about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.dir-locals.el8
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md1
-rw-r--r--default.nix5
-rw-r--r--doc/cross-compilation.xml2
-rw-r--r--doc/functions.xml2
-rw-r--r--doc/introduction.chapter.md2
-rw-r--r--doc/languages-frameworks/haskell.section.md81
-rw-r--r--doc/languages-frameworks/python.section.md19
-rw-r--r--doc/reviewing-contributions.xml48
-rw-r--r--lib/attrsets.nix5
-rw-r--r--lib/default.nix10
-rw-r--r--lib/generators.nix52
-rw-r--r--lib/kernel.nix57
-rw-r--r--lib/licenses.nix16
-rw-r--r--lib/lists.nix38
-rw-r--r--lib/modules.nix36
-rw-r--r--lib/systems/default.nix1
-rw-r--r--lib/systems/examples.nix15
-rw-r--r--lib/systems/platforms.nix3
-rw-r--r--lib/tests/misc.nix15
-rw-r--r--lib/trivial.nix51
-rw-r--r--lib/types.nix7
-rw-r--r--maintainers/maintainer-list.nix513
-rw-r--r--maintainers/scripts/all-tarballs.nix8
-rwxr-xr-xmaintainers/scripts/nixpkgs-lint.pl3
-rwxr-xr-xmaintainers/scripts/update-python-libraries2
-rw-r--r--nixos/doc/manual/administration/imperative-containers.xml2
-rw-r--r--nixos/doc/manual/configuration/network-manager.xml2
-rw-r--r--nixos/doc/manual/configuration/ssh.xml2
-rw-r--r--nixos/doc/manual/default.nix5
-rw-r--r--nixos/doc/manual/installation/changing-config.xml2
-rw-r--r--nixos/doc/manual/installation/installing-from-other-distro.xml2
-rw-r--r--nixos/doc/manual/release-notes/rl-1809.xml94
-rw-r--r--nixos/lib/make-ext4-fs.nix3
-rwxr-xr-xnixos/maintainers/scripts/azure/create-azure.sh2
-rw-r--r--nixos/modules/config/ldap.nix4
-rw-r--r--nixos/modules/config/networking.nix4
-rw-r--r--nixos/modules/config/no-x-libs.nix22
-rw-r--r--nixos/modules/config/pulseaudio.nix4
-rw-r--r--nixos/modules/hardware/all-firmware.nix3
-rw-r--r--nixos/modules/hardware/brightnessctl.nix30
-rw-r--r--nixos/modules/hardware/nitrokey.nix2
-rw-r--r--nixos/modules/hardware/video/uvcvideo/default.nix64
-rw-r--r--nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix46
-rw-r--r--nixos/modules/i18n/input-method/default.nix2
-rw-r--r--nixos/modules/i18n/input-method/default.xml12
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-base.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-aarch64.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image.nix24
-rw-r--r--nixos/modules/installer/netboot/netboot-base.nix2
-rw-r--r--nixos/modules/installer/scan/not-detected.nix9
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl2
-rw-r--r--nixos/modules/installer/virtualbox-demo.nix2
-rw-r--r--nixos/modules/misc/ids.nix8
-rw-r--r--nixos/modules/misc/locate.nix2
-rw-r--r--nixos/modules/module-list.nix12
-rw-r--r--nixos/modules/profiles/demo.nix2
-rw-r--r--nixos/modules/programs/adb.nix4
-rw-r--r--nixos/modules/programs/digitalbitbox/default.nix2
-rw-r--r--nixos/modules/programs/firejail.nix48
-rw-r--r--nixos/modules/programs/gphoto2.nix4
-rw-r--r--nixos/modules/programs/npm.nix4
-rw-r--r--nixos/modules/programs/screen.nix4
-rw-r--r--nixos/modules/programs/sway.nix2
-rw-r--r--nixos/modules/programs/thefuck.nix4
-rw-r--r--nixos/modules/programs/wireshark.nix2
-rw-r--r--nixos/modules/programs/zsh/zsh-autosuggestions.nix60
-rw-r--r--nixos/modules/programs/zsh/zsh.nix11
-rw-r--r--nixos/modules/rename.nix12
-rw-r--r--nixos/modules/security/pam_mount.nix2
-rw-r--r--nixos/modules/security/polkit.nix2
-rw-r--r--nixos/modules/security/rtkit.nix2
-rw-r--r--nixos/modules/security/sudo.nix3
-rw-r--r--nixos/modules/services/admin/oxidized.nix4
-rw-r--r--nixos/modules/services/amqp/activemq/default.nix4
-rw-r--r--nixos/modules/services/amqp/rabbitmq.nix4
-rw-r--r--nixos/modules/services/audio/liquidsoap.nix4
-rw-r--r--nixos/modules/services/audio/mopidy.nix4
-rw-r--r--nixos/modules/services/audio/mpd.nix4
-rw-r--r--nixos/modules/services/audio/squeezelite.nix2
-rw-r--r--nixos/modules/services/backup/bacula.nix4
-rw-r--r--nixos/modules/services/backup/duplicati.nix4
-rw-r--r--nixos/modules/services/backup/mysql-backup.nix2
-rw-r--r--nixos/modules/services/backup/postgresql-backup.nix62
-rw-r--r--nixos/modules/services/backup/restic-rest-server.nix4
-rw-r--r--nixos/modules/services/backup/restic.nix10
-rw-r--r--nixos/modules/services/cluster/hadoop/conf.nix31
-rw-r--r--nixos/modules/services/cluster/hadoop/default.nix63
-rw-r--r--nixos/modules/services/cluster/hadoop/hdfs.nix73
-rw-r--r--nixos/modules/services/cluster/hadoop/yarn.nix74
-rw-r--r--nixos/modules/services/cluster/kubernetes/dashboard.nix173
-rw-r--r--nixos/modules/services/cluster/kubernetes/default.nix67
-rw-r--r--nixos/modules/services/cluster/kubernetes/dns.nix69
-rw-r--r--nixos/modules/services/continuous-integration/buildbot/master.nix4
-rw-r--r--nixos/modules/services/continuous-integration/buildbot/worker.nix4
-rw-r--r--nixos/modules/services/continuous-integration/buildkite-agent.nix2
-rw-r--r--nixos/modules/services/continuous-integration/gitlab-runner.nix4
-rw-r--r--nixos/modules/services/continuous-integration/gocd-agent/default.nix4
-rw-r--r--nixos/modules/services/continuous-integration/gocd-server/default.nix8
-rw-r--r--nixos/modules/services/continuous-integration/hydra/default.nix8
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix4
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/slave.nix4
-rw-r--r--nixos/modules/services/databases/4store-endpoint.nix2
-rw-r--r--nixos/modules/services/databases/4store.nix2
-rw-r--r--nixos/modules/services/databases/cassandra.nix2
-rw-r--r--nixos/modules/services/databases/clickhouse.nix4
-rw-r--r--nixos/modules/services/databases/couchdb.nix4
-rw-r--r--nixos/modules/services/databases/firebird.nix4
-rw-r--r--nixos/modules/services/databases/foundationdb.nix4
-rw-r--r--nixos/modules/services/databases/hbase.nix4
-rw-r--r--nixos/modules/services/databases/influxdb.nix4
-rw-r--r--nixos/modules/services/databases/memcached.nix2
-rw-r--r--nixos/modules/services/databases/mongodb.nix2
-rw-r--r--nixos/modules/services/databases/mysql.nix4
-rw-r--r--nixos/modules/services/databases/neo4j.nix2
-rw-r--r--nixos/modules/services/databases/openldap.nix4
-rw-r--r--nixos/modules/services/databases/opentsdb.nix4
-rw-r--r--nixos/modules/services/databases/pgmanage.nix68
-rw-r--r--nixos/modules/services/databases/postgresql.nix9
-rw-r--r--nixos/modules/services/databases/redis.nix2
-rw-r--r--nixos/modules/services/databases/rethinkdb.nix4
-rw-r--r--nixos/modules/services/databases/riak-cs.nix2
-rw-r--r--nixos/modules/services/databases/riak.nix4
-rw-r--r--nixos/modules/services/databases/stanchion.nix4
-rw-r--r--nixos/modules/services/databases/virtuoso.nix2
-rw-r--r--nixos/modules/services/desktops/bamf.nix23
-rw-r--r--nixos/modules/services/desktops/pipewire.nix22
-rw-r--r--nixos/modules/services/development/bloop.nix37
-rw-r--r--nixos/modules/services/editors/infinoted.nix4
-rw-r--r--nixos/modules/services/games/minecraft-server.nix2
-rw-r--r--nixos/modules/services/games/minetest-server.nix2
-rw-r--r--nixos/modules/services/games/terraria.nix4
-rw-r--r--nixos/modules/services/hardware/fwupd.nix2
-rw-r--r--nixos/modules/services/hardware/sane.nix4
-rw-r--r--nixos/modules/services/hardware/tcsd.nix4
-rw-r--r--nixos/modules/services/hardware/udisks2.nix11
-rw-r--r--nixos/modules/services/hardware/usbmuxd.nix4
-rw-r--r--nixos/modules/services/logging/graylog.nix2
-rw-r--r--nixos/modules/services/logging/journaldriver.nix112
-rw-r--r--nixos/modules/services/logging/journalwatch.nix4
-rw-r--r--nixos/modules/services/logging/logcheck.nix2
-rw-r--r--nixos/modules/services/mail/dovecot.nix4
-rw-r--r--nixos/modules/services/mail/dspam.nix4
-rw-r--r--nixos/modules/services/mail/exim.nix4
-rw-r--r--nixos/modules/services/mail/mailhog.nix2
-rw-r--r--nixos/modules/services/mail/mlmmj.nix4
-rw-r--r--nixos/modules/services/mail/nullmailer.nix4
-rw-r--r--nixos/modules/services/mail/opendkim.nix4
-rw-r--r--nixos/modules/services/mail/opensmtpd.nix17
-rw-r--r--nixos/modules/services/mail/postfix.nix4
-rw-r--r--nixos/modules/services/mail/postgrey.nix4
-rw-r--r--nixos/modules/services/mail/postsrsd.nix4
-rw-r--r--nixos/modules/services/mail/rmilter.nix8
-rw-r--r--nixos/modules/services/mail/rspamd.nix4
-rw-r--r--nixos/modules/services/mail/spamassassin.nix4
-rw-r--r--nixos/modules/services/misc/airsonic.nix2
-rw-r--r--nixos/modules/services/misc/apache-kafka.nix2
-rw-r--r--nixos/modules/services/misc/autorandr.nix24
-rw-r--r--nixos/modules/services/misc/bepasty.nix4
-rw-r--r--nixos/modules/services/misc/calibre-server.nix4
-rw-r--r--nixos/modules/services/misc/cfdyndns.nix4
-rw-r--r--nixos/modules/services/misc/cgminer.nix2
-rw-r--r--nixos/modules/services/misc/couchpotato.nix4
-rw-r--r--nixos/modules/services/misc/dictd.nix4
-rw-r--r--nixos/modules/services/misc/disnix.nix2
-rw-r--r--nixos/modules/services/misc/docker-registry.nix7
-rw-r--r--nixos/modules/services/misc/emby.nix4
-rw-r--r--nixos/modules/services/misc/errbot.nix4
-rw-r--r--nixos/modules/services/misc/etcd.nix2
-rw-r--r--nixos/modules/services/misc/exhibitor.nix2
-rw-r--r--nixos/modules/services/misc/felix.nix4
-rw-r--r--nixos/modules/services/misc/folding-at-home.nix2
-rw-r--r--nixos/modules/services/misc/gammu-smsd.nix2
-rw-r--r--nixos/modules/services/misc/geoip-updater.nix2
-rw-r--r--nixos/modules/services/misc/gitea.nix2
-rw-r--r--nixos/modules/services/misc/gitit.nix10
-rw-r--r--nixos/modules/services/misc/gitlab.nix4
-rw-r--r--nixos/modules/services/misc/gitolite.nix4
-rw-r--r--nixos/modules/services/misc/gogs.nix4
-rw-r--r--nixos/modules/services/misc/gollum.nix4
-rw-r--r--nixos/modules/services/misc/gpsd.nix15
-rw-r--r--nixos/modules/services/misc/home-assistant.nix4
-rw-r--r--nixos/modules/services/misc/ihaskell.nix10
-rw-r--r--nixos/modules/services/misc/jackett.nix4
-rw-r--r--nixos/modules/services/misc/mathics.nix10
-rw-r--r--nixos/modules/services/misc/matrix-synapse.nix4
-rw-r--r--nixos/modules/services/misc/mediatomb.nix4
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix10
-rw-r--r--nixos/modules/services/misc/nix-ssh-serve.nix4
-rw-r--r--nixos/modules/services/misc/nzbget.nix4
-rw-r--r--nixos/modules/services/misc/octoprint.nix4
-rw-r--r--nixos/modules/services/misc/osrm.nix2
-rw-r--r--nixos/modules/services/misc/plex.nix4
-rw-r--r--nixos/modules/services/misc/plexpy.nix2
-rw-r--r--nixos/modules/services/misc/pykms.nix4
-rw-r--r--nixos/modules/services/misc/radarr.nix4
-rw-r--r--nixos/modules/services/misc/redmine.nix4
-rw-r--r--nixos/modules/services/misc/ripple-data-api.nix2
-rw-r--r--nixos/modules/services/misc/rippled.nix2
-rw-r--r--nixos/modules/services/misc/serviio.nix4
-rw-r--r--nixos/modules/services/misc/siproxd.nix2
-rw-r--r--nixos/modules/services/misc/sonarr.nix4
-rw-r--r--nixos/modules/services/misc/subsonic.nix6
-rw-r--r--nixos/modules/services/misc/uhub.nix4
-rw-r--r--nixos/modules/services/misc/xmr-stak.nix60
-rw-r--r--nixos/modules/services/misc/zookeeper.nix2
-rw-r--r--nixos/modules/services/monitoring/bosun.nix4
-rw-r--r--nixos/modules/services/monitoring/collectd.nix2
-rw-r--r--nixos/modules/services/monitoring/dd-agent/dd-agent.nix4
-rw-r--r--nixos/modules/services/monitoring/fusion-inventory.nix2
-rw-r--r--nixos/modules/services/monitoring/grafana.nix2
-rw-r--r--nixos/modules/services/monitoring/graphite.nix4
-rw-r--r--nixos/modules/services/monitoring/heapster.nix2
-rw-r--r--nixos/modules/services/monitoring/munin.nix4
-rw-r--r--nixos/modules/services/monitoring/nagios.nix2
-rw-r--r--nixos/modules/services/monitoring/netdata.nix4
-rw-r--r--nixos/modules/services/monitoring/prometheus/default.nix4
-rw-r--r--nixos/modules/services/monitoring/riemann-dash.nix4
-rw-r--r--nixos/modules/services/monitoring/riemann-tools.nix4
-rw-r--r--nixos/modules/services/monitoring/riemann.nix4
-rw-r--r--nixos/modules/services/monitoring/scollector.nix4
-rw-r--r--nixos/modules/services/monitoring/statsd.nix2
-rw-r--r--nixos/modules/services/monitoring/telegraf.nix2
-rw-r--r--nixos/modules/services/monitoring/ups.nix4
-rw-r--r--nixos/modules/services/monitoring/vnstat.nix2
-rw-r--r--nixos/modules/services/monitoring/zabbix-agent.nix2
-rw-r--r--nixos/modules/services/monitoring/zabbix-server.nix2
-rw-r--r--nixos/modules/services/network-filesystems/ceph.nix4
-rw-r--r--nixos/modules/services/network-filesystems/davfs2.nix4
-rw-r--r--nixos/modules/services/network-filesystems/ipfs.nix4
-rw-r--r--nixos/modules/services/network-filesystems/openafs/client.nix26
-rw-r--r--nixos/modules/services/network-filesystems/openafs/lib.nix11
-rw-r--r--nixos/modules/services/network-filesystems/openafs/server.nix34
-rw-r--r--nixos/modules/services/network-filesystems/tahoe.nix4
-rw-r--r--nixos/modules/services/network-filesystems/xtreemfs.nix4
-rw-r--r--nixos/modules/services/network-filesystems/yandex-disk.nix2
-rw-r--r--nixos/modules/services/networking/amuled.nix4
-rw-r--r--nixos/modules/services/networking/aria2.nix4
-rw-r--r--nixos/modules/services/networking/asterisk.nix4
-rw-r--r--nixos/modules/services/networking/avahi-daemon.nix4
-rw-r--r--nixos/modules/services/networking/bind.nix2
-rw-r--r--nixos/modules/services/networking/bird.nix4
-rw-r--r--nixos/modules/services/networking/bitlbee.nix4
-rw-r--r--nixos/modules/services/networking/btsync.nix4
-rw-r--r--nixos/modules/services/networking/charybdis.nix4
-rw-r--r--nixos/modules/services/networking/chrony.nix6
-rw-r--r--nixos/modules/services/networking/cntlm.nix2
-rw-r--r--nixos/modules/services/networking/consul.nix2
-rw-r--r--nixos/modules/services/networking/coturn.nix4
-rw-r--r--nixos/modules/services/networking/dhcpd.nix2
-rw-r--r--nixos/modules/services/networking/dnscache.nix2
-rw-r--r--nixos/modules/services/networking/dnschain.nix2
-rw-r--r--nixos/modules/services/networking/dnsdist.nix61
-rw-r--r--nixos/modules/services/networking/dnsmasq.nix2
-rw-r--r--nixos/modules/services/networking/ejabberd.nix4
-rw-r--r--nixos/modules/services/networking/firewall.nix439
-rw-r--r--nixos/modules/services/networking/freenet.nix4
-rw-r--r--nixos/modules/services/networking/freeradius.nix2
-rw-r--r--nixos/modules/services/networking/gale.nix4
-rw-r--r--nixos/modules/services/networking/gateone.nix4
-rw-r--r--nixos/modules/services/networking/git-daemon.nix4
-rw-r--r--nixos/modules/services/networking/gnunet.nix4
-rw-r--r--nixos/modules/services/networking/hans.nix2
-rw-r--r--nixos/modules/services/networking/haproxy.nix4
-rw-r--r--nixos/modules/services/networking/hostapd.nix2
-rw-r--r--nixos/modules/services/networking/i2p.nix4
-rw-r--r--nixos/modules/services/networking/i2pd.nix4
-rw-r--r--nixos/modules/services/networking/iodine.nix4
-rw-r--r--nixos/modules/services/networking/ircd-hybrid/default.nix4
-rw-r--r--nixos/modules/services/networking/iwd.nix4
-rw-r--r--nixos/modules/services/networking/kippo.nix4
-rw-r--r--nixos/modules/services/networking/kresd.nix4
-rw-r--r--nixos/modules/services/networking/lambdabot.nix4
-rw-r--r--nixos/modules/services/networking/lldpd.nix4
-rw-r--r--nixos/modules/services/networking/mailpile.nix4
-rw-r--r--nixos/modules/services/networking/matterbridge.nix4
-rw-r--r--nixos/modules/services/networking/minidlna.nix4
-rw-r--r--nixos/modules/services/networking/mjpg-streamer.nix2
-rw-r--r--nixos/modules/services/networking/monero.nix4
-rw-r--r--nixos/modules/services/networking/morty.nix2
-rw-r--r--nixos/modules/services/networking/mosquitto.nix4
-rw-r--r--nixos/modules/services/networking/murmur.nix4
-rw-r--r--nixos/modules/services/networking/namecoind.nix4
-rw-r--r--nixos/modules/services/networking/nat.nix20
-rw-r--r--nixos/modules/services/networking/networkmanager.nix186
-rw-r--r--nixos/modules/services/networking/ngircd.nix2
-rw-r--r--nixos/modules/services/networking/nix-serve.nix2
-rw-r--r--nixos/modules/services/networking/nntp-proxy.nix2
-rw-r--r--nixos/modules/services/networking/nsd.nix4
-rw-r--r--nixos/modules/services/networking/ntpd.nix2
-rw-r--r--nixos/modules/services/networking/nylon.nix4
-rw-r--r--nixos/modules/services/networking/oidentd.nix4
-rw-r--r--nixos/modules/services/networking/openntpd.nix2
-rw-r--r--nixos/modules/services/networking/owamp.nix47
-rw-r--r--nixos/modules/services/networking/pdns-recursor.nix2
-rw-r--r--nixos/modules/services/networking/pdnsd.nix4
-rw-r--r--nixos/modules/services/networking/polipo.nix4
-rw-r--r--nixos/modules/services/networking/prayer.nix4
-rw-r--r--nixos/modules/services/networking/prosody.nix4
-rw-r--r--nixos/modules/services/networking/quagga.nix33
-rw-r--r--nixos/modules/services/networking/quassel.nix4
-rw-r--r--nixos/modules/services/networking/radicale.nix4
-rw-r--r--nixos/modules/services/networking/radvd.nix2
-rw-r--r--nixos/modules/services/networking/rdnssd.nix2
-rw-r--r--nixos/modules/services/networking/resilio.nix4
-rw-r--r--nixos/modules/services/networking/rpcbind.nix2
-rw-r--r--nixos/modules/services/networking/sabnzbd.nix4
-rw-r--r--nixos/modules/services/networking/searx.nix4
-rw-r--r--nixos/modules/services/networking/seeks.nix4
-rw-r--r--nixos/modules/services/networking/shairport-sync.nix2
-rw-r--r--nixos/modules/services/networking/shout.nix2
-rw-r--r--nixos/modules/services/networking/smokeping.nix2
-rw-r--r--nixos/modules/services/networking/sniproxy.nix4
-rw-r--r--nixos/modules/services/networking/spiped.nix4
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix10
-rw-r--r--nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix7
-rw-r--r--nixos/modules/services/networking/supplicant.nix2
-rw-r--r--nixos/modules/services/networking/supybot.nix4
-rw-r--r--nixos/modules/services/networking/syncthing.nix4
-rw-r--r--nixos/modules/services/networking/tcpcrypt.nix2
-rw-r--r--nixos/modules/services/networking/tinc.nix12
-rw-r--r--nixos/modules/services/networking/tinydns.nix2
-rw-r--r--nixos/modules/services/networking/tox-bootstrapd.nix2
-rw-r--r--nixos/modules/services/networking/toxvpn.nix2
-rw-r--r--nixos/modules/services/networking/tvheadend.nix4
-rw-r--r--nixos/modules/services/networking/unbound.nix11
-rw-r--r--nixos/modules/services/networking/unifi.nix2
-rw-r--r--nixos/modules/services/networking/vsftpd.nix4
-rw-r--r--nixos/modules/services/networking/xrdp.nix1
-rw-r--r--nixos/modules/services/networking/zerotierone.nix2
-rw-r--r--nixos/modules/services/networking/znc.nix15
-rw-r--r--nixos/modules/services/printing/cupsd.nix2
-rw-r--r--nixos/modules/services/scheduling/atd.nix4
-rw-r--r--nixos/modules/services/scheduling/chronos.nix2
-rw-r--r--nixos/modules/services/scheduling/fcron.nix2
-rw-r--r--nixos/modules/services/scheduling/marathon.nix2
-rw-r--r--nixos/modules/services/search/hound.nix4
-rw-r--r--nixos/modules/services/search/kibana.nix2
-rw-r--r--nixos/modules/services/security/clamav.nix4
-rw-r--r--nixos/modules/services/security/fprot.nix4
-rw-r--r--nixos/modules/services/security/oauth2_proxy.nix3
-rw-r--r--nixos/modules/services/security/oauth2_proxy_nginx.nix64
-rw-r--r--nixos/modules/services/security/tor.nix55
-rw-r--r--nixos/modules/services/security/vault.nix4
-rw-r--r--nixos/modules/services/system/dbus.nix5
-rw-r--r--nixos/modules/services/system/kerberos.nix8
-rw-r--r--nixos/modules/services/system/nscd.nix2
-rw-r--r--nixos/modules/services/system/uptimed.nix2
-rw-r--r--nixos/modules/services/torrent/deluge.nix4
-rw-r--r--nixos/modules/services/torrent/peerflix.nix2
-rw-r--r--nixos/modules/services/torrent/transmission.nix4
-rw-r--r--nixos/modules/services/web-apps/atlassian/confluence.nix4
-rw-r--r--nixos/modules/services/web-apps/atlassian/crowd.nix4
-rw-r--r--nixos/modules/services/web-apps/atlassian/jira.nix4
-rw-r--r--nixos/modules/services/web-apps/frab.nix4
-rw-r--r--nixos/modules/services/web-apps/matomo.nix6
-rw-r--r--nixos/modules/services/web-apps/mattermost.nix12
-rw-r--r--nixos/modules/services/web-apps/nexus.nix22
-rw-r--r--nixos/modules/services/web-apps/restya-board.nix4
-rw-r--r--nixos/modules/services/web-apps/tt-rss.nix44
-rw-r--r--nixos/modules/services/web-apps/virtlyst.nix72
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix6
-rw-r--r--nixos/modules/services/web-servers/caddy.nix4
-rw-r--r--nixos/modules/services/web-servers/hitch/default.nix4
-rw-r--r--nixos/modules/services/web-servers/lighttpd/cgit.nix28
-rw-r--r--nixos/modules/services/web-servers/lighttpd/default.nix4
-rw-r--r--nixos/modules/services/web-servers/lighttpd/inginious.nix2
-rw-r--r--nixos/modules/services/web-servers/meguca.nix9
-rw-r--r--nixos/modules/services/web-servers/mighttpd2.nix4
-rw-r--r--nixos/modules/services/web-servers/minio.nix4
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix4
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix6
-rw-r--r--nixos/modules/services/web-servers/traefik.nix4
-rw-r--r--nixos/modules/services/web-servers/uwsgi.nix12
-rw-r--r--nixos/modules/services/web-servers/varnish/default.nix4
-rw-r--r--nixos/modules/services/web-servers/zope2.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce.nix8
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix4
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix100
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix7
-rw-r--r--nixos/modules/services/x11/display-managers/sddm.nix4
-rw-r--r--nixos/modules/services/x11/hardware/libinput.nix2
-rw-r--r--nixos/modules/services/x11/window-managers/awesome.nix7
-rw-r--r--nixos/modules/services/x11/xserver.nix7
-rw-r--r--nixos/modules/system/boot/initrd-network.nix1
-rw-r--r--nixos/modules/system/boot/initrd-ssh.nix2
-rw-r--r--nixos/modules/system/boot/loader/grub/grub.nix5
-rw-r--r--nixos/modules/system/boot/loader/grub/install-grub.pl2
-rw-r--r--nixos/modules/system/boot/resolved.nix2
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh3
-rw-r--r--nixos/modules/system/boot/stage-1.nix6
-rw-r--r--nixos/modules/system/boot/systemd.nix16
-rw-r--r--nixos/modules/system/boot/timesyncd.nix4
-rw-r--r--nixos/modules/tasks/filesystems/zfs.nix111
-rw-r--r--nixos/modules/tasks/network-interfaces.nix18
-rw-r--r--nixos/modules/testing/test-instrumentation.nix2
-rw-r--r--nixos/modules/virtualisation/azure-image.nix4
-rw-r--r--nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch14
-rw-r--r--nixos/modules/virtualisation/docker.nix2
-rw-r--r--nixos/modules/virtualisation/libvirtd.nix2
-rw-r--r--nixos/modules/virtualisation/lxc-container.nix2
-rw-r--r--nixos/modules/virtualisation/lxd.nix4
-rw-r--r--nixos/modules/virtualisation/rkt.nix2
-rw-r--r--nixos/modules/virtualisation/virtualbox-guest.nix2
-rw-r--r--nixos/modules/virtualisation/virtualbox-host.nix2
-rw-r--r--nixos/modules/virtualisation/virtualbox-image.nix36
-rw-r--r--nixos/release.nix6
-rw-r--r--nixos/tests/acme.nix2
-rw-r--r--nixos/tests/atd.nix2
-rw-r--r--nixos/tests/common/letsencrypt/default.nix (renamed from nixos/tests/common/letsencrypt.nix)75
-rw-r--r--nixos/tests/common/letsencrypt/mkcerts.nix69
-rwxr-xr-xnixos/tests/common/letsencrypt/mkcerts.sh6
-rw-r--r--nixos/tests/common/letsencrypt/snakeoil-certs.nix253
-rw-r--r--nixos/tests/common/resolver.nix2
-rw-r--r--nixos/tests/common/user-account.nix4
-rw-r--r--nixos/tests/containers-imperative.nix2
-rw-r--r--nixos/tests/gitolite.nix4
-rw-r--r--nixos/tests/gnome3.nix9
-rw-r--r--nixos/tests/hadoop/hdfs.nix54
-rw-r--r--nixos/tests/hadoop/yarn.nix46
-rw-r--r--nixos/tests/installer.nix6
-rw-r--r--nixos/tests/jenkins.nix4
-rw-r--r--nixos/tests/lightdm.nix2
-rw-r--r--nixos/tests/morty.nix4
-rw-r--r--nixos/tests/mpd.nix119
-rw-r--r--nixos/tests/opensmtpd.nix115
-rw-r--r--nixos/tests/openssh.nix4
-rw-r--r--nixos/tests/ostree.nix21
-rw-r--r--nixos/tests/pam-oath-login.nix2
-rw-r--r--nixos/tests/plasma5.nix20
-rw-r--r--nixos/tests/postgresql.nix7
-rw-r--r--nixos/tests/sddm.nix2
-rw-r--r--nixos/tests/slim.nix2
-rw-r--r--nixos/tests/sudo.nix2
-rw-r--r--nixos/tests/taskserver.nix7
-rw-r--r--nixos/tests/tor.nix28
-rw-r--r--nixos/tests/virtualbox.nix2
-rw-r--r--pkgs/applications/altcoins/bitcoin.nix4
-rw-r--r--pkgs/applications/altcoins/clightning.nix47
-rw-r--r--pkgs/applications/altcoins/default.nix1
-rw-r--r--pkgs/applications/altcoins/go-ethereum.nix15
-rw-r--r--pkgs/applications/altcoins/litecoin.nix4
-rw-r--r--pkgs/applications/altcoins/nano-wallet/default.nix4
-rw-r--r--pkgs/applications/altcoins/parity-ui/default.nix4
-rw-r--r--pkgs/applications/altcoins/parity/default.nix6
-rw-r--r--pkgs/applications/altcoins/particl/particl-core.nix4
-rw-r--r--pkgs/applications/audio/MMA/default.nix2
-rw-r--r--pkgs/applications/audio/abcde/default.nix2
-rw-r--r--pkgs/applications/audio/aeolus/default.nix2
-rw-r--r--pkgs/applications/audio/amarok/default.nix42
-rw-r--r--pkgs/applications/audio/amarok/kf5.nix38
-rw-r--r--pkgs/applications/audio/audacious/default.nix2
-rw-r--r--pkgs/applications/audio/banshee/default.nix2
-rw-r--r--pkgs/applications/audio/beast/default.nix2
-rw-r--r--pkgs/applications/audio/bitmeter/default.nix2
-rw-r--r--pkgs/applications/audio/calf/default.nix13
-rw-r--r--pkgs/applications/audio/cdparanoia/default.nix2
-rw-r--r--pkgs/applications/audio/deadbeef/plugins/mpris2.nix4
-rw-r--r--pkgs/applications/audio/denemo/default.nix2
-rw-r--r--pkgs/applications/audio/dr14_tmeter/default.nix2
-rw-r--r--pkgs/applications/audio/drumgizmo/default.nix2
-rw-r--r--pkgs/applications/audio/ecasound/default.nix2
-rw-r--r--pkgs/applications/audio/elisa/default.nix6
-rw-r--r--pkgs/applications/audio/fldigi/default.nix4
-rw-r--r--pkgs/applications/audio/fomp/default.nix2
-rw-r--r--pkgs/applications/audio/gigedit/default.nix2
-rw-r--r--pkgs/applications/audio/gpodder/default.nix6
-rw-r--r--pkgs/applications/audio/gtklick/default.nix5
-rw-r--r--pkgs/applications/audio/guitarix/default.nix4
-rw-r--r--pkgs/applications/audio/jaaa/default.nix2
-rw-r--r--pkgs/applications/audio/jack-capture/default.nix2
-rw-r--r--pkgs/applications/audio/jalv/default.nix2
-rw-r--r--pkgs/applications/audio/japa/default.nix2
-rw-r--r--pkgs/applications/audio/ladspa-sdk/default.nix2
-rw-r--r--pkgs/applications/audio/ladspa-sdk/ladspah.nix2
-rw-r--r--pkgs/applications/audio/lastfmsubmitd/default.nix3
-rw-r--r--pkgs/applications/audio/lastwatch/default.nix3
-rw-r--r--pkgs/applications/audio/linuxsampler/default.nix2
-rw-r--r--pkgs/applications/audio/lollypop/default.nix58
-rw-r--r--pkgs/applications/audio/mda-lv2/default.nix2
-rw-r--r--pkgs/applications/audio/mimms/default.nix52
-rw-r--r--pkgs/applications/audio/mixxx/default.nix2
-rw-r--r--pkgs/applications/audio/monkeys-audio/default.nix2
-rw-r--r--pkgs/applications/audio/mopidy/default.nix3
-rw-r--r--pkgs/applications/audio/mopidy/gmusic.nix2
-rw-r--r--pkgs/applications/audio/mopidy/iris.nix4
-rw-r--r--pkgs/applications/audio/mopidy/local-images.nix3
-rw-r--r--pkgs/applications/audio/mopidy/local-sqlite.nix3
-rw-r--r--pkgs/applications/audio/mopidy/musicbox-webclient.nix3
-rw-r--r--pkgs/applications/audio/mopidy/soundcloud.nix7
-rw-r--r--pkgs/applications/audio/mopidy/spotify-tunigo.nix3
-rw-r--r--pkgs/applications/audio/mopidy/spotify.nix2
-rw-r--r--pkgs/applications/audio/mopidy/youtube.nix3
-rw-r--r--pkgs/applications/audio/muse/default.nix76
-rw-r--r--pkgs/applications/audio/musescore/default.nix4
-rw-r--r--pkgs/applications/audio/nova-filters/default.nix2
-rw-r--r--pkgs/applications/audio/paprefs/default.nix2
-rw-r--r--pkgs/applications/audio/pavucontrol/default.nix2
-rw-r--r--pkgs/applications/audio/pd-plugins/helmholtz/default.nix2
-rw-r--r--pkgs/applications/audio/pd-plugins/puremapping/default.nix2
-rw-r--r--pkgs/applications/audio/pd-plugins/zexy/default.nix2
-rw-r--r--pkgs/applications/audio/picard/default.nix7
-rw-r--r--pkgs/applications/audio/pithos/default.nix1
-rw-r--r--pkgs/applications/audio/puddletag/default.nix13
-rw-r--r--pkgs/applications/audio/pulseeffects/default.nix99
-rw-r--r--pkgs/applications/audio/qjackctl/default.nix4
-rw-r--r--pkgs/applications/audio/quodlibet/default.nix2
-rw-r--r--pkgs/applications/audio/renoise/default.nix2
-rw-r--r--pkgs/applications/audio/rosegarden/default.nix2
-rw-r--r--pkgs/applications/audio/sidplayfp/default.nix22
-rw-r--r--pkgs/applications/audio/snapcast/default.nix54
-rw-r--r--pkgs/applications/audio/snd/default.nix4
-rw-r--r--pkgs/applications/audio/sonata/default.nix2
-rw-r--r--pkgs/applications/audio/sonic-visualiser/default.nix2
-rw-r--r--pkgs/applications/audio/spectrojack/default.nix4
-rw-r--r--pkgs/applications/audio/tetraproc/default.nix2
-rw-r--r--pkgs/applications/audio/tomahawk/default.nix1
-rw-r--r--pkgs/applications/audio/vorbis-tools/default.nix2
-rw-r--r--pkgs/applications/audio/x42-plugins/default.nix2
-rw-r--r--pkgs/applications/audio/ympd/default.nix2
-rw-r--r--pkgs/applications/audio/yoshimi/default.nix4
-rw-r--r--pkgs/applications/backup/deja-dup/default.nix11
-rw-r--r--pkgs/applications/backup/deja-dup/hardcode-gsettings.patch38
-rw-r--r--pkgs/applications/display-managers/lightdm-mini-greeter/default.nix32
-rw-r--r--pkgs/applications/display-managers/sddm/default.nix11
-rw-r--r--pkgs/applications/display-managers/sddm/qt511.patch28
-rw-r--r--pkgs/applications/editors/android-studio/common.nix2
-rw-r--r--pkgs/applications/editors/android-studio/default.nix11
-rw-r--r--pkgs/applications/editors/atom/default.nix13
-rw-r--r--pkgs/applications/editors/atom/env.nix4
-rw-r--r--pkgs/applications/editors/eclipse/default.nix34
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix34
-rw-r--r--pkgs/applications/editors/edbrowse/default.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/cask/default.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/icicles/default.nix10
-rw-r--r--pkgs/applications/editors/emacs-modes/scala-mode/v1.nix2
-rw-r--r--pkgs/applications/editors/emacs/macport.nix16
-rw-r--r--pkgs/applications/editors/focuswriter/default.nix4
-rw-r--r--pkgs/applications/editors/geany/default.nix2
-rw-r--r--pkgs/applications/editors/ghostwriter/default.nix4
-rw-r--r--pkgs/applications/editors/gnome-latex/default.nix47
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix62
-rwxr-xr-xpkgs/applications/editors/jetbrains/update.pl2
-rw-r--r--pkgs/applications/editors/jupp/default.nix2
-rw-r--r--pkgs/applications/editors/monodevelop/default.nix2
-rw-r--r--pkgs/applications/editors/nano/default.nix4
-rw-r--r--pkgs/applications/editors/neovim/default.nix7
-rw-r--r--pkgs/applications/editors/neovim/neovim-remote.nix2
-rw-r--r--pkgs/applications/editors/netbeans/default.nix2
-rw-r--r--pkgs/applications/editors/nvpy/default.nix2
-rw-r--r--pkgs/applications/editors/rednotebook/default.nix6
-rw-r--r--pkgs/applications/editors/scite/default.nix4
-rw-r--r--pkgs/applications/editors/texstudio/default.nix4
-rw-r--r--pkgs/applications/editors/tweak/default.nix2
-rw-r--r--pkgs/applications/editors/typora/default.nix7
-rw-r--r--pkgs/applications/editors/vim/common.nix4
-rw-r--r--pkgs/applications/editors/vscode/default.nix11
-rw-r--r--pkgs/applications/editors/vscode/with-extensions.nix11
-rw-r--r--pkgs/applications/gis/grass/default.nix2
-rw-r--r--pkgs/applications/gis/qgis/default.nix2
-rw-r--r--pkgs/applications/gis/whitebox-tools/default.nix24
-rw-r--r--pkgs/applications/graphics/ImageMagick/7.0.nix8
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix4
-rw-r--r--pkgs/applications/graphics/avocode/default.nix4
-rw-r--r--pkgs/applications/graphics/darktable/default.nix11
-rw-r--r--pkgs/applications/graphics/displaycal/default.nix3
-rw-r--r--pkgs/applications/graphics/dosage/default.nix1
-rw-r--r--pkgs/applications/graphics/exrdisplay/default.nix6
-rw-r--r--pkgs/applications/graphics/fbida/default.nix12
-rw-r--r--pkgs/applications/graphics/feh/default.nix4
-rw-r--r--pkgs/applications/graphics/freecad/default.nix17
-rw-r--r--pkgs/applications/graphics/gimp/default.nix8
-rw-r--r--pkgs/applications/graphics/glabels/default.nix2
-rw-r--r--pkgs/applications/graphics/gocr/default.nix2
-rw-r--r--pkgs/applications/graphics/graphicsmagick/default.nix4
-rw-r--r--pkgs/applications/graphics/imagej/default.nix2
-rw-r--r--pkgs/applications/graphics/imlibsetroot/default.nix2
-rw-r--r--pkgs/applications/graphics/inkscape/default.nix16
-rw-r--r--pkgs/applications/graphics/jpegoptim/default.nix2
-rw-r--r--pkgs/applications/graphics/kipi-plugins/default.nix2
-rw-r--r--pkgs/applications/graphics/krita/default.nix10
-rw-r--r--pkgs/applications/graphics/krop/default.nix40
-rw-r--r--pkgs/applications/graphics/mozjpeg/default.nix18
-rw-r--r--pkgs/applications/graphics/nomacs/default.nix4
-rw-r--r--pkgs/applications/graphics/pencil/default.nix6
-rw-r--r--pkgs/applications/graphics/qiv/default.nix2
-rw-r--r--pkgs/applications/graphics/sane/backends/brscan4/default.nix2
-rw-r--r--pkgs/applications/graphics/scantailor/advanced.nix4
-rw-r--r--pkgs/applications/graphics/seg3d/default.nix2
-rw-r--r--pkgs/applications/graphics/tesseract/default.nix64
-rw-r--r--pkgs/applications/graphics/write_stylus/default.nix52
-rw-r--r--pkgs/applications/graphics/zgv/default.nix2
-rw-r--r--pkgs/applications/kde/fetch.sh2
-rw-r--r--pkgs/applications/kde/srcs.nix1696
-rw-r--r--pkgs/applications/misc/1password/default.nix15
-rw-r--r--pkgs/applications/misc/alacritty/default.nix4
-rw-r--r--pkgs/applications/misc/albert/default.nix9
-rw-r--r--pkgs/applications/misc/audio/wavesurfer/default.nix2
-rw-r--r--pkgs/applications/misc/barrier/default.nix15
-rw-r--r--pkgs/applications/misc/blender/default.nix2
-rw-r--r--pkgs/applications/misc/calcurse/default.nix2
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/cbatticon/default.nix4
-rw-r--r--pkgs/applications/misc/cherrytree/default.nix6
-rw-r--r--pkgs/applications/misc/chirp/default.nix4
-rw-r--r--pkgs/applications/misc/confclerk/default.nix2
-rw-r--r--pkgs/applications/misc/copyq/default.nix9
-rw-r--r--pkgs/applications/misc/coursera-dl/default.nix8
-rw-r--r--pkgs/applications/misc/cura/default.nix13
-rw-r--r--pkgs/applications/misc/cura/lulzbot.nix2
-rw-r--r--pkgs/applications/misc/curaengine/default.nix6
-rw-r--r--pkgs/applications/misc/dbeaver/default.nix4
-rw-r--r--pkgs/applications/misc/digitalbitbox/default.nix5
-rw-r--r--pkgs/applications/misc/dunst/default.nix8
-rw-r--r--pkgs/applications/misc/ephemeralpg/default.nix4
-rw-r--r--pkgs/applications/misc/fbreader/default.nix2
-rw-r--r--pkgs/applications/misc/girara/default.nix2
-rw-r--r--pkgs/applications/misc/glava/default.nix105
-rw-r--r--pkgs/applications/misc/gnss-sdr/default.nix2
-rw-r--r--pkgs/applications/misc/gnuradio/default.nix12
-rw-r--r--pkgs/applications/misc/goldendict/default.nix14
-rw-r--r--pkgs/applications/misc/gpsprune/default.nix2
-rw-r--r--pkgs/applications/misc/guake/default.nix4
-rw-r--r--pkgs/applications/misc/gxneur/default.nix2
-rw-r--r--pkgs/applications/misc/hello-unfree/default.nix23
-rw-r--r--pkgs/applications/misc/hello/default.nix3
-rw-r--r--pkgs/applications/misc/hugo/default.nix8
-rw-r--r--pkgs/applications/misc/hugo/deps.nix64
-rw-r--r--pkgs/applications/misc/ipmicfg/default.nix6
-rw-r--r--pkgs/applications/misc/ipmiview/default.nix6
-rw-r--r--pkgs/applications/misc/jgmenu/default.nix4
-rw-r--r--pkgs/applications/misc/josm/default.nix10
-rw-r--r--pkgs/applications/misc/jrnl/default.nix8
-rw-r--r--pkgs/applications/misc/kdeconnect/default.nix4
-rw-r--r--pkgs/applications/misc/keepassx/community.nix6
-rw-r--r--pkgs/applications/misc/keepassx/qt511.patch15
-rw-r--r--pkgs/applications/misc/khal/default.nix26
-rw-r--r--pkgs/applications/misc/khard/default.nix22
-rw-r--r--pkgs/applications/misc/kitty/default.nix15
-rw-r--r--pkgs/applications/misc/krename/default.nix13
-rw-r--r--pkgs/applications/misc/librecad/default.nix2
-rw-r--r--pkgs/applications/misc/limesuite/default.nix4
-rw-r--r--pkgs/applications/misc/lyx/default.nix9
-rw-r--r--pkgs/applications/misc/masterpdfeditor/default.nix2
-rw-r--r--pkgs/applications/misc/mlterm/default.nix4
-rw-r--r--pkgs/applications/misc/mupdf/default.nix15
-rw-r--r--pkgs/applications/misc/octoprint/default.nix38
-rw-r--r--pkgs/applications/misc/orca/default.nix4
-rw-r--r--pkgs/applications/misc/pcmanx-gtk2/default.nix2
-rw-r--r--pkgs/applications/misc/pdfdiff/default.nix2
-rw-r--r--pkgs/applications/misc/pgadmin/default.nix2
-rw-r--r--pkgs/applications/misc/pgmanage/default.nix4
-rw-r--r--pkgs/applications/misc/pstree/default.nix2
-rw-r--r--pkgs/applications/misc/ptask/default.nix2
-rw-r--r--pkgs/applications/misc/rofi/wrapper.nix13
-rw-r--r--pkgs/applications/misc/rtl-sdr/default.nix10
-rw-r--r--pkgs/applications/misc/rtv/default.nix4
-rw-r--r--pkgs/applications/misc/safeeyes/default.nix4
-rw-r--r--pkgs/applications/misc/sbagen/default.nix2
-rw-r--r--pkgs/applications/misc/sequeler/default.nix17
-rw-r--r--pkgs/applications/misc/slic3r/default.nix1
-rw-r--r--pkgs/applications/misc/slic3r/prusa3d.nix11
-rw-r--r--pkgs/applications/misc/tasknc/default.nix4
-rw-r--r--pkgs/applications/misc/tasksh/default.nix2
-rw-r--r--pkgs/applications/misc/termite/add_errno_header.patch24
-rw-r--r--pkgs/applications/misc/termite/default.nix15
-rw-r--r--pkgs/applications/misc/termite/remove_ldflags_macos.patch25
-rw-r--r--pkgs/applications/misc/tilix/default.nix9
-rw-r--r--pkgs/applications/misc/toot/default.nix4
-rw-r--r--pkgs/applications/misc/tqsl/default.nix2
-rw-r--r--pkgs/applications/misc/tvbrowser/bin.nix56
-rw-r--r--pkgs/applications/misc/tzupdate/default.nix1
-rw-r--r--pkgs/applications/misc/udiskie/default.nix4
-rw-r--r--pkgs/applications/misc/unixcw/default.nix37
-rw-r--r--pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch677
-rw-r--r--pkgs/applications/misc/urh/default.nix4
-rw-r--r--pkgs/applications/misc/vcal/default.nix4
-rw-r--r--pkgs/applications/misc/verbiste/default.nix2
-rw-r--r--pkgs/applications/misc/vym/default.nix12
-rw-r--r--pkgs/applications/misc/welle-io/default.nix2
-rw-r--r--pkgs/applications/misc/wikicurses/default.nix23
-rw-r--r--pkgs/applications/misc/wsjtx/default.nix4
-rw-r--r--pkgs/applications/misc/xmr-stak/default.nix4
-rw-r--r--pkgs/applications/misc/xmrig/default.nix4
-rw-r--r--pkgs/applications/misc/xmrig/proxy.nix4
-rw-r--r--pkgs/applications/misc/xneur/0.8.nix2
-rw-r--r--pkgs/applications/misc/xneur/default.nix2
-rw-r--r--pkgs/applications/misc/xscope/default.nix24
-rw-r--r--pkgs/applications/misc/xtermcontrol/default.nix2
-rw-r--r--pkgs/applications/misc/yubioath-desktop/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix10
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix3
-rw-r--r--pkgs/applications/networking/browsers/chromium/plugins.nix7
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix18
-rw-r--r--pkgs/applications/networking/browsers/dillo/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch35
-rw-r--r--pkgs/applications/networking/browsers/eolie/default.nix70
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix796
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix796
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix786
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix25
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix57
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix10
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix10
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix6
-rw-r--r--pkgs/applications/networking/browsers/opera/default.nix11
-rw-r--r--pkgs/applications/networking/browsers/qutebrowser/default.nix16
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle/default.nix2
-rw-r--r--pkgs/applications/networking/charles/default.nix48
-rw-r--r--pkgs/applications/networking/cluster/flink/default.nix12
-rw-r--r--pkgs/applications/networking/cluster/hadoop/default.nix187
-rw-r--r--pkgs/applications/networking/cluster/helm/default.nix8
-rw-r--r--pkgs/applications/networking/cluster/helmfile/default.nix14
-rw-r--r--pkgs/applications/networking/cluster/heptio-ark/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/hetzner-kube/default.nix24
-rw-r--r--pkgs/applications/networking/cluster/kanif/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/kontemplate/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/kubernetes/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/minikube/default.nix18
-rw-r--r--pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock8
-rw-r--r--pkgs/applications/networking/cluster/terraform-landscape/gemset.nix16
-rw-r--r--pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/terraform/providers/data.nix140
-rwxr-xr-xpkgs/applications/networking/cluster/terraform/providers/update-all2
-rw-r--r--pkgs/applications/networking/dropbox/default.nix2
-rw-r--r--pkgs/applications/networking/esniper/default.nix2
-rw-r--r--pkgs/applications/networking/feedreaders/newsboat/default.nix4
-rw-r--r--pkgs/applications/networking/flent/default.nix7
-rw-r--r--pkgs/applications/networking/flent/http-getter.nix23
-rw-r--r--pkgs/applications/networking/flexget/default.nix11
-rw-r--r--pkgs/applications/networking/gmailieer/default.nix4
-rw-r--r--pkgs/applications/networking/gns3/default.nix6
-rw-r--r--pkgs/applications/networking/ids/bro/default.nix2
-rw-r--r--pkgs/applications/networking/ids/daq/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/baresip/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/dino/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/gomuks/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/hipchat/default.nix22
-rw-r--r--pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix81
-rw-r--r--pkgs/applications/networking/instant-messengers/mcabber/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/qtox/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/quaternion/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/bare.nix11
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/default.nix5
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch19
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch35
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/riot/riot-web.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/signal-desktop/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix9
-rw-r--r--pkgs/applications/networking/instant-messengers/slack/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/teamspeak/client.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/viber/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/wire-desktop/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/zoom-us/default.nix139
-rwxr-xr-xpkgs/applications/networking/instant-messengers/zoom-us/update.sh7
-rw-r--r--pkgs/applications/networking/irc/chatzilla/default.nix2
-rw-r--r--pkgs/applications/networking/irc/konversation/default.nix8
-rw-r--r--pkgs/applications/networking/irc/quassel/default.nix2
-rw-r--r--pkgs/applications/networking/irc/quassel/qt5_11.patch72
-rw-r--r--pkgs/applications/networking/irc/weechat/default.nix2
-rw-r--r--pkgs/applications/networking/jmeter/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/balsa/default.nix4
-rw-r--r--pkgs/applications/networking/mailreaders/claws-mail/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/neomutt/default.nix6
-rw-r--r--pkgs/applications/networking/mailreaders/notmuch/default.nix6
-rw-r--r--pkgs/applications/networking/mailreaders/sylpheed/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix474
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/default.nix4
-rw-r--r--pkgs/applications/networking/mumble/default.nix14
-rw-r--r--pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch157
-rw-r--r--pkgs/applications/networking/newsreaders/quiterss/default.nix9
-rw-r--r--pkgs/applications/networking/ostinato/default.nix2
-rw-r--r--pkgs/applications/networking/owamp/default.nix28
-rw-r--r--pkgs/applications/networking/p2p/deluge/default.nix13
-rw-r--r--pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix6
-rw-r--r--pkgs/applications/networking/p2p/ktorrent/default.nix20
-rw-r--r--pkgs/applications/networking/p2p/ncdc/default.nix2
-rw-r--r--pkgs/applications/networking/p2p/synapse-bt/default.nix4
-rw-r--r--pkgs/applications/networking/p2p/twister/default.nix6
-rw-r--r--pkgs/applications/networking/remote/anydesk/default.nix40
-rw-r--r--pkgs/applications/networking/remote/citrix-receiver/default.nix27
-rw-r--r--pkgs/applications/networking/remote/remmina/default.nix18
-rw-r--r--pkgs/applications/networking/remote/x2goclient/default.nix10
-rw-r--r--pkgs/applications/networking/remote/x2goclient/qt511.patch15
-rw-r--r--pkgs/applications/networking/remote/xrdp/default.nix8
-rw-r--r--pkgs/applications/networking/seafile-client/default.nix4
-rw-r--r--pkgs/applications/networking/sniffers/etherape/default.nix12
-rw-r--r--pkgs/applications/networking/sniffers/kismet/default.nix2
-rw-r--r--pkgs/applications/networking/sniffers/wireshark/default.nix12
-rw-r--r--pkgs/applications/networking/soapui/default.nix51
-rw-r--r--pkgs/applications/networking/ssb/patchwork-classic/default.nix106
-rw-r--r--pkgs/applications/networking/super-productivity/default.nix105
-rw-r--r--pkgs/applications/networking/sync/casync/default.nix52
-rw-r--r--pkgs/applications/networking/sync/rclone/default.nix6
-rw-r--r--pkgs/applications/networking/syncplay/default.nix15
-rw-r--r--pkgs/applications/networking/syncthing-gtk/default.nix22
-rw-r--r--pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch77
-rw-r--r--pkgs/applications/networking/vnstat/default.nix4
-rw-r--r--pkgs/applications/networking/znc/default.nix4
-rw-r--r--pkgs/applications/office/autokey/default.nix38
-rw-r--r--pkgs/applications/office/autokey/remove-requires-dbus-python.patch11
-rw-r--r--pkgs/applications/office/calligra/default.nix2
-rw-r--r--pkgs/applications/office/calligra/qt5_11.patch98
-rw-r--r--pkgs/applications/office/cb2bib/default.nix2
-rw-r--r--pkgs/applications/office/fava/default.nix2
-rw-r--r--pkgs/applications/office/gnucash/default.nix10
-rw-r--r--pkgs/applications/office/grisbi/default.nix4
-rw-r--r--pkgs/applications/office/kmymoney/default.nix8
-rw-r--r--pkgs/applications/office/ledger/default.nix5
-rw-r--r--pkgs/applications/office/libreoffice/default-primary-src.nix4
-rw-r--r--pkgs/applications/office/libreoffice/default.nix12
-rw-r--r--pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix10
-rw-r--r--pkgs/applications/office/libreoffice/libreoffice-srcs.nix24
-rw-r--r--pkgs/applications/office/libreoffice/still-primary-src.nix4
-rw-r--r--pkgs/applications/office/libreoffice/still.nix12
-rw-r--r--pkgs/applications/office/marp/default.nix4
-rw-r--r--pkgs/applications/office/mendeley/default.nix6
-rw-r--r--pkgs/applications/office/mytetra/default.nix4
-rw-r--r--pkgs/applications/office/osmo/default.nix4
-rw-r--r--pkgs/applications/office/scribus/default.nix2
-rw-r--r--pkgs/applications/office/zotero/default.nix1
-rw-r--r--pkgs/applications/science/astronomy/gildas/clang.patch22
-rw-r--r--pkgs/applications/science/astronomy/gildas/default.nix68
-rw-r--r--pkgs/applications/science/astronomy/gildas/return-error-code.patch13
-rw-r--r--pkgs/applications/science/astronomy/gildas/wrapper.patch19
-rw-r--r--pkgs/applications/science/astronomy/gravit/default.nix5
-rw-r--r--pkgs/applications/science/astronomy/stellarium/default.nix21
-rw-r--r--pkgs/applications/science/biology/hmmer/default.nix28
-rw-r--r--pkgs/applications/science/biology/igv/default.nix6
-rw-r--r--pkgs/applications/science/biology/iv/default.nix2
-rw-r--r--pkgs/applications/science/biology/mosdepth/default.nix42
-rw-r--r--pkgs/applications/science/biology/neuron/default.nix2
-rw-r--r--pkgs/applications/science/biology/picard-tools/default.nix4
-rw-r--r--pkgs/applications/science/biology/raxml/default.nix4
-rw-r--r--pkgs/applications/science/chemistry/jmol/default.nix11
-rw-r--r--pkgs/applications/science/chemistry/octopus/default.nix10
-rw-r--r--pkgs/applications/science/electronics/kicad/unstable.nix9
-rw-r--r--pkgs/applications/science/electronics/librepcb/default.nix14
-rw-r--r--pkgs/applications/science/electronics/librepcb/fix-2017-12.patch29
-rw-r--r--pkgs/applications/science/electronics/ngspice/default.nix11
-rw-r--r--pkgs/applications/science/electronics/verilator/default.nix8
-rw-r--r--pkgs/applications/science/electronics/xcircuit/default.nix31
-rw-r--r--pkgs/applications/science/logic/abc/default.nix21
-rw-r--r--pkgs/applications/science/logic/celf/default.nix2
-rw-r--r--pkgs/applications/science/logic/coq/8.3.nix2
-rw-r--r--pkgs/applications/science/logic/coq/8.4.nix2
-rw-r--r--pkgs/applications/science/logic/coq/default.nix1
-rw-r--r--pkgs/applications/science/logic/cvc4/default.nix12
-rw-r--r--pkgs/applications/science/logic/eprover/default.nix10
-rw-r--r--pkgs/applications/science/logic/isabelle/default.nix2
-rw-r--r--pkgs/applications/science/logic/leo2/default.nix2
-rw-r--r--pkgs/applications/science/logic/mcrl2/default.nix4
-rw-r--r--pkgs/applications/science/logic/monosat/default.nix67
-rw-r--r--pkgs/applications/science/logic/poly/default.nix23
-rw-r--r--pkgs/applications/science/logic/potassco/clingo.nix4
-rw-r--r--pkgs/applications/science/logic/prooftree/default.nix2
-rw-r--r--pkgs/applications/science/logic/prover9/default.nix2
-rw-r--r--pkgs/applications/science/logic/satallax/default.nix2
-rw-r--r--pkgs/applications/science/logic/vampire/default.nix59
-rw-r--r--pkgs/applications/science/logic/workcraft/default.nix2
-rw-r--r--pkgs/applications/science/logic/yices/default.nix10
-rw-r--r--pkgs/applications/science/logic/z3/default.nix14
-rw-r--r--pkgs/applications/science/math/R/default.nix9
-rw-r--r--pkgs/applications/science/math/bliss/default.nix37
-rw-r--r--pkgs/applications/science/math/cbc/default.nix2
-rw-r--r--pkgs/applications/science/math/csdp/default.nix2
-rw-r--r--pkgs/applications/science/math/fricas/default.nix4
-rw-r--r--pkgs/applications/science/math/geogebra/default.nix6
-rw-r--r--pkgs/applications/science/math/glsurf/default.nix2
-rw-r--r--pkgs/applications/science/math/hmetis/default.nix42
-rw-r--r--pkgs/applications/science/math/palp/default.nix19
-rw-r--r--pkgs/applications/science/math/pari/default.nix2
-rw-r--r--pkgs/applications/science/math/pari/gp2c.nix2
-rw-r--r--pkgs/applications/science/math/pynac/default.nix4
-rw-r--r--pkgs/applications/science/math/qalculate-gtk/default.nix12
-rw-r--r--pkgs/applications/science/math/sage/README.md117
-rw-r--r--pkgs/applications/science/math/sage/default.nix413
-rw-r--r--pkgs/applications/science/math/sage/env-locations.nix46
-rw-r--r--pkgs/applications/science/math/sage/env.patch22
-rwxr-xr-xpkgs/applications/science/math/sage/fetch-mirrors.sh11
-rw-r--r--pkgs/applications/science/math/sage/flask-oldsessions.nix36
-rw-r--r--pkgs/applications/science/math/sage/flask-openid.nix28
-rw-r--r--pkgs/applications/science/math/sage/openblas-pc.nix18
-rw-r--r--pkgs/applications/science/math/sage/patchSageShebangs.sh51
-rw-r--r--pkgs/applications/science/math/sage/patches/arb-2.13.0.patch427
-rw-r--r--pkgs/applications/science/math/sage/patches/dochtml-optional.patch127
-rw-r--r--pkgs/applications/science/math/sage/patches/eclib-regulator-precision.patch98
-rw-r--r--pkgs/applications/science/math/sage/patches/matplotlib-normed-deprecated.patch12
-rw-r--r--pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch48
-rw-r--r--pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch812
-rw-r--r--pkgs/applications/science/math/sage/patches/pari-stackwarn.patch20
-rw-r--r--pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch479
-rw-r--r--pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch28
-rw-r--r--pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch40
-rw-r--r--pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch14
-rw-r--r--pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch31
-rw-r--r--pkgs/applications/science/math/sage/patches/sphinx-1.7.patch62
-rw-r--r--pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch31
-rw-r--r--pkgs/applications/science/math/sage/patches/zn_poly_version.patch13
-rw-r--r--pkgs/applications/science/math/sage/pybrial.nix29
-rw-r--r--pkgs/applications/science/math/sage/python-openid.nix42
-rw-r--r--pkgs/applications/science/math/sage/sage-env.nix162
-rw-r--r--pkgs/applications/science/math/sage/sage-src.nix204
-rw-r--r--pkgs/applications/science/math/sage/sage-with-env.nix129
-rw-r--r--pkgs/applications/science/math/sage/sage-wrapper.nix41
-rw-r--r--pkgs/applications/science/math/sage/sage.nix32
-rw-r--r--pkgs/applications/science/math/sage/sagedoc.nix97
-rw-r--r--pkgs/applications/science/math/sage/sagelib.nix139
-rw-r--r--pkgs/applications/science/math/sage/sagenb.nix57
-rw-r--r--pkgs/applications/science/math/sage/shebangs.patch36
-rw-r--r--pkgs/applications/science/math/sage/spkg-giac.patch20
-rw-r--r--pkgs/applications/science/math/sage/spkg-git.patch18
-rw-r--r--pkgs/applications/science/math/sage/spkg-python.patch13
-rw-r--r--pkgs/applications/science/math/sage/spkg-singular.patch18
-rw-r--r--pkgs/applications/science/math/scilab-bin/default.nix2
-rw-r--r--pkgs/applications/science/math/scilab/default.nix2
-rw-r--r--pkgs/applications/science/math/scotch/default.nix2
-rw-r--r--pkgs/applications/science/math/symmetrica/default.nix23
-rw-r--r--pkgs/applications/science/misc/golly/default.nix4
-rw-r--r--pkgs/applications/science/misc/openmvg/default.nix4
-rw-r--r--pkgs/applications/science/misc/openmvs/default.nix18
-rw-r--r--pkgs/applications/science/molecular-dynamics/gromacs/default.nix6
-rw-r--r--pkgs/applications/science/physics/sacrifice/default.nix2
-rw-r--r--pkgs/applications/science/physics/sherpa/default.nix2
-rw-r--r--pkgs/applications/science/programming/scyther/default.nix6
-rw-r--r--pkgs/applications/science/robotics/gazebo/default.nix2
-rw-r--r--pkgs/applications/search/recoll/default.nix14
-rw-r--r--pkgs/applications/version-management/git-and-tools/cgit/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-secret/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-sync/default.nix45
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix1
-rw-r--r--pkgs/applications/version-management/git-and-tools/hub/default.nix39
-rw-r--r--pkgs/applications/version-management/git-and-tools/tig/default.nix5
-rw-r--r--pkgs/applications/version-management/gitaly/default.nix2
-rw-r--r--pkgs/applications/version-management/gitea/default.nix4
-rw-r--r--pkgs/applications/version-management/gitkraken/default.nix4
-rw-r--r--pkgs/applications/version-management/gource/default.nix4
-rw-r--r--pkgs/applications/version-management/meld/default.nix4
-rw-r--r--pkgs/applications/version-management/p4v/default.nix2
-rw-r--r--pkgs/applications/version-management/redmine/default.nix2
-rw-r--r--pkgs/applications/version-management/sit/aarch64-isel.patch9
-rw-r--r--pkgs/applications/version-management/sit/default.nix21
-rw-r--r--pkgs/applications/version-management/srcml/default.nix2
-rw-r--r--pkgs/applications/version-management/tailor/default.nix2
-rw-r--r--pkgs/applications/video/avidemux/default.nix28
-rw-r--r--pkgs/applications/video/dvb-apps/default.nix2
-rw-r--r--pkgs/applications/video/mkvtoolnix/default.nix4
-rw-r--r--pkgs/applications/video/mpv/default.nix18
-rw-r--r--pkgs/applications/video/obs-studio/linuxbrowser.nix4
-rw-r--r--pkgs/applications/video/openshot-qt/default.nix4
-rw-r--r--pkgs/applications/video/openshot-qt/libopenshot-audio.nix4
-rw-r--r--pkgs/applications/video/openshot-qt/libopenshot.nix4
-rw-r--r--pkgs/applications/video/shotcut/default.nix13
-rw-r--r--pkgs/applications/video/smplayer/default.nix4
-rw-r--r--pkgs/applications/video/streamlink/default.nix8
-rw-r--r--pkgs/applications/video/vlc/default.nix4
-rw-r--r--pkgs/applications/video/xawtv/default.nix6
-rw-r--r--pkgs/applications/virtualization/containerd/default.nix4
-rw-r--r--pkgs/applications/virtualization/docker/default.nix2
-rw-r--r--pkgs/applications/virtualization/ecs-agent/default.nix4
-rw-r--r--pkgs/applications/virtualization/looking-glass-client/default.nix8
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix10
-rw-r--r--pkgs/applications/virtualization/rancher-compose/default.nix44
-rw-r--r--pkgs/applications/virtualization/singularity/default.nix4
-rw-r--r--pkgs/applications/virtualization/spice-vdagent/default.nix6
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix19
-rw-r--r--pkgs/applications/window-managers/dwm/dwm-status.nix32
-rw-r--r--pkgs/applications/window-managers/fvwm/default.nix4
-rw-r--r--pkgs/applications/window-managers/herbstluftwm/default.nix2
-rw-r--r--pkgs/applications/window-managers/i3/easyfocus.nix32
-rw-r--r--pkgs/applications/window-managers/i3/gaps.nix8
-rw-r--r--pkgs/applications/window-managers/i3/i3ipc-glib.nix34
-rw-r--r--pkgs/applications/window-managers/i3/lock-color.nix2
-rw-r--r--pkgs/applications/window-managers/i3/status-rust.nix8
-rw-r--r--pkgs/applications/window-managers/matchbox/default.nix2
-rw-r--r--pkgs/applications/window-managers/sawfish/default.nix2
-rw-r--r--pkgs/applications/window-managers/weston/default.nix4
-rw-r--r--pkgs/applications/window-managers/yabar/build.nix4
-rw-r--r--pkgs/applications/window-managers/yabar/default.nix14
-rw-r--r--pkgs/build-support/bintools-wrapper/setup-hook.sh2
-rw-r--r--pkgs/build-support/build-bazel-package/default.nix12
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix6
-rw-r--r--pkgs/build-support/cc-wrapper/setup-hook.sh2
-rw-r--r--pkgs/build-support/docker/default.nix13
-rw-r--r--pkgs/build-support/docker/examples.nix5
-rwxr-xr-xpkgs/build-support/fetchgit/nix-prefetch-git2
-rw-r--r--pkgs/build-support/fetchurl/builder.sh26
-rw-r--r--pkgs/build-support/fetchurl/default.nix4
-rw-r--r--pkgs/build-support/fetchurl/mirrors.nix73
-rw-r--r--pkgs/build-support/rust/build-rust-crate.nix8
-rw-r--r--pkgs/build-support/setup-hooks/prune-libtool-files.sh22
-rw-r--r--pkgs/build-support/singularity-tools/default.nix2
-rw-r--r--pkgs/build-support/trivial-builders.nix19
-rw-r--r--pkgs/build-support/vm/default.nix22
-rw-r--r--pkgs/build-support/vsenv/build-solution.nix18
-rw-r--r--pkgs/build-support/vsenv/default.nix7
-rw-r--r--pkgs/data/fonts/babelstone-han/default.nix4
-rw-r--r--pkgs/data/fonts/clearlyU/default.nix2
-rw-r--r--pkgs/data/fonts/fira-mono/default.nix8
-rw-r--r--pkgs/data/fonts/fira/default.nix8
-rw-r--r--pkgs/data/fonts/font-awesome-5/default.nix4
-rw-r--r--pkgs/data/fonts/proggyfonts/default.nix2
-rw-r--r--pkgs/data/fonts/source-han-code-jp/default.nix25
-rw-r--r--pkgs/data/icons/arc-icon-theme/default.nix3
-rw-r--r--pkgs/data/icons/faba-icon-theme/default.nix14
-rw-r--r--pkgs/data/icons/faba-mono-icons/default.nix3
-rw-r--r--pkgs/data/icons/hicolor-icon-theme/default.nix2
-rw-r--r--pkgs/data/icons/moka-icon-theme/default.nix15
-rw-r--r--pkgs/data/icons/paper-icon-theme/default.nix19
-rw-r--r--pkgs/data/misc/brise/default.nix2
-rw-r--r--pkgs/data/misc/combinatorial_designs/default.nix31
-rw-r--r--pkgs/data/misc/conway_polynomials/default.nix43
-rw-r--r--pkgs/data/misc/elliptic_curves/default.nix51
-rw-r--r--pkgs/data/misc/freepats/default.nix2
-rw-r--r--pkgs/data/misc/graphs/default.nix26
-rw-r--r--pkgs/data/misc/hackage/default.nix4
-rw-r--r--pkgs/data/misc/iana-etc/default.nix4
-rw-r--r--pkgs/data/misc/pari-galdata/default.nix26
-rw-r--r--pkgs/data/misc/pari-seadata-small/default.nix26
-rw-r--r--pkgs/data/misc/polytopes_db/default.nix26
-rw-r--r--pkgs/data/misc/poppler-data/default.nix2
-rw-r--r--pkgs/desktops/deepin/deepin-terminal/default.nix13
-rw-r--r--pkgs/desktops/gnome-3/apps/bijiben/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/apps/evolution/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/apps/gnome-documents/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/apps/gnome-logs/default.nix28
-rw-r--r--pkgs/desktops/gnome-3/core/epiphany/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/core/evolution-data-server/default.nix15
-rw-r--r--pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch11
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-calculator/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/core/grilo/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/core/gucharmap/default.nix54
-rw-r--r--pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix29
-rw-r--r--pkgs/desktops/gnome-3/core/libgweather/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix8
-rw-r--r--pkgs/desktops/gnome-3/core/totem/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/core/tracker-miners/default.nix29
-rw-r--r--pkgs/desktops/gnome-3/core/tracker/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/default.nix23
-rw-r--r--pkgs/desktops/gnome-3/misc/geary/default.nix4
-rw-r--r--pkgs/desktops/lxqt/base/libsysstat/default.nix4
-rw-r--r--pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix10
-rw-r--r--pkgs/desktops/lxqt/core/libfm-qt/default.nix4
-rw-r--r--pkgs/desktops/lxqt/core/lxqt-l10n/default.nix4
-rw-r--r--pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix4
-rw-r--r--pkgs/desktops/lxqt/core/lxqt-themes/default.nix4
-rw-r--r--pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix6
-rw-r--r--pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix4
-rw-r--r--pkgs/desktops/lxqt/core/qtermwidget/default.nix4
-rw-r--r--pkgs/desktops/lxqt/optional/compton-conf/default.nix4
-rw-r--r--pkgs/desktops/lxqt/optional/lximage-qt/default.nix4
-rw-r--r--pkgs/desktops/lxqt/optional/obconf-qt/default.nix4
-rw-r--r--pkgs/desktops/lxqt/optional/qterminal/default.nix4
-rw-r--r--pkgs/desktops/mate/caja-extensions/default.nix4
-rw-r--r--pkgs/desktops/mate/caja/default.nix4
-rw-r--r--pkgs/desktops/mate/engrampa/default.nix4
-rw-r--r--pkgs/desktops/mate/eom/default.nix4
-rw-r--r--pkgs/desktops/mate/libmatekbd/default.nix4
-rw-r--r--pkgs/desktops/mate/libmatemixer/default.nix4
-rw-r--r--pkgs/desktops/mate/libmateweather/default.nix4
-rw-r--r--pkgs/desktops/mate/marco/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-calc/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-control-center/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-desktop/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-icon-theme/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-indicator-applet/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-media/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-menus/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-netbook/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-notification-daemon/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-polkit/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-power-manager/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-screensaver/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-sensors-applet/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-session-manager/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-settings-daemon/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-system-monitor/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-terminal/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-user-guide/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-user-share/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-utils/default.nix4
-rw-r--r--pkgs/desktops/mate/mozo/default.nix4
-rw-r--r--pkgs/desktops/mate/pluma/default.nix4
-rw-r--r--pkgs/desktops/plasma-5/bluedevil.nix4
-rw-r--r--pkgs/desktops/plasma-5/default.nix1
-rw-r--r--pkgs/desktops/plasma-5/fetch.sh2
-rw-r--r--pkgs/desktops/plasma-5/kactivitymanagerd.nix4
-rw-r--r--pkgs/desktops/plasma-5/kde-cli-tools.nix4
-rw-r--r--pkgs/desktops/plasma-5/kdecoration.nix4
-rw-r--r--pkgs/desktops/plasma-5/kdeplasma-addons.nix4
-rw-r--r--pkgs/desktops/plasma-5/kscreen.nix6
-rw-r--r--pkgs/desktops/plasma-5/kwin/default.nix8
-rw-r--r--pkgs/desktops/plasma-5/plasma-browser-integration.nix11
-rw-r--r--pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch41
-rw-r--r--pkgs/desktops/plasma-5/plasma-desktop/series1
-rw-r--r--pkgs/desktops/plasma-5/plasma-vault/default.nix2
-rw-r--r--pkgs/desktops/plasma-5/plasma-workspace/default.nix20
-rw-r--r--pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch157
-rw-r--r--pkgs/desktops/plasma-5/srcs.nix360
-rw-r--r--pkgs/desktops/plasma-5/systemsettings.nix4
-rw-r--r--pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix4
-rw-r--r--pkgs/development/arduino/platformio/chrootenv.nix1
-rw-r--r--pkgs/development/arduino/platformio/core.nix4
-rw-r--r--pkgs/development/compilers/asn1c/default.nix2
-rw-r--r--pkgs/development/compilers/avian/default.nix2
-rw-r--r--pkgs/development/compilers/chicken/default.nix2
-rw-r--r--pkgs/development/compilers/clean/default.nix2
-rw-r--r--pkgs/development/compilers/closure/default.nix4
-rw-r--r--pkgs/development/compilers/colm/default.nix2
-rw-r--r--pkgs/development/compilers/crystal/default.nix20
-rw-r--r--pkgs/development/compilers/ecl/16.1.2.nix8
-rw-r--r--pkgs/development/compilers/fsharp/default.nix2
-rw-r--r--pkgs/development/compilers/fsharp41/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/7/default.nix3
-rw-r--r--pkgs/development/compilers/gforth/default.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.10.3-binary.nix5
-rw-r--r--pkgs/development/compilers/ghc/7.10.3.nix5
-rw-r--r--pkgs/development/compilers/ghc/8.0.2.nix5
-rw-r--r--pkgs/development/compilers/ghc/8.2.1-binary.nix19
-rw-r--r--pkgs/development/compilers/ghc/8.2.2.nix34
-rw-r--r--pkgs/development/compilers/ghc/8.4.3.nix38
-rw-r--r--pkgs/development/compilers/ghc/8.6.1.nix (renamed from pkgs/development/compilers/ghc/8.4.2.nix)54
-rw-r--r--pkgs/development/compilers/ghc/head.nix14
-rw-r--r--pkgs/development/compilers/ghcjs-ng/default.nix18
-rw-r--r--pkgs/development/compilers/ghcjs/base.nix4
-rw-r--r--pkgs/development/compilers/glslang/default.nix8
-rw-r--r--pkgs/development/compilers/go/1.10.nix6
-rw-r--r--pkgs/development/compilers/graalvm/default.nix145
-rw-r--r--pkgs/development/compilers/julia/0.6.nix8
-rw-r--r--pkgs/development/compilers/kotlin/default.nix4
-rw-r--r--pkgs/development/compilers/llvm/3.7/default.nix8
-rw-r--r--pkgs/development/compilers/llvm/3.7/libc++abi.nix3
-rw-r--r--pkgs/development/compilers/llvm/3.8/clang/default.nix5
-rw-r--r--pkgs/development/compilers/llvm/3.8/default.nix9
-rw-r--r--pkgs/development/compilers/llvm/3.8/libc++/default.nix13
-rw-r--r--pkgs/development/compilers/llvm/3.8/libc++abi.nix6
-rw-r--r--pkgs/development/compilers/llvm/3.8/llvm.nix23
-rw-r--r--pkgs/development/compilers/llvm/3.9/clang/default.nix2
-rw-r--r--pkgs/development/compilers/llvm/3.9/default.nix9
-rw-r--r--pkgs/development/compilers/llvm/3.9/libc++/default.nix18
-rw-r--r--pkgs/development/compilers/llvm/3.9/libc++abi.nix6
-rw-r--r--pkgs/development/compilers/llvm/3.9/llvm.nix19
-rw-r--r--pkgs/development/compilers/llvm/4/default.nix9
-rw-r--r--pkgs/development/compilers/llvm/4/libc++/default.nix2
-rw-r--r--pkgs/development/compilers/llvm/4/libc++abi.nix2
-rw-r--r--pkgs/development/compilers/llvm/4/llvm.nix15
-rw-r--r--pkgs/development/compilers/llvm/5/clang/default.nix10
-rw-r--r--pkgs/development/compilers/llvm/5/compiler-rt.nix37
-rw-r--r--pkgs/development/compilers/llvm/5/default.nix43
-rw-r--r--pkgs/development/compilers/llvm/5/llvm.nix19
-rw-r--r--pkgs/development/compilers/llvm/6/compiler-rt.nix10
-rw-r--r--pkgs/development/compilers/llvm/6/default.nix47
-rw-r--r--pkgs/development/compilers/llvm/6/llvm.nix4
-rw-r--r--pkgs/development/compilers/llvm/dynamiclibrary-musl.patch (renamed from pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch)0
-rw-r--r--pkgs/development/compilers/llvm/libcxx-max_align_t.patch (renamed from pkgs/development/compilers/llvm/4/libc++/max_align_t.patch)0
-rw-r--r--pkgs/development/compilers/mercury/default.nix2
-rw-r--r--pkgs/development/compilers/mint/crystal2nix.cr15
-rw-r--r--pkgs/development/compilers/mint/default.nix10
-rw-r--r--pkgs/development/compilers/mint/shards.nix20
-rw-r--r--pkgs/development/compilers/mono/generic-cmake.nix2
-rw-r--r--pkgs/development/compilers/mono/generic.nix2
-rw-r--r--pkgs/development/compilers/nasm/default.nix4
-rw-r--r--pkgs/development/compilers/neko/default.nix2
-rw-r--r--pkgs/development/compilers/nim/default.nix2
-rw-r--r--pkgs/development/compilers/nvidia-cg-toolkit/default.nix2
-rw-r--r--pkgs/development/compilers/ocaml/3.10.0.nix2
-rw-r--r--pkgs/development/compilers/ocaml/3.11.2.nix2
-rw-r--r--pkgs/development/compilers/ocaml/3.12.1.nix2
-rw-r--r--pkgs/development/compilers/ocaml/4.00.1.nix2
-rw-r--r--pkgs/development/compilers/ocaml/4.07.nix4
-rw-r--r--pkgs/development/compilers/ocaml/ber-metaocaml-104.nix2
-rw-r--r--pkgs/development/compilers/opendylan/bin.nix2
-rw-r--r--pkgs/development/compilers/opendylan/default.nix2
-rw-r--r--pkgs/development/compilers/openjdk/10.nix4
-rw-r--r--pkgs/development/compilers/openjdk/8.nix4
-rw-r--r--pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch16
-rw-r--r--pkgs/development/compilers/osl/default.nix39
-rw-r--r--pkgs/development/compilers/pakcs/default.nix2
-rw-r--r--pkgs/development/compilers/polyml/5.6.nix2
-rw-r--r--pkgs/development/compilers/polyml/default.nix2
-rw-r--r--pkgs/development/compilers/ponyc/default.nix6
-rw-r--r--pkgs/development/compilers/ponyc/disable-tests.patch13
-rw-r--r--pkgs/development/compilers/ponyc/pony-stable.nix4
-rw-r--r--pkgs/development/compilers/rust/binaryBuild.nix2
-rw-r--r--pkgs/development/compilers/rust/bootstrap.nix14
-rw-r--r--pkgs/development/compilers/rust/default.nix16
-rw-r--r--pkgs/development/compilers/rust/rustc.nix2
-rw-r--r--pkgs/development/compilers/scala/2.10.nix4
-rw-r--r--pkgs/development/compilers/scala/2.11.nix4
-rw-r--r--pkgs/development/compilers/scala/default.nix4
-rw-r--r--pkgs/development/compilers/seexpr/default.nix23
-rw-r--r--pkgs/development/compilers/shaderc/default.nix46
-rw-r--r--pkgs/development/compilers/smlnj/default.nix2
-rw-r--r--pkgs/development/compilers/solc/default.nix24
-rw-r--r--pkgs/development/compilers/solc/patches/boost-shared-libs.patch24
-rw-r--r--pkgs/development/compilers/solc/patches/shared-libs-install.patch12
-rw-r--r--pkgs/development/compilers/vs90wrapper/default.nix9
-rw-r--r--pkgs/development/compilers/wcc/default.nix49
-rw-r--r--pkgs/development/compilers/yap/default.nix2
-rw-r--r--pkgs/development/compilers/yasm/default.nix2
-rw-r--r--pkgs/development/coq-modules/equations/default.nix16
-rw-r--r--pkgs/development/go-modules/generic/default.nix9
-rw-r--r--pkgs/development/guile-modules/guile-reader/default.nix46
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix185
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix10
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix9
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix10
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix406
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix47
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-head.nix10
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix18
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml2992
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix27
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix67
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix15044
-rw-r--r--pkgs/development/haskell-modules/lib.nix19
-rw-r--r--pkgs/development/haskell-modules/make-package-set.nix17
-rw-r--r--pkgs/development/haskell-modules/patches/lzma-tests.patch11
-rw-r--r--pkgs/development/haskell-modules/with-packages-wrapper.nix5
-rw-r--r--pkgs/development/idris-modules/array.nix10
-rw-r--r--pkgs/development/idris-modules/bi.nix11
-rw-r--r--pkgs/development/idris-modules/bifunctors.nix6
-rw-r--r--pkgs/development/idris-modules/build-builtin-package.nix3
-rw-r--r--pkgs/development/idris-modules/build-idris-package.nix38
-rw-r--r--pkgs/development/idris-modules/bytes.nix8
-rw-r--r--pkgs/development/idris-modules/canvas.nix5
-rw-r--r--pkgs/development/idris-modules/categories.nix15
-rw-r--r--pkgs/development/idris-modules/coda.nix6
-rw-r--r--pkgs/development/idris-modules/comonad.nix6
-rw-r--r--pkgs/development/idris-modules/composition.nix5
-rw-r--r--pkgs/development/idris-modules/config.nix5
-rw-r--r--pkgs/development/idris-modules/console.nix5
-rw-r--r--pkgs/development/idris-modules/containers.nix6
-rw-r--r--pkgs/development/idris-modules/cube.nix7
-rw-r--r--pkgs/development/idris-modules/curses.nix7
-rw-r--r--pkgs/development/idris-modules/data.nix5
-rw-r--r--pkgs/development/idris-modules/default.nix7
-rw-r--r--pkgs/development/idris-modules/derive.nix14
-rw-r--r--pkgs/development/idris-modules/descncrunch.nix6
-rw-r--r--pkgs/development/idris-modules/dict.nix5
-rw-r--r--pkgs/development/idris-modules/dom.nix5
-rw-r--r--pkgs/development/idris-modules/electron.nix6
-rw-r--r--pkgs/development/idris-modules/eternal.nix11
-rw-r--r--pkgs/development/idris-modules/farrp.nix5
-rw-r--r--pkgs/development/idris-modules/free.nix5
-rw-r--r--pkgs/development/idris-modules/fsm.nix6
-rw-r--r--pkgs/development/idris-modules/glfw.nix6
-rw-r--r--pkgs/development/idris-modules/graphviz.nix5
-rw-r--r--pkgs/development/idris-modules/hamt.nix5
-rw-r--r--pkgs/development/idris-modules/heyting-algebra.nix5
-rw-r--r--pkgs/development/idris-modules/hezarfen.nix6
-rw-r--r--pkgs/development/idris-modules/hrtime.nix5
-rw-r--r--pkgs/development/idris-modules/html.nix5
-rw-r--r--pkgs/development/idris-modules/http.nix5
-rw-r--r--pkgs/development/idris-modules/http4idris.nix6
-rw-r--r--pkgs/development/idris-modules/iaia.nix5
-rw-r--r--pkgs/development/idris-modules/idris-wrapper.nix16
-rw-r--r--pkgs/development/idris-modules/idrishighlighter.nix5
-rw-r--r--pkgs/development/idris-modules/idrisscript.nix6
-rw-r--r--pkgs/development/idris-modules/ipkgparser.nix5
-rw-r--r--pkgs/development/idris-modules/jheiling-extras.nix6
-rw-r--r--pkgs/development/idris-modules/jheiling-js.nix6
-rw-r--r--pkgs/development/idris-modules/js.nix5
-rw-r--r--pkgs/development/idris-modules/lens.nix6
-rw-r--r--pkgs/development/idris-modules/lightyear.nix7
-rw-r--r--pkgs/development/idris-modules/logic.nix5
-rw-r--r--pkgs/development/idris-modules/mapping.nix6
-rw-r--r--pkgs/development/idris-modules/mhd.nix6
-rw-r--r--pkgs/development/idris-modules/pacman.nix5
-rw-r--r--pkgs/development/idris-modules/patricia.nix5
-rw-r--r--pkgs/development/idris-modules/permutations.nix6
-rw-r--r--pkgs/development/idris-modules/pfds.nix5
-rw-r--r--pkgs/development/idris-modules/pipes.nix6
-rw-r--r--pkgs/development/idris-modules/posix.nix6
-rw-r--r--pkgs/development/idris-modules/protobuf.nix5
-rw-r--r--pkgs/development/idris-modules/rationals.nix8
-rw-r--r--pkgs/development/idris-modules/recursion_schemes.nix5
-rw-r--r--pkgs/development/idris-modules/refined.nix6
-rw-r--r--pkgs/development/idris-modules/sdl.nix10
-rw-r--r--pkgs/development/idris-modules/sdl2.nix10
-rw-r--r--pkgs/development/idris-modules/semidirect.nix11
-rw-r--r--pkgs/development/idris-modules/setoids.nix12
-rw-r--r--pkgs/development/idris-modules/smproc.nix6
-rw-r--r--pkgs/development/idris-modules/snippets.nix5
-rw-r--r--pkgs/development/idris-modules/software_foundations.nix5
-rw-r--r--pkgs/development/idris-modules/specdris.nix13
-rw-r--r--pkgs/development/idris-modules/tap.nix5
-rw-r--r--pkgs/development/idris-modules/test.nix7
-rw-r--r--pkgs/development/idris-modules/tlhydra.nix6
-rw-r--r--pkgs/development/idris-modules/tomladris.nix6
-rw-r--r--pkgs/development/idris-modules/tp.nix6
-rw-r--r--pkgs/development/idris-modules/tparsec.nix12
-rw-r--r--pkgs/development/idris-modules/transducers.nix6
-rw-r--r--pkgs/development/idris-modules/trees.nix5
-rw-r--r--pkgs/development/idris-modules/union_type.nix6
-rw-r--r--pkgs/development/idris-modules/vdom.nix6
-rw-r--r--pkgs/development/idris-modules/vecspace.nix5
-rw-r--r--pkgs/development/idris-modules/webgl.nix5
-rw-r--r--pkgs/development/idris-modules/with-packages.nix2
-rw-r--r--pkgs/development/idris-modules/wl-pprint.nix6
-rw-r--r--pkgs/development/idris-modules/wyvern.nix5
-rw-r--r--pkgs/development/idris-modules/xhr.nix5
-rw-r--r--pkgs/development/idris-modules/yaml.nix5
-rw-r--r--pkgs/development/idris-modules/yampa.nix5
-rw-r--r--pkgs/development/interpreters/erlang/R20.nix4
-rw-r--r--pkgs/development/interpreters/erlang/R21.nix10
-rw-r--r--pkgs/development/interpreters/gauche/default.nix16
-rw-r--r--pkgs/development/interpreters/joker/default.nix4
-rw-r--r--pkgs/development/interpreters/lua-4/default.nix2
-rw-r--r--pkgs/development/interpreters/lua-5/5.0.3.nix2
-rw-r--r--pkgs/development/interpreters/lua-5/5.1.nix2
-rw-r--r--pkgs/development/interpreters/lua-5/5.2.nix2
-rw-r--r--pkgs/development/interpreters/lua-5/5.3.nix1
-rw-r--r--pkgs/development/interpreters/luajit/default.nix12
-rw-r--r--pkgs/development/interpreters/perl/default.nix7
-rw-r--r--pkgs/development/interpreters/php/default.nix8
-rw-r--r--pkgs/development/interpreters/picolisp/default.nix3
-rw-r--r--pkgs/development/interpreters/pyrex/0.9.5.nix2
-rw-r--r--pkgs/development/interpreters/pyrex/0.9.6.nix2
-rw-r--r--pkgs/development/interpreters/python/cpython/2.7/default.nix18
-rw-r--r--pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch62
-rw-r--r--pkgs/development/interpreters/python/cpython/3.6/default.nix2
-rw-r--r--pkgs/development/interpreters/python/cpython/3.7/default.nix185
-rw-r--r--pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch100
-rw-r--r--pkgs/development/interpreters/rakudo/default.nix2
-rw-r--r--pkgs/development/interpreters/rascal/default.nix4
-rw-r--r--pkgs/development/interpreters/red/default.nix2
-rw-r--r--pkgs/development/interpreters/renpy/default.nix2
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.5.nix2
-rw-r--r--pkgs/development/interpreters/spidermonkey/17.nix14
-rw-r--r--pkgs/development/interpreters/spidermonkey/52.nix4
-rw-r--r--pkgs/development/java-modules/jogl/default.nix10
-rw-r--r--pkgs/development/libraries/CoinMP/default.nix2
-rw-r--r--pkgs/development/libraries/SDL/default.nix2
-rw-r--r--pkgs/development/libraries/SDL2/default.nix41
-rw-r--r--pkgs/development/libraries/SDL2_image/default.nix2
-rw-r--r--pkgs/development/libraries/SDL2_mixer/default.nix2
-rw-r--r--pkgs/development/libraries/SDL2_net/default.nix2
-rw-r--r--pkgs/development/libraries/SDL_gfx/default.nix2
-rw-r--r--pkgs/development/libraries/SDL_image/default.nix2
-rw-r--r--pkgs/development/libraries/SDL_sound/default.nix2
-rw-r--r--pkgs/development/libraries/SDL_ttf/default.nix2
-rw-r--r--pkgs/development/libraries/Xaw3d/default.nix6
-rw-r--r--pkgs/development/libraries/ace/default.nix4
-rw-r--r--pkgs/development/libraries/adns/default.nix2
-rw-r--r--pkgs/development/libraries/agda/agda-stdlib/default.nix1
-rw-r--r--pkgs/development/libraries/allegro/5.nix2
-rw-r--r--pkgs/development/libraries/allegro/default.nix2
-rw-r--r--pkgs/development/libraries/amtk/default.nix40
-rw-r--r--pkgs/development/libraries/appstream-glib/default.nix4
-rw-r--r--pkgs/development/libraries/arb/default.nix10
-rw-r--r--pkgs/development/libraries/armadillo/default.nix4
-rw-r--r--pkgs/development/libraries/asio/1.10.nix6
-rw-r--r--pkgs/development/libraries/asio/1.12.nix6
-rw-r--r--pkgs/development/libraries/asio/default.nix21
-rw-r--r--pkgs/development/libraries/asio/generic.nix25
-rw-r--r--pkgs/development/libraries/at-spi2-atk/default.nix43
-rw-r--r--pkgs/development/libraries/at-spi2-core/default.nix49
-rw-r--r--pkgs/development/libraries/aubio/default.nix2
-rw-r--r--pkgs/development/libraries/audio/libbass/default.nix2
-rw-r--r--pkgs/development/libraries/audio/lilv/default.nix2
-rw-r--r--pkgs/development/libraries/audio/rtaudio/default.nix2
-rw-r--r--pkgs/development/libraries/audio/rtmidi/default.nix2
-rw-r--r--pkgs/development/libraries/audio/sratom/default.nix2
-rw-r--r--pkgs/development/libraries/audio/suil/default.nix2
-rw-r--r--pkgs/development/libraries/audio/zita-convolver/default.nix4
-rw-r--r--pkgs/development/libraries/audiofile/default.nix2
-rw-r--r--pkgs/development/libraries/aws-sdk-cpp/default.nix4
-rw-r--r--pkgs/development/libraries/babl/default.nix6
-rw-r--r--pkgs/development/libraries/bamf/default.nix30
-rw-r--r--pkgs/development/libraries/boehm-gc/default.nix5
-rw-r--r--pkgs/development/libraries/boost/1.66.nix2
-rw-r--r--pkgs/development/libraries/boost/1.67.nix11
-rw-r--r--pkgs/development/libraries/boost/darwin-no-system-python.patch45
-rw-r--r--pkgs/development/libraries/boost/generic.nix37
-rw-r--r--pkgs/development/libraries/botan/2.0.nix4
-rw-r--r--pkgs/development/libraries/c-ares/default.nix2
-rw-r--r--pkgs/development/libraries/c-blosc/default.nix4
-rw-r--r--pkgs/development/libraries/cairo/default.nix2
-rw-r--r--pkgs/development/libraries/cairomm/default.nix2
-rw-r--r--pkgs/development/libraries/cctz/default.nix27
-rw-r--r--pkgs/development/libraries/ceres-solver/default.nix8
-rw-r--r--pkgs/development/libraries/clutter-gtk/default.nix7
-rw-r--r--pkgs/development/libraries/cpp-hocon/default.nix4
-rw-r--r--pkgs/development/libraries/cpp-netlib/default.nix2
-rw-r--r--pkgs/development/libraries/cppcms/default.nix4
-rw-r--r--pkgs/development/libraries/cppunit/default.nix2
-rw-r--r--pkgs/development/libraries/ctpl/default.nix2
-rw-r--r--pkgs/development/libraries/curlcpp/default.nix4
-rw-r--r--pkgs/development/libraries/cutelyst/default.nix45
-rw-r--r--pkgs/development/libraries/db/generic.nix2
-rw-r--r--pkgs/development/libraries/dbus/default.nix2
-rw-r--r--pkgs/development/libraries/dleyna-connector-dbus/default.nix2
-rw-r--r--pkgs/development/libraries/dleyna-core/default.nix2
-rw-r--r--pkgs/development/libraries/dleyna-renderer/default.nix2
-rw-r--r--pkgs/development/libraries/dleyna-server/default.nix2
-rw-r--r--pkgs/development/libraries/dlib/default.nix11
-rw-r--r--pkgs/development/libraries/eccodes/default.nix4
-rw-r--r--pkgs/development/libraries/editline/default.nix24
-rw-r--r--pkgs/development/libraries/eigen/2.0.nix2
-rw-r--r--pkgs/development/libraries/eigen/3.3.nix2
-rw-r--r--pkgs/development/libraries/eigen/default.nix2
-rw-r--r--pkgs/development/libraries/embree/2.x.nix27
-rw-r--r--pkgs/development/libraries/eventlog/default.nix2
-rw-r--r--pkgs/development/libraries/exempi/default.nix2
-rw-r--r--pkgs/development/libraries/ffmpeg/2.8.nix4
-rw-r--r--pkgs/development/libraries/fftw/default.nix5
-rw-r--r--pkgs/development/libraries/flatpak/default.nix4
-rw-r--r--pkgs/development/libraries/flatpak/fix-test-paths.patch57
-rw-r--r--pkgs/development/libraries/fltk/default.nix56
-rw-r--r--pkgs/development/libraries/folly/default.nix4
-rw-r--r--pkgs/development/libraries/fribidi/default.nix28
-rw-r--r--pkgs/development/libraries/gdal/default.nix2
-rw-r--r--pkgs/development/libraries/gdal/gdal-1_11.nix2
-rw-r--r--pkgs/development/libraries/gdcm/default.nix4
-rw-r--r--pkgs/development/libraries/gegl/3.0.nix2
-rw-r--r--pkgs/development/libraries/gegl/4.0.nix6
-rw-r--r--pkgs/development/libraries/geoclue/2.0.nix2
-rw-r--r--pkgs/development/libraries/geos/default.nix2
-rw-r--r--pkgs/development/libraries/gettext/default.nix4
-rw-r--r--pkgs/development/libraries/gf2x/default.nix17
-rw-r--r--pkgs/development/libraries/gle/default.nix2
-rw-r--r--pkgs/development/libraries/glib/default.nix5
-rw-r--r--pkgs/development/libraries/glib/gobject_init_on_demand.patch87
-rw-r--r--pkgs/development/libraries/glib/quark_init_on_demand.patch33
-rw-r--r--pkgs/development/libraries/glibc/2.26-115to131.diff.gzbin20022 -> 0 bytes
-rw-r--r--pkgs/development/libraries/glibc/2.26-75.patch.gzbin289084 -> 0 bytes
-rw-r--r--pkgs/development/libraries/glibc/2.26-75to115.diff.gzbin32865 -> 0 bytes
-rw-r--r--pkgs/development/libraries/gloox/default.nix6
-rw-r--r--pkgs/development/libraries/gmp/6.x.nix9
-rw-r--r--pkgs/development/libraries/grantlee/default.nix4
-rw-r--r--pkgs/development/libraries/grib-api/default.nix4
-rw-r--r--pkgs/development/libraries/gsl/default.nix4
-rw-r--r--pkgs/development/libraries/gspell/default.nix (renamed from pkgs/desktops/gnome-3/misc/gspell/default.nix)5
-rw-r--r--pkgs/development/libraries/gstreamer/bad/default.nix15
-rw-r--r--pkgs/development/libraries/gtdialog/default.nix2
-rw-r--r--pkgs/development/libraries/gtk+/3.x.nix4
-rw-r--r--pkgs/development/libraries/gtkd/default.nix38
-rw-r--r--pkgs/development/libraries/gtkspell/3.nix9
-rw-r--r--pkgs/development/libraries/harfbuzz/default.nix6
-rw-r--r--pkgs/development/libraries/hspell/default.nix3
-rw-r--r--pkgs/development/libraries/iksemel/default.nix25
-rw-r--r--pkgs/development/libraries/ip2location-c/default.nix2
-rw-r--r--pkgs/development/libraries/isl/0.11.1.nix2
-rw-r--r--pkgs/development/libraries/java/dbus-java/default.nix2
-rw-r--r--pkgs/development/libraries/java/geoipjava/default.nix2
-rw-r--r--pkgs/development/libraries/java/libmatthew-java/default.nix2
-rw-r--r--pkgs/development/libraries/jbigkit/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/fetch.sh2
-rw-r--r--pkgs/development/libraries/kde-frameworks/srcs.nix624
-rw-r--r--pkgs/development/libraries/lasso/default.nix4
-rw-r--r--pkgs/development/libraries/ldb/default.nix2
-rw-r--r--pkgs/development/libraries/leatherman/default.nix4
-rw-r--r--pkgs/development/libraries/libLAS/default.nix2
-rw-r--r--pkgs/development/libraries/libabw/default.nix2
-rw-r--r--pkgs/development/libraries/libantlr3c/default.nix2
-rw-r--r--pkgs/development/libraries/libaom/default.nix19
-rw-r--r--pkgs/development/libraries/libarchive/default.nix10
-rw-r--r--pkgs/development/libraries/libaudclient/default.nix2
-rw-r--r--pkgs/development/libraries/libbladeRF/default.nix19
-rw-r--r--pkgs/development/libraries/libblockdev/default.nix39
-rw-r--r--pkgs/development/libraries/libbsd/default.nix2
-rw-r--r--pkgs/development/libraries/libbytesize/default.nix31
-rw-r--r--pkgs/development/libraries/libcanberra/default.nix21
-rw-r--r--pkgs/development/libraries/libcdr/default.nix2
-rw-r--r--pkgs/development/libraries/libclthreads/default.nix2
-rw-r--r--pkgs/development/libraries/libclxclient/default.nix2
-rw-r--r--pkgs/development/libraries/libcollectdclient/default.nix5
-rw-r--r--pkgs/development/libraries/libcouchbase/default.nix6
-rw-r--r--pkgs/development/libraries/libcutl/default.nix2
-rw-r--r--pkgs/development/libraries/libdap/default.nix2
-rw-r--r--pkgs/development/libraries/libdazzle/default.nix4
-rw-r--r--pkgs/development/libraries/libde265/default.nix24
-rw-r--r--pkgs/development/libraries/libdivecomputer/default.nix2
-rw-r--r--pkgs/development/libraries/libdrm/default.nix2
-rw-r--r--pkgs/development/libraries/libdwarf/default.nix4
-rw-r--r--pkgs/development/libraries/libeatmydata/default.nix2
-rw-r--r--pkgs/development/libraries/libebml/default.nix24
-rw-r--r--pkgs/development/libraries/libedit/default.nix6
-rw-r--r--pkgs/development/libraries/libevent/default.nix16
-rw-r--r--pkgs/development/libraries/libexttextcat/default.nix2
-rw-r--r--pkgs/development/libraries/libfakekey/default.nix2
-rw-r--r--pkgs/development/libraries/libfilezilla/default.nix4
-rw-r--r--pkgs/development/libraries/libfive/default.nix30
-rw-r--r--pkgs/development/libraries/libftdi/1.x.nix2
-rw-r--r--pkgs/development/libraries/libftdi/default.nix2
-rw-r--r--pkgs/development/libraries/libgap/default.nix13
-rw-r--r--pkgs/development/libraries/libgcrypt/default.nix7
-rw-r--r--pkgs/development/libraries/libgcrypt/fix-jent-locking.patch29
-rw-r--r--pkgs/development/libraries/libgdiplus/default.nix2
-rw-r--r--pkgs/development/libraries/libgeotiff/default.nix2
-rw-r--r--pkgs/development/libraries/libgig/default.nix2
-rw-r--r--pkgs/development/libraries/libgsystem/default.nix31
-rw-r--r--pkgs/development/libraries/libgtop/default.nix18
-rw-r--r--pkgs/development/libraries/libguestfs/default.nix4
-rw-r--r--pkgs/development/libraries/libheif/default.nix27
-rw-r--r--pkgs/development/libraries/libiconv/default.nix9
-rw-r--r--pkgs/development/libraries/libidn/default.nix4
-rw-r--r--pkgs/development/libraries/libinput/default.nix6
-rw-r--r--pkgs/development/libraries/libivykis/default.nix4
-rw-r--r--pkgs/development/libraries/libmatchbox/default.nix2
-rw-r--r--pkgs/development/libraries/libmatheval/default.nix2
-rw-r--r--pkgs/development/libraries/libmatroska/default.nix23
-rw-r--r--pkgs/development/libraries/libmnl/default.nix2
-rw-r--r--pkgs/development/libraries/libmpcdec/default.nix2
-rw-r--r--pkgs/development/libraries/libmrss/default.nix2
-rw-r--r--pkgs/development/libraries/libmspack/default.nix2
-rw-r--r--pkgs/development/libraries/libmysqlconnectorcpp/default.nix2
-rw-r--r--pkgs/development/libraries/libndctl/default.nix48
-rw-r--r--pkgs/development/libraries/libndp/default.nix4
-rw-r--r--pkgs/development/libraries/libnetfilter_cthelper/default.nix2
-rw-r--r--pkgs/development/libraries/libnfnetlink/default.nix2
-rw-r--r--pkgs/development/libraries/libnfs/default.nix4
-rw-r--r--pkgs/development/libraries/libnftnl/default.nix4
-rw-r--r--pkgs/development/libraries/libnice/default.nix2
-rw-r--r--pkgs/development/libraries/libnxml/default.nix2
-rw-r--r--pkgs/development/libraries/libodfgen/default.nix8
-rw-r--r--pkgs/development/libraries/libpcap/default.nix2
-rw-r--r--pkgs/development/libraries/libpfm/default.nix6
-rw-r--r--pkgs/development/libraries/libplist/default.nix2
-rw-r--r--pkgs/development/libraries/libqalculate/default.nix12
-rw-r--r--pkgs/development/libraries/libqmatrixclient/default.nix4
-rw-r--r--pkgs/development/libraries/libraw/default.nix6
-rw-r--r--pkgs/development/libraries/librealsense/default.nix4
-rw-r--r--pkgs/development/libraries/librep/default.nix2
-rw-r--r--pkgs/development/libraries/libressl/default.nix13
-rw-r--r--pkgs/development/libraries/librime/default.nix2
-rw-r--r--pkgs/development/libraries/libsearpc/default.nix23
-rw-r--r--pkgs/development/libraries/libsidplayfp/default.nix4
-rw-r--r--pkgs/development/libraries/libsixel/default.nix4
-rw-r--r--pkgs/development/libraries/libskk/default.nix4
-rw-r--r--pkgs/development/libraries/libsolv/default.nix13
-rw-r--r--pkgs/development/libraries/libsoup/default.nix4
-rw-r--r--pkgs/development/libraries/libspatialindex/default.nix2
-rw-r--r--pkgs/development/libraries/libspatialite/default.nix2
-rw-r--r--pkgs/development/libraries/libspectre/default.nix2
-rw-r--r--pkgs/development/libraries/libstatgrab/default.nix2
-rw-r--r--pkgs/development/libraries/libtiff/default.nix10
-rw-r--r--pkgs/development/libraries/libtomcrypt/default.nix6
-rw-r--r--pkgs/development/libraries/libtommath/default.nix2
-rw-r--r--pkgs/development/libraries/libtorrent-rasterbar/default.nix49
-rw-r--r--pkgs/development/libraries/libtoxcore/default.nix4
-rw-r--r--pkgs/development/libraries/libtsm/default.nix2
-rw-r--r--pkgs/development/libraries/libtxc_dxtn/default.nix2
-rw-r--r--pkgs/development/libraries/libunistring/default.nix4
-rw-r--r--pkgs/development/libraries/libusbmuxd/default.nix2
-rw-r--r--pkgs/development/libraries/libuv/default.nix4
-rw-r--r--pkgs/development/libraries/libva/1.0.0.nix2
-rw-r--r--pkgs/development/libraries/libvirt-glib/default.nix2
-rw-r--r--pkgs/development/libraries/libvirt/default.nix25
-rw-r--r--pkgs/development/libraries/libvmi/default.nix43
-rw-r--r--pkgs/development/libraries/libvorbis/default.nix5
-rw-r--r--pkgs/development/libraries/libx86/default.nix2
-rw-r--r--pkgs/development/libraries/libxc/default.nix4
-rw-r--r--pkgs/development/libraries/libxcomp/default.nix2
-rw-r--r--pkgs/development/libraries/libxml2/default.nix9
-rw-r--r--pkgs/development/libraries/libyaml/default.nix4
-rw-r--r--pkgs/development/libraries/libzdb/default.nix2
-rw-r--r--pkgs/development/libraries/lief/default.nix14
-rw-r--r--pkgs/development/libraries/lightning/default.nix4
-rw-r--r--pkgs/development/libraries/linbox/default.nix3
-rw-r--r--pkgs/development/libraries/loudmouth/default.nix2
-rw-r--r--pkgs/development/libraries/mbedtls/default.nix57
-rw-r--r--pkgs/development/libraries/mdds/0.12.1.nix2
-rw-r--r--pkgs/development/libraries/mdds/default.nix2
-rw-r--r--pkgs/development/libraries/minixml/default.nix2
-rw-r--r--pkgs/development/libraries/mlt/qt-5.nix4
-rw-r--r--pkgs/development/libraries/mpfr/default.nix2
-rw-r--r--pkgs/development/libraries/mpich2/default.nix2
-rw-r--r--pkgs/development/libraries/nanomsg/default.nix6
-rw-r--r--pkgs/development/libraries/npth/default.nix2
-rw-r--r--pkgs/development/libraries/nss/default.nix6
-rw-r--r--pkgs/development/libraries/ntdb/default.nix2
-rw-r--r--pkgs/development/libraries/odpic/default.nix40
-rw-r--r--pkgs/development/libraries/olm/default.nix5
-rw-r--r--pkgs/development/libraries/opae/default.nix44
-rw-r--r--pkgs/development/libraries/opendbx/default.nix2
-rw-r--r--pkgs/development/libraries/openfst/default.nix4
-rw-r--r--pkgs/development/libraries/openldap/default.nix2
-rw-r--r--pkgs/development/libraries/openssl/default.nix2
-rw-r--r--pkgs/development/libraries/openzwave/default.nix2
-rw-r--r--pkgs/development/libraries/oracle-instantclient/default.nix78
-rw-r--r--pkgs/development/libraries/pango/default.nix2
-rw-r--r--pkgs/development/libraries/pangomm/default.nix2
-rw-r--r--pkgs/development/libraries/pangox-compat/default.nix2
-rw-r--r--pkgs/development/libraries/phash/default.nix38
-rw-r--r--pkgs/development/libraries/phonon/backends/vlc.nix15
-rw-r--r--pkgs/development/libraries/phonon/default.nix4
-rw-r--r--pkgs/development/libraries/physics/cernlib/default.nix2
-rw-r--r--pkgs/development/libraries/physics/fastnlo/default.nix2
-rw-r--r--pkgs/development/libraries/physics/herwig/default.nix2
-rw-r--r--pkgs/development/libraries/physics/lhapdf/default.nix2
-rw-r--r--pkgs/development/libraries/physics/mcgrid/default.nix2
-rw-r--r--pkgs/development/libraries/physics/nlojet/default.nix2
-rw-r--r--pkgs/development/libraries/physics/rivet/default.nix2
-rw-r--r--pkgs/development/libraries/physics/thepeg/default.nix2
-rw-r--r--pkgs/development/libraries/physics/yoda/default.nix2
-rw-r--r--pkgs/development/libraries/pkcs11helper/default.nix4
-rw-r--r--pkgs/development/libraries/polkit/default.nix29
-rw-r--r--pkgs/development/libraries/poppler/default.nix11
-rw-r--r--pkgs/development/libraries/postgis/default.nix2
-rw-r--r--pkgs/development/libraries/proj/default.nix2
-rw-r--r--pkgs/development/libraries/pupnp/default.nix4
-rw-r--r--pkgs/development/libraries/qpdf/default.nix14
-rw-r--r--pkgs/development/libraries/qt-5/5.10/fetch.sh2
-rw-r--r--pkgs/development/libraries/qt-5/5.10/qtwebkit.patch77
-rw-r--r--pkgs/development/libraries/qt-5/5.10/srcs.nix341
-rw-r--r--pkgs/development/libraries/qt-5/5.11/default.nix (renamed from pkgs/development/libraries/qt-5/5.10/default.nix)22
-rw-r--r--pkgs/development/libraries/qt-5/5.11/fetch.sh2
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch13
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch (renamed from pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch)40
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch102
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtbase.patch (renamed from pkgs/development/libraries/qt-5/5.10/qtbase.patch)156
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch (renamed from pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch)8
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtscript.patch (renamed from pkgs/development/libraries/qt-5/5.10/qtscript.patch)0
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtserialport.patch (renamed from pkgs/development/libraries/qt-5/5.10/qtserialport.patch)0
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qttools.patch (renamed from pkgs/development/libraries/qt-5/5.10/qttools.patch)0
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch (renamed from pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch)0
-rw-r--r--pkgs/development/libraries/qt-5/5.11/qtwebkit.patch12
-rw-r--r--pkgs/development/libraries/qt-5/5.11/srcs.nix325
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtbase.nix9
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtdeclarative.nix1
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtwebkit.nix33
-rw-r--r--pkgs/development/libraries/qt-5/qtModule.nix4
-rw-r--r--pkgs/development/libraries/rabbitmq-java-client/default.nix2
-rw-r--r--pkgs/development/libraries/range-v3/default.nix4
-rw-r--r--pkgs/development/libraries/readosm/default.nix2
-rw-r--r--pkgs/development/libraries/rep-gtk/default.nix2
-rw-r--r--pkgs/development/libraries/rocksdb/default.nix2
-rw-r--r--pkgs/development/libraries/rubberband/default.nix2
-rw-r--r--pkgs/development/libraries/schroedinger/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/brial/default.nix4
-rw-r--r--pkgs/development/libraries/science/math/ipopt/default.nix6
-rw-r--r--pkgs/development/libraries/science/math/lcalc/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/magma/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/openblas/default.nix14
-rw-r--r--pkgs/development/libraries/science/math/openlibm/default.nix4
-rw-r--r--pkgs/development/libraries/science/math/rankwidth/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/rubiks/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/sympow/default.nix4
-rw-r--r--pkgs/development/libraries/serd/default.nix2
-rw-r--r--pkgs/development/libraries/shapelib/default.nix2
-rw-r--r--pkgs/development/libraries/slang/default.nix2
-rw-r--r--pkgs/development/libraries/slib/default.nix2
-rw-r--r--pkgs/development/libraries/snack/default.nix2
-rw-r--r--pkgs/development/libraries/sord/default.nix2
-rw-r--r--pkgs/development/libraries/soundtouch/default.nix2
-rw-r--r--pkgs/development/libraries/spandsp/default.nix2
-rw-r--r--pkgs/development/libraries/spatialite-tools/default.nix2
-rw-r--r--pkgs/development/libraries/speexdsp/default.nix2
-rw-r--r--pkgs/development/libraries/spice-gtk/default.nix2
-rw-r--r--pkgs/development/libraries/spice-protocol/default.nix6
-rw-r--r--pkgs/development/libraries/spice/default.nix2
-rw-r--r--pkgs/development/libraries/sqlite/analyzer.nix4
-rw-r--r--pkgs/development/libraries/sqlite/default.nix4
-rw-r--r--pkgs/development/libraries/startup-notification/default.nix2
-rw-r--r--pkgs/development/libraries/strigi/default.nix2
-rw-r--r--pkgs/development/libraries/swiften/default.nix6
-rw-r--r--pkgs/development/libraries/sword/default.nix2
-rw-r--r--pkgs/development/libraries/tachyon/default.nix1
-rw-r--r--pkgs/development/libraries/talloc/default.nix6
-rw-r--r--pkgs/development/libraries/tbb/default.nix4
-rw-r--r--pkgs/development/libraries/tdb/default.nix6
-rw-r--r--pkgs/development/libraries/telepathy/farstream/default.nix2
-rw-r--r--pkgs/development/libraries/telepathy/glib/default.nix2
-rw-r--r--pkgs/development/libraries/telepathy/qt/default.nix2
-rw-r--r--pkgs/development/libraries/tepl/default.nix42
-rw-r--r--pkgs/development/libraries/tevent/default.nix6
-rw-r--r--pkgs/development/libraries/thrift/default.nix2
-rw-r--r--pkgs/development/libraries/tre/default.nix2
-rw-r--r--pkgs/development/libraries/ucl/default.nix2
-rw-r--r--pkgs/development/libraries/unicap/default.nix2
-rw-r--r--pkgs/development/libraries/uri/default.nix2
-rw-r--r--pkgs/development/libraries/usbredir/default.nix2
-rw-r--r--pkgs/development/libraries/vaapi-vdpau/default.nix2
-rw-r--r--pkgs/development/libraries/vapoursynth/default.nix2
-rw-r--r--pkgs/development/libraries/vo-amrwbenc/default.nix2
-rw-r--r--pkgs/development/libraries/volume-key/default.nix38
-rw-r--r--pkgs/development/libraries/vsqlite/default.nix2
-rw-r--r--pkgs/development/libraries/vulkan-headers/default.nix22
-rw-r--r--pkgs/development/libraries/vulkan-loader/default.nix66
-rw-r--r--pkgs/development/libraries/vulkan-loader/rev-file.patch21
-rw-r--r--pkgs/development/libraries/wayland/1.9.nix4
-rw-r--r--pkgs/development/libraries/wayland/protocols.nix4
-rw-r--r--pkgs/development/libraries/webkitgtk/2.20.nix8
-rw-r--r--pkgs/development/libraries/webkitgtk/2.4.nix2
-rw-r--r--pkgs/development/libraries/webrtc-audio-processing/default.nix2
-rw-r--r--pkgs/development/libraries/wolfssl/default.nix4
-rw-r--r--pkgs/development/libraries/wxSVG/default.nix4
-rw-r--r--pkgs/development/libraries/x264/default.nix2
-rw-r--r--pkgs/development/libraries/xapian/default.nix2
-rw-r--r--pkgs/development/libraries/xapian/tools/omega/default.nix4
-rw-r--r--pkgs/development/libraries/xml-security-c/default.nix2
-rw-r--r--pkgs/development/libraries/xmlsec/default.nix2
-rw-r--r--pkgs/development/libraries/xsd/default.nix2
-rw-r--r--pkgs/development/libraries/zlib/default.nix2
-rw-r--r--pkgs/development/misc/amdapp-sdk/default.nix2
-rw-r--r--pkgs/development/mobile/androidenv/androidndk-pkgs.nix13
-rw-r--r--pkgs/development/mobile/androidenv/androidndk.nix24
-rw-r--r--pkgs/development/mobile/androidenv/androidndk_r8e.nix12
-rw-r--r--pkgs/development/mobile/androidenv/androidsdk.nix16
-rw-r--r--pkgs/development/mobile/androidenv/build-gradle-app.nix108
-rw-r--r--pkgs/development/mobile/androidenv/default.nix45
-rw-r--r--pkgs/development/node-packages/composition-v10.nix17
-rw-r--r--pkgs/development/node-packages/composition-v6.nix2
-rw-r--r--pkgs/development/node-packages/composition-v8.nix2
-rw-r--r--pkgs/development/node-packages/default-v10.nix24
-rw-r--r--pkgs/development/node-packages/default-v6.nix52
-rw-r--r--pkgs/development/node-packages/default-v8.nix52
-rwxr-xr-xpkgs/development/node-packages/generate.sh1
-rw-r--r--pkgs/development/node-packages/node-env.nix81
-rw-r--r--pkgs/development/node-packages/node-packages-v10.json6
-rw-r--r--pkgs/development/node-packages/node-packages-v10.nix230
-rw-r--r--pkgs/development/node-packages/node-packages-v6.json5
-rw-r--r--pkgs/development/node-packages/node-packages-v6.nix13387
-rw-r--r--pkgs/development/node-packages/node-packages-v8.nix2068
-rw-r--r--pkgs/development/ocaml-modules/bap/default.nix17
-rw-r--r--pkgs/development/ocaml-modules/cmdliner/0.9.nix34
-rw-r--r--pkgs/development/ocaml-modules/cpdf/default.nix5
-rw-r--r--pkgs/development/ocaml-modules/ezjsonm/default.nix15
-rw-r--r--pkgs/development/ocaml-modules/ipaddr/default.nix7
-rw-r--r--pkgs/development/ocaml-modules/iri/default.nix34
-rw-r--r--pkgs/development/ocaml-modules/janestreet/default.nix569
-rw-r--r--pkgs/development/ocaml-modules/janestreet/janePackage.nix2
-rw-r--r--pkgs/development/ocaml-modules/lambda-term/default.nix6
-rw-r--r--pkgs/development/ocaml-modules/lwt/default.nix11
-rw-r--r--pkgs/development/ocaml-modules/lwt_log/default.nix24
-rw-r--r--pkgs/development/ocaml-modules/nocrypto/default.nix38
-rw-r--r--pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix13
-rw-r--r--pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix10
-rw-r--r--pkgs/development/ocaml-modules/ppxlib/default.nix34
-rw-r--r--pkgs/development/ocaml-modules/psmt2-frontend/default.nix35
-rw-r--r--pkgs/development/ocaml-modules/re/default.nix24
-rw-r--r--pkgs/development/ocaml-modules/tls/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/uri/default.nix6
-rw-r--r--pkgs/development/ocaml-modules/xtmpl/default.nix21
-rw-r--r--pkgs/development/ocaml-modules/zarith/default.nix6
-rw-r--r--pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch13
-rw-r--r--pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch32
-rw-r--r--pkgs/development/pharo/vm/default.nix6
-rw-r--r--pkgs/development/python-modules/3to2/default.nix1
-rw-r--r--pkgs/development/python-modules/APScheduler/default.nix1
-rw-r--r--pkgs/development/python-modules/Babel/default.nix12
-rw-r--r--pkgs/development/python-modules/Cython/default.nix16
-rw-r--r--pkgs/development/python-modules/Flask-PyMongo/default.nix5
-rw-r--r--pkgs/development/python-modules/FormEncode/default.nix1
-rw-r--r--pkgs/development/python-modules/GeoIP/default.nix1
-rw-r--r--pkgs/development/python-modules/GitPython/default.nix6
-rw-r--r--pkgs/development/python-modules/Pmw/default.nix1
-rw-r--r--pkgs/development/python-modules/PyLD/default.nix1
-rw-r--r--pkgs/development/python-modules/Pygments/default.nix1
-rw-r--r--pkgs/development/python-modules/ROPGadget/default.nix1
-rw-r--r--pkgs/development/python-modules/Theano/default.nix5
-rw-r--r--pkgs/development/python-modules/Wand/default.nix1
-rw-r--r--pkgs/development/python-modules/XlsxWriter/default.nix5
-rw-r--r--pkgs/development/python-modules/aafigure/default.nix1
-rw-r--r--pkgs/development/python-modules/absl-py/default.nix4
-rw-r--r--pkgs/development/python-modules/acme-tiny/default.nix1
-rw-r--r--pkgs/development/python-modules/acme/default.nix1
-rw-r--r--pkgs/development/python-modules/acoustics/default.nix1
-rw-r--r--pkgs/development/python-modules/actdiag/default.nix1
-rw-r--r--pkgs/development/python-modules/adal/default.nix5
-rw-r--r--pkgs/development/python-modules/aenum/default.nix1
-rw-r--r--pkgs/development/python-modules/agate-dbf/default.nix1
-rw-r--r--pkgs/development/python-modules/agate-excel/default.nix1
-rw-r--r--pkgs/development/python-modules/agate-sql/default.nix1
-rw-r--r--pkgs/development/python-modules/agate/default.nix50
-rw-r--r--pkgs/development/python-modules/aioamqp/default.nix5
-rw-r--r--pkgs/development/python-modules/aioconsole/default.nix4
-rw-r--r--pkgs/development/python-modules/aiodns/default.nix1
-rw-r--r--pkgs/development/python-modules/aiofiles/default.nix1
-rw-r--r--pkgs/development/python-modules/aiohttp-jinja2/default.nix4
-rw-r--r--pkgs/development/python-modules/aiohttp/default.nix12
-rw-r--r--pkgs/development/python-modules/aiohue/default.nix4
-rw-r--r--pkgs/development/python-modules/aioimaplib/default.nix13
-rw-r--r--pkgs/development/python-modules/alabaster/default.nix5
-rw-r--r--pkgs/development/python-modules/alembic/default.nix5
-rw-r--r--pkgs/development/python-modules/altair/default.nix4
-rw-r--r--pkgs/development/python-modules/amqp/default.nix11
-rw-r--r--pkgs/development/python-modules/amqplib/default.nix1
-rw-r--r--pkgs/development/python-modules/aniso8601/default.nix5
-rw-r--r--pkgs/development/python-modules/ansicolor/default.nix1
-rw-r--r--pkgs/development/python-modules/ansiconv/default.nix24
-rw-r--r--pkgs/development/python-modules/antlr4-python3-runtime/default.nix8
-rw-r--r--pkgs/development/python-modules/apipkg/default.nix1
-rw-r--r--pkgs/development/python-modules/appdirs/default.nix1
-rw-r--r--pkgs/development/python-modules/area53/default.nix1
-rw-r--r--pkgs/development/python-modules/argcomplete/default.nix1
-rw-r--r--pkgs/development/python-modules/args/default.nix1
-rw-r--r--pkgs/development/python-modules/asana/default.nix1
-rw-r--r--pkgs/development/python-modules/asn1crypto/default.nix1
-rw-r--r--pkgs/development/python-modules/astor/default.nix1
-rw-r--r--pkgs/development/python-modules/astroid/default.nix5
-rw-r--r--pkgs/development/python-modules/astropy/default.nix4
-rw-r--r--pkgs/development/python-modules/astunparse/default.nix17
-rw-r--r--pkgs/development/python-modules/async_timeout/default.nix4
-rw-r--r--pkgs/development/python-modules/asyncssh/default.nix4
-rw-r--r--pkgs/development/python-modules/asynctest/default.nix11
-rw-r--r--pkgs/development/python-modules/attrs/default.nix4
-rw-r--r--pkgs/development/python-modules/audioread/default.nix5
-rw-r--r--pkgs/development/python-modules/authres/default.nix28
-rw-r--r--pkgs/development/python-modules/autobahn/default.nix13
-rw-r--r--pkgs/development/python-modules/automat/default.nix12
-rw-r--r--pkgs/development/python-modules/autopep8/default.nix1
-rw-r--r--pkgs/development/python-modules/aws-sam-translator/default.nix38
-rw-r--r--pkgs/development/python-modules/aws-xray-sdk/default.nix4
-rw-r--r--pkgs/development/python-modules/backports_csv/default.nix5
-rw-r--r--pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix25
-rw-r--r--pkgs/development/python-modules/backports_tempfile/default.nix1
-rw-r--r--pkgs/development/python-modules/backports_unittest-mock/default.nix1
-rw-r--r--pkgs/development/python-modules/backports_weakref/default.nix1
-rw-r--r--pkgs/development/python-modules/bap/default.nix1
-rw-r--r--pkgs/development/python-modules/bash_kernel/default.nix1
-rw-r--r--pkgs/development/python-modules/bayespy/default.nix1
-rw-r--r--pkgs/development/python-modules/bcrypt/default.nix7
-rw-r--r--pkgs/development/python-modules/beancount/default.nix7
-rw-r--r--pkgs/development/python-modules/beautifulsoup4/default.nix1
-rw-r--r--pkgs/development/python-modules/behave/default.nix1
-rw-r--r--pkgs/development/python-modules/biopython/default.nix4
-rw-r--r--pkgs/development/python-modules/bitcoin-price-api/default.nix1
-rw-r--r--pkgs/development/python-modules/bitcoinlib/default.nix1
-rw-r--r--pkgs/development/python-modules/bitstring/default.nix1
-rw-r--r--pkgs/development/python-modules/bkcharts/default.nix1
-rw-r--r--pkgs/development/python-modules/blessed/default.nix5
-rw-r--r--pkgs/development/python-modules/blinker/default.nix2
-rw-r--r--pkgs/development/python-modules/blivet/default.nix3
-rw-r--r--pkgs/development/python-modules/bokeh/default.nix6
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/default.nix8
-rw-r--r--pkgs/development/python-modules/boto3/default.nix4
-rw-r--r--pkgs/development/python-modules/botocore/default.nix5
-rw-r--r--pkgs/development/python-modules/branca/default.nix5
-rw-r--r--pkgs/development/python-modules/breathe/default.nix11
-rw-r--r--pkgs/development/python-modules/browsermob-proxy/default.nix1
-rw-r--r--pkgs/development/python-modules/btrees/default.nix15
-rw-r--r--pkgs/development/python-modules/buildout-nix/default.nix11
-rw-r--r--pkgs/development/python-modules/bumps/default.nix4
-rw-r--r--pkgs/development/python-modules/bz2file/default.nix1
-rw-r--r--pkgs/development/python-modules/cachetools/1.nix5
-rw-r--r--pkgs/development/python-modules/cachetools/default.nix5
-rw-r--r--pkgs/development/python-modules/canonicaljson/default.nix4
-rw-r--r--pkgs/development/python-modules/cccolutils/default.nix1
-rw-r--r--pkgs/development/python-modules/celery/default.nix13
-rw-r--r--pkgs/development/python-modules/cerberus/default.nix4
-rw-r--r--pkgs/development/python-modules/certifi/default.nix5
-rw-r--r--pkgs/development/python-modules/cffi/default.nix1
-rw-r--r--pkgs/development/python-modules/cftime/default.nix32
-rw-r--r--pkgs/development/python-modules/chai/default.nix1
-rw-r--r--pkgs/development/python-modules/chainer/default.nix4
-rw-r--r--pkgs/development/python-modules/chainmap/default.nix1
-rw-r--r--pkgs/development/python-modules/channels/default.nix5
-rw-r--r--pkgs/development/python-modules/characteristic/default.nix1
-rw-r--r--pkgs/development/python-modules/check-manifest/default.nix4
-rw-r--r--pkgs/development/python-modules/cheroot/default.nix18
-rw-r--r--pkgs/development/python-modules/cherrypy/default.nix7
-rw-r--r--pkgs/development/python-modules/circus/default.nix4
-rw-r--r--pkgs/development/python-modules/cld2-cffi/default.nix1
-rw-r--r--pkgs/development/python-modules/click-plugins/default.nix1
-rw-r--r--pkgs/development/python-modules/click/default.nix7
-rw-r--r--pkgs/development/python-modules/click/fix-paths.patch11
-rw-r--r--pkgs/development/python-modules/cligj/default.nix1
-rw-r--r--pkgs/development/python-modules/cloudpickle/default.nix4
-rw-r--r--pkgs/development/python-modules/clustershell/default.nix89
-rw-r--r--pkgs/development/python-modules/coinmarketcap/default.nix4
-rw-r--r--pkgs/development/python-modules/colorlover/default.nix1
-rw-r--r--pkgs/development/python-modules/confluent-kafka/default.nix1
-rw-r--r--pkgs/development/python-modules/constantly/default.nix7
-rw-r--r--pkgs/development/python-modules/consul/default.nix4
-rw-r--r--pkgs/development/python-modules/contextlib2/default.nix1
-rw-r--r--pkgs/development/python-modules/coverage/default.nix1
-rw-r--r--pkgs/development/python-modules/credstash/default.nix12
-rw-r--r--pkgs/development/python-modules/csscompressor/default.nix1
-rw-r--r--pkgs/development/python-modules/cufflinks/default.nix5
-rw-r--r--pkgs/development/python-modules/cupy/default.nix4
-rw-r--r--pkgs/development/python-modules/cvxopt/default.nix4
-rw-r--r--pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch27
-rw-r--r--pkgs/development/python-modules/cx_oracle/default.nix13
-rw-r--r--pkgs/development/python-modules/cycler/default.nix1
-rw-r--r--pkgs/development/python-modules/cypari2/default.nix6
-rw-r--r--pkgs/development/python-modules/cysignals/default.nix15
-rw-r--r--pkgs/development/python-modules/dask/default.nix5
-rw-r--r--pkgs/development/python-modules/dataclasses/default.nix4
-rw-r--r--pkgs/development/python-modules/dateutil/1_5.nix4
-rw-r--r--pkgs/development/python-modules/dateutil/default.nix9
-rw-r--r--pkgs/development/python-modules/dbf/default.nix4
-rw-r--r--pkgs/development/python-modules/dbfread/default.nix1
-rw-r--r--pkgs/development/python-modules/dbus/default.nix3
-rw-r--r--pkgs/development/python-modules/deap/default.nix26
-rw-r--r--pkgs/development/python-modules/decorator/default.nix4
-rw-r--r--pkgs/development/python-modules/deluge-client/default.nix4
-rw-r--r--pkgs/development/python-modules/demjson/default.nix1
-rw-r--r--pkgs/development/python-modules/dendropy/default.nix4
-rw-r--r--pkgs/development/python-modules/deprecation/default.nix4
-rw-r--r--pkgs/development/python-modules/descartes/default.nix1
-rw-r--r--pkgs/development/python-modules/devpi-common/default.nix7
-rw-r--r--pkgs/development/python-modules/diff-match-patch/default.nix1
-rw-r--r--pkgs/development/python-modules/dill/default.nix5
-rw-r--r--pkgs/development/python-modules/discid/default.nix1
-rw-r--r--pkgs/development/python-modules/discogs_client/default.nix1
-rw-r--r--pkgs/development/python-modules/distorm3/default.nix8
-rw-r--r--pkgs/development/python-modules/distro/default.nix4
-rw-r--r--pkgs/development/python-modules/django-allauth/default.nix5
-rw-r--r--pkgs/development/python-modules/django-compat/default.nix1
-rw-r--r--pkgs/development/python-modules/django-extensions/default.nix35
-rw-r--r--pkgs/development/python-modules/django-gravatar2/default.nix1
-rw-r--r--pkgs/development/python-modules/django-haystack/default.nix30
-rw-r--r--pkgs/development/python-modules/django-hijack-admin/default.nix1
-rw-r--r--pkgs/development/python-modules/django-ipware/default.nix5
-rw-r--r--pkgs/development/python-modules/django-jinja2/default.nix1
-rw-r--r--pkgs/development/python-modules/django-multiselectfield/default.nix1
-rw-r--r--pkgs/development/python-modules/django-pglocks/default.nix1
-rw-r--r--pkgs/development/python-modules/django-picklefield/default.nix1
-rw-r--r--pkgs/development/python-modules/django-raster/default.nix11
-rw-r--r--pkgs/development/python-modules/django-sampledatahelper/default.nix1
-rw-r--r--pkgs/development/python-modules/django-sites/default.nix1
-rw-r--r--pkgs/development/python-modules/django-sr/default.nix1
-rw-r--r--pkgs/development/python-modules/django/2_0.nix5
-rw-r--r--pkgs/development/python-modules/django_appconf/default.nix1
-rw-r--r--pkgs/development/python-modules/django_compressor/default.nix1
-rw-r--r--pkgs/development/python-modules/django_guardian/default.nix10
-rw-r--r--pkgs/development/python-modules/django_redis/default.nix1
-rw-r--r--pkgs/development/python-modules/django_tagging/default.nix1
-rw-r--r--pkgs/development/python-modules/djangorestframework/default.nix7
-rw-r--r--pkgs/development/python-modules/djmail/default.nix16
-rw-r--r--pkgs/development/python-modules/dkimpy/default.nix37
-rw-r--r--pkgs/development/python-modules/dlib/build-cores.patch27
-rw-r--r--pkgs/development/python-modules/dnspython/default.nix1
-rw-r--r--pkgs/development/python-modules/doc8/default.nix1
-rw-r--r--pkgs/development/python-modules/docker-pycreds/default.nix4
-rw-r--r--pkgs/development/python-modules/docker/default.nix4
-rw-r--r--pkgs/development/python-modules/docker_compose/default.nix4
-rw-r--r--pkgs/development/python-modules/dogpile.cache/default.nix1
-rw-r--r--pkgs/development/python-modules/dogtail/default.nix58
-rw-r--r--pkgs/development/python-modules/dogtail/nix-support.patch35
-rw-r--r--pkgs/development/python-modules/dpkt/default.nix1
-rw-r--r--pkgs/development/python-modules/dropbox/default.nix4
-rw-r--r--pkgs/development/python-modules/ds4drv/default.nix1
-rw-r--r--pkgs/development/python-modules/dulwich/default.nix6
-rw-r--r--pkgs/development/python-modules/easy-thumbnails/default.nix1
-rw-r--r--pkgs/development/python-modules/easydict/default.nix1
-rw-r--r--pkgs/development/python-modules/ed25519/default.nix1
-rw-r--r--pkgs/development/python-modules/elasticsearch-curator/default.nix4
-rw-r--r--pkgs/development/python-modules/elasticsearch/default.nix4
-rw-r--r--pkgs/development/python-modules/email-validator/default.nix1
-rw-r--r--pkgs/development/python-modules/emcee/default.nix1
-rw-r--r--pkgs/development/python-modules/emoji/default.nix1
-rw-r--r--pkgs/development/python-modules/enum-compat/default.nix1
-rw-r--r--pkgs/development/python-modules/enzyme/default.nix1
-rw-r--r--pkgs/development/python-modules/ephem/default.nix1
-rw-r--r--pkgs/development/python-modules/evdev/default.nix4
-rw-r--r--pkgs/development/python-modules/eve/default.nix9
-rw-r--r--pkgs/development/python-modules/eve/setup.patch21
-rw-r--r--pkgs/development/python-modules/events/default.nix17
-rw-r--r--pkgs/development/python-modules/ezdxf/default.nix1
-rw-r--r--pkgs/development/python-modules/faker/default.nix4
-rw-r--r--pkgs/development/python-modules/feedgen/default.nix5
-rw-r--r--pkgs/development/python-modules/feedgenerator/default.nix7
-rw-r--r--pkgs/development/python-modules/fido2/default.nix23
-rw-r--r--pkgs/development/python-modules/fiona/default.nix5
-rw-r--r--pkgs/development/python-modules/fixtures/default.nix1
-rw-r--r--pkgs/development/python-modules/flake8-blind-except/default.nix7
-rw-r--r--pkgs/development/python-modules/flake8/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-assets/default.nix8
-rw-r--r--pkgs/development/python-modules/flask-autoindex/default.nix16
-rw-r--r--pkgs/development/python-modules/flask-caching/default.nix28
-rw-r--r--pkgs/development/python-modules/flask-common/default.nix8
-rw-r--r--pkgs/development/python-modules/flask-compress/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-cors/default.nix5
-rw-r--r--pkgs/development/python-modules/flask-elastic/default.nix7
-rw-r--r--pkgs/development/python-modules/flask-ldap-login/default.nix9
-rw-r--r--pkgs/development/python-modules/flask-login/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-mail/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-marshmallow/default.nix5
-rw-r--r--pkgs/development/python-modules/flask-migrate/default.nix5
-rw-r--r--pkgs/development/python-modules/flask-oauthlib/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-principal/default.nix8
-rw-r--r--pkgs/development/python-modules/flask-restful/default.nix27
-rw-r--r--pkgs/development/python-modules/flask-restplus/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-silk/default.nix14
-rw-r--r--pkgs/development/python-modules/flask-testing/default.nix1
-rw-r--r--pkgs/development/python-modules/flask-wtf/default.nix7
-rw-r--r--pkgs/development/python-modules/flask/default.nix5
-rw-r--r--pkgs/development/python-modules/fn/default.nix1
-rw-r--r--pkgs/development/python-modules/fonttools/default.nix4
-rw-r--r--pkgs/development/python-modules/funcsigs/default.nix1
-rw-r--r--pkgs/development/python-modules/future/default.nix1
-rw-r--r--pkgs/development/python-modules/gast/default.nix16
-rw-r--r--pkgs/development/python-modules/gensim/default.nix1
-rw-r--r--pkgs/development/python-modules/geojson/default.nix8
-rw-r--r--pkgs/development/python-modules/gevent/default.nix11
-rw-r--r--pkgs/development/python-modules/ghdiff/default.nix9
-rw-r--r--pkgs/development/python-modules/git-annex-adapter/default.nix18
-rw-r--r--pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch13
-rw-r--r--pkgs/development/python-modules/google-api-python-client/default.nix8
-rw-r--r--pkgs/development/python-modules/google-auth-httplib2/default.nix41
-rw-r--r--pkgs/development/python-modules/google_api_core/default.nix4
-rw-r--r--pkgs/development/python-modules/google_auth/default.nix4
-rw-r--r--pkgs/development/python-modules/google_cloud_speech/default.nix8
-rw-r--r--pkgs/development/python-modules/google_gax/default.nix31
-rw-r--r--pkgs/development/python-modules/gplaycli/default.nix2
-rw-r--r--pkgs/development/python-modules/grammalecte/default.nix1
-rw-r--r--pkgs/development/python-modules/graph-tool/2.x.x.nix3
-rw-r--r--pkgs/development/python-modules/greenlet/default.nix31
-rw-r--r--pkgs/development/python-modules/grpcio-tools/default.nix25
-rw-r--r--pkgs/development/python-modules/grpcio/default.nix6
-rw-r--r--pkgs/development/python-modules/gssapi/default.nix5
-rw-r--r--pkgs/development/python-modules/gst-python/default.nix10
-rw-r--r--pkgs/development/python-modules/guessit/2.0.nix32
-rw-r--r--pkgs/development/python-modules/guessit/default.nix5
-rw-r--r--pkgs/development/python-modules/gunicorn/default.nix16
-rw-r--r--pkgs/development/python-modules/gurobipy/darwin.nix3
-rw-r--r--pkgs/development/python-modules/gurobipy/linux.nix3
-rw-r--r--pkgs/development/python-modules/h2/default.nix1
-rw-r--r--pkgs/development/python-modules/hbmqtt/default.nix9
-rw-r--r--pkgs/development/python-modules/hdbscan/default.nix2
-rw-r--r--pkgs/development/python-modules/hglib/default.nix5
-rw-r--r--pkgs/development/python-modules/hidapi/default.nix1
-rw-r--r--pkgs/development/python-modules/hieroglyph/default.nix8
-rw-r--r--pkgs/development/python-modules/hiro/default.nix4
-rw-r--r--pkgs/development/python-modules/html5-parser/default.nix1
-rw-r--r--pkgs/development/python-modules/htmlmin/default.nix1
-rw-r--r--pkgs/development/python-modules/httpserver/default.nix1
-rw-r--r--pkgs/development/python-modules/hupper/default.nix5
-rw-r--r--pkgs/development/python-modules/hvac/default.nix4
-rw-r--r--pkgs/development/python-modules/hypchat/default.nix1
-rw-r--r--pkgs/development/python-modules/hyperframe/default.nix1
-rw-r--r--pkgs/development/python-modules/ibmquantumexperience/default.nix33
-rw-r--r--pkgs/development/python-modules/idna/default.nix4
-rw-r--r--pkgs/development/python-modules/ijson/default.nix1
-rw-r--r--pkgs/development/python-modules/immutables/default.nix4
-rw-r--r--pkgs/development/python-modules/incremental/default.nix9
-rw-r--r--pkgs/development/python-modules/intelhex/default.nix1
-rw-r--r--pkgs/development/python-modules/internetarchive/default.nix1
-rw-r--r--pkgs/development/python-modules/interruptingcow/default.nix1
-rw-r--r--pkgs/development/python-modules/intervaltree/default.nix1
-rw-r--r--pkgs/development/python-modules/ipykernel/default.nix1
-rw-r--r--pkgs/development/python-modules/ipyparallel/default.nix5
-rw-r--r--pkgs/development/python-modules/ipython/default.nix4
-rw-r--r--pkgs/development/python-modules/ipython_genutils/default.nix1
-rw-r--r--pkgs/development/python-modules/ipywidgets/default.nix1
-rw-r--r--pkgs/development/python-modules/iso-639/default.nix9
-rw-r--r--pkgs/development/python-modules/iso3166/default.nix1
-rw-r--r--pkgs/development/python-modules/jabberbot/default.nix7
-rw-r--r--pkgs/development/python-modules/jdatetime/default.nix4
-rw-r--r--pkgs/development/python-modules/jdcal/default.nix4
-rw-r--r--pkgs/development/python-modules/jedi/default.nix1
-rw-r--r--pkgs/development/python-modules/jellyfish/default.nix4
-rw-r--r--pkgs/development/python-modules/joblib/default.nix3
-rw-r--r--pkgs/development/python-modules/josepy/default.nix4
-rw-r--r--pkgs/development/python-modules/jsbeautifier/default.nix9
-rw-r--r--pkgs/development/python-modules/jsmin/default.nix1
-rw-r--r--pkgs/development/python-modules/jsondiff/default.nix4
-rw-r--r--pkgs/development/python-modules/jsonpatch/default.nix1
-rw-r--r--pkgs/development/python-modules/jsonref/default.nix1
-rw-r--r--pkgs/development/python-modules/jsonrpclib-pelix/default.nix1
-rw-r--r--pkgs/development/python-modules/jsonschema/default.nix1
-rw-r--r--pkgs/development/python-modules/jug/default.nix1
-rw-r--r--pkgs/development/python-modules/junos-eznc/default.nix4
-rw-r--r--pkgs/development/python-modules/jupyter_console/default.nix1
-rw-r--r--pkgs/development/python-modules/jupyter_core/default.nix1
-rw-r--r--pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix4
-rw-r--r--pkgs/development/python-modules/jupyterlab/default.nix4
-rw-r--r--pkgs/development/python-modules/kafka-python/default.nix5
-rw-r--r--pkgs/development/python-modules/kaitaistruct/default.nix1
-rw-r--r--pkgs/development/python-modules/keepkey/default.nix1
-rw-r--r--pkgs/development/python-modules/keras/default.nix4
-rw-r--r--pkgs/development/python-modules/keyutils/default.nix17
-rw-r--r--pkgs/development/python-modules/kitchen/default.nix1
-rw-r--r--pkgs/development/python-modules/kiwisolver/default.nix8
-rw-r--r--pkgs/development/python-modules/klaus/default.nix (renamed from pkgs/servers/web-apps/klaus/default.nix)8
-rw-r--r--pkgs/development/python-modules/koji/default.nix3
-rw-r--r--pkgs/development/python-modules/kombu/default.nix25
-rw-r--r--pkgs/development/python-modules/kubernetes/default.nix4
-rw-r--r--pkgs/development/python-modules/langcodes/default.nix2
-rw-r--r--pkgs/development/python-modules/ldap/default.nix4
-rw-r--r--pkgs/development/python-modules/ldap3/default.nix4
-rw-r--r--pkgs/development/python-modules/leather/default.nix1
-rw-r--r--pkgs/development/python-modules/ledgerblue/default.nix1
-rw-r--r--pkgs/development/python-modules/libagent/default.nix1
-rw-r--r--pkgs/development/python-modules/libarcus/default.nix20
-rw-r--r--pkgs/development/python-modules/libasyncns/default.nix1
-rw-r--r--pkgs/development/python-modules/libnacl/default.nix1
-rw-r--r--pkgs/development/python-modules/libsexy/default.nix1
-rw-r--r--pkgs/development/python-modules/libvirt/default.nix4
-rw-r--r--pkgs/development/python-modules/line_profiler/default.nix1
-rw-r--r--pkgs/development/python-modules/linuxfd/default.nix1
-rw-r--r--pkgs/development/python-modules/livereload/default.nix1
-rw-r--r--pkgs/development/python-modules/llvmlite/default.nix4
-rw-r--r--pkgs/development/python-modules/lmtpd/default.nix1
-rw-r--r--pkgs/development/python-modules/logfury/default.nix1
-rw-r--r--pkgs/development/python-modules/logilab/common.nix1
-rw-r--r--pkgs/development/python-modules/logilab/constraint.nix1
-rw-r--r--pkgs/development/python-modules/luftdaten/default.nix4
-rw-r--r--pkgs/development/python-modules/lxml/default.nix4
-rw-r--r--pkgs/development/python-modules/m2r/default.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/default.nix5
-rw-r--r--pkgs/development/python-modules/marionette-harness/manifestparser.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/marionette_driver.nix5
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozcrash.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozdevice.nix5
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozfile.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozhttpd.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozinfo.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/moznetwork.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozprocess.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozprofile.nix5
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozrunner.nix5
-rw-r--r--pkgs/development/python-modules/marionette-harness/moztest.nix1
-rw-r--r--pkgs/development/python-modules/marionette-harness/mozversion.nix1
-rw-r--r--pkgs/development/python-modules/markdown2/default.nix8
-rw-r--r--pkgs/development/python-modules/markdownsuperscript/default.nix1
-rw-r--r--pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix5
-rw-r--r--pkgs/development/python-modules/marshmallow/default.nix5
-rw-r--r--pkgs/development/python-modules/matplotlib/default.nix7
-rw-r--r--pkgs/development/python-modules/matrix-client/default.nix15
-rw-r--r--pkgs/development/python-modules/mccabe/default.nix1
-rw-r--r--pkgs/development/python-modules/meliae/default.nix1
-rw-r--r--pkgs/development/python-modules/mistune/default.nix1
-rw-r--r--pkgs/development/python-modules/mnemonic/default.nix7
-rw-r--r--pkgs/development/python-modules/monty/default.nix38
-rw-r--r--pkgs/development/python-modules/more-itertools/default.nix4
-rw-r--r--pkgs/development/python-modules/moretools/default.nix1
-rw-r--r--pkgs/development/python-modules/moto/default.nix3
-rw-r--r--pkgs/development/python-modules/mpi4py/default.nix1
-rw-r--r--pkgs/development/python-modules/mplleaflet/default.nix1
-rw-r--r--pkgs/development/python-modules/mpyq/default.nix1
-rw-r--r--pkgs/development/python-modules/mt-940/default.nix2
-rw-r--r--pkgs/development/python-modules/multidict/default.nix4
-rw-r--r--pkgs/development/python-modules/multipledispatch/default.nix1
-rw-r--r--pkgs/development/python-modules/mygpoclient/default.nix2
-rw-r--r--pkgs/development/python-modules/mypy/default.nix4
-rw-r--r--pkgs/development/python-modules/natsort/default.nix4
-rw-r--r--pkgs/development/python-modules/nbconvert/default.nix1
-rw-r--r--pkgs/development/python-modules/nbformat/default.nix1
-rw-r--r--pkgs/development/python-modules/nbmerge/default.nix1
-rw-r--r--pkgs/development/python-modules/nbxmpp/default.nix9
-rw-r--r--pkgs/development/python-modules/netcdf4/default.nix23
-rw-r--r--pkgs/development/python-modules/netdisco/default.nix4
-rw-r--r--pkgs/development/python-modules/nevow/default.nix4
-rw-r--r--pkgs/development/python-modules/nibabel/default.nix4
-rw-r--r--pkgs/development/python-modules/nilearn/default.nix4
-rw-r--r--pkgs/development/python-modules/nipype/default.nix4
-rw-r--r--pkgs/development/python-modules/nltk/default.nix1
-rw-r--r--pkgs/development/python-modules/nose-exclude/default.nix1
-rw-r--r--pkgs/development/python-modules/nose_warnings_filters/default.nix1
-rw-r--r--pkgs/development/python-modules/notebook/default.nix10
-rw-r--r--pkgs/development/python-modules/ntlm-auth/default.nix1
-rw-r--r--pkgs/development/python-modules/numba/default.nix4
-rw-r--r--pkgs/development/python-modules/numpy-stl/default.nix1
-rw-r--r--pkgs/development/python-modules/numpy/default.nix4
-rw-r--r--pkgs/development/python-modules/numtraits/default.nix1
-rw-r--r--pkgs/development/python-modules/odfpy/default.nix1
-rw-r--r--pkgs/development/python-modules/ofxclient/default.nix1
-rw-r--r--pkgs/development/python-modules/ofxhome/default.nix1
-rw-r--r--pkgs/development/python-modules/olefile/default.nix1
-rw-r--r--pkgs/development/python-modules/onkyo-eiscp/default.nix1
-rw-r--r--pkgs/development/python-modules/openidc-client/default.nix5
-rw-r--r--pkgs/development/python-modules/openpyxl/default.nix5
-rw-r--r--pkgs/development/python-modules/opentimestamps/default.nix9
-rw-r--r--pkgs/development/python-modules/pafy/default.nix1
-rw-r--r--pkgs/development/python-modules/pandas/0.17.1.nix5
-rw-r--r--pkgs/development/python-modules/pandas/default.nix42
-rw-r--r--pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch13
-rw-r--r--pkgs/development/python-modules/paperspace/default.nix26
-rw-r--r--pkgs/development/python-modules/parse/default.nix5
-rw-r--r--pkgs/development/python-modules/parso/default.nix5
-rw-r--r--pkgs/development/python-modules/pbr/default.nix5
-rw-r--r--pkgs/development/python-modules/pdf2image/default.nix21
-rw-r--r--pkgs/development/python-modules/pdfx/default.nix33
-rw-r--r--pkgs/development/python-modules/pelican/default.nix1
-rw-r--r--pkgs/development/python-modules/pendulum/default.nix11
-rw-r--r--pkgs/development/python-modules/pep257/default.nix1
-rw-r--r--pkgs/development/python-modules/persistent/default.nix1
-rw-r--r--pkgs/development/python-modules/pexpect/default.nix5
-rw-r--r--pkgs/development/python-modules/phonenumbers/default.nix5
-rw-r--r--pkgs/development/python-modules/phpserialize/default.nix1
-rw-r--r--pkgs/development/python-modules/piexif/default.nix1
-rw-r--r--pkgs/development/python-modules/pika-pool/default.nix1
-rw-r--r--pkgs/development/python-modules/pillow/default.nix1
-rw-r--r--pkgs/development/python-modules/pip-tools/default.nix8
-rw-r--r--pkgs/development/python-modules/pkgconfig/default.nix25
-rw-r--r--pkgs/development/python-modules/plac/default.nix1
-rw-r--r--pkgs/development/python-modules/plaid-python/default.nix24
-rw-r--r--pkgs/development/python-modules/plaster-pastedeploy/default.nix1
-rw-r--r--pkgs/development/python-modules/plaster/default.nix1
-rw-r--r--pkgs/development/python-modules/plotly/default.nix5
-rw-r--r--pkgs/development/python-modules/pluginbase/default.nix5
-rw-r--r--pkgs/development/python-modules/plumbum/default.nix1
-rw-r--r--pkgs/development/python-modules/plyfile/default.nix1
-rw-r--r--pkgs/development/python-modules/podcastparser/default.nix1
-rw-r--r--pkgs/development/python-modules/portend/default.nix8
-rw-r--r--pkgs/development/python-modules/portpicker/default.nix1
-rw-r--r--pkgs/development/python-modules/premailer/default.nix5
-rw-r--r--pkgs/development/python-modules/preshed/default.nix1
-rw-r--r--pkgs/development/python-modules/proboscis/default.nix1
-rw-r--r--pkgs/development/python-modules/prompt_toolkit/default.nix1
-rw-r--r--pkgs/development/python-modules/psd-tools/default.nix1
-rw-r--r--pkgs/development/python-modules/psutil/default.nix5
-rw-r--r--pkgs/development/python-modules/pushover/default.nix4
-rw-r--r--pkgs/development/python-modules/py/default.nix1
-rw-r--r--pkgs/development/python-modules/py3exiv2/default.nix5
-rw-r--r--pkgs/development/python-modules/py4j/default.nix7
-rw-r--r--pkgs/development/python-modules/py_scrypt/default.nix1
-rw-r--r--pkgs/development/python-modules/pyaes/default.nix1
-rw-r--r--pkgs/development/python-modules/pyasn1-modules/default.nix1
-rw-r--r--pkgs/development/python-modules/pyasn1/default.nix5
-rw-r--r--pkgs/development/python-modules/pyaxmlparser/default.nix4
-rw-r--r--pkgs/development/python-modules/pybase64/default.nix4
-rw-r--r--pkgs/development/python-modules/pybindgen/default.nix4
-rw-r--r--pkgs/development/python-modules/pyblake2/default.nix1
-rw-r--r--pkgs/development/python-modules/pybrowserid/default.nix24
-rw-r--r--pkgs/development/python-modules/pycassa/default.nix1
-rw-r--r--pkgs/development/python-modules/pychromecast/default.nix4
-rw-r--r--pkgs/development/python-modules/pycodestyle/default.nix1
-rw-r--r--pkgs/development/python-modules/pycollada/default.nix2
-rw-r--r--pkgs/development/python-modules/pycrypto/default.nix1
-rw-r--r--pkgs/development/python-modules/pycryptodome/default.nix11
-rw-r--r--pkgs/development/python-modules/pycryptodomex/default.nix5
-rw-r--r--pkgs/development/python-modules/pycuda/default.nix1
-rw-r--r--pkgs/development/python-modules/pycurl/default.nix4
-rw-r--r--pkgs/development/python-modules/pydbus/default.nix1
-rw-r--r--pkgs/development/python-modules/pydot/default.nix1
-rw-r--r--pkgs/development/python-modules/pydub/default.nix5
-rw-r--r--pkgs/development/python-modules/pyemd/default.nix1
-rw-r--r--pkgs/development/python-modules/pyexiv2/default.nix12
-rw-r--r--pkgs/development/python-modules/pyfftw/default.nix1
-rw-r--r--pkgs/development/python-modules/pyfiglet/default.nix1
-rw-r--r--pkgs/development/python-modules/pyflakes/default.nix1
-rw-r--r--pkgs/development/python-modules/pygame/default.nix1
-rw-r--r--pkgs/development/python-modules/pygeoip/default.nix1
-rw-r--r--pkgs/development/python-modules/pygit2/default.nix1
-rw-r--r--pkgs/development/python-modules/pygpgme/default.nix3
-rw-r--r--pkgs/development/python-modules/pygraphviz/default.nix1
-rw-r--r--pkgs/development/python-modules/pyhamcrest/default.nix1
-rw-r--r--pkgs/development/python-modules/pyhomematic/default.nix4
-rw-r--r--pkgs/development/python-modules/pyjwkest/default.nix1
-rw-r--r--pkgs/development/python-modules/pylast/default.nix5
-rw-r--r--pkgs/development/python-modules/pylibmc/default.nix7
-rw-r--r--pkgs/development/python-modules/pylint/default.nix7
-rw-r--r--pkgs/development/python-modules/pylru/default.nix8
-rw-r--r--pkgs/development/python-modules/pylti/default.nix4
-rw-r--r--pkgs/development/python-modules/pymc3/default.nix6
-rw-r--r--pkgs/development/python-modules/pymongo/default.nix2
-rw-r--r--pkgs/development/python-modules/pynisher/default.nix25
-rw-r--r--pkgs/development/python-modules/pyobjc/default.nix5
-rw-r--r--pkgs/development/python-modules/pyodbc/default.nix1
-rw-r--r--pkgs/development/python-modules/pyopenssl/default.nix4
-rw-r--r--pkgs/development/python-modules/pyowm/default.nix8
-rw-r--r--pkgs/development/python-modules/pyparsing/default.nix1
-rw-r--r--pkgs/development/python-modules/pyperclip/default.nix4
-rw-r--r--pkgs/development/python-modules/pyphen/default.nix1
-rw-r--r--pkgs/development/python-modules/pyproj/default.nix1
-rw-r--r--pkgs/development/python-modules/pyqt/5.x.nix25
-rw-r--r--pkgs/development/python-modules/pyramid_beaker/default.nix1
-rw-r--r--pkgs/development/python-modules/pyro/default.nix2
-rw-r--r--pkgs/development/python-modules/pyroute2/default.nix11
-rw-r--r--pkgs/development/python-modules/pyrr/default.nix1
-rw-r--r--pkgs/development/python-modules/pyscard/default.nix13
-rw-r--r--pkgs/development/python-modules/pyserial/default.nix4
-rw-r--r--pkgs/development/python-modules/pysha3/default.nix1
-rw-r--r--pkgs/development/python-modules/pyshp/default.nix1
-rw-r--r--pkgs/development/python-modules/pyside/default.nix1
-rw-r--r--pkgs/development/python-modules/pyside/generatorrunner.nix2
-rw-r--r--pkgs/development/python-modules/pyside/shiboken.nix1
-rw-r--r--pkgs/development/python-modules/pyside/tools.nix1
-rw-r--r--pkgs/development/python-modules/pyslurm/default.nix9
-rw-r--r--pkgs/development/python-modules/pysmbc/default.nix1
-rw-r--r--pkgs/development/python-modules/pysolr/default.nix26
-rw-r--r--pkgs/development/python-modules/pyspark/default.nix4
-rw-r--r--pkgs/development/python-modules/pyspf/default.nix8
-rw-r--r--pkgs/development/python-modules/pyspread/default.nix5
-rw-r--r--pkgs/development/python-modules/pysrt/default.nix1
-rw-r--r--pkgs/development/python-modules/pyte/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-asyncio/default.nix10
-rw-r--r--pkgs/development/python-modules/pytest-datafiles/default.nix1
-rw-r--r--pkgs/development/python-modules/pytest-django/default.nix1
-rw-r--r--pkgs/development/python-modules/pytest-expect/default.nix7
-rw-r--r--pkgs/development/python-modules/pytest-flakes/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-forked/default.nix1
-rw-r--r--pkgs/development/python-modules/pytest-httpbin/default.nix3
-rw-r--r--pkgs/development/python-modules/pytest-isort/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-localserver/default.nix1
-rw-r--r--pkgs/development/python-modules/pytest-mock/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-pep257/default.nix7
-rw-r--r--pkgs/development/python-modules/pytest-quickcheck/default.nix1
-rw-r--r--pkgs/development/python-modules/pytest-rerunfailures/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-timeout/default.nix7
-rw-r--r--pkgs/development/python-modules/pytest-tornado/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-warnings/default.nix1
-rw-r--r--pkgs/development/python-modules/pytest/default.nix15
-rw-r--r--pkgs/development/python-modules/python-axolotl-curve25519/default.nix8
-rw-r--r--pkgs/development/python-modules/python-axolotl/default.nix8
-rw-r--r--pkgs/development/python-modules/python-editor/default.nix1
-rw-r--r--pkgs/development/python-modules/python-fontconfig/default.nix1
-rw-r--r--pkgs/development/python-modules/python-forecastio/default.nix31
-rw-r--r--pkgs/development/python-modules/python-gnupg/default.nix4
-rw-r--r--pkgs/development/python-modules/python-hosts/default.nix33
-rw-r--r--pkgs/development/python-modules/python-openid/default.nix20
-rw-r--r--pkgs/development/python-modules/python-periphery/default.nix21
-rw-r--r--pkgs/development/python-modules/python-prctl/default.nix26
-rw-r--r--pkgs/development/python-modules/python-prctl/skip_bad_tests.patch34
-rw-r--r--pkgs/development/python-modules/python-simple-hipchat/default.nix1
-rw-r--r--pkgs/development/python-modules/python-slugify/default.nix1
-rw-r--r--pkgs/development/python-modules/python-sql/default.nix7
-rw-r--r--pkgs/development/python-modules/python-stdnum/default.nix13
-rw-r--r--pkgs/development/python-modules/python-uinput/default.nix1
-rw-r--r--pkgs/development/python-modules/python3-openid/default.nix7
-rw-r--r--pkgs/development/python-modules/pythonix/default.nix24
-rw-r--r--pkgs/development/python-modules/pytimeparse/default.nix5
-rw-r--r--pkgs/development/python-modules/pytools/default.nix4
-rw-r--r--pkgs/development/python-modules/pytorch/default.nix3
-rw-r--r--pkgs/development/python-modules/pytz/default.nix4
-rw-r--r--pkgs/development/python-modules/pytzdata/default.nix4
-rw-r--r--pkgs/development/python-modules/pyudev/default.nix7
-rw-r--r--pkgs/development/python-modules/pyusb/default.nix1
-rw-r--r--pkgs/development/python-modules/pywebdav/default.nix1
-rw-r--r--pkgs/development/python-modules/pywinrm/default.nix1
-rw-r--r--pkgs/development/python-modules/pyzufall/default.nix9
-rw-r--r--pkgs/development/python-modules/qasm2image/default.nix47
-rw-r--r--pkgs/development/python-modules/qiskit/default.nix65
-rw-r--r--pkgs/development/python-modules/qiskit/setup.py.patch21
-rw-r--r--pkgs/development/python-modules/qtconsole/default.nix1
-rw-r--r--pkgs/development/python-modules/radicale_infcloud/default.nix1
-rw-r--r--pkgs/development/python-modules/ramlfications/default.nix1
-rw-r--r--pkgs/development/python-modules/rarfile/default.nix1
-rw-r--r--pkgs/development/python-modules/rcssmin/default.nix1
-rw-r--r--pkgs/development/python-modules/readme_renderer/default.nix4
-rw-r--r--pkgs/development/python-modules/rebulk/default.nix1
-rw-r--r--pkgs/development/python-modules/recommonmark/default.nix1
-rw-r--r--pkgs/development/python-modules/redis/default.nix1
-rw-r--r--pkgs/development/python-modules/regex/default.nix4
-rw-r--r--pkgs/development/python-modules/reikna/default.nix9
-rw-r--r--pkgs/development/python-modules/relatorio/default.nix7
-rw-r--r--pkgs/development/python-modules/requests-mock/default.nix4
-rw-r--r--pkgs/development/python-modules/requests-oauthlib/default.nix5
-rw-r--r--pkgs/development/python-modules/requests-toolbelt/default.nix1
-rw-r--r--pkgs/development/python-modules/requests/default.nix4
-rw-r--r--pkgs/development/python-modules/requests_download/default.nix1
-rw-r--r--pkgs/development/python-modules/requests_ntlm/default.nix1
-rw-r--r--pkgs/development/python-modules/requestsexceptions/default.nix1
-rw-r--r--pkgs/development/python-modules/restructuredtext_lint/default.nix1
-rw-r--r--pkgs/development/python-modules/restview/default.nix9
-rw-r--r--pkgs/development/python-modules/rfc3986/default.nix1
-rw-r--r--pkgs/development/python-modules/rhpl/default.nix6
-rw-r--r--pkgs/development/python-modules/rjsmin/default.nix1
-rw-r--r--pkgs/development/python-modules/rlp/default.nix4
-rw-r--r--pkgs/development/python-modules/robotsuite/default.nix1
-rw-r--r--pkgs/development/python-modules/rocket-errbot/default.nix8
-rw-r--r--pkgs/development/python-modules/root_numpy/default.nix1
-rw-r--r--pkgs/development/python-modules/rootpy/default.nix1
-rw-r--r--pkgs/development/python-modules/rply/default.nix1
-rw-r--r--pkgs/development/python-modules/rpy2/default.nix11
-rw-r--r--pkgs/development/python-modules/s2clientprotocol/default.nix1
-rw-r--r--pkgs/development/python-modules/s3fs/default.nix2
-rw-r--r--pkgs/development/python-modules/salmon-mail/default.nix11
-rw-r--r--pkgs/development/python-modules/sampledata/default.nix1
-rw-r--r--pkgs/development/python-modules/sarge/default.nix8
-rw-r--r--pkgs/development/python-modules/scandir/default.nix8
-rw-r--r--pkgs/development/python-modules/schema/default.nix5
-rw-r--r--pkgs/development/python-modules/scikitlearn/default.nix5
-rw-r--r--pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch73
-rw-r--r--pkgs/development/python-modules/scipy/default.nix6
-rw-r--r--pkgs/development/python-modules/scp/default.nix4
-rw-r--r--pkgs/development/python-modules/scrapy/default.nix59
-rw-r--r--pkgs/development/python-modules/seaborn/default.nix1
-rw-r--r--pkgs/development/python-modules/secretstorage/default.nix1
-rw-r--r--pkgs/development/python-modules/seekpath/default.nix25
-rw-r--r--pkgs/development/python-modules/semver/default.nix1
-rw-r--r--pkgs/development/python-modules/serpy/default.nix1
-rw-r--r--pkgs/development/python-modules/serversyncstorage/default.nix4
-rw-r--r--pkgs/development/python-modules/setuptools/default.nix6
-rw-r--r--pkgs/development/python-modules/setuptools_scm/default.nix5
-rw-r--r--pkgs/development/python-modules/shapely/default.nix1
-rw-r--r--pkgs/development/python-modules/simanneal/default.nix1
-rw-r--r--pkgs/development/python-modules/simpleeval/default.nix7
-rw-r--r--pkgs/development/python-modules/simplejson/default.nix5
-rw-r--r--pkgs/development/python-modules/sip/default.nix3
-rw-r--r--pkgs/development/python-modules/sklearn-deap/default.nix28
-rw-r--r--pkgs/development/python-modules/sleekxmpp/default.nix8
-rw-r--r--pkgs/development/python-modules/smart_open/default.nix1
-rw-r--r--pkgs/development/python-modules/snakeviz/default.nix7
-rw-r--r--pkgs/development/python-modules/sockjs-tornado/default.nix10
-rw-r--r--pkgs/development/python-modules/soco/default.nix28
-rw-r--r--pkgs/development/python-modules/sounddevice/default.nix15
-rw-r--r--pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch34
-rw-r--r--pkgs/development/python-modules/spacy/models.nix1
-rw-r--r--pkgs/development/python-modules/spake2/default.nix2
-rw-r--r--pkgs/development/python-modules/spambayes/default.nix1
-rw-r--r--pkgs/development/python-modules/spglib/default.nix27
-rw-r--r--pkgs/development/python-modules/sphinx-testing/default.nix1
-rw-r--r--pkgs/development/python-modules/sphinx/default.nix7
-rw-r--r--pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix4
-rw-r--r--pkgs/development/python-modules/sphinxcontrib-websupport/default.nix5
-rw-r--r--pkgs/development/python-modules/splinter/default.nix4
-rw-r--r--pkgs/development/python-modules/sqlalchemy/default.nix7
-rw-r--r--pkgs/development/python-modules/sqlmap/default.nix5
-rw-r--r--pkgs/development/python-modules/statsmodels/default.nix5
-rw-r--r--pkgs/development/python-modules/stevedore/default.nix1
-rw-r--r--pkgs/development/python-modules/stringtemplate/default.nix3
-rw-r--r--pkgs/development/python-modules/stripe/default.nix4
-rw-r--r--pkgs/development/python-modules/subliminal/default.nix7
-rw-r--r--pkgs/development/python-modules/subprocess32/default.nix5
-rw-r--r--pkgs/development/python-modules/supervise_api/default.nix4
-rw-r--r--pkgs/development/python-modules/sympy/default.nix19
-rw-r--r--pkgs/development/python-modules/syncserver/default.nix7
-rw-r--r--pkgs/development/python-modules/tables/default.nix13
-rw-r--r--pkgs/development/python-modules/tempora/default.nix1
-rw-r--r--pkgs/development/python-modules/tensorflow-tensorboard/default.nix18
-rw-r--r--pkgs/development/python-modules/tensorflow/bin.nix7
-rw-r--r--pkgs/development/python-modules/tensorflow/default.nix1
-rw-r--r--pkgs/development/python-modules/testfixtures/default.nix4
-rw-r--r--pkgs/development/python-modules/textacy/default.nix1
-rw-r--r--pkgs/development/python-modules/texttable/default.nix4
-rw-r--r--pkgs/development/python-modules/thespian/default.nix1
-rw-r--r--pkgs/development/python-modules/thinc/default.nix4
-rw-r--r--pkgs/development/python-modules/thumbor/default.nix13
-rw-r--r--pkgs/development/python-modules/tiros/default.nix1
-rw-r--r--pkgs/development/python-modules/titlecase/default.nix1
-rw-r--r--pkgs/development/python-modules/todoist/default.nix7
-rw-r--r--pkgs/development/python-modules/tokenserver/default.nix7
-rw-r--r--pkgs/development/python-modules/toolz/default.nix5
-rw-r--r--pkgs/development/python-modules/torchvision/default.nix2
-rw-r--r--pkgs/development/python-modules/tqdm/default.nix5
-rw-r--r--pkgs/development/python-modules/traitlets/default.nix1
-rw-r--r--pkgs/development/python-modules/transaction/default.nix1
-rw-r--r--pkgs/development/python-modules/treq/default.nix1
-rw-r--r--pkgs/development/python-modules/trezor/default.nix1
-rw-r--r--pkgs/development/python-modules/twill/default.nix14
-rw-r--r--pkgs/development/python-modules/twine/default.nix1
-rw-r--r--pkgs/development/python-modules/twisted/default.nix14
-rw-r--r--pkgs/development/python-modules/txaio/default.nix5
-rw-r--r--pkgs/development/python-modules/txtorcon/default.nix4
-rw-r--r--pkgs/development/python-modules/typed-ast/default.nix1
-rw-r--r--pkgs/development/python-modules/typeguard/default.nix1
-rw-r--r--pkgs/development/python-modules/tzlocal/default.nix1
-rw-r--r--pkgs/development/python-modules/u-msgpack-python/default.nix7
-rw-r--r--pkgs/development/python-modules/ua-parser/default.nix4
-rw-r--r--pkgs/development/python-modules/ukpostcodeparser/default.nix1
-rw-r--r--pkgs/development/python-modules/uncertainties/default.nix3
-rw-r--r--pkgs/development/python-modules/unidecode/default.nix1
-rw-r--r--pkgs/development/python-modules/unifi/default.nix1
-rw-r--r--pkgs/development/python-modules/unittest-xml-reporting/default.nix5
-rw-r--r--pkgs/development/python-modules/uproot/default.nix4
-rw-r--r--pkgs/development/python-modules/uranium/default.nix13
-rw-r--r--pkgs/development/python-modules/uritools/default.nix4
-rw-r--r--pkgs/development/python-modules/urllib3/default.nix5
-rw-r--r--pkgs/development/python-modules/urwid/default.nix1
-rw-r--r--pkgs/development/python-modules/user-agents/default.nix2
-rw-r--r--pkgs/development/python-modules/vcrpy/default.nix5
-rw-r--r--pkgs/development/python-modules/vcversioner/default.nix1
-rw-r--r--pkgs/development/python-modules/vega/default.nix5
-rw-r--r--pkgs/development/python-modules/vine/default.nix1
-rw-r--r--pkgs/development/python-modules/virtkey/default.nix8
-rw-r--r--pkgs/development/python-modules/virtualenv/default.nix5
-rw-r--r--pkgs/development/python-modules/vobject/default.nix4
-rw-r--r--pkgs/development/python-modules/vowpalwabbit/default.nix16
-rw-r--r--pkgs/development/python-modules/warrant/default.nix10
-rw-r--r--pkgs/development/python-modules/webassets/default.nix10
-rw-r--r--pkgs/development/python-modules/webencodings/default.nix9
-rw-r--r--pkgs/development/python-modules/websockets/default.nix14
-rw-r--r--pkgs/development/python-modules/websockets_client/default.nix4
-rw-r--r--pkgs/development/python-modules/werkzeug/default.nix1
-rw-r--r--pkgs/development/python-modules/wheel/default.nix5
-rw-r--r--pkgs/development/python-modules/whoosh/default.nix3
-rw-r--r--pkgs/development/python-modules/widgetsnbextension/default.nix1
-rw-r--r--pkgs/development/python-modules/wptserve/default.nix1
-rw-r--r--pkgs/development/python-modules/ws4py/default.nix1
-rw-r--r--pkgs/development/python-modules/xarray/default.nix4
-rw-r--r--pkgs/development/python-modules/xgboost/default.nix7
-rw-r--r--pkgs/development/python-modules/xlwt/default.nix10
-rw-r--r--pkgs/development/python-modules/xml2rfc/default.nix22
-rw-r--r--pkgs/development/python-modules/xmpppy/default.nix1
-rw-r--r--pkgs/development/python-modules/xstatic-jquery/default.nix2
-rw-r--r--pkgs/development/python-modules/yamllint/default.nix1
-rw-r--r--pkgs/development/python-modules/yapf/default.nix5
-rw-r--r--pkgs/development/python-modules/yarl/default.nix4
-rw-r--r--pkgs/development/python-modules/yenc/default.nix5
-rw-r--r--pkgs/development/python-modules/yolk/default.nix1
-rw-r--r--pkgs/development/python-modules/zc_lockfile/default.nix7
-rw-r--r--pkgs/development/python-modules/zconfig/default.nix1
-rw-r--r--pkgs/development/python-modules/zeep/default.nix8
-rw-r--r--pkgs/development/python-modules/zeroconf/default.nix1
-rw-r--r--pkgs/development/python-modules/zetup/default.nix1
-rw-r--r--pkgs/development/python-modules/zipfile36/default.nix1
-rw-r--r--pkgs/development/python-modules/zipstream/default.nix12
-rw-r--r--pkgs/development/python-modules/zodb/default.nix1
-rw-r--r--pkgs/development/python-modules/zodbpickle/default.nix5
-rw-r--r--pkgs/development/python-modules/zope_interface/default.nix5
-rw-r--r--pkgs/development/python-modules/zxcvbn-python/default.nix1
-rw-r--r--pkgs/development/r-modules/bioc-annotation-packages.nix310
-rw-r--r--pkgs/development/r-modules/bioc-experiment-packages.nix665
-rw-r--r--pkgs/development/r-modules/bioc-packages.nix3018
-rw-r--r--pkgs/development/r-modules/cran-packages.nix4762
-rw-r--r--pkgs/development/r-modules/default.nix19
-rwxr-xr-xpkgs/development/r-modules/generate-r-packages.R2
-rw-r--r--pkgs/development/r-modules/patches/Rhdf5lib.patch12
-rw-r--r--pkgs/development/ruby-modules/bundler/default.nix4
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix45
-rw-r--r--pkgs/development/ruby-modules/solargraph/Gemfile.lock20
-rw-r--r--pkgs/development/ruby-modules/solargraph/gemset.nix38
-rw-r--r--pkgs/development/tools/analysis/autoflake/default.nix4
-rw-r--r--pkgs/development/tools/analysis/checkstyle/default.nix10
-rw-r--r--pkgs/development/tools/analysis/cppcheck/default.nix4
-rw-r--r--pkgs/development/tools/analysis/egypt/default.nix2
-rw-r--r--pkgs/development/tools/analysis/flow/default.nix14
-rw-r--r--pkgs/development/tools/analysis/pmd/default.nix4
-rw-r--r--pkgs/development/tools/analysis/radare/default.nix2
-rw-r--r--pkgs/development/tools/analysis/radare/ired.nix2
-rw-r--r--pkgs/development/tools/analysis/radare2-cutter/default.nix33
-rw-r--r--pkgs/development/tools/analysis/radare2/default.nix14
-rw-r--r--pkgs/development/tools/analysis/rr/default.nix2
-rw-r--r--pkgs/development/tools/analysis/snowman/default.nix6
-rw-r--r--pkgs/development/tools/aws-sam-cli/default.nix37
-rw-r--r--pkgs/development/tools/boomerang/default.nix6
-rw-r--r--pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix80
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix60
-rw-r--r--pkgs/development/tools/build-managers/bloop/default.nix61
-rw-r--r--pkgs/development/tools/build-managers/buildbot/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/buildbot/pkg.nix4
-rw-r--r--pkgs/development/tools/build-managers/buildbot/plugins.nix10
-rw-r--r--pkgs/development/tools/build-managers/buildbot/worker.nix4
-rw-r--r--pkgs/development/tools/build-managers/cask/default.nix11
-rw-r--r--pkgs/development/tools/build-managers/cmake/default.nix2
-rwxr-xr-xpkgs/development/tools/build-managers/cmake/setup-hook.sh2
-rw-r--r--pkgs/development/tools/build-managers/conan/default.nix9
-rw-r--r--pkgs/development/tools/build-managers/gradle/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/icmake/default.nix10
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix1
-rw-r--r--pkgs/development/tools/build-managers/ninja/default.nix8
-rw-r--r--pkgs/development/tools/build-managers/pants/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/redo/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/sbt/default.nix2
-rw-r--r--pkgs/development/tools/build-managers/shards/default.nix6
-rw-r--r--pkgs/development/tools/buildah/default.nix11
-rw-r--r--pkgs/development/tools/cdecl/default.nix2
-rw-r--r--pkgs/development/tools/continuous-integration/drone-cli/default.nix24
-rw-r--r--pkgs/development/tools/continuous-integration/drone-cli/deps.nix274
-rw-r--r--pkgs/development/tools/continuous-integration/gitlab-runner/default.nix8
-rw-r--r--pkgs/development/tools/database/liquibase/default.nix4
-rw-r--r--pkgs/development/tools/database/sqlitebrowser/default.nix2
-rw-r--r--pkgs/development/tools/devtodo/default.nix2
-rw-r--r--pkgs/development/tools/documentation/mkdocs/default.nix4
-rw-r--r--pkgs/development/tools/easyjson/default.nix6
-rw-r--r--pkgs/development/tools/fac/default.nix4
-rw-r--r--pkgs/development/tools/fac/deps.nix20
-rw-r--r--pkgs/development/tools/flatpak-builder/default.nix6
-rw-r--r--pkgs/development/tools/flootty/default.nix1
-rw-r--r--pkgs/development/tools/flyway/default.nix6
-rw-r--r--pkgs/development/tools/gauge/default.nix4
-rw-r--r--pkgs/development/tools/godot/default.nix4
-rw-r--r--pkgs/development/tools/haskell/multi-ghc-travis/default.nix14
-rw-r--r--pkgs/development/tools/hcloud/default.nix6
-rw-r--r--pkgs/development/tools/java/cfr/default.nix4
-rw-r--r--pkgs/development/tools/jira_cli/default.nix2
-rw-r--r--pkgs/development/tools/mdk/default.nix2
-rw-r--r--pkgs/development/tools/misc/babeltrace/default.nix6
-rw-r--r--pkgs/development/tools/misc/binutils/default.nix2
-rw-r--r--pkgs/development/tools/misc/cgdb/default.nix2
-rw-r--r--pkgs/development/tools/misc/circleci-cli/default.nix38
-rw-r--r--pkgs/development/tools/misc/creduce/default.nix2
-rw-r--r--pkgs/development/tools/misc/csmith/default.nix2
-rw-r--r--pkgs/development/tools/misc/dialog/default.nix4
-rw-r--r--pkgs/development/tools/misc/doclifter/default.nix6
-rw-r--r--pkgs/development/tools/misc/editorconfig-core-c/default.nix2
-rw-r--r--pkgs/development/tools/misc/eggdbus/default.nix2
-rw-r--r--pkgs/development/tools/misc/elfutils/default.nix4
-rw-r--r--pkgs/development/tools/misc/epm/default.nix2
-rw-r--r--pkgs/development/tools/misc/fswatch/default.nix4
-rw-r--r--pkgs/development/tools/misc/gdbgui/default.nix1
-rw-r--r--pkgs/development/tools/misc/gob2/default.nix2
-rw-r--r--pkgs/development/tools/misc/gtkperf/bench.patch60
-rw-r--r--pkgs/development/tools/misc/gtkperf/default.nix24
-rw-r--r--pkgs/development/tools/misc/intel-gpu-tools/default.nix2
-rw-r--r--pkgs/development/tools/misc/jscoverage/default.nix2
-rw-r--r--pkgs/development/tools/misc/lit/default.nix5
-rw-r--r--pkgs/development/tools/misc/msitools/default.nix2
-rw-r--r--pkgs/development/tools/misc/patchelf/default.nix2
-rw-r--r--pkgs/development/tools/misc/prelink/default.nix2
-rw-r--r--pkgs/development/tools/misc/strace/default.nix6
-rw-r--r--pkgs/development/tools/misc/sysbench/default.nix6
-rw-r--r--pkgs/development/tools/misc/tokei/default.nix6
-rw-r--r--pkgs/development/tools/misc/uhd/default.nix16
-rw-r--r--pkgs/development/tools/misc/ycmd/default.nix13
-rw-r--r--pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch33
-rw-r--r--pkgs/development/tools/misc/yodl/default.nix10
-rw-r--r--pkgs/development/tools/node-webkit/nw12.nix2
-rw-r--r--pkgs/development/tools/nwjs/default.nix4
-rw-r--r--pkgs/development/tools/ocaml/cppo/default.nix45
-rw-r--r--pkgs/development/tools/ocaml/jbuilder/default.nix6
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix4
-rw-r--r--pkgs/development/tools/ocaml/ocaml-top/default.nix11
-rw-r--r--pkgs/development/tools/ocaml/ocp-build/default.nix9
-rw-r--r--pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix37
-rw-r--r--pkgs/development/tools/ocaml/ocp-indent/default.nix16
-rw-r--r--pkgs/development/tools/ocaml/ocp-index/default.nix34
-rw-r--r--pkgs/development/tools/ocaml/utop/default.nix24
-rw-r--r--pkgs/development/tools/packer/default.nix4
-rw-r--r--pkgs/development/tools/parsing/antlr/2.7.7.nix2
-rw-r--r--pkgs/development/tools/parsing/antlr/3.4.nix2
-rw-r--r--pkgs/development/tools/parsing/antlr/3.5.nix2
-rw-r--r--pkgs/development/tools/parsing/antlr/4.7.nix2
-rw-r--r--pkgs/development/tools/parsing/byacc/default.nix4
-rw-r--r--pkgs/development/tools/parsing/ragel/default.nix2
-rw-r--r--pkgs/development/tools/pipenv/default.nix4
-rw-r--r--pkgs/development/tools/profiling/EZTrace/default.nix2
-rw-r--r--pkgs/development/tools/profiling/sysprof/default.nix10
-rw-r--r--pkgs/development/tools/pyre/default.nix71
-rw-r--r--pkgs/development/tools/remarshal/default.nix1
-rw-r--r--pkgs/development/tools/repository-managers/nexus/default.nix6
-rw-r--r--pkgs/development/tools/selenium/chromedriver/default.nix6
-rw-r--r--pkgs/development/tools/spirv-tools/default.nix10
-rw-r--r--pkgs/development/tools/sqlint/Gemfile2
-rw-r--r--pkgs/development/tools/sqlint/Gemfile.lock17
-rw-r--r--pkgs/development/tools/sqlint/default.nix34
-rw-r--r--pkgs/development/tools/sqlint/gemset.nix28
-rw-r--r--pkgs/development/tools/tradcpp/default.nix2
-rw-r--r--pkgs/development/tools/vagrant/default.nix4
-rw-r--r--pkgs/development/tools/valadoc/default.nix2
-rw-r--r--pkgs/development/tools/vcstool/default.nix4
-rw-r--r--pkgs/development/tools/vim-vint/default.nix4
-rw-r--r--pkgs/development/tools/vulkan-validation-layers/default.nix28
-rw-r--r--pkgs/development/tools/xcbuild/default.nix6
-rw-r--r--pkgs/development/tools/xcbuild/platforms.nix (renamed from pkgs/development/tools/xcbuild/platform.nix)38
-rw-r--r--pkgs/development/tools/xcbuild/sdk.nix35
-rw-r--r--pkgs/development/tools/xcbuild/sdks.nix28
-rw-r--r--pkgs/development/tools/xcbuild/setup-hook.sh8
-rw-r--r--pkgs/development/tools/xcbuild/toolchain.nix123
-rw-r--r--pkgs/development/tools/xcbuild/toolchains.nix71
-rw-r--r--pkgs/development/tools/xcbuild/wrapper.nix163
-rw-r--r--pkgs/development/tools/yarn/default.nix4
-rw-r--r--pkgs/development/tools/yq/default.nix4
-rw-r--r--pkgs/development/web/csslint/default.nix2
-rw-r--r--pkgs/development/web/grails/default.nix4
-rw-r--r--pkgs/development/web/kcgi/default.nix4
-rw-r--r--pkgs/development/web/nodejs/v10.nix4
-rw-r--r--pkgs/development/web/nodejs/v6.nix4
-rw-r--r--pkgs/development/web/nodejs/v8.nix4
-rw-r--r--pkgs/development/web/nodejs/v9.nix11
-rw-r--r--pkgs/development/web/remarkjs/node-packages.nix1051
-rw-r--r--pkgs/development/web/remarkjs/nodepkgs.nix2
-rw-r--r--pkgs/games/airstrike/default.nix2
-rw-r--r--pkgs/games/alienarena/default.nix2
-rw-r--r--pkgs/games/anki/default.nix4
-rw-r--r--pkgs/games/astromenace/default.nix2
-rw-r--r--pkgs/games/ball-and-paddle/default.nix2
-rw-r--r--pkgs/games/chocolate-doom/default.nix1
-rw-r--r--pkgs/games/dwarf-fortress/default.nix67
-rw-r--r--pkgs/games/dwarf-fortress/dfhack/default.nix69
-rw-r--r--pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch23
-rw-r--r--pkgs/games/dwarf-fortress/dwarf-therapist/default.nix20
-rw-r--r--pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix20
-rw-r--r--pkgs/games/dwarf-fortress/game.json86
-rw-r--r--pkgs/games/dwarf-fortress/game.nix59
-rw-r--r--pkgs/games/dwarf-fortress/lazy-pack.nix36
-rw-r--r--pkgs/games/dwarf-fortress/legends-browser/default.nix36
-rw-r--r--pkgs/games/dwarf-fortress/soundsense.nix2
-rw-r--r--pkgs/games/dwarf-fortress/themes/default.nix16
-rw-r--r--pkgs/games/dwarf-fortress/twbt/default.nix35
-rw-r--r--pkgs/games/dwarf-fortress/unfuck.nix18
-rwxr-xr-xpkgs/games/dwarf-fortress/update.sh42
-rw-r--r--pkgs/games/dwarf-fortress/wrapper/default.nix50
-rw-r--r--pkgs/games/dxx-rebirth/default.nix2
-rw-r--r--pkgs/games/exult/default.nix1
-rw-r--r--pkgs/games/ezquake/default.nix6
-rw-r--r--pkgs/games/factorio/default.nix12
-rw-r--r--pkgs/games/freeciv/default.nix1
-rw-r--r--pkgs/games/freedink/default.nix1
-rw-r--r--pkgs/games/gcompris/default.nix4
-rw-r--r--pkgs/games/gshogi/default.nix37
-rw-r--r--pkgs/games/gzdoom/default.nix4
-rw-r--r--pkgs/games/hedgewars/default.nix11
-rw-r--r--pkgs/games/hexen/default.nix2
-rw-r--r--pkgs/games/hyperrogue/default.nix26
-rw-r--r--pkgs/games/ivan/default.nix12
-rw-r--r--pkgs/games/lbreakout2/default.nix1
-rw-r--r--pkgs/games/liberal-crime-squad/default.nix6
-rw-r--r--pkgs/games/micropolis/default.nix49
-rw-r--r--pkgs/games/minecraft-server/default.nix2
-rw-r--r--pkgs/games/multimc/default.nix14
-rw-r--r--pkgs/games/nethack/default.nix20
-rw-r--r--pkgs/games/openclonk/default.nix2
-rw-r--r--pkgs/games/openrct2/default.nix22
-rw-r--r--pkgs/games/openxcom/default.nix2
-rw-r--r--pkgs/games/orthorobot/default.nix32
-rw-r--r--pkgs/games/quake3/content/demo.nix2
-rw-r--r--pkgs/games/quake3/content/pointrelease.nix2
-rw-r--r--pkgs/games/racer/default.nix2
-rw-r--r--pkgs/games/rogue/default.nix2
-rw-r--r--pkgs/games/scrolls/default.nix2
-rw-r--r--pkgs/games/scummvm/default.nix2
-rw-r--r--pkgs/games/spring/default.nix2
-rw-r--r--pkgs/games/spring/springlobby.nix4
-rw-r--r--pkgs/games/tennix/default.nix2
-rw-r--r--pkgs/games/terraria-server/default.nix2
-rw-r--r--pkgs/games/unvanquished/default.nix69
-rw-r--r--pkgs/games/warzone2100/default.nix4
-rw-r--r--pkgs/games/wesnoth/default.nix4
-rw-r--r--pkgs/games/xbomb/default.nix2
-rw-r--r--pkgs/games/xmoto/default.nix2
-rw-r--r--pkgs/games/xonotic/default.nix2
-rw-r--r--pkgs/games/xsnow/default.nix2
-rw-r--r--pkgs/games/xsokoban/default.nix2
-rw-r--r--pkgs/games/zoom/default.nix2
-rw-r--r--pkgs/misc/base16-builder/node-packages-generated.nix1843
-rw-r--r--pkgs/misc/base16-builder/node-packages.nix9
-rw-r--r--pkgs/misc/brightnessctl/default.nix29
-rw-r--r--pkgs/misc/cups/cups-pk-helper.nix2
-rw-r--r--pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/brgenml1lpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/canon/default.nix10
-rw-r--r--pkgs/misc/cups/drivers/hll2390dw-cups/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/kyocera/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix45
-rw-r--r--pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix43
-rw-r--r--pkgs/misc/cups/filters.nix2
-rw-r--r--pkgs/misc/drivers/epkowa/default.nix36
-rw-r--r--pkgs/misc/drivers/epkowa/firmware_location.patch3
-rw-r--r--pkgs/misc/drivers/foomatic-filters/default.nix2
-rw-r--r--pkgs/misc/drivers/gutenprint/bin.nix2
-rw-r--r--pkgs/misc/drivers/hplip/default.nix43
-rw-r--r--pkgs/misc/drivers/postscript-lexmark/default.nix2
-rw-r--r--pkgs/misc/emulators/bsod/default.nix2
-rw-r--r--pkgs/misc/emulators/citra/default.nix20
-rw-r--r--pkgs/misc/emulators/dlx/default.nix2
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix103
-rw-r--r--pkgs/misc/emulators/epsxe/default.nix2
-rw-r--r--pkgs/misc/emulators/firebird-emu/default.nix38
-rw-r--r--pkgs/misc/emulators/fs-uae/default.nix2
-rw-r--r--pkgs/misc/emulators/hatari/default.nix2
-rw-r--r--pkgs/misc/emulators/higan/default.nix2
-rw-r--r--pkgs/misc/emulators/libdsk/default.nix2
-rw-r--r--pkgs/misc/emulators/mgba/default.nix54
-rw-r--r--pkgs/misc/emulators/pcsx2/default.nix2
-rw-r--r--pkgs/misc/emulators/rpcs3/default.nix50
-rw-r--r--pkgs/misc/emulators/snes9x-gtk/default.nix26
-rw-r--r--pkgs/misc/emulators/termtekst/default.nix36
-rw-r--r--pkgs/misc/emulators/wine/packages.nix5
-rw-r--r--pkgs/misc/emulators/wine/sources.nix10
-rw-r--r--pkgs/misc/mxt-app/default.nix6
-rw-r--r--pkgs/misc/screensavers/electricsheep/default.nix2
-rw-r--r--pkgs/misc/screensavers/xautolock/default.nix2
-rw-r--r--pkgs/misc/screensavers/xlockmore/default.nix2
-rw-r--r--pkgs/misc/seafile-shared/default.nix19
-rw-r--r--pkgs/misc/themes/adapta/default.nix4
-rw-r--r--pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix2
-rw-r--r--pkgs/misc/themes/jade1/default.nix4
-rw-r--r--pkgs/misc/uboot/default.nix35
-rw-r--r--pkgs/misc/urbit/default.nix2
-rw-r--r--pkgs/misc/vim-plugins/default.nix583
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names2
-rw-r--r--pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim1
-rw-r--r--pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme2
-rw-r--r--pkgs/misc/vscode-extensions/cpptools/default.nix4
-rw-r--r--pkgs/misc/vscode-extensions/python/default.nix8
-rw-r--r--pkgs/os-specific/bsd/netbsd/default.nix11
-rw-r--r--pkgs/os-specific/bsd/netbsd/locale.patch85
-rw-r--r--pkgs/os-specific/darwin/apple-sdk/default.nix23
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix5
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix5
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix6
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix6
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix5
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix14
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix2
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix2
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix6
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix8
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix6
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix5
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix5
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/top/default.nix5
-rw-r--r--pkgs/os-specific/darwin/insert_dylib/default.nix4
-rw-r--r--pkgs/os-specific/darwin/iproute2mac/default.nix38
-rw-r--r--pkgs/os-specific/darwin/security-tool/default.nix4
-rw-r--r--pkgs/os-specific/darwin/trash/default.nix4
-rw-r--r--pkgs/os-specific/darwin/xcode/default.nix8
-rw-r--r--pkgs/os-specific/darwin/xcode/sdk-pkgs.nix (renamed from pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix)11
-rw-r--r--pkgs/os-specific/gnu/default.nix4
-rw-r--r--pkgs/os-specific/linux/alsa-firmware/default.nix7
-rw-r--r--pkgs/os-specific/linux/alsa-lib/default.nix5
-rw-r--r--pkgs/os-specific/linux/alsa-oss/default.nix5
-rw-r--r--pkgs/os-specific/linux/alsa-plugins/default.nix5
-rw-r--r--pkgs/os-specific/linux/alsa-tools/default.nix5
-rw-r--r--pkgs/os-specific/linux/alsa-utils/default.nix6
-rw-r--r--pkgs/os-specific/linux/atop/default.nix2
-rw-r--r--pkgs/os-specific/linux/audit/default.nix2
-rw-r--r--pkgs/os-specific/linux/batman-adv/alfred.nix2
-rw-r--r--pkgs/os-specific/linux/batman-adv/batctl.nix2
-rw-r--r--pkgs/os-specific/linux/bluez/default.nix4
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix2
-rw-r--r--pkgs/os-specific/linux/checksec/default.nix2
-rw-r--r--pkgs/os-specific/linux/conntrack-tools/default.nix2
-rw-r--r--pkgs/os-specific/linux/criu/default.nix2
-rw-r--r--pkgs/os-specific/linux/cryptsetup/default.nix32
-rw-r--r--pkgs/os-specific/linux/dmraid/default.nix22
-rw-r--r--pkgs/os-specific/linux/dpdk/default.nix2
-rw-r--r--pkgs/os-specific/linux/eventstat/default.nix4
-rw-r--r--pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix2
-rw-r--r--pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix2
-rw-r--r--pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix49
-rw-r--r--pkgs/os-specific/linux/firmware/raspberrypi/default.nix4
-rw-r--r--pkgs/os-specific/linux/fnotifystat/default.nix4
-rw-r--r--pkgs/os-specific/linux/forkstat/default.nix4
-rw-r--r--pkgs/os-specific/linux/fswebcam/default.nix2
-rw-r--r--pkgs/os-specific/linux/fuse/common.nix6
-rw-r--r--pkgs/os-specific/linux/fuse/default.nix4
-rw-r--r--pkgs/os-specific/linux/fwts/default.nix4
-rw-r--r--pkgs/os-specific/linux/google-authenticator/default.nix2
-rw-r--r--pkgs/os-specific/linux/hwdata/default.nix6
-rw-r--r--pkgs/os-specific/linux/ioport/default.nix2
-rw-r--r--pkgs/os-specific/linux/iproute/default.nix4
-rw-r--r--pkgs/os-specific/linux/iptables/default.nix2
-rw-r--r--pkgs/os-specific/linux/iwd/default.nix9
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix1389
-rw-r--r--pkgs/os-specific/linux/kernel/copperhead-4-14.patch2864
-rw-r--r--pkgs/os-specific/linux/kernel/generic.nix15
-rw-r--r--pkgs/os-specific/linux/kernel/hardened-config.nix7
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.14.nix9
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.16.nix18
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.17.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.4.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.9.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix19
-rw-r--r--pkgs/os-specific/linux/kernel/linux-mptcp-93.nix47
-rw-r--r--pkgs/os-specific/linux/kernel/linux-mptcp.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-rpi.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix25
-rw-r--r--pkgs/os-specific/linux/keyutils/default.nix2
-rw-r--r--pkgs/os-specific/linux/kmod-debian-aliases/default.nix2
-rw-r--r--pkgs/os-specific/linux/kmscon/default.nix2
-rw-r--r--pkgs/os-specific/linux/libsmbios/default.nix4
-rw-r--r--pkgs/os-specific/linux/libvolume_id/default.nix2
-rw-r--r--pkgs/os-specific/linux/lm-sensors/default.nix2
-rw-r--r--pkgs/os-specific/linux/mcelog/default.nix4
-rw-r--r--pkgs/os-specific/linux/multipath-tools/default.nix2
-rw-r--r--pkgs/os-specific/linux/musl/default.nix2
-rw-r--r--pkgs/os-specific/linux/nftables/default.nix6
-rwxr-xr-xpkgs/os-specific/linux/nvidia-x11/builder.sh1
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/default.nix12
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch19
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/generic.nix5
-rw-r--r--pkgs/os-specific/linux/odp-dpdk/default.nix2
-rw-r--r--pkgs/os-specific/linux/otpw/default.nix2
-rw-r--r--pkgs/os-specific/linux/pagemon/default.nix4
-rw-r--r--pkgs/os-specific/linux/pam_krb5/default.nix2
-rw-r--r--pkgs/os-specific/linux/paxctl/default.nix2
-rw-r--r--pkgs/os-specific/linux/plymouth/default.nix2
-rw-r--r--pkgs/os-specific/linux/pm-utils/default.nix2
-rw-r--r--pkgs/os-specific/linux/pommed-light/default.nix6
-rw-r--r--pkgs/os-specific/linux/pps-tools/default.nix34
-rw-r--r--pkgs/os-specific/linux/pscircle/default.nix28
-rw-r--r--pkgs/os-specific/linux/rdma-core/default.nix8
-rw-r--r--pkgs/os-specific/linux/s6-linux-utils/default.nix2
-rw-r--r--pkgs/os-specific/linux/smem/default.nix2
-rw-r--r--pkgs/os-specific/linux/smemstat/default.nix4
-rw-r--r--pkgs/os-specific/linux/spl/default.nix2
-rw-r--r--pkgs/os-specific/linux/sssd/default.nix4
-rw-r--r--pkgs/os-specific/linux/sysstat/default.nix4
-rw-r--r--pkgs/os-specific/linux/thunderbolt/default.nix21
-rw-r--r--pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch48
-rw-r--r--pkgs/os-specific/linux/tiscamera/default.nix98
-rw-r--r--pkgs/os-specific/linux/udisks/1-default.nix2
-rw-r--r--pkgs/os-specific/linux/udisks/2-default.nix82
-rw-r--r--pkgs/os-specific/linux/udisks/fix-paths.patch131
-rw-r--r--pkgs/os-specific/linux/usbguard/default.nix4
-rw-r--r--pkgs/os-specific/linux/v4l-utils/default.nix2
-rw-r--r--pkgs/os-specific/linux/wireguard/default.nix9
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix14
-rw-r--r--pkgs/servers/apache-kafka/default.nix6
-rw-r--r--pkgs/servers/asterisk/default.nix6
-rw-r--r--pkgs/servers/clickhouse/default.nix20
-rw-r--r--pkgs/servers/clickhouse/find-mysql.patch11
-rw-r--r--pkgs/servers/computing/slurm/default.nix15
-rw-r--r--pkgs/servers/dict/default.nix2
-rw-r--r--pkgs/servers/dns/bind/default.nix13
-rw-r--r--pkgs/servers/dns/coredns/default.nix2
-rw-r--r--pkgs/servers/dns/dnsdist/default.nix4
-rw-r--r--pkgs/servers/dns/knot-dns/default.nix6
-rw-r--r--pkgs/servers/dns/knot-resolver/default.nix12
-rw-r--r--pkgs/servers/dns/nsd/default.nix6
-rw-r--r--pkgs/servers/dns/powerdns/default.nix4
-rw-r--r--pkgs/servers/foundationdb/default.nix94
-rw-r--r--pkgs/servers/foundationdb/ldflags-5.1.patch90
-rw-r--r--pkgs/servers/foundationdb/ldflags.patch14
-rw-r--r--pkgs/servers/gpsd/0002-scons-envs-patch.patch11
-rw-r--r--pkgs/servers/gpsd/default.nix19
-rw-r--r--pkgs/servers/h2/default.nix2
-rw-r--r--pkgs/servers/holochain-go/default.nix29
-rw-r--r--pkgs/servers/holochain-go/deps.nix1056
-rw-r--r--pkgs/servers/home-assistant/component-packages.nix66
-rw-r--r--pkgs/servers/home-assistant/default.nix26
-rw-r--r--pkgs/servers/home-assistant/frontend.nix13
-rw-r--r--pkgs/servers/http/apache-modules/tomcat-connectors/default.nix2
-rw-r--r--pkgs/servers/http/couchdb/2.0.0.nix4
-rw-r--r--pkgs/servers/http/hiawatha/default.nix43
-rw-r--r--pkgs/servers/http/jboss/default.nix2
-rw-r--r--pkgs/servers/http/jetty/default.nix2
-rw-r--r--pkgs/servers/http/lighttpd/default.nix2
-rw-r--r--pkgs/servers/http/micro-httpd/default.nix2
-rw-r--r--pkgs/servers/http/mini-httpd/default.nix2
-rw-r--r--pkgs/servers/http/myserver/default.nix4
-rw-r--r--pkgs/servers/http/nginx/generic.nix7
-rw-r--r--pkgs/servers/http/nginx/modules.nix4
-rw-r--r--pkgs/servers/http/openresty/default.nix2
-rw-r--r--pkgs/servers/http/redstore/default.nix2
-rw-r--r--pkgs/servers/http/thttpd/default.nix2
-rw-r--r--pkgs/servers/http/yaws/default.nix4
-rw-r--r--pkgs/servers/irc/ngircd/default.nix2
-rw-r--r--pkgs/servers/jackett/default.nix4
-rw-r--r--pkgs/servers/kippo/default.nix2
-rw-r--r--pkgs/servers/livepeer/default.nix35
-rw-r--r--pkgs/servers/livepeer/deps.nix20
-rw-r--r--pkgs/servers/mail/dovecot/default.nix6
-rw-r--r--pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix6
-rw-r--r--pkgs/servers/mail/exim/default.nix2
-rw-r--r--pkgs/servers/mail/nullmailer/default.nix2
-rw-r--r--pkgs/servers/mail/opensmtpd/default.nix10
-rw-r--r--pkgs/servers/mail/postfix/pflogsumm.nix2
-rw-r--r--pkgs/servers/mail/postgrey/default.nix2
-rw-r--r--pkgs/servers/mail/rspamd/default.nix24
-rw-r--r--pkgs/servers/matrix-synapse/default.nix6
-rw-r--r--pkgs/servers/mattermost/default.nix11
-rw-r--r--pkgs/servers/meguca/default.nix37
-rw-r--r--pkgs/servers/meguca/server_deps.nix63
-rw-r--r--pkgs/servers/memcached/default.nix6
-rw-r--r--pkgs/servers/misc/taskserver/default.nix2
-rw-r--r--pkgs/servers/monitoring/consul-alerts/default.nix15
-rw-r--r--pkgs/servers/monitoring/consul-alerts/deps.nix34
-rw-r--r--pkgs/servers/monitoring/grafana/default.nix14
-rw-r--r--pkgs/servers/monitoring/nagios/default.nix4
-rw-r--r--pkgs/servers/monitoring/newrelic-sysmond/default.nix2
-rw-r--r--pkgs/servers/monitoring/prometheus/jmx-httpserver.nix35
-rw-r--r--pkgs/servers/monitoring/prometheus/node-exporter.nix6
-rw-r--r--pkgs/servers/monitoring/telegraf/default.nix4
-rw-r--r--pkgs/servers/monitoring/telegraf/deps-1.7.0.nix (renamed from pkgs/servers/monitoring/telegraf/deps-1.6.1.nix)209
-rw-r--r--pkgs/servers/monitoring/zabbix/2.0.nix4
-rw-r--r--pkgs/servers/monitoring/zabbix/2.2.nix4
-rw-r--r--pkgs/servers/monitoring/zabbix/3.4.nix2
-rw-r--r--pkgs/servers/monitoring/zipkin/default.nix2
-rw-r--r--pkgs/servers/nextcloud/default.nix4
-rw-r--r--pkgs/servers/nosql/apache-jena/fuseki-binary.nix4
-rw-r--r--pkgs/servers/nosql/arangodb/default.nix4
-rw-r--r--pkgs/servers/nosql/influxdb/default.nix1
-rw-r--r--pkgs/servers/nosql/neo4j/default.nix4
-rw-r--r--pkgs/servers/nosql/redis/default.nix6
-rw-r--r--pkgs/servers/nosql/riak-cs/2.1.1.nix2
-rw-r--r--pkgs/servers/nosql/riak-cs/stanchion.nix2
-rw-r--r--pkgs/servers/nosql/riak/2.2.0.nix2
-rw-r--r--pkgs/servers/openafs/1.6/default.nix (renamed from pkgs/servers/openafs/default.nix)0
-rw-r--r--pkgs/servers/openafs/1.6/module.nix (renamed from pkgs/servers/openafs/module.nix)0
-rw-r--r--pkgs/servers/openafs/1.6/srcs.nix (renamed from pkgs/servers/openafs/srcs.nix)0
-rw-r--r--pkgs/servers/openafs/1.6/tsmbac.patch (renamed from pkgs/servers/openafs/tsmbac.patch)0
-rw-r--r--pkgs/servers/openafs/1.8/bosserver.patch30
-rw-r--r--pkgs/servers/openafs/1.8/default.nix97
-rw-r--r--pkgs/servers/openafs/1.8/module.nix60
-rw-r--r--pkgs/servers/openafs/1.8/srcs.nix14
-rw-r--r--pkgs/servers/openafs/1.8/tsmbac.patch62
-rw-r--r--pkgs/servers/radicale/default.nix29
-rw-r--r--pkgs/servers/sabnzbd/default.nix2
-rw-r--r--pkgs/servers/samba/3.x.nix2
-rw-r--r--pkgs/servers/samba/4.x.nix21
-rw-r--r--pkgs/servers/search/elasticsearch/5.x.nix4
-rw-r--r--pkgs/servers/search/elasticsearch/es-classpath-5.x.patch9
-rw-r--r--pkgs/servers/search/groonga/default.nix2
-rw-r--r--pkgs/servers/sip/freeswitch/default.nix2
-rw-r--r--pkgs/servers/smcroute/default.nix4
-rw-r--r--pkgs/servers/sonarr/default.nix6
-rw-r--r--pkgs/servers/sql/mariadb/default.nix69
-rw-r--r--pkgs/servers/sql/monetdb/default.nix4
-rw-r--r--pkgs/servers/sql/mysql/5.7.x.nix15
-rw-r--r--pkgs/servers/sql/postgresql/pgroonga/default.nix2
-rw-r--r--pkgs/servers/sql/postgresql/pgtap/default.nix2
-rw-r--r--pkgs/servers/sql/postgresql/psqlodbc/default.nix2
-rw-r--r--pkgs/servers/sslh/default.nix2
-rw-r--r--pkgs/servers/trezord/default.nix4
-rw-r--r--pkgs/servers/tt-rss/default.nix2
-rw-r--r--pkgs/servers/uhub/default.nix2
-rw-r--r--pkgs/servers/uwsgi/default.nix6
-rw-r--r--pkgs/servers/varnish/default.nix2
-rw-r--r--pkgs/servers/web-apps/matomo/default.nix4
-rw-r--r--pkgs/servers/web-apps/selfoss/default.nix5
-rw-r--r--pkgs/servers/web-apps/shaarli/default.nix4
-rw-r--r--pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch14
-rw-r--r--pkgs/servers/web-apps/virtlyst/default.nix32
-rw-r--r--pkgs/servers/x11/xorg/default.nix88
-rw-r--r--pkgs/servers/x11/xorg/xwayland.nix11
-rw-r--r--pkgs/servers/xmpp/prosody/default.nix2
-rw-r--r--pkgs/servers/zookeeper/default.nix3
-rw-r--r--pkgs/shells/bash/bash-4.4-patches.nix4
-rw-r--r--pkgs/shells/elvish/default.nix4
-rw-r--r--pkgs/shells/mksh/default.nix2
-rw-r--r--pkgs/shells/powershell/default.nix11
-rw-r--r--pkgs/shells/xonsh/default.nix4
-rw-r--r--pkgs/shells/zsh/antibody/default.nix4
-rw-r--r--pkgs/shells/zsh/antibody/deps.nix65
-rw-r--r--pkgs/shells/zsh/gradle-completion/default.nix35
-rw-r--r--pkgs/shells/zsh/oh-my-zsh/default.nix2
-rw-r--r--pkgs/shells/zsh/zsh-command-time/default.nix6
-rw-r--r--pkgs/stdenv/cross/default.nix6
-rw-r--r--pkgs/stdenv/darwin/default.nix101
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix13
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix1
-rw-r--r--pkgs/test/cc-wrapper/default.nix6
-rw-r--r--pkgs/tools/X11/arandr/default.nix2
-rw-r--r--pkgs/tools/X11/bumblebee/default.nix2
-rw-r--r--pkgs/tools/X11/keynav/default.nix2
-rw-r--r--pkgs/tools/X11/vdpauinfo/default.nix4
-rw-r--r--pkgs/tools/X11/x2vnc/default.nix2
-rw-r--r--pkgs/tools/X11/xbindkeys/default.nix2
-rw-r--r--pkgs/tools/X11/xbrightness/default.nix2
-rw-r--r--pkgs/tools/X11/xdg-user-dirs/default.nix2
-rw-r--r--pkgs/tools/X11/xdotool/default.nix2
-rw-r--r--pkgs/tools/X11/xidlehook/default.nix4
-rw-r--r--pkgs/tools/X11/xpra/default.nix6
-rw-r--r--pkgs/tools/X11/xpra/gtk3.nix2
-rw-r--r--pkgs/tools/X11/xsecurelock/default.nix33
-rw-r--r--pkgs/tools/admin/adtool/default.nix39
-rw-r--r--pkgs/tools/admin/ansible/default.nix2
-rw-r--r--pkgs/tools/admin/awscli/default.nix4
-rw-r--r--pkgs/tools/admin/azure-cli/default.nix0
-rw-r--r--pkgs/tools/admin/bubblewrap/default.nix4
-rw-r--r--pkgs/tools/admin/google-cloud-sdk/default.nix6
-rw-r--r--pkgs/tools/admin/lego/default.nix8
-rw-r--r--pkgs/tools/admin/lxd/default.nix5
-rw-r--r--pkgs/tools/admin/mycli/default.nix1
-rw-r--r--pkgs/tools/admin/nxproxy/default.nix2
-rw-r--r--pkgs/tools/admin/salt/default.nix28
-rw-r--r--pkgs/tools/admin/ssl-cert-check/default.nix59
-rw-r--r--pkgs/tools/archivers/cabextract/default.nix2
-rw-r--r--pkgs/tools/archivers/cromfs/default.nix2
-rw-r--r--pkgs/tools/archivers/innoextract/default.nix4
-rw-r--r--pkgs/tools/archivers/p7zip/default.nix6
-rw-r--r--pkgs/tools/archivers/pxattr/default.nix2
-rw-r--r--pkgs/tools/archivers/unarj/default.nix2
-rw-r--r--pkgs/tools/archivers/zip/default.nix2
-rw-r--r--pkgs/tools/audio/abcm2ps/default.nix4
-rw-r--r--pkgs/tools/audio/abcmidi/default.nix6
-rw-r--r--pkgs/tools/audio/beets/default.nix8
-rw-r--r--pkgs/tools/audio/pasystray/default.nix14
-rw-r--r--pkgs/tools/backup/borg/default.nix9
-rw-r--r--pkgs/tools/backup/btrbk/default.nix2
-rw-r--r--pkgs/tools/backup/chunksync/default.nix2
-rw-r--r--pkgs/tools/backup/dar/default.nix (renamed from pkgs/tools/archivers/dar/default.nix)22
-rw-r--r--pkgs/tools/backup/duplicity/default.nix8
-rw-r--r--pkgs/tools/backup/httrack/default.nix2
-rw-r--r--pkgs/tools/backup/partclone/default.nix2
-rw-r--r--pkgs/tools/backup/restic/default.nix4
-rw-r--r--pkgs/tools/compression/bsdiff/default.nix2
-rw-r--r--pkgs/tools/compression/dtrx/default.nix2
-rw-r--r--pkgs/tools/compression/lz4/default.nix10
-rw-r--r--pkgs/tools/compression/lz4/install-on-freebsd.patch54
-rw-r--r--pkgs/tools/compression/lzop/default.nix2
-rw-r--r--pkgs/tools/compression/pigz/default.nix2
-rw-r--r--pkgs/tools/compression/rzip/default.nix2
-rw-r--r--pkgs/tools/compression/zstd/default.nix4
-rw-r--r--pkgs/tools/filesystems/archivemount/default.nix2
-rw-r--r--pkgs/tools/filesystems/chunkfs/default.nix2
-rw-r--r--pkgs/tools/filesystems/f2fs-tools/default.nix4
-rw-r--r--pkgs/tools/filesystems/genimage/default.nix2
-rw-r--r--pkgs/tools/filesystems/gocrypfs/default.nix44
-rw-r--r--pkgs/tools/filesystems/gocrypfs/deps.nix39
-rw-r--r--pkgs/tools/filesystems/gocryptfs/default.nix50
-rw-r--r--pkgs/tools/filesystems/gocryptfs/deps.nix66
-rw-r--r--pkgs/tools/filesystems/mtpfs/default.nix2
-rw-r--r--pkgs/tools/filesystems/nilfs-utils/default.nix4
-rw-r--r--pkgs/tools/filesystems/s3backer/default.nix4
-rw-r--r--pkgs/tools/filesystems/s3fs/default.nix4
-rw-r--r--pkgs/tools/filesystems/sshfs-fuse/default.nix4
-rw-r--r--pkgs/tools/filesystems/xfsprogs/default.nix4
-rw-r--r--pkgs/tools/filesystems/yandex-disk/default.nix2
-rw-r--r--pkgs/tools/filesystems/zerofree/default.nix2
-rw-r--r--pkgs/tools/graphics/appleseed/default.nix66
-rw-r--r--pkgs/tools/graphics/argyllcms/default.nix2
-rw-r--r--pkgs/tools/graphics/dcraw/default.nix2
-rw-r--r--pkgs/tools/graphics/exiftags/default.nix2
-rw-r--r--pkgs/tools/graphics/feedgnuplot/default.nix54
-rw-r--r--pkgs/tools/graphics/fgallery/default.nix2
-rw-r--r--pkgs/tools/graphics/gifsicle/default.nix2
-rw-r--r--pkgs/tools/graphics/gmic/default.nix2
-rw-r--r--pkgs/tools/graphics/logstalgia/default.nix4
-rw-r--r--pkgs/tools/graphics/luxcorerender/default.nix87
-rw-r--r--pkgs/tools/graphics/maim/default.nix4
-rw-r--r--pkgs/tools/graphics/netpbm/default.nix6
-rw-r--r--pkgs/tools/graphics/nifskope/default.nix97
-rw-r--r--pkgs/tools/graphics/nifskope/external-lib-paths.patch33
-rw-r--r--pkgs/tools/graphics/nifskope/gcc-6.patch123
-rw-r--r--pkgs/tools/graphics/nifskope/qttools-bins.patch22
-rw-r--r--pkgs/tools/graphics/pngquant/default.nix13
-rw-r--r--pkgs/tools/graphics/pstoedit/default.nix5
-rw-r--r--pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch13
-rw-r--r--pkgs/tools/graphics/qrencode/default.nix4
-rw-r--r--pkgs/tools/graphics/rocket/default.nix31
-rw-r--r--pkgs/tools/graphics/structure-synth/default.nix47
-rw-r--r--pkgs/tools/graphics/structure-synth/gcc47.patch50
-rw-r--r--pkgs/tools/graphics/vips/default.nix4
-rw-r--r--pkgs/tools/graphics/vulkan-tools/default.nix28
-rw-r--r--pkgs/tools/graphics/yafaray-core/default.nix38
-rw-r--r--pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix4
-rw-r--r--pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix4
-rw-r--r--pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix4
-rw-r--r--pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix4
-rw-r--r--pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix4
-rw-r--r--pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix6
-rw-r--r--pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix13
-rw-r--r--pkgs/tools/inputmethods/triggerhappy/default.nix39
-rw-r--r--pkgs/tools/inputmethods/uim/default.nix6
-rw-r--r--pkgs/tools/misc/agedu/default.nix35
-rw-r--r--pkgs/tools/misc/apparix/default.nix2
-rw-r--r--pkgs/tools/misc/appdata-tools/default.nix2
-rw-r--r--pkgs/tools/misc/arp-scan/default.nix31
-rw-r--r--pkgs/tools/misc/asciinema/default.nix10
-rw-r--r--pkgs/tools/misc/aws-mturk-clt/default.nix2
-rw-r--r--pkgs/tools/misc/bandwidth/default.nix2
-rw-r--r--pkgs/tools/misc/bepasty/default.nix3
-rw-r--r--pkgs/tools/misc/bibtex2html/default.nix2
-rw-r--r--pkgs/tools/misc/bibutils/default.nix4
-rw-r--r--pkgs/tools/misc/blink1-tool/default.nix4
-rw-r--r--pkgs/tools/misc/buildtorrent/default.nix22
-rw-r--r--pkgs/tools/misc/calamares/default.nix4
-rw-r--r--pkgs/tools/misc/clex/default.nix4
-rw-r--r--pkgs/tools/misc/clipster/default.nix4
-rw-r--r--pkgs/tools/misc/colord-gtk/default.nix2
-rw-r--r--pkgs/tools/misc/colord/default.nix2
-rw-r--r--pkgs/tools/misc/contacts/default.nix5
-rw-r--r--pkgs/tools/misc/convmv/default.nix2
-rw-r--r--pkgs/tools/misc/cutecom/default.nix4
-rw-r--r--pkgs/tools/misc/dbacl/default.nix2
-rw-r--r--pkgs/tools/misc/ddcutil/default.nix4
-rw-r--r--pkgs/tools/misc/debootstrap/default.nix4
-rw-r--r--pkgs/tools/misc/desktop-file-utils/default.nix2
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix6
-rw-r--r--pkgs/tools/misc/direnv/default.nix4
-rw-r--r--pkgs/tools/misc/ent/default.nix2
-rw-r--r--pkgs/tools/misc/entr/default.nix4
-rw-r--r--pkgs/tools/misc/esptool/default.nix4
-rw-r--r--pkgs/tools/misc/ethtool/default.nix4
-rw-r--r--pkgs/tools/misc/flashrom/default.nix2
-rw-r--r--pkgs/tools/misc/fwup/default.nix4
-rw-r--r--pkgs/tools/misc/fzf/default.nix4
-rw-r--r--pkgs/tools/misc/gams/default.nix4
-rw-r--r--pkgs/tools/misc/geekbench/default.nix2
-rw-r--r--pkgs/tools/misc/gnokii/default.nix2
-rw-r--r--pkgs/tools/misc/gnuvd/default.nix2
-rw-r--r--pkgs/tools/misc/goaccess/default.nix2
-rw-r--r--pkgs/tools/misc/gringo/default.nix2
-rw-r--r--pkgs/tools/misc/hdfview/default.nix2
-rw-r--r--pkgs/tools/misc/hyperfine/default.nix8
-rw-r--r--pkgs/tools/misc/ical2org/default.nix27
-rw-r--r--pkgs/tools/misc/ical2org/deps.nix11
-rw-r--r--pkgs/tools/misc/jdupes/default.nix13
-rw-r--r--pkgs/tools/misc/journaldriver/default.nix25
-rw-r--r--pkgs/tools/misc/lf/default.nix6
-rw-r--r--pkgs/tools/misc/lf/deps.nix4
-rw-r--r--pkgs/tools/misc/libcpuid/default.nix60
-rw-r--r--pkgs/tools/misc/libcpuid/stdint.patch5
-rw-r--r--pkgs/tools/misc/lice/default.nix24
-rw-r--r--pkgs/tools/misc/logstash/contrib.nix2
-rw-r--r--pkgs/tools/misc/memtest86/default.nix2
-rw-r--r--pkgs/tools/misc/mimeo/default.nix2
-rw-r--r--pkgs/tools/misc/mpdscribble/default.nix2
-rw-r--r--pkgs/tools/misc/mprime/default.nix2
-rw-r--r--pkgs/tools/misc/multitail/default.nix2
-rw-r--r--pkgs/tools/misc/ncdu/default.nix2
-rw-r--r--pkgs/tools/misc/neofetch/default.nix4
-rw-r--r--pkgs/tools/misc/osinfo-db-tools/default.nix4
-rw-r--r--pkgs/tools/misc/ostree/default.nix70
-rw-r--r--pkgs/tools/misc/papis/default.nix21
-rw-r--r--pkgs/tools/misc/parallel/default.nix4
-rw-r--r--pkgs/tools/misc/patdiff/default.nix2
-rw-r--r--pkgs/tools/misc/pdd/default.nix4
-rw-r--r--pkgs/tools/misc/plantuml/default.nix4
-rw-r--r--pkgs/tools/misc/progress/default.nix4
-rw-r--r--pkgs/tools/misc/pv/default.nix2
-rw-r--r--pkgs/tools/misc/remind/default.nix2
-rw-r--r--pkgs/tools/misc/riemann-c-client/default.nix4
-rw-r--r--pkgs/tools/misc/riemann-tools/Gemfile2
-rw-r--r--pkgs/tools/misc/riemann-tools/Gemfile.lock136
-rw-r--r--pkgs/tools/misc/riemann-tools/default.nix2
-rw-r--r--pkgs/tools/misc/riemann-tools/gemset.nix440
-rw-r--r--pkgs/tools/misc/rockbox-utility/default.nix4
-rw-r--r--pkgs/tools/misc/routino/default.nix2
-rw-r--r--pkgs/tools/misc/rpm-ostree/default.nix72
-rw-r--r--pkgs/tools/misc/rrdtool/default.nix2
-rw-r--r--pkgs/tools/misc/s6-portable-utils/default.nix2
-rw-r--r--pkgs/tools/misc/sixpair/default.nix38
-rw-r--r--pkgs/tools/misc/sixpair/hcitool.patch19
-rw-r--r--pkgs/tools/misc/skim/default.nix6
-rw-r--r--pkgs/tools/misc/smenu/default.nix4
-rw-r--r--pkgs/tools/misc/system-config-printer/default.nix38
-rw-r--r--pkgs/tools/misc/t1utils/default.nix2
-rw-r--r--pkgs/tools/misc/termtosvg/default.nix27
-rw-r--r--pkgs/tools/misc/testdisk/default.nix2
-rw-r--r--pkgs/tools/misc/tio/default.nix4
-rw-r--r--pkgs/tools/misc/tlp/default.nix2
-rw-r--r--pkgs/tools/misc/tmuxinator/default.nix4
-rw-r--r--pkgs/tools/misc/trash-cli/default.nix7
-rw-r--r--pkgs/tools/misc/unclutter/default.nix2
-rw-r--r--pkgs/tools/misc/units/default.nix4
-rw-r--r--pkgs/tools/misc/usbmuxd/default.nix2
-rw-r--r--pkgs/tools/misc/vorbisgain/default.nix2
-rw-r--r--pkgs/tools/misc/wakatime/default.nix4
-rw-r--r--pkgs/tools/misc/woeusb/default.nix4
-rw-r--r--pkgs/tools/misc/xdaliclock/default.nix2
-rw-r--r--pkgs/tools/misc/xfstests/default.nix9
-rw-r--r--pkgs/tools/misc/you-get/default.nix4
-rw-r--r--pkgs/tools/misc/yubikey-manager/default.nix5
-rw-r--r--pkgs/tools/networking/aircrack-ng/default.nix2
-rw-r--r--pkgs/tools/networking/airfield/node-packages.nix183
-rw-r--r--pkgs/tools/networking/airfield/node.nix2
-rw-r--r--pkgs/tools/networking/bwm-ng/default.nix2
-rw-r--r--pkgs/tools/networking/chrony/default.nix6
-rw-r--r--pkgs/tools/networking/connect/default.nix2
-rw-r--r--pkgs/tools/networking/curl/default.nix2
-rw-r--r--pkgs/tools/networking/dhcp/default.nix2
-rw-r--r--pkgs/tools/networking/dhcping/default.nix2
-rw-r--r--pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix (renamed from pkgs/tools/networking/dnscrypt-proxy/default.nix)0
-rw-r--r--pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix24
-rw-r--r--pkgs/tools/networking/dnsperf/default.nix6
-rw-r--r--pkgs/tools/networking/dnstracer/default.nix2
-rw-r--r--pkgs/tools/networking/dropbear/default.nix2
-rw-r--r--pkgs/tools/networking/fping/default.nix2
-rw-r--r--pkgs/tools/networking/gftp/default.nix2
-rw-r--r--pkgs/tools/networking/gnirehtet/default.nix50
-rw-r--r--pkgs/tools/networking/gnirehtet/paths.patch35
-rw-r--r--pkgs/tools/networking/gvpe/default.nix2
-rw-r--r--pkgs/tools/networking/hans/default.nix2
-rw-r--r--pkgs/tools/networking/http-prompt/default.nix4
-rw-r--r--pkgs/tools/networking/i2p/default.nix4
-rw-r--r--pkgs/tools/networking/i2pd/default.nix4
-rw-r--r--pkgs/tools/networking/iodine/default.nix2
-rw-r--r--pkgs/tools/networking/ip2location/default.nix2
-rw-r--r--pkgs/tools/networking/iperf/2.nix4
-rw-r--r--pkgs/tools/networking/iperf/3.nix6
-rw-r--r--pkgs/tools/networking/kail/default.nix31
-rw-r--r--pkgs/tools/networking/kail/deps.nix489
-rw-r--r--pkgs/tools/networking/lftp/default.nix2
-rw-r--r--pkgs/tools/networking/logmein-hamachi/default.nix4
-rw-r--r--pkgs/tools/networking/maxscale/default.nix87
-rw-r--r--pkgs/tools/networking/maxscale/getopt.patch11
-rw-r--r--pkgs/tools/networking/miniupnpd/default.nix4
-rw-r--r--pkgs/tools/networking/miredo/default.nix2
-rw-r--r--pkgs/tools/networking/mitmproxy/default.nix2
-rw-r--r--pkgs/tools/networking/modem-manager/default.nix2
-rw-r--r--pkgs/tools/networking/nbd/default.nix6
-rw-r--r--pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch12
-rw-r--r--pkgs/tools/networking/ndisc6/default.nix2
-rw-r--r--pkgs/tools/networking/netkit/tftp/default.nix2
-rw-r--r--pkgs/tools/networking/netrw/default.nix2
-rw-r--r--pkgs/tools/networking/network-manager/PppdPath.patch11
-rw-r--r--pkgs/tools/networking/network-manager/applet.nix16
-rw-r--r--pkgs/tools/networking/network-manager/default.nix57
-rw-r--r--pkgs/tools/networking/network-manager/fix-paths.patch69
-rw-r--r--pkgs/tools/networking/network-manager/modprobe.patch11
-rw-r--r--pkgs/tools/networking/network-manager/openconnect_helper_path.patch29
-rw-r--r--pkgs/tools/networking/network-manager/openvpn/default.nix (renamed from pkgs/tools/networking/network-manager/openvpn.nix)4
-rw-r--r--pkgs/tools/networking/network-manager/openvpn/fix-paths.patch34
-rw-r--r--pkgs/tools/networking/noip/default.nix2
-rw-r--r--pkgs/tools/networking/ntp/default.nix8
-rw-r--r--pkgs/tools/networking/ntp/seccomp.patch3
-rw-r--r--pkgs/tools/networking/nylon/default.nix2
-rw-r--r--pkgs/tools/networking/nyx/default.nix25
-rw-r--r--pkgs/tools/networking/nzbget/default.nix4
-rw-r--r--pkgs/tools/networking/offlineimap/default.nix4
-rw-r--r--pkgs/tools/networking/openfortivpn/default.nix4
-rw-r--r--pkgs/tools/networking/pirate-get/default.nix7
-rw-r--r--pkgs/tools/networking/rp-pppoe/default.nix2
-rw-r--r--pkgs/tools/networking/shadowfox/default.nix29
-rw-r--r--pkgs/tools/networking/shadowfox/deps.nix75
-rw-r--r--pkgs/tools/networking/skydive/default.nix45
-rw-r--r--pkgs/tools/networking/skydive/deps.nix1335
-rw-r--r--pkgs/tools/networking/smokeping/default.nix2
-rw-r--r--pkgs/tools/networking/speedtest-cli/default.nix4
-rw-r--r--pkgs/tools/networking/spiped/default.nix2
-rw-r--r--pkgs/tools/networking/spoofer/default.nix40
-rw-r--r--pkgs/tools/networking/strongswan/default.nix2
-rw-r--r--pkgs/tools/networking/swaks/default.nix2
-rw-r--r--pkgs/tools/networking/telepresence/default.nix36
-rw-r--r--pkgs/tools/networking/tinc/default.nix6
-rw-r--r--pkgs/tools/networking/tinc/pre.nix8
-rw-r--r--pkgs/tools/networking/trickle/default.nix2
-rw-r--r--pkgs/tools/networking/ucspi-tcp/default.nix2
-rw-r--r--pkgs/tools/networking/unbound/default.nix6
-rw-r--r--pkgs/tools/networking/unbound/python.nix4
-rw-r--r--pkgs/tools/networking/whois/default.nix4
-rw-r--r--pkgs/tools/networking/wireguard-go/default.nix9
-rw-r--r--pkgs/tools/networking/wireguard-tools/default.nix4
-rw-r--r--pkgs/tools/networking/xl2tpd/default.nix4
-rw-r--r--pkgs/tools/networking/zerotierone/default.nix4
-rw-r--r--pkgs/tools/package-management/appimage-run/default.nix147
-rw-r--r--pkgs/tools/package-management/cargo-tree/default.nix6
-rw-r--r--pkgs/tools/package-management/createrepo_c/default.nix4
-rw-r--r--pkgs/tools/package-management/home-manager/default.nix6
-rw-r--r--pkgs/tools/package-management/nix-du/default.nix13
-rw-r--r--pkgs/tools/package-management/nix-pin/default.nix6
-rw-r--r--pkgs/tools/package-management/nix-review/default.nix9
-rw-r--r--pkgs/tools/package-management/nix-update-source/default.nix6
-rw-r--r--pkgs/tools/package-management/nixui/nixui.nix2
-rw-r--r--pkgs/tools/package-management/nixui/node-packages.nix18
-rw-r--r--pkgs/tools/package-management/opkg/default.nix2
-rw-r--r--pkgs/tools/package-management/packagekit/default.nix12
-rw-r--r--pkgs/tools/security/asc-key-to-qr-code-gif/default.nix40
-rw-r--r--pkgs/tools/security/eid-mw/default.nix4
-rw-r--r--pkgs/tools/security/fprintd/default.nix2
-rw-r--r--pkgs/tools/security/gnu-pw-mgr/default.nix20
-rw-r--r--pkgs/tools/security/gnupg/1.nix4
-rw-r--r--pkgs/tools/security/gnupg/22.nix4
-rw-r--r--pkgs/tools/security/gopass/default.nix13
-rw-r--r--pkgs/tools/security/gpgstats/default.nix2
-rw-r--r--pkgs/tools/security/jd-gui/default.nix122
-rw-r--r--pkgs/tools/security/kbfs/default.nix4
-rw-r--r--pkgs/tools/security/keybase/default.nix4
-rw-r--r--pkgs/tools/security/keybase/gui.nix8
-rw-r--r--pkgs/tools/security/libacr38u/default.nix2
-rw-r--r--pkgs/tools/security/libmodsecurity/default.nix4
-rw-r--r--pkgs/tools/security/lynis/default.nix4
-rw-r--r--pkgs/tools/security/nasty/default.nix2
-rw-r--r--pkgs/tools/security/nwipe/default.nix22
-rw-r--r--pkgs/tools/security/pass/default.nix6
-rw-r--r--pkgs/tools/security/pass/extensions/otp.nix4
-rw-r--r--pkgs/tools/security/pcsc-cyberjack/default.nix2
-rw-r--r--pkgs/tools/security/pcsclite/default.nix6
-rw-r--r--pkgs/tools/security/pdfcrack/default.nix23
-rw-r--r--pkgs/tools/security/pinentry/mac.nix5
-rw-r--r--pkgs/tools/security/saml2aws/default.nix28
-rw-r--r--pkgs/tools/security/saml2aws/deps.nix291
-rw-r--r--pkgs/tools/security/stoken/default.nix4
-rw-r--r--pkgs/tools/security/super/default.nix2
-rw-r--r--pkgs/tools/security/tor/default.nix4
-rw-r--r--pkgs/tools/security/vault/default.nix4
-rw-r--r--pkgs/tools/security/volatility/default.nix4
-rw-r--r--pkgs/tools/system/acpica-tools/default.nix4
-rw-r--r--pkgs/tools/system/bfs/default.nix4
-rw-r--r--pkgs/tools/system/collectd/default.nix2
-rw-r--r--pkgs/tools/system/ddrescueview/default.nix39
-rw-r--r--pkgs/tools/system/ddrutility/default.nix25
-rw-r--r--pkgs/tools/system/dfc/default.nix2
-rw-r--r--pkgs/tools/system/efivar/default.nix4
-rw-r--r--pkgs/tools/system/facter/default.nix4
-rw-r--r--pkgs/tools/system/hardlink/default.nix2
-rw-r--r--pkgs/tools/system/htop/default.nix2
-rw-r--r--pkgs/tools/system/hwinfo/default.nix4
-rw-r--r--pkgs/tools/system/iops/default.nix2
-rw-r--r--pkgs/tools/system/loadwatch/default.nix20
-rw-r--r--pkgs/tools/system/lshw/default.nix2
-rw-r--r--pkgs/tools/system/osquery/default.nix8
-rw-r--r--pkgs/tools/system/osquery/misc.patch25
-rw-r--r--pkgs/tools/system/pciutils/default.nix4
-rw-r--r--pkgs/tools/system/psensor/default.nix2
-rw-r--r--pkgs/tools/system/rsyslog/default.nix4
-rw-r--r--pkgs/tools/system/s-tui/default.nix4
-rw-r--r--pkgs/tools/system/stress/default.nix2
-rw-r--r--pkgs/tools/system/syslog-ng/default.nix6
-rw-r--r--pkgs/tools/system/thermald/default.nix4
-rw-r--r--pkgs/tools/system/uptimed/default.nix4
-rw-r--r--pkgs/tools/system/vbetool/default.nix2
-rw-r--r--pkgs/tools/text/colordiff/default.nix2
-rw-r--r--pkgs/tools/text/dadadodo/default.nix2
-rw-r--r--pkgs/tools/text/enca/default.nix2
-rw-r--r--pkgs/tools/text/esh/default.nix40
-rw-r--r--pkgs/tools/text/fanficfare/default.nix4
-rw-r--r--pkgs/tools/text/ispell/default.nix2
-rw-r--r--pkgs/tools/text/kakasi/default.nix6
-rw-r--r--pkgs/tools/text/languagetool/default.nix4
-rw-r--r--pkgs/tools/text/mpage/default.nix8
-rw-r--r--pkgs/tools/text/peco/default.nix5
-rw-r--r--pkgs/tools/text/qprint/default.nix2
-rw-r--r--pkgs/tools/text/rst2html5/default.nix4
-rw-r--r--pkgs/tools/text/uni2ascii/default.nix2
-rw-r--r--pkgs/tools/text/xml/html-xml-utils/default.nix2
-rw-r--r--pkgs/tools/typesetting/hevea/default.nix4
-rw-r--r--pkgs/tools/typesetting/skribilo/default.nix58
-rw-r--r--pkgs/tools/typesetting/tectonic/default.nix6
-rw-r--r--pkgs/tools/typesetting/tex/texlive/bin.nix3
-rw-r--r--pkgs/tools/typesetting/tex/texlive/combine.nix2
-rw-r--r--pkgs/tools/typesetting/xml2rfc/default.nix4
-rw-r--r--pkgs/tools/virtualization/aws/default.nix2
-rw-r--r--pkgs/tools/virtualization/distrobuilder/default.nix18
-rw-r--r--pkgs/tools/virtualization/ec2-ami-tools/default.nix2
-rw-r--r--pkgs/top-level/aliases.nix7
-rw-r--r--pkgs/top-level/all-packages.nix750
-rw-r--r--pkgs/top-level/beam-packages.nix10
-rw-r--r--pkgs/top-level/coq-packages.nix2
-rw-r--r--pkgs/top-level/darwin-packages.nix11
-rw-r--r--pkgs/top-level/emacs-packages.nix16
-rw-r--r--pkgs/top-level/haskell-packages.nix24
-rw-r--r--pkgs/top-level/impure.nix3
-rw-r--r--pkgs/top-level/lua-packages.nix20
-rw-r--r--pkgs/top-level/make-tarball.nix4
-rw-r--r--pkgs/top-level/ocaml-packages.nix36
-rw-r--r--pkgs/top-level/perl-packages.nix1241
-rw-r--r--pkgs/top-level/php-packages.nix46
-rw-r--r--pkgs/top-level/python-packages.nix329
-rw-r--r--pkgs/top-level/release.nix63
-rw-r--r--pkgs/top-level/splice.nix79
-rw-r--r--pkgs/top-level/stage.nix48
-rw-r--r--pkgs/top-level/unix-tools.nix12
-rw-r--r--pkgs/top-level/wine-packages.nix4
3428 files changed, 63286 insertions, 41832 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000000000..a53c8aa6db54f
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,8 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((nil
+  (bug-reference-bug-regexp . "\\(\\(?:[Ii]ssue \\|[Ff]ixe[ds] \\|[Rr]esolve[ds]? \\|[Cc]lose[ds]? \\|[Pp]\\(?:ull [Rr]equest\\|[Rr]\\) \\|(\\)#\\([0-9]+\\))?\\)")
+  (bug-reference-url-format . "https://github.com/NixOS/nixpkgs/issues/%s"))
+ (nix-mode
+  (tab-width . 2)))
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e7a9b1ba25fd2..ab1a50865f093 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,6 +13,7 @@
 - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
 - [ ] Tested execution of all binary files (usually in `./result/bin/`)
+- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
 
 ---
diff --git a/default.nix b/default.nix
index a4896a9bbeece..180815d4d6de9 100644
--- a/default.nix
+++ b/default.nix
@@ -6,7 +6,10 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.
 
     This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
 
-    - If you are running NixOS, use `nixos-rebuild' to upgrade your system.
+    - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
+
+    - Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively
+      upgrade Nix. You may use `nix-env --version' to check which version you have.
 
     - If you installed Nix using the install script (https://nixos.org/nix/install),
       it is safe to upgrade by running it again:
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 3b433fdcc1d2d..a7b43aeec23f9 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -305,7 +305,7 @@
   </section>
 
   <section>
-   <title>Cross packagaing cookbook</title>
+   <title>Cross packaging cookbook</title>
 
    <para>
     Some frequently problems when packaging for cross compilation are good to
diff --git a/doc/functions.xml b/doc/functions.xml
index 746ef7131f860..c23f6aa259670 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -521,7 +521,7 @@ merge:"diff3"
     <callout arearefs='ex-dockerTools-buildImage-2'>
      <para>
       <varname>tag</varname> specifies the tag of the resulting image. By
-      default it's <literal>latest</literal>.
+      default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-buildImage-3'>
diff --git a/doc/introduction.chapter.md b/doc/introduction.chapter.md
index 8b03221c64b12..6abdc2714e2c7 100644
--- a/doc/introduction.chapter.md
+++ b/doc/introduction.chapter.md
@@ -30,7 +30,7 @@ Packages, including the Nix packages collection, are distributed through
 distributed for users of Nix on non-NixOS distributions through the channel
 `nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g.
 `nixos-16.03`, which includes all packages and modules for the stable NixOS
-16.03. The purpose of stable NixOS releases are generally only given
+16.03. Stable NixOS releases are generally only given
 security updates. More up to date packages and modules are available via the
 `nixos-unstable` channel.
 
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 3b8971c295bb5..c0dc741eabcaa 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -312,7 +312,7 @@ For example, installing the following environment
 allows one to browse module documentation index [not too dissimilar to
 this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html)
 for all the specified packages and their dependencies by directing a browser of
-choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or
+choice to `~/.nix-profile/share/doc/hoogle/index.html` (or
 `/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in
 `environment.systemPackages` in NixOS).
 
@@ -334,10 +334,29 @@ navigate there.
 
 Finally, you can run
 ```shell
-hoogle server -p 8080 --local
+hoogle server --local -p 8080
 ```
 and navigate to http://localhost:8080/ for your own local
-[Hoogle](https://www.haskell.org/hoogle/).
+[Hoogle](https://www.haskell.org/hoogle/). The `--local` flag makes the hoogle
+server serve files from your nix store over http, without the flag it will use
+`file://` URIs. Note, however, that Firefox and possibly other browsers
+disallow navigation from `http://` to `file://` URIs for security reasons,
+which might be quite an inconvenience. Versions before v5 did not have this
+flag. See
+[this page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for
+workarounds.
+
+For NixOS users there's a service which runs this exact command for you.
+Specify the `packages` you want documentation for and the `haskellPackages` set
+you want them to come from. Add the following to `configuration.nix`.
+
+```nix
+services.hoogle = {
+enable = true;
+packages = (hpkgs: with hpkgs; [text cryptonite]);
+haskellPackages = pkgs.haskellPackages;
+};
+```
 
 ### How to build a Haskell project using Stack
 
@@ -716,6 +735,62 @@ sets at once:
 }
 ```
 
+### How to specify source overrides for your Haskell package
+
+When starting a Haskell project you can use `developPackage`
+to define a derivation for your package at the `root` path
+as well as source override versions for Hackage packages, like so:
+
+```nix
+# default.nix
+{ compilerVersion ? "ghc842" }:
+let
+  # pinning nixpkgs using new Nix 2.0 builtin `fetchGit`
+  pkgs = import (fetchGit (import ./version.nix)) { };
+  compiler = pkgs.haskell.packages."${compilerVersion}";
+  pkg = compiler.developPackage {
+    root = ./.;
+    source-overrides = {
+      # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0
+      HUnit = "1.5.0.0";
+    };
+  };
+in pkg
+```
+
+This could be used in place of a simplified `stack.yaml` defining a Nix
+derivation for your Haskell package.
+
+As you can see this allows you to specify only the source version found on
+Hackage and nixpkgs will take care of the rest.
+
+You can also specify `buildInputs` for your Haskell derivation for packages
+that directly depend on external libraries like so:
+
+```nix
+# default.nix
+{ compilerVersion ? "ghc842" }:
+let
+  # pinning nixpkgs using new Nix 2.0 builtin `fetchGit`
+  pkgs = import (fetchGit (import ./version.nix)) { };
+  compiler = pkgs.haskell.packages."${compilerVersion}";
+  pkg = compiler.developPackage {
+    root = ./.;
+    source-overrides = {
+      HUnit = "1.5.0.0"; # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0
+    };
+  };
+  # in case your package source depends on any libraries directly, not just transitively.
+  buildInputs = [ zlib ];
+in pkg.overrideAttrs(attrs: {
+  buildInputs = attrs.buildInputs ++ buildInputs;
+})
+```
+
+Notice that you will need to override (via `overrideAttrs` or similar) the
+derivation returned by the `developPackage` Nix lambda as there is no `buildInputs`
+named argument you can pass directly into the `developPackage` lambda.
+
 ### How to recover from GHC's infamous non-deterministic library ID bug
 
 GHC and distributed build farms don't get along well:
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 7a48bbaeeeec8..298920ce166b6 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -200,7 +200,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
     doCheck = false;
 
     meta = {
-      homepage = "http://github.com/pytoolz/toolz/";
+      homepage = "https://github.com/pytoolz/toolz/";
       description = "List processing tools and functional utilities";
       license = licenses.bsd3;
       maintainers = with maintainers; [ fridh ];
@@ -245,7 +245,7 @@ with import <nixpkgs> {};
       doCheck = false;
 
       meta = {
-        homepage = "http://github.com/pytoolz/toolz/";
+        homepage = "https://github.com/pytoolz/toolz/";
         description = "List processing tools and functional utilities";
       };
     };
@@ -328,7 +328,7 @@ when building the bindings and are therefore added as `buildInputs`.
 
     meta = {
       description = "Pythonic binding for the libxml2 and libxslt libraries";
-      homepage = http://lxml.de;
+      homepage = https://lxml.de;
       license = licenses.bsd3;
       maintainers = with maintainers; [ sjourdois ];
     };
@@ -436,7 +436,7 @@ Let's split the package definition from the environment definition.
 We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
 
 ```nix
-{ pkgs, buildPythonPackage }:
+{ lib, pkgs, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "toolz";
@@ -447,7 +447,7 @@ buildPythonPackage rec {
     sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "http://github.com/pytoolz/toolz/";
     description = "List processing tools and functional utilities";
     license = licenses.bsd3;
@@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used.
 
 ### Interpreters
 
-Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
+Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
 respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
 is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
 `python35`. The default interpreter, `python`, maps to `python2`.
@@ -533,6 +533,7 @@ sets are
 * `pkgs.python34Packages`
 * `pkgs.python35Packages`
 * `pkgs.python36Packages`
+* `pkgs.python37Packages`
 * `pkgs.pypyPackages`
 
 and the aliases
@@ -973,7 +974,7 @@ stdenv.mkDerivation {
     # the following packages are related to the dependencies of your python
     # project.
     # In this particular example the python modules listed in the
-    # requirements.tx require the following packages to be installed locally
+    # requirements.txt require the following packages to be installed locally
     # in order to compile any binary extensions they may require.
     #
     taglib
@@ -1028,7 +1029,7 @@ To alter a python package using overlays, you would use the following approach:
 
 ```nix
 self: super:
-rec {
+{
   python = super.python.override {
     packageOverrides = python-self: python-super: {
       bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: {
@@ -1040,7 +1041,7 @@ rec {
       });
     };
   };
-  pythonPackages = python.pkgs;
+  pythonPackages = self.python.pkgs;
 }
 ```
 
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index b648691183b87..673ff92d2c8a0 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -6,18 +6,22 @@
  <title>Reviewing contributions</title>
  <warning>
   <para>
-   The following section is a draft and reviewing policy is still being
-   discussed.
+   The following section is a draft, and the policy for reviewing is still being
+   discussed in issues such as <link
+	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166
+   </link> and <link
+	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836
+   </link>.
   </para>
  </warning>
  <para>
-  The nixpkgs projects receives a fairly high number of contributions via
+  The nixpkgs project receives a fairly high number of contributions via
   GitHub pull-requests. Reviewing and approving these is an important task and
   a way to contribute to the project.
  </para>
  <para>
-  The high change rate of nixpkgs make any pull request that is open for long
-  enough subject to conflicts that will require extra work from the submitter
+  The high change rate of nixpkgs makes any pull request that remains open for
+  too long subject to conflicts that will require extra work from the submitter
   or the merger. Reviewing pull requests in a timely manner and being
   responsive to the comments is the key to avoid these. GitHub provides sort
   filters that can be used to see the
@@ -33,34 +37,34 @@
  <para>
   When reviewing a pull request, please always be nice and polite.
   Controversial changes can lead to controversial opinions, but it is important
-  to respect every community members and their work.
+  to respect every community member and their work.
  </para>
  <para>
-  GitHub provides reactions, they are a simple and quick way to provide
+  GitHub provides reactions as a simple and quick way to provide
   feedback to pull-requests or any comments. The thumb-down reaction should be
-  used with care and if possible accompanied with some explanations so the
-  submitter has directions to improve his contribution.
+  used with care and if possible accompanied with some explanation so the
+  submitter has directions to improve their contribution.
  </para>
  <para>
-  Pull-requests reviews should include a list of what has been reviewed in a
+  Pull-request reviews should include a list of what has been reviewed in a
   comment, so other reviewers and mergers can know the state of the review.
  </para>
  <para>
   All the review template samples provided in this section are generic and
   meant as examples. Their usage is optional and the reviewer is free to adapt
-  them to his liking.
+  them to their liking.
  </para>
  <section>
   <title>Package updates</title>
 
   <para>
    A package update is the most trivial and common type of pull-request. These
-   pull-requests mainly consist in updating the version part of the package
+   pull-requests mainly consist of updating the version part of the package
    name and the source hash.
   </para>
 
   <para>
-   It can happen that non trivial updates include patches or more complex
+   It can happen that non-trivial updates include patches or more complex
    changes.
   </para>
 
@@ -84,12 +88,12 @@
    </listitem>
    <listitem>
     <para>
-     Ensure that the package versioning is fitting the guidelines.
+     Ensure that the package versioning fits the guidelines.
     </para>
    </listitem>
    <listitem>
     <para>
-     Ensure that the commit text is fitting the guidelines.
+     Ensure that the commit text fits the guidelines.
     </para>
    </listitem>
    <listitem>
@@ -99,7 +103,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       mention-bot usually notify GitHub users based on the submitted changes,
+       mention-bot usually notifies GitHub users based on the submitted changes,
        but it can happen that it misses some of the package maintainers.
       </para>
      </listitem>
@@ -107,13 +111,13 @@
    </listitem>
    <listitem>
     <para>
-     Ensure that the meta field contains correct information.
+     Ensure that the meta field information is correct.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       License can change with version updates, so it should be checked to be
-       fitting upstream license.
+       License can change with version updates, so it should be checked to match
+       the upstream license.
       </para>
      </listitem>
      <listitem>
@@ -137,9 +141,9 @@
     <itemizedlist>
      <listitem>
       <para>
-       Pull-requests are often targeted to the master or staging branch so
-       building the pull-request locally as it is submitted can trigger a large
-       amount of source builds.
+       Pull-requests are often targeted to the master or staging branch, and
+       building the pull-request locally when it is submitted can trigger
+       many source builds.
       </para>
       <para>
        It is possible to rebase the changes on nixos-unstable or
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 19218cfe8ecb4..dca39cf79ffa3 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -195,8 +195,9 @@ rec {
           { x = "foo"; y = "bar"; }
        => { x = "x-foo"; y = "y-bar"; }
   */
-  mapAttrs = f: set:
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set));
+  mapAttrs = builtins.mapAttrs or
+    (f: set:
+      listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)));
 
 
   /* Like `mapAttrs', but allows the name of each attribute to be
diff --git a/lib/default.nix b/lib/default.nix
index 4ca2e2ea6e372..c1a4a1e39a816 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,10 +56,10 @@ let
       hasAttr head isAttrs isBool isInt isList isString length
       lessThan listToAttrs pathExists readFile replaceStrings seq
       stringLength sub substring tail;
-    inherit (trivial) id const concat or and boolToString mergeAttrs
-      flip mapNullable inNixShell min max importJSON warn info
-      nixpkgsVersion version mod compare splitByAndCompare
-      functionArgs setFunctionArgs isFunction;
+    inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot
+      boolToString mergeAttrs flip mapNullable inNixShell min max
+      importJSON warn info nixpkgsVersion version mod compare
+      splitByAndCompare functionArgs setFunctionArgs isFunction;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
@@ -76,7 +76,7 @@ let
       optional optionals toList range partition zipListsWith zipLists
       reverseList listDfs toposort sort naturalSort compareLists take
       drop sublist last init crossLists unique intersectLists
-      subtractLists mutuallyExclusive;
+      subtractLists mutuallyExclusive groupBy groupBy';
     inherit (strings) concatStrings concatMapStrings concatImapStrings
       intersperse concatStringsSep concatMapStringsSep
       concatImapStringsSep makeSearchPath makeSearchPathOutput
diff --git a/lib/generators.nix b/lib/generators.nix
index c09384c00f572..aa67590870313 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -173,6 +173,56 @@ rec {
                        fna);
       in if fna == {}    then "<λ>"
                          else "<λ:{${showFnas}}>"
-    else abort "toPretty: should never happen (v = ${v})";
+    else abort "generators.toPretty: should never happen (v = ${v})";
+
+  # PLIST handling
+  toPlist = {}: v: let
+    isFloat = builtins.isFloat or (x: false);
+    expr = ind: x:  with builtins;
+      if isNull x   then "" else
+      if isBool x   then bool ind x else
+      if isInt x    then int ind x else
+      if isString x then str ind x else
+      if isList x   then list ind x else
+      if isAttrs x  then attrs ind x else
+      if isFloat x  then float ind x else
+      abort "generators.toPlist: should never happen (v = ${v})";
+
+    literal = ind: x: ind + x;
+
+    bool = ind: x: literal ind  (if x then "<true/>" else "<false/>");
+    int = ind: x: literal ind "<integer>${toString x}</integer>";
+    str = ind: x: literal ind "<string>${x}</string>";
+    key = ind: x: literal ind "<key>${x}</key>";
+    float = ind: x: literal ind "<real>${toString x}</real>";
+
+    indent = ind: expr "\t${ind}";
+
+    item = ind: libStr.concatMapStringsSep "\n" (indent ind);
+
+    list = ind: x: libStr.concatStringsSep "\n" [
+      (literal ind "<array>")
+      (item ind x)
+      (literal ind "</array>")
+    ];
+
+    attrs = ind: x: libStr.concatStringsSep "\n" [
+      (literal ind "<dict>")
+      (attr ind x)
+      (literal ind "</dict>")
+    ];
+
+    attr = let attrFilter = name: value: name != "_module" && value != null;
+    in ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList
+      (name: value: lib.optional (attrFilter name value) [
+      (key "\t${ind}" name)
+      (expr "\t${ind}" value)
+    ]) x));
+
+  in ''<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+${expr "" v}
+</plist>'';
 
 }
diff --git a/lib/kernel.nix b/lib/kernel.nix
new file mode 100644
index 0000000000000..45b33aea7b871
--- /dev/null
+++ b/lib/kernel.nix
@@ -0,0 +1,57 @@
+{ lib
+# we pass the kernel version here to keep a nice syntax `whenOlder "4.13"`
+# kernelVersion, e.g., config.boot.kernelPackages.version
+, version
+, mkValuePreprocess ? null
+}:
+
+with lib;
+rec {
+  # Common patterns
+  when        = cond: opt: if cond then opt else null;
+  whenAtLeast = ver: when (versionAtLeast version ver);
+  whenOlder   = ver: when (versionOlder version ver);
+  whenBetween = verLow: verHigh: when (versionAtLeast version verLow && versionOlder version verHigh);
+
+  # Keeping these around in case we decide to change this horrible implementation :)
+  option = x: if x == null then null else "?${x}";
+  yes    = "y";
+  no     = "n";
+  module = "m";
+
+  mkValue = val:
+  let
+    isNumber = c: elem c ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"];
+  in
+    if val == "" then "\"\""
+    else if val == yes || val == module || val == no then val
+    else if all isNumber (stringToCharacters val) then val
+    else if substring 0 2 val == "0x" then val
+    else val; # FIXME: fix quoting one day
+
+
+  # generate nix intermediate kernel config file of the form
+  #
+  #       VIRTIO_MMIO m
+  #       VIRTIO_BLK y
+  #       VIRTIO_CONSOLE n
+  #       NET_9P_VIRTIO? y
+  #
+  # Use mkValuePreprocess to preprocess option values, aka mark 'modules' as
+  # 'yes' or vice-versa
+  # Borrowed from copumpkin https://github.com/NixOS/nixpkgs/pull/12158
+  # returns a string, expr should be an attribute set
+  generateNixKConf = exprs: mkValuePreprocess:
+  let
+    mkConfigLine = key: rawval:
+    let
+      val = if builtins.isFunction mkValuePreprocess then mkValuePreprocess rawval else rawval;
+    in
+      if val == null
+        then ""
+        else if hasPrefix "?" val
+          then "${key}? ${mkValue (removePrefix "?" val)}\n"
+          else "${key} ${mkValue val}\n";
+    mkConf = cfg: concatStrings (mapAttrsToList mkConfigLine cfg);
+  in mkConf exprs;
+}
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 767fd89b948cc..c4ccea457e20b 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -99,6 +99,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = ''BSD 4-clause "Original" or "Old" License'';
   };
 
+  bsl10 = {
+    fullName = "Business Source License 1.0";
+    url = https://mariadb.com/bsl10;
+  };
+
+  bsl11 = {
+    fullName = "Business Source License 1.1";
+    url = https://mariadb.com/bsl11;
+  };
+
   clArtistic = spdx {
     spdxId = "ClArtistic";
     fullName = "Clarified Artistic License";
@@ -112,26 +122,31 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   cc-by-nc-sa-20 = spdx {
     spdxId = "CC-BY-NC-SA-2.0";
     fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
+    free = false;
   };
 
   cc-by-nc-sa-25 = spdx {
     spdxId = "CC-BY-NC-SA-2.5";
     fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";
+    free = false;
   };
 
   cc-by-nc-sa-30 = spdx {
     spdxId = "CC-BY-NC-SA-3.0";
     fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";
+    free = false;
   };
 
   cc-by-nc-sa-40 = spdx {
     spdxId = "CC-BY-NC-SA-4.0";
     fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";
+    free = false;
   };
 
   cc-by-nd-30 = spdx {
     spdxId = "CC-BY-ND-3.0";
     fullName = "Creative Commons Attribution-No Derivative Works v3.00";
+    free = false;
   };
 
   cc-by-sa-25 = spdx {
@@ -445,6 +460,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   msrla = {
     fullName  = "Microsoft Research License Agreement";
     url       = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
+    free = false;
   };
 
   ncsa = spdx {
diff --git a/lib/lists.nix b/lib/lists.nix
index 5ec97f5a07f38..231c2317c0c42 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -101,7 +101,7 @@ rec {
        concatMap (x: [x] ++ ["z"]) ["a" "b"]
        => [ "a" "z" "b" "z" ]
   */
-  concatMap = f: list: concatLists (map f list);
+  concatMap = builtins.concatMap or (f: list: concatLists (map f list));
 
   /* Flatten the argument into a single list; that is, nested lists are
      spliced into the top-level lists.
@@ -250,6 +250,42 @@ rec {
       else { right = t.right; wrong = [h] ++ t.wrong; }
     ) { right = []; wrong = []; });
 
+  /* Splits the elements of a list into many lists, using the return value of a predicate.
+     Predicate should return a string which becomes keys of attrset `groupBy' returns.
+
+     `groupBy'' allows to customise the combining function and initial value
+
+     Example:
+       groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
+       => { true = [ 5 3 4 ]; false = [ 1 2 ]; }
+       groupBy (x: x.name) [ {name = "icewm"; script = "icewm &";}
+                             {name = "xfce";  script = "xfce4-session &";}
+                             {name = "icewm"; script = "icewmbg &";}
+                             {name = "mate";  script = "gnome-session &";}
+                           ]
+       => { icewm = [ { name = "icewm"; script = "icewm &"; }
+                      { name = "icewm"; script = "icewmbg &"; } ];
+            mate  = [ { name = "mate";  script = "gnome-session &"; } ];
+            xfce  = [ { name = "xfce";  script = "xfce4-session &"; } ];
+          }
+
+
+     groupBy' allows to customise the combining function and initial value
+
+     Example:
+       groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
+       => { true = 12; false = 3; }
+  */
+  groupBy' = op: nul: pred: lst:
+    foldl' (r: e:
+              let
+                key = pred e;
+              in
+                r // { ${key} = op (r.${key} or nul) e; }
+           ) {} lst;
+
+  groupBy = groupBy' (sum: e: sum ++ [e]) [];
+
   /* Merges two lists of the same size together. If the sizes aren't the same
      the merging stops at the shortest. How both lists are merged is defined
      by the first argument.
diff --git a/lib/modules.nix b/lib/modules.nix
index 8baae49170538..20207b31d35bf 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -493,7 +493,7 @@ rec {
       inherit priority content;
     };
 
-  mkOptionDefault = mkOverride 1001; # priority of option defaults
+  mkOptionDefault = mkOverride 1500; # priority of option defaults
   mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default
   mkForce = mkOverride 50;
   mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
@@ -532,9 +532,7 @@ rec {
   #
   mkAliasDefinitions = mkAliasAndWrapDefinitions id;
   mkAliasAndWrapDefinitions = wrap: option:
-    mkMerge
-      (optional (isOption option && option.isDefined)
-        (wrap (mkMerge option.definitions)));
+    mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions));
 
 
   /* Compatibility. */
@@ -669,22 +667,26 @@ rec {
   };
 
   doRename = { from, to, visible, warn, use }:
+    { config, options, ... }:
     let
+      fromOpt = getAttrFromPath from options;
+      toOpt = getAttrFromPath to options;
       toOf = attrByPath to
         (abort "Renaming error: option `${showOption to}' does not exist.");
     in
-      { config, options, ... }:
-      { options = setAttrByPath from (mkOption {
-          inherit visible;
-          description = "Alias of <option>${showOption to}</option>.";
-          apply = x: use (toOf config);
-        });
-        config = {
-          warnings =
-            let opt = getAttrFromPath from options; in
-            optional (warn && opt.isDefined)
-              "The option `${showOption from}' defined in ${showFiles opt.files} has been renamed to `${showOption to}'.";
-        } // setAttrByPath to (mkAliasDefinitions (getAttrFromPath from options));
-      };
+    {
+      options = setAttrByPath from (mkOption {
+        inherit visible;
+        description = "Alias of <option>${showOption to}</option>.";
+        apply = x: use (toOf config);
+      });
+      config = mkMerge [
+        {
+          warnings = optional (warn && fromOpt.isDefined)
+            "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
+        }
+        (mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt)
+      ];
+    };
 
 }
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index ee4c29660a554..5eacc9eb23e11 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -46,7 +46,6 @@ rec {
       # Misc boolean options
       useAndroidPrebuilt = false;
       useiOSPrebuilt = false;
-      isiPhoneSimulator = false;
     } // mapAttrs (n: v: v final.parsed) inspect.predicates
       // args;
   in assert final.useAndroidPrebuilt -> final.isAndroid;
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 4c7dd99179190..31772ba0054db 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -32,13 +32,15 @@ rec {
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
     sdkVer = "21";
+    ndkVer = "10e";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
 
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
-    sdkVer = "21";
+    sdkVer = "24";
+    ndkVer = "17";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
@@ -46,6 +48,7 @@ rec {
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
     sdkVer = "24";
+    ndkVer = "17";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
@@ -97,6 +100,8 @@ rec {
     config = "aarch64-apple-ios";
     # config = "aarch64-apple-darwin14";
     sdkVer = "10.2";
+    xcodeVer = "8.2";
+    xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
     platform = {};
   };
@@ -105,6 +110,8 @@ rec {
     config = "armv7a-apple-ios";
     # config = "arm-apple-darwin10";
     sdkVer = "10.2";
+    xcodeVer = "8.2";
+    xcodePlatform = "iPhoneOS";
     useiOSPrebuilt = true;
     platform = {};
   };
@@ -113,8 +120,9 @@ rec {
     config = "x86_64-apple-ios";
     # config = "x86_64-apple-darwin14";
     sdkVer = "10.2";
+    xcodeVer = "8.2";
+    xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
-    isiPhoneSimulator = true;
     platform = {};
   };
 
@@ -122,8 +130,9 @@ rec {
     config = "i686-apple-ios";
     # config = "i386-apple-darwin11";
     sdkVer = "10.2";
+    xcodeVer = "8.2";
+    xcodePlatform = "iPhoneSimulator";
     useiOSPrebuilt = true;
-    isiPhoneSimulator = true;
     platform = {};
   };
 
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index f624a5c140a3a..8027f6b9fc1b8 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -170,7 +170,8 @@ rec {
     kernelBaseConfig = "bcm2835_defconfig";
     kernelDTB = true;
     kernelArch = "arm";
-    kernelAutoModules = false;
+    kernelAutoModules = true;
+    kernelPreferBuiltin = true;
     kernelExtraConfig = ''
       # Disable OABI to have seccomp_filter (required for systemd)
       # https://github.com/raspberrypi/firmware/issues/651
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index c683df7d7ca3b..eab20d0f14dc6 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -45,6 +45,21 @@ runTests {
     expected = true;
   };
 
+  testBitAnd = {
+    expr = (bitAnd 3 10);
+    expected = 2;
+  };
+
+  testBitOr = {
+    expr = (bitOr 3 10);
+    expected = 11;
+  };
+
+  testBitXor = {
+    expr = (bitXor 3 10);
+    expected = 9;
+  };
+
 # STRINGS
 
   testConcatMapStrings = {
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 251cb796db0e6..fac0718a9e73c 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1,4 +1,41 @@
 { lib }:
+let
+  zipIntBits = f: x: y:
+    let
+      # (intToBits 6) -> [ 0 1 1 ]
+      intToBits = x:
+        if x == 0 || x == -1 then
+          []
+        else
+          let
+            headbit  = if (x / 2) * 2 != x then 1 else 0;          # x & 1
+            tailbits = if x < 0 then ((x + 1) / 2) - 1 else x / 2; # x >> 1
+          in
+            [headbit] ++ (intToBits tailbits);
+
+      # (bitsToInt [ 0 1 1 ] 0) -> 6
+      # (bitsToInt [ 0 1 0 ] 1) -> -6
+      bitsToInt = l: signum:
+        if l == [] then
+          (if signum == 0 then 0 else -1)
+        else
+          (builtins.head l) + (2 * (bitsToInt (builtins.tail l) signum));
+
+      xsignum = if x < 0 then 1 else 0;
+      ysignum = if y < 0 then 1 else 0;
+      zipListsWith' = fst: snd:
+        if fst==[] && snd==[] then
+          []
+        else if fst==[] then
+          [(f xsignum             (builtins.head snd))] ++ (zipListsWith' []                  (builtins.tail snd))
+        else if snd==[] then
+          [(f (builtins.head fst) ysignum            )] ++ (zipListsWith' (builtins.tail fst) []                 )
+        else
+          [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd));
+    in
+      assert (builtins.isInt x) && (builtins.isInt y);
+      bitsToInt (zipListsWith' (intToBits x) (intToBits y)) (f xsignum ysignum);
+in
 rec {
 
   /* The identity function
@@ -31,6 +68,18 @@ rec {
   /* boolean “and” */
   and = x: y: x && y;
 
+  /* bitwise “and” */
+  bitAnd = builtins.bitAnd or zipIntBits (a: b: if a==1 && b==1 then 1 else 0);
+
+  /* bitwise “or” */
+  bitOr = builtins.bitOr or zipIntBits (a: b: if a==1 || b==1 then 1 else 0);
+
+  /* bitwise “xor” */
+  bitXor = builtins.bitXor or zipIntBits (a: b: if a!=b then 1 else 0);
+
+  /* bitwise “not” */
+  bitNot = builtins.sub (-1);
+
   /* Convert a boolean to a string.
      Note that toString on a bool returns "1" and "".
   */
@@ -53,7 +102,7 @@ rec {
   # Pull in some builtins not included elsewhere.
   inherit (builtins)
     pathExists readFile isBool
-    isInt add sub lessThan
+    isInt isFloat add sub lessThan
     seq deepSeq genericClosure;
 
   inherit (lib.strings) fileContents;
diff --git a/lib/types.nix b/lib/types.nix
index 5aa09d33e9b3d..cf6f2aa46e40e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -167,6 +167,13 @@ rec {
         # s32 = sign 32 4294967296;
       };
 
+    float = mkOptionType rec {
+        name = "float";
+        description = "floating point number";
+        check = isFloat;
+        merge = mergeOneOption;
+    };
+
     str = mkOptionType {
       name = "str";
       description = "string";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50ac45adc2527..c710f8dc3ea5d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18,178 +18,6 @@
   for an example on how to work with this data.
   */
 {
-  Adjective-Object = {
-    email = "mhuan13@gmail.com";
-    github = "Adjective-Object";
-    name = "Maxwell Huang-Hobbs";
-  };
-  AndersonTorres = {
-    email = "torres.anderson.85@gmail.com";
-    github = "AndersonTorres";
-    name = "Anderson Torres";
-  };
-  Anton-Latukha = {
-    email = "anton.latuka+nixpkgs@gmail.com";
-    github = "Anton-Latukha";
-    name = "Anton Latukha";
-  };
-  Baughn = {
-    email = "sveina@gmail.com";
-    github = "Baughn";
-    name = "Svein Ove Aas";
-  };
-  ChengCat = {
-    email = "yu@cheng.cat";
-    github = "ChengCat";
-    name = "Yucheng Zhang";
-  };
-  CrazedProgrammer = {
-    email = "crazedprogrammer@gmail.com";
-    github = "CrazedProgrammer";
-    name = "CrazedProgrammer";
-  };
-  CrystalGamma = {
-    email = "nixos@crystalgamma.de";
-    github = "CrystalGamma";
-    name = "Jona Stubbe";
-  };
-  DamienCassou = {
-    email = "damien@cassou.me";
-    github = "DamienCassou";
-    name = "Damien Cassou";
-  };
-  das_j = {
-    email = "janne@hess.ooo";
-    github = "dasJ";
-    name = "Janne Heß";
-  };
-  DerGuteMoritz = {
-    email = "moritz@twoticketsplease.de";
-    github = "DerGuteMoritz";
-    name = "Moritz Heidkamp";
-  };
-  DerTim1 = {
-    email = "tim.digel@active-group.de";
-    github = "DerTim1";
-    name = "Tim Digel";
-  };
-  DmitryTsygankov = {
-    email = "dmitry.tsygankov@gmail.com";
-    github = "DmitryTsygankov";
-    name = "Dmitry Tsygankov";
-  };
-  Esteth = {
-    email = "adam.copp@gmail.com";
-    name = "Adam Copp";
-  };
-  FireyFly = {
-    email = "nix@firefly.nu";
-    github = "FireyFly";
-    name = "Jonas Höglund";
-  };
-  Fresheyeball = {
-    email = "fresheyeball@gmail.com";
-    github = "fresheyeball";
-    name = "Isaac Shapira";
-  };
-  Gonzih = {
-    email = "gonzih@gmail.com";
-    github = "Gonzih";
-    name = "Max Gonzih";
-  };
-  Jo = {
-    email = "0x4A6F@shackspace.de";
-    name = "Joachim Ernst";
-  };
-  KibaFox = {
-    email = "kiba.fox@foxypossibilities.com";
-    github = "KibaFox";
-    name = "Kiba Fox";
-  };
-  MP2E = {
-    email = "MP2E@archlinux.us";
-    github = "MP2E";
-    name = "Cray Elliott";
-  };
-  Mogria = {
-    email = "m0gr14@gmail.com";
-    github = "mogria";
-    name = "Mogria";
-  };
-  MostAwesomeDude = {
-    email = "cds@corbinsimpson.com";
-    github = "MostAwesomeDude";
-    name = "Corbin Simpson";
-  };
-  Nate-Devv = {
-    email = "natedevv@gmail.com";
-    name = "Nathan Moore";
-  };
-  NikolaMandic = {
-    email = "nikola@mandic.email";
-    github = "NikolaMandic";
-    name = "Ratko Mladic";
-  };
-  Phlogistique = {
-    email = "noe.rubinstein@gmail.com";
-    github = "Phlogistique";
-    name = "Noé Rubinstein";
-  };
-  Profpatsch = {
-    email = "mail@profpatsch.de";
-    github = "Profpatsch";
-    name = "Profpatsch";
-  };
-  roosemberth = {
-    email = "roosembert.palacios+nixpkgs@gmail.com";
-    github = "roosemberth";
-    name = "Roosembert (Roosemberth) Palacios";
-  };
-  Scriptkiddi = {
-    email = "nixos@scriptkiddi.de";
-    github = "scriptkiddi";
-    name = "Fritz Otlinghaus";
-  };
-  SShrike = {
-    email = "severen@shrike.me";
-    github = "severen";
-    name = "Severen Redwood";
-  };
-  SeanZicari = {
-    email = "sean.zicari@gmail.com";
-    github = "SeanZicari";
-    name = "Sean Zicari";
-  };
-  StijnDW = {
-    email = "stekke@airmail.cc";
-    github = "StijnDW";
-    name = "Stijn DW";
-  };
-  StillerHarpo = {
-    email = "florianengel39@gmail.com";
-    github = "StillerHarpo";
-    name = "Florian Engel";
-  };
-  SuprDewd = {
-    email = "suprdewd@gmail.com";
-    github = "SuprDewd";
-    name = "Bjarki Ágúst Guðmundsson";
-  };
-  TealG = {
-    email = "~@Teal.Gr";
-    github = "TealG";
-    name = "Teal Gaure";
-  };
-  ThomasMader = {
-    email = "thomas.mader@gmail.com";
-    github = "ThomasMader";
-    name = "Thomas Mader";
-  };
-  Zimmi48 = {
-    email = "theo.zimmermann@univ-paris-diderot.fr";
-    github = "Zimmi48";
-    name = "Théo Zimmermann";
-  };
   a1russell = {
     email = "adamlr6+pub@gmail.com";
     github = "a1russell";
@@ -250,6 +78,11 @@
     github = "adisbladis";
     name = "Adam Hose";
   };
+  Adjective-Object = {
+    email = "mhuan13@gmail.com";
+    github = "Adjective-Object";
+    name = "Maxwell Huang-Hobbs";
+  };
   adnelson = {
     email = "ithinkican@gmail.com";
     github = "adnelson";
@@ -326,9 +159,9 @@
     name = "Alexander Krupenkin ";
   };
   alexchapman = {
-    name = "Alex Chapman";
     email = "alex@farfromthere.net";
     github = "AJChapman";
+    name = "Alex Chapman";
   };
   alexfmpe = {
     email = "alexandre.fmp.esteves@gmail.com";
@@ -383,6 +216,11 @@
     github = "AndrewMorsillo";
     name = "Andrew Morsillo";
   };
+  AndersonTorres = {
+    email = "torres.anderson.85@gmail.com";
+    github = "AndersonTorres";
+    name = "Anderson Torres";
+  };
   anderspapitto = {
     email = "anderspapitto@gmail.com";
     github = "anderspapitto";
@@ -393,6 +231,11 @@
     github = "andir";
     name = "Andreas Rammhold";
   };
+  andreabedini = {
+    email = "andrea@kzn.io";
+    github = "andreabedini";
+    name = "Andrea Bedini";
+  };
   andres = {
     email = "ksnixos@andres-loeh.de";
     github = "kosmikus";
@@ -428,6 +271,11 @@
     github = "ankhers";
     name = "Justin Wood";
   };
+  Anton-Latukha = {
+    email = "anton.latuka+nixpkgs@gmail.com";
+    github = "Anton-Latukha";
+    name = "Anton Latukha";
+  };
   antono = {
     email = "self@antono.info";
     github = "antono";
@@ -463,6 +311,11 @@
     github = "aristidb";
     name = "Aristid Breitkreuz";
   };
+  ariutta = {
+    email = "anders.riutta@gmail.com";
+    github = "ariutta";
+    name = "Anders Riutta";
+  };
   arobyn = {
     email = "shados@shados.net";
     github = "shados";
@@ -562,11 +415,16 @@
     github = "basvandijk";
     name = "Bas van Dijk";
   };
+  Baughn = {
+    email = "sveina@gmail.com";
+    github = "Baughn";
+    name = "Svein Ove Aas";
+  };
   bbarker = {
     email = "brandon.barker@gmail.com";
     github = "bbarker";
     name = "Brandon Elam Barker";
-  };  
+  };
   bcarrell = {
     email = "brandoncarrell@gmail.com";
     github = "bcarrell";
@@ -701,6 +559,11 @@
     github = "brian-dawn";
     name = "Brian Dawn";
   };
+  bricewge = {
+    email = "bricewge@gmail.com";
+    github = "bricewge";
+    name = "Brice Waegeneire";
+  };
   bstrik = {
     email = "dutchman55@gmx.com";
     github = "bstrik";
@@ -799,6 +662,11 @@
     email = "me@philscotted.com";
     name = "Phil Scott";
   };
+  ChengCat = {
+    email = "yu@cheng.cat";
+    github = "ChengCat";
+    name = "Yucheng Zhang";
+  };
   chiiruno = {
     email = "okinan@protonmail.com";
     github = "chiiruno";
@@ -939,11 +807,21 @@
     github = "cransom";
     name = "Casey Ransom";
   };
+  CrazedProgrammer = {
+    email = "crazedprogrammer@gmail.com";
+    github = "CrazedProgrammer";
+    name = "CrazedProgrammer";
+  };
   cryptix = {
     email = "cryptix@riseup.net";
     github = "cryptix";
     name = "Henry Bubert";
   };
+  CrystalGamma = {
+    email = "nixos@crystalgamma.de";
+    github = "CrystalGamma";
+    name = "Jona Stubbe";
+  };
   csingley = {
     email = "csingley@gmail.com";
     github = "csingley";
@@ -959,6 +837,11 @@
     github = "cwoac";
     name = "Oliver Matthews";
   };
+  DamienCassou = {
+    email = "damien@cassou.me";
+    github = "DamienCassou";
+    name = "Damien Cassou";
+  };
   danbst = {
     email = "abcz2.uprola@gmail.com";
     github = "danbst";
@@ -979,6 +862,11 @@
     github = "danielfullmer";
     name = "Daniel Fullmer";
   };
+  das_j = {
+    email = "janne@hess.ooo";
+    github = "dasJ";
+    name = "Janne Heß";
+  };
   dasuxullebt = {
     email = "christoph.senjak@googlemail.com";
     name = "Christoph-Simon Senjak";
@@ -1033,11 +921,21 @@
     github = "derchrisuk";
     name = "Christian Gerbrandt";
   };
+  DerGuteMoritz = {
+    email = "moritz@twoticketsplease.de";
+    github = "DerGuteMoritz";
+    name = "Moritz Heidkamp";
+  };
   dermetfan = {
     email = "serverkorken@gmail.com";
     github = "dermetfan";
     name = "Robin Stumm";
   };
+  DerTim1 = {
+    email = "tim.digel@active-group.de";
+    github = "DerTim1";
+    name = "Tim Digel";
+  };
   desiderius = {
     email = "didier@devroye.name";
     github = "desiderius";
@@ -1083,11 +981,21 @@
     github = "dizfer";
     name = "David Izquierdo";
   };
+  Dje4321 = {
+    email = "dje4321@gmail.com";
+    github = "dje4321";
+    name = "Dje4321";
+  };
   dmalikov = {
     email = "malikov.d.y@gmail.com";
     github = "dmalikov";
     name = "Dmitry Malikov";
   };
+  DmitryTsygankov = {
+    email = "dmitry.tsygankov@gmail.com";
+    github = "DmitryTsygankov";
+    name = "Dmitry Tsygankov";
+  };
   dmjio = {
     email = "djohnson.m@gmail.com";
     github = "dmjio";
@@ -1157,6 +1065,11 @@
     github = "e-user";
     name = "Alexander Kahl";
   };
+  eadwu = {
+    email = "edmund.wu@protonmail.com";
+    github = "eadwu";
+    name = "Edmund Wu";
+  };
   earldouglas = {
     email = "james@earldouglas.com";
     github = "earldouglas";
@@ -1231,6 +1144,11 @@
     github = "proteansec";
     name = "Dejan Lukan";
   };
+  eliasp = {
+    email = "mail@eliasprobst.eu";
+    github = "eliasp";
+    name = "Elias Probst";
+  };
   elijahcaine = {
     email = "elijahcainemv@gmail.com";
     github = "pop";
@@ -1252,9 +1170,9 @@
     name = "Will Fancher";
   };
   emmanuelrosa = {
-      email = "emmanuel_rosa@aol.com";
-      github = "emmanuelrosa";
-      name = "Emmanuel Rosa";
+    email = "emmanuel_rosa@aol.com";
+    github = "emmanuelrosa";
+    name = "Emmanuel Rosa";
   };
   endgame = {
     email = "jack@jackkelly.name";
@@ -1285,11 +1203,6 @@
     github = "ericbmerritt";
     name = "Eric Merritt";
   };
-  erosennin = {
-    email = "ag@sologoc.com";
-    github = "erosennin";
-    name = "Andrey Golovizin";
-  };
   ericsagnes = {
     email = "eric.sagnes@gmail.com";
     github = "ericsagnes";
@@ -1310,11 +1223,20 @@
     github = "erikryb";
     name = "Erik Rybakken";
   };
+  erosennin = {
+    email = "ag@sologoc.com";
+    github = "erosennin";
+    name = "Andrey Golovizin";
+  };
   ertes = {
     email = "esz@posteo.de";
     github = "ertes";
     name = "Ertugrul Söylemez";
   };
+  Esteth = {
+    email = "adam.copp@gmail.com";
+    name = "Adam Copp";
+  };
   ethercrow = {
     email = "ethercrow@gmail.com";
     github = "ethercrow";
@@ -1375,6 +1297,11 @@
     github = "fgaz";
     name = "Francesco Gazzetta";
   };
+  FireyFly = {
+    email = "nix@firefly.nu";
+    github = "FireyFly";
+    name = "Jonas Höglund";
+  };
   flokli = {
     email = "flokli@flokli.de";
     github = "flokli";
@@ -1420,6 +1347,11 @@
     github = "fps";
     name = "Florian Paul Schmidt";
   };
+  Fresheyeball = {
+    email = "fresheyeball@gmail.com";
+    github = "fresheyeball";
+    name = "Isaac Shapira";
+  };
   fridh = {
     email = "fridh@fridh.nl";
     github = "fridh";
@@ -1479,7 +1411,7 @@
     name = "Jim Garrison";
   };
   gavin = {
-    email = "gavin@praxeology.co.uk";
+    email = "gavin.rogers@holo.host";
     github = "gavinrogers";
     name = "Gavin Rogers";
   };
@@ -1543,6 +1475,11 @@
     github = "cillianderoiste";
     name = "Cillian de Róiste";
   };
+  Gonzih = {
+    email = "gonzih@gmail.com";
+    github = "Gonzih";
+    name = "Max Gonzih";
+  };
   goodrone = {
     email = "goodrone@gmail.com";
     github = "goodrone";
@@ -1692,6 +1629,11 @@
     github = "igsha";
     name = "Igor Sharonov";
   };
+  iimog = {
+    email = "iimog@iimog.org";
+    github = "iimog";
+    name = "Markus J. Ankenbrand";
+  };
   ikervagyok = {
     email = "ikervagyok@gmail.com";
     github = "ikervagyok";
@@ -1702,6 +1644,16 @@
     github = "ilya-kolpakov";
     name = "Ilya Kolpakov";
   };
+  imalison = {
+    email = "IvanMalison@gmail.com";
+    github = "IvanMalison";
+    name = "Ivan Malison";
+  };
+  imalsogreg = {
+    email = "imalsogreg@gmail.com";
+    github = "imalsogreg";
+    name = "Greg Hale";
+  };
   infinisil = {
     email = "infinisil@icloud.com";
     github = "infinisil";
@@ -1775,16 +1727,16 @@
     email = "jack@mudshark.org";
     name = "Jack Cummings";
   };
-  jdagilliland = {
-    email = "jdagilliland@gmail.com";
-    github = "jdagilliland";
-    name = "Jason Gilliland";
-  };
   jD91mZM2 = {
     email = "me@krake.one";
     github = "jD91mZM2";
     name = "jD91mZM2";
   };
+  jdagilliland = {
+    email = "jdagilliland@gmail.com";
+    github = "jdagilliland";
+    name = "Jason Gilliland";
+  };
   jefdaj = {
     email = "jefdaj@gmail.com";
     github = "jefdaj";
@@ -1850,6 +1802,10 @@
     github = "jluttine";
     name = "Jaakko Luttinen";
   };
+  Jo = {
+    email = "0x4A6F@shackspace.de";
+    name = "Joachim Ernst";
+  };
   joachifm = {
     email = "joachifm@fastmail.fm";
     github = "joachifm";
@@ -1973,6 +1929,11 @@
     github = "kaiha";
     name = "Kai Harries";
   };
+  kalbasit = {
+    email = "wael.nasreddine@gmail.com";
+    github = "kalbasit";
+    name = "Wael Nasreddine";
+  };
   kamilchm = {
     email = "kamil.chm@gmail.com";
     github = "kamilchm";
@@ -2007,6 +1968,11 @@
     github = "khumba";
     name = "Bryan Gardiner";
   };
+  KibaFox = {
+    email = "kiba.fox@foxypossibilities.com";
+    github = "KibaFox";
+    name = "Kiba Fox";
+  };
   kierdavis = {
     email = "kierdavis@gmail.com";
     github = "kierdavis";
@@ -2075,7 +2041,7 @@
     email = "giulio.eulisse@cern.ch";
     github = "ktf";
     name = "Giuluo Eulisse";
- };
+  };
   ktosiek = {
     email = "tomasz.kontusz@gmail.com";
     github = "ktosiek";
@@ -2136,6 +2102,11 @@
     github = "leenaars";
     name = "Michiel Leenaars";
   };
+  lejonet = {
+    email = "daniel@kuehn.se";
+    github = "lejonet";
+    name = "Daniel Kuehn";
+  };
   leo60228 = {
     email = "iakornfeld@gmail.com";
     github = "leo60228";
@@ -2146,11 +2117,6 @@
     github = "leonardoce";
     name = "Leonardo Cecchi";
   };
-  lejonet = {
-    email = "daniel@kuehn.se";
-    github = "lejonet";
-    name = "Daniel Kuehn";
-  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lethalman";
@@ -2334,10 +2300,6 @@
     github = "marcweber";
     name = "Marc Weber";
   };
-  markWot = {
-    email = "markus@wotringer.de";
-    name = "Markus Wotringer";
-  };
   markus1189 = {
     email = "markus1189@gmail.com";
     github = "markus1189";
@@ -2348,6 +2310,10 @@
     github = "markuskowa";
     name = "Markus Kowalewski";
   };
+  markWot = {
+    email = "markus@wotringer.de";
+    name = "Markus Wotringer";
+  };
   marsam = {
     email = "marsam@users.noreply.github.com";
     github = "marsam";
@@ -2433,7 +2399,7 @@
     github = "meditans";
     name = "Carlo Nucera";
   };
-  megheaiulian  = {
+  megheaiulian = {
     email = "iulian.meghea@gmail.com";
     github = "megheaiulian";
     name = "Meghea Iulian";
@@ -2448,6 +2414,11 @@
     github = "meisternu";
     name = "Matt Miemiec";
   };
+  melsigl = {
+    email = "melanie.bianca.sigl@gmail.com";
+    github = "melsigl";
+    name = "Melanie B. Sigl";
+  };
   metabar = {
     email = "softs@metabarcoding.org";
     name = "Celine Mercier";
@@ -2536,6 +2507,11 @@
     github = "MikePlayle";
     name = "Mike Playle";
   };
+  mkazulak = {
+    email = "kazulakm@gmail.com";
+    github = "mulderr";
+    name = "Maciej Kazulak";
+  };
   mkg = {
     email = "mkg@vt.edu";
     github = "mkgvt";
@@ -2576,6 +2552,11 @@
     github = "mogorman";
     name = "Matthew O'Gorman";
   };
+  Mogria = {
+    email = "m0gr14@gmail.com";
+    github = "mogria";
+    name = "Mogria";
+  };
   montag451 = {
     email = "montag451@laposte.net";
     github = "montag451";
@@ -2596,11 +2577,21 @@
     github = "moretea";
     name = "Maarten Hoogendoorn";
   };
+  MostAwesomeDude = {
+    email = "cds@corbinsimpson.com";
+    github = "MostAwesomeDude";
+    name = "Corbin Simpson";
+  };
   mounium = {
     email = "muoniurn@gmail.com";
     github = "mounium";
     name = "Katona László";
   };
+  MP2E = {
+    email = "MP2E@archlinux.us";
+    github = "MP2E";
+    name = "Cray Elliott";
+  };
   mpcsh = {
     email = "m@mpc.sh";
     github = "mpcsh";
@@ -2700,6 +2691,10 @@
     github = "nand0p";
     name = "Fernando Jose Pando";
   };
+  Nate-Devv = {
+    email = "natedevv@gmail.com";
+    name = "Nathan Moore";
+  };
   nathan-gs = {
     email = "nathan@nathan.gs";
     github = "nathan-gs";
@@ -2755,6 +2750,11 @@
     github = "nico202";
     name = "Nicolò Balzarotti";
   };
+  NikolaMandic = {
+    email = "nikola@mandic.email";
+    github = "NikolaMandic";
+    name = "Ratko Mladic";
+  };
   ninjatrappeur = {
     email = "felix@alternativebit.fr";
     github = "ninjatrappeur";
@@ -2793,7 +2793,7 @@
   nonfreeblob = {
     email = "nonfreeblob@yandex.com";
     github = "nonfreeblob";
-    name ="nonfreeblob";
+    name = "nonfreeblob";
   };
   notthemessiah = {
     email = "brian.cohen.88@gmail.com";
@@ -2814,6 +2814,11 @@
     github = "nthorne";
     name = "Niklas Thörne";
   };
+  numinit = {
+    email = "me@numin.it";
+    github = "numinit";
+    name = "Morgan Jones";
+  };
   nyanloutre = {
     email = "paul@nyanlout.re";
     github = "nyanloutre";
@@ -2898,10 +2903,10 @@
     github = "oxij";
     name = "Jan Malakhovski";
   };
-  pSub = {
-    email = "mail@pascal-wittmann.de";
-    github = "pSub";
-    name = "Pascal Wittmann";
+  oyren = {
+    email = "m.scheuren@oyra.eu";
+    github = "oyren";
+    name = "Moritz Scheuren";
   };
   paholg = {
     email = "paho@paholg.com";
@@ -2918,6 +2923,11 @@
     github = "panaeon";
     name = "Vitalii Voloshyn";
   };
+  pandaman = {
+    email = "kointosudesuyo@infoseek.jp";
+    github = "pandaman64";
+    name = "pandaman";
+  };
   paperdigits = {
     email = "mica@silentumbrella.com";
     github = "paperdigits";
@@ -2988,6 +2998,11 @@
     github = "phile314";
     name = "Philipp Hausmann";
   };
+  Phlogistique = {
+    email = "noe.rubinstein@gmail.com";
+    github = "Phlogistique";
+    name = "Noé Rubinstein";
+  };
   phreedom = {
     email = "phreedom@yandex.ru";
     github = "phreedom";
@@ -3062,6 +3077,11 @@
     github = "pmiddend";
     name = "Philipp Middendorf";
   };
+  pmyjavec = {
+    email = "pauly@myjavec.com";
+    github = "pmyjavec";
+    name = "Pauly Myjavec";
+  };
   pneumaticat = {
     email = "kevin@potatofrom.space";
     github = "pneumaticat";
@@ -3087,6 +3107,11 @@
     github = "primeos";
     name = "Michael Weiss";
   };
+  Profpatsch = {
+    email = "mail@profpatsch.de";
+    github = "Profpatsch";
+    name = "Profpatsch";
+  };
   proglodyte = {
     email = "proglodyte23@gmail.com";
     github = "proglodyte";
@@ -3106,6 +3131,11 @@
     email = "philipp@xndr.de";
     name = "Philipp Steinpaß";
   };
+  pSub = {
+    email = "mail@pascal-wittmann.de";
+    github = "pSub";
+    name = "Pascal Wittmann";
+  };
   psyanticy = {
     email = "iuns@outlook.fr";
     github = "Assassinkin";
@@ -3125,6 +3155,11 @@
     github = "qknight";
     name = "Joachim Schiele";
   };
+  qoelet = {
+    email = "kenny@machinesung.com";
+    github = "qoelet";
+    name = "Kenny Shen";
+  };
   ragge = {
     email = "r.dahlen@gmail.com";
     github = "ragnard";
@@ -3309,6 +3344,11 @@
     github = "rongcuid";
     name = "Rongcui Dong";
   };
+  roosemberth = {
+    email = "roosembert.palacios+nixpkgs@gmail.com";
+    github = "roosemberth";
+    name = "Roosembert (Roosemberth) Palacios";
+  };
   rprospero = {
     email = "rprospero+nix@gmail.com";
     github = "rprospero";
@@ -3448,11 +3488,21 @@
     github = "scolobb";
     name = "Sergiu Ivanov";
   };
+  Scriptkiddi = {
+    email = "nixos@scriptkiddi.de";
+    github = "scriptkiddi";
+    name = "Fritz Otlinghaus";
+  };
   sdll = {
     email = "sasha.delly@gmail.com";
     github = "sdll";
     name = "Sasha Illarionov";
   };
+  SeanZicari = {
+    email = "sean.zicari@gmail.com";
+    github = "SeanZicari";
+    name = "Sean Zicari";
+  };
   sellout = {
     email = "greg@technomadic.org";
     github = "sellout";
@@ -3636,6 +3686,11 @@
     github = "srhb";
     name = "Sarah Brofeldt";
   };
+  SShrike = {
+    email = "severen@shrike.me";
+    github = "severen";
+    name = "Severen Redwood";
+  };
   stephenmw = {
     email = "stephen@q5comm.com";
     github = "stephenmw";
@@ -3656,11 +3711,26 @@
     github = "steveej";
     name = "Stefan Junker";
   };
+  StijnDW = {
+    email = "stekke@airmail.cc";
+    github = "StijnDW";
+    name = "Stijn DW";
+  };
+  StillerHarpo = {
+    email = "florianengel39@gmail.com";
+    github = "StillerHarpo";
+    name = "Florian Engel";
+  };
   stumoss = {
     email = "samoss@gmail.com";
     github = "stumoss";
     name = "Stuart Moss";
   };
+  SuprDewd = {
+    email = "suprdewd@gmail.com";
+    github = "SuprDewd";
+    name = "Bjarki Ágúst Guðmundsson";
+  };
   suvash = {
     email = "suvash+nixpkgs@gmail.com";
     github = "suvash";
@@ -3721,6 +3791,11 @@
     github = "Radvendii";
     name = "Taeer Bar-Yam";
   };
+  taha = {
+    email = "xrcrod@gmail.com";
+    github = "tgharib";
+    name = "Taha Gharib";
+  };
   tailhook = {
     email = "paul@colomiets.name";
     github = "tailhook";
@@ -3761,6 +3836,11 @@
     github = "tazjin";
     name = "Vincent Ambo";
   };
+  TealG = {
+    email = "~@Teal.Gr";
+    github = "TealG";
+    name = "Teal Gaure";
+  };
   teh = {
     email = "tehunger@gmail.com";
     github = "teh";
@@ -3811,6 +3891,11 @@
     github = "ctheune";
     name = "Christian Theune";
   };
+  ThomasMader = {
+    email = "thomas.mader@gmail.com";
+    github = "ThomasMader";
+    name = "Thomas Mader";
+  };
   thoughtpolice = {
     email = "aseipp@pobox.com";
     github = "thoughtpolice";
@@ -3841,6 +3926,11 @@
     github = "timor";
     name = "timor";
   };
+  timput = {
+    email = "tim@timput.com";
+    github = "TimPut";
+    name = "Tim Put";
+  };
   tiramiseb = {
     email = "sebastien@maccagnoni.eu";
     github = "tiramiseb";
@@ -3876,6 +3966,11 @@
     github = "tokudan";
     name = "Daniel Frank";
   };
+  tomahna = {
+    email = "kevin.rauscher@tomahna.fr";
+    github = "Tomahna";
+    name = "Kevin Rauscher";
+  };
   tomberek = {
     email = "tomberek@gmail.com";
     github = "tomberek";
@@ -4119,6 +4214,11 @@
     github = "vyp";
     name = "vyp";
   };
+  waynr = {
+    name = "Wayne Warren";
+    email = "wayne.warren.s@gmail.com";
+    github = "waynr";
+  };
   wchresta = {
     email = "wchresta.nix@chrummibei.ch";
     github = "wchresta";
@@ -4320,6 +4420,11 @@
     github = "zimbatm";
     name = "zimbatm";
   };
+  Zimmi48 = {
+    email = "theo.zimmermann@univ-paris-diderot.fr";
+    github = "Zimmi48";
+    name = "Théo Zimmermann";
+  };
   zohl = {
     email = "zohl@fmap.me";
     github = "zohl";
diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix
index d981a1fa7dbc0..6a4de8a4b9511 100644
--- a/maintainers/scripts/all-tarballs.nix
+++ b/maintainers/scripts/all-tarballs.nix
@@ -6,13 +6,11 @@
    $ copy-tarballs.pl --expr 'import <nixpkgs/maintainers/scripts/all-tarballs.nix>'
 */
 
-removeAttrs (import ../../pkgs/top-level/release.nix
+import ../../pkgs/top-level/release.nix
   { # Don't apply ‘hydraJob’ to jobs, because then we can't get to the
     # dependency graph.
     scrubJobs = false;
     # No need to evaluate on i686.
     supportedSystems = [ "x86_64-linux" ];
-  })
-  [ # Remove jobs whose evaluation depends on a writable Nix store.
-    "tarball" "unstable" "darwin-tested"
-  ]
+    limitedSupportedSystems = [];
+  }
diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
index 7e9ff91ebe068..638d1b2aaa167 100755
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -1,4 +1,5 @@
-#! /run/current-system/sw/bin/perl -w
+#! /usr/bin/env nix-shell
+#! nix-shell -i perl -p perl perlPackages.XMLSimple
 
 use strict;
 use List::Util qw(min);
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 4536662c8420b..d95ff4f347e87 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -262,7 +262,7 @@ def _update_package(path, target):
     if new_version == version:
         logging.info("Path {}: no update available for {}.".format(path, pname))
         return False
-    elif new_version <= version:
+    elif Version(new_version) <= Version(version):
         raise ValueError("downgrade for {}.".format(pname))
     if not new_sha256:
         raise ValueError("no file available for {}.".format(pname))
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 9cc7ca3e672a5..9bb62bc2ece9e 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -27,7 +27,7 @@
 <screen>
 # nixos-container create foo --config '
   <xref linkend="opt-services.openssh.enable"/> = true;
-  <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
+  <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
 '
 </screen>
  </para>
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index e217a99148b95..d103ee2497839 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -19,7 +19,7 @@
   All users that should have permission to change network settings must belong
   to the <code>networkmanager</code> group:
 <programlisting>
-<link linkend="opt-users.users._name__.extraGroups">users.extraUsers.youruser.extraGroups</link> = [ "networkmanager" ];
+<link linkend="opt-users.users._name__.extraGroups">users.users.alice.extraGroups</link> = [ "networkmanager" ];
 </programlisting>
  </para>
 
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
index 6e883e3fbbc1d..a4af1b96583d8 100644
--- a/nixos/doc/manual/configuration/ssh.xml
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -20,7 +20,7 @@
   follows:
 <!-- FIXME: this might not work if the user is unmanaged. -->
 <programlisting>
-<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.alice.openssh.authorizedKeys.keys</link> =
+<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.alice.openssh.authorizedKeys.keys</link> =
   [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
 </programlisting>
  </para>
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 2c6309474b37a..fef6b2f86c85f 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -31,11 +31,12 @@ let
                   else p;
       describe = args:
         let
+          title = args.title or null;
           name = args.name or (lib.concatStringsSep "." args.path);
           path = args.path or [ args.name ];
           package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs);
         in "<listitem>"
-        + "<para><literal>pkgs.${name} (${package.meta.name})</literal>"
+        + "<para><literal>${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})</literal>"
         + lib.optionalString (!package.meta.available) " <emphasis>[UNAVAILABLE]</emphasis>"
         + ": ${package.meta.description or "???"}.</para>"
         + lib.optionalString (args ? comment) "\n<para>${args.comment}</para>"
@@ -51,7 +52,7 @@ let
   // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; }
   // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; }
   // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }
-  // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; });
+  // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages; });
 
   # We need to strip references to /nix/store/* from options,
   # including any `extraSources` if some modules came from elsewhere,
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 680160a3cb7e1..1a116ec0b6556 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -66,7 +66,7 @@ $ ./result/bin/run-*-vm
   <literal>mutableUsers = false</literal>. Another way is to temporarily add
   the following to your configuration:
 <screen>
-<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.your-user.initialHashedPassword</link> = "test";
+<link linkend="opt-users.users._name__.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test";
 </screen>
   <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have
   started the virtual machine at least once without the right users, otherwise
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index c55aa90267fbb..d1e49a2a1597c 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -211,7 +211,7 @@ $ sudo groupdel nixbld</screen>
     use <literal>sudo</literal>)
    </para>
 <programlisting>
-<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = "";
+<link linkend="opt-users.users._name__.initialHashedPassword">users.users.root.initialHashedPassword</link> = "";
               </programlisting>
   </listitem>
   <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 5799354c6e99f..7fd6483bca1a4 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -19,6 +19,27 @@
 
   <itemizedlist>
    <listitem>
+     <para>
+       Support for wrapping binaries using <literal>firejail</literal> has been
+       added through <varname>programs.firejail.wrappedBinaries</varname>.
+     </para>
+     <para>
+       For example
+     </para>
+<programlisting>
+programs.firejail = {
+  enable = true;
+  wrappedBinaries = {
+    firefox = "${lib.getBin pkgs.firefox}/bin/firefox";
+    mpv = "${lib.getBin pkgs.mpv}/bin/mpv";
+  };
+};
+</programlisting>
+      <para>
+        This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail.
+      </para>
+   </listitem>
+   <listitem>
     <para>
      User channels are now in the default <literal>NIX_PATH</literal>, allowing
      users to use their personal <command>nix-channel</command> defined
@@ -127,6 +148,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      Make sure the key file is accessible to the daemon.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>,
+      which indicates that the nix output hash will be used as tag.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
@@ -178,9 +205,26 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     <literal>lib.traceValIfNot</literal> has been deprecated. Use
-     <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
-     instead.
+      The <literal>pkgs</literal> argument to NixOS modules can now be set directly using <literal>nixpkgs.pkgs</literal>. Previously, only the <literal>system</literal>, <literal>config</literal> and <literal>overlays</literal> arguments could be used to influence <literal>pkgs</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+      A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example:
+      <programlisting>
+inherit (pkgs.nixos {
+  boot.loader.grub.enable = false;
+  fileSystems."/".device = "/dev/xvda1";
+}) toplevel kernel initialRamdisk manual;
+      </programlisting>
+
+      This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+      <literal>lib.traceValIfNot</literal> has been deprecated. Use
+      <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> instead.
     </para>
    </listitem>
    <listitem>
@@ -271,11 +315,53 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS)
+     Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS)
      Therefore; public service port for the dashboard has changed to 443
      (container port 8443) and scheme to https.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The option <varname>services.kubernetes.apiserver.address</varname>
+     was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.
+     Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The option <varname>services.kubernetes.apiserver.publicAddress</varname>
+     was not used and thus has been removed.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname>
+     was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The Kubernetes Dashboard now has only minimal RBAC permissions by default.
+     If dashboard cluster-admin rights are desired,
+     set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> to true.
+     On existing clusters, in order for the revocation of privileges to take effect,
+     the current ClusterRoleBinding for kubernetes-dashboard must be manually removed:
+     <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <varname>programs.screen</varname> module provides allows to configure
+     <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as
+     the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal>
+     will be added to <literal>environment.systemPackages</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+      The module <option>services.networking.hostapd</option> now uses WPA2 by default.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 4095d9c6d00d4..35a8afae4a7a3 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -5,6 +5,7 @@
 { pkgs
 , storePaths
 , volumeLabel
+, uuid ? "44444444-4444-4444-8888-888888888888"
 }:
 
 let
@@ -32,7 +33,7 @@ pkgs.stdenv.mkDerivation {
       echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
 
       truncate -s $bytes $out
-      faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
+      faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
 
       # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
       # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
diff --git a/nixos/maintainers/scripts/azure/create-azure.sh b/nixos/maintainers/scripts/azure/create-azure.sh
index a834566be8f75..2b22cb5366190 100755
--- a/nixos/maintainers/scripts/azure/create-azure.sh
+++ b/nixos/maintainers/scripts/azure/create-azure.sh
@@ -5,4 +5,4 @@ export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation
 export TIMESTAMP=$(date +%Y%m%d%H%M)
 
 nix-build '<nixpkgs/nixos>' \
-   -A config.system.build.azureImage --argstr system x86_64-linux -o azure --option extra-binary-caches https://hydra.nixos.org -j 10
+   -A config.system.build.azureImage --argstr system x86_64-linux -o azure -j 10
diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index 710dfdd01af5e..0693e896f7151 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -215,11 +215,11 @@ in
     );
 
     users = mkIf cfg.daemon.enable {
-      extraGroups.nslcd = {
+      groups.nslcd = {
         gid = config.ids.gids.nslcd;
       };
 
-      extraUsers.nslcd = {
+      users.nslcd = {
         uid = config.ids.uids.nslcd;
         description = "nslcd user.";
         group = "nslcd";
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 4101ef82f3e1b..48c3b41bc0911 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -231,10 +231,6 @@ in
               # a collision with an apparently unrelated environment
               # variable with the same name exported by dhcpcd.
               interface_order='lo lo[0-9]*'
-            '' + optionalString config.services.nscd.enable ''
-              # Invalidate the nscd cache whenever resolv.conf is
-              # regenerated.
-              libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
             '' + optionalString (length resolvconfOptions > 0) ''
               # Options as described in resolv.conf(5)
               resolv_conf_options='${concatStringsSep " " resolvconfOptions}'
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index a20910353f347..c7a6c943bc27d 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -26,16 +26,16 @@ with lib;
 
     fonts.fontconfig.enable = false;
 
-    nixpkgs.config.packageOverrides = pkgs: {
-      dbus = pkgs.dbus.override { x11Support = false; };
-      networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; };
-      networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
-      networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
-      networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
-      networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
-      networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
-      pinentry = pkgs.pinentry_ncurses;
-      gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; };
-    };
+    nixpkgs.overlays = singleton (const (super: {
+      dbus = super.dbus.override { x11Support = false; };
+      networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
+      networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };
+      networkmanager-openconnect = super.networkmanager-openconnect.override { withGnome = false; };
+      networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; };
+      networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
+      networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
+      pinentry = super.pinentry_ncurses;
+      gobjectIntrospection = super.gobjectIntrospection.override { x11Support = false; };
+    }));
   };
 }
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 90cea47b70ae9..3fd882789af27 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -264,7 +264,7 @@ in {
     })
 
     (mkIf systemWide {
-      users.extraUsers.pulse = {
+      users.users.pulse = {
         # For some reason, PulseAudio wants UID == GID.
         uid = assert uid == gid; uid;
         group = "pulse";
@@ -274,7 +274,7 @@ in {
         createHome = true;
       };
 
-      users.extraGroups.pulse.gid = gid;
+      users.groups.pulse.gid = gid;
 
       systemd.services.pulseaudio = {
         description = "PulseAudio System-Wide Server";
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index b61acf1815d96..e978ec6b40ada 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -38,7 +38,8 @@ in {
         firmwareLinuxNonfree
         intel2200BGFirmware
         rtl8192su-firmware
-      ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
+      ] ++ optional (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) raspberrypiWirelessFirmware
+        ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
         rtl8723bs-firmware
       ];
     })
diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixos/modules/hardware/brightnessctl.nix
new file mode 100644
index 0000000000000..341e4b791c237
--- /dev/null
+++ b/nixos/modules/hardware/brightnessctl.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.hardware.brightnessctl;
+in
+{
+
+  options = {
+
+    hardware.brightnessctl = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable brightnessctl in userspace.
+          This will allow brightness control from users in the video group.
+        '';
+
+      };
+    };
+  };
+
+
+  config = mkIf cfg.enable {
+    services.udev.packages = with pkgs; [ brightnessctl ];
+  };
+
+}
diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix
index bd440de697228..60fc95a758281 100644
--- a/nixos/modules/hardware/nitrokey.nix
+++ b/nixos/modules/hardware/nitrokey.nix
@@ -36,6 +36,6 @@ in
         { inherit (cfg) group; }
       ))
     ];
-    users.extraGroups."${cfg.group}" = {};
+    users.groups."${cfg.group}" = {};
   };
 }
diff --git a/nixos/modules/hardware/video/uvcvideo/default.nix b/nixos/modules/hardware/video/uvcvideo/default.nix
new file mode 100644
index 0000000000000..7e3e94fdf2bd6
--- /dev/null
+++ b/nixos/modules/hardware/video/uvcvideo/default.nix
@@ -0,0 +1,64 @@
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.uvcvideo;
+
+  uvcdynctrl-udev-rules = packages: pkgs.callPackage ./uvcdynctrl-udev-rules.nix {
+    drivers = packages;
+    udevDebug = false;
+  };
+
+in
+
+{
+
+  options = {
+    services.uvcvideo.dynctrl = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable <command>uvcvideo</command> dynamic controls.
+
+          Note that enabling this brings the <command>uvcdynctrl</command> tool
+          into your environement and register all dynamic controls from
+          specified <command>packages</command> to the <command>uvcvideo</command> driver.
+        '';
+      };
+
+      packages = mkOption {
+        type = types.listOf types.path;
+        example = literalExample "[ pkgs.tiscamera ]";
+        description = ''
+          List of packages containing <command>uvcvideo</command> dynamic controls
+          rules. All files found in
+          <filename><replaceable>pkg</replaceable>/share/uvcdynctrl/data</filename>
+          will be included.
+
+          Note that these will serve as input to the <command>libwebcam</command>
+          package which through its own <command>udev</command> rule will register
+          the dynamic controls from specified packages to the <command>uvcvideo</command>
+          driver.
+        '';
+        apply = map getBin;
+      };
+    };
+  };
+
+  config = mkIf cfg.dynctrl.enable {
+
+    services.udev.packages = [
+      (uvcdynctrl-udev-rules cfg.dynctrl.packages)
+    ];
+
+    environment.systemPackages = [
+      pkgs.libwebcam
+    ];
+
+  };
+}
diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
new file mode 100644
index 0000000000000..832e619661202
--- /dev/null
+++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, buildEnv
+, libwebcam
+, makeWrapper
+, runCommand
+, drivers ? []
+, udevDebug ? false
+}:
+
+let
+  version = "0.0.0";
+
+  dataPath = buildEnv {
+    name = "uvcdynctrl-with-drivers-data-path";
+    paths = drivers ++ [ libwebcam ];
+    pathsToLink = [ "/share/uvcdynctrl/data" ];
+    ignoreCollisions = false;
+  };
+
+  dataDir = "${dataPath}/share/uvcdynctrl/data";
+  udevDebugVarValue = if udevDebug then "1" else "0";
+in
+
+runCommand "uvcdynctrl-udev-rules-${version}"
+{
+  inherit dataPath;
+  buildInputs = [
+    makeWrapper
+    libwebcam
+  ];
+  dontPatchELF = true;
+  dontStrip = true;
+}
+''
+  mkdir -p "$out/lib/udev"
+  makeWrapper "${libwebcam}/lib/udev/uvcdynctrl" "$out/lib/udev/uvcdynctrl" \
+    --set NIX_UVCDYNCTRL_DATA_DIR "${dataDir}" \
+    --set NIX_UVCDYNCTRL_UDEV_DEBUG "${udevDebugVarValue}"
+
+  mkdir -p "$out/lib/udev/rules.d"
+  cat "${libwebcam}/lib/udev/rules.d/80-uvcdynctrl.rules" | \
+    sed -r "s#RUN\+\=\"([^\"]+)\"#RUN\+\=\"$out/lib/udev/uvcdynctrl\"#g" > \
+    "$out/lib/udev/rules.d/80-uvcdynctrl.rules"
+''
+
diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 7ed4a584d6469..9548a249efa0a 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -50,7 +50,7 @@ in
 
       package = mkOption {
         internal = true;
-        type     = types.path;
+        type     = types.nullOr types.path;
         default  = null;
         description = ''
           The input method method package.
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
index 76ffa8cb7e37b..eb75b7415c9c4 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@@ -68,6 +68,18 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
 <para>To use any input method, the package must be added in the configuration,
   as shown above, and also (after running <literal>nixos-rebuild</literal>) the
   input method must be added from IBus' preference dialog.</para>
+
+<simplesect>
+  <title>Troubleshooting</title>
+  <para>If IBus works in some applications but not others, a likely cause of
+  this is that IBus is depending on a different version of
+  <literal>glib</literal> to what the applications are depending on. This can
+  be checked by running <literal>nix-store -q --requisites &lt;path&gt; | grep
+  glib</literal>, where <literal>&lt;path&gt;</literal> is the path of either
+  IBus or an application in the Nix store. The <literal>glib</literal>
+  packages must match exactly. If they do not, uninstalling and reinstalling
+  the application is a likely fix.</para>
+</simplesect>
 </section>
 
 <section><title>Fcitx</title>
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 1ed56386e6e77..298b8d88bb597 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -30,7 +30,7 @@ with lib;
   boot.loader.grub.memtest86.enable = true;
 
   # Allow the user to log in as root without a password.
-  users.extraUsers.root.initialHashedPassword = "";
+  users.users.root.initialHashedPassword = "";
 
   system.nixos.stateVersion = mkDefault "18.03";
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index ddf91a5656c7c..4eb28434e192a 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -34,7 +34,7 @@ in
   boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
 
   # FIXME: this probably should be in installation-device.nix
-  users.extraUsers.root.initialHashedPassword = "";
+  users.users.root.initialHashedPassword = "";
 
   sdImage = {
     populateBootCommands = let
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 891923234dda9..0d595503f1933 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -35,7 +35,7 @@ in
   boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"];
 
   # FIXME: this probably should be in installation-device.nix
-  users.extraUsers.root.initialHashedPassword = "";
+  users.users.root.initialHashedPassword = "";
 
   sdImage = {
     populateBootCommands = let
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index fe6cc4161630d..aa52844288ca9 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -28,7 +28,7 @@ in
   boot.kernelPackages = pkgs.linuxPackages_rpi;
 
   # FIXME: this probably should be in installation-device.nix
-  users.extraUsers.root.initialHashedPassword = "";
+  users.users.root.initialHashedPassword = "";
 
   sdImage = {
     populateBootCommands = let
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index c091923de60f7..311a5ff696705 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -16,6 +16,8 @@ let
     inherit pkgs;
     inherit (config.sdImage) storePaths;
     volumeLabel = "NIXOS_SD";
+  } // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
+    uuid = config.sdImage.rootPartitionUUID;
   };
 in
 {
@@ -42,6 +44,24 @@ in
       '';
     };
 
+    bootPartitionID = mkOption {
+      type = types.string;
+      default = "0x2178694e";
+      description = ''
+        Volume ID for the /boot partition on the SD card. This value must be a
+        32-bit hexadecimal number.
+      '';
+    };
+
+    rootPartitionUUID = mkOption {
+      type = types.nullOr types.string;
+      default = null;
+      example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7";
+      description = ''
+        UUID for the main NixOS partition on the SD card.
+      '';
+    };
+
     bootSize = mkOption {
       type = types.int;
       default = 120;
@@ -95,7 +115,7 @@ in
         # type=b is 'W95 FAT32', type=83 is 'Linux'.
         sfdisk $img <<EOF
             label: dos
-            label-id: 0x2178694e
+            label-id: ${config.sdImage.bootPartitionID}
 
             start=8M, size=$bootSizeBlocks, type=b, bootable
             start=${toString (8 + config.sdImage.bootSize)}M, type=83
@@ -108,7 +128,7 @@ in
         # Create a FAT32 /boot partition of suitable size into bootpart.img
         eval $(partx $img -o START,SECTORS --nr 1 --pairs)
         truncate -s $((SECTORS * 512)) bootpart.img
-        faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n NIXOS_BOOT bootpart.img
+        faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.bootPartitionID} -n NIXOS_BOOT bootpart.img
 
         # Populate the files intended for /boot
         mkdir boot
diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix
index b12eaccf8707b..5e8f7f93d92a9 100644
--- a/nixos/modules/installer/netboot/netboot-base.nix
+++ b/nixos/modules/installer/netboot/netboot-base.nix
@@ -16,5 +16,5 @@ with lib;
     ];
 
   # Allow the user to log in as root without a password.
-  users.extraUsers.root.initialHashedPassword = "";
+  users.users.root.initialHashedPassword = "";
 }
diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix
index 903933e2df029..baa068c08dbff 100644
--- a/nixos/modules/installer/scan/not-detected.nix
+++ b/nixos/modules/installer/scan/not-detected.nix
@@ -1,9 +1,6 @@
-# List all devices which are _not_ detected by nixos-generate-config.
-# Common devices are enabled by default.
-{ config, lib, pkgs, ... }:
-
-with lib;
+# Enables non-free firmware on devices not recognized by `nixos-generate-config`.
+{ lib, ... }:
 
 {
-  hardware.enableRedistributableFirmware = true;
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
 }
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index a198c2d49b531..1655669124017 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -619,7 +619,7 @@ $bootLoaderConfig
   # services.xserver.desktopManager.plasma5.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  # users.extraUsers.guest = {
+  # users.users.guest = {
   #   isNormalUser = true;
   #   uid = 1000;
   # };
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index c40e303542061..f58c365878013 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -14,7 +14,7 @@ with lib;
   boot.loader.grub.fsIdentifier = "provided";
 
   # Allow mounting of shared folders.
-  users.extraUsers.demo.extraGroups = [ "vboxsf" ];
+  users.users.demo.extraGroups = [ "vboxsf" ];
 
   # Add some more video drivers to give X11 a shot at working in
   # VMware and QEMU.
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 73231edf077bc..aac86087f9ec3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -317,6 +317,10 @@
       restic = 291;
       openvpn = 292;
       meguca = 293;
+      yarn = 294;
+      hdfs = 295;
+      mapred = 296;
+      hadoop = 297;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -594,6 +598,10 @@
       restic = 291;
       openvpn = 292;
       meguca = 293;
+      yarn = 294;
+      hdfs = 295;
+      mapred = 296;
+      hadoop = 297;
 
       # 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/misc/locate.nix b/nixos/modules/misc/locate.nix
index ce5765cf1978c..dd6a2f67b30de 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -101,7 +101,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups = mkIf isMLocate { mlocate = {}; };
+    users.groups = mkIf isMLocate { mlocate = {}; };
 
     security.wrappers = mkIf isMLocate {
       locate = {
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index da4c21296ffdd..988693d924bf7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -29,6 +29,7 @@
   ./config/vpnc.nix
   ./config/zram.nix
   ./hardware/all-firmware.nix
+  ./hardware/brightnessctl.nix
   ./hardware/ckb.nix
   ./hardware/cpu/amd-microcode.nix
   ./hardware/cpu/intel-microcode.nix
@@ -50,6 +51,7 @@
   ./hardware/video/bumblebee.nix
   ./hardware/video/displaylink.nix
   ./hardware/video/nvidia.nix
+  ./hardware/video/uvcvideo/default.nix
   ./hardware/video/webcam/facetimehd.nix
   ./i18n/input-method/default.nix
   ./i18n/input-method/fcitx.nix
@@ -84,6 +86,7 @@
   ./programs/dconf.nix
   ./programs/digitalbitbox/default.nix
   ./programs/environment.nix
+  ./programs/firejail.nix
   ./programs/fish.nix
   ./programs/freetds.nix
   ./programs/gnupg.nix
@@ -127,6 +130,7 @@
   ./programs/zsh/oh-my-zsh.nix
   ./programs/zsh/zsh.nix
   ./programs/zsh/zsh-autoenv.nix
+  ./programs/zsh/zsh-autosuggestions.nix
   ./programs/zsh/zsh-syntax-highlighting.nix
   ./rename.nix
   ./security/acme.nix
@@ -175,6 +179,7 @@
   ./services/backup/rsnapshot.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
+  ./services/cluster/hadoop/default.nix
   ./services/cluster/kubernetes/default.nix
   ./services/cluster/kubernetes/dns.nix
   ./services/cluster/kubernetes/dashboard.nix
@@ -216,6 +221,7 @@
   ./services/databases/stanchion.nix
   ./services/databases/virtuoso.nix
   ./services/desktops/accountsservice.nix
+  ./services/desktops/bamf.nix
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
   ./services/desktops/flatpak.nix
@@ -239,6 +245,7 @@
   ./services/desktops/gnome3/tracker-miners.nix
   ./services/desktops/profile-sync-daemon.nix
   ./services/desktops/telepathy.nix
+  ./services/development/bloop.nix
   ./services/development/hoogle.nix
   ./services/editors/emacs.nix
   ./services/editors/infinoted.nix
@@ -472,6 +479,7 @@
   ./services/networking/dnschain.nix
   ./services/networking/dnscrypt-proxy.nix
   ./services/networking/dnscrypt-wrapper.nix
+  ./services/networking/dnsdist.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
   ./services/networking/fakeroute.nix
@@ -482,6 +490,7 @@
   ./services/networking/flannel.nix
   ./services/networking/flashpolicyd.nix
   ./services/networking/freenet.nix
+  ./services/networking/freeradius.nix
   ./services/networking/gale.nix
   ./services/networking/gateone.nix
   ./services/networking/gdomap.nix
@@ -537,6 +546,7 @@
   ./services/networking/openntpd.nix
   ./services/networking/openvpn.nix
   ./services/networking/ostinato.nix
+  ./services/networking/owamp.nix
   ./services/networking/pdnsd.nix
   ./services/networking/polipo.nix
   ./services/networking/powerdns.nix
@@ -619,6 +629,7 @@
   ./services/security/hologram-agent.nix
   ./services/security/munge.nix
   ./services/security/oauth2_proxy.nix
+  ./services/security/oauth2_proxy_nginx.nix
   ./services/security/physlock.nix
   ./services/security/shibboleth-sp.nix
   ./services/security/sks.nix
@@ -657,6 +668,7 @@
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/selfoss.nix
   ./services/web-apps/quassel-webserver.nix
+  ./services/web-apps/virtlyst.nix
   ./services/web-apps/youtrack.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/caddy.nix
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index c3ee6e98371ee..7477795a94e96 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -3,7 +3,7 @@
 {
   imports = [ ./graphical.nix ];
 
-  users.extraUsers.demo =
+  users.users.demo =
     { isNormalUser = true;
       description = "Demo user account";
       extraGroups = [ "wheel" ];
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index f648d70bd9fa4..942572cef9d51 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -14,7 +14,7 @@ with lib;
         description = ''
           Whether to configure system to use Android Debug Bridge (adb).
           To grant access to a user, it must be part of adbusers group:
-          <code>users.extraUsers.alice.extraGroups = ["adbusers"];</code>
+          <code>users.users.alice.extraGroups = ["adbusers"];</code>
         '';
         relatedPackages = [ ["androidenv" "platformTools"] ];
       };
@@ -25,6 +25,6 @@ with lib;
   config = mkIf config.programs.adb.enable {
     services.udev.packages = [ pkgs.android-udev-rules ];
     environment.systemPackages = [ pkgs.androidenv.platformTools ];
-    users.extraGroups.adbusers = {};
+    users.groups.adbusers = {};
   };
 }
diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix
index 7c727489c6c96..2fe0a14412c51 100644
--- a/nixos/modules/programs/digitalbitbox/default.nix
+++ b/nixos/modules/programs/digitalbitbox/default.nix
@@ -34,6 +34,6 @@ in
 
   meta = {
     doc = ./doc.xml;
-    maintainers = with stdenv.lib.maintainers; [ vidbina ];
+    maintainers = with lib.maintainers; [ vidbina ];
   };
 }
diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
new file mode 100644
index 0000000000000..46ee4bc0f7a01
--- /dev/null
+++ b/nixos/modules/programs/firejail.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.firejail;
+
+  wrappedBins = pkgs.stdenv.mkDerivation rec {
+    name = "firejail-wrapped-binaries";
+    nativeBuildInputs = with pkgs; [ makeWrapper ];
+    buildCommand = ''
+      mkdir -p $out/bin
+      ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: binary: ''
+      cat <<_EOF >$out/bin/${command}
+      #!${pkgs.stdenv.shell} -e
+      /run/wrappers/bin/firejail ${binary} "\$@"
+      _EOF
+      chmod 0755 $out/bin/${command}
+      '') cfg.wrappedBinaries)}
+    '';
+  };
+
+in {
+  options.programs.firejail = {
+    enable = mkEnableOption "firejail";
+
+    wrappedBinaries = mkOption {
+      type = types.attrs;
+      default = {};
+      description = ''
+        Wrap the binaries in firejail and place them in the global path.
+        </para>
+        <para>
+        You will get file collisions if you put the actual application binary in
+        the global environment and applications started via .desktop files are
+        not wrapped if they specify the absolute path to the binary.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail";
+
+    environment.systemPackages = [ wrappedBins ];
+  };
+
+  meta.maintainers = with maintainers; [ peterhoeg ];
+}
diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix
index ca7c6fb28f525..93923ff3133cb 100644
--- a/nixos/modules/programs/gphoto2.nix
+++ b/nixos/modules/programs/gphoto2.nix
@@ -15,7 +15,7 @@ with lib;
           Whether to configure system to use gphoto2.
           To grant digital camera access to a user, the user must
           be part of the camera group:
-          <code>users.extraUsers.alice.extraGroups = ["camera"];</code>
+          <code>users.users.alice.extraGroups = ["camera"];</code>
         '';
       };
     };
@@ -25,6 +25,6 @@ with lib;
   config = mkIf config.programs.gphoto2.enable {
     services.udev.packages = [ pkgs.libgphoto2 ];
     environment.systemPackages = [ pkgs.gphoto2 ];
-    users.extraGroups.camera = {};
+    users.groups.camera = {};
   };
 }
diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix
index 7ef172355c1fc..5fdd4fa841a1e 100644
--- a/nixos/modules/programs/npm.nix
+++ b/nixos/modules/programs/npm.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -39,6 +39,8 @@ in
     environment.etc."npmrc".text = cfg.npmrc;
 
     environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
+
+    environment.systemPackages = [ pkgs.nodePackages.npm ];
   };
 
 }
diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix
index f82338a69d25d..c1daaa58f16f4 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixos/modules/programs/screen.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   inherit (lib) mkOption mkIf types;
@@ -25,6 +25,8 @@ in
 
   config = mkIf (cfg.screenrc != "") {
     environment.etc."screenrc".text = cfg.screenrc;
+
+    environment.systemPackages = [ pkgs.screen ];
   };
 
 }
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index d9503d6004ff6..0eaaf6b85b99a 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -73,7 +73,7 @@ in {
       permissions = "u+rx,g+rx";
     };
 
-    users.extraGroups.sway = {};
+    users.groups.sway = {};
     security.pam.services.swaylock = {};
 
     hardware.opengl.enable = mkDefault true;
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index eb913477cf05a..f4ae52934760d 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -31,8 +31,8 @@ in
       environment.systemPackages = with pkgs; [ thefuck ];
       environment.shellInit = initScript;
 
-      programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
-      programs.fish.shellInit = mkIf prg.fish.enable ''
+      programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
+      programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
         ${pkgs.thefuck}/bin/thefuck --alias | source
       '';
     };
diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix
index 710d223b6f594..819f15b98a05a 100644
--- a/nixos/modules/programs/wireshark.nix
+++ b/nixos/modules/programs/wireshark.nix
@@ -29,7 +29,7 @@ in {
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ wireshark ];
-    users.extraGroups.wireshark = {};
+    users.groups.wireshark = {};
 
     security.wrappers.dumpcap = {
       source = "${wireshark}/bin/dumpcap";
diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
new file mode 100644
index 0000000000000..416f4c9c67511
--- /dev/null
+++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
@@ -0,0 +1,60 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.zsh.autosuggestions;
+in
+{
+  options.programs.zsh.autosuggestions = {
+
+    enable = mkEnableOption "zsh-autosuggestions";
+
+    highlightStyle = mkOption {
+      type = types.str;
+      default = "fg=8"; # https://github.com/zsh-users/zsh-autosuggestions/tree/v0.4.3#suggestion-highlight-style
+      description = "Highlight style for suggestions ({fore,back}ground color)";
+      example = "fg=cyan";
+    };
+
+    strategy = mkOption {
+      type = types.enum [ "default" "match_prev_cmd" ];
+      default = "default";
+      description = ''
+        Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
+        There are currently two to choose from:
+
+          * default: Chooses the most recent match.
+          * match_prev_cmd: Chooses the most recent match whose preceding history item matches
+            the most recently executed command (more info). Note that this strategy won't work as
+            expected with ZSH options that don't preserve the history order such as
+            HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = with types; attrsOf str;
+      default = {};
+      description = "Attribute set with additional configuration values";
+      example = literalExample ''
+        {
+          "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "20";
+        }
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    programs.zsh.interactiveShellInit = ''
+      source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+
+      export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
+      export ZSH_AUTOSUGGEST_STRATEGY="${cfg.strategy}"
+
+      ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
+    '';
+
+  };
+}
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 662b463d572ea..42d4e1d4ada01 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -87,13 +87,6 @@ in
         type = types.bool;
       };
 
-      enableAutosuggestions = mkOption {
-        default = false;
-        description = ''
-          Enable zsh-autosuggestions
-        '';
-        type = types.bool;
-      };
     };
 
   };
@@ -168,10 +161,6 @@ in
 
         ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
 
-        ${optionalString (cfg.enableAutosuggestions)
-          "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
-        }
-
         ${cfge.interactiveShellInit}
 
         ${cfg.interactiveShellInit}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b15dd84999a99..3d626bf515ac9 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -32,6 +32,9 @@ with lib;
     (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
     (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
+    (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
+    (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
     (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
@@ -197,6 +200,12 @@ with lib;
     (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
     (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
 
+    # postgresqlBackup
+    (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] ''
+       A systemd timer is now used instead of cron.
+       The starting time can be configured via <literal>services.postgresqlBackup.startAt</literal>.
+    '')
+
     # Profile splitting
     (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
 
@@ -233,6 +242,7 @@ with lib;
     (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
+    (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
     (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
@@ -247,6 +257,8 @@ with lib;
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])
     (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])
 
+    (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ])
+
     # Xen
     (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
 
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index a5299728348d6..8b131c54a2a5e 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -40,7 +40,7 @@ in
       target = "security/pam_mount.conf.xml";
       source =
         let
-          extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers;
+          extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.users;
           userVolumeEntry = user: "<volume user=\"${user.name}\" path=\"${user.cryptHomeLuks}\" mountpoint=\"${user.home}\" />\n";
         in
          pkgs.writeText "pam_mount.conf.xml" ''
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 7e59408a5b0b3..04685f2c9ea15 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -94,7 +94,7 @@ in
         rm -rf /var/lib/{polkit-1,PolicyKit}
       '';
 
-    users.extraUsers.polkituser = {
+    users.users.polkituser = {
       description = "PolKit daemon";
       uid = config.ids.uids.polkituser;
     };
diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index afe93f24273d3..f6dda21c60064 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -34,7 +34,7 @@ with lib;
 
     services.dbus.packages = [ pkgs.rtkit ];
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "rtkit";
         uid = config.ids.uids.rtkit;
         description = "RealtimeKit daemon";
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 24283e1d6165c..361a7e869602c 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -66,6 +66,9 @@ in
     security.sudo.extraRules = mkOption {
       description = ''
         Define specific rules to be in the <filename>sudoers</filename> file.
+        More specific rules should come after more general ones in order to
+        yield the expected behavior. You can use mkBefore/mkAfter to ensure
+        this is the case when configuration options are merged.
       '';
       default = [];
       example = [
diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix
index 891ca6323c3cf..70f7dd9e36475 100644
--- a/nixos/modules/services/admin/oxidized.nix
+++ b/nixos/modules/services/admin/oxidized.nix
@@ -83,8 +83,8 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups.${cfg.group} = { };
-    users.extraUsers.${cfg.user} = {
+    users.groups.${cfg.group} = { };
+    users.users.${cfg.user} = {
       description = "Oxidized service user";
       group = cfg.group;
       home = cfg.dataDir;
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 261f976176644..27bfd91cd2d58 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -93,13 +93,13 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.activemq = {
+    users.users.activemq = {
       description = "ActiveMQ server user";
       group = "activemq";
       uid = config.ids.uids.activemq;
     };
 
-    users.extraGroups.activemq.gid = config.ids.gids.activemq;
+    users.groups.activemq.gid = config.ids.gids.activemq;
 
     systemd.services.activemq_init = {
       wantedBy = [ "activemq.service" ];
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index f536d56d7c63d..bb6fc0a104dff 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -83,7 +83,7 @@ in {
 
     environment.systemPackages = [ pkgs.rabbitmq_server ];
 
-    users.extraUsers.rabbitmq = {
+    users.users.rabbitmq = {
       description = "RabbitMQ server user";
       home = "${cfg.dataDir}";
       createHome = true;
@@ -91,7 +91,7 @@ in {
       uid = config.ids.uids.rabbitmq;
     };
 
-    users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq;
+    users.groups.rabbitmq.gid = config.ids.gids.rabbitmq;
 
     systemd.services.rabbitmq = {
       description = "RabbitMQ Server";
diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix
index 1c19ed36bdc7e..66f84ef207622 100644
--- a/nixos/modules/services/audio/liquidsoap.nix
+++ b/nixos/modules/services/audio/liquidsoap.nix
@@ -57,7 +57,7 @@ in
 
   config = mkIf (builtins.length streams != 0) {
 
-    users.extraUsers.liquidsoap = {
+    users.users.liquidsoap = {
       uid = config.ids.uids.liquidsoap;
       group = "liquidsoap";
       extraGroups = [ "audio" ];
@@ -66,7 +66,7 @@ in
       createHome = true;
     };
 
-    users.extraGroups.liquidsoap.gid = config.ids.gids.liquidsoap;
+    users.groups.liquidsoap.gid = config.ids.gids.liquidsoap;
 
     systemd.services = builtins.listToAttrs ( map streamService streams );
   };
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 52613d450b51e..e2f4ec39f94c6 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -93,7 +93,7 @@ in {
       };
     };
 
-    users.extraUsers.mopidy = {
+    users.users.mopidy = {
       inherit uid;
       group = "mopidy";
       extraGroups = [ "audio" ];
@@ -101,7 +101,7 @@ in {
       home = "${cfg.dataDir}";
     };
 
-    users.extraGroups.mopidy.gid = gid;
+    users.groups.mopidy.gid = gid;
 
   };
 
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 94020ed05d677..3add6556d0df5 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -184,7 +184,7 @@ in {
       };
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == name) (singleton {
+    users.users = optionalAttrs (cfg.user == name) (singleton {
       inherit uid;
       inherit name;
       group = cfg.group;
@@ -193,7 +193,7 @@ in {
       home = "${cfg.dataDir}";
     });
 
-    users.extraGroups = optionalAttrs (cfg.group == name) (singleton {
+    users.groups = optionalAttrs (cfg.group == name) (singleton {
       inherit name;
       gid = gid;
     });
diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix
index f1a60be992d85..57ae385599394 100644
--- a/nixos/modules/services/audio/squeezelite.nix
+++ b/nixos/modules/services/audio/squeezelite.nix
@@ -54,7 +54,7 @@ in {
       };
     };
 
-    users.extraUsers.squeezelite= {
+    users.users.squeezelite= {
       inherit uid;
       group = "nogroup";
       extraGroups = [ "audio" ];
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 340b0cf072342..e2806a6953986 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -397,7 +397,7 @@ in {
 
     environment.systemPackages = [ pkgs.bacula ];
 
-    users.extraUsers.bacula = {
+    users.users.bacula = {
       group = "bacula";
       uid = config.ids.uids.bacula;
       home = "${libDir}";
@@ -406,6 +406,6 @@ in {
       shell = "${pkgs.bash}/bin/bash";
     };
 
-    users.extraGroups.bacula.gid = config.ids.gids.bacula;
+    users.groups.bacula.gid = config.ids.gids.bacula;
   };
 }
diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix
index 379fde1fe038f..80287f30b813f 100644
--- a/nixos/modules/services/backup/duplicati.nix
+++ b/nixos/modules/services/backup/duplicati.nix
@@ -44,13 +44,13 @@ in
       };
     };
 
-    users.extraUsers.duplicati = {
+    users.users.duplicati = {
       uid = config.ids.uids.duplicati;
       home = "/var/lib/duplicati";
       createHome = true;
       group = "duplicati";
     };
-    users.extraGroups.duplicati.gid = config.ids.gids.duplicati;
+    users.groups.duplicati.gid = config.ids.gids.duplicati;
 
   };
 }
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 3f533fa457dc1..f0c273ffebf15 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -84,7 +84,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton
+    users.users = optionalAttrs (cfg.user == defaultUser) (singleton
       { name = defaultUser;
         isSystemUser = true;
         createHome = false;
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 4a5ebebc682e1..2ec78ce6f2cfa 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -3,18 +3,41 @@
 with lib;
 
 let
-  inherit (pkgs) gzip;
 
-  location = config.services.postgresqlBackup.location;
+  cfg = config.services.postgresqlBackup;
 
-  postgresqlBackupCron = db:
-    ''
-      ${config.services.postgresqlBackup.period} root ${config.services.postgresql.package}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
-    '';
+  postgresqlBackupService = db :
+    {
+      enable = true;
 
-in
+      description = "Backup of database ${db}";
 
-{
+      requires = [ "postgresql.service" ];
+
+      preStart = ''
+        mkdir -m 0700 -p ${cfg.location}
+        chown postgres ${cfg.location}
+      '';
+
+      script = ''
+        if [ -e ${cfg.location}/${db}.sql.gz ]; then
+          ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
+        fi
+
+        ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \
+          ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz
+      '';
+
+      serviceConfig = {
+        Type = "oneshot";
+        PermissionsStartOnly = "true";
+        User = "postgres";
+      };
+
+      startAt = cfg.startAt;
+    };
+
+in {
 
   options = {
 
@@ -27,10 +50,10 @@ in
         '';
       };
 
-      period = mkOption {
-        default = "15 01 * * *";
+      startAt = mkOption {
+        default = "*-*-* 01:15:00";
         description = ''
-          This option defines (in the format used by cron) when the
+          This option defines (see <literal>systemd.time</literal> for format) when the
           databases should be dumped.
           The default is to update at 01:15 (at night) every day.
         '';
@@ -49,18 +72,23 @@ in
           Location to put the gzipped PostgreSQL database dumps.
         '';
       };
+
+      pgdumpOptions = mkOption {
+        type = types.string;
+        default = "-Cbo";
+        description = ''
+          Command line options for pg_dump.
+        '';
+      };
     };
 
   };
 
   config = mkIf config.services.postgresqlBackup.enable {
-    services.cron.systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
 
-    system.activationScripts.postgresqlBackup = stringAfter [ "stdio" "users" ]
-      ''
-        mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
-        chown root ${config.services.postgresqlBackup.location}
-      '';
+    systemd.services = listToAttrs (map (db : {
+          name = "postgresqlBackup-${db}";
+          value = postgresqlBackupService db; } ) cfg.databases);
   };
 
 }
diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix
index d4b47a0994101..d1b775f150dc1 100644
--- a/nixos/modules/services/backup/restic-rest-server.nix
+++ b/nixos/modules/services/backup/restic-rest-server.nix
@@ -95,13 +95,13 @@ in
       };
     };
 
-    users.extraUsers.restic = {
+    users.users.restic = {
       group = "restic";
       home = cfg.dataDir;
       createHome = true;
       uid = config.ids.uids.restic;
     };
 
-    users.extraGroups.restic.gid = config.ids.uids.restic;
+    users.groups.restic.gid = config.ids.uids.restic;
   };
 }
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 21d82469c6051..2d14762e86853 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -14,7 +14,15 @@ with lib;
             Read the repository password from a file.
           '';
           example = "/etc/nixos/restic-password";
+        };
 
+        s3CredentialsFile = mkOption {
+          type = with types; nullOr str;
+          description = ''
+            file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
+            for an S3-hosted repository, in the format of an EnvironmentFile
+            as described by systemd.exec(5)
+          '';
         };
 
         repository = mkOption {
@@ -134,6 +142,8 @@ with lib;
             Type = "oneshot";
             ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}";
             User = backup.user;
+          } // optionalAttrs (backup.s3CredentialsFile != null) {
+            EnvironmentFile = backup.s3CredentialsFile;
           };
         } // optionalAttrs backup.initialize {
           preStart = ''
diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixos/modules/services/cluster/hadoop/conf.nix
new file mode 100644
index 0000000000000..38db10406b9a0
--- /dev/null
+++ b/nixos/modules/services/cluster/hadoop/conf.nix
@@ -0,0 +1,31 @@
+{ hadoop, pkgs }:
+let
+  propertyXml = name: value: ''
+    <property>
+      <name>${name}</name>
+      <value>${builtins.toString value}</value>
+    </property>
+  '';
+  siteXml = fileName: properties: pkgs.writeTextDir fileName ''
+    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <!-- generated by NixOS -->
+    <configuration>
+      ${builtins.concatStringsSep "\n" (pkgs.lib.mapAttrsToList propertyXml properties)}
+    </configuration>
+  '';
+  userFunctions = ''
+    hadoop_verify_logdir() {
+      echo Skipping verification of log directory
+    }
+  '';
+in
+pkgs.buildEnv {
+  name = "hadoop-conf";
+  paths = [
+    (siteXml "core-site.xml" hadoop.coreSite)
+    (siteXml "hdfs-site.xml" hadoop.hdfsSite)
+    (siteXml "mapred-site.xml" hadoop.mapredSite)
+    (siteXml "yarn-site.xml" hadoop.yarnSite)
+    (pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions)
+  ];
+}
diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix
new file mode 100644
index 0000000000000..240938f0d621d
--- /dev/null
+++ b/nixos/modules/services/cluster/hadoop/default.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ...}:
+let 
+  cfg = config.services.hadoop;
+  hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; };
+in
+with lib;
+{
+  imports = [ ./yarn.nix ./hdfs.nix ];
+
+  options.services.hadoop = {
+    coreSite = mkOption {
+      default = {};
+      example = {
+        "fs.defaultFS" = "hdfs://localhost";
+      };
+      description = "Hadoop core-site.xml definition";
+    };
+
+    hdfsSite = mkOption {
+      default = {};
+      example = {
+        "dfs.nameservices" = "namenode1";
+      };
+      description = "Hadoop hdfs-site.xml definition";
+    };
+
+    mapredSite = mkOption {
+      default = {};
+      example = {
+        "mapreduce.map.cpu.vcores" = "1";
+      };
+      description = "Hadoop mapred-site.xml definition";
+    };
+
+    yarnSite = mkOption {
+      default = {};
+      example = {
+        "yarn.resourcemanager.ha.id" = "resourcemanager1";
+      };
+      description = "Hadoop yarn-site.xml definition";
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.hadoop;
+      defaultText = "pkgs.hadoop";
+      example = literalExample "pkgs.hadoop";
+      description = ''
+      '';
+    };
+  };
+
+
+  config = mkMerge [
+    (mkIf (builtins.hasAttr "yarn" config.users.users ||
+           builtins.hasAttr "hdfs" config.users.users) {
+      users.groups.hadoop = {
+        gid = config.ids.gids.hadoop;
+      };
+    })
+
+  ];
+}
diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix
new file mode 100644
index 0000000000000..a38b6a78d3a51
--- /dev/null
+++ b/nixos/modules/services/cluster/hadoop/hdfs.nix
@@ -0,0 +1,73 @@
+{ config, lib, pkgs, ...}:
+let
+  cfg = config.services.hadoop;
+  hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; };
+in
+with lib;
+{
+  options.services.hadoop.hdfs = {
+    namenode.enabled = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to run the Hadoop YARN NameNode
+      '';
+    };
+    datanode.enabled = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to run the Hadoop YARN DataNode
+      '';
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.hdfs.namenode.enabled {
+      systemd.services."hdfs-namenode" = {
+        description = "Hadoop HDFS NameNode";
+        wantedBy = [ "multi-user.target" ];
+
+        environment = {
+          HADOOP_HOME = "${cfg.package}";
+        };
+
+        preStart = ''
+          ${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true
+        '';
+
+        serviceConfig = {
+          User = "hdfs";
+          SyslogIdentifier = "hdfs-namenode";
+          ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode";
+        };
+      };
+    })
+    (mkIf cfg.hdfs.datanode.enabled {
+      systemd.services."hdfs-datanode" = {
+        description = "Hadoop HDFS DataNode";
+        wantedBy = [ "multi-user.target" ];
+
+        environment = {
+          HADOOP_HOME = "${cfg.package}";
+        };
+
+        serviceConfig = {
+          User = "hdfs";
+          SyslogIdentifier = "hdfs-datanode";
+          ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} datanode";
+        };
+      };
+    })
+    (mkIf (
+        cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled
+    ) {
+      users.users.hdfs = {
+        description = "Hadoop HDFS user";
+        group = "hadoop";
+        uid = config.ids.uids.hdfs;
+      };
+    })
+
+  ];
+}
diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix
new file mode 100644
index 0000000000000..5345a2732d7e0
--- /dev/null
+++ b/nixos/modules/services/cluster/hadoop/yarn.nix
@@ -0,0 +1,74 @@
+{ config, lib, pkgs, ...}:
+let
+  cfg = config.services.hadoop;
+  hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; };
+in
+with lib;
+{
+  options.services.hadoop.yarn = {
+    resourcemanager.enabled = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to run the Hadoop YARN ResourceManager
+      '';
+    };
+    nodemanager.enabled = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to run the Hadoop YARN NodeManager
+      '';
+    };
+  };
+
+  config = mkMerge [
+    (mkIf (
+        cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled
+    ) {
+
+      users.users.yarn = {
+        description = "Hadoop YARN user";
+        group = "hadoop";
+        uid = config.ids.uids.yarn;
+      };
+    })
+
+    (mkIf cfg.yarn.resourcemanager.enabled {
+      systemd.services."yarn-resourcemanager" = {
+        description = "Hadoop YARN ResourceManager";
+        wantedBy = [ "multi-user.target" ];
+
+        environment = {
+          HADOOP_HOME = "${cfg.package}";
+        };
+
+        serviceConfig = {
+          User = "yarn";
+          SyslogIdentifier = "yarn-resourcemanager";
+          ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " +
+                      " resourcemanager";
+        };
+      };
+    })
+
+    (mkIf cfg.yarn.nodemanager.enabled {
+      systemd.services."yarn-nodemanager" = {
+        description = "Hadoop YARN NodeManager";
+        wantedBy = [ "multi-user.target" ];
+
+        environment = {
+          HADOOP_HOME = "${cfg.package}";
+        };
+
+        serviceConfig = {
+          User = "yarn";
+          SyslogIdentifier = "yarn-nodemanager";
+          ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " +
+                      " nodemanager";
+        };
+      };
+    })
+
+  ];
+}
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index 8c1f35ec651b1..6d9faada44018 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -4,29 +4,51 @@ with lib;
 
 let
   cfg = config.services.kubernetes.addons.dashboard;
-
-  name = "k8s.gcr.io/kubernetes-dashboard-amd64";
-  version = "v1.8.3";
-
-  image = pkgs.dockerTools.pullImage {
-    imageName = name;
-    imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";
-    finalImageTag = version;
-    sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";
-  };
 in {
   options.services.kubernetes.addons.dashboard = {
     enable = mkEnableOption "kubernetes dashboard addon";
 
-    enableRBAC = mkOption {
-      description = "Whether to enable role based access control is enabled for kubernetes dashboard";
-      type = types.bool;
-      default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;
+    rbac = mkOption {
+      description = "Role-based access control (RBAC) options";
+      type = types.submodule {
+
+        options = {
+          enable = mkOption {
+            description = "Whether to enable role based access control is enabled for kubernetes dashboard";
+            type = types.bool;
+            default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;
+          };
+
+          clusterAdmin = mkOption {
+            description = "Whether to assign cluster admin rights to the kubernetes dashboard";
+            type = types.bool;
+            default = false;
+          };
+          
+        };
+      };
+    };
+
+    version = mkOption {
+      description = "Which version of the kubernetes dashboard to deploy";
+      type = types.str;
+      default = "v1.8.3";
+    };
+
+    image = mkOption {
+      description = "Docker image to seed for the kubernetes dashboard container.";
+      type = types.attrs;
+      default = {
+        imageName = "k8s.gcr.io/kubernetes-dashboard-amd64";
+        imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";
+        finalImageTag = cfg.version;
+        sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";
+      };
     };
   };
 
   config = mkIf cfg.enable {
-    services.kubernetes.kubelet.seedDockerImages = [image];
+    services.kubernetes.kubelet.seedDockerImages = [(pkgs.dockerTools.pullImage cfg.image)];
 
     services.kubernetes.addonManager.addons = {
       kubernetes-dashboard-deployment = {
@@ -36,7 +58,7 @@ in {
           labels = {
             k8s-addon = "kubernetes-dashboard.addons.k8s.io";
             k8s-app = "kubernetes-dashboard";
-            version = version;
+            version = cfg.version;
             "kubernetes.io/cluster-service" = "true";
             "addonmanager.kubernetes.io/mode" = "Reconcile";
           };
@@ -52,7 +74,7 @@ in {
               labels = {
                 k8s-addon = "kubernetes-dashboard.addons.k8s.io";
                 k8s-app = "kubernetes-dashboard";
-                version = version;
+                version = cfg.version;
                 "kubernetes.io/cluster-service" = "true";
               };
               annotations = {
@@ -63,7 +85,7 @@ in {
               priorityClassName = "system-cluster-critical";
               containers = [{
                 name = "kubernetes-dashboard";
-                image = "${name}:${version}";
+                image = with cfg.image; "${imageName}:${finalImageTag}";
                 ports = [{
                   containerPort = 8443;
                   protocol = "TCP";
@@ -195,29 +217,106 @@ in {
           namespace = "kube-system";
         };
       };
-    } // (optionalAttrs cfg.enableRBAC {
-      kubernetes-dashboard-crb = {
-        apiVersion = "rbac.authorization.k8s.io/v1";
-        kind = "ClusterRoleBinding";
-        metadata = {
-          name = "kubernetes-dashboard";
-          labels = {
-            k8s-app = "kubernetes-dashboard";
-            k8s-addon = "kubernetes-dashboard.addons.k8s.io";
-            "addonmanager.kubernetes.io/mode" = "Reconcile";
-          };
-        };
-        roleRef = {
-          apiGroup = "rbac.authorization.k8s.io";
-          kind = "ClusterRole";
-          name = "cluster-admin";
-        };
+    } // (optionalAttrs cfg.rbac.enable
+      (let
         subjects = [{
           kind = "ServiceAccount";
           name = "kubernetes-dashboard";
           namespace = "kube-system";
         }];
-      };
-    });
+        labels = {
+          k8s-app = "kubernetes-dashboard";
+          k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+          "addonmanager.kubernetes.io/mode" = "Reconcile";
+        };
+      in
+        (if cfg.rbac.clusterAdmin then {
+          kubernetes-dashboard-crb = {
+            apiVersion = "rbac.authorization.k8s.io/v1";
+            kind = "ClusterRoleBinding";
+            metadata = {
+              name = "kubernetes-dashboard";
+              inherit labels;
+            };
+            roleRef = {
+              apiGroup = "rbac.authorization.k8s.io";
+              kind = "ClusterRole";
+              name = "cluster-admin";
+            };
+            inherit subjects;
+          };
+        }
+        else
+        {
+          # Upstream role- and rolebinding as per:
+          # https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/alternative/kubernetes-dashboard.yaml
+          kubernetes-dashboard-role = {
+            apiVersion = "rbac.authorization.k8s.io/v1";
+            kind = "Role";
+            metadata = {
+              name = "kubernetes-dashboard-minimal";
+              namespace = "kube-system";
+              inherit labels;
+            };
+            rules = [
+              # Allow Dashboard to create 'kubernetes-dashboard-key-holder' secret.
+              {
+                apiGroups = [""];
+                resources = ["secrets"];
+                verbs = ["create"];
+              }
+              # Allow Dashboard to create 'kubernetes-dashboard-settings' config map.
+              {
+                apiGroups = [""];
+                resources = ["configmaps"];
+                verbs = ["create"];
+              }
+              # Allow Dashboard to get, update and delete Dashboard exclusive secrets.
+              {
+                apiGroups = [""];
+                resources = ["secrets"];
+                resourceNames = ["kubernetes-dashboard-key-holder"];
+                verbs = ["get" "update" "delete"];
+              }
+              # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map.
+              {
+                apiGroups = [""];
+                resources = ["configmaps"];
+                resourceNames = ["kubernetes-dashboard-settings"];
+                verbs = ["get" "update"];
+              }
+              # Allow Dashboard to get metrics from heapster.
+              {
+                apiGroups = [""];
+                resources = ["services"];
+                resourceNames = ["heapster"];
+                verbs = ["proxy"];
+              }
+              {
+                apiGroups = [""];
+                resources = ["services/proxy"];
+                resourceNames = ["heapster" "http:heapster:" "https:heapster:"];
+                verbs = ["get"];
+              }
+            ];
+          };
+
+          kubernetes-dashboard-rb = {
+            apiVersion = "rbac.authorization.k8s.io/v1";
+            kind = "RoleBinding";
+            metadata = {
+              name = "kubernetes-dashboard-minimal";
+              namespace = "kube-system";
+              inherit labels;
+            };
+            roleRef = {
+              apiGroup = "rbac.authorization.k8s.io";
+              kind = "Role";
+              name = "kubernetes-dashboard-minimal";
+            };
+            inherit subjects;
+          };
+        })
+    ));
   };
 }
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index e624f41601b37..2707c176efd89 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -73,7 +73,9 @@ let
   mkKubeConfigOptions = prefix: {
     server = mkOption {
       description = "${prefix} kube-apiserver server address.";
-      default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+      default = "http://${if cfg.apiserver.advertiseAddress != null
+                          then cfg.apiserver.advertiseAddress
+                          else "127.0.0.1"}:${toString cfg.apiserver.port}";
       type = types.str;
     };
 
@@ -103,12 +105,18 @@ let
     keyFile = mkDefault cfg.kubeconfig.keyFile;
   };
 
-  cniConfig = pkgs.buildEnv {
-    name = "kubernetes-cni-config";
-    paths = imap (i: entry:
-      pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)
-    ) cfg.kubelet.cni.config;
-  };
+  cniConfig =
+    if cfg.kubelet.cni.config != [] && !(isNull cfg.kubelet.cni.configDir) then
+      throw "Verbatim CNI-config and CNI configDir cannot both be set."
+    else if !(isNull cfg.kubelet.cni.configDir) then
+      cfg.kubelet.cni.configDir
+    else
+      (pkgs.buildEnv {
+        name = "kubernetes-cni-config";
+        paths = imap (i: entry:
+          pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)
+        ) cfg.kubelet.cni.config;
+      });
 
   manifests = pkgs.buildEnv {
     name = "kubernetes-manifests";
@@ -244,18 +252,13 @@ in {
         type = types.listOf types.str;
       };
 
-      address = mkOption {
-        description = "Kubernetes apiserver listening address.";
-        default = "127.0.0.1";
-        type = types.str;
-      };
-
-      publicAddress = mkOption {
+      bindAddress = mkOption {
         description = ''
-          Kubernetes apiserver public listening address used for read only and
-          secure port.
+          The IP address on which to listen for the --secure-port port.
+          The associated interface(s) must be reachable by the rest
+          of the cluster, and by CLI/web clients.
         '';
-        default = cfg.apiserver.address;
+        default = "0.0.0.0";
         type = types.str;
       };
 
@@ -329,11 +332,11 @@ in {
 
       authorizationMode = mkOption {
         description = ''
-          Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
+          Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See
           <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/authorization/"/>
         '';
         default = ["RBAC" "Node"];
-        type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
+        type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]);
       };
 
       authorizationPolicy = mkOption {
@@ -345,6 +348,15 @@ in {
         type = types.listOf types.attrs;
       };
 
+      webhookConfig = mkOption {
+        description = ''
+          Kubernetes apiserver Webhook config file. It uses the kubeconfig file format.
+          See <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/webhook/"/>
+        '';
+        default = null;
+        type = types.nullOr types.path;
+      };
+
       allowPrivileged = mkOption {
         description = "Whether to allow privileged containers on Kubernetes.";
         default = true;
@@ -670,6 +682,12 @@ in {
             }]
           '';
         };
+
+        configDir = mkOption {
+          description = "Path to Kubernetes CNI configuration directory.";
+          type = types.nullOr types.path;
+          default = null;
+        };
       };
 
       manifests = mkOption {
@@ -892,7 +910,7 @@ in {
 
     (mkIf cfg.apiserver.enable {
       systemd.services.kube-apiserver = {
-        description = "Kubernetes Kubelet Service";
+        description = "Kubernetes APIServer Service";
         wantedBy = [ "kubernetes.target" ];
         after = [ "network.target" "docker.service" ];
         serviceConfig = {
@@ -906,7 +924,7 @@ in {
             ${optionalString (cfg.etcd.keyFile != null)
               "--etcd-keyfile=${cfg.etcd.keyFile}"} \
             --insecure-port=${toString cfg.apiserver.port} \
-            --bind-address=${toString cfg.apiserver.address} \
+            --bind-address=${cfg.apiserver.bindAddress} \
             ${optionalString (cfg.apiserver.advertiseAddress != null)
               "--advertise-address=${cfg.apiserver.advertiseAddress}"} \
             --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\
@@ -934,6 +952,9 @@ in {
                 (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy)
               }"
             } \
+            ${optionalString (elem "Webhook" cfg.apiserver.authorizationMode)
+              "--authorization-webhook-config-file=${cfg.apiserver.webhookConfig}"
+            } \
             --secure-port=${toString cfg.apiserver.securePort} \
             --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \
             ${optionalString (cfg.apiserver.runtimeConfig != "")
@@ -1124,7 +1145,7 @@ in {
       ];
 
       environment.systemPackages = [ cfg.package ];
-      users.extraUsers = singleton {
+      users.users = singleton {
         name = "kubernetes";
         uid = config.ids.uids.kubernetes;
         description = "Kubernetes user";
@@ -1133,7 +1154,7 @@ in {
         home = cfg.dataDir;
         createHome = true;
       };
-      users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes;
+      users.groups.kubernetes.gid = config.ids.gids.kubernetes;
 
 			# dns addon is enabled by default
       services.kubernetes.addons.dns.enable = mkDefault true;
diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
index 9751e5f7cf0a8..43bbb50a48d4d 100644
--- a/nixos/modules/services/cluster/kubernetes/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -4,28 +4,6 @@ with lib;
 
 let
   version = "1.14.10";
-
-  k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
-    imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";
-    imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";
-    finalImageTag = version;
-    sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";
-  };
-
-  k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
-    imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";
-    imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";
-    finalImageTag = version;
-    sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";
-  };
-
-  k8s-dns-sidecar = pkgs.dockerTools.pullImage {
-    imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";
-    imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";
-    finalImageTag = version;
-    sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";
-  };
-
   cfg = config.services.kubernetes.addons.dns;
 in {
   options.services.kubernetes.addons.dns = {
@@ -48,13 +26,46 @@ in {
       default = "cluster.local";
       type = types.str;
     };
+
+    kube-dns = mkOption {
+      description = "Docker image to seed for the kube-dns main container.";
+      type = types.attrs;
+      default = {
+        imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";
+        imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";
+        finalImageTag = version;
+        sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";
+      };
+    };
+
+    dnsmasq-nanny = mkOption {
+      description = "Docker image to seed for the kube-dns dnsmasq container.";
+      type = types.attrs;
+      default = {
+        imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";
+        imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";
+        finalImageTag = version;
+        sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";
+      };
+    };
+
+    sidecar = mkOption {
+      description = "Docker image to seed for the kube-dns sidecar container.";
+      type = types.attrs;
+      default = {
+        imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";
+        imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";
+        finalImageTag = version;
+        sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";
+      };
+    };
   };
 
   config = mkIf cfg.enable {
-    services.kubernetes.kubelet.seedDockerImages = [
-      k8s-dns-kube-dns
-      k8s-dns-dnsmasq-nanny
-      k8s-dns-sidecar
+    services.kubernetes.kubelet.seedDockerImages = with pkgs.dockerTools; [
+      (pullImage cfg.kube-dns)
+      (pullImage cfg.dnsmasq-nanny)
+      (pullImage cfg.sidecar)
     ];
 
     services.kubernetes.addonManager.addons = {
@@ -88,7 +99,7 @@ in {
               containers = [
                 {
                   name = "kubedns";
-                  image = "k8s.gcr.io/k8s-dns-kube-dns-amd64:${version}";
+                  image = with cfg.kube-dns; "${imageName}:${finalImageTag}";
                   resources = {
                     limits.memory = "170Mi";
                     requests = {
@@ -154,7 +165,7 @@ in {
                 }
                 {
                   name = "dnsmasq";
-                  image = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:${version}";
+                  image = with cfg.dnsmasq-nanny; "${imageName}:${finalImageTag}";
                   livenessProbe = {
                     httpGet = {
                       path = "/healthcheck/dnsmasq";
@@ -206,7 +217,7 @@ in {
                 }
                 {
                   name = "sidecar";
-                  image = "k8s.gcr.io/k8s-dns-sidecar-amd64:${version}";
+                  image = with cfg.sidecar; "${imageName}:${finalImageTag}";
                   livenessProbe = {
                     httpGet = {
                       path = "/metrics";
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 846efc8b5b9ac..8d767de37f00a 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -191,11 +191,11 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups = optional (cfg.group == "buildbot") {
+    users.groups = optional (cfg.group == "buildbot") {
       name = "buildbot";
     };
 
-    users.extraUsers = optional (cfg.user == "buildbot") {
+    users.users = optional (cfg.user == "buildbot") {
       name = "buildbot";
       description = "Buildbot User.";
       isNormalUser = true;
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index a97f571e89df2..67c541570b97c 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -84,11 +84,11 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups = optional (cfg.group == "bbworker") {
+    users.groups = optional (cfg.group == "bbworker") {
       name = "bbworker";
     };
 
-    users.extraUsers = optional (cfg.user == "bbworker") {
+    users.users = optional (cfg.user == "bbworker") {
       name = "bbworker";
       description = "Buildbot Worker User.";
       isNormalUser = true;
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index d647b7b9fa491..9daf391c73c46 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -185,7 +185,7 @@ in
   };
 
   config = mkIf config.services.buildkite-agent.enable {
-    users.extraUsers.buildkite-agent =
+    users.users.buildkite-agent =
       { name = "buildkite-agent";
         home = cfg.dataDir;
         createHome = true;
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 6d5cea4f77a5c..a0aff1b8b5b92 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -134,7 +134,7 @@ in
     # Make the gitlab-runner command availabe so users can query the runner
     environment.systemPackages = [ cfg.package ];
 
-    users.extraUsers.gitlab-runner = {
+    users.users.gitlab-runner = {
       group = "gitlab-runner";
       extraGroups = optional hasDocker "docker";
       uid = config.ids.uids.gitlab-runner;
@@ -142,6 +142,6 @@ in
       createHome = true;
     };
 
-    users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner;
+    users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner;
   };
 }
diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix
index 05adb18fbe911..8126f27c2b0c5 100644
--- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix
+++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix
@@ -135,12 +135,12 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups = optional (cfg.group == "gocd-agent") {
+    users.groups = optional (cfg.group == "gocd-agent") {
       name = "gocd-agent";
       gid = config.ids.gids.gocd-agent;
     };
 
-    users.extraUsers = optional (cfg.user == "gocd-agent") {
+    users.users = optional (cfg.user == "gocd-agent") {
       name = "gocd-agent";
       description = "gocd-agent user";
       createHome = true;
diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix
index 07e00f17f1e8e..8f177da129e50 100644
--- a/nixos/modules/services/continuous-integration/gocd-server/default.nix
+++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix
@@ -113,8 +113,8 @@ in {
 
       extraOptions = mkOption {
         default = [ ];
-        example = [ 
-          "-X debug" 
+        example = [
+          "-X debug"
           "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
           "-verbose:gc"
           "-Xloggc:go-server-gc.log"
@@ -143,12 +143,12 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups = optional (cfg.group == "gocd-server") {
+    users.groups = optional (cfg.group == "gocd-server") {
       name = "gocd-server";
       gid = config.ids.gids.gocd-server;
     };
 
-    users.extraUsers = optional (cfg.user == "gocd-server") {
+    users.users = optional (cfg.user == "gocd-server") {
       name = "gocd-server";
       description = "gocd-server user";
       createHome = true;
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 2fa7c59a965d3..c7fe4eeeab996 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -194,11 +194,11 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraGroups.hydra = {
+    users.groups.hydra = {
       gid = config.ids.gids.hydra;
     };
 
-    users.extraUsers.hydra =
+    users.users.hydra =
       { description = "Hydra";
         group = "hydra";
         createHome = true;
@@ -207,7 +207,7 @@ in
         uid = config.ids.uids.hydra;
       };
 
-    users.extraUsers.hydra-queue-runner =
+    users.users.hydra-queue-runner =
       { description = "Hydra queue runner";
         group = "hydra";
         useDefaultShell = true;
@@ -215,7 +215,7 @@ in
         uid = config.ids.uids.hydra-queue-runner;
       };
 
-    users.extraUsers.hydra-www =
+    users.users.hydra-www =
       { description = "Hydra web server";
         group = "hydra";
         useDefaultShell = true;
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index c2f4e9c0c5a73..1eca45fbd570c 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -150,12 +150,12 @@ in {
       pkgs.dejavu_fonts
     ];
 
-    users.extraGroups = optional (cfg.group == "jenkins") {
+    users.groups = optional (cfg.group == "jenkins") {
       name = "jenkins";
       gid = config.ids.gids.jenkins;
     };
 
-    users.extraUsers = optional (cfg.user == "jenkins") {
+    users.users = optional (cfg.user == "jenkins") {
       name = "jenkins";
       description = "jenkins user";
       createHome = true;
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
index a0216caf2b5c6..d8f55fb826f28 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -50,12 +50,12 @@ in {
   };
 
   config = mkIf (cfg.enable && !masterCfg.enable) {
-    users.extraGroups = optional (cfg.group == "jenkins") {
+    users.groups = optional (cfg.group == "jenkins") {
       name = "jenkins";
       gid = config.ids.gids.jenkins;
     };
 
-    users.extraUsers = optional (cfg.user == "jenkins") {
+    users.users = optional (cfg.user == "jenkins") {
       name = "jenkins";
       description = "jenkins user";
       createHome = true;
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index d528355671f61..59ed0e5f0afdf 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -52,7 +52,7 @@ with lib;
         message = "Must specify 4Store database name";
       };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = endpointUser;
         uid = config.ids.uids.fourstorehttp;
         description = "4Store SPARQL endpoint user";
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index abb62e1f2637e..be4351c1c38f4 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -43,7 +43,7 @@ with lib;
         message = "Must specify 4Store database name.";
       };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = fourStoreUser;
         uid = config.ids.uids.fourstore;
         description = "4Store database user";
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index 1e5cd8f541307..09b3fbd8a62a0 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -420,7 +420,7 @@ in {
       9160
     ];
 
-    users.extraUsers.cassandra =
+    users.users.cassandra =
       if config.ids.uids ? "cassandra"
       then { uid = config.ids.uids.cassandra; } // cassandraUser
       else cassandraUser ;
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix
index 631d7f8cba793..1b8771cec3915 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixos/modules/services/databases/clickhouse.nix
@@ -27,14 +27,14 @@ with lib;
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.clickhouse = {
+    users.users.clickhouse = {
       name = "clickhouse";
       uid = config.ids.uids.clickhouse;
       group = "clickhouse";
       description = "ClickHouse server user";
     };
 
-    users.extraGroups.clickhouse.gid = config.ids.gids.clickhouse;
+    users.groups.clickhouse.gid = config.ids.gids.clickhouse;
 
     systemd.services.clickhouse = {
       description = "ClickHouse server";
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 52247bfb983e2..ca89b1198205b 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -198,13 +198,13 @@ in {
       };
     };
 
-    users.extraUsers.couchdb = {
+    users.users.couchdb = {
       description = "CouchDB Server user";
       group = "couchdb";
       uid = config.ids.uids.couchdb;
     };
 
-    users.extraGroups.couchdb.gid = config.ids.gids.couchdb;
+    users.groups.couchdb.gid = config.ids.gids.couchdb;
 
   };
 }
diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index b9f66612d4ebf..cc81b440450b1 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -154,13 +154,13 @@ in
       # there are some additional settings which should be reviewed
     '';
 
-    users.extraUsers.firebird = {
+    users.users.firebird = {
       description = "Firebird server user";
       group = "firebird";
       uid = config.ids.uids.firebird;
     };
 
-    users.extraGroups.firebird.gid = config.ids.gids.firebird;
+    users.groups.firebird.gid = config.ids.gids.firebird;
 
   };
 }
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 693d2fde99163..91337cf791dca 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -325,14 +325,14 @@ in
 
     environment.systemPackages = [ pkg ];
 
-    users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton
+    users.users = optionalAttrs (cfg.user == "foundationdb") (singleton
       { name        = "foundationdb";
         description = "FoundationDB User";
         uid         = config.ids.uids.foundationdb;
         group       = cfg.group;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "foundationdb") (singleton
+    users.groups = optionalAttrs (cfg.group == "foundationdb") (singleton
       { name = "foundationdb";
         gid  = config.ids.gids.foundationdb;
       });
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index 629d02209a9c7..4772e897efe2c 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -122,13 +122,13 @@ in {
       };
     };
 
-    users.extraUsers.hbase = {
+    users.users.hbase = {
       description = "HBase Server user";
       group = "hbase";
       uid = config.ids.uids.hbase;
     };
 
-    users.extraGroups.hbase.gid = config.ids.gids.hbase;
+    users.groups.hbase.gid = config.ids.gids.hbase;
 
   };
 }
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 15b711f57b13b..d7a028b25d8d9 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -182,13 +182,13 @@ in
         '';
     };
 
-    users.extraUsers = optional (cfg.user == "influxdb") {
+    users.users = optional (cfg.user == "influxdb") {
       name = "influxdb";
       uid = config.ids.uids.influxdb;
       description = "Influxdb daemon user";
     };
 
-    users.extraGroups = optional (cfg.group == "influxdb") {
+    users.groups = optional (cfg.group == "influxdb") {
       name = "influxdb";
       gid = config.ids.gids.influxdb;
     };
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index 46bc6fc5c1320..7af452e4dced7 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -64,7 +64,7 @@ in
 
   config = mkIf config.services.memcached.enable {
 
-    users.extraUsers = optional (cfg.user == "memcached") {
+    users.users = optional (cfg.user == "memcached") {
       name = "memcached";
       description = "Memcached server user";
     };
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 78dbf0d784cfb..4c46d9228e5f8 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -93,7 +93,7 @@ in
 
   config = mkIf config.services.mongodb.enable {
 
-    users.extraUsers.mongodb = mkIf (cfg.user == "mongodb")
+    users.users.mongodb = mkIf (cfg.user == "mongodb")
       { name = "mongodb";
         uid = config.ids.uids.mongodb;
         description = "MongoDB server user";
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 15b9c788e8724..3eb7879e2d9f6 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -221,13 +221,13 @@ in
       mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql"
                  else "/var/mysql");
 
-    users.extraUsers.mysql = {
+    users.users.mysql = {
       description = "MySQL server user";
       group = "mysql";
       uid = config.ids.uids.mysql;
     };
 
-    users.extraGroups.mysql.gid = config.ids.gids.mysql;
+    users.groups.mysql.gid = config.ids.gids.mysql;
 
     environment.systemPackages = [mysql];
 
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 424e08a6ee346..5015618c42472 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -139,7 +139,7 @@ in {
 
     environment.systemPackages = [ cfg.package ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "neo4j";
       uid = config.ids.uids.neo4j;
       description = "Neo4j daemon user";
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index a67c61eb99492..9f2bf5ef8a9cc 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -145,13 +145,13 @@ in
           "${configOpts}";
     };
 
-    users.extraUsers.openldap =
+    users.users.openldap =
       { name = cfg.user;
         group = cfg.group;
         uid = config.ids.uids.openldap;
       };
 
-    users.extraGroups.openldap =
+    users.groups.openldap =
       { name = cfg.group;
         gid = config.ids.gids.openldap;
       };
diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix
index 489cdcffe6587..b26fa9093ef46 100644
--- a/nixos/modules/services/databases/opentsdb.nix
+++ b/nixos/modules/services/databases/opentsdb.nix
@@ -97,13 +97,13 @@ in {
       };
     };
 
-    users.extraUsers.opentsdb = {
+    users.users.opentsdb = {
       description = "OpenTSDB Server user";
       group = "opentsdb";
       uid = config.ids.uids.opentsdb;
     };
 
-    users.extraGroups.opentsdb.gid = config.ids.gids.opentsdb;
+    users.groups.opentsdb.gid = config.ids.gids.opentsdb;
 
   };
 }
diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix
index d1b48c06440e5..1a34c7f5ecee6 100644
--- a/nixos/modules/services/databases/pgmanage.nix
+++ b/nixos/modules/services/databases/pgmanage.nix
@@ -41,7 +41,9 @@ let
 
   pgmanage = "pgmanage";
 
-  pgmanageOptions = {
+in {
+
+  options.services.pgmanage = {
     enable = mkEnableOption "PostgreSQL Administration for the web";
 
     package = mkOption {
@@ -176,47 +178,29 @@ let
     };
   };
 
-
-in {
-
-  options.services.pgmanage = pgmanageOptions;
-
-  # This is deprecated and should be removed for NixOS-18.03.
-  options.services.postage = pgmanageOptions;
-
-  config = mkMerge [
-    { assertions = [
-        { assertion = !config.services.postage.enable;
-          message =
-            "services.postage is deprecated in favour of pgmanage. " +
-            "They have the same options so just substitute postage for pgmanage." ;
-        }
-      ];
-    }
-    (mkIf cfg.enable {
-      systemd.services.pgmanage = {
-        description = "pgmanage - PostgreSQL Administration for the web";
-        wants    = [ "postgresql.service" ];
-        after    = [ "postgresql.service" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          User         = pgmanage;
-          Group        = pgmanage;
-          ExecStart    = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
-                         optionalString cfg.localOnly " --local-only=true";
-        };
+  config = mkIf cfg.enable {
+    systemd.services.pgmanage = {
+      description = "pgmanage - PostgreSQL Administration for the web";
+      wants    = [ "postgresql.service" ];
+      after    = [ "postgresql.service" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User         = pgmanage;
+        Group        = pgmanage;
+        ExecStart    = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
+                       optionalString cfg.localOnly " --local-only=true";
       };
-      users = {
-        users."${pgmanage}" = {
-          name  = pgmanage;
-          group = pgmanage;
-          home  = cfg.sqlRoot;
-          createHome = true;
-        };
-        groups."${pgmanage}" = {
-          name = pgmanage;
-        };
+    };
+    users = {
+      users."${pgmanage}" = {
+        name  = pgmanage;
+        group = pgmanage;
+        home  = cfg.sqlRoot;
+        createHome = true;
       };
-    })
-  ];
+      groups."${pgmanage}" = {
+        name = pgmanage;
+      };
+    };
+  };
 }
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 4ad4728ccda6e..e33bee9db6e93 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -24,14 +24,13 @@ let
 
   postgresql = postgresqlAndPlugins cfg.package;
 
-  flags = optional cfg.enableTCPIP "-i";
-
   # The main PostgreSQL configuration file.
   configFile = pkgs.writeText "postgresql.conf"
     ''
       hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'stderr'
+      listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}'
       port = ${toString cfg.port}
       ${cfg.extraConfig}
     '';
@@ -184,14 +183,14 @@ in
         host  all all ::1/128      md5
       '';
 
-    users.extraUsers.postgres =
+    users.users.postgres =
       { name = "postgres";
         uid = config.ids.uids.postgres;
         group = "postgres";
         description = "PostgreSQL server user";
       };
 
-    users.extraGroups.postgres.gid = config.ids.gids.postgres;
+    users.groups.postgres.gid = config.ids.gids.postgres;
 
     environment.systemPackages = [ postgresql ];
 
@@ -229,7 +228,7 @@ in
                 "${cfg.dataDir}/recovery.conf"
             ''}
 
-             exec postgres ${toString flags}
+             exec postgres
           '';
 
         serviceConfig =
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index e4e38a4364a0d..cc7b51982d1d6 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -217,7 +217,7 @@ in
       allowedTCPPorts = [ cfg.port ];
     };
 
-    users.extraUsers.redis =
+    users.users.redis =
       { name = cfg.user;
         description = "Redis database user";
       };
diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix
index cd8c386b08db0..789d9c851d64f 100644
--- a/nixos/modules/services/databases/rethinkdb.nix
+++ b/nixos/modules/services/databases/rethinkdb.nix
@@ -96,12 +96,12 @@ in
       '';
     };
 
-    users.extraUsers.rethinkdb = mkIf (cfg.user == "rethinkdb")
+    users.users.rethinkdb = mkIf (cfg.user == "rethinkdb")
       { name = "rethinkdb";
         description = "RethinkDB server user";
       };
 
-    users.extraGroups = optionalAttrs (cfg.group == "rethinkdb") (singleton
+    users.groups = optionalAttrs (cfg.group == "rethinkdb") (singleton
       { name = "rethinkdb";
       });
 
diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix
index 198efc29222a2..2cb204f729a73 100644
--- a/nixos/modules/services/databases/riak-cs.nix
+++ b/nixos/modules/services/databases/riak-cs.nix
@@ -145,7 +145,7 @@ in
       ${cfg.extraAdvancedConfig}
     '';
 
-    users.extraUsers.riak-cs = {
+    users.users.riak-cs = {
       name = "riak-cs";
       uid = config.ids.uids.riak-cs;
       group = "riak";
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index e0ebf164aef03..ac086cf559964 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -102,14 +102,14 @@ in
       ${cfg.extraAdvancedConfig}
     '';
 
-    users.extraUsers.riak = {
+    users.users.riak = {
       name = "riak";
       uid = config.ids.uids.riak;
       group = "riak";
       description = "Riak server user";
     };
 
-    users.extraGroups.riak.gid = config.ids.gids.riak;
+    users.groups.riak.gid = config.ids.gids.riak;
 
     systemd.services.riak = {
       description = "Riak Server";
diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix
index a4597cac3cd6c..9fe49f51edd26 100644
--- a/nixos/modules/services/databases/stanchion.nix
+++ b/nixos/modules/services/databases/stanchion.nix
@@ -143,14 +143,14 @@ in
       ${cfg.extraConfig}
     '';
 
-    users.extraUsers.stanchion = {
+    users.users.stanchion = {
       name = "stanchion";
       uid = config.ids.uids.stanchion;
       group = "stanchion";
       description = "Stanchion server user";
     };
 
-    users.extraGroups.stanchion.gid = config.ids.gids.stanchion;
+    users.groups.stanchion.gid = config.ids.gids.stanchion;
 
     systemd.services.stanchion = {
       description = "Stanchion Server";
diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix
index 3231fede08fa5..6ffc44a5274e6 100644
--- a/nixos/modules/services/databases/virtuoso.nix
+++ b/nixos/modules/services/databases/virtuoso.nix
@@ -54,7 +54,7 @@ with lib;
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = virtuosoUser;
         uid = config.ids.uids.virtuoso;
         description = "virtuoso user";
diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix
new file mode 100644
index 0000000000000..0928ee81a6487
--- /dev/null
+++ b/nixos/modules/services/desktops/bamf.nix
@@ -0,0 +1,23 @@
+# Bamf
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+
+  options = {
+    services.bamf = {
+      enable = mkEnableOption "bamf";
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.bamf.enable {
+    services.dbus.packages = [ pkgs.bamf ];
+
+    systemd.packages = [ pkgs.bamf ];
+  };
+}
diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix
index 263a06156f84b..13f3d61e84ca1 100644
--- a/nixos/modules/services/desktops/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire.nix
@@ -3,20 +3,34 @@
 
 with lib;
 
-{
+let
+  cfg = config.services.pipewire;
+  packages = with pkgs; [ pipewire ];
+
+in {
   ###### interface
   options = {
     services.pipewire = {
       enable = mkEnableOption "pipewire service";
+
+      socketActivation = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Automatically run pipewire when connections are made to the pipewire socket.
+        '';
+      };
     };
   };
 
 
   ###### implementation
-  config = mkIf config.services.pipewire.enable {
-    environment.systemPackages = [ pkgs.pipewire ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = packages;
+
+    systemd.packages = packages;
 
-    systemd.packages = [ pkgs.pipewire ];
+    systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ];
   };
 
   meta.maintainers = with lib.maintainers; [ jtojnar ];
diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix
new file mode 100644
index 0000000000000..56904b7c40e6a
--- /dev/null
+++ b/nixos/modules/services/development/bloop.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.bloop;
+
+in {
+
+  options.services.bloop = {
+    install = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to install a user service for the Bloop server.
+
+        The service must be manually started for each user with
+        "systemctl --user start bloop".
+      '';
+    };
+  };
+
+  config = mkIf (cfg.install) {
+    systemd.user.services.bloop = {
+      description = "Bloop Scala build server";
+
+      serviceConfig = {
+        Type      = "simple";
+        ExecStart = ''${pkgs.bloop}/bin/blp-server'';
+        Restart   = "always";
+      };
+    };
+
+    environment.systemPackages = [ pkgs.bloop ];
+  };
+}
diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix
index 9074a4345eae5..bba21caca85d7 100644
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixos/modules/services/editors/infinoted.nix
@@ -111,12 +111,12 @@ in {
   };
 
   config = mkIf (cfg.enable) {
-    users.extraUsers = optional (cfg.user == "infinoted")
+    users.users = optional (cfg.user == "infinoted")
       { name = "infinoted";
         description = "Infinoted user";
         group = cfg.group;
       };
-    users.extraGroups = optional (cfg.group == "infinoted")
+    users.groups = optional (cfg.group == "infinoted")
       { name = "infinoted";
       };
   
diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix
index d2c8af6de0c54..f50d2897843a2 100644
--- a/nixos/modules/services/games/minecraft-server.nix
+++ b/nixos/modules/services/games/minecraft-server.nix
@@ -45,7 +45,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.minecraft = {
+    users.users.minecraft = {
       description     = "Minecraft Server Service user";
       home            = cfg.dataDir;
       createHome      = true;
diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix
index 58b73ac4f6bfa..2de42f20f6ccd 100644
--- a/nixos/modules/services/games/minetest-server.nix
+++ b/nixos/modules/services/games/minetest-server.nix
@@ -79,7 +79,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.minetest = {
+    users.users.minetest = {
       description     = "Minetest Server Service user";
       home            = "/var/lib/minetest";
       createHome      = true;
diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix
index 21aff780b6729..ddf17599296ad 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixos/modules/services/games/terraria.nix
@@ -105,14 +105,14 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.terraria = {
+    users.users.terraria = {
       description = "Terraria server service user";
       home        = "/var/lib/terraria";
       createHome  = true;
       uid         = config.ids.uids.terraria;
     };
 
-    users.extraGroups.terraria = {
+    users.groups.terraria = {
       gid = config.ids.gids.terraria;
       members = [ "terraria" ];
     };
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index d8abde2a600a8..d97d690920a65 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -85,6 +85,6 @@ in {
   };
 
   meta = {
-    maintainers = pkgs.fwupd.maintainers;
+    maintainers = pkgs.fwupd.meta.maintainers;
   };
 }
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index d651ccaa57764..fe05c5a5c06f8 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -124,7 +124,7 @@ in
       environment.sessionVariables = env;
       services.udev.packages = backends;
 
-      users.extraGroups."scanner".gid = config.ids.gids.scanner;
+      users.groups."scanner".gid = config.ids.gids.scanner;
     })
 
     (mkIf config.services.saned.enable {
@@ -152,7 +152,7 @@ in
         };
       };
 
-      users.extraUsers."scanner" = {
+      users.users."scanner" = {
         uid = config.ids.uids.scanner;
         group = "scanner";
       };
diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index d957b5063d386..d4b0a9495d757 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -137,13 +137,13 @@ in
       serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}";
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton
+    users.users = optionalAttrs (cfg.user == "tss") (singleton
       { name = "tss";
         group = "tss";
         uid = config.ids.uids.tss;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton
+    users.groups = optionalAttrs (cfg.group == "tss") (singleton
       { name = "tss";
         gid = config.ids.gids.tss;
       });
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index ad5dc8e8a49b7..ed8703be921cb 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -40,15 +40,8 @@ with lib;
       '';
 
     services.udev.packages = [ pkgs.udisks2 ];
-    
-    systemd.services.udisks2 = {
-      description = "Udisks2 service";
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "org.freedesktop.UDisks2";
-        ExecStart = "${pkgs.udisks2}/libexec/udisks2/udisksd --no-debug";
-      };
-    };
+
+    systemd.packages = [ pkgs.udisks2 ];
   };
 
 }
diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix
index 7ebd49fa01c27..6a3f7cfd210de 100644
--- a/nixos/modules/services/hardware/usbmuxd.nix
+++ b/nixos/modules/services/hardware/usbmuxd.nix
@@ -43,13 +43,13 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = optional (cfg.user == defaultUserGroup) {
+    users.users = optional (cfg.user == defaultUserGroup) {
       name = cfg.user;
       description = "usbmuxd user";
       group = cfg.group;
     };
 
-    users.extraGroups = optional (cfg.group == defaultUserGroup) {
+    users.groups = optional (cfg.group == defaultUserGroup) {
       name = cfg.group;
     };
 
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 95f31829882ff..74a7b3c9b470b 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -127,7 +127,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = mkIf (cfg.user == "graylog") {
+    users.users = mkIf (cfg.user == "graylog") {
       graylog = {
         uid = config.ids.uids.graylog;
         description = "Graylog server daemon user";
diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix
new file mode 100644
index 0000000000000..74ac3d4c23659
--- /dev/null
+++ b/nixos/modules/services/logging/journaldriver.nix
@@ -0,0 +1,112 @@
+# This module implements a systemd service for running journaldriver,
+# a log forwarding agent that sends logs from journald to Stackdriver
+# Logging.
+#
+# It can be enabled without extra configuration when running on GCP.
+# On machines hosted elsewhere, the other configuration options need
+# to be set.
+#
+# For further information please consult the documentation in the
+# upstream repository at: https://github.com/aprilabank/journaldriver/
+
+{ config, lib, pkgs, ...}:
+
+with lib; let cfg = config.services.journaldriver;
+in {
+  options.services.journaldriver = {
+    enable = mkOption {
+      type        = types.bool;
+      default     = false;
+      description = ''
+        Whether to enable journaldriver to forward journald logs to
+        Stackdriver Logging.
+      '';
+    };
+
+    logLevel = mkOption {
+      type        = types.str;
+      default     = "info";
+      description = ''
+        Log level at which journaldriver logs its own output.
+      '';
+    };
+
+    logName = mkOption {
+      type        = with types; nullOr str;
+      default     = null;
+      description = ''
+        Configures the name of the target log in Stackdriver Logging.
+        This option can be set to, for example, the hostname of a
+        machine to improve the user experience in the logging
+        overview.
+      '';
+    };
+
+    googleCloudProject = mkOption {
+      type        = with types; nullOr str;
+      default     = null;
+      description = ''
+        Configures the name of the Google Cloud project to which to
+        forward journald logs.
+
+        This option is required on non-GCP machines, but should not be
+        set on GCP instances.
+      '';
+    };
+
+    logStream = mkOption {
+      type        = with types; nullOr str;
+      default     = null;
+      description = ''
+        Configures the name of the Stackdriver Logging log stream into
+        which to write journald entries.
+
+        This option is required on non-GCP machines, but should not be
+        set on GCP instances.
+      '';
+    };
+
+    applicationCredentials = mkOption {
+      type        = with types; nullOr path;
+      default     = null;
+      description = ''
+        Path to the service account private key (in JSON-format) used
+        to forward log entries to Stackdriver Logging on non-GCP
+        instances.
+
+        This option is required on non-GCP machines, but should not be
+        set on GCP instances.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.journaldriver = {
+      description = "Stackdriver Logging journal forwarder";
+      script      = "${pkgs.journaldriver}/bin/journaldriver";
+      after       = [ "network-online.target" ];
+      wantedBy    = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Restart        = "always";
+        DynamicUser    = true;
+
+        # This directive lets systemd automatically configure
+        # permissions on /var/lib/journaldriver, the directory in
+        # which journaldriver persists its cursor state.
+        StateDirectory = "journaldriver";
+
+        # This group is required for accessing journald.
+        SupplementaryGroups = "systemd-journal";
+      };
+
+      environment = {
+        RUST_LOG                       = cfg.logLevel;
+        LOG_NAME                       = cfg.logName;
+        LOG_STREAM                     = cfg.logStream;
+        GOOGLE_CLOUD_PROJECT           = cfg.googleCloudProject;
+        GOOGLE_APPLICATION_CREDENTIALS = cfg.applicationCredentials;
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix
index d49795fe2b77c..2c9bc18c8c3cd 100644
--- a/nixos/modules/services/logging/journalwatch.nix
+++ b/nixos/modules/services/logging/journalwatch.nix
@@ -197,7 +197,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.${user} = {
+    users.users.${user} = {
       isSystemUser = true;
       createHome = true;
       home = dataDir;
@@ -241,6 +241,6 @@ in {
   };
 
   meta = {
-    maintainers = with stdenv.lib.maintainers; [ florianjacob ];
+    maintainers = with lib.maintainers; [ florianjacob ];
   };
 }
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index a4cab0c94cdcc..1477d273d5ee9 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -213,7 +213,7 @@ in
         mapAttrsToList writeIgnoreRule cfg.ignore
         ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron;
 
-    users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton
+    users.users = optionalAttrs (cfg.user == "logcheck") (singleton
       { name = "logcheck";
         uid = config.ids.uids.logcheck;
         shell = "/bin/sh";
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 50477fdd25bad..a3eb1653df5b6 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -309,7 +309,7 @@ in
      ++ optional cfg.enablePop3 "pop3"
      ++ optional cfg.enableLmtp "lmtp";
 
-    users.extraUsers = [
+    users.users = [
       { name = "dovenull";
         uid = config.ids.uids.dovenull2;
         description = "Dovecot user for untrusted logins";
@@ -328,7 +328,7 @@ in
            group = cfg.mailGroup;
          });
 
-    users.extraGroups = optional (cfg.group == "dovecot2")
+    users.groups = optional (cfg.group == "dovecot2")
       { name = "dovecot2";
         gid = config.ids.gids.dovecot2;
       }
diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index 89076ff054620..167b5aeccc848 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -86,13 +86,13 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     {
-      users.extraUsers = optionalAttrs (cfg.user == "dspam") (singleton
+      users.users = optionalAttrs (cfg.user == "dspam") (singleton
         { name = "dspam";
           group = cfg.group;
           uid = config.ids.uids.dspam;
         });
 
-      users.extraGroups = optionalAttrs (cfg.group == "dspam") (singleton
+      users.groups = optionalAttrs (cfg.group == "dspam") (singleton
         { name = "dspam";
           gid = config.ids.gids.dspam;
         });
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index f9ee3f9096607..06c4b2811b3fc 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -77,14 +77,14 @@ in
       systemPackages = [ exim ];
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = cfg.user;
       description = "Exim mail transfer agent user";
       uid = config.ids.uids.exim;
       group = cfg.group;
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = cfg.group;
       gid = config.ids.gids.exim;
     };
diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix
index 206fb50d31a29..b78f4c8e0e663 100644
--- a/nixos/modules/services/mail/mailhog.nix
+++ b/nixos/modules/services/mail/mailhog.nix
@@ -24,7 +24,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.mailhog = {
+    users.users.mailhog = {
       name = cfg.user;
       description = "MailHog service user";
     };
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index b6439b44fb5f5..11565bc02f891 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -94,7 +94,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = cfg.user;
       description = "mlmmj user";
       home = stateDir;
@@ -104,7 +104,7 @@ in
       useDefaultShell = true;
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = cfg.group;
       gid = config.ids.gids.mlmmj;
     };
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 59cb512c115b6..418c02af4b7f1 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -201,13 +201,13 @@ with lib;
     };
 
     users = {
-      extraUsers = singleton {
+      users = singleton {
         name = cfg.user;
         description = "Nullmailer relay-only mta user";
         group = cfg.group;
       };
 
-      extraGroups = singleton {
+      groups = singleton {
         name = cfg.group;
       };
     };
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index 59a8373843a1f..7855efb46c73d 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -88,13 +88,13 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton
+    users.users = optionalAttrs (cfg.user == "opendkim") (singleton
       { name = "opendkim";
         group = cfg.group;
         uid = config.ids.uids.opendkim;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "opendkim") (singleton
+    users.groups = optionalAttrs (cfg.group == "opendkim") (singleton
       { name = "opendkim";
         gid = config.ids.gids.opendkim;
       });
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 53acdba424570..4276552d4f03a 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -10,7 +10,7 @@ let
 
   sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
     mkdir -p $out/bin
-    ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail
+    ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail
   '';
 
 in {
@@ -27,6 +27,13 @@ in {
         description = "Whether to enable the OpenSMTPD server.";
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.opensmtpd;
+        defaultText = "pkgs.opensmtpd";
+        description = "The OpenSMTPD package to use.";
+      };
+
       addSendmailToSystemPath = mkOption {
         type = types.bool;
         default = true;
@@ -76,12 +83,12 @@ in {
   ###### implementation
 
   config = mkIf cfg.enable {
-    users.extraGroups = {
+    users.groups = {
       smtpd.gid = config.ids.gids.smtpd;
       smtpq.gid = config.ids.gids.smtpq;
     };
 
-    users.extraUsers = {
+    users.users = {
       smtpd = {
         description = "OpenSMTPD process user";
         uid = config.ids.uids.smtpd;
@@ -97,7 +104,7 @@ in {
     systemd.services.opensmtpd = let
       procEnv = pkgs.buildEnv {
         name = "opensmtpd-procs";
-        paths = [ pkgs.opensmtpd ] ++ cfg.procPackages;
+        paths = [ cfg.package ] ++ cfg.procPackages;
         pathsToLink = [ "/libexec/opensmtpd" ];
       };
     in {
@@ -115,7 +122,7 @@ in {
         chown smtpq.root /var/spool/smtpd/purge
         chmod 700 /var/spool/smtpd/purge
       '';
-      serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
+      serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
       environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
     };
 
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 5ab331ac067fd..33249aa3e554c 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -616,14 +616,14 @@ in
         setgid = true;
       };
 
-      users.extraUsers = optional (user == "postfix")
+      users.users = optional (user == "postfix")
         { name = "postfix";
           description = "Postfix mail server user";
           uid = config.ids.uids.postfix;
           group = group;
         };
 
-      users.extraGroups =
+      users.groups =
         optional (group == "postfix")
         { name = group;
           gid = config.ids.gids.postfix;
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index d4ae25c066acd..241f75eae279f 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -136,14 +136,14 @@ in {
     environment.systemPackages = [ pkgs.postgrey ];
 
     users = {
-      extraUsers = {
+      users = {
         postgrey = {
           description = "Postgrey Daemon";
           uid = config.ids.uids.postgrey;
           group = "postgrey";
         };
       };
-      extraGroups = {
+      groups = {
         postgrey = {
           gid = config.ids.gids.postgrey;
         };
diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
index a1af16ec9ac18..8f12a16906c5a 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -90,13 +90,13 @@ in {
 
     services.postsrsd.domain = mkDefault config.networking.hostName;
 
-    users.extraUsers = optionalAttrs (cfg.user == "postsrsd") (singleton
+    users.users = optionalAttrs (cfg.user == "postsrsd") (singleton
       { name = "postsrsd";
         group = cfg.group;
         uid = config.ids.uids.postsrsd;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "postsrsd") (singleton
+    users.groups = optionalAttrs (cfg.group == "postsrsd") (singleton
       { name = "postsrsd";
         gid = config.ids.gids.postsrsd;
       });
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index e17b7516bfff8..7f38d75701329 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -194,14 +194,14 @@ in
 
     (mkIf cfg.enable {
 
-      users.extraUsers = singleton {
+      users.users = singleton {
         name = cfg.user;
         description = "rmilter daemon";
         uid = config.ids.uids.rmilter;
         group = cfg.group;
       };
 
-      users.extraGroups = singleton {
+      users.groups = singleton {
         name = cfg.group;
         gid = config.ids.gids.rmilter;
       };
@@ -238,12 +238,12 @@ in
     })
 
     (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) {
-      users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ];
+      users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ];
     })
 
     (mkIf (cfg.enable && cfg.postfix.enable) {
       services.postfix.extraConfig = cfg.postfix.configFragment;
-      users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ];
+      users.users.${postfixCfg.user}.extraGroups = [ cfg.group ];
     })
   ];
 }
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 09fb587e74b56..b3dae60c2c7e0 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -282,14 +282,14 @@ in
     # Allow users to run 'rspamc' and 'rspamadm'.
     environment.systemPackages = [ pkgs.rspamd ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = cfg.user;
       description = "rspamd daemon";
       uid = config.ids.uids.rspamd;
       group = cfg.group;
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = cfg.group;
       gid = config.ids.gids.rspamd;
     };
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index d483a8c3d67dc..0c11ea4313685 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -128,14 +128,14 @@ in
       systemPackages = [ pkgs.spamassassin ];
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "spamd";
       description = "Spam Assassin Daemon";
       uid = config.ids.uids.spamd;
       group = "spamd";
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = "spamd";
       gid = config.ids.gids.spamd;
     };
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index b92104787a560..083587b8ebb1b 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -107,7 +107,7 @@ in {
       };
     };
 
-    users.extraUsers.airsonic = {
+    users.users.airsonic = {
       description = "Airsonic service user";
       name = cfg.user;
       home = cfg.home;
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 82fa1cc2e7e51..363ac4411e11d 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -124,7 +124,7 @@ in {
 
     environment.systemPackages = [cfg.package];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "apache-kafka";
       uid = config.ids.uids.apache-kafka;
       description = "Apache Kafka daemon user";
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 3020130ad1f69..4708e16e2a6c6 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -12,6 +12,16 @@ in {
 
     services.autorandr = {
       enable = mkEnableOption "handling of hotplug and sleep events by autorandr";
+
+      defaultTarget = mkOption {
+        default = "default";
+        type = types.str;
+        description = ''
+          Fallback if no monitor layout can be detected. See the docs
+          (https://github.com/phillipberndt/autorandr/blob/v1.0/README.md#how-to-use)
+          for further reference.
+        '';
+      };
     };
 
   };
@@ -22,13 +32,21 @@ in {
 
     environment.systemPackages = [ pkgs.autorandr ];
 
-    systemd.packages = [ pkgs.autorandr ];
-
     systemd.services.autorandr = {
       wantedBy = [ "sleep.target" ];
+      description = "Autorandr execution hook";
+      after = [ "sleep.target" ];
+
+      serviceConfig = {
+        StartLimitInterval = 5;
+        StartLimitBurst = 1;
+        ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}";
+        Type = "oneshot";
+        RemainAfterExit = false;
+      };
     };
 
   };
 
-  meta.maintainers = with maintainers; [ gnidorah ];
+  meta.maintainers = with maintainers; [ gnidorah ma27 ];
 }
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index c499e428af359..62835c194e42b 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -168,14 +168,14 @@ in
         })
     ) cfg.servers;
 
-    users.extraUsers = [{
+    users.users = [{
       uid = config.ids.uids.bepasty;
       name = user;
       group = group;
       home = default_home;
     }];
 
-    users.extraGroups = [{
+    users.groups = [{
       name = group;
       gid = config.ids.gids.bepasty;
     }];
diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index 6b19f780ec0cc..84c04f403d3a3 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -49,12 +49,12 @@ in
 
     environment.systemPackages = [ pkgs.calibre ];
 
-    users.extraUsers.calibre-server = {
+    users.users.calibre-server = {
         uid = config.ids.uids.calibre-server;
         group = "calibre-server";
       };
 
-    users.extraGroups.calibre-server = {
+    users.groups.calibre-server = {
         gid = config.ids.gids.calibre-server;
       };
 
diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix
index 69a33d0b8c1ba..dcf416022734f 100644
--- a/nixos/modules/services/misc/cfdyndns.nix
+++ b/nixos/modules/services/misc/cfdyndns.nix
@@ -54,14 +54,14 @@ in
       };
     };
 
-    users.extraUsers = {
+    users.users = {
       cfdyndns = {
         group = "cfdyndns";
         uid = config.ids.uids.cfdyndns;
       };
     };
 
-    users.extraGroups = {
+    users.groups = {
       cfdyndns = {
         gid = config.ids.gids.cfdyndns;
       };
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index d5071d8ff767f..b1cf5a7d11040 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -110,7 +110,7 @@ in
 
   config = mkIf config.services.cgminer.enable {
 
-    users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton
+    users.users = optionalAttrs (cfg.user == "cgminer") (singleton
       { name = "cgminer";
         uid = config.ids.uids.cgminer;
         description = "Cgminer user";
diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix
index 4964876223516..70aa895f76d88 100644
--- a/nixos/modules/services/misc/couchpotato.nix
+++ b/nixos/modules/services/misc/couchpotato.nix
@@ -34,7 +34,7 @@ in
       };
     };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "couchpotato";
         group = "couchpotato";
         home = "/var/lib/couchpotato/";
@@ -42,7 +42,7 @@ in
         uid = config.ids.uids.couchpotato;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "couchpotato";
         gid = config.ids.gids.couchpotato;
       };
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index 7e3b6431a133a..8d3e294622d13 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -45,7 +45,7 @@ in
     # get the command line client on system path to make some use of the service
     environment.systemPackages = [ pkgs.dict ];
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "dictd";
         group = "dictd";
         description = "DICT.org dictd server";
@@ -53,7 +53,7 @@ in
         uid = config.ids.uids.dictd;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "dictd";
         gid = config.ids.gids.dictd;
       };
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index e4517c636e880..b28995a09115e 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -71,7 +71,7 @@ in
       ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
     services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "disnix";
         gid = config.ids.gids.disnix;
       };
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 45931cb42b54f..9a3966ab30aa2 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -42,7 +42,7 @@ let
     };
   };
 
-  configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig));
+  configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
 
 in {
   options.services.dockerRegistry = {
@@ -91,7 +91,7 @@ in {
         Docker extra registry configuration via environment variables.
       '';
       default = {};
-      type = types.attrsOf types.str;
+      type = types.attrs;
     };
 
     enableGarbageCollect = mkEnableOption "garbage collect";
@@ -120,6 +120,7 @@ in {
       serviceConfig = {
         User = "docker-registry";
         WorkingDirectory = cfg.storagePath;
+        AmbientCapabilities = mkIf (cfg.port < 1024) "cap_net_bind_service";
       };
     };
 
@@ -139,7 +140,7 @@ in {
       startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates;
     };
 
-    users.extraUsers.docker-registry = {
+    users.users.docker-registry = {
       createHome = true;
       home = cfg.storagePath;
     };
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index e295f0f930e1a..b1968784af0f9 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -54,14 +54,14 @@ in
       };
     };
 
-    users.extraUsers = mkIf (cfg.user == "emby") {
+    users.users = mkIf (cfg.user == "emby") {
       emby = {
         group = cfg.group;
         uid = config.ids.uids.emby;
       };
     };
 
-    users.extraGroups = mkIf (cfg.group == "emby") {
+    users.groups = mkIf (cfg.group == "emby") {
       emby = {
         gid = config.ids.gids.emby;
       };
diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix
index cb2fa6776240d..ac6ba2181de28 100644
--- a/nixos/modules/services/misc/errbot.nix
+++ b/nixos/modules/services/misc/errbot.nix
@@ -76,8 +76,8 @@ in {
   };
 
   config = mkIf (cfg.instances != {}) {
-    users.extraUsers.errbot.group = "errbot";
-    users.extraGroups.errbot = {};
+    users.users.errbot.group = "errbot";
+    users.groups.errbot = {};
 
     systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" (
     let
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index 7c91462883f13..2d1893dae64be 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -188,7 +188,7 @@ in {
 
     environment.systemPackages = [ pkgs.etcdctl ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "etcd";
       uid = config.ids.uids.etcd;
       description = "Etcd daemon user";
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 600bd780e7b0e..685e652c0ba08 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -408,7 +408,7 @@ in
         chmod -R u+w ${cfg.baseDir}/zookeeper/conf
       '';
     };
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "zookeeper";
       uid = config.ids.uids.zookeeper;
       description = "Zookeeper daemon user";
diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
index d6ad9dcaebc2c..1c5ece8682587 100644
--- a/nixos/modules/services/misc/felix.nix
+++ b/nixos/modules/services/misc/felix.nix
@@ -47,12 +47,12 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "osgi";
         gid = config.ids.gids.osgi;
       };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "osgi";
         uid = config.ids.uids.osgi;
         description = "OSGi user";
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 164221cbab7fb..122c89ce0680a 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -42,7 +42,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = fahUser;
         uid = config.ids.uids.foldingathome;
         description = "Folding@Home user";
diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix
index 2d406b6344371..3057d7fd1a095 100644
--- a/nixos/modules/services/misc/gammu-smsd.nix
+++ b/nixos/modules/services/misc/gammu-smsd.nix
@@ -200,7 +200,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.${cfg.user} = {
+    users.users.${cfg.user} = {
       description = "gammu-smsd user";
       uid = config.ids.uids.gammu-smsd;
       extraGroups = [ "${cfg.device.group}" ];
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index e0b9df96f8e8d..baf0a8d73d198 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -251,7 +251,7 @@ in
       }
     ];
 
-    users.extraUsers.geoip = {
+    users.users.geoip = {
       group = "root";
       description = "GeoIP database updater";
       uid = config.ids.uids.geoip;
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 46efc1df12ebb..5d664728e0b5f 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -337,7 +337,7 @@ in
     };
 
     users = mkIf (cfg.user == "gitea") {
-      extraUsers.gitea = {
+      users.gitea = {
         description = "Gitea Service";
         home = cfg.stateDir;
         createHome = true;
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 94a98e0335dff..0025d96bd37bd 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -645,15 +645,15 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.gitit = {
-      group = config.users.extraGroups.gitit.name;
+    users.users.gitit = {
+      group = config.users.groups.gitit.name;
       description = "Gitit user";
       home = homeDir;
       createHome = true;
       uid = config.ids.uids.gitit;
     };
 
-    users.extraGroups.gitit.gid = config.ids.gids.gitit;
+    users.groups.gitit.gid = config.ids.gids.gitit;
 
     systemd.services.gitit = let
       uid = toString config.ids.uids.gitit;
@@ -715,8 +715,8 @@ NAMED
       '';
 
       serviceConfig = {
-        User = config.users.extraUsers.gitit.name;
-        Group = config.users.extraGroups.gitit.name;
+        User = config.users.users.gitit.name;
+        Group = config.users.groups.gitit.name;
         ExecStart = with cfg; gititSh haskellPackages extraPackages;
       };
     };
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index e80abf96da482..b09f0408e1023 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -444,7 +444,7 @@ in {
     # Use postfix to send out mails.
     services.postfix.enable = mkDefault true;
 
-    users.extraUsers = [
+    users.users = [
       { name = cfg.user;
         group = cfg.group;
         home = "${cfg.statePath}/home";
@@ -453,7 +453,7 @@ in {
       }
     ];
 
-    users.extraGroups = [
+    users.groups = [
       { name = cfg.group;
         gid = config.ids.gids.gitlab;
       }
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 6e60316d000c0..b9c2a966e6f51 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -140,7 +140,7 @@ in
       push( @{$RC{ENABLE}}, 'git-annex-shell ua');
     '';
 
-    users.extraUsers.${cfg.user} = {
+    users.users.${cfg.user} = {
       description     = "Gitolite user";
       home            = cfg.dataDir;
       createHome      = true;
@@ -148,7 +148,7 @@ in
       group           = cfg.group;
       useDefaultShell = true;
     };
-    users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite;
+    users.groups."${cfg.group}".gid = config.ids.gids.gitolite;
 
     systemd.services."gitolite-init" = {
       description = "Gitolite initialization";
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
index ba744d37e71c5..ee99967c261b6 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@@ -254,7 +254,7 @@ in
     };
 
     users = mkIf (cfg.user == "gogs") {
-      extraUsers.gogs = {
+      users.gogs = {
         description = "Go Git Service";
         uid = config.ids.uids.gogs;
         group = "gogs";
@@ -262,7 +262,7 @@ in
         createHome = true;
         shell = pkgs.bash;
       };
-      extraGroups.gogs.gid = config.ids.gids.gogs;
+      groups.gogs.gid = config.ids.gids.gogs;
     };
 
     warnings = optional (cfg.database.password != "")
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index 0888221ab62fc..d1823bc6d4df6 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -93,8 +93,8 @@ in
       '';
 
       serviceConfig = {
-        User = config.users.extraUsers.gollum.name;
-        Group = config.users.extraGroups.gollum.name;
+        User = config.users.users.gollum.name;
+        Group = config.users.groups.gollum.name;
         PermissionsStartOnly = true;
         ExecStart = ''
           ${pkgs.gollum}/bin/gollum \
diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
index a4a4c7b5d937d..3bfcb636a3c6c 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixos/modules/services/misc/gpsd.nix
@@ -53,6 +53,14 @@ in
         '';
       };
 
+      nowait = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          don't wait for client connects to poll GPS
+        '';
+      };
+
       port = mkOption {
         type = types.int;
         default = 2947;
@@ -78,14 +86,14 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "gpsd";
         inherit uid;
         description = "gpsd daemon user";
         home = "/var/empty";
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "gpsd";
         inherit gid;
       };
@@ -99,7 +107,8 @@ in
         ExecStart = ''
           ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"  \
             -S "${toString cfg.port}"                             \
-            ${if cfg.readonly then "-b" else ""}                  \
+            ${optionalString cfg.readonly "-b"}                   \
+            ${optionalString cfg.nowait "-n"}                     \
             "${cfg.device}"
         '';
       };
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 05555353f2076..fdcfe6bc2b8ef 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -170,13 +170,13 @@ in {
       after = wants;
     };
 
-    users.extraUsers.hass = {
+    users.users.hass = {
       home = cfg.configDir;
       createHome = true;
       group = "hass";
       uid = config.ids.uids.hass;
     };
 
-    users.extraGroups.hass.gid = config.ids.gids.hass;
+    users.groups.hass.gid = config.ids.gids.hass;
   };
 }
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index 6da9cc8c47e6e..11597706d0d16 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -38,23 +38,23 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.ihaskell = {
-      group = config.users.extraGroups.ihaskell.name;
+    users.users.ihaskell = {
+      group = config.users.groups.ihaskell.name;
       description = "IHaskell user";
       home = "/var/lib/ihaskell";
       createHome = true;
       uid = config.ids.uids.ihaskell;
     };
 
-    users.extraGroups.ihaskell.gid = config.ids.gids.ihaskell;
+    users.groups.ihaskell.gid = config.ids.gids.ihaskell;
 
     systemd.services.ihaskell = {
       description = "IHaskell notebook instance";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        User = config.users.extraUsers.ihaskell.name;
-        Group = config.users.extraGroups.ihaskell.name;
+        User = config.users.users.ihaskell.name;
+        Group = config.users.groups.ihaskell.name;
         ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
       };
     };
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
index 87a41ee70b540..db72d36f2ac7f 100644
--- a/nixos/modules/services/misc/jackett.nix
+++ b/nixos/modules/services/misc/jackett.nix
@@ -36,12 +36,12 @@ in
       };
     };
 
-    users.extraUsers.jackett = {
+    users.users.jackett = {
       uid = config.ids.uids.jackett;
       home = "/var/lib/jackett";
       group = "jackett";
     };
-    users.extraGroups.jackett.gid = config.ids.gids.jackett;
+    users.groups.jackett.gid = config.ids.gids.jackett;
 
   };
 }
diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix
index 50715858881ac..c588a30d76cd1 100644
--- a/nixos/modules/services/misc/mathics.nix
+++ b/nixos/modules/services/misc/mathics.nix
@@ -26,23 +26,23 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.mathics = {
-      group = config.users.extraGroups.mathics.name;
+    users.users.mathics = {
+      group = config.users.groups.mathics.name;
       description = "Mathics user";
       home = "/var/lib/mathics";
       createHome = true;
       uid = config.ids.uids.mathics;
     };
 
-    users.extraGroups.mathics.gid = config.ids.gids.mathics;
+    users.groups.mathics.gid = config.ids.gids.mathics;
 
     systemd.services.mathics = {
       description = "Mathics notebook server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        User = config.users.extraUsers.mathics.name;
-        Group = config.users.extraGroups.mathics.name;
+        User = config.users.users.mathics.name;
+        Group = config.users.groups.mathics.name;
         ExecStart = concatStringsSep " " [
           "${pkgs.mathics}/bin/mathicsserver"
           "--port" (toString cfg.port)
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index f7441988b272f..3e3de9114708f 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -635,7 +635,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = [
+    users.users = [
       { name = "matrix-synapse";
         group = "matrix-synapse";
         home = cfg.dataDir;
@@ -644,7 +644,7 @@ in {
         uid = config.ids.uids.matrix-synapse;
       } ];
 
-    users.extraGroups = [
+    users.groups = [
       { name = "matrix-synapse";
         gid = config.ids.gids.matrix-synapse;
       } ];
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index 40ec2831ff09d..5c1977d28deb5 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -267,12 +267,12 @@ in {
       serviceConfig.User = "${cfg.user}";
     };
 
-    users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton {
+    users.groups = optionalAttrs (cfg.group == "mediatomb") (singleton {
       name = "mediatomb";
       gid = gid;
     });
 
-    users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton {
+    users.users = optionalAttrs (cfg.user == "mediatomb") (singleton {
       name = "mediatomb";
       isSystemUser = true;
       group = cfg.group;
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 0ee105e4c6f13..e64df8dc7d2d7 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -131,10 +131,10 @@ in
         description = "
           If set, Nix will perform builds in a sandboxed environment that it
           will set up automatically for each build. This prevents impurities
-          in builds by disallowing access to dependencies outside of the Nix 
-          store by using network and mount namespaces in a chroot environment. 
-          This isn't enabled by default for possible performance impacts due to 
-          the initial setup time of a sandbox for each build. It doesn't affect 
+          in builds by disallowing access to dependencies outside of the Nix
+          store by using network and mount namespaces in a chroot environment.
+          This isn't enabled by default for possible performance impacts due to
+          the initial setup time of a sandbox for each build. It doesn't affect
           derivation hashes, so changing this option will not trigger a rebuild
           of packages.
         ";
@@ -450,7 +450,7 @@ in
 
     nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);
 
-    users.extraUsers = nixbldUsers;
+    users.users = nixbldUsers;
 
     services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers;
 
diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix
index 5bd9cf9086f1f..87ed7f0a61b90 100644
--- a/nixos/modules/services/misc/nix-ssh-serve.nix
+++ b/nixos/modules/services/misc/nix-ssh-serve.nix
@@ -36,7 +36,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.nix-ssh = {
+    users.users.nix-ssh = {
       description = "Nix SSH store user";
       uid = config.ids.uids.nix-ssh;
       useDefaultShell = true;
@@ -55,7 +55,7 @@ in {
       Match All
     '';
 
-    users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys;
+    users.users.nix-ssh.openssh.authorizedKeys.keys = cfg.keys;
 
   };
 }
diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix
index a186d57ceba21..f79a04a1d7489 100644
--- a/nixos/modules/services/misc/nzbget.nix
+++ b/nixos/modules/services/misc/nzbget.nix
@@ -86,14 +86,14 @@ let
       };
     };
 
-    users.extraUsers = mkIf (cfg.user == "nzbget") {
+    users.users = mkIf (cfg.user == "nzbget") {
       nzbget = {
         group = cfg.group;
         uid = config.ids.uids.nzbget;
       };
     };
 
-    users.extraGroups = mkIf (cfg.group == "nzbget") {
+    users.groups = mkIf (cfg.group == "nzbget") {
       nzbget = {
         gid = config.ids.gids.nzbget;
       };
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 6883993a893bb..baa7c3ade52e3 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -86,13 +86,13 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = optionalAttrs (cfg.user == "octoprint") (singleton
+    users.users = optionalAttrs (cfg.user == "octoprint") (singleton
       { name = "octoprint";
         group = cfg.group;
         uid = config.ids.uids.octoprint;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "octoprint") (singleton
+    users.groups = optionalAttrs (cfg.group == "octoprint") (singleton
       { name = "octoprint";
         gid = config.ids.gids.octoprint;
       });
diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix
index 7ec8b15906fca..f89f37ccd9df5 100644
--- a/nixos/modules/services/misc/osrm.nix
+++ b/nixos/modules/services/misc/osrm.nix
@@ -69,7 +69,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        User = config.users.extraUsers.osrm.name;
+        User = config.users.users.osrm.name;
         ExecStart = ''
           ${pkgs.osrm-backend}/bin/osrm-routed \
             --ip ${cfg.address} \
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 46221ace30843..85f1d4a85562d 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -157,14 +157,14 @@ in
       allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ];
     };
 
-    users.extraUsers = mkIf (cfg.user == "plex") {
+    users.users = mkIf (cfg.user == "plex") {
       plex = {
         group = cfg.group;
         uid = config.ids.uids.plex;
       };
     };
 
-    users.extraGroups = mkIf (cfg.group == "plex") {
+    users.groups = mkIf (cfg.group == "plex") {
       plex = {
         gid = config.ids.gids.plex;
       };
diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix
index df9f125812471..2a589fdfb27fc 100644
--- a/nixos/modules/services/misc/plexpy.nix
+++ b/nixos/modules/services/misc/plexpy.nix
@@ -74,7 +74,7 @@ in
       };
     };
 
-    users.extraUsers = mkIf (cfg.user == "plexpy") {
+    users.users = mkIf (cfg.user == "plexpy") {
       plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; };
     };
   };
diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index 897e856e2a2d6..a11296e1bd02c 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -73,7 +73,7 @@ in {
     };
 
     users = {
-      extraUsers.pykms = {
+      users.pykms = {
         name = "pykms";
         group = "pykms";
         home  = home;
@@ -82,7 +82,7 @@ in {
         description = "PyKMS daemon user";
       };
 
-      extraGroups.pykms = {
+      groups.pykms = {
         gid = config.ids.gids.pykms;
       };
     };
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
index 245ad9f9a6df9..7738eacc6ae9d 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixos/modules/services/misc/radarr.nix
@@ -36,12 +36,12 @@ in
       };
     };
 
-    users.extraUsers.radarr = {
+    users.users.radarr = {
       uid = config.ids.uids.radarr;
       home = "/var/lib/radarr";
       group = "radarr";
     };
-    users.extraGroups.radarr.gid = config.ids.gids.radarr;
+    users.groups.radarr.gid = config.ids.gids.radarr;
 
   };
 }
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 3997b3f0dca0e..9a9424449f808 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -128,13 +128,13 @@ in {
       }
     ];
 
-    users.extraUsers = [
+    users.users = [
       { name = "redmine";
         group = "redmine";
         uid = config.ids.uids.redmine;
       } ];
 
-    users.extraGroups = [
+    users.groups = [
       { name = "redmine";
         gid = config.ids.gids.redmine;
       } ];
diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix
index dbca56b13335e..042b496d35eeb 100644
--- a/nixos/modules/services/misc/ripple-data-api.nix
+++ b/nixos/modules/services/misc/ripple-data-api.nix
@@ -185,7 +185,7 @@ in {
       ];
     };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "ripple-data-api";
         description = "Ripple data api user";
         uid = config.ids.uids.ripple-data-api;
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index 8bcf35a8ad382..9d9a0ba44da59 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -406,7 +406,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "rippled";
         description = "Ripple server user";
         uid = config.ids.uids.rippled;
diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix
index a6612e9c6adb3..8808f2d219311 100644
--- a/nixos/modules/services/misc/serviio.nix
+++ b/nixos/modules/services/misc/serviio.nix
@@ -63,7 +63,7 @@ in {
       };
     };
 
-    users.extraUsers = [
+    users.users = [
       { 
         name = "serviio";
         group = "serviio";
@@ -74,7 +74,7 @@ in {
       }
     ];
 
-    users.extraGroups = [
+    users.groups = [
       { name = "serviio";} 
     ];
 
diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix
index 9e8fb6c228f21..dcaf73aca4482 100644
--- a/nixos/modules/services/misc/siproxd.nix
+++ b/nixos/modules/services/misc/siproxd.nix
@@ -161,7 +161,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "siproxyd";
       uid = config.ids.uids.siproxd;
     };
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix
index ecde2c33bfa93..edba4e6c23ebf 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixos/modules/services/misc/sonarr.nix
@@ -36,12 +36,12 @@ in
       };
     };
 
-    users.extraUsers.sonarr = {
+    users.users.sonarr = {
       uid = config.ids.uids.sonarr;
       home = "/var/lib/sonarr";
       group = "sonarr";
     };
-    users.extraGroups.sonarr.gid = config.ids.gids.sonarr;
+    users.groups.sonarr.gid = config.ids.gids.sonarr;
 
   };
 }
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index c2efd53d413ae..1612b197f35f4 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -130,7 +130,7 @@ let cfg = config.services.subsonic; in {
                 ! [ -e "${cfg.home}" ] &&
                 [ -d "$oldHome" ] &&
                 [ $(${pkgs.coreutils}/bin/stat -c %u "$oldHome") -eq \
-                    ${toString config.users.extraUsers.subsonic.uid} ]; then
+                    ${toString config.users.users.subsonic.uid} ]; then
             logger Moving "$oldHome" to "${cfg.home}"
             ${pkgs.coreutils}/bin/mv -T "$oldHome" "${cfg.home}"
         fi
@@ -152,7 +152,7 @@ let cfg = config.services.subsonic; in {
       };
     };
 
-    users.extraUsers.subsonic = {
+    users.users.subsonic = {
       description = "Subsonic daemon user";
       home = cfg.home;
       createHome = true;
@@ -160,6 +160,6 @@ let cfg = config.services.subsonic; in {
       uid = config.ids.uids.subsonic;
     };
 
-    users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
+    users.groups.subsonic.gid = config.ids.gids.subsonic;
   };
 }
diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix
index 15071202b9c2e..005951b9231ec 100644
--- a/nixos/modules/services/misc/uhub.nix
+++ b/nixos/modules/services/misc/uhub.nix
@@ -161,11 +161,11 @@ in
   config = mkIf cfg.enable {
 
     users = {
-      extraUsers = singleton {
+      users = singleton {
         name = "uhub";
         uid = config.ids.uids.uhub;
       };
-      extraGroups = singleton {
+      groups = singleton {
         name = "uhub";
         gid = config.ids.gids.uhub;
       };
diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix
index 57f4393654717..a87878c31e0d5 100644
--- a/nixos/modules/services/misc/xmr-stak.nix
+++ b/nixos/modules/services/misc/xmr-stak.nix
@@ -10,9 +10,6 @@ let
     inherit (cfg) openclSupport cudaSupport;
   };
 
-  xmrConfArg = optionalString (cfg.configText != "") ("-c " +
-    pkgs.writeText "xmr-stak-config.txt" cfg.configText);
-
 in
 
 {
@@ -29,22 +26,34 @@ in
         description = "List of parameters to pass to xmr-stak.";
       };
 
-      configText = mkOption {
-        type = types.lines;
-        default = "";
-        example = ''
-          "currency" : "monero",
-          "pool_list" :
-            [ { "pool_address" : "pool.supportxmr.com:5555",
-                "wallet_address" : "<long-hash>",
-                "pool_password" : "minername",
-                "pool_weight" : 1,
-              },
-            ],
+      configFiles = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = literalExample ''
+          {
+            "config.txt" = '''
+              "verbose_level" : 4,
+              "h_print_time" : 60,
+              "tls_secure_algo" : true,
+            ''';
+            "pools.txt" = '''
+              "currency" : "monero7",
+              "pool_list" :
+              [ { "pool_address" : "pool.supportxmr.com:443",
+                  "wallet_address" : "my-wallet-address",
+                  "rig_id" : "",
+                  "pool_password" : "nixos",
+                  "use_nicehash" : false,
+                  "use_tls" : true,
+                  "tls_fingerprint" : "",
+                  "pool_weight" : 23
+                },
+              ],
+            ''';
+          }
         '';
         description = ''
-          Verbatim xmr-stak config.txt. If empty, the <literal>-c</literal>
-          parameter will not be added to the xmr-stak command.
+          Content of config files like config.txt, pools.txt or cpu.txt.
         '';
       };
     };
@@ -58,10 +67,13 @@ in
       environment = mkIf cfg.cudaSupport {
         LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib";
       };
-      script = ''
-        exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs}
-      '';
+
+      preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: ''
+        ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}'
+      ''));
+
       serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in {
+        ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}";
         # xmr-stak generates cpu and/or gpu configuration files
         WorkingDirectory = "/tmp";
         PrivateTmp = true;
@@ -70,4 +82,12 @@ in
       };
     };
   };
+
+  imports = [
+    (mkRemovedOptionModule ["services" "xmr-stak" "configText"] ''
+      This option was removed in favour of `services.xmr-stak.configFiles`
+      because the new config file `pools.txt` was introduced. You are
+      now able to define all other config files like cpu.txt or amd.txt.
+    '')
+  ];
 }
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index 91539592511c2..cb7cc97d5a5c9 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -144,7 +144,7 @@ in {
       '';
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "zookeeper";
       uid = config.ids.uids.zookeeper;
       description = "Zookeeper daemon user";
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 496838a131ba5..8bf741adb6e33 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -153,13 +153,13 @@ in {
       };
     };
 
-    users.extraUsers.bosun = {
+    users.users.bosun = {
       description = "bosun user";
       group = "bosun";
       uid = config.ids.uids.bosun;
     };
 
-    users.extraGroups.bosun.gid = config.ids.gids.bosun;
+    users.groups.bosun.gid = config.ids.gids.bosun;
 
   };
 
diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index dfbac3446e035..6606980cdad88 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -97,7 +97,7 @@ in {
       '';
     };
 
-    users.extraUsers = optional (cfg.user == "collectd") {
+    users.users = optional (cfg.user == "collectd") {
       name = "collectd";
     };
   };
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 6367c8245f710..cf65b6c28cf2b 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -178,7 +178,7 @@ in {
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
 
-    users.extraUsers.datadog = {
+    users.users.datadog = {
       description = "Datadog Agent User";
       uid = config.ids.uids.datadog;
       group = "datadog";
@@ -186,7 +186,7 @@ in {
       createHome = true;
     };
 
-    users.extraGroups.datadog.gid = config.ids.gids.datadog;
+    users.groups.datadog.gid = config.ids.gids.datadog;
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
index c3b869e00880e..9c976c65ea49a 100644
--- a/nixos/modules/services/monitoring/fusion-inventory.nix
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -46,7 +46,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "fusion-inventory";
       description = "FusionInventory user";
     };
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index eceb91525db4a..3e801f9b838db 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -265,7 +265,7 @@ in {
       '';
     };
 
-    users.extraUsers.grafana = {
+    users.users.grafana = {
       uid = config.ids.uids.grafana;
       description = "Grafana user";
       home = cfg.dataDir;
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 4b1ad34b3a4ef..7ad26c137e515 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -638,13 +638,13 @@ in {
       cfg.web.enable || cfg.api.enable ||
       cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable
      ) {
-      users.extraUsers = singleton {
+      users.users = singleton {
         name = "graphite";
         uid = config.ids.uids.graphite;
         description = "Graphite daemon user";
         home = dataDir;
       };
-      users.extraGroups.graphite.gid = config.ids.gids.graphite;
+      users.groups.graphite.gid = config.ids.gids.graphite;
     })
   ];
 }
diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix
index deee64aa41ea9..fbdff2eb5dbe4 100644
--- a/nixos/modules/services/monitoring/heapster.nix
+++ b/nixos/modules/services/monitoring/heapster.nix
@@ -49,7 +49,7 @@ in {
       };
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "heapster";
       uid = config.ids.uids.heapster;
       description = "Heapster user";
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 358ffd431dd48..ff9604c7dbcd1 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -150,14 +150,14 @@ in
 
     environment.systemPackages = [ pkgs.munin ];
 
-    users.extraUsers = [{
+    users.users = [{
       name = "munin";
       description = "Munin monitoring user";
       group = "munin";
       uid = config.ids.uids.munin;
     }];
 
-    users.extraGroups = [{
+    users.groups = [{
       name = "munin";
       gid = config.ids.gids.munin;
     }];
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix
index 4914c5db97d24..3e1d727b416e0 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixos/modules/services/monitoring/nagios.nix
@@ -143,7 +143,7 @@ in
 
 
   config = mkIf cfg.enable {
-    users.extraUsers.nagios = {
+    users.users.nagios = {
       description = "Nagios user ";
       uid         = config.ids.uids.nagios;
       home        = nagiosState;
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index d23b329eeb258..eefddf5a206bf 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -100,11 +100,11 @@ in {
     };
 
 
-    users.extraUsers = optional (cfg.user == defaultUser) {
+    users.users = optional (cfg.user == defaultUser) {
       name = defaultUser;
     };
 
-    users.extraGroups = optional (cfg.group == defaultUser) {
+    users.groups = optional (cfg.group == defaultUser) {
       name = defaultUser;
     };
 
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 80122e69d1673..5dda763bd56b7 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -471,8 +471,8 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus;
-    users.extraUsers.${promUser} = {
+    users.groups.${promGroup}.gid = config.ids.gids.prometheus;
+    users.users.${promUser} = {
       description = "Prometheus daemon user";
       uid = config.ids.uids.prometheus;
       group = promGroup;
diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix
index 523f74cb72b97..7eb4d888b0cc4 100644
--- a/nixos/modules/services/monitoring/riemann-dash.nix
+++ b/nixos/modules/services/monitoring/riemann-dash.nix
@@ -51,9 +51,9 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash;
+    users.groups.riemanndash.gid = config.ids.gids.riemanndash;
 
-    users.extraUsers.riemanndash = {
+    users.users.riemanndash = {
       description = "riemann-dash daemon user";
       uid = config.ids.uids.riemanndash;
       group = "riemanndash";
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index de858813a7620..4e8832dadc5e9 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -40,9 +40,9 @@ in {
 
   config = mkIf cfg.enableHealth {
 
-    users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools;
+    users.groups.riemanntools.gid = config.ids.gids.riemanntools;
 
-    users.extraUsers.riemanntools = {
+    users.users.riemanntools = {
       description = "riemann-tools daemon user";
       uid = config.ids.uids.riemanntools;
       group = "riemanntools";
diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix
index ac5d0134a80d6..237de53456f98 100644
--- a/nixos/modules/services/monitoring/riemann.nix
+++ b/nixos/modules/services/monitoring/riemann.nix
@@ -69,9 +69,9 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraGroups.riemann.gid = config.ids.gids.riemann;
+    users.groups.riemann.gid = config.ids.gids.riemann;
 
-    users.extraUsers.riemann = {
+    users.users.riemann = {
       description = "riemann daemon user";
       uid = config.ids.uids.riemann;
       group = "riemann";
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 2684482c61848..6ecb21d628dee 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -123,13 +123,13 @@ in {
       };
     };
 
-    users.extraUsers.scollector = {
+    users.users.scollector = {
       description = "scollector user";
       group = "scollector";
       uid = config.ids.uids.scollector;
     };
 
-    users.extraGroups.scollector.gid = config.ids.gids.scollector;
+    users.groups.scollector.gid = config.ids.gids.scollector;
 
   };
 
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 7b0e9981cbb18..ea155821ecc9b 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -125,7 +125,7 @@ in
       message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!";
     }) cfg.backends;
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "statsd";
       uid = config.ids.uids.statsd;
       description = "Statsd daemon user";
diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 49dc9d8143e6f..6bfcd7143e1c9 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -62,7 +62,7 @@ in {
       };
     };
 
-    users.extraUsers = [{
+    users.users = [{
       name = "telegraf";
       uid = config.ids.uids.telegraf;
       description = "telegraf daemon user";
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 29dc68f90cc94..bc755612fd9bb 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -259,7 +259,7 @@ in
 
 
 /*
-    users.extraUsers = [
+    users.users = [
       { name = "nut";
         uid = 84;
         home = "/var/lib/nut";
@@ -269,7 +269,7 @@ in
       }
     ];
 
-    users.extraGroups = [
+    users.groups = [
       { name = "nut";
         gid = 84;
       }
diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
index ca56e4a7b958b..cb2f8c07edb97 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -16,7 +16,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.vnstatd = {
+    users.users.vnstatd = {
       isSystemUser = true;
       description = "vnstat daemon user";
       home = "/var/lib/vnstat";
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index 88a63b4bf161b..87857225e7d75 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -68,7 +68,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = mkIf (!config.services.zabbixServer.enable) (singleton
+    users.users = mkIf (!config.services.zabbixServer.enable) (singleton
       { name = "zabbix";
         uid = config.ids.uids.zabbix;
         description = "Zabbix daemon user";
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index acd1279ddf47a..f62d55457ed4a 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -85,7 +85,7 @@ in
 
     services.postgresql.enable = useLocalPostgres;
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "zabbix";
         uid = config.ids.uids.zabbix;
         description = "Zabbix daemon user";
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 5de8ae79a246e..4e3bc839d4007 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -332,13 +332,13 @@ in
       in
         generators.toINI {} totalConfig;
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "ceph";
       uid = config.ids.uids.ceph;
       description = "Ceph daemon user";
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = "ceph";
       gid = config.ids.gids.ceph;
     };
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix
index 6b2a770100c5b..c16e12378d758 100644
--- a/nixos/modules/services/network-filesystems/davfs2.nix
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -57,12 +57,12 @@ in
     environment.systemPackages = [ pkgs.davfs2 ];
     environment.etc."davfs2/davfs2.conf".source = cfgFile;
 
-    users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton {
+    users.groups = optionalAttrs (cfg.davGroup == "davfs2") (singleton {
       name = "davfs2";
       gid = config.ids.gids.davfs2;
     });
 
-    users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton {
+    users.users = optionalAttrs (cfg.davUser == "davfs2") (singleton {
       name = "davfs2";
       createHome = false;
       group = cfg.davGroup;
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index ab6d3a3d2fa4f..21b664e5b2f92 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -212,7 +212,7 @@ in {
       user_allow_other
     ''; };
 
-    users.extraUsers = mkIf (cfg.user == "ipfs") {
+    users.users = mkIf (cfg.user == "ipfs") {
       ipfs = {
         group = cfg.group;
         home = cfg.dataDir;
@@ -222,7 +222,7 @@ in {
       };
     };
 
-    users.extraGroups = mkIf (cfg.group == "ipfs") {
+    users.groups = mkIf (cfg.group == "ipfs") {
       ipfs.gid = config.ids.gids.ipfs;
     };
 
diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix
index 3826fe3edfd03..52c0966e05bc5 100644
--- a/nixos/modules/services/network-filesystems/openafs/client.nix
+++ b/nixos/modules/services/network-filesystems/openafs/client.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
-with import ./lib.nix { inherit lib; };
+# openafsMod, openafsBin, mkCellServDB
+with import ./lib.nix { inherit config lib pkgs; };
 
 let
   inherit (lib) getBin mkOption mkIf optionalString singleton types;
@@ -8,8 +9,8 @@ let
   cfg = config.services.openafsClient;
 
   cellServDB = pkgs.fetchurl {
-    url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14;
-    sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc";
+    url = http://dl.central.org/dl/cellservdb/CellServDB.2018-05-14;
+    sha256 = "1wmjn6mmyy2r8p10nlbdzs4nrqxy8a9pjyrdciy5nmppg4053rk2";
   };
 
   clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB);
@@ -21,8 +22,6 @@ let
     echo "${cfg.mountPoint}:${cfg.cache.directory}:${toString cfg.cache.blocks}" > $out/cacheinfo
   '';
 
-  openafsMod = config.boot.kernelPackages.openafs;
-  openafsBin = lib.getBin pkgs.openafs;
 in
 {
   ###### interface
@@ -147,6 +146,19 @@ in
         '';
       };
 
+      packages = {
+        module = mkOption {
+          default = config.boot.kernelPackages.openafs;
+          type = types.package;
+          description = "OpenAFS kernel module package. MUST match the userland package!";
+        };
+        programs = mkOption {
+          default = getBin pkgs.openafs;
+          type = types.package;
+          description = "OpenAFS programs package. MUST match the kernel module package!";
+        };
+      };
+
       sparse = mkOption {
         default = true;
         type = types.bool;
@@ -180,7 +192,7 @@ in
       }
     ];
 
-    environment.systemPackages = [ pkgs.openafs ];
+    environment.systemPackages = [ openafsBin ];
 
     environment.etc = {
       clientCellServDB = {
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index ecfc72d2eaf91..255740ac65ef4 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -1,14 +1,15 @@
-{ lib, ...}:
+{ config, lib, pkgs, ...}:
 
 let
-  inherit (lib) concatStringsSep mkOption types;
+  inherit (lib) concatStringsSep getBin mkOption types;
 
 in rec {
 
   mkCellServDB = cellName: db: ''
     >${cellName}
   '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "")
-                                   db));
+                                   db))
+     + "\n";
 
   # CellServDB configuration type
   cellServDBConfig = {
@@ -25,4 +26,8 @@ in rec {
       description = "DNS full-qualified domain name of a database server";
     };
   };
+
+  openafsMod = config.services.openafsClient.packages.module;
+  openafsBin = config.services.openafsClient.packages.programs;
+  openafsSrv = config.services.openafsServer.package;
 }
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index 429eb945ac9e8..aa8640fd240e3 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
-with import ./lib.nix { inherit lib; };
+# openafsBin, openafsSrv, mkCellServDB
+with import ./lib.nix { inherit config lib pkgs; };
 
 let
   inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;
@@ -11,21 +12,21 @@ let
     checkbintime 3 0 5 0 0
   '' + (optionalString cfg.roles.database.enable ''
     bnode simple vlserver 1
-    parm ${openafsBin}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs}
+    parm ${openafsSrv}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs}
     end
     bnode simple ptserver 1
-    parm ${openafsBin}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs}
+    parm ${openafsSrv}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs}
     end
   '') + (optionalString cfg.roles.fileserver.enable ''
     bnode dafs dafs 1
-    parm ${openafsBin}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs}
-    parm ${openafsBin}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs}
-    parm ${openafsBin}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs}
-    parm ${openafsBin}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs}
+    parm ${openafsSrv}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs}
+    parm ${openafsSrv}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs}
+    parm ${openafsSrv}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs}
+    parm ${openafsSrv}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs}
     end
   '') + (optionalString (cfg.roles.database.enable && cfg.roles.backup.enable) ''
     bnode simple buserver 1
-    parm ${openafsBin}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"}
+    parm ${openafsSrv}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"}
     end
   ''));
 
@@ -39,8 +40,6 @@ let
 
   udpSizeStr = toString cfg.udpPacketSize;
 
-  openafsBin = lib.getBin pkgs.openafs;
-
 in {
 
   options = {
@@ -79,6 +78,12 @@ in {
         description = "Definition of all cell-local database server machines.";
       };
 
+      package = mkOption {
+        default = pkgs.openafs.server or pkgs.openafs;
+        type = types.package;
+        description = "OpenAFS package for the server binaries";
+      };
+
       roles = {
         fileserver = {
           enable = mkOption {
@@ -213,7 +218,7 @@ in {
       }
     ];
 
-    environment.systemPackages = [ pkgs.openafs ];
+    environment.systemPackages = [ openafsBin ];
 
     environment.etc = {
       bosConfig = {
@@ -244,7 +249,10 @@ in {
         after = [ "syslog.target" "network.target" ];
         wantedBy = [ "multi-user.target" ];
         restartIfChanged = false;
-        unitConfig.ConditionPathExists = [ "/etc/openafs/server/rxkad.keytab" ];
+        unitConfig.ConditionPathExists = [
+          "|/etc/openafs/server/rxkad.keytab"
+          "|/etc/openafs/server/KeyFileExt"
+        ];
         preStart = ''
           mkdir -m 0755 -p /var/openafs
           ${optionalString (netInfo != null) "cp ${netInfo} /var/openafs/netInfo"}
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 80b34c48f1d2f..534862a3c9e4c 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -255,7 +255,7 @@ in
               cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
             '';
           });
-        users.extraUsers = flip mapAttrs' cfg.introducers (node: _:
+        users.users = flip mapAttrs' cfg.introducers (node: _:
           nameValuePair "tahoe.introducer-${node}" {
             description = "Tahoe node user for introducer ${node}";
             isSystemUser = true;
@@ -355,7 +355,7 @@ in
               cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
             '';
           });
-        users.extraUsers = flip mapAttrs' cfg.nodes (node: _:
+        users.users = flip mapAttrs' cfg.nodes (node: _:
           nameValuePair "tahoe.${node}" {
             description = "Tahoe node user for node ${node}";
             isSystemUser = true;
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index 95d7641e8b53f..c93e201da56ca 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -432,14 +432,14 @@ in
 
     environment.systemPackages = [ xtreemfs ];
 
-    users.extraUsers.xtreemfs =
+    users.users.xtreemfs =
       { uid = config.ids.uids.xtreemfs;
         description = "XtreemFS user";
         createHome = true;
         home = home;
       };
 
-    users.extraGroups.xtreemfs =
+    users.groups.xtreemfs =
       { gid = config.ids.gids.xtreemfs;
       };
 
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index 44b0edf620185..e93f45b49867b 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -73,7 +73,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = mkIf (cfg.user == null) [ {
+    users.users = mkIf (cfg.user == null) [ {
       name = u;
       uid = config.ids.uids.yandexdisk;
       group = "nogroup";
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index 9898f164c5cf8..57f02542eafd4 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -45,14 +45,14 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = mkIf (cfg.user == null) [
+    users.users = mkIf (cfg.user == null) [
       { name = "amule";
         description = "AMule daemon";
         group = "amule";
         uid = config.ids.uids.amule;
       } ];
 
-    users.extraGroups = mkIf (cfg.user == null) [
+    users.groups = mkIf (cfg.user == null) [
       { name = "amule";
         gid = config.ids.gids.amule;
       } ];
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index df9c92db2e540..98eb008610169 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -92,7 +92,7 @@ in
       allowedTCPPorts = [ config.services.aria2.rpcListenPort ];
     };
 
-    users.extraUsers.aria2 = {
+    users.users.aria2 = {
       group = "aria2";
       uid = config.ids.uids.aria2;
       description = "aria2 user";
@@ -100,7 +100,7 @@ in
       createHome = false;
     };
 
-    users.extraGroups.aria2.gid = config.ids.gids.aria2;
+    users.groups.aria2.gid = config.ids.gids.aria2;
 
     systemd.services.aria2 = {
       description = "aria2 Service";
diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix
index 514204db33fa5..b8ec2b25a2274 100644
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixos/modules/services/networking/asterisk.nix
@@ -211,7 +211,7 @@ in
 
     environment.etc.asterisk.source = asteriskEtc;
 
-    users.extraUsers.asterisk =
+    users.users.asterisk =
       { name = asteriskUser;
         group = asteriskGroup;
         uid = config.ids.uids.asterisk;
@@ -219,7 +219,7 @@ in
         home = varlibdir;
       };
 
-    users.extraGroups.asterisk =
+    users.groups.asterisk =
       { name = asteriskGroup;
         gid = config.ids.gids.asterisk;
       };
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 9ccdacb20e91a..81e11db104098 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -187,14 +187,14 @@ in
 
     services.avahi.hostName = mkDefault config.networking.hostName;
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "avahi";
         uid = config.ids.uids.avahi;
         description = "`avahi-daemon' privilege separation user";
         home = "/var/empty";
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "avahi";
         gid = config.ids.gids.avahi;
       };
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 7775a4bd87fef..abcd1ef6ff5de 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -170,7 +170,7 @@ in
 
   config = mkIf config.services.bind.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = bindUser;
         uid = config.ids.uids.bind;
         description = "BIND daemon user";
diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index c25bd0fdc5411..9f08cc0a79ede 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -60,11 +60,11 @@ let
           };
         };
         users = {
-          extraUsers.${variant} = {
+          users.${variant} = {
             description = "BIRD Internet Routing Daemon user";
             group = variant;
           };
-          extraGroups.${variant} = {};
+          groups.${variant} = {};
         };
       };
     };
diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index bd26804788f38..392a8d5c2e7ce 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -149,7 +149,7 @@ in
 
   config = mkIf config.services.bitlbee.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "bitlbee";
         uid = bitlbeeUid;
         description = "BitlBee user";
@@ -157,7 +157,7 @@ in
         createHome = true;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "bitlbee";
         gid = config.ids.gids.bitlbee;
       };
diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 6e479a5860acf..33e85ef58e6e6 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -284,7 +284,7 @@ in
 
     services.btsync.package = mkOptionDefault pkgs.bittorrentSync14;
 
-    users.extraUsers.btsync = {
+    users.users.btsync = {
       description     = "Bittorrent Sync Service user";
       home            = cfg.storagePath;
       createHome      = true;
@@ -292,7 +292,7 @@ in
       group           = "btsync";
     };
 
-    users.extraGroups = [
+    users.groups = [
       { name = "btsync";
       }];
 
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index c354ec61fe236..6d57faa9ac2b7 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -71,14 +71,14 @@ in
 
   config = mkIf cfg.enable (lib.mkMerge [
     {
-      users.extraUsers = singleton {
+      users.users = singleton {
         name = cfg.user;
         description = "Charybdis IRC daemon user";
         uid = config.ids.uids.ircd;
         group = cfg.group;
       };
 
-      users.extraGroups = singleton {
+      users.groups = singleton {
         name = cfg.group;
         gid = config.ids.gids.ircd;
       };
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 9bf266b38054c..6a89002b42deb 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -96,12 +96,12 @@ in
     # Make chronyc available in the system path
     environment.systemPackages = [ pkgs.chrony ];
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "chrony";
         gid = config.ids.gids.chrony;
       };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "chrony";
         uid = config.ids.uids.chrony;
         group = "chrony";
@@ -109,7 +109,7 @@ in
         home = stateDir;
       };
 
-    systemd.services.timesyncd.enable = mkForce false;
+    services.timesyncd.enable = mkForce false;
 
     systemd.services.chronyd =
       { description = "chrony NTP daemon";
diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
index 3978a1969ce91..4e4e3104c3a8a 100644
--- a/nixos/modules/services/networking/cntlm.nix
+++ b/nixos/modules/services/networking/cntlm.nix
@@ -117,7 +117,7 @@ in
       };
     };
 
-    users.extraUsers.cntlm = {
+    users.users.cntlm = {
       name = "cntlm";
       description = "cntlm system-wide daemon";
       isSystemUser = true;
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 6333970cb338f..ab3f810376811 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -155,7 +155,7 @@ in
   config = mkIf cfg.enable (
     mkMerge [{
 
-      users.extraUsers."consul" = {
+      users.users."consul" = {
         description = "Consul agent daemon user";
         uid = config.ids.uids.consul;
         # The shell is needed for health checks
diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index b3c64490d97e4..c430ce5af92a3 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixos/modules/services/networking/coturn.nix
@@ -294,12 +294,12 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = [
+    users.users = [
       { name = "turnserver";
         uid = config.ids.uids.turnserver;
         description = "coturn TURN server user";
       } ];
-    users.extraGroups = [
+    users.groups = [
       { name = "turnserver";
         gid = config.ids.gids.turnserver;
         members = [ "turnserver" ];
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index fd7e317eee955..0b2063bc42466 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -197,7 +197,7 @@ in
   config = mkIf (cfg4.enable || cfg6.enable) {
 
     users = {
-      extraUsers.dhcpd = {
+      users.dhcpd = {
         uid = config.ids.uids.dhcpd;
         description = "DHCP daemon user";
       };
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
index ba5c8e2d5e53f..fc30f50317fe9 100644
--- a/nixos/modules/services/networking/dnscache.nix
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -84,7 +84,7 @@ in {
 
   config = mkIf config.services.dnscache.enable {
     environment.systemPackages = [ pkgs.djbdns ];
-    users.extraUsers.dnscache = {};
+    users.users.dnscache = {};
 
     systemd.services.dnscache = {
       description = "djbdns dnscache server";
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index ee1cd36000398..0c2add424bac5 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -141,7 +141,7 @@ in
         dns = "127.0.0.1:${toString cfg.dns.port}";
       };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = username;
       description = "DNSChain daemon user";
       home = dataDir;
diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix
new file mode 100644
index 0000000000000..12eee136e6394
--- /dev/null
+++ b/nixos/modules/services/networking/dnsdist.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.dnsdist;
+  configFile = pkgs.writeText "dndist.conf" ''
+    setLocal('${cfg.listenAddress}:${toString cfg.listenPort}')
+    ${cfg.extraConfig}
+    '';
+in {
+  options = {
+    services.dnsdist = {
+      enable = mkEnableOption "dnsdist domain name server";
+
+      listenAddress = mkOption {
+        type = types.str;
+        description = "Listen IP Address";
+        default = "0.0.0.0";
+      };
+      listenPort = mkOption {
+        type = types.int;
+        description = "Listen port";
+        default = 53;
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = ''
+        '';
+        description = ''
+          Extra lines to be added verbatim to dnsdist.conf.
+        '';
+      };
+    };
+  };
+
+  config = mkIf config.services.dnsdist.enable {
+    systemd.services.dnsdist = {
+      description = "dnsdist load balancer";
+      wantedBy = [ "multi-user.target" ];
+      after = ["network.target"];
+
+      serviceConfig = {
+        Restart="on-failure";
+        RestartSec="1";
+        DynamicUser = true;
+        StartLimitInterval="0";
+        PrivateTmp=true;
+        PrivateDevices=true;
+        CapabilityBoundingSet="CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID";
+        ExecStart = "${pkgs.dnsdist}/bin/dnsdist --supervised --disable-syslog --config ${configFile}";
+        ProtectSystem="full";
+        ProtectHome=true;
+        RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6";
+        LimitNOFILE="16384";
+        TasksMax="8192";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 91a3e54474ac9..24d16046c63e6 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -86,7 +86,7 @@ in
 
     services.dbus.packages = [ dnsmasq ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "dnsmasq";
       uid = config.ids.uids.dnsmasq;
       description = "Dnsmasq daemon user";
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 82ed7fc4a8377..ef5e2cee6f200 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -94,7 +94,7 @@ in {
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
-    users.extraUsers = optionalAttrs (cfg.user == "ejabberd") (singleton
+    users.users = optionalAttrs (cfg.user == "ejabberd") (singleton
       { name = "ejabberd";
         group = cfg.group;
         home = cfg.spoolDir;
@@ -102,7 +102,7 @@ in {
         uid = config.ids.uids.ejabberd;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "ejabberd") (singleton
+    users.groups = optionalAttrs (cfg.group == "ejabberd") (singleton
       { name = "ejabberd";
         gid = config.ids.gids.ejabberd;
       });
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index c4bd0e7f9eef2..36f1dd8d24797 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -148,38 +148,42 @@ let
     ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept
 
     # Accept connections to the allowed TCP ports.
-    ${concatMapStrings (port:
+    ${concatStrings (mapAttrsToList (iface: cfg:
+      concatMapStrings (port:
         ''
-          ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept
+          ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
         ''
       ) cfg.allowedTCPPorts
-    }
+    ) cfg.interfaces)}
 
     # Accept connections to the allowed TCP port ranges.
-    ${concatMapStrings (rangeAttr:
+    ${concatStrings (mapAttrsToList (iface: cfg:
+      concatMapStrings (rangeAttr:
         let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
         ''
-          ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept
+          ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
         ''
       ) cfg.allowedTCPPortRanges
-    }
+    ) cfg.interfaces)}
 
     # Accept packets on the allowed UDP ports.
-    ${concatMapStrings (port:
+    ${concatStrings (mapAttrsToList (iface: cfg:
+      concatMapStrings (port:
         ''
-          ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept
+          ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
         ''
       ) cfg.allowedUDPPorts
-    }
+    ) cfg.interfaces)}
 
     # Accept packets on the allowed UDP port ranges.
-    ${concatMapStrings (rangeAttr:
+    ${concatStrings (mapAttrsToList (iface: cfg:
+      concatMapStrings (rangeAttr:
         let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
         ''
-          ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept
+          ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
         ''
       ) cfg.allowedUDPPortRanges
-    }
+    ) cfg.interfaces)}
 
     # Accept IPv4 multicast.  Not a big security risk since
     # probably nobody is listening anyway.
@@ -254,106 +258,30 @@ let
     fi
   '';
 
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    networking.firewall.enable = mkOption {
-      type = types.bool;
-      default = true;
-      description =
-        ''
-          Whether to enable the firewall.  This is a simple stateful
-          firewall that blocks connection attempts to unauthorised TCP
-          or UDP ports on this machine.  It does not affect packet
-          forwarding.
-        '';
-    };
-
-    networking.firewall.logRefusedConnections = mkOption {
-      type = types.bool;
-      default = true;
-      description =
-        ''
-          Whether to log rejected or dropped incoming connections.
-        '';
-    };
-
-    networking.firewall.logRefusedPackets = mkOption {
-      type = types.bool;
-      default = false;
-      description =
-        ''
-          Whether to log all rejected or dropped incoming packets.
-          This tends to give a lot of log messages, so it's mostly
-          useful for debugging.
-        '';
-    };
-
-    networking.firewall.logRefusedUnicastsOnly = mkOption {
-      type = types.bool;
-      default = true;
-      description =
-        ''
-          If <option>networking.firewall.logRefusedPackets</option>
-          and this option are enabled, then only log packets
-          specifically directed at this machine, i.e., not broadcasts
-          or multicasts.
-        '';
-    };
-
-    networking.firewall.rejectPackets = mkOption {
-      type = types.bool;
-      default = false;
-      description =
-        ''
-          If set, refused packets are rejected rather than dropped
-          (ignored).  This means that an ICMP "port unreachable" error
-          message is sent back to the client (or a TCP RST packet in
-          case of an existing connection).  Rejecting packets makes
-          port scanning somewhat easier.
-        '';
-    };
-
-    networking.firewall.trustedInterfaces = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      example = [ "enp0s2" ];
-      description =
-        ''
-          Traffic coming in from these interfaces will be accepted
-          unconditionally.  Traffic from the loopback (lo) interface
-          will always be accepted.
-        '';
-    };
-
-    networking.firewall.allowedTCPPorts = mkOption {
+  commonOptions = {
+    allowedTCPPorts = mkOption {
       type = types.listOf types.int;
       default = [ ];
       example = [ 22 80 ];
       description =
-        ''
+        '' 
           List of TCP ports on which incoming connections are
           accepted.
         '';
     };
 
-    networking.firewall.allowedTCPPortRanges = mkOption {
+    allowedTCPPortRanges = mkOption {
       type = types.listOf (types.attrsOf types.int);
       default = [ ];
       example = [ { from = 8999; to = 9003; } ];
       description =
-        ''
+        '' 
           A range of TCP ports on which incoming connections are
           accepted.
         '';
     };
 
-    networking.firewall.allowedUDPPorts = mkOption {
+    allowedUDPPorts = mkOption {
       type = types.listOf types.int;
       default = [ ];
       example = [ 53 ];
@@ -363,7 +291,7 @@ in
         '';
     };
 
-    networking.firewall.allowedUDPPortRanges = mkOption {
+    allowedUDPPortRanges = mkOption {
       type = types.listOf (types.attrsOf types.int);
       default = [ ];
       example = [ { from = 60000; to = 61000; } ];
@@ -372,133 +300,226 @@ in
           Range of open UDP ports.
         '';
     };
+  };
 
-    networking.firewall.allowPing = mkOption {
-      type = types.bool;
-      default = true;
-      description =
-        ''
-          Whether to respond to incoming ICMPv4 echo requests
-          ("pings").  ICMPv6 pings are always allowed because the
-          larger address space of IPv6 makes network scanning much
-          less effective.
-        '';
-    };
+in
 
-    networking.firewall.pingLimit = mkOption {
-      type = types.nullOr (types.separatedString " ");
-      default = null;
-      example = "--limit 1/minute --limit-burst 5";
-      description =
-        ''
-          If pings are allowed, this allows setting rate limits
-          on them.  If non-null, this option should be in the form of
-          flags like "--limit 1/minute --limit-burst 5"
-        '';
-    };
+{
 
-    networking.firewall.checkReversePath = mkOption {
-      type = types.either types.bool (types.enum ["strict" "loose"]);
-      default = kernelHasRPFilter;
-      example = "loose";
-      description =
-        ''
-          Performs a reverse path filter test on a packet.  If a reply
-          to the packet would not be sent via the same interface that
-          the packet arrived on, it is refused.
+  ###### interface
 
-          If using asymmetric routing or other complicated routing, set
-          this option to loose mode or disable it and setup your own
-          counter-measures.
+  options = {
 
-          This option can be either true (or "strict"), "loose" (only
-          drop the packet if the source address is not reachable via any
-          interface) or false.  Defaults to the value of
-          kernelHasRPFilter.
+    networking.firewall = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          ''
+            Whether to enable the firewall.  This is a simple stateful
+            firewall that blocks connection attempts to unauthorised TCP
+            or UDP ports on this machine.  It does not affect packet
+            forwarding.
+          '';
+      };
 
-          (needs kernel 3.3+)
-        '';
-    };
+      logRefusedConnections = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          ''
+            Whether to log rejected or dropped incoming connections.
+          '';
+      };
 
-    networking.firewall.logReversePathDrops = mkOption {
-      type = types.bool;
-      default = false;
-      description =
-        ''
-          Logs dropped packets failing the reverse path filter test if
-          the option networking.firewall.checkReversePath is enabled.
-        '';
-    };
+      logRefusedPackets = mkOption {
+        type = types.bool;
+        default = false;
+        description =
+          ''
+            Whether to log all rejected or dropped incoming packets.
+            This tends to give a lot of log messages, so it's mostly
+            useful for debugging.
+          '';
+      };
 
-    networking.firewall.connectionTrackingModules = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
-      description =
-        ''
-          List of connection-tracking helpers that are auto-loaded.
-          The complete list of possible values is given in the example.
-
-          As helpers can pose as a security risk, it is advised to
-          set this to an empty list and disable the setting
-          networking.firewall.autoLoadConntrackHelpers unless you
-          know what you are doing. Connection tracking is disabled
-          by default.
-
-          Loading of helpers is recommended to be done through the
-          CT target.  More info:
-          https://home.regit.org/netfilter-en/secure-use-of-helpers/
-        '';
-    };
+      logRefusedUnicastsOnly = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          ''
+            If <option>networking.firewall.logRefusedPackets</option>
+            and this option are enabled, then only log packets
+            specifically directed at this machine, i.e., not broadcasts
+            or multicasts.
+          '';
+      };
 
-    networking.firewall.autoLoadConntrackHelpers = mkOption {
-      type = types.bool;
-      default = false;
-      description =
-        ''
-          Whether to auto-load connection-tracking helpers.
-          See the description at networking.firewall.connectionTrackingModules
+      rejectPackets = mkOption {
+        type = types.bool;
+        default = false;
+        description =
+          ''
+            If set, refused packets are rejected rather than dropped
+            (ignored).  This means that an ICMP "port unreachable" error
+            message is sent back to the client (or a TCP RST packet in
+            case of an existing connection).  Rejecting packets makes
+            port scanning somewhat easier.
+          '';
+      };
 
-          (needs kernel 3.5+)
-        '';
-    };
+      trustedInterfaces = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "enp0s2" ];
+        description =
+          ''
+            Traffic coming in from these interfaces will be accepted
+            unconditionally.  Traffic from the loopback (lo) interface
+            will always be accepted.
+          '';
+      };
 
-    networking.firewall.extraCommands = mkOption {
-      type = types.lines;
-      default = "";
-      example = "iptables -A INPUT -p icmp -j ACCEPT";
-      description =
-        ''
-          Additional shell commands executed as part of the firewall
-          initialisation script.  These are executed just before the
-          final "reject" firewall rule is added, so they can be used
-          to allow packets that would otherwise be refused.
-        '';
-    };
+      allowPing = mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          ''
+            Whether to respond to incoming ICMPv4 echo requests
+            ("pings").  ICMPv6 pings are always allowed because the
+            larger address space of IPv6 makes network scanning much
+            less effective.
+          '';
+      };
 
-    networking.firewall.extraPackages = mkOption {
-      type = types.listOf types.package;
-      default = [ ];
-      example = literalExample "[ pkgs.ipset ]";
-      description =
-        ''
-          Additional packages to be included in the environment of the system
-          as well as the path of networking.firewall.extraCommands.
-        '';
-    };
+      pingLimit = mkOption {
+        type = types.nullOr (types.separatedString " ");
+        default = null;
+        example = "--limit 1/minute --limit-burst 5";
+        description =
+          ''
+            If pings are allowed, this allows setting rate limits
+            on them.  If non-null, this option should be in the form of
+            flags like "--limit 1/minute --limit-burst 5"
+          '';
+      };
 
-    networking.firewall.extraStopCommands = mkOption {
-      type = types.lines;
-      default = "";
-      example = "iptables -P INPUT ACCEPT";
-      description =
-        ''
-          Additional shell commands executed as part of the firewall
-          shutdown script.  These are executed just after the removal
-          of the NixOS input rule, or if the service enters a failed
-          state.
-        '';
-    };
+      checkReversePath = mkOption {
+        type = types.either types.bool (types.enum ["strict" "loose"]);
+        default = kernelHasRPFilter;
+        example = "loose";
+        description =
+          ''
+            Performs a reverse path filter test on a packet.  If a reply
+            to the packet would not be sent via the same interface that
+            the packet arrived on, it is refused.
+
+            If using asymmetric routing or other complicated routing, set
+            this option to loose mode or disable it and setup your own
+            counter-measures.
+
+            This option can be either true (or "strict"), "loose" (only
+            drop the packet if the source address is not reachable via any
+            interface) or false.  Defaults to the value of
+            kernelHasRPFilter.
+
+            (needs kernel 3.3+)
+          '';
+      };
+
+      logReversePathDrops = mkOption {
+        type = types.bool;
+        default = false;
+        description =
+          ''
+            Logs dropped packets failing the reverse path filter test if
+            the option networking.firewall.checkReversePath is enabled.
+          '';
+      };
+
+      connectionTrackingModules = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
+        description =
+          ''
+            List of connection-tracking helpers that are auto-loaded.
+            The complete list of possible values is given in the example.
+
+            As helpers can pose as a security risk, it is advised to
+            set this to an empty list and disable the setting
+            networking.firewall.autoLoadConntrackHelpers unless you
+            know what you are doing. Connection tracking is disabled
+            by default.
+
+            Loading of helpers is recommended to be done through the
+            CT target.  More info:
+            https://home.regit.org/netfilter-en/secure-use-of-helpers/
+          '';
+      };
+
+      autoLoadConntrackHelpers = mkOption {
+        type = types.bool;
+        default = false;
+        description =
+          ''
+            Whether to auto-load connection-tracking helpers.
+            See the description at networking.firewall.connectionTrackingModules
+
+            (needs kernel 3.5+)
+          '';
+      };
+
+      extraCommands = mkOption {
+        type = types.lines;
+        default = "";
+        example = "iptables -A INPUT -p icmp -j ACCEPT";
+        description =
+          ''
+            Additional shell commands executed as part of the firewall
+            initialisation script.  These are executed just before the
+            final "reject" firewall rule is added, so they can be used
+            to allow packets that would otherwise be refused.
+          '';
+      };
+
+      extraPackages = mkOption {
+        type = types.listOf types.package;
+        default = [ ];
+        example = literalExample "[ pkgs.ipset ]";
+        description =
+          ''
+            Additional packages to be included in the environment of the system
+            as well as the path of networking.firewall.extraCommands.
+          '';
+      };
+
+      extraStopCommands = mkOption {
+        type = types.lines;
+        default = "";
+        example = "iptables -P INPUT ACCEPT";
+        description =
+          ''
+            Additional shell commands executed as part of the firewall
+            shutdown script.  These are executed just after the removal
+            of the NixOS input rule, or if the service enters a failed
+            state.
+          '';
+      };
+
+      interfaces = mkOption {
+        default = {
+          default = mapAttrs (name: value: cfg."${name}") commonOptions;
+        };
+        type = with types; attrsOf (submodule [ { options = commonOptions; } ]);
+        description =
+          ''
+            Interface-specific open ports. Setting this value will override
+            all values of the <literal>networking.firewall.allowed*</literal>
+            options.
+          '';
+      };
+    } // commonOptions;
 
   };
 
diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix
index 3903a2c708cbc..3da3ab0c7df48 100644
--- a/nixos/modules/services/networking/freenet.nix
+++ b/nixos/modules/services/networking/freenet.nix
@@ -50,7 +50,7 @@ in
       serviceConfig.Nice = cfg.nice;
     };
 
-    users.extraUsers.freenet = {
+    users.users.freenet = {
       group = "freenet";
       description = "Freenet daemon user";
       home = varDir;
@@ -58,7 +58,7 @@ in
       uid = config.ids.uids.freenet;
     };
 
-    users.extraGroups.freenet.gid = config.ids.gids.freenet;
+    users.groups.freenet.gid = config.ids.gids.freenet;
   };
 
 }
diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix
index 45cba1ce27708..e192b70c129c0 100644
--- a/nixos/modules/services/networking/freeradius.nix
+++ b/nixos/modules/services/networking/freeradius.nix
@@ -59,7 +59,7 @@ in
   config = mkIf (cfg.enable) {
 
     users = {
-      extraUsers.radius = {
+      users.radius = {
         /*uid = config.ids.uids.radius;*/
         description = "Radius daemon user";
       };
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
index fd83f9e3c1b73..7083d87c40735 100644
--- a/nixos/modules/services/networking/gale.nix
+++ b/nixos/modules/services/networking/gale.nix
@@ -104,7 +104,7 @@ in
          systemPackages = [ pkgs.gale ];
        };
 
-       users.extraUsers = [{
+       users.users = [{
          name = cfg.user;
          description = "Gale daemon";
          uid = config.ids.uids.gale;
@@ -113,7 +113,7 @@ in
          createHome = true;
        }];
 
-       users.extraGroups = [{
+       users.groups = [{
          name = cfg.group;
          gid = config.ids.gids.gale;
        }];
diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
index 78ff0b76198c4..4456a95402edd 100644
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixos/modules/services/networking/gateone.nix
@@ -23,12 +23,12 @@ config = mkIf cfg.enable {
   environment.systemPackages = with pkgs.pythonPackages; [
     gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert];
 
-  users.extraUsers.gateone = {
+  users.users.gateone = {
     description = "GateOne privilege separation user";
     uid = config.ids.uids.gateone;
     home = cfg.settingsDir;
   };
-  users.extraGroups.gateone.gid = config.ids.gids.gateone;
+  users.groups.gateone.gid = config.ids.gids.gateone;
 
   systemd.services.gateone = with pkgs; {
     description = "GateOne web-based terminal";
diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index cd3fcd0f8f66a..c0020349ec740 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -104,13 +104,13 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = if cfg.user != "git" then {} else singleton
+    users.users = if cfg.user != "git" then {} else singleton
       { name = "git";
         uid = config.ids.uids.git;
         description = "Git daemon user";
       };
 
-    users.extraGroups = if cfg.group != "git" then {} else singleton
+    users.groups = if cfg.group != "git" then {} else singleton
       { name = "git";
         gid = config.ids.gids.git;
       };
diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
index 008b09e81a57c..6a1db81413c53 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixos/modules/services/networking/gnunet.nix
@@ -126,7 +126,7 @@ in
 
   config = mkIf config.services.gnunet.enable {
 
-    users.extraUsers.gnunet = {
+    users.users.gnunet = {
       group = "gnunet";
       description = "GNUnet User";
       home = homeDir;
@@ -134,7 +134,7 @@ in
       uid = config.ids.uids.gnunet;
     };
 
-    users.extraGroups.gnunet.gid = config.ids.gids.gnunet;
+    users.groups.gnunet.gid = config.ids.gids.gnunet;
 
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index dd34ef8d4ca1d..20e57e4626efa 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -135,7 +135,7 @@ in
       };
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = hansUser;
       description = "Hans daemon user";
     };
diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix
index 09e48ec4bff07..0438d0bf8d860 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixos/modules/services/networking/haproxy.nix
@@ -52,11 +52,11 @@ with lib;
 
     environment.systemPackages = [ pkgs.haproxy ];
 
-    users.extraUsers.haproxy = {
+    users.users.haproxy = {
       group = "haproxy";
       uid = config.ids.uids.haproxy;
     };
 
-    users.extraGroups.haproxy.gid = config.ids.uids.haproxy;
+    users.groups.haproxy.gid = config.ids.uids.haproxy;
   };
 }
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 63f56437d1c8d..3af0441a89d8e 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -29,7 +29,7 @@ let
     ctrl_interface_group=${cfg.group}
 
     ${if cfg.wpa then ''
-      wpa=1
+      wpa=2
       wpa_passphrase=${cfg.wpaPassphrase}
       '' else ""}
 
diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix
index e6ee5fd1f9576..3b6010531f13f 100644
--- a/nixos/modules/services/networking/i2p.nix
+++ b/nixos/modules/services/networking/i2p.nix
@@ -11,14 +11,14 @@ in {
 
   ###### implementation
   config = mkIf cfg.enable {
-    users.extraUsers.i2p = {
+    users.users.i2p = {
       group = "i2p";
       description = "i2p User";
       home = homeDir;
       createHome = true;
       uid = config.ids.uids.i2p;
     };
-    users.extraGroups.i2p.gid = config.ids.gids.i2p;
+    users.groups.i2p.gid = config.ids.gids.i2p;
     systemd.services.i2p = {
       description = "I2P router with administration interface for hidden services";
       after = [ "network.target" ];
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 8f5aeee4a16b4..8875309143fdd 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -456,7 +456,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.i2pd = {
+    users.users.i2pd = {
       group = "i2pd";
       description = "I2Pd User";
       home = homeDir;
@@ -464,7 +464,7 @@ in
       uid = config.ids.uids.i2pd;
     };
 
-    users.extraGroups.i2pd.gid = config.ids.gids.i2pd;
+    users.groups.i2pd.gid = config.ids.gids.i2pd;
 
     systemd.services.i2pd = {
       description = "Minimal I2P router";
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 3f41421d27f7f..58ad0df4ff20d 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -140,11 +140,11 @@ in
       };
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = iodinedUser;
       uid = config.ids.uids.iodined;
       description = "Iodine daemon user";
     };
-    users.extraGroups.iodined.gid = config.ids.gids.iodined;
+    users.groups.iodined.gid = config.ids.gids.iodined;
   };
 }
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index bd583fb020ece..2bd898edf8971 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -112,14 +112,14 @@ in
 
   config = mkIf config.services.ircdHybrid.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "ircd";
         description = "IRCD owner";
         group = "ircd";
         uid = config.ids.uids.ircd;
       };
 
-    users.extraGroups.ircd.gid = config.ids.gids.ircd;
+    users.groups.ircd.gid = config.ids.gids.ircd;
 
     systemd.services."ircd-hybrid" = {
       description = "IRCD Hybrid server";
diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index 344212ad83294..cfc536fc5b5f6 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -28,6 +28,10 @@ in {
 
       serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd";
     };
+
+    systemd.tmpfiles.rules = [
+      "d /var/lib/iwd 0700 root root -"
+    ];
   };
 
   meta.maintainers = with lib.maintainers; [ mic92 ];
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 834de4fdc09f2..40c38254a57c3 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -73,12 +73,12 @@ rec {
         ${cfg.extraConfig}
     '';
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "kippo";
       description = "kippo web server privilege separation user";
       uid = 108; # why does config.ids.uids.kippo give an error?
     };
-    users.extraGroups = singleton { name = "kippo";gid=108; };
+    users.groups = singleton { name = "kippo";gid=108; };
 
     systemd.services.kippo = with pkgs; {
       description = "Kippo Web Server";
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index aac02b811d716..ca34ff9df4ef3 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -62,13 +62,13 @@ in
   config = mkIf cfg.enable {
     environment.etc."kresd.conf".source = configFile; # not required
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "kresd";
         uid = config.ids.uids.kresd;
         group = "kresd";
         description = "Knot-resolver daemon user";
       };
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "kresd";
         gid = config.ids.gids.kresd;
       };
diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix
index 5a61a9f967827..b7c8bd008fe1c 100644
--- a/nixos/modules/services/networking/lambdabot.nix
+++ b/nixos/modules/services/networking/lambdabot.nix
@@ -67,7 +67,7 @@ in
       };
     };
 
-    users.extraUsers.lambdabot = {
+    users.users.lambdabot = {
       group = "lambdabot";
       description = "Lambdabot daemon user";
       home = "/var/lib/lambdabot";
@@ -75,7 +75,7 @@ in
       uid = config.ids.uids.lambdabot;
     };
 
-    users.extraGroups.lambdabot.gid = config.ids.gids.lambdabot;
+    users.groups.lambdabot.gid = config.ids.gids.lambdabot;
 
   };
 
diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index db1534edfd7c0..dec30cc92f6a5 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixos/modules/services/networking/lldpd.nix
@@ -20,13 +20,13 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers._lldpd = {
+    users.users._lldpd = {
       description = "lldpd user";
       group = "_lldpd";
       home = "/var/run/lldpd";
       isSystemUser = true;
     };
-    users.extraGroups._lldpd = {};
+    users.groups._lldpd = {};
 
     environment.systemPackages = [ pkgs.lldpd ];
     systemd.packages = [ pkgs.lldpd ];
diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix
index e164d41483c7f..c42d3d5a44cb0 100644
--- a/nixos/modules/services/networking/mailpile.nix
+++ b/nixos/modules/services/networking/mailpile.nix
@@ -41,14 +41,14 @@ in
 
   config = mkIf config.services.mailpile.enable {
 
-    users.extraUsers.mailpile =
+    users.users.mailpile =
       { uid = config.ids.uids.mailpile;
         description = "Mailpile user";
         createHome = true;
         home = "/var/lib/mailpile";
       };
 
-    users.extraGroups.mailpile =
+    users.groups.mailpile =
       { gid = config.ids.gids.mailpile;
       };
 
diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix
index e2f4784059530..1fd63348c16c1 100644
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixos/modules/services/networking/matterbridge.nix
@@ -92,12 +92,12 @@ in
     warnings = optional options.services.matterbridge.configFile.isDefined
       "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath";
 
-    users.extraUsers = optional (cfg.user == "matterbridge")
+    users.users = optional (cfg.user == "matterbridge")
       { name = "matterbridge";
         group = "matterbridge";
       };
 
-    users.extraGroups = optional (cfg.group == "matterbridge")
+    users.groups = optional (cfg.group == "matterbridge")
       { name = "matterbridge";
       };
 
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 6401631bf6209..1858f03cac1f4 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -84,13 +84,13 @@ in
         '') cfg.mediaDirs}
       '';
 
-    users.extraUsers.minidlna = {
+    users.users.minidlna = {
       description = "MiniDLNA daemon user";
       group = "minidlna";
       uid = config.ids.uids.minidlna;
     };
 
-    users.extraGroups.minidlna.gid = config.ids.gids.minidlna;
+    users.groups.minidlna.gid = config.ids.gids.minidlna;
 
     systemd.services.minidlna =
       { description = "MiniDLNA Server";
diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix
index 1286b0c7ef6c9..e0a6c112e3cbf 100644
--- a/nixos/modules/services/networking/mjpg-streamer.nix
+++ b/nixos/modules/services/networking/mjpg-streamer.nix
@@ -49,7 +49,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = optional (cfg.user == "mjpg-streamer") {
+    users.users = optional (cfg.user == "mjpg-streamer") {
       name = "mjpg-streamer";
       uid = config.ids.uids.mjpg-streamer;
       group = cfg.group;
diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
index 31379189f5de3..8241c32bad07e 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixos/modules/services/networking/monero.nix
@@ -197,7 +197,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "monero";
       uid  = config.ids.uids.monero;
       description = "Monero daemon user";
@@ -205,7 +205,7 @@ in
       createHome = true;
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = "monero";
       gid  = config.ids.gids.monero;
     };
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index b31bec9a86275..f24562f118174 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -72,7 +72,7 @@ in
 
   config = mkIf config.services.morty.enable {
 
-    users.extraUsers.morty =
+    users.users.morty =
       { description = "Morty user";
         createHome = true;
         home = "/var/lib/morty";
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index d8135f4d0ffa4..332dc541345e8 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -218,7 +218,7 @@ in
         ) cfg.users);
     };
 
-    users.extraUsers.mosquitto = {
+    users.users.mosquitto = {
       description = "Mosquitto MQTT Broker Daemon owner";
       group = "mosquitto";
       uid = config.ids.uids.mosquitto;
@@ -226,7 +226,7 @@ in
       createHome = true;
     };
 
-    users.extraGroups.mosquitto.gid = config.ids.gids.mosquitto;
+    users.groups.mosquitto.gid = config.ids.gids.mosquitto;
 
   };
 }
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 873d62dbf341e..fcc813e6898f9 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -238,7 +238,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.murmur = {
+    users.users.murmur = {
       description     = "Murmur Service user";
       home            = "/var/lib/murmur";
       createHome      = true;
@@ -248,7 +248,7 @@ in
     systemd.services.murmur = {
       description = "Murmur Chat Service";
       wantedBy    = [ "multi-user.target" ];
-      after       = [ "network.target "];
+      after       = [ "network-online.target "];
 
       serviceConfig = {
         Type      = "forking";
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 11f7d7e5caef7..8de23b442f932 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -153,7 +153,7 @@ in
       config = ${configFile}
     '';
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "namecoin";
       uid  = config.ids.uids.namecoin;
       description = "Namecoin daemon user";
@@ -161,7 +161,7 @@ in
       createHome = true;
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = "namecoin";
       gid  = config.ids.gids.namecoin;
     };
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index da3827c35e63a..89d8590093dd5 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -38,19 +38,19 @@ let
     # NAT the marked packets.
     ${optionalString (cfg.internalInterfaces != []) ''
       iptables -w -t nat -A nixos-nat-post -m mark --mark 1 \
-        -o ${cfg.externalInterface} ${dest}
+        ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest}
     ''}
 
     # NAT packets coming from the internal IPs.
     ${concatMapStrings (range: ''
       iptables -w -t nat -A nixos-nat-post \
-        -s '${range}' -o ${cfg.externalInterface} ${dest}
+        -s '${range}' ${optionalString (cfg.externalInterface != null) "-o ${cfg.externalInterface}"} ${dest}
     '') cfg.internalIPs}
 
     # NAT from external ports to internal ports.
     ${concatMapStrings (fwd: ''
       iptables -w -t nat -A nixos-nat-pre \
-        -i ${cfg.externalInterface} -p ${fwd.proto} \
+        -i ${toString cfg.externalInterface} -p ${fwd.proto} \
         --dport ${builtins.toString fwd.sourcePort} \
         -j DNAT --to-destination ${fwd.destination}
 
@@ -81,7 +81,7 @@ let
 
     ${optionalString (cfg.dmzHost != null) ''
       iptables -w -t nat -A nixos-nat-pre \
-        -i ${cfg.externalInterface} -j DNAT \
+        -i ${toString cfg.externalInterface} -j DNAT \
         --to-destination ${cfg.dmzHost}
     ''}
 
@@ -134,7 +134,8 @@ in
     };
 
     networking.nat.externalInterface = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
+      default = null;
       example = "eth1";
       description =
         ''
@@ -236,6 +237,15 @@ in
     { networking.firewall.extraCommands = mkBefore flushNat; }
     (mkIf config.networking.nat.enable {
 
+      assertions = [
+        { assertion = (cfg.dmzHost != null)    -> (cfg.externalInterface != null);
+          message = "networking.nat.dmzHost requires networking.nat.externalInterface";
+        }
+        { assertion = (cfg.forwardPorts != []) -> (cfg.externalInterface != null);
+          message = "networking.nat.forwardPorts requires networking.nat.externalInterface";
+        }
+      ];
+
       environment.systemPackages = [ pkgs.iptables ];
 
       boot = {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index f4c4adcaaeb89..b0bc1c83d6b70 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -6,21 +6,17 @@ with lib;
 let
   cfg = config.networking.networkmanager;
 
+  dynamicHostsEnabled =
+    cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {};
+
   # /var/lib/misc is for dnsmasq.leases.
   stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
 
-  dns =
-    if cfg.dns == "none" then "none"
-    else if cfg.dns == "dnsmasq" then "dnsmasq"
-    else if config.services.resolved.enable then "systemd-resolved"
-    else if config.services.unbound.enable then "unbound"
-    else "default";
-
   configFile = writeText "NetworkManager.conf" ''
     [main]
     plugins=keyfile
     dhcp=${cfg.dhcp}
-    dns=${dns}
+    dns=${cfg.dns}
 
     [keyfile]
     ${optionalString (cfg.unmanaged != [])
@@ -38,6 +34,8 @@ let
 
     [device]
     wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
+
+    ${cfg.extraConfig}
   '';
 
   /*
@@ -120,6 +118,14 @@ in {
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration appended to the generated NetworkManager.conf.
+        '';
+      };
+
       unmanaged = mkOption {
         type = types.listOf types.string;
         default = [];
@@ -207,19 +213,73 @@ in {
       };
 
       dns = mkOption {
-        type = types.enum [ "auto" "dnsmasq" "none" ];
-        default = "auto";
+        type = types.enum [ "default" "dnsmasq" "unbound" "systemd-resolved" "none" ];
+        default = "default";
         description = ''
+          Set the DNS (<literal>resolv.conf</literal>) processing mode.
+          </para>
+          <para>
           Options:
-            - auto: Check for systemd-resolved, unbound, or use default.
-            - dnsmasq:
-              Enable NetworkManager's dnsmasq integration. NetworkManager will run
-              dnsmasq as a local caching nameserver, using a "split DNS"
-              configuration if you are connected to a VPN, and then update
-              resolv.conf to point to the local nameserver.
-            - none:
-              Disable NetworkManager's DNS integration completely.
-              It will not touch your /etc/resolv.conf.
+          <variablelist>
+          <varlistentry>
+            <term><literal>"default"</literal></term>
+            <listitem><para>
+              NetworkManager will update <literal>/etc/resolv.conf</literal> to
+              reflect the nameservers provided by currently active connections.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"dnsmasq"</literal></term>
+            <listitem>
+              <para>
+                Enable NetworkManager's dnsmasq integration. NetworkManager will
+                run dnsmasq as a local caching nameserver, using a "split DNS"
+                configuration if you are connected to a VPN, and then update
+                <literal>resolv.conf</literal> to point to the local nameserver.
+              </para>
+              <para>
+                It is possible to pass custom options to the dnsmasq instance by
+                adding them to files in the
+                <literal>/etc/NetworkManager/dnsmasq.d/</literal> directory.
+              </para>
+              <para>
+                When multiple upstream servers are available, dnsmasq will
+                initially contact them in parallel and then use the fastest to
+                respond, probing again other servers after some time.  This
+                behavior can be modified passing the
+                <literal>all-servers</literal> or <literal>strict-order</literal>
+                options to dnsmasq (see the manual page for more details).
+              </para>
+              <para>
+                Note that this option causes NetworkManager to launch and manage
+                its own instance of the dnsmasq daemon, which is
+                <emphasis>not</emphasis> the same as setting
+                <literal>services.dnsmasq.enable = true;</literal>.
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"unbound"</literal></term>
+            <listitem><para>
+              NetworkManager will talk to unbound and dnssec-triggerd,
+              providing a "split DNS" configuration with DNSSEC support.
+              <literal>/etc/resolv.conf</literal> will be managed by
+              dnssec-trigger daemon.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"systemd-resolved"</literal></term>
+            <listitem><para>
+              NetworkManager will push the DNS configuration to systemd-resolved.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>"none"</literal></term>
+            <listitem><para>
+              NetworkManager will not modify resolv.conf.
+            </para></listitem>
+          </varlistentry>
+          </variablelist>
         '';
       };
 
@@ -260,6 +320,52 @@ in {
           so you don't need to to that yourself.
         '';
       };
+
+      dynamicHosts = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enabling this option requires the
+            <option>networking.networkmanager.dns</option> option to be
+            set to <literal>dnsmasq</literal>. If enabled, the directories
+            defined by the
+            <option>networking.networkmanager.dynamicHosts.hostsDirs</option>
+            option will be set up when the service starts. The dnsmasq instance
+            managed by NetworkManager will then watch those directories for
+            hosts files (see the <literal>--hostsdir</literal> option of
+            dnsmasq). This way a non-privileged user can add or override DNS
+            entries on the local system (depending on what hosts directories
+            that are configured)..
+          '';
+        };
+        hostsDirs = mkOption {
+          type = with types; attrsOf (submodule {
+            options = {
+              user = mkOption {
+                type = types.str;
+                default = "root";
+                description = ''
+                  The user that will own the hosts directory.
+                '';
+              };
+              group = mkOption {
+                type = types.str;
+                default = "root";
+                description = ''
+                  The group that will own the hosts directory.
+                '';
+              };
+            };
+          });
+          default = {};
+          description = ''
+            Defines a set of directories (relative to
+            <literal>/run/NetworkManager/hostdirs</literal>) that dnsmasq will
+            watch for hosts files.
+          '';
+        };
+      };
     };
   };
 
@@ -268,10 +374,17 @@ in {
 
   config = mkIf cfg.enable {
 
-    assertions = [{
-      assertion = config.networking.wireless.enable == false;
-      message = "You can not use networking.networkmanager with networking.wireless";
-    }];
+    assertions = [
+      { assertion = config.networking.wireless.enable == false;
+        message = "You can not use networking.networkmanager with networking.wireless";
+      }
+      { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq");
+        message = ''
+          To use networking.networkmanager.dynamicHosts you also need to set
+          networking.networkmanager.dns = "dnsmasq"
+        '';
+      }
+    ];
 
     environment.etc = with cfg.basePackages; [
       { source = configFile;
@@ -305,11 +418,17 @@ in {
       ++ lib.imap1 (i: s: {
         inherit (s) source;
         target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
-      }) cfg.dispatcherScripts;
+      }) cfg.dispatcherScripts
+      ++ optional (dynamicHostsEnabled)
+           { target = "NetworkManager/dnsmasq.d/dyndns.conf";
+             text = concatMapStrings (n: ''
+               hostsdir=/run/NetworkManager/hostsdirs/${n}
+             '') (attrNames cfg.dynamicHosts.hostsDirs);
+           };
 
     environment.systemPackages = cfg.packages;
 
-    users.extraGroups = [{
+    users.groups = [{
       name = "networkmanager";
       gid = config.ids.gids.networkmanager;
     }
@@ -317,7 +436,7 @@ in {
       name = "nm-openvpn";
       gid = config.ids.gids.nm-openvpn;
     }];
-    users.extraUsers = [{
+    users.users = [{
       name = "nm-openvpn";
       uid = config.ids.uids.nm-openvpn;
       extraGroups = [ "networkmanager" ];
@@ -341,6 +460,21 @@ in {
       '';
     };
 
+    systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
+      wantedBy = [ "network-manager.service" ];
+      before = [ "network-manager.service" ];
+      partOf = [ "network-manager.service" ];
+      script = concatStrings (mapAttrsToList (n: d: ''
+        mkdir -p "/run/NetworkManager/hostsdirs/${n}"
+        chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"
+        chmod 0775 "/run/NetworkManager/hostsdirs/${n}"
+      '') cfg.dynamicHosts.hostsDirs);
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExist = true;
+      };
+    };
+
     # Turn off NixOS' network management
     networking = {
       useDHCP = false;
diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix
index 6a5290ffdee2b..4b2fa77959225 100644
--- a/nixos/modules/services/networking/ngircd.nix
+++ b/nixos/modules/services/networking/ngircd.nix
@@ -51,7 +51,7 @@ in {
       serviceConfig.User = "ngircd";
     };
 
-    users.extraUsers.ngircd = {
+    users.users.ngircd = {
       uid = config.ids.uids.ngircd;
       description = "ngircd user.";
     };
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 8499e7c0f7c46..e83cad949ae8c 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -64,7 +64,7 @@ in
       };
     };
 
-    users.extraUsers.nix-serve = {
+    users.users.nix-serve = {
       description = "Nix-serve user";
       uid = config.ids.uids.nix-serve;
     };
diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix
index 7eebecb23b006..d24d6f77a4916 100644
--- a/nixos/modules/services/networking/nntp-proxy.nix
+++ b/nixos/modules/services/networking/nntp-proxy.nix
@@ -210,7 +210,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = proxyUser;
         uid = config.ids.uids.nntp-proxy;
         description = "NNTP-Proxy daemon user";
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index fc910e59c323d..cde47bf23eaef 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -897,12 +897,12 @@ in
 
     environment.systemPackages = [ nsdPkg ];
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = username;
       gid = config.ids.gids.nsd;
     };
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = username;
       description = "NSD service user";
       home = stateDir;
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index 88e6dbf22b9e2..342350d49ab32 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -67,7 +67,7 @@ in
     environment.systemPackages = [ pkgs.ntp ];
     services.timesyncd.enable = mkForce false;
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = ntpUser;
         uid = config.ids.uids.ntp;
         description = "NTP daemon user";
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index 4864ecf3f92fe..b7b59d95bf024 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -151,7 +151,7 @@ in
 
   config = mkIf (length(enabledNylons) > 0) {
 
-    users.extraUsers.nylon = {
+    users.users.nylon = {
       group = "nylon";
       description = "Nylon SOCKS Proxy";
       home = homeDir;
@@ -159,7 +159,7 @@ in
       uid = config.ids.uids.nylon;
     };
 
-    users.extraGroups.nylon.gid = config.ids.gids.nylon;
+    users.groups.nylon.gid = config.ids.gids.nylon;
 
     systemd.services = fold (a: b: a // b) {} nylonUnits;
 
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index ba7acd879546d..8cf34623ab5ed 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
@@ -32,13 +32,13 @@ with lib;
           optionalString config.networking.enableIPv6 " -a ::";
     };
 
-    users.extraUsers.oidentd = {
+    users.users.oidentd = {
       description = "Ident Protocol daemon user";
       group = "oidentd";
       uid = config.ids.uids.oidentd;
     };
 
-    users.extraGroups.oidentd.gid = config.ids.gids.oidentd;
+    users.groups.oidentd.gid = config.ids.gids.oidentd;
 
   };
 
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index 241038ca12ede..57638ebc9c018 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -59,7 +59,7 @@ in
 
     environment.etc."ntpd.conf".text = configFile;
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "ntp";
       uid = config.ids.uids.ntp;
       description = "OpenNTP daemon user";
diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix
new file mode 100644
index 0000000000000..821a0258f4bec
--- /dev/null
+++ b/nixos/modules/services/networking/owamp.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.owamp;
+in
+{
+
+  ###### interface
+
+  options = {
+    services.owamp.enable = mkEnableOption ''Enable OWAMP server'';
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    users.users = singleton {
+      name = "owamp";
+      group = "owamp";
+      description = "Owamp daemon";
+    };
+
+    users.groups = singleton {
+      name = "owamp";
+    };
+
+    systemd.services.owamp = {
+      description = "Owamp server";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart="${pkgs.owamp}/bin/owampd -R /run/owamp -d /run/owamp -v -Z ";
+        PrivateTmp = true;
+        Restart = "always";
+        Type="simple";
+        User = "owamp";
+        Group = "owamp";
+        RuntimeDirectory = "owamp";
+        StateDirectory = "owamp";
+        AmbientCapabilities = "cap_net_bind_service";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 26be72d2a61e8..d07deb9dcc678 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -128,7 +128,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    users.extraUsers."${username}" = {
+    users.users."${username}" = {
       home = dataDir;
       createHome = true;
       uid = config.ids.uids.pdns-recursor;
diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix
index f4467b818958b..f5b174dd7b7b9 100644
--- a/nixos/modules/services/networking/pdnsd.nix
+++ b/nixos/modules/services/networking/pdnsd.nix
@@ -62,14 +62,14 @@ in
     };
 
   config = mkIf cfg.enable {
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = pdnsdUser;
       uid = config.ids.uids.pdnsd;
       group = pdnsdGroup;
       description = "pdnsd user";
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = pdnsdGroup;
       gid = config.ids.gids.pdnsd;
     };
diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix
index 847fc88ead4c1..529115a1c6e14 100644
--- a/nixos/modules/services/networking/polipo.nix
+++ b/nixos/modules/services/networking/polipo.nix
@@ -85,7 +85,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "polipo";
         uid = config.ids.uids.polipo;
         description = "Polipo caching proxy user";
@@ -93,7 +93,7 @@ in
         createHome = true;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "polipo";
         gid = config.ids.gids.polipo;
         members = [ "polipo" ];
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index 8cd4a08235343..f63f86496beee 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -72,14 +72,14 @@ in
   config = mkIf config.services.prayer.enable {
     environment.systemPackages = [ prayer ];
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = prayerUser;
         uid = config.ids.uids.prayer;
         description = "Prayer daemon user";
         home = stateDir;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = prayerGroup;
         gid = config.ids.gids.prayer;
       };
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 1b4f81f6b56e0..a37ef98caec61 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -487,7 +487,7 @@ in
         '') cfg.virtualHosts) }
     '';
 
-    users.extraUsers.prosody = mkIf (cfg.user == "prosody") {
+    users.users.prosody = mkIf (cfg.user == "prosody") {
       uid = config.ids.uids.prosody;
       description = "Prosody user";
       createHome = true;
@@ -495,7 +495,7 @@ in
       home = "${cfg.dataDir}";
     };
 
-    users.extraGroups.prosody = mkIf (cfg.group == "prosody") {
+    users.groups.prosody = mkIf (cfg.group == "prosody") {
       gid = config.ids.gids.prosody;
     };
 
diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix
index 22204e53203cf..5acdd5af8f8f4 100644
--- a/nixos/modules/services/networking/quagga.nix
+++ b/nixos/modules/services/networking/quagga.nix
@@ -95,26 +95,25 @@ in
 {
 
   ###### interface
-
-  options.services.quagga =
+  imports = [
     {
-
-      zebra = (serviceOptions "zebra") // {
-
-        enable = mkOption {
-          type = types.bool;
-          default = any isEnabled services;
-          description = ''
-            Whether to enable the Zebra routing manager.
-
-            The Zebra routing manager is automatically enabled
-            if any routing protocols are configured.
-          '';
+      options.services.quagga = {
+        zebra = (serviceOptions "zebra") // {
+          enable = mkOption {
+            type = types.bool;
+            default = any isEnabled services;
+            description = ''
+              Whether to enable the Zebra routing manager.
+
+              The Zebra routing manager is automatically enabled
+              if any routing protocols are configured.
+            '';
+          };
         };
-
       };
-
-    } // (genAttrs services serviceOptions);
+    }
+    { options.services.quagga = (genAttrs services serviceOptions); }
+  ];
 
   ###### implementation
 
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index bc7d6912b5ce2..d850bb8b1305f 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -72,14 +72,14 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = mkIf (cfg.user == null) [
+    users.users = mkIf (cfg.user == null) [
       { name = "quassel";
         description = "Quassel IRC client daemon";
         group = "quassel";
         uid = config.ids.uids.quassel;
       }];
 
-    users.extraGroups = mkIf (cfg.user == null) [
+    users.groups = mkIf (cfg.user == null) [
       { name = "quassel";
         gid = config.ids.gids.quassel;
       }];
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 97ee05046ff02..2afab5ee3b3e9 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -59,7 +59,7 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "radicale";
         uid = config.ids.uids.radicale;
         description = "radicale user";
@@ -67,7 +67,7 @@ in
         createHome = true;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "radicale";
         gid = config.ids.gids.radicale;
       };
diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix
index 85d7f9e4a41b8..020faa34922a2 100644
--- a/nixos/modules/services/networking/radvd.nix
+++ b/nixos/modules/services/networking/radvd.nix
@@ -52,7 +52,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.radvd =
+    users.users.radvd =
       { uid = config.ids.uids.radvd;
         description = "Router Advertisement Daemon User";
       };
diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix
index a102242eae715..887772f6e5f0c 100644
--- a/nixos/modules/services/networking/rdnssd.nix
+++ b/nixos/modules/services/networking/rdnssd.nix
@@ -64,7 +64,7 @@ in
       };
     };
 
-    users.extraUsers.rdnssd = {
+    users.users.rdnssd = {
       description = "RDNSSD Daemon User";
       uid = config.ids.uids.rdnssd;
     };
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 2956a5ecbc040..ee7f82ac7bee1 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -236,7 +236,7 @@ in
         }
       ];
 
-    users.extraUsers.rslsync = {
+    users.users.rslsync = {
       description     = "Resilio Sync Service user";
       home            = cfg.storagePath;
       createHome      = true;
@@ -244,7 +244,7 @@ in
       group           = "rslsync";
     };
 
-    users.extraGroups = [ { name = "rslsync"; } ];
+    users.groups = [ { name = "rslsync"; } ];
 
     systemd.services.resilio = with pkgs; {
       description = "Resilio Sync Service";
diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix
index cddcb09054e05..0a5df6987092a 100644
--- a/nixos/modules/services/networking/rpcbind.nix
+++ b/nixos/modules/services/networking/rpcbind.nix
@@ -37,7 +37,7 @@ with lib;
       wantedBy = [ "multi-user.target" ];
     };
 
-    users.extraUsers.rpc = {
+    users.users.rpc = {
       group = "nogroup";
       uid = config.ids.uids.rpc;
     };
diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix
index cacf753fdcd7c..62b24d4377f8a 100644
--- a/nixos/modules/services/networking/sabnzbd.nix
+++ b/nixos/modules/services/networking/sabnzbd.nix
@@ -41,7 +41,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.sabnzbd = {
+    users.users.sabnzbd = {
           uid = config.ids.uids.sabnzbd;
           group = "sabnzbd";
           description = "sabnzbd user";
@@ -49,7 +49,7 @@ in
           createHome = true;
     };
 
-    users.extraGroups.sabnzbd = {
+    users.groups.sabnzbd = {
       gid = config.ids.gids.sabnzbd;
     };
 
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index c7a128ae212de..9412d0ef8a62e 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -47,14 +47,14 @@ in
 
   config = mkIf config.services.searx.enable {
 
-    users.extraUsers.searx =
+    users.users.searx =
       { uid = config.ids.uids.searx;
         description = "Searx user";
         createHome = true;
         home = "/var/lib/searx";
       };
 
-    users.extraGroups.searx =
+    users.groups.searx =
       { gid = config.ids.gids.searx;
       };
 
diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix
index f5bc60be34576..40729225b6d0a 100644
--- a/nixos/modules/services/networking/seeks.nix
+++ b/nixos/modules/services/networking/seeks.nix
@@ -46,14 +46,14 @@ in
 
   config = mkIf config.services.seeks.enable {
 
-    users.extraUsers.seeks =
+    users.users.seeks =
       { uid = config.ids.uids.seeks;
         description = "Seeks user";
         createHome = true;
         home = "/var/lib/seeks";
       };
 
-    users.extraGroups.seeks =
+    users.groups.seeks =
       { gid = config.ids.gids.seeks;
       };
 
diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix
index 908de9efd6fb7..0b87140b0d8db 100644
--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixos/modules/services/networking/shairport-sync.nix
@@ -55,7 +55,7 @@ in
     services.avahi.publish.enable = true;
     services.avahi.publish.userServices = true;
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = cfg.user;
         description = "Shairport user";
         isSystemUser = true;
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index 3664c28577397..9784f1d160f37 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -82,7 +82,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "shout";
       uid = config.ids.uids.shout;
       description = "Shout daemon user";
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index c5c131cb4c509..9ba6e48f417ce 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -278,7 +278,7 @@ in
       "fping6".source = "${pkgs.fping}/bin/fping6";
     };
     environment.systemPackages = [ pkgs.fping ];
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = cfg.user;
       isNormalUser = false;
       isSystemUser = true;
diff --git a/nixos/modules/services/networking/sniproxy.nix b/nixos/modules/services/networking/sniproxy.nix
index 4d0f36923293a..0345c12d3afeb 100644
--- a/nixos/modules/services/networking/sniproxy.nix
+++ b/nixos/modules/services/networking/sniproxy.nix
@@ -82,14 +82,14 @@ in
       };
     };
 
-    users.extraUsers = mkIf (cfg.user == "sniproxy") {
+    users.users = mkIf (cfg.user == "sniproxy") {
       sniproxy = {
         group = cfg.group;
         uid = config.ids.uids.sniproxy;
       };
     };
 
-    users.extraGroups = mkIf (cfg.group == "sniproxy") {
+    users.groups = mkIf (cfg.group == "sniproxy") {
       sniproxy = {
         gid = config.ids.gids.sniproxy;
       };
diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix
index 005d7182351ab..e60d9abf42a66 100644
--- a/nixos/modules/services/networking/spiped.nix
+++ b/nixos/modules/services/networking/spiped.nix
@@ -171,8 +171,8 @@ in
       message   = "A pipe must either encrypt or decrypt";
     }) cfg.config;
 
-    users.extraGroups.spiped.gid = config.ids.gids.spiped;
-    users.extraUsers.spiped = {
+    users.groups.spiped.gid = config.ids.gids.spiped;
+    users.users.spiped = {
       description = "Secure Pipe Service user";
       group       = "spiped";
       uid         = config.ids.uids.spiped;
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 77673b5287bc6..7b2d1920f0f1b 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -49,7 +49,7 @@ let
         ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles}
       '';
     };
-    usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u:
+    usersWithKeys = attrValues (flip filterAttrs config.users.users (n: u:
       length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
     ));
   in listToAttrs (map mkAuthKeyFile usersWithKeys);
@@ -330,7 +330,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.sshd =
+    users.users.sshd =
       { isSystemUser = true;
         description = "SSH privilege separation user";
       };
@@ -338,7 +338,9 @@ in
     services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
 
     environment.etc = authKeysFiles //
-      { "ssh/moduli".source = cfg.moduliFile; };
+      { "ssh/moduli".source = cfg.moduliFile;
+        "ssh/sshd_config".text = cfg.extraConfig;
+      };
 
     systemd =
       let
@@ -376,7 +378,7 @@ in
               { ExecStart =
                   (optionalString cfg.startWhenNeeded "-") +
                   "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
-                  "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
+                  "-f /etc/ssh/sshd_config";
                 KillMode = "process";
               } // (if cfg.startWhenNeeded then {
                 StandardInput = "socket";
diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index ad211f41eef01..b16d299917fee 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -938,9 +938,12 @@ in {
         protection.
       '';
 
-      hw_offload = mkYesNoParam no ''
+      hw_offload = mkEnumParam ["yes" "no" "auto"] "no" ''
         Enable hardware offload for this CHILD_SA, if supported by the IPsec
-        implementation.
+        implementation. The value <literal>yes</literal> enforces offloading
+        and the installation will fail if it's not supported by either kernel or
+        device. The value <literal>auto</literal> enables offloading, if it's
+        supported, but the installation does not fail otherwise.
       '';
 
       start_action = mkEnumParam ["none" "trap" "start"] "none" ''
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index dc90a4bcc6207..3c4321ab9e9d6 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -183,7 +183,7 @@ in
 
       example = literalExample ''
         { "wlan0 wlan1" = {
-            configFile = "/etc/wpa_supplicant";
+            configFile.path = "/etc/wpa_supplicant.conf";
             userControlled.group = "network";
             extraConf = '''
               ap_scan=1
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index 2cfb9fc9b9234..64eb110683290 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -45,7 +45,7 @@ in
 
     environment.systemPackages = [ pkgs.pythonPackages.limnoria ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "supybot";
       uid = config.ids.uids.supybot;
       group = "supybot";
@@ -54,7 +54,7 @@ in
       createHome = true;
     };
 
-    users.extraGroups.supybot = {
+    users.groups.supybot = {
       name = "supybot";
       gid = config.ids.gids.supybot;
     };
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index e485c073cbddf..c610b3b666062 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -103,7 +103,7 @@ in {
     systemd.packages = [ pkgs.syncthing ];
 
     users = mkIf (cfg.user == defaultUser) {
-      extraUsers."${defaultUser}" =
+      users."${defaultUser}" =
         { group = cfg.group;
           home  = cfg.dataDir;
           createHome = true;
@@ -111,7 +111,7 @@ in {
           description = "Syncthing daemon user";
         };
 
-      extraGroups."${defaultUser}".gid =
+      groups."${defaultUser}".gid =
         config.ids.gids.syncthing;
     };
 
diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix
index ee005e11aa326..a0ccb99500941 100644
--- a/nixos/modules/services/networking/tcpcrypt.nix
+++ b/nixos/modules/services/networking/tcpcrypt.nix
@@ -29,7 +29,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "tcpcryptd";
       uid = config.ids.uids.tcpcryptd;
       description = "tcpcrypt daemon user";
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index e3c9b5282b8c4..35cdddc590b80 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -163,12 +163,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         path = [ data.package ];
-        restartTriggers =
-          let
-            drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ]
-                        ++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts;
-          in # drvlist might be too long to be used directly
-            [ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ];
+        restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ];
         serviceConfig = {
           Type = "simple";
           Restart = "always";
@@ -207,13 +202,14 @@ in
           ${concatStringsSep "\n" (mapAttrsToList (network: data:
             optionalString (versionAtLeast data.package.version "1.1pre") ''
               makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \
-                --add-flags "--pidfile=/run/tinc.${network}.pid"
+                --add-flags "--pidfile=/run/tinc.${network}.pid" \
+                --add-flags "--config=/etc/tinc/${network}"
             '') cfg.networks)}
         '';
       };
     in [ cli-wrappers ];
 
-    users.extraUsers = flip mapAttrs' cfg.networks (network: _:
+    users.users = flip mapAttrs' cfg.networks (network: _:
       nameValuePair ("tinc.${network}") ({
         description = "Tinc daemon user for ${network}";
         isSystemUser = true;
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
index 184888ef05da0..7d5db71601ef5 100644
--- a/nixos/modules/services/networking/tinydns.nix
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -32,7 +32,7 @@ with lib;
   config = mkIf config.services.tinydns.enable {
     environment.systemPackages = [ pkgs.djbdns ];
 
-    users.extraUsers.tinydns = {};
+    users.users.tinydns = {};
 
     systemd.services.tinydns = {
       description = "djbdns tinydns server";
diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix
index cb0e6b1586514..1d34921516903 100644
--- a/nixos/modules/services/networking/tox-bootstrapd.nix
+++ b/nixos/modules/services/networking/tox-bootstrapd.nix
@@ -56,7 +56,7 @@ in
 
   config = mkIf config.services.toxBootstrapd.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "tox-bootstrapd";
         uid = config.ids.uids.tox-bootstrapd;
         description = "Tox bootstrap daemon user";
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 5e13402d7645f..f5baea9222be7 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -57,7 +57,7 @@ with lib;
 
     environment.systemPackages = [ pkgs.toxvpn ];
 
-    users.extraUsers = {
+    users.users = {
       toxvpn = {
         uid        = config.ids.uids.toxvpn;
         home       = "/var/lib/toxvpn";
diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix
index cdd8747ba8982..f495c39967e8c 100644
--- a/nixos/modules/services/networking/tvheadend.nix
+++ b/nixos/modules/services/networking/tvheadend.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let cfg     = config.services.tvheadend;
-    pidFile = "${config.users.extraUsers.tvheadend.home}/tvheadend.pid";
+    pidFile = "${config.users.users.tvheadend.home}/tvheadend.pid";
 in
 
 {
@@ -25,7 +25,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.tvheadend = {
+    users.users.tvheadend = {
       description = "Tvheadend Service user";
       home        = "/var/lib/tvheadend";
       createHome  = true;
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index f069a9883a7f5..1a35979ad44c4 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -60,7 +60,7 @@ in
       };
 
       interfaces = mkOption {
-        default = [ "127.0.0.1" "::1" ];
+        default = [ "127.0.0.1" ] ++ optional config.networking.enableIPv6 "::1";
         type = types.listOf types.str;
         description = "What addresses the server should listen on.";
       };
@@ -112,8 +112,8 @@ in
         mkdir -m 0755 -p ${stateDir}/dev/
         cp ${confFile} ${stateDir}/unbound.conf
         ${optionalString cfg.enableRootTrustAnchor ''
-        ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
-        chown unbound ${stateDir} ${rootTrustAnchorFile}
+          ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
+          chown unbound ${stateDir} ${rootTrustAnchorFile}
         ''}
         touch ${stateDir}/dev/random
         ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random
@@ -126,9 +126,14 @@ in
         ProtectSystem = true;
         ProtectHome = true;
         PrivateDevices = true;
+        Restart = "always";
+        RestartSec = "5s";
       };
     };
 
+    # If networkmanager is enabled, ask it to interface with unbound.
+    networking.networkmanager.dns = "unbound";
+
   };
 
 }
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 94958bfdd83ec..ac10e77ba3063 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -114,7 +114,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers.unifi = {
+    users.users.unifi = {
       uid = config.ids.uids.unifi;
       description = "UniFi controller daemon user";
       home = "${stateDir}";
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 6b3d658bd8527..1f9107c3ce9c8 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -193,7 +193,7 @@ in
         message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!";
       };
 
-    users.extraUsers =
+    users.users =
       [ { name = "vsftpd";
           uid = config.ids.uids.vsftpd;
           description = "VSFTPD user";
@@ -207,7 +207,7 @@ in
           home = cfg.anonymousUserHome;
         };
 
-    users.extraGroups.ftp.gid = config.ids.gids.ftp;
+    users.groups.ftp.gid = config.ids.gids.ftp;
 
     # If you really have to access root via FTP use mkOverride or userlistDeny
     # = false and whitelist root
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index bf23c6ae61921..0e882873b4ba9 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -97,6 +97,7 @@ in
     # xrdp can run X11 program even if "services.xserver.enable = false"
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
+    fonts.enableDefaultFonts = mkDefault true;
 
     systemd = {
       services.xrdp = {
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index cd1617b8e2bac..4c1ee75d536cc 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -47,7 +47,7 @@ in
     };
 
     # ZeroTier does not issue DHCP leases, but some strangers might...
-    networking.dhcpcd.denyInterfaces = [ "zt0" ];
+    networking.dhcpcd.denyInterfaces = [ "zt*" ];
 
     # ZeroTier receives UDP transmissions on port 9993 by default
     networking.firewall.allowedUDPPorts = [ 9993 ];
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 72313ab2ee144..6f477e3b14605 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -36,6 +36,7 @@ let
             IPv4 = true
             IPv6 = true
             SSL = ${boolToString confOpts.useSSL}
+            ${lib.optionalString (confOpts.uriPrefix != null) "URIPrefix = ${confOpts.uriPrefix}"}
     </Listener>
 
     <User ${confOpts.userName}>
@@ -310,6 +311,16 @@ in
           '';
         };
 
+        uriPrefix = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "/znc/";
+          description = ''
+            An optional URI prefix for the ZNC web interface. Can be
+            used to make ZNC available behind a reverse proxy.
+          '';
+        };
+
         extraZncConf = mkOption {
           default = "";
           type = types.lines;
@@ -402,7 +413,7 @@ in
       script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}";
     };
 
-    users.extraUsers = optional (cfg.user == defaultUser)
+    users.users = optional (cfg.user == defaultUser)
       { name = defaultUser;
         description = "ZNC server daemon owner";
         group = defaultUser;
@@ -411,7 +422,7 @@ in
         createHome = true;
       };
 
-    users.extraGroups = optional (cfg.user == defaultUser)
+    users.groups = optional (cfg.user == defaultUser)
       { name = defaultUser;
         gid = config.ids.gids.znc;
         members = [ defaultUser ];
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index c4147986439c4..b074d15cbec1b 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -268,7 +268,7 @@ in
 
   config = mkIf config.services.printing.enable {
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "cups";
         uid = config.ids.uids.cups;
         group = "lp";
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 77a3f6b51e801..a32907647a0d5 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -57,14 +57,14 @@ in
 
     security.pam.services.atd = {};
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "atd";
         uid = config.ids.uids.atd;
         description = "atd user";
         home = "/var/empty";
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "atd";
         gid = config.ids.gids.atd;
       };
diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix
index 6c39997fec88e..9a8ed4c09ac1c 100644
--- a/nixos/modules/services/scheduling/chronos.nix
+++ b/nixos/modules/services/scheduling/chronos.nix
@@ -49,6 +49,6 @@ in {
       };
     };
 
-    users.extraUsers.chronos.uid = config.ids.uids.chronos;
+    users.users.chronos.uid = config.ids.uids.chronos;
   };
 }
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 0ea41f3c3985c..ae3828977753e 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -115,7 +115,7 @@ in
       ];
 
     environment.systemPackages = [ pkgs.fcron ];
-    users.extraUsers.fcron = {
+    users.users.fcron = {
       uid = config.ids.uids.fcron;
       home = "/var/spool/fcron";
       group = "fcron";
diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix
index 19c9a708f21fb..0961a67770e1b 100644
--- a/nixos/modules/services/scheduling/marathon.nix
+++ b/nixos/modules/services/scheduling/marathon.nix
@@ -93,6 +93,6 @@ in {
       };
     };
 
-    users.extraUsers.${cfg.user} = { };
+    users.users.${cfg.user} = { };
   };
 }
diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix
index a94a851e80eca..6740928db9a70 100644
--- a/nixos/modules/services/search/hound.nix
+++ b/nixos/modules/services/search/hound.nix
@@ -88,12 +88,12 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraGroups = optional (cfg.group == "hound") {
+    users.groups = optional (cfg.group == "hound") {
       name = "hound";
       gid = config.ids.gids.hound;
     };
 
-    users.extraUsers = optional (cfg.user == "hound") {
+    users.users = optional (cfg.user == "hound") {
       name = "hound";
       description = "hound code search";
       createHome = true;
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index 9d7d2d7991896..5885a72c6628f 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -193,7 +193,7 @@ in {
 
     environment.systemPackages = [ cfg.package ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = "kibana";
       uid = config.ids.uids.kibana;
       description = "Kibana service user";
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 4161c61ed375e..9ad0095252dea 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -79,7 +79,7 @@ in
   config = mkIf (cfg.updater.enable || cfg.daemon.enable) {
     environment.systemPackages = [ pkg ];
 
-    users.extraUsers = singleton {
+    users.users = singleton {
       name = clamavUser;
       uid = config.ids.uids.clamav;
       group = clamavGroup;
@@ -87,7 +87,7 @@ in
       home = stateDir;
     };
 
-    users.extraGroups = singleton {
+    users.groups = singleton {
       name = clamavGroup;
       gid = config.ids.gids.clamav;
     };
diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index a12aa01503e3e..b1ca4ab234526 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -53,14 +53,14 @@ in {
       target = "f-prot.conf";
     };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = fprotUser;
         uid = config.ids.uids.fprot;
         description = "F-Prot daemon user";
         home = stateDir;
       };
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = fprotGroup;
         gid = config.ids.gids.fprot;
       };
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 433d97c2a7d76..0c5fe8c0ef5ff 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -72,6 +72,7 @@ let
 
   mapConfig = key: attr:
   if (!isNull attr && attr != []) then (
+    if isDerivation attr then mapConfig key (toString attr) else
     if (builtins.typeOf attr) == "set" then concatStringsSep " "
       (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else
     if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else
@@ -543,7 +544,7 @@ in
       cookie.secret = mkDefault null;
     };
 
-    users.extraUsers.oauth2_proxy = {
+    users.users.oauth2_proxy = {
       description = "OAuth2 Proxy";
     };
 
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
new file mode 100644
index 0000000000000..2aa2c57fd22c3
--- /dev/null
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -0,0 +1,64 @@
+{ pkgs, config, lib, ... }:
+with lib;
+let
+  cfg = config.services.oauth2_proxy.nginx;
+in
+{
+  options.services.oauth2_proxy.nginx = {
+    proxy = mkOption {
+      type = types.string;
+      default = config.services.oauth2_proxy.httpAddress;
+      description = ''
+        The address of the reverse proxy endpoint for oauth2_proxy
+      '';
+    };
+    virtualHosts = mkOption {
+      type = types.listOf types.string;
+      default = [];
+      description = ''
+        A list of nginx virtual hosts to put behind the oauth2 proxy
+      '';
+    };
+  };
+  config.services.oauth2_proxy = mkIf (cfg.virtualHosts != [] && (hasPrefix "127.0.0.1:" cfg.proxy)) {
+    enable = true;
+  };
+  config.services.nginx = mkMerge ((optional (cfg.virtualHosts != []) {
+    recommendedProxySettings = true; # needed because duplicate headers
+  }) ++ (map (vhost: {
+    virtualHosts.${vhost} = {
+      locations."/oauth2/" = {
+        proxyPass = cfg.proxy;
+        extraConfig = ''
+          proxy_set_header X-Scheme                $scheme;
+          proxy_set_header X-Auth-Request-Redirect $request_uri;
+        '';
+      };
+      locations."/oauth2/auth" = {
+        proxyPass = cfg.proxy;
+        extraConfig = ''
+          proxy_set_header X-Scheme         $scheme;
+          # nginx auth_request includes headers but not body
+          proxy_set_header Content-Length   "";
+          proxy_pass_request_body           off;
+        '';
+      };
+      locations."/".extraConfig = ''
+        auth_request /oauth2/auth;
+        error_page 401 = /oauth2/sign_in;
+
+        # pass information via X-User and X-Email headers to backend,
+        # requires running with --set-xauthrequest flag
+        auth_request_set $user   $upstream_http_x_auth_request_user;
+        auth_request_set $email  $upstream_http_x_auth_request_email;
+        proxy_set_header X-User  $user;
+        proxy_set_header X-Email $email;
+
+        # if you enabled --cookie-refresh, this is needed for it to work with auth_request
+        auth_request_set $auth_cookie $upstream_http_set_cookie;
+        add_header Set-Cookie $auth_cookie;
+      '';
+
+    };
+  }) cfg.virtualHosts));
+}
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 806252f49b8d7..dcb41d187c2b1 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -39,7 +39,7 @@ let
     ''}
 
     ${optint "ControlPort" cfg.controlPort}
-    ${optionalString cfg.controlSocket.enable "ControlSocket ${torRunDirectory}/control GroupWritable RelaxDirModeCheck"}
+    ${optionalString cfg.controlSocket.enable "ControlPort unix:${torRunDirectory}/control GroupWritable RelaxDirModeCheck"}
   ''
   # Client connection config
   + optionalString cfg.client.enable ''
@@ -360,7 +360,7 @@ in
 
                 <important>
                   <para>
-                    WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE.
+                    WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVICE.
                     Consult with your lawer when in doubt.
                   </para>
 
@@ -686,8 +686,8 @@ in
         always create a container/VM with a separate Tor daemon instance.
       '';
 
-    users.extraGroups.tor.gid = config.ids.gids.tor;
-    users.extraUsers.tor =
+    users.groups.tor.gid = config.ids.gids.tor;
+    users.users.tor =
       { description = "Tor Daemon User";
         createHome  = true;
         home        = torDirectory;
@@ -695,19 +695,38 @@ in
         uid         = config.ids.uids.tor;
       };
 
+    # We have to do this instead of using RuntimeDirectory option in
+    # the service below because systemd has no way to set owners of
+    # RuntimeDirectory and putting this into the service below
+    # requires that service to relax it's sandbox since this needs
+    # writable /run
+    systemd.services.tor-init =
+      { description = "Tor Daemon Init";
+        wantedBy = [ "tor.service" ];
+        after = [ "local-fs.target" ];
+        script = ''
+          install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion
+          install -m 0750 -o tor -g tor -d ${torRunDirectory}
+        '';
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+      };
+
     systemd.services.tor =
       { description = "Tor Daemon";
         path = [ pkgs.tor ];
 
         wantedBy = [ "multi-user.target" ];
-        after    = [ "network.target" ];
+        after    = [ "tor-init.service" "network.target" ];
         restartTriggers = [ torRcFile ];
 
         serviceConfig =
           { Type         = "simple";
             # Translated from the upstream contrib/dist/tor.service.in
             ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
-            ExecStart    = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0";
+            ExecStart    = "${pkgs.tor}/bin/tor -f ${torRcFile}";
             ExecReload   = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             KillSignal   = "SIGINT";
             TimeoutSec   = 30;
@@ -715,20 +734,18 @@ in
             LimitNOFILE  = 32768;
 
             # Hardening
-            # Note: DevicePolicy is set to 'closed', although the
-            # minimal permissions are really:
-            #   DeviceAllow /dev/null rw
-            #   DeviceAllow /dev/urandom r
-            # .. but we can't specify DeviceAllow multiple times. 'closed'
-            # is close enough.
-            RuntimeDirectory        = "tor";
-            StateDirectory          = [ "tor" "tor/onion" ];
-            PrivateTmp              = "yes";
-            DevicePolicy            = "closed";
-            InaccessibleDirectories = "/home";
-            ReadOnlyDirectories     = "/";
-            ReadWriteDirectories    = [torDirectory torRunDirectory];
+            # this seems to unshare /run despite what systemd.exec(5) says
+            PrivateTmp              = mkIf (!cfg.controlSocket.enable) "yes";
+            PrivateDevices          = "yes";
+            ProtectHome             = "yes";
+            ProtectSystem           = "strict";
+            InaccessiblePaths       = "/home";
+            ReadOnlyPaths           = "/";
+            ReadWritePaths          = [ torDirectory torRunDirectory ];
             NoNewPrivileges         = "yes";
+
+            # tor.service.in has this in, but this line it fails to spawn a namespace when using hidden services
+            #CapabilityBoundingSet   = "CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE";
           };
       };
 
diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 146afec344ab9..47c70cf0687bc 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -97,13 +97,13 @@ in
       }
     ];
 
-    users.extraUsers.vault = {
+    users.users.vault = {
       name = "vault";
       group = "vault";
       uid = config.ids.uids.vault;
       description = "Vault daemon user";
     };
-    users.extraGroups.vault.gid = config.ids.gids.vault;
+    users.groups.vault.gid = config.ids.gids.vault;
 
     systemd.services.vault = {
       description = "Vault server daemon";
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 643bec1881429..e045802184421 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -71,14 +71,14 @@ in
         target = "dbus-1";
       };
 
-    users.extraUsers.messagebus = {
+    users.users.messagebus = {
       uid = config.ids.uids.messagebus;
       description = "D-Bus system message bus daemon user";
       home = homeDir;
       group = "messagebus";
     };
 
-    users.extraGroups.messagebus.gid = config.ids.gids.messagebus;
+    users.groups.messagebus.gid = config.ids.gids.messagebus;
 
     systemd.packages = [ pkgs.dbus.daemon ];
 
@@ -100,6 +100,7 @@ in
       # Don't restart dbus-daemon. Bad things tend to happen if we do.
       reloadIfChanged = true;
       restartTriggers = [ configDir ];
+      environment = { LD_LIBRARY_PATH = config.system.nssModules.path; };
     };
 
     systemd.user = {
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 4f2e2fdf662b2..d85dee089827b 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -41,8 +41,8 @@ in
         flags = "REUSE NAMEINARGS";
         protocol = "tcp";
         user = "root";
-        server = "${pkgs.tcp_wrappers}/sbin/tcpd";
-        serverArgs = "${pkgs.heimdalFull}/sbin/kadmind";
+        server = "${pkgs.tcp_wrappers}/bin/tcpd";
+        serverArgs = "${pkgs.heimdalFull}/bin/kadmind";
       };
 
     systemd.services.kdc = {
@@ -51,13 +51,13 @@ in
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
       '';
-      script = "${heimdalFull}/sbin/kdc";
+      script = "${heimdalFull}/bin/kdc";
     };
 
     systemd.services.kpasswdd = {
       description = "Kerberos Password Changing daemon";
       wantedBy = [ "multi-user.target" ];
-      script = "${heimdalFull}/sbin/kpasswdd";
+      script = "${heimdalFull}/bin/kpasswdd";
     };
   };
 
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index eb4b5281c7c6e..11a30ea81ba97 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -41,7 +41,7 @@ in
   config = mkIf cfg.enable {
     environment.etc."nscd.conf".text = cfg.config;
 
-    users.extraUsers.nscd =
+    users.users.nscd =
       { isSystemUser = true;
         description = "Name service cache daemon user";
       };
diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index b20d60968032d..3c9978ab22692 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
@@ -20,7 +20,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.uptimed = {
+    users.users.uptimed = {
       description = "Uptimed daemon user";
       home        = stateDir;
       createHome  = true;
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index bff22cd135941..84f0437b9411c 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -55,7 +55,7 @@ in {
 
     environment.systemPackages = [ pkgs.deluge ];
 
-    users.extraUsers.deluge = {
+    users.users.deluge = {
       group = "deluge";
       uid = config.ids.uids.deluge;
       home = "/var/lib/deluge/";
@@ -63,6 +63,6 @@ in {
       description = "Deluge Daemon user";
     };
 
-    users.extraGroups.deluge.gid = config.ids.gids.deluge;
+    users.groups.deluge.gid = config.ids.gids.deluge;
   };
 }
diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix
index 2e3dd9902d729..bed6661f84d61 100644
--- a/nixos/modules/services/torrent/peerflix.nix
+++ b/nixos/modules/services/torrent/peerflix.nix
@@ -58,6 +58,6 @@ in {
       };
     };
 
-    users.extraUsers.peerflix.uid = config.ids.uids.peerflix;
+    users.users.peerflix.uid = config.ids.uids.peerflix;
   };
 }
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 3564afd77f413..bf4fb76d0c0c7 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -113,8 +113,8 @@ in
     # It's useful to have transmission in path, e.g. for remote control
     environment.systemPackages = [ pkgs.transmission ];
 
-    users.extraGroups.transmission.gid = config.ids.gids.transmission;
-    users.extraUsers.transmission = {
+    users.groups.transmission.gid = config.ids.gids.transmission;
+    users.users.transmission = {
       group = "transmission";
       uid = config.ids.uids.transmission;
       description = "Transmission BitTorrent user";
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index 84c41b6e53c2d..f896d92fd6fc3 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -137,12 +137,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers."${cfg.user}" = {
+    users.users."${cfg.user}" = {
       isSystemUser = true;
       group = cfg.group;
     };
 
-    users.extraGroups."${cfg.group}" = {};
+    users.groups."${cfg.group}" = {};
 
     systemd.services.confluence = {
       description = "Atlassian Confluence";
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 778e4afa1e0b4..b6cb9f3b7c418 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -103,12 +103,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers."${cfg.user}" = {
+    users.users."${cfg.user}" = {
       isSystemUser = true;
       group = cfg.group;
     };
 
-    users.extraGroups."${cfg.group}" = {};
+    users.groups."${cfg.group}" = {};
 
     systemd.services.atlassian-crowd = {
       description = "Atlassian Crowd";
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 13c5951524d9f..f5ec0a5f31b8b 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -141,12 +141,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers."${cfg.user}" = {
+    users.users."${cfg.user}" = {
       isSystemUser = true;
       group = cfg.group;
     };
 
-    users.extraGroups."${cfg.group}" = {};
+    users.groups."${cfg.group}" = {};
 
     systemd.services.atlassian-jira = {
       description = "Atlassian JIRA";
diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix
index d5329ef03c897..d411727a1a54b 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixos/modules/services/web-apps/frab.nix
@@ -174,14 +174,14 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ frab-rake ];
 
-    users.extraUsers = [
+    users.users = [
       { name = cfg.user;
         group = cfg.group;
         home = "${cfg.statePath}";
       }
     ];
 
-    users.extraGroups = [ { name = cfg.group; } ];
+    users.groups = [ { name = cfg.group; } ];
 
     systemd.services.frab = {
       after = [ "network.target" "gitlab.service" ];
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index ef6ac9698e219..42affb06b51fb 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -109,13 +109,13 @@ in {
         message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory";
     }];
 
-    users.extraUsers.${user} = {
+    users.users.${user} = {
       isSystemUser = true;
       createHome = true;
       home = dataDir;
       group  = user;
     };
-    users.extraGroups.${user} = {};
+    users.groups.${user} = {};
 
     systemd.services.matomo_setup_update = {
       # everything needs to set up and up to date before matomo php files are executed
@@ -241,6 +241,6 @@ in {
 
   meta = {
     doc = ./matomo-doc.xml;
-    maintainers = with stdenv.lib.maintainers; [ florianjacob ];
+    maintainers = with lib.maintainers; [ florianjacob ];
   };
 }
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index be74a2b1955be..8c7fc4056adc9 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -25,7 +25,7 @@ in
 {
   options = {
     services.mattermost = {
-      enable = mkEnableOption "Mattermost chat platform";
+      enable = mkEnableOption "Mattermost chat server";
 
       statePath = mkOption {
         type = types.str;
@@ -146,14 +146,14 @@ in
 
   config = mkMerge [
     (mkIf cfg.enable {
-      users.extraUsers = optionalAttrs (cfg.user == "mattermost") (singleton {
+      users.users = optionalAttrs (cfg.user == "mattermost") (singleton {
         name = "mattermost";
         group = cfg.group;
         uid = config.ids.uids.mattermost;
         home = cfg.statePath;
       });
 
-      users.extraGroups = optionalAttrs (cfg.group == "mattermost") (singleton {
+      users.groups = optionalAttrs (cfg.group == "mattermost") (singleton {
         name = "mattermost";
         gid = config.ids.gids.mattermost;
       });
@@ -167,7 +167,7 @@ in
       '';
 
       systemd.services.mattermost = {
-        description = "Mattermost chat platform service";
+        description = "Mattermost chat service";
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" "postgresql.service" ];
 
@@ -201,13 +201,13 @@ in
           PermissionsStartOnly = true;
           User = cfg.user;
           Group = cfg.group;
-          ExecStart = "${pkgs.mattermost}/bin/mattermost-platform";
+          ExecStart = "${pkgs.mattermost}/bin/mattermost";
           WorkingDirectory = "${cfg.statePath}";
-          JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
           Restart = "always";
           RestartSec = "10";
           LimitNOFILE = "49152";
         };
+        unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
       };
     })
     (mkIf cfg.matterircd.enable {
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index d5bd0f12febbe..050f8757fa5fa 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -13,6 +13,12 @@ in
     services.nexus = {
       enable = mkEnableOption "Sonatype Nexus3 OSS service";
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.nexus;
+        description = "Package which runs Nexus3";
+      };
+
       user = mkOption {
         type = types.str;
         default = "nexus";
@@ -55,10 +61,10 @@ in
           -XX:LogFile=${cfg.home}/nexus3/log/jvm.log
           -XX:-OmitStackTraceInFastThrow
           -Djava.net.preferIPv4Stack=true
-          -Dkaraf.home=${pkgs.nexus}
-          -Dkaraf.base=${pkgs.nexus}
-          -Dkaraf.etc=${pkgs.nexus}/etc/karaf
-          -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties
+          -Dkaraf.home=${cfg.package}
+          -Dkaraf.base=${cfg.package}
+          -Dkaraf.etc=${cfg.package}/etc/karaf
+          -Djava.util.logging.config.file=${cfg.package}/etc/karaf/java.util.logging.properties
           -Dkaraf.data=${cfg.home}/nexus3
           -Djava.io.tmpdir=${cfg.home}/nexus3/tmp
           -Dkaraf.startLocalConsole=false
@@ -74,12 +80,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers."${cfg.user}" = {
+    users.users."${cfg.user}" = {
       isSystemUser = true;
       group = cfg.group;
     };
 
-    users.extraGroups."${cfg.group}" = {};
+    users.groups."${cfg.group}" = {};
 
     systemd.services.nexus = {
       description = "Sonatype Nexus3";
@@ -112,7 +118,7 @@ in
         fi
       '';
 
-      script = "${pkgs.nexus}/bin/nexus run";
+      script = "${cfg.package}/bin/nexus run";
 
       serviceConfig = {
         User = cfg.user;
@@ -124,5 +130,5 @@ in
     };
   };
 
-  meta.maintainers = with stdenv.lib.maintainers; [ ironpinguin ];
+  meta.maintainers = with lib.maintainers; [ ironpinguin ];
 }
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index cee725e8fe5ff..bc6689bdb2712 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -358,13 +358,13 @@ in
       '';
     };
 
-    users.extraUsers.restya-board = {
+    users.users.restya-board = {
       isSystemUser = true;
       createHome = false;
       home = runDir;
       group  = "restya-board";
     };
-    users.extraGroups.restya-board = {};
+    users.groups.restya-board = {};
 
     services.postgresql.enable = mkIf (isNull cfg.database.host) true;
 
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 610c6463a5eb5..2b171aa1b2b29 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -76,6 +76,8 @@ let
       define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}');
       define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}');
       define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}');
+
+      ${cfg.extraConfig}
   '';
 
  in {
@@ -431,6 +433,26 @@ let
         '';
       };
 
+      pluginPackages = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          List of plugins to install. The list elements are expected to
+          be derivations. All elements in this derivation are automatically
+          copied to the <literal>plugins.local</literal> directory.
+        '';
+      };
+
+      themePackages = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          List of themes to install. The list elements are expected to
+          be derivations. All elements in this derivation are automatically
+          copied to the <literal>themes.local</literal> directory.
+        '';
+      };
+
       logDestination = mkOption {
         type = types.enum ["" "sql" "syslog"];
         default = "sql";
@@ -441,6 +463,14 @@ let
           error.log).
         '';
       };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Additional lines to append to <literal>config.php</literal>.
+        '';
+      };
     };
   };
 
@@ -517,6 +547,16 @@ let
           rm -rf "${cfg.root}/*"
           mkdir -m 755 -p "${cfg.root}"
           cp -r "${pkgs.tt-rss}/"* "${cfg.root}"
+          ${optionalString (cfg.pluginPackages != []) ''
+            for plugin in ${concatStringsSep " " cfg.pluginPackages}; do
+              cp -r "$plugin"/* "${cfg.root}/plugins.local/"
+            done
+          ''}
+          ${optionalString (cfg.themePackages != []) ''
+            for theme in ${concatStringsSep " " cfg.themePackages}; do
+              cp -r "$theme"/* "${cfg.root}/themes.local/"
+            done
+          ''}
           ln -sf "${tt-rss-config}" "${cfg.root}/config.php"
           chown -R "${cfg.user}" "${cfg.root}"
           chmod -R 755 "${cfg.root}"
@@ -584,8 +624,8 @@ let
     };
 
     users = optionalAttrs (cfg.user == "tt_rss") {
-      extraUsers.tt_rss.group = "tt_rss";
-      extraGroups.tt_rss = {};
+      users.tt_rss.group = "tt_rss";
+      groups.tt_rss = {};
     };
   };
 }
diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix
new file mode 100644
index 0000000000000..e5c0bff2168ae
--- /dev/null
+++ b/nixos/modules/services/web-apps/virtlyst.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.virtlyst;
+  stateDir = "/var/lib/virtlyst";
+
+  ini = pkgs.writeText "virtlyst-config.ini" ''
+    [wsgi]
+    master = true
+    threads = auto
+    http-socket = ${cfg.httpSocket}
+    application = ${pkgs.virtlyst}/lib/libVirtlyst.so
+    chdir2 = ${stateDir}
+    static-map = /static=${pkgs.virtlyst}/root/static
+
+    [Cutelyst]
+    production = true
+    DatabasePath = virtlyst.sqlite
+    TemplatePath = ${pkgs.virtlyst}/root/src
+
+    [Rules]
+    cutelyst.* = true
+    virtlyst.* = true
+  '';
+
+in
+
+{
+
+  options.services.virtlyst = {
+    enable = mkEnableOption "Virtlyst libvirt web interface";
+
+    adminPassword = mkOption {
+      type = types.str;
+      description = ''
+        Initial admin password with which the database will be seeded.
+      '';
+    };
+
+    httpSocket = mkOption {
+      type = types.str;
+      default = "localhost:3000";
+      description = ''
+        IP and/or port to which to bind the http socket.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.users.virtlyst = {
+      home = stateDir;
+      createHome = true;
+      group = mkIf config.virtualisation.libvirtd.enable "libvirtd";
+    };
+
+    systemd.services.virtlyst = {
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword;
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}";
+        User = "virtlyst";
+        WorkingDirectory = stateDir;
+      };
+    };
+  };
+
+}
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index f9f2511f45dc7..eb8ee9b5cf46a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -656,16 +656,16 @@ in
                      message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
                  ];
 
-    warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
+    warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
 
-    users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton
+    users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
       { name = "wwwrun";
         group = mainCfg.group;
         description = "Apache httpd user";
         uid = config.ids.uids.wwwrun;
       });
 
-    users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton
+    users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton
       { name = "wwwrun";
         gid = config.ids.gids.wwwrun;
       });
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index fe65fba42a468..4237cfdd9198c 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -93,13 +93,13 @@ in {
       };
     };
 
-    users.extraUsers.caddy = {
+    users.users.caddy = {
       group = "caddy";
       uid = config.ids.uids.caddy;
       home = cfg.dataDir;
       createHome = true;
     };
 
-    users.extraGroups.caddy.gid = config.ids.uids.caddy;
+    users.groups.caddy.gid = config.ids.uids.caddy;
   };
 }
diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix
index 895d02827f718..a6c4cbea12259 100644
--- a/nixos/modules/services/web-servers/hitch/default.nix
+++ b/nixos/modules/services/web-servers/hitch/default.nix
@@ -102,7 +102,7 @@ with lib;
 
     environment.systemPackages = [ pkgs.hitch ];
 
-    users.extraUsers.hitch.group = "hitch";
-    users.extraGroups.hitch = {};
+    users.users.hitch.group = "hitch";
+    users.groups.hitch = {};
   };
 }
diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 710fecc0c05c9..e6a054c296dc9 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -4,8 +4,15 @@ with lib;
 
 let
   cfg = config.services.lighttpd.cgit;
+  pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir;
   configFile = pkgs.writeText "cgitrc"
     ''
+      # default paths to static assets
+      css=${pathPrefix}/cgit.css
+      logo=${pathPrefix}/cgit.png
+      favicon=${pathPrefix}/favicon.ico
+
+      # user configuration
       ${cfg.configText}
     '';
 in
@@ -18,8 +25,17 @@ in
       type = types.bool;
       description = ''
         If true, enable cgit (fast web interface for git repositories) as a
-        sub-service in lighttpd. cgit will be accessible at
-        http://yourserver/cgit
+        sub-service in lighttpd.
+      '';
+    };
+
+    subdir = mkOption {
+      default = "cgit";
+      example = "";
+      type = types.str;
+      description = ''
+        The subdirectory in which to serve cgit. The web application will be
+        accessible at http://yourserver/''${subdir}
       '';
     };
 
@@ -48,14 +64,14 @@ in
     services.lighttpd.enableModules = [ "mod_cgi" "mod_alias" "mod_setenv" ];
 
     services.lighttpd.extraConfig = ''
-      $HTTP["url"] =~ "^/cgit" {
+      $HTTP["url"] =~ "^/${cfg.subdir}" {
           cgi.assign = (
               "cgit.cgi" => "${pkgs.cgit}/cgit/cgit.cgi"
           )
           alias.url = (
-              "/cgit.css" => "${pkgs.cgit}/cgit/cgit.css",
-              "/cgit.png" => "${pkgs.cgit}/cgit/cgit.png",
-              "/cgit"     => "${pkgs.cgit}/cgit/cgit.cgi"
+              "${pathPrefix}/cgit.css" => "${pkgs.cgit}/cgit/cgit.css",
+              "${pathPrefix}/cgit.png" => "${pkgs.cgit}/cgit/cgit.png",
+              "${pathPrefix}"          => "${pkgs.cgit}/cgit/cgit.cgi"
           )
           setenv.add-environment = (
               "CGIT_CONFIG" => "${configFile}"
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index d23e810dcc626..7a3df26e47a6c 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -245,12 +245,12 @@ in
       serviceConfig.KillSignal = "SIGINT";
     };
 
-    users.extraUsers.lighttpd = {
+    users.users.lighttpd = {
       group = "lighttpd";
       description = "lighttpd web server privilege separation user";
       uid = config.ids.uids.lighttpd;
     };
 
-    users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd;
+    users.groups.lighttpd.gid = config.ids.gids.lighttpd;
   };
 }
diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix
index 8c813d116a528..5ff1796e92a1e 100644
--- a/nixos/modules/services/web-servers/lighttpd/inginious.nix
+++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix
@@ -194,7 +194,7 @@ in
           storageDriver = mkDefault "overlay";
         };
 
-        users.extraUsers."lighttpd".extraGroups = [ "docker" ];
+        users.users."lighttpd".extraGroups = [ "docker" ];
 
         # Ensure that docker has pulled the required images.
         systemd.services.inginious-prefetch = {
diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix
index 8ae86c67a29f4..ed7325ff07900 100644
--- a/nixos/modules/services/web-servers/meguca.nix
+++ b/nixos/modules/services/web-servers/meguca.nix
@@ -104,15 +104,16 @@ in
       preStart = ''
         # Ensure folder exists and links are correct or create them
         mkdir -p ${cfg.baseDir}
+        chmod 750 ${cfg.baseDir}
         ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir}
 
         # Ensure the database is correct or create it
         ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
           -SDR meguca || true
-        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql \
-          -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true
         ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
           -T template0 -E UTF8 -O meguca meguca || true
+        ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \
+          -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true
       '';
 
     script = ''
@@ -139,7 +140,7 @@ in
     };
 
     users = {
-      extraUsers.meguca = {
+      users.meguca = {
         description = "meguca server service user";
         home = cfg.baseDir;
         createHome = true;
@@ -147,7 +148,7 @@ in
         uid = config.ids.uids.meguca;
       };
 
-      extraGroups.meguca = {
+      groups.meguca = {
         gid = config.ids.gids.meguca;
         members = [ "meguca" ];
       };
diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix
index a888f623616e0..4e7082c676905 100644
--- a/nixos/modules/services/web-servers/mighttpd2.nix
+++ b/nixos/modules/services/web-servers/mighttpd2.nix
@@ -119,13 +119,13 @@ in {
       };
     };
 
-    users.extraUsers.mighttpd2 = {
+    users.users.mighttpd2 = {
       group = "mighttpd2";
       uid = config.ids.uids.mighttpd2;
       isSystemUser = true;
     };
 
-    users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2;
+    users.groups.mighttpd2.gid = config.ids.gids.mighttpd2;
   };
 
   meta.maintainers = with lib.maintainers; [ fgaz ];
diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index 7ead33483ea49..f78a966989b69 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -101,11 +101,11 @@ in
       };
     };
 
-    users.extraUsers.minio = {
+    users.users.minio = {
       group = "minio";
       uid = config.ids.uids.minio;
     };
 
-    users.extraGroups.minio.gid = config.ids.uids.minio;
+    users.groups.minio.gid = config.ids.uids.minio;
   };
 }
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 0aa780bf6da16..355976c4b7cbc 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -613,13 +613,13 @@ in
         listToAttrs acmePairs
     );
 
-    users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton
+    users.users = optionalAttrs (cfg.user == "nginx") (singleton
       { name = "nginx";
         group = cfg.group;
         uid = config.ids.uids.nginx;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton
+    users.groups = optionalAttrs (cfg.group == "nginx") (singleton
       { name = "nginx";
         gid = config.ids.gids.nginx;
       });
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index aa94e0e976c96..d8ccb7ca65d61 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -110,7 +110,7 @@ in
       webapps = mkOption {
         type = types.listOf types.package;
         default = [ tomcat.webapps ];
-        defaultText = "[ tomcat.webapps ]";
+        defaultText = "[ pkgs.tomcat85.webapps ]";
         description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
       };
 
@@ -166,12 +166,12 @@ in
 
   config = mkIf config.services.tomcat.enable {
 
-    users.extraGroups = singleton
+    users.groups = singleton
       { name = "tomcat";
         gid = config.ids.gids.tomcat;
       };
 
-    users.extraUsers = singleton
+    users.users = singleton
       { name = "tomcat";
         uid = config.ids.uids.tomcat;
         description = "Tomcat user";
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index b6c7fef21fb29..700202b1d28fa 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -114,12 +114,12 @@ in {
       };
     };
 
-    users.extraUsers.traefik = {
+    users.users.traefik = {
       group = "traefik";
       home = cfg.dataDir;
       createHome = true;
     };
 
-    users.extraGroups.traefik = {};
+    users.groups.traefik = {};
   };
 }
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 14596bb3add00..3ef78ea77cb24 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -31,9 +31,7 @@ let
         inherit python;
       };
 
-      penv = python.buildEnv.override {
-        extraLibs = (c.pythonPackages or (self: [])) pythonPackages;
-      };
+      pythonEnv = python.withPackages (c.pythonPackages or (self: []));
 
       uwsgiCfg = {
         uwsgi =
@@ -42,7 +40,7 @@ let
               inherit plugins;
             } // removeAttrs c [ "type" "pythonPackages" ]
               // optionalAttrs (python != null) {
-                pythonpath = "${penv}/${python.sitePackages}";
+                pythonpath = "${pythonEnv}/${python.sitePackages}";
                 env =
                   # Argh, uwsgi expects list of key-values there instead of a dictionary.
                   let env' = c.env or [];
@@ -51,7 +49,7 @@ let
                            then substring (stringLength "PATH=") (stringLength x) x
                            else null;
                       oldPaths = filter (x: x != null) (map getPath env');
-                  in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${penv}/bin" ];
+                  in env' ++ [ "PATH=${optionalString (oldPaths != []) "${last oldPaths}:"}${pythonEnv}/bin" ];
               }
           else if c.type == "emperor"
             then {
@@ -152,13 +150,13 @@ in {
       };
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton
+    users.users = optionalAttrs (cfg.user == "uwsgi") (singleton
       { name = "uwsgi";
         group = cfg.group;
         uid = config.ids.uids.uwsgi;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton
+    users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton
       { name = "uwsgi";
         gid = config.ids.gids.uwsgi;
       });
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index bc74d62b116a1..63f967185c2d2 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -103,11 +103,11 @@ in
       })
     ];
 
-    users.extraUsers.varnish = {
+    users.users.varnish = {
       group = "varnish";
       uid = config.ids.uids.varnish;
     };
 
-    users.extraGroups.varnish.gid = config.ids.uids.varnish;
+    users.groups.varnish.gid = config.ids.uids.varnish;
   };
 }
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 496e34db4a96c..1dcc3ac9d8d4f 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -103,7 +103,7 @@ in
 
   config = mkIf (cfg.instances != {}) {
 
-    users.extraUsers.zope2.uid = config.ids.uids.zope2;
+    users.users.zope2.uid = config.ids.uids.zope2;
 
     systemd.services =
       let
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 7dcc600d2664f..ae155470419d5 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -43,12 +43,6 @@ in
         default = true;
         description = "Enable the XFWM (default) window manager.";
       };
-
-      screenLock = mkOption {
-        type = types.enum [ "xscreensaver" "xlockmore" "slock" ];
-        default = "xlockmore";
-        description = "Application used by XFCE to lock the screen.";
-      };
     };
   };
 
@@ -92,7 +86,7 @@ in
       thunar-volman # TODO: drop
     ] ++ (if config.hardware.pulseaudio.enable
           then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
-	  else [ xfce4-mixer xfce4-volumed ])
+          else [ xfce4-mixer xfce4-volumed ])
       # TODO: NetworkManager doesn't belong here
       ++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
       ++ optionals config.powerManagement.enable [ xfce4-power-manager ]
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a6a38a21b6172..8b08c01ea0db0 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -89,7 +89,7 @@ in
 
     services.xserver.displayManager.slim.enable = false;
 
-    users.extraUsers.gdm =
+    users.users.gdm =
       { name = "gdm";
         uid = config.ids.uids.gdm;
         group = "gdm";
@@ -97,7 +97,7 @@ in
         description = "GDM user";
       };
 
-    users.extraGroups.gdm.gid = config.ids.gids.gdm;
+    users.groups.gdm.gid = config.ids.gids.gdm;
 
     # GDM needs different xserverArgs, presumable because using wayland by default.
     services.xserver.tty = null;
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
new file mode 100644
index 0000000000000..ba8151a60f201
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  dmcfg = config.services.xserver.displayManager;
+  ldmcfg = dmcfg.lightdm;
+  cfg = ldmcfg.greeters.mini;
+
+  xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{
+    path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop";
+    name = "lightdm-mini-greeter.desktop";
+  }];
+
+  miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf"
+    ''
+    [greeter]
+    user = ${cfg.user}
+    show-password-label = true
+    password-label-text = Password:
+    show-input-cursor = true
+
+    [greeter-hotkeys]
+    mod-key = meta
+    shutdown-key = s
+    restart-key = r
+    hibernate-key = h
+    suspend-key = u
+
+    [greeter-theme]
+    font = Sans
+    font-size = 1em
+    text-color = "#080800"
+    error-color = "#F8F8F0"
+    background-image = "${ldmcfg.background}"
+    background-color = "#1B1D1E"
+    window-color = "#F92672"
+    border-color = "#080800"
+    border-width = 2px
+    layout-space = 15
+    password-color = "#F8F8F0"
+    password-background-color = "#1B1D1E"
+
+    ${cfg.extraConfig}
+    '';
+
+in
+{
+  options = {
+
+    services.xserver.displayManager.lightdm.greeters.mini = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable lightdm-mini-greeter as the lightdm greeter.
+
+          Note that this greeter starts only the default X session.
+          You can configure the default X session by
+          <option>services.xserver.desktopManager.default</option> and
+          <option>services.xserver.windowManager.default</option>.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "root";
+        description = ''
+          The user to login as.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration that should be put in the lightdm-mini-greeter.conf
+          configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf (ldmcfg.enable && cfg.enable) {
+
+    services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
+
+    services.xserver.displayManager.lightdm.greeter = mkDefault {
+      package = xgreeters;
+      name = "lightdm-mini-greeter";
+    };
+
+    environment.etc."lightdm/lightdm-mini-greeter.conf".source = miniGreeterConf;
+
+  };
+}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 9d30155a72348..206ede227efa7 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -42,7 +42,7 @@ let
     ''
       [LightDM]
       ${optionalString cfg.greeter.enable ''
-        greeter-user = ${config.users.extraUsers.lightdm.name}
+        greeter-user = ${config.users.users.lightdm.name}
         greeters-directory = ${cfg.greeter.package}
       ''}
       sessions-directory = ${dmcfg.session.desktops}
@@ -72,6 +72,7 @@ in
   # preferred.
   imports = [
     ./lightdm-greeters/gtk.nix
+    ./lightdm-greeters/mini.nix
   ];
 
   options = {
@@ -251,14 +252,14 @@ in
         session  include   lightdm
     '';
 
-    users.extraUsers.lightdm = {
+    users.users.lightdm = {
       createHome = true;
       home = "/var/lib/lightdm-data";
       group = "lightdm";
       uid = config.ids.uids.lightdm;
     };
 
-    users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
+    users.groups.lightdm.gid = config.ids.gids.lightdm;
     services.xserver.tty     = null; # We might start multiple X servers so let the tty increment themselves..
     services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
   };
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index df782e82ed154..8db7414e811f5 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -268,7 +268,7 @@ in
       '';
     };
 
-    users.extraUsers.sddm = {
+    users.users.sddm = {
       createHome = true;
       home = "/var/lib/sddm";
       group = "sddm";
@@ -277,7 +277,7 @@ in
 
     environment.etc."sddm.conf".source = cfgFile;
 
-    users.extraGroups.sddm.gid = config.ids.gids.sddm;
+    users.groups.sddm.gid = config.ids.gids.sddm;
 
     environment.systemPackages = [ sddm ];
     services.dbus.packages = [ sddm ];
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index d0a87f183b6fb..072004d5dd91c 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -116,7 +116,7 @@ in {
       };
 
       scrollMethod = mkOption {
-        type = types.enum [ "twofinger" "edge" "none" ];
+        type = types.enum [ "twofinger" "edge" "button" "none" ];
         default = "twofinger";
         example = "edge";
         description =
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index 71eb02ec59549..089e9f769f0a5 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
@@ -37,6 +37,11 @@ in
         apply = pkg: if pkg == null then pkgs.awesome else pkg;
       };
 
+      noArgb = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Disable client transparency support, which can be greatly detrimental to performance in some setups";
+      };
     };
 
   };
@@ -50,7 +55,7 @@ in
       { name = "awesome";
         start =
           ''
-            ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} &
+            ${awesome}/bin/awesome ${lib.optionalString cfg.noArgb "--no-argb"} ${makeSearchPath cfg.luaModules} &
             waitPID=$!
           '';
       };
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 1404231f837e0..3048cd02683fd 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -244,6 +244,13 @@ in
           "ati_unfree" "amdgpu" "amdgpu-pro"
           "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304"
         ];
+        # TODO(@oxij): think how to easily add the rest, like those nvidia things
+        relatedPackages = concatLists
+          (mapAttrsToList (n: v:
+            optional (hasPrefix "xf86video" n) {
+              path  = [ "xorg" n ];
+              title = removePrefix "xf86video" n;
+            }) pkgs.xorg);
         description = ''
           The names of the video drivers the configuration
           supports. They will be tried in order until one that
diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 33862b0965cc2..384ae909b7011 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -12,6 +12,7 @@ let
       if [ "$1" = bound ]; then
         ip address add "$ip/$mask" dev "$interface"
         if [ -n "$router" ]; then
+          ip route add "$router" dev "$interface" # just in case if "$router" is not within "$ip/$mask" (e.g. Hetzner Cloud)
           ip route add default via "$router" dev "$interface"
         fi
         if [ -n "$dns" ]; then
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 8b3dc2d90eb33..53e993603e273 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -79,7 +79,7 @@ in
 
     boot.initrd.network.ssh.authorizedKeys = mkOption {
       type = types.listOf types.str;
-      default = config.users.extraUsers.root.openssh.authorizedKeys.keys;
+      default = config.users.users.root.openssh.authorizedKeys.keys;
       description = ''
         Authorized keys for the root user on initrd.
       '';
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 2e497ff9f2c49..42da658572219 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -385,8 +385,9 @@ in
       };
 
       default = mkOption {
-        default = 0;
-        type = types.int;
+        default = "0";
+        type = types.either types.int types.str;
+        apply = toString;
         description = ''
           Index of the default menu item to be booted.
         '';
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 872261d0edfa8..d1ff6e6bf5256 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -54,7 +54,7 @@ my $splashImage = get("splashImage");
 my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
-my $defaultEntry = int(get("default"));
+my $defaultEntry = get("default");
 my $fsIdentifier = get("fsIdentifier");
 my $grubEfi = get("grubEfi");
 my $grubTargetEfi = get("grubTargetEfi");
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 4d9de020c84e2..e1095fb988eb6 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -147,6 +147,8 @@ in
       ${config.services.resolved.extraConfig}
     '';
 
+    # If networkmanager is enabled, ask it to interface with resolved.
+    networking.networkmanager.dns = "systemd-resolved";
   };
 
 }
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 92e68b72664a0..de8451bbe31b7 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -251,6 +251,9 @@ checkFS() {
     # Skip fsck for bcachefs - not implemented yet.
     if [ "$fsType" = bcachefs ]; then return 0; fi
 
+    # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem.
+    if [ "$fsType" = nilfs2 ]; then return 0; fi
+
     # Skip fsck for inherently readonly filesystems.
     if [ "$fsType" = squashfs ]; then return 0; fi
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 55bb6d3449c5c..6756f68cdf722 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -56,6 +56,12 @@ let
       left=("''${left[@]:3}")
       if [ -z ''${seen[$next]+x} ]; then
         seen[$next]=1
+
+        # Ignore the dynamic linker which for some reason appears as a DT_NEEDED of glibc but isn't in glibc's RPATH.
+        case "$next" in
+          ld*.so.?) continue;;
+        esac
+
         IFS=: read -ra paths <<< $rpath
         res=
         for path in "''${paths[@]}"; do
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d2fe33488a7ad..6593b1a024308 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -798,13 +798,13 @@ in
         mkdir -m 0700 -p /var/log/journal
       '';
 
-    users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
-    users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
-    users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
-    users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
+    users.users.systemd-network.uid = config.ids.uids.systemd-network;
+    users.groups.systemd-network.gid = config.ids.gids.systemd-network;
+    users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve;
+    users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
 
     # Target for ‘charon send-keys’ to hook into.
-    users.extraGroups.keys.gid = config.ids.gids.keys;
+    users.groups.keys.gid = config.ids.gids.keys;
 
     systemd.targets.keys =
       { description = "Security Keys";
@@ -840,9 +840,9 @@ in
         "TMPFS_XATTR" "SECCOMP"
       ];
 
-    users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
-    users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
-    users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
+    users.groups.systemd-journal.gid = config.ids.gids.systemd-journal;
+    users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
+    users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
 
     # Generate timer units for all services that have a ‘startAt’ value.
     systemd.timers =
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 57853c5698d0c..18aad58b36ccf 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -37,8 +37,8 @@ with lib;
       NTP=${concatStringsSep " " config.services.timesyncd.servers}
     '';
 
-    users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync;
-    users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
+    users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync;
+    users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
 
   };
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index de735e9ba11b0..39f51c363673a 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -58,6 +58,45 @@ let
 
   snapshotNames = [ "frequent" "hourly" "daily" "weekly" "monthly" ];
 
+  # When importing ZFS pools, there's one difficulty: These scripts may run
+  # before the backing devices (physical HDDs, etc.) of the pool have been
+  # scanned and initialized.
+  #
+  # An attempted import with all devices missing will just fail, and can be
+  # retried, but an import where e.g. two out of three disks in a three-way
+  # mirror are missing, will succeed. This is a problem: When the missing disks
+  # are later discovered, they won't be automatically set online, rendering the
+  # pool redundancy-less (and far slower) until such time as the system reboots.
+  #
+  # The solution is the below. poolReady checks the status of an un-imported
+  # pool, to see if *every* device is available -- in which case the pool will be
+  # in state ONLINE, as opposed to DEGRADED, FAULTED or MISSING.
+  #
+  # The import scripts then loop over this, waiting until the pool is ready or a
+  # sufficient amount of time has passed that we can assume it won't be. In the
+  # latter case it makes one last attempt at importing, allowing the system to
+  # (eventually) boot even with a degraded pool.
+  importLib = {zpoolCmd, awkCmd, cfgZfs}: ''
+    poolReady() {
+      pool="$1"
+      state="$("${zpoolCmd}" import | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
+      if [[ "$state" = "ONLINE" ]]; then
+        return 0
+      else
+        echo "Pool $pool in state $state, waiting"
+        return 1
+      fi
+    }
+    poolImported() {
+      pool="$1"
+      "${zpoolCmd}" list "$pool" >/dev/null 2>/dev/null
+    }
+    poolImport() {
+      pool="$1"
+      "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool"
+    }
+  '';
+
 in
 
 {
@@ -171,8 +210,12 @@ in
         default = config.boot.zfs.enableUnstable;
         description = ''
           Request encryption keys or passwords for all encrypted datasets on import.
-
           Dataset encryption is only supported in zfsUnstable at the moment.
+          For root pools the encryption key can be supplied via both an
+          interactive prompt (keylocation=prompt) and from a file
+          (keylocation=file://). Note that for data pools the encryption key can
+          be only loaded from a file and not via interactive prompt since the
+          import is processed in a background systemd service.
         '';
       };
 
@@ -335,19 +378,26 @@ in
                   ;;
               esac
             done
-            ''] ++ (map (pool: ''
+          ''] ++ [(importLib {
+            # See comments at importLib definition.
+            zpoolCmd = "zpool";
+            awkCmd = "awk";
+            inherit cfgZfs;
+          })] ++ (map (pool: ''
             echo -n "importing root ZFS pool \"${pool}\"..."
-            trial=0
-            until msg="$(zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE '${pool}' 2>&1)"; do
-              sleep 0.25
-              echo -n .
-              trial=$(($trial + 1))
-              if [[ $trial -eq 60 ]]; then
-                break
+            # Loop across the import until it succeeds, because the devices needed may not be discovered yet.
+            if ! poolImported "${pool}"; then
+              for trial in `seq 1 60`; do
+                poolReady "${pool}" > /dev/null && msg="$(poolImport "${pool}" 2>&1)" && break
+                sleep 1
+                echo -n .
+              done
+              echo
+              if [[ -n "$msg" ]]; then
+                echo "$msg";
               fi
-            done
-            echo
-            if [[ -n "$msg" ]]; then echo "$msg"; fi
+              poolImported "${pool}" || poolImport "${pool}"  # Try one last time, e.g. to import a degraded pool.
+            fi
             ${lib.optionalString cfgZfs.requestEncryptionCredentials ''
               zfs load-key -a
             ''}
@@ -391,9 +441,26 @@ in
               Type = "oneshot";
               RemainAfterExit = true;
             };
-            script = ''
-              zpool_cmd="${packages.zfsUser}/sbin/zpool"
-              ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
+            script = (importLib {
+              # See comments at importLib definition.
+              zpoolCmd="${packages.zfsUser}/sbin/zpool";
+              awkCmd="${pkgs.gawk}/bin/awk";
+              inherit cfgZfs;
+            }) + ''
+              poolImported "${pool}" && exit
+              echo -n "importing ZFS pool \"${pool}\"..."
+              # Loop across the import until it succeeds, because the devices needed may not be discovered yet.
+              for trial in `seq 1 60`; do
+                poolReady "${pool}" && poolImport "${pool}" && break
+                sleep 1
+              done
+              poolImported "${pool}" || poolImport "${pool}"  # Try one last time, e.g. to import a degraded pool.
+              if poolImported "${pool}"; then
+                ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""}
+                echo "Successfully imported ${pool}"
+              else
+                exit 1
+              fi
             '';
           };
 
@@ -414,12 +481,15 @@ in
               ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
             '';
           };
+        createZfsService = serv:
+          nameValuePair serv {
+            after = [ "systemd-modules-load.service" ];
+            wantedBy = [ "zfs.target" ];
+          };
 
-      in listToAttrs (map createImportService dataPools ++ map createSyncService allPools) // {
-        "zfs-mount" = { after = [ "systemd-modules-load.service" ]; };
-        "zfs-share" = { after = [ "systemd-modules-load.service" ]; };
-        "zfs-zed" = { after = [ "systemd-modules-load.service" ]; };
-      };
+      in listToAttrs (map createImportService dataPools ++
+                      map createSyncService allPools ++
+                      map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]);
 
       systemd.targets."zfs-import" =
         let
@@ -428,6 +498,7 @@ in
           {
             requires = services;
             after = services;
+            wantedBy = [ "zfs.target" ];
           };
 
       systemd.targets."zfs".wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 14f9b95675151..7053aa57f8038 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -46,22 +46,6 @@ let
     '';
   });
 
-  # Collect all interfaces that are defined for a device
-  # as device:interface key:value pairs.
-  wlanDeviceInterfaces =
-    let
-      allDevices = unique (mapAttrsToList (_: v: v.device) cfg.wlanInterfaces);
-      interfacesOfDevice = d: filterAttrs (_: v: v.device == d) cfg.wlanInterfaces;
-    in
-      genAttrs allDevices (d: interfacesOfDevice d);
-
-  # Convert device:interface key:value pairs into a list, and if it exists,
-  # place the interface which is named after the device at the beginning.
-  wlanListDeviceFirst = device: interfaces:
-    if hasAttr device interfaces
-    then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces)
-    else mapAttrsToList (n: v: v // {_iName = n;}) interfaces;
-
   # We must escape interfaces due to the systemd interpretation
   subsystemDevice = interface:
     "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
@@ -1069,7 +1053,7 @@ in
       };
     } // (listToAttrs (flip map interfaces (i:
       let
-        deviceDependency = if config.boot.isContainer
+        deviceDependency = if (config.boot.isContainer || i.name == "lo")
           then []
           else [ (subsystemDevice i.name) ];
       in
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 3d46ba72493c7..7a7fcbecd64f9 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -126,7 +126,7 @@ in
     networking.usePredictableInterfaceNames = false;
 
     # Make it easy to log in as root when running the test interactively.
-    users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
+    users.users.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.job.logToJournal = true;
 
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index cb756842f3695..dd2108ccc379f 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -2,13 +2,13 @@
 
 with lib;
 let
-  diskSize = 30720;
+  diskSize = 2048;
 in
 {
   system.build.azureImage = import ../../lib/make-disk-image.nix {
     name = "azure-image";
     postVM = ''
-      ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
+      ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd
     '';
     configFile = ./azure-config-user.nix;
     format = "raw";
diff --git a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch
deleted file mode 100644
index 81d29feea3de6..0000000000000
--- a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d6b9dc1..ce7c493 100644
---- a/Makefile
-+++ b/Makefile
-@@ -384,8 +384,7 @@ install-confdir:
- install-sysconfig: install-datadir install-confdir
- 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
- 
--install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
--install-datadir install-localstatedir
-+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
- ifneq ($(TOOLS),)
- 	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
- endif
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index a9a2095499a73..a1a32c1c59a1f 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -141,7 +141,7 @@ in
 
   config = mkIf cfg.enable (mkMerge [{
       environment.systemPackages = [ cfg.package ];
-      users.extraGroups.docker.gid = config.ids.gids.docker;
+      users.groups.docker.gid = config.ids.gids.docker;
       systemd.packages = [ cfg.package ];
 
       systemd.services.docker = {
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 024db7f87c2e8..87409db4320c0 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -108,7 +108,7 @@ in {
 
     boot.kernelModules = [ "tun" ];
 
-    users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd;
+    users.groups.libvirtd.gid = config.ids.gids.libvirtd;
 
     systemd.packages = [ pkgs.libvirt ];
 
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index 0208787e7795c..dbb7b881955af 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -8,7 +8,7 @@ with lib;
   ];
 
   # Allow the user to login as root without password.
-  users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
+  users.users.root.initialHashedPassword = mkOverride 150 "";
 
   # Some more help text.
   services.mingetty.helpLine =
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 3e76cdacfc4b8..505c11abd2087 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -73,9 +73,9 @@ in
 
     };
 
-    users.extraGroups.lxd.gid = config.ids.gids.lxd;
+    users.groups.lxd.gid = config.ids.gids.lxd;
 
-    users.extraUsers.root = {
+    users.users.root = {
       subUidRanges = [ { startUid = 1000000; count = 65536; } ];
       subGidRanges = [ { startGid = 1000000; count = 65536; } ];
     };
diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix
index 98be4f680c3a7..fd662b52df524 100644
--- a/nixos/modules/virtualisation/rkt.nix
+++ b/nixos/modules/virtualisation/rkt.nix
@@ -59,6 +59,6 @@ in
       };
     };
 
-    users.extraGroups.rkt = {};
+    users.groups.rkt = {};
   };
 }
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 5da4b7e3bafd5..78c6f740788e4 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -44,7 +44,7 @@ in
     boot.supportedFilesystems = [ "vboxsf" ];
     boot.initrd.supportedFilesystems = [ "vboxsf" ];
 
-    users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf;
+    users.groups.vboxsf.gid = config.ids.gids.vboxsf;
 
     systemd.services.virtualbox =
       { description = "VirtualBox Guest Services";
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 885d752577d50..8adf3aa919d8e 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -86,7 +86,7 @@ in
       "VirtualBox"
     ]));
 
-    users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers;
+    users.groups.vboxusers.gid = config.ids.gids.vboxusers;
 
     services.udev.extraRules =
       ''
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 64f145f77ca39..475852d1546c7 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -17,12 +17,40 @@ in {
           The size of the VirtualBox base image in MiB.
         '';
       };
+      memorySize = mkOption {
+        type = types.int;
+        default = 1536;
+        description = ''
+          The amount of RAM the VirtualBox appliance can use in MiB.
+        '';
+      };
+      vmDerivationName = mkOption {
+        type = types.str;
+        default = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}";
+        description = ''
+          The name of the derivation for the VirtualBox appliance.
+        '';
+      };
+      vmName = mkOption {
+        type = types.str;
+        default = "NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})";
+        description = ''
+          The name of the VirtualBox appliance.
+        '';
+      };
+      vmFileName = mkOption {
+        type = types.str;
+        default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova";
+        description = ''
+          The file name of the VirtualBox appliance.
+        '';
+      };
     };
   };
 
   config = {
     system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
-      name = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.system}";
+      name = cfg.vmDerivationName;
 
       inherit pkgs lib config;
       partitionTableType = "legacy";
@@ -37,11 +65,11 @@ in {
           VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
 
           echo "creating VirtualBox VM..."
-          vmName="NixOS ${config.system.nixos.label} (${pkgs.stdenv.system})"
+          vmName="${cfg.vmName}";
           VBoxManage createvm --name "$vmName" --register \
             --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
           VBoxManage modifyvm "$vmName" \
-            --memory 1536 --acpi on --vram 32 \
+            --memory ${toString cfg.memorySize} --acpi on --vram 32 \
             ${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \
             --nictype1 virtio --nic1 nat \
             --audiocontroller ac97 --audio alsa \
@@ -53,7 +81,7 @@ in {
 
           echo "exporting VirtualBox VM..."
           mkdir -p $out
-          fn="$out/nixos-${config.system.nixos.label}-${pkgs.stdenv.system}.ova"
+          fn="$out/${cfg.vmFileName}"
           VBoxManage export "$vmName" --output "$fn"
 
           rm -v $diskImage
diff --git a/nixos/release.nix b/nixos/release.nix
index 0fa8b22cc898d..f11f372335a03 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -299,6 +299,8 @@ in rec {
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
   tests.grafana = callTest tests/grafana.nix {};
   tests.graphite = callTest tests/graphite.nix {};
+  tests.hadoop.hdfs = callTestOnMatchingSystems [ "x86_64-linux" ] tests/hadoop/hdfs.nix {};
+  tests.hadoop.yarn = callTestOnMatchingSystems [ "x86_64-linux" ] tests/hadoop/yarn.nix {};
   tests.hardened = callTest tests/hardened.nix { };
   tests.haproxy = callTest tests/haproxy.nix {};
   tests.hibernate = callTest tests/hibernate.nix {};
@@ -314,6 +316,7 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
+  tests.ostree = callTest tests/ostree.nix {};
   tests.osquery = callTest tests/osquery.nix {};
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.plotinus = callTest tests/plotinus.nix {};
@@ -338,6 +341,7 @@ in rec {
   tests.mesos = callTest tests/mesos.nix {};
   tests.misc = callTest tests/misc.nix {};
   tests.mongodb = callTest tests/mongodb.nix {};
+  tests.mpd = callTest tests/mpd.nix {};
   tests.mumble = callTest tests/mumble.nix {};
   tests.munin = callTest tests/munin.nix {};
   tests.mutableUsers = callTest tests/mutable-users.nix {};
@@ -363,6 +367,7 @@ in rec {
   tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};
   tests.openldap = callTest tests/openldap.nix {};
+  tests.opensmtpd = callTest tests/opensmtpd.nix {};
   tests.owncloud = callTest tests/owncloud.nix {};
   tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
   tests.peerflix = callTest tests/peerflix.nix {};
@@ -398,6 +403,7 @@ in rec {
   tests.switchTest = callTest tests/switch-test.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
+  tests.tor = callTest tests/tor.nix {};
   tests.transmission = callTest tests/transmission.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
   tests.vault = callTest tests/vault.nix {};
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index 21b0fedcfefe6..c5898db6b3253 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -29,7 +29,7 @@ in import ./make-test.nix {
   name = "acme";
 
   nodes = {
-    letsencrypt = ./common/letsencrypt.nix;
+    letsencrypt = ./common/letsencrypt;
 
     webserver = { config, pkgs, ... }: {
       imports = [ commonConfig ];
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index 5260c8ddfb827..ef848c2a374f2 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
   machine =
     { config, pkgs, ... }:
     { services.atd.enable = true;
-      users.extraUsers.alice = { isNormalUser = true; };
+      users.users.alice = { isNormalUser = true; };
     };
 
   # "at" has a resolution of 1 minute
diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt/default.nix
index 7c6b3b29e36dc..4b841a03cc470 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt/default.nix
@@ -17,7 +17,7 @@
 # A configuration example of a full node setup using this would be this:
 #
 # {
-#   letsencrypt = import ./common/letsencrypt.nix;
+#   letsencrypt = import ./common/letsencrypt;
 #
 #   example = { nodes, ... }: {
 #     networking.nameservers = [
@@ -30,14 +30,14 @@
 # }
 #
 # By default, this module runs a local resolver, generated using resolver.nix
-# from the same directory to automatically discover all zones in the network.
+# from the parent directory to automatically discover all zones in the network.
 #
 # If you do not want this and want to use your own resolver, you can just
 # override networking.nameservers like this:
 #
 # {
 #   letsencrypt = { nodes, ... }: {
-#     imports = [ ./common/letsencrypt.nix ];
+#     imports = [ ./common/letsencrypt ];
 #     networking.nameservers = [
 #       nodes.myresolver.config.networking.primaryIPAddress
 #     ];
@@ -164,8 +164,8 @@ let
         -e 's,exec \./bin/,,' \
         test/startservers.py
 
-      cat "${snakeOilCa}/ca.key" > test/test-ca.key
-      cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
+      cat ${lib.escapeShellArg snakeOilCerts.ca.key} > test/test-ca.key
+      cat ${lib.escapeShellArg snakeOilCerts.ca.cert} > test/test-ca.pem
     '';
 
     # Until vendored pkcs11 is go 1.9 compatible
@@ -173,6 +173,21 @@ let
       rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11
     '';
 
+    # XXX: Temporarily brought back putting the source code in the output,
+    # since e95f17e2720e67e2eabd59d7754c814d3e27a0b2 was removing that from
+    # buildGoPackage.
+    preInstall = ''
+      mkdir -p $out
+      pushd "$NIX_BUILD_TOP/go"
+      while read f; do
+        echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' \
+          || continue
+        mkdir -p "$(dirname "$out/share/go/$f")"
+        cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
+      done < <(find . -type f)
+      popd
+    '';
+
     extraSrcs = map mkGoDep [
       { goPackagePath = "github.com/miekg/pkcs11";
         rev           = "6dbd569b952ec150d1425722dbbe80f2c6193f83";
@@ -191,51 +206,15 @@ let
     1:/var/lib/softhsm/slot1.db
   '';
 
-  snakeOilCa = pkgs.runCommand "snakeoil-ca" {
-    buildInputs = [ pkgs.openssl ];
-  } ''
-    mkdir "$out"
-    openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \
-      -subj '/CN=Snakeoil CA' -nodes \
-      -out "$out/ca.pem" -keyout "$out/ca.key"
-  '';
-
-  createAndSignCert = fqdn: let
-    snakeoilCertConf = pkgs.writeText "snakeoil.cnf" ''
-      [req]
-      default_bits = 4096
-      prompt = no
-      default_md = sha256
-      req_extensions = req_ext
-      distinguished_name = dn
-      [dn]
-      CN = ${fqdn}
-      [req_ext]
-      subjectAltName = DNS:${fqdn}
-    '';
-  in pkgs.runCommand "snakeoil-certs-${fqdn}" {
-    buildInputs = [ pkgs.openssl ];
-  } ''
-    mkdir "$out"
-    openssl genrsa -out "$out/snakeoil.key" 4096
-    openssl req -new -key "$out/snakeoil.key" \
-      -config ${lib.escapeShellArg snakeoilCertConf} \
-      -out snakeoil.csr
-    openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
-      -CA "${snakeOilCa}/ca.pem" -CAkey "${snakeOilCa}/ca.key" \
-      -extfile ${lib.escapeShellArg snakeoilCertConf} \
-      -out "$out/snakeoil.pem" -days 36500
-  '';
+  snakeOilCerts = import ./snakeoil-certs.nix;
 
-  wfeCerts = createAndSignCert wfeDomain;
   wfeDomain = "acme-v01.api.letsencrypt.org";
-  wfeCertFile = "${wfeCerts}/snakeoil.pem";
-  wfeKeyFile = "${wfeCerts}/snakeoil.key";
+  wfeCertFile = snakeOilCerts.${wfeDomain}.cert;
+  wfeKeyFile = snakeOilCerts.${wfeDomain}.key;
 
-  siteCerts = createAndSignCert siteDomain;
   siteDomain = "letsencrypt.org";
-  siteCertFile = "${siteCerts}/snakeoil.pem";
-  siteKeyFile = "${siteCerts}/snakeoil.key";
+  siteCertFile = snakeOilCerts.${siteDomain}.cert;
+  siteKeyFile = snakeOilCerts.${siteDomain}.key;
 
   # Retrieved via:
   # curl -s -I https://acme-v01.api.letsencrypt.org/terms \
@@ -348,7 +327,7 @@ let
   }) components;
 
 in {
-  imports = [ ./resolver.nix ];
+  imports = [ ../resolver.nix ];
 
   options.test-support.letsencrypt.caCert = lib.mkOption {
     type = lib.types.path;
@@ -364,7 +343,7 @@ in {
       resolver.enable = let
         isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ];
       in lib.mkOverride 900 isLocalResolver;
-      letsencrypt.caCert = "${snakeOilCa}/ca.pem";
+      letsencrypt.caCert = snakeOilCerts.ca.cert;
     };
 
     # This has priority 140, because modules/testing/test-instrumentation.nix
diff --git a/nixos/tests/common/letsencrypt/mkcerts.nix b/nixos/tests/common/letsencrypt/mkcerts.nix
new file mode 100644
index 0000000000000..3b4a589e41427
--- /dev/null
+++ b/nixos/tests/common/letsencrypt/mkcerts.nix
@@ -0,0 +1,69 @@
+{ pkgs ? import <nixpkgs> {}
+, lib ? pkgs.lib
+
+, domains ? [ "acme-v01.api.letsencrypt.org" "letsencrypt.org" ]
+}:
+
+pkgs.runCommand "letsencrypt-snakeoil-ca" {
+  nativeBuildInputs = [ pkgs.openssl ];
+} ''
+  addpem() {
+    local file="$1"; shift
+    local storeFileName="$(IFS=.; echo "$*")"
+
+    echo -n "  " >> "$out"
+
+    # Every following argument is an attribute, so let's recurse and check
+    # every attribute whether it must be quoted and write it into $out.
+    while [ -n "$1" ]; do
+      if expr match "$1" '^[a-zA-Z][a-zA-Z0-9]*$' > /dev/null; then
+        echo -n "$1" >> "$out"
+      else
+        echo -n '"' >> "$out"
+        echo -n "$1" | sed -e 's/["$]/\\&/g' >> "$out"
+        echo -n '"' >> "$out"
+      fi
+      shift
+      [ -z "$1" ] || echo -n . >> "$out"
+    done
+
+    echo " = builtins.toFile \"$storeFileName\" '''" >> "$out"
+    sed -e 's/^/    /' "$file" >> "$out"
+
+    echo "  ''';" >> "$out"
+  }
+
+  echo '# Generated via mkcert.sh in the same directory.' > "$out"
+  echo '{' >> "$out"
+
+  openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \
+    -subj '/CN=Snakeoil CA' -nodes -out ca.pem -keyout ca.key
+
+  addpem ca.key ca key
+  addpem ca.pem ca cert
+
+  ${lib.concatMapStrings (fqdn: let
+    opensslConfig = pkgs.writeText "snakeoil.cnf" ''
+      [req]
+      default_bits = 4096
+      prompt = no
+      default_md = sha256
+      req_extensions = req_ext
+      distinguished_name = dn
+      [dn]
+      CN = ${fqdn}
+      [req_ext]
+      subjectAltName = DNS:${fqdn}
+    '';
+  in ''
+    export OPENSSL_CONF=${lib.escapeShellArg opensslConfig}
+    openssl genrsa -out snakeoil.key 4096
+    openssl req -new -key snakeoil.key -out snakeoil.csr
+    openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
+      -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500
+    addpem snakeoil.key ${lib.escapeShellArg fqdn} key
+    addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert
+  '') domains}
+
+  echo '}' >> "$out"
+''
diff --git a/nixos/tests/common/letsencrypt/mkcerts.sh b/nixos/tests/common/letsencrypt/mkcerts.sh
new file mode 100755
index 0000000000000..cc7f8ca650dd4
--- /dev/null
+++ b/nixos/tests/common/letsencrypt/mkcerts.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p nix bash -i bash
+set -e
+cd "$(dirname "$0")"
+storepath="$(nix-build --no-out-link mkcerts.nix)"
+cat "$storepath" > snakeoil-certs.nix
diff --git a/nixos/tests/common/letsencrypt/snakeoil-certs.nix b/nixos/tests/common/letsencrypt/snakeoil-certs.nix
new file mode 100644
index 0000000000000..c3d29ab8f1633
--- /dev/null
+++ b/nixos/tests/common/letsencrypt/snakeoil-certs.nix
@@ -0,0 +1,253 @@
+# Generated via mkcert.sh in the same directory.
+{
+  ca.key = builtins.toFile "ca.key" ''
+    -----BEGIN PRIVATE KEY-----
+    MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDfdVxC/4HwhuzD
+    9or9CDDu3TBQE5lirJI5KYmfMZtfgdzEjgOzmR9AVSkn2rQeCqzM5m+YCzPO+2y7
+    0Fdk7vDORi1OdhYfUQIW6/TZ27xEjx4t82j9i705yUqTJZKjMbD830geXImJ6VGj
+    Nv/WisTHmwBspWKefYQPN68ZvYNCn0d5rYJg9uROZPJHSI0MYj9iERWIPN+xhZoS
+    xN74ILJ0rEOQfx2GHDhTr99vZYAFqbAIfh35fYulRWarUSekI+rDxa83FD8q9cMg
+    OP84KkLep2dRXXTbUWErGUOpHP55M9M7ws0RVNdl9PUSbDgChl7yYlHCde3261q/
+    zGp5dMV/t/jXXNUgRurvXc4gUKKjS4Sffvg0XVnPs3sMlZ4JNmycK9klgISVmbTK
+    VcjRRJv8Bva2NQVsJ9TIryV0QEk94DucgsC3LbhQfQdmnWVcEdzwrZHNpk9az5mn
+    w42RuvZW9L19T7xpIrdLSHaOis4VEquZjkWIhfIz0DVMeXtYEQmwqFG23Ww0utcp
+    mCW4FPvpyYs5GAPmGWfrlMxsLD/7eteot3AheC+56ZBoVBnI8FFvIX2qci+gfVDu
+    CjvDmbyS/0NvxLGqvSC1GUPmWP3TR5Fb1H8Rp+39zJHRmH+qYWlhcv6p7FlY2/6d
+    9Rkw8WKRTSCB7yeUdNNPiPopk6N4NwIDAQABAoICAQCzV0ei5dntpvwjEp3eElLj
+    glYiDnjOPt5kTjgLsg6XCmyau7ewzrXMNgz/1YE1ky+4i0EI8AS2nAdafQ2HDlXp
+    11zJWfDLVYKtztYGe1qQU6TPEEo1I4/M7waRLliP7XO0n6cL5wzjyIQi0CNolprz
+    8CzZBasutGHmrLQ1nmnYcGk2+NBo7f2yBUaFe27of3mLRVbYrrKBkU5kveiNkABp
+    r0/SipKxbbivQbm7d+TVpqiHSGDaOa54CEksOcfs7n6efOvw8qj326KtG9GJzDE6
+    7XP4U19UHe40XuR0t7Zso/FmRyO6QzNUutJt5LjXHezZ75razTcdMyr0QCU8MUHH
+    jXZxQCsbt+9AmdxUMBm1SMNVBdHYM8oiNHynlgsEj9eM6jxDEss/Uc3FeKoHl+XL
+    L6m28guIB8NivqjVzZcwhxvdiQCzYxjyqMC+/eX7aaK4NIlX2QRMoDL6mJ58Bz/8
+    V2Qxp2UNVwKJFWAmpgXC+sq6XV/TP3HkOvd0OK82Nid2QxEvfE/EmOhU63qAjgUR
+    QnteLEcJ3MkGGurs05pYBDE7ejKVz6uu2tHahFMOv+yanGP2gfivnT9a323/nTqH
+    oR5ffMEI1u/ufpWU7sWXZfL/mH1L47x87k+9wwXHCPeSigcy+hFI7t1+rYsdCmz9
+    V6QtmxZHMLanwzh5R0ipcQKCAQEA8kuZIz9JyYP6L+5qmIUxiWESihVlRCSKIqLB
+    fJ5sQ06aDBV2sqS4XnoWsHuJWUd39rulks8cg8WIQu8oJwVkFI9EpARt/+a1fRP0
+    Ncc9qiBdP6VctQGgKfe5KyOfMzIBUl3zj2cAmU6q+CW1OgdhnEl4QhgBe5XQGquZ
+    Alrd2P2jhJbMO3sNFgzTy7xPEr3KqUy+L4gtRnGOegKIh8EllmsyMRO4eIrZV2z3
+    XI+S2ZLyUn3WHYkaJqvUFrbfekgBBmbk5Ead6ImlsLsBla6MolKrVYV1kN6KT+Y+
+    plcxNpWY8bnWfw5058OWPLPa9LPfReu9rxAeGT2ZLmAhSkjGxQKCAQEA7BkBzT3m
+    SIzop9RKl5VzYbVysCYDjFU9KYMW5kBIw5ghSMnRmU7kXIZUkc6C1L/v9cTNFFLw
+    ZSF4vCHLdYLmDysW2d4DU8fS4qdlDlco5A00g8T1FS7nD9CzdkVN/oix6ujw7RuI
+    7pE1K3JELUYFBc8AZ7mIGGbddeCwnM+NdPIlhWzk5s4x4/r31cdk0gzor0kE4e+d
+    5m0s1T4O/Iak6rc0MGDeTejZQg04p1eAJFYQ6OY23tJhH/kO8CMYnQ4fidfCkf8v
+    85v4EC1MCorFR7J65uSj8MiaL7LTXPvLAkgFls1c3ijQ2tJ8qXvqmfo0by33T1OF
+    ZGyaOP9/1WQSywKCAQB47m6CfyYO5EZNAgxGD8SHsuGT9dXTSwF/BAjacB/NAEA2
+    48eYpko3LWyBrUcCPn+LsGCVg7XRtxepgMBjqXcoI9G4o1VbsgTHZtwus0D91qV0
+    DM7WsPcFu1S6SU8+OCkcuTPFUT2lRvRiYj+vtNttK+ZP5rdmvYFermLyH/Q2R3ID
+    zVgmH+aKKODVASneSsgJ8/nAs5EVZbwc/YKzbx2Zk+s7P4KE95g+4G4dzrMW0RcN
+    QS1LFJDu2DhFFgU4fRO15Ek9/lj2JS2DpfLGiJY8tlI5nyDsq4YRFvQSBdbUTZpG
+    m+CJDegffSlRJtuT4ur/dQf5hmvfYTVBRk2XS/eZAoIBAB143a22PWnvFRfmO02C
+    3X1j/iYZCLZa6aCl+ZTSj4LDGdyRPPXrUDxwlFwDMHfIYfcHEyanV9T4Aa9SdKh9
+    p6RbF6YovbeWqS+b/9RzcupM77JHQuTbDwL9ZXmtGxhcDgGqBHFEz6ogPEfpIrOY
+    GwZnmcBY+7E4HgsZ+lII4rqng6GNP2HEeZvg91Eba+2AqQdAkTh3Bfn+xOr1rT8+
+    u5WFOyGS5g1JtN0280yIcrmWeNPp8Q2Nq4wnNgMqDmeEnNFDOsmo1l6NqMC0NtrW
+    CdxyXj82aXSkRgMQSqw/zk7BmNkDV8VvyOqX/fHWQynnfuYmEco4Pd2UZQgadOW5
+    cVMCggEBANGz1fC+QQaangUzsVNOJwg2+CsUFYlAKYA3pRKZPIyMob2CBXk3Oln/
+    YqOq6j373kG2AX74EZT07JFn28F27JF3r+zpyS/TYrfZyO1lz/5ZejPtDTmqBiVd
+    qa2coaPKwCOz64s77A9KSPyvpvyuTfRVa8UoArHcrQsPXMHgEhnFRsbxgmdP582A
+    kfYfoJBSse6dQtS9ZnREJtyWJlBNIBvsuKwzicuIgtE3oCBcIUZpEa6rBSN7Om2d
+    ex8ejCcS7qpHeULYspXbm5ZcwE4glKlQbJDTKaJ9mjiMdvuNFUZnv1BdMQ3Tb8zf
+    Gvfq54FbDuB10XP8JdLrsy9Z6GEsmoE=
+    -----END PRIVATE KEY-----
+  '';
+  ca.cert = builtins.toFile "ca.cert" ''
+    -----BEGIN CERTIFICATE-----
+    MIIFATCCAumgAwIBAgIJANydi4uFZr0LMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+    BAMMC1NuYWtlb2lsIENBMCAXDTE4MDcxMjAwMjIxNloYDzIxMTgwNjE4MDAyMjE2
+    WjAWMRQwEgYDVQQDDAtTbmFrZW9pbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+    ADCCAgoCggIBAN91XEL/gfCG7MP2iv0IMO7dMFATmWKskjkpiZ8xm1+B3MSOA7OZ
+    H0BVKSfatB4KrMzmb5gLM877bLvQV2Tu8M5GLU52Fh9RAhbr9NnbvESPHi3zaP2L
+    vTnJSpMlkqMxsPzfSB5ciYnpUaM2/9aKxMebAGylYp59hA83rxm9g0KfR3mtgmD2
+    5E5k8kdIjQxiP2IRFYg837GFmhLE3vggsnSsQ5B/HYYcOFOv329lgAWpsAh+Hfl9
+    i6VFZqtRJ6Qj6sPFrzcUPyr1wyA4/zgqQt6nZ1FddNtRYSsZQ6kc/nkz0zvCzRFU
+    12X09RJsOAKGXvJiUcJ17fbrWr/Manl0xX+3+Ndc1SBG6u9dziBQoqNLhJ9++DRd
+    Wc+zewyVngk2bJwr2SWAhJWZtMpVyNFEm/wG9rY1BWwn1MivJXRAST3gO5yCwLct
+    uFB9B2adZVwR3PCtkc2mT1rPmafDjZG69lb0vX1PvGkit0tIdo6KzhUSq5mORYiF
+    8jPQNUx5e1gRCbCoUbbdbDS61ymYJbgU++nJizkYA+YZZ+uUzGwsP/t616i3cCF4
+    L7npkGhUGcjwUW8hfapyL6B9UO4KO8OZvJL/Q2/Esaq9ILUZQ+ZY/dNHkVvUfxGn
+    7f3MkdGYf6phaWFy/qnsWVjb/p31GTDxYpFNIIHvJ5R000+I+imTo3g3AgMBAAGj
+    UDBOMB0GA1UdDgQWBBQ3vPWzjLmu5krbSpfhBAht9KL3czAfBgNVHSMEGDAWgBQ3
+    vPWzjLmu5krbSpfhBAht9KL3czAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
+    A4ICAQDF9HyC1ZFN3Ob+JA9Dj5+Rcobi7JIA5F8uW3Q92LfPoVaUGEkBrwJSiTFX
+    47zvP/ySBJIpZ9rzHMbJ+1L+eJgczF1uQ91inthCKo1THTPo5TgBrpJj0YAIunsj
+    9eH1tBnfWFYdVIDZoTSiwPtgIvglpyuK/eJXEe+FRzubhtdc9w1Hlzox1sd0TQuy
+    Pl9KFHg7BlFZfCPig1mkB8pfwjBDgVhv5DKJ9cJXh3R5zSoiyuS2b+qYSvw8YTHq
+    0WNKWUthb7BVAYE3OmcbOHgUAUjtJ6EIGIB9z/SoLe90CofXLXFR5dppuVLKCMBA
+    kgL4luBIu7t8mcnN2yzobvcGHy8RVY6F5abCCy6gackLzjOzvH1SYOxP8yN74aKB
+    ANgcqdWspb8JYoU8lEbA8dhBVrsgBf7XeJlrZvMdcUENlJ2PI0JWr9WvlRAM9rYY
+    EY1alJqBCp6530Ggd6/f0V64cEqptejUdmN9L0zboxKjQf4LjpUNraGvg8tw/xkY
+    4dT1U2HlVnhOyBVkx/tE6zIK/RU16oMqwpjCdfbK/TuWCNc/emJz5PMlp81zm83+
+    dExpWwuV4rt6OQbZ/GSatNLJXOw+pkLjaEhnHgrsgI+HqAUXg3ByKol+1e76wN51
+    k1ZKpB6mk4kejySGPYBHiJwED0IyXu9gUfalSczXFO4ySAvhCg==
+    -----END CERTIFICATE-----
+  '';
+  "acme-v01.api.letsencrypt.org".key = builtins.toFile "acme-v01.api.letsencrypt.org.key" ''
+    -----BEGIN RSA PRIVATE KEY-----
+    MIIJKQIBAAKCAgEAvG+sL4q0VkgSClBTn4NkPiUrtXx5oLyZ+CCM1jrQx/xotUt5
+    X2S4/7vMnAK/yRLsR7R2PhXO8CZPqJ7B6OfAgaDTgvipJkZYPZQSMP3KOinM3WJL
+    ssqKh7/HOxZIf0iyUXewrnX5eTAo/CLsUnhBjBD7E99nmQz/leLWSl82sSYDkO3n
+    Uk3/1qJZA8iddb4uH0IEQWcNKev3WoQQzwiVrXBiftlRQOJy5JJXm5m8229MCpMA
+    1AUWmpdu6sl3/gFFdsDhUFq/a7LFrVyaUCMRIHg9szAB7ZFkixr9umQs8jKwuo98
+    3JHB11h2SirwgfIzHHmyhaWhCt22ucTwEXGhq63LtrzZvLsfP8Ql5S+AuqGTH0v8
+    meuc784leAjulBZjkpuIFwDnVv9+YeUEbqJeo1hSHrILddora3nkH4E2dJWmLpqp
+    iPr++GRi+BNgYKW/BQLTJ7C6v+vUs+kdPgYJH5z7oP6f0YZkT0Wkubp/UEz7UV2d
+    fjz57d77DYx5rFWGYzJriWR/xltgL1zDpjwjwG1FDpRqwlyYbBFpjQhxI+X0aT98
+    m6fCzBDQHDb/+JgvsjTHh6OZatahFAwzFIEfrceDv1BG8sBWIaZGhLzYiWQxafl8
+    oXbWv1T6I1jpsTlCdCSkWzaJb4ZjxI9Ga1ynVu8F16+GR2a71wKWu7UbZQsCAwEA
+    AQKCAgBYvrs4FLoD3KNqahRIDqhaQEVKjtn1Yn2dBy9tAXwsg2qI34fE7nnWLwsY
+    +o56U0gmKQ57BOhV36Uqg8JNP0BBjI2wpA19simCrsa2fgAMznzmUpHWHV+KuT5K
+    TJ9OGt2oUpdKQtOASLc0r/neiTZNkf29iTyQLzf7zj4f/qGSYpXRXsnP0F5KJmGH
+    z6agujWckQnSB4eCk9gFsCb+akubyE8K8Kw8w6lajrVl2czBB7SnUj5UnCTeH62k
+    M8goP08Is6QppON8BFDm6bLfRPSe9yIPzu9JhGz2unp+mwkz872Zz1P9yUOieM4U
+    9g4ZFQkPQx1ZpfynUm3pJZ/uhzadBabnIvMe/1qwDAEDifh/WzEM76/2kBpQkHtS
+    qcjwjAElfWnP8aBr1Pj42/cVJy3dbDqb0OawFHx/8xSO2CkY4Gq2h3OYv1XpPv3g
+    S9qqKhvuaT+aD0YjKhP4FYc2vvQSJwdZL8vqOyma8JGmc+r7jakIPCyOx3oPVqnS
+    L2P7DuJ1FcGIZyYOU3UUSzKndDU9fVC8YoLWvHDlwm4RK9UPtdsBY8mEu6BlaAwL
+    zEQG+fbcFnEkHPiJeAohYUCHiqCihLt0pqGwZi+QrudPQE6C47YijGZWJu4VVLjB
+    B2L9iDQKsN4FnBJ9egJIwWBLX3XXQfjC43UGm1A5sBvD+ScsCQKCAQEA7GxU7/SW
+    4YJ+wBXrp7Z3vzlc5mTT5U4L2muWZLhIjT/jmpHpZ4c9a5DY/K9OYcu8XJ+7kx2B
+    N40cU3ZkT2ZbB5/BUCEmi3Wzy3R/KZshHDzvvSZHcXJqVBtv+HGJgR5ssFqAw8c6
+    gJtDls+JE9Sz+nhLk0ZZ4658vbTQfG1lmtzrbC3Kz2xK8RPTdOU5Or7fayeaEKEW
+    ECBJPE41ME2UTdB/E85vyYoee0MBijjAs19QKqvoNbyrsZ5bihcIDYsrvjCmkdW1
+    20IUrSF3ZYJ9bb+CxHeRyNqwvRxPYSkzdMjZHx+xEAvJgw51QqmIi2QQf/qB+ych
+    cSbE/0Jhx4QbDQKCAQEAzAoenEOgmZvUegFUu8C6gWeibMjl3Y9SikQ4CoQO/zWr
+    aoCr5BpbzbtOffwnPfgk9wCGvXf6smOdrLUP1K2QAhBr/vJh7ih2MonvpYr5HPP7
+    maVARR66IgtxXP2ER2I9+9p2OQdecGRP2fUn2KCDQIASHSSY/VjBb8LLJgryC/DS
+    r2b0+m1e2qXfNWt/BYTQZhD/8B/jl/2pl/jI2ne3rkeiwEm7lqZaDt3Q8gC+qoP5
+    /IdG1Gob7UTMCbICWy1aGuzRYUmbpg0Vq4DAV1RtgBySB5oNq5PMBHYpOxedM2nM
+    NxHvf0u6wsxVULwQ4IfWUqUTspjxDmIgogSzmOGadwKCAQEA558if4tynjBImUtg
+    egirvG4oc5doeQhDWJN63eYlPizPgUleD41RQSbBTp04/1qoiV38WJ7ZT2Ex1Rry
+    H0+58vgyXZx8tLh1kufpBQv0HkQc44SzDZP4U7olspMZEaSK+yNPb36p9AEo8IEW
+    XJVQVhywffK4cfUqRHj2oFBU8KlrA6rBPQFtUk4IJkfED6ecHtDHgW8vvFDFLw23
+    0kDPAIU5WmAu6JYmUsBMq+v57kF8urF8Z9kVpIfuSpVR0GL+UfA74DgtWEefFhbp
+    cEutMm4jYPN7ofmOmVc49Yl13f4/qNxVjdDedUUe4FZTbax09cyotzOY8c/3w9R3
+    Ew57qQKCAQAa5jqi30eM+L5KV2KUXhQ4ezEupk2np/15vQSmXkKb4rd2kwAWUmNH
+    /Cmc8mE6CjzVU3xv/iFO41MmMbikkT0rCH80XUAL5cmvX//4ExpEduX0m5SdiC+B
+    zYBkggeuYYVKbsKnQhFxP8hHM8rNBFxJZJj+vpRs0gaudT/TBB5k9JrSBQDHAyQ+
+    Lx/+Ku3UDG5tBlC3l3ypzQdOwb25D49nqooKT64rbkLxMs0ZGoAIet26LRtpZZPI
+    9AjyPkWRP6lhY1c3PD0I5zC0K4Uv/jFxclLOLcEfnZyH+gv1fmd7H7eMixDH93Pn
+    uoiE3EZdU4st2hV+tisRel5S/cuvnA6BAoIBAQDJISK8H0hwYp+J4/WUv/WLtrm4
+    Mhmn8ItdEPAyCljycU6oLHJy4fgmmfRHeoO1i3jb87ks2GghegFBbJNzugfoGxIM
+    dLWIV+uFXWs24fMJ/J6lqN1JtAj7HjvqkXp061X+MdIJ0DsACygzFfJOjv+Ij77Q
+    Q1OBTSPfb0EWFNOuIJr9i2TwdN9eW/2ZMo1bPuwe4ttPEIBssfIC02dn2KD1RTqM
+    1l+L97vVFk7CoSJZf5rLeysLVyUeGdDcoEcRA6fKhfB/55h+iqrZNvySX1HrR6on
+    PQcxDRPJD7f9rMsTzVl3DOxzvXAU3lIcZtPZps97IwXceAAh2e1kZNNv/cxj
+    -----END RSA PRIVATE KEY-----
+  '';
+  "acme-v01.api.letsencrypt.org".cert = builtins.toFile "acme-v01.api.letsencrypt.org.cert" ''
+    -----BEGIN CERTIFICATE-----
+    MIIEtDCCApwCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
+    IENBMCAXDTE4MDcxMjAwMjIxN1oYDzIxMTgwNjE4MDAyMjE3WjAnMSUwIwYDVQQD
+    DBxhY21lLXYwMS5hcGkubGV0c2VuY3J5cHQub3JnMIICIjANBgkqhkiG9w0BAQEF
+    AAOCAg8AMIICCgKCAgEAvG+sL4q0VkgSClBTn4NkPiUrtXx5oLyZ+CCM1jrQx/xo
+    tUt5X2S4/7vMnAK/yRLsR7R2PhXO8CZPqJ7B6OfAgaDTgvipJkZYPZQSMP3KOinM
+    3WJLssqKh7/HOxZIf0iyUXewrnX5eTAo/CLsUnhBjBD7E99nmQz/leLWSl82sSYD
+    kO3nUk3/1qJZA8iddb4uH0IEQWcNKev3WoQQzwiVrXBiftlRQOJy5JJXm5m8229M
+    CpMA1AUWmpdu6sl3/gFFdsDhUFq/a7LFrVyaUCMRIHg9szAB7ZFkixr9umQs8jKw
+    uo983JHB11h2SirwgfIzHHmyhaWhCt22ucTwEXGhq63LtrzZvLsfP8Ql5S+AuqGT
+    H0v8meuc784leAjulBZjkpuIFwDnVv9+YeUEbqJeo1hSHrILddora3nkH4E2dJWm
+    LpqpiPr++GRi+BNgYKW/BQLTJ7C6v+vUs+kdPgYJH5z7oP6f0YZkT0Wkubp/UEz7
+    UV2dfjz57d77DYx5rFWGYzJriWR/xltgL1zDpjwjwG1FDpRqwlyYbBFpjQhxI+X0
+    aT98m6fCzBDQHDb/+JgvsjTHh6OZatahFAwzFIEfrceDv1BG8sBWIaZGhLzYiWQx
+    afl8oXbWv1T6I1jpsTlCdCSkWzaJb4ZjxI9Ga1ynVu8F16+GR2a71wKWu7UbZQsC
+    AwEAATANBgkqhkiG9w0BAQsFAAOCAgEAzeGlFMz1Bo+bbpZDQ60HLdw7qDp3SPJi
+    x5LYG860yzbh9ghvyc59MIm5E6vB140LRJAs+Xo6VdVSTC4jUA2kI9k1BQsbZKds
+    XT0RqA7HkqcLS3t3JWFkkKbCshMGZTSZ//hpbaUG1qEAfUfmZw1lAxqSa0kqavbP
+    awf7k8qHbqcj7WORCdH7fjKAjntEQwIpl1GEkAdCSghOJz2/o9aWmiGZt27OM/sG
+    MLSrcmL3QBElCjOxg14P8rnsmZ+VEp6MO93otoJ4dJL7fN7vTIh5ThbS384at/4l
+    4KK/y7XctUzAtWzhnodjk/NSgrrGX2kseOGOWEM1sZc9xtinHH2tpOMqtLVOkgHD
+    Lul+TArqgqeoOdEM/9OL64kgOrO/JzxBq+egLUi4wgAul2wmtecKZK1dkwYZHeqW
+    74i55yeBp+TTomnPr0ZBns6xKFYldJVzC34OB+2YVDxe8y9XtWtuQOxFw0LQHhNb
+    zy5aBverWzZFwiIIjJoVHTQq848uKBJec0YILfMinS1Wjif4xqW/IMfi+GFS0oka
+    sKCGNE/8ur9u/Jm6cbto3f2dtV8/vkhiITQgwzM2jalyuVJ9jyPxG7EvbTvZORgw
+    pRvBRTd4/eE7I1L+UDe6x8EjR/MrqfF9FWVGOZo4vPTyNbrSWYBh6s9kYy56ds1l
+    IRxst1BXEfI=
+    -----END CERTIFICATE-----
+  '';
+  "letsencrypt.org".key = builtins.toFile "letsencrypt.org.key" ''
+    -----BEGIN RSA PRIVATE KEY-----
+    MIIJKAIBAAKCAgEAwPvhlwemgPi6919sSD7Pz6l6CRfU1G/fDc0AvsMN/nTmiGND
+    pqn9ef1CA+RtLtOuPc1LLyEovcfu75/V+6KSgO4k19E2CrFCFwjEOWDGF4DgclT3
+    751WGmFJgzPEfZfhbOrmQfQau86KxAtNZVp9FxcKbuLyQ/sNNxfNMB+7IHbVhwvz
+    VcndHpYZEP6kdnwvNLP22bouX5q3avxWStln01uZ0BfUm4XwxaUNIU7t0Dv56FK9
+    C9hW9AZae0do0BJBWRF7xSwLeDJqn9uZz+sX0X/tIaaSQSBuZySj0He5ZKzdUO0t
+    px2xTS2Brl3Y2BOJaOE98HubWvdKoslLt4X2rVrMxGa86SmFzcyDL1RSowcP/ruy
+    y555l7pepL5s4cmMgRBBXj5tXhqUTVOn5WO+JClLk+rtvtAT4rogJmMqEKmMw2t7
+    LNy1W9ri/378QG/i3AGaLIL/7GsPbuRO51Sdti4QMVe2zNFze72mzNmj1SXokWy7
+    +ZvjUMp55oEjRRsTPUZdNOEHJWy6Os2znuqL7ZpIHCxBG8FKnkCViXRJqAA8bzcE
+    hR+pLamLIOHlv4kdzJ6phHkSvK68qvbRReUmOjJgSupVBI9jhK+fHay/UWR4zfJQ
+    ed99H8ZOoiXlrLCVs+VPDynUUKrzF1nYyolNzi/NS4e4AbnfWgyC5JKRpjUCAwEA
+    AQKCAgB0fNYL+zM3MGxy+2d6KGf6GnuuV3NBlBGY3ACyJT0iNmAdPYXNaVi2tPeP
+    L+fz1xSa+3uBhEt6Wt/QRrO8g8JZDuawWvl69MpG6yS+2bpY35MbkExkl50sqULd
+    bncRtIb+3r+EWht099RtR8E9B6TwNhk3G8hO3pB4i+ZwQQcMLo7vSHhmdUYCu2mA
+    B6UwW/+GmYbMoARz8wj6DDzuS1LPksBCis/r3KqcMue9Dk6gXkOYR7ETIFBEVj1x
+    ooYS6qIFaHdEajS2JgCUY9LxXR/wdn6lzE0GANSDb+tt34bJzUp+Gdxvvo2SX4Ci
+    xsUokIpmA2gG7CW3gAPORSFuMu/VYZtvt+owNYlODXRPuGi/eLDknFRB/S4Nx0J0
+    WZZq5uTgJdQainyKYtDZALia5X4cc5I2hNetCorG9jNZIsSunbIAG+htx2FI3eqK
+    jwOUiHE8SCZ6YdXoDQjg2w+g8jeB23eqkPyzunpZphYiKay7VFeLwQEMC2a791ln
+    +MbHhhpRAc1uAoU2reB2fxKyaPlOfAWVMgUOGlgpVOuEVeMoc1CwjajaFztGG7fI
+    8EHNoyAftCdXnTaLZk2KZnnIDHHzFXR62TE1GJFD1fdI1pHAloCbgA4h+Dtwm1Uu
+    iAEEfvVU/E5wbtAzv6pY32+OKX5kyHAbM5/e918B8ZxmHG1J9QKCAQEA6FwxsRG3
+    526NnZak540yboht5kV12BNBChjmARv/XgZ7o1VsfwjaosErMvasUBcHDEYOC/oE
+    ZgPAyrMVsYm0xe/5FSIFLJVeYXTr0rmCNhVtBCHx3IS94BCXreNnz0qoEWnb5E09
+    Z1O42D0yGcLXklg6QaJfb7EdHh03F3dSVMHyDR3JlAQHRINeuP6LlQpbvRD3adH5
+    QWr2M3k+Stuq2OJdG7eUS1dreCxRShLuDjDhiZekdl/TB3LM0prOaWrKBrryN2g6
+    mjiasH6I5zRD3LQP5zg57Thb8afHqA4Fb85Frt6ltfFlPTIoxXZ5drVhmRWfXXnQ
+    POnj8T+w4zVjvwKCAQEA1J4ivyFkCL0JTSY3/PtwAQvBBj3GazzU6P+urWeH74Vh
+    WK17Ae40iOUHGyy80Db/fVY4VLQTpxvAeG91Gj5Nd/AucXJgOrisabcEz6N/xUs5
+    sjJNgXuNKTAgjYBu0bqLXxgZj43zT8JhA6KW7RuYU0PtHMRragz4RbK9NWDaVvJb
+    xSR5QoVLS00PerUa0SfupEYKCrlSTP6FOM5YNkCuSMt7X6/m9cR0WwVINKvUQBiT
+    ObrN+KeBmF9awpQQnQOq/GbCl3kf6VyPQqYFhdrWSg52w33c2tBVYrtHJpeXGcin
+    akw4KKcj4rdU2qxMuuRiD5paagshbLdGsYMTbSzjCwKCAQEAh89DGAyUIcfDLAWd
+    st0bSfGh0oJsw3NVg3JUFPfpRWqiny/Rr1pcd95RwoLc6h7bdrgHg8aJBZtR9ue/
+    WTp0l3CQdGKjBZD0TiAJqevViIjzZAP3Gn3XgPwRu4f75/Pp0eu+o2zl49vSYUk7
+    XEU+vIGm4y/leiHaM/y9c5DBZVrKgBIV/NZx7QCfv56/tMgOIK6m/YnFlw/OgP1v
+    hE9qR0PfSdD98x9QaDf290WjMFYvrL0eWjXd4S+fOcVTude55z8jTXE1N2i4OUpr
+    +D7bH0d7OBjr+pQDYXZAQyCW2ueEYRYvYu2Jz7/ehrOdgN25AsHZmMgXB1NpcFta
+    pyJQfwKCAQByoPMwworRH0GVg4Zp8RFYrwKZH9MK29gZ6kc9m/Sw0OND0PvhdZCD
+    QZ8MKpl9VDl4VHS4TgHOdWrWQ5kJ1g8kG6yeY0C4R/pEYHTKkWaAcucfSHl61qar
+    TxQt1dFpZz5evXqCZ9CG7tApCo5+NQNx2MxMVyVmHqn3wb66uYXdnHqXlet+Tqji
+    ZyByUpOrsfC6RjyBvZo+gnZGwxDR5xtPiczxML+/PvRQYk+kfgNHrzgoxqrnZT+8
+    a6ReBT/TtzeHLsu4qIfo44slLqcJnIstkBC9ouzgV7PBMCDTEKVZNFH2QDOCz2HM
+    iHTKFFyl4h1wNhKK24dguor1hyqBENMzAoIBAAQvQHwRWIVlfCMRI170Ls8AXB9Z
+    MMdZJ37bh6kmJpkV3+HB1ZkKwofHKR9h/3xLt5iYXzqT+/zA4EAsFFs1A93+tkzh
+    yPrN5iTSJicophZSlA4ObX1hMkgshvl7ZB1fRM5WyiszBOfm8W7eAxaK8nY2oAoP
+    tI7rioo6CFBNMCGbOl4gEX6YJ4OsVSm+efCRSDDw+3HW8H2YgqufBzAULk1Jcj5t
+    ZvraXpC5qZ92VtsH0cGA1ovNDAmoOV4AAvtZVpLQsXwaphad/Fbn/ItGrrluvvFC
+    HuldRzYtl/AQtoirK86LTY3aAmcwVFuiYvDQMzjzkJvVMmRCFZBcUIaz2oI=
+    -----END RSA PRIVATE KEY-----
+  '';
+  "letsencrypt.org".cert = builtins.toFile "letsencrypt.org.cert" ''
+    -----BEGIN CERTIFICATE-----
+    MIIEpzCCAo8CAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
+    IENBMCAXDTE4MDcxMjAwMjIxOVoYDzIxMTgwNjE4MDAyMjE5WjAaMRgwFgYDVQQD
+    DA9sZXRzZW5jcnlwdC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+    AQDA++GXB6aA+Lr3X2xIPs/PqXoJF9TUb98NzQC+ww3+dOaIY0Omqf15/UID5G0u
+    0649zUsvISi9x+7vn9X7opKA7iTX0TYKsUIXCMQ5YMYXgOByVPfvnVYaYUmDM8R9
+    l+Fs6uZB9Bq7zorEC01lWn0XFwpu4vJD+w03F80wH7sgdtWHC/NVyd0elhkQ/qR2
+    fC80s/bZui5fmrdq/FZK2WfTW5nQF9SbhfDFpQ0hTu3QO/noUr0L2Fb0Blp7R2jQ
+    EkFZEXvFLAt4Mmqf25nP6xfRf+0hppJBIG5nJKPQd7lkrN1Q7S2nHbFNLYGuXdjY
+    E4lo4T3we5ta90qiyUu3hfatWszEZrzpKYXNzIMvVFKjBw/+u7LLnnmXul6kvmzh
+    yYyBEEFePm1eGpRNU6flY74kKUuT6u2+0BPiuiAmYyoQqYzDa3ss3LVb2uL/fvxA
+    b+LcAZosgv/saw9u5E7nVJ22LhAxV7bM0XN7vabM2aPVJeiRbLv5m+NQynnmgSNF
+    GxM9Rl004QclbLo6zbOe6ovtmkgcLEEbwUqeQJWJdEmoADxvNwSFH6ktqYsg4eW/
+    iR3MnqmEeRK8rryq9tFF5SY6MmBK6lUEj2OEr58drL9RZHjN8lB5330fxk6iJeWs
+    sJWz5U8PKdRQqvMXWdjKiU3OL81Lh7gBud9aDILkkpGmNQIDAQABMA0GCSqGSIb3
+    DQEBCwUAA4ICAQAkx3jcryukAuYP7PQxMy3LElOl65ZFVqxDtTDlr7DvAkWJzVCb
+    g08L6Tu+K0rKh2RbG/PqS0+8/jBgc4IwSOPfDDAX+sinfj0kwXG34WMzB0G3fQzU
+    2BMplJDOaBcNqHG8pLP1BG+9HAtR/RHe9p2Jw8LG2qmZs6uemPT/nCTNoyIL4oxh
+    UncjETV4ayCHDKD1XA7/icgddYsnfLQHWuIMuCrmQCHo0uQAd7qVHfUWZ+gcsZx0
+    jTNCcaI8OTS2S65Bjaq2HaM7GMcUYNUD2vSyNQeQbha4ZeyZ9bPyFzznPMmrPXQe
+    MJdkbJ009RQIG9As79En4m+l+/6zrdx4DNdROqaL6YNiSebWMnuFHpMW/rCnhrT/
+    HYadijHOiJJGj9tWSdC4XJs7fvZW3crMPUYxpOvl01xW2ZlgaekILi1FAjSMQVoV
+    NhWstdGCKJdthJqLL5MtNdfgihKcmgkJqKFXTkPv7sgAQCopu6X+S+srCgn856Lv
+    21haRWZa8Ml+E0L/ticT8Fd8Luysc6K9TJ4mT8ENC5ywvgDlEkwBD3yvINXm5lg1
+    xOIxv/Ye5gFk1knuM7OzpUFBrXUHdVVxflCUqNAhFPbcXwjgEQ+A+S5B0vI6Ohue
+    ZnR/wuiou6Y+Yzh8XfqL/3H18mGDdjyMXI1B6l4Judk000UVyr46cnI7mw==
+    -----END CERTIFICATE-----
+  '';
+}
diff --git a/nixos/tests/common/resolver.nix b/nixos/tests/common/resolver.nix
index a1901c5c8167c..6be8d1d18e622 100644
--- a/nixos/tests/common/resolver.nix
+++ b/nixos/tests/common/resolver.nix
@@ -18,7 +18,7 @@
       defining this option needs to be explicitly imported.
 
       The reason this option exists is for the
-      <filename>nixos/tests/common/letsencrypt.nix</filename> module, which
+      <filename>nixos/tests/common/letsencrypt</filename> module, which
       needs that option to disable the resolver once the user has set its own
       resolver.
     '';
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index 93aeb60e456af..dc50e14750b01 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -1,12 +1,12 @@
 { lib, ... }:
 
-{ users.extraUsers.alice =
+{ users.users.alice =
     { isNormalUser = true;
       description = "Alice Foobar";
       password = "foobar";
     };
 
-  users.extraUsers.bob =
+  users.users.bob =
     { isNormalUser = true;
       description = "Bob Foobar";
       password = "foobar";
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index b89e08f82acb1..42bff6a9a3f98 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     { config, pkgs, lib, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
-      virtualisation.memorySize = 768;
+      virtualisation.memorySize = 1024;
       # Make sure we always have all the required dependencies for creating a
       # container available within the VM, because we don't have network access.
       virtualisation.pathsInNixDB = let
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
index 4b4e081acc5fb..d4028efad1d89 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixos/tests/gitolite.nix
@@ -78,8 +78,8 @@ in
             # there's nobody around that can input password
             PreferredAuthentications publickey
         '';
-        users.extraUsers.alice = { isNormalUser = true; };
-        users.extraUsers.bob = { isNormalUser = true; };
+        users.users.alice = { isNormalUser = true; };
+        users.users.bob = { isNormalUser = true; };
       };
 
   };
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 492fa61484a0f..591ed8600685f 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,8 +11,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.displayManager.lightdm.autoLogin.enable = true;
+      services.xserver.displayManager.lightdm.autoLogin.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
 
       virtualisation.memorySize = 1024;
@@ -21,7 +22,9 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
-      $machine->sleep(15);
+
+      # wait for alice to be logged in
+      $machine->waitForUnit("default.target","alice");
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix
new file mode 100644
index 0000000000000..4206c940c1afa
--- /dev/null
+++ b/nixos/tests/hadoop/hdfs.nix
@@ -0,0 +1,54 @@
+import ../make-test.nix ({pkgs, ...}: {
+  nodes = {
+    namenode = {pkgs, config, ...}: {
+      services.hadoop = {
+        package = pkgs.hadoop_3_1;
+        hdfs.namenode.enabled = true;
+        coreSite = {
+          "fs.defaultFS" = "hdfs://namenode:8020";
+        };
+        hdfsSite = {
+          "dfs.replication" = 1;
+          "dfs.namenode.rpc-bind-host" = "0.0.0.0";
+          "dfs.namenode.http-bind-host" = "0.0.0.0";
+        };
+      };
+      networking.firewall.allowedTCPPorts = [
+        9870 # namenode.http-address
+        8020 # namenode.rpc-address
+      ];
+    };
+    datanode = {pkgs, config, ...}: {
+      services.hadoop = {
+        package = pkgs.hadoop_3_1;
+        hdfs.datanode.enabled = true;
+        coreSite = {
+          "fs.defaultFS" = "hdfs://namenode:8020";
+        };
+      };
+      networking.firewall.allowedTCPPorts = [
+        9864 # datanode.http.address
+        9866 # datanode.address
+        9867 # datanode.ipc.address
+      ];
+    };
+  };
+
+  testScript = ''
+    startAll
+
+    $namenode->waitForUnit("hdfs-namenode");
+    $namenode->waitForUnit("network.target");
+    $namenode->waitForOpenPort(8020);
+    $namenode->waitForOpenPort(9870);
+
+    $datanode->waitForUnit("hdfs-datanode");
+    $datanode->waitForUnit("network.target");
+    $datanode->waitForOpenPort(9864);
+    $datanode->waitForOpenPort(9866);
+    $datanode->waitForOpenPort(9867);
+
+    $namenode->succeed("curl http://namenode:9870");
+    $datanode->succeed("curl http://datanode:9864");
+  '';
+})
diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix
new file mode 100644
index 0000000000000..e97cc1acc902e
--- /dev/null
+++ b/nixos/tests/hadoop/yarn.nix
@@ -0,0 +1,46 @@
+import ../make-test.nix ({pkgs, ...}: {
+  nodes = {
+    resourcemanager = {pkgs, config, ...}: {
+      services.hadoop.package = pkgs.hadoop_3_1;
+      services.hadoop.yarn.resourcemanager.enabled = true;
+      services.hadoop.yarnSite = {
+        "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler";
+      };
+      networking.firewall.allowedTCPPorts = [
+        8088 # resourcemanager.webapp.address
+        8031 # resourcemanager.resource-tracker.address
+      ];
+    };
+    nodemanager = {pkgs, config, ...}: {
+      services.hadoop.package = pkgs.hadoop_3_1;
+      services.hadoop.yarn.nodemanager.enabled = true;
+      services.hadoop.yarnSite = {
+        "yarn.resourcemanager.hostname" = "resourcemanager";
+        "yarn.nodemanager.log-dirs" = "/tmp/userlogs";
+        "yarn.nodemanager.address" = "0.0.0.0:8041";
+      };
+      networking.firewall.allowedTCPPorts = [
+        8042 # nodemanager.webapp.address
+        8041 # nodemanager.address
+      ];
+    };
+
+  };
+
+  testScript = ''
+    startAll;
+
+    $resourcemanager->waitForUnit("yarn-resourcemanager");
+    $resourcemanager->waitForUnit("network.target");
+    $resourcemanager->waitForOpenPort(8031);
+    $resourcemanager->waitForOpenPort(8088);
+
+    $nodemanager->waitForUnit("yarn-nodemanager");
+    $nodemanager->waitForUnit("network.target");
+    $nodemanager->waitForOpenPort(8042);
+    $nodemanager->waitForOpenPort(8041);
+
+    $resourcemanager->succeed("curl http://localhost:8088");
+    $nodemanager->succeed("curl http://localhost:8042");
+  '';
+})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 7da02d9c204aa..8ce9bc21ff775 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -43,7 +43,7 @@ let
           boot.loader.systemd-boot.enable = true;
         ''}
 
-        users.extraUsers.alice = {
+        users.users.alice = {
           isNormalUser = true;
           home = "/home/alice";
           description = "Alice Foobar";
@@ -51,6 +51,8 @@ let
 
         hardware.enableAllFirmware = lib.mkForce false;
 
+        services.udisks2.enable = lib.mkDefault false;
+
         ${replaceChars ["\n"] ["\n  "] extraConfig}
       }
     '';
@@ -250,6 +252,8 @@ let
               ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
               ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
 
+            services.udisks2.enable = mkDefault false;
+
             nix.binaryCaches = mkForce [ ];
             nix.extraOptions =
               ''
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index ed55b2ff58716..25629efbfa490 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         # should have no effect
         services.jenkinsSlave.enable = true;
 
-        users.extraUsers.jenkins.extraGroups = [ "users" ];
+        users.users.jenkins.extraGroups = [ "users" ];
 
         systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min";
       };
@@ -27,7 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
       { services.jenkinsSlave.enable = true;
 
-        users.extraUsers.jenkins.extraGroups = [ "users" ];
+        users.users.jenkins.extraGroups = [ "users" ];
       };
 
   };
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index 97ec79406b884..d2b561fa67b4c 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   enableOCR = true;
 
   testScript = { nodes, ... }: let
-    user = nodes.machine.config.users.extraUsers.alice;
+    user = nodes.machine.config.users.users.alice;
   in ''
     startAll;
     $machine->waitForText(qr/${user.description}/);
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
index e052ee988060b..0a5324259ada9 100644
--- a/nixos/tests/morty.nix
+++ b/nixos/tests/morty.nix
@@ -22,9 +22,9 @@ import ./make-test.nix ({ pkgs, ... }:
   testScript =
     { nodes , ... }:
     ''
-      startAll;
+      $mortyProxyWithKey->waitForUnit("default.target");
 
-      $mortyProxyWithKey->waitForUnit("morty");
+      $mortyProxyWithKey->waitForOpenPort(3001);
       $mortyProxyWithKey->succeed("curl -L 127.0.0.1:3001 | grep MortyProxy");
 
     '';
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
new file mode 100644
index 0000000000000..2950a8d809d6e
--- /dev/null
+++ b/nixos/tests/mpd.nix
@@ -0,0 +1,119 @@
+import ./make-test.nix ({ pkgs, ... }:
+  let
+    track = pkgs.fetchurl {
+      # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in
+      # License: http://creativecommons.org/licenses/by-sa/4.0/
+
+      name = "Blue_Wave_Theory-Skyhawk_Beach.mp3";
+      url = https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3;
+      sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp";
+    };
+
+    defaultCfg = rec {
+      user = "mpd";
+      group = "mpd";
+      dataDir = "/var/lib/mpd";
+      musicDirectory = "${dataDir}/music";
+    };
+
+    defaultMpdCfg = with defaultCfg; {
+      inherit dataDir musicDirectory user group;
+      enable = true;
+    };
+
+    musicService = { user, group, musicDirectory }: {
+      description = "Sets up the music file(s) for MPD to use.";
+      requires = [ "mpd.service" ];
+      after = [ "mpd.service" ];
+      wantedBy = [ "default.target" ];
+      script = ''
+        mkdir -p ${musicDirectory} && chown -R ${user}:${group} ${musicDirectory}
+        cp ${track} ${musicDirectory}
+        chown ${user}:${group} ${musicDirectory}/$(basename ${track})
+      '';
+    };
+
+    mkServer = { mpd, musicService, }:
+      { boot.kernelModules = [ "snd-dummy" ];
+        sound.enable = true;
+        services.mpd = mpd;
+        systemd.services.musicService = musicService;
+      };
+  in {
+    name = "mpd";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ emmanuelrosa ];
+    };
+
+  nodes =
+    { client = 
+      { config, pkgs, ... }: { };
+
+      serverALSA =
+        { config, pkgs, ... }: (mkServer {
+          mpd = defaultMpdCfg // {
+            network.listenAddress = "any";
+            extraConfig = ''
+              audio_output {
+                type "alsa"
+                name "ALSA"
+                mixer_type "null"
+              }
+            '';
+          };
+
+          musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
+        }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; };
+
+      serverPulseAudio =
+        { config, pkgs, ... }: (mkServer {
+          mpd = defaultMpdCfg // {
+            extraConfig = ''
+              audio_output {
+                type "pulse"
+                name "The Pulse"
+              }
+            '';
+          };
+
+          musicService = with defaultCfg; musicService { inherit user group musicDirectory; };
+        }) // { hardware.pulseaudio.enable = true; };
+    };
+
+  testScript = ''
+    my $mpc = "${pkgs.mpc_cli}/bin/mpc --wait";
+
+    # Connects to the given server and attempts to play a tune.
+    sub play_some_music {
+        my $server = $_[0];
+
+        $server->waitForUnit("mpd.service");
+        $server->succeed("$mpc update");
+        my @tracks = $server->execute("$mpc ls");
+
+        for my $track (split(/\n/, $tracks[1])) {
+            $server->succeed("$mpc add $track");
+        };
+
+        my @added_tracks = $server->execute("$mpc listall");
+        (length $added_tracks[1]) > 0 or die "Failed to add audio tracks to the playlist.";
+
+        $server->succeed("$mpc play");
+
+        my @status = $server->execute("$mpc status");
+        my @output = split(/\n/, $status[1]);
+        $output[1] =~ /.*playing.*/ or die "Audio track is not playing, as expected.";
+
+        $server->succeed("$mpc stop");
+    };
+
+    play_some_music($serverALSA);
+    play_some_music($serverPulseAudio);
+
+    $client->succeed("$mpc -h serverALSA status");
+
+    # The PulseAudio-based server is configured not to accept external client connections
+    # to perform the following test:
+    $client->fail("$mpc -h serverPulseAudio status");
+  '';
+})
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
new file mode 100644
index 0000000000000..5079779f35b42
--- /dev/null
+++ b/nixos/tests/opensmtpd.nix
@@ -0,0 +1,115 @@
+import ./make-test.nix {
+  name = "opensmtpd";
+
+  nodes = {
+    smtp1 = { pkgs, ... }: {
+      imports = [ common/user-account.nix ];
+      networking = {
+        firewall.allowedTCPPorts = [ 25 ];
+        useDHCP = false;
+        interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+          { address = "192.168.1.1"; prefixLength = 24; }
+        ];
+      };
+      environment.systemPackages = [ pkgs.opensmtpd ];
+      services.opensmtpd = {
+        enable = true;
+        extraServerArgs = [ "-v" ];
+        serverConfiguration = ''
+          listen on 0.0.0.0
+          # DO NOT DO THIS IN PRODUCTION!
+          # Setting up authentication requires a certificate which is painful in
+          # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
+          # WELL-CONTROLLED ENVIRONMENT!
+          accept from any for any relay
+        '';
+      };
+    };
+
+    smtp2 = { pkgs, ... }: {
+      imports = [ common/user-account.nix ];
+      networking = {
+        firewall.allowedTCPPorts = [ 25 143 ];
+        useDHCP = false;
+        interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+          { address = "192.168.1.2"; prefixLength = 24; }
+        ];
+      };
+      environment.systemPackages = [ pkgs.opensmtpd ];
+      services.opensmtpd = {
+        enable = true;
+        extraServerArgs = [ "-v" ];
+        serverConfiguration = ''
+          listen on 0.0.0.0
+          accept from any for local deliver to mda \
+            "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
+        '';
+      };
+      services.dovecot2 = {
+        enable = true;
+        enableImap = true;
+        mailLocation = "maildir:~/mail";
+        protocols = [ "imap" ];
+      };
+    };
+
+    client = { pkgs, ... }: {
+      networking = {
+        useDHCP = false;
+        interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+          { address = "192.168.1.3"; prefixLength = 24; }
+        ];
+      };
+      environment.systemPackages = let
+        sendTestMail = pkgs.writeScriptBin "send-a-test-mail" ''
+          #!${pkgs.python3.interpreter}
+          import smtplib, sys
+
+          with smtplib.SMTP('192.168.1.1') as smtp:
+            smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """
+              From: alice@smtp1
+              To: bob@smtp2
+              Subject: Test
+
+              Hello World
+            """)
+        '';
+
+        checkMailLanded = pkgs.writeScriptBin "check-mail-landed" ''
+          #!${pkgs.python3.interpreter}
+          import imaplib
+
+          with imaplib.IMAP4('192.168.1.2', 143) as imap:
+            imap.login('bob', 'foobar')
+            imap.select()
+            status, refs = imap.search(None, 'ALL')
+            assert status == 'OK'
+            assert len(refs) == 1
+            status, msg = imap.fetch(refs[0], 'BODY[TEXT]')
+            assert status == 'OK'
+            content = msg[0][1]
+            print("===> content:", content)
+            split = content.split(b'\r\n')
+            print("===> split:", split)
+            lastline = split[-3]
+            print("===> lastline:", lastline)
+            assert lastline.strip() == b'Hello World'
+        '';
+      in [ sendTestMail checkMailLanded ];
+    };
+  };
+
+  testScript = ''
+    startAll;
+
+    $client->waitForUnit("network.target");
+    $smtp1->waitForUnit('opensmtpd');
+    $smtp2->waitForUnit('opensmtpd');
+    $smtp2->waitForUnit('dovecot2');
+
+    $client->succeed('send-a-test-mail');
+    $smtp1->waitUntilFails('smtpctl show queue | egrep .');
+    $smtp2->waitUntilFails('smtpctl show queue | egrep .');
+    $client->succeed('check-mail-landed >&2');
+  '';
+}
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index b2d254e9d9d94..230b452068472 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -17,7 +17,7 @@ in {
         services.openssh.enable = true;
         security.pam.services.sshd.limits =
           [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
-        users.extraUsers.root.openssh.authorizedKeys.keys = [
+        users.users.root.openssh.authorizedKeys.keys = [
           snakeOilPublicKey
         ];
       };
@@ -29,7 +29,7 @@ in {
         services.openssh = { enable = true; startWhenNeeded = true; };
         security.pam.services.sshd.limits =
           [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
-        users.extraUsers.root.openssh.authorizedKeys.keys = [
+        users.users.root.openssh.authorizedKeys.keys = [
           snakeOilPublicKey
         ];
       };
diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix
new file mode 100644
index 0000000000000..8b19004874e76
--- /dev/null
+++ b/nixos/tests/ostree.nix
@@ -0,0 +1,21 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, lib, ... }: {
+  name = "ostree";
+
+  meta = {
+    maintainers = pkgs.ostree.meta.maintainers;
+  };
+
+  # TODO: Wrap/patch the tests directly in the package
+  machine = { pkgs, ... }: {
+    environment.systemPackages = with pkgs; [
+      gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
+    ];
+
+    environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
+  };
+
+  testScript = ''
+    $machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share");
+  '';
+})
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index 4364d6e354a65..eb5966d92139b 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -30,7 +30,7 @@ in
         enable = true;
       };
 
-      users.extraUsers.alice = {
+      users.users.alice = {
         isNormalUser = true;
         name = "alice";
         uid = 1000;
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index f3bd4c5915b01..e479d3f1cb8f0 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -6,13 +6,28 @@ import ./make-test.nix ({ pkgs, ...} :
     maintainers = [ ttuegel ];
   };
 
-  machine = { lib, ... }: {
+  machine = { lib, ... }:
+  let
+    sddm_theme = pkgs.stdenv.mkDerivation {
+      name = "breeze-ocr-theme";
+      phases = "buildPhase";
+      buildCommand = ''
+        mkdir -p $out/share/sddm/themes/
+        cp -r ${pkgs.plasma-workspace}/share/sddm/themes/breeze $out/share/sddm/themes/breeze-ocr-theme
+        chmod -R +w $out/share/sddm/themes/breeze-ocr-theme
+        printf "[General]\ntype=color\ncolor=#1d99f3\nbackground=\n" > $out/share/sddm/themes/breeze-ocr-theme/theme.conf
+      '';
+    };
+  in
+  {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.displayManager.sddm.enable = true;
+    services.xserver.displayManager.sddm.theme = "breeze-ocr-theme";
     services.xserver.desktopManager.plasma5.enable = true;
     services.xserver.desktopManager.default = "plasma5";
     virtualisation.memorySize = 1024;
+    environment.systemPackages = [ sddm_theme ];
 
     # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
     nixpkgs.config.packageOverrides = superPkgs: {
@@ -26,11 +41,10 @@ import ./make-test.nix ({ pkgs, ...} :
   enableOCR = true;
 
   testScript = { nodes, ... }: let
-    user = nodes.machine.config.users.extraUsers.alice;
+    user = nodes.machine.config.users.users.alice;
     xdo = "${pkgs.xdotool}/bin/xdotool";
   in ''
     startAll;
-
     # Wait for display manager to start
     $machine->waitForText(qr/${user.description}/);
     $machine->screenshot("sddm");
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 0ce37b55bb7b3..2381939552e23 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -26,6 +26,9 @@ let
       {
         services.postgresql.package=postgresql-package;
         services.postgresql.enable = true;
+
+        services.postgresqlBackup.enable = true;
+        services.postgresqlBackup.databases = [ "postgres" ];
       };
 
     testScript = ''
@@ -46,6 +49,10 @@ let
       $machine->succeed(check_count("SELECT * FROM sth;", 5));
       $machine->fail(check_count("SELECT * FROM sth;", 4));
       $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1));
+
+      # Check backup service
+      $machine->succeed("systemctl start postgresqlBackup-postgres.service");
+      $machine->succeed("zcat /var/backup/postgresql/postgres.sql.gz | grep '<test>ok</test>'");
       $machine->shutdown;
     '';
 
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 1ce2b81578426..ac91a89f66958 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -21,7 +21,7 @@ let
       enableOCR = true;
 
       testScript = { nodes, ... }: let
-        user = nodes.machine.config.users.extraUsers.alice;
+        user = nodes.machine.config.users.users.alice;
       in ''
         startAll;
         $machine->waitForText(qr/select your user/i);
diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix
index 7b939d836381a..5c76c58cf3f32 100644
--- a/nixos/tests/slim.nix
+++ b/nixos/tests/slim.nix
@@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   enableOCR = true;
 
   testScript = { nodes, ... }: let
-    user = nodes.machine.config.users.extraUsers.alice;
+    user = nodes.machine.config.users.users.alice;
   in ''
     startAll;
     $machine->waitForText(qr/Username:/);
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
index 35addb0ee8056..5d6c8691230aa 100644
--- a/nixos/tests/sudo.nix
+++ b/nixos/tests/sudo.nix
@@ -14,7 +14,7 @@ in
       { config, lib, pkgs, ... }:
       with lib;
       {
-        users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
+        users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
         users.users = {
           test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; };
           test1 = { isNormalUser = true; password = password; };
diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix
index 75be97a507d01..ab9b589f85930 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixos/tests/taskserver.nix
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }: let
     crlTemplate = pkgs.writeText "snakeoil-crl.template" ''
       expiration_days = -1
     '';
-    userCertTemplace = pkgs.writeText "snakoil-user-cert.template" ''
+    userCertTemplate = pkgs.writeText "snakeoil-user-cert.template" ''
       organization = snakeoil
       cn = server
       expiration_days = -1
@@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }: let
     certtool -p --bits 4096 | sed -n \
       -e '/^----* *BEGIN/,/^----* *END/p' > "$out/alice.key"
 
-    certtool -c --template "$userCertTemplace" \
+    certtool -c --template "$userCertTemplate" \
                 --load-privkey "$out/alice.key" \
                 --load-ca-privkey ca.key \
                 --load-ca-certificate "$cacert" \
@@ -82,8 +82,9 @@ in {
       # This is to avoid assigning a different network address to the new
       # generation.
       networking = lib.mapAttrs (lib.const lib.mkForce) {
+        interfaces.eth1.ipv4 = nodes.server.config.networking.interfaces.eth1.ipv4;
         inherit (nodes.server.config.networking)
-          hostName interfaces primaryIPAddress extraHosts;
+          hostName primaryIPAddress extraHosts;
       };
     };
 
diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix
new file mode 100644
index 0000000000000..24d46a03897e5
--- /dev/null
+++ b/nixos/tests/tor.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ lib, ... }: with lib;
+
+rec {
+  name = "tor";
+  meta.maintainers = with maintainers; [ joachifm ];
+
+  common =
+    { config, ... }:
+    { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];
+      networking.firewall.enable = false;
+      networking.useDHCP = false;
+    };
+
+  nodes.client =
+    { config, pkgs, ... }:
+    { imports = [ common ];
+      environment.systemPackages = with pkgs; [ netcat ];
+      services.tor.enable = true;
+      services.tor.client.enable = true;
+      services.tor.controlPort = 9051;
+    };
+
+  testScript = ''
+    $client->waitForUnit("tor.service");
+    $client->waitForOpenPort(9051);
+    $client->succeed("echo GETINFO version | nc 127.0.0.1 9051") =~ /514 Authentication required./ or die;
+  '';
+})
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 249571fcedec1..008dab8459c84 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -334,7 +334,7 @@ let
       virtualisation.memorySize = 2048;
       virtualisation.virtualbox.host.enable = true;
       services.xserver.displayManager.auto.user = "alice";
-      users.extraUsers.alice.extraGroups = let
+      users.users.alice.extraGroups = let
         inherit (config.virtualisation.virtualbox.host) enableHardening;
       in lib.mkIf enableHardening (lib.singleton "vboxusers");
     };
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 30bbcb2c83935..25f223d57441a 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchurl {
     urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
              "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc";
+    sha256 = "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
new file mode 100644
index 0000000000000..73cdd3664ea57
--- /dev/null
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake,
+  autogen, git, sqlite, gmp, zlib, fetchFromGitHub }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "clightning-${version}";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    fetchSubmodules = true;
+    owner = "ElementsProject";
+    repo = "lightning";
+    rev = "v${version}";
+    sha256 = "1xbi8c7kn21wj255fxnb9s0sqnzbn3wsz4p96z084k8mw1nc71vn";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ which sqlite gmp zlib autoconf libtool automake autogen python3 pkgconfig ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  configurePhase = ''
+    ./configure --prefix=$out --disable-developer --disable-valgrind
+  '';
+
+  postPatch = ''
+    echo "" > tools/refresh-submodules.sh
+    patchShebangs tools/generate-wire.py
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "A Bitcoin Lightning Network implementation in C";
+    longDescription= ''
+      c-lightning is a standard compliant implementation of the Lightning
+      Network protocol. The Lightning Network is a scalability solution for
+      Bitcoin, enabling secure and instant transfer of funds between any two
+      parties for any amount.
+    '';
+    homepage = https://github.com/ElementsProject/lightning;
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1a0e77dc12f1f..385e9e53522d2 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -6,6 +6,7 @@ rec {
 
   bitcoin  = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
+  clightning = callPackage ./clightning.nix { };
 
   bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; };
   bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; };
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 021764f5023f8..79c8e0dfde8ac 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.8.8";
+  version = "1.8.11";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -12,22 +12,11 @@ buildGoPackage rec {
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
   hardeningDisable = [ "fortify" ];
 
-  # Only install binaries in $out, source is not interesting and takes ~50M
-  outputs = [ "out" ];
-  preFixup = ''
-    export bin="''${out}"
-  '';
-  installPhase = ''
-    mkdir -p $out/bin $out
-    dir="$NIX_BUILD_TOP/go/bin"
-    [ -e "$dir" ] && cp -r $dir $out
-  '';
-
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "059nd2jvklziih679dd4cd34xjpj1ci7fha83wv86xjz61awyb16";
+    sha256 = "1b4za0hszb95jnj97g4xkrgcl0bydllznm0wj6rpi6cwmdr0h8na";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index 12cf5dcb71c1f..b930923e8f45d 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "litecoin-project";
     repo = "litecoin";
     rev = "v${version}";
-    sha256 = "01q0lj0grabyfh67ar984m9lv9xs0rakadkci8jpfbp8xw166r40";
+    sha256 = "1g79sbplkn2bnb17i2kyh1d64bjl3ihbx83n0xssvjaajn56hbzw";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 8c4722bd99171..a14a40e9cc759 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "12.1";
+  version = "14.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "10ng7qn6y31s2bjahmpivw2plx90ljjjzb87j3l7zmppsjd2iq03";
+    sha256 = "0jbv5a8sz403a1pqcgl32idk6y0z510h7ikjg1dcxla0rsch6ipl";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index 33e72125c6bde..b22302d0d39af 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -6,11 +6,11 @@ uiEnv = pkgs.callPackage ./env.nix { };
 
 in stdenv.mkDerivation rec {
   name = "parity-ui-${version}";
-  version = "0.2.5";
+  version = "0.2.8";
 
   src = fetchurl {
     url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
-    sha256 = "1jk7ac6qqxs47hf16vhr94ix4wf51qzpm55q8h6wsx1lrgy1y3g6";
+    sha256 = "1nyarq73jdknhax68cq2i868sznghzj70kvk4ixypxnjb1q6a53a";
     name = "${name}.deb";
   };
 
diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 3ba2495d45a23..a41488c48b509 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.10.6";
-  sha256      = "1x2sm262z8fdkx8zin6r8nwbb7znziw9nm224pr6ap3p0jmv7fcq";
-  cargoSha256 = "1wf1lh32f9dlhv810gdcssv92g1yximx09lw63m0mxcjbn9813bs";
+  version     = "1.10.9";
+  sha256      = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g";
+  cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf";
   patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index f47b04c1daea2..5be2bec6c7249 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -19,11 +19,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "particl-core-${version}";
-  version     = "0.16.0.5";
+  version     = "0.16.1.0";
 
   src = fetchurl {
     url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
-    sha256 = "070crn6nnzrbcaj30w0qbybpm9kfd2ghnvmxp29gckgknw6n0vam";
+    sha256 = "0rfqywyrl6cgxn3ba91zsa88ph2yf9d1vn706xpyz19pfb6mjfbg";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index dfa27aa9f2ebe..d21c3fd5efbd9 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -5,7 +5,7 @@
   name = "mma-${version}";
 
   src = fetchurl {
-    url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
+    url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
     sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww";
   };
 
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index b74d85b9dbfa0..e672e6f3bae18 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -8,7 +8,7 @@ in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
-      url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
+      url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
       sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774";
     };
 
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index 7ac1025c5027a..68a9bb63e2e02 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.9.5";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
     sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv";
   };
 
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
new file mode 100644
index 0000000000000..855d31aadbb08
--- /dev/null
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -0,0 +1,42 @@
+{ mkDerivation, fetchgit, lib
+, extra-cmake-modules, kdoctools
+, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
+, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
+, fftw, phonon, plasma-framework, threadweaver
+, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
+}:
+
+let
+  pname = "amarok";
+  version = "2.9.0-20180618";
+
+in mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchgit {
+    # master has the Qt5 version as of April 2018 but a formal release has not
+    # yet been made so change this back to the proper upstream when such a
+    # release is out
+    url    = git://anongit.kde.org/amarok.git;
+    # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    rev    = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96";
+    sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+  propagatedBuildInputs = [
+    qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
+    karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
+    phonon plasma-framework threadweaver
+    curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
+    pcre snappy taglib taglib_extras
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix
deleted file mode 100644
index a4ac2943bfbc2..0000000000000
--- a/pkgs/applications/audio/amarok/kf5.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ mkDerivation, fetchgit, lib
-, extra-cmake-modules, kdoctools
-, qca-qt5, qjson, qtscript, qtwebkit
-, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor
-, phonon, plasma-framework, threadweaver
-, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
-}:
-
-let
-  pname = "amarok";
-  version = "2.8.91-20170228";
-
-in mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchgit {
-    url    = git://anongit.kde.org/amarok.git;
-    # go back to the KDE mirror when kf5 is merged into master
-    # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    rev    = "323e2d5b43245c4c06e0b83385d37ef0d32920cb";
-    sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    qca-qt5 qjson qtscript qtwebkit
-    kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor
-    phonon plasma-framework threadweaver
-    curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
-    pcre snappy taglib taglib_extras
-  ];
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 6e411c8448f6f..19cb55d93c98d 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "3.9";
 
   src = fetchurl {
-    url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
+    url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
     sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
   };
 
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index d1c0c2afa83b9..a3ac2b097e95c 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "2.6.2";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz";
+    url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz";
     sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p";
   };
 
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 7f62d53af9efc..29cecb1699980 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "beast-0.7.1";
 
   src = fetchurl {
-    url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2";
+    url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2";
     sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
   };
 
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index 32daf000dc599..5f3229dc157c7 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2";
 
   src = fetchurl {
-    url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz";
+    url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz";
     sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
   };
 
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 82c32903bd865..94b43fc544ac4 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
+{ stdenv, fetchurl, fetchpatch, cairo, expat, fftwSinglePrec, fluidsynth, glib
 , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -6,10 +6,19 @@ stdenv.mkDerivation rec {
   version = "0.90.0";
 
   src = fetchurl {
-    url = "http://calf-studio-gear.org/files/${name}.tar.gz";
+    url = "https://calf-studio-gear.org/files/${name}.tar.gz";
     sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib";
   };
 
+  patches = [
+    # Fix memory leak in limiter
+    # https://github.com/flathub/com.github.wwmm.pulseeffects/issues/12
+    (fetchpatch {
+      url = https://github.com/calf-studio-gear/calf/commit/7afdefc0d0489a6227fd10f15843d81dc82afd62.patch;
+      sha256 = "056662iw6hp4ykwk4jyrzg5yarcn17ni97yc060y5kcnzy29ddg6";
+    })
+  ];
+
   buildInputs = [
     cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH
     libglade lv2 pkgconfig
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 760b04bef0050..96330d4e95571 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://xiph.org/paranoia;
+    homepage = https://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index c6509b5f460ee..4e2e75953f35d 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "deadbeef-mpris2-plugin-${version}";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75";
+    sha256 = "1j631z34rwxf6wdjpsf8c2f1saq6qas1qmkgsg63m6zzpwqyizw0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
index be941bc3db292..6c1536c0a6109 100644
--- a/pkgs/applications/audio/denemo/default.nix
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "2.2.0";
 
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
     sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh";
   };
 
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix
index 3e315e2d1a75f..ea0ce8cb5f30d 100644
--- a/pkgs/applications/audio/dr14_tmeter/default.nix
+++ b/pkgs/applications/audio/dr14_tmeter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3Packages, pkgs }:
 
 python3Packages.buildPythonApplication rec {
-  name = "dr14_tmeter-${version}";
+  pname = "dr14_tmeter";
   version = "1.0.16";
 
   disabled = !python3Packages.isPy3k;
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index c42d290c59937..e004e8c847cbb 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "drumgizmo-${version}";
 
   src = fetchurl {
-    url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
+    url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
     sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4";
   };
 
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index 36ce40490222d..a9d84eb6e6c56 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   version = "2.9.1";
 
   src = fetchurl {
-    url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz";
+    url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz";
     sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r";
   };
 
diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
index 4ef1f1dd20207..90ea4c58ea4aa 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   name = "elisa-${version}";
-  version = "0.1";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "elisa";
-    rev    = version;
-    sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w";
+    rev    = "v${version}";
+    sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 246e02c53c720..fc01a543e285e 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -2,13 +2,13 @@
   libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.16";
+  version = "4.0.17";
   pname = "fldigi";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7";
+    sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q";
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index 367b1db139d54..d7a46143939dd 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.0";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
   };
 
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index b92d4f6eb1e8a..e9ce20f6c80ac 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.1.0";
 
   src = fetchurl {
-    url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
     sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
   };
 
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 0cf5a3610038d..571f0a925adb1 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -4,8 +4,8 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  name = "gpodder-${version}";
-  version = "3.10.1";
+  pname = "gpodder";
+  version = "3.10.3";
 
   format = "other";
 
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
     owner = "gpodder";
     repo = "gpodder";
     rev = version;
-    sha256 = "1cqhm5h0kkdb2m691dbj8i3bixl7bw0iww2pl6k1jkz8mgafyd9d";
+    sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l";
   };
 
   postPatch = with stdenv.lib; ''
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index fae8d3e4b6057..0434b00c7053b 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pythonPackages, gettext, klick}:
 
 pythonPackages.buildPythonApplication rec {
-  name = "gtklick-${version}";
-  namePrefix = "";
+  pname = "gtklick";
   version = "0.6.4";
 
   src = fetchurl {
-    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
     sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
   };
 
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 62bc2fa6f36fa..5c34293e7f9ff 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.37.0";
+  version = "0.37.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6";
+    sha256 = "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai";
   };
 
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index b0fbced221138..cacbf428caa09 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.8.4";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
     sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01";
   };
 
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index e4d20db78682a..f11bba34c74ca 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.9.73";
 
   src = fetchurl {
-    url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz";
+    url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz";
     sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
   };
 
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 99c3e48ae84dc..f78110e8bbbf4 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation  rec {
   version = "1.6.0";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
   };
 
diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
index 4efdaa86084a7..cdf25c08378a6 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/pkgs/applications/audio/japa/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "japa-${version}";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
     sha256 = "1jhj7s4vqk5c4lchdall0kslvj5sh91902hhfjvs6r3a5nrhwcp0";
   };
 
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index d0ffbf29bcb22..296a4f86a8481 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "ladspa-sdk-${version}";
   version = "1.13";
   src = fetchurl {
-    url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
     sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
   };
 
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index e41d2ba96750b..01acc0d01f7ec 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "ladspa.h-${version}";
   version = "1.13";
   src = fetchurl {
-    url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
     sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
   };
 
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index d0c3eab69154f..2cb90081c68be 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "lastfmsubmitd-${version}";
-  namePrefix = ""; 
+  pname = "lastfmsubmitd";
   version = "1.0.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index fff1664933393..d2ef7434c4dbd 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchgit, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "lastwatch-${version}";
-  namePrefix = "";
+  pname = "lastwatch";
   version = "0.4.1";
 
   src = fetchgit {
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index 7f368fe6c2815..f173e41321f08 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.1.0";
 
   src = fetchurl {
-    url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
     sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
   };
 
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
new file mode 100644
index 0000000000000..d961393f9ec28
--- /dev/null
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
+, appstream-glib, desktop-file-utils, gobjectIntrospection
+, python36Packages, gnome3, glib, gst_all_1 }:
+
+stdenv.mkDerivation rec  {  
+  version = "0.9.519";
+  name = "lollypop-${version}";
+
+  src = fetchgit {
+    url = "https://gitlab.gnome.org/World/lollypop";
+    rev = "refs/tags/${version}";
+    fetchSubmodules = true;
+    sha256 = "1v4p59w4yf86djk7xv1xwbximpjm64wn42il090w7q1wy04my6fl";
+  };
+
+  nativeBuildInputs = with python36Packages; [
+    appstream-glib
+    desktop-file-utils
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    wrapGAppsHook
+    wrapPython
+  ];
+
+  buildInputs = [ glib ] ++ (with gnome3; [
+    easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser
+  ]) ++ (with gst_all_1; [
+    gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
+    gstreamer
+  ]);
+
+  pythonPath = with python36Packages; [
+    beautifulsoup4
+    gst-python
+    pillow
+    pycairo
+    pydbus
+    pygobject3
+    pylast
+  ];
+
+  postFixup = "wrapPythonPrograms";
+
+  postPatch = ''
+    chmod +x ./meson_post_install.py
+    patchShebangs ./meson_post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A modern music player for GNOME";
+    homepage    = https://wiki.gnome.org/Apps/Lollypop;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index c7d0caec8bf5a..e27aab6e898b5 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2.2";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
   };
 
diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix
index cee3469e3f532..b9b840682d743 100644
--- a/pkgs/applications/audio/mimms/default.nix
+++ b/pkgs/applications/audio/mimms/default.nix
@@ -1,31 +1,31 @@
 { fetchurl, stdenv, pythonPackages, libmms }:
 
-let version = "3.2";
-in
-  pythonPackages.buildPythonApplication {
-    name = "mimms-${version}";
-    src = fetchurl {
-      url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
-      sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
-    };
+pythonPackages.buildPythonApplication rec {
+  pname = "mimms";
+  version = "3.2";
 
-    postInstall = ''
-      wrapProgram $out/bin/mimms \
-        --prefix LD_LIBRARY_PATH : ${libmms}/lib
-    '';
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
+    sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
+  };
+
+  postInstall = ''
+    wrapProgram $out/bin/mimms \
+      --prefix LD_LIBRARY_PATH : ${libmms}/lib
+  '';
 
-    meta = {
-      homepage = https://savannah.nongnu.org/projects/mimms/;
-      license = stdenv.lib.licenses.gpl3;
-      description = "An mms (e.g. mms://) stream downloader";
+  meta = {
+    homepage = https://savannah.nongnu.org/projects/mimms/;
+    license = stdenv.lib.licenses.gpl3;
+    description = "An mms (e.g. mms://) stream downloader";
 
-      longDescription = ''
-        mimms is a program designed to allow you to download streams
-        using the MMS protocol and save them to your computer, as
-        opposed to watching them live. Similar functionality is
-        available in full media player suites such as Xine, MPlayer,
-        and VLC, but mimms is quick and easy to use and, for the time
-        being, remains a useful program.
-      '';
-    };
-  }
+    longDescription = ''
+      mimms is a program designed to allow you to download streams
+      using the MMS protocol and save them to your computer, as
+      opposed to watching them live. Similar functionality is
+      available in full media player suites such as Xine, MPlayer,
+      and VLC, but mimms is quick and easy to use and, for the time
+      being, remains a useful program.
+    '';
+  };
+}
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index f511fa6591499..60a0695ffecc9 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "2.0.0";
 
   src = fetchurl {
-    url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz";
+    url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz";
     sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
   };
 
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 55f3a667e06fa..1b3e89d4885e4 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   patches = [ ./buildfix.diff ];
 
   src = fetchurl {
-    url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
+    url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
     sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
   };
 
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index ad280d382d02f..753a273a08cc3 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -3,8 +3,7 @@
 }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-${version}";
-
+  pname = "mopidy";
   version = "2.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix
index e58cddd42942e..e9c5198092d56 100644
--- a/pkgs/applications/audio/mopidy/gmusic.nix
+++ b/pkgs/applications/audio/mopidy/gmusic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-gmusic-${version}";
+  pname = "mopidy-gmusic";
   version = "2.0.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index dcd2d6f5f5aed..a2d35f382b986 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.20.0";
+  version = "3.21.3";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1fva5ysik3af3x74l6059ngwsxrk9g6ml47wr5ck536k66i025ar";
+    sha256 = "0gp51zz5qr93w0h14m1blmjnlgmilyb15lw2m75varslw1ar7vlg";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix
index 063821544aed4..3e10904f3e69c 100644
--- a/pkgs/applications/audio/mopidy/local-images.nix
+++ b/pkgs/applications/audio/mopidy/local-images.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-local-images-${version}";
-
+  pname = "mopidy-local-images";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix
index 7aebc43dabbb5..6d0cc370ff346 100644
--- a/pkgs/applications/audio/mopidy/local-sqlite.nix
+++ b/pkgs/applications/audio/mopidy/local-sqlite.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-local-sqlite-${version}";
-
+  pname = "mopidy-local-sqlite";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index d2f525bffd1dc..b0abefd7a1fd0 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-musicbox-webclient-${version}";
-
+  pname = "mopidy-musicbox-webclient";
   version = "2.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix
index 098812961649e..8002feb0f9016 100644
--- a/pkgs/applications/audio/mopidy/soundcloud.nix
+++ b/pkgs/applications/audio/mopidy/soundcloud.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-soundcloud-${version}";
-
-  version = "2.0.2";
+  pname = "mopidy-soundcloud";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy-soundcloud";
     rev = "v${version}";
-    sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi";
+    sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv";
   };
 
   propagatedBuildInputs = [ mopidy ];
diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix
index 034a07bf027d2..4b75af5ed5798 100644
--- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix
+++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-spotify-tunigo-${version}";
-
+  pname = "mopidy-spotify-tunigo";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix
index 64b5ee629b339..9a6e1bef994c3 100644
--- a/pkgs/applications/audio/mopidy/spotify.nix
+++ b/pkgs/applications/audio/mopidy/spotify.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-spotify-${version}";
+  pname = "mopidy-spotify";
   version = "3.1.0";
 
   src = fetchurl {
diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix
index d3eb8539a19c0..b8e22a41cabf0 100644
--- a/pkgs/applications/audio/mopidy/youtube.nix
+++ b/pkgs/applications/audio/mopidy/youtube.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "mopidy-youtube-${version}";
-
+  pname = "mopidy-youtube";
   version = "2.0.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
new file mode 100644
index 0000000000000..9687ff3106bdc
--- /dev/null
+++ b/pkgs/applications/audio/muse/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, fetchFromGitHub
+, libjack2
+, qt5
+, cmake
+, libsndfile
+, libsamplerate
+, ladspaH
+, fluidsynth
+, alsaLib
+, rtaudio
+, lash
+, dssi
+, liblo
+, pkgconfig
+, gitAndTools
+}:
+
+stdenv.mkDerivation rec {
+  name = "muse-sequencer-${version}";
+  version = "3.0.2";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.muse-sequencer.org;
+    description = "MIDI/Audio sequencer with recording and editing capabilities";
+    longDescription = ''
+      MusE is a MIDI/Audio sequencer with recording and editing capabilities
+      written originally by Werner Schweer now developed and maintained
+      by the MusE development team.
+
+      MusE aims to be a complete multitrack virtual studio for Linux,
+      it is published under the GNU General Public License.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+  };
+
+  src =
+    fetchFromGitHub {
+      owner = "muse-sequencer";
+      repo = "muse";
+      rev = "02d9dc6abd757c3c1783fdd46dacd3c4ef2c0a6d";
+      sha256 = "0pn0mcg79z3bhjwxbss3ylypdz3gg70q5d1ij3x8yw65ryxbqf51";
+    };
+
+
+  buildInputs = [
+    libjack2
+    qt5.qtsvg
+    qt5.qttools
+    cmake
+    libsndfile
+    libsamplerate
+    ladspaH
+    fluidsynth
+    alsaLib
+    rtaudio
+    lash
+    dssi
+    liblo
+    pkgconfig
+    gitAndTools.gitFull
+  ];
+
+  sourceRoot = "source/muse3";
+
+  buildPhase = ''
+    cd ..
+    bash compile_muse.sh
+  '';
+
+  installPhase = ''
+    mkdir $out
+    cd build
+    make install
+  '';
+}
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 7ed9021e3e09b..a5c38a4774151 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.2.1";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner  = "musescore";
     repo   = "MuseScore";
     rev    = "v${version}";
-    sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs";
+    sha256 = "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd";
   };
 
   cmakeFlags = [
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index 6b50ee1426ce5..e65604e974afd 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "nova-filters-${version}";
 
   src = fetchurl {
-    url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz;
+    url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz;
     sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
   };
 
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index fe9ed12390a5b..5f95a60237f2d 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "paprefs-0.9.10";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
+    url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
     sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
   };
 
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index d113b8a49b313..4f64be02fd521 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "pavucontrol-3.0";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
+    url = "https://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
     sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk";
   };
 
diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 3670fb8347d69..faa914e132870 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "helmholtz";
 
   src = fetchurl {
-    url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip";
+    url = "https://www.katjaas.nl/helmholtz/helmholtz~.zip";
     name = "helmholtz.zip";
     curlOpts = "--user-agent ''";
     sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index 4f285552576c6..37d692a3ab5a6 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "20160130";
 
   src = fetchurl {
-    url = "http://www.chnry.net/data/puremapping-${version}-generic.zip";
+    url = "https://www.chnry.net/data/puremapping-${version}-generic.zip";
     name = "puremapping";
     sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7";
   };
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index 8b7c2121bd791..d56462ccc8443 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.4";
 
   src = fetchurl {
-    url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz";
+    url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz";
     sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
   };
 
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 677c60399e521..26f35f258651a 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,11 +1,10 @@
 { stdenv, python2Packages, fetchurl, gettext, chromaprint }:
 
 let
-  version = "1.4.2";
   pythonPackages = python2Packages;
-in pythonPackages.buildPythonApplication {
-  name = "picard-${version}";
-  namePrefix = "";
+in pythonPackages.buildPythonApplication rec {
+  pname = "picard";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index 55b9435baaa5f..1d3fffb549d79 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -4,7 +4,6 @@
 pythonPackages.buildPythonApplication rec {
   pname = "pithos";
   version = "1.1.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 00f58750408b3..e96b6f1909a53 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
 
 python2Packages.buildPythonApplication rec {
-  name = "puddletag-${version}";
+  pname = "puddletag";
   version = "1.2.0";
 
   src = fetchFromGitHub {
@@ -27,17 +27,6 @@ python2Packages.buildPythonApplication rec {
   doCheck = false;   # there are no tests
   dontStrip = true;  # we are not generating any binaries
 
-  installPhase = ''
-    runHook preInstall
-
-    siteDir=$(toPythonPath $out)
-    mkdir -p $siteDir
-    PYTHONPATH=$PYTHONPATH:$siteDir
-    ${python2Packages.python.interpreter} setup.py install --prefix $out
-
-    runHook postInstall
-  '';
-
   meta = with stdenv.lib; {
     homepage    = https://puddletag.net;
     description = "An audio tag editor similar to the Windows program, Mp3tag";
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
new file mode 100644
index 0000000000000..9e8b924d43d7f
--- /dev/null
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -0,0 +1,99 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, libxml2
+, desktop-file-utils
+, wrapGAppsHook
+, gst_all_1
+, pulseaudio
+, gtk3
+, glib
+, glibmm
+, gtkmm3
+, lilv
+, lv2
+, serd
+, sord
+, sratom
+, libbs2b
+, libsamplerate
+, libsndfile
+, boost
+, fftwFloat
+, calf
+, zam-plugins
+, rubberband
+, mda_lv2
+}:
+
+let
+  lv2Plugins = [
+    calf # limiter, compressor exciter, bass enhancer and others
+    mda_lv2 # loudness
+  ];
+  ladspaPlugins = [
+    rubberband # pitch shifting
+    zam-plugins # maximizer
+  ];
+in stdenv.mkDerivation rec {
+  name = "pulseeffects-${version}";
+  version = "4.1.5";
+
+  src = fetchFromGitHub {
+    owner = "wwmm";
+    repo = "pulseeffects";
+    rev = "v${version}";
+    sha256 = "1k5ibn4ilzhps91insvw07jd9x9yxhxl8pvfzgcm9ndvb8anifv4";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    libxml2
+    desktop-file-utils
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    pulseaudio
+    glib
+    glibmm
+    gtk3
+    gtkmm3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    lilv lv2 serd sord sratom
+    libbs2b
+    libsamplerate
+    libsndfile
+    boost
+    fftwFloat
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
+  preFixup = ''
+    addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0
+
+    gappsWrapperArgs+=(
+      --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}"
+      --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}"
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
+    homepage = https://github.com/wwmm/pulseeffects;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index aabd734301009..09249f7fbeaa5 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.1";
+  version = "0.5.2";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0jw1s4qh4qjxnysddjv3j2lchwlslj9p4iisv9i89d3m7pf1svs4";
+    sha256 = "0nqr5f82lry3i4if8wdmrqsw84m45ijyj4psll30plxx5732zzaz";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index e7073d0c95e9a..f1a22bd839a0d 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -8,7 +8,7 @@
 
 let optionals = stdenv.lib.optionals; in
 python3.pkgs.buildPythonApplication rec {
-  name = "quodlibet${tag}-${version}";
+  pname = "quodlibet${tag}";
   version = "4.1.0";
 
   # XXX, tests fail
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 5ec7375056ec4..24a2f1a8a6014 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
         if builtins.isNull releasePath then
         fetchurl {
-          url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
+          url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
           sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
         }
         else
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index d881afa7f5f05..e57d85de05a95 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.rosegardenmusic.com/;
+    homepage = https://www.rosegardenmusic.com/;
     description = "Music composition and editing environment";
     longDescription = ''
       Rosegarden is a music composition and editing environment based around
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
new file mode 100644
index 0000000000000..2495759593cff
--- /dev/null
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libsidplayfp }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.3";
+  name = "sidplayfp-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz";
+    sha256 = "04gqhxs4w0riabp1svgcs6gsxdmbfmrs4kaqr5lifvxjvv03vzsn";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsidplayfp ];
+
+  meta = with stdenv.lib; {
+    description = "A SID player using libsidplayfp";
+    homepage = https://sourceforge.net/projects/sidplay-residfp/;
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ dezgeg ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
new file mode 100644
index 0000000000000..3afd73493b05d
--- /dev/null
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
+, asio, alsaLib, avahi, libogg, libvorbis, flac }:
+
+let
+
+  popl = stdenv.mkDerivation rec {
+    name = "popl-${version}";
+    version = "1.1.0";
+
+    src = fetchFromGitHub {
+      owner = "badaix";
+      repo = "popl";
+      rev = "v${version}";
+      sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i";
+    };
+    nativeBuildInputs = [ cmake ];
+  };
+
+  aixlog = stdenv.mkDerivation rec {
+    name = "aixlog-${version}";
+    version = "1.2.1";
+
+    src = fetchFromGitHub {
+      owner = "badaix";
+      repo = "aixlog";
+      rev = "v${version}";
+      sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
+    };
+    nativeBuildInputs = [ cmake ];
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "snapcast-${version}";
+  version = "0.14.0";
+
+  src = fetchFromGitHub {
+    owner = "badaix";
+    repo = "snapcast";
+    rev = "v${version}";
+    sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ];
+
+  meta = with lib; {
+    description = "Synchronous multi-room audio player";
+    homepage = https://github.com/badaix/snapcast;
+    maintainers = with maintainers; [ fpletz ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 9b386ea7ac7ee..272d4b6592ac8 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.4";
+  name = "snd-18.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "1asc513d0cmbq0ldzpzmfbydvlj5hwpp480qnicgkn96wplp9c7s";
+    sha256 = "1m2rw1p9xr9428p9drd3w5irsi12lz23m605lzgk9gjamq9paywy";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 55c3dfa92e301..a3d418cd4fe43 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -4,7 +4,7 @@
 let
   inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
 in buildPythonApplication rec {
-  name = "sonata-${version}";
+  pname = "sonata";
   version = "1.7b1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index bdb9911d36508..d5f613b459455 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "2.4.1";
 
   src = fetchurl {
-    url = "http://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz";
     sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb";
   };
 
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 86eefc3955690..6614e37022470 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "spectrojack-${version}";
-  version = "0.4";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
-    sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx";
+    sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libjack2 fftwFloat gtk2 ];
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index d450cce7b86f1..535d53d99eeb0 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "0.8.2";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
     sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
   };
 
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 4140c5da5a459..78bd433835399 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
     homepage = http://tomahawk-player.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
+    broken = true; # 2018-06-25
   };
 }
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 6b9af119859ef..f815ac02e6e56 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       A set of command-line tools to manipulate Ogg Vorbis audio
       files, notably the `ogg123' player and the `oggenc' encoder.
     '';
-    homepage = http://xiph.org/vorbis/;
+    homepage = https://xiph.org/vorbis/;
     license = licenses.gpl2;
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 6bf45f451a5d7..3540869f36169 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "x42-plugins-${version}";
 
   src = fetchurl {
-    url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
+    url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
     sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl";
   };
 
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index c3e8efae7fe9d..2e335e6b10e94 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake mpd_clientlib openssl ];
 
   meta = {
-    homepage = http://www.ympd.org;
+    homepage = https://www.ympd.org;
     description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
     maintainers = [ stdenv.lib.maintainers.siddharthist ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0c85d72cc9018..65a3bbfdc0111 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.5.8";
+  version = "1.5.8.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0gwsr5srzy28hwqhfzrc8pswysmyra8kbww3bxfx8bq4mdjifdj6";
+    sha256 = "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index ef7aa96beb063..797a00f4fc4a4 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "deja-dup-${version}";
-  version = "36.3";
+  version = "38.0";
 
   src = fetchurl {
-    url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz";
-    sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc";
+    url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz";
+    sha256 = "1l3sa24v0v6xf312h36jikfi8zyx6z3nmc7pjzgdp7l89gkdm65v";
   };
 
   patches = [
@@ -19,8 +19,13 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit coreutils;
     })
+    ./hardcode-gsettings.patch
   ];
 
+  postPatch = ''
+    substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
+  '';
+
   nativeBuildInputs = [
     meson ninja pkgconfig vala_0_40 gettext itstool
     appstream-glib desktop-file-utils libxml2 wrapGAppsHook
diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
new file mode 100644
index 0000000000000..50bf2ba4fbd52
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
@@ -0,0 +1,38 @@
+--- a/deja-dup/nautilus/NautilusExtension.c
++++ b/deja-dup/nautilus/NautilusExtension.c
+@@ -24,6 +24,8 @@
+ #include <glib/gi18n-lib.h>
+ 
+ GList *dirs = NULL;
++GSettingsSchemaSource *schema_source = NULL;
++GSettingsSchema *schema = NULL;
+ GSettings *settings = NULL;
+ 
+ // This will treat a < b iff a is 'lower' in the file tree than b
+@@ -313,7 +315,13 @@
+   bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+   bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ 
+-  settings = g_settings_new("org.gnome.DejaDup");
++  schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@",
++    g_settings_schema_source_get_default (), TRUE, NULL);
++
++  schema = g_settings_schema_source_lookup (schema_source,
++                                            "org.gnome.DejaDup", FALSE);
++
++  settings = g_settings_new_full (schema, NULL, NULL);
+   g_signal_connect(settings, "changed::include-list",
+                    update_include_excludes, NULL);
+   g_signal_connect(settings, "changed::exclude-list",
+@@ -329,7 +337,11 @@
+ 
+ void nautilus_module_shutdown(void)
+ {
++  g_settings_schema_source_unref(schema_source);
++  g_settings_schema_unref(schema);
+   g_object_unref(settings);
++  schema_source = NULL;
++  schema = NULL;
+   settings = NULL;
+ 
+   update_include_excludes(); /* will clear it now that settings is NULL */
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
new file mode 100644
index 0000000000000..ef80aa00563fa
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "lightdm-mini-greeter-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "prikhi";
+    repo = "lightdm-mini-greeter";
+    rev = version;
+    sha256 = "1g3lrh034w38hiq96b0xmghmlf87hcycwdh06dwkdksr0hl08wxy";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ lightdm gtk3 ];
+
+  configureFlags = [ "--sysconfdir=/etc" ];
+  makeFlags = [ "configdir=$(out)/etc" ];
+
+  postInstall = ''
+    substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \
+      --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A minimal, configurable, single-user GTK3 LightDM greeter";
+    homepage = https://github.com/prikhi/lightdm-mini-greeter;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ mnacamura ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index a41f917a7ec2a..27b23bb571fc2 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -16,15 +16,14 @@ in mkDerivation rec {
     sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
   };
 
-  patches = [ ./sddm-ignore-config-mtime.patch ];
+  patches = [
+    ./sddm-ignore-config-mtime.patch
+    ./qt511.patch
+  ];
 
   postPatch =
-    # Module Qt5::Test must be included in `find_package` before it is used.
-    ''
-      sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
-    ''
     # Fix missing include for gettimeofday()
-    + ''
+    ''
       sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp
     '';
 
diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch
new file mode 100644
index 0000000000000..6430e60ed417f
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/qt511.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 005c9ad..71b46d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,7 @@ find_package(XCB REQUIRED)
+ find_package(XKB REQUIRED)
+ 
+ # Qt 5
+-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
++find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
+ 
+ # find qt5 imports dir
+ get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index c9d935a..bb85ddd 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE)
+ 
+ include_directories(../src/common)
+ 
+-
+ set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp)
+ add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
+ add_test(NAME Configuration COMMAND ConfigurationTest)
+ 
+-qt5_use_modules(ConfigurationTest Test)
++target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index a165fad370ecd..8a536bad9c486 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -16,6 +16,7 @@
 , fontconfig
 , freetype
 , libpulseaudio
+, libGL
 , libX11
 , libXext
 , libXi
@@ -97,6 +98,7 @@ let
           # For Android emulator
           libpulseaudio
           libX11
+          libGL
 
           # For GTKLookAndFeel
           gtk2
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 5e37ba47fa5fc..60566a0fcf89d 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
   };
   latestVersion = {
-    version = "3.2.0.16"; # "Android Studio 3.2 Canary 17"
-    build = "181.4823740";
-    sha256Hash = "04282zd28kn2a4rjsi0ikx4bc9ab668xm7cc87ga60pzyg5gmmgk";
+    version = "3.3.0.2"; # "Android Studio 3.3 Canary 3"
+    build = "181.4884283";
+    sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh";
   };
 in rec {
   # Old alias
@@ -40,9 +40,12 @@ in rec {
     };
   });
 
-  beta = mkStudio (stableVersion // {
+  beta = mkStudio (latestVersion // {
     pname = "android-studio-preview";
     #pname = "android-studio-beta"; # TODO: Rename and provide symlink
+    version = "3.2.0.20"; # "Android Studio 3.2 Beta 3"
+    build = "181.4868252";
+    sha256Hash = "17r7gvy317vh2r56yvhnn7dym0q6gs8r04fdr7hx53s9rb79sd1j";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (beta channel)";
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index a68c841d53bc7..142e9b789948d 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -21,6 +21,7 @@ let
       mv $out/usr/* $out/
       rm -r $out/share/lintian
       rm -r $out/usr/
+      sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname}
       # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname}
       wrapProgram $out/bin/${pname} \
         --prefix "PATH" : "${gvfs}/bin"
@@ -35,6 +36,8 @@ let
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${atomEnv.libPath}" \
         $share/resources/app/apm/bin/node
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
 
       dugite=$share/resources/app.asar.unpacked/node_modules/dugite
       rm -f $dugite/git/bin/git
@@ -53,17 +56,17 @@ let
       homepage = https://atom.io/;
       license = licenses.mit;
       maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];
-      platforms = [ "x86_64-linux" ];
+      platforms = platforms.x86_64;
     };
   };
 in stdenv.lib.mapAttrs common {
   atom = {
-    version = "1.27.2";
-    sha256 = "0xriv142asc82mjxzkqsafaqalxa3icz4781z2fsgyfkkw6zbz2v";
+    version = "1.28.1";
+    sha256 = "03phnbsc45i0r799ni9br7s4qjy05fczbca64jd0sr4jhzi7qmlx";
   };
 
   atom-beta = {
-    version = "1.28.0-beta3";
-    sha256 = "07mmzkbc7xzcwh6ylrs2w1g3l5gmyfk0gdmr2kzr6jdr00cq73y0";
+    version = "1.29.0-beta1";
+    sha256 = "121y716pnq4vpjrymr505prskvi5a2lnn8hw79q8b4hf7yz0j6rb";
   };
 }
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index c7e1dfe27364b..f93d4042a6226 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
+{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
 , libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
 , gconf, nss, xorg, libcap, systemd, libnotify, libsecret
 }:
 
 let
   packages = [
-    stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
+    stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
     fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 3a09b5c6be476..a2d246809c9d4 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -96,7 +96,7 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-platform-47; # always point to latest
+  eclipse-platform = eclipse-platform-48; # always point to latest
 
   eclipse-platform-46 = buildEclipse {
     name = "eclipse-platform-4.6.2";
@@ -128,6 +128,21 @@ rec {
     };
   };
 
+  eclipse-platform-48 = buildEclipse {
+    name = "eclipse-platform-4.8";
+    description = "Eclipse Platform Photon";
+    sources = {
+      "x86_64-linux" = fetchurl {
+        url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz;
+          sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz;
+          sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b";
+        };
+    };
+  };
+
   ### Eclipse Scala SDK
 
   eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
@@ -150,7 +165,7 @@ rec {
 
   ### Eclipse SDK
 
-  eclipse-sdk = eclipse-sdk-47; # always point to latest
+  eclipse-sdk = eclipse-sdk-48; # always point to latest
 
   eclipse-sdk-46 = buildEclipse {
     name = "eclipse-sdk-4.6.2";
@@ -182,6 +197,21 @@ rec {
     };
   };
 
+  eclipse-sdk-48 = buildEclipse {
+    name = "eclipse-sdk-4.8";
+    description = "Eclipse Photon Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz;
+          sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz;
+          sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917";
+        };
+    };
+  };
+
   eclipse-sdk-37 = buildEclipse {
     name = "eclipse-sdk-3.7";
     description = "Eclipse Classic";
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f381064c92cfd..8b03d93d18389 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -470,12 +470,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.7.3a";
+    version = "4.8";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip;
-      sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx";
+      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/org.eclipse.jdt-4.8.zip;
+      sha256 = "1my0d1114mx5gzxmwqlx0rcny39ly97ixlwx53ljk6qcryhdnr88";
     };
 
     meta = with stdenv.lib; {
@@ -487,6 +487,29 @@ rec {
     };
   };
 
+  jdt-codemining = buildEclipsePlugin rec {
+    name = "jdt-codemining-${version}";
+    version = "1.0.0.201806221018";
+
+    srcFeature = fetchurl {
+      url = "http://oss.opensagres.fr/jdt-codemining/snapshot/features/jdt-codemining-feature_${version}.jar";
+      sha256 = "1vy30rsb9xifn4r1r2n84d48g6riadzli1xvhfs1mf5pkm5ljwl6";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://oss.opensagres.fr/jdt-codemining/snapshot/plugins/org.eclipse.jdt.codemining_${version}.jar";
+      sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/angelozerr/jdt-codemining;
+      description = "Provides JDT Java CodeMining";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   rustdt = buildEclipseUpdateSite rec {
     name = "rustdt-${version}";
     version = "0.6.2";
@@ -532,11 +555,12 @@ rec {
 
   spotbugs = buildEclipseUpdateSite rec {
     name = "spotbugs-${version}";
-    version = "3.1.3";
+    version = "3.1.5";
 
     src = fetchzip {
+      stripRoot = false;
       url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
-      sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg";
+      sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 862739b4ed018..28775e48e1a7f 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "edbrowse-${version}";
-  version = "3.7.3";
+  version = "3.7.4";
 
   buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "CMB";
     repo = "edbrowse";
     rev = "v${version}";
-    sha256 = "19qdxigp0qv5vyy0hpn0czcc8papvivsjrxx7p367ihizm39yzla";
+    sha256 = "0i9ivyfy1dd16c89f392kwx6wxgkkpyq2hl32jhzra0fb0zyl0k6";
   };
   meta = with stdenv.lib; {
     description = "Command Line Editor Browser";
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 673b590f56eb8..aed976051f201 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, emacs, python }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.8.4";
   name = "cask-${version}";
 
   src = fetchFromGitHub {
     owner = "cask";
     repo = "cask";
     rev = "v${version}";
-    sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
+    sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686";
   };
 
   buildInputs = [ emacs python ];
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 2277ebef4ff08..884d1724ef8d5 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -3,14 +3,14 @@
 let
   modules = [
     { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; }
-    { name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; }
-    { name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; }
+    { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; }
+    { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; }
     { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; }
     { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; }
     { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; }
     { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; }
-    { name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; }
-    { name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; }
+    { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; }
+    { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; }
     { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; }
     { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; }
     { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; }
@@ -20,7 +20,7 @@ let
   forAll = f: map f modules;
 in
 stdenv.mkDerivation rec {
-  version = "2018-04-16";
+  version = "2018-07-02";
   name = "icicles-${version}";
 
   srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
index f82d467066a63..7867226ff8063 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An Emacs mode for editing Scala code";
 
-    homepage = http://www.scala-lang.org/node/354;
+    homepage = https://www.scala-lang.org/node/354;
 
     # non-copyleft, BSD-style
     license = "permissive";
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index c5cb0f4655e68..8f74aca44885f 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -6,7 +6,7 @@
 stdenv.mkDerivation rec {
   emacsVersion = "26.1";
   emacsName = "emacs-${emacsVersion}";
-  macportVersion = "7.0";
+  macportVersion = "7.1";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   builder = ./builder.sh;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "02dbasiv1szvlzi0avb7bi9xwpw2lssj3kzbn8pi5vmziqhvgfhz";
+    sha256 = "0d2ny54f68v3hjc2g3pkj83xv3yzv0hrwvn2cmpyb0jxjbsb2frc";
   };
 
   hiresSrc = fetchurl {
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
     sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk";
   };
 
+  patches = [ ./clean-env.patch ];
+
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig autoconf automake ];
 
-  buildInputs = [ ncurses libxml2 gnutls texinfo gettext ];
-
-  propagatedBuildInputs = [
+  buildInputs = [ ncurses libxml2 gnutls texinfo gettext
     AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
     ImageCaptureCore GSS ImageIO   # may be optional
   ];
@@ -75,10 +75,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    description = "GNU Emacs 25, the extensible, customizable text editor";
+    description = "The extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
+    maintainers = with maintainers; [ jwiegley matthewbauer ];
     platforms   = platforms.darwin;
 
     longDescription = ''
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       extensions are distributed with GNU Emacs; others are available
       separately.
 
-      This is "Mac port" addition to GNU Emacs 25. This provides a native
+      This is the "Mac port" addition to GNU Emacs 26. This provides a native
       GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later
       already contain the official GUI support via the NS (Cocoa) port for
       Mac OS X 10.4 and later. So if it is good enough for you, then you
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 4b14b13332041..997a4bd253c0d 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.6.13";
+  version = "1.6.14";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "1qs9v5r88scahpyw8ndr622fdnaib9789jvl2jnkwi62zcivbf6n";
+    sha256 = "1n8ni4bnw5vs7jx28v8r1vk69g2m1q5h9s6xpf8c0bxbcwwg2m5i";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index bedc299ee6732..799f58e5b68cc 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "geany-${version}";
 
   src = fetchurl {
-    url = "http://download.geany.org/${name}.tar.bz2";
+    url = "https://download.geany.org/${name}.tar.bz2";
     sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2";
   };
 
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 7a0399ea0f845..594f4ca8704a6 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ghostwriter";
-  version = "1.6.2";
+  version = "1.7.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "wereturtle";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12";
+    sha256 = "00nlk5gazlfnndanhhjj5hlvkkp9yfx5mj6jq0jz37mk8mn6rzln";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];
diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix
new file mode 100644
index 0000000000000..4657d0d10ad83
--- /dev/null
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, wrapGAppsHook
+, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
+let
+  version = "3.28.1";
+  pname = "gnome-latex";
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1z481izrx057wraphnr82kxnpmmi8nvl7jswyylzm22kfs0mw402";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+  configureFlags = ["--disable-dconf-migration"];
+
+  nativeBuildInputs = [
+    pkgconfig
+    wrapGAppsHook
+    itstool
+    intltool
+  ];
+
+  buildInputs = with gnome3; [
+    amtk
+    defaultIconTheme
+    glib
+    gsettings-desktop-schemas
+    gspell
+    gtksourceview4
+    libgee
+    libxml2
+    tepl
+  ];
+
+  doCheck = true;
+
+  passthru.updateScript = gnome3.updateScript { packageName = pname; };
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/GNOME-LaTeX;
+    description = "A LaTeX editor for the GNOME desktop";
+    maintainers = [ maintainers.manveru ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f6c446da35d16..060d1de5e045e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -237,119 +237,119 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.1.3";
+    version = "2018.1.5"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5";
+      sha256 = "0hd58i531schyjlm99vff9bi5gjskdbsljd367k9zafjfh53z91l"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
-    update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
+    update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
   };
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */
+      sha256 = "1m0qckq645jw7cj40m5vfgr212b8hji539skavch2j5s5fbqy3ln"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
-    update-channel = "datagrip_2018_1";
+    update-channel = "DataGrip 2018.1";
   };
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */
+      sha256 = "1ipib91443sb27snnqik8rm3bm9w6gb5niildbd538lhc9agc9xb"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
-    update-channel = "goland_release";
+    update-channel = "GoLand Release";
   };
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.1.4"; /* updated by script */
+    version = "2018.1.5"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1qb425wg4690474g348yizhkcqcgigz2synp4blcfv4p0pg79ri6"; /* updated by script */
+      sha256 = "0bhajghwh5r5mdv3lbnq0xlr6669hid5kyzlsxnsfzc2z737zwc5"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
-    update-channel = "IDEA_Release";
+    update-channel = "IntelliJ IDEA Release";
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.1.4"; /* updated by script */
+    version = "2018.1.5"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "0jn771z09bscnk283kwrki0zyzhh4v4n6mr2swbd0ccs9v12dx71"; /* updated by script */
+      sha256 = "046wyvk2f7vbh4zam1bbri4yxzb34q43rjpk6i6npxrb25jv6clx"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
-    update-channel = "IDEA_Release";
+    update-channel = "IntelliJ IDEA Release";
   };
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2018.1.4"; /* updated by script */
+    version = "2018.1.6"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */
+      sha256 = "0v07sfg7ywawk6wb52zhr3753hscpxw3m53ppgw4n50dcdwx0kdn"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
-    update-channel = "PS2018.1";
+    update-channel = "PhpStorm 2018.1";
   };
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */
+      sha256 = "0frzasqh3jx7wcip4dnwdl9ap2g1nkx7anapwd416cxv4jj3r5ch"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
-    update-channel = "PyCharm_Release";
+    update-channel = "PyCharm Release";
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */
+      sha256 = "1kv1d5y2ph36aq91sq08lbz8hvfp765xi7m0hdwkhqdi2wkrpnkc"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
-    update-channel = "PyCharm_Release";
+    update-channel = "PyCharm Release";
   };
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */
+      sha256 = "1jsj0g4mv7fci3jgwx9skaz2m40g3ray2n17djaln08731rls5cc"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
-    update-channel = "rider_2018_1";
+    update-channel = "Rider 2018.1.2";
   };
 
   ruby-mine = buildRubyMine rec {
@@ -362,20 +362,20 @@ in
       sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
-    update-channel = "rm2018.1";
+    update-channel = "RubyMine 2018.1";
   };
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.5"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */
+      sha256 = "1mqms8gzmsaqvwzfk821vj1z1cxdgjw5nnwq63mag6rly04h60n6"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
-    update-channel = "WS_Release";
+    update-channel = "WebStorm Release";
   };
 
 }
diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index a0479fc911250..b4a96228db40d 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -17,7 +17,7 @@ sub get_latest_versions {
   my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs;
   my %h = {};
   for my $ch (@channels) {
-    my ($id) = $ch =~ /^<channel id="([^"]+)"/;
+    my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/;
     my @builds = $ch =~ /(<build .+?<\/build>)/gs;
     my $latest_build = reduce {
       my ($aversion) = $a =~ /^<build [^>]*version="([^"]+)"/; die "no version in $a" unless $aversion;
diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix
index 14fdcce1c8e58..5e6406e33f286 100644
--- a/pkgs/applications/editors/jupp/default.nix
+++ b/pkgs/applications/editors/jupp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     urls = [
       "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz"
-      "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ];
+      "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ];
     sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s";
   };
 
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index e8e529b63abcf..66112b3498dd5 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "monodevelop-${version}";
 
   src = fetchurl {
-    url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
     sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji";
   };
 
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index c29cbe52872e6..fb0ce43a60e6e 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.9.7";
+  version = "2.9.8";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn";
+    sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index b090b0c84f962..f47688b828020 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
+{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
 , libtool, libuv, luaPackages, ncurses, perl, pkgconfig
 , unibilium, vimUtils, xsel, gperf, callPackage
 , libvterm-neovim
@@ -11,13 +11,13 @@ let
 
   neovim = stdenv.mkDerivation rec {
     name = "neovim-unwrapped-${version}";
-    version = "0.2.2";
+    version = "0.3.0";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "1dxr29d0hyag7snbww5s40as90412qb61rgj7gd9rps1iccl9gv4";
+      sha256 = "10c8y309fdwvr3d9n6vm1f2c0k6pzicnhc64l2dvbw1lnabp04vv";
     };
 
     enableParallelBuilding = true;
@@ -32,6 +32,7 @@ let
       luaPackages.lua
       gperf
     ] ++ optional withJemalloc jemalloc
+      ++ optional stdenv.isDarwin libiconv
       ++ lualibs;
 
     nativeBuildInputs = [
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 49b08534cd8c9..b0c834934f9c4 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 pythonPackages.buildPythonPackage rec {
-  name = "neovim-remote-${version}";
+  pname = "neovim-remote";
   version = "2.0.5";
   disabled = !pythonPackages.isPy3k;
 
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index a23c5242a24b1..9af60ca4fcbd8 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -15,7 +15,7 @@ in
 stdenv.mkDerivation {
   name = "netbeans-8.2";
   src = fetchurl {
-    url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip;
+    url = https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip;
     sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d";
   };
 
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index 0bcbad58b3a2e..e806e63cdbf62 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -4,7 +4,7 @@ let
   pythonPackages = python2Packages;
 in pythonPackages.buildPythonApplication rec {
   version = "0.9.7";
-  name = "nvpy-${version}";
+  pname = "nvpy";
 
   src = fetchurl {
     url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 1a0e6e54fb3e7..9456ea3150a44 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -1,10 +1,10 @@
 { lib, buildPythonApplication, fetchFromGitHub
-, gdk_pixbuf, glib, gtk3, pango, webkitgtk
+, gdk_pixbuf, glib, gobjectIntrospection, gtk3, pango, webkitgtk
 , pygobject3, pyyaml
 }:
 
 buildPythonApplication rec {
-  name = "rednotebook-${version}";
+  pname = "rednotebook";
   version = "2.3";
 
   src = fetchFromGitHub {
@@ -17,6 +17,8 @@ buildPythonApplication rec {
   # We have not packaged tests.
   doCheck = false;
 
+  nativeBuildInputs = [ gobjectIntrospection ];
+
   propagatedBuildInputs = [
     gdk_pixbuf glib gtk3 pango webkitgtk
     pygobject3 pyyaml
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 76a00c44ebbe9..2f4693982a9c0 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.0.5";
 
   src = fetchurl {
-    url = http://www.scintilla.org/scite405.tgz;
+    url = https://www.scintilla.org/scite405.tgz;
     sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.scintilla.org/SciTE.html;
+    homepage = https://www.scintilla.org/SciTE.html;
     description = "SCIntilla based Text Editor";
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 938f381747966..790c4ea45c02c 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
-  version = "2.12.8";
+  version = "2.12.10";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
     repo = pname;
     rev = version;
-    sha256 = "0f1az7398rnxmm3m9b2jcz7pd9x445fjsv8w85k2j261n5cyfqx2";
+    sha256 = "0mkx7fym41hwd7cdg31ji2hxlv3gxx0sa6bnap51ryxmq8sxdjhq";
   };
 
   nativeBuildInputs = [ qt5.qmake pkgconfig ];
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index e55bcb48787fc..aa3b4b99d7a07 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.02";
 
   src = fetchurl {
-    url = "http://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz";
+    url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz";
     sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v";
   };
 
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index efde7242793d4..082bc2a2536c3 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
-  version = "0.9.48";
+  version = "0.9.53";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "36a7c5f855306bcbe3364d12aca94c2f6d013a013e59b46f89df81496ec11800";
+        sha256 = "02k6x30l4mbjragqbq5rn663xbw3h4bxzgppfxqf5lwydswldklb";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "7197c526918a791b15b701846f9f2f1747a5b8ceac77c4cba691ee6d74d07d1d";
+        sha256 = "1wyq1ri0wwdy7slbd9dwyrdynsaa644x44c815jl787sg4nhas6y";
       }
     ;
 
@@ -80,7 +80,6 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/typora \
       "''${gappsWrapperArgs[@]}" \
       --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \
       --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share"
 
     # Fix the desktop link
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index a93054a9aeb8e..2ce6563be0bd5 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.1.0001";
+  version = "8.1.0146";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6";
+    sha256 = "1v33h08j15zii0ipw5py18ghsaxlbar0nyx365z1acjhk4vhn9nb";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 4b1d26742d699..d79a50855f390 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
-  makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
+  gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.24.0";
+  version = "1.25.0";
   channel = "stable";
 
   plat = {
@@ -12,15 +12,16 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "17dvyp31kf12mfs6z3cm8rxfrvrmbrk9gbsk3z7v284z64dry9vz";
-    "x86_64-linux" = "11m50lb0hvnmvb3qdixgpvdzcljzm94qxl41240g4qh4a36qvr1j";
-    "x86_64-darwin" = "1wm6h3f8b33rky5nlrvwx4qx0k9h72aabiz6sm27x1wrs486p3lf";
+    "i686-linux" = "1dgn9swqax54pn5ykk97zdkkzyj46jambmnkb67cn44p29bw9s9m";
+    "x86_64-linux" = "0w2lzif7iilibvwhvg13gxarwz41qsb72s8hvj87mk5iqfdms1px";
+    "x86_64-darwin" = "08xhwvggflzh9lfc5s3jgrqb49yz4jdfii8sfq6v8w3c6yy8cdly";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
 
   rpath = lib.concatStringsSep ":" [
     atomEnv.libPath
+    "${lib.makeLibraryPath [gtk2]}"
     "${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0"
     "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1"
     "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1"
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index c54c8a4277f1e..9b0d69ae65aac 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -12,7 +12,7 @@
         # When the extension is already available in the default extensions set.
         vscodeExtensions = with vscode-extensions; [
           bbenoist.Nix
-        ]   
+        ]
 
         # Concise version from the vscode market place when not available in the default set.
         ++ vscode-utils.extensionsFromVscodeMarketplace [
@@ -26,11 +26,11 @@
       }
       ~~~
 
-      This expression should fetch 
+      This expression should fetch
        -  the *nix* vscode extension from whatever source defined in the
           default nixpkgs extensions set `vscodeExtensions`.
 
-       -  the *code-runner* vscode extension from the marketplace using the 
+       -  the *code-runner* vscode extension from the marketplace using the
           following url:
 
           ~~~
@@ -72,6 +72,11 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
   meta = vscode.meta;
 } ''
   mkdir -p "$out/bin"
+  mkdir -p "$out/share/applications"
+  mkdir -p "$out/share/pixmaps"
+
+  ln -sT "${vscode}/share/applications/code.desktop" "$out/share/applications/code.desktop"
+  ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
   ${if [] == vscodeExtensions
     then ''
       ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}"
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index b2404df8e56ee..a64e9a18e1ad5 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -6,7 +6,7 @@
 stdenv.mkDerivation {
   name = "grass-7.2.2";
   src = fetchurl {
-    url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz;
+    url = https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz;
     sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv";
   };
 
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 279d83e92193e..02e874739efe0 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://qgis.org/downloads/${name}.tar.bz2";
+    url = "https://qgis.org/downloads/${name}.tar.bz2";
     sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g";
   };
 
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
new file mode 100644
index 0000000000000..f6adf7857ede0
--- /dev/null
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform , fetchFromGitHub, Security }:
+rustPlatform.buildRustPackage rec {
+  name = "whitebox_tools-${version}";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "jblindsay";
+    repo = "whitebox-tools";
+    rev = "6221cdf327be70f0ee4f2053b76bfa01c3f37caa";
+    sha256 = "1423ga964mz7qkl88vkcm8qfprsksx04aq4sz9v5ghnmdzzvl89x";
+  };
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
+  cargoSha256 = "1gbgirng21ak0kl3fiyr6lxwzrjd5v79gcrbzf941nb8y8rlvz7k";
+
+  meta = with stdenv.lib; {
+    description = "An advanced geospatial data analysis platform";
+    homepage = http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html;
+    license = licenses.mit;
+    maintainers = [ maintainers.mpickering ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 9e97a1d755aad..63cf950f02a4e 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
-, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
 , ApplicationServices
 , buildPlatform, hostPlatform
 }:
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-35";
-    sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz";
+    version = "7.0.8-6";
+    sha256 = "1v7m1g9a7fqc8nravvv3dy54nzd3ip75hcnkdrpb5wbiz9pqgzi3";
     patches = [];
   };
 in
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ zlib fontconfig freetype ghostscript
-      libpng libtiff libxml2
+      libpng libtiff libxml2 libheif
     ]
     ++ lib.optionals (!hostPlatform.isMinGW)
       [ openexr librsvg openjpeg ]
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 3af6e19b70110..b767f11da00b7 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
-, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
 , ApplicationServices
 , buildPlatform, hostPlatform
 }:
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ zlib fontconfig freetype ghostscript
-      libpng libtiff libxml2
+      libpng libtiff libxml2 libheif libde265
     ]
     ++ lib.optionals (!hostPlatform.isMinGW)
       [ openexr librsvg openjpeg ]
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 89a728f1a9977..fbf6443b91f85 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "2.26.4";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "0qbir023zyd53ly6y8zcm3kbhbhjjpclcgp9d0mqb5lc9zajxv12";
+    sha256 = "1qvyc08i3b4rr43ssz78xndm4bx8lz2vigh6w9gd7w367xjf4f5b";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 4de49524f82fe..ac44a1e875c05 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -3,15 +3,16 @@
 , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
 , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt
 , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
+, ocl-icd
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.3";
+  version = "2.4.4";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x";
+    sha256 = "0kdhmiw4wxk2w9v2hms9yk8nl4ymdshnqyj0l07nivzzr6w20hwn";
   };
 
   nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
@@ -21,9 +22,9 @@ stdenv.mkDerivation rec {
     libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
     libsoup graphicsmagick json-glib openjpeg lua pugixml
     colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme
-    osm-gps-map
+    osm-gps-map ocl-icd
   ];
-
+    
   cmakeFlags = [
     "-DBUILD_USERMANUAL=False"
   ];
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
   # the wrappers:
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
+      --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable:${ocl-icd}/lib"
     )
   '';
 
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
index 9984c0222a021..821a9e8083e15 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -3,7 +3,8 @@
  , argyllcms, wxPython, numpy
  }:
 buildPythonPackage {
-  name = "displaycal-3.5.0.0";
+  pname = "displaycal";
+  version = "3.5.0.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index 4bc0e93a3b460..7667b674fcec6 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,7 +1,6 @@
 { stdenv, pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "dosage";
   version = "2018.04.08";
   PBR_VERSION = version;
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index e698fb8f23418..34e7b1f23088f 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
 
-assert fltk.glSupport;
-
 stdenv.mkDerivation {
   name ="openexr_viewers-2.2.1";
 
@@ -14,14 +12,14 @@ stdenv.mkDerivation {
     ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
   '';
 
-  buildPahse = ''
+  buildPhase = ''
     make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
   '';
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
 
-  meta = { 
+  meta = {
     description = "Application for viewing OpenEXR images on a display at various exposure settings";
     homepage = http://openexr.com;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 2e91f7873501d..33d65a860764e 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -3,11 +3,11 @@
 , epoxy, poppler, mesa_noglu, lirc }:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.13";
+  name = "fbida-2.14";
   
   src = fetchurl {
     url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8";
+    sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     mesa_noglu
   ];
   
-  makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ];
+  makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ];
 
-  patchPhase =
-    ''
+  patchPhase = ''
     sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
-    '';
+    sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile
+  '';
 
   meta = with stdenv.lib; {
     description = "Image viewing and manipulation programs";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index eb7daf2797bf0..4ec4b76ac0471 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.26.3";
+  version = "2.27";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz";
+    sha256 = "0kn6cka9m76697i495npd60ad64jnfnzv5z6znzyr0vlxx2nhcmg";
   };
 
   outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 87565a1e53e52..6362d6c06fe92 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
-, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran
+, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran, fetchpatch
 , soqt, libf2c, makeWrapper, makeDesktopItem
 , mpi ? null }:
 
@@ -16,9 +16,18 @@ in stdenv.mkDerivation rec {
     sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df";
   };
 
-  buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
-    zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile
-    pycollada pyside pysideShiboken pysideTools pivy
+  buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts
+    zlib  swig gfortran soqt libf2c makeWrapper  mpi vtk hdf5 medfile
+  ] ++ (with pythonPackages; [
+    matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost
+  ]);
+
+  patches = [
+    # Fix for finding boost_python. Boost >= 1.67.0 appends the Python version.
+    (fetchpatch {
+      url = https://github.com/FreeCAD/FreeCAD/commit/3c9e6b038ed544e446c61695dab62f83e781a28a.patch;
+      sha256 = "0f09qywzn0y41hylizb5g8jy74fi53iqmvqr5zznaz16wpw4hqbp";
+    })
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index f92594f08e167..8e18d531605c1 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -2,18 +2,18 @@
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
 , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
 , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
-, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr
+, harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr
 , AppKit, Cocoa, gtk-mac-integration }:
 
 let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   name = "gimp-${version}";
-  version = "2.10.2";
+  version = "2.10.4";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w";
+    sha256 = "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
     freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
-    libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp
+    libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
     python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
     ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index c1f15904818ff..2d4fa882dd61b 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.4.0";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
+    url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
     sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl";
   };
 
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 98a32ad189954..78772a63dfe31 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "gocr-0.51";
 
   src = fetchurl {
-    url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
+    url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
     sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf";
   };
 
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 872afb39ec6ff..2c322128c3869 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "graphicsmagick-${version}";
-  version = "1.3.29";
+  version = "1.3.30";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1";
+    sha256 = "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr";
   };
 
   patches = [
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
index 673361c734e13..0bbd543a30769 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -12,7 +12,7 @@ let
     version = "150";
 
     src = fetchurl {
-      url = "http://wsr.imagej.net/distros/cross-platform/ij150.zip";
+      url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
       sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
     };
     buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index 90f8eec5993a8..a881c0fc1f931 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "imlibsetroot-${version}";
   version = "1.2";
   src = fetchurl {
-    url = "http://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz";
+    url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz";
     sha256 = "8c1b3b7c861e4d865883ec13a96b8e4ab22464a87d4e6c67255b17a88e3cfd1c";
   };
 
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 7eb9e7aa00165..639f1928f8a4b 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
   };
 
+  # Inkscape hits the ARGMAX when linking on macOS. It appears to be
+  # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS.
+  # Setting strictDeps it avoids duplicating some dependencies so it
+  # will leave us under ARGMAX.
+  strictDeps = true;
+
   unpackPhase = ''
     cp $src ${name}.tar.bz2
     tar xvjf ${name}.tar.bz2 > /dev/null
@@ -33,19 +39,19 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ];
   buildInputs = [
-    perl perlXMLParser libXft libpng zlib popt boehmgc
+    libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
-    makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace cmake python2Env
+    gsl poppler imagemagick libwpg librevenge
+    libvisio libcdr libexif potrace
   ];
 
   enableParallelBuilding = true;
 
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
-    rm "$out/share/icons/hicolor/icon-theme.cache"
+    rm -f "$out/share/icons/hicolor/icon-theme.cache"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
     install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
index b428be1a1ba39..ba64aae621599 100644
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "jpegoptim-${version}";
 
   src = fetchurl {
-    url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
     sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8";
   };
 
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index d27fdb8b53beb..48a94a5253d01 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Plugins for KDE-based image applications";
     license = stdenv.lib.licenses.gpl2;
-    homepage = http://www.digikam.org;
+    homepage = https://www.digikam.org;
     maintainers = with stdenv.lib.maintainers; [ ttuegel ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 690253947a18e..1fd19162a4f76 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -2,18 +2,19 @@
 , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
-, boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr
+, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
 , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
 , qtmultimedia, qtx11extras
+, python3
 }:
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.0.3";
+  version = "4.1.0";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr";
+    sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -21,9 +22,10 @@ mkDerivation rec {
   buildInputs = [
     karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
     ki18n kitemmodels kitemviews kwindowsystem kio kcrash
-    boost libraw fftw eigen exiv2 lcms2 gsl openexr
+    boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
     openjpeg opencolorio vc poppler_qt5 curl ilmbase
     qtmultimedia qtx11extras
+    python3
   ];
 
   NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix
new file mode 100644
index 0000000000000..2858086e0d643
--- /dev/null
+++ b/pkgs/applications/graphics/krop/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "krop";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "arminstraub";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    pyqt5
+    pypdf2
+    poppler-qt5
+    libsForQt5.poppler
+    ghostscript
+  ];
+
+  # Disable checks because of interference with older Qt versions // xcb
+  doCheck = false;
+
+  meta = {
+    homepage = http://arminstraub.com/software/krop;
+    description = "Graphical tool to crop the pages of PDF files";
+    longDescription = ''
+    Krop is a tool that allows you to optimise your PDF files, and remove
+    sections of the page you do not want.  A unique feature of krop, at least to my
+    knowledge, is its ability to automatically split pages into subpages to fit the
+    limited screensize of devices such as eReaders. This is particularly useful, if
+    your eReader does not support convenient scrolling. Krop also has a command line
+    interface.
+    '';
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ leenaars ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index 33785a279c7b4..b48fd891a6ac1 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libpng, nasm }:
 
 stdenv.mkDerivation rec {
-  version = "3.2";
+  version = "3.3.1";
   name = "mozjpeg-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz";
-    sha256 = "0wvv5qh1jasz8apq93c3j9d5wd22j7lld9dr06p76yj4mpnc3v4a";
+  src = fetchFromGitHub {
+    owner = "mozilla";
+    repo = "mozjpeg";
+    rev = "v${version}";
+    sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky";
   };
 
-  postPatch = ''
-    sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libpng nasm ];
 
   meta = {
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 675c4e6a49ef7..1103c9ff40a95 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -18,12 +18,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.8.1";
+  version = "3.10.0";
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
     rev = version;
-    sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla";
+    sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv";
   };
 
   name = "nomacs-${version}";
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 0e52190af4200..de75827100480 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -2,7 +2,7 @@
   # build dependencies
   alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
   freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
-  glibc, udev
+  glibc, systemd
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ar p "$src" data.tar.xz | tar xJ
   '';
 
-  buildPhase = ":";
+  dontBuild = true;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     chmod a+x $out/opt/Pencil/libffmpeg.so
 
     # fix missing libudev
-    ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1
+    ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/Pencil/libudev.so.1
     wrapProgram $out/opt/Pencil/pencil \
       --prefix LD_LIBRARY_PATH : $out/opt/Pencil
   '';
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index f1a58d4e21b8e..02f5f33f6e6b6 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation (rec {
   name = "qiv-${version}";
 
   src = fetchurl {
-    url = "http://spiegl.de/qiv/download/${name}.tgz";
+    url = "https://spiegl.de/qiv/download/${name}.tgz";
     sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
   };
 
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index 42d129e538879..df44c132ed965 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
+        url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
         sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
       }
     else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 1fb8d572e95b5..82a4989687285 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "scantailor-advanced-${version}";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
     owner = "4lex4";
     repo = "scantailor-advanced";
     rev = "v${version}";
-    sha256 = "1h7lng0hxkjcvwbdf1yx59a382kiwn9bpll42acqs71nsvw65p28";
+    sha256 = "031jqk64ig6lmscl5yg5lp116zwn0jl7xs9rlniqf6a8g4wfbjk9";
   };
 
   nativeBuildInputs = [ cmake qttools ];
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
index 80987a8c74117..bca88cc701303 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/pkgs/applications/graphics/seg3d/default.nix
@@ -6,7 +6,7 @@ assert (stdenv ? glibc);
 stdenv.mkDerivation {
   name = "seg3d-1.12_20090930";
   src = fetchurl {
-    url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
+    url = https://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
     sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";
   };
 
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index eb9a638386124..7940079d09948 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,10 +1,38 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , leptonica, libpng, libtiff, icu, pango, opencl-headers
-
 # Supported list of languages or `null' for all available languages
 , enableLanguages ? null
+# if you want just a specific list of languages, optionally specify a hash
+# to make tessdata a fixed output derivation.
+, enableLanguagesHash ? (if enableLanguages == null # all languages
+                         then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw"
+                         else null)
 }:
 
+let tessdata = stdenv.mkDerivation ({
+  name = "tessdata";
+  src = fetchFromGitHub {
+    owner = "tesseract-ocr";
+    repo = "tessdata";
+    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
+    # when updating don't forget to update the default value fo enableLanguagesHash
+    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
+  };
+  buildCommand = ''
+    cd $src;
+    for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do
+      install -Dt $out/share/tessdata $src/$lang ;
+    done;
+  '';
+  preferLocalBuild = true;
+  } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
+  # when a hash is given, we make this a fixed output derivation.
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  outputHash = enableLanguagesHash;
+  }));
+in
+
 stdenv.mkDerivation rec {
   name = "tesseract-${version}";
   version = "3.05.00";
@@ -16,41 +44,17 @@ stdenv.mkDerivation rec {
     sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
   };
 
-  tessdata = fetchFromGitHub {
-    owner = "tesseract-ocr";
-    repo = "tessdata";
-    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
-    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
-  };
+  enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
 
   LIBLEPT_HEADERSDIR = "${leptonica}/include";
 
-  # Copy the .traineddata files of the languages specified in enableLanguages
-  # into `$out/share/tessdata' and check afterwards if copying was successful.
-  postInstall = let
-    mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}";
-    mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg;
-    findLangArgs = if enableLanguages != null
-                   then "\\( ${mkFindArgs enableLanguages} \\)"
-                   else "-iname '*.traineddata'";
-  in ''
-    numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \
-      ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)"
-
-    ${if enableLanguages != null then ''
-      expected=${toString (builtins.length enableLanguages)}
-    '' else ''
-      expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)"
-    ''}
-
-    if [ "$numLangs" -ne "$expected" ]; then
-      echo "Expected $expected languages, but $numLangs" \
-           "were copied to \`$out/share/tessdata'" >&2
-      exit 1
-    fi
+  postInstall = ''
+    for i in ${tessdata}/share/tessdata/*; do
+      ln -s $i $out/share/tessdata;
+    done
   '';
 
   meta = {
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
new file mode 100644
index 0000000000000..a1c39fadb59d7
--- /dev/null
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, qtbase, qtsvg,  makeWrapper, fetchurl, makeDesktopItem }:
+stdenv.mkDerivation rec {
+  name = "write_stylus-${version}";
+  version = "209";
+
+  desktopItem = makeDesktopItem {
+    name = "Write";
+    exec = "Write";
+    comment = "a word processor for hadwriting";
+    desktopName = "Write";
+    genericName = "Write";
+    categories = "Office;Graphics";
+  };
+
+  src = fetchurl {
+    url = "http://www.styluslabs.com/write/write${version}.tar.gz";
+    sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd";
+  };
+  sourceRoot = ".";
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R Write $out/
+    # symlink the binary to bin/
+    ln -s $out/Write/Write $out/bin/Write
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+  preFixup = let
+    libPath = lib.makeLibraryPath [
+      qtbase        # libQt5PrintSupport.so.5
+      qtsvg         # libQt5Svg.so.5
+      stdenv.cc.cc.lib  # libstdc++.so.6
+    ];
+  in ''
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}" \
+      $out/Write/Write
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.styluslabs.com/;
+    description = "Write is a word processor for handwriting.";
+    platforms = platforms.linux;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with maintainers; [ oyren ];
+  };
+}
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index 1af165368363b..7a49e5b2cb7f0 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "zgv-${version}";
   version = "5.9";
   src = fetchurl {
-    url = "http://www.svgalib.org/rus/zgv/${name}.tar.gz";
+    url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz";
     sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
   };
 
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 0646e258b40e7..5472b3523a6bd 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.04.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.04.2/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 5514345057d69..8275a8a83b1c6 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1699 +3,1699 @@
 
 {
   akonadi = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-18.04.1.tar.xz";
-      sha256 = "0dg0r49angzkp5b09zbxjygjaxn1d50db15rwm7v9xsnz6fmc6hv";
-      name = "akonadi-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-18.04.2.tar.xz";
+      sha256 = "1kwaq91kimvpv4hr0n8bavfpwnd3c80z7bi3wc0hw07r86plxg35";
+      name = "akonadi-18.04.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-18.04.1.tar.xz";
-      sha256 = "0anmy67dc85afc0aq6y813c6xjr0jnkzsh56889zyz8z7k9xpg2q";
-      name = "akonadi-calendar-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-calendar-18.04.2.tar.xz";
+      sha256 = "0sbdkfd5n9apdw65nhl028k6s4qml25lqif6gg01z228ibwr63h2";
+      name = "akonadi-calendar-18.04.2.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz";
-      sha256 = "1935d5nwq2s8ijc9nzp7rdsmbyl2b42xwx0vj7cz1835y4w3k2vn";
-      name = "akonadi-calendar-tools-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-calendar-tools-18.04.2.tar.xz";
+      sha256 = "1xa33lc95brpc73y0464x9a4vx90np85r9k5pb8489mqhh1nmhf2";
+      name = "akonadi-calendar-tools-18.04.2.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadiconsole-18.04.1.tar.xz";
-      sha256 = "032r5r5ksifigx8bk82yygvhji1xjx3dd6i7z7mpx5qlc1zmqjpk";
-      name = "akonadiconsole-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadiconsole-18.04.2.tar.xz";
+      sha256 = "1njyncsn3icgjsw73a3hylaqfw049pxjqv7rnaw1qzwpk2sz8rfd";
+      name = "akonadiconsole-18.04.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-contacts-18.04.1.tar.xz";
-      sha256 = "1y1qcndsrdphii048cpwnfnd185mywcaw1h1szq71q2ww2aapcmp";
-      name = "akonadi-contacts-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-contacts-18.04.2.tar.xz";
+      sha256 = "04v9ncy0vmx1zl345z8sx8asb0spnzzh7qrrqa59wypqki7ndhbr";
+      name = "akonadi-contacts-18.04.2.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-import-wizard-18.04.1.tar.xz";
-      sha256 = "150i8m7ngb6kdyixvzfgnjwyrs2xpsd53gy2x28091kg2kqb0nl4";
-      name = "akonadi-import-wizard-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-import-wizard-18.04.2.tar.xz";
+      sha256 = "0yg3w34j3c0pcxsffpwz2f3fpsy1wg0jd8j9s0nvlq1cmmlglsh9";
+      name = "akonadi-import-wizard-18.04.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-mime-18.04.1.tar.xz";
-      sha256 = "0ypfbrr8h2nypdyg8xxs4d53qlbq4kd3ph2yhafp80577xwhqgmw";
-      name = "akonadi-mime-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-mime-18.04.2.tar.xz";
+      sha256 = "1rsymy2fljriwzwiacwxnmkgwm95hmhnbhg8rbrxblyinbnyrjhy";
+      name = "akonadi-mime-18.04.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-notes-18.04.1.tar.xz";
-      sha256 = "0f4q6ls7z5ikf46v7m0wazdczay8y3yvscw1lnmq5qwnvdfyqcpd";
-      name = "akonadi-notes-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-notes-18.04.2.tar.xz";
+      sha256 = "1pa109cq2nl9fbxc4d0p2dybby70six6nbfcfsxmi42yskc107sw";
+      name = "akonadi-notes-18.04.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akonadi-search-18.04.1.tar.xz";
-      sha256 = "01mfj7s3kx5kcjbvj4hljfrmsbpfmfiq0r87cgzg6734c4mzjqsl";
-      name = "akonadi-search-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akonadi-search-18.04.2.tar.xz";
+      sha256 = "0kjcmg2yyfx3qs140rmwjajwc197l6b3c1d3d0ryh00incmd4j9k";
+      name = "akonadi-search-18.04.2.tar.xz";
     };
   };
   akregator = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/akregator-18.04.1.tar.xz";
-      sha256 = "0h5pdbrwxa3n086yywqsm0m8x9p1s5jy2hgjivdilxgwnqcj6zpv";
-      name = "akregator-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/akregator-18.04.2.tar.xz";
+      sha256 = "1fdgnrl9pbrrpfj73rsvz0xhp67lzr88px4dkkh8msczq7cv3wrc";
+      name = "akregator-18.04.2.tar.xz";
     };
   };
   analitza = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/analitza-18.04.1.tar.xz";
-      sha256 = "09y3zz6zn3cs5nn0i0dcx71jrm0lzz3g8af6nz118m6rz71wndnq";
-      name = "analitza-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/analitza-18.04.2.tar.xz";
+      sha256 = "1m9zg2axi9fnkpl3lqn9s9hmvjh2zcafc5mpgk3lfd2v1v410nd3";
+      name = "analitza-18.04.2.tar.xz";
     };
   };
   ark = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ark-18.04.1.tar.xz";
-      sha256 = "10gpm90zsssygl65280z4p43ma75qjswiyv4drlrksydakxvvxk3";
-      name = "ark-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ark-18.04.2.tar.xz";
+      sha256 = "08ld389whnp94p27m4bh9y65ja02502gc4n05h1cwjx8rkl1z2q8";
+      name = "ark-18.04.2.tar.xz";
     };
   };
   artikulate = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/artikulate-18.04.1.tar.xz";
-      sha256 = "0brpb7ijqib7qp5ypvz9gkai7mwdxf915a7makklgzg80mdqnxpv";
-      name = "artikulate-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/artikulate-18.04.2.tar.xz";
+      sha256 = "1k41jmczw55difdsqq8rwlmpshli8ckxq969yinysy59c8b29c4a";
+      name = "artikulate-18.04.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/audiocd-kio-18.04.1.tar.xz";
-      sha256 = "1g3waj7xb14fgb75b0zzhbai93yqv5r1p0n0j3rwhfg9bvkgqgpa";
-      name = "audiocd-kio-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/audiocd-kio-18.04.2.tar.xz";
+      sha256 = "0hvlg3vricnn3shrqzr71im7c3ixzidrqv5cm0c189mir3ys5965";
+      name = "audiocd-kio-18.04.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/baloo-widgets-18.04.1.tar.xz";
-      sha256 = "1bq2n7lpldi2qiwdgx6l78m41whdjd41n1247985d1cr62bsn5cq";
-      name = "baloo-widgets-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/baloo-widgets-18.04.2.tar.xz";
+      sha256 = "0hsrc1vf4mscf0yxhafbh775lidyrq3ihlcb018j1gnk190b3pxr";
+      name = "baloo-widgets-18.04.2.tar.xz";
     };
   };
   blinken = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/blinken-18.04.1.tar.xz";
-      sha256 = "0sgaipxfzwjfikyj2r47vp0192s8v0zll2x61i9z6p6lzq7glw0j";
-      name = "blinken-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/blinken-18.04.2.tar.xz";
+      sha256 = "0fq3ai0ymxlz4jrn9h0nd3kgc0dnzih058jmdwnar42r85dhb9cy";
+      name = "blinken-18.04.2.tar.xz";
     };
   };
   bomber = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/bomber-18.04.1.tar.xz";
-      sha256 = "13ivb42jq2864vdpajds3cwjhhml7ikww66z1r6j4wp8mlmdlnal";
-      name = "bomber-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/bomber-18.04.2.tar.xz";
+      sha256 = "194bqr0rk2v62ax1blxvjzyr8qs61h0z8vzcwzh92mws0dbd3zyz";
+      name = "bomber-18.04.2.tar.xz";
     };
   };
   bovo = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/bovo-18.04.1.tar.xz";
-      sha256 = "1lm465vcmf4glql9krxl36sr6msgayqkzinammw9ian1wmih9qbn";
-      name = "bovo-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/bovo-18.04.2.tar.xz";
+      sha256 = "0f5v8gcb0kj5bcrir2697v10pj0xzjyc1ynq3djbj2k9n76nd85p";
+      name = "bovo-18.04.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/calendarsupport-18.04.1.tar.xz";
-      sha256 = "02zw1hyqwy031bg0nyxjvayjfamm0z9iw9v9f71hfrsi9siyf77a";
-      name = "calendarsupport-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/calendarsupport-18.04.2.tar.xz";
+      sha256 = "1jp9bkabq267kznjn2dd9h6a33rynlcaak9i2s07jvm0r2wpp8ka";
+      name = "calendarsupport-18.04.2.tar.xz";
     };
   };
   cantor = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/cantor-18.04.1.tar.xz";
-      sha256 = "1hcdf755yzs8kz6qbxan47gn622pg137sqabfbvqjflnphzz7f08";
-      name = "cantor-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/cantor-18.04.2.tar.xz";
+      sha256 = "039jphc9l6sh85j348hjld09ls2wd0dm784c52pzmpf32bjnmfda";
+      name = "cantor-18.04.2.tar.xz";
     };
   };
   cervisia = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/cervisia-18.04.1.tar.xz";
-      sha256 = "03slkk30k747f73dk98q4b930m7w1cimim053hl9y50n1c63n021";
-      name = "cervisia-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/cervisia-18.04.2.tar.xz";
+      sha256 = "0p80prz7ql14pgfa9mj34i78qa1jm7dbyjdvqv3f7d5dfqnqd3m9";
+      name = "cervisia-18.04.2.tar.xz";
     };
   };
   dolphin = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz";
-      sha256 = "11wm2wqmkni798xj6g8z7r6qyfy6db9k7xwnp90k2g1qb5n0xnsh";
-      name = "dolphin-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/dolphin-18.04.2.tar.xz";
+      sha256 = "0gk8m05xfpp8fal7rhw51nx03y39sj1z2ngx5s7xhf26hv2cyzmj";
+      name = "dolphin-18.04.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/dolphin-plugins-18.04.1.tar.xz";
-      sha256 = "00azpyy8xh0d62vayj04l3cbwxgxax430wh35jbv828vng3d2pfc";
-      name = "dolphin-plugins-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/dolphin-plugins-18.04.2.tar.xz";
+      sha256 = "11mqb0jcjm5lr9jqr8nlm1316mirl5sls45p1fa6gyyqbxps2iyv";
+      name = "dolphin-plugins-18.04.2.tar.xz";
     };
   };
   dragon = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/dragon-18.04.1.tar.xz";
-      sha256 = "1phrgssp3x11dmg07yvyi1hsmigfw8q6bblsizr9xm0pvmgrdjl0";
-      name = "dragon-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/dragon-18.04.2.tar.xz";
+      sha256 = "0zcg6k9bqcvld2hjf3aa4fh7xm7nikf9xk739wp9dln67lrbw2hm";
+      name = "dragon-18.04.2.tar.xz";
     };
   };
   eventviews = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/eventviews-18.04.1.tar.xz";
-      sha256 = "0jq1adi764a4w1kszhbdm49dylbwai4ipasjyrkqnf85xly48g40";
-      name = "eventviews-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/eventviews-18.04.2.tar.xz";
+      sha256 = "1ffd7lxs48jypjj6q46p8lzw4ppc5xa2f16cxhnaflkdkdnmp8gl";
+      name = "eventviews-18.04.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ffmpegthumbs-18.04.1.tar.xz";
-      sha256 = "06ls31wxgvnc4c7bc3ba14w4w64b9x37q3zmcnslyydghhnr0qnn";
-      name = "ffmpegthumbs-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ffmpegthumbs-18.04.2.tar.xz";
+      sha256 = "01law0kav378y7id85717y456lwbn4p7ymjp23k5psh12yd6m3k7";
+      name = "ffmpegthumbs-18.04.2.tar.xz";
     };
   };
   filelight = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/filelight-18.04.1.tar.xz";
-      sha256 = "1w169433m5823h1axn4ami9hk4rimi87ypiqagyyl13bncb7s6as";
-      name = "filelight-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/filelight-18.04.2.tar.xz";
+      sha256 = "1i0wzfwl4gqvpzd13m1aa135laq5f5vkf5sji2ld8f4xa97ipgy2";
+      name = "filelight-18.04.2.tar.xz";
     };
   };
   granatier = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/granatier-18.04.1.tar.xz";
-      sha256 = "0q5a2w2bz40qnk7jpcknsc4758k91cd1rh3rxa4v4wlq51id7lzz";
-      name = "granatier-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/granatier-18.04.2.tar.xz";
+      sha256 = "1kkh06slfs5g1gzlzlmw4fi8ma4nbkk3qnb4f46m8qzczymcj68y";
+      name = "granatier-18.04.2.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/grantlee-editor-18.04.1.tar.xz";
-      sha256 = "0ysirk51y993jxvvk98h2r9awsc4zyijavfja6zl0gsnvwwrjnjs";
-      name = "grantlee-editor-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/grantlee-editor-18.04.2.tar.xz";
+      sha256 = "0niky7v12s00x954zvmlqg6833hmvabr36a7b7i85w7k5qs9r2gq";
+      name = "grantlee-editor-18.04.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/grantleetheme-18.04.1.tar.xz";
-      sha256 = "0gzsxxywaqs6lc111hsw736p6gz55xs77v9bpk48igk37r9a0rs8";
-      name = "grantleetheme-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/grantleetheme-18.04.2.tar.xz";
+      sha256 = "09d0yy3b7d3d64r46hwq21n5ik8ksn385i41biqr85cnl4is7pd7";
+      name = "grantleetheme-18.04.2.tar.xz";
     };
   };
   gwenview = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/gwenview-18.04.1.tar.xz";
-      sha256 = "0wyxwqsf2nynz4h87lgy1xla8nj7mi94b997pmp70jzy4936l8bi";
-      name = "gwenview-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/gwenview-18.04.2.tar.xz";
+      sha256 = "1kic82x3ixy0jrxf37aaxb2dncxvwagmw6c3hc1zyb8fi0n9hhw4";
+      name = "gwenview-18.04.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/incidenceeditor-18.04.1.tar.xz";
-      sha256 = "0kc18pml59mhn9bn0g96mw46dmxq7crgn4033dxsfczak0kdr474";
-      name = "incidenceeditor-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/incidenceeditor-18.04.2.tar.xz";
+      sha256 = "00dd6qnhwf153d14jpv8idnfw55hyfwqfxj13wzaqpkv7pgip56a";
+      name = "incidenceeditor-18.04.2.tar.xz";
     };
   };
   juk = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/juk-18.04.1.tar.xz";
-      sha256 = "01zgxxx00hxag29883xfgw4r0m4j66iwr83bap55ni018xgkf4c3";
-      name = "juk-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/juk-18.04.2.tar.xz";
+      sha256 = "0p73xmymjkzi9pab9lia3bkz4xk0lcdnjgr9kkx4n0rrwj2dccpd";
+      name = "juk-18.04.2.tar.xz";
     };
   };
   k3b = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/k3b-18.04.1.tar.xz";
-      sha256 = "0py84q63r40mh8pp0r70gzwidfxv9kj5firvr7pp59rk9fsxznl7";
-      name = "k3b-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/k3b-18.04.2.tar.xz";
+      sha256 = "1yy6i9ca4y04vzb1ykdvvbmds5gb15a1hrsib3qj294mw8gfrhyn";
+      name = "k3b-18.04.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kaccounts-integration-18.04.1.tar.xz";
-      sha256 = "1abyhaa7gj2admk6kf555sbwzc7yha3ql41dhw4j3k6kpzkqk9zj";
-      name = "kaccounts-integration-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kaccounts-integration-18.04.2.tar.xz";
+      sha256 = "1ijsjaxdiqkd0jjj6wkaf4y1a064mx0xch1prqvjjfx5g2ja2k1b";
+      name = "kaccounts-integration-18.04.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kaccounts-providers-18.04.1.tar.xz";
-      sha256 = "15ygghq434qkj1z5iislm8fz0m8z6rkpiyrcjbmqs0cw4s0mqzp6";
-      name = "kaccounts-providers-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kaccounts-providers-18.04.2.tar.xz";
+      sha256 = "1hpn7vpdpj7swm9xkdc1kr7qhbcljbswl87c1nrg39lfw44w0iyw";
+      name = "kaccounts-providers-18.04.2.tar.xz";
     };
   };
   kaddressbook = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kaddressbook-18.04.1.tar.xz";
-      sha256 = "0w02gc9l8jhzf15ljig83ddbkzf430k1qbqp821b3rz5s20gg4m5";
-      name = "kaddressbook-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kaddressbook-18.04.2.tar.xz";
+      sha256 = "0mg1g5x5hg3cdpxg5qf08l1d0ds3q5dm6xmkrripq5adgz77mqgr";
+      name = "kaddressbook-18.04.2.tar.xz";
     };
   };
   kajongg = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kajongg-18.04.1.tar.xz";
-      sha256 = "1vpkj42ylzpakrqy84hkp0hvj4q4x7wnarwwqqj8xp4xi40na481";
-      name = "kajongg-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kajongg-18.04.2.tar.xz";
+      sha256 = "1zv5g7q8sjhjzb16f52k2129awz5v5m15vkj06rnn3yvhhm694kn";
+      name = "kajongg-18.04.2.tar.xz";
     };
   };
   kalarm = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kalarm-18.04.1.tar.xz";
-      sha256 = "0v6maszs79959jkciy5j9xnqggr9ymjzvsibr1j5s30kynlzpxkm";
-      name = "kalarm-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kalarm-18.04.2.tar.xz";
+      sha256 = "18mh380kwg4pgphk0854san2v3iccra5fsydyjlh9g3mi4wkf6fj";
+      name = "kalarm-18.04.2.tar.xz";
     };
   };
   kalarmcal = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kalarmcal-18.04.1.tar.xz";
-      sha256 = "1j04wdb6vg2896hb8y28lm8sna0lil8021i2kw97crfhramldvjk";
-      name = "kalarmcal-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kalarmcal-18.04.2.tar.xz";
+      sha256 = "0ks9k5yrf8nld5x31hlfhdhypy7hi7h62kyqp707kpijhbjb32r6";
+      name = "kalarmcal-18.04.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kalgebra-18.04.1.tar.xz";
-      sha256 = "0gg1fb4cgnnrxyrm554847kpa1bs57zgi9ia8f9wmcivyd35vvyf";
-      name = "kalgebra-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kalgebra-18.04.2.tar.xz";
+      sha256 = "1vn3qcw8af32njpvg4gpqxx5k0v9wzs67c43var0pa190b6bsjhw";
+      name = "kalgebra-18.04.2.tar.xz";
     };
   };
   kalzium = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kalzium-18.04.1.tar.xz";
-      sha256 = "00x2jql639rmbvcfj72yjmfb98f9msfwi2g2mqyww43ja3c835ic";
-      name = "kalzium-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kalzium-18.04.2.tar.xz";
+      sha256 = "12qivsw7pq85z09100bbzca24ag7wdl5ywjf8whi3m1w05xasl61";
+      name = "kalzium-18.04.2.tar.xz";
     };
   };
   kamera = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kamera-18.04.1.tar.xz";
-      sha256 = "1ra7hdvs6fnkbzqvm5sryk6ymlgj0ngsg98yhznda0qvrrkgfahg";
-      name = "kamera-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kamera-18.04.2.tar.xz";
+      sha256 = "02c7nf9f43lxzk88i4y5laj60m7b4062n7lz5jvdiwvlsd9hqkm8";
+      name = "kamera-18.04.2.tar.xz";
     };
   };
   kamoso = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kamoso-18.04.1.tar.xz";
-      sha256 = "1rd08647zx2k7xq8jclxsk0dgjgdaih6fxmnrd7awzjmj0qh89a7";
-      name = "kamoso-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kamoso-18.04.2.tar.xz";
+      sha256 = "1gwq6gairy4zm8vqdq3x9r3rx81ybq5rg7cncyrxhyiyk65w4fb6";
+      name = "kamoso-18.04.2.tar.xz";
     };
   };
   kanagram = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kanagram-18.04.1.tar.xz";
-      sha256 = "0g4zmr10jq9vw92z9nbfvigz6pbjg1p1zc1aspwlh38ajk8sr3gb";
-      name = "kanagram-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kanagram-18.04.2.tar.xz";
+      sha256 = "09l9inx079hbhil47k3w7gkx455z42nqy4jisvs7m8l7c7d7ns3x";
+      name = "kanagram-18.04.2.tar.xz";
     };
   };
   kapman = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kapman-18.04.1.tar.xz";
-      sha256 = "14s2kg50r9nlg53vsi1x59kc8z1rgnqcq028a6zwfnv0sdsa7pw5";
-      name = "kapman-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kapman-18.04.2.tar.xz";
+      sha256 = "0bj6zd6jyjwj4lswn7xyq2gl09ki8iykrjjpy2m1ywm339x8q96v";
+      name = "kapman-18.04.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kapptemplate-18.04.1.tar.xz";
-      sha256 = "064pw1fkbm52pkcg9hyay8mkraw3fdlycgx306p9brahvxb9xjsb";
-      name = "kapptemplate-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kapptemplate-18.04.2.tar.xz";
+      sha256 = "1d5z2ghwlkkz7i7hfpsybrblcadini0m1lml2iyiyb75hl1fprmc";
+      name = "kapptemplate-18.04.2.tar.xz";
     };
   };
   kate = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kate-18.04.1.tar.xz";
-      sha256 = "1xbckjsp5imxcda8vrdb5flgb5sjmdylwy1yr5v01nilmqgpmwa8";
-      name = "kate-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kate-18.04.2.tar.xz";
+      sha256 = "10684wzvzm7mrr69lrnpk3dnjkhqwrxv0mimq0927c1ln76sqy0n";
+      name = "kate-18.04.2.tar.xz";
     };
   };
   katomic = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/katomic-18.04.1.tar.xz";
-      sha256 = "0g3kkibgnxkg5zxgja7rqad57fpw28qapf8rlbczkmxls581ifw6";
-      name = "katomic-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/katomic-18.04.2.tar.xz";
+      sha256 = "0v000v98xsy9x9ka5w1maprgj4pma97v3y07x39l2a96wkinh1k0";
+      name = "katomic-18.04.2.tar.xz";
     };
   };
   kbackup = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kbackup-18.04.1.tar.xz";
-      sha256 = "1gv5m4d6zcadamcicllfp8smm7k4846a2qy4pgm006lhk390bsyz";
-      name = "kbackup-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kbackup-18.04.2.tar.xz";
+      sha256 = "1py7b2mjf1lhpg3hpwy8agjh7wcql67myv3jx2j6r660ni8rbf66";
+      name = "kbackup-18.04.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kblackbox-18.04.1.tar.xz";
-      sha256 = "0hv6ziw2dy88fbc1z0vlflagsrr7x97r9c5l4w9v4acr0ih7ms7h";
-      name = "kblackbox-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kblackbox-18.04.2.tar.xz";
+      sha256 = "1xllh7sds3pm8hjs1l88i8w7xzizl3kv9bdvznih0f61mwrwhwph";
+      name = "kblackbox-18.04.2.tar.xz";
     };
   };
   kblocks = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kblocks-18.04.1.tar.xz";
-      sha256 = "12339f1g73h3qg9a21kqmkqp6ywiw1gvnwdww45dzflf4w931lsw";
-      name = "kblocks-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kblocks-18.04.2.tar.xz";
+      sha256 = "0gnj8lflm7jmqz8i5ymy5gmb11d0v1483bpllvmhsjylk7v7qzal";
+      name = "kblocks-18.04.2.tar.xz";
     };
   };
   kblog = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kblog-18.04.1.tar.xz";
-      sha256 = "1gndfvny1zh2w1daxmpix5sn2wlbc2430m3a21lvgp3qmhb5rwkr";
-      name = "kblog-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kblog-18.04.2.tar.xz";
+      sha256 = "17yh6599k50nayw2b0lx80hkkz7c46xwn389g674c0zyj768pbxl";
+      name = "kblog-18.04.2.tar.xz";
     };
   };
   kbounce = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kbounce-18.04.1.tar.xz";
-      sha256 = "0qjbzmjgcvxbpvbqxyyh02pk5hr6z871n13awsq770xwbr1pdnwc";
-      name = "kbounce-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kbounce-18.04.2.tar.xz";
+      sha256 = "10bipg1ny6997xyqh8d7346xf1j7g4p9bzzmappzs6mx1bsm7hgl";
+      name = "kbounce-18.04.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kbreakout-18.04.1.tar.xz";
-      sha256 = "0yr9hwlwdp1fi2parzniyq5rfv4fxbxxs63xfggaz7ndbm1h8bif";
-      name = "kbreakout-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kbreakout-18.04.2.tar.xz";
+      sha256 = "0y40d36ms3xzch4c2f30gfawr12zzmjgdfh603yy52x81z866svf";
+      name = "kbreakout-18.04.2.tar.xz";
     };
   };
   kbruch = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kbruch-18.04.1.tar.xz";
-      sha256 = "08wb7f2jhz3dkx22sj2k4sairl715nrk7c2swd88dcaskcy411nk";
-      name = "kbruch-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kbruch-18.04.2.tar.xz";
+      sha256 = "1xr6rwdsnxq6as8f1yc48l2997795xgc2py80df84v1gpk0hhm2n";
+      name = "kbruch-18.04.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcachegrind-18.04.1.tar.xz";
-      sha256 = "1mig7xm67w3vwslymbfm51w8w9cnqzk41kqp998j6g7dfrh8476g";
-      name = "kcachegrind-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcachegrind-18.04.2.tar.xz";
+      sha256 = "1bkqb39a0q0di17j0qxg907fm47002vj24j19pmg94qm6nl4b2i4";
+      name = "kcachegrind-18.04.2.tar.xz";
     };
   };
   kcalc = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcalc-18.04.1.tar.xz";
-      sha256 = "14j2w9w31cqmsls3zrgifywbz5bxkzkryggfd1jxiz9q526ylpxy";
-      name = "kcalc-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcalc-18.04.2.tar.xz";
+      sha256 = "19ryii9jvyssa6676an2m09mgdz18340p6jv067qscg0sw5ka3fv";
+      name = "kcalc-18.04.2.tar.xz";
     };
   };
   kcalcore = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcalcore-18.04.1.tar.xz";
-      sha256 = "0q23pb9pkii6czk3angl3xzlzc90fck1pwc05695rz90iwbxq62x";
-      name = "kcalcore-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcalcore-18.04.2.tar.xz";
+      sha256 = "0ailxkviabv5qg02wl2phfx06znbs5dxncb6nzl87qrzck4myj31";
+      name = "kcalcore-18.04.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcalutils-18.04.1.tar.xz";
-      sha256 = "05ma56f0ly8nq62p6nlzkscdq5m93142kakhqrsl17c902bvkcmm";
-      name = "kcalutils-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcalutils-18.04.2.tar.xz";
+      sha256 = "1z3bzx78n4p88p0a3w1m2a984pcqmi8aph28d3h2isiinlfwgak2";
+      name = "kcalutils-18.04.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcharselect-18.04.1.tar.xz";
-      sha256 = "0pv22v1x3n73rxzpihsxz5xxy1c37lq72jcscwylwmwfyszmvdwx";
-      name = "kcharselect-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcharselect-18.04.2.tar.xz";
+      sha256 = "0n71jy1a6hsabzzhvrg46067drb97aa095159bxma1x9xjgbdq14";
+      name = "kcharselect-18.04.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcolorchooser-18.04.1.tar.xz";
-      sha256 = "1wzy9a3pz0jwwmgbqxqlfii0faascrxnxq398wzrnx955shlksbm";
-      name = "kcolorchooser-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcolorchooser-18.04.2.tar.xz";
+      sha256 = "0m0izh28h2n0dja5rwdqg88g0v9v9nz8gmv73zhz72mi4p7vq2h2";
+      name = "kcolorchooser-18.04.2.tar.xz";
     };
   };
   kcontacts = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcontacts-18.04.1.tar.xz";
-      sha256 = "0725cad646qzpgpvxl0vyb1a4hpbk0b6zb3wbdim4al56y7x1rxh";
-      name = "kcontacts-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcontacts-18.04.2.tar.xz";
+      sha256 = "03mzacymwxj50873vs0rla2bxm29kfc9d7sv692nzmccv00r21mj";
+      name = "kcontacts-18.04.2.tar.xz";
     };
   };
   kcron = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kcron-18.04.1.tar.xz";
-      sha256 = "1wlk36s6i53vk4crrvijbfmagh5d8sjbmcacdwdcf4vlb56kxphr";
-      name = "kcron-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kcron-18.04.2.tar.xz";
+      sha256 = "1nwpsq4qhrlggdcn9snfl124g355h3c69360ngziwj66dnnwwcm7";
+      name = "kcron-18.04.2.tar.xz";
     };
   };
   kdav = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdav-18.04.1.tar.xz";
-      sha256 = "16abp767h4rs35yj0j8kgmhm4k09cidnsmh1ihx2b53ya1ivmv9b";
-      name = "kdav-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdav-18.04.2.tar.xz";
+      sha256 = "0m3lf2mjmcblnlqsp9jrv508c8nkhvbrbpcp0hw9sdw8qaplb6x3";
+      name = "kdav-18.04.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdebugsettings-18.04.1.tar.xz";
-      sha256 = "1bz5wcap6kqjv6164zm7wcm31q634785lqlarsc5hqld5xjgr7ig";
-      name = "kdebugsettings-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdebugsettings-18.04.2.tar.xz";
+      sha256 = "0k60nld8r7g5wxj8l14m5pdkzwjhyqgznd4kjfx3vn63xx002ysp";
+      name = "kdebugsettings-18.04.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kde-dev-scripts-18.04.1.tar.xz";
-      sha256 = "08wsj1h44lmvvv43k9l3mxvi2hr498hz3d22z0bwcdjaqgvy60r5";
-      name = "kde-dev-scripts-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kde-dev-scripts-18.04.2.tar.xz";
+      sha256 = "08a9d9ib8wcqgi4kyfh8adzrnf804vjlcdha97wkypz4qk6bilw2";
+      name = "kde-dev-scripts-18.04.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kde-dev-utils-18.04.1.tar.xz";
-      sha256 = "13wpa4xrkm3711vdwjkklibaf7as64klw4hpq9s9vx33ma73sf9a";
-      name = "kde-dev-utils-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kde-dev-utils-18.04.2.tar.xz";
+      sha256 = "0cwfh0innaskb3wipij3pzcx4a6dvgjq1slvz2kvcp7cqx9bmhhs";
+      name = "kde-dev-utils-18.04.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdeedu-data-18.04.1.tar.xz";
-      sha256 = "1ccf8bjd2fc2chgf63bwg91c0r4acxf40w81rssi83wjvnhg4d5j";
-      name = "kdeedu-data-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdeedu-data-18.04.2.tar.xz";
+      sha256 = "03qklcwvjqdgmh8gdz9l98dqmn2yvvs48ha5qlj141jw0cla8lss";
+      name = "kdeedu-data-18.04.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-mobipocket-18.04.1.tar.xz";
-      sha256 = "1y9bjnpbpriyhs007wli7m0q5g9wv2d7izp0qxk4xzmrrw7k5v51";
-      name = "kdegraphics-mobipocket-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdegraphics-mobipocket-18.04.2.tar.xz";
+      sha256 = "1pmqxwlaxxabv8vl6rq7zch1zlizcijvamxfdil49h603jrpspqm";
+      name = "kdegraphics-mobipocket-18.04.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-thumbnailers-18.04.1.tar.xz";
-      sha256 = "06798hwxyd2xvf3aiigwzd53frzi0mqxsbxliznqxxjvk5lcp1ha";
-      name = "kdegraphics-thumbnailers-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdegraphics-thumbnailers-18.04.2.tar.xz";
+      sha256 = "1n5a43d80qdm7gp8k58h3kkp5kbbwg532arj66gfglcimvyw7ybl";
+      name = "kdegraphics-thumbnailers-18.04.2.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdenetwork-filesharing-18.04.1.tar.xz";
-      sha256 = "18dilp18312v1zbrfq5rq223s6cy2lmdmgvp2hg5a25rmldw1yiw";
-      name = "kdenetwork-filesharing-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdenetwork-filesharing-18.04.2.tar.xz";
+      sha256 = "08rg7lw07xi9iskqi09nkw00kgim437a9wm7svcm1nhwnln45bas";
+      name = "kdenetwork-filesharing-18.04.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdenlive-18.04.1.tar.xz";
-      sha256 = "059xqybn3r1w432mbnxx5ds1whj5x23ym2lm90wg23b9hmmmhxl3";
-      name = "kdenlive-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdenlive-18.04.2.tar.xz";
+      sha256 = "08dy8fww0aq1g69pznwach2yykj7izyp2z8axx724drmqh4jifri";
+      name = "kdenlive-18.04.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdepim-addons-18.04.1.tar.xz";
-      sha256 = "1qninnlhwmkw6nxxymjww1x7krm87nz5m6p66y3ghrgyl0q16k7b";
-      name = "kdepim-addons-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdepim-addons-18.04.2.tar.xz";
+      sha256 = "0g3rbq8129pa1qq2vrxlh049nfqrl7k3zqnqbhavb9kggvgfx151";
+      name = "kdepim-addons-18.04.2.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdepim-apps-libs-18.04.1.tar.xz";
-      sha256 = "1a41km8nhgrc24qlgh64560p8il6q9dlcmy25x92s1xmpn1zg1lc";
-      name = "kdepim-apps-libs-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdepim-apps-libs-18.04.2.tar.xz";
+      sha256 = "000qgbr3lvpcx4p42r0f7bl8wlhf3sc320svf2mx4vpgbi28fm7y";
+      name = "kdepim-apps-libs-18.04.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdepim-runtime-18.04.1.tar.xz";
-      sha256 = "0gl2wkkaxpz13rg6zyclcjkc0i7qwqwxcvamgb3cl6l6qkp869w1";
-      name = "kdepim-runtime-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdepim-runtime-18.04.2.tar.xz";
+      sha256 = "18sxzdm2drn16zk0wmsa1sxabag04x50sn72x4arjr32b9pgr8fp";
+      name = "kdepim-runtime-18.04.2.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdesdk-kioslaves-18.04.1.tar.xz";
-      sha256 = "1mx3pg36mx0b6v2kq3a3spxm40rdk4bgkhzzjwphppqkxc57bgln";
-      name = "kdesdk-kioslaves-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdesdk-kioslaves-18.04.2.tar.xz";
+      sha256 = "1csvzwq4hd9r36w5kms7w4zadwd8g10p1mhaq5p9afdg531x5zza";
+      name = "kdesdk-kioslaves-18.04.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdesdk-thumbnailers-18.04.1.tar.xz";
-      sha256 = "0s07h5kfl2h2w0qarz28362n92jdbbq7iw4cy93p949mp6jz1xij";
-      name = "kdesdk-thumbnailers-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdesdk-thumbnailers-18.04.2.tar.xz";
+      sha256 = "0k797w3qm4phvfmaqvhqds79sx340frli9jklsjjkmb1zv3yzz3f";
+      name = "kdesdk-thumbnailers-18.04.2.tar.xz";
     };
   };
   kdf = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdf-18.04.1.tar.xz";
-      sha256 = "1hmq92vglivs9q536g3qx0b7v3g7nlvkly81p8brqs55cw0npf8d";
-      name = "kdf-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdf-18.04.2.tar.xz";
+      sha256 = "1dwvn5rb3jpz4vl2msxm88a1lcb7sb72v0s2161hxrk8xhnxngr3";
+      name = "kdf-18.04.2.tar.xz";
     };
   };
   kdialog = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdialog-18.04.1.tar.xz";
-      sha256 = "0xmdzwawa43xfv9a2sm2rijiiik7b0cvpbcxvwf7s37gwrw5fk05";
-      name = "kdialog-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdialog-18.04.2.tar.xz";
+      sha256 = "0bfvndacp7hbmgkq33kxl64c5kgi4a7m5i4bb5r5bw7d5mdqzrkn";
+      name = "kdialog-18.04.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kdiamond-18.04.1.tar.xz";
-      sha256 = "12z0v4w8adlzsnymn5dsc1fpgqx2w3hx38chwc7l2l5bvgx5ycc1";
-      name = "kdiamond-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kdiamond-18.04.2.tar.xz";
+      sha256 = "0hqkbjdc0ndflwiqg2m1f4zzvz3cgwmxkxc8zxyavl50br471aji";
+      name = "kdiamond-18.04.2.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/keditbookmarks-18.04.1.tar.xz";
-      sha256 = "1qi8y5j9s9d4i6vqvw5h29b55q73zfgj4v76dxdl1z85ghcv0my4";
-      name = "keditbookmarks-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/keditbookmarks-18.04.2.tar.xz";
+      sha256 = "1dfc97vvknywb833ndxilynhxhna6qsfq9rd2fapz5jwk0y7cdnj";
+      name = "keditbookmarks-18.04.2.tar.xz";
     };
   };
   kfind = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kfind-18.04.1.tar.xz";
-      sha256 = "15fha4k00s88n0k7ad0bnw9iyyjyxlhjmnlcr84hfbh6wiwn4l4k";
-      name = "kfind-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kfind-18.04.2.tar.xz";
+      sha256 = "0j5awrlyf6f9z9xybssq0s4yvygxni90zsmqi35rm4vjd38rixjd";
+      name = "kfind-18.04.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kfloppy-18.04.1.tar.xz";
-      sha256 = "0rw3r09zil7121ssms1mvccw435nmmgmz0zx0rmfvpk6bks0cim9";
-      name = "kfloppy-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kfloppy-18.04.2.tar.xz";
+      sha256 = "08pd9qq9syw7mf5d21y1306k0l540zk5dqjn380mng7rmiddnchb";
+      name = "kfloppy-18.04.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kfourinline-18.04.1.tar.xz";
-      sha256 = "0gm8s8gi9nnilcvmnz4gk26wrszjg7y8xfq4dyqw87axwaqcv2z6";
-      name = "kfourinline-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kfourinline-18.04.2.tar.xz";
+      sha256 = "02dsip9cjbygjc7palb1dr9w4g32c4n5krhwf3p0mnmwyhnqbqv3";
+      name = "kfourinline-18.04.2.tar.xz";
     };
   };
   kgeography = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kgeography-18.04.1.tar.xz";
-      sha256 = "16c2gidj8jc4xr35ph392gh4r75vfiqw7n07lpv30d6v3h1mq2jy";
-      name = "kgeography-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kgeography-18.04.2.tar.xz";
+      sha256 = "0sm6sw1ibmsf8n704a114244dbj0387bzjrcblfa0j1zcyf6k9bg";
+      name = "kgeography-18.04.2.tar.xz";
     };
   };
   kget = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kget-18.04.1.tar.xz";
-      sha256 = "1kzvalb1a27bn9ac4iqkgar7fydspd9bhva3n0v9gzz34p3lv1f7";
-      name = "kget-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kget-18.04.2.tar.xz";
+      sha256 = "0i01z7nic11qh9g41dva9vsip02qy0r7axysj53p5yx1syf5brwi";
+      name = "kget-18.04.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kgoldrunner-18.04.1.tar.xz";
-      sha256 = "0w1vppp0r1prciz6gg5srlj0z05m5wcbpp3wwz6wxh2vnpbm2lc1";
-      name = "kgoldrunner-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kgoldrunner-18.04.2.tar.xz";
+      sha256 = "1rangxnzfs83f0hx6k39dc9yiaqn1jr6yznf51zdzb23k4jcczm4";
+      name = "kgoldrunner-18.04.2.tar.xz";
     };
   };
   kgpg = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kgpg-18.04.1.tar.xz";
-      sha256 = "0b2kngq4dqs3qxkvxny72sfm2xlbsmhb986zmpp0wsm09gd6lhyh";
-      name = "kgpg-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kgpg-18.04.2.tar.xz";
+      sha256 = "1r2jsm1klgnzprx342qlj429jbvpa4gnk69b9bfxz8la0lfv71n4";
+      name = "kgpg-18.04.2.tar.xz";
     };
   };
   khangman = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/khangman-18.04.1.tar.xz";
-      sha256 = "1vcr5gp3gz0dygkn8dhkg3fpyqny8vc61nymwii4v247znhg7hw4";
-      name = "khangman-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/khangman-18.04.2.tar.xz";
+      sha256 = "1vyim621gqbfq3wmlr864nm7c4mrn01bpz2m0sn33n7hbnpzb1rw";
+      name = "khangman-18.04.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/khelpcenter-18.04.1.tar.xz";
-      sha256 = "00p3s5zmql82dwr4lmfy3yqyyn7h2209lhf49cajh01hd2nasig1";
-      name = "khelpcenter-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/khelpcenter-18.04.2.tar.xz";
+      sha256 = "13va6h9z0s21dm7jgddka0x7i5llrr398mk7v4kmdr9zbzd6727c";
+      name = "khelpcenter-18.04.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kidentitymanagement-18.04.1.tar.xz";
-      sha256 = "1lb1vl3r7avj45lfrlabbbkq0f7anpx04g20ajn2n8ajfgjpns9q";
-      name = "kidentitymanagement-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kidentitymanagement-18.04.2.tar.xz";
+      sha256 = "1rjmafsbblchqpl865ah7m7arf5kz30cc8sk2z4ps5c8lqzn8gql";
+      name = "kidentitymanagement-18.04.2.tar.xz";
     };
   };
   kig = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kig-18.04.1.tar.xz";
-      sha256 = "1ry2rgmy7y4wyxwwz2f7qrj5aw5sjgv46vs4x5203v514p625nzw";
-      name = "kig-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kig-18.04.2.tar.xz";
+      sha256 = "0i8jkbaxskgxwvsnjqysvmdm5a6yq3v0w6h3fmrk9jsp5gf120gw";
+      name = "kig-18.04.2.tar.xz";
     };
   };
   kigo = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kigo-18.04.1.tar.xz";
-      sha256 = "1l2bdxjv5kiz6f0gmqwd43jghps5l2cvw8228ay4l7r4r9wp0ihr";
-      name = "kigo-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kigo-18.04.2.tar.xz";
+      sha256 = "1fkrx9fhxijw0sd861pn2ihphspyhx6i79z2816gv3riqa0a9j51";
+      name = "kigo-18.04.2.tar.xz";
     };
   };
   killbots = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/killbots-18.04.1.tar.xz";
-      sha256 = "06vqgahirw01zfbhr2dj5z7fd2jay3kizvl04wwwp1fr8jsw3plw";
-      name = "killbots-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/killbots-18.04.2.tar.xz";
+      sha256 = "0ppg1n2m5cd3rgl0ixvga7i9j0f2v97cfxzpwqhbymwz4970cxqz";
+      name = "killbots-18.04.2.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kimagemapeditor-18.04.1.tar.xz";
-      sha256 = "1144z9zasc3x678q8xnk98nn5y0bzaal0lxc6xb51ib4q8q2lhn1";
-      name = "kimagemapeditor-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kimagemapeditor-18.04.2.tar.xz";
+      sha256 = "1nl0am3kww53bg0wds1p8bmw8hbn79zrnh06bhk9f6p0n5n817jc";
+      name = "kimagemapeditor-18.04.2.tar.xz";
     };
   };
   kimap = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kimap-18.04.1.tar.xz";
-      sha256 = "03y1n4rf7xdxb82716wijz196dk0rg8d50rs9kycymys9sgq5y0h";
-      name = "kimap-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kimap-18.04.2.tar.xz";
+      sha256 = "0fxx24nxm055vkdgyisfx648n2ayxrgacmkv519bham9v9qg32zd";
+      name = "kimap-18.04.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kio-extras-18.04.1.tar.xz";
-      sha256 = "0635iam41i5afjspw08x99irqfsj7pa1w8wz4nfbx9yv2iclq1rh";
-      name = "kio-extras-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kio-extras-18.04.2.tar.xz";
+      sha256 = "1kmnfxh5dbgxismz03rbkf7pdgl187ddnr5k3gr547fdid9caphn";
+      name = "kio-extras-18.04.2.tar.xz";
     };
   };
   kiriki = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kiriki-18.04.1.tar.xz";
-      sha256 = "0n258bvhd5cgb978zqqkig6is5fb9idvwa7n860q1r2nimsnch5y";
-      name = "kiriki-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kiriki-18.04.2.tar.xz";
+      sha256 = "0apaa8ki57i3n1lnmgkqjccdx8vp4bwf020nvyxx7vwm8kqpm1hy";
+      name = "kiriki-18.04.2.tar.xz";
     };
   };
   kiten = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kiten-18.04.1.tar.xz";
-      sha256 = "1f6z5assiz6gxvhcp08x71qk3hyc36ib2sr6bmq0q7cbb7xlhbac";
-      name = "kiten-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kiten-18.04.2.tar.xz";
+      sha256 = "0bj6fb00wnvza5hwlxk6b2vhpp7vwsna184ghizx03cl242ig1c9";
+      name = "kiten-18.04.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kjumpingcube-18.04.1.tar.xz";
-      sha256 = "0p4manwh4pndhdnb45fczllpsvswwwgvz1wk8grx2axq0x6pjjln";
-      name = "kjumpingcube-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kjumpingcube-18.04.2.tar.xz";
+      sha256 = "0ll38kbm8yf2pnph3rbhh9ydx4ms7mr49y95k6azkxjbvn8hf4wg";
+      name = "kjumpingcube-18.04.2.tar.xz";
     };
   };
   kldap = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kldap-18.04.1.tar.xz";
-      sha256 = "0arriibg2flqr8rvd4fa8xd4rgr1rl3pwhxxskpfi4i3rl8w1a2i";
-      name = "kldap-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kldap-18.04.2.tar.xz";
+      sha256 = "1jlqr06y0bs3mzzbqf49hzwqyavs39rwc61mzgydm0951kalh2zs";
+      name = "kldap-18.04.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kleopatra-18.04.1.tar.xz";
-      sha256 = "0ayjxvm6sdg1waf44nw360nh740vi29c7m6frq2jyfbxn401x7p3";
-      name = "kleopatra-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kleopatra-18.04.2.tar.xz";
+      sha256 = "0c66j35zjg2hfknc3fqqh6x5ynfw0whgzi1q74hiv9225zbzb80a";
+      name = "kleopatra-18.04.2.tar.xz";
     };
   };
   klettres = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/klettres-18.04.1.tar.xz";
-      sha256 = "1vzr8pf6m24ng3kg44ld5hiap7qqfp2w1q7npyr6sq28rrm8jilb";
-      name = "klettres-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/klettres-18.04.2.tar.xz";
+      sha256 = "0wilxlfhgyj8pbq87kl4vx97f39kc9bpqcchc09qgc3ack40rakv";
+      name = "klettres-18.04.2.tar.xz";
     };
   };
   klickety = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/klickety-18.04.1.tar.xz";
-      sha256 = "1wk6g4a8gmd1z8qqgy30s3f2zgq651dv38gnbk3949j81k92084m";
-      name = "klickety-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/klickety-18.04.2.tar.xz";
+      sha256 = "0w9ajwqsklq2chj491rmph05vg4y4ibvbjwic9l99i8ybp89x00k";
+      name = "klickety-18.04.2.tar.xz";
     };
   };
   klines = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/klines-18.04.1.tar.xz";
-      sha256 = "0zslagiphj37i79896k71j40125nz74qknx75sp3iv2wafy0akgf";
-      name = "klines-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/klines-18.04.2.tar.xz";
+      sha256 = "1wdn3s4r3301ps84v7mw61zmwvlb8rdsvfgxbgrs46am052dszgg";
+      name = "klines-18.04.2.tar.xz";
     };
   };
   kmag = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmag-18.04.1.tar.xz";
-      sha256 = "163i0axbnxkyqhbri6k48x9jsb5l5ll8hl0zvcsw0srh8bzswvgd";
-      name = "kmag-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmag-18.04.2.tar.xz";
+      sha256 = "1fikna4rrsbzgdq9qiwpp1j48rimpf0frrnzgnjq8lnc61csfcjn";
+      name = "kmag-18.04.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmahjongg-18.04.1.tar.xz";
-      sha256 = "1zl1mr8pg6sz2ydqilgdbh3758vw13af37s9g8pi7axva8adf0fp";
-      name = "kmahjongg-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmahjongg-18.04.2.tar.xz";
+      sha256 = "1a19r3kbysx7pzy96wl9sq8c03lwp105nqf9gzbhabm0kyx945hc";
+      name = "kmahjongg-18.04.2.tar.xz";
     };
   };
   kmail = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmail-18.04.1.tar.xz";
-      sha256 = "057727gsrdf0pkn5n17km5ryjiw5rimxixff0dax939d9403qwfg";
-      name = "kmail-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmail-18.04.2.tar.xz";
+      sha256 = "0miqwi55rc1zq1zfz75r8pzz4q3c81z61wp6w53zjhib50caa66i";
+      name = "kmail-18.04.2.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmail-account-wizard-18.04.1.tar.xz";
-      sha256 = "0qky1a0lrmy8mfiq0dqhrd8j7m1lc9p34ivx9vy4rr82r9g3y5jw";
-      name = "kmail-account-wizard-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmail-account-wizard-18.04.2.tar.xz";
+      sha256 = "1vj0bn0z4il34v3nadbw4ldp15yd0afisdriiw3nsyq5v8yp75h9";
+      name = "kmail-account-wizard-18.04.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmailtransport-18.04.1.tar.xz";
-      sha256 = "09l79049dpkzc3iqdxv4jvglpynrq976gvr8n38k63mr5sajwg72";
-      name = "kmailtransport-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmailtransport-18.04.2.tar.xz";
+      sha256 = "1zc1q19xdb59pcqc2n850f4fh107b3f5nj31mhii8496mzz1nk0j";
+      name = "kmailtransport-18.04.2.tar.xz";
     };
   };
   kmbox = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmbox-18.04.1.tar.xz";
-      sha256 = "05zcnykb7asamqf8iqs63bl7jk5myywdqydhxz56jr19fw32lyqq";
-      name = "kmbox-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmbox-18.04.2.tar.xz";
+      sha256 = "0dwd7mkflggj4xdk65qpjlvzb15k6agz6pfmbx426xgpm0dq4bwc";
+      name = "kmbox-18.04.2.tar.xz";
     };
   };
   kmime = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmime-18.04.1.tar.xz";
-      sha256 = "1jlhlxw31c9g7z6yhqjsp76xm85ywrr0in4qazidwb9k8lkqxa7g";
-      name = "kmime-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmime-18.04.2.tar.xz";
+      sha256 = "02h2bpcf4mz4wfv1r2lj9xm01bbglwz23r4ay7373gilxjgcxx5h";
+      name = "kmime-18.04.2.tar.xz";
     };
   };
   kmines = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmines-18.04.1.tar.xz";
-      sha256 = "0i88pc7j18xighw8ii6gh5gxq9k2zy372ggdyany91dcjgmwhgw7";
-      name = "kmines-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmines-18.04.2.tar.xz";
+      sha256 = "0p1hg5nvpkyijl6nzshp136chiqvkwbbmniq7w9gdmf3ch7hr7ba";
+      name = "kmines-18.04.2.tar.xz";
     };
   };
   kmix = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmix-18.04.1.tar.xz";
-      sha256 = "1jq71pgnlz95na5fbm504pkrrahiclqbb0cwsqpbpi10m2nzcrwd";
-      name = "kmix-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmix-18.04.2.tar.xz";
+      sha256 = "1l2gqwxrhnbm9hxyyb0bsn8dxv2c52ha3576j5h62j4rwxzh5mm7";
+      name = "kmix-18.04.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmousetool-18.04.1.tar.xz";
-      sha256 = "08g5k9yfd5wrh47zp99hgq634vd9r23gjlr77xg86jqn8dj2lgqx";
-      name = "kmousetool-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmousetool-18.04.2.tar.xz";
+      sha256 = "0ivhdrdpn8fkws9lghj4iakd3qdrvyd6mp0v3zacdi2mccgcsclg";
+      name = "kmousetool-18.04.2.tar.xz";
     };
   };
   kmouth = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmouth-18.04.1.tar.xz";
-      sha256 = "08m5r9vd0gb06izav2g21qkfmg1gjpj0kn0nh785bbhs0bbngrci";
-      name = "kmouth-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmouth-18.04.2.tar.xz";
+      sha256 = "0zyjh1fbjkg2p0wwc5nw8mh26wbngm0c2vacxv1zx1xdhdwa4mbw";
+      name = "kmouth-18.04.2.tar.xz";
     };
   };
   kmplot = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kmplot-18.04.1.tar.xz";
-      sha256 = "01rxnc45jc6swsm2h8bw45n96lsalgbfzww18hlq1qpyjr20181h";
-      name = "kmplot-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kmplot-18.04.2.tar.xz";
+      sha256 = "0k2qpcwd6s34zx049na1i429ans8js6bgwynkz7fmva0fpc1kgwh";
+      name = "kmplot-18.04.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/knavalbattle-18.04.1.tar.xz";
-      sha256 = "1kr37qmb4577i12wghc0qcbbqpxr2wzww1cqv0wcd9jmjd3mq1xw";
-      name = "knavalbattle-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/knavalbattle-18.04.2.tar.xz";
+      sha256 = "1l846gak5gb3r4sf38410c7lfpwna89x285ql5fhlgzr311xkhqm";
+      name = "knavalbattle-18.04.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/knetwalk-18.04.1.tar.xz";
-      sha256 = "02zpndbbyffakdxxswpmb1hrszh78a3ip6mfr8bqwnwbvzh80cjy";
-      name = "knetwalk-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/knetwalk-18.04.2.tar.xz";
+      sha256 = "0vvc2kkn9szgknxhcc5mphbsk0h121i0kaljr0330ggpxj0n6kfi";
+      name = "knetwalk-18.04.2.tar.xz";
     };
   };
   knotes = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/knotes-18.04.1.tar.xz";
-      sha256 = "0jc9mpnwgrbh8pra75gsiy9wm0aylm9a0ssw8bhfivb77dmqr44c";
-      name = "knotes-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/knotes-18.04.2.tar.xz";
+      sha256 = "0x20j9ln4gmi407avmkpn5snhsjfa70q7ica2z4l15yb43ds2viv";
+      name = "knotes-18.04.2.tar.xz";
     };
   };
   kolf = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kolf-18.04.1.tar.xz";
-      sha256 = "1bahv98dskknyy8rxpnjxywpcw09x58bsdg0aqgh5xdm0ym992ik";
-      name = "kolf-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kolf-18.04.2.tar.xz";
+      sha256 = "0cbl5as62qidi1i2902767apy8yyx7lkpbwm4hp681v8m34kwi6y";
+      name = "kolf-18.04.2.tar.xz";
     };
   };
   kollision = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kollision-18.04.1.tar.xz";
-      sha256 = "0pr4f9inxp77d761byis30jski642bhcfvbpcpnj9fi3k1cgzcna";
-      name = "kollision-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kollision-18.04.2.tar.xz";
+      sha256 = "0065p658792n03n0q0fmmgs6h2h31sczff25y0ka7xyky49452vs";
+      name = "kollision-18.04.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kolourpaint-18.04.1.tar.xz";
-      sha256 = "1lfvmk9vhwa8j454pfh0x1klqb360zlsyydiiqm5a4dhc4wvcwzy";
-      name = "kolourpaint-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kolourpaint-18.04.2.tar.xz";
+      sha256 = "03rrhy1idhj39wfncxpbnrj7wji8lv39msv80zw1k394wdxz713r";
+      name = "kolourpaint-18.04.2.tar.xz";
     };
   };
   kompare = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kompare-18.04.1.tar.xz";
-      sha256 = "0kmf245fbm32hdgmyiv51ham3py7jhc3zpwfcfxbjyi94ikx4n79";
-      name = "kompare-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kompare-18.04.2.tar.xz";
+      sha256 = "0b90varbdq87apsxmp7rk8nbwk57wy6ivl2xc5cpi2p0r09f5bc9";
+      name = "kompare-18.04.2.tar.xz";
     };
   };
   konqueror = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/konqueror-18.04.1.tar.xz";
-      sha256 = "0798z1pm7sxi93xy4jibzhff8k37q88l59kyz524kl7m8wnw5scj";
-      name = "konqueror-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/konqueror-18.04.2.tar.xz";
+      sha256 = "1wy2gf20p7jlsq3dw1xf72pssfhmsbg50wgvbndsr9a9mylj3d4h";
+      name = "konqueror-18.04.2.tar.xz";
     };
   };
   konquest = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/konquest-18.04.1.tar.xz";
-      sha256 = "0h637lpmdsascp178fi5mpl9825n83r094ff8l5k4dnfks5imgv4";
-      name = "konquest-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/konquest-18.04.2.tar.xz";
+      sha256 = "07pdakv1snnwy0q0afc1qydy26vw65c7wy2dbh0hl57df9m095i4";
+      name = "konquest-18.04.2.tar.xz";
     };
   };
   konsole = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/konsole-18.04.1.tar.xz";
-      sha256 = "0hnyi5361glmal69brqc9h6zcv8z4l8va6nv0hc2siafmj21yhw6";
-      name = "konsole-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/konsole-18.04.2.tar.xz";
+      sha256 = "0rqrb9xdp6m2fyknk346iqbfcgz5qizdsa7n450gwinjki14yksx";
+      name = "konsole-18.04.2.tar.xz";
     };
   };
   kontact = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kontact-18.04.1.tar.xz";
-      sha256 = "00xaizfnfvh39xnxq2jp9n9cl7f0a22hlndamjfhw126ji0mz052";
-      name = "kontact-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kontact-18.04.2.tar.xz";
+      sha256 = "0g2sz9rmzscwwm6frxz2x5z17imwh5h9kb64iz0lffjzg8d9fjmq";
+      name = "kontact-18.04.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kontactinterface-18.04.1.tar.xz";
-      sha256 = "1zywgcrwzgw56vx2x0f2f0235bs2aikvn2qfizv4m5ac7ydihnyd";
-      name = "kontactinterface-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kontactinterface-18.04.2.tar.xz";
+      sha256 = "076pbxxsr38q2h0s3xcgszpvdsgfrx7njh37zrv3frn5ns928dxw";
+      name = "kontactinterface-18.04.2.tar.xz";
     };
   };
   kopete = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kopete-18.04.1.tar.xz";
-      sha256 = "1isxabxxx48vjzihycv80fapx69qrvv5zlyfrdg42s9qxqkcgvi8";
-      name = "kopete-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kopete-18.04.2.tar.xz";
+      sha256 = "1s6js1xbm6n7prcjz66rk21lyzj7l76hhghvby0aak6rd77qdhpd";
+      name = "kopete-18.04.2.tar.xz";
     };
   };
   korganizer = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/korganizer-18.04.1.tar.xz";
-      sha256 = "1x3n03200j79xrj4y7046l3sa3qqfys3z2d2b1nl22v8g3l8gyx2";
-      name = "korganizer-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/korganizer-18.04.2.tar.xz";
+      sha256 = "06n4npcwf76nwrzbzjqr14pcmrqn46sriyasgqzd1iqmx1120lb5";
+      name = "korganizer-18.04.2.tar.xz";
     };
   };
   kpat = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kpat-18.04.1.tar.xz";
-      sha256 = "1fly7cd895v6k991hjvq4cv22dibzsvihzcj9cl9pzc7dk9vp70v";
-      name = "kpat-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kpat-18.04.2.tar.xz";
+      sha256 = "0nqgqd4i459m0z0bhavx08igap9lqx4rcc6yx63ina67nbx114k6";
+      name = "kpat-18.04.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kpimtextedit-18.04.1.tar.xz";
-      sha256 = "09513fv0kaa7x01lsnpm18vvxijcwb68hdglbw08n5f7135k79mn";
-      name = "kpimtextedit-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kpimtextedit-18.04.2.tar.xz";
+      sha256 = "1scd58mzh3mddp0nsjp7wjfclz2ylvxqksa4q4md9rbxnc3zl6fn";
+      name = "kpimtextedit-18.04.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kqtquickcharts-18.04.1.tar.xz";
-      sha256 = "08y0nc070pjmf07yifkfd6dm3frma752c42m3ms0ysz96l1x2gr1";
-      name = "kqtquickcharts-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kqtquickcharts-18.04.2.tar.xz";
+      sha256 = "1pxaj7wpnkwygilkj0bg4sd5m2w6jlpc2yaliaswzfy3vshrb2nl";
+      name = "kqtquickcharts-18.04.2.tar.xz";
     };
   };
   krdc = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/krdc-18.04.1.tar.xz";
-      sha256 = "166990llgfkbysahrfralc6n2g7ix7h4w1fpzss0axfigz5ink1x";
-      name = "krdc-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/krdc-18.04.2.tar.xz";
+      sha256 = "0aziq34snf0bbp9zzbag9hjv9an4b24qslmxkn002ifq9c1jww7k";
+      name = "krdc-18.04.2.tar.xz";
     };
   };
   kreversi = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kreversi-18.04.1.tar.xz";
-      sha256 = "0g6jc7s54i4gzb5q9cg4qczwx9i4zir52zqnjl5akr1w9v8d2m34";
-      name = "kreversi-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kreversi-18.04.2.tar.xz";
+      sha256 = "1436cr72snpn6aqjsc9nm3arc7ycdimlliky922mzdsl4n3absg2";
+      name = "kreversi-18.04.2.tar.xz";
     };
   };
   krfb = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/krfb-18.04.1.tar.xz";
-      sha256 = "1zd3rgp4265r1fi1kc2s09rrzpa22b9j56cq3l50mzkb80kyi6vl";
-      name = "krfb-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/krfb-18.04.2.tar.xz";
+      sha256 = "1niwg04ziqwyphw3r54909rwcqc39iv6ni8aqqsm1wfx5iqyg1sa";
+      name = "krfb-18.04.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kross-interpreters-18.04.1.tar.xz";
-      sha256 = "1gybf7diq2amaqs7xaikfh1kp40iwfvxz4bms16b6flck8sja8va";
-      name = "kross-interpreters-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kross-interpreters-18.04.2.tar.xz";
+      sha256 = "1n6r1wn6qw9rf1zrszq30sqkavn46b1151ak99kf3nc3c6fk225q";
+      name = "kross-interpreters-18.04.2.tar.xz";
     };
   };
   kruler = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kruler-18.04.1.tar.xz";
-      sha256 = "0bkf1cm23582hwz4j3xygrwqwbfq27qycvnf2mqw921j08axa376";
-      name = "kruler-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kruler-18.04.2.tar.xz";
+      sha256 = "0ynq8vvgbmrgc8na0bj7nf98qr0kis59wrq8jygllgybrvm8wxb4";
+      name = "kruler-18.04.2.tar.xz";
     };
   };
   kshisen = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kshisen-18.04.1.tar.xz";
-      sha256 = "098qqzii4wk0pv5388yighy381k5ffrb8wy4z461yxgxc75d77f7";
-      name = "kshisen-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kshisen-18.04.2.tar.xz";
+      sha256 = "1psvdcylr8c81252cmd7ky1f62bh82kpnbvfcvwkg2kfwwr9ril3";
+      name = "kshisen-18.04.2.tar.xz";
     };
   };
   ksirk = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ksirk-18.04.1.tar.xz";
-      sha256 = "0mxj4vp6da535ghnxisk6j7akhis0fh16kj6bycw8fxxl5jiy0sq";
-      name = "ksirk-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ksirk-18.04.2.tar.xz";
+      sha256 = "1zl5riig9rmcs3sn4fj51fhxlcgs709x4ahdgcjrncafvxb9b1xg";
+      name = "ksirk-18.04.2.tar.xz";
     };
   };
   ksmtp = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ksmtp-18.04.1.tar.xz";
-      sha256 = "0imfcaisvh78s18x2w4iizr4vn6sndr1nk9585vs9dr8wcwbfrl3";
-      name = "ksmtp-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ksmtp-18.04.2.tar.xz";
+      sha256 = "16q7f5b87mxzz05d8vfra3m2fj0n2h62askcmp5p8zfc9am07991";
+      name = "ksmtp-18.04.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ksnakeduel-18.04.1.tar.xz";
-      sha256 = "07p9nil9x3cyzzxcr59h3rj9h6g1lfssrsi6iqwq0hpdc6h2zl73";
-      name = "ksnakeduel-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ksnakeduel-18.04.2.tar.xz";
+      sha256 = "119jgihx1qdk6aa8xkjh5q3zcqsybbs8vn3hjnwcy2dzkyc04v7a";
+      name = "ksnakeduel-18.04.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kspaceduel-18.04.1.tar.xz";
-      sha256 = "0aar147l5bq1ij40ng5wbdixg91678r3d07lrnmdffb47wa1ly7n";
-      name = "kspaceduel-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kspaceduel-18.04.2.tar.xz";
+      sha256 = "08g1h7j1bl7sfiz2vk05df16yjp0dwzvdn7ymr74il6m6ln65a9w";
+      name = "kspaceduel-18.04.2.tar.xz";
     };
   };
   ksquares = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ksquares-18.04.1.tar.xz";
-      sha256 = "1vr9xdi0jfrjwvq5y04djmnax7q4d5amj8a7mzvvqq427zl6xc3c";
-      name = "ksquares-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ksquares-18.04.2.tar.xz";
+      sha256 = "1xc82gc4bszsfd3y7xgfaxj4flnflr1v0wv8m1jgk3xzka889wq2";
+      name = "ksquares-18.04.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ksudoku-18.04.1.tar.xz";
-      sha256 = "0habss3w7m3x8mhh70qq38nymynvihar9clpxmlp6pbyw8sl9v6n";
-      name = "ksudoku-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ksudoku-18.04.2.tar.xz";
+      sha256 = "0fhbf7d3bb7cad7wd44hslx7ak5l6nx1d0r3dh38y51c7jwwy2nl";
+      name = "ksudoku-18.04.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ksystemlog-18.04.1.tar.xz";
-      sha256 = "1yyrbdzjxrlf96l3bvj675fsbn6440lxr1nd5j4rs09d3fyvl6p1";
-      name = "ksystemlog-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ksystemlog-18.04.2.tar.xz";
+      sha256 = "0qx1wg4a8cpp3vd89xqcbfl7hzg3frcv37bsmdc44l988m9l44x3";
+      name = "ksystemlog-18.04.2.tar.xz";
     };
   };
   kteatime = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kteatime-18.04.1.tar.xz";
-      sha256 = "02849i02h0zmsc3wifzgq9s0mgfdyzdrm61ngq944r260anizxhd";
-      name = "kteatime-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kteatime-18.04.2.tar.xz";
+      sha256 = "1bmirc40prg5f4rlyrz8xbgwrm8nrcxvmbpk8399szb41m3p031c";
+      name = "kteatime-18.04.2.tar.xz";
     };
   };
   ktimer = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktimer-18.04.1.tar.xz";
-      sha256 = "13k0wmjh925sj7l8n4kc0adva1vfbgs6admh80ch0xwk8mmsdjvp";
-      name = "ktimer-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktimer-18.04.2.tar.xz";
+      sha256 = "1djb5r7wwrc0hzv76lqf602gy9ijz4zw1j1z6n19yhvy9baz5ix6";
+      name = "ktimer-18.04.2.tar.xz";
     };
   };
   ktnef = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktnef-18.04.1.tar.xz";
-      sha256 = "1m6nbsnbh8apyqaw2kivkzhk7fp9y2xphmrblqdpf49qpbh6jqlq";
-      name = "ktnef-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktnef-18.04.2.tar.xz";
+      sha256 = "03m7gqgz8bpjig8xh04pmzs3yyfiajksqq43hsh3hlck1fmycmvq";
+      name = "ktnef-18.04.2.tar.xz";
     };
   };
   ktouch = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktouch-18.04.1.tar.xz";
-      sha256 = "18piwwdq4hl8yaln7s7p4bw0lwkyjwnw8lknirj1352npycvq2n1";
-      name = "ktouch-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktouch-18.04.2.tar.xz";
+      sha256 = "0x16m27l8hc2kk2bfc7r98y45vwkdqs7mk3g1i7ys4rf4rdcf62h";
+      name = "ktouch-18.04.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-accounts-kcm-18.04.1.tar.xz";
-      sha256 = "1ihxvngg6cp1vzhpf4hkf2zwxpa5gnlq11lc1ffnhy7fm7ig28nx";
-      name = "ktp-accounts-kcm-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-accounts-kcm-18.04.2.tar.xz";
+      sha256 = "1wfy4p8w1rzq6mnq9axcx6b0v0hsjjlzysn7gvgqnyvnqzfn31gg";
+      name = "ktp-accounts-kcm-18.04.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-approver-18.04.1.tar.xz";
-      sha256 = "1749l1zklk1q7i3z4mbk24566vps74hj3as4ijybgymczr4rd3gz";
-      name = "ktp-approver-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-approver-18.04.2.tar.xz";
+      sha256 = "1irhid13c2nblfs1qkkpkiwk7559zd3hh4397v9d9h2952gadf2r";
+      name = "ktp-approver-18.04.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-auth-handler-18.04.1.tar.xz";
-      sha256 = "0llkw1yqi91s8iqdqz8pskccinmjsgbp1081pngpkqcg1iy7bara";
-      name = "ktp-auth-handler-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-auth-handler-18.04.2.tar.xz";
+      sha256 = "01wmnd63zjc37yknfjqqsgninqpwrh2w6df4rydxbk3p1mqv1g6x";
+      name = "ktp-auth-handler-18.04.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-call-ui-18.04.1.tar.xz";
-      sha256 = "1pji4z8h7bk5npl279x5g9hx7zgdhnjdrv669nrd1gi9m20n6vi7";
-      name = "ktp-call-ui-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-call-ui-18.04.2.tar.xz";
+      sha256 = "1q9h89ng2r85is18lkxpsbapd0j0ac4gb8jyq333c7lahflr6qfw";
+      name = "ktp-call-ui-18.04.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-common-internals-18.04.1.tar.xz";
-      sha256 = "0jwkwznqcrk39k07srl7c0yznj9p9dp70lkfhjg3syscwm8drydv";
-      name = "ktp-common-internals-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-common-internals-18.04.2.tar.xz";
+      sha256 = "13mi1l8xwhr7h5sc332b91nsrq211q2m8xxvdizmlmyf4kss02b2";
+      name = "ktp-common-internals-18.04.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-list-18.04.1.tar.xz";
-      sha256 = "1806fapr0pv15dmpqb0khdlgrmk9bsf45s1ab7x9pdnghnawn132";
-      name = "ktp-contact-list-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-contact-list-18.04.2.tar.xz";
+      sha256 = "0n8aj9m7vq62amrv1smfq39lmbjzlbcz4zdbk529j0iqryvm4ycr";
+      name = "ktp-contact-list-18.04.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-runner-18.04.1.tar.xz";
-      sha256 = "0b9xm5p9w5kd67sh13h9caxqj89jzia79hfk9fzxpjbf0kifj72s";
-      name = "ktp-contact-runner-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-contact-runner-18.04.2.tar.xz";
+      sha256 = "0zjsvsxdd2w4vijj9bqifl88wf0bkkdiqrpzpdm71zwvpp8dp6pj";
+      name = "ktp-contact-runner-18.04.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-desktop-applets-18.04.1.tar.xz";
-      sha256 = "0jrdz8ccgrbwpb6k73wvsix3h3h16dxzgqy19lykd5igckq1v2qh";
-      name = "ktp-desktop-applets-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-desktop-applets-18.04.2.tar.xz";
+      sha256 = "19qdpgp6qqfzqv5xli1jk63d2nz1pr8kaggssfxmygc02vjq39wg";
+      name = "ktp-desktop-applets-18.04.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-filetransfer-handler-18.04.1.tar.xz";
-      sha256 = "03v0wgac6knprqi7mfzc3w1rrdkf9lgi2gpscc3k910dyswh1802";
-      name = "ktp-filetransfer-handler-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-filetransfer-handler-18.04.2.tar.xz";
+      sha256 = "1ygnm5n9sykyr9vi9c131xhrbrb54s9qbm4kmvxnrw8bl40vpdj5";
+      name = "ktp-filetransfer-handler-18.04.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-kded-module-18.04.1.tar.xz";
-      sha256 = "0d3vv1ngsbh87wxijvyd2hzhdzwr0r5vx5h3jdl3znjh9ysifwm4";
-      name = "ktp-kded-module-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-kded-module-18.04.2.tar.xz";
+      sha256 = "11x559k1cqgzhpm7b44ybi47n1086jmd38pw0nmivj0j0qgssypm";
+      name = "ktp-kded-module-18.04.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-send-file-18.04.1.tar.xz";
-      sha256 = "1p3vgbsmam687bzp1h6xxv2qr2f6jz6mjbpk5jxjvvz66aq4dj8y";
-      name = "ktp-send-file-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-send-file-18.04.2.tar.xz";
+      sha256 = "15izy3ziwm2170lg5c4irvypyafzwa4idxjr1pvf1j5z4rs0vj29";
+      name = "ktp-send-file-18.04.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktp-text-ui-18.04.1.tar.xz";
-      sha256 = "1zsxyizm9vdlrxicxvgmy5irqi914szxkd38xrgspp2vdi4bnvb6";
-      name = "ktp-text-ui-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktp-text-ui-18.04.2.tar.xz";
+      sha256 = "0vfi1dsax99gr7qzpk40vpa0da4hqncxjgwxa6h1srf5l0hbvc1r";
+      name = "ktp-text-ui-18.04.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/ktuberling-18.04.1.tar.xz";
-      sha256 = "1rpval4rl63dfy2p6aq5902ifvv14x1zg8mzzci26kqq8k38jasc";
-      name = "ktuberling-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/ktuberling-18.04.2.tar.xz";
+      sha256 = "1c82gnjlsp1dblmdavhrz43yzv2h3nvjafna7f53js6d5ggsxm2q";
+      name = "ktuberling-18.04.2.tar.xz";
     };
   };
   kturtle = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kturtle-18.04.1.tar.xz";
-      sha256 = "1s2n46nlzc63108gc43h14yjrcd12h93bvbg08ynhfaq26pqz1jk";
-      name = "kturtle-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kturtle-18.04.2.tar.xz";
+      sha256 = "09fy1q40iwj7ds521ffzc5hmsbh7qb481ykq6ixfqbxzys4yjxm8";
+      name = "kturtle-18.04.2.tar.xz";
     };
   };
   kubrick = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kubrick-18.04.1.tar.xz";
-      sha256 = "1gqnfc8gnl96gz5i3ak7swhm36c9dv7n0c4b5f70pnsi5n7klbxr";
-      name = "kubrick-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kubrick-18.04.2.tar.xz";
+      sha256 = "1z7yym9sc2i35sw32sjc5qqip99vmf5grwxmha50ra6qvxqgljmq";
+      name = "kubrick-18.04.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kwalletmanager-18.04.1.tar.xz";
-      sha256 = "0vj0ch1dk265v6x8xzvskpv5mc564p10pn8m9jjv79wk2xy1vsjz";
-      name = "kwalletmanager-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kwalletmanager-18.04.2.tar.xz";
+      sha256 = "0lijv2s9213d0wnk0j23qfd1f7f77kdypj2b9pmpi4ng1sf77bwp";
+      name = "kwalletmanager-18.04.2.tar.xz";
     };
   };
   kwave = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kwave-18.04.1.tar.xz";
-      sha256 = "0avbyyrhvzfxdib0d80rk7m6gk6kq9rjvv640s08y237m68fncap";
-      name = "kwave-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kwave-18.04.2.tar.xz";
+      sha256 = "04crj0qkbnzc7abfa920s9csdpy4rhw49qq1x3sq09mqagbd04fw";
+      name = "kwave-18.04.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/kwordquiz-18.04.1.tar.xz";
-      sha256 = "1yqynfmlargfwk7nlfzhlxd1df462ssw7qj3pdhym8277jfch58r";
-      name = "kwordquiz-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/kwordquiz-18.04.2.tar.xz";
+      sha256 = "07dyzq9l4v2bymkc8jjm1i76y3nka98py2nf4ids0lpgxvkdx197";
+      name = "kwordquiz-18.04.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libgravatar-18.04.1.tar.xz";
-      sha256 = "19xrc70yh6baxg5jlr3v3d3af46vms28jzvkpgda5ffacnn3xnrj";
-      name = "libgravatar-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libgravatar-18.04.2.tar.xz";
+      sha256 = "1yzai7azdqa16vndifj7smzxkw2sdkx1j8jfbcqsrs1rmn4p8f0f";
+      name = "libgravatar-18.04.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkcddb-18.04.1.tar.xz";
-      sha256 = "1nn80sflfgzd3d2kc4d4zwa09ix498svrinn27b9h8x3w3gsbg8f";
-      name = "libkcddb-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkcddb-18.04.2.tar.xz";
+      sha256 = "053dgcxva3qphifhk08146gmnnnxnkay64p81bcrxgjbd5lf7vak";
+      name = "libkcddb-18.04.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkcompactdisc-18.04.1.tar.xz";
-      sha256 = "12zb39zwvl8y2b48vjn34dxj4f65laswd67w5f7m4g0nczq218v1";
-      name = "libkcompactdisc-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkcompactdisc-18.04.2.tar.xz";
+      sha256 = "0l3nd8px0w0bl0kjr5gk1rbakzgff8bbzvqrfhqfswx7iqdghlav";
+      name = "libkcompactdisc-18.04.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkdcraw-18.04.1.tar.xz";
-      sha256 = "011q982rx5m8609i1zd6q186xw3ps81fnvhjk69hxy5w8pp44m6i";
-      name = "libkdcraw-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkdcraw-18.04.2.tar.xz";
+      sha256 = "116db7f69972kbjc3p5mh81cv3iq76y9a53v965idx1manw6p17b";
+      name = "libkdcraw-18.04.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkdegames-18.04.1.tar.xz";
-      sha256 = "03afnypmn8bz1cgc4lgfmid2hszsq564hsf9m5s57a29vfswnp6m";
-      name = "libkdegames-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkdegames-18.04.2.tar.xz";
+      sha256 = "130fj578bgkwg6anm0sbnhvw9wvlwv5m5mmqnfnw9aha16yd6w12";
+      name = "libkdegames-18.04.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkdepim-18.04.1.tar.xz";
-      sha256 = "02wrkn1h662dqzp7kyrhhhiyahhkgqz75jcd59haxyj66amlgcx6";
-      name = "libkdepim-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkdepim-18.04.2.tar.xz";
+      sha256 = "1rsyd06dqkfhx1s1zjzlg3n75pkhw754iai2758a8rxzs6bq6plg";
+      name = "libkdepim-18.04.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkeduvocdocument-18.04.1.tar.xz";
-      sha256 = "14i25wjfak39bz0y5rkg25mvjxnzpak76sf5w163dmwx2hd7spzr";
-      name = "libkeduvocdocument-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkeduvocdocument-18.04.2.tar.xz";
+      sha256 = "17bgsj9jf1a0108nrm17cp0fjli9jpbsci28yllda2kavcdr1izm";
+      name = "libkeduvocdocument-18.04.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkexiv2-18.04.1.tar.xz";
-      sha256 = "0q6hmghivdj0aq00pg3z5i6mfdj3xgpdd6yw0vr9i4jnk0rfb349";
-      name = "libkexiv2-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkexiv2-18.04.2.tar.xz";
+      sha256 = "1cqp8cbqmqxnjkhiv8yjd047vppnym5dqy3yr01ppv9jlivyqzpk";
+      name = "libkexiv2-18.04.2.tar.xz";
     };
   };
   libkgapi = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkgapi-18.04.1.tar.xz";
-      sha256 = "0wpxn7qyf56rckarx52ic3yyhv8r043dxjir4f2yf05vkddwkshv";
-      name = "libkgapi-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkgapi-18.04.2.tar.xz";
+      sha256 = "1axnn3634h2cjiky1km8c88ip8wnascxc1z4rdbxwk013hkbd4fh";
+      name = "libkgapi-18.04.2.tar.xz";
     };
   };
   libkgeomap = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkgeomap-18.04.1.tar.xz";
-      sha256 = "16rzw8r1i7isfh86rg86a0h25zwa8h3hnxbzf3fjmdn6mmdkp2va";
-      name = "libkgeomap-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkgeomap-18.04.2.tar.xz";
+      sha256 = "1rx2ksp07nsny4dr7dmjlbd5v9agnnnnz38r4kf4cqdr7w3ymhhd";
+      name = "libkgeomap-18.04.2.tar.xz";
     };
   };
   libkipi = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkipi-18.04.1.tar.xz";
-      sha256 = "09rx85phr259anznvxyfp4rb51jsid76jrbcgv52vy9cfd7rr8pk";
-      name = "libkipi-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkipi-18.04.2.tar.xz";
+      sha256 = "1bddsblrq45v7id41cr8bxss9sdlznk50mwkc03nc9xq1dlhsw0n";
+      name = "libkipi-18.04.2.tar.xz";
     };
   };
   libkleo = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkleo-18.04.1.tar.xz";
-      sha256 = "06kyiv9bshyf2q0k7g7pm1ja35sxddgrzb5ayxnx03na86dm67j9";
-      name = "libkleo-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkleo-18.04.2.tar.xz";
+      sha256 = "0m57klq8dlmibw5j8ah14q18cxl4sy7kjkrckmaydkhi45lc6j8m";
+      name = "libkleo-18.04.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkmahjongg-18.04.1.tar.xz";
-      sha256 = "09sqi1xyd8hk3x6w5ix6sa191ihil3zjq1qd6j50fr2rpqzfnbm0";
-      name = "libkmahjongg-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkmahjongg-18.04.2.tar.xz";
+      sha256 = "0gbzrsc837h5xh72c89zj98ydly08799kl3g4fpai7w2ak1hmcf4";
+      name = "libkmahjongg-18.04.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libkomparediff2-18.04.1.tar.xz";
-      sha256 = "0d00r0h1fbmhkdn791f3i87ckc4l8wd5rljlm4lfzcr95lbmpzyv";
-      name = "libkomparediff2-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libkomparediff2-18.04.2.tar.xz";
+      sha256 = "0m3r45mzipvglv6llkmfryr023yya07xilkxksp672lb46w8x047";
+      name = "libkomparediff2-18.04.2.tar.xz";
     };
   };
   libksane = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libksane-18.04.1.tar.xz";
-      sha256 = "1k1ffki9gcgah7xymyzbwza00gw3dvkfghcbyy4dpvbb0q4ayw7c";
-      name = "libksane-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libksane-18.04.2.tar.xz";
+      sha256 = "0flc1azdjjby27lbi5kgcghh7imry4m37jxsnnwyhnhdfm3py1dy";
+      name = "libksane-18.04.2.tar.xz";
     };
   };
   libksieve = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/libksieve-18.04.1.tar.xz";
-      sha256 = "0dsb1lj155y32avlgw6clxpbv00z3nrc7a7nlfh29l0wjl09mr50";
-      name = "libksieve-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/libksieve-18.04.2.tar.xz";
+      sha256 = "0sml8x0462s13g4wjrvsswsz5fl97zyz1ps9c6v8prc0hyann81p";
+      name = "libksieve-18.04.2.tar.xz";
     };
   };
   lokalize = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/lokalize-18.04.1.tar.xz";
-      sha256 = "1svwl30abycdq2jc4a688lbb4yk28dqscchi1zshdii6w00bcys9";
-      name = "lokalize-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/lokalize-18.04.2.tar.xz";
+      sha256 = "0nzrvbbv61nl3mxgnx2kv4qc9pgky85jxgw7i9w4alizz491xzlp";
+      name = "lokalize-18.04.2.tar.xz";
     };
   };
   lskat = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/lskat-18.04.1.tar.xz";
-      sha256 = "0isy9ibk93i4b72cdv5210n8gfwiydrw4i0bax2pkyxqymyfr5lj";
-      name = "lskat-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/lskat-18.04.2.tar.xz";
+      sha256 = "0qywkf6bl8mgjwhmcpmhrlfk316ds3afyf2ibgcb15cixv72amw1";
+      name = "lskat-18.04.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/mailcommon-18.04.1.tar.xz";
-      sha256 = "0s0c4swm1q331hzqg0fqb2r9dwx4aamwan3s5p71vjnibxzbmqck";
-      name = "mailcommon-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/mailcommon-18.04.2.tar.xz";
+      sha256 = "1aszv65xp07gvx98sx2j8dp6m429c1a5g71n825lvj42j2v4221p";
+      name = "mailcommon-18.04.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/mailimporter-18.04.1.tar.xz";
-      sha256 = "1qzc7yjjscbxkinby9carp02wqppx95hirq0m5ihly7avn5cn6dz";
-      name = "mailimporter-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/mailimporter-18.04.2.tar.xz";
+      sha256 = "17fvrnwmd3bs7r87ysab6blnwn3p7vanlbwb1zzlhqw8m4q8f015";
+      name = "mailimporter-18.04.2.tar.xz";
     };
   };
   marble = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/marble-18.04.1.tar.xz";
-      sha256 = "04aa32qnr585lq3s3hmxqlwqranr3wr1zr1xm99pbsb32k2yyyjn";
-      name = "marble-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/marble-18.04.2.tar.xz";
+      sha256 = "0a4i8jbkibjm24zcldzn1nsr3d2kqwjdzj4anchyhfzyk22ac8hd";
+      name = "marble-18.04.2.tar.xz";
     };
   };
   mbox-importer = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/mbox-importer-18.04.1.tar.xz";
-      sha256 = "06735201365rpp3lr877pqdkz9206zfzhvbbr432fvg6lx3p5z4s";
-      name = "mbox-importer-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/mbox-importer-18.04.2.tar.xz";
+      sha256 = "1ymmwgc7m5k2bg99zfik319zdmx2dw8ni56cqjid1yx5iqmghyl6";
+      name = "mbox-importer-18.04.2.tar.xz";
     };
   };
   messagelib = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/messagelib-18.04.1.tar.xz";
-      sha256 = "1fznlxl1j1n5pbg3v7rmd4lhfjhr1r95b62gyqydlrrwgzzs92b2";
-      name = "messagelib-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/messagelib-18.04.2.tar.xz";
+      sha256 = "0hjk08na1w943y3pi65a7g8q7m66r7scabbs8cvj3sp31c2f9hfw";
+      name = "messagelib-18.04.2.tar.xz";
     };
   };
   minuet = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/minuet-18.04.1.tar.xz";
-      sha256 = "0fans0fpghdckmp6ww8api4d7kfna1w20yjgssvfqxgyxxni0vps";
-      name = "minuet-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/minuet-18.04.2.tar.xz";
+      sha256 = "039la5ifyhv1h7kr1g8zgrkkgvi522d32snxx3cqchyj0dy22ays";
+      name = "minuet-18.04.2.tar.xz";
     };
   };
   okular = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/okular-18.04.1.tar.xz";
-      sha256 = "0fhfbjlwa4xzf2q2wnidprj7qqizs26i959k61k4j66y66d2za0g";
-      name = "okular-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/okular-18.04.2.tar.xz";
+      sha256 = "1jcrk6czwgpbfi4l6cvsnyxcf0s4jnkiw0py7np7yvycwsf4x7mz";
+      name = "okular-18.04.2.tar.xz";
     };
   };
   palapeli = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/palapeli-18.04.1.tar.xz";
-      sha256 = "01p1xipacb8w7lcd3n8387c7axjxswvv62rn7sphp736l23wri5c";
-      name = "palapeli-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/palapeli-18.04.2.tar.xz";
+      sha256 = "0fbn1sv6pznl2s3ps1g2f4y400zjxk9ia42120rz1i695v9xcp2f";
+      name = "palapeli-18.04.2.tar.xz";
     };
   };
   parley = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/parley-18.04.1.tar.xz";
-      sha256 = "1qh7bg38bvq8drnd7plkdxxqsl6rgd37g3iqnxwljxf723s6hcz5";
-      name = "parley-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/parley-18.04.2.tar.xz";
+      sha256 = "0cbab4kqh80gfqvm4iihf78shbkkryg59q3qb5h8m86i22kzf0hv";
+      name = "parley-18.04.2.tar.xz";
     };
   };
   picmi = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/picmi-18.04.1.tar.xz";
-      sha256 = "095xm4nkd0kg0pvbbp3vasll1lfpk491frspk2463q0zhd04hpmi";
-      name = "picmi-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/picmi-18.04.2.tar.xz";
+      sha256 = "0xs4a0dv3kyl2rkl8whlrhfhs05wzvab2q3k9bdmjn3vkcg6w3kc";
+      name = "picmi-18.04.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/pimcommon-18.04.1.tar.xz";
-      sha256 = "0zyd0ja6ir6nbkvf4hk6hi93qr19kns8hgww15y2xmdhdcyf52ja";
-      name = "pimcommon-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/pimcommon-18.04.2.tar.xz";
+      sha256 = "0xdng2vrv0mdzxnlcysrhrjkbkv9vmkck20xc9p3kr2qzjl4v4n3";
+      name = "pimcommon-18.04.2.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/pim-data-exporter-18.04.1.tar.xz";
-      sha256 = "0k69nmjp0n2mmg1nsghghk2ybnvyr01gnrhqwvknpbncb2cnkgcg";
-      name = "pim-data-exporter-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/pim-data-exporter-18.04.2.tar.xz";
+      sha256 = "0si2wss4la5d8w0axcv4j8gnx1x4cy0ja8raz77m2ffnwi27rj43";
+      name = "pim-data-exporter-18.04.2.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/pim-sieve-editor-18.04.1.tar.xz";
-      sha256 = "076hzkia8l61nn3gwma88lsx02d1fb6d00jbibvghqp7raa9f0fx";
-      name = "pim-sieve-editor-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/pim-sieve-editor-18.04.2.tar.xz";
+      sha256 = "152qrdi48kcjnfhnhk7pa2950bmlww7w2i840zngfr3q7s09kacs";
+      name = "pim-sieve-editor-18.04.2.tar.xz";
     };
   };
   poxml = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/poxml-18.04.1.tar.xz";
-      sha256 = "1ha1dy5j40269nv5ygb0idd9kkizni3zq4vz64i2y29lvbrqdgh1";
-      name = "poxml-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/poxml-18.04.2.tar.xz";
+      sha256 = "15nhdkrmyqqcs2lh9c6xn3ny5rb40b97igmicyxw677divlc0aib";
+      name = "poxml-18.04.2.tar.xz";
     };
   };
   print-manager = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/print-manager-18.04.1.tar.xz";
-      sha256 = "10l2w1fyym4nflmqnfsxdnnbllvliwyx7z7ylmi4i4rkcpaafyqx";
-      name = "print-manager-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/print-manager-18.04.2.tar.xz";
+      sha256 = "1kd7mj9qrf1a24lna9jl7rgc1889hgpr97wasq8542g1wdqwdng9";
+      name = "print-manager-18.04.2.tar.xz";
     };
   };
   rocs = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/rocs-18.04.1.tar.xz";
-      sha256 = "1bsm1kjkp9x2rh4n682kjyljisri7mniw5yap4ifksq5lk2vbn8z";
-      name = "rocs-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/rocs-18.04.2.tar.xz";
+      sha256 = "1c0rixfxama65rdd120njgvjan2hj32j5zc7y012yvns495mai5p";
+      name = "rocs-18.04.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/signon-kwallet-extension-18.04.1.tar.xz";
-      sha256 = "0xhvah1xq60wiz6pyjkc66sxsz1v3vdzjbjdr5kklpr98pg9xlib";
-      name = "signon-kwallet-extension-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/signon-kwallet-extension-18.04.2.tar.xz";
+      sha256 = "1q2nmprypaybpk59m1r5qxj9daycw1dxj62x6cc4gj4cxkw9q0bw";
+      name = "signon-kwallet-extension-18.04.2.tar.xz";
     };
   };
   spectacle = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/spectacle-18.04.1.tar.xz";
-      sha256 = "0k8vl79gwm4sj0f5pshz99l6cq323hk7a4r1jqzkdmbdv1mc0rgc";
-      name = "spectacle-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/spectacle-18.04.2.tar.xz";
+      sha256 = "1dyzpqkswl4dlc9ch38r7qh346vm0bj5vb173yf1x40dy4yp2q1n";
+      name = "spectacle-18.04.2.tar.xz";
     };
   };
   step = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/step-18.04.1.tar.xz";
-      sha256 = "1zwxjsjv72wjvzwj7cdz3lclw92bp9306bcpm4bpfrlcnr3xny1z";
-      name = "step-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/step-18.04.2.tar.xz";
+      sha256 = "0z4k9qaxv066dqmbfwxjfwkc3c8jvl77y6gix8qq181hrz71wcw4";
+      name = "step-18.04.2.tar.xz";
     };
   };
   svgpart = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/svgpart-18.04.1.tar.xz";
-      sha256 = "14qf9xfgvgk8d49qz6vhfivzw8hsmj6q2scjk6vg3i16y62qlym9";
-      name = "svgpart-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/svgpart-18.04.2.tar.xz";
+      sha256 = "1pny7rljyig2fpdxfydnv7i2mja40v0xi9z87w52q43jgnrz71jy";
+      name = "svgpart-18.04.2.tar.xz";
     };
   };
   sweeper = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/sweeper-18.04.1.tar.xz";
-      sha256 = "0f8nyxdw2arpa85vwl834jqbydvsx7dswjl8cdy66frx5jyqirim";
-      name = "sweeper-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/sweeper-18.04.2.tar.xz";
+      sha256 = "1dz1a07kdynz405hn78ldn0gi3hn67qp1fl9amzb42r6akzlbzn3";
+      name = "sweeper-18.04.2.tar.xz";
     };
   };
   syndication = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/syndication-18.04.1.tar.xz";
-      sha256 = "1gcas0aqgzr6r571d66yn7hw86hdb4akd5vgk5jh3liww25y8qm5";
-      name = "syndication-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/syndication-18.04.2.tar.xz";
+      sha256 = "05cm4k1zd3jj6v1pbdmpfrky1fyrmwamsihncqn1bw8hx01dzmxp";
+      name = "syndication-18.04.2.tar.xz";
     };
   };
   umbrello = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/umbrello-18.04.1.tar.xz";
-      sha256 = "1vw8py5nm7mpv3qa0lxi72cvbvslxppag6aqhbp2zsnz6b152qhy";
-      name = "umbrello-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/umbrello-18.04.2.tar.xz";
+      sha256 = "0gi4ndvh15hvx10by8jk0viqh66ns1hpdd8zabwf9qg8n5gf7b5d";
+      name = "umbrello-18.04.2.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "18.04.1";
+    version = "18.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.1/src/zeroconf-ioslave-18.04.1.tar.xz";
-      sha256 = "09nvkcq924v3f8jl36618j0hx2b1dzkvbvspf98mnx9lsliyzsc3";
-      name = "zeroconf-ioslave-18.04.1.tar.xz";
+      url = "${mirror}/stable/applications/18.04.2/src/zeroconf-ioslave-18.04.2.tar.xz";
+      sha256 = "07pnsld72i6i8dx342llw53zjgb91lxh43fl2b7zc3vaxr7vzs62";
+      name = "zeroconf-ioslave-18.04.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 60391eee69272..d5818614b9e08 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, makeWrapper }:
+{ stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
   name = "1password-${version}";
@@ -6,25 +6,24 @@ stdenv.mkDerivation rec {
   src =
     if stdenv.system == "i686-linux" then
       fetchzip {
-        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip";
-        sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f";
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
+        sha256 = "1yzzh1f6hx7vwdgzp0znsjarjiw4xqmmrkc5xwywgjpg81qqpl8c";
         stripRoot = false;
       }
     else if stdenv.system == "x86_64-linux" then
       fetchzip {
-        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip";
-        sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1";
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
+        sha256 = "0dgj1zqmpdbnsz2v2j7nqm232cdgyp9wagc089dxi4hbzkmfcvzx";
         stripRoot = false;
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchzip {
-        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip";
-        sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb";
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";
+        sha256 = "116bvyfg38npdhlzaxan5y47cbw7jvj94q5w6v71kxsjzxk9l44a";
         stripRoot = false;
       }
     else throw "Architecture not supported";
 
-  nativeBuildInputs = [ makeWrapper ];
   installPhase = ''
     install -D op $out/bin/op
   '';
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index e565b51cf5091..698485fb086f3 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -92,6 +92,10 @@ in buildRustPackage rec {
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
   '') + ''
 
+    install -D alacritty-completions.zsh "$out/share/zsh/site-functions/_alacritty"
+    install -D alacritty-completions.bash "$out/etc/bash_completion.d/alacritty-completions.bash"
+    install -D alacritty-completions.fish "$out/share/fish/vendor_completions.d/alacritty.fish"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 250590d0d302e..f16144f3befa5 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,15 +1,18 @@
 { mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase,
   qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }:
 
+let
+  pname = "albert";
+  version = "0.14.21";
+in
 mkDerivation rec {
-  name    = "albert-${version}";
-  version = "0.14.15";
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507";
+    sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix
index e5e09bf71fd73..0add5ed78cc53 100644
--- a/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/pkgs/applications/misc/audio/wavesurfer/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "wavesurfer-1.8.5";
 
   src = fetchurl {
-    url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz;
+    url = https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz;
     sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
   };
 
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
index 0bc12e269c0eb..6151b3d55ab71 100644
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5,
+{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5,
   avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
 }:
 
@@ -13,9 +13,18 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ];
   propagatedBuildInputs = with qt5; [ qtbase ];
 
+  patches = [
+    # Fix compilation on Qt 5.11
+    # Patch should be removed on next version bump from 2.1.1!
+    (fetchpatch {
+      url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch";
+      sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21";
+    })
+  ];
+
   postFixup = ''
-      substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
-    '';
+    substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
+  '';
 
   meta = {
     description = "Open-source KVM software";
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index c4c57380be994..b9d4b83e4f1f3 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   name = "blender-2.79b";
 
   src = fetchurl {
-    url = "http://download.blender.org/source/${name}.tar.gz";
+    url = "https://download.blender.org/source/${name}.tar.gz";
     sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c";
   };
 
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index 8800ebd83ca00..fd65fcd226066 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.3.0";
 
   src = fetchurl {
-    url = "http://calcurse.org/files/${name}.tar.gz";
+    url = "https://calcurse.org/files/${name}.tar.gz";
     sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
   };
 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 93a5d9428534d..1aabbb587eb56 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.25.0";
+  version = "3.27.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "018gxjbj5rak4ys5nyx6749rj9vszlf9k1wdcpl60ap3l83kxdnd";
+    sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh";
   };
 
   patches = [
diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index 01511b41b08d1..f4ba30080f715 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6";
   };
 
+  patchPhase = ''
+    sed -i -e 's/ -Wno-format//g' Makefile
+  '';
+
   makeFlags = "PREFIX=$(out)";
 
   nativeBuildInputs = [ pkgconfig gettext ];
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index ff1712f12fec1..03709c30373d8 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "cherrytree-${version}";
-  version = "0.38.4";
+  version = "0.38.5";
 
   src = fetchurl {
-    url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2";
+    url = "https://www.giuspen.com/software/${name}.tar.xz";
+    sha256 = "1ja3b14vm3yd26pf82p2qlld0flqkqvgdg2g33r5dav6wfq3pz6y";
   };
 
   buildInputs = with pythonPackages;
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 90d7ecd082c89..6e0152c71ed09 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180519";
+  version = "20180707";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "1sb4cw95lcj2cdfzzgnwjgmnpk2nqjys4am5qvj4pnh0x447sznv";
+    sha256 = "09siq74k0ss65ssck7i7h515dxp7fhdz5klc3y0yp9wajn706ic3";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index 661a00a066161..3851730c4596d 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "confclerk-${version}";
 
   src = fetchurl {
-    url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
+    url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
     sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3";
   };
 
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 75a402ba2319d..7b34674c21831 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst
+, qtx11extras, git
 , webkitSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.3.1";
+  version = "3.5.0";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc";
+    sha256 = "0hzdv6rhjpq9yrfafnkc6d8m5pzw9qr520vsjf2gn1819gdybmr0";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    git qtbase qtscript libXfixes libXtst
+    git qtbase qtscript libXfixes libXtst qtx11extras
   ] ++ stdenv.lib.optional webkitSupport qtwebkit;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix
index a7a2dac26c6e7..a6afee13e47bd 100644
--- a/pkgs/applications/misc/coursera-dl/default.nix
+++ b/pkgs/applications/misc/coursera-dl/default.nix
@@ -4,21 +4,21 @@ let
   pythonPackages = python3.pkgs;
 
 in pythonPackages.buildPythonApplication rec {
-  name = "coursera-dl-${version}";
-  version = "0.10.0";
+  pname = "coursera-dl";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "coursera-dl";
     repo = "coursera-dl";
     rev = version;
-    sha256 = "0m3f6ly8c3mkb8yy2y398afswqgy17rz159s1054wzxpb4f85zlb";
+    sha256 = "0dn7a6s98dwba62r0dyabq8pryzga4b2wpx88i9bmp7ja1b1f92f";
   };
 
   nativeBuildInputs = with pythonPackages; [ pandoc ];
 
   buildInputs = with pythonPackages; [ glibcLocales ];
 
-  propagatedBuildInputs = with pythonPackages; [ beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ];
+  propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ];
 
   checkInputs = with pythonPackages; [ pytest mock ];
 
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 10f6837761bb3..3b00bba709a0d 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,27 +2,30 @@
 
 mkDerivation rec {
   name = "cura-${version}";
-  version = "3.2.1";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
     rev = version;
-    sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp";
+    sha256 = "0a2xxiw1h5cq4nd4pdkq757hap85p2i29msxs57kbfdd78izrjlx";
   };
 
   materials = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "fdm_materials";
-    rev = "3.2.1";
-    sha256 = "1kr9ga727x0kazw2ypac9bi6g6lddbsx80qw8fbn0514kg2mr9n3";
+    rev = "3.3.0";
+    sha256 = "0vf7s4m14aqhdg4m2yjj87kjxi2gpa46mgx86p0a91jwvkxa8a1q";
   };
 
   buildInputs = [ qtbase qtquickcontrols2 ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
-  cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
+  cmakeFlags = [
+    "-DURANIUM_DIR=${python3.pkgs.uranium.src}"
+    "-DCURA_VERSION=${version}"
+  ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix
index 341cc8ec2d04a..6a36e42eaa3d1 100644
--- a/pkgs/applications/misc/cura/lulzbot.nix
+++ b/pkgs/applications/misc/cura/lulzbot.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb";
+        url = "https://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb";
         sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg";
       }
     else if stdenv.system == "i686-linux" then
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index c3a19e6551a23..ac4c68f9b536b 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp";
+    sha256 = "1dj80lk58qb54apdv7n9cmcck4smb00lidgqld21xnndnnqqb4lw";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libarcus ];
 
-  enableParallelBuilding = true;
+  cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
 
   meta = with stdenv.lib; {
     description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 84150a4c32c66..ed08356fdc5a5 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.1.0";
+  version = "5.1.2";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "041wqlipkwk4xp3qa4rrwyw6rgsn1ppv25qb4h2mkhrsjcjagqhj";
+    sha256 = "1p1klrasasc440qzxsn96lcgfib5qwhl508gvwrbslvmija6m6b2";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index fbd9d47633a1e..09b6db3abf9a0 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -3,6 +3,7 @@
 , curl
 , fetchFromGitHub
 , git
+, libcap
 , libevent
 , libtool
 , libqrencode
@@ -67,6 +68,8 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = with stdenv.lib; [
+    # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
+    libcap
     libevent
     libtool
     libudev
@@ -112,6 +115,8 @@ in stdenv.mkDerivation rec {
     ${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52}
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A QT based application for the Digital Bitbox hardware wallet";
     longDescription = ''
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 1a809307cc12b..12f1f78acb9e1 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper
 , pkgconfig, which, perl, libXrandr
 , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
-, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
+, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg, dunstify ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,11 @@ stdenv.mkDerivation rec {
     "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
   ];
 
-  postInstall = ''
+  buildFlags = if dunstify then [ "dunstify" ] else [];
+
+  postInstall = stdenv.lib.optionalString dunstify ''
+    install -Dm755 dunstify $out/bin
+  '' + ''
     wrapProgram $out/bin/dunst \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';
diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix
index 65df422599ca1..0ade32d998991 100644
--- a/pkgs/applications/misc/ephemeralpg/default.nix
+++ b/pkgs/applications/misc/ephemeralpg/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, postgresql, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "ephemeralpg-${version}";
-  version = "2.2";
+  version = "2.5";
   src = fetchurl {
     url = "http://ephemeralpg.org/code/${name}.tar.gz";
-    sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz";
+    sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk";
   };
   buildInputs = [ makeWrapper ];
   installPhase = ''
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 80f76bc27c895..6fa34a008e770 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "fbreader-0.99.4";
 
   src = fetchurl {
-    url = http://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz;
+    url = https://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz;
     sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
   };
 
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 43a949ded3728..dc70747784cf2 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.3.0";
 
   src = fetchurl {
-    url = "http://pwmt.org/projects/girara/download/${name}.tar.xz";
+    url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
     sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp";
   };
 
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
new file mode 100644
index 0000000000000..d115d1ae1d24b
--- /dev/null
+++ b/pkgs/applications/misc/glava/default.nix
@@ -0,0 +1,105 @@
+{ stdenv, fetchurl, writeScript, fetchFromGitHub
+, libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite
+, enableGlfw ? false, glfw }:
+
+let
+  inherit (stdenv.lib) optional makeLibraryPath;
+
+  version = "1.4.5";
+  gladVersion = "0.1.24";
+  # glad
+  # https://github.com/wacossusca34/glava/issues/46#issuecomment-397816520
+  glad = fetchFromGitHub {
+    owner = "Dav1dde";
+    repo = "glad";
+    rev = "v${gladVersion}";
+    sha256 = "0s2c9w064kqa5i07w8zmvgpg1pa3wj86l1nhgw7w56cjhq7cf8h8";
+  };
+  # gl.xml
+  gl = fetchurl {
+    url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/a24f3f7a4c924fdbc666024f99c70e5b8e34c819/xml/gl.xml;
+    sha256 = "1mskxjmhb35m8qv255pibf633d8sn1w9rdsf0lj75bhlgy0zi5c7";
+  };
+  # EGL 1.5
+  egl = fetchurl {
+    url = https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h;
+    sha256 = "0p0vs4siiya05cvbqq7cw3ci2zvvlfh8kycgm9k9cwvmrkj08349";
+  };
+
+  wrapperScript = writeScript "glava" ''
+    #!${stdenv.shell}
+    case "$1" in
+      --copy-config)
+        # The binary would symlink it, which won't work in Nix because the
+        # garbage collector will eventually remove the original files after
+        # updates
+        echo "Nix wrapper: Copying glava config to ~/.config/glava"
+        cp -r --no-preserve=all @out@/etc/xdg/glava ~/.config/glava
+        ;;
+      *)
+        exec @out@/bin/.glava-unwrapped "$@"
+    esac
+  '';
+in
+  stdenv.mkDerivation rec {
+    name = "glava-${version}";
+
+    src = fetchFromGitHub {
+      owner = "wacossusca34";
+      repo = "glava";
+      rev = "v${version}";
+      sha256 = "1zfw8samrzxxbny709rcdz1z77cw1cd46wlfnf7my02kipmqn0nr";
+    };
+
+    buildInputs = [
+      libX11
+      libXext
+      libXrandr
+      libXrender
+      libpulseaudio
+      libXcomposite
+    ] ++ optional enableGlfw glfw;
+
+    nativeBuildInputs = [
+      python3
+    ];
+
+    patchPhase = ''
+      cp -r --no-preserve=all ${glad}/* glad
+      mkdir -p glad/include/KHR
+
+      cp ${gl} glad/gl.xml
+      cp ${egl} glad/include/KHR/khrplatform.h
+      patchShebangs .
+    '';
+
+    makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1";
+
+    installFlags = [
+      "DESTDIR=$(out)"
+    ];
+
+    fixupPhase = ''
+      mkdir -p $out/bin
+      mv $out/usr/bin/glava $out/bin/.glava-unwrapped
+      rm -rf $out/usr
+
+      patchelf $out/bin/.glava-unwrapped \
+        --set-rpath "$(patchelf --print-rpath $out/bin/.glava-unwrapped):${makeLibraryPath [ libGL ]}" \
+
+      substitute ${wrapperScript} $out/bin/glava --subst-var out
+      chmod +x $out/bin/glava
+    '';
+
+    meta = with stdenv.lib; {
+      description = ''
+        OpenGL audio spectrum visualizer
+      '';
+      homepage = https://github.com/wacossusca34/glava;
+      platforms = platforms.linux;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [
+        eadwu
+      ];
+    };
+  }
diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix
index 68b4949279155..0bb0926f048ab 100644
--- a/pkgs/applications/misc/gnss-sdr/default.nix
+++ b/pkgs/applications/misc/gnss-sdr/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open source Global Navigation Satellite Systems software-defined receiver";
-    homepage = http://gnss-sdr.org/;
+    homepage = https://gnss-sdr.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 58d8e9fae6180..0224d5fd68c75 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -6,7 +6,7 @@
 # May be able to upgrade to swig3
 , python, swig2, numpy, scipy, matplotlib
 # => grc - the gnu radio companion
-, cheetah, pygtk
+, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8
 # => gr-wavelet: collection of wavelet blocks
 , gsl
 # => gr-qtgui: the Qt-based GUI
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.11.1";
+  version = "3.7.13.3";
 
   src = fetchFromGitHub {
     owner = "gnuradio";
     repo = "gnuradio";
-    rev = "6d2221196082a4954c249dc6955e33d5832a56f2";
-    sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm";
+    rev = "v${version}";
+    sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib";
     fetchSubmodules = true;
   };
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ];
 
   propagatedBuildInputs = [
-    cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
+    Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
   ];
 
   enableParallelBuilding = true;
@@ -69,6 +69,8 @@ stdenv.mkDerivation rec {
   setupHook = [ grcSetupHook ];
 
   # patch wxgui and pygtk check due to python importerror in a headless environment
+  # wxgtk gui will be removed in GR3.8
+  # c++11 hack may not be necessary anymore
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}"
     sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index f552a74f4c117..5cb51eefe5d7e 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell
+{ stdenv, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
 , libao, ffmpeg, libeb, lzo, xz, libtiff
 , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
 stdenv.mkDerivation rec {
 
-  name = "goldendict-1.5.0.rc2";
-  src = fetchurl {
-    url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz";
-    sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw";
+  name = "goldendict-2018-06-13";
+  src = fetchFromGitHub {
+    owner = "goldendict";
+    repo = "goldendict";
+    rev = "48e850c7ec11d83cba7499f7fdce377ef3849bbb";
+    sha256 = "0i4q4waqjv45hgwillvjik97pg26kwlmz4925djjkx8s6hxgjlq9";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -22,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "A feature-rich dictionary lookup program";
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.astsmtl ];
+    maintainers = with stdenv.lib.maintainers; [ gebner astsmtl ];
   };
 }
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index b6391d06eb922..586807b2dd5ce 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "19";
 
   src = fetchurl {
-    url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
+    url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
     sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5";
   };
 
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index c34f0e48f3ec8..57dc68263ac4e 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -2,7 +2,7 @@
 , gtk3, keybinder3, libnotify, libutempter, vte }:
 
 let
-  version = "3.2.1";
+  version = "3.3.0";
 in python3.pkgs.buildPythonApplication rec {
   name = "guake-${version}";
   format = "other";
@@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
     owner = "Guake";
     repo = "guake";
     rev = version;
-    sha256 = "0qzrkmjizpc3kirvhml62wya1sr3pbig25nfcrfhk1hhr3jxq17s";
+    sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788";
   };
 
   nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index f581b302c3f42..69c91d257558f 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gxneur-0.13.0";
   
   src = fetchurl {
-    url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
+    url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2;
     sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
   };
 
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
new file mode 100644
index 0000000000000..ef378b2c5ffbd
--- /dev/null
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -0,0 +1,23 @@
+{ stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "example-unfree-package-${version}";
+  version = "1.0";
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cat > $out/bin/hello-unfree << EOF
+    #!/bin/sh
+    echo "Hello, you are running an unfree system!"
+    EOF
+    chmod +x $out/bin/hello-unfree
+  '';
+
+  meta = {
+    description = "An example package with unfree license (for testing)";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.oxij ];
+  };
+}
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index c94f78317f4e9..7998d30f253fd 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hello-2.10";
+  name = "hello-${version}";
+  version = "2.10";
 
   src = fetchurl {
     url = "mirror://gnu/hello/${name}.tar.gz";
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index e4e45dd570bf6..110d17492f871 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.40.3";
+  version = "0.42.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,11 +10,15 @@ buildGoPackage rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "08d4y6x19cd4qy9pf80zrqarcyarbzxph0yp8mfb1sp2bvq42308";
+    sha256 = "17m8bkldvnd7yyzxi4rc8vv3qfypjzik38bjy4qavb7sjdjmfij9";
   };
 
   goDeps = ./deps.nix;
 
+  postInstall = ''
+    rm $bin/bin/generate
+  '';
+
   meta = with stdenv.lib; {
     description = "A fast and modern static website engine.";
     homepage = https://gohugo.io;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index a99eb563dc277..837919b1c3267 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/chroma";
-      rev = "222a1f0fc811afd47471d4a4e32f3aa09b6f9cdf";
-      sha256 = "090yb9f9gld4l0r6x8y2a6a3ghiqbyh19fgmjcjfq8qlv0vj5n4s";
+      rev = "d7b2ed20a4989ab604703f61f86523560f8a6a87";
+      sha256 = "0ni2ncck787sxk9gl14xnyjnw4y27ipypjf4kc00g635fvc64ik6";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/disintegration/imaging";
-      rev = "bbcee2f5c9d5e94ca42c8b50ec847fec64a6c134";
-      sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8";
+      rev = "5e63c9a565d0a3260d23d060a795783dab90fefe";
+      sha256 = "1mmiz439lygi30dj1rbps57iqh762jkinnpb4wfl382v4h136qvp";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobuffalo/envy";
-      rev = "ef60bfc50c8f92d1ee64674d8ce7a48f1f67625e";
-      sha256 = "15qrmw3l2achpd3hz8fkkz7yzpbvldm1pf1vsr250q24nsh6x7iz";
+      rev = "2d0f467653f3d961ce9ada4d32a230bdcb3bfe11";
+      sha256 = "0p9raqrsqg2z1hq2kbvbq5qcwqihjqf28xnfh62214p7ak9b9x8n";
     };
   }
   {
@@ -140,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
-      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+      rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
+      sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
     };
   }
   {
@@ -203,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev = "2c9e9502788518c97fe44e8955cd069417ee89df";
-      sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl";
+      rev = "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
     };
   }
   {
@@ -212,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/markbates/inflect";
-      rev = "fbc6b23ce49e2578f572d2e72bb72fa03c7145de";
-      sha256 = "10rf7kfqnic8x4z8c29whb76w9v847y63wh5b2kfx6rqhrjfilis";
+      rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae";
+      sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d";
     };
   }
   {
@@ -239,8 +239,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
-      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+      rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
+      sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
     };
   }
   {
@@ -257,8 +257,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "8c6996ea1058153460146b16c341a4ae611f7cf7";
-      sha256 = "1k8ai8mdi5cqbcxihzx727z3gg46lpkw0s1byb3lrdnmp31l7p9r";
+      rev = "f6ac3d9cf0c4b6a32527779e992ebde26bd3d948";
+      sha256 = "1vg25khaf7lr90xwf97bsyn873cdi1j7nxh68s80jrg2a86zw0ff";
     };
   }
   {
@@ -275,8 +275,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
-      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
+      rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
-      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
+      rev = "787d034dfe70e44075ccc060d346146ef53270ad";
+      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
     };
   }
   {
@@ -320,8 +320,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
-      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+      rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
+      sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
     };
   }
   {
@@ -356,8 +356,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
-      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+      rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
+      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
     };
   }
   {
@@ -383,8 +383,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/image";
-      rev = "f315e440302883054d0c2bd85486878cb4f8572c";
-      sha256 = "010pc6qjppqd9c7rramiwz7myvip9vhridfxy7wc2qj1kr92b4dc";
+      rev = "af66defab954cb421ca110193eed9477c8541e2a";
+      sha256 = "0dgi7svwzs37c7m5dz2jig3xr45fyjihhr8cg0x8nc8sc8fsyq4h";
     };
   }
   {
@@ -392,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd";
-      sha256 = "1mvnpln6vm0y1i5bb0ycswds49hyapg3jz643lmlw6d183jdcg0q";
+      rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196";
+      sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a";
     };
   }
   {
@@ -410,8 +410,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "64746a42f36bf0832f86b76004f1699dbeb33e4f";
-      sha256 = "1hbk7cnbywiwxdzbx7lqw6iym9dpwvdyacg06gchxpfw7nfa9r27";
+      rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7";
+      sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp";
     };
   }
   {
@@ -419,8 +419,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
-      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
+      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
     };
   }
   {
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index af7d257eed6ea..e150ab457e078 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ipmicfg-${version}";
-  version = "1.27.1";
-  buildVersion = "170901";
+  version = "1.28.0";
+  buildVersion = "180302";
 
   src = fetchzip {
     url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
-    sha256 = "11xhzw36pg4has8857pypf44cni8m2mg8qsqi1s4bfjbxlfgxgwk";
+    sha256 = "0hw853cwaaxmxy1sa3m7l9gqalwpbbvp4ghk8inr7dzwxjljmr02";
     extraPostFetch = "chmod u+rwX,go-rwx+X $out/";
   };
 
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 638765840cb98..58fcd59a2b2fd 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "2.13.0";
-   buildVersion = "170504";
+   version = "2.14.0";
+   buildVersion = "180213";
 
    src = fetchurl {
     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
-    sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6";
+    sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
   };
 
    buildInputs = [ patchelf makeWrapper ];
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 78f90a4ffa6bc..b868808ec3dce 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jgmenu-${version}";
-  version = "0.9";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = "jgmenu";
     rev = "v${version}";
-    sha256 = "17xxz5qyz92sjppsvzjl2v012yb3s5p519cv8xf2hd41j7sh9ym1";
+    sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 6c14c93c83daf..97b60080365fc 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "13576";
+  version = "13996";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4";
+    sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf";
   };
 
-  buildInputs = [ jre8 makeWrapper ];
+  buildInputs = [ jre10 makeWrapper ];
 
   desktopItem = makeDesktopItem {
     name = "josm";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/josm.jar
 
-    makeWrapper ${jre8}/bin/java $out/bin/josm \
+    makeWrapper ${jre10}/bin/java $out/bin/josm \
       --add-flags "-jar $out/share/java/josm.jar"
 
     mkdir -p $out/share/applications
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix
index fc8b8043b94c9..30e36c3dcf0f1 100644
--- a/pkgs/applications/misc/jrnl/default.nix
+++ b/pkgs/applications/misc/jrnl/default.nix
@@ -1,14 +1,12 @@
 { stdenv
-, python
+, python3
 }:
 
-with python.pkgs;
+with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "jrnl";
   version = "1.9.8";
-  name = "${pname}-${version}";
-  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -16,7 +14,7 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs = [
-    pytz six tzlocal keyring argparse dateutil_1_5
+    pytz six tzlocal keyring argparse dateutil
     parsedatetime pycrypto
   ];
 
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 0d02dbba69eb0..97e371e9e72c5 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -20,12 +20,12 @@
 
 stdenv.mkDerivation rec {
   pname = "kdeconnect";
-  version = "1.3.0";
+  version = "1.3.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz";
-    sha256 = "0gzv55hks6j37pf7d18l40n1q6j8b74j9qg3v44p8sp0gnglwkcm";
+    sha256 = "0rzjbn4d2lh81n19dd3a5ilm8qml3zs3g3ahg75avcw8770rr344";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 6b37f9b9145d9..5c5769db1b46a 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -47,7 +47,11 @@ stdenv.mkDerivation rec {
       --replace "/usr/local/share/man" "../share/man"
   '';
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
-  patches = [ ./darwin.patch ];
+
+  patches = [
+    ./darwin.patch
+    ./qt511.patch
+  ];
 
   cmakeFlags = [
     "-DKEEPASSXC_BUILD_TYPE=Release"
diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch
new file mode 100644
index 0000000000000..b4d312c8c263f
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/qt511.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
+index 6fd65c1a..e99275b0 100644
+--- a/src/gui/entry/EditEntryWidget.cpp
++++ b/src/gui/entry/EditEntryWidget.cpp
+@@ -29,6 +29,7 @@
+ #include <QMenu>
+ #include <QSortFilterProxyModel>
+ #include <QTemporaryFile>
++#include <QButtonGroup>
+ #include <QMimeData>
+ #include <QEvent>
+ #include <QColorDialog>
+-- 
+2.17.1
+
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 9dd466c442aa4..ede85aeada5a4 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,9 +1,22 @@
-{ stdenv, pkgs, python3Packages }:
+{ stdenv, pkgs, python3 }:
 
-with python3Packages;
+let
+  python = python3.override {
+    packageOverrides = self: super: {
 
-buildPythonApplication rec {
-  name = "${pname}-${version}";
+      # https://github.com/pimutils/khal/issues/780
+      python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
+        version = "2.6.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
+        };
+      });
+
+    };
+  };
+
+in with python.pkgs; buildPythonApplication rec {
   pname = "khal";
   version = "0.9.9";
 
@@ -30,10 +43,11 @@ buildPythonApplication rec {
     pkginfo
     freezegun
   ];
-  buildInputs = [ setuptools_scm pytest pkgs.glibcLocales ];
+  nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
+  checkInputs = [ pytest ];
 
   checkPhase = ''
-    # py.test
+    py.test
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index c626aaca66bd4..075640f702cb4 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,6 +1,22 @@
-{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }:
+{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3 }:
 
-python3Packages.buildPythonApplication rec {
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+
+      # https://github.com/pimutils/khal/issues/780
+      python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
+        version = "2.6.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
+        };
+      });
+
+    };
+  };
+
+in with python.pkgs; buildPythonApplication rec {
   version = "0.12.2";
   name = "khard-${version}";
   namePrefix = "";
@@ -14,7 +30,7 @@ python3Packages.buildPythonApplication rec {
   LC_ALL = "en_US.UTF-8";
   buildInputs = [ glibcLocales ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     atomicwrites
     configobj
     vobject
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 99c8b87bf4f5b..38c2494c9f7d3 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz,
   fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel,
   libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
-  libxkbcommon, libXi, libXext }:
+  libxkbcommon, libXi, libXext, wayland-protocols, wayland,
+  which
+}:
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.10.1";
+  version = "0.11.2";
   name = "kitty-${version}";
   format = "other";
 
@@ -13,19 +15,24 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1xwrrj0g70hh8zsjbd05x0js776xlf7c6mdsmrqlw4y7jfnlgl45";
+    sha256 = "0vmxgyxrgaqijwd51ldd8pkz7jn9hdcfib1dqr0ai614286v69hw";
   };
 
   buildInputs = [
     fontconfig glfw ncurses libunistring harfbuzz libX11
     libXrandr libXinerama libXcursor libxkbcommon libXi libXext
+    wayland-protocols wayland
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig which sphinx ];
 
   postPatch = ''
     substituteInPlace kitty/utils.py \
       --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
+
+    substituteInPlace docs/Makefile \
+      --replace 'python3 .. +launch $(shell which sphinx-build)' \
+                'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)'
     '';
 
   buildPhase = ''
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index e686ec94a4a34..a0a2776ae3604 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchFromGitHub, lib,
+  mkDerivation, fetchurl, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit, kjsembed, taglib, exiv2, podofo,
   kcrash
@@ -7,15 +7,14 @@
 
 let
   pname = "krename";
-  version = "20170610";
+  version = "5.0.0";
+
 in mkDerivation rec {
   name = "${pname}-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "KDE";
-    repo   = "krename";
-    rev    = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
-    sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a";
   };
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index bfb658098b73a..ca9a90777e33a 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A 2D CAD package based upon Qt";
-    homepage = http://librecad.org;
+    homepage = https://librecad.org;
     repositories.git = git://github.com/LibreCAD/LibreCAD.git;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index 4599fab0c6d6e..070073ea3e2cc 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -4,7 +4,7 @@
 } :
 
 let
-  version = "18.04.1";
+  version = "18.06.0";
 
 in stdenv.mkDerivation {
   name = "limesuite-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     owner = "myriadrf";
     repo = "LimeSuite";
     rev = "v${version}";
-    sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9";
+    sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 092ad6bf4780c..ad3bd499cde9c 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, python, file, bc
+{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch
 , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
 }:
 
@@ -35,6 +35,13 @@ stdenv.mkDerivation rec {
       --prefix PATH : '${python}/bin'
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch?id=07e82fd1fc07bf055c78b81eaa128f8f837da80d";
+      sha256 = "1bnx0il2iv36lnrnyb370wyvww0rd8bphcy6z8d7zmvd3pwhyfql";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "WYSIWYM frontend for LaTeX, DocBook";
     homepage = http://www.lyx.org;
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 525be09d9686c..fb17aadfa4904 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -4,7 +4,7 @@ let
 in stdenv.mkDerivation {
   name = "masterpdfeditor-${version}";
   src = fetchurl {
-    url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
+    url = "https://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
     sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc";
   };
 
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 701e4b2e052d4..31793031dc1fb 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "mlterm-${version}";
-  version = "3.8.4";
+  version = "3.8.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
-    sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9";
+    sha256 = "06zylbinh84s9v79hrlvv44rd57z7kvgz9afbps3rjcbncxcmivd";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf ];
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index fbc7da070211f..1857c3118ddd8 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -23,12 +23,15 @@ in stdenv.mkDerivation rec {
   };
 
   patches = [
+    (fetchpatch {
+      name = "CVE-2018-10289.patch";
+      url = "https://bugs.ghostscript.com/attachment.cgi?id=15230";
+      sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q";
+    })
   ]
-
-  # Use shared libraries to decrease size
-  ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch
-
-  ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+    # Use shared libraries to decrease size
+    ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch
+    ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
   ;
 
   postPatch = ''
@@ -83,7 +86,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://mupdf.com;
+    homepage = https://mupdf.com;
     repositories.git = git://git.ghostscript.com/mupdf.git;
     description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
     license = licenses.agpl3Plus;
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index ca381e14dd173..6b057186eaf3d 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -6,29 +6,37 @@ let
     overrides = self: super: with self; {
       backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;
 
+      flask = super.flask.overridePythonAttrs (oldAttrs: rec {
+        version = "0.12.4";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
+        };
+      });
+
       tornado = buildPythonPackage rec {
-        name = "tornado-${version}";
+        pname = "tornado";
         version = "4.0.2";
 
         propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
 
-        src = fetchurl {
-          url = "mirror://pypi/t/tornado/${name}.tar.gz";
+        src = fetchPypi {
+          inherit pname version;
           sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
         };
       };
 
       flask_login = buildPythonPackage rec {
-        name = "Flask-Login-${version}";
+        pname = "Flask-Login";
         version = "0.2.2";
 
-        src = fetchurl {
-          url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
+        src = fetchPypi {
+          inherit pname version;
           sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
         };
 
         propagatedBuildInputs = [ flask ];
-        buildInputs = [ nose ];
+        checkInputs = [ nose ];
 
         # No tests included
         doCheck = false;
@@ -37,10 +45,9 @@ let
       jinja2 = buildPythonPackage rec {
         pname = "Jinja2";
         version = "2.8.1";
-        name = "${pname}-${version}";
 
-        src = fetchurl {
-          url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
+        src = fetchPypi {
+          inherit pname version;
           sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
         };
 
@@ -53,14 +60,14 @@ let
   };
 
 in pythonPackages.buildPythonApplication rec {
-  name = "OctoPrint-${version}";
-  version = "1.3.6";
+  pname = "OctoPrint";
+  version = "1.3.8";
 
   src = fetchFromGitHub {
     owner = "foosel";
     repo = "OctoPrint";
     rev = version;
-    sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3";
+    sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3";
   };
 
   # We need old Tornado
@@ -70,9 +77,10 @@ in pythonPackages.buildPythonApplication rec {
     psutil pyserial flask_login netaddr markdown sockjs-tornado
     pylru pyyaml sarge feedparser netifaces click websocket_client
     scandir chainmap future dateutil futures wrapt monotonic emoji
+    frozendict
   ];
 
-  buildInputs = with pythonPackages; [ nose mock ddt ];
+  checkInputs = with pythonPackages; [ nose mock ddt ];
 
   # Jailbreak dependencies.
   postPatch = ''
@@ -88,7 +96,7 @@ in pythonPackages.buildPythonApplication rec {
       -e 's,PyYAML>=[^"]*,PyYAML,g' \
       -e 's,scandir>=[^"]*,scandir,g' \
       -e 's,werkzeug>=[^"]*,werkzeug,g' \
-      -e 's,psutil>=[^"]*,psutil,g' \
+      -e 's,psutil==[^"]*,psutil,g' \
       -e 's,requests>=[^"]*,requests,g' \
       -e 's,future>=[^"]*,future,g' \
       -e 's,pyserial>=[^"]*,pyserial,g' \
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index e05cb0ad6f9d9..ca06b5fa6df6f 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -10,7 +10,7 @@
 with lib;
 let
   pname = "orca";
-  version = "3.28.1";
+  version = "3.28.2";
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
@@ -18,7 +18,7 @@ in buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g";
+    sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q";
   };
 
   patches = [
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 7448b8e6648b9..7fdfbd84d2f68 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://pcman.ptt.cc;
+    homepage = https://pcman.ptt.cc;
     license = licenses.gpl2;
     description = "Telnet BBS browser with GTK+ interface";
     maintainers = [ maintainers.sifmelcara ];
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix
index 90149263644df..ee54904bfd66e 100644
--- a/pkgs/applications/misc/pdfdiff/default.nix
+++ b/pkgs/applications/misc/pdfdiff/default.nix
@@ -7,7 +7,7 @@ py.buildPythonApplication rec {
   version = "0.92";
 
   src = fetchurl {
-    url = "http://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py";
+    url = "https://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py";
     sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836";
   };
 
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 889f516f00b7a..7e7850668b846 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.22.2";
 
   src = fetchurl {
-    url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz";
+    url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz";
     sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v";
   };
 
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index d08b183d9d00b..23ab0f8d34ad8 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgmanage-${version}";
-  version = "10.1.1";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner  = "pgManage";
     repo   = "pgManage";
     rev    = "v${version}";
-    sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc";
+    sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 556889e126c03..3cd52af6d3218 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     urls = [
       "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
-      "http://distfiles.macports.org/pstree/${name}.tar.gz"
+      "https://distfiles.macports.org/pstree/${name}.tar.gz"
     ];
     sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw";
   };
diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix
index af74ea570ab36..e1a64c73a1236 100644
--- a/pkgs/applications/misc/ptask/default.nix
+++ b/pkgs/applications/misc/ptask/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ptask-1.0.0";
 
   src = fetchurl {
-    url = "http://wpitchoune.net/ptask/files/${name}.tar.gz";
+    url = "https://wpitchoune.net/ptask/files/${name}.tar.gz";
     sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
   };
 
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 44c6f892bf582..17bbf1583c466 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,14 +1,19 @@
 { stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }:
 
+if theme == null then rofi-unwrapped else
 stdenv.mkDerivation {
   name = "rofi-${rofi-unwrapped.version}";
   buildInputs = [ makeWrapper ];
   preferLocalBuild = true;
-  passthru = { unwrapped = rofi-unwrapped; };
+  passthru.unwrapped = rofi-unwrapped;
   buildCommand = ''
-    mkdir -p $out/bin
-    ln -s ${rofi-unwrapped}/bin/rofi $out/bin/rofi
-    ${lib.optionalString (theme != null) ''wrapProgram $out/bin/rofi --add-flags "-theme ${theme}"''}
+    mkdir $out
+    ln -s ${rofi-unwrapped}/* $out
+    rm $out/bin
+    mkdir $out/bin
+    ln -s ${rofi-unwrapped}/bin/* $out/bin
+    rm $out/bin/rofi
+    makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi --add-flags "-theme ${theme}"
   '';
 
   meta = rofi-unwrapped.meta // {
diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index 92e96a7fb5ee0..bedfc563b1c07 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }:
+{ stdenv, lib, fetchpatch, fetchgit, cmake, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
   name = "rtl-sdr-${version}";
@@ -26,7 +26,13 @@ stdenv.mkDerivation rec {
     grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; }
     echo "Requires: libusb-1.0" >> "$pcfile"
   '';
-
+  patches = lib.optionals stdenv.isDarwin [
+    (fetchpatch {
+      name = "linker-fix.patch";
+      url = "https://github.com/lukeadams/rtl-sdr/commit/7a66dcf268305b5aa507d1756799942c74549b72.patch";
+      sha256 = "0cn9fyf4ay4i3shvxj1ivgyxjvfm401irk560jdjl594nzadrcsl";
+    })
+  ];
   meta = with stdenv.lib; {
     description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
     homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr;
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index ed54e523c8f8f..d202769682443 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
 
 with pythonPackages;
 buildPythonApplication rec {
-  version = "1.22.1";
+  version = "1.23.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4";
+    sha256 = "0i6iqj3ly1bgsfa9403m5190mfl9yk1x4ific3v31wqfja985nsr";
   };
 
   # Tests try to access network
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index d216a695a3c5a..e0c5946d564f1 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi;
 in buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "safeeyes";
-  version = "2.0.5";
+  version = "2.0.6";
   namePrefix = "";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q52ncqn18wb3d42dzsm7lh301w6g053a685i1cnismvp86amvfl";
+    sha256 = "0s14pxicgq33srvhf6bvfq48wv3z4rlsmzkccz4ky9vh3gfx7zka";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index 14680619e0c2d..6f38ba5662b5f 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "sbagen-1.4.4";
 
   src = fetchurl {
-    url = "http://uazu.net/sbagen/${name}.tgz";
+    url = "https://uazu.net/sbagen/${name}.tgz";
     sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
   };
 
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 2c8753efcd745..82b73f58e8df7 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub
-, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook
-, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }:
+, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook
+, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
 
 
 let
-  version = "0.5.4";
+  version = "0.5.5";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,12 +17,17 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "05c7y6xdyq3h9bn90pbz03jhy9kabmgpxi4zz0i26q0qphljskbx";
+    sha256 = "0jv7nx9k1qw2i3cmg0vnahz4qfam03xypas975x40icqd3bhfgj3";
   };
 
-  nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ];
 
-  buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ];
+  buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
 
   meta = with stdenv.lib; {
     description = "Friendly SQL Client";
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 8624cc9dda589..21b55e6e7a01f 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
     IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX
     ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP
+    ExtUtilsCppGuess ModuleBuildWithXSpp ExtUtilsTypemapsDefault
   ];
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 371bf26fe6c8c..11a5baa288ddc 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
   boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
-  glew, eigen }:
+  glew, eigen, curl }:
 let
   AlienWxWidgets = perlPackages.buildPerlPackage rec {
     name = "Alien-wxWidgets-0.69";
@@ -33,12 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.39.2";
+  version = "1.40.1";
 
   enableParallelBuilding = true;
 
   buildInputs = [
     cmake
+    curl
     perl
     makeWrapper
     eigen
@@ -73,6 +74,8 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
+    sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
+    sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
   '';
 
   postInstall = ''
@@ -82,14 +85,14 @@ stdenv.mkDerivation rec {
 
     # it seems we need to copy the icons...
     mkdir -p $out/bin/var
-    cp ../resources/icons/* $out/bin/var/
+    cp -r ../resources/icons/* $out/bin/var/
     cp -r ../resources $out/bin/
   '';
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd";
+    sha256 = "022mdz8824wg68qwgd49gnplw7wn84hqw113xh8l25v3j1jb9zmc";
     rev = "version_${version}";
   };
 
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index 3f39569616173..e44690a5bd791 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }:
+{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }:
 
 stdenv.mkDerivation rec {
   version = "2017-05-15";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     perl # For generating the man pages with pod2man
   ];
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses5 ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index f64d25471982d..1e51ba22ddc3d 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://taskwarrior.org/download/${name}.tar.gz";
+    url = "https://taskwarrior.org/download/${name}.tar.gz";
     sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
   };
 
diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/misc/termite/add_errno_header.patch
new file mode 100644
index 0000000000000..81283f86a21db
--- /dev/null
+++ b/pkgs/applications/misc/termite/add_errno_header.patch
@@ -0,0 +1,24 @@
+From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Fri, 13 Jul 2018 19:03:09 +1000
+Subject: [PATCH] Add errno.h header which isn't always included automatically.
+
+---
+ termite.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/termite.cc b/termite.cc
+index 160fe82..13e2572 100644
+--- a/termite.cc
++++ b/termite.cc
+@@ -21,6 +21,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <cmath>
++#include <errno.h>
+ #include <functional>
+ #include <limits>
+ #include <map>
+-- 
+2.17.1
+
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 46276bbb03fbf..560dff5942758 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin
+{ stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin
 , configFile ? null
 }:
 
@@ -7,16 +7,17 @@ let
   termite = stdenv.mkDerivation {
     name = "termite-${version}";
 
-    src = fetchgit {
-      url = "https://github.com/thestinger/termite";
-      rev = "refs/tags/v${version}";
+    src = fetchFromGitHub {
+      owner = "thestinger";
+      repo = "termite";
+      rev = "v${version}";
       sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj";
+      fetchSubmodules = true;
     };
 
     # https://github.com/thestinger/termite/pull/516
-    patches = [ ./url_regexp_trailing.patch ];
-
-    postPatch = "sed '1i#include <math.h>' -i termite.cc";
+    patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch
+                ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;
 
     makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
 
diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/misc/termite/remove_ldflags_macos.patch
new file mode 100644
index 0000000000000..f8c68518bb4de
--- /dev/null
+++ b/pkgs/applications/misc/termite/remove_ldflags_macos.patch
@@ -0,0 +1,25 @@
+From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Fri, 13 Jul 2018 19:01:51 +1000
+Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS.
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b115f42..ab301ba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++)
+ 	CXXFLAGS += -Wimplicit-fallthrough
+ endif
+ 
+-LDFLAGS := -s -Wl,--as-needed ${LDFLAGS}
++LDFLAGS := -s -Wl ${LDFLAGS}
+ LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}}
+ 
+ termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh
+-- 
+2.17.1
+
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index dc723336a9e93..1cc03b4cd4261 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "tilix-${version}";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
     rev = "${version}";
-    sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh";
+    sha256 = "19dx3hlj40cqwph98pcifkm6axfszfr0v9k6sr3caw4ycml84ci1";
   };
 
   nativeBuildInputs = [
@@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ];
 
   preBuild = ''
-    makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5")
+    makeFlagsArray=(
+      PERL5LIB="${perlPackages.Po4a}/lib/perl5"
+      DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace'
+    )
   '';
 
   postInstall = with gnome3; ''
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index e282e752b3180..0fa0495cedac0 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.17.1";
+  version = "0.18.0";
   name    = "toot-${version}";
 
   src = fetchFromGitHub {
     owner  = "ihabunek";
     repo   = "toot";
     rev    = "${version}";
-    sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis";
+    sha256 = "0snvxn7ifbkrdnml66pdna7vny3qa0s6gcjjz69s7scc0razwrh8";
   };
 
   checkInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
index 829ed2585627f..b41f5c9a0a705 100644
--- a/pkgs/applications/misc/tqsl/default.nix
+++ b/pkgs/applications/misc/tqsl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "2.3.1";
 
   src = fetchurl {
-    url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
+    url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
     sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
   };
 
diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix
new file mode 100644
index 0000000000000..38865ca4f3d96
--- /dev/null
+++ b/pkgs/applications/misc/tvbrowser/bin.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }:
+
+let
+  desktopItem = makeDesktopItem {
+    name = "tvbrowser";
+    exec = "tvbrowser";
+    icon = "tvbrowser";
+    comment = "Themeable and easy to use TV Guide";
+    desktopName = "TV-Browser";
+    genericName = "Electronic TV Program Guide";
+    categories = "AudioVideo;TV;Java;";
+    startupNotify = "true";
+    extraEntries = ''
+      StartupWMClass=tvbrowser-TVBrowser
+    '';
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "tvbrowser";
+  version = "4.0.1";
+  name = "${pname}-bin-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz";
+    sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/share/java/${pname}
+    cp -R * $out/share/java/${pname}
+    rm $out/share/java/${pname}/${pname}.{sh,desktop}
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
+    for i in 16 32 48 128; do
+      mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
+      ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
+    done
+
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/${pname} \
+      --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \
+      --run "cd $out/share/java/${pname}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Electronic TV Program Guide";
+    homepage = https://www.tvbrowser.org/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
index 7eb0f2d41b551..3a723907c925d 100644
--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -4,7 +4,6 @@ let
   inherit (python.pkgs) buildPythonApplication fetchPypi requests;
 in
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "tzupdate";
   version = "1.2.0";
 
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 1db0e4be1966e..5b75fbbc08e10 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, asciidoc-full, gettext
-, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg
+, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
 , udisks2, wrapGAppsHook
 , buildPythonApplication
 , docopt
@@ -27,7 +27,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [
     gettext gobjectIntrospection gtk3 libnotify docopt
-    pygobject3 pyyaml udisks2
+    pygobject3 pyyaml udisks2 libappindicator-gtk3
   ];
 
   postBuild = "make -C doc";
diff --git a/pkgs/applications/misc/unixcw/default.nix b/pkgs/applications/misc/unixcw/default.nix
new file mode 100644
index 0000000000000..2aeba5fb5f4a9
--- /dev/null
+++ b/pkgs/applications/misc/unixcw/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}:
+stdenv.mkDerivation rec {
+  name = "unixcw-${version}";
+  version = "3.5.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";
+    sha256 ="5f3aacd8a26e16e6eff437c7ae1e9b389956fb137eeb3de24670ce05de479e7a";
+  };
+  patches = [
+    ./remove-use-of-dlopen.patch
+  ];
+  buildInputs = [libpulseaudio alsaLib pkgconfig qt5.qtbase];
+  CFLAGS   ="-lasound -lpulse-simple";
+
+  meta = with stdenv.lib; {
+    description = "sound characters as Morse code on the soundcard or console speaker";
+    longDescription = ''
+       unixcw is a project providing libcw library and a set of programs
+       using the library: cw, cwgen, cwcp and xcwcp.
+       The programs are intended for people who want to learn receiving
+       and sending Morse code.
+       unixcw is developed and tested primarily on GNU/Linux system.
+
+       cw  reads  characters  from  an input file, or from standard input,
+       and sounds each valid character as Morse code on either the system sound card,
+       or the system console speaker.
+       After it sounds a  character, cw  echoes it to standard output.
+       The input stream can contain embedded command strings.
+       These change the parameters used when sounding the Morse code.
+       cw reports any errors in  embedded  commands
+     '';
+    homepage = "http://unixcw.sourceforge.net";
+    maintainers = [ maintainers.mafo ];
+    license = licenses.gpl2;
+    platforms=platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch b/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch
new file mode 100644
index 0000000000000..0475c008ba22f
--- /dev/null
+++ b/pkgs/applications/misc/unixcw/remove-use-of-dlopen.patch
@@ -0,0 +1,677 @@
+From e4b91b5a7943a3b54f555ff2e0029b83bd96b131 Mon Sep 17 00:00:00 2001
+From: MarcFontaine <MarcFontaine@users.noreply.github.com>
+Date: Sat, 9 Jun 2018 11:02:11 +0200
+Subject: [PATCH] remove use of dlopen
+
+---
+ src/libcw/libcw_alsa.c | 215 ++++++++++---------------------------------------
+ src/libcw/libcw_pa.c   | 118 ++++-----------------------
+ 2 files changed, 56 insertions(+), 277 deletions(-)
+
+diff --git a/src/libcw/libcw_alsa.c b/src/libcw/libcw_alsa.c
+index a669c6e..17c306d 100644
+--- a/src/libcw/libcw_alsa.c
++++ b/src/libcw/libcw_alsa.c
+@@ -35,7 +35,6 @@
+ 
+ 
+ 
+-#include <dlfcn.h> /* dlopen() and related symbols */
+ #include <alsa/asoundlib.h>
+ 
+ 
+@@ -65,7 +64,6 @@ static const snd_pcm_format_t CW_ALSA_SAMPLE_FORMAT = SND_PCM_FORMAT_S16; /* "Si
+ 
+ 
+ static int  cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *params);
+-static int  cw_alsa_dlsym_internal(void *handle);
+ static int  cw_alsa_write_internal(cw_gen_t *gen);
+ static int  cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv);
+ static int  cw_alsa_open_device_internal(cw_gen_t *gen);
+@@ -80,56 +78,6 @@ static int  cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params);
+ 
+ 
+ 
+-static struct {
+-	void *handle;
+-
+-	int (* snd_pcm_open)(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
+-	int (* snd_pcm_close)(snd_pcm_t *pcm);
+-	int (* snd_pcm_prepare)(snd_pcm_t *pcm);
+-	int (* snd_pcm_drop)(snd_pcm_t *pcm);
+-	snd_pcm_sframes_t (* snd_pcm_writei)(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
+-
+-	const char *(* snd_strerror)(int errnum);
+-
+-	int (* snd_pcm_hw_params_malloc)(snd_pcm_hw_params_t **ptr);
+-	int (* snd_pcm_hw_params_any)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
+-	int (* snd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
+-	int (* snd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
+-	int (* snd_pcm_hw_params_set_access)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access);
+-	int (* snd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
+-	int (* snd_pcm_hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
+-	int (* snd_pcm_hw_params_get_periods)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
+-	int (* snd_pcm_hw_params_get_period_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir);
+-	int (* snd_pcm_hw_params_get_period_size_min)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir);
+-	int (* snd_pcm_hw_params_get_buffer_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
+-} cw_alsa = {
+-	.handle = NULL,
+-
+-	.snd_pcm_open = NULL,
+-	.snd_pcm_close = NULL,
+-	.snd_pcm_prepare = NULL,
+-	.snd_pcm_drop = NULL,
+-	.snd_pcm_writei = NULL,
+-
+-	.snd_strerror = NULL,
+-
+-	.snd_pcm_hw_params_malloc = NULL,
+-	.snd_pcm_hw_params_any = NULL,
+-	.snd_pcm_hw_params_set_format = NULL,
+-	.snd_pcm_hw_params_set_rate_near = NULL,
+-	.snd_pcm_hw_params_set_access = NULL,
+-	.snd_pcm_hw_params_set_channels = NULL,
+-	.snd_pcm_hw_params = NULL,
+-	.snd_pcm_hw_params_get_periods = NULL,
+-	.snd_pcm_hw_params_get_period_size = NULL,
+-	.snd_pcm_hw_params_get_period_size_min = NULL,
+-	.snd_pcm_hw_params_get_buffer_size = NULL
+-};
+-
+-
+-
+-
+-
+ 
+ /**
+    \brief Check if it is possible to open ALSA output
+@@ -144,34 +92,19 @@ static struct {
+ */
+ bool cw_is_alsa_possible(const char *device)
+ {
+-	const char *library_name = "libasound.so.2";
+-	if (!cw_dlopen_internal(library_name, &(cw_alsa.handle))) {
+-		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't access ALSA library \"%s\"", library_name);
+-		return false;
+-	}
+-
+-	int rv = cw_alsa_dlsym_internal(cw_alsa.handle);
+-	if (rv < 0) {
+-		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: failed to resolve ALSA symbol #%d, can't correctly load ALSA library", rv);
+-		dlclose(cw_alsa.handle);
+-		return false;
+-	}
+-
+-	const char *dev = device ? device : CW_DEFAULT_ALSA_DEVICE;
++        int rv;
++        const char *dev = device ? device : CW_DEFAULT_ALSA_DEVICE;
+ 	snd_pcm_t *alsa_handle;
+-	rv = cw_alsa.snd_pcm_open(&alsa_handle,
++	rv = snd_pcm_open(&alsa_handle,
+ 				  dev,                     /* name */
+ 				  SND_PCM_STREAM_PLAYBACK, /* stream (playback/capture) */
+ 				  0);                      /* mode, 0 | SND_PCM_NONBLOCK | SND_PCM_ASYNC */
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+ 			      "cw_alsa: can't open ALSA device \"%s\"", dev);
+-		dlclose(cw_alsa.handle);
+ 		return false;
+ 	} else {
+-		cw_alsa.snd_pcm_close(alsa_handle);
++		snd_pcm_close(alsa_handle);
+ 		return true;
+ 	}
+ }
+@@ -204,7 +137,7 @@ int cw_alsa_write_internal(cw_gen_t *gen)
+ 	/* Send audio buffer to ALSA.
+ 	   Size of correct and current data in the buffer is the same as
+ 	   ALSA's period, so there should be no underruns */
+-	int rv = cw_alsa.snd_pcm_writei(gen->alsa_data.handle, gen->buffer, gen->buffer_n_samples);
++	int rv = snd_pcm_writei(gen->alsa_data.handle, gen->buffer, gen->buffer_n_samples);
+ 	cw_alsa_debug_evaluate_write_internal(gen, rv);
+ 	/*
+ 	cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+@@ -231,7 +164,7 @@ int cw_alsa_write_internal(cw_gen_t *gen)
+ */
+ int cw_alsa_open_device_internal(cw_gen_t *gen)
+ {
+-	int rv = cw_alsa.snd_pcm_open(&gen->alsa_data.handle,
++	int rv = snd_pcm_open(&gen->alsa_data.handle,
+ 				      gen->audio_device,       /* name */
+ 				      SND_PCM_STREAM_PLAYBACK, /* stream (playback/capture) */
+ 				      0);                      /* mode, 0 | SND_PCM_NONBLOCK | SND_PCM_ASYNC */
+@@ -251,7 +184,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
+ 	/* TODO: move this to cw_alsa_set_hw_params_internal(),
+ 	   deallocate hw_params */
+ 	snd_pcm_hw_params_t *hw_params = NULL;
+-	rv = cw_alsa.snd_pcm_hw_params_malloc(&hw_params);
++	rv = snd_pcm_hw_params_malloc(&hw_params);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+ 			      "cw_alsa: can't allocate memory for ALSA hw params");
+@@ -265,7 +198,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
+ 		return CW_FAILURE;
+ 	}
+ 
+-	rv = cw_alsa.snd_pcm_prepare(gen->alsa_data.handle);
++	rv = snd_pcm_prepare(gen->alsa_data.handle);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+ 			      "cw_alsa: can't prepare ALSA handler");
+@@ -275,7 +208,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
+ 	/* Get size for data buffer */
+ 	snd_pcm_uframes_t frames; /* period size in frames */
+ 	int dir = 1;
+-	rv = cw_alsa.snd_pcm_hw_params_get_period_size_min(hw_params, &frames, &dir);
++	rv = snd_pcm_hw_params_get_period_size_min(hw_params, &frames, &dir);
+ 	cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 		      "cw_alsa: rv = %d, ALSA buffer size would be %u frames", rv, (unsigned int) frames);
+ 
+@@ -305,14 +238,11 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
+ void cw_alsa_close_device_internal(cw_gen_t *gen)
+ {
+ 	/* "Stop a PCM dropping pending frames. " */
+-	cw_alsa.snd_pcm_drop(gen->alsa_data.handle);
+-	cw_alsa.snd_pcm_close(gen->alsa_data.handle);
++	snd_pcm_drop(gen->alsa_data.handle);
++	snd_pcm_close(gen->alsa_data.handle);
+ 
+ 	gen->audio_device_is_open = false;
+ 
+-	if (cw_alsa.handle) {
+-		dlclose(cw_alsa.handle);
+-	}
+ 
+ #if CW_DEV_RAW_SINK
+ 	if (gen->dev_raw_sink != -1) {
+@@ -332,11 +262,11 @@ int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv)
+ 	if (rv == -EPIPE) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
+ 			      "cw_alsa: underrun");
+-		cw_alsa.snd_pcm_prepare(gen->alsa_data.handle);
++		snd_pcm_prepare(gen->alsa_data.handle);
+ 	} else if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
+-			      "cw_alsa: writei: %s", cw_alsa.snd_strerror(rv));
+-		cw_alsa.snd_pcm_prepare(gen->alsa_data.handle);
++			      "cw_alsa: writei: %s", snd_strerror(rv));
++		snd_pcm_prepare(gen->alsa_data.handle);
+ 	} else if (rv != gen->buffer_n_samples) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
+ 			      "cw_alsa: short write, %d != %d", rv, gen->buffer_n_samples);
+@@ -363,19 +293,19 @@ int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv)
+ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params)
+ {
+ 	/* Get current hw configuration. */
+-	int rv = cw_alsa.snd_pcm_hw_params_any(gen->alsa_data.handle, hw_params);
++	int rv = snd_pcm_hw_params_any(gen->alsa_data.handle, hw_params);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: get current hw params: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: get current hw params: %s", snd_strerror(rv));
+ 		return CW_FAILURE;
+ 	}
+ 
+ 
+ 	/* Set the sample format */
+-	rv = cw_alsa.snd_pcm_hw_params_set_format(gen->alsa_data.handle, hw_params, CW_ALSA_SAMPLE_FORMAT);
++	rv = snd_pcm_hw_params_set_format(gen->alsa_data.handle, hw_params, CW_ALSA_SAMPLE_FORMAT);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't set sample format: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't set sample format: %s", snd_strerror(rv));
+ 		return CW_FAILURE;
+ 	}
+ 
+@@ -387,7 +317,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 	bool success = false;
+ 	for (int i = 0; cw_supported_sample_rates[i]; i++) {
+ 		rate = cw_supported_sample_rates[i];
+-		int rv = cw_alsa.snd_pcm_hw_params_set_rate_near(gen->alsa_data.handle, hw_params, &rate, &dir);
++		int rv = snd_pcm_hw_params_set_rate_near(gen->alsa_data.handle, hw_params, &rate, &dir);
+ 		if (!rv) {
+ 			if (rate != cw_supported_sample_rates[i]) {
+ 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, "cw_alsa: imprecise sample rate:");
+@@ -402,7 +332,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 
+ 	if (!success) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't get sample rate: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't get sample rate: %s", snd_strerror(rv));
+ 		return CW_FAILURE;
+         } else {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+@@ -410,18 +340,18 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 	}
+ 
+ 	/* Set PCM access type */
+-	rv = cw_alsa.snd_pcm_hw_params_set_access(gen->alsa_data.handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
++	rv = snd_pcm_hw_params_set_access(gen->alsa_data.handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't set access type: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't set access type: %s", snd_strerror(rv));
+ 		return CW_FAILURE;
+ 	}
+ 
+ 	/* Set number of channels */
+-	rv = cw_alsa.snd_pcm_hw_params_set_channels(gen->alsa_data.handle, hw_params, CW_AUDIO_CHANNELS);
++	rv = snd_pcm_hw_params_set_channels(gen->alsa_data.handle, hw_params, CW_AUDIO_CHANNELS);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't set number of channels: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't set number of channels: %s", snd_strerror(rv));
+ 		return CW_FAILURE;
+ 	}
+ 
+@@ -496,7 +426,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 		snd_pcm_uframes_t accepted = 0; /* buffer size in frames  */
+ 		dir = 0;
+ 		for (snd_pcm_uframes_t val = 0; val < 10000; val++) {
+-			rv = cw_alsa.snd_pcm_hw_params_test_buffer_size(gen->alsa_data.handle, hw_params, val);
++			rv = snd_pcm_hw_params_test_buffer_size(gen->alsa_data.handle, hw_params, val);
+ 			if (rv == 0) {
+ 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 					      "cw_alsa: accepted buffer size: %u", (unsigned int) accepted);
+@@ -507,10 +437,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 		}
+ 
+ 		if (accepted > 0) {
+-			rv = cw_alsa.snd_pcm_hw_params_set_buffer_size(gen->alsa_data.handle, hw_params, accepted);
++			rv = snd_pcm_hw_params_set_buffer_size(gen->alsa_data.handle, hw_params, accepted);
+ 			if (rv < 0) {
+ 				cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-					      "cw_alsa: can't set accepted buffer size %u: %s", (unsigned int) accepted, cw_alsa.snd_strerror(rv));
++					      "cw_alsa: can't set accepted buffer size %u: %s", (unsigned int) accepted, snd_strerror(rv));
+ 			}
+ 		} else {
+ 			cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+@@ -526,7 +456,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 		/* this limit should be enough, "accepted" on my machine is 8 */
+ 		const unsigned int n_periods_max = 30;
+ 		for (unsigned int val = 1; val < n_periods_max; val++) {
+-			rv = cw_alsa.snd_pcm_hw_params_test_periods(gen->alsa_data.handle, hw_params, val, dir);
++			rv = snd_pcm_hw_params_test_periods(gen->alsa_data.handle, hw_params, val, dir);
+ 			if (rv == 0) {
+ 				accepted = val;
+ 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+@@ -534,10 +464,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 			}
+ 		}
+ 		if (accepted > 0) {
+-			rv = cw_alsa.snd_pcm_hw_params_set_periods(gen->alsa_data.handle, hw_params, accepted, dir);
++			rv = snd_pcm_hw_params_set_periods(gen->alsa_data.handle, hw_params, accepted, dir);
+ 			if (rv < 0) {
+ 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-					      "cw_alsa: can't set accepted number of periods %d: %s", accepted, cw_alsa.snd_strerror(rv));
++					      "cw_alsa: can't set accepted number of periods %d: %s", accepted, snd_strerror(rv));
+ 			}
+ 		} else {
+ 			cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+@@ -549,7 +479,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 		/* Test period size */
+ 		dir = 0;
+ 		for (snd_pcm_uframes_t val = 0; val < 100000; val++) {
+-			rv = cw_alsa.snd_pcm_hw_params_test_period_size(gen->alsa_data.handle, hw_params, val, dir);
++			rv = snd_pcm_hw_params_test_period_size(gen->alsa_data.handle, hw_params, val, dir);
+ 			if (rv == 0) {
+ 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 					      "cw_alsa: accepted period size: %lu", val);
+@@ -562,7 +492,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ 		/* Test buffer time */
+ 		dir = 0;
+ 		for (unsigned int val = 0; val < 100000; val++) {
+-			rv = cw_alsa.snd_pcm_hw_params_test_buffer_time(gen->alsa_data.handle, hw_params, val, dir);
++			rv = snd_pcm_hw_params_test_buffer_time(gen->alsa_data.handle, hw_params, val, dir);
+ 			if (rv == 0) {
+ 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 					      "cw_alsa: accepted buffer time: %d", val);
+@@ -573,10 +503,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
+ #endif /* #if CW_ALSA_HW_BUFFER_CONFIG */
+ 
+ 	/* Save hw parameters to device */
+-	rv = cw_alsa.snd_pcm_hw_params(gen->alsa_data.handle, hw_params);
++	rv = snd_pcm_hw_params(gen->alsa_data.handle, hw_params);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't save hw parameters: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't save hw parameters: %s", snd_strerror(rv));
+ 		return CW_FAILURE;
+ 	} else {
+ 		return CW_SUCCESS;
+@@ -600,30 +530,30 @@ int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params)
+ 	unsigned int val = 0;
+ 	int dir = 0;
+ 
+-	int rv = cw_alsa.snd_pcm_hw_params_get_periods(hw_params, &val, &dir);
++	int rv = snd_pcm_hw_params_get_periods(hw_params, &val, &dir);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't get 'periods': %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't get 'periods': %s", snd_strerror(rv));
+ 	} else {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 			      "cw_alsa: 'periods' = %u", val);
+ 	}
+ 
+ 	snd_pcm_uframes_t period_size = 0;
+-	rv = cw_alsa.snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir);
++	rv = snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't get 'period size': %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't get 'period size': %s", snd_strerror(rv));
+ 	} else {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 			      "cw_alsa: 'period size' = %u", (unsigned int) period_size);
+ 	}
+ 
+ 	snd_pcm_uframes_t buffer_size;
+-	rv = cw_alsa.snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size);
++	rv = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "cw_alsa: can't get buffer size: %s", cw_alsa.snd_strerror(rv));
++			      "cw_alsa: can't get buffer size: %s", snd_strerror(rv));
+ 	} else {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
+ 			      "cw_alsa: 'buffer size' = %u", (unsigned int) buffer_size);
+@@ -642,70 +572,9 @@ int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params)
+ 
+ 
+ 
+-/**
+-   \brief Resolve/get symbols from ALSA library
+-
+-   Function resolves/gets addresses of few ALSA functions used by
+-   libcw and stores them in cw_alsa global variable.
+-
+-   On failure the function returns negative value, different for every
+-   symbol that the funciton failed to resolve. Function stops and returns
+-   on first failure.
+-
+-   \param handle - handle to open ALSA library
+-
+-   \return 0 on success
+-   \return negative value on failure
+-*/
+-static int cw_alsa_dlsym_internal(void *handle)
+-{
+-	*(void **) &(cw_alsa.snd_pcm_open)    = dlsym(handle, "snd_pcm_open");
+-	if (!cw_alsa.snd_pcm_open)    return -1;
+-	*(void **) &(cw_alsa.snd_pcm_close)   = dlsym(handle, "snd_pcm_close");
+-	if (!cw_alsa.snd_pcm_close)   return -2;
+-	*(void **) &(cw_alsa.snd_pcm_prepare) = dlsym(handle, "snd_pcm_prepare");
+-	if (!cw_alsa.snd_pcm_prepare) return -3;
+-	*(void **) &(cw_alsa.snd_pcm_drop)    = dlsym(handle, "snd_pcm_drop");
+-	if (!cw_alsa.snd_pcm_drop)    return -4;
+-	*(void **) &(cw_alsa.snd_pcm_writei)  = dlsym(handle, "snd_pcm_writei");
+-	if (!cw_alsa.snd_pcm_writei)  return -5;
+-
+-	*(void **) &(cw_alsa.snd_strerror) = dlsym(handle, "snd_strerror");
+-	if (!cw_alsa.snd_strerror) return -10;
+-
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_malloc)               = dlsym(handle, "snd_pcm_hw_params_malloc");
+-	if (!cw_alsa.snd_pcm_hw_params_malloc)              return -20;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_any)                  = dlsym(handle, "snd_pcm_hw_params_any");
+-	if (!cw_alsa.snd_pcm_hw_params_any)                 return -21;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_set_format)           = dlsym(handle, "snd_pcm_hw_params_set_format");
+-	if (!cw_alsa.snd_pcm_hw_params_set_format)          return -22;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_set_rate_near)        = dlsym(handle, "snd_pcm_hw_params_set_rate_near");
+-	if (!cw_alsa.snd_pcm_hw_params_set_rate_near)       return -23;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_set_access)           = dlsym(handle, "snd_pcm_hw_params_set_access");
+-	if (!cw_alsa.snd_pcm_hw_params_set_access)          return -24;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_set_channels)         = dlsym(handle, "snd_pcm_hw_params_set_channels");
+-	if (!cw_alsa.snd_pcm_hw_params_set_channels)        return -25;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params)                      = dlsym(handle, "snd_pcm_hw_params");
+-	if (!cw_alsa.snd_pcm_hw_params)                     return -26;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_get_periods)          = dlsym(handle, "snd_pcm_hw_params_get_periods");
+-	if (!cw_alsa.snd_pcm_hw_params_get_periods)         return -27;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_get_period_size)      = dlsym(handle, "snd_pcm_hw_params_get_period_size");
+-	if (!cw_alsa.snd_pcm_hw_params_get_period_size)     return -28;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_get_period_size_min)  = dlsym(handle, "snd_pcm_hw_params_get_period_size_min");
+-	if (!cw_alsa.snd_pcm_hw_params_get_period_size_min) return -29;
+-	*(void **) &(cw_alsa.snd_pcm_hw_params_get_buffer_size)      = dlsym(handle, "snd_pcm_hw_params_get_buffer_size");
+-	if (!cw_alsa.snd_pcm_hw_params_get_buffer_size)     return -30;
+-
+-	return 0;
+-}
+-
+-
+-
+-
+-
+ void cw_alsa_drop(cw_gen_t *gen)
+ {
+-	cw_alsa.snd_pcm_drop(gen->alsa_data.handle);
++	snd_pcm_drop(gen->alsa_data.handle);
+ 
+ 	return;
+ }
+@@ -721,7 +590,7 @@ void cw_alsa_drop(cw_gen_t *gen)
+ 
+ 
+ #include <stdbool.h>
+-#include "libcw_alsa.h"
++#include "libh"
+ 
+ 
+ 
+diff --git a/src/libcw/libcw_pa.c b/src/libcw/libcw_pa.c
+index 8269e9d..e190200 100644
+--- a/src/libcw/libcw_pa.c
++++ b/src/libcw/libcw_pa.c
+@@ -39,7 +39,6 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
+-#include <dlfcn.h> /* dlopen() and related symbols */
+ #include <string.h>
+ #include <assert.h>
+ #include <sys/types.h>
+@@ -63,39 +62,12 @@ extern cw_debug_t cw_debug_object_dev;
+ 
+ 
+ static pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, const char *device, const char *stream_name, int *error);
+-static int        cw_pa_dlsym_internal(void *handle);
+ static int        cw_pa_open_device_internal(cw_gen_t *gen);
+ static void       cw_pa_close_device_internal(cw_gen_t *gen);
+ static int        cw_pa_write_internal(cw_gen_t *gen);
+ 
+ 
+ 
+-static struct {
+-	void *handle;
+-
+-	pa_simple *(* pa_simple_new)(const char *server, const char *name, pa_stream_direction_t dir, const char *dev, const char *stream_name, const pa_sample_spec *ss, const pa_channel_map *map, const pa_buffer_attr *attr, int *error);
+-	void       (* pa_simple_free)(pa_simple *s);
+-	int        (* pa_simple_write)(pa_simple *s, const void *data, size_t bytes, int *error);
+-	pa_usec_t  (* pa_simple_get_latency)(pa_simple *s, int *error);
+-	int        (* pa_simple_drain)(pa_simple *s, int *error);
+-
+-	size_t     (* pa_usec_to_bytes)(pa_usec_t t, const pa_sample_spec *spec);
+-	char      *(* pa_strerror)(int error);
+-} cw_pa = {
+-	.handle = NULL,
+-
+-	.pa_simple_new = NULL,
+-	.pa_simple_free = NULL,
+-	.pa_simple_write = NULL,
+-	.pa_simple_get_latency = NULL,
+-	.pa_simple_drain = NULL,
+-
+-	.pa_usec_to_bytes = NULL,
+-	.pa_strerror = NULL
+-};
+-
+-
+-
+ 
+ static const pa_sample_format_t CW_PA_SAMPLE_FORMAT = PA_SAMPLE_S16LE; /* Signed 16 bit, Little Endian */
+ static const int CW_PA_BUFFER_N_SAMPLES = 1024;
+@@ -117,21 +89,6 @@ static const int CW_PA_BUFFER_N_SAMPLES = 1024;
+ */
+ bool cw_is_pa_possible(const char *device)
+ {
+-	const char *library_name = "libpulse-simple.so";
+-	if (!cw_dlopen_internal(library_name, &(cw_pa.handle))) {
+-		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "libcw_pa: can't access PulseAudio library \"%s\"", library_name);
+-		return false;
+-	}
+-
+-	int rv = cw_pa_dlsym_internal(cw_pa.handle);
+-	if (rv < 0) {
+-		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "libcw_pa: failed to resolve PulseAudio symbol #%d, can't correctly load PulseAudio library", rv);
+-		dlclose(cw_pa.handle);
+-		return false;
+-	}
+-
+ 	const char *dev = (char *) NULL;
+ 	if (device && strcmp(device, CW_DEFAULT_PA_DEVICE)) {
+ 		dev = device;
+@@ -145,13 +102,10 @@ bool cw_is_pa_possible(const char *device)
+ 
+ 	if (!s) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "libcw_pa: can't connect to PulseAudio server: %s", cw_pa.pa_strerror(error));
+-		if (cw_pa.handle) {
+-			dlclose(cw_pa.handle);
+-		}
++			      "libcw_pa: can't connect to PulseAudio server: %s", pa_strerror(error));
+ 		return false;
+ 	} else {
+-		cw_pa.pa_simple_free(s);
++		pa_simple_free(s);
+ 		s = NULL;
+ 		return true;
+ 	}
+@@ -186,10 +140,10 @@ int cw_pa_write_internal(cw_gen_t *gen)
+ 
+ 	int error = 0;
+ 	size_t n_bytes = sizeof (gen->buffer[0]) * gen->buffer_n_samples;
+-	int rv = cw_pa.pa_simple_write(gen->pa_data.s, gen->buffer, n_bytes, &error);
++	int rv = pa_simple_write(gen->pa_data.s, gen->buffer, n_bytes, &error);
+ 	if (rv < 0) {
+ 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "libcw_pa: pa_simple_write() failed: %s", cw_pa.pa_strerror(error));
++			      "libcw_pa: pa_simple_write() failed: %s", pa_strerror(error));
+ 	} else {
+ 		//cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, "libcw_pa: written %d samples with PulseAudio", gen->buffer_n_samples);
+ 	}
+@@ -237,13 +191,13 @@ pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, con
+ 	}
+ 
+ 	// http://www.mail-archive.com/pulseaudio-tickets@mail.0pointer.de/msg03295.html
+-	ba->tlength = cw_pa.pa_usec_to_bytes(50*1000, ss);
+-	ba->minreq = cw_pa.pa_usec_to_bytes(0, ss);
+-	ba->maxlength = cw_pa.pa_usec_to_bytes(50*1000, ss);
++	ba->tlength = pa_usec_to_bytes(50*1000, ss);
++	ba->minreq = pa_usec_to_bytes(0, ss);
++	ba->maxlength = pa_usec_to_bytes(50*1000, ss);
+ 	/* ba->prebuf = ; */ /* ? */
+ 	/* ba->fragsize = sizeof(uint32_t) -1; */ /* not relevant to playback */
+ 
+-	pa_simple *s = cw_pa.pa_simple_new(NULL,                  /* server name (NULL for default) */
++	pa_simple *s = pa_simple_new(NULL,                  /* server name (NULL for default) */
+ 					   "libcw",               /* descriptive name of client (application name etc.) */
+ 					   PA_STREAM_PLAYBACK,    /* stream direction */
+ 					   dev,                   /* device/sink name (NULL for default) */
+@@ -258,47 +212,6 @@ pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, con
+ 
+ 
+ 
+-
+-
+-/**
+-   \brief Resolve/get symbols from PulseAudio library
+-
+-   Function resolves/gets addresses of few PulseAudio functions used by
+-   libcw and stores them in cw_pa global variable.
+-
+-   On failure the function returns negative value, different for every
+-   symbol that the funciton failed to resolve. Function stops and returns
+-   on first failure.
+-
+-   \param handle - handle to open PulseAudio library
+-
+-   \return 0 on success
+-   \return negative value on failure
+-*/
+-int cw_pa_dlsym_internal(void *handle)
+-{
+-	*(void **) &(cw_pa.pa_simple_new)         = dlsym(handle, "pa_simple_new");
+-	if (!cw_pa.pa_simple_new)         return -1;
+-	*(void **) &(cw_pa.pa_simple_free)        = dlsym(handle, "pa_simple_free");
+-	if (!cw_pa.pa_simple_free)        return -2;
+-	*(void **) &(cw_pa.pa_simple_write)       = dlsym(handle, "pa_simple_write");
+-	if (!cw_pa.pa_simple_write)       return -3;
+-	*(void **) &(cw_pa.pa_strerror)           = dlsym(handle, "pa_strerror");
+-	if (!cw_pa.pa_strerror)           return -4;
+-	*(void **) &(cw_pa.pa_simple_get_latency) = dlsym(handle, "pa_simple_get_latency");
+-	if (!cw_pa.pa_simple_get_latency) return -5;
+-	*(void **) &(cw_pa.pa_simple_drain)       = dlsym(handle, "pa_simple_drain");
+-	if (!cw_pa.pa_simple_drain)       return -6;
+-	*(void **) &(cw_pa.pa_usec_to_bytes)      = dlsym(handle, "pa_usec_to_bytes");
+-	if (!cw_pa.pa_usec_to_bytes)       return -7;
+-
+-	return 0;
+-}
+-
+-
+-
+-
+-
+ /**
+    \brief Open PulseAudio output, associate it with given generator
+ 
+@@ -325,16 +238,16 @@ int cw_pa_open_device_internal(cw_gen_t *gen)
+ 
+  	if (!gen->pa_data.s) {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "libcw_pa: can't connect to PulseAudio server: %s", cw_pa.pa_strerror(error));
++			      "libcw_pa: can't connect to PulseAudio server: %s", pa_strerror(error));
+ 		return false;
+ 	}
+ 
+ 	gen->buffer_n_samples = CW_PA_BUFFER_N_SAMPLES;
+ 	gen->sample_rate = gen->pa_data.ss.rate;
+ 
+-	if ((gen->pa_data.latency_usecs = cw_pa.pa_simple_get_latency(gen->pa_data.s, &error)) == (pa_usec_t) -1) {
++	if ((gen->pa_data.latency_usecs = pa_simple_get_latency(gen->pa_data.s, &error)) == (pa_usec_t) -1) {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-			      "libcw_pa: pa_simple_get_latency() failed: %s", cw_pa.pa_strerror(error));
++			      "libcw_pa: pa_simple_get_latency() failed: %s", pa_strerror(error));
+ 	}
+ 
+ #if CW_DEV_RAW_SINK
+@@ -357,20 +270,17 @@ void cw_pa_close_device_internal(cw_gen_t *gen)
+ 	if (gen->pa_data.s) {
+ 		/* Make sure that every single sample was played */
+ 		int error;
+-		if (cw_pa.pa_simple_drain(gen->pa_data.s, &error) < 0) {
++		if (pa_simple_drain(gen->pa_data.s, &error) < 0) {
+ 			cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
+-				      "libcw_pa: pa_simple_drain() failed: %s", cw_pa.pa_strerror(error));
++				      "libcw_pa: pa_simple_drain() failed: %s", pa_strerror(error));
+ 		}
+-		cw_pa.pa_simple_free(gen->pa_data.s);
++		pa_simple_free(gen->pa_data.s);
+ 		gen->pa_data.s = NULL;
+ 	} else {
+ 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
+ 			      "libcw_pa: called the function for NULL PA sink");
+ 	}
+ 
+-	if (cw_pa.handle) {
+-		dlclose(cw_pa.handle);
+-	}
+ 
+ #if CW_DEV_RAW_SINK
+ 	if (gen->dev_raw_sink != -1) {
+-- 
+2.16.2
+
diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 1a9cd2a12525c..7bf9aca029b98 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.1.0";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "0i01pj71p3lc1kcqj6mixax6865vbxd9k9jczi2xh4p9nmfa5m2a";
+    sha256 = "0ncvfl5iyngw3lr2g7awpskrrld6y0x7w0xyp827lcr7x73fvqgp";
   };
 
   buildInputs = [ hackrf rtl-sdr ];
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 9225bd86492e7..7649785524f1b 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.8";
 
   src = fetchurl {
-    url    = "http://waynemorrison.com/software/vcal";
+    url    = "https://waynemorrison.com/software/vcal";
     sha256 = "0jrm0jzqxb1xjp24hwbzlxsh22gjssay9gj4zszljzdm68r5afvc";
   };
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Parser for VCalendar and ICalendar files, usable from the command line";
-    homepage = http://waynemorrison.com/software/;
+    homepage = https://waynemorrison.com/software/;
     license = licenses.asl20;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index 3ec92adb7f8ce..f23862c63cd4c 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.1.45";
 
   src = fetchurl {
-    url = "http://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
+    url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
     sha256 = "180zyhdjspp7lk2291wsqs6bm7y27r7bd00447iimmjpx372s22c";
   };
 
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index e06242f7a0240..48818ca3b8b11 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }:
+{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
 
 stdenv.mkDerivation rec {
   name = "vym-${version}";
-  version = "2.2.4";
+  version = "2.6.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2";
-    sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs";
+    url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2";
+    sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
   };
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ qt4 qmake4Hook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ qtsvg ];
 
   meta = with stdenv.lib; {
     description = "A mind-mapping software";
diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index 143ec518ac519..27376f4db81cf 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A DAB/DAB+ Software Radio";
-    homepage = http://www.welle.io/;
+    homepage = https://www.welle.io/;
     maintainers = with maintainers; [ ck3d ];
     license = licenses.gpl2;
     platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 84f7d4fd29131..d8628b794d716 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -1,24 +1,16 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.3";
+  version = "1.4";
   name = "wikicurses-${version}";
 
-  src = fetchurl {
-    url = "http://github.com/ids1024/wikicurses/archive/v${version}.tar.gz";
-    sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8";
+  src = fetchFromGitHub {
+    owner = "ids1024";
+    repo = "wikicurses";
+    rev = "v${version}";
+    sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
   };
 
-  patches = [
-    # This is necessary to build without a config file.
-    # It can be safely removed after updating to wikicurses to 1.4
-    # or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included
-    (fetchurl {
-      url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch";
-      sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as";
-    })
-  ];
-
   propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];
 
   meta = {
@@ -26,6 +18,7 @@ pythonPackages.buildPythonApplication rec {
     homepage = https://github.com/ids1024/wikicurses/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ pSub ];
   };
 
 }
diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
index 311983e8f527c..23be3a5dc4fac 100644
--- a/pkgs/applications/misc/wsjtx/default.nix
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "wsjtx-${version}";
-  version = "1.9.0";
+  version = "1.9.1";
 
   # This is a composite source tarball containing both wsjtx and a hamlib fork
   src = fetchurl {
     url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
-    sha256 = "1qxwiylnykh37kw780hh9xfphzbj8ndpfqz4xazld16v3qx2g0jc";
+    sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc";
   };
 
   # Hamlib builds with autotools, wsjtx builds with cmake
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 51fd2ee80648b..05530af12547f 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
 
 stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.4.3";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "0plks4yyd9gjnfg7sfsgsvdgczkbghf5xjwb8bzv01f0fndn10r1";
+    sha256 = "0ix4vqhcm4x9j5p6pwdfwkm2ml6wmwsyn3ppzvxllhp4dj8blzwf";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 91fdb37432eae..f61cbf397597e 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.6.2";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx";
+    sha256 = "1c68qg7433chri6q1yhyggy4mbq2vnn3p2fxs8gqmgij9vpqn3m2";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 4e1e505e035e1..c013a9cc44ec5 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-proxy-${version}";
-  version = "2.6.2";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig-proxy";
     rev = "v${version}";
-    sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh";
+    sha256 = "0h6ihrrkgwi8k642iqq13qx3zlxl9r8q7wm417hb7j35rnmwn8lq";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index 39da756204f9a..897c861e40a17 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "xneur-0.8.0";
   
   src = fetchurl {
-    url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
+    url = https://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
   };
 
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index ca0d7775ecef0..ff7c6a9e9767c 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Utility for switching between keyboard layouts";
-    homepage = http://xneur.ru;
+    homepage = https://xneur.ru;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix
new file mode 100644
index 0000000000000..28ce4a0d500d1
--- /dev/null
+++ b/pkgs/applications/misc/xscope/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, libXt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "xscope";
+  version = "1.4.1";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/${name}.tar.bz2";
+    sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libXt ];
+
+  meta = with stdenv.lib; {
+    description = "program to monitor X11/Client conversations";
+    homepage = https://cgit.freedesktop.org/xorg/app/xscope/;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ ];
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
index ae31ebd1ca7e9..8df29cef53928 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xtermcontrol-${version}";
 
   src = fetchurl {
-    url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
+    url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
     sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l";
   };
 
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index 3d12fc0371074..300281761a4da 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -6,7 +6,7 @@ python27Packages.buildPythonApplication rec {
     version = "3.1.0";
 
     src = fetchurl {
-      url = "http://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
+      url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
       sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw";
     };
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a2d8a24ec5e6a..dbfd475341646 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -22,7 +22,6 @@
 
 # package customization
 , enableNaCl ? false
-, enableHotwording ? false
 , enableWideVine ? false
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false, libgnome-keyring3 ? null
@@ -149,6 +148,7 @@ let
       ./patches/nix_plugin_paths_52.patch
     ]  ++ optionals (versionAtLeast version "68") [
       ./patches/nix_plugin_paths_68.patch
+      (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs")
     ] ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
@@ -214,11 +214,8 @@ let
       proprietary_codecs = false;
       use_sysroot = false;
       use_gnome_keyring = gnomeKeyringSupport;
-      ## FIXME remove use_gconf after chromium 65 has become stable
-      use_gconf = gnomeSupport;
       use_gio = gnomeSupport;
       enable_nacl = enableNaCl;
-      enable_hotwording = enableHotwording;
       enable_widevine = enableWideVine;
       use_cups = cupsSupport;
 
@@ -258,7 +255,10 @@ let
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gn_files.py \
         --system-libraries ${toString gnSystemLibraries}
-      gn gen --args=${escapeShellArg gnFlags} out/Release
+      gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
+
+      # Fail if `gn gen` contains a WARNING.
+      grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
 
       runHook postConfigure
     '';
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1458a1816569e..d2bb04251705f 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -4,7 +4,6 @@
 # package customization
 , channel ? "stable"
 , enableNaCl ? false
-, enableHotwording ? false
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false
 , proprietaryCodecs ? true
@@ -22,7 +21,7 @@ let
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
     mkChromiumDerivation = callPackage ./common.nix {
-      inherit enableNaCl enableHotwording gnomeSupport gnome
+      inherit enableNaCl gnomeSupport gnome
               gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
               enableWideVine;
     };
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 70d457028292a..775ae960eb7d6 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,12 +98,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "30.0.0.113";
+    version = "30.0.0.134";
 
     src = fetchzip {
-      url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
-          + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k";
+      url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
+      sha256 = "1g6695w1ijqs8jbkbrb403ca1vvrf298ayvxslrvk70x6l7lp2ys";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 2113b9cdbed73..a1aba0da2d68b 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm";
-    sha256bin64 = "06gmn0clhll91pmph07db043006gf2x6nfgxlir4qwqsj2qgdch0";
-    version = "67.0.3396.62";
+    sha256 = "1jfhdisp4j6rrb8zxj2am7vlkjfbwvq1si7cacjwfy624hlhxpxz";
+    sha256bin64 = "0j3aw4zyg0alizgh73dp3fz8f6y71srdkycnzjm037p3p8m364j1";
+    version = "68.0.3440.17";
   };
   dev = {
-    sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc";
-    sha256bin64 = "0liqgz8sip5fz5mxb54zagz3p8s24j96p26i5dql935bic7p3lhw";
-    version = "68.0.3440.7";
+    sha256 = "0acgpi7slwvq5lxaagmn57a6jpz508hwa690ypny8zlhsiaqlxaz";
+    sha256bin64 = "1vjmi9lm8xrkhmzv9sqnln867sm4b80y2z3djz7mj05hkzsb0zr9";
+    version = "69.0.3452.0";
   };
   stable = {
-    sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm";
-    sha256bin64 = "16fljvrq2gcpjpyhf1w8s3rv805mknmy2i88n43v2cg7hl35241c";
-    version = "67.0.3396.62";
+    sha256 = "07fvfarlzl4dcr0vbklzbg08iwvzfkczsqsg0d1p695q1hpsf9sx";
+    sha256bin64 = "1c2xn84vs1v7gph7l4s408ml6l6c7lnlg4z2vcx20phxmlsgs1xg";
+    version = "67.0.3396.87";
   };
 }
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index b056bdedb41e3..73094767bf3d6 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "dillo-${version}";
 
   src = fetchurl {
-    url = "http://www.dillo.org/download/${name}.tar.bz2";
+    url = "https://www.dillo.org/download/${name}.tar.bz2";
     sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";
   };
 
diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
deleted file mode 100644
index 347fb8e128770..0000000000000
--- a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001
-From: Sam Parkinson <sam@sam.today>
-Date: Tue, 26 Dec 2017 14:46:27 +1100
-Subject: [PATCH] Extend the python path; rather than replacing it
-
-Some distros (i.e. NixOS) require the special PYTHONPATH, so that
-the web extension has access to the python packages it wants (i.e. gi).
-
-Previously, the PYTHONPATH was replaced with the web extension path;
-meaning it would crash on NixOS.  This instead prepends the web
-extension path to the PYTHONPATH.
----
- eolie/application.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/eolie/application.py b/eolie/application.py
-index 3c21542..bed4e55 100644
---- a/eolie/application.py
-+++ b/eolie/application.py
-@@ -340,7 +340,11 @@ class Application(Gtk.Application):
-         self.settings = Settings.new()
- 
-         # Init extensions
--        GLib.setenv("PYTHONPATH", self.__extension_dir, True)
-+        current_path = GLib.getenv("PYTHONPATH")
-+        new_path = self.__extension_dir
-+        if current_path:
-+            new_path = new_path + ':' + current_path
-+        GLib.setenv("PYTHONPATH", new_path, True)
- 
-         # Create favicon path
-         if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR):
--- 
-2.15.0
-
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 9d4c858298d68..5de6c0d882a38 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,67 +1,53 @@
-{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
-, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection
-, gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
+{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
+, desktop-file-utils, gobjectIntrospection, python36Packages
+, gnome3, gst_all_1, gtkspell3, hunspell }:
 
 stdenv.mkDerivation rec {
   name = "eolie-${version}";
-  version = "0.9.16";
+  version = "0.9.35";
 
   src = fetchgit {
-    url = https://gitlab.gnome.org/gnumdk/eolie;
-    rev = version;
-    sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
+    url = "https://gitlab.gnome.org/World/eolie";
+    rev = "refs/tags/${version}";
+    fetchSubmodules = true;
+    sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7";
   };
 
-  nativeBuildInputs = [
-    intltool
-    itstool
+  nativeBuildInputs = with python36Packages; [
+    desktop-file-utils
+    gobjectIntrospection
     meson
     ninja
     pkgconfig
     wrapGAppsHook
-    gobjectIntrospection
+    wrapPython
   ];
 
-  buildInputs = [
-    glib
-    glib-networking
-    gsettings-desktop-schemas
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-ugly
-    gst_all_1.gst-libav
-    gtk3
-    gtkspell3
-    libsecret
-    python36
-    python36Packages.pygobject3
-    python36Packages.pycairo
-    python36Packages.dateutil
-    python36Packages.dbus-python
-    python36Packages.beautifulsoup4
-    python36Packages.pycrypto
-    python36Packages.requests
-    webkitgtk
+  buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
+    glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret
+  ]) ++ (with gst_all_1; [
+    gst-libav gst-plugins-base gst-plugins-ugly gstreamer
+  ]);
+
+  pythonPath = with python36Packages; [
+    beautifulsoup4
+    pycairo
+    pygobject3
+    python-dateutil
   ];
 
-  wrapPrefixVariables = [ "PYTHONPATH" ];
+  postFixup = "wrapPythonPrograms";
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
   '';
 
-  patches = [
-    ./0001-Extend-the-python-path-rather-than-replacing-it.patch
-  ];
-
   meta = with stdenv.lib; {
     description = "A new GNOME web browser";
-    homepage = https://wiki.gnome.org/Apps/Eolie;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.samdroid-apps ];
-    platforms = platforms.linux;
+    homepage    = https://wiki.gnome.org/Apps/Eolie;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ samdroid-apps worldofpeace ];
+    platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index ec6b0734a1d63..838cdc315199b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,995 @@
 {
-  version = "61.0b12";
+  version = "62.0b8";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ach/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ach/firefox-62.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "52a328bfa793f42b7244eb29368c4e5ee044d4bd3b291aa5c43f0b6cc8c9a0486b15c7d44bf1a1f1e51697b6f775ec1c55f27a1970284483a3f8b28c64ceda6e";
+      sha512 = "976419f6a9e05ce99eea023bb4b3b14f8777aaebb4c18e8ec798d59f0abf9ce0e9470c552cc0aa1f90e53afaa5691b5b8ecac446eac39ec95b7146cfa0f76f7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/af/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/af/firefox-62.0b8.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8278f56fd31808414ab5df2f6aec2b4df31c8a7f1e5658213933254c58cc78087b2741befc4260444b2b6d32b38f4d5fbf281e3c6a30248e31f93053ddd46057";
+      sha512 = "d6af9ccab5ba0e1de78ca080cdc636928394319da8f0c04d5cbb23e248494264fcf8f0024e02d3c739771e2556c24db791ca93da0c9b7c629244fb43ae43cf43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/an/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/an/firefox-62.0b8.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7487a16e06b0e71d1a1b3495952d6216f3aa4941fe20243a276e61bb2ed4cd0f08b7c02886437ae82a0fdf1b90773ceb54a31ec3290ce050ae4170ac16a4e226";
+      sha512 = "a384bfb40654d2e2c2600b45dfb11abb0d6c1d09e99a988a7f8f515b4b40691315b3960116f05292321a40977f8774403ba9c53c299caabac17f911e7de41914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ar/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ar/firefox-62.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "df491982db74b684c6aa1a1163564b2210a502d994ce3813fe73cce40e9c4eb064a966286ae35db436495c9802528995cf4ad80752ded199dc8528412f150042";
+      sha512 = "3613cf6b7223bac23e46dbe6be92e64c6018957c739d192d485b97d8c1f77062aa385015add4b4e28bc7a3786391fd5711d5f432f86d90264516c57be841f7c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/as/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/as/firefox-62.0b8.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "eabe64dcd8d7daaedf6ed6a6538e32837752e7c18e1fd19d31a5751f556a8a05a95342fd2c8a6438c1bbb6546101adbeb95138b83baf6065be7b93b4e4d45f2a";
+      sha512 = "df38f019e4968e48ce56228f2d3d10a347da252ba3f09bc04c587af55fe669ea6cecf0d5f8b85e911abee074bde7f3ff5fd68780f958619c417af279ac53cc00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ast/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ast/firefox-62.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "a10cf8205b4ed7a83ebbf58475d2b24b831e548c5fe99b19e05dc9106be53516a660a877f8d952dec86c97eddfbc01100b9056630e5fcb1157d45cbd0a473323";
+      sha512 = "d7e29f7c6ef5ae6761a306db95e237cb35c7a4dadb76d648f7b6b655df13ddbb5eb57aa9377dbdb60696784c5c27b06c8f5b3f0032f2fe0e3f3d89732ba61e90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/az/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/az/firefox-62.0b8.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "45b55eec4e38782d44708e4db79e81383cb87425c4ea1db124dc986326e889f41f41f361fb408c1b1575604ba92173d42d959f1fa333bc06dfef2bca2cc6f766";
+      sha512 = "8da765b4bda4746682206a4d759de0233a16b2e940023a42aff9d23e6e0590803d737c0a38fb5f69f60a217a66776200211ebfc1276d4417691788e4d4b31257";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/be/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/be/firefox-62.0b8.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "b442e60610d2b705210117da72b37f28f9fc5c72f3c0d90a11ec7136be2230f6f4953b69cfefad37948aa4afccaeb73c363cf2de8f72c58cfeb3a2aba6da747d";
+      sha512 = "772bcae7cc6a329bf1e5f5fbd9634f96fb74dd45326e4e3af8a4819d08711cd3d5a74af6b319cc8876461d8c6c2658917b12e5ecbbebc12ab3fcc0bdcb5cf90c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bg/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bg/firefox-62.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "c93ca5b4a33041ef2c0dd0eab472ff7d8d94bab7d5b2f17600bf45995a1c67287ca8a1bd2c82ed5fce3d15c8efae228c6cbf9f5884a97280f52ee431836e02bf";
+      sha512 = "f7764fba619b64e86a35e0b420c1bb8b2f2db1a3cfb33811e68faee7fda579a5d6d136b989e43fff802ebbc3d8c3977ca97e3e09986abbcd956920bfc595ef89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bn-BD/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bn-BD/firefox-62.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "25b6962a0b196bf19fe2de5f553d49c78b1c1fe4037561cbbefaaae453769b7dbc99e92876706b021eaac28e3cb7dd2bddd05206fc983abd7ce7aac49853cbd6";
+      sha512 = "a5e74480d539b07dbb08ac008135c78d844e55c9554ac8628eb4604be7e5d3c1c0096d4058591fadca9d3c453a5c57f63767fef601d76f815e9094742d092d7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bn-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bn-IN/firefox-62.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "b035474bbc3260270a79e30c3d7b0c9d211d6c4498a2627ddd9c4266027654ff317682e0654a9a83b9b8b5f4e86fbdc692dad08b8b45dc2e671fdf87df673bcd";
+      sha512 = "911e516fd105a7a306f9f9fe022cc88f235175693622f217f604a5bbfc4a031a676dc15f56178d1465e531d5062818815f4e7d59653875538fa61403fa5c96db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/br/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/br/firefox-62.0b8.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "bc3bb4159aed0ea2d24940c245d2f7305b8c9aa2db08b89050cfa1148abc51c66118176e1a4796cae04b37ccdc7d46908b7321484be689c65dec64ad6ddd3730";
+      sha512 = "d2e6d5064691a7a1c8dbbbd87df415674bdf3565c2b70e09c986462a776d96fcb56ede5935893fb7aefa9ce79edbc8ea4c35f4ddac10a5a18c47384bb0d9e8b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bs/firefox-62.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "0ad50c789c497ee9fe48dd981c61ac5efc8c298d2f113294c0f273beeae5e26461890def35568c670d6bdf00346f01a87cbeb30936236a4977dc0e9690da9eb9";
+      sha512 = "d15cd4604cca0339b7db9721910178d9f309a8ca30dafe1af291f2c4f7fc9747882f6d1a25023e35481fb4dcb46c41f9e4a450caf8ab4b5eddef39e4dec5ac60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ca/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ca/firefox-62.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a8412bd99749c5b8c4b32b4a92d24a4ca464e9bb04e4aaf36da0536cfe768bea38bc9aa077600473d644a9c68b202d64ddded17c3f2a49d7486bb7ab966a7b29";
+      sha512 = "5a95eb672c15affddd475777a70e82442df6fee9113c26d668aadedea9f30cbdf3e7d69906885f504439f17d04534713bd217d01a5c417ec0a0e425b858ccf03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cak/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cak/firefox-62.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "249f20e9a18ac6c21d3ffd27d4d1da5385b44b959ef884add67651f9560381967fdbb5ae51157736a29ce20882ad78ddad2a1bd3e586ff204301575ab6d277cf";
+      sha512 = "76e4c7dea27e93728dd001dcdc9237a9063adf3b9464237f516af93e0a05a79d15c1998ec07e16bc198418bf2658d27438df06e76c9a750cd5ec0cad41290390";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cs/firefox-62.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "28a7a595f9348a6e19467ce25c6b02ff91b10db4f8ba05099eef4e4e0404c29a8a8ed4ff589b0d5b95cdf3d5c2c84c69170e420034399f906e9632ec10e1cfc4";
+      sha512 = "cd9353d268a04cb860a40febadf20bdfb20282cf141fec1e4da8fedc344e9bf7afd2476d5af41c413f732a5648c80d961a55749166d135925890310ddbfa2989";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cy/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cy/firefox-62.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "cc3c2dfa6ec782bf4ec16c914063c88292bebf81d3814a2b2873490409f84c0934c517e753a4813aea72e44d76a986aec283623f3b17e40cdbf15ab22b4a7213";
+      sha512 = "edc5016503aadf1edbc1c9dd630d68a6053f90f11bf8854d270b2748c63d4104e69b824dc4c4f39378b533ea91e7ef235dc3b9bfb57573fe481e60743178e5c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/da/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/da/firefox-62.0b8.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "7b1d54a8a18472369bc9c51d42289d399bd0c59178fe44026229f71390203adcbcda944aa6e7288bb87962a6d7d2123659969d91d3149ec1ffd1143516c23333";
+      sha512 = "ad642cf2dfc2f4167549a8800ab34acf4e328eded52f56a456d1fd9dc868f37a583ca04175863e11ed302d82aecd1187654d8fc70808d5b6a1080db0f35b4b0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/de/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/de/firefox-62.0b8.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "001d83700ad1630ebc139cf7228c82abeb62f4e9b06179bba185e10731df9e040b543ad4b2ef53eb1a8f6eb24b5bba341a7c8563943e09c23fcab67cce930a3d";
+      sha512 = "c15586f6bdcd7b2148254e3f7adbbc034efb6f981df0f320bab265fb198e87ad37f1ce530d08f8e6996ce8777e2f42f94904ead72cc4041f11210b8172261127";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/dsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/dsb/firefox-62.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "d5750da2cff1c2467a3ef1db671b3d457c185f95bcd3865e553fb30bc1c574573a6e42a064cbe666fd35a1021fede35975bf562a0b161783ad16332080527784";
+      sha512 = "b5815b2e683532de669eb4889d965447fce265bf50139f28637d1a7b2871b071fd6b01118c9c3214b50cdc7d2c761fb6c4b8c2d5be0b3cd53c89fbbc4ba4d426";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/el/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/el/firefox-62.0b8.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "25a5d3afc9543abf9a403992af0f1a2690559e93357bdc7742ab216c87888d9d7c25a711b2540fb298e699bcd13da5134bb35584d252345669ed0d5e877b5277";
+      sha512 = "e942fa992b0590b617ce69b603807780561277a2f36ac1817ee85ffc1382675b69f2cbf4ada3fe9c796698fa8f25487752d5f290b195941461149526e76026f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-GB/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-CA/firefox-62.0b8.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-x86_64";
+      sha512 = "1afdb58288c58a1cf9849f1066b2644b2e1fb1b20322a2b97fac89bd90a3fe7e8f8a159407b3f8a7009307fea1e32ab2ac2638ab522e210e12a67a5a970bd14b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-GB/firefox-62.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "033999bb8c3c973342755983fdf208a828ad2344a5aeac6e82fc9d066afd21784ba48866981cffd4fa793fc2ae063f420931402e9cd290a97eeedd9047678f4e";
+      sha512 = "c61a221a852ef309ccb04a03a60141d322bd895c5cd82a3b5a3c03e8cc5b2846111e9a0dc8f390be8663a9c992d46d1608f32bc6f2478519ebb0310531b96467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-US/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-US/firefox-62.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "662859918fef837f5b66413164f1fd89c68506a12733d0014dcf75366dd62a03489439a035ad6481a4764feaa80a0a5eec5201813136f755d95c1bb65d87c954";
+      sha512 = "f659791fa08b9f93e3d33fb7ae783a51ce6c6d3cb99a1ce044d3b81408166e69c596125b7e977ea12a49feaeacec6c4b2cc49a196016bb61b3c7eb8699b0b64a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-ZA/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-ZA/firefox-62.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "5f5a6ef28731594dba101d6e244f909dbcbb8b08d2808440bbb485038997719f30f2ba38c1e021d8b91268c7d402b3b9c9fa341afec412cb5878a31a1150c40e";
+      sha512 = "ac051d88ce3d514533017e48d87d84310c110137afd53360988557e7660eed4953f77d2b3e4fab8685f53644f84a075004f90c117b01f23dda6f790a5fb4845b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/eo/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/eo/firefox-62.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "5c96c2d900106ddbb0e527aabb90f082dccbee05e8e05a40a3d704d59254027b9ef42eddd0c19ceaf73bb5d020cd7a075b510ec9fbe4f9cae71e3cd92a6d0d8a";
+      sha512 = "38dbafef566b20ea488a172319bdca879043d50bac583ad5351a74202ba4caf24f0f804b8d53ee974323c0a9c05814145b8e497a92121599d1432b8203559ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-AR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-AR/firefox-62.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "83c0596af66758bc50649badda5e628ef6344ff1e6f579540c804a8fe1d503c36d2c8116d9fc4cb1ad4ca8cfa13dff0462b299f5a038f7f607282ab702b4ac82";
+      sha512 = "f0b76ead6b1bc72832cfe0b33edfc944f3bcde24d7d2c8461fb2f7e5a5964c3eec9506481302c9fccd00d61b25ebad29675dc1e5c8fb6a627ed665da1ceb9fd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-CL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-CL/firefox-62.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "d03939763ce2bec161acec52fb67c9068f50e28abb838f9a073bc4bb479a1696e5aa721cd2e4f6993937e6539c7c56e16385b1ffed6c9942b41996fe44afa722";
+      sha512 = "83079739bec75c386c14086e5d20248520f1805df20293ff7b9a1c984994338c370472bd1c21163006a1b49ef40b6ebe396cd9c5f1fc70c9beabd5e350f87ca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-ES/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-ES/firefox-62.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "b200f2c47bb70213aa13531b540d2d11d457282c7ded5316093b61e6f09cf333225aaceeeb9c4d44174e3faad4635ddbabd87c399fac17466d53a2318b691b0f";
+      sha512 = "ab7ef032be8e75b2b329a4ad25904eb25af6499ddd971d4aed758cf1d32599cfac2f6fbd4f6e311b0bf8b501a6c3edc28a9f6bffe96d784a7fcde5dbbf58e9aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-MX/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-MX/firefox-62.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "eb26c0f4e1cbc4c19a05de06781a9012c46e0c30c4f7eeb33817fac24bc1d052904d77a51ca4d8f2a7ad323e2dca1c026f339adf4d29725417beff74fb2197c1";
+      sha512 = "7a40b322693338b4efedc8518d2bbc88d8ec131fc390690655eca3472160577c3d43bc13dc289afd8d7b8a4eab834a2ef7241e88afa92215060f747972b4c3db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/et/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/et/firefox-62.0b8.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "7b36afcc29ed9e54aeeb563361c23fd97faa572fc470f3a80af583076d6fed1003aa6f9152c958466185672ca14232be4027efba6f3b9383e490d997766b9c4d";
+      sha512 = "8a38e2a7d97a1b789fe8e775b3ede56d65d2110752599ce38c25b688dd91a5286ac4b8fb29f89e478e9386e8f7a76fe3269f2315d2d24b1bd723d0fd0ab3dedd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/eu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/eu/firefox-62.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "3560f55503091209c10e5eec35e11d5eba4051b37e8eadeb52f6179697570a3900a5c6807a97cab39fc028966e2d1c4b1acb57878fa651f5c435a8a9a78325fa";
+      sha512 = "040b07e88803a935e6c4d5ecc568c6911626ab8eb180706aec87982474e638cbca6e16e0dc10b95cdc2da11b3ca385aadf906bfc05525b86993157e617d79c71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fa/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fa/firefox-62.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "45b0e2c3669d556e62ac9a9f9c6e3dba61c304db275b037e9e2c24c63513f55c7d41f82256dc7cfc23528d1ae92964c25268a55200deaad2113c689287a021a4";
+      sha512 = "4886bf3e199238fc454d5a27292f2f245522a2e6cedeb7510ee57af19927f28ee89633cf052079e1740f86ac3172c63b34de8bf98a113f780db44dfd2c7c651b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ff/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ff/firefox-62.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "c9da6bc3443dbdf28fdc9f9c5b11be77e6569621286ce3eb75ef4160aad22f76a78c98f700f80be63f19c6964771c7b4f9e35d251d8cbad5aad98889cbdfe74b";
+      sha512 = "081cbb13005cd2885cd37d8a8134f6852df4f5da78bf14f2752814d707ac7cb7f9cf717a893cb3b6035b1236eff38656d95645055327c7cf20e0ecfa45d52219";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fi/firefox-62.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "845ec5b705525585855cb846454f84a683a3c53fd27732250e4de823113a9f178a8dba0cae5da456cfb8a7e33121ab046a8eba68f0fd8917fa7484efe86cd7c3";
+      sha512 = "223e0559b85a0f1e49d34f9d4a3308854d21f9960c294758edc2412b9022a6f055a8e592578a2125345b51564976350b2c0c8a3271b7f8c75311827f27424908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fr/firefox-62.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "eb0c835552d8bedc442140969ab66973d2852e016bfd3bf471bce0063afe7fd3a6e52a0e4759f797886a89c24fe84caa150e01867078d23026ba28dbec476761";
+      sha512 = "460edac7f75697ca04966cae37177511d50d8bc68200735f19f789b81319fd35ae2ad4243c642c6d135d90994e838709c3c893440569f0438af10bb00e2dbdd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fy-NL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fy-NL/firefox-62.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "438eae3dda2d35251fb9ebd18e42a58fd8cd20ef475c9575f0a087d9c336daf07482c8919791c5e0f7d6deec58c02b481c9810a364637f4a918d0ca896fae9a1";
+      sha512 = "caec2f49d1d399feaccfae6dfe6ee665959a63b8a858eccca7ea1067d81bc70f9355dbaaba3ec218e7b743bf3dda4f1a139feebd5f6e50e3e7ffce9deb1a2791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ga-IE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ga-IE/firefox-62.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "e1436c622ffc70b381809e62c9889d7b35924914c689b55b0a05d12cc13a7a612677efe47e0fc4b58b90bb188b3289630d86874ba6849ff619cf9518c77c4c80";
+      sha512 = "23585d379311b0226f999953ae7ed4446b2b4a270695e64bf2e4a7ce4b5ffbb7d08f9a349f3d64ce0305f7be01cae4e86a16d148b02dc0cf1fbd57c7c131208a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gd/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gd/firefox-62.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "2cb057a728e2772181619fd8b908f9b363232d12afeed63052d3e4c0b201e3f960aba6e879a41dd3f381a8561a813aa5ca490ae5f58b9e6f095b5ce4ece21aa4";
+      sha512 = "ea5495010b53da693b4d1a62a85db5faa30fffb791e92554e88129706e8b47560e18df8ee8b45036e7c41b3fc2c5e01ae3641a4ce3d3923882845d6e154469af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gl/firefox-62.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "4d00e5cb9ef0cf15a8c8db979836a50d28ac4741875f56f632135cc777f8096d05e398d773596a314e24627ffb549e354a07f1efa14c74318c266d8c373fee26";
+      sha512 = "19458201c72009c8ace9b5d0d2de5f0c3d091ba36dc4394b47fefe053958a55adc2db6301b822fe0ed36ab2eb59bd5acd6816891578ac1870f32555347f806fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gn/firefox-62.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "a5e92fd556d1d084793b3d3d5b61bf7fa083f1447a88be227cf58cdbc7f66e156ca67a2a3f6508135935f0315efb02b0ee2ad1a597a7937d6ded1efb7d7c1a07";
+      sha512 = "d88e0685f0db8d05ba9ff6ac2b35196d869ed2ca54eff95c8aee35169f223c97a1956919bf2efdf15d3faa3a6d48819b6d0a42cda2aedcf357bfffef71dee053";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gu-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gu-IN/firefox-62.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "02c9c67bb7003c114c6d64f864b878c5ce6048c54f6bbf13753606bef5b4d1ee6b62c543de230d537b5afc7c99b619049d45989c851027b23f7d1e8a8c029e86";
+      sha512 = "a510d5ec4dcc1c4524e42698ad5b231dbef5bb70538a4694d1fded06dd108218ed3a2a154fe245682ff8c71c306fdad7f0e6a91e4c177c7b16dce82eef57f6ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/he/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/he/firefox-62.0b8.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "2150ea2261ceebcbdc97013630bed5b9fddb581b52fe416ae237115a93997e4db3ceee3056724df321ab3922effec37dcb421e5c72f417301c8e500d877bd606";
+      sha512 = "f1cf8a66a9a3d91b225a54ed8082ba5a73e0a1342537c25e43a1233c333acb8660d037522bfad024c86e387f3fd411456b4d3148591ebd33303d8534837b6a3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hi-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hi-IN/firefox-62.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "1944f410ee05c3e2fea73460a1ed576490a54a8f16fab3cb4893913c7db9bbc7f133cf6a0aabf00736292986f11ce595670e03f1a30833d57549dd2d0943a0f8";
+      sha512 = "f1275ba2ae78178bb04ea794d29839aabbda623f8af69b5a6a10b3aa820b4f986d7c0fe5ef4f436057ab9e418fc8f4ba2f076e09a5b92064f835142664736ab5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hr/firefox-62.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "3b330bf4db4e818723f17b6ae8b78337e2d1c8c03eb58a1ccd0d078ad70dcd2864a5c94e7e1259f1a1c4cf3df482659b6e8d6d37c1c0f131e030101883141bdb";
+      sha512 = "b42b7b165007d76ac30296162588dce0d54742243e9447ffd8d1916da6144e0cd4ae386db8e1c5adb0685fbd550d96a7d44cc6562811621898523f01d2651c19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hsb/firefox-62.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "06690a9d7933a561e0ee7d6ce72a08c34626860f6d0a5475e0bbfcd598eb5c499a3098e7ed354341553600fada49cd8a1411a1b6bb016b10d67acf5e5050609f";
+      sha512 = "98f350628372e0ea3e6e55b55d583dde4d1c54483b53d15c3ec01ce2e42fc12a35cb3248c11019d10589938cfcb64e1b4fb4a9cf84b6b660ed0e06e1671cafed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hu/firefox-62.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d61587a46d45839fd2b3545ec0ef51a58b8af22ac795f77031f0739320f6568f69ec637a4ae8048c519720a6756b87f6453dda77a2d8eab2de7d7ba4031c53a4";
+      sha512 = "a7c567bf0243e3bea872cf5cbd492432578a5c293b416cf9683be59b5fde31edf668f661d0a98bfac56764f7eb8cdfc63d7571e4451bb5d3ba9a06caa3e66fd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hy-AM/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hy-AM/firefox-62.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "67375036a64e5b4b7e2174d64a28a34ef28273fac58939686ad90a6348d82d8d5cde629763535276fbf4dc7a89ffd3c0c753d6649300b82bd0d8050f96bddb2d";
+      sha512 = "16ba64cc577f0b5592a76ac930c818838c505c0d2042a954ab50e3deb64dd38ab4b4be46683dbcd5e5de863b6da0ce296e5539b4baf73126a57aa390ec0a3c2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ia/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ia/firefox-62.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "0e1042db7af12830cdfef6f34b00a2a57ea7ff24628c4e9dc3381681252eb93979f90c19d020c542fc8c5e517e7639b3a8f2804ebe9afafd1d2308ff1efc7c60";
+      sha512 = "f4c028e35a81bbf806c02ddeca3d97ad7673c0fd5e6b410dc14d53defc485f3825130c0e1f609e5623b5af7a670e61b3a5038c6373b6f862b729e3c6a1ad9acc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/id/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/id/firefox-62.0b8.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "938603e41fa33128f615e983beeed9aa99820110ff69466e7d0b16650655efa8773a7bb6eb863bb51267988bb3b9097e03c9632e0dae945827033aaad67a2e22";
+      sha512 = "7fb001cecd52399a65ca87ffbea3ec8411f223756c72e8451f20c43bcfa11f66cfd59412a284edac232c12c952516d27cf7d620dc5026101ae2abc798504e561";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/is/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/is/firefox-62.0b8.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2cb7dbce745c9e310f77977914cc7b1e861b62c11abfdcacf9899174f3dfad850fb0b0dfbc10842fa8e0e1cc4dc08a0863f1842e99b967d75e76fb13cb26b4fd";
+      sha512 = "dd71ded6761be477276b9ef79965e141f688c0311690b41f7e4f777d8fbd8b47510e2142b26c9e70710bd479e8fb840c295df5083ae8ddec955c8d9e40b2977a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/it/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/it/firefox-62.0b8.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "0aca845e35d1f392cce164062690c5b346fa7c2e422666ed4ce8abc9e61f341e401e6a3fd09c1cbd05a5c08a8a8e671622c690e776b584cf356c61b4c46433e2";
+      sha512 = "d93690c9abc4808b2ede8afa2ef6b6f537ab368261ed81fc9e45f0632ff3d53974faf7f2a5202ca2d2da14a1b7b610f865e18cebee9cc609a36a3789e4cb70e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ja/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ja/firefox-62.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "1679481dd3bab13693a54d2e0b31e85c5d1ba374e3f13434986bfac6e2606d761245ce6d7945a75f4547775e7b72743038699102edb938f296e5a35d6ededef8";
+      sha512 = "5b3ff686d066d93c1db1a727bccece4033f69d5c1c322e0fffb94b9df182977a40addbad1bd75cf5865117caf1f4b77e1ad3c5ff7b5880811dc2842052e00dfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ka/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ka/firefox-62.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "607f3cc38807df3293c8ab288d143724206ef7d2a84e6ab34b2099637ab6e53f295996c552edda9d8f8f12aa5101b3d1cdd4269b3afb792c27a136ea2ba87c4a";
+      sha512 = "9700df084080f237ad4fba49efc9309083edb735d924842243ebe6958d048596f9d09724e69f33ba2706af9ade3fec699d8862c19fa74c8021d2ab36e55c1559";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kab/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kab/firefox-62.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "1edd189564cd7e760753c3f335b406a341233135711884c45244055c861480d3b4d654e697a5f0158bb16c3ad05934dff5c18ab0543c7d1e4e2234ee81351bf0";
+      sha512 = "bd1f0a14933ccb350bded8d268b4077fa627ea5fb9421d911a9088e5e69a66802d4904203258b7ea1f738bdc6836c8b6bbcffdc3896278aaab5011facbcdefa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kk/firefox-62.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "37cb725edf3cb07927ddd4f9ffc9c510bf30d8a02acd1f7c2bab838b9b344d57e003fc87cf61da340a98a13a8386a6e36f92896bcee5774c9629f1b851e06a68";
+      sha512 = "469891b6d7236ba10890dcf63e5b1a5e67a70c7974a176d059568aac47b2bbafcd7592f84ff525e644bfcfeca78474ac0677d35e0126ec3d065ebd4f2d279e48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/km/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/km/firefox-62.0b8.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "3e5e5ea32e9bbbc912e9047492a4df1e928e56060218d6338b4f3f8a173aba13767b9653e66bffbeaf0932b0640e4853e12ca870724b24d31554e6814fdddbbc";
+      sha512 = "4ca404c9a92b0c9de1a8314c4ef0b6072021761efc42055ef7c6ff3696fa23edeb04a0aaf982e9908c81c4ca54508e37052dff3a4599ed9b8955163a43a8eb82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kn/firefox-62.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "d49132da3584d83bbb8b8620871e8b8016b7379b45c9b3a88992c6ab7c888ddd648eeeece8168bcd808af9a1adeb227689b109c27bc221bbe51c10a8bd7ae483";
+      sha512 = "2869abf3173e3fc1e2b4cd7effb65953ba08ffc0c8a485e1892a71e351902f303617520d4434d9181606c1dd3a86321eed2039a21d610923a3817f0541d78eb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ko/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ko/firefox-62.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4ba372f0ff299eb86f0fae4eab623ece74525516c256fdfbf2579bfea8365d5b85beb0d544af6dfb492eeee5f5c3fa3bb779d2221aa197e0108f4a46096111fe";
+      sha512 = "0edf7c720ae7ea1f932ee91f5f3f24a0c71b640d3e85bd1a896423623a64501dc6066a155c430b88acd02edca882aa660f213fbef7b2040a02b91316e4b099d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lij/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lij/firefox-62.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "3f2508dacd506a4e2368bec9253c0efc88e4e97c37bcf4e923e1acd0014431bd79a0a223d157f9eeebfbdf1262351b1fcfd20ad0a5be6a22ebeccad68cdaa6c8";
+      sha512 = "0a6aa980cdd8eb371f9909b57f9d1b4958983ae9ba471e7396054f3e22665565ed4f24a0920411cba48237ca283069a4de6b706cdac20d9fb53208d145932a33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lt/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lt/firefox-62.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "6e147ded183d2de13419d077ac7e74941881e5c17bf9f5e3e9f2805352d6b0c33628ce493a3e6bc8705a57631da13f33c45486280a62caba471ac6c558c03ae5";
+      sha512 = "57b9fd1bf501ce887a31de05d82e39245b803d017f0a2707bcbe467e4885b7b95dba60ce3c38233f718b84190d8c77598c1f9f5bcea548e4741d55cbda056435";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lv/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lv/firefox-62.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "9357d029b1a7b189917d5d2587a7da8ac05801b530c5e9b9bd46353a9b980da782a406b47d6ef4528f3865a8ad05fa5442ecec92696b5f96494d09bf6f35d02a";
+      sha512 = "d98284b722936b8f60cce73632bb79c6cdd8d04e29f4bdbc1ef8020c477158c3da9e8b02fa48e3bda5104671082349e9c436d2860425c7ddfe36393590eb13d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mai/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mai/firefox-62.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0264751831b7caf8f5d56255af54b446574819f2bac3d0252d5cea29b8fd7b060da60e513c16f9dbf486114b02ca244901270ed40c2741b9ec9e403fd547e031";
+      sha512 = "ed95750250e19614a62f6c1c2ce66e87981d964218ae2fbcf429081e2dd4a88a59b28bbea36b21305bcb9d53f7e8c7542ce26c669abf0567664eeb85264c0139";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mk/firefox-62.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "16445afe986de8dd4b894bf07ff0dd8a99fef38c768479d8a83a4f091c616e7439db5b1dba41c878fb8492100630026c0a453ca0e7cf26c066e2a076715a87ae";
+      sha512 = "b6e3f4d266c9c9c8c9da1f515c8e80b4d35a7d0e39a0891398656f9f714a67c974c2f6f120c76c2cd322902db03a4673baeb84b82f43116bf357da1ceba33729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ml/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ml/firefox-62.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "db77a52531b4e706b84fccc042ee45337aecb77015578b4504a3e9898157d775c3a8d5b0538a12281627a040cbe049e7e8f48b138acb9c34291a532d2e320726";
+      sha512 = "3961315032c0ac95a2d0c995be494c24aedff7dbfc65b33f92d19e2123f77f7851e36970d0e023e299d64e1ecd20c1e68da5af2fce87cdb9fdb75e322d5568ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mr/firefox-62.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "46192be8b4b3f0885c8c587f919def8418fd2711a9f35fac16d1240fd8e3c7a89c4349ca4a625986999a5d3525c7cb35965d703cceb8d027d4f3188276aac123";
+      sha512 = "a09405c21427153710ad3ae2e83b04381c101dce14c3b99d7ef17a8bdb4fe7dcb7f7f59d916a9520ba96652dacfe9bfbd374b3c569e420e1a5b43c763e002491";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ms/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ms/firefox-62.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "7306b0517f8dfafb55221adc4fb02840c33db98a54856ea768bd0a0795a9fd7a761dde7fdeef9da3b9b32f04a4a948e897084847ab91c2ea282acfb6ee24d85d";
+      sha512 = "bb95adf7cae84a4e5c37d33fd25efae472035d816c37cb4d6e2d94b99c260045fca9ebf68d71bd9fa096caa2a0f9c13d828eafef3a1b9ba7c2cd81e9cd6e6bd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/my/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/my/firefox-62.0b8.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "774950b82abd0360a0acf997ca2a86afa0a08216f2bafd759ba26a603bf02e524ad2f54fb99d9ee869fe5ca474e8aaf59afa31d1b9d048a1cf277a4e0696903d";
+      sha512 = "948fbb58ef850dc1c2f0c3b4a55c7077000c3697ddc63b524ad5890715a72c4d1bdbc6e48f901128a43251141aaa61a4b93bb655385185d3ceecec0114c55f91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nb-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nb-NO/firefox-62.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bba3378115ec3aec5539094820959226ddad5f2ace20d6de8f73920317eba594771762cd552b0bffe5371c7050f9bf3af88c1ff57d67887e55cec017521a823d";
+      sha512 = "472348038fa02afc5deda78a17d5b1d43a7b572925daf76720c9a18eccdc285ed4c7a46589f71764a338b0367b3d64f5ab18a57eef54dbafc2dd10e69cb60515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ne-NP/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ne-NP/firefox-62.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "7d2218a5dd3a75d652d73fa50d349c40e1cc89d02ea7e1918b8f3b732ac078b2f9187527b2345576de7733009ed1a74bc68df4cc9727bf92a65b6f88e25418c8";
+      sha512 = "783a40742f33d6546bb6f0fa832531faa0681fefb5c0a60c151fb5b52ca6201e94995948743442cf7fcba475bbf901330d842f4e40f948fa9afbc1f4da0efb33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nl/firefox-62.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "c574b2086b28c060e9cafcb560d4914106bad3571b1c58848b0e99436fc188af5a4a3cf82649636e305e8a2bd32e67827e48a7960eb561cac266973e6c249c33";
+      sha512 = "4a6c15e0467baa49f7d71812749a77b0c0d40727db1a24ed06ee25bd21f0abc904d1c2a101c1d1e2002c181e6eb17fcf42e5bdb4d592a41a10b4a49552f49061";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nn-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nn-NO/firefox-62.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "abaa85ff573cffd459db073d3fc1a66e41cb0901698c00b8c33d7db2a25e4fd7764989ad7e6a97afc976d606713e0807730c4ec9b13076b7546a5661aabd1cb1";
+      sha512 = "a0c4ca38a35688947de35578f101676c174e441f5788c2c1b0538b818daba01c7a79bbe19b953d8b503e540edc6bc3a435ca0afa75fdfd6c8dc15b6e728854de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/oc/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/oc/firefox-62.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "c8b309a79531a6a53f06ccf96aedb1667004d242d56be5f252e802f5a9689ad7a72aa6dc2c9e2a2641c10ee102bff930a939d41d2586b55d04db2805a39ebfff";
+      sha512 = "48bb5fa2aac87aabe50534a519e2d65c5aa0fd38e9b8f2d3193df1a94d38d02faaf40e2ae21105fa30b5b2e980d44276c274d0b60dd8a06142d3652a321d2ee1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/or/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/or/firefox-62.0b8.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "d00ad155453c562f5d04b99db7810160535ad36e0066c76c17a2c37889369a5e699f1addf045bc7472d7f2a98f22443ac7fbfea785da52619c41162025587fd3";
+      sha512 = "50a7f6338277f08ae3aec1642c4db5a55118f0058f8ced336fcd934d111439083982cd72885420273f398cbcfa82f5e3190f0d8d91571cef5b3053959df021d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pa-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pa-IN/firefox-62.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "582714b7c9db90f364ab390d4bd383b5f111628e2aae7d08083f4b01eda1edd3b566dd985500e3e72e49d56333c2c98648f6835ef06e2c12a4189dbaa86b2a6d";
+      sha512 = "aa7b1e86d620b695954d4901f2bf95316dced89f5d7f42de13d45a81cdb198b2098508978798e561c0d3d3c347d66b7784136af0cb0a10e55426cccdc162b35f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pl/firefox-62.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f07a2e782fbaf2d43404d890a84820bac13d4f06daca634fbc203674560c94917a2e189a193c9c4ada26b5380bc2ba7eab05ddda34e98e9cfe8b4912a2c11d7f";
+      sha512 = "1f7f603c1fdbca385ac164c3cec42bb628aaf83a7d67edc0ceaf07c3d172912d43d47490e826dc37bf0e3b0cce5d80d193b4046eabb1019e233487f4bcad21b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pt-BR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pt-BR/firefox-62.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "1e54be6780c0a1cacd364b91d4a1857eacd2646b668fed30487707b8a7eea5d7b14bfc1a137fcce60f27847da411b5187155e16b9ea15ed4dec8c38f5ad707d9";
+      sha512 = "26d0e2419a179f9feffdf6e08c55c5b0f1b39167be40db54fae171ca438f781f5c353016747c20b39188033e2aef5c556a505f8a296f62bdf69574aa11c80b9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pt-PT/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pt-PT/firefox-62.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "3bf222a72788c1ffd67ffc102203f2b55796391adf61bee3e586ee1cdca773206017f2927c7e3898ff548eb7c6372027e8c14ba5819e1dc084103a317eb4697e";
+      sha512 = "a070992b30b159ffbbabb98d9b97afa55db237d806a7619dbcd65dbcda2db202fe3be0b43a0408e0c3b34dda3343decd69d9a3cb1b24f89ff60c422826e96438";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/rm/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/rm/firefox-62.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "7eb639523200984fc229d0578e3bd322c5a517aaa6ccb314a85dd490c00c0793d2f9b3e8ff8e02a328425160f5c1a67325906fb27ee4ba159cf08f87a5976d11";
+      sha512 = "0728f7379104d89fb25c3a983366deff16cdd32f5f38e4396ca58e3be2c8d987bc0de95c24c123bfb2802fa5b4308bc10702cd0917294c1a6b7c2b6acf666d5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ro/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ro/firefox-62.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7488f5dff4381076f07e50fac78eb7355ea46ddbb9a7da33212d140d57fdf33079c91e2c218e22db78c7e230db5bd51014a930b052be603840bf2d2fad026077";
+      sha512 = "d3cd1b3bdc282c7061db9f17b6e0ae22ed61968dc0e59df0ed2f408dfed7b348dcb0f770f61a6e95839ba99d7d3e133d3c3cbb88dfdd40d84e3d92b5f5231a3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ru/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ru/firefox-62.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0538f5ae025020d57bf9a8102892ecd27f493839badeefc3f27de5dac01bd96255aaa7aa9b677a60ed7d9cee86f6913c41a8338ee61473b718a9b2724419ad74";
+      sha512 = "f06c3202aae74ce01665616ba13eabdf364872f107611829e7d774e55df00519e8a2ad1aff3cb61d5acc10640844fb036a5e4aa8ab74388b649cc03f2cfea3e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/si/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/si/firefox-62.0b8.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "601daed45b7a07d3a71a7dc94acc40911041145e920fda15061c98c155e6282b2070dd023887e7d2fecc813dfb83368459ae5d0593b36ea9c31d42f31abae777";
+      sha512 = "0335f6e6cbdba13dd59cd04252de746e44a3e0200962d3d406ac5047850b0d2ef784bbcf5da6f1ed4f52b1dd82a4061329b49f368c9567301166270f7f5d61d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sk/firefox-62.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "78a1167cee2e6e2104ebb1b40aa34f71964984c332f06d061c21213627d8205a33069a7bb4574b3e763c4086ef072c0dee5e02e41ea1284131ccd9688e688dcc";
+      sha512 = "81f35be8df524689bbfd076509f40cac4cc8a2fad56726698f72d1aa41492daee190863d6e23fa9f94aafb9474c04069e90f331dbc40eb518428f8873edd8bce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sl/firefox-62.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "01d9c2c21bb9bb343dbcf914266845400345683cd81f71fe0bbf523a626b08a493b6851bffab94ceaca0fdd432d5c386c3de1396f0fc48b460103878f1dd4781";
+      sha512 = "15a1d6a3efb209c9413a604d8ba7df8a7084e0908ee7cda4ba41fc8e4ee516af6e12ec3e0543796fbe99fa329650e3538d3ab261faa36c645a942104c57ebef0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/son/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/son/firefox-62.0b8.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "41ceaf62ea512e6c18a4ec01c51d5c5377ca947821c82cb414913f52bdf742ad26e9de86dd67bebc9cb4fc921c4c5e1d2f57664028eb7d143f5ed770718a5c7f";
+      sha512 = "278716fece719a9c8114ab7b328b0ed03cb698a2bd5cf437529353cd4c5f911fdd12598e093c81c2b59c25fdbf5ad1f2d36cf0ee04bb640343976337090a11fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sq/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sq/firefox-62.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a5fe9343e1aaf6818cfae7e5953ee2dcfacc15c33aaacab445eb345f1f340dc0d090d0e2f42f74daf6c6bf4f7efd50c8e4ac9fc2a52e33b84369d3a7b46341ba";
+      sha512 = "bda588ac74b9f6809fbfabd260de4a4dbdbb3e6f5e9c4c08a24a5432c530822b4804fe0dcc5b813e44911b61619e9a924c2c738d72685707c271a92552be2dbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sr/firefox-62.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "16180694b75382f00c1853984e78d6a423b5b9859e827606f3d603ce13fcfe578ed3b5ce7656937625b9459996ee996d704eafdb9e880d8d2274e2154253375c";
+      sha512 = "1b63cc64d6ea72677f6e574a9ef4ad90c231edcad73d1050409f6df6b1702aac2af0b9326b9577c38f58ac9dc5ce234d6ef547f5a50815772bc6753f0e1b72c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sv-SE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sv-SE/firefox-62.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "9d71193c78ff1f06c2d12b0e8fc299d5e0316b1425861e6faf7f9e46303d72280358e9f2a4cebe931ea7bfde54e36147872c1e319fc95dfa964bfd6abd235d55";
+      sha512 = "1b600fdf772e0cbff440778321b8c380939ecda502f1c5653c97c772794815236cd2a0906de4c34bc26f6154ac9dcfd8c4a90e3166121be6e288e73c26b0f1e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ta/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ta/firefox-62.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "21f00f0631fa5e3ad7e4a9e33596beb1bba7df4cf3d7cf1fcbd3c9f457039fb038f3c77595f8b925268192f3215a83dd7d233d782e2ed883ee053d932f5304cf";
+      sha512 = "e606f4dbe7fe659e9011676fe1245aa8d6b1b6f814f22c1c2b71c9e6ededd4492516535e8ecb31787b4c8708cadb2d4e5d2cf09d78b4c576a01baba74b62313a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/te/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/te/firefox-62.0b8.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "34489cc573800d78fbf1e98645275a2245d4a764abf3431ab79f182dbd30bccb383ce860dbcda2f215df47358307be2899a00d30a6dde2055311be3830e9a6eb";
+      sha512 = "78fefa776126ca7cb60f11dbffad735569bd6b76debe68208ec1386ecdeee7d49dc58482ff73c06835834270adbb8316b725ca16b3f2da8d1c790b3649b1e51f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/th/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/th/firefox-62.0b8.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "f9593af4f06279ddbeaf465669a9a5235f5521f7c020c8cbe36f6d069cb7f64461e2e0c1b6100c23f8cd4d02f81f56053df6cc004aa5f4b0b54fbfff4dfadc11";
+      sha512 = "e2ac47ba49e9567755351c47d945ea7b2c0da3c06cda05ab3c8c5e8932fd1e2a36b6251ce0e9acc31b3555bff8ea5143e3e8811e0ee5fe03a926b7d121384afb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/tr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/tr/firefox-62.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "18248ee9591aefd1049f7c12274940c913a5780daff7c9a5c3f39966cad584a31a877dc4ccbb491ad15c555561e3d35482afffbab921c093d165d33715a507ad";
+      sha512 = "9d8f9fe40bf3e30caa3b4383954de68d279769faa57e54f0db2f40b102410a5ca3b4edc07caa3ef1b07cd0a3146d74133a87e89cddb6608c0e394ebc840a29dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/uk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/uk/firefox-62.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7a3d3a3b3514b1cb4870131e875547574bd93803ea8dc5caad970ec8bbbedd408d65efdb4049c728ddaa6445b59e7925dd29fab1783f47e7160af128c7f7f045";
+      sha512 = "707c17313359e6a50263e73d3f66a551010333c3c1b7e01ffdb42eca47bbd8f9252f167f0298dc6c2d82abf8ff9cc0898aa87c644ee157869a5aaea29708a185";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ur/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ur/firefox-62.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "a0ca2dda0e0ee5696760156a18863acf9742ba914e76feb08a52b3d56b03d3cef93273e4c05b21a7888effb03d4a2acedd278caf0e7bf19117dd2fcca848ee42";
+      sha512 = "258f10e7034221e7160a3d57e63572a178c6f01ad1d8cc5f7a1c6a7166f779fe423d13095d12f2aab87e99021d16f2fd961a58acd1d0398b6f9e61ff5b9bc168";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/uz/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/uz/firefox-62.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "25ccd88703d814115cb5e19a511b3b93d18d1b122fb3323c262de2f807b93b7ffca31fea484859c400966b5b028414aa0675d6fe12bee27b3dbf29ca62db4ac0";
+      sha512 = "39043e62b42d559a5bc799cdeba2b7b7e7b5aadfd523d076c3b208218b4a385c831fb27edb6aa6d13f6a95e9de9cad82abe59a95e14987e8b68de367c364c91a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/vi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/vi/firefox-62.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "04d6c29f647a788b6b5345fe6caf1bb045a7d4855ebfbae67975049a84f42660bd18f2471d7a8b46afd3aa71e23226ac9bc99b0b151439961250e968cd83af4c";
+      sha512 = "06767d09bcfad7380b948789f0fcb282e13a35c86b3e8ac81228042dee7b63b5e61e5bf5e048294ac0b9daa7e2a55f09c5900701ef98bcae2c7cd32cc1c6dbda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/xh/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/xh/firefox-62.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "678d5e90d2016cf3ff4826c763cc9110a8a7685f9a0f1c4a423c0b48e0779a422be834493d8eb420453b90d3cee9b11e3d891a57f25de50ae4a13419f8a00259";
+      sha512 = "85713120830065c4e9a58dcb63acccc5fa8259456a3ec43b280eaf5060104594d0fb7dce063fdc77be572aadcbe136d85614661a6cb2a1c0f32c6e9df1cd0850";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/zh-CN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/zh-CN/firefox-62.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "df6abf9a93a6745fa96eee39dec2b7460347fdab6348a8b20fb84334d8373de95b5bc595a9159a6e9acd17f16f6aeb3eb8af30709c0c65a8949404c3360269ac";
+      sha512 = "61bef062b4ae86514ec68736ccbce16527c73fdc24cd05544edb4fd47e32e360a565a3e23bc2a7b1b4ac18718810dc9be28fa1576329aa5e0f084af9ad1062a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/zh-TW/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/zh-TW/firefox-62.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "6f5982081aada2eb35459db7de8a46eecf5d2abb45a9ccf0119f91fd05daf82ab6a2d95d601a847febcfb4de6f8c75da71f40c43140da4845fe0bc7f5cfce80c";
+      sha512 = "ffd9d1c5586ee6c228c655a47a5dda8d8c8ece0a30471044083bc59ef6b407fe8d29b9d1ae90cce856924eafe40785df2b9808418deadf06b4d0ade5a2bb2793";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ach/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ach/firefox-62.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "146e5f0560341cc585337223fe04f7a2a7e7f0c4b47ffbca58707c4d3bb52b71f82b02f0ad5ac4cce69f45d6702a4c06230ed12612a529d71714a5efbc1de553";
+      sha512 = "11fc8aff860e2d9f6c9f733fc815d8b531a874aee9c755b5ccea842b1a5e43c7038d060542503b924f7b7da2ee115f766914401a953a97490bdcce9e95b03e3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/af/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/af/firefox-62.0b8.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "132ea8da613fa047aef0d63ae5ac33256306a18fb16a3012551dc8bda4383889bc6a51be0c85ab09a3470b7a2e5c22996d04487b5b5ae2ddb474efcb18570059";
+      sha512 = "c30736a5929601a4925a457f5e112b26c9f15db5a55182f3ab402ab64ffac18dd2a6b97f13a43504f3c97b05c6ae71ec515f70b67b8ca7d1b3eb404bb5f12574";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/an/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/an/firefox-62.0b8.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "f9b8e3bfa820f5f24cef33745e51079636d6e8fc69fefbe511d20392309426281670dcf9924bd0f1bde8fac05750d80ec360257aed4078ba7f5efaad4d8acaf6";
+      sha512 = "299e30b41252737f807cfbdc00d6c92022be5c956fe7d1b2bff7c02a627b3b9f4465fcc2bdfab7703f21af2a824366878903d8eba2de3511ef739ff75c31c48b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ar/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ar/firefox-62.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "62795fdb3d07fc6f9877039068dbe18214b3c6ab3f248bafa17e4e251e093b600bb912fae5cc19e2f9b9b498941bd5ff20f44790c2f89dcc12ed8fc403f94f6f";
+      sha512 = "7145a29912cab6a8f75de7a11a5a1dc456b1f83b061bd499894c75e656a858d49c4bfa7c32256ebe895f8f294bdc3ea227b7a6fbe33d594034a4d42834aeaa7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/as/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/as/firefox-62.0b8.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "c07cf4012c35379cab339b88cf8d70c5bee7403b7de782ced36999829701477b18c4398986e4c88ec138322b0f6fcba17853cd6cb9627fa597329ec3362df4f1";
+      sha512 = "ab55e7fc54dd024561d7d6fd4bb3a514ec95b5dc2475999406c809923a2447ae0dbcbd77fc07757a79b81e84417cfa53fb6d3073abe5e9752889c6abdebd4f41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ast/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ast/firefox-62.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "510ffd64355160f52ac60251b5a3f580fd688910fe0eaa7d54f6f1850b1597dbe3f4a9a8db2a2a236b7244b084c37a7ac612427bd28375eecd2d899f81ec9465";
+      sha512 = "73751e61014762150208f5d6d1cab78b6728dccadfa86e08f5a6fb135e55400fc8d0cdbae7213b00ed4875f808e6d1dfec3b271fd7110c7bcd6907d35b40b69c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/az/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/az/firefox-62.0b8.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "f0b3dc7ebd3cb6cb44816c8af620d8cd4d7fdd317557e960c72c08722a2a97f6c9cc17d322e85239f7262aa8dd57e9281ac42a679ecd97d1ed6a6685135e93bc";
+      sha512 = "15cdf76c30c2009fed8c821c127a02a48479b5104744ccc10d684aba31fb540fa8ea034c03eb1c78aa0f4ad7c64d82682d3e113fe8ad1a98be8c78890d8a9553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/be/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/be/firefox-62.0b8.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "3aeb733096ec39823015271b731be2b51da548d633c82d7040e9be887acd774310cf44ce392cd5ecf0526bb483cad5010ea00ac355c17755fea5ad8a99ebbaa8";
+      sha512 = "3c499063b5ebd8886ffe6b606362a93637cece1817bf74029cbb52ff52b9cc4158f3103823840c2fc091435d2280f0543cdad43e18aae663c632b166a66134e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bg/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bg/firefox-62.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "9990329df9385651e42a32276573e9b5666481fe9619946f469455f0beb972e8308ab789ba3063f42475f21774e8e7f2353df5e0c49a6b11789397fb937e5cf6";
+      sha512 = "86cdd766893f861996615be611eb46e5548d3eec849ea49fbeeb19969213dba5b941160b9359aa68ab99bb9d11e3c2a775e2ce57e0a737fb936f5dd8d51095aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bn-BD/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bn-BD/firefox-62.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "31860be3d06c3f78126d037324dfa0cf9ac648f34847a4016e255c4ecd3743ee3fd2b8c48c6bc532adc16a5cbe337350923769aa1ee3facc5c64c87add39d24b";
+      sha512 = "514f490eda4ef7e48fbcfcceb66c12b05b1ae42b2d902d952be03b36042b8219e9f6d652b8b59caa574829fd0a78ec98facd5170ce07c7dd93cda60d940c3dcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bn-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bn-IN/firefox-62.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "eb182fa279ffe2365676835029c47f7f89b38964f74942aa597b99b02b02fd42fb25b55ac9325c997e7faab1a912dc99405cb8acdb6c6ceb7aad13dd518976a5";
+      sha512 = "a70bc94560f08257d5d5f8eeca705a2c9bf1e2185ab8a60c52464a2e02dcc49e4661ad9c8ffd92b6cae4482bdbd1a764220cf718b67d4763ec6a8b23259e72fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/br/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/br/firefox-62.0b8.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9cee54cbc563039273ee81c09b322e83e014b3d2d66d0f05854d09dc6b9651410fc7e5259d8bcabd6d24fd4afd95cb2b5f7aa549f8a96914afe7552102317f8c";
+      sha512 = "a102200f33fc71ff3a26fc0b9bb9d02d63c677d0d9ad25dd9aec5da26e654c8853cd892393bd9b8e8ec777241e946f9a74cfd7b17d8795c38224ebf8421cfabd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bs/firefox-62.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "edabcbc201ac663c8c596b7bf1fbb128da042b3b3eabeb0cddc80ac1364c570eeb596d13e6e2fda6fbc2f06f068768a3391826be9bdbc74d66335287d9705e37";
+      sha512 = "f026cfaf289d7341f70f2f17a8ecc8b2cacf7a2e71004c29419cc7b7478bece21c77fa83a6a6fddc357617b1f01759ceebd60133e0581f5bdf9adb4e76cd54d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ca/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ca/firefox-62.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "dd38e337c6d0efd503c7f117c22a2542f4f77b8e27b4bd58f40ddc7f90950db5d5c90c40afc6ea78e1c55c1d5e21f585b49016640f5cbf60ff73f74bedef00f2";
+      sha512 = "2a03327b2019276ac598edc2b9bc9b7d88a8b9d3bdec29b986260420fe9b0081d11e1f4b93132edb17b537870de91dcb78cfb338e1446df97932b6764f4d432b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cak/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cak/firefox-62.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c4535437b19571f1143ae2e242a9068993553a282ee9e87658b467491dfa1b1919a705dfbfbcd3bb1392c8795e43fcfc9598bd4bc91211f81b0a75a650153ebc";
+      sha512 = "f7ce71395347756e2b19eb3596d45d34d05c4ee8df30b69455e8ac5d5b1a4b16efd8bf8c6ce573f98bf46079671e3ec9aadd252015f279f6d9449aaab396db72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cs/firefox-62.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "657c545ac09551db5363ec085f08af96637df8dd9e2cda81276ee02b9d3cd03ca52a4e2d3f1fc30b60717caeb39b6ace71f8f799d9de9f3a1c793bd37be13b9a";
+      sha512 = "5c86128042b6da5cbb54f374c2d76833ae1eb99cea48140f3c1aaf86c0333ee51f4cd9b33d1fd37815dbf1cf1ee779bad3bde13dac0c16db99a90df67258e481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cy/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cy/firefox-62.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "e5c70b0b61721f0d166556fa3693cbdcd8a174a1e795412637a6d03107d51240fd1095425145958c9c3ef3ccd3bea0a228e1fe12525dc05763d632075248e1d2";
+      sha512 = "15b54a0d8114477239234833524c2a0161264b9caa6b2ff9f9b31656a2fefd3a48c3b251026b462ef6a8adbac6998076ad7e040cff592d7da23d6651473b379c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/da/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/da/firefox-62.0b8.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "73445ab7d6e44074f9995523047717dd6a6f58f4673649f1de0e370c14a49958befdf70ff52a295976966e5e7900392c1b96d6a19170907018b9defc592638eb";
+      sha512 = "647e62b45aea1a171fdae38a3010cd33c39ab1baa5553247723bbbc33d7058f4bd1189418b8f7e45147abd5f21c7556f2f101ac7d64011991ddc55df3d24a925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/de/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/de/firefox-62.0b8.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "38a13b53dc897e154cdf7c0bb06afde38e5201f832650a1c6f2d55f4ae6319b934cf1e9be33770e2e75cbe231184906d1e4a1a22fde98b9647d67e48b5f475aa";
+      sha512 = "af858031e0c29ea9ca498aa28994e2115775de73222700ca24ac728c9efb50f19211a7387419cd034b900034ab718dc76ceaa84bdcb9ab19f167f952904ae6bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/dsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/dsb/firefox-62.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "db069d18fa6ea82011f337dbe71fa653d81f7001f708a6f907327e8721caf64398ac3977aa3941920bee84d9787a037d48bb00952f785513e2346df9cb1a1991";
+      sha512 = "7b72a34a86da439c7d36defce600ceeb09110e89aa00bed3969e4ea3bff1acef8015bd045c2382061f6646b8c1bed5a929e5e746d770e79a316222ebe67b43e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/el/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/el/firefox-62.0b8.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d59cb7082b6aafae03177b3193bbaa44f76aa59ec0b230e35e800fd2705fe5a859c7f381a9a3701a6938286ae98ccf4acb4e0835722ce9d6ba020fe93a653d4e";
+      sha512 = "6654a20fcad60fe82c9c50492bd3c72bacb537fea0ccaf56adc5654cf4d7db457317a39fe5240df663b102e04c97b8457cd99461be4820e0cc97d70a2bb50263";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-CA/firefox-62.0b8.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-i686";
+      sha512 = "2cdee47248b65a82882070b02c9b51b8ff2d496a92781a9053c986ad5aca22fede9bd967a2602a0475aeb14561bae6d1446c5301e999aad163054d6ac935dded";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-GB/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-GB/firefox-62.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "390b1a511a6e4563af75a9e9b419d3052cf1d4b27ab53c61860572b2d72991771cfbe4e645464a7e1ad252a3808e3a64abf87fb05ec2525e279b5d70b240ac0c";
+      sha512 = "0b0fb41768b0a317608a23e200528c9ec5855423960c6e79d75c37bf0edecd1b5145c0d7d499645ed6faf0b927738eb33a25bbcc10e9302826a3ee79b39daf2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-US/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-US/firefox-62.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "35e9712e45d749f3a3855dfcc0e20812b775911ab7ef3fb4a908c3fc824faaedea08160ec9bd3f0367b2d0a95f18f885feb66775d9769905fc2b272ef0577c3f";
+      sha512 = "a824ef6e7f3ef1da11b158e94b6c2308ce199f1db4a1ad8598a5376824edd785280775cd26c31be3eb2d7be870f54180186ae8c2fd1fbc2a2d2b196e3e2e564b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-ZA/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-ZA/firefox-62.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "6a53911b6de1f07047e5ff60fde03d12895292c4e50712f8da4a2d044ce7b265e1a8ae5be096a987fc0d7e055c9a55876d446308c461355a6024783a82672203";
+      sha512 = "86af05dab09f2fe192658e7676a035deedc2104118aae427a0f6baf29c3cd04c56940090c9918860742cd63d9efba280bb8757403d6bf22f35b8d977e0b53199";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/eo/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/eo/firefox-62.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "893df2a1b1e0a3494222e940dbbec52754944a6e0239a69515204d15190b3f9c53f187976b21672165dac42f5d2253db506608f949f04101651e33bff0f37d02";
+      sha512 = "1be7f111093d519bd06a97ef31c96b44f4ae0beba32cc06c9bf636540a48d27191cbab1d8849bf11556328f9a4127715e28136220f5029013e423c1e469c0b37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-AR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-AR/firefox-62.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7f727d9572804a21796d583564c3d4cdbecbc480a92ee5ae2c57174a9fbce9e3f867bce52cef9bb346c2dbd312fc710f691fc5b005ca1f272bccd7c6f0680418";
+      sha512 = "47ed1061146f7d07b132b805066e8c02ba3cd91b2d278cf2574a9d1ca61a9454ab7dcb2b05c231437fe0da34a5efb5f8e013d27a7351383d093cace38b197bfa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-CL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-CL/firefox-62.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "6f9442c705d469233294a18e567d4c60a291345b9d2fb1086ba898a869c1d1de501f773ec66e32cc07787df7111e7f5ee3e38c11d212faa6a0d6098894718a4f";
+      sha512 = "1f020cbfadaa52326b677d72cd83d77e783b0de10a78a845ee8ae3c65b88962a416cf0396a483885db64b6574ebf77130a3ca538dccceaa94ee0c6cf23f79f56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-ES/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-ES/firefox-62.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e60abf563a66d68007eabafa6113a8ab38f558e61630b0eff3f5896cdaafaa6411db49525e6a4a7930030bc3b94253b13a65fbf87d6812982b380ba88f74edea";
+      sha512 = "9fb64b729c84ce7fe66cd7949edea48d83c34214ea78028057302fe2aaf0dfdb736b7329168a30fdfa8885aae08d07d51b00e9355b450b8fdf0fb670e778f54e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-MX/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-MX/firefox-62.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "18e09cd4ce53933e405d653f6b6dc731f0367fc9fa772c9a2338b71c02984499c9c529e5450976170e0249d5e10d861f561718b4762a6e730dfb159ebe664c88";
+      sha512 = "74fe673825524dcd6c0f86ec5af895b8b4053cd3be413d4ac6cc5dc6a04975e47f0fad300f7df128aea082bb5348de400322af554eaf007be6340ee2000775d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/et/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/et/firefox-62.0b8.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "17999b5c83170958b49b818cedf360581a0198897acf7a439d7cb8c4cef8a69d67f5185a976690afd319b3a18f86aa437e1031c6529268d236174630fce50d58";
+      sha512 = "c2b695c0d50ffcd0a796799a230e18c221d26c078f268fceb2439cb02006d6e41f537591d81726f3f26205bf4e6018b70635b701584849c015a59cb62e84210f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/eu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/eu/firefox-62.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "5d1508e82062c4680fb3deea990417aec7250ed2d005132fb0c8159c938e7098cc72d06d2425bed797969138d53a9bd39f2446a914e3320a8770951e0397b5bf";
+      sha512 = "f997f0437792320039dfc99298bdbac3156a085a1e2393ab2766a8d2c761cd3e646a25348712e2a2220ffcce8191adbac0ec568a7441c66e447bdc1b1bd600ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fa/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fa/firefox-62.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "4471fa4e48ca9763f92247dc225bba545ea8f6b6ae85657481906624350dcbe61e78e04fd24814d967c12680cc70f4cfaa0c50c6e9335ea914ebd30f41e298c7";
+      sha512 = "a876169ec8f6f88bcb156652206b88dcb46c85b1cbbfdfd363d13f7e6a315ca4cbac598b3834833f5507bcbff2eb6851781900a24e6bf56597812e29b546dfc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ff/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ff/firefox-62.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "ef0d11d3c7f212871a387b800567e53f717c59cc7186ced1ed92c12d9fb0f9c15e0e1922e21d2a57fbebaff901c0f4018ea5907a0344c52e504bdb9ac8454b32";
+      sha512 = "6a7dbf71ef0ecb1fce9a680f404e56814004e0e83fef5ed02ad3f7570cdc63ca3ef39a30543ba5bd915ef078c0704629034fa46dd4a853937ee5bf3e096dc205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fi/firefox-62.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "c606a916853f95e9a8a90b341533725a9c3a8fef5cf52deb4d99163309a90650552df6db79186396233f19133c0955f818b11f65a75cab395be7ea1476dd326d";
+      sha512 = "4974af183667222f0868500979447742e520f5a52feb1c688c321553b4622855b18c622b7010868db9e30f62de7efbdf0164eaad032ed000e6502c4fa7e4edda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fr/firefox-62.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "e3ad9f587d99ed1e5b258b02b990c43e2c760376eac9f94ae42c8fddcb079d0f4a946b5873ed0b82ff6a35009f11fccea8d157af496ba1ec565f5d64b2cfbb3f";
+      sha512 = "7e82b2a8f43459e3a11501a81b205503e2cd98ef003079bfd869c81f6c4156666bde1b8d566f2988bd7407da566573b2046e08f7595c8e52907be915aa379e28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fy-NL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fy-NL/firefox-62.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "d7b93ec05788b7c324dfbfc0d55411368d46ce1bae8bdc245c920ab26356643259672ba473ea8f9cb63db141a0cb76acd8bfbb0f9c0fcc4ff197795705f4e47e";
+      sha512 = "48a82ef0e49669f9f3a0bf41edcdfc126ce0ddf805caa10942366b9c0a26e016a938157de7bff898c852b7a263aa9e4f5c8e916de33cd276914244582165ef91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ga-IE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ga-IE/firefox-62.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "9928b0e7c03060bb93d4edadc9228ede47f5e43caed8f0d23be729740b4aba168be59e3365f9619696d4a8e421a663b0946701746ffd3c4fd5bcec1473d2b092";
+      sha512 = "3ea47df66ef87ff581a187d7b6b1f3fbc917e6acc7a9bb2a66433477c92da15b92117214f8c6e9cb401e1a7f3b7ee7251229f13e2a3030445bcffd3c8b18159f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gd/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gd/firefox-62.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a883d411bfd612b5de69d7e1b535d992c0641eb1cabdc28a80f8a38469f55de36aafbb3547da757b4f6fdac96dd2934aa10c8c61362fb9a837e49049062c2afc";
+      sha512 = "43a0133a655ba59b72ef5d8fe3e3fb9f38de541c3b9f91a1ca259292f53839d95d4990b09411289b9d7ba718b02e0c58fd5de33db2f0e6a7c7cd39aa8b263a6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gl/firefox-62.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "6e01cc01459c1d78df561eefe0bcda490960a8724f4fd4670e19b84c3ff16c41b5367205f883e51a0af8c03b957b65f55696bd7eb851f015f57aa5e950b36799";
+      sha512 = "08c1e4375806aac5ad26704db8d76f89a380c53a1d0218b6f5a17a4a538293360d3e600c20f6be219f39049d9c049cbbd2294e3bce71d42efd0269697d1b049c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gn/firefox-62.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "62dd993eb1a643fcad48aaa5e2b9ac291137c6e26ee40065333ca31bee94e51f0f6fb31b55dc1901fe3983f87b69b617b0577b7555e20663147ac17a94fd423e";
+      sha512 = "773e8b3876f6256f4c3404a019b9c2b852143ca5b55d13afe61e6f915d8aaad45c665f8fe683bddff9ba6680483a8eb79662f7f9261ee162d8fd291d725fdab6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gu-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gu-IN/firefox-62.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "6dbd6d474aef6d10b6b47d1c3f606ddfee10488dbf9ef6d353002157bc31158564d5603699c1c8e8abe6af83717c098776fa90430cb849461aeaed8b832252bb";
+      sha512 = "95a4c05781e6813be233ab7a6dc91ce90751ea07d6b7f565d2b1580e4d18000341822a3dcb1fb4fa2656badd3f1c24dba4af094b25251d7050204c63ff87e74e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/he/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/he/firefox-62.0b8.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "06d27186e2b0970ab8599d283c7a5332de87af021584137b4ceef3ceff35e0177f0068d4de2190e0e633be44674291a021087f5c1bd344162555cc50999eac2d";
+      sha512 = "cc60d8d8bc145a719f81d8d09cf8959a0f86275074583c2c0bc742df020d0c43e28e4e5476d49309584795a2273006b37a04b82c1615a0f203b32ddefdca21d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hi-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hi-IN/firefox-62.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "24b56f6eddda98e6bf33bad4a2ce615191076d3094c84611b5a244c488397a8afce689fe2a5089eb8fa93f4ba3cc894164bf1500f5b0b864fbbcd843a338ec03";
+      sha512 = "9645d08f6fba1fd60ed32e20c4adbb509b068edde2ee827814e979e0c0d5b06c92b2fa102a41b2da7d386772f0fee43804faee24a2bc4e29452b814d6ebd3066";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hr/firefox-62.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "bf5b2dddf62818357e4729c8b51cf87b03d8c2ed74456a9666b85d4837d88db73ca83684e6348a53f03ec9086572526888c84204e661b4aeb022a31e4962c8d6";
+      sha512 = "292103b10479f6d2f570d8ebf10df1b98668f8a3b416b4385035839bd750bcb254b40055df57fdebbd22387744cd9e5cbf1ac484d4f507d5fdaed346d300fcd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hsb/firefox-62.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c55d7ac11802db6cb85cab3a62c850ba2e868d6f46760bdcb1dc530313b0355113cac404619f3ea7347d26efe3754dd8ae74f83fbfac5b27655164beca0bb56e";
+      sha512 = "70f9d2062220edb81c28f4d9a75435eccc82b9c771384fe8ef9f3b4f7e1a13d78a5e311a9f6ab165e03b8092d151c9a43ed43c19e00a1f62b43727008ebcf725";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hu/firefox-62.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "75b66ec8b5827e39d0fd1e72e01321b640e356855fd1b70d3ff8a0d8fe7abbc44a381db9fad8a44c97840fa39f200cd53d55a02e84f6137c65e4217ca0b951ea";
+      sha512 = "91a1d540ee0ac0faedd9254c6336462ecd74779116f88f9954df8a06cc49236dbc343a97ca2d971d43a83b3b560e18a72c123b730aea474bd26ed4a3932da113";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hy-AM/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hy-AM/firefox-62.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "2e94363c1f25d59fbb97b2faf554b3000bd3a8aee7783cf415e7008c8754578299f7529e04a907ad94cdea80c51ee2562e114c369ef98c66beb9776c83e4e4f7";
+      sha512 = "701744a3c2244d22d5a3b13a909bd4aa8870103d9fcd1ae6f5201c9575a815968991a9caf1ce25f2cb2b5b1005ec0dd0185f519eb13793b3ddbdf0cf1bf5ab77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ia/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ia/firefox-62.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "bdd9f4ea0a4017abd387ccf8514b5ad9f73f232e252f66b4ba0387ee328f159c49e7b79c1a28c3ba4e040ff767f018f8ddbe4de20193a361c406934fcff42e5c";
+      sha512 = "05cf372b240ec992afbf0671cd4885ac36ccc37b10f68c9e49c75b5fdaa9de72ccbdf9d33cd8c37db34e971ebbca2a4516dc9e5bea3985edd89e1a07eae006a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/id/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/id/firefox-62.0b8.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e29865d8115bcf89f34af721e0c12365e1fcb622a9abe56f1e6f04edd4456b400ddccced69bf45912c5be24da63058c73c981e1f34bceac9b4d436ef3306fa36";
+      sha512 = "d87fcc3eb4b1fcb35faf144073799386c36b923512c269fc820ad3fbb8a513f80a9ac4a1bde88f5a82f2d5bb51b69e9fb8a833b0c585f2e9ab43d803c19bab82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/is/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/is/firefox-62.0b8.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "3ff1eeade8b45f8657f87e0c7e84ee551f330461e39f377c14469e9b7ba8d744077407185e9968d021ffb4fbf1394b6c100e6d76c4ba94e1711310fad14c8d43";
+      sha512 = "fca8b0ec89124fa23d9aeb2902f6007ab671ceb916e63fdc285ec2cbcfbd10449d9f1aad10c8d8ec98bc61a4c01d96ea5875ec84ada60f43359abe1254930a1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/it/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/it/firefox-62.0b8.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b912beeb96910ee0fe101a1f1ba4ca0f6f5fa13c93d1fe14fb6bbc5bed14eaa2d9b2caeeca3a9665de8ba27de9a55b903060441f152b4a4563ccf74ced2b5aba";
+      sha512 = "7062e6b55615e365537e57d4bae648cf5ae16fc9cf675dcddba928308935ee36c71b90f5e5b13108d20cf370fd7306f33667fd3e8a670281787d958269011b1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ja/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ja/firefox-62.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "1712c01828f98110fb68925ee80a343e79bf8bc7521d44840dc5c6f57ff0a2b8625c5116d1d076882a517f00c8f09066e9385744aa6a3ec57b2f21315a3279ca";
+      sha512 = "04326831442d26752ce5ae4b853606259a7af2da1b548a4fe4fa287af06460b6231f753ff4daa8e1e57e5d4c86d1c877f4319a441870dbf02ae2f47b2d0b9f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ka/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ka/firefox-62.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "b7e3d57935289bfab5a7925210cd484d24c87374412041ee0d279691e758e6bc872666fcdf2a0ecec84e6073fd03f9e32765e0fcf4ede852a4f389d6fcd5be03";
+      sha512 = "9553f112008640c188fd524bda7566d9fcb3d3f34d8c1ec5636c783ca4aab5e899ede66b8ca2d0058e53d6da791a7ca329ff5e8dce29565528486a2043807d22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kab/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kab/firefox-62.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6cc7b0bc89590ffc749b39a070e20ffe3a8c7b611d69aa7d1b0d803bea0fa98c208387e24b640ce18f586e718a4bd3e2387070053d0cf7fe2198e920119d9b41";
+      sha512 = "cc7964535193e6dc3047b2c644050909e131b5f95db88f2b288a555314e6a4addde51aaa98789be7d4dd8207fb5cbb97a263728ba5405875ad450ac216b86e30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kk/firefox-62.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "be754f0a6bd1f7b8b81eaf59b8985fa993bd6ab507d16385b4da2541000e9a25304de87b017979d7d79a803a9bacb147026aa0c96fa3c94cc2e5f5322e1c7f69";
+      sha512 = "283f4fd6ebdcccbb4bf9a4bd7db7e8fb2a5946deb8b4e742cf29ccfa652b46fc436576eb7f7955a2edd1eb9cc788841369b0bcce491b7b1ec0c3d353d58f5267";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/km/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/km/firefox-62.0b8.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "87f25a6ba372602ac5c80143c740370df1ec020f4166786310937af019225f7ab156e6f6a1580187cff144ecc53b28d0c4596fbe5efe49befbd5c2ce0b579b93";
+      sha512 = "ee81f13e790025a12ac7c98c063f448722ee7178fccbbe4edc83788333d3eac50f9e7da95ccb2173b5708c22e96cfe3a8c297b251d2077eeec11212ba0dd9c17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kn/firefox-62.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "c5e50196d9ffa05ed6dc1d3b70407fcc3d65bd5889ce891e988a4fe131d58480460de560f89f5d19afda6f17cebcbb25ce15233381be571b2d5ed20d5d964940";
+      sha512 = "6d66df340b9d43065ed3ceb67b74a59b80cb341ee3ade9028affeaad513a14ee81de245d8dba04cf86b2323d32e797613d8c20ce338d5ee0866893d21729d997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ko/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ko/firefox-62.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "129c1b5d034514b486979b1ce8b960ab2a533c7d92127135029f207c56c9c9fe79ab44bba68a1a6decb8444e040fa2f304bd4120a9da2ca4dec6f2f084cb0224";
+      sha512 = "2b391c7e59cc051dc5c3cc2ca98dd0b9085a22a69aee57afffabe3dfb640a132a8c9a79097b58934931ab72e856300b00a9f7261e0eeab9eab483fb9d8b9bb7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lij/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lij/firefox-62.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "7633c91bd22b6034bae60513d506baf824f9240cc01a3845b6e8b52de6662074dcdeaa672846677aecbbd8027e29b4e703f7ae63be249591c4d48006b24a8960";
+      sha512 = "33bd48973ebb1299a02248dcbdf31bd070e0c8eab0d1bf43b512cafc3b4f9267bc3d687dd4d2dd0c4154415f06ec34a07e17e85d96a908b9675ad4087ce0cbf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lt/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lt/firefox-62.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "dcd4765d1df0ef95e71052b9b981c874af71a97e3f37185d33d74c49208ec2839602830043749b5e551683602c263c095012d2385209d75a6e4f04fc30d2afc4";
+      sha512 = "ed75d79135390ebfdfc698d5df6292f4d2cf4ea3b99078373fb94ba95042ddda174191fd6c9f8a092a853e54658eb001256e8a49cceef038c4367ea5ad8b06b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lv/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lv/firefox-62.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "354997be972af80700b7085f5023c46b8d8cecdec079c7415f5ec5a12bdc2ceb6aadca9a7c9041c2ef65a518cb18efdadb9f3b78692f9a17e62d35ea701e1e11";
+      sha512 = "2e82f2c0d76678deb54e984f2c46858824d23d47b854f0e5087466bca71dab61acbe2c2fd3ec6cf9788bcbf2959abb45b132763619a2ff14dfaf802a1f0e46fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mai/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mai/firefox-62.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "8b9bbb13c4bef28a7134c05f0d05476caf5d72d0112f4b8507b66e448b183fd357b7caf643c81cefd652ebcdf021432c2cc5af9e40803b20f11e3095d3ee3a4f";
+      sha512 = "189add8fa9e65ed80b8c858225eeb6e0a9583f3cdc17ad9a61aa226a49ebcd63a634b0c335703a112a898ceaf73206ac0c8c7ca43fc28487dd657491bd601e5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mk/firefox-62.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "9e098c8a2bf36c14b3802c54fe2c8e6b7db83242d2356e299f9eee67edcc006e74fc83646428c0f475b1ac93440fc4105f767a5bbf57974b8e4d19cb1d30a0dd";
+      sha512 = "6981a2ff3a06eeb70f95dbc662c91695c590650887082b77b634de09d454f3ffab44e9bc11794f2d24e6f71eb77922f4c0c8c2fc0bb529900dea78b2f8630664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ml/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ml/firefox-62.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "b6a84bdc0168d82e6ecc3cdacd9e899c0ba0b15e448b04ba70621c82e82d05cf022b762f8df2e9b54082facebee3040ce50b1074f74b5637694ee7cdd840880d";
+      sha512 = "239b650c9f4a8b12ae604211bae3ba80aa5a9de4a3d0847945f82b359feaccb1bf41a786f43411137b1b15e6f732dee62920c929724241b8d93c5d4a6fe7eb02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mr/firefox-62.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "e1901d752960078ef992dd11bcb04df1c29019bb8a947442478cceae75083c2f063341329e10dcd471720cd1fef6f5ba6410fa98f95ced45591178592b760e97";
+      sha512 = "25d012726f7e7237002d1831f50b7a954f56771954b165a11b76ae49be1f3a685889570dbe905a4a1c1243220468c20e84fb59d898b04c3ec200c70ab0c60a34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ms/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ms/firefox-62.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "3cc2cb6c9fbd5d3c5a399cdc0dd10d2198412a5cda82ac4e93e691f88e8eb6bc55fd27abc453c011502e681abbd0017f6743915906869c3ac60d5b713b45fcc3";
+      sha512 = "b4b9daa4ba7bd38dae2340f14348b325ebb4942ab0417d507a63b2c82577a12315b0208de17d5bce41a28ca352384cb1b411295f5a39d3094b7165e043498586";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/my/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/my/firefox-62.0b8.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "e267949bd286b873105e1872f077fa3b6a0d1fe4ec2a789a0a415781e847d540e021e830ee37fc70738ab54829f6c35e2f0b4d0fea1003f771fd12f19c97c04d";
+      sha512 = "3625d7417e7d13c5af1eb3e706316b209c1d09f90679de5c110dd5c7f1d400f325c12ad5c8ff0aa50ac11bd05b4998ce574880994297b27bd0168f45f74ab7ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nb-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nb-NO/firefox-62.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "8e369eb4e8085abb02dd29ec504e198e7c2167e32c60d81448b24c6204818708f1756690e2ee8e498c7aa0eebf0db5755df7884f706853e2d3306e4002425c82";
+      sha512 = "69412d0cd51ad26fb18c27e669bf07907a9d544bfd64edb3075040dd33cb3f950909ea78487d8ff4593c9cbcf818db24480fb12edf0dc483eb4da4f2b92228b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ne-NP/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ne-NP/firefox-62.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6425928fe907b60946f029d8ea67a5c4b6e0860771eb15a0f26bfe9a56ea020a5a278b513e077cb9d2c751675596c42a7ccda96aed810987a701ea9f0b505330";
+      sha512 = "5ed247fe6707d4f9f0d0bc9814b7e620b01960c291ba959ba4928b72752b97b2f7645b822a4fd5a1512d7b9a93e2c94f673569593a3c9edae342cf18343d5240";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nl/firefox-62.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "822baa292edbcc6a72dbe175f9d8cda33d03aa6389027a982f3c40bb0ccc9709be663d072d72ad046a2bef1b9f251ba85dfe422cfd6e68bf4e2990a9f8b8d205";
+      sha512 = "f2fd813cea42feea6a82df0c9501282930db6482374a3dc3cf09f4d99e59179e13646df2419428ff7c0823971cd003f1b2440a8295eb6900f43c42674e1419e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nn-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nn-NO/firefox-62.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "1f91b46a16102e291a74d653572e34329e0d6e4905c7a9770badc446c129db9a9037106d401aa925a26e4662eb42f89f925aabc0a438bcfce262a9b5cdc501da";
+      sha512 = "c4fc42825650e69a925755f8bc1280e873f4cecfd9ab8121331daac51b7f445f9f3645d3898e73b81ce5d38c5162d396437f922817d5cf7f504c394da420bb71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/oc/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/oc/firefox-62.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "436800ba52f5b68c3b53e6c13cd3d4749556575314215228608426ef1315e8ad2628a84eec05a66a53d9de10ef159e4b493649ed0ab73b61cc2007933f43dec1";
+      sha512 = "f914083206611d88b7dda7dcdd8fe1ef5058f6818a56ddd3e035a75a7ebab0144110238defa53b07e250369be923c6f91decc3b2877e3e1a07f3c0c4e1b98491";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/or/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/or/firefox-62.0b8.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "02584b67c2dd65ac2ffdfd7fb1ecb518afd0344ab6ea623b43ba1b3da9142c6788e4060e4449fe5aa362f2b748ccef1a3c535bb1f6c8bc99eb2753dc119cad66";
+      sha512 = "a38905bd3bbdb6f7bf8113c5be14159548505176c84a336da9839b589f1ceba46aacc70cbd3337e740e15ab63076bdb10a3f163b45e62d97a33eb66d5243b4a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pa-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pa-IN/firefox-62.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "931a1f6319dfb6db4148eba5bb01a996c2ea2512f065123113e539a9c6cdef40ad92b5ed3f42237a36e256fd95f3a6eccb6a77f2a9829541c57f651f3ddf65dc";
+      sha512 = "1086f3a59e2be3c612b6262e2bc0ecbe9db409d08659bc8c92d0ce487ed77c94d1dfc6fa9f17f48ddeffe7e1403d6ba4abc098f35a28431f43443ac3cd8ad565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pl/firefox-62.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "c94c23a33651f0036e3163d25c6ca94fb832e1906869c1d384417098f89e7fea75e815c62a7e2f6661e629cbc56d17cce03d440a716c77185a1c38b6f646dfc3";
+      sha512 = "374f288d0317c4fcb65e7ddb7bc2489d1ab0eb6b79d5240ce27d7db44b9ec7f2184588a148ca1fb6029e273e863fdcae126f76f2f9625f278cb9e89c37b5075a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pt-BR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pt-BR/firefox-62.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e4714d288c1729aa625d9a497aec6154d5fe055e9b306ee2fbe812b4123e2bcab03177488806c470f530d9c45b2781cfb650a756eb17565d3f9e58097d8a8c2c";
+      sha512 = "9d5ce4842e13887c0a7e4c44d641cd96a6801f41d4d5af1c2bb292aaa1fe4799099d832abcfb7e4dffd3e1c40e96f4dfa063bc4090de63e8a1e4266a6343531a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pt-PT/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pt-PT/firefox-62.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "d460b6962554bf114b28feb80ad560b7e2eac625b05bb4722422f04a41787d32d04c7393b95c1bae9ab6dfbbeeceb1b43493bc3126dcca1f265c23e5870a89db";
+      sha512 = "997550771ee09dd150b7e5ce97d7a1db90e2d3bf258a23fb0df089460fce17157159bfd5648c2095315b3a383b0bcecf7506744c84c27f8e1912f34a11293330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/rm/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/rm/firefox-62.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a38ad0170a0811754a282ad894f41ab6edf30addfc83da973fe1a5b7ce61824b817b42543613203757f98768609213b68242d61f17c3388d4b67909e9a45a921";
+      sha512 = "2bda72985ca5619da9f63b760c994e3a25a1512ac586f8692a0ec27c3e1be63e315376860ad5d8be96ab82de2ec4439effd164411eb567f4f23c7a31398907a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ro/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ro/firefox-62.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3a8c57014c7e4a9e912219b61192d0617f6b995e0609104574948dad1405601ca02d750d71dd8c29b7b914f11044d9623d0d89d2531c2506519c41a905ab3cea";
+      sha512 = "4da0289b1b5461d51dd0f426d03203aefa7997116a760776f81ac10eb4bcc4565755ce0c6b3fe39dc6681642526b06473172901f50096fd61dd096ab377b96ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ru/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ru/firefox-62.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "23a7611dddccd415ba5fbca31a3bc7e58f0de84295f60a051fac891581e3a52cfc52000e2be2f4a81a37a208e9d4c0d8c0db72a109a6361c03fb0294753dea2a";
+      sha512 = "58ddd47f9af79f474d4bbd757b28dd6d602f42217782891dfb62c8947fbe82270f6e6b1c3ab738847ddbe41b8b3b9c17892c47f8034f3764794e20700d4d5228";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/si/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/si/firefox-62.0b8.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "8266694c5c13e3ff93cf1e6380dadbaa4056a80b48c2b42eb1d1b0d4d3b57cb5db18ce78b261b459ff25356f3bbdaa0d6032cc71e97414f8e124d68a0198685c";
+      sha512 = "8fa680b3e2603c51ff081e196be395e88d134e02bc8496f58dae077003b26ca3251f1d3eb629ba6073fcc3a4dcfc883fe36156a3e3cb4ca70675d6f038be13eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sk/firefox-62.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9bcb5e29e221be2eac6552578f0b4cf351400101f44f91648fbfc82db85dc5175d66854017751f1f890cb78cf8ab6102bac7d86e0fa2615abe6a18c62baadf1a";
+      sha512 = "5ced28dda01e9fbc96cd430fd299f4af72f08bbbe084ba4b845ad05158475de173b4383b96a237f02136c6685e3501b3bc7898f7309f7e014691c777c496ad8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sl/firefox-62.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "e08a7ac0517da3d82627fe126096205c60c3ee4114ef9ed8a67859a0b2ce9540d79f6d84b046f28ba0d3c3c1902484fefae8090ce3780bcd45ce24c2ea211cb1";
+      sha512 = "137da2206a0147542a3a47977b308578474d0bb75d295d224bc5e563f7208b4e80f63489538e7eca9892d88b7c768488c1f12f2fb2579303d8fdec2f076e765a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/son/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/son/firefox-62.0b8.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "d50fd3a722014d16c95e8c8ea1798d2305ed77c878513d3f67f3d3f5baf5ae7eb595fef17f84a41a353342ab93bd7d2049c62cbc9b9e9be8bd7593cba563eb9b";
+      sha512 = "06f601898a4efb59c1d9310e0bf3be0e84dc1d05ab61af99f6b8e1871aeab16ace40ea8828e3e39ab7a294b0de6a24e83a0e9e3ecb383e097c87f6abe50795b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sq/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sq/firefox-62.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "a21ed6954e84ec409700f12a285acb46f8f969e20c671e2ade4d1015a8b01823d7c5b64b49c6b73b7000f367ba6e1ccfe3af1f7eef4ee0b28335385bb206d61c";
+      sha512 = "16fd044a2cc66da7d6c15725bad01fc5ed0f6b050fa7bb5e143d6f7fb92a0fc39efe42c1b5f65c829e6f5ed774c3a717168e17d11634cfb74e1be036d39902ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sr/firefox-62.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "cc73f22b2f3846dbf19b320ea9433696bd00471ecaecc6b3450dee8f6696bd5698c329254629aacdf3b10ca2a3d67cba9cc44f636901a74672ecae506d6936be";
+      sha512 = "b443d6e775fed18a1b32906f9b9b3f75989d24febdbbcc5430b4c58edeaab7a89aba04cf6393cad440c345d0c4eda3d2ff17aa36c84c7be64afa8911907dc116";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sv-SE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sv-SE/firefox-62.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "02fc03caab923214814a5e6c025bac0113c8454696c2dd502e97a729d96693aaf3f0419cb8ddb3a55803b2c05ae35ec82f0cc59547c42e50f4125f061c2ee7f8";
+      sha512 = "8b1652740bfc5eda8cc7b5e4de0cdc696f9ee98a5ab3b7a6479c8eba86158f3d78d28521bee112fb7a765fcf52a10b6e0291df8214df83c5ac9ddb80d72e2560";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ta/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ta/firefox-62.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "2f240d2d1c49d6cdb162edcfd3fd7dd6771854f516fea45e1d9634421815ca2315735fbd1a9556dcda180c1fbc27934dc0e27f64d0bd2f8640a4c532521b0f73";
+      sha512 = "3f4defe35e81d56e16fe86a6786ad6f0ed666f5cfc74ab54927f51ba1556a3434792284e076051d6004929fe31c7f1f7e1b3e740e89abe49307c9bbef1f16000";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/te/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/te/firefox-62.0b8.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ef538472c38863cf11728eb38e03bd8b3d7e6c568d81ab030b010a9c123a191c1b0d6a6361b9daed2d025d708a433633b74819a67d3751e0b37de17bbc495c12";
+      sha512 = "3aaceb787cba83678dd331576a5cf6b426a62a5cbd136bc94e83afe01d5075f64ad25e5306e3f795bb3a691e9286dc352b8318529b90e83db3d074d33c2eedc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/th/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/th/firefox-62.0b8.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "bd5db689c9115f88efd8ea6e38d557f7ae765d8c58c269954005b069626421f022d7a2cbda59b143bad54a0d0f17acb15691641f1699d89435e68ee2eebb7801";
+      sha512 = "f90f63ea681b34d340a93895bd8e3859020ec8773106d4b814389bc1cf0e12f1c79f177d2946f2e221caf548fb97b2de893e3715691ab757f5c67882600f61b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/tr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/tr/firefox-62.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8a4f2e312cc7e6e7a80eccc0619702d64e89e5a120341fab88705dc9236d4604343fa0e80115b496004f1af5465949188a34accc09958612c8d8277e027c3470";
+      sha512 = "16bcb13802e99368bc4b96516175a06150031bcfbff27c50cfdf1676565aec60a43ef79416c189f1e8c8eed4c62d3adf00bd1054b8a10b6ca0c9b2988d782aef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/uk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/uk/firefox-62.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "ecd943cd65d7ee7b57328d2adbfe3b81ed457fa6f75d2d911845ebe31ffec7c0d622ecccbe04eeeba90d35e8f6c789d33caf251d6aa4e38d85633108013f2374";
+      sha512 = "ad4a29bee7871ba8e8cfcc60e3801d402f527bfa00082a1413892b812091bbf80ac05b7ff754aa233cf5d5bf60c629c3c5ae5e2c3c0e43767a80763e96f8c380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ur/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ur/firefox-62.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "23120059c8f35c7cda3493fd2c233c810d81d81ac6ad521e01c9a455fbc63375024510e2394c9a3eb8ae3bc311f68c2a760bc7451e3d35a7246b33f618fef167";
+      sha512 = "ac8f1de37d413f5fcc03dfb32d441632d33000960f89bbb487d9b1cd1129e0bb6f51a3fc89f0cd2e353b123471ba5b7bc7e900f03c3c982f0f492c811132d36c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/uz/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/uz/firefox-62.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "6dee30f68865feed42e46806a81620edada2095d28b79751ca813497df5b17a831eedf7d22b14f37ab8a85bef3111f7ba1f04ea8ec4133fad0ca281af28a32e4";
+      sha512 = "04decbb2c4491bcd12f4c256a81eb23fe54ebc45acb286ff6dbf3d3b9c2e52d332fb8ccba52432e34a78de90234438295d1f55d512598b35e557c11e53068a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/vi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/vi/firefox-62.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "868a354fa2a09e79cb914c0d51d58a810ed00498eb051d39345fbe23a1f6c19c4293df71af951e7701767a1579c178090f0a3b49216e25fc48458c33dd252f8f";
+      sha512 = "728dd66cefffa12fc651bedde83aba4387cb38f06798514dbd5713158da8141b26fe6e8f5192729ac45215ed203480de4ee3a533b4bf305eba17776a7660554e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/xh/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/xh/firefox-62.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "a7deea372bb9597668ae47040aaa3ef6432eb5a8df65fdee92c001dca10474283171bdbf9a498b48c023495f0f0f39352221df54cc3f874fd623dbf510377409";
+      sha512 = "c8f7696e85d6fbf8e457c90a40f155f03e06a1c15958d8288f543df21576d433900277c39790cc122d90e424f94eb1dcfb4926a6b3fd5937192dd9d4bf054115";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/zh-CN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/zh-CN/firefox-62.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "e1d7d831001c8914cb577d31ae5e4bd1af779a79da422bca8f0bdabadf1a7d44b9e950c1f66ef5917bdfc8c274972cad5e3c9678831a4d3bc58e292b6db3faff";
+      sha512 = "e6c60f2cc1ef0f8dccbfd2d455cb2ed032e0c0d16c1f271b7e8d371478f3c607e55710bbed1c12957fb123e6692d251da726d25ae14bae514083d47950cb1a51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/zh-TW/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/zh-TW/firefox-62.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "056940876ef7139604ee19ea9a44ef4f4c3ebd4b31a4705bd44a312a53e9750fc7f7af8f39d2e4641f831bcba6aa8e185a71351acb6a871b26aae015bfbc2e0c";
+      sha512 = "c1efbceb88d89fdc17429db4f8761e7a93f283360d31c8e0fbd3bb56065c78c1b71aa47f1a6bee3ceb6104e62357515defc0ab564e25666c6a1a6b13dda5c1a3";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6a9cd8b7b4728..6a5c9d67470c0 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -19,9 +19,11 @@
 , libXScrnSaver
 , libxcb
 , libXcomposite
+, libXcursor
 , libXdamage
 , libXext
 , libXfixes
+, libXi
 , libXinerama
 , libXrender
 , libXt
@@ -104,10 +106,12 @@ stdenv.mkDerivation {
       libX11
       libXScrnSaver
       libXcomposite
+      libXcursor
       libxcb
       libXdamage
       libXext
       libXfixes
+      libXi
       libXinerama
       libXrender
       libXt
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index d8d58c0fe16d7..7bc14c3a8fdc2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,995 @@
 {
-  version = "61.0b12";
+  version = "62.0b8";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ach/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ach/firefox-62.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "076d627bb6fba278807793b5b41b944595626f80f5c1b92cf61d3c4be8c3c35c08139b57349ca08b2f0f23aceb7af755d94332a1e11483f03a813bda400371bd";
+      sha512 = "d897f44172fc411d9632eb5e94a69cd02fdaa7e19cba50ca036135b3fd7feec97f718d86adbf6124ca5fcdb63c9532d709a8ad5b514626d22826d18ba0e3eb1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/af/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/af/firefox-62.0b8.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "b3e0f4fef73c0714f5a8d54b21278137a83fbaed1056b4201bbfe9a227f6406d6f962f676707641ed7d9c3a3d225ed90879803d7101b84950d4fbc7d7bebf8e4";
+      sha512 = "8b544de908dc4dc76e8c48c22a8819082e7e6828957b8cea2ac6534d237ecec19846b8e9e23c73c157a9d55b7122bce2a6094dacdef61718d02485243bbf04b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/an/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/an/firefox-62.0b8.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "10087d953477a93cc4ef842b3e54cda8e41236d1a50737538dade9eea0849698106ba25ac506d83fa3baa1773b98b1a7545b0e2c28224a6d9f55d4805e4f448d";
+      sha512 = "ee464edc47530c994196b461c738ac2e67e3c0e660d1bed7aefb4ddbba301bc2aa36aa810ea3d37cccb9b9eb042f8abce4f97fd5a8903b2559caccbba1f2d4ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ar/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ar/firefox-62.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "aeabe46628f508010dbd51a8961ffb1fe6d8941376758e165ce3f286bcaff8764b4c38afa494875407e99d44175bcea744aad4b331f49ef2fe1828133478cf76";
+      sha512 = "b518c82f49efd368f0a0b9605a63e89f50b796906fec1c3a107945fb17c7ed8b902c3c38c2497fe094c9bb8fac019af41f4e2cad95bc47a2aee6d1e7e7777d3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/as/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/as/firefox-62.0b8.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "a2699f209952f310939ed4e605380940391f212a6649b73b0b850ba9cb575fe6b7fd56e09631658245edfc3b45f53979fbc1e522334e49607124d4b1d1091f7e";
+      sha512 = "d758d992d3ad90e437f7762a23683387cacf04621bbd11c4d4ee18a1acfe9760094416dd374216817dd493b4d1a0da65a74037b7742c14e2bbf8ad566a988fb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ast/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ast/firefox-62.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e06bd557142c7f25fc450f52c405e93e9aea03b9774054fa361a16849f46cf52919f9d09f1c7897f7c96a32825891f5677faac5994b1a8ce4ecfa03f97c8062c";
+      sha512 = "47dabd688b4b2dc3469f1de471be0214db874c5a82545938555bb2c9c92249fb3aec99b7c8a231772a51d5b3456bd67954db8195b7bd4fa1343ea0a1d96ad27c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/az/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/az/firefox-62.0b8.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "496899ac014db2ec2044df67b62e4a78c4f8a65708c141bb33e0234691ef4d68c0e6338e6664d40e18f29d6892600bda71fb27083c5d23b1c492018a35b02026";
+      sha512 = "5c0cc8aa893703db2c8d081bd4705dbba18954f785d4974da5dcc2f8038cd48d46bb4906cd5afff66c01982d3d70f0bcbed61fb862c3091f51aed1c7519c9a60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/be/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/be/firefox-62.0b8.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fe3c134af6a3023d91f2ee022eea6febfeba3901af6d60492121503ea464b506942885de2a93a58c1b1302c8dadb26915695ecb6866864901f6b263ebaca8c3f";
+      sha512 = "9f7dc862d2df0698a1b6bc32bffb59abf1cd3c86447c0914215a55eb9ebf91da51cfd5d0f9a06bb6c59e1e8ef787677dad1928db4bebadc1cdbb49c8137da5c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bg/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bg/firefox-62.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "37c2a30520cffa6374e28020cdbcb1e4fba124e42dc78d1806e6ccd973265e1d6c6f7a74a3b9510e1059b49b44198e75c7d056baf6553ecce4e522641ef8d0f6";
+      sha512 = "80de85a8ac235ed50d0baab05302cf7d272f4c0f2015dab7e3b4bc4a3393a441c7e2386ed6f75f1d40ed16e370587afd45dd8fab67084ce66885cf4aaea36849";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bn-BD/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bn-BD/firefox-62.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "e123698c813009b7ad982e42c7e91a43f86576d71bf4fbc0fddb092de28cd6b3f213cd1abec52bdc7c779c5385847aac3637b1a00ce2754341a736f1815f6c3b";
+      sha512 = "e9753f0690325d8542d26bba71cad4c43645a51074d482aecfdc40b09c9e3622fb0d288cf82a7777fc70b625d36d24771aec768348ab212fcd85bb5387fe1909";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bn-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bn-IN/firefox-62.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "16e8d4f623e78333df9cfd72a03b30ebd54c3cb26d6583cc009b278288495f971e33183334a59931f2d00d59efc37eab51327743075cbf2c2c1c985c86d06379";
+      sha512 = "9768864bc59ac9803995b4ee446611ce1c90bca61126e91a824cd007e3e16e8939ea76e1fd8bfab0b733f2ef4530819adccaf86b34f7078717e732a5dc56fa64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/br/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/br/firefox-62.0b8.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7c4678353845207626bb2b886a0b2dec87f0fc86c370085afefcdaf470d4d67f74f4e20631257700c309efba9d301e4092b5daa1f3b85ea691f9885c307fb3f7";
+      sha512 = "3d32ad8e5f037b50d6ced03d1747314a88fa52a30347adfd81a3c7070b93c4c3793b71490bba2a839ff188f8b1b674d6fad66cd0e21e42efd2f2e3e202f8f4fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bs/firefox-62.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "a201de963c3dfebe369f1fc8f04784e69ad06aa6402aad9853c822d43223d211732b1fada85ae3fc72b68ba14c4bacf516787880d421e81efcb1f27fad782e0e";
+      sha512 = "30789dc56f2c09f29b9fa22315144df142034993e0751a7b60b958c55de2f1364b484714304c0204dd190685ed4645ac4fc22d83d05ce25a5957afed9a0eb465";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ca/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ca/firefox-62.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d79adefe980e53658d591c1dd2b4ad6e3ebffe22a6723b23cb052a24c30e0face2bb0a7678661018ef1f47cb65ba37838bb705f1cf601f9a6c3647b34b685ebd";
+      sha512 = "13409ba2cc807b2559de2b6d76d2b40b4b4b412d1ec656c3aff4d78ebd7ade63317c14a76e407b164f4fdd7f992aaf51905e366f4d0d494a5fef3330d378067b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cak/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cak/firefox-62.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "eea0c8306c265d85ae6c8f2c8a0cb9233e6798b81228c65e6afd62cbb529b57d4f43c5f00033f62b2d3eea2220dc2c6cf614d04682f82102dabceb399c0b11fa";
+      sha512 = "eda46414dee9605c4a4cd6ac73ea9cb2f4810880aa0eab08239c46de1f39e4689fe7ef19cc560be42d6733745b7445af4e3be65f65ae99a388d3349437b1b4ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cs/firefox-62.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f55e4f7e0c75ff9f6e73eacbffed28a85cc3a561f60390d42ac8ed8550cd2bbf3c4592bb8119646c246779eb102b79a6bb046498c06c0c9529e2ce559ef08248";
+      sha512 = "7962a823bee7db362bb3d61a78500f52b145e801440caa29382f756352e0131c7907fbc835455c0d01bcd10eac08c4e4edee42f5764097249295d3fc55419a0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cy/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cy/firefox-62.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "e431d678fccbe04769821132f5abe84778940fc0a61210ab6e3bbbdd2506530baa19ca53c75d7212726eed8ea10d226f90f314bd68ebaa0bc21f509fc932ec3a";
+      sha512 = "36e4824e32dc9054286575879dc581e941f0c9e38e6b4964977dacfabf7743bf2cb383e04b80ad057c58b522d0ad8792145b9276f69b4b1a8d360b97080be943";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/da/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/da/firefox-62.0b8.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b4e2ea82061651644db144c56296df53d7a401f72ba999220dbfe6339e3233be65b8195709881cf3a4210c463f851fe2806b9a87a7567911c031fbb0b11e947f";
+      sha512 = "127ed822b2b90c8727770864cbde078980b93a7d1730e9525822c231c9ee7554b5087e325d61467c2d9bba2d96d45dc359f54fbcc522bc70dde2a18c9d1237d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/de/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/de/firefox-62.0b8.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "0603e12a1f7f9f5c478abff3012f94d0124e657c327fc851010f01e5f2bf213b829d680ca1d0119a55bd4ff2475e37323cd0bd9ee656a266a6c87fbd2c159989";
+      sha512 = "12f422e904a4f357a93bc0c093cb04f35c3f95a9a98f4658e10c6f3e292b4be3858217f4fd9a2b7c27db307f1bb20e1810868c1af5b04d21bb847843d1df96a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/dsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/dsb/firefox-62.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "c7ed913ae77520203acdbe32069d239a3c3ab5dd03e6fcf2556909eeb9b8dd94f49405d036275481fb49f376009fcc72b6676d0380b520d8e57b70be2034b94e";
+      sha512 = "91d5846862482c7f93bee5ed748e9dd2705242a3f7513987257a8a71093436bc4c24004ff3dc6f5c5e78786ae412e978105732e5aa2abe267bbe7953e2b5d3b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/el/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/el/firefox-62.0b8.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "7c54f4b2c905854e7deb59b18c44d8868518aceeecb340d9b287f502aa3a62e317ac7e86439915ab03eee8151fe2573946fdf10944ec271f64d3dd73b272cdf6";
+      sha512 = "74f7bc52dca092867aae77350ed2384e6986869b227e4da9c539170dcdb4319b5f1a79b16c4ce1db50489b4b2dbd2082c9f9038314821dc2193d94f8678b678a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-GB/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-CA/firefox-62.0b8.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-x86_64";
+      sha512 = "e7b0cb6bf77280a5f971af0c639fc539d873e50fe30436498d4282b118bdc75ffd3b3a2c982b7eba8085634578f04bfba3a4542c79ada19f449d99bd26598fd5";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-GB/firefox-62.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "531a49323ab069376afe6aa7d925e517a90ad9304127d8f5a7c740f0a5f09e45b9b161a1283419c02438d5099b5b6f7d61149ad988564504b00ee7b007c664e0";
+      sha512 = "de701a52d04528458e7fc090289729d58335402d410640147261f006c1fa3053eee286288ecdd6c75c9344dfdd25305bfd2216386c2c5c36e325b4afe6f6ac51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-US/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-US/firefox-62.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "7b9af92e0718abebdc64a5f4c5ca1e3b26838c58f2d92a3fe189d1fc1e593815d6a7ffb5970a9d02c7172a3e8ba1dee8294337e29c43e2f2fbb2998042f26143";
+      sha512 = "6329ab408c0766581b688815e1e03aa8dd5d0675b428145265bf768f51d93e39a37c9e18a224670ae8a44e2adc18fe8373f5e65d2ad26492de06de3ad8fa2bfd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-ZA/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-ZA/firefox-62.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "7c6f80d57f2d9ca8c98601f05290018a323c1d2103caa71f712f0006fcb0885864989f07e77a2bde4edab1ed2fcbdce22962eee7fb5917bb43eb5b73fdd41692";
+      sha512 = "76dca81d11ffc48c54425c48d3dbc88e1256f50b411411c018b816557d855160e09c19be0f313e441b9870848bf69eab4b550d9659e5e118f5ecec1ad1de95d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/eo/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/eo/firefox-62.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "89813e89b4cd363458113ea9fa4428b43ce978aed19d4e9236268f6ee9de8a739adf0cf3ee397548592eea74750c37195a8e189567c0fc853d9b010fe394bdd0";
+      sha512 = "656d5c21d6bac867bd9dfacf782b740f8fe0d320ab480bbecdbc105114bdc3d072b4c2606ca014012a939bf0825c83f4d4b83486a2ab47f681a21b5cf939e44b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-AR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-AR/firefox-62.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "4f86c38d1c056259b7d27241d805575dfcb2a71afd593c638f0c3ed3488d9a8e6c9125735378e22fe7ed47bbe61d56b743755b6331e3621733dbdadf1afbec7f";
+      sha512 = "26dc9285989a78ad8f3365ede1350c6a88c377d44db107ae20fdd75c5f52a00d42c008e8dadd216cd4c64d512f1f380d5e55d5fde74787983ab305bc042af0ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-CL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-CL/firefox-62.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "fdc42f6d6c96c24a08e0ce6a34bb2be21e314ddad090107e6640f4d761e2ed8304211f071ee6ca71aec7f3e36fe0b618b72da72a29ba12456a8a6b1b13392edc";
+      sha512 = "cf0c96ea3d43c5e40dd10711b122e59e898cabf21082783dde8878e643240adaac6b1ef8904cccaecd5d5638d5a0624f09b94eb4357699dd8d0df2b2e45e6b53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-ES/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-ES/firefox-62.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "ad2e4d68fc63d93bba2267fda419e3e227ee07d4084673bc1942c3bf8f48a87af9b01f5639561ad302ed9f6ba325c8a4bbcbb3618bc58b8d0a6272bcdfe167fe";
+      sha512 = "a1e95129fa0b4de9dbfee8fae3adac5255a99ab77036b323c9c99892be8f5599160c0416efd4139230701a1e57ca6afb3fc69b162b32c5b8add8cf9d7c37a91e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-MX/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-MX/firefox-62.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "700e5d01b2f130dcda65df25121d09f55fbacc52ab58e2f32fbcbe2cfbc591e6552e4157b64c4bf31b3fc02f85bec7ea9276c948a023a89987ff1a1ff4dcae33";
+      sha512 = "2d0821a5a2ce8b48bb37ccdb3c49d8094ff071aff6ec6dd21d780d633486daa3761a47c24a3fb67f8e70077a560b980e86f454fcc5ab8136f1c8c13e71e849fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/et/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/et/firefox-62.0b8.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "e576b557e08ae12aea5db28c1be4fe0d48469196c854b78c750560325f29b347b8c2600a5df97258dd0b104a888ca2fcc6d03068a8ea78b0bbecf08022b7ca5a";
+      sha512 = "58c96be64e4c8fdfc24a2489593c475bac52cad49c7f533da0315b7ca6462cabf703c74dbd029e5b82c9c902a8793b9d7d11882aa4511aa055817599f35b425f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/eu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/eu/firefox-62.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "6d2175348912f8b07b76c9c3750040efce9cacf3ea79a27353a2cf4ae70d6240b0b4c4d40c1c07291518da49ead715a7e8f65ef33be623365dcfd462ee237cc5";
+      sha512 = "f3c063f4233bfcc26c1d78d6b63a85e6f967789a950ddf3507181a7ccfef75e128a674b1896ca3d44977cb4803216fd283c35894ef9a9ec22dffc7c9e6b9c54d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fa/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fa/firefox-62.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9c3f1e65f56421334108ac9206cbaaa4eebb761447f993037c1b6790996db9bbe19b2a75843e746e482cea4281ba571ae3874b2323efea10eba559a74f6d4e10";
+      sha512 = "a928c716a4e82e197589c883a0e262346cd4c10bc1853f28c8fd39316dff83ce80a4a64f43d8041d7e6b9039656372dd61bb0d07bbae1d8c51cd40b5043d7ed0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ff/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ff/firefox-62.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "bb2600a4ccba282bfcc3b26a44cfd13adc72083d333613fb17cb927358a61f505c74a727ffce5943ec1cc37239e1149874beaf404699bc49ecc17397aa578487";
+      sha512 = "ba22c9d687c6001abf5bcbea99964fc0e427803a88cdf11d2bbcfee7b340aabda82460910a3bff0779fba689df573e4b45a82ea168d969b10b2958c12731ec60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fi/firefox-62.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b1fdd37d5a661145173594d2e5ad3add713f1843c55c20d282c6967c0a98de7d91f42ee4dfdf54b482195b3ba7ed4e94dd65667632bc75df250312aae4d1932e";
+      sha512 = "1b1e90240d6e6d2d9fff7852097d64ef10ae719f9a0d9355972be492fefa37417722d8dd0e5e4a1c0bdedce4ce75daa8085991df1a83d05e9bf84a1d8e8ae142";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fr/firefox-62.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "dd04b9c12290b0e54d7aa19330e3902cb131e9e390f091674d16a857797cd106461e63ef65be71fd912e6b8979dc534c3e66c89c64a2cadc427422e9dac22ded";
+      sha512 = "d4c3e745da4ded8a79910c66872147e15bb33be7920171ec44ad1f380884c28f9832fcfa386212e5d4c32cafa58243e0cca31f29844f8fe57417075b9107994e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fy-NL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fy-NL/firefox-62.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "6a2f60be75f6e0812f4e7defbd9f483669a4c4a4d6d59a5bc8490a35e0520ec231186c6769384c768395e27ae660820fee8fa4e9d0049715e5503d4e55431623";
+      sha512 = "8b861015dd3f869e55a70001245a2acdd68a97932431dc48ef685882d5b1ed890ae6ef758f880c85de37661f770d3b776b71f8ec07c37c7ea60e3c615a9bf308";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ga-IE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ga-IE/firefox-62.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b61bd25b1b9010f70c2deb0cda49838d89abef4c4c1ce0d2b7334195d9871957fc0aa4a38d278ccd05171671a92ab7bb1578331481492aa0a4cc5b5ec0ea75c3";
+      sha512 = "704952c178446c95cee66508d09d1f73409c1eef6fa333bf46996ca7f2ec8ebf33e2a0305e29f65f493defb43751ec4a7d563f85aa24c56f37368586ea8ede03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gd/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gd/firefox-62.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "9afffdb255895026cb963ad9e24690710948decb53bc254e363cb3d96fa2aba3714748858e0d0158682678e8c4cd9cfbf6fde24f180e07ebb017b814cde43714";
+      sha512 = "069477569c7e439ad4d3677a7e919a9cd63db35e3f081c6e5af295886983ce63e0b2407e017314bbf30478459da4faef28c3b6a4dae8e65262bedea032e21a15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gl/firefox-62.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "65c39926daf8664a306d85936421bdae622f16a26c86cd7c8d6ba928d5cb76b3fc0e75bb7b484317d7e6f8f2b6b00d016711f70a24f271051c3ffbc7702e80c1";
+      sha512 = "70056d4370b16fc1990e5a3e65259efcc9c4b25fb9d4732904b622f4f331ea30a3d2e495f27e9e1647cb2f40c5914a2cdddb42fb9275bbb94ae66b69deb42534";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gn/firefox-62.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "1c605598cf858fb46b1931503019f644fe1ae0e93fdc36193fde6e9d4667926a477e1b3b51722a496e8f55fbba2ff65e6c7209a2a3bf47ec0f5106924a1184f8";
+      sha512 = "6d86d3bee8bafa88652258cf46351b79d85f66b675ddc6196b251c2f65f9ff2438880fc1760a7d51a847a017c67cb9a2e9fb4c9d1be08dec212bbd8c8d46d7bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gu-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gu-IN/firefox-62.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "b4bea06a476fac58407a54358fb56cdaf26853f19c5f87ba90d8d8fce27d959e333abb5ded0c960ab3faefb45abda2aa54c40ab1dbb7ae2e342e1601fa89bf9b";
+      sha512 = "fa97cd30fc4aca26a16969336473b01786b0989e5d946df8151d403761edb49e6c7a818a2522f9e30f5a233b0ed5cdd7c862fb7542d576d80a167bd05d1b9aa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/he/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/he/firefox-62.0b8.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "997b1e8e7fb8036bde2785ec0b1a2fd1f3cc00bfdf4d1ae1697f740bb91bb174e021e632c167d9a702d924e457e689fc90e006c05caafcf6be403859b6267ac2";
+      sha512 = "bceaffb1db978ddfcbd167450d43a43252dd3301a41f964ed4ca7eae0dd4a8e44e7bc67d0ab5dd3a8d19be1f1e108d839631e3efd1c1c8342227fac3ddd8d588";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hi-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hi-IN/firefox-62.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f9320e510318e83a879adf34d6e94637c2d457c4f0c8ce54794b66c8ac09de2224510745a3e96b152ba652ba070cf5184bbaa3afe2af816083115863ddf3a6eb";
+      sha512 = "37f5ead0e532ae44db2b9c3cff2fbf9001d9aa7a9f3d7d49c50b0db5cb9c272888d883bc0fcdd81e80d5dcddbf32847317948c13a501539a2a802d93110401a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hr/firefox-62.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "1097e0020b011d160bd2a1c0c20676b5188d07cd6a818ee047e83ac07b83bf89e036fd7223c6fb978f5c23eb940ceb0bf840cdee1fd46bb303fe7d40439289d4";
+      sha512 = "4a4579786c2727684c4e960465c3e5a478d1af52a829588900bdd6ff093b8cd58d9d5e9cc705f49be2dfbde50fc2576fa5cd197663bfa3f390f9a1697187b865";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hsb/firefox-62.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "8c2a4f2d42fef3a3085660c2ef5186e0e2d9af585eb4dbb919b186eca8ecd391582e40e1844c3a7b8494465c1d052440f1d31c725d0a44ed9ba35ce071a2cc0d";
+      sha512 = "c9a0ebf132e2fedf887801d7e061c4a3b77f550936464ce4d232e7872781a9922bffa235bf4bc65679aa9a528d562df911be6bb817498cb1ffe3019e84f8bc33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hu/firefox-62.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b080e388ec0d6a46575668cdb0867ae34b79f6338f401d1888020bc0469d878a5e717b70744326be1bc62eca321e41df6ffd8ee2e4f740d0a1859b6b394123aa";
+      sha512 = "a52a84cd2b2b63400c0dc4e32ada00f4181efb899d35fd6e7a369de5a7699c5c46a6c892b0ee558db2f59519c169868a44772b948e04bdbfedbc31252aa5817a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hy-AM/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hy-AM/firefox-62.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "367010c05454117230802a61b6ee00838905514aac7f06af5e612bfa12dc44e1bad8b642ba24d59242ef5cfcf67cb04165bc3cf08dc5e13beb8b754b136e91bc";
+      sha512 = "9cbff1936b03c19c9cc8112f5aa380ec5d783702d8de98c9cead3bcc9576b9ea5f2e8381ee7b6dd57822727922e7af04680005a2d394470baf1ea13a036b0cb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ia/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ia/firefox-62.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "cb6fcf58b49ebad81329cee4a9e4f5e54cdca6506f17df16af85f3f35c328e7a5ebbe4b8419f531531c79c2efc855ea2c31ad56dd0563b299df913a4be2a413d";
+      sha512 = "c83baa1785779e8e5c89aa1f5b177b737bc1d785cfb3d08e967f2203ad4694a595cec039fe844f285d68cdbfd7de887668df106a2e9f9da7417bd4013bdb7d17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/id/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/id/firefox-62.0b8.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "e8de3160e004a82b38daebb44b3af2eca63c44971296e6c4eb1e3dd7b65e516a00f40b430d740bdcaa2a500917d653de02c363285f243d5db0f09ede34322160";
+      sha512 = "99343fddbd4d46b3f123a0d9d99bff1bdcf13ebef37d649a54d5b0f25577990d0891971336c4e138d7a8f9d52bba25f128e375177e925407786cbbed297d1ab9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/is/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/is/firefox-62.0b8.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "dd4aaae6eb4bba3d4383fe736061d033ee2c56914711f4d3aab00fb965404b0626b3133cb57588b51148c13b4de6f090597ac25beb28c93660723752ea313c15";
+      sha512 = "5ab9e0cc0f624e700f7e7eb656ddf3bd1cb863eee57ac7534bb66999a4ec09e17360f526648ecc6733d5e2b0879d6ef39de77d0c448b721c8101d38bee144515";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/it/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/it/firefox-62.0b8.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "5eef084981e138f49a12a9c188d5caf59777a8fedf905670a0151749dc964bc7be20c6ac848b29ce89ab7d51c9bad28ad51e65c2b2a80a3a82a8225c490ddeb2";
+      sha512 = "c18f825cd703aca1e5364cbe6a2c377bb683ecfb5f69407933eb593c889fd5838f093158d8494c862d00fb6fb662f535dd9b265a7e687905ac52843f7d118083";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ja/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ja/firefox-62.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "561590036c3c0d16e742c0877cef4f107a05ae13c9f4b030b08afc4633b64212ec359a438b0dd54d968cfe33d85c5478f8c9fd997ea0252a2869cce93cb6b6fe";
+      sha512 = "00aa5f6478e5b69b6a1bd65751eedd16aa4d0d6122f16ea40dd45a20ec40ea1efea4b8668a881258c3050be06639199ade24e02fccf17a34c815a75989117ec9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ka/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ka/firefox-62.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "5ed3e24a7762da603b0ae00ae5bade06881b69369fbe98f6ef8ba800da2d66a306fef43a830f324238558f7affad168c08499d1757ded12612cad2d808cbf908";
+      sha512 = "fb116868e59b3f46d53407a4706d88120810d8f50d86552f9ee75273825027ab4fc454a58d179d33838a68d66bd1bc37b736237156217dbfe5165064649c5979";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kab/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kab/firefox-62.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0bea4f9e2547361f39bf52552ee95dadea60cdf13e462ca536e5e08c85125823e92893b1f71653a3be01d250477fde733b362e31d218c1eb7c0c28d7dbe97691";
+      sha512 = "7d065d2ba0f6d9d00b092bf059212847b989490f00c1bb4dfe1599dab4ae219a229a250e7b2d357cf27358f6dad034e53dc94370adbc29ffc040eb6333592177";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kk/firefox-62.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "a7b9777cd258b64900771c9a9b0a17ca064fe5ad7704f775d5ab007146242971f16dc8fa43eafb9b6b1e595046bbe25efe3ef428d80e77889127b7d18f670140";
+      sha512 = "3c9f591d4edcba7001ccfcde2393f581cc79f0cc3a05c098fbfb8a5023f9b20dca203d84241bc4aced261d482374411a06f66baf302881d52bb062c1b88ef0be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/km/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/km/firefox-62.0b8.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "08c45d608b04ef7e58fec76f1ff3988c701374e5f81b6c51d9cd16c829a014526c6fd358852ad68d46fac52975b0849c9ea9b60f67ca27c6608f25dd39c5e58c";
+      sha512 = "b922f2f45fb38940bef57054f307d0f5c37cc282841155f0ef09ed66722f80c04e64c1d7234cb1754e8afc6ee455f70067d25cf24c58cada9545234a95099075";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kn/firefox-62.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "6e37f618c5993a40bdd80d228a1d35b8b95fff02e74c62d64a01dd065b8f5e43c9dac296ec9f7d282897c1ed8463799aa4f58a93bc183541871988ac241821b6";
+      sha512 = "814f9fbf8e46f123cbe9999b1365226138a49b8f6d2fdc1dc23d472ea757c785f4458997e7a054121a0a72df6eb88782b0a449abfe3ea9e639af99d51325b238";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ko/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ko/firefox-62.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d633acc7e741cdad5384fb7f48865817d952ceab58af67b9664f122f89eb864333ef174d046c45053f7289a44751c468891d3a39f71c3b2de3f56673a5d4f0d7";
+      sha512 = "c41acc63d7dd60e50198084286da55a8d64e6544501aae1cb8b2aecbfb39e3ff9a630cb1f5cee164945a26d6bd42b302322c5533afad749dee76f5bab46f0b12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lij/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lij/firefox-62.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "43b9976d4a98134f2c83edbebb1b4d8de7c8e24ababd41719256aafd7c11f6cd1e89ccd6549246529e860303ba5ba41becb07b3e5cf722290b5bde32f602576c";
+      sha512 = "a4b3ddb51502a21435eff747aba28f458a291c399f187f8eb8f008681014e0db9f09a813d5851e3e7bb7f4a5c882c5990c97ae40782f74a2aa28b4d2c1145dc4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lt/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lt/firefox-62.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "47cc1e66ca49cae1249872465c2f4b27fac6badab4a28c53118c06abd4ba3e43d2a4b93a556d8ab86add2446a28e36e532b170ba95eb505128de4720c6468047";
+      sha512 = "06312f8b135122827c5a7f14242dfe2d8b2b8a80a4c6f707317ae57cf988b052016ba686c666de90bb6389e61b6194944f26d9d2886ef89f944bb31ad6a057b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lv/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lv/firefox-62.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "8c3aa7fcf524a63670113a08ce3b31dc34c113c04360216ef5076ed33240f7a062a649fa4d0d95cb0e2749c5bc0ba33e0fafdf073b3c09d6d11d196aece24861";
+      sha512 = "9f75c4260a6329fab8e18851fce460c8434d35c91c30c8aca0945d184bd65cf2407b46eb6354647a37935e4583e2327e9dff170f9b2b8b8925e1f317f4ff9637";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mai/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mai/firefox-62.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "8c7e485363f6e16b3858f1c25ac0f6dae2f3f70aea8ca18c14fbc21c3084700585202fe0832d165f519f8c8bb312d84943d34f0f46c0e2127dbee4e8eb706889";
+      sha512 = "082492be40c27d720771422386948cca4c4704b8ac168b44e9cd3ec1c322ffb42050bf1a0c2be1698fd185cc10a9ed1acc665262b5280e131019a4aeeec69f6c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mk/firefox-62.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "4c063b9c4b8b6e1433576384d8707906337648dd141eef6672f72877e2367a33da87a420a621339b68abe786f0f35f007ea999639aa37f480b6cc9de278669ec";
+      sha512 = "d7809ae69d01a6d259a72aad63daf03da539fd4aaf0e7dbe2bf863f2cc4f1040affad9ada368adfe1115e48568e32194d5bdd2645a9e53c124d370aec1f044ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ml/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ml/firefox-62.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "32b7a4d6c27cd8a19bec4875bf56846cac63789f943c63b555fa8c4503c083a261cb112ca4a3077de9e5bdccef301c631e8beaa4e40eab322805730a9519e73d";
+      sha512 = "bdb8681befb9600653dfa5365349c117115b2f62b0a35fa05e7858b077991296d5b0abf3fd6d9fb734eb556fa600a759a33cc171e938c05a6267a1b44dcb81fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mr/firefox-62.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "1c4607c713df330d01efd8f33d2defaf154d65e911dc5bdc9f30b67a7eb35d704dc474a5366fcafdb546438b157f5bd1c9fff879f9d15f00c028ae480e3890f9";
+      sha512 = "4871f2109edfd3347f2524e22946828df8aebf36e09cab28922400163a9e8da2808d297c0f2961f3cf51f7659706f15e01ce14d91a11651d7d46607691d2b392";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ms/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ms/firefox-62.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c611780fb48d09967fea62a8b9173c1eba99e56dcc2ae8196f1b29cf07552931a9ebc06010e513c652fdae01b32b1446b5409361d3f5f0c262fdd1cd715bbc0d";
+      sha512 = "75e18eada51ad229c6d9024f1e59f27fda7e3ce39c2a9d776d43e7b39f0490aa0b2e0f0072cb4d2102e21376d144e957a785d6917b49399470089a4c50b86fad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/my/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/my/firefox-62.0b8.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7fc59b78f1d6251122c5b91dc51753e1477b6ce4d5a0bc22ba813048cb5b6f6b05ed79482296ec12158c9f11be08a484f8ca9b3e4e77eacd1aa902fcdef30a98";
+      sha512 = "fdebc1ec11dd68f709bde3489e9f4048ca06ec098df86e059f049b3ac42c43fbd2385375d138481f94f74625d224044f8bb4ef9f8b99db7e3744ba5de40e2c2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nb-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nb-NO/firefox-62.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "281f313ada351f060aedcb4b08424beb6a8518b45d9571eae15527bcede5c87a188c4042d7ec826484b9f7e643b20575bf526d3699e29cc48cfc4a6367744a37";
+      sha512 = "31bdb35e58f603734f02814a6ca8bb7d25e4e441006b4e1fa50f31c289607f2a8b87cc50196dda4cd2110c254a0aff828fcbf01b64fa7ee855ffda478566bafe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ne-NP/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ne-NP/firefox-62.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "05b146af2dffebe79f19e2f32b469633f1ca38ad190b8763667d80f434c94ab23723fd29a4a4680cc394ac48eb7b049df61238d2ed0fc995c730e7a27dc8a0d4";
+      sha512 = "665a95aa63f4484adbb5fab9175d9961b393cd4246503b127898ca7a75c014be6a942e2ebb5229e20309cb19c04ec1d28c908ec2fff763023469a4adf78241b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nl/firefox-62.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "279253a928dad6f326a16e6e5720802e83e7f15ea1eca1714ca6d2ce7035a79d16e3dc195dd64701b2b3c6a1d79c150706733d5bbfe02e1fcb7e911592f6edb1";
+      sha512 = "092a3b45b26d679dd709546816bd481330b6dfd69013dc5267a98bdf771eb2b97dcdf297ae7615735f96faa4ad72fc89417e3d5f6a09301d38683bd5db31c1c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nn-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nn-NO/firefox-62.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7ffd3a708b8cf8ef7b8293322008fc6f8765d1de4df72e7e8b8d320bf16f638fd068dc8eec4cae4a6a23387245dec1c7ce7341acd3b8c6cdd52af0178fa14570";
+      sha512 = "13a1d4e3931d4a0ba80f0cfbd6aed3974dc9ec6ace6477c32b1de0fb59076619d14105a3aa1f110fb52274dd2f29674e2bce2040eaeaa5e0caaff11b52de4ec3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/oc/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/oc/firefox-62.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "ee3b9e8b5d092c966b8fbdb35b04bb25f3816a2f5ba72520372c65ae53163461d184c313cfbccab9a7a68fe4cddfc708671e3ea61d3400096dc168098be0656b";
+      sha512 = "b37f0902e8b5e05a5e3d2690d64b7abee5293f260de6410d1721388d89cb60354114f18849d5be5957fb1b6db4221da23c35e2959fdb8392be6e2fa3effc2667";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/or/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/or/firefox-62.0b8.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "2f6a878393fdb6c7df042fa95e04db8f7250eedf991470e8affc42f27b0ac5526e50bfe926b5e44fca6d877aff8f1c7459f30d58cd961a77f5e7754c1d07a9dd";
+      sha512 = "bac38857fcaeecdecd3abbd837ae1b729f6bce1040985f38243402bcc1aad1e69e59f9c3a2237636174d9b2e1a080ee16364912392af5facf93f901aeab6b947";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pa-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pa-IN/firefox-62.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "230d08f87b6aa0115383d926792033ab88860083a887d1acf9409466cc0f6e528e039277e37f75b1839956ef4bd237de8682474b6fb1f1519233088e89aab6c0";
+      sha512 = "904edf40c00228017ab4defb97095b0636e0153043d74c33c9769bc7c134b5d8f5865fb0bb1081a69898e5bc0b52e5f9c0a8ff350e7fb9e7c2ac5c2d0148656c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pl/firefox-62.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "50531ee7a4bdbe3533d3fa94797da28c9bdb41c262537f7b14d8ab5c3ab7353c083e62d14a00678bff4b9fa3a1d7a6c5f2bd6cb1d0364a5d364de661476737c8";
+      sha512 = "f79a1d18b0f2eb1e0e5f40f02fc582422f1c07ce13661976487e2b40621b190ad7d4d62ce3b2509553a5997d284ba4975ad681118589a7a6d9c170955c0efe83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pt-BR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pt-BR/firefox-62.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "4f70f26ce2779a6185cddb3bfa4f973b59a60fea1541ab0bc1dd8a58607ecd853073883823a254ccd353b247f141a8af126f491dc732b5c4a14963c0719788c3";
+      sha512 = "5357a906a9f4920f25db77efb655ebbf54fba7acb1120e28cb0b22b4d825ce53e458fac1a7d5b3fd21df4a735d8d96f7d4ba9a878f0c54aec076c5ac58e592ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pt-PT/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pt-PT/firefox-62.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "19d0a557eeafc734e13c852f9222839a31c7e56fe6e100a75f3d64d7167ed78ccb10bc491724403948d13f0a1b874aa7568c648e3d20e5b41208a645fe9996c8";
+      sha512 = "8bf5e145607a5ff3c84df57d6dc427a87973713d246677d2280f0452c7339c6008bcc49f0f9e70ff261b9cb44dacb8d3a442ef9ede46c728fb7f21a5bf0f95a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/rm/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/rm/firefox-62.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "10ea7f8eb8ecb5ace562b9eca4182ac05554b9cdffdab1716cab55685428ebc50f25738e71994c2da6b27a657411e409d063cda6d7aff2dc477a30d2d3c14eff";
+      sha512 = "16b5a217eb6179300ca709d97ff504339bcc0ed6684d68e118672974eadf58f1b5d28598c29f94aac2a1391d592e543cc42258672fef14c97197b2f4684b410d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ro/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ro/firefox-62.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "654cc1cb5bcccde12d486e92123401940ab00a47cd20e864a5424bbc0f37854cb4047fadd672fce71b976659dc0aa4082a0d12c25431dc0a30e6faf97531d3d5";
+      sha512 = "5dceb3a11da2f02749341c9064c4bfa798f9ab1deb02f6eaaac4ade66acd73f1467deb491583e6eb74441ff56ecc15531ba3f241d0009d9bb42fb7e0dbc44d5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ru/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ru/firefox-62.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "582c24ca9b4808f004a622b4bfa59b00df17a81425e5785452a4d9871925e118cd59d9fdc1a8854ab0a702be026012cecea48fc842b4660e389e37d5f11842c2";
+      sha512 = "388fdda87262647ff1969bd5dafd0804304d4bdb1255323d84ddb4b4d8b423224701b417b0392f90ea13b90b8f8ab7db18fd3d015daadf5480fe0c8b2965813b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/si/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/si/firefox-62.0b8.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f26f9abdd9e1da50c7e4d555396bd96ac309a6aaaba9c1bda10925c16c3f8a57bbf26180fef93afe7ecff9ec49a41a51004450d738ac440f54071cc9c4d4eda0";
+      sha512 = "8c84473bd83e31fea9569c374d94b95f8826be2c456d7848cb813bfcd76cdfcf5dc91ef6b406368f4170b932d5575fa79d126e4912fb2174a375c19922eb7191";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sk/firefox-62.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "de942ae63f311ce0e3a7786f10f9ee728060e520551a8c0ec91a31a74344dd373a18aec68cb1547f96d245536a669369569cec605699f85bfd8aefaf1d0576b1";
+      sha512 = "10c03fadde9bfae654f349e87e791d1f71b6411fdbee46073a7883bb5e31f4eb34467838356b3c87c4f0a1db1bed0aa8a9de44ba25a7f7b25e69dc1516f51db7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sl/firefox-62.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "be1a0662549921cea469a2c40452a973daf47a40883e044455697c2caa0dfd6184f23a0458f448916e2b0f483d3ad228a9e3724d5dd46e2c82b38ff63b571498";
+      sha512 = "c3d13be822bca5d45a584c50c9c31ce1050e9749eec9de273f77abbc9fdb9867e111e4731a8c22d55ea9cb7d07d608b6f19a4b38dfc7a4d9b1ed32baf751da64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/son/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/son/firefox-62.0b8.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "225527e7f8a9ced9fb53f7f0d3e11cf5a6745ec861b1e293aca467339a487bc50fdf11e2c2a0512dbd5532b4439651f57095b9b4b779d670945c912e5cc20901";
+      sha512 = "ca7654c7e16da7233d74ca4a7850cddc57e74110be95ae1d3b97c51f89c34099a229a47ef519704846d6e172be615a87555716073a3ee4cee55d0785901e65f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sq/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sq/firefox-62.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b8f1aa044caad453cb0ee492ee8204ed5fae05d5f7fd1344d9dc2ffc0989e9b089adfaf486f3b09f38534af17bb35e5ce183e353200c3b5279c566a86f952bfb";
+      sha512 = "623419b86e05f07b8c93d0238e308039235ebe0818afd352966850d39579fd4bad12f70406208fe7e69f72b67105f577953b921560877d33c3cb7289e3b7ee3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sr/firefox-62.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "b31d69a2dbe85f7269c994751ea8e5c43c3b134be9843ccdaf0c2dfb3d5db19635a9d998bd2465ecb47c02b9cafaa50329d08a501289846eb80097561cfe6330";
+      sha512 = "de6fefca0a95d228850b950fe20c5c5075f6d74ddbcd262a402fdb1057b4882c40d48f78d8f6260999e23d70fecd360d71b799ab6a486b28ac5f6d383bce0a02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sv-SE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sv-SE/firefox-62.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "08c58b4457122713139d7d5db7bdc1fb10cc3c8789b7052c95f868722c84679919b8dd5ec11c26343210ab962566827bfd350007f2e0207016c36754a4a24266";
+      sha512 = "2bd609749a8b22c3ee48919dbf69e9940ffd0eaf9eb9dd5e1d3be6c8908ac36ef6a30b5d7173b5f6572c69bfbb899bf92ca7e69c8038645a38e2c601f86a6fe9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ta/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ta/firefox-62.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "dbfea11dcb74aa27fe3f0a3984303ba813df0ef0a958c2fd43ebc215d00e7def02dd31e2450f98179250deecc98db79880c973048f53d72a6792591043fdd792";
+      sha512 = "abad5a9264de2a1120ec53d6d44776a4072ec9f62caa565a6ebaff4791c10b790d2478e989318ba5ce18bb701e733bc413f902a78bc6d4cbfe565da36e255d71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/te/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/te/firefox-62.0b8.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "87c4bb3f356698e2b7fe2968c100384e7f74b2731191d1cc4aa6e8dc500e5cdc94c561d8b06a2b208575c85b68abaafdbcd2dfbebe31ed8cc15d7acf4bca3fa3";
+      sha512 = "1c4a99ff6218baa53fee4e260fc9a917a8be5e6abd5beaf960fe7a0e17c19f22268cc62acd106b2ff87772fe4f200c1eb9fbcefa9d84c5ea36066408f8c74a2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/th/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/th/firefox-62.0b8.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "2dd48ccefeafd4848f480b24bde131667e87ed25fff8fe119c4d60bbfc114ad68ba350980f0eba9590c26eb631fa77db5873ffe72aee3a754b346046e89fc0d0";
+      sha512 = "47bb945dbbd1b23721e86fd8f250d6bd05aaa7833c29d1d891b6e8a5555dce59c3adf2f4427c871275c085cc1d0b433ddf1e0dae8b4644136a96fbf01b2c884b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/tr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/tr/firefox-62.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "cb2923deb94acbd7159df685fbe44477bd49d9982853d30567ac56fb17849f215d7e462a9cce9f4a5c467cc1d9632f89d956881fbf6ad1e90b9a58a549ebfda7";
+      sha512 = "40ee4e0b9dd1ad96cc1bc315453b2597c3a32230a7c009dae359562a844bfc6fc29d76bc779272b45bbedf7f51ac55b1940c34135113410151679ff6908eb174";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/uk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/uk/firefox-62.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "24931a8ffeba090ac00f32cce09488456e153ad267b7f43f15ae4be3921fb4547820fb93baf5f15695ad003c5d7716c1916f7742f22ba09ccc71fbb6de602885";
+      sha512 = "9bd74d2fd76c9396e61eef04a5815c1c48c736700120c808090b28cd4b93eab6232c7ca67d40a685ab7d7878d4a894c8ef5edff1624a57d9fda1f1689ef8aa0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ur/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ur/firefox-62.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "900a307a41faf1c1e3663e4b10ae7ef7972c3ce010c2e3098396dedd8d882c2769ecb5bbbf57d2b0cdcb21d3bbd898f508b4851792eed0d2e06a03142d204c69";
+      sha512 = "1250b38cc368996ff198adc3d4887628e8daca7f982e0c730d5f563757fe0744afb8c9fc35567cbaa97fc0d8eae51918ac2656e5b68a1c11bfaa41383ba85cd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/uz/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/uz/firefox-62.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "0bb865a14e5c9c33679c09f6fab5a1fea12a41a7c561e37cf20e02b2c424c85cd766c9e4769ac199a8cd6341cf3950cb64c15776bef1f8b992786c979ae5901c";
+      sha512 = "3972912f74a387d8d5efc8c7f0158077259f12005a9634f98e604a37407c96517f7b652e3b319386723126122e32996fa6387fd2e8ae9454412590353ddbdc39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/vi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/vi/firefox-62.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "b45a9c119d16b7d06199df2ffa49d44ca54101d249354e766a06dec3b7fb9b126d1badf9b787268846b8f0650ad033382c1a9a927bb62e0d260ad4c5880b5a22";
+      sha512 = "0990fcab28416bc0c4616ee1ecb33d38e6d9693b09a2aa3b546e1e9115a229a4ef94485cdabb8361619d944a02b1f516d7d229e984ec2cf4f68e2d85a71f83b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/xh/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/xh/firefox-62.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "a183e4a310e4a6cb4f0d98daf230b38c5c1d1852b8144f4fa8d56b05beea0e1b42fe4a243a5e551c366a9d724eeb7677175331d1b812a54151e3e0e64ff31fc3";
+      sha512 = "fba549690c99c67ab6c1d7c1e69c466fa9c91ae0133e052cd81846b18931aabd7d773817ecc6445c0819e71eb817c29b66d0061be60fd1caa30fb81f08473bfb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/zh-CN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/zh-CN/firefox-62.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "efef2f01d1dbf8a53dde1511e71ad33c220c76fdc8b6c9a68067f69d58149d613f7bedbf9952dbda386834f14aed4aaa798ee3871a6d4d018bd432ac52b1eeca";
+      sha512 = "305f09e1cf68acccfc3eab5dd147acc07b186d66d34b7f4642c4ba4b63e5c5d523c55f8f92460b1db076e9105cf287517f39460e3a336bd28c819cc1ddf4c376";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/zh-TW/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/zh-TW/firefox-62.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "9b247086e288674c0b38a6da4658d8363d616cc0a518d54bf8a7f46a5b0b1aa40798725a45a09162bf85e4e07a9bba1a0a5b80e458182fba92f27af6691b4fdc";
+      sha512 = "3bea23377782c0ab887c8fd5406ab4f8201aa302b37f0621ba3383068da1395353c483ab59c779171d57049f6d0b82dc900298f93afceab232c74d894a3de91a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ach/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ach/firefox-62.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b10f1bfe8fa0daa5cdebf7dd67cc79b2bba5c1bd01df11ac6157f557759737794dc591b8253bb2f911a9157145d56e95c8cae557319a2739c19913f3e85e0f5c";
+      sha512 = "66ab08448681715644f1fd98796a96bd8fa9107ddb66454efb281ff81e2adf14d7aa4d3a78735dc8a88a73be3278b44fa4f7cd07eacd396e3c3a0ca663c4876a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/af/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/af/firefox-62.0b8.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "479ff91b7b4270aacb02230de29e111204951c194bc70b534d34b1965e76b408340aa2d6e3c3496d43ff007728880bc9c36eeed33a2ca90e48e2375ebf6d158e";
+      sha512 = "f162b28ff504ae53accdf80099e07c67fd5d8c4cbe4d28bf3d3a5312a29f0cbec018b4d1ceb058f7934c587b0d1d3956123dba97e5548a90eec073b2a46c682f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/an/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/an/firefox-62.0b8.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "ea0b543308a21b7d364cba55c1a55be6c87acd86133ebee60006ac9bd73144b22f7c4d140401175c1c7bdca95eddd7a63c3cd622df2326b7a622664424f5f801";
+      sha512 = "954e118d203ed335b43e22c4743021cd69856695af2900576e461c5a4fb82db6d2410db28b5f978c0f50c5bf443b1f499348c502540a6f718b9cae80b691ef3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ar/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ar/firefox-62.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "78e9971aa0e31e37be5a8373109dce66eba95b444f2cf830d08566024f1260565903552708050f6428a755ed2fff727cf0ba177428d505de568c976118527e55";
+      sha512 = "dabf1adddd6687b36db7be633f3944449af48b9e7d74bf91a963062058fa59fe5abc235f7d0c597b335141e9ae92ead05a486847f1d2a21a6ada38ce3938b93f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/as/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/as/firefox-62.0b8.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "3d915d481b88156da4700e7b7669698b23f4ed761d808c3d3ba57c0ae54b4ed7cef38ce5cd1def3dfbf9fcdc8333ad74e376c8f1520ca6f05a69c7b3758bb1f8";
+      sha512 = "54ac6533026a330ab7926115803af0b511fd85b4a56078bc152c6df88c0496dedf6cc59f7f4f180465e5716d06838b7560c9aa6a9e9a8e9de101c75fc8d2bda8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ast/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ast/firefox-62.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1d160b65cbec0d222aefbf1ded97bc131398e7c10ef9e4ab03e0057d59f2999f1e0d79b7466f522923e286f48afea8309d98d2c1e6b1c9c3a81879b0471918f7";
+      sha512 = "ae0edb7e314404566ac706ba527c8481688555008026ba54f4acfd4c8c0e1b31aa84314820c137d412e75df9263143858a4e87e38e285db0eda7227850044762";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/az/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/az/firefox-62.0b8.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "db9556748397f222b01776df3fc920f1d75d3b89ff854c17aacde8c44777b7b60c2a115d80fbc5af9adc14e81d1801efa96c83bc3fb64aefb886f79f0fd09a80";
+      sha512 = "94695103f392e42dc21864ffb763cf5a29b5c279c043a867c7eb5f67640fa454b22118ee7928cd68299f14f58dffad093e67dda23f398c76971af24eae81c0dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/be/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/be/firefox-62.0b8.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "7a4591db7d7f500c969def96949ed441807364d5afe0bbd50960d3344a91afa11a553047210f1ac5f820e1f266d2974aa516c50f8f403868544b8adecb12719d";
+      sha512 = "a224ca31468ea32720a1bcab6b48479b5f1e75a475305fa922e3085e7636106011406b144904348ccbdbddced590210ea9e4a1f1aa5d1b42befd2a83fbaf68a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bg/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bg/firefox-62.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "418c8fe10153784695829714b50c75db6c380f22abecc596555646ed00d6a2f0c94d1eec70f000808f6343ada728b69a1d504e910676526d50b5fb1a7148f41b";
+      sha512 = "31aec72f23a034acdf81bf7afdcbdd564bc0f8835191d6e95badd9c8f726106b6351169fea5b5f8fea1008b0786ec26aa693473eebae85f4c36f43197ae8f57a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bn-BD/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bn-BD/firefox-62.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "6860c155ae24b95ac5e394b6e73d893b904ec63c057bf361c9afc3ce6cb8ef085e086e595da8f106092641f37bd5482cb4e07655882ea35e18174f2ca7bea839";
+      sha512 = "69cf522ea9acfbe7ee28cb5dfa3e137f1b6b9192935e14b909131dbdcbadaef36c77d2660a5216361a63ebea1608fcb8aef0dc53e0a6ecda35e7946a7fc81371";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bn-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bn-IN/firefox-62.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "a381c1c9d0a0b366859d7ce48405a84bb6fb5a116841cfb7e0780c390e42795a095f74727dacc20ea058f7f9c8c85e22e1da06133a10d1106e4d41dd5ffb0ac6";
+      sha512 = "337e70740147bc29e13e7c14d9e3705ca6477aa8791dff9f1752346514970e07ad134bc97571ef02659366e8d53657da688c3b5ad7dc808fca64382a5fce2a02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/br/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/br/firefox-62.0b8.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "3556210ae4bf3d2062dea53c267bce8dfece29bbf8f485eff398f76b9a4722b42408dabe34b4ce4f3eeea18a3390c17ac0fbfd33133ea5c009d13e7290e5f624";
+      sha512 = "e105100b11ac7f7271f2bf4d4adeb2a63dbd3c908ffbabdec2776fe15f2bd8c021142e2b20e9331481b9448fdae1fa7cac613194918671383ee7791d7a081d70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bs/firefox-62.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "52aecb7676940adbca112bbe17feb4f7946684f54f5a2111c08375919f78690e1340599beae4c886913dc97c47438c4962a2ab78ed01c29f235b9f8c130433b9";
+      sha512 = "84309476b384672ba4f9ba8cbef78584eaf1c73de33627d02fb8e125da57391778927a57ef7b9839b52037bff4a9565c7a64e899b3a9fd0f6dd1ca422f82f659";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ca/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ca/firefox-62.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "b92d1711a552b96b9617dbefd917124764cfdf6f79c657272a0a12bee6d79eb2f02228f6d7bc23002ce104f7475c28efc0e4d474f444349a1751f393915690e6";
+      sha512 = "1ebd529177ccaf448609a9ea09e5aafdc39059c913c5c7b7e75d0967d1256121ce3427d9a9839cd4d086cd41b54560786186bd31cf3c00441d75c21c4dda50e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cak/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cak/firefox-62.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "86d6e0f2d427d1fd6c8bb1c33ec8594e63f2349c2bd00faecee0ef5d0d24b2baf9b7a8f40094170a4c9d737c978eaecc7c74f0377fc1d13fba24a9db6904de1f";
+      sha512 = "a9d9988afb346a133962def1414970c9793d81ff21731a985ff7a333e3869e5bdc59f1d6d8010cf11d636d3bc743dff7487f9aa8a5c3a400548d0759066bf067";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cs/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cs/firefox-62.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "53c5c1b07f24c9c0510d40860b6944d613b3ffe4b752029ed9a32e89bb9b699fb8cb54ab2f25b9222aabd08255197e44e6cc3797bebbff1392c5a65ddd1a460d";
+      sha512 = "8ab01621c7533dca95e062c4f5fdb6d87a1db26db17f54a451d639c04816eb3bed2801355b9a168332dd6ddf6f452ae0aaf6db84f87837e8b6f0ad78130fb59a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cy/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cy/firefox-62.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4f634916df6f13916858d4bba56092ce8224fbc693c7a466ac1636088545c268a607f0ae986f0ca58404668913565da9ddf778a8aad0fec2de040c87c20edc12";
+      sha512 = "02d600eb55011b2351e90d3a2be289ba1ce6667b4fe0fb63a5dde03fbbadf85ea13d791b67161bcb0b604869e9dd2f1903c17337fb52b4ed32c3dfeb23bcca66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/da/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/da/firefox-62.0b8.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "1c35bb182112c13667121588db9d686f5797a29acb7b3515550d8c8631d3420409678972233bd9fd08d477985d796fa51e7cd7f5f72e05b8476d4451737d5479";
+      sha512 = "d4feebf408b21e1258be3b4dc56830949d4652470b9c148dd675b250eb2ff756a06937b28ce88f143406813d8750f0504bad001e9289e86c3d4e274b5cca6a87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/de/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/de/firefox-62.0b8.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "02b3897e181b6427e6b713e97d9b4ddb6c175091796577aa7c726ab0d865520a44435f26425ffa4e9f78a9a73581eca30e82a4172d617b15c6ab9e42caeaddb5";
+      sha512 = "58ecbb11eecc19bd748b69b8979bf1f1d029c16eeeb2f4945a75d968d18093940b09614e2d6e969129a3e405285f971856e7c74f33f2915431616e43507b568f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/dsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/dsb/firefox-62.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "82fc4a58d0a0a49f8b96d4457854ba295f11c5880716c517838d4329e5cd41044dd26b4aa20f036fe664cbf8813e4622ecc3b2069a7629fe6e03e84a87927191";
+      sha512 = "8cd3239bf1baaed9d222c70402121e866d98cddc66d5763d1ab8e533093828721c81bac9ec74bc62ae7062b4c176c1bb530886b506444ce1b2b2e69c503a6f77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/el/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/el/firefox-62.0b8.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "e4c46c68f9a2551969a06dcf55a7fff30a53b52896c3802ec7966d53e4527d986c2d15d7eea3a70ab90cb8bd8414de20e207ca40afc7866bc13cfd47524a752e";
+      sha512 = "25e495437e74fa9c2d55ed775cc7398acfc6eb8206847caabe8d1b99aa99fd9586bba1de6eb2c75119b8cc64b8f7f05ae816ff06f373b9552b7e9407d6eb17d8";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-CA/firefox-62.0b8.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-i686";
+      sha512 = "ac250fdfb15622b4f1001e8542591d43651c2123144286ced4b8323d18d320bad8d07fe3b5b1fbba245419e6f9a3e2c98d13499f61f3c8d1aabe6d4f3d51bf96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-GB/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-GB/firefox-62.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "1c478b893c558516988c273f9b82e27e3abfc3db28f83aaab952a9df5595cff6a0044ff8054f172d7ec71304d65ce0f67a682b9b0008213cc9a301e24901146b";
+      sha512 = "47a59793dc03b6946d9d8410d86a593fb9c43e27e2843ca8268b503ee7043b4adcb613b11289c4727f4441e2502e5fd1bb1cd7d78fad51b343527db83220435e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-US/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-US/firefox-62.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "1750541362c668f517431b6abc5d8096f0436895f85134ad008cd11d589a0b89b6aba7b54ad2d4ec08164d1bed88a25ed9c279cdad07b996657caecbe7f946bb";
+      sha512 = "cf3148447d9a69457b2314f670a24c2f4bb433ebe043bad2d6333f308567871ea4b43d6658d71f4f889d69146d0b87f2898272e7e37b5ffee6e77aba42360ef7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-ZA/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-ZA/firefox-62.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "71e632bec1a0d3b4c95d4e9ffaca97e18a0d936e4c7be8c2ce3595672d28fc7b5dfeeb73962d189d83b64cc4bad0e4855d80fceace8384c76bec8bea5d8c253b";
+      sha512 = "ac71ca325f78a04cd797a32e4ce02a511a9d86d39ecd3d730f990da201addad0a7d2d846e1467fe24f88a13f055194793fb1b79c929f902f87a8dad14a8c2ea1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/eo/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/eo/firefox-62.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "ae28a8f714639b150103a271254f9deaa405d86d9cfad0f4dc5dd2d198e64a59c9b34d7ac2e3eb723ed629452ba94de0218f7125d5e40cc1aa9f5e3bc7eaf17c";
+      sha512 = "919f469824c477539cb9bbfbd9a6b49282f22a05e2f5fa5b14f7d175005efbe819bb89b5219c70494d430f27450be8dbef682e7cd7aadb2ed08d0ab12a8ee8c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-AR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-AR/firefox-62.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "91772cc444e2f6e56103d4635c6eb3861b22a4d5dadb440f049c1cde84901b463fec3305086ae224c98e321b867ed556d7831de33cf91facd7d99a2896b7202e";
+      sha512 = "d6d945117c4dca2b547f499e53dc8155e35497ff3cbbf4829a7148be6e6f473d679427d2d3e316d793d81f842cab5a0c4c65980a1f0182b0064808969c6468c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-CL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-CL/firefox-62.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9d4a2209c1a8c8e620de33c43f80e09003f08f97f4bb551839f8ecb877967261f9e8b3e87449c3e2fb659a17a0ce408c5b4c3386f4551bb9b49b57347cbf0ce9";
+      sha512 = "cf45f9fa15f9082265f87e41a082ec83d6f6095112778aaa7843d3904417f0beb57cf8c05f3d7dd8d9ed72a25a9e7b029136a018098f6f87c157c125789e4e04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-ES/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-ES/firefox-62.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "4282f1ff6a953a2f7f30e7adf05470022259911c113a0777dd614f7cc55190b764be66cc025c4db1a65118e111612422ab02794ad659940bce9d3cec448368f9";
+      sha512 = "c994dc12c7a2535ac941a6b5a7cf5ff6e4fd59be0c97abcaf68af0f978a50e5193f5bd66c16c0e720863796bc000aecb005b1537d370eefbf9c063ffdc17a211";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-MX/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-MX/firefox-62.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "d01276bd4f3e740bf61f5d6553dc0252bb367117db56cc9b8df8df143df0db0c2624e81a926f363d9a71963f8ff1c4412c7cd41b8d7a7be7503a9f3177ce9b85";
+      sha512 = "a594ed7d8122ea1b55679a830d41308a60cbf3bc5073a9884907027a49d1dcaf7310d72b2ad3f2b727d4c15e72955d6de87f5909193e6c65874eff6fe1ed57f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/et/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/et/firefox-62.0b8.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "d48429950bd675d120dcee2c078d005d87ef84eb29012fad143c498e87962561c0f75f43f841374ef2af898e3ad83b67287a1bd200926bb6c35026f40fe5d050";
+      sha512 = "0e14c2efcbc025e109933766a42d79c048e4bcb2c37dbae2093d710cf4f3c277ad7d9c33239a38033affe1b45481e986f1677c168c7db47b9cc0bb0eb560f6c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/eu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/eu/firefox-62.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "ca86788fe7133a03b4bd9d1061da03d01510b5f997a5bcd5a186e21310889084053d2109820b8efa62cf0f1526e89271e2460a28508653e32ca34caad560ab17";
+      sha512 = "7b917ab09b1d8e02045c877de859330b3fa284f00b7888ecde7aad2897edbf00d130a0ce86ed52faf78f8c78bab791a005f9aa26d7de5b9bc18a510566d8a092";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fa/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fa/firefox-62.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "fe3f9fe8c832333b979ba34e1328eb11a38fd76cdbcdb9b19a4669df8d71dd7a34b0518ae5b9e71a1a41777fa1dbcb0ed0e4d0727c5d1eca56a74271dfebb3f3";
+      sha512 = "4fcdace94e6881ebcbca35ab8505caee6faf3248eec47f48652af51738ea4148f3ba5aa5c6ad06922f41b42314a847fe390cc8ca0fd8208825fc6e40b201b29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ff/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ff/firefox-62.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "7d8b940a57c3c3b019dc83abb63e7f4e6222f3705197df3114a560d676ce580bcfc119531f9f96f168353fbd4b12e58c107411ee62f152454f9aef33decc50ce";
+      sha512 = "2371b589d46e4104219bd2514abe89b58c07edb6a1324be872d127ecdf3b03f711672620e12e751bb0d80d79f5073ea0783a4757281fd650da323584a06b496b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fi/firefox-62.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2ccdfc0613d91e7066c640f1b310dedf0e1f6d89bb3d1ae71510b22bf63786aaf693211586fa25181e5cc183a5d54966c43f8cf60639f66679248fd3c7b3645e";
+      sha512 = "1c735d81f757948058a6433de854483552f8ab8bf863aa363cb89573a7d507048287f79279ea05ec805778cc70f39738f1bf3949a4491370ed41eddd95fd89e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fr/firefox-62.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "6a88924af75101f52b354e37756b9638320865d726560a794cf02f65b3c0eae46eaae0c980ce90757250c94d2eecb76275915c6a1160d39514201f261a24d239";
+      sha512 = "94a52b48326b8c6708366e0a4d4b62428faec108d9897cbef60190608fd1a32bfc10e1180f5a4544815737b7f02c9f54327d7062e94466c51c7ac50121bd9cb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fy-NL/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fy-NL/firefox-62.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "06a99118ab6a20e884bb7771a61093206fcf7230d097f606d8a162144f00493811f2f462db2d75d70bc7e8284b4fe82f7462e7382419b08841da5d441f8524ec";
+      sha512 = "8e82dcfbbcd398200b3103efd62aee511d6594805034c049205a59dfc7042e18bb6a86a7f633a2c5d1717721f22a5a20fc00f31223b2ecaa2b316c5908c3a489";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ga-IE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ga-IE/firefox-62.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c0b3695a8e3f3f8ff991fdf861823964129e142872cd79eb76a588eaca71b57c8742477a5ad455fd13d10e344b5c117a4a101e65d18148958db62315a572252a";
+      sha512 = "7cf134789f157fb07254028227353dbafacc6f82bd361f263233b767c3d5a2d82a0c128dae6a2e186df3757088136502240c1254974a05bb7e7d9171fa5fec06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gd/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gd/firefox-62.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "047fe3900b1e904d9f6d6ffea8866e56701ff269e6589fc2836021d1a841e7c524f25db5ccb00b91163901d8bd3a89b27fc98a1affdf4119351f96a7aaa56429";
+      sha512 = "727b3ae49955f3652a4315f24f5b614b27eff8ee9e9ac2c879f5457f727ae4d8b4d6f829cdc095ccd7d5781e3afb2ab4bda9657e4069d4d7333a4ca6a6c4178d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gl/firefox-62.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "5c7091e0f42d711f4f65814cf2b1745c14889d8206530911216b55443d75d9fe43bdcdf7b7221dd7a316553de5ee4327f1fd50fc9143d3c333926c2b22755f7d";
+      sha512 = "52b49be17fc6054405e62aca76251f7b4d8d343e4320886777f6ab5dbf3fc212811742a0d2c8b6ff537cedee1451330cf97582b0de9f5e3380f7800fbbca50b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gn/firefox-62.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "5bff9ecc955a5c40afe27775c255727d8eaca2c48e92065edff3ff841280b917b89ea2c2a5e53115959ea14b0c86a60559acf802fb74707dccd92241e469272d";
+      sha512 = "cb61acdef2b5dcab12a9feb7c1c5fc95e42b94d0806ad551e3d6965082d1faa8e47517447d872ae068860e36f14dee1f2d611fcd1be3ab70b81b43ff60f9daa0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gu-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gu-IN/firefox-62.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "e210b2a52074d446b835a47becb241ff01724cb55829665a3fd8661ff25f5a19c2f77998e678d485bf14409c8c88f1a8850a1717d08d1240dd844888ddb2dfec";
+      sha512 = "8b8cbd3ba57812a57e9b5ac2427132aa832f4c6a132b4d5fb9312f53a7312bf83fc3d07034527b8364f6270d92161d2c855a4e97750c579c2ecf5e284d1830af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/he/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/he/firefox-62.0b8.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "790a38a052543e13974134e9366f579a1f41b5c6c9e0c7b56c6bce0d44d1a9bdc04aa9a57bf035293b0fbc0c5ae02c7181673d5373b01c63579b4aaaa3f66ad7";
+      sha512 = "f56d01974a7f4377f59fa4d79d13735f3fd402fd54e2371cb375d081137ee461b1fadb37e87572e3d3e8f578eb39f3633849506fbd896b1528f71d9083cadb7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hi-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hi-IN/firefox-62.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "a987e5e132b4c5efbefe700364e094502b33471bab25d479934ff25cf4e6b614e9161d1d8f113852fb710ac7282d0c5845e5a1e0e3c3281db86bd79a12d27551";
+      sha512 = "0c9fdaf9319b7f0e9e8a6f98f98389c1ad43bbf60f671901410d9b73a58d31be6d538cb70319b08c317aaa282ba6e27fd953806913fdd777dea53c35709cfd4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hr/firefox-62.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "156bce37c7224b01c5f0929ee80a12088f57ee215f875125f646f7258654a91210792d52ffbc8e1749f85c9bf174d633f2a787160be01c8821ad6d1cd8118133";
+      sha512 = "5b7d723b6a3bf484b63253652068963d3e2ceba4ce938a9e15ee8575516121dbc548e05e0067e4fb01b0226d018ee6c13b80f9ddc92924e107cc2399f30bf23e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hsb/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hsb/firefox-62.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "0eb4815892e9ea61a9a7cc258c891c674df6abea2f04551f30a4cafdc3e4a190c18a6413a8889060193a3481ef19833e6703c2a7f527e718fe13222605d78ed9";
+      sha512 = "0266f52a3f0e5afc0aca01fea7b043ebdaf7c8d2036c417b6fc43ca44dda5e42356100e15d91e8c96f55fefd791d30a9791957037da9c5922d020f5941d1deb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hu/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hu/firefox-62.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "3f1e5afca6e56f251631931799be1fd18417b4907a7f075c9a4d78a46afabc482b3e6df0ade62dc5013e4e34f0080411c3a5171f8ece6bec1d0723d2d5930c0e";
+      sha512 = "d3d159603f644fce578b3595e4f536bcdd673cf9f7ed51ac2a3261a9896c977ea9ffbff3c514d388cfa5ed55f308558f7532c64615c014f307cc1ed417af3aa1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hy-AM/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hy-AM/firefox-62.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "f6897f07b122fd68e96dc502c3df8489d967a6bb5ff48f8b4fdf07de646d89735bed686dbfb8433277bea57fdd18d75ebb28f755e40cbb0b7d2fcb8cb8e87cb9";
+      sha512 = "6a5275434a8d4a7c2ccd950a90dea8c01256dd06050fbb89f46e3b3b2af93eca58cc63ba0a3d2ce74638ca665c03e50f531a38c2e7ddc656ff8b790fc91b86ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ia/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ia/firefox-62.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "4c1e875e73f0c4afb5a0f8ab5ec40f520ff2734f060419e8d3bff5e9f533774d1a52b554b3ca8c6a76c3286bc70091a1ba85a8e00cc2e64d6fdb3167be3f13da";
+      sha512 = "dde0b49642051ee119fc494ddcb8f460b4f2266bddb0b6bcbc9471024422b0e752e5931d463379b2bd093e263841770ed72b2a0f5ac6289738824582c9b5b26e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/id/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/id/firefox-62.0b8.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "daaf0fbef850fa277f6089bbde27b58fae2aad022df5cfa5428e81eb5e65fd8fd56b17466c6aa2ea9751c3ffadd3227100903413a62f696f134310f33b894a47";
+      sha512 = "d28cc78cbace72125d82987477c2d9d2842588639a42ee5fad8ce32c27dc7b1c0d0fa11dbd780e2084033ec92337e02b16e1b8bf7a4cc07751fb431505576f0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/is/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/is/firefox-62.0b8.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ee7af4acf4191578cadeed746b4a333ec072349dc7a334d4dcef7cfef4b5f6cdc736c0d0d465d809e564da7521d1591a86e0bdb8f059216f29155b99a8eb4006";
+      sha512 = "0fd3caf8fdb6131c925c4bd5dee53303eab3cd0974568291b2fcce7d3cf45ef303ecced2e1c35c36f4929a0ccaadb90c4f15eed7beac7cb557fa19d89c2ec589";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/it/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/it/firefox-62.0b8.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "548d9492e0da5241936c3c9bc5b8ba655a4334118e3b16758f3f96b53ee6367c9403f02be501375c96b60e20f9a733408a953c86cad48116fcc07b7ed907167a";
+      sha512 = "a532995d36104848afa55015ad2ace55bf75b08866d15a1d421e86dc9fe63db1e81ee394336266e466e4ccec91b152a52eaedda190acffde6c081d31d0034dd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ja/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ja/firefox-62.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "84e44c54977bd37417b7cc92ee7ffe51a5815a3a63559c53026cdf703931c418aef7a16e81b8a038a61209e0b246cc2d16d73a1ff42afaa81792e2250894b168";
+      sha512 = "42b91ea7daaa5c95ba73f84b9bb2bc5f7a2822c265a6efc0c00c9d0c2627d066ed1a59ba0124cd7c23823997b5aebfcc79477d77fa7fc537fca96f7a949b678d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ka/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ka/firefox-62.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f315c726215432bc8375044714ba66f1a02504d0ac4ac75ebd2eccddb69c7a05eff6ebaae84f7fb2a33dcf8571ef231e4c130ae168f00874a4fdcd04b6a16491";
+      sha512 = "56d98625777f708034abb9da0d2478b84742ad4a6275a0f4a410d35c431eb50f12364c6c822d5e315b8dfc4eddf7e2d36d5fdc42775ae1e49cc2b0165af027bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kab/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kab/firefox-62.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c5d5ce3a7aa32fe2be100b4c1095cbc7ca533ec6abce2c770584fd108e5671ce7e7e4e3bb7d7bd68d66a78f4e04aadcc2e6fabae94526dc6beffea99629d6faa";
+      sha512 = "17d385688a810c6850ab2842777ed5af6848818d78226fd931a26394f2b423c04984c38822aa0b9172fdde39c14155e6cc35ba6afc3f7b1ecca37bd17aa3e088";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kk/firefox-62.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "8338d1d56bf64f419ead646f8c79afa81b310a24f250625f637a3bedb2db3e60850d2f2d10e393098838d8e65f4e7dd870cc7fadd34f16c81fda20578893888b";
+      sha512 = "ad28f77aefc1702d13ff96a4340cc59729d62d8cb195b9b909f991ad7d2886884fadfb029243a35ae78e400f0a9873ff26a60d609e5f2be934bd74193e971542";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/km/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/km/firefox-62.0b8.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "c408f89bbbc6e90d831b47236cdd6c4b2086556235e7c5df65a3796fdb36053c70eca365016aab3cced3249f0f50794c741454a7298e42c1fb9d261faf6b9627";
+      sha512 = "2a39367c11e5199a37b129f84011c724742d60496fa9d0abaaaad99b81dd42cfc170b49a91ee5227a138d2dc11f1558e2b6fcae1097f04195595e5a24d837910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kn/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kn/firefox-62.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "02aa0007ca0e3495c343ebed7bec89c30d3b0b34a2c09d8adb9e7e61846fa3586bd954a53cfde76b7f7058e2f938ffb1f59648e3968a3f37f11e56f34de1a628";
+      sha512 = "f8a3d491f4e2a4490df7948179d1f4a94c9d59f090512873853ac263632eb5b859eda30c630e00a37ba8834f53e7fe8803ff92f9c8c63b46fa11126e98b394e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ko/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ko/firefox-62.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "12281135bb407740b4bd2098c6382ae440e3fe3cda92cbef7a9ef38268d2d72b357330c8f054f8365c4b2301709bcd3119759818a1b86a25697d3843191b6b10";
+      sha512 = "67f172b6674f2afb59624ce91b3fd5c478447270324b97f0399ee4020c83befcacb04ba43a34d58a7bcb75ac4e3bfe09c51213e27a30285a5085219ca9254812";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lij/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lij/firefox-62.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "4d28673f495ec4c8dc1a7bb6915ed8474fd7f378fbcacbdc5633835e3a33c89b8cc9e82c5258fb1975ef5675d7b72df6c0ad2d909003b33e60d89737674c51f5";
+      sha512 = "c52abc55645828516da84e5a27374bdac3fadf939a916b728ed89f79ed3b63be2933a4a5d90f005935d14bf7d52a45311af2a63c0474a2749cdcba9a8943e83a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lt/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lt/firefox-62.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "9a7939df189181535319e74eb28c87d570e053e329efd42c32a4572e953bbd975ee8c310deee24a5fe31d9cbe5bb209d36c6525c6eaa8ea440555d87c3ab91b9";
+      sha512 = "6d690bc2fd294a58208935e4fbc63f286b4b2e719faccb918dd78b0a342afa278559347cf39ed1e7d040b85904dd9332397b129084d1aef267d488b3f3b4e272";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lv/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lv/firefox-62.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "fdf9d973305278e3c7fa677e3f884ab533fc1895b68e8318846a8771038a2b876aaa8465cf0e952e67aff0c3b6529f2c988226610ca7f1359aedca464a62a9d4";
+      sha512 = "4c364a343e569fb793f8f0373d4c689b403e6d4fa44e38eb8560e1572d03c7958dfae42e6e0c1aca4c43eef455c41f8d592084852d11c93cc2c6e8c219bf39aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mai/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mai/firefox-62.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "c89e58c8888bf34a370309c9d29ebd4870e18565b5a41cf0e654c773f0daac8f1e0f3d33a2df1d7acf8cdfb5a99a17c2407bdd1027b30f2d831cdf11bd4fdc9d";
+      sha512 = "f65c7091e5b6382401c9acd175df3e0ed4db61371b467a2d5eda4da97c718b06ca911796d9a8fcff55cab3420155eda88226b2ef3ff2f00bfbdc9801e71b6cf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mk/firefox-62.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4ef7ac1803bf7634e754d3719c3ea53f2f19e7d3faf47f0c91ed1bd2446871d43ab33b1786a00f79f8e68ca57361778a99663160bdea8a196d109a6c347d4dff";
+      sha512 = "ed38247a800564d8bc7c480fef34b342353d6fd6ae6cf9c77af3928d849cd0ae85d717a0e71429ea0bc0ab3cf11d66a8b68375159c25fdbb30379312880b390b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ml/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ml/firefox-62.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "40abc6fdc4ba15d88af54dca0aefa33809140ad3d7059eb17e86accbd1a788d045b80bf94117819813647b5b5011c3e35783bbc7035808a42668c44278170845";
+      sha512 = "417b83980dc5019681d13989650019ad81a399a340b7388152648cc98f8e8c5740ad892b0a905e5dc4dab8f25f277b982783aa62d5846653caadbd40fca11a64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mr/firefox-62.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "800461d8726ed7cee434d283bd87942ec1729d5fa052c4c51e7de44a69b4b9b2fadf9c314e504e75ec713e72f53aef323ec45708b3ee73ba758c8940ca44decf";
+      sha512 = "894e581f7596e7700234cdd0bf1dd787abcb3f088b12f7374e391cc2da834b4ff3737a4ba6ab1cf1b3d9ac43316551b794e4d0760559267f106369da9d8090da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ms/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ms/firefox-62.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c00f27a992e42b8c5c707a07946582e577431f6e0603bd1d6fd23308961230923f243fa07b484feea97e9f05a66d4a0ac9d2bbc4f6a14153d49bd5ed55eda5d0";
+      sha512 = "8a258945d4a6ebcd92362bffa54ae7e1910ff53b2c8026978fa419407842349412b621213b3265da867183aab1ecb0ad5f7a01f0e994c411a4e4caeecba6ad55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/my/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/my/firefox-62.0b8.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "c74fea7e9ea9f6967893293b11011c980ad1f621aacfab2fd6913d6fbb39ec4e33480d527a677237495bf7a5fddb6a2b012713251ab58b033a90fea856187501";
+      sha512 = "14319f1cfbba49420dd36d8c72df942ea7bbb8347e1354603709be1a74ea72e1cc347f906d14aa658f52a6a200b38212666175023fe60fa320abd08c5188b3c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nb-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nb-NO/firefox-62.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "f3cb7b04a139a7c4d9974fa50ca64e31109b05719c65c02114735d05e0cbb1a8274b212470d3c49150afd28c53b8b52083bc97fa95d31460b172bce81852414d";
+      sha512 = "699a1823692cff174f372ed91f42fb3e39789ef7eef98b2e7dd67586113b949ca36136f71b6ddd7671966e01cf782ee6503794d2c2728294b1c7dcecd960cc47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ne-NP/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ne-NP/firefox-62.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "21f328f1deb08a06957195ccdd6de3ee08c316655643e60f4c1c8fd2748d69ccf778a9e108037a859ec1ff9f079802b6f70a4c0f5436692eca42f0ee2b6a18a3";
+      sha512 = "f32b70758b5da00462b02bee115e2fc17a75587996b32bd3ec6fde8de1be3b3d1639e813230545d218b94b23a74bfea71a47f6313e264914b14e624f2d5ffdc4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nl/firefox-62.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "c640dba6a09dfaf25c9d76f26808a5d5a6d96c7c8164f567c1be396af32a36b64b07eaa2fc4db7b011aa6dd4e63b31fa2d14499eadd59c34894a8ac16b6e2bc5";
+      sha512 = "66b2ce7a9a315c7b79addd6579e82c8e28ba5d4629976b8eb848b9fc07ab86990470e71f767dde34279a0021c7d9670a74ac3cf9bf499403377d6fe6c7047288";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nn-NO/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nn-NO/firefox-62.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "bd69bba361521ca53cc4603bf874122cf21977eb86be84f58664da4ccb7d330641eed6084fd62a14920ccbf9ad723cf3edcb44b2c672e6fa46ebdc3129d5e8a1";
+      sha512 = "e29bf8120d1828f25664c66871bde593f5adeed9c5772d3d8460d4eab410387a05a68b4c61a1d909557b069eae31650a61694b0b938a269fd7eb026c9166a94f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/oc/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/oc/firefox-62.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "6b325721e50c9f5d3cda7961c169f1bf61379f199f203eb04708e5daf5adf4e5cfbdcafe393846be8811a95caea08eae379413f070fc87fcc6fdc8d792429bfd";
+      sha512 = "0e87d74e3714b391a7adefe05432dbf3d0d0a59f8a042b02ecf3c26d08cf21fdb69e276965b801c942704c935a2190bdd381165c2e1eb76825e861268fe4e305";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/or/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/or/firefox-62.0b8.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "fb810758c07df0e88346e9da1b3f69b8ad0c1f325253b4066f979028133b35b6f38ec6ced190b469302edeacc2be1480a89101ebd49595692ba4ae0810336f72";
+      sha512 = "92530b4abcc39fd7411a432e4e0978cf9558970dc1a98b1f383f6878fada5e3d9cdd258e41b62876a768014c213afd577fb250c4688e234715841275e6f0b81b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pa-IN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pa-IN/firefox-62.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "a64fc38eb4aca8f51323c0fd579f92710f9f2130885f1d3af375ba22be6f052354664abb35cf92be820117f37c2e86dceb1a0dae6b06ffb2a38ddc71d35e6afa";
+      sha512 = "65e8d369ee686ae8ad3e26bb72e768dc859e5c49c7a1cb93108309e917c97619984429a5fb3250f52276609a23ca330c49576aabce2fab99982940e92caeacc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pl/firefox-62.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "90284224c8c4b990280e60d00c7d787a4702d466a4a98be69948d56e9d2142388c39eeb0de77d7277b5df97444de7c6b341c42020ba42dbaf1c80336cd8f2397";
+      sha512 = "8c81dcab1ecf4c63dfad587b12cccd8d130633c41a80964852866b31e5075946e40ae3b4ac38e46a986840dd72a1cc1e4da90d4fa5325c1c5c87e187593ad268";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pt-BR/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pt-BR/firefox-62.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "09f22cfa4d6a5d7943ba21c46b3d272f002cbeb75c70de51ced0787ff45068eca9a6f7f1b336863ef315b41e8d6145cf77f974c7ae12c0d2825720fcc32f6f48";
+      sha512 = "3982eb2823a7bc4cfc2477e6b39f45b821f6e4f3a86e8941af5d308e5b3e9f299bac6bee27b1ae9a360d55a5be82bc08e39aad6058ad9d26520197a333d12b5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pt-PT/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pt-PT/firefox-62.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3d6f83528e8161f5dfdd6f35174f88d677ac97fac3ffb561450ac54367f552cf9c09ff08a69a82224123ca271ebfb2d011723de4a8a86708ab0afd34e9806c30";
+      sha512 = "b6ac02641a856cde768dfb3d9bf3d843be1926c2be97690823d9b1b8acf6add653d388dbe388321e5149cf68b8b6e33228a698e3bcf84eacd073078f3fdeedaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/rm/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/rm/firefox-62.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "65043eb93f0b43f1e7a4282732d06b5d4043f898eec4324ece23fdea36812c85871fd943cabe8265badae913d7338e925f519732edac792429f7643adc062332";
+      sha512 = "5df66816dc8bc2a094b62851c451c3276217b4f5f3223bee0c93d07cfdec5dc32092b85adf2a4bc924773abbb24aea1a734ca0a81d322513ab4c24a4429f186a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ro/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ro/firefox-62.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "d78f56f3171789ab1254f6be63725f5a5462da78fb1d6f5df1acd4d2e3baa777fdbddf565d4f458e678508cc0aad8bdcfca55d810e86a1c7bbd490b303134252";
+      sha512 = "08dc28f4affffe6c26ac26ba0e572e8b5b68c856317836b7e936cc88a2559c8ee92ac5ea1b796d0e42c614de4839aa3cd40e9e9bb7d1852262d92baf91255827";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ru/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ru/firefox-62.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "51ebb33bd00d2444a1049222fb8d97d846034fd4eca5e441b066c4da262080846e22d893e1fd7ed6eca390112f8694996cd001a28ccb7f24769a3fa479cbb453";
+      sha512 = "173b0b854c3e0cc681d0e7b576e350b7912d6441345b8e9ac404523d12c49fbded11d561bc2c409c56da41022e0b683b8c1c39bea743eed4a0fec5dc8608ec16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/si/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/si/firefox-62.0b8.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "097e100f8b1d476fda5d070d87ac3a0521889f5c2aa7a26fa794e01b518b311ce380c8731bcfba41db6e6dbe24c6cb83fe8e595dc41cf2450a72f7e6698d74ec";
+      sha512 = "73edb5fb6138df5f4a48f246a36fa36f2b1d3b8196cec6e3de7fc2258bfa6cbf1c4fa2b30eabcafc76bed63f59fd824d6956367f151b5edc5346b5f3f9fae29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sk/firefox-62.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "603b641c4f23a68767cf97945d8e72e81abf2cf40da031aa6d343729ff028a30c3e4bed074d4377aba9dd58d3f0d18a80bd9cc15ad81dad873866ddb9f6b00dc";
+      sha512 = "440c8176c33d9c9d32dfee994a6e19f25fd66334e5654b13472e31a3bba0e3aba82848b5c8f14762a8192ba2c391c8e32775ad856d99ed66cbca22ad246cf61b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sl/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sl/firefox-62.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "6eaba505da78615bb9345ae6bb3321a089dabf470d6b4d10c08290ab81f0b44df346015e96c95b413d32eee27bddc53ca5e3d1a632f8ebfbb8fdd0580c937fc5";
+      sha512 = "ec372b7fba0127ef08ab288e97590b3e0a70739a8d36d874d3a7a140c2e01fe186c80122aa96b6ac46bb4937911ff1f0d3e9c50f03240a931c63f43540e07cf1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/son/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/son/firefox-62.0b8.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "dddeb77817ecfae0e6671c8db2aa4a0c313c3d7bc11474be4d2933033f11dece142c1b6d1e12fa1f2650e7691dcb8ddd58a2ee9af6005620647c06d69f6691fe";
+      sha512 = "5bd52abe9e2bd74bac9b372a26075e32647f09da235046926449ff252b12d9f7b67b3af2e66190db0ab344d62f367f0e2e9d57078ffbd0f758cff0140fb3570d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sq/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sq/firefox-62.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "b5f3e7e78abbc20d612ea38ed74697f4543e6b580605cd37c630ddddbb15cb6829af2f69fbf470981bf47184b4ee501426fb515c6f09fc4d7b1156bdd04002a2";
+      sha512 = "f06bc7d0af089eadb7f465b997f2f626347fdf2d418e9c5c74f3f9b810faa67977575600ae8e20ee888eb0acdc9da9378eb26044d8cc2ee0ef611c4d4ee88526";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sr/firefox-62.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b1687aba62e211f614d0ed4d307fa48b8228109665f42f1557037ab645f87af54b1c0069f54c14e09d46d652b68e6e5802f83c3052b45c29f5ac9284934b2961";
+      sha512 = "c29b7090f8890ba26e8d3c8a32fafa7a56b0618109547b3f911304029f831aeb6eea7407e165d1b2643d98153df86c358978da4cf4ae301bcdbe9b287667816e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sv-SE/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sv-SE/firefox-62.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "fdb632c4004f721fba16669ffd8ae0031023f55fff3ab0de3f045fc408232788b4aa7dff4fd5bbab847f1b7a1b524fd786dd9c9f63ac289d699dbfad687a759c";
+      sha512 = "8caad6ef2d4302b0ac0d41344a5c8c1e6ce490dbaee8b727d2113a47354c56a4ab7c62925875fe52f946d7850111358a1c24890fcdea6b62f3e2e716d907d82c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ta/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ta/firefox-62.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "a53f07ad5212a975d201dfec81a89c18ab83e8e6429a67d835aa47897d8a5ac4cbc676d178db41fdeef4f5d066813bb68fd5b52c8dc9d55b8830be2b69b353db";
+      sha512 = "5e9f415e6c6d706b9fa895e6166b147ddb53b5d7f86d556e436736dd469f2478d9807ec9a8453e54829fe4a34c97d85a6c4854e9ff8e67d5f4c5e0194d626f13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/te/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/te/firefox-62.0b8.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "9cc6d73c01531a72dd59fc19e56987da093518f4a54b76e6d40fb6f26b708caadc7c301d069ba8138ea91cd667c46e1c298aa63889b067a1b981cd3bafeb55fd";
+      sha512 = "f74eb03c0d08cc80c9c8954d23e70b2356fcc530c4fff4b38cbff17e7d295fe065a2388042d52eca2297ae9234cf3fb1735448ee767b8ca087cc5189b8c15016";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/th/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/th/firefox-62.0b8.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "8afb2048fd071ec612791c26892652c01aab0d12798cf26dfb5af69e97962d805f962c555e4e6c842d403286da7572724022885f13599fbde665dbcdb27438fb";
+      sha512 = "160a29622cbd47af6a914a20554b0f64786aabe06496e2cb0f647bb722f405922d52fcb7e49f6f44441641a1e987f6ad70bc1e995a63e691f2cab685e5192b25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/tr/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/tr/firefox-62.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "2ef229013fbe4221920a2573b7925be045ef8062b600f8e560e844ec87420506df3c712378cef34e7890e387f0a8d4706f7ceafa1487d5f024a69cc46c218408";
+      sha512 = "369171223ce036e3066abeeb30b14b4206a89824cca71e5a42b83ed00652e30fdd297670659e55e923298e26c4f256d18041f6dcabb71268641e940c2a753fe7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/uk/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/uk/firefox-62.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "ce10d72b1eb8ebe01cbce38722ed16333b6eda3616aaf398a40c685ce062874339599a1c1344b6d9c9529e072564f3bf739b56a62ad0c6deea2ae2f5ffa29505";
+      sha512 = "12179e32d115d8077cd9d765f3aa9131fca58645515ecee0c9b9f853fbc498fa4c93cc2c29eada9f3c487658ba1a13815a85ad9d4d9bc4e81d0f1122b132afc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ur/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ur/firefox-62.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "52c7fa6169f399eb224bdbbafef9951285543a478985088e60f601fb5c798855d24b1b8257d29ff44ed6c5435fea4e65ec1e1164daa0b7e22eb32152d172e6f4";
+      sha512 = "69c276cbd9e5541c27accd171308ac575cb86c25035800b80eb3fa3a7962c55da79fff129b8c6cd96710481c3aa51d94ad8daa3bad200408ab138a90e59d7826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/uz/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/uz/firefox-62.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "835f1cae73b327bbb520935b801b78bf47b9e58a03962aa22a9d2b933f187670d828871a679508702a0ac2d461e17bdad71a3e0bf2e8d34824b08dffb7f65d52";
+      sha512 = "c670e1ae6e93e54d71737f6fcdad8398a61e6a0184efc8690567bfaf3e71a97c25ce852886442d74d8bbcea2dbefdc8bf498db602cd0e9b61ffe09fa6978f198";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/vi/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/vi/firefox-62.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "f4812bba2812a71e004107a0d761795fe1feaa9705be0afe7db5462782fc888cc677bf5eaaedad7f5f914b827435bceba8322dd246274539d095b082f1221fb8";
+      sha512 = "dd74b6ebe0d820b808444ad87dc21c72490cb56dc6e3cc0b80e979074456d9f9df8538fe64326fc9d1e9825e9e2846efab87ca3e43282ced753effdf605746cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/xh/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/xh/firefox-62.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d8ba71f75d3131dc130a638692e42565cf9a5cd976caee18220cba6bba8a858f728f470cf345294d286bbbd3e2059554018f86f33533fd9dace88f0e0d97c0f1";
+      sha512 = "1e7e2dc1456772c6fb9c9bf7dc41136d0466643db2757ac865dd6595b46e38a1f4c0c10f0e34dc11da5f66fe8e810ab512a39ee21ee5d1470ce46e79a6cf568f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/zh-CN/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/zh-CN/firefox-62.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "49ea68976c1ea0a972b7b228283cac2a1f0c9bc660da4456e700786d235e7f40a04f89a69c337a65e82a4c200307120cd2c8cbb1fe3536c9d417be07a80c42cf";
+      sha512 = "c9521852c781e2b57c6dd6dee07c184525b61eaca7ed49e4cd792608e7ecf4268ea4fd02a19c86cde07e0493dc4ef360716fed4ec51e03b8eab11af98c55ac3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/zh-TW/firefox-61.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/zh-TW/firefox-62.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0332cba8cbc962ab2868bc61de0748c446c098a45d4ce8125c78b2f7d167e6da94348cd255e2910471c9ff7635d4ed8500eec27c1bbde21e79cd65b7f88fdba4";
+      sha512 = "234a05c330e0b13396b523a522439106015dce8c6b76f49becc2e8e9498e325b73d35cab168950e059d79a0220bca2845fcd09940b29336277643733f742f316";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 32adb56c931cc..2665a20d3add1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0.1";
+  version = "61.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ach/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ach/firefox-61.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "ca1638e32f121b1f366d89934e5516ee23cbe249596a7600f5ba1986fcb014d9125d24d3d7a38f251aa9fb527d368001ccc0af80063a7f3abb02a2a920bc7fd7";
+      sha512 = "e872332980e0af6f087aeecf87fbd824604e0f30f45f60d8ee6b325db0536cd2f79fb0550236baa7b6d2087fc85f3561ab793de273c66ddc44896eaf185104b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/af/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/af/firefox-61.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "f693b42ee4380fa6c0505fb7971984dcb466ef2a1ce90c09e8088e758f1aef5d3ee790ac578737523ba93f2866dcc92722852579cf4cc5898e66adf28ce17495";
+      sha512 = "882595f99b6481a42d9d2e6e11ff9e71b562442cb267d02b3f23797cd96dbd588610eeadddceaf378f22e84df01d63d3e3941d5630a9e1e117043ff2c4cc9919";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/an/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/an/firefox-61.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "4858341f974d45c982a9c3c8285de2932db81c8dbdd124272e7aaafc0e4712f613aec5e4929ad0182c1801850fc394ebeda38f08a40e71e29ce111c17abbfc7d";
+      sha512 = "ab697e5e4b1286b19fc8554c248d95afcb5c605d4e83f6d5d060280e3b0dda6b3214fee6b05aa50bc34713791fd4236f7c6e46b42de5131b6f4a66d306657eea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ar/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ar/firefox-61.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "dcbe81e9b0910c44530f9b8f33876c8e2df6ca314172f268c9b5cc53010f5f4024b37929a726d4c138033596d904596a6040b6770e796d20a9a8999ff3e84ecc";
+      sha512 = "2b149c4a4fb2f9cc40bbae2827f17497510f9eb979db3ccf55b84f9563dfe0c08fcbcd36e74b4e685f940f4309827091270750f66d1f96e9b6d01ce591c400f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/as/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/as/firefox-61.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "4420f102bc6d665ddb568d3a27001cb91ddd76ac20ebe65c4c6fe58d92b2b9406a47c492c2f5ed4da42a48355e30a982c81da2b756826d239d443179bd6deec1";
+      sha512 = "d40d924dce02fa4f269088163901c643b902bf13d45f15a902da0c97b734ec2924b0346161ce86cf7336018c46b775c7202dc516b4796a3661be56f5bfe66b60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ast/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ast/firefox-61.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "5294a33939e40bc868041952830593fafb27f7be2eb7fc163571a6d08c7ccf19443f177bd73e4a3bed96d73103d2fb696810982648abfe300973c7ca7c6677d8";
+      sha512 = "a705578265e08e3ae8595074943378ae7ec76d614bfa2b0d3affede6842172b605f96db4aaa28165d45ac9bbaeb3ca4d3681cac698a4a77b14e723ff2368575c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/az/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/az/firefox-61.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "272fe5c3c276e9f3cc9554ebada40a90762af24cf6652a5fb9541f41aad964358471f2c19f94b3c1ad59eaf93a4ee507617f4ec299d4601c41d72a6620d0cd3b";
+      sha512 = "4189f7d1ecd2738876a72e65641484320ff0c4e50faf94d782b0ed3b3b0d1877a4767b45034ff8296fb54faf7f3d6a388579cad5eb9f35a60def134a5f02392e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/be/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/be/firefox-61.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "75689bbdb2f678ed36b265696d21d6f9becd7658001e15bbd8bd306e683b69d4762ac1cb27ddbb12638f7e626927e36fc0a16cc7b98479c5f2e21769dcd9cd06";
+      sha512 = "103d650c8e4c81339399a1afd8cd92a2df39cd4474280307f4902e5510b679b3985a1291310033db28995f483121ab55ad0c890b88b71502769da84e4dfe9558";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bg/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bg/firefox-61.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "33b7aa767bb6c234dcb8406eb7eee3160424192dc1a76b9c1c7beee1de42d1c623ad009ab714e60c62e07bbb087cc1b08feec7628361739380a767bb7b43a020";
+      sha512 = "187ec7aabb8931f5b99a7ba400947370df299a001c06d923b7d95c4de5d2f044f92cdb13400ae751175d9d50ede3be7b7cb2a22d67d07480bc6d30cb0cdc8e2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bn-BD/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-BD/firefox-61.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "3c6fdfe39d61fd681fa3d30a4ea1c1ef7988a1345912592a79b9622f18d1106ab96e099fe56b428568467c0c63b56e2cc09bc5fe2a9705478f458d5de0f36433";
+      sha512 = "12db6da4e99ee661595773c813bda46ac3418a7d6c79b2532d6c26bc726dead4d9e3f4c913218f858e0e5709da6384befbe976b6958601ba1453ae93b7595b17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bn-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-IN/firefox-61.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "d9c67926f2df8faae64a6d9848a3823bd4968cafa1caaaf8b2713db2656c0a6c82dfc16eca9741c274994178ea46a7325b5f72a11ecafddacd8cf4df45683a89";
+      sha512 = "678587691077d68613a4d3adce48c8b73660001c7359240b60325e315f792c1febd01a05492d494df13b19e6d8ed6b3f3d00202acd4ec9468bf744fe627ce08c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/br/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/br/firefox-61.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a0ad58a34f85b254d5985a1bc6a2a0003a91773ba43408a45998098b98fe104b9f09e4d4e9bc9ab7ec9cd378692beb6e9f7aa4d2e55b49630c807bf0f9d158dd";
+      sha512 = "1936b78bba3d802b6a4ca598cbbabf840f8febc19b27e4bc8994158874de076d68b44972e1f1ffd5f1c5ef29f6d08605b1a6c087c69a4bcb4ea0363569d79221";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bs/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bs/firefox-61.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "3c24cba1629f4458832d09df121c897fa08c6c3a02ddb42d4e232207086525ff0dd01adc8e133c4ed2b6fc909907efd87f985cf0bc1d27fed18055ec566403f2";
+      sha512 = "03ff822e4f6dec24385491d711d9b4115bcc2452d79ea46542e303ec17da8e5034206f4117d9d5218257dbf33928230a17e51b73e4aa71760167b11ef36fd92c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ca/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ca/firefox-61.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "75d63bd285257a1f8a6dd97981914fbe0886d77abebc237f08abb498a34bd1f129e38afd6fdbdce3da3d7dab5a7138e1da883ffad0ca31f954da68fc3d273ed4";
+      sha512 = "91edb8c454d77b829a4b639f3eb820c4f8cc62e83ed759e817ee433eb5063d0565b2f959be21a090ea9a9b2d36c2345e1b8024c46fdf60679eec91f6a2aaec31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cak/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cak/firefox-61.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d79aaa1c8833f2fa9c9612efb8e5b7a02805c37f1fc45db6f7fc2f6288c48f75880ff46b9ddd96be7f05b674a8201f3c1bcbd36d0deafd9072aee5dce8f18ab1";
+      sha512 = "654cf46693e478a242f900569e64d18c0f61e2d6d45e8b5af0e46577118083c0fcb1a11f127453d70c028bbb1011477f9420b3a2456afbf5f328803552879e72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cs/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cs/firefox-61.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8b01b051a92320457c9364ab0f28761a7dc574b35777098bb773c9b0ec64d8947a76a2bf3c58b3b4a073e392f7d07b4f804994854c6f625a9e9dc51cad9bf914";
+      sha512 = "81b762008dfcaaa2b7d2921d84267f6a494e3cebe7e899cd6d0c70777c28d17a97647eceace8dd26e3dbc03c86d21c3471aa4f5cb2a95548b790a3805dc4f535";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cy/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cy/firefox-61.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "9f0e601b41e8f698de134d17d84f1b43d8f91d3319041482fe698fce34c8bcaa0da31e1e113fde72e1760bd93dc11dded02fbc917d69cf1ab008518e54c491dc";
+      sha512 = "398718832a292c556f1fd0aa735db9a90776d1fcc88955d2acc2f712e24106ce89d532456f9922d3a3a96136b508a236bb2bf0edef8f2f6a1670d02f12102200";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/da/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/da/firefox-61.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "dc4280c4e4f7e51befe4adc002d6875f9bdc7d4cb592335134d5b0df18462b6fe54817dbfa2815375e8947bf76d81ab9ccec31b7b36f07ca2b11ec04b3bbf728";
+      sha512 = "b77a4e71d3a48e7d2de30f7f45274afc6e81f3f12fa6391b62973489153709a4f4d13d8d880ee5546254ca2c0e48e8fa24e5b2f70364313f6fcdda29c627f26e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/de/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/de/firefox-61.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "f9c7e6f1b83616883c74ba8fca5d21b793a811868e15e40611c93312f76ca8d8c37c4222454a8a71bce47d1d30e8596ed5907eb9300c3b5a957ae49249808c7c";
+      sha512 = "ce223acc8cfa532933fb29896e5169ce3a4c9b187ec5424022e24d77ea5f8c47bca8b389258f13a2280d32aa0ef1490e71e95c6324e8815e91f0503d66ff7345";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/dsb/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/dsb/firefox-61.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "fc41281038372262d135de8004a1d7b03a3c8047fc20ab0e6856b696eee3260328a64b59212a809eb03cad7efd58fadda422e44153e7c8e33415d0efe5321c63";
+      sha512 = "e79b5ad7f5aa1e8f27ae3ae7bca8a0ac24eb73a1a9feb6fde51584b46cebfea2dcf3cad67a61b0e612e6dea900f866ac8fcaf8bda69a11d545cf883c6fd4b7db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/el/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/el/firefox-61.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5a5f2d3f2f83e8c3a4bf358cc9611f1279fbf218f24c4e5aff69efcbe4b27ae08b955bafafe3a73ae1caa05914bd4ad739f1292344d9434f1f486f5e615645dd";
+      sha512 = "4bf55b08dafe5e9700a56b11fbcb4945914e7805279f40f805815bfe57bb6520667807b6b6ed3fc9843d3cdd1019faeb17428eb5c0fae8b3152b5d7b2528e5a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-GB/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-GB/firefox-61.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "19b09722af085bdb016a12cc586ec9d32371d293f3c5be660efdb792e2d894d339600cef27325759f0489a0b3a4000123685c19db5b6d933d3f4f51244cd4f90";
+      sha512 = "c7cc66b75a630fda0f6e10cd9496975fb63dbcefaf1f6988f66f1f5e86925d569ba770df6de86dc3b479f43ade9e43d515777475dc34ba8ca9d1f2f86623a1a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-US/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-US/firefox-61.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "2f7c14e1ef94ad4751c7382d7b012fcd36787ee1045918226cb3b0fdbb08508fa986181f54e304df12fdb8d49aadd62afc936f5855939437a7f9d8860976398c";
+      sha512 = "9eab9c7b56ae920337b21953516271fd9ae1b3f3ebbd549e3e1145f96e0adb98dea082167923badf97a109a168496290c2be49965f3034667de49c1d76a48a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-ZA/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-ZA/firefox-61.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "04661ad52e94ad5e8967e21a460fe1e25cc08f9f0f108e9fe55633d4fdaaf23df133b1b73388146c496285d8562b57d38603100f45c4d81787ec02d4c4b6f0f6";
+      sha512 = "003a2a93ee8138fc1c696e3aca12c10eae3e4a94a854305d96f25d3b0340068414e87cafa196a471a7bac06eef148dce8eee22d74a8a18ce3eae22b8c6b8237c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/eo/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eo/firefox-61.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "bb1bd451569e1a4f116b458bb9d020d046b556c7335589dd6aa13f2a941b4ebbd197fa25728607f8bcfeacb610a94943d01d05b072f212346a5b74e96071f157";
+      sha512 = "a2c71fa1e6ed3b38d65fe1f9f81e34f53dac6dd0d1411d8b4eb08beba1882e2fd3dd286d7c827ec8731aeba10243fac15feb5d42ceaee45231e875bc69734d4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-AR/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-AR/firefox-61.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "8b175a74a9688a50adc42a13b4ff4c137b34f09c571606d9a25080a8134640bfc8e0ef757ff88e90428153002d5c71f6dd339c54320520976669c264004a6743";
+      sha512 = "b6c4bc1568a760ce22613153c289d8eaa3ddabedc181ab891957e86b2aad8ef4022d6b4622a2ed897fba5b1ccd7732fa5c74480c7414d18c2777593b17931bd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-CL/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-CL/firefox-61.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "7561ea580fa411d7c4a8c4cc6bed455f3287a55a843484d20431aa81f7d08b42386287e3cbf5fe7751f528945d9ed70b922cbaaa0f5cde74ff030101d897447a";
+      sha512 = "27216ca2542f8bbd821f94525837e1b21fd46bd5d79c06476ad3b1e443429678d625ae4e23f220dd383e3b32b3f5e208bbb1f95bfae4afd7f2bfe830ff007109";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-ES/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-ES/firefox-61.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "3f7dea40f758a29ac6cdc8dc9e78ab4fde698c7f8d5369670ae31ef3a09819dd40e28296e2c05caa57e95bf4238f6c162fb81fff6d2bcb4a2ebf26eaad3a225a";
+      sha512 = "77698e03f595a02535f058c7649b2fe7515073b64baec470b21f2baad5629873d74ab62bb8db7b695863c8ca1c0d5e54a164439c3491576e40aac885cc9eaa6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-MX/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-MX/firefox-61.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2ef05c4095c02c22769098c837cabc435d2d84ec60b7ce09682c6625117c93e294bd00877379561728117e33d5991a0272cf48044a035964eb5d9df6167586d3";
+      sha512 = "837cc72cf2bdf5524f5912da8c72b17882d43c089b63958ebf45184bc375eb77294a7196c7007fb4016afe83be5ef46492beef07a0965cd09493cfe1e79a7039";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/et/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/et/firefox-61.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "445158a41339640365d8101bf4473dc77df38f8c965a75f66ba8ef48172e6bd21d6813025192a7f98d451b50078faf5485f95b826af566c3e5215a10df2cbcce";
+      sha512 = "446c4ee9b2b78966181bdb4a9bf7ac84cb350bd8ef0ed609479c54f314ba2e17ba1b23da244fd1cc58b1ea388cddb3897b48b754afd36ab7c1f5fb42d8e51b10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/eu/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eu/firefox-61.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "7760ad9243be37fbf1aa727afda348f8b4460eb4726d1402e2da82b3165f208eee21b786adde20e7c11aeb5567c6e379210874b0eba75a86f5c88486b4c48c2d";
+      sha512 = "f1fc634a87af4d75c0bc71af2a657dc26fbf31b8fdfe78c292f97a3595684252a3dc40e55d1632f387164907dff57625af5b8ea81d75fd1930f5adc744e6298a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fa/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fa/firefox-61.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "38fff9451b7fc7a027a5cf646ea6666a9519ae57f31ea77da8560777e485fcafa27e5203ce184916a725449384ce7531f41ba5f38d30a05004093c932c052ebb";
+      sha512 = "0867ec71cbfe6e56d244acf9ff28408a2ea3d55634c6ebf68fc68b89e5f6fb95cbf45efcf9f76c4106ac44d333c191293b93d82b0414d2a882186a5d5475436f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ff/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ff/firefox-61.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "efed066528af1466f750af19ac816f64031220618cd1c35e8c2041b6d94e0b3fe894780dda51c22e75eb49d4a0f3013c6de9557167de22b85ab4d72bb44d6729";
+      sha512 = "5d31ad4bd4260634917fe9f131294e612f211164551fd232a86ba5a408c52056f20f82d5a6c8cd62182533bb4a09d29766a908dbbc604abd5804ee53ffac040e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fi/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fi/firefox-61.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "95d8c34ba47b0fbf2b112764c5f2dff684f9e207c839eef45a2443500de6f30b72ded618e116d784b6b315028df8cceb1efe11d3dc08b1af4a0466c016854c73";
+      sha512 = "fb7f452ffed85ca74c2d214654decb4f61ecd397b923428b9c3214b88890c322f4cfccb3479965b201a619c535d6bcaf0d6dee0fa631c1b858dc7ecb902e6040";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fr/firefox-61.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "108fa3054bec0877f35594c6c5f22d5d5bce3eaf5e74e5a1843bcb7592ff84b67160065b32962497577cf59b5375f0bcf75d4676c4e7201712589050a018e00b";
+      sha512 = "efb1a2ce95d407cfe519d6bf1677918c3edcb837fef9506c45084ba873669be0de976c9b5253acd0af0cec2a4007a61f3c810cc243661251f7aa8821e2dc9e41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fy-NL/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fy-NL/firefox-61.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "9dddf9cc3be7557e495e712f542f5f3f40ef205c893b5773217ff13e93cc83d35c7d7fa3611ebd1223a9cde4308cc8b4d0d0ba8879072e9dbc1d1433b972ae15";
+      sha512 = "82445a34694cdd79a2f9619c9269615d70e2c8806fcd7be9d201b42e0e462a56372a55d2138c7ee795d5df36da9da224668db33fb0414600aba9f517f569e558";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ga-IE/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ga-IE/firefox-61.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a2539cd2e7ec2f8898c98a27e7e70772d42a14a435279e33f2fe192189253e8c0d92814d25d3b2e5a5c66ac02ba6745b5feee1045c965398781fa86b19c68b0c";
+      sha512 = "4fe90d326992d7289e9a8650f27abdba2a71e7a4fea86f5a0c1a66217172deb2649fc69e8d43f7b650f16a465ab113f079267097e64a50c2de9218970e43bf32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gd/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gd/firefox-61.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "dbfcbdd6bf0ddcf535821268d0c7fe59541387647124a7b95243babb1ba02e34dbfc3956808aea1bafe5f301a7c31382eb958e3da21a476c7961f44b4055bd4b";
+      sha512 = "80a193ffd23e52d0d31428849d7bfcad1d92987edc4e6d6de48aa8f8d573451578ed99a6faadff24872d1e77633531fcf96ff08742ebfb311b010b8ea91b5ee7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gl/firefox-61.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "743c417dcb7bfb4027b0f56ff9c2561888bb7a66b0399e713bc65255f6283f9f33736abbfb449030cada641b085ed9d6a5a7010c60ada1002802f4cf6f3fedbf";
+      sha512 = "8edd57a08730b18e343d7d550e888341ec17cf703d3f5a63a52ffdef89c6cb2aa403486a5b417f8798137db69d3ccabb874caed0ee412f17515a2587a0f446c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gn/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gn/firefox-61.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "319eb86fac5e121e27a55386d3b9b79a07e4c766ac999ea387e03619f85e1c9a194dc4bc6cb56d66203ae647f6cede6bba81e65c4bace35baec986a18d79045f";
+      sha512 = "b7cf94842186bc094a82a27a1e5cc53746158bfcc4c74f66760318b59ef2c573421b08b56331afbb00979be38d682700dcd2020e0c315b25c8f98651e337cb1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gu-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gu-IN/firefox-61.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "37a5b54f94b5532d8bbaff537642bce1ca3822697821b84df523d9ecbeecd991aa2302c65a1f31883e7a0f9519347a3bb5995bc17208e1a56d8c98897fd1d2b9";
+      sha512 = "ffbe4bbdf378799f5026affe421244cbab92c3c9c9697b56d28928a959c6916ae8807e190e659cfc0ec119eb6d98701bba8bc67d6eb62d6d9a0e530159c8ffaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/he/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/he/firefox-61.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7a9cae5f7a7aebbf25908509efae41430f6f24d91d406964f83da585762cc078caf508750a562683e1f782bd805ba24b59327d1807badf63462a19955230aef2";
+      sha512 = "26428931a19d881ef5d4c9fce86327a9575899160a376ea5e486d3f0e413a25f44f28dd13f44fe7499bf72e198ae80c0271674e0882847fe487ea65b7e2530c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hi-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hi-IN/firefox-61.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "99ed2ea7f0aaaf214d3d4e60ff1fefefee09c42d5aaee85690d0c4e9832cab67f23b4d3f5eff8f46a936ab91922bb32ccc801db06c1cfaee4bdea3e60df3a2b0";
+      sha512 = "9eebf3a40c32f8ee17c14233e80c694922429dcf783fde48281e8ea79bf046f2daa2f244392db8c9d33beb6cc95d55700489dec1f95e5709f120e540dae3e7bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hr/firefox-61.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "ea4814ad10720b0685713ea2d670c65713e453693b1d6ab95eb55e1ce418f398549ffdbbec172955d0141f275caa424c75bbcb326b736013dd8741511cba9488";
+      sha512 = "f51f38c60d4fffd70b9be574643147a1c12fe70f0a617e996fccdb408aa40665fa3a30cfaa5f843d98ba1a91b17df71aea211677068057d8c2358b5853a8139d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hsb/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hsb/firefox-61.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "2e89edffaebcf69580fdb83c92830b091956d2ddd2d523885d0cbb858f3a958661c47e65e82a5f4f832751b215d568f985632a466e52cc23254ebf0b0276cdbb";
+      sha512 = "abd9500491a639a27f1edf9c8d9f32b5d3097f673fc724fb9f4eb5b89ea848c5ddac54be5927fd581254e0c343595ea131f58a6a2e68e03e3176c896450c5740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hu/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hu/firefox-61.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d00f603275a624ad6ded66f71b287e38afc8c4904b194fa0c71ab4f148ce2ddeda286eadc1b2395c316a4ace7aa7ea39e6f50ae8b8177bcafd60774661295e23";
+      sha512 = "11bdc7443008f76e6adc2eb54bd5875df846f6dc050fff6f9dace91e981d210867a248bd3fb98c20bc2bb4012374d383c1cbda58ee21d0fa57ab7545f25efb8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hy-AM/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hy-AM/firefox-61.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "da238fd6afbb3bbd7586f9f057ccb53d5dd8068fc12ce6ced6602384ede890b71e964c0c516b776154f5de358b1bf6b06daf91526dd8fd334bc6fb8fa650bc1a";
+      sha512 = "5fa03106c35a4781f27d27a9f6e4466bf93e56b7d094b851cb057833a6cb2376a231066bb04fd05e0ae0f32b42ab7a859447f8401bf0e3abd44fb9bfb9ec4e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ia/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ia/firefox-61.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "dad9d2b95fa47fc1b34aa9bd47f785e7640eaf44ee51dc0cee8df6897939e3c77977c60b7a8fd3427b23dddb10bf4d0758b3ba08d305c61f7b42dab6b490a6fd";
+      sha512 = "e0d442b1cb6c770ce00b1a87669e61d6e60d6803a4623cd67025bbbae1345839329f6d924960c355c788dbf4ce4caa1f1b946d72ae7df824105cb1be547bade5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/id/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/id/firefox-61.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "17f8ceee4f31a8a37684d1319f9b84685c05f3f2aa0ba3a8801c4132c2f61755ef9427eeffdb38420829e92fbbd24dcbe54906de59d89ff149f055ede61b751d";
+      sha512 = "18c827e2f584e649a4a4a8653dfa5a3524ce5dffd7bda78bae3e1e6cd183e7f68605abf0f108552aecf20ad75e5837800f6cc98c8eb6efe479e143e03a629b6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/is/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/is/firefox-61.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "9dc8a651bcf460e48a64661dea924d56d48e37424579b369ce4bce113d3a3405fd65f542096c8d199a2a3db42463dc28964fe92c42419c8aa5020084b82059a9";
+      sha512 = "d2230cd1cd82ab815d66c673a5add1cbbaaa82a239f6d8ab19b09a4307e3eb4cfa1355fd599e60adfeb12735a846a71917ae25f4896608fef4ed42438743c1b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/it/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/it/firefox-61.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "49a8881a2ae10544db31aba2a8f54bce5948ad25a47f8bd221d8982f12fa66cc7caa43e8c1963cc3ed156ded31bcc331ca0b2f784655c7ef0d8af89d7fd2c271";
+      sha512 = "44c6d3d5ddccc04f6a7ed73346051fcaa6131edb716466956d063d432f22c8a2baa70d5bc6dc02fe7f5046a12e166ced2a5e203bc71da140b68e7a1ac55f5612";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ja/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ja/firefox-61.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "9af0675507f54ec12924c29e051fa4727ea7b380ebcbb8fac1a91481c0405585b4e593324f72b4778538f0acc0efe8878f21f16a02272c5b02acc5ba7be7245c";
+      sha512 = "d8374b8f783e7c24943cde05949939260934b0d006a5379fa7de9b0814668dcea935bad2d69036fe03e0253c99f792c690966ed8ba3db94bebb9f58d5cd628f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ka/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ka/firefox-61.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "c5b52b448bdb19945baab604b820d383f48cf75a3fef2b8d734f0874d7aa8ba1e3ac6493e9892d8003371fde1bec8405cb1bb0991656b8d9d537e8c0b77a062d";
+      sha512 = "a73aa4e06b9a198c931119f16e8e8e1bb244c231aa080f499c442a5b2fe3095640584ba5637665492aba8ca04ddb2cdc45648e1fcdce8d74c28d71af46f008e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kab/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kab/firefox-61.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "7f93bb78f7e57004fc22863d7dcd40f9407e32a606ff07bbc20a3e4e8d348720fff541d72d962d119eab70998925cdb81ab816086bb8d95c4724a9c02a723587";
+      sha512 = "207a97bf5d9fc1a4d624657bc68067bee325fa5b05ba34347cf6a6998168792974bb486245fa716a013e96112f9899998b7d2518da55fcbc551bf0634ce50902";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kk/firefox-61.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "fc60ad4c8c2db9252e4975534a50b373bd5b223ea8ae6e6d2a7a07bbaa4834d078ef2756b40dcbab2cc4dc1bdb5feb1def890021c1d44620a179dbb10ec2ab28";
+      sha512 = "c81fd754bf280972ae7c6f59c3892dd7ace4a399a2dceaa5163fd078ab3379904f7a8e4f831373f871f0031f8557e098646ca04ed7085e8a9d40914d407b8c02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/km/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/km/firefox-61.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c6a544c825f3895ec390275e823da876113d74e16fe3c61838c55afae38b9ba7abdc05e28d1b66bdd3477be0e4b0b792fa2244eb6dfa7aa4a189da438badd823";
+      sha512 = "eda95e84eb9e2d3e073668bef38e68473b0e628f8ecc5a2e84d124f7ca3d060949ff1e0909c08002ff51707b66d08a3ee955417146a8e6a6ec03bbfb5ad39290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kn/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kn/firefox-61.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "c42366e72d38cbe3301d52ec5c6e34d5b623d5f1a06e8309cdacb5ed6b6a3a356034cbe95ccc5c6a8b320dd41e8a92564b66effddab4a03476dacf00acab3fc9";
+      sha512 = "8254394f428957da380a576af4ceb49e6a2a0a82c35d7b0aa2eae5993c12118114fc77875f7ee1a80085497bda1182ec7ebefa42d66a268640c87564e6e2c7f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ko/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ko/firefox-61.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4e05c5d8956661956581acd8bbd93eebaa84b6d5972da34b976bb6f654a06d1d0286504350b89dc43988675a3a9c57890dcec81c4a39ad87e0fbd0593a0e1d63";
+      sha512 = "d59939490741318d2fe11900df7dde9adee99d8dbd04a365b4a13e0426898109bef586bb097884ae280a8261aaa21d38673c352bea06b035731b72510d4ce35f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lij/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lij/firefox-61.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "68120d34a56f65afe99930e32c0b35660c36b38d61e5f60f7ad5da131b1c95d02e241124379c11b6287d2f8794191d27ef1fff1f5c4eed5dd3a5df6f5a2183cb";
+      sha512 = "cc95e24bf4edeefc3cdd8e4d7be72b88f51efff45a61beb35d4d4f0e42727fd97e762bf2f04d9e96b2fb4052c8e34796723f49b2b80117819ecd0594e8d6d901";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lt/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lt/firefox-61.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "149ee7cedc772534427202309ec4060e8187a847b79dd686096d5ec2c44b1a0656e8c3099606e921942e8c426d0206551fa5952dc0e9abd1d510320fee26926a";
+      sha512 = "4d6b6dba9d9f75a315549969a68d73639ae61a79025e9dbffe0fb171360c8b0e04c3cb13653e4f294375f248a7f2126394b67e7c21d20170dfb5ffcdab5c9df1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lv/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lv/firefox-61.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0e630d9a09895fdb06c6893d7f9f3bfe3c3832d4a1682e2f12ee89611570b6bbca695bafd8dcfa583525645db86a156bfcf97afb575c44c19f801a43edd824cb";
+      sha512 = "f47220148f2190b71f89708348a57d830d74168240e4badc3018f2ae1c477ac0ed0f4273ede81fd50773c947f478cb812da98b2510063b74f15a6d6b01f83923";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mai/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mai/firefox-61.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "6c3dc9e2230a3f7d74390e00e661eca28306996cb8d5379ee7fde818dc09beb813ae5ccf09319510a1df84e3ebd45b7f1a8a08e776d046e39a69f724fbd79da9";
+      sha512 = "b77dc269a68f39e36becc013128895267fe176cb6f97e5a2ab07e4191869647208068bcf3579d01085edf7490d061851f5392f984be2687b5f067cde98bf3d47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mk/firefox-61.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "60353c437af1ed116c5d16a4e5d57a1b99016a36eeca8f8e4e8379553a5374cea543dd8a9864e448028b2f188ae16180590da7e199ef96fad604e172fa1f6e55";
+      sha512 = "444d572534c326688f267d624f1ee661f2a1b236ee7b4f62009d6a6685636b07dd63faf2066a12f9dcc9434fbb1ea9be663456e06ce9afa66516ae3911b4fb60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ml/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ml/firefox-61.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6065d13e781728dcf587a1389d3893ee69e7e49b601cccb293e2c13dd5e0b5b039ddcef5de3b8b61baf30aa0e994f44eed6f29b38c94b3b24df88f102b0721fd";
+      sha512 = "74d42e5341168db08fb4c012e88f53b9388f67efa9a0d5907817b3bc04540c721c533e077d1c05ac1b067a2dbcfb643ddfa08966cbd56ab0e0f46f2c822504eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mr/firefox-61.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "ddaf770f926ffcb612bef6169cbf073ed4c624635d00db6edd3ac6c6051ebd9ab926ae48f2a9b92a5816c6aa2e6b5ed33ea90827f18c70b7364bc33d6ff9174d";
+      sha512 = "3796574509f0ea2971f02356a5bad744a6b0621054b55e391e22cca934b74cc7e3370e550a3f933db7e92cf9e070cdf6d3a576036a72c2ae228165e2a06ca6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ms/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ms/firefox-61.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "4b9f1e63cfce7b99e05d54f99b7d42255f2e2875718e2ba0e173a7aa53113ed990f1547ecafd508a8547b696f036ec88826260545ab7a6b03d4acde8afbd1fc4";
+      sha512 = "920c6f3071d24379a9460f74d8335b35d0114da5eab39efd2979f150ad9795e8ddc16044173ff69190a024f824502b96e047bd79fb1ecba554f0a6b8da0c311d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/my/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/my/firefox-61.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "a82103f7dc6880e8e81ec3f0f9b07af4dc13de369eb87398dc977f2935387e489c6e61ff2f5a2c883d5d69ec24cd556bc44c722592d432a3a8f82420fadf11d0";
+      sha512 = "bfd10c2dc7377a2a55c437520f21401d750831d088995d98bf4e1eb2524f1d69b49d3ca64ec76e8c875757075a270f1714a8ab739a5881b8897b8c9320d09281";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nb-NO/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nb-NO/firefox-61.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "4a68aabf3a6a085a8a7abfe705ee67b724243696e63bbd5a9324a1a39c2765db0c75d1fd8b652b78982702702fa1997831945e2eb56b059efe55d64d351723d6";
+      sha512 = "1955303700b9f3b7ceae901076e51400c977b35864ab96d71f1d3d246bc4348464e7cfa2e9a1840b6b06f3c419028a0226955eb8b5e72667f4b433d20570da26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ne-NP/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ne-NP/firefox-61.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "760c819b44b1b2d694ddd5841a97f586c46fe2661c18a2d9f6831ae24a1f67a90beaf5592d8dccba35868a0e608f80b0a652f9c3af8e01601dbfe771d35c38d2";
+      sha512 = "4398dcf4bc81d8ebdb72e0b6ea488ae707c04d175c8c18248fcc69899929e2d5615eaadc04804d602dce0aaf97ad19358b178a43604434d774fbf82dccc7546a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nl/firefox-61.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "698c765c19647bbd6cf55e3812501131720ffdb485058e90e79446b5310d056ee09162253ee334535ff0eff2d544748385ea88d3bc1fb3bfa0044d4eefac8f07";
+      sha512 = "c8a8e55cdcb4eb6b2b19d600c5cafabd8f8dcab146a4c78e0d4bf66daac8798b63e2b30f5591f58c50117632d9b736351c2860ef28267e2a5f6bc3375cf3ae03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nn-NO/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nn-NO/firefox-61.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "5cd75409e8f952a681cf7485860a0c45bcb77a9b6f3d645f27b34560802772917a8d29eb465b8eca2fafdaa5db1cfd5a37ef2219cd14444296c81b1c53008375";
+      sha512 = "6e0c8d61c4b6a93ec3d8935cf92254957a66305ef743007946b959ba1a6584c9e585e6f4e971f16f826d8f1e09f3aca50a68aee3de1a92c3afe4a3b5fe712c30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/oc/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/oc/firefox-61.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "765bee0da88cdf168a37521e94249e14dfc80f72248e9d6805b098af8d99801ba38b96eadd6461bfa523fc2bb9999652ca2309ae9fa9202a5e5e00d4aecb506c";
+      sha512 = "dc8cf40472f9503949a776c9ca9a5e29d72a7d218d1ec10ea7abeb960d0abf5d879b6952bd3af4864abe4f1f065b37317d1276358c3ae4c1e062dd4943dd38e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/or/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/or/firefox-61.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "06fdff27a007b45357d17f77fb22b589bd2f0d07866e0f64f00af46a1403f7375df82cda101997d008882232ba34043f26e0e8db0f796bfe30d442eb990ddfec";
+      sha512 = "bbae097901a488360c98bee5bd19c43eb36318f0fa04b3bdd37c24fd69468d7d2a0d48ee20472f6811052410368e8b80bc49d00c16112e00608a11729b27ad93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pa-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pa-IN/firefox-61.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "8a416b28b1f2d73865d151480ff329843e53ad45dea6a1e931fa6426d1d448d47b6ef2e8cf2125d7e03c69bbed90351bf6fe65036be490dbe7688598eb01a8ff";
+      sha512 = "1e78585fa23960ab22aee044231de1d7bb99087f27ab717dc3d3d783593bef23f5af3a47dd06647344eaa1e896a72df217a90fe96afebe32bd5158e45d03f0dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pl/firefox-61.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "df635d41fc27ccab2eb30d6b73effe6ee33a44f543fa0f7cdfcb9e2ba8a70ba3a5608a914bb80bd4f450b623d3d6b05e0d9cb250a660560cbefdf98d501425b6";
+      sha512 = "e60a0662710985a7879f004e2ecf0d3a776ca346685cb314f964563917ab3ec081f73e411014163b4fececc5eb97a45a4496574c01bcc964b718306cf382b189";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pt-BR/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-BR/firefox-61.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "b5e23c79428ab50ee97ceb79305331cb36b19f9f76b8473a53f83e669178eecbf06fcf79d067923147fda14863d56bdc157d1123b50cf64841ef3d8fd77f7cd8";
+      sha512 = "83de7c2b7f3d6939bf888fe9c5a19a08af78427f3b466a910e385ab0f8d1a1282dcd21d8c7160c1c45ed1a4aadc44934e3fd8708d8ac09da9bbe5f7bd5ea18eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pt-PT/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-PT/firefox-61.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "03e3dc135b4d0d8c74ed9cd087edebdf26b256768adbf42d3a8e6745b438a9e617d717d9fa68533d9aa5e7c07c64ed42540b5005cd1b36fa04e9912b4e046090";
+      sha512 = "700379d0a99abacb29ffebf57a9b50ca0a8bf1facb868cf6f3cc2ab41575fcc9c0e4d1b6e580a535e1c06754a4fd05ce5e7263791edde822e3e8d5eb9b5f87ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/rm/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/rm/firefox-61.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "74884aa4baf61bef8707eb94c9cd523707426ee5c5e280a2f18ddc1cb5535d15a83c7125b4734e3472c9e0ffcf2a8aa7837b9c150ecfc2b1767ee42750cd2a3c";
+      sha512 = "6595217951fd22ec31abbdb90364e4ffe6bd9656f9d34e10ff6bc1182cd8872409467dac1e0f86c7f7eda8ebee1cb4af5ed0971fdc0c55387831ff12e012311a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ro/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ro/firefox-61.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d245c0322e0a4d94b3a837c75c8b800505c82472363202520fdc99d0db04b2830bbf522bf1cc63285d103a0fab22083b8dba93c1117df78ec8ccb6c03cb36633";
+      sha512 = "05e68cd9143f9cd0504ca906843d1d6e08a5e9152e11c237b461a1b63f00efb82ab7fd329a42aed7fff255d7b3bd2a6b5287ce0b2d3ace12c30710cb309e95dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ru/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ru/firefox-61.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "1ff03c04e419498d3e2ea565c02f4716f41370fc97c24166e54d6a07d92ad6f0ffb6ba13f708e4079d00a4c98fc24e36c278414c7b638e29cc7e5f2891417348";
+      sha512 = "5bf13f5994d8672cde5b7daf942abc2157c9c988fea459c5fd4bd006f68b013b3056440f73794a06bdd0947a4d2a5a7764d497dadde3b602d4d945ca49b6e855";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/si/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/si/firefox-61.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "4467d0a6a69d7ce89e1849d1cfaa81f2588cf8019e50a5fac6f292a2a50c55750130e885334659f834190969636ab74a3af97d6175be5f88e45b97cb772a55e5";
+      sha512 = "43b0859b38ea7ca87304f0f0d7b95bf161eb1ca1fa4f28c99267b8c746dd690ada601a2becabd70a3fb09294d29c82e69fba8bbbed8ba27938f43921569e6a3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sk/firefox-61.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "1060fbd4bf7f83c851d74773ce0277ebcb7f22769ef95b75775d7546b3fbad930e2a04deead17d37e5bee69f39aa978b65c41e20862235209528bb91a776550c";
+      sha512 = "6507d61d87d4723fbe97a4f51c088dc2d3717925a5aef47e1cc21d75f191e64726b86a48f4c1bfa0cd3f5e59b4282626a711b335bca44c27fe06388f73eb4108";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sl/firefox-61.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "75f0d0a4af65fc3f3992cd859c7f7f7a9292aa4f0e1906fd4e7bb4106edad80f3cf086cd843bb526cf2958cdfd94403fd110c83d232c533b105e7a79b6b01b06";
+      sha512 = "752a398b84af789bcc5a0138ec5774ad49fd0e116338a8da0d07133952379af429efa89721a72ffc092230545f870afd02668a5b9b76660c43d29ddacde92902";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/son/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/son/firefox-61.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4f5a8dbd2c60874a4158a4f78b66377a193265751c1f7629836c789ce0abb83de85ff1bee97ab8708ef86bb123d0d2ea5bbb2bb21fcdc52950e1c1164fc13684";
+      sha512 = "1cf5e57b99b57e243d7edfac411bfa8c894b439c0a88f169ae2566c986969af7fa13209fd3693243839ce59fb386456872420e57d06ae156923018f709c9b96c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sq/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sq/firefox-61.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "5b226608e43a7fe4ae8f23eced67af9f512adda9f70c4f33b81f0a4e779e78e9301bb5e95a4b4362ee79a04ac5da81c36005c5b4e903d40f6f4af84b5503c113";
+      sha512 = "9ccc8a1870e4882c7862aac6a76677223b73b2087dafe64e26484a9c549479d825b7f566ab99fa8fb85094585e8c457265e7296da3da1c2b1b5980138182c6a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sr/firefox-61.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "143de2c6f87385f71deb0faf6db20cfa5680c5e3f682e89456602f05494624d22db9c577b92934cda98e041f27682103d1755864b0dec5bc3b2b6d9121133532";
+      sha512 = "8faf82d7555ae44d65d4d30d4ed4c97a30cb9ac8ab970f654f0ee0dd5ab1bac8823233a638ccbb591a65a603aff17354eee86775636fd4f458127a59a9cbd460";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sv-SE/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sv-SE/firefox-61.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "09e52958d73ec2b32331109a1f1d9798493cecae739fde6542dc4d6ba026b4d2e1d1f3816b4d2b16d71faa3a3840417329b97eb7a8c0fac2cd168b159a61eb7f";
+      sha512 = "881de9734d9d21d7c94257a4539b4c60a3732abb77dd1020c7101e61c88beae474f7aca3f5c8317614308af7c27d402379ecc3bfcbdf5644b04492cd8b57abb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ta/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ta/firefox-61.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "72b0e1a7b94eccade119f7e4b251b803f4f0c54783faeb506649b9048d663698e084e15664baccfa79ad2f6c6238a19c1bc61bcf840fbf003df94cd62ef38deb";
+      sha512 = "b3726893b48cb95ff2c4f3fe8769efe82bf36fecffd1860b66f55018ef5cf9e0f6345c1443b88aabb822945bdb6ecef570d7590eb346a0f6f463ae72cf3849f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/te/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/te/firefox-61.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0478768a0e6b228ad924dcda9dca83fbe2d51646503db931ae4600bd107fa15c8f1bcfd4034b6201a72debf561a815c28c54396a45100dacb68d9f04c2c0a45f";
+      sha512 = "c4cb2a1529a4fdeef248ef530b9fcac8730b6caaead597eda24d165648982bc2231eda8650404cba5465ad7281d25910e64dc7ded802a0c042537ee1c14b9888";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/th/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/th/firefox-61.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "499aa56d62d5293e050bc67a50feefaf5019385291e4d3a602f35c1e8b58937acaea893a36d4d77e0e4eacacc3c406054b9e81bfe8cdb27c687b4cc6efcf1b2e";
+      sha512 = "5275e34f34bded8945cea10496d41834c7a1ea2380ed29bd338cea64b0cb10cb4e0985ea2c4ffaeec94167d224e25ecba68e2195a40915d8ec448c1db049d300";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/tr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/tr/firefox-61.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "8c3f26b9d37e47e3445fb14ca547f143961f19eab66c93ee4a560828a4bed3c773fe09d2e77c350effd76e0a0c447a0121c9ed29774a5ed93de3d707891a024e";
+      sha512 = "4769514468e6653a9b1fca2556faa9c25d8d9fba7b2301e9c9a2da0dc0141eb9cfc3801fae1808868db14aa0ab8b5cc0832919cda86f7306c4c0b922fdcb3956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/uk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uk/firefox-61.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "ef7a776d6aadd6d9c70594260679810325a4cbd11002bedf5e7d58d36bfc82f72c3c2c352f0d693292992ad6bf9fc323e5947183f6c713f85c353ebe72203b7f";
+      sha512 = "3313520a53dc840cebab96d2901f83f34168370e5c08df92edc996ac220ccf3aa2eaa62e765df0d86f4072acee2eb2a3d513c2aef26d9470b9eccd1baa447120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ur/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ur/firefox-61.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "9096d21d134c2e55d694ea9a6e06a669e636b15fc4532bcda12b9944d38eef325e256106004e6f9fa503f5590e5077da5f72a535b8887501a53d4a8c9c0c4c55";
+      sha512 = "4bef3bf1d3dcfde97d79518e1d12305949306e1f71e02e26116bca434c6ac4ec3fc7ec7d219ef1360e999c4a3963ab3b1f1034eefd4be04fcf47c4667b426aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/uz/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uz/firefox-61.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "d856195097a7923d42a7efb257a9758ce4bb5ec3d93de798bfcea1ff20dbbe1664d71fcd8bc72dc9592bb4c4e8e45a041164fb9b9174c2c75e2c04ade968e532";
+      sha512 = "7dd28ba9c29e891498f6caa7d38dd4cbbccf807a96b0e77f83499159d574b37409304f6d16544ea592c2b0ce64c66e4f4dbf127a9a9aeb17e8738cf99cb7083a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/vi/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/vi/firefox-61.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "7ce9b59b89c77e289b56ee8b358409aa6bca3c47b6be004a38037f7c156834213dc5704e1ffabe3fa86f1ba89243abb6efa2fba31eb5bd1f4d95e0f225d0253d";
+      sha512 = "a19176978e40e7446da4edbf2cbf8945e5b5acd49acf22ba14ec7649f375f7dd6498a8662e285518361b6080cb549f038e91c02b5f5d5bd88874516b6eab2ef0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/xh/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/xh/firefox-61.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "7dfc5627038c97188e4875af30cb88baea359463d5bd47d11440c9f33f84ad4168d860e947e90c104ac647a09f3134892a394b8a8435639f71f7bb9edd92bcae";
+      sha512 = "51149fe6381d6dc077730afc623624a0c4bf4da7f0a28d9dd601c3e2ce80e2ff79c8aabb7fe308bfb1faf402d59c4feda46b56fd8cb183201cc25131df448cbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/zh-CN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-CN/firefox-61.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "75d8a96eac39c0c60814718929997e9d4a60a2fd273ceab744bead7164d6bbdbd8057a94a3310709da7b6287549cd44f6d7dabc4bba1bfe1f48f3345193cd142";
+      sha512 = "e244d0a4ef5beb49f05fc5602866f3e075f0269aa8a606d2f9ebed615de00088108677b3489c0d62c221fd931d22b8e25ab915a5aa51d650aadfffbf59b8ad10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/zh-TW/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-TW/firefox-61.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "d0465db2b3aa8a52d8e60c480605c069c31f0fcf80cc757980022bb538c0509b99563ce7fd06f2660dc8169dcd3fb6a8681859218365a3ef2ea822eebeb29e12";
+      sha512 = "8f7b559e0ba2235a5459b45a099c8c892a3a3cc1b43d9d7bca4ea0fadcaab757cb7ad8b50f4d5e363214896c2d6b1ad0141b1cf978115bd8ca756f1332d3b214";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ach/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ach/firefox-61.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "7770772e90d57f9bfe30a5f965cd89fe367ded55c4fc146da547d150c85d0fbe906fa092c2a62ae8df3cccd5702e6a7b1b1680e0522e3164d1df20d2538993e0";
+      sha512 = "f071c04decd07e0a5a9113d33e149c46666916c493ff5a425daf2bbef67b7f073f529f34244a260545a28b887d42928cb0f9bb3ac59cde2907f79d8e1faac8c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/af/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/af/firefox-61.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "c615df0582484ce23cb16556cda202cdd81056d197a78be02b31d3f71059644378c2e24cd42b4afcbb0b610a3f25d87aa1178671ba04437a0885cd90b0954f97";
+      sha512 = "372f02ad225840314ffc709ed5053efdde3d1917d165b898980c877fd5eecb49918ad8616d326eefd3e6e85a6c816cf82f77db4bea1fd6f92018f73698db8de6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/an/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/an/firefox-61.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "ab0fd2292c5aac5ec5e1669c49f0aa6568f0c8d0bbea8c20c18ead6a52e88ddf08e3ca44e24386a9a0102f0bd7eec12b9e2b9e6713a3958cf13bd978106f7009";
+      sha512 = "a75046b320adc861eab167829e7d7a8fd460ec89e995f4f1add970dd608d16c0ba4ff7875d0162dbf404c7e0301ae5898f88911e9e4ac4405cb97ce3dd62d1ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ar/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ar/firefox-61.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "dac0df9a18f1a7d01c1caf05e17edbffa6029733c6d439c26fed0b12d1fa8ad325fa10ccca51cde25ada1f76e338c0e6a8792e400f0ae44771231a3a49a33a8d";
+      sha512 = "546e1138d18802cda7375a1e36c5d1751a5621b644b9147035814eeb2408ee9e070183319debcc0a5b9707ec978fec7f9ea787b0c6ca6d4e2a4f05ab7f2f8ca5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/as/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/as/firefox-61.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "d57627a4cfad823602cf5e243c5a1c1d8e5e7fd5cbbd345cac1db7ca23947fbe0dfc8a4dad223c6af8b5059f3544a34afde8502ea29f9ed6e41623ce4d856f98";
+      sha512 = "003602b08fb96218a0e86a577c466bf4c6d1860165bfdc2eca566ecaa4185c6f73a0763b8dd3b8c3d50b11e7345b42afb20b5cb30aa075d1cd8a05d06f97d34f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ast/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ast/firefox-61.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "32bd3dcfa0a8c63605aefe54a3c96f2dea826d41edce8c71bdc4da5eaffc2b303c8f1c057ce0a4c6ce5d853d4ef55484b5dacb51f27dad5e50b96cdeaa2298c1";
+      sha512 = "76b37c34a3c1b5f8b55d8fb326709f0aa7141b869890f35d9452b2beda692302024e07dfb7870f5689a47f9fb5f5e4f9ab097b552f25e60dade571d0010e9326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/az/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/az/firefox-61.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e94f419ec6a34100242babf4afbbf23b98106748b7c2f02b83ff4b0a396bf5e003ec1bb3ed36feeeff82c79fb17c18918ee6e9ddc038ffccc0e121dcaf0eb1f4";
+      sha512 = "4ade37b7cb1814ee254f902705aeb74ade1172267a080fb3dd029bae059819d4cddf34d23872d49c5696aa55d6a49f64a0a00a5ed5186c58f687a614db3b7822";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/be/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/be/firefox-61.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "b23cc179f2c4c5b3d79f6009d87f4772dedba67150e014b792a5d892fd1e09a413ed405d86f82e9f74a1c2e36ab76b2a9e41bd49dc7d16483749d195b56791de";
+      sha512 = "6352d3e4495c184048157713b4a3716cc65d8d69478a22b93937c545663746c9bf3303935d97e4f1c0574f3e22c4b06076405b31fdfd5a3df3f40b3b0b1650c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bg/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bg/firefox-61.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0d8abaa490719185579d4c24b02ce38971191ec13bdd1798966364c2f9fc118bf46dfa4ae0621d1c6427beeb03f487a1ebccb0a4e49d6ec93372397de56c4851";
+      sha512 = "642fd894a03672a0b91606bb7f8a6039566d007c3f90bc680db208bf3ea75327186e6540599db6c18bd76359622184e9642e6f53a9baead022fb0cf6e8ff5315";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bn-BD/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-BD/firefox-61.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "db9e15472c21880a07e1337e92fde44ec19a8f6297992b589f20bc05ec37140c41d65097f1759734b9ac13b75c806996e17c70bd5fd0bbe65e3acd6a0bb0a854";
+      sha512 = "bd9a7d34937da1630e4b621f70942c43c6242bbb7ae6108df460316fde6686436b22ffb5416082d483a81296b1afa179391fce40ee21800e5b984827a5dd20c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bn-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-IN/firefox-61.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2017273b405a8ff2b9bb1d1c1120c74679a1583ddee9f32e4643f62ef22fd3174e4e01f22e374af92b9821a550b8711d2b65987c71b44215236c161827f679b0";
+      sha512 = "a186b8d943d7cba1ceb768aaa8607bf97228ac54236ef5f3b71b88eb2d1d487f69250fe73620dd9b4928b5d12b66dbe3531c4643f4e6eda6e1851289e5b5cde4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/br/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/br/firefox-61.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9e7648e312d78397bdc06b0a6921f76acf1916c28c8ae05aa9dc7c70c83d522898ef7e2e847cc3c0cbb19553a572ada7914b60424a46d57c0d7fc207941af3dc";
+      sha512 = "dfff029c7b96118394dfcdd4feb19c0756bc3fe8e8b8761f16767280d2bb97b1643f14ee182ac30f52d0da1f4b0c984a09e43c7ffd14d7e1b7aecb560597d1dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bs/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bs/firefox-61.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "6e93cd48d03f87e027e913199e0e7b99f5d66d2d81a4d7da52b8f6a38b9b1e43d5ac5ffa56a6eb46c921a695f1826c6f5b936d4622aab3501e6132da26395888";
+      sha512 = "83802af9571a658287bc8753c3dec0cf077d1a0e09196e965f14f172c7b76172d2833a2096f71299718e225dfe3c7ffea7c38c4db1436018fbf2228b0c981499";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ca/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ca/firefox-61.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "0e49140d11167e2b6c7d15f75f2b121ab44afffaf1af9135012314c9234af25555a5e18a7ae866d3219e6c0c6752f7ae313f66c7312959fc101c32e417feaed1";
+      sha512 = "e850371abda2bc4241fff1c6e9b79618d378a0efb266f4c39239aecb3d44ba42b0cecf71183ab0ad6de812e779376c2a40e77852a436102de2c038dc7e7e6ca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cak/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cak/firefox-61.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "75c5532e9ee936aa24c5fad77c96fb8aa9e84d3531ac6d36330fd3c324c8bdf13f2e7f815d844e639fd06096c6203e4253c9d97e0c7a564b0b393543a892e56d";
+      sha512 = "ce33c245d288e3ed52958acb89be5152fd78b29aba3d83e78543cb48c8424ed647c2ed03af0a03dfbeb3a3f1f89137492f1694633edd68c5d22ed66f0a74aaec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cs/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cs/firefox-61.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "32835014bb3b7acb93d566710bf52ebb3bde52f9c17f4b4de64ec598e4a40b9ee8644a2c1866a48aa6598ace07969912eeb09a47811d67d6cb317078e8e99e99";
+      sha512 = "3d012a8edb3691d05426a236dfddef9841f56f1afb59a4fe00a710fbb3060650890fa2e766e6a42112a4b5c07b19b2de10f6737e630a05f89b9ce62a336dc2c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cy/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cy/firefox-61.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "7b29c7e69a18e817828fd7cfc05faee51a9f9bd1b229a1943443cc3676b4a3e8daf4b52232633c713f0cc3ec4d9ef43a6dae0ec1dcec66caf0ab9d67b1be9467";
+      sha512 = "86e7849fe9edaea1332c98ddd4286b75bf5814e6b74f17fa8b47015a9534a548390ade8278fb600248dadc2dccc43e7c4f1f5aea4a6d6e299bef34e8911e1be7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/da/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/da/firefox-61.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "41aa2e220651b92b8aef3e868d1b9080d1872841d5b82cafa7c1f2d1b0db063c487198949643d89fa0121bfa4287b7dcda99c245f8095b1f3dd86bfe960ab257";
+      sha512 = "5dcff5b9527b76a39a3e932be37af0a4faf32a60b32f4827136892e51c051c20606a91eea7767c5d80b0a2c97a7be44e7199d0ba8b20417b297cb0637c8cf725";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/de/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/de/firefox-61.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "7d25282bb59a627dcf09b39ca15777253593c4b91e61e6f9d4d2138426cf8ee16f6d8e509398824d8697e42eb301db29e6843eebfad5eaee1fdaaba5fbe7f76c";
+      sha512 = "34eb449d0aa62bc473413b0e8e21409ef9a4d2d08c7bd5164a780512662b2ca8d9436eb059c47824b4cd50c6502aea9e0aa1d198561882da1018aa18b72a8821";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/dsb/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/dsb/firefox-61.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "1f1245297135c1c1550db1ceb110546bc0b436ceaf364bbcd531f6df4770ab694c1602de9f39bf0d9083dccdefa1d5fea21cf9f4e46925cf1357bcc5043f8926";
+      sha512 = "5d9dda0e61b5a29d62516996ff0e2cca1f535c5b0d343a5382a6b07641f2122da9aad42682e70d8b5f20b562120190f9a1eeefd5a2efc1f119bdf78e86f395d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/el/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/el/firefox-61.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "58763f729f19722446e87dc7f0e8044993f9cff5b7f707c3d1256628d00011c48973f4408a8cbca67551b621f67256a9596d91f353ecd82482e3b9278fe8b687";
+      sha512 = "b62151ec4a320d6e1a92d47082b0bbfc141958424674162056ad302226717ef1841a54da07824457d0ac6e953524ea2d617695b0a369c88ffc75c2acaaf3f702";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-GB/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-GB/firefox-61.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d51d6942aaed323fd82eb833a84ee13e4ce8b2d7c461a5bd1f2f48b2b1ae8c9d900280bd21a2891455bf17711f01cbbe70e793f18e3a0c2e9b15cec274c3da1b";
+      sha512 = "b031bde943a2b3d8863dd4b578c2d7213c385066985c1aecacfc06f5dc45b00893382c1e6c157bdf6b889a86fb580b575e81156f29a475ea47e90e2e6113c3e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-US/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-US/firefox-61.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6c849a9fe358e06c9db01fcc1f811c9cce59cfc150423dcbf8f83eb1407113378b25641de67a8ce8bfeea4930937fd0ff4e919648ef80b219f84eebc3ebee546";
+      sha512 = "38f959e86d5caf4c30bbc8fe4b2c9e2451c31a1b30ffc0fdc38e92d8152580c8c2fecf7c5e4ebe86fc41e6b2f7f8691b428a691d89744308e9e800633df1b022";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-ZA/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-ZA/firefox-61.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "42280dcb3627c457097887b51a2530eaf32850c4b01e25c62fde1c89e3cc8392ad29ee72ed8cdec11d78f776e4d720235e4f33b21883cef0c4c99823f26c7c10";
+      sha512 = "6a3b9855ce3fc053ec5cbe65b177290444097317f40da1a19cebeeac83f78e5fc3c74086b15c5a4af80341bd16319d09b0def2d3e2b65b67adf57065021c5479";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/eo/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eo/firefox-61.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "0ada2ad4b8ef63b0881d1249b29a39aca65bf2714614e5c074d80d8901124a54d63ec5af4301ffe1483f4e70c6cfcb62db398042b8d12005aca7d95079588065";
+      sha512 = "cec51b0e9a5a0017171e724337e8b5edba7bcf4a2950061b4203738adea2fa65991bb9012ad84446fbb4e837e2feb01e1128ba424e6b0936dcc1cc6dddcbdfaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-AR/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-AR/firefox-61.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "5c548ab1b0ddbf832d0ae42ff5bc6457ff7aee08b8ac3e94ef65a0e3ab326bfdf6f85be8745fca64e66efd2b45ee992499ccfff963ae21308519fca1bc72cfb5";
+      sha512 = "a659ec66e3bfb25c51765490632906e320e1ce16f81e16a528c8b48a383f264fa01694e7906fd27948d4ca97289e240f2a45f4a8afee3340c0152e053108f621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-CL/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-CL/firefox-61.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "509acc1e54e03aadf6c2b1b21d0366d52fa02a51f1983107ef88a7a175226021a574bbdeccc5715bd63ad596f934fa69e1c10bc0122359409632d06bde63f14a";
+      sha512 = "2d1dcf65d150bfe52743b251127743aa5fee665a4d8a69d8250d629fb48d99f4d6af06162dd19011aac8d1d6dce22df5b1d5516084ea238342e14bc008db520a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-ES/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-ES/firefox-61.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e23028c9a8234744001b267ba43899b2740b63e5655ff289d1e45b1132f3fa97e28d7d800bdeaf2d016ede782432db8f7cae1dd8598eaffba3899c9f7a99ff37";
+      sha512 = "c843d1f6ed5175e8aff02e0501e377ebfa4095f423f6c8a069166c38fc417fd2ce670d1d23f2d00ab927bf2065103cfebf4e7be0acb803e6e448f523bcae0177";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-MX/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-MX/firefox-61.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a5974914bf0e664ee4dfc0ca2697be5971563e24249adb6b7a7528be67329ec43005fa77acf9bd51970776e9da110019d8bc353a4d6cbce3a27c122399c88cb3";
+      sha512 = "274d9c8343ceb3f9f9bca4d1664104b1ce40e5dc47bd029764421fe88e0700f5458d9a82848b5c35acc0f4a2b9e02b5d651638e71dee877ca7a1faa5955d0ea3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/et/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/et/firefox-61.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9701a3d97558c3a6946294aa3196d816ada9c721d72993a2b10be24640d48ec37c5675abe3a42df9ca986e8b92f3fffabe0649d3be335e2e557f39f63d454997";
+      sha512 = "30b7976181ade5c66d0f6e0239919e490b9082fa36deb1d483242d83b5cf150632862237d30481f8c8135fc00ff977a9b7cf1c9abccb8c2ff7eabfe5052d0c6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/eu/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eu/firefox-61.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "119c5b59dd5520017334db3ff95511ca8ab2d674dfbc85f0cd6f77fac919bbc0e99af18c59f05fb6cdf75f6015cb83ac24d15d0cf4ae3a2b5ed7564c8bc7bf9d";
+      sha512 = "92136a5d5dc0771be51a18e17c613fd921a99e40bf0069f2ce638c5c1e3489b8a1be119586cb4d8d7e57dc7132641158c3e5046e64c4047c5be137007302afa2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fa/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fa/firefox-61.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "c45fa6ace31733812411d597362bc56f4672fb7a8bd9b127eb288d7ddd2de3e129721c2ec44a08d8adbc8c15672328ef62384e0139a1e37c6a12ba9ae35ceb7f";
+      sha512 = "4911024cd6035415f4efa7fa1ed4e69d4af83455119477dd920f34626c941ee96177969c843744b1336f8ed557a2acf8137d5965d001725d59dbd0fe75ac68d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ff/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ff/firefox-61.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "cf96e6cdc941ec347036b5d737d0060a892220ebe6f72a71354a21099a7c82a0fd337bfeb6e6eba53d95af88754687888abc4dfa307348d5073315692a4f3496";
+      sha512 = "244f8cffb392dba35e18faa76f1fac9425a8389046953c6a74bc4776f71863b2de2bc97e0bbcef2b02929982541877245d2a1d5e749079b64fac3e461c4b87a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fi/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fi/firefox-61.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "0b4bc6fc0559c05b92e42bcd11513ae20d2101384189ffcff337cb017bfbc5a90151e5c4b8bfe29442ffddfb48eba552a06b3a1db24f7dbb78ff45bfc6a4b5f2";
+      sha512 = "b3cbf12bae53f19d8ee270458ad57d563dc09a4362c889b03c2135fda52964822c77acf444cdcef2f0a5f01e4c6609ae65769ffa0533f0aa22a73fabd51d8de0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fr/firefox-61.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "0ce803471b565c8ca715b1700a54be80894205434060751c31d8696d1716f3d3b8fc19c5a0baa82e78f7ffe0df462780e479597c975d2c476b10540de1e98656";
+      sha512 = "a1f09c3e1bde95708a97e7ce579af3e2c23fafe3715ba34e98f2f7409540b9a59ab4bd932c89d30c88d0689cf4d1e58fbf5f69e3682da39db5a7e460d3cea015";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fy-NL/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fy-NL/firefox-61.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "3dae49cc320f46622ec92d7ad948455a1861f8986cfe9b98bc73035fa41ae44c9b150b9223c037c87c42c5d93c62bdff40784010d2e7f8ee6ee8fb7725c3ee55";
+      sha512 = "050fd5cc1460eefb184d15497f3eb0af89a4796a80e556638f03263dc80da24f67a098e527a7d9d105ffc8381693aa8cc92140d0c51fdfe091697021eb526669";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ga-IE/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ga-IE/firefox-61.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "9bc562d1e432e6e45e56de1238b61f27303fe5b475f0ab0528e44f7c15424911b6b699b08e0386dec8cc7c15df9345b7690361b24b9d467841df63d5677392f6";
+      sha512 = "95aa5c888b0c8d249db2faa39cb42b4c004c4200da6b3854709cc25d12654d70b9fadcd732141c8ccd81bb1352c7c627b6665a9ae409ab87f1acfd4e27900cc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gd/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gd/firefox-61.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "fd343b25a8f07fd3d5f276372bdeea05bd9692b761051c9fa968beafb6518619ccc40e2d69ef00737ed4da23f092363ba575099137aec85dfb7f6a813384ca7f";
+      sha512 = "2ff55c69c3d7e87937b9a08863bb69824e07c84d9b433933fcb48058ac7973d1f8da67058220a805e1deb0c7f1ea25551f8f5e790a54cf0c18c2b38c83680cb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gl/firefox-61.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "2be7fd719d946a96325e684a14247ea344e9c5e096378f02629f87bcc1180d01010cf46f3baa4edc2cebeb4fb99aa5e1d79c24e7b2d1c4d5da1c747ae884be3c";
+      sha512 = "d956ac5b55a3437b00502823ab79b879f4d3448eab489e62a73520e56c67c5abf039badbfd1271b589baeac83025d6396712bce3d3ae1b4bff4767cc3ef08cdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gn/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gn/firefox-61.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "d19176ca380d778ed407db04712d51098b57090487564ffefbe0d2e25c4a35596e3ba2b10b9d179e886f38a4d3a4fbdfa7454116a49ec82b6701678c3af7d8dd";
+      sha512 = "176a71c3c938e602cdf4c693a6f5f4a424e1984fa949265911ddad5f9babad588318849f5050051233fcd077584ef9c10a76c240193edfea0aac6a960d739d83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gu-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gu-IN/firefox-61.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d219e58d9699ff8b3d87822421f032fbcb4f8c3dd7c13b928e7e8a1661d0672cc1582ea55fb348fb168641307d430d66aaa7912e32a9ac1c78091e3f46867723";
+      sha512 = "fc054c9c78d3705407bb388c0244cab2ffc941f7f4fadcc8c27181e720f40c1b6fade221b0ee9d2d833bffa1f09cce4714248a8f94a1d199580e99b63c10cf02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/he/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/he/firefox-61.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "cf2e5f7f7da94e75f26be5fb6c9e90d089dbab94779fa026ab61f87bbbb0e6ae75e16160c65f19de809bf6527b9d8a92bb0cec97ad18657b07ebb107b88edd6c";
+      sha512 = "1474c09dcb6f0aa2f2637c7ebd69eea0ef0374218138a1a3d51c06034a3803d47a82641fa3d95a1e0c960d72413ff68e8937fe3602abd335c8faf818184da3f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hi-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hi-IN/firefox-61.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "08626ae0313f7227eb144bd264a6f9c7d2e041b88fce8f1ea182bfdf438496ecc1899d9caf76bf00b6ea25604fa6032807766a93de088764e17a2c8449bd548c";
+      sha512 = "f0ce4bde052f506464c7a67b289f1202a8ffac52b21f7a0deb1a4a93067f9a9537d925390548924effb15724dca8a03bb5fa10eb991ce90ef201ce7a6608f3fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hr/firefox-61.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "1c9e3ae0e271ed1ed332fe1c6f820cd0ebf0cb01e86ec713b9523a7247efb8ddd4c6d5f0dd93d5522adab2e18e1bcf9ed44ed2a86be03643f1836e260b498524";
+      sha512 = "46a12ba74472f1d1698d62b32a3f421c80a4408ab98e5f72c1e221af89e9a428055a73ed11a9e5e909c27d89a4b03f230a2f55205b425e877f81bbee3a503f37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hsb/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hsb/firefox-61.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "669c3c36fc77359edabced7532e558d0f4e24fef66766b49ca71b4f32d19cc3a1856fc92b716de8507d742905fcb82d6d23f62d542f5adf151a95b99068c7195";
+      sha512 = "d6e456e80f4a0282091cd6e35aa75d61da9a8e5a02cff88f2c102404888b86b80ec3b0f5e3bf1f90f7ba207c9ee2ef5e83f64ace8d3f3d2f4875ee97d08d4243";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hu/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hu/firefox-61.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "c84788b5f7c670e0a0afda91f47d91f51a40e4441522e049b850bed89908363c74dfea7c9023bf3d54068c1fcdb7752f327f57b6f8812e880363881434f893f7";
+      sha512 = "1f1b201d42db1e6122aa7575e1a39ca3f2dfe0a896066080ddd917b5f37d6da824b483ab640a38431e2164a918d804a6f6647b1c3456f9f09e5e89dbb4b0de68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hy-AM/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hy-AM/firefox-61.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "ca81e92cc2ddf30c55dbf7124c4f11f0c2dc00466d17e8f518d2969ae57e04e2a543118756bae3e55bc72e668bc9e78ea1e11d952fb233e43941560720cfa90c";
+      sha512 = "0f99f6dabb425c27f3f6045413948e8e10c4b765c4104a1bc4c2a0e39a78495565a7104c1cbf8b47dfe5c3e9866855f633bc1b0f649d22864d4688941edc4832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ia/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ia/firefox-61.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "8914b9e45e37602eec6aa20a77ed5c9cf618b0c5d789fbe1821d13ea909148606923d1acbb79006c3fc3e38a4657e926eab02d91a1f47717a9b6f527c935c629";
+      sha512 = "3d192886bf01989adebce0582c9fef6ae89b06043dbd5ec5b0d3ce8157e08b288007483617f55f18ffb7a98647f31a856325b3974d446f7d4d0b0b27c619195f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/id/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/id/firefox-61.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "ccdc3eceb51e7ee33f3a49bbb752055bd000152dfe3af1bf9bd7d8a617e217c8615bea4c3ce1d8bb51ab60477956867f5ce93bad472da47fbf47404ab0db9524";
+      sha512 = "a82f87671af899d82cebb1745f8b373390982f7b0a7aa08e2f3b4fbe1d3ad4cc5356277767dd3200b794702af2895e43e2443d7a9fe308d7671786cdcfbea8f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/is/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/is/firefox-61.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "802c8d9b77678bdf051633b19a452544028a4be76fde686240a78fad9d25dc7ed38de0c58b54fbe214bcdc46e0cd1b6f2cad5ec646a8fabe3e8c7072b84b627a";
+      sha512 = "e89106d20bdf294de5fdff8bcd76425377d6154677f114547ca239a388ea78d4a447e8e6d7e0412ac438e126c4b6b10a869873e2da59c1df35c45e62dbbf59eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/it/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/it/firefox-61.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "44cc35fb9e6375739c5e88bc8e7489c15a80faa9d0327ffb2793916d2674cf71a4b237a41073f05477fcb142bdac8d4ada684ce2101027f551a7241eb46bb7b9";
+      sha512 = "2113ee46a7f2122300ed8bb84f3a5bba79e895e1d8c0b2632f64c7227ae815a4945a6c9c41bd504c8800deb2ad48956295fcd4c283227a433d7e670f5a5815e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ja/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ja/firefox-61.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "8daac42dcb02ad640a56196ce500b9528c4fbc2a562549f08d76bfd990e51dc2c938a99becd26860c659e4bdaf90465d6c9c909f6cea95030c61839adc79a4a7";
+      sha512 = "f06a1380b6a3e00afb1a07edcc3580c24c70401ab265fe4f9033fd0ade365b522eda4a81531bd5d42ebd4ae4b8661a0cb1bf37cf6db710376946eb7d9bdeda47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ka/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ka/firefox-61.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "2cd50870e0ebad8d385b5e1feffa546dbdee31c2916277c36afa9835d01f9e9dc1d7d4c0f386d4baca38eef11a6c0b1cf1657bc7588a1cd5512e894b12acb9d7";
+      sha512 = "834fd967a81070bcc1802001726a9e061182cf30a03227d4713b9d59df6e3559acccfd665b89b8b63e43764d14e37f0e5859075e276c67bd6e0972f608e5df8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kab/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kab/firefox-61.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "8c292f95480d21ad521df9e4fbbd580306c2615705a37a75ceaffc8f6ca5a24648fa1e0bc97006c34a38b6e58a523a487953c414395c1bef8f58c11b68bdf5e5";
+      sha512 = "15be0475321c0a7542361afcb28c5ded73b71bbbb504b4fa4a4a03e37178a5ed341634278e039ecd6f19c6ff25930a70f93abf2b7fccbe9faa9748134ed84ab6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kk/firefox-61.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "285e6bb268d6b9968d9a0d2cda10c82a790be9d0dde686ba3c0230d84029eae28943e1edf70188fb32c96a7712f13ed9087eac57d690bae222736593515e80e3";
+      sha512 = "74e0438fb6c73fe86246e90ac4902a0d07d3af65b11e76260aae00df7c4e0f6999ee63d3c88dfb33390ec480925d79e017d6aecf916a18cd7dca7856823a621e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/km/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/km/firefox-61.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "a939d51066e185a68170bd7c3d21523c4e3c5d69189822496ddbde0bda46ffba3728211efcebb89808ca6d70d76ba12547bfdea8c8fb3420000dbe39fecb8232";
+      sha512 = "2090a149d0a7062c62e0a2207c9c9d4de1ba9121898cdc0f820e4aa893e9af2937769b71aadc150c9c543db9fccfdfc5a027ab25e5b51465cadc591ca50df0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kn/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kn/firefox-61.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "2207b6883e5dc506d556f8f79bc773f304168029b3282835282296c8b2104ebee6a12e5b1f3887645d366339bc026e53021a004bbab893e3e0362ca28921c78d";
+      sha512 = "0ddcf94f52a3cc68a0f92aedfe4b84cb739967566ddb8f9fd67c151efbb3c5abf10a841a799a13280c21c1a4a9e2869028cb450cbad49fdab96b4ad797bba327";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ko/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ko/firefox-61.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "02b13260a74edecb18543679e8d0f969d95b40f87dc237f39465399ddfb5cdd66293408ffda594a53a6514a83ee120c464f3827064b6a286187916109eb0cb03";
+      sha512 = "c53b45bcb74ddbb385360607662b4ca845099ab3f276cf8dce4158963e90d3d17c2aecb4a5b0d4ea496328e72f6a1268d11a08bb2f5459d77033dd10fe6330c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lij/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lij/firefox-61.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2386a05577d90599c48c04083ef1305d84b7a88b6cf22eb331fcda80ef5678755f7d60f418c053dda9aa992aab5ac6ada99bc5e76afca9cec1dd0d250313d277";
+      sha512 = "d7480cc04cb4c13ddf7707be2b0c70694863aab289a73f28fbdea83363446f635ec52c8bbded3ac9c72360721a7adde9407da82816318bfc6dabe1e208582a23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lt/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lt/firefox-61.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "6eac885d100539167429293655033e86387d50fddc6d6702f5b9e8ee6f21758e3bf01e340c4dee702958851cdf89c3159ed940545b2d439f8d32a90bc3c272a4";
+      sha512 = "315c23da9ec3b270ba8840c8fcb5c34fba57b87319f499a64f140fb0e9803b229831b4366ed68287809a8a0277d3db955ffddd4042a4bd3f0f453e22ee97ed0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lv/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lv/firefox-61.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "984840eff4cf03915d04ca12ed78ce06db9c765db069d2cb647d3b795f8fbe6927f6abfa5d8ccc1c2806f10ab45fa7d612a08f4a0aee1b129c9aa4ad31bf4613";
+      sha512 = "b7af965deeecee3f907a0b119c886fe5c70ca48ee3ecb094ce052653e9241f6754f804e7b8513c57f060dcfe382949dbc69a4baf34875d5f2bc3fe452b3e4e28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mai/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mai/firefox-61.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "b063a79532ec9345751d69a41a1e3542256c2b623532a524724eda4f04aba6f5174c568cb45f60e332b1224f3cc0f9a0e641e455e3668cbbb52048571715a559";
+      sha512 = "def09aab80c64677ebd5088da465d7f76e56c3594c88343ffa39ce67f125086324a3e75161e3bc08e004a48555d15faf6b568357fb7909cdeb53934af6879696";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mk/firefox-61.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "944882edf6c53dc02682733d50dd09c1df3b06c8bb32e05ee1307504936ced2d408623b7ec6588aac3a26e5c82861cf5bb4db44cd4462c9fd8d9fe62dec19743";
+      sha512 = "51fb92f31ba8d0c7b5c27f54ef4db116be1266e3a23514b39b8af9988c8a72302b9157640773fbd4f0aab2f76d586ea2ee0b78fb4aeb5304635e7dc13cb5e0cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ml/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ml/firefox-61.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "b206d4ceffcf460c73b31326ce2a7cc5d8fefd851a3d824a0012793d0bb0cd773b6abfda81cfcb721f11b3f6b4f38de727a04ab2a32a56f3f7ab7abde6632d3a";
+      sha512 = "389b1ebad514f54484b2af8991d358dac58213a259ecfcb979561bd09954afba0594d9f0397c8948ce74165191046612b5da3c09d9c317118468e6c751177730";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mr/firefox-61.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "965c85edf69d05c96f3f23b987376c3747dfe9694af92f925c405a42544ac8a2992782c7aea60bce3fab4072db153b37e0f2873a4f42e564e821731eefd05400";
+      sha512 = "73ef9e2b717992bcd196c60f58ac6b4867e094b16ce0f6a919c32e159eca98993415f90e9edda96c64eb6cd1c0769e4b1fbc2365be41f0452ac93e657ecaa3d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ms/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ms/firefox-61.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "ae5938803a9acc6871577d6629579c0bd5ac4d7404e87cfe373876b94204d5af1110425400f9a7642b13bf2a68f32f2c485c8b9e3565f4d3c49ffd967a8e6df0";
+      sha512 = "bb19da37decb720804821cf5a4ce295bc385b5402412ee001e43a15f0943d56aaecfb94ac3a761170f2b479a50fe58bf2fb0ec6f318fe68bfcd3da2f05ef1919";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/my/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/my/firefox-61.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "4fb3ac47fcd3b7b36bb66fa24ac82bf9ade26fbadf8eea125b78fced6222ae0f2c3c45638b3511b630b50e27fce70739733fbb357744ba89febd16544703b356";
+      sha512 = "17b96fc20d62a938e92bf8f6659b451752700292cf209da477571945a8d126784bd3e5ed75e27feb5c4b75addb64b45da2a2dfdbba98f62b3508a74c0a681a08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nb-NO/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nb-NO/firefox-61.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c469e49346a29b8b2bb87b6d3be37f72be7db18977a9085240184a66cced8da5c8a62d09c84424985418e106d8cc1a2359ce8778e515430188ff6921d403b42f";
+      sha512 = "a99b83bf5b85b44c46166448fb56490c020a7dc9e7357c9b4d5abd2552f91d7ca6f9cc445b8b2255481aa212b7ac1c9662e5406b760922d3d64c7ae611823bea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ne-NP/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ne-NP/firefox-61.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "5374a889f9ae7934c4138b4742dfe50c360858e460b7e348be5ba7196f001453466c84b8bb55e8c1178a194e9500831684f50866c13ccfdd6228a8fb4d17e607";
+      sha512 = "6d8ad313b854fbb564f06d3ffae52f90ac7bc57620d0a642874a1eafd950966471cc201828045e5fd005a7cb848f37f77cee2efcc0f19dffb7f02b391fe02acc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nl/firefox-61.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f937a25191c60c973b0676cc9ad993c07c221dbdc3c3f794c8cfbb2981ebe4d85b0450702b5c7270f47f6daa7b55bb4fb617e113686bc7b496811f5304ae8053";
+      sha512 = "d8fa336c7084823bc3430d0c11e2bc8e38874e3ca33886e48a1318ca2d5deb7d0a523f9b7f8e86596e456c1d4f899edf22af2058a162ea5ea1266596a812aeef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nn-NO/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nn-NO/firefox-61.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "d95de4ef017c0fb951fcf8c90488acc63f5fa82ec7c72bc87f02aa4f2f4f75c2f4cf1a805958fadacd65759e68fef1be21181ad8511c6d1158bbf331c72b97d2";
+      sha512 = "69028673fb57cb9fb7d87d6e3bdfabd5e530f51680af61052791a9a160c6a8a2545c9a4e5bbc3cf37d6595120641f20c4514dad59ad1ca4745c8fd5b72fe539d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/oc/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/oc/firefox-61.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "d4757d7a79b953a9aa92363c7fc40a7545fd7dcfa5ed03ee45af2b48b71b74a0fcbb841fd580244e6ddcc392c6fd105fbaaa03e42256522e2b51e6b18f433fb3";
+      sha512 = "5d1d399dc74ff5cff63e460ca223c11e130ec2fe96a974262ea47a055899a6ef875aa4e554c1edbbedd0b5fba66270c5664a7e66040e5d59bed6cbe3793b9a84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/or/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/or/firefox-61.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "e5d6ec46f23bb31fd32ec5bf58049d7d948fb7632a198fdac34c004c23b58d2bb08c163e4b53e789529d1f6232fd050142a0c84d7d43d1d334ad3b66857a747e";
+      sha512 = "31b555805922b46594ec82918c70a1862ab032e6a593b1b72a85ac7852a4d49dceac2ea76f2ca22d0b648a5e3c7636611bf247c4ad4133ddb5be309b99768da7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pa-IN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pa-IN/firefox-61.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "bc2d7ef61b866fae30e6b2fe6c542e206e879d4d0edeff4764a635c9927430cd763e6e907d8676914a5dc95d7a670958f332a62d09517446cfa1a32ebbc858df";
+      sha512 = "62d1d01fcd5001e108c17b6b6a5828f387b89f1c1a77f954dd31a88d226c355086e5246e4c9dbcb805a4faa12ebc9662270aa07d34c397ca43cf0daa1333a106";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pl/firefox-61.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "c8ee365012576e66468c848d232af3d28796fc7bb8a2971e953ae0f4783b3eee06bd4c1da5725732ee5bd964c2447d1d3cd11041f5d56d88877fc36a6a568dab";
+      sha512 = "e2f51335bb4ab71698643599689865d56c3832ffc4e946ddbec63109c53f6dbfd337473ef7f3052fc63570c8b3e029cf68bcb0754916bfe3cfb2e1c774eb4435";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pt-BR/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-BR/firefox-61.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e708e25ba08c0ba92981c0abd27b170086fd7e54be5604ba5b6c4be47012d4cc467f5ee81e5a50ee1ccf413d5e4e3fa29fafca0ce84d4b35001e59e46afa796b";
+      sha512 = "55fc461bd3016d633471a999d6b9cf58b64f7ed243ffe7eb00e95b08b94e3f774ce300b6745cf2eaacec9399df8c905a0c2c621659db15e1bda0faa3cd747006";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pt-PT/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-PT/firefox-61.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5a227d1954a93f35d83b7f89b48d6fef10f1ce09c239eb84a3fbf76b2c93f03ecb0890a9c18bc2d2edb01fece405aeafe16ced0420ef8b8ff90efb232d13569b";
+      sha512 = "d29373018e02b47999c31f80bb5be4b04825cce738451e81b1c3a9454f6ce278f027a7ea6dce97d49ca795495920179b1163a33bf2a04dcc64e1c4e86ed7346c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/rm/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/rm/firefox-61.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9f2caae925cebb42c49c4c2b139dcfd961174aa8a4dd4d323b65d84b6acbef5beb1e5c844f09454d6fa3af882758137d452ba1cbad5cf017a8b54766f4967ba1";
+      sha512 = "02853099aa53ac35de59ceeea533de72eca31897b0e46e503870379ea57829d8e298bd39cac55cd6b42ae757617a2ab7e0d65566422c2eb23b8518bb38f6acd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ro/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ro/firefox-61.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a24ffa5fb4f05bb700025df13384ca5f57183eb94d9826fa82560dc45d50a05c3f96c7c58fb1f609e1efdf3b9d3b86bd720a044d5c5c0ae8886e1d4218189635";
+      sha512 = "404a9b30e228eb990df49126a1066b727669e4f76fbcc0ac90934539393a56342a01cadc46293b636edcd9fa11ec629496a822c693da74f900f322ee19bcdf76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ru/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ru/firefox-61.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e256695c13cdce7fbd0650561c2e68ca7b3c6eafef5c451b54db67ebd6dc0c14f1c84622cc2550a573932b4ef1ffe20d1608a2d36d3fe0033ec18399ca80448d";
+      sha512 = "62d8315cada27354c4d59c94d04522954e82277b245055262e856e6c98e967e5c1fd84aef1d5893f51d92d567e6a0992c7e8ff1661620af6b1980b32d0982fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/si/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/si/firefox-61.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "b42ffbb1c3948555320d89e7732c145061b91453ed6f70a7d334754264ede63759201ff36bf94b1e33814c0d171541e450f8eb53ef95e8c5320d0e408475ba5c";
+      sha512 = "b7bce8630eacd3b7e07cc355068a0e9d432223cec4f5cbefc4f912dd1a9aad37dd66751c3ad4192592b52391437f2fb0bcba96f6683e83e63501bcab52f632ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sk/firefox-61.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d224b3ae2edeea852e2d26314b3f8d22d7c048eebd540107281b2863c23dd7c7caeab9ec814c90434da515e912acfea35d5331beede5b9e6bc74ec77ca8e8781";
+      sha512 = "1b5fcdd53fa59a14645494a6a2bb2e2050c9c6062fc446496888dd64e555c2326065658e622160fa02831ca073b5c3e226de5cbee8b42678a5bbdcdc0ba52d09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sl/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sl/firefox-61.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c3c1ae0ce8858d1dfeba2e56d9b92769ab06585c86519f754f3ac97a527816bbf7c56df6e8055c04e7b06370c1b9c397ca522991c5f23371ef4e76fb3811cd23";
+      sha512 = "b539609ccc63eae0ab092b5c7d326f414c058c58fc5188e1a55d81478e1305b612b5e7bf32f071bf71d15ddbe36fd2d09647beaa913c624e30b68bfecb52b09c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/son/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/son/firefox-61.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7622a3c211e34c48185e5756168378d60bbfb52784cb9b4e1b37d9e985d92d3d88ba6b29b750578136db9beb5f2123cb1b7c9f47d4b8139b0441b92884620c4a";
+      sha512 = "9bd817b0ae3a80472a3cf1ba8f8c6c564bd09fc92b09c95d97008cf940a663f61aab6e52ee99991be148a54296c5af38c7105ab655a60fb6f7e171b0b2b94880";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sq/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sq/firefox-61.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "8f4f30bd858bba7c2e90655821395522f6a96e38ff169334b034f182162294af8ca2d00da375e03c3e18e1c96c113333ec4f7d41ac01d385a12a7acb3e188653";
+      sha512 = "c066ae8b06bab9c27dbb21f016d860c67fb63402b899d06030b821f61b4bdb1ed0cd946792e36203a2ca32d86a49a67538da24745133a36fdecc654726f13235";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sr/firefox-61.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "00b4b3ef5d8217d7acfb2504c86338ca729f9ca3b69f2a0616def97ca88bcf61f2669f1a4e4acf4ccf5473db08de53c4308a342cc3ce944634743fdc1b8e5a11";
+      sha512 = "8853eceb13dba82f95382592009198eedf465618be213659ecb962fb3590451aed7a45fab05749c77f50ef6b5f188f60d15c92af37e6f3325661de35dfcb2d71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sv-SE/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sv-SE/firefox-61.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "287ae1efdc8ec6a34165bd4588b51c0f81203685d47ed59c01922e87d7d9aae9ab23b1351a7297a493d45645635c2da7458b245ef56991e7ec928fe264576e57";
+      sha512 = "7898426b4152fd469fed37b8e84daf73ac93203ee3d625a3efafbec1e2f910e321300d94329115736e1f800d5c538c7a43046e184b932e05b580238faeb63109";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ta/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ta/firefox-61.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "fde55160176bf7f5c016d7d780e8a78e556ba6d04e1703e6fd6e90ffa278b23822855e8e26a7b86ff38cf006dad3042ea9cd7d4f75b810efa5f543ac28126f6a";
+      sha512 = "cd6248f8946bec179a192411a0f81b48ead19354cde614f1260420b6134b69eadc23f278489756ce55d3a45b94f0f7b89e4fd5a08708899485170540833634b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/te/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/te/firefox-61.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "5cd75ab1ed134ceae22c0020d753cae351caabf513a025dfe30ab3b146f5c693cdf202f5cb4f48a00fafdfe6584ff693d383a5a3f973e307e9ef056e61bcc43e";
+      sha512 = "6d6ee190eef46bcf6894a429a589fdf0c336eba5e3b96f28f46d6359562e4c88cbdcb18cfa0053fc5f10e4e7e310e9d7aa3a7ea32d3d6772670221d5e9b28272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/th/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/th/firefox-61.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "037b7e200bb6246e3d95983f5cd9451a10c54be0fcbbf30ec35ddc115395cf8fda3274a212285bbb1dcadd69f3efaab60606345765ed3f69471c5ea2d47c467e";
+      sha512 = "44fcee59ff292ae1015cf305440ec2f7d8fcf7888705732927311bea40d4bd140a6e74f0e0bba3788b3f9ea62f18d3fe2c23e12ddf78eda7df57da914d53dc29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/tr/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/tr/firefox-61.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "d2cd7b818c64a6529387d5bf540174aee44b5e863479978b15aac20fe62d102f231d2f1367454c5ddf9f3009776e6176fca8d96eeb221730a477c4fced4b45d7";
+      sha512 = "a398769dd7950dabb84638e216b1cce7be94693c29bf2989ed313ca7470f7c5bfd471a3663b08dd0c16b3ac28d5e0b1b42b30b05ab812d16914939bb1ece0b2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/uk/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uk/firefox-61.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "4f8ed8dbd4f7bc8184ee4c128382a5ccc5dd6b93840199657a6a2ce5e6ffa5b192d7e17d50ea4a4631f2ef0a5fa225506de953a03e92b4f51e731c436d4d2b11";
+      sha512 = "fa3301461971158c7dc6ea683b3ba130be99674762dff62cedc5120d8473cf66ddb08579b3a911946a62ff9d575e6baabb5beae7c458af8a5b5a1028c4abeee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ur/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ur/firefox-61.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "4c8db3bf7affc403705bcb5c4da7685a43cc6119e02f3efe8fa499bc22da18a6f43f7d720fe07c32d226d97e6f92ea1611f153d85f7ebd25c038e938acaa3da8";
+      sha512 = "a8d587b5808ca09907e2d788bf5d85df12663d30dc6d28b0c589c98b4e973eafb5a34e0fa69c5cefec992a50249e1c846f1d858e089f5264e6db14c261b6dcf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/uz/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uz/firefox-61.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "933c279629ce254da1f7886825a934413a129e2371eb72a8999dc846e0cee12648e68ea9f3b01264aea4c1b5fb2f9081e039b02bc7f5c808307135e8675e05f7";
+      sha512 = "b502728c13ac63f4017f2ddf655bb894f9486c8538c75cb4e68de06ff2fa93a2ce0a9f3e36180a28aaa0fe4c23d35a5d734ab26110a1631d8bc5aea00f7eaa14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/vi/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/vi/firefox-61.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "c2bd138c1edd4425ee7f9cf341cb01d2ef04c1924185c8632a7b2e8ce3c87b4847611827dedfd826ad12028d486a27536c2053b9a677edcf74232183f36a49d7";
+      sha512 = "22e87ab09fd252886bf0040b43cd18e8d17666efe86da5fa3d6c981f3d85c1eaecf323a27157599d335ab8d09fdd8afd0a34ba7d2daa6069ef54b778074a98e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xh/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/xh/firefox-61.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "2ee93f40b882c52b80297075864a079b9a91ad30f9fbb64d64d4eeddf9cee31b717d4fbf59d25c8fd40944a2df2f0b67e95d1a57cb1031277429a7fe97be0d05";
+      sha512 = "eb941a2457336c1057103736501d6a0eef688750e7a3ecf672bdc7957fc10ac0e681cbb43d6d88e9025182df1c18bdc2e6ed42332359ad464756f46e69240d75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/zh-CN/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-CN/firefox-61.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1ab340e9827d84d757f7b88c165ff07ab2d6202cdf939b6a50d40e23d09c002a49daaf9d4e7b90fdf20cfe36160e2d6518fcedf455de5a9f49c05badd6f0cb69";
+      sha512 = "ef196dc65cf7d93986d332795f5bee25b8bfb7322d8def53921bc3456c28ddfe555ad9a15fc7805662564d43f17391482442344502ee71cb30a77add41ef5a11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/zh-TW/firefox-60.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-TW/firefox-61.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3886ef200481d8f0dcb4add628144dfda705edeea37f1560fdeee7a45e797b75b885a2e590193d59f84d13b2c848c42d0e0f94986d3f4c514a9410e6924a71f4";
+      sha512 = "7bdebc9f67bf6ed0f5b19d95abb2b3550ff5d8da4d9da3f7764340ded15fb16bccf910bdc56c250db789bed735bada5ac8f4a5f5353174d94dabf984e03f7c23";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 9a3da4307146d..50eb396d6442c 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,13 +1,14 @@
 { pname, version, updateScript ? null
-, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta
+, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? []
+, overrides ? {}, extraNativeBuildInputs ? [], meta
 , isTorBrowserLike ? false }:
 
-{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
+{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL
 , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
 , freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, libGLU_combined, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, icu, libpng, jemalloc
+, cairo, icu, libpng, jemalloc, glib
 , autoconf213, which, gnused, cargo, rustc, llvmPackages
 , debugBuild ? false
 
@@ -75,27 +76,27 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [
     gtk2 perl zip libIDL libjpeg zlib bzip2
-    dbus dbus-glib pango freetype fontconfig xorg.libXi
+    dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
     xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
     nspr libnotify xorg.pixman yasm libGLU_combined
     xorg.libXScrnSaver xorg.scrnsaverproto
     xorg.libXext xorg.xextproto sqlite unzip makeWrapper
-    hunspell libevent libstartup_notification libvpx /* cairo */
-    icu libpng jemalloc
+    libevent libstartup_notification libvpx /* cairo */
+    icu libpng jemalloc glib
   ]
   ++ lib.optionals (!isTorBrowserLike) [ nss ]
-
+  ++ lib.optional (lib.versionOlder version "61") hunspell
   ++ lib.optional  alsaSupport alsaLib
   ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
   ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
   ++ lib.optional  gtk3Support gtk3
   ++ lib.optional  gssSupport kerberos;
 
-  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   nativeBuildInputs =
-    [ autoconf213 which gnused pkgconfig perl python cargo rustc ]
-    ++ lib.optional gtk3Support wrapGAppsHook;
+    [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
+    ++ lib.optional gtk3Support wrapGAppsHook ++ extraNativeBuildInputs;
 
   preConfigure = ''
     # remove distributed configuration files
@@ -113,7 +114,7 @@ stdenv.mkDerivation (rec {
     cxxLib=$( echo -n ${gcc}/include/c++/* )
     archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
 
-    test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
+    test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
   '' + lib.optionalString googleAPISupport ''
     # Google API key used by Chromium and Firefox.
     # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
@@ -134,7 +135,6 @@ stdenv.mkDerivation (rec {
     "--with-system-png" # needs APNG support
     "--with-system-icu"
     "--enable-system-ffi"
-    "--enable-system-hunspell"
     "--enable-system-pixman"
     "--enable-system-sqlite"
     #"--enable-system-cairo"
@@ -148,6 +148,7 @@ stdenv.mkDerivation (rec {
     "--disable-gconf"
     "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
   ]
+  ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell"
   ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
     # on i686-linux: --with-libclang-path is not available in this configuration
     "--with-libclang-path=${llvmPackages.libclang}/lib"
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 9cdbcb8b4ceec..bdb9dab4f9d26 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
+{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
 
 let
 
@@ -6,10 +6,6 @@ let
 
   nixpkgsPatches = [
     ./env_var_for_system_dir.patch
-
-    # this one is actually an omnipresent bug
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
-    ./fix-pa-context-connect-retval.patch
   ];
 
   firefox60_aarch64_skia_patch = fetchpatch {
@@ -24,15 +20,17 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "60.0.1";
+    version = "61.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn";
+      sha512 = "0alkiz89c42y6677n7csk694g9qsfzm8x928i6007mcdyh8ifkg1604pxwp6irid0w3v8cz7b2153jkk4f0qdx85a2r9csh8hbar583";
     };
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
-    ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
+    ];
+
+    extraNativeBuildInputs = [ python3 ];
 
     meta = {
       description = "A web browser built from Firefox source tree";
@@ -47,13 +45,17 @@ rec {
 
   firefox-esr-52 = common rec {
     pname = "firefox-esr";
-    version = "52.8.0esr";
+    version = "52.9.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1";
+      sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9";
     };
 
-    patches = nixpkgsPatches;
+    patches = nixpkgsPatches ++ [
+      # this one is actually an omnipresent bug
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
+      ./fix-pa-context-connect-retval.patch
+    ];
 
     meta = firefox.meta // {
       description = "A web browser built from Firefox Extended Support Release source tree";
@@ -66,14 +68,18 @@ rec {
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    version = "60.0.1esr";
+    version = "60.1.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b";
+      sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6";
     };
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
+
+      # this one is actually an omnipresent bug
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
+      ./fix-pa-context-connect-retval.patch
     ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
 
     meta = firefox.meta // {
@@ -137,35 +143,18 @@ rec {
 
 in rec {
 
-  tor-browser-7-0 = common (rec {
-    pname = "tor-browser";
-    version = "7.0.1";
-    isTorBrowserLike = true;
-
-    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
-    src = fetchFromGitHub {
-      owner = "SLNOS";
-      repo  = "tor-browser";
-      # branch "tor-browser-52.5.0esr-7.0-1-slnos";
-      rev   = "830ff8d622ef20345d83f386174f790b0fc2440d";
-      sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
-    };
-
-    patches = nixpkgsPatches;
-  } // commonAttrs) {};
-
   tor-browser-7-5 = common (rec {
     pname = "tor-browser";
-    version = "7.5.4";
+    version = "7.5.6";
     isTorBrowserLike = true;
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-52.8.0esr-7.5-1-slnos"
-      rev   = "dbaabe129d2982bee00a753146fbe610fec0ca50";
-      sha256 = "0j60vz18bwabqbzv0r1id3vcyh3832mzx6cg5r7x5c03s5hn40a4";
+      # branch "tor-browser-52.9.0esr-7.5-2-slnos"
+      rev   = "95bb92d552876a1f4260edf68fda5faa3eb36ad8";
+      sha256 = "1ykn3yg4s36g2cpzxbz7s995c33ij8kgyvghx38z4i8siaqxdddy";
     };
 
     patches = nixpkgsPatches;
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 5b2ede611d03d..62fd4f533ea03 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -7,7 +7,7 @@
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
-, browserpass, chrome-gnome-shell, uget-integrator
+, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
 , libudev
 , kerberos
 }:
@@ -60,15 +60,17 @@ let
         );
       nativeMessagingHosts =
         ([ ]
-          ++ lib.optional (cfg.enableBrowserpass or false) browserpass
+          ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
           ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
           ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
+          ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
           ++ extraNativeMessagingHosts
         );
-      libs = lib.optional ffmpegSupport ffmpeg
+      libs = [ libudev ]
+            ++ lib.optional ffmpegSupport ffmpeg
             ++ lib.optional gssSupport kerberos
             ++ lib.optionals (cfg.enableQuakeLive or false)
-            (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
+            (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 true) libpulseaudio;
       gtk_modules = [ libcanberra-gtk2 ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 507697f0c2c3c..2384a9da19cb8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "30.0.0.113";
+  version = "30.0.0.134";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j"
+          "1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80"
         else
-          "1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4"
+          "1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6"
       else
         if arch == "x86_64" then
-          "05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l"
+          "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw"
         else
-          "0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8";
+          "011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 8664b20e82d79..dbf0bbbd4d549 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "30.0.0.113";
+  version = "30.0.0.134";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0"
+        "1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax"
       else
-        "10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8";
+        "13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index b98d1d415c665..37ea44bb28d62 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -11,7 +11,7 @@
 , freetype
 , gdk_pixbuf
 , glib
-, gnome2
+, gnome3
 , gtk3
 , libX11
 , libxcb
@@ -32,12 +32,13 @@
 , pango
 , stdenv
 , systemd
+, at-spi2-atk
 }:
 
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "50.0.2762.45";
+  version = "53.0.2907.99";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -54,7 +55,7 @@ let
     freetype.out
     gdk_pixbuf.out
     glib.out
-    gnome2.GConf.out
+    gnome3.gconf
     gtk3.out
     libX11.out
     libXScrnSaver.out
@@ -81,6 +82,8 @@ let
 
     # Works fine without this except there is no sound.
     libpulseaudio.out
+
+    at-spi2-atk
   ];
 
 in stdenv.mkDerivation {
@@ -89,7 +92,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-    sha256 = "1ajdr6yzqc9xkvdcgkps6j5996n60ibjhj518gmminx90da6x5dy";
+    sha256 = "0fih5047xv275rmbcr2drji81wxi6p0kyp172mmn328g3pzddmwx";
   };
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 38aaf8115166a..47a273e99f981 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -12,11 +12,11 @@ assert withMediaPlayback -> gst_all_1 != null;
 let
   pdfjs = stdenv.mkDerivation rec {
     name = "pdfjs-${version}";
-    version = "1.7.225";
+    version = "1.10.100";
 
     src = fetchzip {
-      url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
-      sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8";
+      url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip";
+      sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
       stripRoot = false;
     };
 
@@ -27,15 +27,13 @@ let
   };
 
 in python3Packages.buildPythonApplication rec {
-  name = "qutebrowser-${version}${versionPostfix}";
-  namePrefix = "";
-  version = "1.3.1";
-  versionPostfix = "";
+  pname = "qutebrowser";
+  version = "1.4.1";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
-    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "121fz549vlxdasw0lcx6v394x8g34nadvrfs4svw3b65n0shv1ky";
+    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
+    sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3";
   };
 
   # Needs tox
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 97b719c1471b4..de6766709131a 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.4";
+  version = "7.5.6";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1d5q2vc7kyd2wizl4551yf54rcagh3y2xf1lzvrswxq4kasii3h9";
+      sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "18v7ykv23gsylvn9mlkp5547yz3y833i9h126r7195wsqdshizdj";
+      sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461";
     };
   };
 in
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index 65ebaa3f80c57..031c520275feb 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -340,7 +340,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "An unofficial version of the tor browser bundle, built from source";
     homepage = https://torproject.org/;
-    license = licenses.unfreeRedistributable; # TODO: check this
+    license = licenses.free;
     platforms = [ "x86_64-linux" ];
     hydraPlatforms = [ ];
     maintainers = with maintainers; [ joachifm ];
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
new file mode 100644
index 0000000000000..8a60023b43500
--- /dev/null
+++ b/pkgs/applications/networking/charles/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }:
+
+let
+  desktopItem = makeDesktopItem {
+    categories = "Network;Development;WebDevelopment;Java;";
+    desktopName = "Charles";
+    exec = "charles %F";
+    genericName  = "Web Debugging Proxy";
+    icon = "charles-proxy";
+    mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace";
+    name = "Charles";
+    startupNotify = "true";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "charles-${version}";
+  version = "4.2.6";
+
+  src = fetchurl {
+    url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
+    sha256 = "1hjfimyr9nnbbxadwni02d2xl64ybarh42l1g6hlslq5qwl8ywzb";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    makeWrapper ${jre}/bin/java $out/bin/charles \
+      --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
+
+    for fn in lib/*.jar; do
+      install -D -m644 $fn $out/share/java/$(basename $fn)
+    done
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
+    mkdir -p $out/share/icons
+    cp -r icon $out/share/icons/hicolor
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Web Debugging Proxy";
+    homepage = https://www.charlesproxy.com/;
+    maintainers = [ maintainers.kalbasit ];
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index f394df3391ac2..402a03b77f4aa 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre
-, version ? "1.4" }:
+, version ? "1.5" }:
 
 let
   versionMap = {
     "1.3" = {
-      flinkVersion = "1.3.2";
+      flinkVersion = "1.3.3";
       scalaVersion = "2.11";
-      sha256 = "0mf4qz0963bflzidgslvwpdlvj9za9sj20dfybplw9lhd4sf52rp";
+      sha256 = "0gfm48k5adr14gnhqri9cd01i9dprd0nwmnnz3yrpd20nq4ap4qy";
       hadoopBundle = "-hadoop27";
     };
     "1.4" = {
@@ -15,6 +15,12 @@ let
       sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
       hadoopBundle = "";
     };
+    "1.5" = {
+      flinkVersion = "1.5.0";
+      scalaVersion = "2.11";
+      sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
+      hadoopBundle = "";
+    };
   };
 in
 
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index a9e7325d181f7..6f4bc17f8b508 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -1,76 +1,155 @@
-{ stdenv, fetchurl, makeWrapper, which, jre, bash }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }:
 
-let 
-  hadoopDerivation = { version, sha256 }: stdenv.mkDerivation rec {
+let
+  common = { version, sha256, dependencies-sha256, tomcat }:
+    let
+      # compile the hadoop tarball from sources, it requires some patches
+      binary-distributon = stdenv.mkDerivation rec {
+        name = "hadoop-${version}-bin";
+        src = fetchurl {
+          url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}-src.tar.gz";
+          inherit sha256;
+        };
 
-    name = "hadoop-${version}";
+        # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files)
+        fetched-maven-deps = stdenv.mkDerivation {
+          name = "hadoop-${version}-maven-deps";
+          inherit src nativeBuildInputs buildInputs configurePhase;
+          buildPhase = ''
+            while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
+              echo "timeout, restart maven to continue downloading"
+            done
+          '';
+          # keep only *.{pom,jar,xml,sha1,so,dll,dylib} and delete all ephemeral files with lastModified timestamps inside
+          installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
+          outputHashAlgo = "sha256";
+          outputHashMode = "recursive";
+          outputHash = dependencies-sha256;
+        };
 
-    src = fetchurl {
-      url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
-      sha256 = "${sha256}";
-    };
+        nativeBuildInputs = [ maven cmake pkgconfig ];
+        buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ];
+        # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated
+        postPatch = ''
+          for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \
+                      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java \
+                      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java \
+                      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DockerContainerExecutor.java \
+                      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java \
+                      hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java; do
+            if [ -f "$file" ]; then
+              substituteInPlace "$file" \
+                --replace '/usr/bin/stat' 'stat' \
+                --replace '/bin/bash'     'bash' \
+                --replace '/bin/ls'       'ls'   \
+                --replace '/bin/mv'       'mv'
+            fi
+          done
+        '';
+        configurePhase = "true"; # do not trigger cmake hook
+        mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e";
+        # prevent downloading tomcat during the build
+        preBuild = stdenv.lib.optionalString (tomcat != null) ''
+          install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz
+          install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz
+        '';
+        buildPhase = ''
+          # 'maven.repo.local' must be writable
+          mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags}
+          # remove runtime dependency on $jdk/jre/lib/amd64/server/libjvm.so
+          patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0
+          patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0
+        '';
+        installPhase = "mv hadoop-dist/target/hadoop-${version} $out";
+      };
+    in
+      stdenv.mkDerivation rec {
+        name = "hadoop-${version}";
 
-    buildInputs = [ makeWrapper ];
+        src = binary-distributon;
 
-    buildPhase = ''
-      for n in bin/{hadoop,hdfs,mapred,yarn} sbin/*.sh; do
-      sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
-      done
-    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor;
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/test-container-executor;
-    '';
+        nativeBuildInputs = [ makeWrapper ];
 
-    installPhase = ''
-      mkdir -p $out
-      mv *.txt share/doc/hadoop/
-      mv * $out
+        installPhase = ''
+          mkdir -p $out/share/doc/hadoop
+          cp -dpR * $out/
+          mv $out/*.txt $out/share/doc/hadoop/
 
-      for n in $out/bin/{hadoop,hdfs,mapred,yarn} $out/sbin/*.sh; do
-      wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_HOME "$out"
-      done
-    '';
+          #
+          # Do not use `wrapProgram` here, script renaming may result to weird things: http://i.imgur.com/0Xee013.png
+          #
+          mkdir -p $out/bin.wrapped
+          for n in $out/bin/*; do
+            if [ -f "$n" ]; then # only regular files
+              mv $n $out/bin.wrapped/
+              makeWrapper $out/bin.wrapped/$(basename $n) $n \
+                --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \
+                --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \
+                --set JAVA_HOME "${jre}" \
+                --set HADOOP_PREFIX "$out"
+            fi
+          done
+        '';
 
-    meta = {
-      homepage = http://hadoop.apache.org/;
-      description = "Framework for distributed processing of large data sets across clusters of computers";
-      license = stdenv.lib.licenses.asl20;
+        meta = with stdenv.lib; {
+          homepage = "http://hadoop.apache.org/";
+          description = "Framework for distributed processing of large data sets across clusters of computers";
+          license = licenses.asl20;
 
-      longDescription = ''
-        The Apache Hadoop software library is a framework that allows for
-        the distributed processing of large data sets across clusters of
-        computers using a simple programming model. It is designed to
-        scale up from single servers to thousands of machines, each
-        offering local computation and storage. Rather than rely on
-        hardware to deliver high-avaiability, the library itself is
-        designed to detect and handle failures at the application layer,
-        so delivering a highly-availabile service on top of a cluster of
-        computers, each of which may be prone to failures.
-      '';
+          longDescription = ''
+            The Apache Hadoop software library is a framework that allows for
+            the distributed processing of large data sets across clusters of
+            computers using a simple programming model. It is designed to
+            scale up from single servers to thousands of machines, each
+            offering local computation and storage. Rather than rely on
+            hardware to deliver high-avaiability, the library itself is
+            designed to detect and handle failures at the application layer,
+            so delivering a highly-availabile service on top of a cluster of
+            computers, each of which may be prone to failures.
+          '';
+          maintainers = with maintainers; [ volth ];
+          platforms = [ "x86_64-linux" ];
+        };
+      };
 
-      platforms = stdenv.lib.platforms.linux;
+  tomcat_6_0_48 = rec {
+    version = "6.0.48";
+    src = fetchurl {
+      # do not use "mirror://apache/" here, tomcat-6 is legacy and has been removed from the mirrors
+      url = "https://archive.apache.org/dist/tomcat/tomcat-6/v${version}/bin/apache-tomcat-${version}.tar.gz";
+      sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc";
     };
   };
-in
-{
-  hadoop_2_7 = hadoopDerivation {
+
+in {
+  hadoop_2_7 = common {
     version = "2.7.6";
-    sha256 = "0sanwam0k2m40pfsf9l5zxvklv8rvq78xvhd2pbsbiab7ylpwcpj";
+    sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010";
+    dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r";
+    tomcat = tomcat_6_0_48;
   };
-  hadoop_2_8 = hadoopDerivation {
+  hadoop_2_8 = common {
     version = "2.8.4";
-    sha256 = "05dik4qnazhf5aldwkljf610cwncsg5y3hyvgj476cfpzmr5jm3b";
+    sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w";
+    dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03";
+    tomcat = tomcat_6_0_48;
   };
-  hadoop_2_9 = hadoopDerivation {
+  hadoop_2_9 = common {
     version = "2.9.1";
-    sha256 = "1z22v46mmq9hfjc229x61ws332sa1rvmib3v4jsd6i1n29d03mpf";
+    sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7";
+    dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x";
+    tomcat = tomcat_6_0_48;
   };
-  hadoop_3_0 = hadoopDerivation {
-    version = "3.0.2";
-    sha256 = "10ig3rrcaizvs5bnni15fvm942mr5hfc2hr355g6ich722kpll0d";
+  hadoop_3_0 = common {
+    version = "3.0.3";
+    sha256 = "1vvkci0kx4b48dg0niifn2d3r4wwq8pb3c5z20wy8pqsqrqhlci5";
+    dependencies-sha256 = "1kzkna9ywacm2m1cirj9cyip66bgqjhid2xf9rrhq6g10lhr8j9m";
+    tomcat = null;
   };
-  hadoop_3_1 = hadoopDerivation { 
+  hadoop_3_1 = common {
     version = "3.1.0";
-    sha256 = "1rs3a752is1y2vgxjlqmmln00iwzncwlwg59l6gjv92zb7njq3b7";
+    sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314";
+    dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d";
+    tomcat = null;
   };
 }
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index ae9dc3bbc34ad..d09e65a4caae0 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if isLinux
-             then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6"
-             else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp";
+             then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn"
+             else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv";
   pname = "helm";
-  version = "2.9.0";
+  version = "2.9.1";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
@@ -45,6 +45,6 @@ stdenv.mkDerivation {
     description = "A package manager for kubernetes";
     license = licenses.asl20;
     maintainers = [ maintainers.rlupton20 ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = [ "x86_64-linux" ] ++ platforms.darwin;
   };
 }
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index b1dcfb809b5d1..358f4cdb7df77 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoPackage, fetchFromGitHub, ... }:
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-let version = "0.16.0"; in
+let version = "0.19.0"; in
 
 buildGoPackage {
   name = "helmfile-${version}";
@@ -9,11 +9,19 @@ buildGoPackage {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d";
+    sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd";
   };
 
   goPackagePath = "github.com/roboll/helmfile";
 
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/helmfile \
+      --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
+  '';
+
+
   meta = {
     description = "Deploy Kubernetes Helm charts";
     homepage = https://github.com/roboll/helmfile;
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index d24c307fcce54..1860874c436ce 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "heptio-ark-${version}";
-  version = "0.7.1";
+  version = "0.9.0";
 
   goPackagePath = "github.com/heptio/ark";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "heptio";
     repo = "ark";
-    sha256 = "0j3x9zxcffxhlw0fxq2cw9ph37bqw90cbmf9xshmnj8yl9rbxp7y";
+    sha256 = "0b3jsgs35l8kk63pjnqn3911pyb397fyvsmd3jd8vzjawisgpdp7";
   };
 
   postInstall = "rm $bin/bin/generate";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
new file mode 100644
index 0000000000000..fe2420a719d55
--- /dev/null
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoPackage, fetchFromGitHub, ... }:
+
+let version = "0.3.1"; in
+
+buildGoPackage {
+  name = "hetzner-kube-${version}";
+
+  src = fetchFromGitHub {
+    owner = "xetys";
+    repo = "hetzner-kube";
+    rev = "${version}";
+    sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w";
+  };
+
+  goPackagePath = "github.com/xetys/hetzner-kube";
+
+  meta = {
+    description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
+    homepage = https://github.com/xetys/hetzner-kube;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eliasp ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index 5b543854473dd..6274168b3da7f 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "kanif-${version}";
 
   src = fetchurl {
-    url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
     sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
   };
 
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index fd599cd865868..e5d649c68b79c 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name          = "kontemplate-${version}";
-  version       = "1.5.0";
+  version       = "1.6.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "tazjin";
     repo   = "kontemplate";
     rev    = "v${version}";
-    sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6";
+    sha256 = "06qcf2cxs686kd7iqccmqd5chdzxgbkav95byjim7sgvq9qjajfi";
   };
 
   meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 65fd22cdf47a1..6bd7ba3eac2cd 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -16,13 +16,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.10.3";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1la9cdf5a67kg72xn4bn5mib1caiv5vxsjmnxqsmx0m7vhbv5i4n";
+    sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2";
   };
 
   # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 97bcb1bd1b4da..7301e45a41f8f 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,12 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm,
-  gpgme, makeWrapper, hostPlatform, vmnet, python }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
+, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
+, docker-machine-kvm, docker-machine-kvm2
+, extraDrivers ? []
+}:
 
-let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ];
+let
+  drivers = stdenv.lib.filter (d: d != null) (extraDrivers
+            ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]);
+
+  binPath = drivers
+            ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]);
 
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.27.0";
+  version = "0.28.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -14,7 +22,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
+    sha256 = "1gm61w0f33mdax6im42wckfmjgdr5pziiaw2n7yj6jfjrxjnmzmf";
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
index 047ddaadad072..ccc2294b6a094 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
@@ -2,17 +2,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     colorize (0.8.1)
-    commander (4.4.4)
+    commander (4.4.5)
       highline (~> 1.7.2)
-    diffy (3.2.0)
+    diffy (3.2.1)
     highline (1.7.10)
     polyglot (0.3.5)
-    terraform_landscape (0.1.17)
+    terraform_landscape (0.1.18)
       colorize (~> 0.7)
       commander (~> 4.4)
       diffy (~> 3.0)
       treetop (~> 1.6)
-    treetop (1.6.9)
+    treetop (1.6.10)
       polyglot (~> 0.3)
 
 PLATFORMS
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
index 38321b9d37aaf..8dd57af4c73b9 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
@@ -11,18 +11,18 @@
     dependencies = ["highline"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9";
+      sha256 = "0sry6raysvg9qsx5nqqw09n8r8hvcsqzvci7xp2qk7jq3s9mgvnn";
       type = "gem";
     };
-    version = "4.4.4";
+    version = "4.4.5";
   };
   diffy = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941";
+      sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.1";
   };
   highline = {
     source = {
@@ -44,18 +44,18 @@
     dependencies = ["colorize" "commander" "diffy" "treetop"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl";
+      sha256 = "0476q2kx88w9srj7rlzl6skrza3pdgyym7zksw78infsb2105lg9";
       type = "gem";
     };
-    version = "0.1.17";
+    version = "0.1.18";
   };
   treetop = {
     dependencies = ["polyglot"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
+      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
       type = "gem";
     };
-    version = "1.6.9";
+    version = "1.6.10";
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
index 304df0947acfc..69de076cd1cfa 100644
--- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
@@ -12,7 +12,7 @@
 
 buildGoPackage rec {
   name = "terraform-provider-ibm-${version}";
-  version = "0.9.1";
+  version = "0.11.0";
 
   goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
   subPackages = [ "./" ];
@@ -20,7 +20,7 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "IBM-Cloud";
     repo = "terraform-provider-ibm";
-    sha256 = "1j8v7r5lsvrg1afdbwxi8vq665qr47a9pddqgmpkirh99pzixgr6";
+    sha256 = "0zgzzs2l9p06angqw6vjpkd88gcn2mswmmwycc31ihkglzs6yw2p";
     rev = "v${version}";
   };
 
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 7aed4b95dd456..554c56fdae664 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -4,8 +4,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.9.1";
-      sha256  = "11rsvzyc74v14n7g0z1mwyykaz7m6bmvi38jx711b6vpxvm2scva";
+      version = "1.9.5";
+      sha256  = "12yhy0p4xciw70i0gvwzbg39f6mfin2cfdblxyqjlv9bwg26k7jz";
     };
   archive =
     {
@@ -32,8 +32,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.16.0";
-      sha256  = "0knivwxdjkxyaqka0vvn0lh2ndbg660dw2g03iw00fx6ska1zn0c";
+      version = "1.25.0";
+      sha256  = "1cg2pch6nip96qdzca7q0ak6308fkjxz9zjdcv74cwg0f65frh7d";
     };
   azure-classic =
     {
@@ -46,8 +46,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.4.0";
-      sha256  = "0g1i1aasi44zn5bdivzqkk1kshq271x2lydjskyqq7jfx27myibb";
+      version = "1.7.0";
+      sha256  = "0lf83pc5gdmd61i93221zdg9pdzfpfnvhis8kf1s2jlc6zshbabv";
+    };
+  azurestack =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-azurestack";
+      version = "0.1.0";
+      sha256  = "144dfaq16g41i9y2pcq2ilgygndad3vivr6fbygg8yl10m5l4qp0";
     };
   bitbucket =
     {
@@ -109,8 +116,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-consul";
-      version = "1.0.0";
-      sha256  = "1008lrvdqn3kk8gwvq094nwknh00b429jmwi0hq4brick7vyvbvz";
+      version = "2.1.0";
+      sha256  = "1qm29vj8ms37zb4b3bhdv4b4vrl0am134zmc654lb2g582cnj9yw";
     };
   datadog =
     {
@@ -137,8 +144,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-dns";
-      version = "1.0.0";
-      sha256  = "05ismwpmpkv9qxn6g5i29y18s1pw4yf2pyvv9ak8hj8idh4z6gz2";
+      version = "2.0.0";
+      sha256  = "1km0pq1wp0bdccb612z9n0kj9w7hn1yvhk7xszwp2mzs8qmd7flv";
     };
   dnsimple =
     {
@@ -172,15 +179,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-fastly";
-      version = "0.1.4";
-      sha256  = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k";
+      version = "0.2.0";
+      sha256  = "0vrvyqhzbrvhyhdkg2y2dgadf5j7bj0cbzd13f9m86d146zlf8lb";
+    };
+  flexibleengine =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-flexibleengine";
+      version = "1.0.1";
+      sha256  = "1xf5cmn434a0zr9qxc7f0jma9gf111cp7fm2vgyhkd62hipafcas";
     };
   github =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-github";
-      version = "1.0.0";
-      sha256  = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb";
+      version = "1.1.0";
+      sha256  = "1f0yg2qpr9ffimscy17csh20cq9czkcs96ac79s3kl56f8c95ijm";
     };
   gitlab =
     {
@@ -193,8 +207,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.10.0";
-      sha256  = "08ayi30aqw9lz8qn982vl9m3z4prah60fqq2q9hvscf6qb9g8lr0";
+      version = "1.15.0";
+      sha256  = "0xwijnv7mzlyzplkylfphph568b9bxavrclnlwvp9ylvklq70nzl";
     };
   grafana =
     {
@@ -203,12 +217,19 @@
       version = "1.0.2";
       sha256  = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i";
     };
+  hcloud =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-hcloud";
+      version = "1.2.0";
+      sha256  = "17zrdzvb9hp02710khvh9pwkavp79zy3y2qzaydgmnrbkks4s8cg";
+    };
   heroku =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-heroku";
-      version = "0.1.2";
-      sha256  = "0dmq5v4bwzndy6l6vx29m5ykn2zhnnbmnla00ad8i7djm1sj1fbg";
+      version = "1.0.1";
+      sha256  = "1kx74d0ywzim5zj3y5ac80r18igsqax39yv9qaam546a88ya31yy";
     };
   http =
     {
@@ -228,8 +249,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ignition";
-      version = "1.0.0";
-      sha256  = "0hr2zshrx4qfb7xdknsxsa4522kkf84rsqqbliz7ac9nsqpaarf4";
+      version = "1.0.1";
+      sha256  = "1j9rgwrb4bnm8a44rg3d9fry46wlpfkwxxpkpw9y6l24php0qxh8";
     };
   influxdb =
     {
@@ -270,8 +291,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-logicmonitor";
-      version = "1.1.0";
-      sha256  = "16blwfbvx80j5s6809wrlfnkq0qvjasz0zi4ykwzvkqxh00igj7r";
+      version = "1.2.0";
+      sha256  = "1zir35i8j5w7ra4i7f9k0ghac9b3bar0dy16sqy1kqwbh4ikmhb8";
     };
   mailgun =
     {
@@ -291,8 +312,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-newrelic";
-      version = "1.0.0";
-      sha256  = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62";
+      version = "1.0.1";
+      sha256  = "0g4fd2rvx90f2bmjl6jjdvrsx7ayhf30vj9y3mklhxgsd9x83wpq";
     };
   nomad =
     {
@@ -326,29 +347,29 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oneandone";
-      version = "1.0.0";
-      sha256  = "0q14r36iyn1c1wfky42imkzvkys5znj1yzq27iaxnrsqp4hh7pl2";
+      version = "1.1.0";
+      sha256  = "1yps2mcdy61afxva7vg0i82s24zkdrn5abwblm0gcgc0cz588r9d";
     };
   opc =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opc";
-      version = "1.1.0";
-      sha256  = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr";
+      version = "1.1.2";
+      sha256  = "0v413wgnr8h682han88s0n15cdwd9a0dxr9s2mknpi4664c41qlk";
     };
   openstack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-openstack";
-      version = "1.3.0";
-      sha256  = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx";
+      version = "1.6.0";
+      sha256  = "14chn2vb8y9rz5irh8m2ky9yxmw2za45gikncjm4gfc3xl6803iq";
     };
   opentelekomcloud =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opentelekomcloud";
-      version = "1.0.0";
-      sha256  = "1wra9a6cjgsyvbfldvi2xnjk6y9zqv3y06pbq8c8dyjzssd5j591";
+      version = "1.1.0";
+      sha256  = "04pcgygcz2ld5hp7f29j2z3d4ypy4fm4m1zbbs9l9gc3fya88iny";
     };
   opsgenie =
     {
@@ -361,8 +382,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oraclepaas";
-      version = "1.0.0";
-      sha256  = "1h66ijnq172zk0bkv68iq0sy5l6jlasa2pi9q8fq54ib9sxnfkk2";
+      version = "1.2.1";
+      sha256  = "0r404rysjhbsxh45ad23k12rs8js2pdczakzavnjx508kr29gcqc";
     };
   ovh =
     {
@@ -375,22 +396,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-packet";
-      version = "1.2.3";
-      sha256  = "0vx2pvrxgpy137v3i563w0sdqqrqp6p6sls27fg76cfxrqik5dpk";
+      version = "1.2.4";
+      sha256  = "11ga29d5bzmn6rzlb6sb28nh1zbbwglinzn185pysqx6n21l6wva";
     };
   pagerduty =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "1.1.0";
-      sha256  = "100zxmpgd5qbzivkc2ja75980yrlz0k50x7448wf1kp2inyylxq0";
+      version = "1.1.1";
+      sha256  = "1dpl6cnii9kzx9lr1f9vndh7w6mfg5kv6az7dq49lhi16sxwwb6a";
     };
   panos =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-panos";
-      version = "1.1.0";
-      sha256  = "1j3j0bdblw54g2l4xdwm9604n3qfb6zb4b8p081hs5nv004awka4";
+      version = "1.3.0";
+      sha256  = "1isnhaszld96zpkcbwkf70nhhwmsl2z3s9868cjsac44b27gsvrq";
     };
   postgresql =
     {
@@ -410,29 +431,29 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-profitbricks";
-      version = "1.1.1";
-      sha256  = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m";
+      version = "1.3.1";
+      sha256  = "1g4filwv38rq9wcdbpnpgfnv8qj1kzdnjc8awvbsdlxlj4fa06bi";
     };
   rabbitmq =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-rabbitmq";
-      version = "0.2.0";
-      sha256  = "1pbib43d1iqy8xl03zqwnz77362cb9cq8awcpid714n1sz7nd4im";
+      version = "1.0.0";
+      sha256  = "1md928243r4c46ihjnavz2375nxnfyhknyc86r9853hwhhyhsx5d";
     };
   rancher =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-rancher";
-      version = "1.2.0";
-      sha256  = "0xxff4mh4cv27mignvanhsz5sf5476ljk7q4h67fy4y0gzyxwpzw";
+      version = "1.2.1";
+      sha256  = "1z0gqchb268w5mw0519fbx4126nkxb9kvvay8vjj287yxdpi5grj";
     };
   random =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-random";
-      version = "1.2.0";
-      sha256  = "00gzqav21h2x2spczwcddlwl0llhgy03djvjjq9g9wb5yvcf4yll";
+      version = "1.3.1";
+      sha256  = "0zcvw0vz7mxx46m2jamhmkl7l0k8v0q5fha5z6cra3y2ikhqrnfl";
     };
   rundeck =
     {
@@ -441,12 +462,19 @@
       version = "0.1.0";
       sha256  = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg";
     };
+  runscope =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-runscope";
+      version = "0.1.0";
+      sha256  = "05l305423njds2cmmxg67swpdnp3zibs36dq4cfjk47i4byvipjz";
+    };
   scaleway =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.3.0";
-      sha256  = "1yd2xdr52z0f3ykfhsfgf57zzhjglci8mvbimdf6z8xmdgfhwjbf";
+      version = "1.4.1";
+      sha256  = "1zxb3981w30hv1aax28ayiy0sl0vzrrwkynp4lmwwhfjyhyagnm1";
     };
   softlayer =
     {
@@ -459,8 +487,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-spotinst";
-      version = "0.1.0";
-      sha256  = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka";
+      version = "1.0.0";
+      sha256  = "1p05wamv70mywfqf0b3nxpvxc0m8ydb5zcl2kpzsrii9mq21pjrf";
     };
   statuscake =
     {
@@ -494,8 +522,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-triton";
-      version = "0.5.0";
-      sha256  = "1cbv4bliswiwbhr9bh2m4faazhj0v89jnwn0fndfjw3rka1b97h7";
+      version = "0.5.1";
+      sha256  = "1bn5x6nmhfkrzpxhyfclls85l9qqffvzx1xsgcb3368lhwzarn2f";
     };
   ultradns =
     {
@@ -522,7 +550,7 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      version = "1.4.1";
-      sha256  = "16dgszmcsfzbflqg053av1v8wgwy8m6f2qlk55fg3ww1a59c0wy1";
+      version = "1.6.0";
+      sha256  = "1xav341bal7lyb206zw2nzgzjvwkda54cgksza44q3jhqznxma47";
     };
 }
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index 24695066fa28e..e7ded437edb78 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -71,7 +71,7 @@ fi
 
 org=terraform-providers
 
-repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort)
+repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-telefonicaopencloud | sort)
 
 
 # Get all the providers with index
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 2d364450677a6..721bc6cd6f567 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms;
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "40.4.46";
+  version = "52.3.56";
 
   arch = {
     "x86_64-linux" = "x86_64";
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 80984208460b2..a7d10adc0a75d 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }:
 
 stdenv.mkDerivation rec {
-  name = "esniper-2.33.0.2017-11-06";
+  name = "esniper-2.35.0";
 
   src = fetchFromGitHub {
     owner = "yhfudev";
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 24fed4ca85217..f10a88ec96147 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "newsboat-${version}";
-  version = "2.11.1";
+  version = "2.12";
 
   src = fetchurl {
     url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
-    sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma";
+    sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv";
   };
 
   prePatch = ''
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index 90ff868d6becd..2f97b39da60fe 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }:
+{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5
+, sphinx
+}:
 
 buildPythonApplication rec {
   pname = "flent";
@@ -10,7 +12,8 @@ buildPythonApplication rec {
     sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r";
   };
 
-  buildInputs = [ netperf ];
+  buildInputs = [ sphinx ];
+
   propagatedBuildInputs = [
     matplotlib
     procps
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix
new file mode 100644
index 0000000000000..20557c18c52c7
--- /dev/null
+++ b/pkgs/applications/networking/flent/http-getter.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake
+, curl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "http-getter";
+  version = "20180606";
+
+  src = fetchFromGitHub {
+    owner = "tohojo";
+    repo = "http-getter";
+    rev = "79bcccce721825a745f089d0c347bbaf2e6e12f4";
+    sha256 = "1zxk52s1h5qx62idil237zdpj8agrry0w1xwkfx05wvv9sw4ld35";
+  };
+
+  buildInputs = [ cmake pkgconfig curl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tohojo/http-getter;
+    description = "Simple getter for HTTP URLs using cURL";
+    platforms = platforms.unix;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 9a71f8911c259..ecad7549117d8 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -20,6 +20,14 @@ let
         sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv";
       };
     });
+
+    guessit = super.guessit.overridePythonAttrs (old: rec {
+      version = "2.1.4";
+      src = old.src.override {
+        inherit version;
+        sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
+      };
+    });
   };
 
 in
@@ -48,7 +56,7 @@ buildPythonApplication rec {
     chardet beautifulsoup4 html5lib
     PyRSS2Gen pynzb rpyc jinja2
     jsonschema requests dateutil
-    pathpy guessit_2_0 APScheduler
+    pathpy guessit APScheduler
     terminaltables colorclass
     cherrypy flask flask-restful
     flask-restplus flask-compress
@@ -60,6 +68,7 @@ buildPythonApplication rec {
     idna itsdangerous markupsafe
     plumbum pytz six tzlocal urllib3
     webencodings werkzeug zxcvbn-python
+    backports_functools_lru_cache
   ] ++ lib.optional (pythonOlder "3.4") pathlib
     ++ lib.optional delugeSupport deluge;
 
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index 9b738fe3863f6..6d134708a5eb0 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "gmailieer-${version}";
-  version = "0.6";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "gauteh";
     repo = "gmailieer";
     rev = "v${version}";
-    sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76";
+    sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk";
   };
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 91bcfc73f2c76..9123477bb3edb 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.6";
+  stableVersion = "2.1.7";
   # Currently there is no preview version.
   previewVersion = stableVersion;
   addVersion = args:
@@ -10,8 +10,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "0wrh0x5ig2x2pxyyf99z4bfiyxn19akyjic5kgf0pv2snifw2481";
-  serverSrcHash = "0jy5700bshz54mdsh5qpcb2qrczg9isxhr4y0bmglrl23pywvisc";
+  guiSrcHash = "10zf429zjzf7v4y9r7mmkp42kh5ppmqinhvwqzb7jmsrpv2cnxj6";
+  serverSrcHash = "056swz6ygqdi37asah51v1yy0ky8q0p32vf7dxs697hd7nv78aqj";
 in {
   guiStable = mkGui {
     stable = true;
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 2612e2d9240b7..5e79517a5512a 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "bro-2.5.4";
 
   src = fetchurl {
-    url = "http://www.bro.org/downloads/${name}.tar.gz";
+    url = "https://www.bro.org/downloads/${name}.tar.gz";
     sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0";
   };
 
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 8f4b54cec86ab..3dc154351d2f0 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Data AcQuisition library (DAQ), for packet I/O";
-    homepage = http://www.snort.org;
+    homepage = https://www.snort.org;
     maintainers = with stdenv.lib.maintainers; [ aycanirican ];
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index eff33643ebcfa..b7570e85217c5 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -3,11 +3,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
-  version = "0.5.9";
+  version = "0.5.10";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf";
+    sha256 = "1yx721qnyhgk2lna1p6iwndl767cy0ss5zcwhyjccgqd848b0grr";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem cairo mpg123
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 32808f720bf1f..2cd30ab9604b0 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-04-19";
+  name = "dino-unstable-2018-06-03";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "e80da806022d8aaa32f77f3c7f0333cc1c80829b";
-    sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gibm";
+    rev = "52e116ee44be1667660c08858a28fe8fda125f79";
+    sha256 = "1yybmjd50r41366clrsw21qybbpjfkvim2n5b3dkcagjnifak0zl";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 5246f8d3d1d67..8e85be831a01f 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -2,15 +2,15 @@
 
 buildGo110Package rec {
   name = "gomuks-${version}";
-  version = "2018-05-16";
+  version = "2018-07-10";
 
   goPackagePath = "maunium.net/go/gomuks";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "gomuks";
-    rev = "512ca88804268bf58a754e8a02be556f953db317";
-    sha256 = "1bpgjkpvqqks3ljw9s0hm5pgscjs4rjy8rfpl2444m4rbpz1xvmr";
+    rev = "68db26bcace31297471641fe95f8882e301f5699";
+    sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index dd1ce2264d5f7..ac00fb7bbd35e 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -3,8 +3,7 @@
 , libGL, xcbutilkeysyms, xdg_utils, libtool }:
 
 let
-
-  version = "4.30.4.1672";
+  version = "4.30.5.1676";
 
   rpath = stdenv.lib.makeLibraryPath [
     xdg_utils
@@ -39,22 +38,13 @@ let
     systemd
     libGL
   ] + ":${stdenv.cc.cc.lib}/lib64";
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
-        sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx";
-      }
-    else
-      throw "HipChat is not supported on ${stdenv.system}";
-
-in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   name = "hipchat-${version}";
 
-  inherit src;
+  src = fetchurl {
+    url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
+    sha256 = "1fmvarq7zf1cnah2d1l7rxhbiw3dmjcxsldys5is63y204hdh04y";
+  };
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
new file mode 100644
index 0000000000000..60e883e8b9d18
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -0,0 +1,81 @@
+{ stdenv, lib, fetchurl, gnome3, gtk2, pango, atk, cairo, gdk_pixbuf, glib,
+freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
+libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
+libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
+let
+  rpath = lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk_pixbuf
+    glib
+    gnome3.gconf
+    gtk2
+    pango
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    nspr
+    nss
+    stdenv.cc.cc
+    udev
+    xorg.libxcb
+  ];
+
+in
+  stdenv.mkDerivation rec {
+    name = "mattermost-desktop-${version}";
+    version = "4.1.2";
+
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz";
+          sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s";
+        }
+      else if stdenv.system == "i686-linux" then
+        fetchurl {
+          url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz";
+          sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr";
+        }
+      else
+        throw "Mattermost-Desktop is not currently supported on ${stdenv.system}";
+
+    phases = [ "unpackPhase" "installPhase" ];
+    installPhase = ''
+      mkdir -p $out
+      cp -R . $out
+
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+               --set-rpath ${rpath}:$out $out/mattermost-desktop
+
+      patchShebangs $out/create_desktop_file.sh
+      $out/create_desktop_file.sh
+
+      mkdir -p $out/{bin,share/applications}
+      cp Mattermost.desktop $out/share/applications/Mattermost.desktop
+      ln -s $out/mattermost-desktop $out/bin/mattermost-desktop
+    '';
+
+    meta = {
+      description = "Mattermost Desktop client";
+      homepage    = https://about.mattermost.com/;
+      license     = lib.licenses.asl20;
+      platforms   = [
+        "x86_64-linux" "i686-linux"
+      ];
+    };
+  }
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index edd7b012e217d..6a697790d8f98 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.1.0";
 
   src = fetchurl {
-    url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
+    url = "https://mcabber.com/files/mcabber-${version}.tar.bz2";
     sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index f7a56d47dbfa7..f1d33b83fd0cc 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -7,7 +7,7 @@
 , AVFoundation ? null }:
 
 let
-  version = "1.15.0";
+  version = "1.16.1";
   rev = "v${version}";
 
 in mkDerivation rec {
@@ -16,7 +16,7 @@ in mkDerivation rec {
   src = fetchFromGitHub {
     owner  = "qTox";
     repo   = "qTox";
-    sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9";
+    sha256 = "05cz67yvdqjv1dmqycnc5rd0275zh94wyaa7sqdkr1iw8k5h955n";
     inherit rev;
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 6c716cc3e1c05..2e2489870ed1a 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quaternion-${version}";
-  version = "0.0.9";
+  version = "0.0.9.2";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "Quaternion";
     rev    = "v${version}";
-    sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408";
+    sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
   };
 
   buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 594004fd2949b..334c50814d78f 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
-, auth0ClientID, auth0Domain, disableTooltips }:
+, auth0ClientID, auth0Domain }:
 
 stdenv.mkDerivation rec {
   name = "rambox-bare-${version}";
-  version = "0.5.13";
+  version = "0.5.17";
 
   src = fetchFromGitHub {
     owner = "saenzramiro";
     repo = "rambox";
     rev = version;
-    sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
+    sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay";
   };
 
   nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,11 +18,10 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
+    sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
   };
 
-  patches = [ ./hide-check-for-updates.patch ./isDev.patch ]
-    ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ];
+  patches = [ ./isDev.patch ];
 
   configurePhase = ''
     echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index a601db8c8da5d..b6e9c9210251d 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,14 +1,13 @@
 { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
 , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
-, auth0Domain ? "nixpkgs.auth0.com"
-, disableTooltips ? false }:
+, auth0Domain ? "nixpkgs.auth0.com" }:
 
 let
   callPackage = newScope self;
   self = {
     fetchNodeModules = callPackage ./fetchNodeModules.nix {};
     rambox-bare = callPackage ./bare.nix {
-      inherit auth0ClientID auth0Domain disableTooltips;
+      inherit auth0ClientID auth0Domain;
     };
     sencha = callPackage ./sencha {};
   };
diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch
deleted file mode 100644
index 5ddaa9d51771b..0000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- index.html.orig	2017-12-16 20:06:03.401298402 +0300
-+++ ./index.html	2017-12-16 20:06:21.474484436 +0300
-@@ -43,14 +43,14 @@
- 	<!--- Localization -->
- 
- 	<!--- Tooltip player -->
--	<script type='text/javascript'>
-+	<!--<script type='text/javascript'>
- 	    (function(d, s){
- 			var t = d.createElement(s), e = d.getElementsByTagName(s)[0];
- 			t.type = "text/javascript"; e.parentNode.insertBefore(t, e);
- 			t.async = "async";
- 			t.src = "https://cdn.tooltip.io/static/player.js?apiKey=sEF8shc4KSuqtHMx0ztmTFdcrQO0cAVpszZ9Y8hLfQ2";
- 		})(document, "script");
--	</script>
-+	</script>-->
- 	<!--- Tooltip player -->
- </head>
- <body>
diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
deleted file mode 100644
index 8363baef2dfcc..0000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/saenzramiro/rambox/issues/1283
-
-diff -urNZ a/electron/menu.js b/electron/menu.js
---- a/electron/menu.js	2017-11-02 22:02:59.753119865 +0000
-+++ b/electron/menu.js	2017-11-02 22:08:34.419698562 +0000
-@@ -220,14 +220,6 @@
- 					}
- 				},
- 				{
--					label: locale['menu.help[5]'],
--					click(item, win) {
--						const webContents = win.webContents;
--						const send = webContents.send.bind(win.webContents);
--						send('autoUpdater:check-update');
--					}
--				},
--				{
- 					label: locale['menu.help[6]'],
- 					click() {
- 						sendAction('showAbout')
-@@ -290,14 +282,6 @@
- 			type: 'separator'
- 		});
- 		helpSubmenu.push({
--			label: `&`+locale['menu.help[5]'],
--			click(item, win) {
--				const webContents = win.webContents;
--				const send = webContents.send.bind(win.webContents);
--				send('autoUpdater:check-update');
--			}
--		});
--		helpSubmenu.push({
- 			label: `&`+locale['menu.help[6]'],
- 			click() {
- 				sendAction('showAbout')
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index 5f68e6d86295d..ca82f30e2d1f2 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, gzip, which, unzip, jdk }:
 
 let
-  version = "6.5.2";
+  version = "6.5.3.6";
   srcs = {
     i686-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
-      sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr";
+      sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9";
     };
     x86_64-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
-      sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7";
+      sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz";
     };
   };
 in
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 822080df10b9e..dbf17d9cbdb1d 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.15.4";
+  version = "0.15.7";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1c0b9717xmzvzzxj006hqxafvcpvnnrsifxjnbxxla58jmnwr9v5";
+    sha256 = "09sa2qcmns4b9by3hzmyppc6fi3845vppkal2ylrf2vi9yczb2ch";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 60c075c2fadb5..39043b43936c4 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.12.0";
+  version = "1.14.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk";
+    sha256 = "1f76dzm9qq12i4s95c51d9s923n69y8cbg8yz79qjpd6k30j8vkq";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
index 713aa8f03744c..5fcee73c0f909 100644
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "skype-call-recorder-0.8";
   src = fetchurl {
-    url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
+    url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
     sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 1cf7243476cf5..9ac3d870312d3 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
-, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
+, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
 
 let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.18.0.6";
+  version = "8.24.0.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -24,8 +24,7 @@ let
 
     gnome3.gconf
     gdk_pixbuf
-    gtk2
-
+    gtk3
 
     gnome3.gnome-keyring
 
@@ -57,7 +56,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig";
+        sha256 = "079bv0wilwwd9gqykcyfs4bj8za140788dxi058k4275h1jlvrww";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index c39e3ce1a459f..32648ee34c907 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -5,7 +5,7 @@
 
 let
 
-  version = "3.2.0-beta25a7a50e";
+  version = "3.2.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -47,7 +47,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064";
+        sha256 = "095dpkwvvnwlxsglyg6wi9126wpalzi736b6g6j3bd6d93z9afah";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 23d2e640b4f00..7a50536cc0ff0 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -31,7 +31,7 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.1.8";
+  version = "3.1.10";
 
   src = fetchurl {
     urls = [
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z"
-                else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i";
+                then "17gylj5pxba14c1c98b5rdyyb87c58z8l8yrd1iw5k293wf7iwv3"
+                else "1bkn3ykrc73wr02qaqwpr4garlqm3424y3dm2fjx6lqcfzm3ms2k";
   };
 
   # grab the plugin sdk for the desktop icon
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 071f82a8cbeca..3e0e60594f821 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.3.0";
-    sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i";
+    version = "1.3.7";
+    sha256Hash = "1rwnqgla061icvyvw8gxqd7qki1jnq0f46hvyffp74ng5r1b6wjg";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "310557";
     archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
@@ -14,7 +14,5 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.3.4";
-    sha256Hash = "17xdzyl7jb5g69a2h6fyk67z7s6h2dqjg8j478px6n0br1n420wk";
   });
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 7581482504b74..732ea95dd07c2 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -90,6 +90,10 @@ mkDerivation rec {
     sed -i Telegram/gyp/qt_rcc.gypi \
       -e "s,/usr/bin/rcc,rcc,g"
 
+    # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out
+    sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \
+      -e "/-msse2/d"
+
     gyp \
       -Dbuild_defines=${GYP_DEFINES} \
       -Gconfig=Release \
@@ -133,7 +137,7 @@ mkDerivation rec {
     description = "Telegram Desktop messaging app "
       + (if stable then "(stable version)" else "(pre-release)");
     license = licenses.gpl3;
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = platforms.linux;
     homepage = https://desktop.telegram.org/;
     maintainers = with maintainers; [ primeos abbradar garbas ];
   };
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 4fa4967c898e3..1ff67d02ff676 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.18.4";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
     sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index 89be42781a4c9..769e639314e06 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-0.8.0";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
     sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 1791a7ff1ddc4..3f22aa28f36f9 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "${project}-0.8.2";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
+    url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
     sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 18b3bb06e98fe..7d68f66afc793 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "telepathy-mission-control";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
     sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 17cd20c09cbda..bae7231e783f7 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-0.8.1";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
     sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index 781912f665d5d..d7c70232b0adc 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "7.0.0.1035";
 
   src = fetchurl {
-    url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
+    url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
     sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 87dddff4bd050..4e26d7683e690 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -39,7 +39,7 @@ let
     xorg.libxcb
   ];
 
-  version = "3.0.2816";
+  version = "3.2.2840";
 
   plat = {
     "i686-linux" = "i386";
@@ -47,8 +47,8 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1ds807j1b8dk9hrnzbg4g9mvn44abw24pxrqns9ai62mh3hvi65p";
-    "x86_64-linux" = "13pyyp2c8q0v0ni2hzh2jnbd3i96q68314glbmy4kyh7vm9427lc";
+    "i686-linux" = "071ddh2d8wmiybwafwyb97962zj358l0fq7g2r44231653sgybvq";
+    "x86_64-linux" = "0qp9ms94smnm7k47b0n0jdzvnm1b7gj25hyinsfc6lghrb6jqw3r";
   }.${stdenv.system};
 
 in
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 692a43629355f..dc2bb4ba1e123 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,14 +1,22 @@
-{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
-  alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio,
-  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps, libGL }:
+{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook
+# Dynamic libraries
+, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
+, qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine
+# Runtime
+, libjpeg_turbo, pciutils, procps, qtimageformats
+, pulseaudioSupport ? true, libpulseaudio ? null
+}:
+
+assert pulseaudioSupport -> libpulseaudio != null;
 
 let
+  inherit (stdenv.lib) concatStringsSep makeBinPath optional optionalString;
 
-  version = "2.0.123200.0405";
+  version = "2.2.128200.0702";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z";
+      sha256 = "0n9kyj94bj35gbpwiz4kq7hc8pwfqwnfqf003g4c8gx5pda3g56w";
     };
   };
 
@@ -17,76 +25,57 @@ in stdenv.mkDerivation {
 
   src = srcs.${system};
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  libPath = stdenv.lib.makeLibraryPath [
-    alsaLib
-    expat
-    glib
-    freetype
-    libGL
-    libpulseaudio
-    zlib
-    dbus
-    fontconfig
-    sqlite
-    utillinux
-    udev
-
-    xorg.libX11
-    xorg.libSM
-    xorg.libICE
-    xorg.libxcb
-    xorg.xcbutilimage
-    xorg.xcbutilkeysyms
-    xorg.libXcursor
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXdamage
-    xorg.libXtst
-    xorg.libxshmfence
-    xorg.libXi
-    xorg.libXrender
-    xorg.libXcomposite
-    xorg.libXScrnSaver
-    xorg.libXrandr
-
-    stdenv.cc.cc
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
+  buildInputs = [
+    dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative
+    qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine
+    libjpeg_turbo
   ];
 
-  installPhase = ''
-    runHook preInstall
-
-    packagePath=$out/share/zoom-us
-    mkdir -p $packagePath
-    mkdir -p $out/bin
-    cp -ar * $packagePath
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/zoom
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/QtWebEngineProcess
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/qtdiag
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/zopen
-    # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
-    # it works for me without it, but, well...
-    paxmark m $packagePath/zoom
-    #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about?
-
-    # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it
-    makeWrapper $packagePath/zoom $out/bin/zoom-us \
-        --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
-        --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
-        --prefix PATH : "${procps}/bin" \
-        --set QT_PLUGIN_PATH "$packagePath/platforms" \
-        --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
-        --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
-
-    cat > $packagePath/qt.conf <<EOF
-    [Paths]
-    Prefix = $packagePath
-    EOF
-
-    runHook postInstall
-  '';
+  runtimeDependencies = optional pulseaudioSupport libpulseaudio;
+
+  # Don't remove runtimeDependencies from RPATH via patchelf --shrink-rpath
+  dontPatchELF = true;
+
+  installPhase =
+    let
+      files = concatStringsSep " " [
+        "*.pcm"
+        "*.png"
+        "ZXMPPROOT.cer"
+        "ZoomLauncher"
+        "config-dump.sh"
+        "qtdiag"
+        "timezones"
+        "translations"
+        "version.txt"
+        "zcacert.pem"
+        "zoom"
+        "zoom.sh"
+        "zoomlinux"
+        "zopen"
+      ];
+    in ''
+      runHook preInstall
+
+      packagePath=$out/share/zoom-us
+      mkdir -p $packagePath $out/bin
+
+      cp -ar ${files} $packagePath
+
+      # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd
+      ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so
+
+      makeWrapper $packagePath/zoom $out/bin/zoom-us \
+        --prefix PATH : "${makeBinPath [ pciutils procps ]}" \
+        --set QSG_INFO 1 \
+        --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.qtCompatVersion}/plugins/platforms \
+        --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} \
+        --run "cd $packagePath"
+
+      runHook postInstall
+    '';
 
   postInstall = (makeDesktopItem {
     name = "zoom-us";
@@ -98,12 +87,14 @@ in stdenv.mkDerivation {
     mimeType = "x-scheme-handler/zoommtg;";
   }).buildCommand;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = https://zoom.us/;
     description = "zoom.us video conferencing application";
     license = stdenv.lib.licenses.unfree;
     platforms = builtins.attrNames srcs;
-    maintainers = with stdenv.lib.maintainers; [ danbst ];
+    maintainers = with stdenv.lib.maintainers; [ danbst tadfisher ];
   };
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
new file mode 100755
index 0000000000000..21039d53da4f9
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl pcre common-updater-scripts
+
+set -eu -o pipefail
+
+version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
+update-source-version zoom-us "$version"
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index e11f4c65c49aa..805b474e814ff 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp";
+    url = "https://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp";
     sha256 = "09asg7ixjrin46xd19ri71g4jdrgb1gg0pk0lwk0dlb1qjxyf1xy";
   };
 
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 96218ef87b5f2..c41b6116b29d9 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,6 +1,7 @@
 { mkDerivation
 , lib
 , fetchurl
+, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@@ -69,6 +70,13 @@ in mkDerivation rec {
     kdoctools
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d";
+      sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn";
+    })
+  ];
+
   meta = {
     description = "Integrated IRC client for KDE";
     license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 739842bbec3ab..9de3944222793 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -71,6 +71,8 @@ in with stdenv; mkDerivation rec {
           --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
     '';
 
+  patches = [ ./qt5_11.patch ];
+
   meta = with stdenv.lib; {
     homepage = https://quassel-irc.org/;
     description = "Qt/KDE distributed IRC client suppporting a remote daemon";
diff --git a/pkgs/applications/networking/irc/quassel/qt5_11.patch b/pkgs/applications/networking/irc/quassel/qt5_11.patch
new file mode 100644
index 0000000000000..45e43d7f96beb
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel/qt5_11.patch
@@ -0,0 +1,72 @@
+From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Thu, 3 May 2018 23:19:34 +0200
+Subject: [PATCH] cmake: Fix build with Qt 5.11
+
+Qt 5.11 removes the qt5_use_modules function, so add a copy. If
+present, the Qt-provided function will be used instead.
+
+Closes GH-355.
+---
+ cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
+index 652c0042..d77ba1cf 100644
+--- a/cmake/QuasselMacros.cmake
++++ b/cmake/QuasselMacros.cmake
+@@ -5,6 +5,9 @@
+ # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
+ # (C) 2005-2009 Kitware, Inc.
+ #
++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
++# (C) 2005-2011 Kitware, Inc.
++#
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
+     endforeach()
+ endfunction()
+ 
++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
++# If present, the Qt-provided version will be used automatically instead.
++function(qt5_use_modules _target _link_type)
++    if (NOT TARGET ${_target})
++        message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
++    endif()
++    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
++        set(_qt5_modules ${ARGN})
++        set(_qt5_link_type ${_link_type})
++    else()
++        set(_qt5_modules ${_link_type} ${ARGN})
++    endif()
++
++    if ("${_qt5_modules}" STREQUAL "")
++        message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
++    endif()
++    foreach(_module ${_qt5_modules})
++        if (NOT Qt5${_module}_FOUND)
++            find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
++            if (NOT Qt5${_module}_FOUND)
++                message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
++            endif()
++        endif()
++        target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
++        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
++        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
++        if (Qt5_POSITION_INDEPENDENT_CODE
++                AND (CMAKE_VERSION VERSION_LESS 2.8.12
++                    AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
++                    OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
++            set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
++        endif()
++    endforeach()
++endfunction()
++
+ # Some wrappers for simplifying dual-Qt support
+ 
+ function(qt_use_modules)
+-- 
+2.16.2
+
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 0d9320c12e271..dec933489af9f 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -117,7 +117,7 @@ in if configure == null then weechat else
         ln -s $plugin $out/plugins
       done
     '';
-  in (writeScriptBin weechat.name ''
+  in (writeScriptBin "weechat" ''
     #!${stdenv.shell}
     export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
     ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index ec67321400dc6..2019d9930ef09 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jmeter-${version}";
   version = "4.0";
   src = fetchurl {
-    url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
+    url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
     sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 762c6222b58e0..571a48951477c 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "balsa-${version}";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchurl {
     url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2";
-    sha256 = "0p4w81wvdxqhynkninzglsgqk6920x1zif2zmw8bml410lav2azz";
+    sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 4d3c8a7974123..057c051c62596 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The user-friendly, lightweight, and fast email client";
-    homepage = http://www.claws-mail.org/;
+    homepage = https://www.claws-mail.org/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz globin ];
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 2ae58721188e3..33ccec355117d 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180512";
+  version = "20180622";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl";
+    sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) as well as 20180512 so we disable them for now.
+    # that has tests (20180223) as well as 20180622 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 13add2690db3a..9b259cad6d0b1 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.26.2";
+  version = "0.27";
   name = "notmuch-${version}";
 
   passthru = {
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h";
+    url = "https://notmuchmail.org/releases/${name}.tar.gz";
+    sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 22bfddc5b570e..70f74dff3097f 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "3.7.0";
 
   src = fetchurl {
-    url = "http://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz";
+    url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz";
     sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 759cf74ba9d0e..bea713c9e6bdf 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
+    url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
     inherit (source) sha512;
   };
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 56b9e5cfb04b8..05c372d0780e5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.8.0";
+  version = "52.9.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ar/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ar/thunderbird-52.9.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "7ba3e6d4a64ce91b16d79607c3530deba2d68b09c81f7509991c62a11736ee51278b3cd60ca8063ce94748bf0b483cd9d9ea3be4ba84b24bef56194053502550";
+      sha512 = "4585aabb08aaf049622f7cc8b485fb6a28ffd26759c760dab75af679a434d3ea7f356e5255a990f22f362e1506722207c2c2b866718a695dd651a53923a37fb2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ast/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ast/thunderbird-52.9.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "192442636ec56f7751d752572122c8b435fb28d6801a398dc6d02896d1f99d51feebbdb906f3911da08bb9da2851d3ea29eb064949d53436a6764292a6aeee7e";
+      sha512 = "f8558b2b833be94accd96ccd62b9b1fd8f837d11f9f53a514bf19b2007af4c69afac762f091c4116ec4b7ceadc3538183c2370b4b485a430d3b975aa94de0027";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/be/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/be/thunderbird-52.9.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "facdfa7f6ec8eacc6a9294958c879a32cd5dadd31364d64894f8ad1a38ff883a9f2471d49d1358fa79b2b585a33ba7d710b195ec6101760289b8429d073004a9";
+      sha512 = "78e259db1a9b73178fe2ffcc8ee05c5b1324513a4ea0d564a0d702d42aa2bb87f990f780021c19d3c880922ea443b8925d71370fd31d4577e985f6dd1d2af11b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bg/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/bg/thunderbird-52.9.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5dae827d4111bf6f07f1f794ab71cfabd4763d9f344b9666143a0c559c93479da532056d43f25b8d130284b9affeddd4d08c8e7042c86b681a1566a7b8822c87";
+      sha512 = "783fe76fb9c34b47a41ea625f31a66e047fc37a4df521c74628d785cdca2fe8c06a7fac1fa1a3cdb5f782c1acd79862317f19ee1597350c991881bde682061ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bn-BD/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/bn-BD/thunderbird-52.9.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "fc5816d829c836b8c0995405c9e33ead778ffdff7d1ec11c57113b87954ca1be6e58281244fe5985f7eb84572e56202a700d7bf382c0abe0e4f11598929cccea";
+      sha512 = "bcc80e20e418f676936335ff0aca9d542ab6563d678e8f986373b86aba160be8a815bef28a1b3af70a54047d857bf2f09b1cd7e7926d32e8ff41b790bfbbfd61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/br/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/br/thunderbird-52.9.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "4b2ad9013cfe07708ec6cbab5fa79556d20d0146e5d853951c11c2d7629d795a7a9a16a6d7faf3c2dac535f5d368d98d98ca631c367c8b9cc6e3cd13763f6146";
+      sha512 = "183faf91edaa6035b768fa24bbfa6aff165e07c43174828bf8de8d2a41f1e80b96d65b88714556b9230b2cef37a2b03f2d9b40baa623bda3a831b528a2c3d61c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ca/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ca/thunderbird-52.9.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2ef0f547dfea3d1ab97fba96673ff10d6bc0bdb24ea20c457b4baaf6cb987166219eb8d7c4e9c7a8f89b5933f65654f3cf8da8be7145c1378f1d5f51b8751825";
+      sha512 = "4f55b3a0da97c3530f8c69f13b53b27e7ec492f0aeda2fd5075a9a340fd0b76a88a29e0f3c5ef8a801872bd263803e4da4b59dbf4258e6f4f0fd986aec63bd7d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cs/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/cs/thunderbird-52.9.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "57f55ea5c102274b42154433a9df9663f8594d62a5b25aa18fcdaedeeb52d6556cdbce8542f2f301f5c7ea08354d90ed769c9e6b95664d6aecdd3f58e7e7aaeb";
+      sha512 = "13ac8185a5bb7e20f4d1961cc5983e3a3a60467d9530a326d9cac184a1ce44113deb113242d21855504376396985e9307dfb0f95bf73f9ce50f68d1a6287355b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cy/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/cy/thunderbird-52.9.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "241729c3a385ca1fba281b5985513486a3fc9b768a41c4d8d1c0249bd9d3b4de032a76c6b2df383041840ec2913eadc854f2f8b85bc7de782a4f09001f0f5ab8";
+      sha512 = "1bdff75c79684bd67564954844d53735e6d63c0815aa7629cbf55124f138476c17b891229a657892faf29decefcdfcef8e984eb1e9c935dbb2d555f18bad75fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/da/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/da/thunderbird-52.9.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4368a9301d40becf9675379c217040023faac8862482c5521a47f06e6c2a7466ec0b251475db111ed7f37c72cab0742e20b58463d2519a1fd6f77bc8e360330a";
+      sha512 = "af08df6ddc75e3bf4d1fb678894799eb112963edeb424c149e4b5703e8112f4b747e25dae5706a5f7ac066258cb6a16dbb197e29c45b787124f42c004671897a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/de/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/de/thunderbird-52.9.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "08c2fa848f3dc5fdccc498c935a03ac4e12d3bc3707beaafa5b9bff1c2aa51d6eb2a6e8373a0185f123a1ba77bb720e40ec9f8b364ef5b7a2f7810260ca9c372";
+      sha512 = "0aca6f9fa7549e36a10df14f2f74d213ba88c614c98b6701a1d5b3d498a6fd8c7b399464a170b55363746cb1b662d05a1e56bc171c778b83428314a2874e5177";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/dsb/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/dsb/thunderbird-52.9.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "83ccb82aad5d63952674707c2c2317b4296f4b8ac56cd3ff9e294023036c1354f8f373d3b977f5f1cc5f9a9fb4876cb68b8dca786d5e2a07e28443e85e531e63";
+      sha512 = "73fcb0ea062f7cabf96088dc4c8400d084a3b8e5258dbf56132f2d23046e6286ba041e77c97d6e12448809e14aec402bb4edbc9e7602e713e1d74cd2e1244bb7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/el/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/el/thunderbird-52.9.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4e6f9982e661d6935bbf6b4490a0f66ab2c082ecaf3e6bfc67e32a878b3cb60c7e98d2b5ae07439e43aa4f0f5f7b64616dd22fe1e3db9a5e28e42285a2c1ac6f";
+      sha512 = "0103d5de58e5971bf74f74e43e99b519b8ade5aedf70fe2422e4bfe68a9a8d8b9c4cb81efd82d485e085f7ab3afe4a40e81f65ab37681626385ecdd7384959b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-GB/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/en-GB/thunderbird-52.9.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "3ffb11f6ad966980eefa882933b2ac791d73eb338907b8c3915905420318f0e52e16037fb6e04c2add9641e4d89424a48d769cc472234c4b25ddcaa51913d1c5";
+      sha512 = "608c7b33f333aea4a1737e763bb57562332eea53555f98e27ccfe8e5485d6850847242bbb9d6d63a840a68895b45b2fa036ce675b4d88fcf37b09f71ba8eef69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-US/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/en-US/thunderbird-52.9.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d5c2ab406d1820745bf425ba7bf6b947166747d0037f1519c0e4a76a6036be9eed1e00e563c7f663f7472ef77a6a85b646f9ed706f26666dc1d4dd39dba3f917";
+      sha512 = "4b6479bdf244cc7dbf175109b9b353d021728e53f16c6f172a6c9b5d2f1018a0bb5a69f1f0fb40d95fa7ab117497f20514f7795b7180b69506102b1a6d654888";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-AR/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/es-AR/thunderbird-52.9.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "c5971b74a717f24047cf43c4a20ee5c3d0c952a1f3c28ca2692887426746afaa1e8fdf4abbb601193cdf594912013b20ecabdcf8dcd301db221a8a632056e0ff";
+      sha512 = "40106ce1b5f54870db329699ef434a7e7995cea50937df642afe17f2c11445ba4c2d337bd3e8d0a689500abe8e538dc6d5ad6e1b8bc82d47a8b23a4e70b9c269";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-ES/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/es-ES/thunderbird-52.9.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7b58ae76bd7026088c5d3a6e00b64e8445c29a898aaba8363524d436dba650ae1438feabe28e599e116ea7d995c864ff84688a09606476109bdd6aad48304973";
+      sha512 = "2724a4e6355804e9fef679952aa435806bcab0e444b8ec2ca4e6ac950951723f02585683f7f9f203c8ab1388f3be53e0de161bd51250469d286ba82eb1ed2b2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/et/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/et/thunderbird-52.9.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "a71f40dadab629369f8ece09613c8d7ad78314da38489705a880b436afb7649523f50c189501279c1c0269953c7561b81d1de29ff9c1fe1bd22fab734772e8bb";
+      sha512 = "c5907d7998700e1915c35e4f45fde0f28339d3ea2daece85b63428aa39be24f23ab1f5f69ffa9241ef2fb858909dae4aa5f3577b569d237796d1d9a24bb15704";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/eu/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/eu/thunderbird-52.9.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2e9e6f58505c4873e5f3f263b75ea56bf50fd82320b78b2bb5ea0876773fe87ce5b76cd4e48c0781565690a28e86cc611ff17e7223db4134e2978e0729e2630a";
+      sha512 = "d9711b60be3559f3905a6db72cda46c39c9cd89493effcc4f618241444910c8af19c244be3f043513c62e1d2a7e5c91a5e4be7e8397c71f783056c8e1141fbb1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fi/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fi/thunderbird-52.9.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5b22836043bddda0abefd5a9613f17ee147988de819d221f184482161d1667c4a9555763376e5d0e28b3f0fe0ec4482994368ca26745ccabd1826db0bd847af9";
+      sha512 = "07a915424b71e5b1bad7f76bf58e678374c3d385231a2f32c04da4374acd758a2425cd0766d7c904ad5edbe390ae8fbf20eb59996111410fd8853b618ca1d7ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fr/thunderbird-52.9.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "c465c33cf95bced2fddd7d4e3c624c3f98ffe02c2aeb21ab8946c1b1c37a31211bf79fb80a5fe767872dbe9cb1cfeabcbebea7bfc8e8dee1404b8c75c9aa6a4e";
+      sha512 = "7368953ce57bab8cb7a774f60aea222d59d7982c5e8f1015d0b11bad1f0857d8a8df05a59db6e3526af92562f70c8bef65882954e7b0b4534e4b240c196ca125";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fy-NL/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/fy-NL/thunderbird-52.9.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "51d262f87d2766e1c44370ba8f9d22df7e2b0876059bcfdef4b9b7809056468fab1cc6ee7abb892ce293d392548ebbaeccc55bf58c251aa774a8d936a7a50ef3";
+      sha512 = "2284bec81a2f082dee4820489941cc638f7026fd7a7e4256b7f9a4bfab688ca88e9b5fb08f3a1e796cb4845192ec49cf453a4a4d8f83bbc116630c0d40dba84c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ga-IE/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ga-IE/thunderbird-52.9.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "f9354bb331f6ef82cccde57eaaaf73887d904b76ed2157ab4ffcf37109928160127714cf51586032049a78e7215c43211719f2be1c860828585a344742c1ec91";
+      sha512 = "ae0722e8bbf24319b9276a2f8f9ba3551d7f0201152622133f53d0d42c8abc64d4ceb7b27e45a0a4447cc6d5abdcb705c74f44c0102fcd9c0d7e9938adc4a755";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gd/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/gd/thunderbird-52.9.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "926060b60e5fef2020c27e64a93c246ea9f477d82d8138c1a1e6439098e8e1809aa74747d45ee9b069dd32ac07624b24b022d318efaa3c1b5b02e8c8d599a54f";
+      sha512 = "1464c0c2b1f2c89fd93419102da9a79400b6683767cc25d50bb249855091cb1549b410fddfa990b463404645ac3737d31ad4abffdbed58a7b94b17fe43f6ff6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/gl/thunderbird-52.9.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "d07e61440f1e938b0af4b5db38187a7cf7c6ca8584eec093c292b5f6b7096b529fc20db06766b11001f8d13e1c7dae7a5d3c798e82f3eac9dadcf8a8a50107bf";
+      sha512 = "990202de53a2f86253819202337b312fdead9dccb6b011fae514614a7e45eb91976b5b9b7dbb3a7a9378c523280172b177a0ad7ac85e92b624086cdb8dab0651";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/he/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/he/thunderbird-52.9.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7661135b35207b781bdc9a402128eaaace6f67c8558e6cdff271d946c88cf023de8307ca1a7c0ece4e0424e37d38b2b5e2f24fa966f7e13078dd56dc6a1972d3";
+      sha512 = "862cb3047c83c1277ca195cffa21fae79e79f12b9330b3eb27378c050495552b857b43daf18425768e76004fc88f978f46d6b062b8e14d6a4789fa5442479d05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hr/thunderbird-52.9.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d5db8e96bdf2061d8f24b9b332b9ca4e7fe64316385e32f01023520f80605bba50b2de8263d7aa67fbd5b3a9b39fd20a050bef4742804da4ae03b4d866ed8012";
+      sha512 = "419c10d7ad1168fc43c390651199c56aaf331fc9f6015a46f2fefde83ce31cd26c26f856d00b85b5f7278c6540f235d17f3f7f83d85bf79df7b50aeb6dc198fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hsb/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hsb/thunderbird-52.9.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "9cff35b2b5a4dab919e38180cfa88d7c3c249c9e119f6de850bd6e72018e6a62b1078ddafaef6c73c210b8c1dea3caa7987d88c75513f76033186bb7926f5e81";
+      sha512 = "e2efdc85a7653e6dc3d15d27453bd3294aaba3b7cfd0b41da63d1a9954fabd544469304bd038beae6a3dd7bc5159e1960beeb18325d15190a24f5f8aff470e63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hu/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hu/thunderbird-52.9.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "56057845898226d58981107d1ab14c3ca02547c0767e768f45c48f30097e14a7745c43b3b2b0bbdae81bc6ecdcd323194d30006ad20ab2b0de2cb3b29c15dba0";
+      sha512 = "1140a52c2bd80c46ec14a8ab429f94ab380fa091f29604b0045f35c210c670d66cf6dcae0ce16b3cd865b5756a08f8c3e31b561c4a36e75cdefe6ef333074b90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hy-AM/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/hy-AM/thunderbird-52.9.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "6595e53a1b790cc2ee47f071d395dce94b44aafee80d2efc1613ee44d3698736db972f45806848dd9b35de699dec53b8b5e64e596b0b49b1e829326e57880904";
+      sha512 = "35c657c76494dbce3d5c5f5e78be1983530caa1d028d4c8407c15bc6d104765ec47c247b48a8a848530fbf1f42ab2fea5202a73442b149caee7c85ceedaf2ad3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/id/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/id/thunderbird-52.9.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "878b475a2073c97e6af40bac24c2cfb88a73c8bdcba58b5d8cb2958f5114093fabaa6309f32096347c4ebb4baa828bbdf0077995284f1d2ae32eb234a7ca1d78";
+      sha512 = "0659d0314cfdb1b8ac465281f5d6017b60f36eec2947ae608561f22c91edda6b294de3437e26d448b260b175e6e8b2bc8b5b253efbc14dbb93038bb535b8e8b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/is/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/is/thunderbird-52.9.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a8ed951689420281cbfd660bf23a4e5e3764da4894b31eb723b18c2923ca7f5f1b13d6a279f93d3cdf524f0a9387bb706c3d187ee4b84c74490fdba7867ffe25";
+      sha512 = "915e420a4ae20927dff42a5211d582548f9e20fc4079627a79bb96244d06ac983865c7ba814562eb0bc67ec620f07e06e7c9739d9985464370417d186b39724a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/it/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/it/thunderbird-52.9.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "24942a2fb5dc9a41641232f728077c8bfe5e99c5766ef4327a11e7e60858520a267ef12e0bebed7d9ff2664ba45d672fa1aa24c9ebdba9048bba10f6e73f6d85";
+      sha512 = "61b94999940d80e6fdc5c446d0cf28382797f28f88f7f9175fba880c068d052f24a53ad6b8c5d688a11d5c756dcab6eb046694fa5454bcee24fbbfb7912a83d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ja/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ja/thunderbird-52.9.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "291e715308f4bfb605fe987ce774d3f5cac211f920f62ea5e8abf12b51458f2da19c36329eca8fbbf185ec2eac9793dccc3d7483b320c0341ecc17bb477af263";
+      sha512 = "5068296796e6eae90711d7d36a8da446e11097e65bdf0ee57aaa231e96ee044baf5b9a82c77424e783ad4acf8a5b9b93433f73a7b0fb98de3ff01c576b19bddc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/kab/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/kab/thunderbird-52.9.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "de78483cd0b0a35687e091c52bd57d9de400a97ddeafd3b7708565501ff20da7ca1025940198aba6d410646d72be39bfca780d36df6b323ceef63cb085b214ec";
+      sha512 = "d8ce200213fddfa2520a7df57be2daa8983dfdc8fbab5dfd5beec793234c82831fecf913387ad8043ce859abdabc1f2bbc08b5c5a2f7e476a987646cc8921870";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ko/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ko/thunderbird-52.9.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b87fcc1baee680496b5bc13b1c87a3440c50f46be6e22b175cc8aff51bfc18bdeaad662d3cc10ebb255cfdf6d35ff2e59e9082f9d36dc5ddb079c49cda4d9d70";
+      sha512 = "84c2a4ccdda118b304a690eba28d92fbffa7616434a8278616a1e923b6d757c8600b5e35ab25a13c29fd1a290b1f19540725569db82f3e821fc8b8e9a119737b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/lt/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/lt/thunderbird-52.9.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "093519e8b927f2d716f76925fe40dc0b63835e51c446bf6759992419396f922a38f24d6f8e3fa2c0c252f391a2ff812084d26d36d414d77ba5d961a091b12756";
+      sha512 = "38f9dd15a596af07b882fa265487dbaa638e1221a1fe8cf3377bb0a9e19f5f9450da8213ba63ed57d4e33e1543b9b9af6d0c4a7334260672d3c61b9b4ac51bfb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nb-NO/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nb-NO/thunderbird-52.9.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "970a4d41c779e224504524ab8aa2b3bf83c71facc5f666c887b2eff27a8ee39e15404c0812376280dffa0c0642216e6e966004b577572ddb8d9e7cfae0544059";
+      sha512 = "75fd6fd0bcb786bbffaa657344834af1f113823db703582968b8813de6e8a69d26e657542e29b6e309f714a222140b961de264e3b81f12a678731bc74ef8d65b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nl/thunderbird-52.9.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "7248b9d9a51f5f0b5b628b744e935c1d9c21a0a41cb5d77ab66b2e470bf6788774f1b769435f4526afb8d7c28d8fb240a3b3a918b6f20db617b599285e11b5fc";
+      sha512 = "ff34802f626606b91fa01a7cc00b6ff97f84edff91afbd8a51a465e740ac97b3119357f8f04d214ddda3bc1a8f61574360baced40e38b5aeac8d870e06ccca24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nn-NO/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/nn-NO/thunderbird-52.9.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6f8e73df3122bc6985f7c37b5eed90c64914e83a800caabeb27a5b155085b5def8685c6af237e8f0cd605db28681a5df0cf4cfed32fa97b6d594666041bbca16";
+      sha512 = "ee73bc257ca5f1d35fe2c0cd861a4ff2ce6e9329a59feef2492bc9edf03d80bf879b7c2899417ed381faccf20813d8120a867107ee17f216a8c02d9011802c76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pa-IN/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pa-IN/thunderbird-52.9.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "56f1e10c22acb54a5e6dea22be888525f24e9afc7ec2dfbe8cefee45196737bc68f0a39e7b25e0ab1376b3d7301f753958a11e66f60392f340a3f3f5896c9d5e";
+      sha512 = "8874b47fc730e61dbad1a78e38d7be1f23cc898ac609e6dc302d2217633a812ba75f519699ceda0b492fc451d3d8f7bebe2e0a55f6ad9bcec0310c2927035d36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pl/thunderbird-52.9.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "3dc5ae6f3e6451fa942fada6e2b7d7643975782cd9c43f0df9473f40117a5b8f91784462c444683aa180ff6decb677bbb1765bdbbd5ba69080fac806b4c7b97a";
+      sha512 = "e612b9bf659f1124721c771015fc2698533d83f73d65cdc6ba95a5e1bc89748b0667f8b83b3d9f9b2173cd448ef8a88028e704fdbf5b6536884c6c9253075d24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-BR/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pt-BR/thunderbird-52.9.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ea4e6eae43d379e92adb54cf8a0e7cc1baf23bfb427e752f41d95bf9411dbf092ac94794aefbf2983dd7031db0961585c7bef31be63633035f907afb5a8f1a9d";
+      sha512 = "a94c7feb52fc7ef1e819af28598d558f9b6b39833081bce0078b2e3aecc0ebe97cd519f3de8726512c453b89930eb3fc7280e66e89bd773222896fa807ade6a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-PT/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/pt-PT/thunderbird-52.9.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "0de5ad70739e456fdbceef8ba89445f37ca4be23a9b213ad5b52b92656b702dc7ab39d6b27f2d9012ee27c46a4749444a210070ced586963577ee386726ee72a";
+      sha512 = "94eabd80a87d5201c141f8d54952dcab971eb3c3f4e1436465bd9adfaf606310c8cd3b0c0fb1270260f0fa34183112ac54cbfc1734d18dde84c848b5efcf0d0a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/rm/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/rm/thunderbird-52.9.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "dd947ad65fa23c42f2a1d118343b54deb2e7c9ef374118e2bfcbbec0d5ccfe5217ad0d636e9b4eee56f1e373beca52d8ff9f12593ce77b9f5aa94a1f62f2dcc6";
+      sha512 = "46ed5419e3d6d12d1de660c9a4d65a641f25716ad11392cfd88d0719610529f8bf92a961518d21f914dca5bff5a49a780df0c1a0a31632d13b89215e0e106726";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ro/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ro/thunderbird-52.9.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "41b74b034f00a7ec26aabe5b5cca0b4a332b161be06f15a41e0c850ef53760ce1b284bcc8b71e1657a20b46c436c4ab6ef0bedb8f4a00c46b59bff825c5d5583";
+      sha512 = "c842a16aa76106bec5ef16edcda149296da7b2196d78830dbf51c9b840316f55fe1fa73943f4de6aac403a45a74af0f390a9499fccbd1d1f94de23a52e0e2a67";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ru/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ru/thunderbird-52.9.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "4bc1aee9cb629f59aba733a08d4c2f5951006e30ad38584688fce6772d19e2a01dc6ddb43b6c0d7375638c8e0714703e6e4cf47fc639c449a1ba02dabe7dc44f";
+      sha512 = "4165b3b55c7106bb4f4f4d2aa46d17358be96dbdabb4d3bff8913f8f7b4efb898e13391ef3dd58875b244d49ca8aad6a83cbe2208e2e6e1be851f16659570194";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/si/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/si/thunderbird-52.9.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "663ab05d2e5f90f1be7fa9b2b61734f2c5c7d314ab86196629447c05d220f8de0a405d7ecb67e333d0c31006c0f0c384fa891fa087335f585a757b397d29769b";
+      sha512 = "23e9b1524451d5932701ead1b61ccfb1945b5aa752c5b686fd889c1ef1064b44fa2b96b8c5416ab124bcb04bdf21cfaa2e6ae3eb0a76997db72f91a9eeb958f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sk/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sk/thunderbird-52.9.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "4e925c2ec5d218b82722d6141b4e7b9f3216ba35b5e8260cf15c58f647b60e93161e9bdc8501865567e693ccbe3b40458b69e85e7b7a0884a522a68cce2df123";
+      sha512 = "0cdf4d30d1e466ea9779394238ecb76937aceb546b25b6dac038060273121450643ed83b0f279e4e7f67c084d263896cf02fbc138a01c3c917c1c0d54a229cbb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sl/thunderbird-52.9.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9c0e33622d3cc6e735978b35643ae6c4028456964255b04aeee28486177e1711354cf1de02db84c6af928ba176578abf5b6a2a12a248389790fc6ade6fa96e2c";
+      sha512 = "5be5d7b380ffe2147b3194b97c9811f62b7c7315a0c6746e28f7c1ae20ab9be04c3202dbca6ee0b235479ffad1f111d44eb4d636bdd3d3f077751cde14afeb86";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sq/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sq/thunderbird-52.9.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a6642a2c55db02058ce8bb9111afa3a9433372494e1e613fd8f1d575c64ce95e0c0e61a8b9cd60c662266f3347cabfebfbc606bfa333a121396caf3c0f89737d";
+      sha512 = "fe24594d05688eadd9ce855a7f45b6c94e596beb967359611d21495ca890e5b9a3b2d2f8cf764fb81e88c62c7dc6285837993d05a88060f08d79fc6947becd6b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sr/thunderbird-52.9.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "e472a07bf64547b912b80a32212fa9a0c25023044aff165cf92cad8af1796fbda9d36ef32f6c11bf9b87b75babb4c6fc6d9d5463b7b88f31649298adc6947b50";
+      sha512 = "9cb0ddd297e9261d4a2b852624a72370030d212cb2aab869aab117e4e21575eda635940fb55fd67cd95384ea956a180fbf5c6e3b6aa333a8907fec70461c15fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sv-SE/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/sv-SE/thunderbird-52.9.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "18cc4af474e717dbec7ff88fffc6635b7fec7d8936f0c7d903c42a1b9482186d5d0a2ca661491f76b477c57de45e03c995c562e295e5fca574534d81d6e6d30b";
+      sha512 = "c17e07785d86770acc788f8f05c1d404db08ad383a92dd21698532f85953fcf9f7cf1779824076937a2dd1ca362881db8b8b7a7213db6d431fe504355a42d1aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ta-LK/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/ta-LK/thunderbird-52.9.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "22f8d3345de9de5eae1cb05bbeaead160779b9f8c1187ace426d7ff026ec0ee0762a56b909f22c2bcdc186088b333d6fcf52a0ebf87ff56959b31b1f6dd7777a";
+      sha512 = "64701069778da5be5777fd12d4aa859bac2ccb229df076cc218ac4a8f07b29d614a25564d38a220ae76bdcfba874dbecf62294b53515fb6c1ba923b22dccc0a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/tr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/tr/thunderbird-52.9.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fc9365d3c869c1c3c1c9435f00b5f8eeee6fb231230a5fb0ff48cc59a8184f57bc558ab7f7386ebaee74b9c61c34bf5f7c6e882cd0e431749247b4a58d068c50";
+      sha512 = "99c2133c3a4bcdadd6803ee6dfcb204ae8a095edf68f7f854004844835ad88772ae1a83c92ccda717719b2c44aaf8776a2a49af2737111a6a5f1ff83a2028af5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/uk/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/uk/thunderbird-52.9.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "60ed7415eb87d9f1eedc2c92078823dc49db80652f6ad26de0ceeef34b7c499ec940ac3bf083a7731bac9c144b6bc04546209aabd1ddc0b399ac174fb88be6e1";
+      sha512 = "b4006430e6b08d4ceb40bb76eb0a19bf743b4c6ba39ebb4999021c4ca625228a173c6e2539ba5e711be191e8b7550e45ea7160936aaafb0a3d1b44ca7ba7dbf8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/vi/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/vi/thunderbird-52.9.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ea5892eb57fbdc0169f5dc39b2edb5eff2d06cddeae506e979d7556164fe55a65a402c7d791c873e6d0a3b48b97722d8dc90aae1b7389aaef3db836e803b9825";
+      sha512 = "9f65e5447923f9f2d36fbcf80c056ede580221a8e5f5f0ba10bd5ecab354d1b35fb787f8a0f2779465c9fe78a83c8fcc9bf3a16d0f853aa620f899b48eb4b0c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-CN/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/zh-CN/thunderbird-52.9.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "22ab8baa3a41beda58f02612bcd5e0a9848c3cb93bc68037ea504cdd0b2a0b5ea5bf78e5bf735dcbad4079ebcb3c5434c34d6a5e2a9f09a513f91018084ce960";
+      sha512 = "72768a3d97ca1093d381312923ac42127248c3aee9eea1c6b187a4989082b87c326c56cbea7f9c6c2dcc626e39391c834f28697e00b1dddbe22a861a1199aaa3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-TW/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-x86_64/zh-TW/thunderbird-52.9.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "6c089225c57a0e010b0d413046004b53570afbf2d3b673dbca9a6e8cc102b6edf0e3a4f4858add4f5c1a4bb1fadc2641bd1c1dbc8659f970c84f61869b3634ea";
+      sha512 = "496c01eb0aed26ff77c032f03617dee5340415837a039b1b7e953d1029b91163422430742499e7a1152b171760ea06cd9fe0e538a234edfba44033f6cf2b7978";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ar/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ar/thunderbird-52.9.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d48822233fa44e48b762e6aa2da302dafb38c32827b112197563952b35ee453a361a45eee35c6ee88317d6cc5215d0276e74862b167b01adf62f9c275f89a38b";
+      sha512 = "44379cb4694512417728230fb6084fe13147dc25e832b5914eafc9f2b93c96103cf923025cee84570cc001221d8176d49752a7432792714f9dd4a0c454e02bee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ast/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ast/thunderbird-52.9.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3894ea6a01b335b92fa0d9f175aacefdf4fdcbfaeab3f3f5faa37f0bea090ebc7bfc130fb42ffff2293ecc95e3bdc8bf6142a5896dd4165fc3fa9f8e09fc3b5a";
+      sha512 = "73ec4faf9c3ba21decffa60658e4db5ff22902f4bd8b65849ec98367bae8d309fafd596a17016275eb10e7ff9854315980ab87cce2d7efab29a287700d377c43";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/be/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/be/thunderbird-52.9.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "ad93e61d4d1437681bdd772ad815efcb30716e716a08a442b9df2351b27118a590426d0ac054c6f41c29f4abd14f6e8fe7a54206eed810bddf1a70d6afa6776e";
+      sha512 = "21cc3cf7392b99ab566c69bda193457cd7b2fa2e0e0aabf29354ab6be6be3c556890e630650fd18deb940a89b93f91dff8d7e0763b684e32d599b0d6747cafbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bg/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/bg/thunderbird-52.9.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "de09ff65e4c24aad1faded64897f9cf7bbdcc21d4ed609fa1bb0d9ad5d5a9d1d4e780fc2d8a386890e6cf59641697fd1542701689ba82e22c844ac29012633b8";
+      sha512 = "7d2fe68e8906083753e6f62a7fff622e0b2a959222c9cffbaca6797f6b401777b760c99802d9f2df6a200d6d7e89c81d58872bff93358605d1d2a5ef9f6ac0b9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bn-BD/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/bn-BD/thunderbird-52.9.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a5f3737e2cdfa540adb3682542163a5f9c34605e975fd66bbb579c1508f485ff891f997a8c90d576fbc09d5c4cd183f123f020df7a3cd1f23401e7d92e930724";
+      sha512 = "18238e34dbeb90ca13cf38a0a5d9335e1ee669e7788afc0b369ca5bb2c45ae18b5faaa846e19a6089cbb098d862529003da29aada28bda0712401269e6aac05d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/br/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/br/thunderbird-52.9.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "37222d22ed65271e08fbfd32d5e6fa7cfe65d5d002116bdfbde8fec9c3877bafff6b6ef38680cd4373a1c86ed92402aa5afd5bf04f369029669af5451c9d884c";
+      sha512 = "d65cd714e87d2e4901fc61b9749860617200043b019cd1888b66c86de06a5f5bca8947ac97ee25695c950c82f94ad334cdfba5d5cf18351c6409849529779e57";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ca/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ca/thunderbird-52.9.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "87adf55bc6b50881b8d7ce30170f6e2f346db2c7f9801abbe37a17ef274417a3fb7dccab8d2eecb25d6c61a888ffede95c2ed40b6fe097fff2cf49a0e9490a00";
+      sha512 = "d39b1855e78b6bf24c877649e408973770a7ef244e7a95ddaa571aeed88d75225c9f3e1e8fa6b3440c7480a57d3a0cc8ac63343af13f6031f4ddbc4e649ddd78";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cs/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/cs/thunderbird-52.9.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "055df8c29546975bfca186dfccfc9fde5ba418f3f2be1e15c77ac00c3b759527609427aa6590e3bb06e417211be6642bc37db4d19be6c3b866358d65c3aa3bbc";
+      sha512 = "bda0e525a980495ed72bfa9bfeb7f0235d8461b9ce057d8d7f4e5334348153e6c410abfa9b0f75946f3100a9693b0363cc8e4f542e834b1b15b2acb7b8fed1dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cy/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/cy/thunderbird-52.9.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "c60e61146c3fc195c482106d40a2eac47d0b621a13bcaeee5fd95a40ffaa5ae810f58a5ba85b2676a4277ad3fc6d7caa3907b1d4962fd42887e762236e7e9366";
+      sha512 = "29e1f5e0bcb60d1eba274103c5f94b60dade1d04eeba3bfc684ec9aaf4f9750b0970badf94bbb3db7f575d82e53caa929584168e4663019a382b942a79636df7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/da/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/da/thunderbird-52.9.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "1f8634f680512bf4ed0a44b41f3be55c118a114dcc262ee41010e58abc29f8bc3032a4c5264b948b9e4e13684d42761d97bf612050b891b4f52c78e91aa5a0c0";
+      sha512 = "ca24d47fa8c71c9b182cb31998b72ce63ee82f8c4377090f155a3155988759e6be8e8e28c8e0f0217c4318c87c16ffa34e638bc27d06f5ac41ee2c6171d16fdb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/de/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/de/thunderbird-52.9.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "9422296b970e77217581c0a10efb928923e55272baa485ccd1a7446d6e9a84da23e6f2b93623922ac85db84861ab4813282e328315bedf9e3b8cf344d869108e";
+      sha512 = "2d820c628683710a3d5fb69212dc51523c867def469c7f5c4a15456d99e22988143c7804ec3692ba62e61628657abc286785925a94a1358c79ecc623f0693336";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/dsb/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/dsb/thunderbird-52.9.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "281736767a8d59830b1452eff5e5058c4090661030068bdc33d2ceb960f10c38284c32ff94345685fa7a7781da502f67c34fc83314728161d75c5fb3fd0ad0b5";
+      sha512 = "2f97cfd783405eab580457311d7faa24c8cf6956cc62a60272b60b21cb68ccc35fabb0964dd97786537e784eba7eff8d67e496a242e9edee2fb6f95891931592";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/el/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/el/thunderbird-52.9.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "baa144336339a3a271f5a852b3130d20054baab3633d453015a5862e630dd73f3a99f50b979da7910810e84e99120a2afa96f8dca8c8ce0017824851deb9d702";
+      sha512 = "8ca85b4c91b07f914c805d020ab4424a3ecd443c86c52c66cafa6be16ec344b025407b7e52d0a6d240da1e8d9470dc6237b7a93e835f9fa6dc16b33b45de3807";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-GB/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/en-GB/thunderbird-52.9.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b9573d177ff237ad833e8064ac72f7560940c5accbb7b7f663f53f6942e0326ed451e2290b09003ef6b320b860cd388020b00cb340d39af34b38678556704390";
+      sha512 = "7a51412c09c78bdfe03484db0bf7a274f5cdfe6c352cfdb710abecc56b2f203c782a70d4212b22602f61546a564c65b1341900a80a6d537074d8877479dca222";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-US/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/en-US/thunderbird-52.9.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5f0d43831c256e00eb3cbe5953cae5b6e84f54bbbde8b71c83f841c38b3704620e1163bcc5cc903a0b716685371912401f90bd00f5500fd42cc6debe97b28470";
+      sha512 = "fcd2d06dcd49a5b60284e0a370bb0e5cedfd01dbc06a9057a8063a0e84abde6a6c7a7779bc60e475629a33645b70b718508bbccfea76ff1e6be42c0052eb0e45";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-AR/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/es-AR/thunderbird-52.9.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "ad640b2048f064d3e0914a0e79311e66c169258dd259a6873983147c37778616eecdc6e22aa64db272b534813a11fd1a0e5c555ca158d565513f3f201197a9a0";
+      sha512 = "b41eac5efe305b395237de378b49d33e1804661ddef3bd321f08a97bb8ab437299a899e81bdd5230981dc6119de45902ed1fd961cbe02570b2545ccba58f28e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-ES/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/es-ES/thunderbird-52.9.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "12c3f601473909f38f737a353dbda2bea515cec0e6934c389daeeb470a489104d8aa7f920b0d81f6da930f886ea74b0c82dc6a49a2142c1e843c458f597c1a5f";
+      sha512 = "4405a7ca6b8809223ac6d441a52183687df9d016cb115dac10e4d78f0df4af4f41daf2c95544948f119cc5977e3b749be919d66f14049221aac50c81d2007847";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/et/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/et/thunderbird-52.9.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "840cee14b983e20a0aa6847e15aba2babdbba947b6df38c14d3d5f3b50dcdf6cddafec13191c75718634a15ec757ebeb664172d09f841fa2ee55db02bdc67cee";
+      sha512 = "1c6933a054068f2a027e9e50200da3398d94152a4decf74750e3c8121103a628f6762c6867fc465216eee8dcec74ce8a06426b7ea668e6e157d00ae6df5c1aaa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/eu/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/eu/thunderbird-52.9.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d6b4c9edcc54f22f39991c206e7316ea172e4450fca39202a81cb522040abea08eb9b48e296baaa19aca12d34de0b8af8379c1faf30a1111648a1c0cee84ac70";
+      sha512 = "aa54aad06cee5d4a6130bb5269fd649157a09f377c10c2f3aecc24a88a48ae2ba4cd3d0af35ccb9a7cb5a54097bf19eec31ac23d652236a0e440c54468672a99";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fi/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fi/thunderbird-52.9.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "23b25a0ab4879ddada9026991fb9955df9d32d635c4d0f746d329dcdfbce4593cbf7a3217845b8ef5f5a1b8e39a8a6bb1447557a5098f19acb82027e5993d549";
+      sha512 = "6dc8d8c586ea6fd23fd5c5438c650f39e7fb441ff30f1ef541a1f62a3e39b58fa154b50298df6585d5f4a2451b8d660d620fae4a9d3812b50270cc4e2b6cde9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fr/thunderbird-52.9.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "4033f784c31e8e13cfe408782e8b4e528f4d099abd02480090a28c6d0079a5bdd29ee0cd0953d5b94434c60d11c6b9867b355a8d8b6296ffee51d78337df3931";
+      sha512 = "106d63fd73482886682e02f222b7907f130485c14ae8b2f6196f380828a224726d53e1ab0b9d6a12044fb62168934de745285a686ccc8e36bc78f4988cb3cee7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fy-NL/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/fy-NL/thunderbird-52.9.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "64959a9a0d45564ff2ff344e1494c7f3d80792ecd8fd7df8f2ce3f35676533b033183f24ce44416f3cbd281dde20a7c7f2c3c488e8476d606d0416bdc341c02a";
+      sha512 = "8ea82bc44e837e38f01fb3ae6310a9726c8ca2a8b1bd0a6f1eef9c5d4b83fe3d2ae62ae12e0aa5466dc591f1f566339b50fc03d77cbfbba2701784affd597585";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ga-IE/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ga-IE/thunderbird-52.9.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "255215853d3eccc809b71b653d6e830d1cc3e5857409f8d8f91b9f7a2d6e4cfb1033ba927e79a407f482ef8b56c1175d2b0162eb04a153cda8c2e156b0da8c16";
+      sha512 = "16d4de4df7ca43ff7b66c362f82ff2b9970e8a835042cc3a3725178c1d31459c7a41a2689f23640996317b7d3af6f7b35b9335f48c28e75144102611ce6c87b7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gd/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/gd/thunderbird-52.9.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "483550a103337dd7807b85ff87ce0fead21851ebba75a470be88796017bf412979be6020eb3daacb7bbc15044236093277b6b2dac1ac66fa2c3b2fc2e403911f";
+      sha512 = "121939eec9f61b07885d68bbfc864e24ab57be48f70ec866903ada1a8e9887169dc0d0fdb62ec7fba71d0d36429325cf1ebdc29d02bb38fb71a41439c4290411";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/gl/thunderbird-52.9.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "bbd79bf49e94720ffed29c07555488164de1188212fe4ae0e6076ede587997b3def662f880176e267d11c4ba1b1d4cdc6ed6721ee771a7cd9acabc3a231f76e9";
+      sha512 = "7fc0f727d1f5d99c2c1d6c30778b949d0304ad614a2323ddb034e4f49e8647d600f3c3bd40a0879a08945a27025abb43cf3af453f3506e7cce9790e80450555f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/he/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/he/thunderbird-52.9.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "99b135b3f4aed9909daf8c2711ac10ad9ee85beecbc127e112fd61fb51a7d3d8f8575722cef0e7da6d4f79aa38de72ea4807c9503af5974c1ba9787180ec014f";
+      sha512 = "bc792144bef2e87958e8773caef367750ee5dfa005d494e0c4f328c89de7555d3d3f8e19085551e5cc2aa06af06d5da698582c7b87b73b15d0fdd5e66daf566a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hr/thunderbird-52.9.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a11ff16f2993d07d748630e94ec7bd6cd7634506535f3b7e7cfa5d16439fb6d2118ec195752cdedb87bfbee20feb629b72d6ce2f84b72a1da87b876e8e9786dd";
+      sha512 = "56a4e35b53c319b8e639c79ff9edcf6ce62c43d338645ea8b39f41deecd3d4fb4b03d6c3356f1875647dbb69b411eb28fb905a3434765b4e42bf0291c42bfe20";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hsb/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hsb/thunderbird-52.9.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "9090e5766ca42f0a633a2e639a520cf6f89a0a08f9d81d7e35fdec64b9effaab8759fb7241ab77c4b31b217e5fd72d52fc953544dd55c3b141a9a6d2e631ca5c";
+      sha512 = "caa5bb1686a19ca904d55b5bf5de6760b1403df535f92e061e48720bfb62f7a3b6e8e0af690817b636774b0d0323e92393701aa9689c375c71545e7a56f93af3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hu/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hu/thunderbird-52.9.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "f5158c0d4ba87f2472fb07f850a709e174577293e431b482f0d67e3ecb16d818544a02e221d3b68dcbd1d8e750795d51254ad87eac98350f4919979651261e5f";
+      sha512 = "d1d989dccf98f5db87ca565b33bf1d8278c4bef0e88a57f5465b1ec77328c9033bbae12b92115a9e431ae86bd33042e02f7dbf1933a70e3f0daadb13ca5f96ba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hy-AM/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/hy-AM/thunderbird-52.9.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "c902f41fa9353e57c666876715da6175ee9bad96ed45e0e858b436fb5c10164038a56bea670fb73a8b0eb2a60ceed33a7c08e790718efe2e22e6883768b21529";
+      sha512 = "6f4e519dc51cca5fba623e2883d72337392a831e837f294ef0359541e9483a8ef9ccee9065867482af92f57a230ae40bf38cd8cceea56c8a430a0735b5ec5f02";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/id/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/id/thunderbird-52.9.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2366a3c32145012e073c84527f7e0f8cb1b311728b414084ee7b99727df5ea2ba6b6323def0c7fff2df20066f65ee530ed635a981e42bd1b7fe21874b893a680";
+      sha512 = "c73238c614ccabc55bd231f1337cb9c91a38f25a6a3c5420ee278a68d4b00eb56cf02f9cfee4fe52457762ffe4826a441cc25f5868bdb3c8afd81857f74c19c4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/is/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/is/thunderbird-52.9.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ae858675cac66dec80de439a2d9a1290ef2d6644a896b183692a10924eb55184b18866227787bae30cc01482453e65040618158a05c2f8d6d9dc2b7b60dca09b";
+      sha512 = "187fd5bb383d775fdd00bd558aadd38cacbcf14066b6e0db50e0bb72ea2abc4e3a123ec2e33b12895d7c1ab6911b75949e3216beb06b044294b1f92f9ff336d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/it/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/it/thunderbird-52.9.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "ace77d1b7385f9aa825d5f67f640a77187891d5a257a00a4a9c565f46f742d931093a26f1d234f65f5e372d9598cb26c98766913e5b10a1c593fc6faab32edf3";
+      sha512 = "d4df787eab69c8a342cc48698d1c329a6e2feafc634d297d20d451b15bc8b7843a4dc7fbb39bdff24fd1720d387e101dda01dcd8a7fb5570d70016f1a98bf486";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ja/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ja/thunderbird-52.9.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "cb61fdcf68f4d02340a25c5b01b7037a7d102423bbd7068a9e7766f823a88ce461d52d6aca4211c1d871d31b8503477bd606c1f814c725f65240c260284e63f1";
+      sha512 = "22cd069e4b1a1326888aaeff5a74d73d84ebacc160717fc8fa046ec3d011f082053ac7110870284e61931808c447ae54b40acda4b3aec2d267f572220fafe492";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/kab/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/kab/thunderbird-52.9.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "a52705049e4baef0e8f884f97fd3dc15097c855987e540adcca6b9d27d9d1a38538e326bf1f6bb2893055f72f3fdefe0563b6e048c02031af4e7e4bb77140698";
+      sha512 = "acd50322046c5e42fdebaab02f565e7c716e83c84a3813dbc7e957fe37e9c01a02c7574486a6296eb2080744c1798a1b02ab993218d56f277dd7284d557b29fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ko/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ko/thunderbird-52.9.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "a4bbe35e6a5fbf4db08982b0538390e3ec5e54d4e8b627a0e9267ae9137822710add418e5042ace3be8da3d5d56ea41ee4d5bbc5bfb95afe1587a5f81d5b32d4";
+      sha512 = "71e85afe9b8b7f8c2eb96f014b4d2e55272fa458d088cff90b58506be8100ab43fcff9ee5d8a2faedc4be30d8afb0bf40afa4626455c9b17d8f0ceb61708d1d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/lt/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/lt/thunderbird-52.9.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0ef3fdb51246274198221cdbe07ebe6083c36759edd73243ed3568650b2d6570e90fc25b414d61d6a4bc0755b44eea21818cac09900c6eeef9dfcf24b403d3a1";
+      sha512 = "5dc9f270212862ae4dc0e6e0e10229ee6e3ad83720f7ba9fbbf604bc406114d16775d087a3209c35471218e7bdac8fea348984b7d8501309b4b7d39dbf95f0b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nb-NO/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nb-NO/thunderbird-52.9.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "4a08c425fc32dccd29901e7211b2e35dc151d954c1a6ec607ece3ffeedff1a913bef8910b46e4285edb785111643d6b1eeb19284af953e8446d92c055c62621a";
+      sha512 = "4e187c7aef208e00c80632a075d649cd1dc4d2ffe8847fe32df78112d81dc98b5f665bfaf9d63911d389a2a24fc6fc4581ca95023fce05908fb9062c6d287923";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nl/thunderbird-52.9.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8f54f5b2131bdd6579dcf7dce3afea57ac069206258ba52649d4f587aeed6e9aac9a08c4dc3920fd9be37074c2e619071bf502490b43d40a164d3f8d283de5f7";
+      sha512 = "c0c15136ed4865c76d4b0ba24e7dcccec4c50e3706a770c6adfafc94a119df33bab7643d7cc6abdb85f37d4afdada5d5ad556b91ec3111501a2a9fd93f37ed54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nn-NO/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/nn-NO/thunderbird-52.9.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "2d93dc0829669babf3ae3c3d6f16a7c9d2c9491c6127b1d7adc9b071cc6343e6383f0eed78bde342ce52d9570cc56b74595970e48430f08215143ed9642ad6cd";
+      sha512 = "2ebd9d8c516d506fc7454768a71d0ec5fef6e766b285ddc46d97041624df8688eb6aa6cdf5082911c0d338e1293d73f87dd411081c209c4e4ca7f390d61040b5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pa-IN/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pa-IN/thunderbird-52.9.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "98a844a40538224f750934132deac0270fa401afac00cc19352798ba813249408f976809b261419d0b8613a4ebbaf7e8ed2b8669f0d3ffed63916b9e71f1b28d";
+      sha512 = "9a8b43faf81d0e12b0a36af4f3bee1e360c09a8612ceb7df8200763f2e2c8c99a3e73551c4954359dccd9d393ba190f0d18904e59658272f93a8cb8ea6955d44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pl/thunderbird-52.9.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8c7465446cd1cae4d1bbaae69541516765d9388c79e73bb64996fa0154802f5a20f86cd6c1d0f835f7f7b631455d0b5d1ccc1d0d6119705bc5a9f6f06ecce8de";
+      sha512 = "1323658b75438e2e473b34c810aec9094f2933af2c492cdfa0617ab58be5a956226640998241835d5c39868bf5d0a4ce176cd0e9b59e70a519649c858362c769";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-BR/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pt-BR/thunderbird-52.9.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "718b4af9ae8b205f1cdf666b68b851b7c0fd5f0152237f8933dc1ccc843265fe8a869c2656d044ce7b5ef857981c827fc6dee85ff1008921108313bbfe1266a9";
+      sha512 = "669d5583d94692786bb4719d2a6428dcb52733811439636c6aa0f5a18a10804824cb9f158bf45d9f82c8a6317c2950c4da3d1391c6a0096ad13745ba95c5506c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-PT/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/pt-PT/thunderbird-52.9.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3bf4ae15abfc39505f7f846e468baaa70b01e370a05258f31150e778ff67517098e27a9be135ead2f8f53ef96291d8d04a201d6aeb7d56a9e45e211f44246b21";
+      sha512 = "8de8b7bf494cf9ca9132b98c53659e8238db06df60449858cbf53e129eeb7640e26f7134744a031aad428bf1440e5339aef36e45b1a93b6250b130401ad68bf8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/rm/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/rm/thunderbird-52.9.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9214ecc41dd65de573cb21bb9ad56bc53baf8b86261ab41fdddca57173d157cb055f46aa2a087151c0a9b0dca4960914e7afc1095d118754f847dbc952a4a998";
+      sha512 = "de74e4afa564f0caefde8ddac66bfd41fb2ea0be2f03fe7b83cb1abb0fef184391a10d0993c680b56cecd282176e6d499101519a785b8f58e92ef0d0e0edb123";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ro/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ro/thunderbird-52.9.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "aa46ef621604b95cb97b0e9cd4400a5f57aac58f82b3a5225a7828a757a24fa3e03d80839e1c6c03f914632fa6652386fc1787b8879343b06b6a59f9fe08b87c";
+      sha512 = "c4a9305420bc835840a319b334beb4ab45de7e509123b1a5d60466ecf4ed237153caf0d4f4fc75dc277de25bc8d05d017dea730b50cc977d5397a2466d8dfd5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ru/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ru/thunderbird-52.9.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "f07d8fe2b6f81ebd151804d1c0f0a39851bf3ee1e468092a2b0eee5f69438a94872b467840da11aaa7fa5f5604dd86f28ee61c85fe62ae283f844f8aac4ced7d";
+      sha512 = "a16338cfc3d8f6b5dfbbbfd846ace944791bc27414ebd7c9e429fb4131f988cd6fc5d33ef21c1b0b19b7ef15c3aac134dd4566a994f39609429fa35a85c77238";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/si/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/si/thunderbird-52.9.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "8f1b53473fb3e995c499e1583156114557548c1dc8a283a2e8f8c32a90cf2f765b3827455b1abb11272eae3dcd02d39e10b4eb4c2d6cd138f1905cf47bb8c696";
+      sha512 = "f45e41437c28dac8ed5ca9993128973a7ea8026b49147aec2f338722f06e6874bdedd62b08df00e0e7ef66b23d174374852e5d621db5354c78f8d22bb4382bf0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sk/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sk/thunderbird-52.9.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9d40559c28a79375bd70b382b959227be036b00115b8c331d1383eadcc4599099247d76a67880e284e8cf9137bed0271c8edc2b61059ae4d91a540de5f50bec8";
+      sha512 = "cd5ba98037c0429f36a82604cb7f620a41f536fb4941b3f39ec730668ce9c11ff89dbf3aa900dae6541b263ff602372cb9456c6da6c084e4e7f90d883153070e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sl/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sl/thunderbird-52.9.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "9426449a10bcc6ed3f24123fd5452cfcc87bead7014877a05be59d54db77af0833c15614c8c6e42f57005c9b773b1ebb2e59bcd9afd17177160b4010c0d5423a";
+      sha512 = "39a89eb8b69b1ecdb815a95e423487c67ff381a0200af57ec7939be6f10b9c4219df1c0fdecc814d85f1fb60f37b039e283fdc4060cff5a2481dda425d847446";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sq/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sq/thunderbird-52.9.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "a6d914e1df0b240afba8aa5467f5c1e62b48a263e86d32ab5b8e2cf07b8ad747ceeb733e9431f018779f4e1e9f6a9291f29f3e05681727a9b4981ad09a8cba45";
+      sha512 = "d21440caf9fa0c70fcd8f9af1110fdff1dd2674fc0774712e8aec182c3e7521992b64ee079b88a8834afde689abe9f64429ddbcd2935eb07191db2a6bc454e44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sr/thunderbird-52.9.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "f333626201a1445aebeef71926fe3d57f08fb0fbbeb2adf50b30fa75d3c28c4828489675e74a76fe07b0684e2ab949bc13b87ead003b54119efd11b1c7c11cc8";
+      sha512 = "42101562502934485c11324ac63d13a3e0a0ee5044f36b6d5f938197c8932bc4305333744079313f6570c350936d2f79e122a3764dc73d98051dc9fa5805b13e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sv-SE/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/sv-SE/thunderbird-52.9.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5fcc5b4210320f5d571938fddd312493615e829bd6415aeaca2c37ec63db46a1e2d8942e9ce58164c4b8d1d40e88eff0de43861f0e20d796129d9088e624a4ec";
+      sha512 = "0bc5cf65d0d3baecc6b611107b595422dce5c7fda51465545a730b7499bac7419b8b914a9731fb54a3e197bd150d87954c94281a0942d0a1f44b1e39e2312bb8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ta-LK/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/ta-LK/thunderbird-52.9.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "6f48b7b74a11e42fab58436112f8216942dc288e57594e4bd99d951efd8a4f4e2fee668425342635ce1fece60f0fb21027932b4e678a119f38ac45a6f7a89365";
+      sha512 = "c326294f7d0d6b016bdd468b9b24a87f2a874f7773388213f55e9001f4a7b0fe1c21ffaf08efdb9286590308a413b821a61c567e79408d5e9851299b992366c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/tr/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/tr/thunderbird-52.9.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c6a5c01c21e9b07fe1555c9f9148f888c793d4290d9b582cfd2741b895166a6b2407f0ff94de098f136758a816d59a1e6064f38c927574bc175afff168be72a6";
+      sha512 = "2b850e90127c7dff0bc4a937a5a1fcdeee0d855be1cc484713db210d7e1fe6991869841da79dc859e9b01528a3c5186965fdd78b4b21bf14714af09caffa2acc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/uk/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/uk/thunderbird-52.9.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6492260323d1e50a2bc129ba22008d3681283b2931bd6df0d5e5d9087a45294cffc74e711a40994d86d98c1d430f4349ffc4b97d0a1b539c35653c6ed6ea877b";
+      sha512 = "9e249bf0cc84218c5e59a0e4f026650975a49ba1bc49955802d86e348fca437619455e90472a6e75b3489f8a5c13f8dca44567a5b6af4bb709500600ba44be7b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/vi/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/vi/thunderbird-52.9.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d43c675312a30a3e6c02f70e9af921025a6798bb5143864ef7d1bc44e11ad654be66a79590698faa44fd404a4090d6dde37088a26339f3c244e0f1cc4d9042f2";
+      sha512 = "4bfd348a419e59a4c1665c99122e9b8fb9d768b7fead8dc3f5576bcb7d24f915da243f6fb31a233eec07894806807966c07234add2d8a48a6439c488358f1c95";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-CN/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/zh-CN/thunderbird-52.9.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "fe81ec132fbfd17a15f76299853c45306be9f801d2c03a10fa9e4b25ac48e6e14efe4bc4ff2e5f01a94e46b0c1752add48e5277b11dee7d52325bebf5126616f";
+      sha512 = "caefc3ff5cf38dd792daecfb2c6c5c8789ba4f5cf5e965b5e542b7b9605c8c89a2a3d86a330aa497d5984931f9b4daaedf4fc0c8bd9d16c42f2d3fa973ee8967";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-TW/thunderbird-52.8.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.0/linux-i686/zh-TW/thunderbird-52.9.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "96b53b5287e3625b4045588118427fe696827aa25b790665aeacb9096ca9ee8bca8a67bd28f733d128d08541069a1e684819f4ce8a1fd29cf683bce546a04fd5";
+      sha512 = "df930968d97d74ae4ccbbb10e83c65e59254a4669887b5ad5aa303903ad0180a61ad9e7801817d3a6994714004c6391f96ff0335583ed344a8881c9b3baf55a4";
     }
     ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 15d2c58e816c1..43684c897302f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.8.0";
+  version = "52.9.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03";
+    sha512 = "30jv4r8yh270dynqiwlc0yf52f6bka366l48rsppz5nqdb9jvxz04vghhcrp832wrmhd9z6r4b09yb1syhg7n3sl7zsjj2gq1yblhi1";
   };
 
   # New sed no longer tolerates this mistake.
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index d8029f02a6f0b..13f7bce492189 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig
 , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
 , alsaLib, python
 , jackSupport ? false, libjack2 ? null
@@ -126,14 +126,16 @@ let
   };
 
   gitSource = rec {
-    version = "2018-01-12";
+    version = "2018-07-01";
     qtVersion = 5;
 
     # Needs submodules
-    src = fetchgit {
-      url = "https://github.com/mumble-voip/mumble";
-      rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e";
-      sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3";
+    src = fetchFromGitHub {
+      owner = "mumble-voip";
+      repo = "mumble";
+      rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418";
+      sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz";
+      fetchSubmodules = true;
     };
   };
 in {
diff --git a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch
deleted file mode 100644
index d9b994d9b37cc..0000000000000
--- a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Date: Wed, 6 Jun 2018 20:46:38 +0200
-
-This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6.
----
- src/application/mainapplication.cpp |  3 ---
- src/application/mainwindow.cpp      | 11 -----------
- src/application/mainwindow.h        |  2 --
- src/newstabwidget.cpp               |  6 +-----
- src/newstabwidget.h                 |  2 +-
- src/optionsdialog.cpp               |  2 --
- src/webview/webpage.cpp             | 13 +------------
- src/webview/webpage.h               |  3 ---
- 8 files changed, 3 insertions(+), 39 deletions(-)
-
-diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp
-index e93ec9c1..a5913bdf 100644
---- a/src/application/mainapplication.cpp
-+++ b/src/application/mainapplication.cpp
-@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings()
-   settings.beginGroup("ClickToFlash");
-   c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList();
-   c2fEnabled_ = settings.value("enabled", true).toBool();
--#if QT_VERSION >= 0x050900
--  c2fEnabled_ = false;
--#endif
-   settings.endGroup();
- }
- 
-diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp
-index 337a7c4e..42255d2c 100644
---- a/src/application/mainwindow.cpp
-+++ b/src/application/mainwindow.cpp
-@@ -8140,14 +8140,3 @@ void MainWindow::createBackup()
-     QFile::copy(settings.fileName(), backupFileName);
-   }
- }
--
--void MainWindow::webViewFullScreen(bool on)
--{
--  setFullScreen();
--  feedsWidget_->setVisible(!on);
--  pushButtonNull_->setVisible(!on);
--  tabBarWidget_->setVisible(!on);
--  currentNewsTab->newsWidget_->setVisible(!on);
--  pushButtonNull_->setVisible(!on);
--  statusBar()->setVisible(!on);
--}
-diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h
-index 995f96dc..93b75c11 100644
---- a/src/application/mainwindow.h
-+++ b/src/application/mainwindow.h
-@@ -271,8 +271,6 @@ public:
- 
-   AdBlockIcon *adBlockIcon() { return adblockIcon_; }
- 
--  void webViewFullScreen(bool on);
--
- public slots:
-   void restoreFeedsOnStartUp();
-   void addFeed();
-diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp
-index 77d74d3b..c6c130f7 100644
---- a/src/newstabwidget.cpp
-+++ b/src/newstabwidget.cpp
-@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh)
-  *----------------------------------------------------------------------------*/
- void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl)
- {
--  QUrl url = baseUrl;
--#if QT_VERSION >= 0x050900
--  url.setScheme("");
--#endif
-   webView_->history()->setMaximumItemCount(0);
--  webView_->setHtml(html, url);
-+  webView_->setHtml(html, baseUrl);
-   webView_->history()->setMaximumItemCount(100);
- }
- 
-diff --git a/src/newstabwidget.h b/src/newstabwidget.h
-index 7f5c3957..8d1266ac 100644
---- a/src/newstabwidget.h
-+++ b/src/newstabwidget.h
-@@ -127,7 +127,6 @@ public:
-   QToolBar *newsToolBar_;
-   QSplitter *newsTabWidgetSplitter_;
- 
--  QWidget *newsWidget_;
-   WebView *webView_;
-   QToolBar *webToolBar_;
-   LocationBar *locationBar_;
-@@ -199,6 +198,7 @@ private:
- 
-   MainWindow *mainWindow_;
-   QSqlDatabase db_;
-+  QWidget *newsWidget_;
- 
-   FeedsModel *feedsModel_;
-   FeedsProxyModel *feedsProxyModel_;
-diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
-index 73136dec..c082bc30 100644
---- a/src/optionsdialog.cpp
-+++ b/src/optionsdialog.cpp
-@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget()
-   browserWidget_ = new QTabWidget();
-   browserWidget_->addTab(generalBrowserWidget, tr("General"));
-   browserWidget_->addTab(historyBrowserWidget_, tr("History"));
--#if QT_VERSION < 0x050900
-   browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash"));
--#endif
-   browserWidget_->addTab(downloadsWidget, tr("Downloads"));
- }
- 
-diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp
-index 6401ec87..0254a167 100644
---- a/src/webview/webpage.cpp
-+++ b/src/webview/webpage.cpp
-@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent)
-           this, SLOT(downloadRequested(QNetworkRequest)));
-   connect(this, SIGNAL(printRequested(QWebFrame*)),
-           mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*)));
--#if QT_VERSION >= 0x050900
--  connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)),
--          this, SLOT(slotFullScreenRequested(QWebFullScreenRequest)));
--#endif
-+
-   livingPages_.append(this);
- }
- 
-@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects()
-     mainFrame()->scrollToAnchor(mainFrame()->url().fragment());
-   }
- }
--
--#if QT_VERSION >= 0x050900
--void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest)
--{
--  fullScreenRequest.accept();
--  mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn());
--}
--#endif
-diff --git a/src/webview/webpage.h b/src/webview/webpage.h
-index 5c376c50..91e72758 100644
---- a/src/webview/webpage.h
-+++ b/src/webview/webpage.h
-@@ -68,9 +68,6 @@ private slots:
-   void downloadRequested(const QNetworkRequest &request);
-   void cleanBlockedObjects();
-   void urlChanged(const QUrl &url);
--#if QT_VERSION >= 0x050900
--  void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest);
--#endif
- 
- private:
-   NetworkManagerProxy *networkManagerProxy_;
--- 
-2.16.2
-
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 6bd42183d0385..6df0817070c20 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -4,20 +4,15 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.11";
+  version = "0.18.12";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "0n9byhibi2qpgrb7x08knvqnmyn5c7vm24cl6y3zcvz52pz8y2yc";
+    sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
   };
 
-  # Revert this commit until qt5.qtwebkit (currently an older version) from
-  # nixpkgs supports it (the commit states WebKit 602.1 while the current
-  # version in nixos-unstable is 538.1)
-  patches = [ ./0001-Revert-change-WebKit-602.1-c2f.patch ];
-
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
 
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index c03202517747d..962f10a99c01f 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A packet traffic generator and analyzer";
-    homepage    = http://ostinato.org;
+    homepage    = https://ostinato.org;
     license     = licenses.gpl3;
     maintainers = with maintainers; [ rick68 ];
     platforms   = with platforms; linux ++ darwin ++ cygwin;
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
new file mode 100644
index 0000000000000..293c67164835e
--- /dev/null
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, fetchFromGitHub
+, autoconf, automake, mandoc }:
+
+stdenv.mkDerivation rec {
+  name = "owamp-${version}";
+  version = "3.5.6";
+  buildInputs = [ autoconf automake mandoc ];
+  src = fetchFromGitHub {
+    owner = "perfsonar";
+    repo = "owamp";
+    rev = version;
+    sha256="019rcshmrqk8pfp510j5jvazdcnz0igfkwv44mfxb5wirzj9p6s7";
+    fetchSubmodules = true;
+  };
+
+  preConfigure = ''
+    I2util/bootstrap.sh
+    ./bootstrap
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://software.internet2.edu/owamp/;
+    description = ''A tool for performing one-way active measurements'';
+    platforms = platforms.linux;
+    maintainers = [maintainers.teto];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index c6e5d0f3cb31e..ca4014ed31c31 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }:
+{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }:
+
 pythonPackages.buildPythonPackage rec {
   name = "deluge-${version}";
   version = "1.3.15";
@@ -8,6 +9,14 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
   };
 
+  patches = [
+    # Fix preferences when built against libtorrent >=0.16
+    (fetchpatch {
+      url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e";
+      sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d";
+    })
+  ];
+
   propagatedBuildInputs = with pythonPackages; [
     pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity
   ];
@@ -22,7 +31,7 @@ pythonPackages.buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://deluge-torrent.org;
+    homepage = https://deluge-torrent.org;
     description = "Torrent client";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ domenkozar ebzzry ];
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index d634502a03522..01672aa71a809 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.6.7";
+  version = "6.7.0";
   name = "frostwire-${version}";
 
   src = fetchurl {
-    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
-    sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh";
+    url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
+    sha256 = "1qvk4w2ly2nz3ibsd6qdxaqb3g1a3l9f5a15b5zpzhsziln1fbxf";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index 219615abb02a7..53485e95b9a6b 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchurl, fetchpatch, cmake
 , extra-cmake-modules, qtbase, qtscript
 , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
 , kdoctools, kross, kcmutils, kwindowsystem
@@ -22,6 +22,24 @@ stdenv.mkDerivation rec {
     libktorrent taglib libgcrypt kplotting
   ];
 
+  patches = [
+    # Fix build with CMake 3.11
+    (fetchpatch {
+      url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8";
+      sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid";
+    })
+
+    # Fix build against Qt 5.11
+    (fetchpatch {
+      url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8";
+      sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl";
+    })
+    (fetchpatch {
+      url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60";
+      sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 400600751a2e2..c56e39826a663 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.20";
 
   src = fetchurl {
-    url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
+    url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
     sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca";
   };
 
diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix
index c8d54e945bf96..2c257a1294ac5 100644
--- a/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "synapse-bt-unstable-${version}";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1psrmgf6ddzqwx7gf301rx84asfnvxpsvkx2fan453v65819k960";
 
-  buildInputs = [ pkgconfig openssl ];
+  buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   cargoBuildFlags = [ "--all" ];
 
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index d30527ca60939..cce44521a6208 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -13,6 +13,8 @@ let
     };
   };
 
+  boostPython = boost.override { enablePython = true; };
+
 in stdenv.mkDerivation rec {
   name = "twister-${version}";
   version = "0.9.34";
@@ -29,13 +31,13 @@ in stdenv.mkDerivation rec {
     "--disable-deprecated-functions"
     "--enable-tests"
     "--enable-python-binding"
-    "--with-boost-libdir=${boost.out}/lib"
+    "--with-boost-libdir=${boostPython.out}/lib"
   ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     autoconf automake libtool python2
-    boost db openssl geoip miniupnpc libiconv
+    boostPython db openssl geoip miniupnpc libiconv
   ];
 
   patches = stdenv.lib.singleton (fetchpatch {
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index a6858a7b5fdf0..19e85a9711d15 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper
-, cairo, gdk_pixbuf, glib, gnome2, gtk2, pango, xorg
+{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, makeDesktopItem
+, atk, cairo, freetype, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
 , lsb-release }:
 
 let
@@ -13,6 +13,18 @@ let
     "i686-linux"   = "i686";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
+  description = "Desktop sharing application, providing remote support and online meetings";
+
+  desktopItem = makeDesktopItem rec {
+    name = "anydesk";
+    exec = "@out@/bin/anydesk";
+    icon = "anydesk";
+    desktopName = "anydesk";
+    genericName = description;
+    categories = "Application;Network;";
+    startupNotify = "false";
+  };
+
 in stdenv.mkDerivation rec {
   name = "anydesk-${version}";
   version = "2.9.4";
@@ -22,35 +34,43 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  libPath = stdenv.lib.makeLibraryPath ([
-    cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
-    gnome2.gtkglext
+  buildInputs = [
+    atk cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
+    gnome2.gtkglext libGLU_combined
   ] ++ (with xorg; [
-    libxcb libX11 libXdamage libXext libXfixes libXi
+    libxcb libX11 libXdamage libXext libXfixes libXi libXmu
     libXrandr libXtst
-  ]));
+  ]);
 
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/icons/hicolor,share/doc/anydesk}
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor}
     install -m755 anydesk $out/bin/anydesk
     cp changelog copyright README $out/share/doc/anydesk
     cp -r icons/* $out/share/icons/hicolor/
+    cp ${desktopItem}/share/applications/*.desktop $out/share/applications
+
+    runHook postInstall
   '';
 
   postFixup = ''
     patchelf \
       --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "${libPath}" \
+      --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \
       $out/bin/anydesk
 
     wrapProgram $out/bin/anydesk \
       --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}
+
+    substituteInPlace $out/share/applications/*.desktop \
+      --subst-var out
   '';
 
   meta = with stdenv.lib; {
-    description = "Desktop sharing application, providing remote support and online meetings";
+    inherit description;
     homepage = http://www.anydesk.com;
     license = licenses.unfree;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 61dfb434070b9..489de974aaaf6 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , lib
+, fetchurl
 , requireFile
 , makeWrapper
 , libredirect
@@ -23,10 +24,20 @@
 , alsaLib
 , libidn
 , zlib
-, version ? "13.9.0"
+, version ? "13.10.0"
 }:
 
 let
+  # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12.
+  # Citrix looks for the former so we build version 1.34 to please the binary
+  libidn_134 = libidn.overrideDerivation (_: rec {
+    name = "libidn-1.34";
+    src = fetchurl {
+      url = "mirror://gnu/libidn/${name}.tar.gz";
+      sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
+    };
+  });
+
   versionInfo = {
     "13.4.0" = rec {
       major     = "13";
@@ -102,6 +113,17 @@ let
       x86hash   = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483";
       x64suffix = "6";
       x86suffix = "6";
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html;
+    };
+
+    "13.10.0" = {
+      major     = "13";
+      minor     = "10";
+      patch     = "0";
+      x64hash   = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA";
+      x86hash   = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4";
+      x64suffix = "20";
+      x86suffix = "20";
       homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
     };
   };
@@ -160,7 +182,7 @@ let
         xorg.libXinerama
         xorg.libXfixes
         libpng12
-        libidn
+        libidn_134
         zlib
         gtk_engines
         freetype
@@ -209,6 +231,7 @@ let
         find $ICAInstDir -type f -exec file {} \; |
           grep 'ELF.*executable' |
           cut -f 1 -d : |
+          grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729
           while read f
           do
             echo "Patching ELF intrepreter and rpath for $f"
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 6d32036def550..6b0ddb371205b 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
 , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11
 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
 , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
 , libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core
-, openssl, gsettings-desktop-schemas
+, openssl, gsettings-desktop-schemas, json-glib
 # The themes here are soft dependencies; only icons are missing without them.
 , hicolor-icon-theme, adwaita-icon-theme
 }:
 
 let
-  version = "1.2.0-rcgit.24";
+  version = "1.2.30.1";
 
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -25,11 +25,11 @@ let
 in stdenv.mkDerivation {
   name = "remmina-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "FreeRDP";
+  src = fetchFromGitLab {
+    owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg";
+    sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
                   libvncserver libpthreadstubs libXdmcp libxkbcommon
                   libsecret spice-protocol spice-gtk epoxy at-spi2-core
-                  openssl hicolor-icon-theme adwaita-icon-theme ];
+                  openssl hicolor-icon-theme adwaita-icon-theme json-glib ];
 
   cmakeFlags = [
     "-DWITH_VTE=OFF"
@@ -64,9 +64,9 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     license = stdenv.lib.licenses.gpl2;
-    homepage = http://remmina.sourceforge.net/;
+    homepage = https://gitlab.com/Remmina/Remmina;
     description = "Remote desktop client written in GTK+";
-    maintainers = [];
+    maintainers = with maintainers; [ melsigl ryantm ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index a4d2e85a91198..01aaa2219bf38 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -3,18 +3,20 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
-  version = "4.1.1.1";
+  version = "4.1.2.1";
 
   src = fetchurl {
-    url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
+    url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
+    sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh
                   qtbase qtsvg qtx11extras qttools phonon ];
   nativeBuildInputs = [ makeWrapper ];
 
-  patchPhase = ''
+  patches = [ ./qt511.patch ];
+
+  postPatch = ''
      substituteInPlace Makefile \
        --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
        --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch
new file mode 100644
index 0000000000000..8f02cd62277d6
--- /dev/null
+++ b/pkgs/applications/networking/remote/x2goclient/qt511.patch
@@ -0,0 +1,15 @@
+diff --git a/src/printwidget.cpp b/src/printwidget.cpp
+index 58a8af7..131d340 100644
+--- a/src/printwidget.cpp
++++ b/src/printwidget.cpp
+@@ -23,6 +23,7 @@
+ #include "x2gosettings.h"
+ #include "x2gologdebug.h"
+ #include <QDir>
++#include <QButtonGroup>
+ #ifdef Q_OS_WIN
+ #include "wapi.h"
+ #endif
+-- 
+2.17.1
+
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index ed1abfcba99de..3061467c82bd9 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -3,13 +3,13 @@
 let
   xorgxrdp = stdenv.mkDerivation rec {
     name = "xorgxrdp-${version}";
-    version = "0.2.5";
+    version = "0.2.7";
 
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
       rev = "v${version}";
-      sha256 = "05ix0bvbgpg0l0f6pyxp64a4785yv16dxf522y7k84b0rag4bxr7";
+      sha256 = "15idwgcjgwa9in8y1bblpj67y7w0bfngc2sa0hd9hn0dinrlifrk";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -34,7 +34,7 @@ let
   };
 
   xrdp = stdenv.mkDerivation rec {
-    version = "0.9.5";
+    version = "0.9.7";
     name = "xrdp-${version}";
 
     src = fetchFromGitHub {
@@ -42,7 +42,7 @@ let
       repo = "xrdp";
       rev = "refs/heads/runtime-cfg-path-${version}";  # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already
       fetchSubmodules = true;
-      sha256 = "1sm994dic72zvxgwxw9z6an6050976nlnnn2my42pnzj9l5842d8";
+      sha256 = "1dw2zl9zh6win1q0kxj08n9fawpcrs1krjh5978wp0jmq8sdbn7k";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 279dc508225b0..ea0a756e76d10 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.1.8";
+  version = "6.2.2";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "0gy7jfxr5f8qvbqj80g7fzaw9b3vax750c4z5cr7f43rv99284pc";
+    sha256 = "19204fqi4x4q7hsc500y6gj0qdfzf4kjgfsr808w13qnh1lxhvr4";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
index 9c27139c66d2a..81c48cff4a012 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade,
-libgnomecanvas, popt, itstool }:
+{ stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2,
+popt, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.17";
+  name = "etherape-0.9.18";
   src = fetchurl {
     url = "mirror://sourceforge/etherape/${name}.tar.gz";
-    sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6";
+    sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv";
   };
 
-  nativeBuildInputs = [ itstool pkgconfig ];
+  nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ];
   buildInputs = [
-    libtool gtk2 libpcap libglade libgnomecanvas popt
+    libtool gtk3 libpcap goocanvas2 popt
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 803e35307fe9a..0c793c41c55a2 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2016-07-R1";
 
   src = fetchurl {
-    url = "http://www.kismetwireless.net/code/${name}.tar.xz";
+    url = "https://www.kismetwireless.net/code/${name}.tar.xz";
     sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx";
   };
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index f3afeced8f65e..ef1dade4dddd5 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,15 +12,15 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.4.7";
+  version = "2.6.1";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
   name = "wireshark-${variant}-${version}";
 
   src = fetchurl {
-    url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy";
+    url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
+    sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb";
   };
 
   cmakeFlags = [
@@ -52,6 +52,10 @@ in stdenv.mkDerivation {
     })
     ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch;
 
+  preBuild = ''
+    export LD_LIBRARY_PATH="$PWD/run"
+  '';
+
   postInstall = if stdenv.isDarwin then ''
     ${optionalString withQt ''
       mkdir -p $out/Applications
@@ -72,6 +76,8 @@ in stdenv.mkDerivation {
     ''}
     ${optionalString withQt ''
       install -Dm644 -t $out/share/applications ../wireshark.desktop
+      wrapProgram $out/bin/wireshark \
+        --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
     ''}
 
     substituteInPlace $out/share/applications/*.desktop \
diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix
new file mode 100644
index 0000000000000..93ab6c56d99d0
--- /dev/null
+++ b/pkgs/applications/networking/soapui/default.nix
@@ -0,0 +1,51 @@
+{ fetchurl, stdenv, writeText, jdk, maven, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "soapui-${version}";
+  version = "5.4.0";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz";
+    sha256 = "1yqx1fsh8mr5zf36df7pi25dysb28gfscr1667jzd5s0k9jl42xd";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ jdk maven ];
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp -R bin lib $out/share/java
+
+    makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java
+  '';
+
+  patches = [
+    (writeText "soapui-${version}.patch" ''
+      --- a/bin/soapui.sh
+      +++ b/bin/soapui.sh
+      @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/*
+       export SOAPUI_CLASSPATH
+
+       JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png"
+      -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator`
+      +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator`
+       SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH
+
+       if $darwin
+      @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME
+       echo =
+       echo ================================
+
+      -java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
+      +${jdk}/bin/java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
+    '')
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The Most Advanced REST & SOAP Testing Tool in the World";
+    homepage = https://www.soapui.org/;
+    license = "SoapUI End User License Agreement";
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
new file mode 100644
index 0000000000000..1f8d0cba6d053
--- /dev/null
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -0,0 +1,106 @@
+{ stdenv, fetchurl, lib, makeWrapper,
+  # build dependencies
+  alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
+  freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
+  glibc, systemd
+}:
+
+stdenv.mkDerivation rec {
+
+  version = "2.12.0";
+
+  name = "patchwork-classic-${version}";
+
+  src = fetchurl {
+    url    = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb";
+    sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj";
+  };
+
+  sourceRoot = ".";
+
+  unpackCmd = ''
+    ar p "$src" data.tar.xz | tar xJ
+  '';
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R usr/share opt $out/
+
+    # fix the path in the desktop file
+    substituteInPlace \
+      $out/share/applications/ssb-patchwork-electron.desktop \
+      --replace /opt/ $out/opt/
+
+    # symlink the binary to bin/
+    ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic
+  '';
+
+
+  preFixup = let
+    packages = [
+      alsaLib
+      atk
+      cairo
+      cups
+      dbus
+      expat
+      fontconfig
+      freetype
+      gdk_pixbuf
+      glib
+      gnome2.GConf
+      gnome2.gtk
+      gnome2.pango
+      nspr
+      nss
+      xorg.libX11
+      xorg.libXScrnSaver
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
+      stdenv.cc.cc.lib
+      stdenv.cc.cc
+      glibc
+    ];
+    libPathNative = lib.makeLibraryPath packages;
+    libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+    libPath = "${libPathNative}:${libPath64}";
+  in ''
+    # patch executable
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \
+      $out/opt/ssb-patchwork-electron/ssb-patchwork-electron
+
+    # patch libnode
+    patchelf \
+      --set-rpath "${libPath}" \
+      $out/opt/ssb-patchwork-electron/libnode.so
+
+    # libffmpeg is for some reason  not executable
+    chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so
+
+    # fix missing libudev
+    ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1
+    wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \
+      --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser";
+    homepage    = "https://github.com/ssbc/patchwork-classic-electron";
+    license     = licenses.gpl3; 
+    maintainers = with maintainers; [ mrVanDalo ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
new file mode 100644
index 0000000000000..7c613a8a45a9b
--- /dev/null
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -0,0 +1,105 @@
+{ stdenv, fetchurl, dpkg, makeWrapper
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
+, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
+, systemd, wget, xorg, xprintidle-ng }:
+
+let
+
+  version = "1.10.45";
+
+  rpath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+    gnome3.gconf
+    gdk_pixbuf
+    gtk3
+    pango
+    libnotify
+    libxcb
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity_${version}_amd64.deb";
+        sha256 = "0jfi0lfijnhij9jvkhxgyvq8m1jzaym8n1c7707fv3hjh1h0vxn1";
+      }
+    else
+      throw "super-productivity is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+  name = "super-productivity-${version}";
+
+  inherit src;
+
+  buildInputs = [
+    dpkg
+    gtk3  # needed for GSETTINGS_SCHEMAS_PATH
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  unpackPhase = "dpkg -x $src .";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+
+    cp -R usr/share $out/share
+    cp -R opt $out/libexec
+
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+
+    # set linker and rpath
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/libexec/superProductivity/superproductivity"
+    patchelf --set-rpath ${rpath}:$out/libexec/superProductivity "$out/libexec/superProductivity/superproductivity"
+
+    # wrapper for xdg_data_dirs and xprintidle path
+    makeWrapper $out/libexec/superProductivity/superproductivity $out/bin/superproductivity \
+      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+      --prefix PATH : "${xprintidle-ng}/bin"
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/superproductivity.desktop \
+      --replace /opt/superProductivity/ $out/bin/
+
+    runHook postInstall
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "To Do List / Time Tracker with Jira Integration.";
+    homepage = http://super-productivity.com;
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ offline ];
+  };
+}
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
new file mode 100644
index 0000000000000..82dd3a506dee8
--- /dev/null
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, fetchpatch
+, meson, ninja, pkgconfig, sphinx
+, acl, curl, fuse, libselinux, udev, xz, zstd
+, fuseSupport ? true
+, selinuxSupport ? true
+, udevSupport ? true
+, glibcLocales, rsync
+}:
+
+stdenv.mkDerivation rec {
+  name = "casync-${version}";
+  version = "2-152-ge4a3c5e";
+
+  src = fetchFromGitHub {
+    owner  = "systemd";
+    repo   = "casync";
+    rev    = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9";
+    sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0";
+  };
+
+  buildInputs = [ acl curl xz zstd ]
+                ++ stdenv.lib.optionals (fuseSupport) [ fuse ]
+                ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ]
+                ++ stdenv.lib.optionals (udevSupport) [ udev ];
+  nativeBuildInputs = [ meson ninja pkgconfig sphinx ];
+  checkInputs = [ glibcLocales rsync ];
+
+  postPatch = ''
+    for f in test/test-*.sh.in; do
+      patchShebangs $f
+    done
+    patchShebangs test/http-server.py
+  '';
+
+  PKG_CONFIG_UDEV_UDEVDIR = "lib/udev";
+  mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ]
+               ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ]
+               ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
+
+  doCheck = true;
+  preCheck = ''
+    export LC_ALL="en_US.utf-8"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Content-Addressable Data Synchronizer";
+    homepage    = https://github.com/systemd/casync;
+    license     = licenses.lgpl21;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 405ff2fde7358..337c166a79ac4 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.41";
+  version = "1.42";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr";
+    sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj";
   };
 
   outputs = [ "bin" "out" "man" ];
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";
-    homepage = http://rclone.org;
+    homepage = https://rclone.org;
     license = licenses.mit;
     maintainers = with maintainers; [ danielfullmer ];
     platforms = platforms.all;
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 4eecf7f4a1f8c..07444fbb9fe95 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -2,26 +2,21 @@
 
 python2Packages.buildPythonApplication rec {
   name = "syncplay-${version}";
-  version = "1.5.3";
+  version = "1.5.5";
 
   format = "other";
 
   src = fetchurl {
-    url = https://github.com/Syncplay/syncplay/archive/v1.5.3.tar.gz;
-    sha256 = "1yk0aajskhk6czpjshf9a9pzp3rafh5cgdcyyz8pwpk4ca9zyzfv";
+    url = https://github.com/Syncplay/syncplay/archive/v1.5.5.tar.gz;
+    sha256 = "0g12hm84c48fjrmwljl0ii62f55vm6fk2mv8vna7fadabmk6dwhr";
   };
 
   propagatedBuildInputs = with python2Packages; [ pyside twisted ];
 
-  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
-
-  postInstall = ''
-    mkdir -p $out/lib/python2.7/site-packages
-    mv $out/lib/syncplay/syncplay $out/lib/python2.7/site-packages/
-  '';
+  makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = http://syncplay.pl/;
+    homepage = https://syncplay.pl/;
     description = "Free software that synchronises media players";
     license = licenses.asl20;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 4db546651dd95..9d720bee05e7a 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
+{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
+, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
+, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
+, bcrypt, gobjectIntrospection }:
 
 buildPythonApplication rec {
-  version = "0.9.3.1";
+  version = "0.9.4";
   name = "syncthing-gtk-${version}";
 
   src = fetchFromGitHub {
     owner = "syncthing";
     repo = "syncthing-gtk";
     rev = "v${version}";
-    sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb";
+    sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9";
   };
 
   nativeBuildInputs = [
@@ -29,14 +32,19 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    ./disable-syncthing-binary-configuration.patch
+    (fetchpatch {
+      url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch;
+      sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7";
+    })
     (substituteAll {
       src = ./paths.patch;
-      killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall";
+      killall = "${killall}/bin/killall";
       syncthing = "${syncthing}/bin/syncthing";
     })
   ];
 
+  setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ];
+
   postPatch = ''
     substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
     substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
@@ -48,9 +56,9 @@ buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "GTK3 & python based GUI for Syncthing";
-    maintainers = with maintainers; [ ];
-    platforms = syncthing.meta.platforms;
     homepage = https://github.com/syncthing/syncthing-gtk;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
+    platforms = syncthing.meta.platforms;
   };
 }
diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
deleted file mode 100644
index 14c2b62e6e387..0000000000000
--- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/glade/find-daemon.glade
-+++ b/glade/find-daemon.glade
-@@ -112,6 +112,7 @@
-                   <object class="GtkEntry" id="vsyncthing_binary">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="margin_right">20</property>
-                     <signal name="changed" handler="cb_check_value" swapped="no"/>
-                   </object>
-@@ -126,6 +127,7 @@
-                     <property name="label" translatable="yes">_Browse...</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="receives_default">True</property>
-                     <property name="use_underline">True</property>
-                     <property name="yalign">0.51999998092651367</property>
---- a/glade/ui-settings.glade
-+++ b/glade/ui-settings.glade
-@@ -943,6 +943,7 @@
-                     <property name="label" translatable="yes">_Browse...</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="receives_default">True</property>
-                     <property name="use_underline">True</property>
-                     <property name="yalign">0.51999998092651367</property>
-@@ -974,6 +975,7 @@
-                   <object class="GtkEntry" id="vsyncthing_binary">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="hexpand">True</property>
-                     <signal name="changed" handler="cb_check_value" swapped="no"/>
-                   </object>
---- a/syncthing_gtk/configuration.py
-+++ b/syncthing_gtk/configuration.py
-@@ -168,6 +168,8 @@
- 			yield k
- 	
- 	def get(self, key):
-+		if key == "syncthing_binary":
-+			return self.REQUIRED_KEYS[key][1]
- 		return self.values[key]
- 	
- 	def set(self, key, value):
---- a/syncthing_gtk/finddaemondialog.py
-+++ b/syncthing_gtk/finddaemondialog.py
-@@ -163,7 +163,7 @@
- 		self["lblDownloadProgress"].set_markup(_("Download failed."))
- 		self["btDownload"].set_visible(True)
- 		self["pbDownload"].set_visible(False)
--		self["vsyncthing_binary"].set_sensitive(True)
-+		self["vsyncthing_binary"].set_sensitive(False)
- 		self["btBrowse"].set_sensitive(True)
- 		self["btSave"].set_sensitive(True)
- 	
-@@ -179,7 +179,7 @@
- 	
- 	def cb_extract_finished(self, downloader, *a):
- 		""" Called after extraction is finished """
--		self["vsyncthing_binary"].set_sensitive(True)
-+		self["vsyncthing_binary"].set_sensitive(False)
- 		self["btBrowse"].set_sensitive(True)
- 		self["vsyncthing_binary"].set_text(downloader.get_target())
- 		self["lblDownloadProgress"].set_markup("<b>" + _("Download finished.") + "</b>")
---- a/syncthing_gtk/wizard.py
-+++ b/syncthing_gtk/wizard.py
-@@ -60,7 +60,6 @@
- 		self.quit_button.connect("clicked", lambda *a : self.emit("cancel"))
- 		# Pages
- 		self.add_page(IntroPage(self))
--		self.add_page(FindDaemonPage())
- 		self.add_page(GenerateKeysPage())
- 		self.add_page(HttpSettingsPage())
- 		self.add_page(SaveSettingsPage())
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index e38ba36b9253c..d689b17fe3256 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp";
-    url = "http://humdi.net/vnstat/${name}.tar.gz";
+    url = "https://humdi.net/vnstat/${name}.tar.gz";
   };
 
   buildInputs = [ gd ncurses ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       This means that vnStat won't actually be sniffing any traffic and also
       ensures light use of system resources.
     '';
-    homepage = http://humdi.net/vnstat/;
+    homepage = https://humdi.net/vnstat/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index d1b333587a687..b78c0ad09c3da 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "1.7.0";
 
   src = fetchurl {
-    url = "http://znc.in/releases/archive/${name}.tar.gz";
+    url = "https://znc.in/releases/archive/${name}.tar.gz";
     sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Advanced IRC bouncer";
-    homepage = http://wiki.znc.in/ZNC;
+    homepage = https://wiki.znc.in/ZNC;
     maintainers = with maintainers; [ viric schneefux lnl7 ];
     license = licenses.asl20;
     platforms = platforms.unix;
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
new file mode 100644
index 0000000000000..fdff39e27f90f
--- /dev/null
+++ b/pkgs/applications/office/autokey/default.nix
@@ -0,0 +1,38 @@
+{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection
+, gtksourceview, gnome3, libappindicator-gtk3, libnotify }:
+
+python3Packages.buildPythonApplication rec {
+  name = "autokey-${version}";
+  version = "0.94.1";
+
+  src = fetchFromGitHub {
+    owner = "autokey";
+    repo = "autokey";
+    rev = "v${version}";
+    sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr";
+  };
+
+  # Arch requires a similar work around—see
+  # https://aur.archlinux.org/packages/autokey-py3/?comments=all
+  patches = [ ./remove-requires-dbus-python.patch ];
+
+  # Tests appear to be broken with import errors within the project structure
+  doCheck = false;
+
+  # Note: no dependencies included for Qt GUI because Qt ui is poorly
+  # maintained—see https://github.com/autokey/autokey/issues/51
+
+  buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview
+    libappindicator-gtk3 libnotify ];
+
+  propagatedBuildInputs = with python3Packages; [
+    dbus-python pyinotify xlib pygobject3 ];
+
+  meta = {
+    homepage = https://github.com/autokey/autokey;
+    description = "Desktop automation utility for Linux and X11";
+    license = with lib.licenses; [ gpl3 ];
+    maintainers = with lib.maintainers; [ pneumaticat ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch
new file mode 100644
index 0000000000000..73372e435291f
--- /dev/null
+++ b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -71,7 +71,7 @@
+         'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main']
+     },
+     scripts=['autokey-qt', 'autokey-run', 'autokey-shell'],
+-    install_requires=['dbus-python', 'pyinotify', 'python3-xlib'],
++    install_requires=['pyinotify', 'python-xlib'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Intended Audience :: Developers',
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 01014e6687cb1..80046ecb2cd51 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -23,6 +23,8 @@ mkDerivation rec {
     sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
   };
 
+  patches = [ ./qt5_11.patch ];
+
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch
new file mode 100644
index 0000000000000..66ff8c6eedcd5
--- /dev/null
+++ b/pkgs/applications/office/calligra/qt5_11.patch
@@ -0,0 +1,98 @@
+diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
+index 0ffdcf6..cdca006 100644
+--- a/libs/widgets/KoCsvImportDialog.cpp
++++ b/libs/widgets/KoCsvImportDialog.cpp
+@@ -21,6 +21,7 @@
+ #include "KoCsvImportDialog.h"
+ 
+ // Qt
++#include <QButtonGroup>
+ #include <QTextCodec>
+ #include <QTextStream>
+ 
+diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
+index f91555c..a3816f9 100644
+--- a/libs/widgets/KoPageLayoutWidget.cpp
++++ b/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+ 
+ #include <KoUnit.h>
+ 
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+index c0d5136..d2a772e 100644
+--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+@@ -24,6 +24,7 @@
+ 
+ // Qt
+ #include <QAbstractItemModel>
++#include <QAction>
+ 
+ // Calligra
+ #include <KoIcon.h>
+diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
+index ed10919..8f52177 100644
+--- a/plugins/formulashape/FormulaToolWidget.cpp
++++ b/plugins/formulashape/FormulaToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <QWidgetAction>
+ #include <QTableWidget>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+ 
+ FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
+diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
+index a0a9832..7d7db53 100644
+--- a/sheets/dialogs/LayoutDialog.cpp
++++ b/sheets/dialogs/LayoutDialog.cpp
+@@ -36,6 +36,7 @@
+ #include <math.h>
+ 
+ #include <QIntValidator>
++#include <QButtonGroup>
+ #include <QCheckBox>
+ #include <QFrame>
+ #include <QLabel>
+diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
+index d64208c..bfddb3a 100644
+--- a/words/part/dialogs/KWAnchoringProperties.cpp
++++ b/words/part/dialogs/KWAnchoringProperties.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include <kundo2command.h>
+ 
++#include <QButtonGroup>
+ #include <QComboBox>
+ 
+ const int KWAnchoringProperties::vertRels[4][20] = {
+diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
+index e38599a..7e8b2d5 100644
+--- a/words/part/dialogs/KWRunAroundProperties.cpp
++++ b/words/part/dialogs/KWRunAroundProperties.cpp
+@@ -28,6 +28,8 @@
+ 
+ #include <kundo2command.h>
+ 
++#include <QButtonGroup>
++
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
+         : m_state(state)
+ {
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
+index ae743da..3007f91 100644
+--- a/stage/part/KPrPresentationTool.cpp
++++ b/stage/part/KPrPresentationTool.cpp
+@@ -32,6 +32,7 @@
+ #include <QDesktopServices>
+ #include <QUrl>
+ #include <QDBusConnection>
++#include <QFrame>
+ 
+ #include <KoShape.h>
+ #include <KoShapeManager.h>
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index 813608a386a4c..1dd095e577e8d 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "cb2bib";
   version = "1.9.7";
   src = fetchurl {
-    url = "http://www.molspaces.com/dl/progs/${name}.tar.gz";
+    url = "https://www.molspaces.com/dl/progs/${name}.tar.gz";
     sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s";
   };
   buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 9c8f39d52f1d3..29ea9ff2910fb 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -6,7 +6,6 @@ in
 buildPythonApplication rec {
   pname = "fava";
   version = "1.7";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -26,4 +25,3 @@ buildPythonApplication rec {
     maintainers = with stdenv.lib.maintainers; [ ];
   };
 }
-
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index d12b1327e8f7a..63fda1e0e8be2 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gnucash-${version}";
-  version = "3.1-1";
+  version = "3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0qfjpmr6hnr0v7l2fi00rilnlyan4kqiyygyidxlpdxqqg76dvx1";
+    sha256 = "0li4b6pvlahgh5n9v91yxfgm972a1kky80xw3q1ggl4f2h6b1rb3";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
@@ -37,8 +37,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
     webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi
-    libdbiDrivers guile perlWrapper
-  ];
+    libdbiDrivers guile
+    perlWrapper perl
+  ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
 
   propagatedUserEnvPkgs = [ dconf ];
 
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gnucash" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
       --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
+      --prefix PERL5LIB ":" "$PERL5LIB" \
       --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
   '';
 
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 62dcf5dd8a880..7c07082b3041e 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "grisbi-${version}";
-  version = "1.0.2";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
-    sha256 = "1m31a1h4i59z36ri4a22rrd29byg6wnxq37559042hdhn557kazm";
+    sha256 = "1rh2iqvi7lpz5l57vn7qk9azil3y1g65mfbi9hhbx956knh9bpf6";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 212aaa5fa2c4d..7899bf607e546 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,4 +1,5 @@
 { stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools
+, fetchpatch
 
 , akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive
 , kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement
@@ -20,6 +21,13 @@ stdenv.mkDerivation rec {
     sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx";
   };
 
+  # Fix build with Qt 5.11.
+  patches = lib.singleton (fetchpatch {
+    url = "https://cgit.kde.org/kmymoney.git/patch/?id="
+        + "e5198a902996b27bf9abde0ad24af82d55ab5dc1";
+    sha256 = "1h2f1xznf7343s26fh94x8n2ci0pijk5j86f24lvghawsw848316";
+  });
+
   # Hidden dependency that wasn't included in CMakeLists.txt:
   NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
 
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 9675293cfe579..387a71aa04ee0 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [ boost gmp mpfr libedit python texinfo gnused ];
+  buildInputs = [
+    (boost.override { enablePython = usePython; })
+    gmp mpfr libedit python texinfo gnused
+  ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 436558283e056..87fe343613e54 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,7 +3,7 @@
 rec {
   major = "6";
   minor = "0";
-  patch = "3";
+  patch = "5";
   tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j";
+    sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c8897c87bd3ce..e3ff0b594b4ef 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -12,7 +12,7 @@
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
+, defaultIconTheme, glib, ncurses, epoxy, gpgme
 , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
 , withHelp ? true
 , kdeIntegration ? false
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la";
+      sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686";
+      sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9";
     };
 
   };
@@ -241,6 +241,7 @@ in stdenv.mkDerivation rec {
     "--without-system-mdds"
     # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
+    "--without-system-xmlsec"
   ];
 
   checkPhase = ''
@@ -261,12 +262,11 @@ in stdenv.mkDerivation rec {
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw libzmf libtool
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
-      librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
+      librevenge libe-book libmwaw glm glew ncurses epoxy
       libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
-      gdb
     ]
     ++ lib.optional kdeIntegration kdelibs4;
-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gdb ];
 
   passthru = {
     inherit srcs jdk;
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index e82fa241c00c9..36500166dccfd 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -581,11 +581,11 @@
     md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
   }
   {
-    name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
-    url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
-    sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34";
-    md5 = "a084cd548b586552cb7d3ee51f1af969";
-    md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
+    name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
+    url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
+    sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769";
+    md5 = "";
+    md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
   }
   {
     name = "officeotron-0.7.4-master.jar";
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 251aa44a2c580..66d1baed2dae9 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -105,11 +105,11 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.58.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz";
-    sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115";
+    name = "curl-7.60.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz";
+    sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5";
     md5 = "";
-    md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz";
+    md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz";
   }
   {
     name = "libe-book-0.1.3.tar.xz";
@@ -455,11 +455,11 @@
     md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
   }
   {
-    name = "language-subtag-registry-2017-12-14.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
-    sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
+    name = "language-subtag-registry-2018-03-30.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
+    sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
     md5 = "";
-    md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
+    md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
@@ -623,11 +623,11 @@
     md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
   }
   {
-    name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
-    url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
-    sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf";
+    name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
+    url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
+    sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769";
     md5 = "";
-    md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
+    md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
   }
   {
     name = "officeotron-0.7.4-master.jar";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index b1aa10800d6fe..22216af3723c4 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -3,7 +3,7 @@
 rec {
   major = "5";
   minor = "4";
-  patch = "6";
+  patch = "7";
   tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i";
+    sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 52baed720c5fc..dbfeb0f2fe867 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -12,7 +12,7 @@
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme
+, defaultIconTheme, glib, ncurses, epoxy, gpgme
 , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
 , withHelp ? true
 , kdeIntegration ? false
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc";
+      sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc";
+      sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl";
     };
 
   };
@@ -238,6 +238,7 @@ in stdenv.mkDerivation rec {
     "--without-system-libstaroffice"
     # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
+    "--without-system-xmlsec"
   ];
 
   checkPhase = ''
@@ -258,12 +259,11 @@ in stdenv.mkDerivation rec {
       python3 sablotron sane-backends unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw libzmf libtool
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme
-      librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
+      librevenge libe-book libmwaw glm glew ncurses epoxy
       libodfgen CoinMP librdf_rasqal defaultIconTheme
-      gdb
     ]
     ++ lib.optional kdeIntegration kdelibs4;
-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gdb ];
 
   passthru = {
     inherit srcs jdk;
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 7f6d93a11ae23..6ff0cf1dfd052 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marp-${version}";
-  version = "0.0.12";
+  version = "0.0.13";
 
   src = fetchurl {
     url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
-    sha256 = "0pljjkis9vb819d0akqmqnyakwgnvc3qqyg20yr13xms9a5iqv32";
+    sha256 = "1120mbw4mf7v4qfmss3121gkgp5pn31alk9cssxbrmdcsdkaq5ld";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 15a57ba9de4b2..cf40392c6dd93 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -42,14 +42,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.18-stable";
+  shortVersion = "1.19.1-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "046v1j4sc6m0bf89f52zsg8riygrhldplyih5p0cjhcsd45q6fx8"
-    else "072fppgxhiryb6m1fb4qvq8nbblx88xpknnklygch1sw0lyks69h";
+    then "0fcyl5i8xdgb5j0x1643qc0j74d8p11jczvqmgqkqh0wgid1y1ad"
+    else "1dzwa2cnn9xakrhhq159fhh71gw5wlbf017rrikdlia694m8akq6";
 
   deps = [
     qtbase
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index b752f552ba97d..c94d79a0ced79 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmake, qtsvg }:
 
 let
-  version = "1.42.2";
+  version = "1.43.27";
 in stdenv.mkDerivation rec {
   name = "mytetra-${version}";
   src = fetchurl {
     url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
-    sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
+    sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h";
   };
 
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index b5475ae337a3a..20f8b428f0db4 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify
-, libarchive, gtkspell3, webkitgtk, libgringotts, wrapGAppsHook }:
+, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "osmo-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
   buildInputs = [ gtk3 libxml2 libical libnotify libarchive
-    gtkspell3 webkitgtk libgringotts ];
+    gspell webkitgtk libgringotts ];
 
   meta = with stdenv.lib; {
     description = "A handy personal organizer";
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index a6f0bccec96b5..ac1bf18e99995 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
     description = "Desktop Publishing (DTP) and Layout program for Linux";
-    homepage = http://www.scribus.net;
+    homepage = https://www.scribus.net;
     license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 2f9999ab856c7..b070958b756bf 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -34,6 +34,7 @@ fhsEnv = buildFHSUserEnv {
   targetPkgs = pkgs: with pkgs; with xorg; [
     gtk3 dbus-glib
     libXt nss
+    libX11
   ];
 };
 
diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/applications/science/astronomy/gildas/clang.patch
new file mode 100644
index 0000000000000..4d6654a99aee1
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/clang.patch
@@ -0,0 +1,22 @@
+diff -ruN gildas-src-jun18a/admin/define-system.sh gildas-src-jun18a.clang/admin/define-system.sh
+--- gildas-src-jun18a/admin/define-system.sh	2018-03-12 11:07:57.000000000 +0100
++++ gildas-src-jun18a.clang/admin/define-system.sh	2018-06-12 14:56:14.000000000 +0200
+@@ -218,13 +218,13 @@
+         	else
+         	    GAG_MACHINE=pc
+         	fi
+-                if which gcc > /dev/null 2>&1; then
+-                    DEFAULT_CCOMPILER=gcc
++                if which clang > /dev/null 2>&1; then
++                    DEFAULT_CCOMPILER=clang
+                 fi
+-                if which g++ > /dev/null 2>&1; then
+-                    DEFAULT_CXXCOMPILER=g++
+-                elif which clang++ > /dev/null 2>&1; then
++                if which clang++ > /dev/null 2>&1; then
+                     DEFAULT_CXXCOMPILER=clang++
++                elif which g++ > /dev/null 2>&1; then
++                    DEFAULT_CXXCOMPILER=g++
+                 fi
+         	if which ifort > /dev/null 2>&1; then
+         	    DEFAULT_FCOMPILER=ifort
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
new file mode 100644
index 0000000000000..bd4587bf22768
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif
+, cfitsio , getopt , perl , groff , which
+}:
+
+let
+  python27Env = python27.withPackages(ps: with ps; [ numpy ]);
+in
+
+stdenv.mkDerivation rec {
+  srcVersion = "jun18a";
+  version = "20180601_a";
+  name = "gildas-${version}";
+
+  src = fetchurl {
+    url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
+    sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
+
+  buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
+
+  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ];
+
+  configurePhase=''
+    substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
+    substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env}
+    source admin/gildas-env.sh -c gfortran -o openmp
+    echo "gag_doc:        $out/share/doc/" >> kernel/etc/gag.dico.lcl
+  '';
+
+  buildPhase=''
+    make depend
+    make
+  '';
+
+  postInstall=''
+    mkdir -p $out/bin
+    cp -a ../gildas-exe-${srcVersion}/* $out
+    mv $out/$GAG_EXEC_SYSTEM $out/libexec
+    cp admin/wrapper.sh $out/bin/gildas-wrapper.sh
+    chmod 755 $out/bin/gildas-wrapper.sh
+    for i in $out/libexec/bin/* ; do
+      ln -s $out/bin/gildas-wrapper.sh $out/bin/$(basename "$i")
+    done
+  '';
+
+  meta = {
+    description = "Radioastronomy data analysis software";
+    longDescription = ''
+      GILDAS is a collection of state-of-the-art software
+      oriented toward (sub-)millimeter radioastronomical
+      applications (either single-dish or interferometer).
+      It is daily used to reduce all data acquired with the
+      IRAM 30M telescope and Plateau de Bure Interferometer
+      PDBI (except VLBI observations). GILDAS is easily
+      extensible. GILDAS is written in Fortran-90, with a
+      few parts in C/C++ (mainly keyboard interaction,
+      plotting, widgets).'';
+    homepage = http://www.iram.fr/IRAMFR/GILDAS/gildas.html;
+    license = stdenv.lib.licenses.free;
+    maintainers = [ stdenv.lib.maintainers.bzizou stdenv.lib.maintainers.smaret ];
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/applications/science/astronomy/gildas/return-error-code.patch b/pkgs/applications/science/astronomy/gildas/return-error-code.patch
new file mode 100644
index 0000000000000..f0bd7da9354e9
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/return-error-code.patch
@@ -0,0 +1,13 @@
+diff --new-file -r -u gildas-src-dec17a.orig/admin/gildas-env.sh gildas-src-dec17a/admin/gildas-env.sh
+--- gildas-src-dec17a.orig/admin/gildas-env.sh	2017-10-24 11:39:18.000000000 +0200
++++ gildas-src-dec17a/admin/gildas-env.sh	2017-12-01 11:17:32.051953670 +0100
+@@ -1010,6 +1010,9 @@
+     gagenv_message "$gagenv_errors error(s) and $gagenv_warnings warning(s) detected"
+     if [ $gagenv_errors -ne 0 ]; then
+         gagenv_message "GILDAS will not compile"
++	gagenv_clean
++        echo
++        \return 1
+     elif [ $gagenv_warnings -ne 0 ]; then
+         gagenv_message "GILDAS will compile with some optional features disabled"
+     else
diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/applications/science/astronomy/gildas/wrapper.patch
new file mode 100644
index 0000000000000..2e470a1e9cdca
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/wrapper.patch
@@ -0,0 +1,19 @@
+diff --new-file -r -u gildas-src-feb17d.orig/admin/wrapper.sh gildas-src-feb17d/admin/wrapper.sh
+--- gildas-src-feb17d.orig/admin/wrapper.sh	1970-01-01 01:00:00.000000000 +0100
++++ gildas-src-feb17d/admin/wrapper.sh	2017-05-18 21:00:01.660778782 +0200
+@@ -0,0 +1,15 @@
++#!/bin/sh -e
++
++export GAG_ROOT_DIR="%%OUT%%"
++export GAG_PATH="${GAG_ROOT_DIR}/etc"
++export GAG_EXEC_SYSTEM="libexec"
++export PYTHONHOME="%%PYTHONHOME%%"
++if [ -z "\$PYTHONPATH" ]; then
++  PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
++else
++  PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python:${PYTHONPATH}"
++fi
++export PYTHONPATH
++export LD_LIBRARY_PATH=${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/lib/
++me=`basename $0`
++exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/${me} ${*}
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index d572dd55b2b20..03d0018f237b5 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "gravit-0.5.1";
 
   src = fetchurl {
-    url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
+    url = "https://gravit.slowchop.com/media/downloads/${name}.tgz";
     sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://gravit.slowchop.com;
+    homepage = https://gravit.slowchop.com;
     description = "Beautiful OpenGL-based gravity simulator";
     license = stdenv.lib.licenses.gpl2;
 
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.mesaPlatforms;
+    hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
   };
 }
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 3c7af809b884a..111608126718b 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,25 +1,32 @@
-{ mkDerivation, lib, fetchurl
+{ mkDerivation, lib, fetchFromGitHub
 , cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv
 , qtscript, qtserialport, qttools
-, qtmultimedia, qtlocation
+, qtmultimedia, qtlocation, makeWrapper, qtbase
 }:
 
 mkDerivation rec {
   name = "stellarium-${version}";
-  version = "0.16.1";
+  version = "0.18.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "087x6mbcn2yj8d3qi382vfkzgdwmanxzqi5l1x3iranxmx9c40dh";
+  src = fetchFromGitHub {
+    owner = "Stellarium";
+    repo = "stellarium";
+    rev = "v${version}";
+    sha256 = "0srwi08azzzayf50dr4dr1zcdcc8hwribzv7xvb7hbp6xp51c813";
   };
 
   nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [
     freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools
-    qtmultimedia qtlocation
+    qtmultimedia qtlocation qtbase makeWrapper
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/stellarium \
+      --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins"
+  '';
+
   meta = with lib; {
     description = "Free open-source planetarium";
     homepage = http://stellarium.org/;
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix
new file mode 100644
index 0000000000000..8552aa34c4336
--- /dev/null
+++ b/pkgs/applications/science/biology/hmmer/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.1b2";
+  name = "hmmer-${version}";
+
+  src = fetchurl {
+    url = "http://eddylab.org/software/hmmer3/${version}/${name}.tar.gz";
+    sha256 = "0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Biosequence analysis using profile hidden Markov models";
+    longDescription = ''
+HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs).
+
+HMMER is often used together with a profile database, such as Pfam or many of the databases that participate in Interpro. But HMMER can also work with query sequences, not just profiles, just like BLAST. For example, you can search a protein query sequence against a database with phmmer, or do an iterative search with jackhmmer.
+
+HMMER is designed to detect remote homologs as sensitively as possible, relying on the strength of its underlying probability models. In the past, this strength came at significant computational expense, but as of the new HMMER3 project, HMMER is now essentially as fast as BLAST.
+
+HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute.
+    '';
+    homepage = http://hmmer.org/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.iimog ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index bf963958406d7..2df8b188f7858 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "igv-${version}";
-  version = "2.4.10";
+  version = "2.4.13";
 
   src = fetchurl {
-    url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
-    sha256 = "1wyv3ny06m6ipb83hi3pzcc50v49zms69c5714iixh0nqpd826f2";
+    url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
+    sha256 = "0cl6fs1v9rqkzjq4syx0m1pr71hbhvidwa3ym57pvz8ardfs3qa1";
   };
 
   buildInputs = [ unzip jre ];
diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix
index 2258482bd4b2c..f204d9bbca961 100644
--- a/pkgs/applications/science/biology/iv/default.nix
+++ b/pkgs/applications/science/biology/iv/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec
   { name = "iv-19";
     src = fetchurl
-      { url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz";
+      { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz";
         sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx";
       };
     nativeBuildInputs = [ patchelf ];
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
new file mode 100644
index 0000000000000..05cd7992aa900
--- /dev/null
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchFromGitHub, nim, htslib, patchelf, pcre}:
+
+let
+  hts-nim = fetchFromGitHub {
+    owner = "brentp";
+    repo = "hts-nim";
+    rev = "9cd83e30522ab64cd71eb8209be4154aa5579ce1";
+    sha256 = "10g408idy14667varq1syf06rrbpk63i3ib7i5dh1md4ib19av6f";
+  };
+
+  docopt = fetchFromGitHub {
+    owner = "docopt";
+    repo = "docopt.nim";
+    rev = "v0.6.5";
+    sha256 = "0yx79m4jkdcazwlky55nwf39zj5kdhymrrdrjq29mahiwx83x5zr";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "mosdepth-${version}";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "brentp";
+    repo = "mosdepth";
+    rev = "v${version}";
+    sha256 = "1b9frrwhcvay3alhn0d02jccc2qlbij1732hzq9nhwnr4kvsvxx7";
+  };
+
+  buildInputs = [ nim ];
+
+  buildPhase = "nim -p:${hts-nim}/src -p:${docopt}/src c -d:release mosdepth.nim";
+  installPhase = "install -Dt $out/bin mosdepth";
+  fixupPhase = "patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc htslib pcre ]} $out/bin/mosdepth";
+
+  meta = with stdenv.lib; {
+    description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing.";
+    license = licenses.mit;
+    homepage = https://github.com/brentp/mosdepth;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 7fa229c42b10e..35710fd1fe1fc 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses readline python mpi iv ];
 
   src = fetchurl {
-    url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz";
+    url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz";
     sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf";
   };
 
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 555542b76318f..eea889cb4ab75 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.5";
+  version = "2.18.9";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "1lk1qnwc2gwjh8js3rx4qayan5157an6yzxnhija6kqgrxv58f11";
+    sha256 = "0mmyzw75szjycncrgilj1kly3ldawqndxy59059qc8ddbiwn1zky";
   };
 
   buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index 0bac6c778049a..efe19a4e2b6e8 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "RAxML";
-  version = "8.2.11";
+  version = "8.2.12";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "stamatak";
     repo = "standard-${pname}";
     rev = "v${version}";
-    sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg";
+    sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
   };
 
   buildInputs = if mpi then [ pkgs.openmpi ] else [];
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 4c4278c30faac..d5dae364cc3d9 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchurl
 , unzip
 , makeDesktopItem
@@ -16,15 +17,15 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "${baseVersion}.${patchVersion}";
-  baseVersion = "14.29";
-  patchVersion = "12";
+  version = "14.29.17";
   pname = "jmol";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = let 
+    baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
+  in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv";
+    sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index bf8ccee4a6354..0d8ab0d0e191e 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, symlinkJoin, gfortran, perl, procps
-, libyaml, libxc, fftw, openblas, gsl
+, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack
 }:
 
 let
-  version = "7.3";
+  version = "8.1";
   fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
 
 in stdenv.mkDerivation {
@@ -11,11 +11,11 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
-    sha256 = "0hnpqjjxdxh2ggf6ckrsy4hs9iglnazscb4siczddvmysi4kv15d";
+    sha256 = "0rxwvcp22364nnhwhqlr38w4rwv1yl60snxi2f8nqdflx1143n10";
   };
 
   nativeBuildInputs = [ perl procps fftw.dev ];
-  buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out ];
+  buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ];
 
   configureFlags = ''
     --with-yaml-prefix=${libyaml}
@@ -37,6 +37,8 @@ in stdenv.mkDerivation {
     patchShebangs testsuite/oct-run_testsuite.sh
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Real-space time dependent density-functional theory code";
     homepage = http://octopus-code.org;
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index 7209ee3edf60d..eca3ddd32e8b7 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -12,13 +12,13 @@ assert ngspiceSupport -> libngspice != null;
 with lib;
 stdenv.mkDerivation rec {
   name = "kicad-unstable-${version}";
-  version = "2018-03-10";
+  version = "2018-06-12";
 
   src = fetchFromGitHub {
     owner = "KICad";
     repo = "kicad-source-mirror";
-    rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862";
-    sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0";
+    rev = "bc7bd107d980da147ad515aeae0469ddd55c2368";
+    sha256 = "11nsx52pd3jr2wbzr11glmcs1a9r7z1mqkqx6yvlm0awbgd8qlv8";
   };
 
   postPatch = ''
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
       "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
     ];
 
-  nativeBuildInputs = [ cmake doxygen  pkgconfig ];
+  # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html
+  nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen  pkgconfig ];
   buildInputs = [
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
     cairo curl openssl boost
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index ea0ebd52b3ebd..48afb5bf9dc0c 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "librepcb-${version}";
-  version = "20171229";
+  version = "20180628";
 
   src = fetchFromGitHub {
     owner = "LibrePCB";
     repo = "LibrePCB";
     fetchSubmodules = true;
-    rev = "4efb06fa42755abc5e606da4669cc17e8de2f8c6";
-    sha256 = "0r33fm1djqpy0dzvnf5gv2dfh5nj2acaxb7w4cn8yxdgrazjf7ak";
+    rev = "68577ecf8f39299ef4d81ff964b01c3908d1f10b";
+    sha256 = "1ca4q8b8fhp19vq5yi55sq6xlsz14ihw3i0h7rq5fw0kigpjldmz";
   };
 
   enableParallelBuilding = true;
@@ -18,11 +18,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
-	# LibrePCB still supports QT below 5.9. But some code lines break the build, so they are removed by this patch so that the software builds.
-  patches = [ ./fix-2017-12.patch ];
-
   qmakeFlags = ["-r"];
 
+  postInstall = ''
+      mkdir -p $out/share/librepcb/fontobene
+      cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
+    '';
+
   meta = with stdenv.lib; {
     description = "A free EDA software to develop printed circuit boards";
     homepage = http://librepcb.org/;
diff --git a/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch b/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch
deleted file mode 100644
index 75fc590ad7feb..0000000000000
--- a/pkgs/applications/science/electronics/librepcb/fix-2017-12.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libs/librepcb/common/fileio/serializableobjectlist.h
-+++ b/libs/librepcb/common/fileio/serializableobjectlist.h
-@@ -374,26 +374,6 @@
- } // namespace librepcb
-
- /*****************************************************************************************
-- * Prevent from using SerializableObjectList in a foreach loop because it always would
-- * create a deep copy of the list! You should use C++11 range based for loops instead.
-- ****************************************************************************************/
--
--#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 0))
--#define QFOREACHCONTAINER_TEMPLATE QtPrivate::QForeachContainer
--#else
--#define QFOREACHCONTAINER_TEMPLATE QForeachContainer
--#endif
--
--template <typename T, typename P>
--class QFOREACHCONTAINER_TEMPLATE<librepcb::SerializableObjectList<T, P>> { public:
--    ~QForeachContainer() = delete;
--};
--template <typename T, typename P>
--class QFOREACHCONTAINER_TEMPLATE<const librepcb::SerializableObjectList<T, P>> { public:
--    ~QForeachContainer() = delete;
--};
--
--/*****************************************************************************************
-  *  End of File
-  ****************************************************************************************/
-
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 96025e8faa62e..af2ee49daee90 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,15 +1,16 @@
-{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}:
+{stdenv, fetchurl, bison, flex
+, readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }:
 
 stdenv.mkDerivation {
-  name = "ngspice-27";
+  name = "ngspice-28";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-27.tar.gz";
-    sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
+    url = "mirror://sourceforge/ngspice/ngspice-28.tar.gz";
+    sha256 = "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l";
   };
 
   nativeBuildInputs = [ flex bison ];
-  buildInputs = [ readline libX11 libICE libXaw libXext fftw ];
+  buildInputs = [ readline libX11 libICE libXaw libXmu libXext libXt fftw ];
 
   configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
 
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 75e99dcf6594f..6ee3f3266f8d0 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.922";
+  version = "3.924";
 
   src = fetchurl {
-    url    = "http://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg";
+    url    = "https://www.veripool.org/ftp/${name}.tgz";
+    sha256 = "0xarifraycmdzjxs0lscpwvrwr59z84p8g8dkyjssc463dqikjvx";
   };
 
   enableParallelBuilding = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Fast and robust (System)Verilog simulator/compiler";
     homepage    = "https://www.veripool.org/wiki/verilator";
     license     = stdenv.lib.licenses.lgpl3;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix
new file mode 100644
index 0000000000000..ba2a170e62556
--- /dev/null
+++ b/pkgs/applications/science/electronics/xcircuit/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, autoreconfHook, automake, pkgconfig
+, cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:
+
+let
+  version = "3.9.73";
+  name = "xcircuit-${version}";
+  inherit (stdenv.lib) getBin;
+
+in stdenv.mkDerivation {
+  inherit name version;
+
+  src = fetchurl {
+    url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz";
+    sha256 = "1kj9hayipplzm4960kx48vxddqj154qnxkccaqj9cnkp62b7q3jg";
+  };
+
+  nativeBuildInputs = [ autoreconfHook automake pkgconfig ];
+  hardeningDisable = [ "format" ];
+
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --with-ngspice=${getBin ngspice}/bin/ngspice";
+
+  buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ];
+
+  meta = with stdenv.lib; {
+    description = "Generic drawing program tailored to circuit diagrams";
+    homepage = http://opencircuitdesign.com/xcircuit;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.spacefrogg ];
+  };
+}
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index bab9b302d7d18..6e7a3cfc88ac0 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -1,20 +1,21 @@
-{ fetchhg, stdenv, readline }:
+{ fetchFromGitHub, stdenv, readline, cmake }:
 
 stdenv.mkDerivation rec {
   name = "abc-verifier-${version}";
-  version = "20160818";
+  version = "2018-07-08";
 
-  src = fetchhg {
-    url    = "https://bitbucket.org/alanmi/abc";
-    rev    = "a2e5bc66a68a72ccd267949e5c9973dd18f8932a";
-    sha256 = "09yvhj53af91nc54gmy7cbp7yljfcyj68a87494r5xvdfnsj11gy";
+  src = fetchFromGitHub {
+    owner = "berkeley-abc";
+    repo = "abc";
+    rev    = "24407e13db4b8ca16c3996049b2d33ec3722de39";
+    sha256 = "1rckji7nk81n6v1yajz7daqwipxacv7zlafknvmbiwji30j47sq5";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ readline ];
-  preBuild = ''
-    export buildFlags="CC=$CC CXX=$CXX LD=$CXX"
-  '';
+
   enableParallelBuilding = true;
+
   installPhase = ''
     mkdir -p $out/bin
     mv abc $out/bin
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool for squential logic synthesis and formal verification";
-    homepage    = "https://people.eecs.berkeley.edu/~alanmi/abc/abc.htm";
+    homepage    = https://people.eecs.berkeley.edu/~alanmi/abc;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix
index 669cd46cd2ec9..708270f772fd2 100644
--- a/pkgs/applications/science/logic/celf/default.nix
+++ b/pkgs/applications/science/logic/celf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linear logic programming system";
-    homepage = http://github.com/clf/celf;
+    homepage = https://github.com/clf/celf;
     license = licenses.gpl3;
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
index 87b847087e348..341267b2cebe3 100644
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ b/pkgs/applications/science/logic/coq/8.3.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   name = "coq-${version}";
 
   src = fetchurl {
-    url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
+    url = "https://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
     sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
   };
 
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
index 64b0f85aed2ad..c3da1205ab0cb 100644
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   inherit ocaml camlp5;
 
   src = fetchurl {
-    url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
+    url = "https://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
     sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55";
   };
 
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 2b35c91d10c4a..dbfec66789a36 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -23,6 +23,7 @@ let
    "8.7.1"     = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
    "8.7.2"     = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
    "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
+   "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index 403eff216f53c..222021bb1c9f6 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, cln, gmp, swig, pkgconfig
 , readline, libantlr3c, boost, jdk, autoreconfHook
-, python2, antlr3_4
+, python3, antlr3_4
 }:
 
 stdenv.mkDerivation rec {
   name = "cvc4-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchurl {
-    url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz";
-    sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi";
+    url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz";
+    sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python2 ];
+  buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python3 ];
   configureFlags = [
     "--enable-language-bindings=c,c++,java"
     "--enable-gpl"
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     homepage    = http://cvc4.cs.nyu.edu/web/;
     license     = licenses.gpl3;
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ vbgl thoughtpolice ];
+    maintainers = with maintainers; [ vbgl thoughtpolice gebner ];
   };
 }
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 44328eeb6bbb7..95f5385fac3db 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "eprover-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchurl {
-    url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
-    sha256 = "1xmwr32pd8lv3f6yh720mdqhi3na505y3zbgcsgh2hwb7b5i3ngb";
+    url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
+    sha256 = "1gh99ajmza33f54idhqkdqxp5zh2k06jsf45drihnrzydlqv1n7l";
   };
 
   buildInputs = [ which ];
@@ -16,10 +16,6 @@ stdenv.mkDerivation rec {
   '';
   configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man";
 
-  postInstall = ''
-    sed -e s,EXECPATH=.\*,EXECPATH=$out/bin, -i $out/bin/eproof{,_ram}
-  '';
-
   meta = with stdenv.lib; {
     description = "Automated theorem prover for full first-order logic with equality";
     homepage = http://www.eprover.org/;
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index af2bb3ed0c4e4..ae04c11d95906 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
       sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb";
     }
     else fetchurl {
-      url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
+      url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
       sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw";
     };
 
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index e308953462588..be337a1c258e7 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.6.2";
 
   src = fetchurl {
-    url = "http://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
+    url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
     sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";
   };
 
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index 6e8797fcc40bf..6d9549b526f9b 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "mcrl2-${version}";
 
   src = fetchurl {
-    url = "http://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
+    url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
     sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       that can be used for modelling, validation and verification of
       concurrent systems and protocols
     '';
-    homepage = http://www.mcrl2.org/;
+    homepage = https://www.mcrl2.org/;
     license = licenses.boost;
     maintainers = with maintainers; [ moretea ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
new file mode 100644
index 0000000000000..54bedc7c5e971
--- /dev/null
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchFromGitHub, cmake, zlib, gmp, jdk8,
+  # The JDK we use on Darwin currenly makes extensive use of rpaths which are
+  # annoying and break the python library, so let's not bother for now
+  includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }:
+
+with stdenv.lib;
+
+let
+  boolToCmake = x: if x then "ON" else "OFF";
+
+  rev    = "2deeadeff214e975c9f7508bc8a24fa05a1a0c32";
+  sha256 = "09yhym2lxmn3xbhw5fcxawnmvms5jd9fw9m7x2wzil7yvy4vwdjn";
+
+  pname   = "monosat";
+  version = substring 0 7 sha256;
+
+  src = fetchFromGitHub {
+    owner = "sambayless";
+    repo  = pname;
+    inherit rev sha256;
+  };
+
+  core = stdenv.mkDerivation rec {
+    name = "${pname}-${version}";
+    inherit src;
+    buildInputs = [ cmake zlib gmp jdk8 ];
+
+    cmakeFlags = [ "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" ];
+
+    postInstall = optionalString includeJava ''
+      mkdir -p $out/share/java
+      cp monosat.jar $out/share/java
+    '';
+
+    passthru = { inherit python; };
+
+    meta = {
+      description = "SMT solver for Monotonic Theories";
+      platforms   = platforms.unix;
+      license     = if includeGplCode then licenses.gpl2 else licenses.mit;
+      homepage    = https://github.com/sambayless/monosat;
+    };
+  };
+
+  python = { buildPythonPackage, cython }: buildPythonPackage {
+    inherit pname version src;
+
+    # The top-level "source" is what fetchFromGitHub gives us. The rest is inside the repo
+    sourceRoot = "source/src/monosat/api/python/";
+
+    propagatedBuildInputs = [ core cython ];
+
+    # This tells setup.py to use cython
+    MONOSAT_CYTHON = true;
+
+    # The relative paths here don't make sense for our Nix build
+    # Also, let's use cython since it should produce faster bindings
+    # TODO: do we want to just reference the core monosat library rather than copying the
+    # shared lib? The current setup.py copies the .dylib/.so...
+    postPatch = ''
+
+      substituteInPlace setup.py \
+        --replace '../../../../libmonosat.dylib' '${core}/lib/libmonosat.dylib' \
+        --replace '../../../../libmonosat.so'  '${core}/lib/libmonosat.so'
+    '';
+  };
+in core
\ No newline at end of file
diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index 1b401c927b6ef..2f765572f9ad8 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -1,17 +1,20 @@
-{stdenv, fetchurl, gmp, cmake, python}:
+{stdenv, fetchFromGitHub, gmp, cmake, python}:
 
-let version = "0.1.4";
-in
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "libpoly";
+  version = "0.1.7";
 
-stdenv.mkDerivation {
-  name = "libpoly-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz";
-    sha256 = "16x1pk2a3pcb5a0dzyw28ccjwkhmbsck4hy80ss7kx0dd7qgpi7j";
+  src = fetchFromGitHub {
+    owner = "SRI-CSL";
+    repo = "libpoly";
+    rev = "v${version}";
+    sha256 = "0i5ar4lhs88glk0rvkmag656ii434i6i1q5dspx6d0kyg78fii64";
   };
 
-  buildInputs = [ cmake gmp python ];
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ gmp python ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/SRI-CSL/libpoly;
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index 6bf19a2a2f4d7..4abfdf9162c0c 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "clingo";
-  version = "5.2.2";
+  version = "5.3.0";
 
   src = fetchzip {
     url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
-    sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm";
+    sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv";
   };
 
   buildInputs = [];
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index b143fd9825057..01dfc35f6e0d0 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation (rec {
   version = "0.12";
 
   src = fetchurl {
-    url = "http://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz";
+    url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz";
     sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m";
   };
 
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 74e31d062f484..f96532b7038bd 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "prover9-2009-11a";
 
   src = fetchurl {
-    url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz;
+    url = https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz;
     sha256 = "1l2i3d3h5z7nnbzilb6z92r0rbx0kh6yaxn2c5qhn3000xcfsay3";
   };
 
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index c22bff9cdee24..b9dd90f601f51 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ocaml zlib which eprover makeWrapper coq];
   src = fetchurl {
-    url = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
+    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
     sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
   };
 
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
new file mode 100644
index 0000000000000..e05839b2a143c
--- /dev/null
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }:
+
+stdenv.mkDerivation rec {
+  version = "4.2.2";
+  name = "vampire-${version}";
+
+  src = fetchFromGitHub {
+    owner = "vprover";
+    repo = "vampire";
+    rev = version;
+    sha256 = "080zwgmyhn0b2c6hqlhcgaw7n3frz02sh894v5kk68kzxbqr29w2";
+    fetchSubmodules = true;
+    leaveDotGit = true;
+  };
+
+  nativeBuildInputs = [ git ];
+  buildInputs = [ z3 zlib ];
+
+  makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ];
+
+  patches = [
+    # https://github.com/vprover/vampire/pull/54
+    (fetchpatch {
+      name = "fix-apple-cygwin-defines.patch";
+      url = https://github.com/vprover/vampire/pull/54.patch;
+      sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza";
+    })
+    # https://github.com/vprover/vampire/pull/55
+    (fetchpatch {
+      name = "fix-wait-any.patch";
+      url = https://github.com/vprover/vampire/pull/55.patch;
+      sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l";
+    })
+    # https://github.com/vprover/vampire/pull/56
+    (fetchpatch {
+      name = "fenv.patch";
+      url = https://github.com/vprover/vampire/pull/56.patch;
+      sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g";
+    })
+  ];
+
+  enableParallelBuilding = true;
+
+  fixupPhase = ''
+    rm -rf z3
+  '';
+
+  installPhase = ''
+    install -m0755 -D vampire_z3_rel* $out/bin/vampire
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://vprover.github.io/";
+    description = "The Vampire Theorem Prover";
+    platforms = platforms.unix;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ gebner ];
+  };
+}
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 9ae5d75c45774..b677927a8eff7 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://workcraft.org/;
+    homepage = https://workcraft.org/;
     description = "Framework for interpreted graph modeling, verification and synthesis";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index a607f1066395b..3121a83e5b983 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.5.4";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
     name = "${name}-src.tar.gz";
-    sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p";
+    sha256 = "10ikq7ib8jhx7hlxfm6mp5qg6r8dflqs8242q5zaicn80qixpm12";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -26,9 +26,11 @@ stdenv.mkDerivation rec {
 
   # Includes a fix for the embedded soname being libyices.so.2.5, but
   # only installing the libyices.so.2.5.x file.
-  installPhase = ''
+  installPhase = let
+    ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version));
+  in ''
       make install LDCONFIG=true
-      (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5)
+      ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 54c9799a01b84..10a5261927645 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -20,6 +20,20 @@ stdenv.mkDerivation rec {
     cd build
   '';
 
+  postInstall = ''
+    mkdir -p $dev $lib $python/lib
+
+    mv $out/lib/python*  $python/lib/
+    mv $out/lib          $lib/lib
+    mv $out/include      $dev/include
+
+    # clean up a copy of libz3.so and symlink it instead
+    rm $python/${python.sitePackages}/z3/lib/libz3.so
+    ln -s $lib/lib/libz3.so $python/${python.sitePackages}/z3/lib/libz3.so
+  '';
+
+  outputs = [ "out" "lib" "dev" "python" ];
+
   meta = {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "https://github.com/Z3Prover/z3";
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 953f4e62c22b8..25ebee96a103d 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.5.0";
+  name = "R-3.5.1";
 
   src = fetchurl {
-    url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx";
+    url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
+    sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
   };
 
   buildInputs = [
@@ -65,8 +65,7 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install" "install-info" "install-pdf" ];
 
-  doCheck = withRecommendedPackages;  # R 3.5.0 fails the test suite if the
-                                      # recommended packages are not built
+  doCheck = true;
   preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'";
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix
new file mode 100644
index 0000000000000..b96aa60da6860
--- /dev/null
+++ b/pkgs/applications/science/math/bliss/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, unzip, doxygen }:
+
+stdenv.mkDerivation rec {
+  name = "bliss-${version}";
+  version = "0.73";
+
+  src = fetchurl {
+    url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip";
+    sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84";
+  };
+
+  patches = fetchurl {
+    url = "http://scip.zib.de/download/bugfixes/scip-5.0.1/bliss-0.73.patch";
+    sha256 = "815868d6586bcd49ff3c28e14ccb536d38b2661151088fe08187c13909c5dab0";
+  };
+
+  nativeBuildInputs = [ unzip doxygen ];
+
+  preBuild = ''
+    doxygen Doxyfile
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include
+    mv bliss $out/bin 
+    mv html/* COPYING* $out/share/doc/bliss
+    mv *.a $out/lib
+    mv *.h *.hh $out/include
+  '';
+
+  meta = with stdenv.lib; {
+    description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs.";
+    homepage = http://www.tcs.hut.fi/Software/bliss/;
+    license = licenses.lgpl3;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix
index 6de77d81be6f8..689261abc661f 100644
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/pkgs/applications/science/math/cbc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cbc-2.9.9";
 
   src = fetchurl {
-    url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz";
+    url = "https://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz";
     sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a";
   };
 
diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix
index 796e8b7264fbf..9b402fe0ac941 100644
--- a/pkgs/applications/science/math/csdp/default.nix
+++ b/pkgs/applications/science/math/csdp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "csdp-6.1.1";
 
   src = fetchurl {
-    url = "http://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz";
+    url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz";
     sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05";
   };
 
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 553905c21957b..2e48d334a603a 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
 
 let
-  version = "1.3.3";
+  version = "1.3.4";
   name = "fricas-" + version;
 in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url    = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
-    sha256 = "1avp9mbl5yn192c7kz5c2d18k33hay9lwii363b0v5hj3qgq2hhl";
+    sha256 = "156k9az1623y5808j845c56z2nvvdrm48dzg1v0ivpplyl7vp57x";
   };
 
   buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 9e2c55d567cbf..755a609403887 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-444-0";
+  version = "5-0-472-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     urls = [
       "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
-      "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+      "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
     ];
-    sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
+    sha256 = "1f56k5r5wf2l27sgp2vjpvx7wl72gizwxs0a6hngk15nzzka87v9";
   };
 
   srcIcon = fetchurl {
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 798141b6b4383..a538293470538 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "glsurf-3.3.1";
 
   src = fetchurl {
-    url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
+    url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
     sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix
new file mode 100644
index 0000000000000..9eab9ca39992b
--- /dev/null
+++ b/pkgs/applications/science/math/hmetis/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, ghostscript }:
+
+stdenv.mkDerivation rec {
+  name = "hmetis-${version}";
+  version = "1.5";
+
+  src = fetchurl {
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/hmetis/hmetis-${version}-linux.tar.gz";
+    sha256 = "e835a098c046e9c26cecb8addfea4d18ff25214e49585ffd87038e72819be7e1";
+  };
+
+  nativeBuildInputs = [ ghostscript ];
+
+  binaryFiles = "hmetis khmetis shmetis";
+
+  patchPhase = ''
+    for binaryfile in $binaryFiles; do
+      patchelf \
+        --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \
+        --set-rpath ${stdenv.glibc}/lib \
+        $binaryfile
+    done
+  '';
+
+  buildPhase = ''
+    gs -sOutputFile=manual.pdf -sDEVICE=pdfwrite -SNOPAUSE -dBATCH manual.ps
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/hmetis $out/lib
+    mv $binaryFiles $out/bin
+    mv manual.pdf $out/share/doc/hmetis
+    mv libhmetis.a $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "hMETIS is a set of programs for partitioning hypergraphs";
+    homepage = http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview;
+    license = licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix
index 3484c369db3b8..4c7df4412e4f4 100644
--- a/pkgs/applications/science/math/palp/default.nix
+++ b/pkgs/applications/science/math/palp/default.nix
@@ -14,13 +14,28 @@ stdenv.mkDerivation rec {
     sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs";
   };
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [
+    "format"
+    "strictoverflow" # causes runtime failure (tested in checkPhase)
+  ];
 
   preBuild = ''
       echo Building PALP optimized for ${dim} dimensions
       sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h
   '';
 
+  # palp has no tests of its own. This test is an adapted sage test that failed
+  # when #28029 was merged.
+  doCheck = true;
+  checkPhase = ''
+    ./nef.x -f -N << EOF | grep -q 'np='
+      3 6
+      1  0  0 -1  0  0
+      0  1  0  0 -1  0
+      0  0  1  0  0 -1
+    EOF
+  '';
+
   installPhase = ''
     mkdir -p "$out/bin"
     for file in poly class cws nef mori; do
@@ -62,6 +77,6 @@ stdenv.mkDerivation rec {
     # the right license.
     license = licenses.gpl2;
     maintainers = with maintainers; [ timokau ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 07c6af0926d66..a811c9da8c27e 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "2.9.5";
 
   src = fetchurl {
-    url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
+    url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
     sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb";
   };
 
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index b3e36b6bf2060..10b0d0cba36d2 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.0.10pl1";
 
   src = fetchurl {
-    url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
+    url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
     sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
   };
 
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index a3ff0d6d0f1e5..1a059aeb1670d 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.21";
+  version = "0.7.22";
   name = "pynac-${version}";
 
   src = fetchFromGitHub {
     owner = "pynac";
     repo = "pynac";
     rev = "pynac-${version}";
-    sha256 = "072mdziyx52y0knxjf2hs6nab36bckkanp7g6ff6qiy4fm0v8q04";
+    sha256 = "1ribm5vpbgsja4hbca1ckw4ln9kjkv608aaqsvxxvbs4z76ys6yi";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 11ae3852f067e..7990088ffbe98 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "qalculate-gtk-${version}";
-  version = "2.5.0";
+  version = "2.6.1";
 
-  src = fetchurl {
-    url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
-    sha256 = "1hwwsdk3mlzvg9fsnv0hpj0s1lfkhycwv3sx2yrjwffzphhmxs7a";
+  src = fetchFromGitHub {
+    owner = "qalculate";
+    repo = "qalculate-gtk";
+    rev = "v${version}";
+    sha256 = "19jw1w29x0r1qq5r8gmqrqr00ml2pfi2w433723vjzxpfg2pp70r";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md
new file mode 100644
index 0000000000000..46496664f28e0
--- /dev/null
+++ b/pkgs/applications/science/math/sage/README.md
@@ -0,0 +1,117 @@
+# Sage on nixos
+
+Sage is a pretty complex package that depends on many other complex packages and patches some of those. As a result, the sage nix package is also quite complex.
+
+Don't feel discouraged to fix, simplify or improve things though. Here's a quick overview over the functions of the individual files:
+
+- `sage-src.nix`  
+  Downloads the source code and applies patches. This makes sure that all the other files work with the same sage source. If you want to apply a patch to sage or update sage to a new version, this is the place to do it.
+
+- `env-locations.nix`  
+  Creates a bash file that sets a bunch of environment variables telling sage where to find various packages and files. The definitions of those environment variables can be found in the sage source in the `src/env.py` file. This bash file needs to be sourced before sage is started (done in `sage-env.nix` and `sagedoc.nix`).
+
+- `sage-env.nix`  
+  Sets all environment variables sage needs to run. This includes the package locations defined in `env-locations.nix` as well as the location of sage itself and its various subdirectories.
+
+- `sagelib.nix`  
+  Defines the main sage package (without setting the necessary environments or running any tests).
+
+- `sage-with-env.nix`  
+  Wraps sage in the necessary environment.
+
+- `sage.nix`  
+  Runs sages doctests.
+
+- `sage-wrapper.nix`  
+  Optionally tells sage where do find the docs.
+
+- `sagedoc.nix`  
+  Builds and tests the sage html documentation. Can be used for offline documentation viewing as well as the sage `browse_sage_doc` and `search_doc` functions.
+
+- `sagenb.nix`  
+  The (semi deprecated) sage notebook.
+
+- `default.nix`  
+  Introduces necessary overrides, defines new packages and ties everything together (returning the `sage` package).
+
+- `flask-oldsessions.nix`, `flask-openid.nix`, `python-openid.nix`
+  These are python packages that were rejected from the main nixpkgs tree because they appear unmaintained. They are needed for the (semi-deprecated) sage notebook. Since that notebook is still needed to run the sage doctests, these packages are included but not exposed to the rest of nixpkgs.
+
+- `pybrial.nix`  
+  pybrial is a dependency of sage. However, pybrial itself also has sage as a dependency. Because of that circular dependency, pybrial is hidden from the rest of nixpkgs (just as the flask packages and python-openid.
+
+- `openblas-pc.nix`  
+  This creates a `.pc` file to be read by `pkg-config` that allows openblas to take on different roles, like `cblas` or `lapack`.
+
+## The sage build is broken
+
+First you should find out which change to nixpkgs is at fault (if you don't already know). You can use `git-bisect` for that (see the manpage).
+
+If the build broke as a result of a package update, try those solutions in order:
+
+- search the [sage trac](https://trac.sagemath.org/) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`.
+
+- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch).
+
+- fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch:
+
+```
+[user@localhost ~]$ git clone git://github.com/sagemath/sage.git
+[user@localhost ~]$ cd sage
+[user@localhost sage]$ git checkout 8.2 # substitute the relevant version here
+```
+
+Then make the needed changes and generate a patch with `git diff`:
+
+```
+[user@localhost ~]$ <make changes>
+[user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/applications/science/math/sage/patches/name-of-patch.patch
+```
+
+Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, [propose them upstream](#proposing-a-sage-patch) and add a link to the trac ticket.
+
+- pin the package version in `default.nix` and add a note that explains why that is necessary.
+
+
+## Proposing a sage patch
+
+You can [login the sage trac using GitHub](https://trac.sagemath.org/login). Your username will then be `gh-<your-github-name>`. The only other way is to request a trac account via email. After that refer to [git the hard way](http://doc.sagemath.org/html/en/developer/manual_git.html#chapter-manual-git) in the sage documentation. The "easy way" requires a non-GitHub account (requested via email) and a special tool. The "hard way" is really not all that hard if you're a bit familiar with git.
+
+Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then:
+
+```
+[user@localhost ~]$ git clone git://github.com/sagemath/sage.git
+[user@localhost ~]$ cd sage
+[user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master
+[user@localhost sage]$ git checkout -b u/gh-<your-github-username>/<your-branch-name> develop
+[user@localhost sage]$ <make changes>
+[user@localhost sage]$ git add .
+[user@localhost sage]$ git commit
+[user@localhost sage]$ git show # review your changes
+[user@localhost sage]$ git push --set-upstream trac u/gh-<your-github-username>/<your-branch-name>
+```
+
+You now created a branch on the trac server (you *must* follow the naming scheme as you only have push access to branches with the `u/gh-<your-github-username>/` prefix).
+Now you can [create a new trac ticket](https://trac.sagemath.org/newticket).
+- Write a description of the change
+- set the type and component as appropriate
+- write your real name in the "Authors" field
+- write `u/gh-<your-github-username>/<your-branch-name>` in the "Branch" field
+- click "Create ticket"
+- click "Modify" on the top right of your ticket (for some reason you can only change the ticket status after you have created it)
+- set the ticket status from `new` to `needs_review`
+- click "Save changes"
+
+Refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details.
+
+## I want to update sage
+
+You'll need to change the `version` field in `sage-src.nix`. Afterwards just try to build and let nix tell you which patches no longer apply (hopefully because they were adopted upstream). Remove those.
+
+Hopefully the build will succeed now. If it doesn't and the problem is obvious, fix it as described in [The sage build is broken](#the-sage-build-is-broken).
+If the problem is not obvious, you can try to first update sage to an intermediate version (remember that you can also set the `version` field to any git revision of sage) and locate the sage commit that introduced the issue. You can even use `git-bisect` for that (it will only be a bit tricky to keep track of which patches to apply). Hopefully after that the issue will be obvious.
+
+## Well, that didn't help!
+
+If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping @timokau (or whoever is listed in the `maintainers` list of the sage package).
+Describe what you did and why it didn't work. Afterwards it would be great if you help the next guy out and improve this documentation!
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index b74bcc3d63772..afb230cf4287f 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -1,230 +1,201 @@
-# TODO
-# - consider writing a script to convert spkgs to nix packages, similar to vim
-#   or cabal2nix. This would allow a more efficient and "cleaner" build, greater
-#   flexibility and the possibility to select which dependencies to add and which
-#   to remove. It would also allow to use system packages for some dependencies
-#   and recompile others (optimized for the system) without recompiling everything.
-# - add optdeps:
-#   - imagemagick
-#   - texlive full for documentation
-#   - ...
-# - further seperate build outputs. Also maybe run `make doc`.
-#   Configure flags like --bindir and --libdir oculd also be used for that, see
-#   ./configure --help`.
-
-# Other resources:
-# - https://wiki.debian.org/DebianScience/Sage
-# - https://github.com/cschwan/sage-on-gentoo
-# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath
-
-{ stdenv
-, bash
-, fetchurl
-, perl
-, gfortran6
-, python
-, autoreconfHook
-, gettext
-, which
-, texlive
-, texinfo
-, hevea
-, buildDocs ? false
-, optimize ? false # optimize sage to the current system (obviously impure)
+{ nixpkgs
+, withDoc ? false
 }:
 
-stdenv.mkDerivation rec {
-  version = "8.1";
-  name = "sage-${version}";
-
-  # Modified version of patchShebangs that patches to the sage-internal version if possible
-  # and falls back to the system version if not.
-  patchSageShebangs = ./patchSageShebangs.sh;
-  src = fetchurl {
-    # Note that the source is *not* fetched from github, since that doesn't
-    # the upstream folder with all the source tarballs of the spkgs.
-    # If those are not present they are fetched at build time, which breaks
-    # when building in a sandbox (and probably only works if you install the
-    # latest sage version).
-    urls = [
-      "http://mirrors.mit.edu/sage/src/sage-${version}.tar.gz"
-      "ftp://ftp.fu-berlin.de/unix/misc/sage/src/sage-${version}.tar.gz"
-      "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz"
-      "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz"
-      "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz"
-      "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz"
-      "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz"
-      "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz"
-      "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz"
-      "http://files.sagemath.org/src/sage-${version}.tar.gz"
-      "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz"
-      "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz"
-      "http://linorg.usp.br/sage/src/sage-${version}.tar.gz"
-      "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz"
-      "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz"
-      "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz"
-      "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz"
-      "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz"
-      "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz"
-      "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz"
-      "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz"
-      "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz"
-      "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz"
-      "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz"
-      "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz"
-      "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz"
-      "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz"
-      "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz"
-      "http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz"
-    ];
-    sha256 = "1cpcs1mr0yii64s152xmxyd450bfzjb22jjj0zh9y3n6g9alzpyq";
+let
+  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x;
+
+  # https://trac.sagemath.org/ticket/15980 for tracking of python3 support
+  python = nixpkgs.python2.override {
+    packageOverrides = self: super: {
+      cypari2 = super.cypari2.override { inherit pari; };
+
+      cysignals = super.cysignals.override { inherit pari; };
+
+      cvxopt = super.cvxopt.override { inherit glpk; };
+
+      # python packages that appear unmaintained and were not accepted into the nixpkgs
+      # tree because of that. These packages are only dependencies of the more-or-less
+      # deprecated sagenb. However sagenb is still a default dependency and the doctests
+      # depend on it.
+      # See https://github.com/NixOS/nixpkgs/pull/38787 for a discussion.
+      flask-oldsessions = self.callPackage ./flask-oldsessions.nix {};
+      flask-openid = self.callPackage ./flask-openid.nix {};
+      python-openid = self.callPackage ./python-openid.nix {};
+
+      pybrial = self.callPackage ./pybrial.nix {};
+
+      sagelib = self.callPackage ./sagelib.nix {
+        inherit flint ecl pari glpk eclib;
+        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        linbox = nixpkgs.linbox.override { withSage = true; };
+      };
+
+      sagenb = self.callPackage ./sagenb.nix {
+        mathjax = nodePackages_8_x.mathjax;
+      };
+
+      sagedoc = self.callPackage ./sagedoc.nix {
+        inherit sage-src;
+      };
+
+      env-locations = self.callPackage ./env-locations.nix {
+        inherit pari_data ecl pari;
+        inherit singular;
+        three = nodePackages_8_x.three;
+        mathjax = nodePackages_8_x.mathjax;
+      };
+
+      sage-env = self.callPackage ./sage-env.nix {
+        inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv;
+        pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
+      };
+
+      sage-with-env = self.callPackage ./sage-with-env.nix {
+        inherit pari eclib pythonEnv;
+        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
+        three = nodePackages_8_x.three;
+      };
+
+      sage = self.callPackage ./sage.nix { };
+
+      sage-wrapper = self.callPackage ./sage-wrapper.nix {
+        inherit sage-src withDoc;
+      };
+    };
   };
 
-  postPatch = ''
-    substituteAllInPlace src/bin/sage-env
-    bash=${bash} substituteAllInPlace build/bin/sage-spkg
-  '';
-
-  installPhase = ''
-    # Sage installs during first `make`, `make install` is no-op and just takes time.
-  '';
-
-  outputs = [ "out" ] ++ stdenv.lib.optionals (buildDocs) [ "doc" ];
-
-  buildInputs = [
-    bash # needed for the build
-    perl # needed for the build
-    python # needed for the build
-    gfortran6 # needed to build giac, openblas
-    autoreconfHook # needed to configure sage with prefix
-    gettext # needed to build the singular spkg
-    which # needed in configure of mpir
-    texinfo # needed to build maxima
-  ] ++ stdenv.lib.optionals(buildDocs) [
-    hevea # needed to build the docs of the giac spkg
-    (texlive.combine { inherit (texlive)
-      scheme-basic
-      collection-pstricks # needed by giac
-      times # font needed by giac
-      stmaryrd # needed by giac
-      babel-greek # optional for giac, otherwise throws a bunch of latex command not founds
-      ;
-    })
-  ];
-
-  nativeBuildInputs = [ gfortran6 perl which ];
-
-  patches = [
-    # fix usages of /bin/rm
-    ./spkg-singular.patch
-    # help python find the crypt library
-    # patches python3 and indirectly python2, since those installation files are symlinked
-    ./spkg-python.patch
-    # fix usages of /usr/bin/perl
-    ./spkg-git.patch
-    # fix usages of /bin/cp and add necessary argument to function call
-    ./spkg-giac.patch
-    # environment
-    ./env.patch
-    # adjust wrapper shebang and patch shebangs after each spkg build
-    ./shebangs.patch
+  openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
+  openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
+  openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
+
+  sage-src = callPackage ./sage-src.nix {};
+
+  pythonRuntimeDeps = with python.pkgs; [
+    sagelib
+    pybrial
+    sagenb
+    cvxopt
+    networkx
+    service-identity
+    psutil
+    sympy
+    fpylll
+    matplotlib
+    scipy
+    ipywidgets
+    rpy2
+    sphinx
+    typing
+    pillow
   ];
 
-  enableParallelBuilding = true;
+  pythonEnv = python.buildEnv.override {
+    extraLibs = pythonRuntimeDeps;
+    ignoreCollisions = true;
+  } // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible
+
+  # needs to be rWrapper, standard "R" doesn't include default packages
+  rWrapper = nixpkgs.rWrapper.override {
+    # https://trac.sagemath.org/ticket/25674
+    R = nixpkgs.R.overrideAttrs (attrs: rec {
+      name = "R-3.4.4";
+      src = fetchurl {
+        url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
+        sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";
+      };
+    });
+  };
 
-  hardeningDisable = [
-    "format" # needed to build palp, for lines like `printf(ctime(&_NFL->TIME))`
-    # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream
-  ];
+  # update causes issues
+  # https://groups.google.com/forum/#!topic/sage-packaging/cS3v05Q0zso
+  # https://trac.sagemath.org/ticket/24735
+  singular = nixpkgs.singular.overrideAttrs (oldAttrs: {
+    name = "singular-4.1.0p3";
+    src = fetchurl {
+      url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-1-0/singular-4.1.0p3.tar.gz";
+      sha256 = "105zs3zk46b1cps403ap9423rl48824ap5gyrdgmg8fma34680a4";
+    };
+  });
+
+  # *not* to confuse with the python package "pynac"
+  # https://trac.sagemath.org/ticket/24838 (depends on arb update)
+  pynac = nixpkgs.pynac.override { inherit singular; };
+
+  eclib = nixpkgs.eclib.override { inherit pari; };
+
+  # With openblas (64 bit), the tests fail the same way as when sage is build with
+  # openblas instead of openblasCompat. Apparently other packages somehow use flints
+  # blas when it is available. Alternative would be to override flint to use
+  # openblasCompat.
+  flint = nixpkgs.flint.override { withBlas = false; };
+
+  # Multiple palp dimensions need to be available and sage expects them all to be
+  # in the same folder.
+  palp = symlinkJoin {
+    name = "palp-${nixpkgs.palp.version}";
+    paths = [
+      (nixpkgs.palp.override { dimensions = 4; doSymlink = false; })
+      (nixpkgs.palp.override { dimensions = 5; doSymlink = false; })
+      (nixpkgs.palp.override { dimensions = 6; doSymlink = true; })
+      (nixpkgs.palp.override { dimensions = 11; doSymlink = false; })
+    ];
+  };
 
-  configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ];
-  preConfigure = ''
-    export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
-
-    export HOME=/tmp/sage-home
-    export SAGE_ROOT="$PWD"
-    export SAGE_SRC="$PWD"
-
-    mkdir -p "$HOME"
-    mkdir -p "$out"
-
-    # we need to keep the source around
-    dir="$PWD"
-    cd ..
-    mv "$dir" "$out/sage-root"
-
-    export SAGE_SPKG_INSTALL_DOCS='no'
-    cd "$out/sage-root" # build in target dir, since `make` is also `make install`
-  ''
-  + stdenv.lib.optionalString (buildDocs) ''
-    mkdir -p "$doc"
-    export SAGE_DOC="$doc"
-    export SAGE_DOCBUILD_OPTS="--no-pdf-links -k"
-  ''
-  + stdenv.lib.optionalString (!optimize) ''
-    export SAGE_FAT_BINARY=yes
-  '';
-
-  buildFlags = if (buildDocs) then "doc" else "build";
-
-  # for reference: http://doc.sagemath.org/html/en/installation/source.html
-  preBuild = ''
-    # symlink python to make sure the shebangs are patched to the sage path
-    # while still being able to use python before building it
-    # (this is important because otherwise sage will try to install python
-    # packages globally later on)
-    ln -s "${python}/bin/python2" $out/bin/python2
-    ln -s "$out/bin/python2" $out/bin/python
-    touch $out/bin/python3
-    bash $patchSageShebangs .
-  '';
-
-  postBuild = ''
-    # Clean up
-    rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs
-    rm -rf "$out/sage-root/src/build"
-    rm -rf "$out/sage-root/src/autom4te.cache"
-    rm -rf "$out/sage-root/src/config"
-    rm -rf "$out/sage-root/src/m4"
-    rm -rf "$out/sage-root/.git"
-    rm -r "$out/sage-root/logs"
-    rm -r "$out"/lib/python*/test
-    # Fix dependency cycle between out and doc
-    rm -f "$out/sage-root/config.log"
-    rm -f "$out/sage-root/config.status"
-    rm -f "$out/sage-root/build/make/Makefile-auto"
-    rm -f "$out/sage-home/.sage/gap/libgap-workspace-"*
-    # Make sure unnessessary packages don't end up in the build closure
-    find "$out" \
-        -iname 'config.log' \
-        -delete \
-        -or -iname 'Makefile' \
-        -delete
-    rm -f "$out/lib/R/etc/Renviron"
-    # Make sure all shebangs are properly patched
-    bash $patchSageShebangs $out
-  '';
-
-  # TODO there are some doctest failures, which seem harmless.
-  # We should figure out a way to fix the failures or ignore only those tests.
-  doCheck = false;
-
-  checkTarget = "ptestalllong"; # all long tests in parallell
-  preCheck = ''
-    export SAGE_TIMEOUT=0 # no timeout
-    export SAGE_TIMEOUT_LONG=0 # no timeout
-  '';
-
-  meta = {
-    homepage = http://www.sagemath.org;
-    description = "A free open source mathematics software system";
-    # taken from the homepage
-    longDescription = ''
-      SageMath is a free open-source mathematics software system licensed under the GPL. It builds on top of many existing open-source packages: NumPy, SciPy, matplotlib, Sympy, Maxima, GAP, FLINT, R and many more. Access their combined power through a common, Python-based language or directly via interfaces or wrappers.
-      Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab.
-    '';
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = ["x86_64-linux" "i686-linux"];
-    maintainers = with stdenv.lib.maintainers; [ timokau ];
+  # Sage expects those in the same directory.
+  pari_data = symlinkJoin {
+    name = "pari_data";
+    paths = with nixpkgs; [
+      pari-galdata
+      pari-seadata-small
+    ];
   };
-}
+
+  # https://trac.sagemath.org/ticket/22191
+  ecl = nixpkgs.ecl_16_1_2;
+
+  # sage currently uses an unreleased version of pari
+  pari = (nixpkgs.pari.override { withThread = false; }).overrideAttrs (attrs: rec {
+    version = "2.10-1280-g88fb5b3"; # on update remove pari-stackwarn patch from `sage-src.nix`
+    src = fetchurl {
+      url = "mirror://sageupstream/pari/pari-${version}.tar.gz";
+      sha256 = "19gbsm8jqq3hraanbmsvzkbh88iwlqbckzbnga3y76r7k42akn7m";
+    };
+  });
+
+  # https://trac.sagemath.org/ticket/24824
+  glpk = nixpkgs.glpk.overrideAttrs (attrs: rec {
+    version = "4.63";
+    name = "glpk-${version}";
+    src = fetchurl {
+      url = "mirror://gnu/glpk/${name}.tar.gz";
+      sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci";
+    };
+    patches = (attrs.patches or []) ++ [
+      # Alternatively patch sage with debians
+      # https://sources.debian.org/data/main/s/sagemath/8.1-7/debian/patches/t-version-glpk-4.60-extra-hack-fixes.patch
+      # The header of that debian patch contains a good description of the issue. The gist of it:
+      # > If GLPK in Sage causes one error, and this is caught by Sage and recovered from, then
+      # > later (because upstream GLPK does not clear the "error" flag) Sage will append
+      # > all subsequent terminal output of GLPK into the error_message string but not
+      # > actually forward it to the user's terminal. This breaks some doctests.
+      (fetchpatch {
+        name = "error_recovery.patch";
+        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+        sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf";
+      })
+
+      # Allow setting a exact verbosity level (OFF|ERR|ON|ALL|DBG)
+      (fetchpatch {
+        name = "exact_verbosity.patch";
+        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/glp_exact_verbosity.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+        sha256 = "15gm5i2alqla3m463i1qq6jx6c0ns6lip7njvbhp37pgxg4s9hx8";
+      })
+    ];
+  });
+in
+  python.pkgs.sage-wrapper // {
+    doc = python.pkgs.sagedoc;
+    lib = python.pkgs.sagelib;
+  }
diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix
new file mode 100644
index 0000000000000..2ed079ab32bc8
--- /dev/null
+++ b/pkgs/applications/science/math/sage/env-locations.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, writeTextFile
+, pari_data
+, pari
+, singular
+, maxima-ecl
+, conway_polynomials
+, graphs
+, elliptic_curves
+, polytopes_db
+, gap-libgap-compatible
+, ecl
+, combinatorial_designs
+, jmol
+, mathjax
+, three
+, cysignals
+}:
+
+writeTextFile rec {
+  name = "sage-env-locations";
+  destination = "/${name}";
+  text = ''
+    export GP_DATA_DIR="${pari_data}/share/pari"
+    export PARI_DATA_DIR="${pari_data}"
+    export GPHELP="${pari}/bin/gphelp"
+    export GPDOCDIR="${pari}/share/pari/doc"
+    export SINGULARPATH='${singular}/share/singular'
+    export SINGULAR_SO='${singular}/lib/libSingular.so'
+    export SINGULAR_EXECUTABLE='${singular}/bin/Singular'
+    export MAXIMA_FAS='${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas'
+    export MAXIMA_PREFIX="${maxima-ecl}"
+    export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials'
+    export GRAPHS_DATA_DIR='${graphs}/share/graphs'
+    export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
+    export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
+    export GAP_ROOT_DIR='${gap-libgap-compatible}/share/gap/build-dir'
+    export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
+    export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
+    export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
+    export JMOL_DIR="${jmol}"
+    export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
+    export THREEJS_DIR="${three}/lib/node_modules/three"
+    export SAGE_INCLUDE_DIRECTORIES="${cysignals}/lib/python2.7/site-packages"
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/env.patch b/pkgs/applications/science/math/sage/env.patch
deleted file mode 100644
index a7f8538eac3d4..0000000000000
--- a/pkgs/applications/science/math/sage/env.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/bin/sage-env b/src/bin/sage-env
-index ead308f861..ed8db9f9b7 100644
---- a/src/bin/sage-env
-+++ b/src/bin/sage-env
-@@ -111,6 +111,8 @@ resolvelinks() {
- }
- 
- 
-+SAGE_ROOT="@out@/sage-root"
-+
- # New value for SAGE_ROOT: either SAGE_ROOT (if given)
- # or a guessed value based on pwd.
- if [ -n "$SAGE_ROOT" ]; then
-@@ -185,6 +187,8 @@ fi
- export SAGE_ENV_SOURCED=$SAGE_ENV_VERSION
- 
- export SAGE_ROOT="$NEW_SAGE_ROOT"
-+export SAGE_LOCAL='@out@/'
-+export PYTHONPATH="@out@/lib/python2.7/site-packages:$PYTHONPATH"
- 
- 
- # sage-env must know where the Sage's script files are.
diff --git a/pkgs/applications/science/math/sage/fetch-mirrors.sh b/pkgs/applications/science/math/sage/fetch-mirrors.sh
deleted file mode 100755
index a1103e86beb9c..0000000000000
--- a/pkgs/applications/science/math/sage/fetch-mirrors.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p curl go-pup
-
-# Fetches a list of all available source mirrors from the sage homepage.
-# Note that the list is sorted by country, but fetchurl doesn't offer an option
-# to customize mirror preference.
-
-curl -s http://www.sagemath.org/download-source.html \
-    | pup 'table#mirror'  \
-    | pup 'a attr{href}' \
-    | sed -e 's/index\.html/sage-${version}.tar.gz/'
diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix
new file mode 100644
index 0000000000000..85e35736d0305
--- /dev/null
+++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, python
+, flask
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-OldSessions";
+  version = "0.10";
+
+  # no artifact on pypi: https://github.com/mitsuhiko/flask-oldsessions/issues/1
+  src = fetchFromGitHub {
+    owner = "mitsuhiko";
+    repo = "flask-oldsessions";
+    rev = "${version}";
+    sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn";
+  };
+
+  propagatedBuildInputs = [
+    flask
+  ];
+
+  # missing module flask.testsuite, probably assumes an old version of flask
+  doCheck = false;
+  checkPhase = ''
+    ${python.interpreter} run-tests.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Provides a session class that works like the one in Flask before 0.10.";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ timokau ];
+    homepage = https://github.com/mitsuhiko/flask-oldsessions;
+  };
+}
diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix
new file mode 100644
index 0000000000000..9043fabd9b4a9
--- /dev/null
+++ b/pkgs/applications/science/math/sage/flask-openid.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, flask
+, python-openid
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-OpenID";
+  version = "1.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1aycwmwi7ilcaa5ab8hm0bp6323zl8z25q9ha0gwrl8aihfgx3ss";
+  };
+
+  propagatedBuildInputs = [
+    flask
+    python-openid
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Adds openid support to flask applications";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ timokau ];
+    homepage = https://pythonhosted.org/Flask-OpenID/;
+  };
+}
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
new file mode 100644
index 0000000000000..ba46850bbc617
--- /dev/null
+++ b/pkgs/applications/science/math/sage/openblas-pc.nix
@@ -0,0 +1,18 @@
+{ stdenv
+, openblasCompat
+, writeTextFile
+, name
+}:
+
+writeTextFile {
+  name = "openblas-${name}-pc-${openblasCompat.version}";
+  destination = "/lib/pkgconfig/${name}.pc";
+  text = ''
+    Name: ${name}
+    Version: ${openblasCompat.version}
+
+    Description: ${name} for SageMath, provided by the OpenBLAS package.
+    Cflags: -I${openblasCompat}/include
+    Libs: -L${openblasCompat}/lib -lopenblas
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/patchSageShebangs.sh b/pkgs/applications/science/math/sage/patchSageShebangs.sh
deleted file mode 100644
index 6ddf93af01147..0000000000000
--- a/pkgs/applications/science/math/sage/patchSageShebangs.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is a slightly modified version of nix's default patchShebangs
-
-dir="$1"
-
-echo "patching sage internal script interpreter paths in $( readlink -f "$dir")"
-
-find "$dir" -type f -perm -0100 | while read f; do
-    if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
-        # missing shebang => not a script
-        continue
-    fi
-
-    oldInterpreterLine=$(head -1 "$f" | tail -c+3)
-    read -r oldPath arg0 args <<< "$oldInterpreterLine"
-
-    if $(echo "$oldPath" | grep -q "/bin/env$"); then
-        # Check for unsupported 'env' functionality:
-        # - options: something starting with a '-'
-        # - environment variables: foo=bar
-        if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
-            echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
-            exit 1
-        fi
-        executable="$arg0"
-    else
-        if [ "$oldPath" = "" ]; then
-            # If no interpreter is specified linux will use /bin/sh. Set
-            # oldpath="/bin/sh" so that we get /nix/store/.../sh.
-            oldPath="/bin/sh"
-        fi
-        executable="$(basename "$oldPath")"
-        args="$arg0 $args"
-    fi
-
-    newPath="$(echo "$out/bin/$executable $args" | sed 's/[[:space:]]*$//')"
-    if [[ ! -x "$newPath" ]] ; then
-        newPath="$(command -v "$executable" || true)"
-    fi
-
-    # Strip trailing whitespace introduced when no arguments are present
-    newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')"
-
-    if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
-        if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
-            echo "$f: sage interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
-            # escape the escape chars so that sed doesn't interpret them
-            escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
-            sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
-        fi
-    fi
-done
diff --git a/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch b/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch
new file mode 100644
index 0000000000000..a20f1670a256a
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch
@@ -0,0 +1,427 @@
+commit c885927e25b29bd23869e02379c2918da430323e
+Author: Timo Kaufmann <timokau@zoho.com>
+Date:   Sat Jun 30 02:26:15 2018 +0200
+
+diff --git a/build/pkgs/arb/checksums.ini b/build/pkgs/arb/checksums.ini
+index 1924ee03c3..9323b97391 100644
+--- a/build/pkgs/arb/checksums.ini
++++ b/build/pkgs/arb/checksums.ini
+@@ -1,4 +1,4 @@
+ tarball=arb-VERSION.tar.gz
+-sha1=27476d0529e48a07d92da90bd0fb80dd18f443e3
+-md5=733285d9705d10b8024e551ffa81952f
+-cksum=2391183744
++sha1=44eda7bf8eaa666c45b1fc2c1b5bd08756d94b58
++md5=fa24de9fffe4394fb6a7a6792e2ecc5f
++cksum=3689220688
+diff --git a/build/pkgs/arb/package-version.txt b/build/pkgs/arb/package-version.txt
+index c8810e9bdb..fb2c0766b7 100644
+--- a/build/pkgs/arb/package-version.txt
++++ b/build/pkgs/arb/package-version.txt
+@@ -1 +1 @@
+-2.12.0.p0
++2.13.0
+diff --git a/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch b/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch
+deleted file mode 100644
+index 3e5c0e708b..0000000000
+--- a/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch
++++ /dev/null
+@@ -1,17 +0,0 @@
+-In newer binutils, ld options -r and -pie conflict.
+-Patch due to Jörg-Volker Peetz
+-(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ),
+-packaged by Emmanuel Charpentier
+-
+-diff -ru arb-2.8.1-orig/Makefile.subdirs arb-2.8.1-new/Makefile.subdirs
+---- arb-2.8.1-orig/Makefile.subdirs	2015-12-31 17:30:01.000000000 +0100
+-+++ arb-2.8.1-new/Makefile.subdirs	2016-11-07 18:50:34.540051779 +0100
+-@@ -52,7 +52,7 @@
+- 	$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+- 
+- $(MOD_LOBJ): $(LOBJS)
+--	$(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
+-+	$(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+- 
+- -include $(LOBJS:.lo=.d)
+- 
+diff --git a/src/sage/rings/complex_arb.pyx b/src/sage/rings/complex_arb.pyx
+index 70d51e655a..00e7caea2c 100644
+--- a/src/sage/rings/complex_arb.pyx
++++ b/src/sage/rings/complex_arb.pyx
+@@ -857,14 +857,14 @@ class ComplexBallField(UniqueRepresentation, Field):
+             [0.500000000000000 +/- 2.09e-16]
+ 
+             sage: CBF.integral(lambda x, _: x.gamma(), 1 - CBF(i), 1 + CBF(i))
+-            [+/- 3.95e-15] + [1.5723926694981 +/- 4.53e-14]*I
++            [+/- 4...e-15] + [1.5723926694981 +/- 4...e-14]*I
+ 
+             sage: C = ComplexBallField(100)
+             sage: C.integral(lambda x, _: x.cos() * x.sin(), 0, 1)
+             [0.35403670913678559674939205737 +/- 8.89e-30]
+ 
+             sage: CBF.integral(lambda x, _: (x + x.exp()).sin(), 0, 8)
+-            [0.34740017266 +/- 6.36e-12]
++            [0.34740017266 +/- 6...e-12]
+ 
+             sage: C = ComplexBallField(2000)
+             sage: C.integral(lambda x, _: (x + x.exp()).sin(), 0, 8) # long time
+@@ -879,14 +879,14 @@ class ComplexBallField(UniqueRepresentation, Field):
+             ....:     else:
+             ....:         return z.sqrt()
+             sage: CBF.integral(my_sqrt, -1 + CBF(i), -1 - CBF(i))
+-            [+/- 1.14e-14] + [-0.4752076627926 +/- 5.18e-14]*I
++            [+/- 1.14e-14] + [-0.4752076627926 +/- 5...e-14]*I
+ 
+         Note, though, that proper handling of the ``analytic`` flag is required
+         even when the path does not touch the branch cut::
+ 
+             sage: correct = CBF.integral(my_sqrt, 1, 2); correct
+             [1.21895141649746 +/- 3.73e-15]
+-            sage: RBF(integral(sqrt(x), x, 1, 2))
++            sage: RBF(integral(sqrt(x), x, 1, 2))  # long time
+             [1.21895141649746 +/- 1.79e-15]
+             sage: wrong = CBF.integral(lambda z, _: z.sqrt(), 1, 2) # WRONG!
+             sage: correct - wrong
+@@ -915,9 +915,9 @@ class ComplexBallField(UniqueRepresentation, Field):
+         the integrand is unbounded::
+ 
+             sage: CBF.integral(lambda x, _: 1/x, -1, 1)
+-            [+/- inf] + [+/- inf]*I
++            nan + nan*I
+             sage: CBF.integral(lambda x, _: 1/x, 10^-1000, 1)
+-            [+/- inf] + [+/- inf]*I
++            nan + nan*I
+             sage: CBF.integral(lambda x, _: 1/x, 10^-1000, 1, abs_tol=1e-10)
+             [2302.5850930 +/- 1.26e-8]
+ 
+@@ -928,14 +928,15 @@ class ComplexBallField(UniqueRepresentation, Field):
+             sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, abs_tol=1e-450)
+             [2.304377150950e-439 +/- 9.74e-452]
+             sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, abs_tol=0)
+-            [2.304377150949e-439 +/- 7.53e-452]
+-            sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, rel_tol=1e-4, abs_tol=0)
+-            [2.30438e-439 +/- 3.90e-445]
++            [2.304377150950e-439 +/- 7...e-452]
++            sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, rel_tol=1e-2, abs_tol=0)
++            [2.30438e-439 +/- 5.94e-445]
+ 
+-            sage: CBF.integral(lambda x, _: x*(1/x).sin(), 0, 1)
+-            [+/- 0.644]
+-            sage: CBF.integral(lambda x, _: x*(1/x).sin(), 0, 1, use_heap=True)
+-            [0.3785300 +/- 4.32e-8]
++            sage: epsi = CBF(1e-10)
++            sage: CBF.integral(lambda x, _: x*(1/x).sin(), epsi, 1)
++            [0.38 +/- 8.54e-3]
++            sage: CBF.integral(lambda x, _: x*(1/x).sin(), epsi, 1, use_heap=True)
++            [0.37853002 +/- 8.73e-9]
+ 
+         ALGORITHM:
+ 
+@@ -951,12 +952,12 @@ class ComplexBallField(UniqueRepresentation, Field):
+ 
+             sage: i = QuadraticField(-1).gen()
+             sage: CBF.integral(lambda x, _: (1 + i*x).gamma(), -1, 1)
+-            [1.5723926694981 +/- 4.53e-14] + [+/- 3.95e-15]*I
++            [1.5723926694981 +/- 4...e-14] + [+/- 4...e-15]*I
+ 
+-            sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, rel_tol=1e-400)
+-            [0.459... +/- ...e-4...]
++            sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, rel_tol=1e-300)
++            [0.459... +/- ...e-3...]
+             sage: CBF.integral(lambda x, _: x.sin(), 0, 100, rel_tol=10)
+-            [+/- 7.61]
++            [0.138 +/- 5.53e-4]
+ 
+             sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, abs_tol=1e-400)
+             [0.459697... +/- ...e-4...]
+@@ -2389,9 +2390,9 @@ cdef class ComplexBall(RingElement):
+             sage: ~CBF(i/3)
+             [-3.00000000000000 +/- 9.44e-16]*I
+             sage: ~CBF(0)
+-            [+/- inf]
++            nan
+             sage: ~CBF(RIF(10,11))
+-            [0.1 +/- 9.53e-3]
++            [0.1 +/- 9.10e-3]
+         """
+         cdef ComplexBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
+@@ -2512,9 +2513,9 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(-2, 1)/CBF(1, 1/3)
+             [-1.500000000000000 +/- 8.83e-16] + [1.500000000000000 +/- 5.64e-16]*I
+             sage: CBF(2+I)/CBF(0)
+-            [+/- inf] + [+/- inf]*I
++            nan + nan*I
+             sage: CBF(1)/CBF(0)
+-            [+/- inf]
++            nan
+             sage: CBF(1)/CBF(RBF(0, 1.))
+             nan
+         """
+@@ -2543,9 +2544,9 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(0)^(1/3)
+             0
+             sage: CBF(0)^(-1)
+-            [+/- inf]
++            nan
+             sage: CBF(0)^(-2)
+-            [+/- inf] + [+/- inf]*I
++            nan + nan*I
+ 
+         TESTS::
+ 
+@@ -2656,12 +2657,12 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(1).rising_factorial(5)
+             120.0000000000000
+             sage: CBF(1/3, 1/2).rising_factorial(300)
+-            [-3.87949484514e+612 +/- 5.23e+600] + [-3.52042209763e+612 +/- 5.55e+600]*I
++            [-3.87949484514e+612 +/- 5...e+600] + [-3.52042209763e+612 +/- 5...e+600]*I
+ 
+             sage: CBF(1).rising_factorial(-1)
+             nan
+             sage: CBF(1).rising_factorial(2**64)
+-            [+/- 2.30e+347382171305201370464]
++            [+/- 2.30e+347382171326740403407]
+             sage: ComplexBallField(128)(1).rising_factorial(2**64)
+             [2.343691126796861348e+347382171305201285713 +/- 4.71e+347382171305201285694]
+             sage: CBF(1/2).rising_factorial(CBF(2,3))
+@@ -2700,7 +2701,7 @@ cdef class ComplexBall(RingElement):
+             [1.000000000000000 +/- 2.83e-16] + [-0.441271200305303 +/- 2.82e-16]*I
+ 
+             sage: CBF('inf').log()
+-            nan + nan*I
++            [+/- inf]
+             sage: CBF(2).log(0)
+             nan + nan*I
+         """
+@@ -2808,7 +2809,7 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(pi/2, 1/10).tan()
+             [+/- 2.87e-14] + [10.0333111322540 +/- 2.36e-14]*I
+             sage: CBF(pi/2).tan()
+-            [+/- inf]
++            nan
+         """
+         cdef ComplexBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
+@@ -2825,7 +2826,7 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(pi, 1/10).cot()
+             [+/- 5.74e-14] + [-10.0333111322540 +/- 2.81e-14]*I
+             sage: CBF(pi).cot()
+-            [+/- inf]
++            nan
+         """
+         cdef ComplexBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
+@@ -3211,9 +3212,9 @@ cdef class ComplexBall(RingElement):
+             1.000000000000000*I
+ 
+             sage: CBF(2+3*I).hypergeometric([1/4,1/3],[1/2])
+-            [0.7871684267473 +/- 7.34e-14] + [0.2749254173721 +/- 9.23e-14]*I
++            [0.7871684267473 +/- 7...e-14] + [0.2749254173721 +/- 9...e-14]*I
+             sage: CBF(2+3*I).hypergeometric([1/4,1/3],[1/2],regularized=True)
+-            [0.4441122268685 +/- 3.96e-14] + [0.1551100567338 +/- 5.75e-14]*I
++            [0.4441122268685 +/- 3...e-14] + [0.1551100567338 +/- 5...e-14]*I
+ 
+             sage: CBF(5).hypergeometric([2,3], [-5])
+             nan + nan*I
+@@ -4041,9 +4042,9 @@ cdef class ComplexBall(RingElement):
+ 
+             sage: phi = CBF(1,1)
+             sage: (CBF.pi()/2).elliptic_e_inc(phi)
+-            [1.283840957898 +/- 3.23e-13] + [-0.5317843366915 +/- 7.79e-14]*I
++            [1.283840957898 +/- 3...e-13] + [-0.5317843366915 +/- 7...e-14]*I
+             sage: phi.elliptic_e()
+-            [1.2838409578982 +/- 5.90e-14] + [-0.5317843366915 +/- 3.35e-14]*I
++            [1.2838409578982 +/- 5...e-14] + [-0.5317843366915 +/- 3...e-14]*I
+ 
+             sage: phi = CBF(2, 3/7)
+             sage: (CBF.pi()/2).elliptic_e_inc(phi)
+@@ -4312,8 +4313,7 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(10).laguerre_L(3, 2)
+             [-6.666666666667 +/- 4.15e-13]
+             sage: CBF(5,7).laguerre_L(CBF(2,3), CBF(1,-2))
+-            [5515.315030271 +/- 4.37e-10] + [-12386.942845271 +/- 5.47e-10]*I
+-
++            [5515.315030271 +/- 4...e-10] + [-12386.942845271 +/- 5...e-10]*I
+         """
+         cdef ComplexBall my_n = self._parent.coerce(n)
+         cdef ComplexBall my_m = self._parent.coerce(m)
+@@ -4357,9 +4357,9 @@ cdef class ComplexBall(RingElement):
+         EXAMPLES::
+ 
+             sage: CBF(1/2).legendre_P(5)
+-            [0.08984375000000000 +/- 4.5...e-18]
++            [0.0898437500000000 +/- 7...e-17]
+             sage: CBF(1,2).legendre_P(CBF(2,3), CBF(0,1))
+-            [0.10996180744364 +/- 7.45e-15] + [0.14312767804055 +/- 8.38e-15]*I
++            [0.10996180744364 +/- 7.12e-15] + [0.14312767804055 +/- 8.07e-15]*I
+             sage: CBF(-10).legendre_P(5, 325/100)
+             [-22104403.487377 +/- 6.81e-7] + [53364750.687392 +/- 7.25e-7]*I
+             sage: CBF(-10).legendre_P(5, 325/100, type=3)
+@@ -4393,9 +4393,9 @@ cdef class ComplexBall(RingElement):
+             sage: CBF(1/2).legendre_Q(5)
+             [0.55508089057168 +/- 2.79e-15]
+             sage: CBF(1,2).legendre_Q(CBF(2,3), CBF(0,1))
+-            [0.167678710 +/- 4.60e-10] + [-0.161558598 +/- 7.47e-10]*I
++            [0.167678710 +/- 3.91e-10] + [-0.161558598 +/- 6.77e-10]*I
+             sage: CBF(-10).legendre_Q(5, 325/100)
+-            [-83825154.36008 +/- 4.94e-6] + [-34721515.80396 +/- 5.40e-6]*I
++            [-83825154.36008 +/- 5.02e-6] + [-34721515.80396 +/- 5.42e-6]*I
+             sage: CBF(-10).legendre_Q(5, 325/100, type=3)
+             [-4.797306921692e-6 +/- 6.82e-19] + [-4.797306921692e-6 +/- 6.57e-19]*I
+ 
+diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pyx b/src/sage/rings/polynomial/polynomial_complex_arb.pyx
+index c436d4705b..ef611a566b 100644
+--- a/src/sage/rings/polynomial/polynomial_complex_arb.pyx
++++ b/src/sage/rings/polynomial/polynomial_complex_arb.pyx
+@@ -543,7 +543,7 @@ cdef class Polynomial_complex_arb(Polynomial):
+             sage: (1 - x/3).inverse_series_trunc(3)
+             ([0.1111111111111111 +/- 5.99e-17])*x^2 + ([0.3333333333333333 +/- 7.04e-17])*x + 1.000000000000000
+             sage: x.inverse_series_trunc(1)
+-            [+/- inf]
++            nan
+             sage: Pol(0).inverse_series_trunc(2)
+             (nan + nan*I)*x + nan + nan*I
+ 
+@@ -671,7 +671,7 @@ cdef class Polynomial_complex_arb(Polynomial):
+             sage: pol._sqrt_series(2)
+             ([+/- 7.51e-3] + [+/- 0.501]*I)*x + [+/- 5.01e-3] + [+/- 1.01]*I
+             sage: x._sqrt_series(2)
+-            ([+/- inf] + [+/- inf]*I)*x
++            (nan + nan*I)*x
+         """
+         cdef Polynomial_complex_arb res = self._new()
+         if n < 0:
+diff --git a/src/sage/rings/real_arb.pyx b/src/sage/rings/real_arb.pyx
+index c9f68e38d7..76e3037a9a 100644
+--- a/src/sage/rings/real_arb.pyx
++++ b/src/sage/rings/real_arb.pyx
+@@ -161,7 +161,7 @@ values and should be preferred::
+ 
+     sage: RBF(NaN) < RBF(infinity)
+     False
+-    sage: 1/RBF(0) <= RBF(infinity)
++    sage: RBF(0).add_error(infinity) <= RBF(infinity)
+     True
+ 
+ TESTS::
+@@ -252,6 +252,8 @@ cdef void mpfi_to_arb(arb_t target, const mpfi_t source, const long precision):
+         (+infinity, +infinity)
+         sage: RBF(RIF(-infinity)).endpoints()
+         (-infinity, -infinity)
++        sage: RBF(RIF(-infinity, infinity)).endpoints()
++        (-infinity, +infinity)
+         sage: RIF(RBF(infinity)).endpoints()
+         (+infinity, +infinity)
+         sage: RIF(RBF(-infinity)).endpoints()
+@@ -266,10 +268,11 @@ cdef void mpfi_to_arb(arb_t target, const mpfi_t source, const long precision):
+     if _do_sig(precision): sig_on()
+     mpfi_get_left(left, source)
+     mpfi_get_right(right, source)
+-    arb_set_interval_mpfr(target, left, right, precision)
+-    # Work around weakness of arb_set_interval_mpfr(tgt, inf, inf)
+-    if mpfr_equal_p(left, right):
+-        mag_zero(arb_radref(target))
++    if mpfr_inf_p(left) and mpfr_inf_p(right) and mpfr_sgn(left) < 0 < mpfr_sgn(right):
++        # Work around a weakness of arb_set_interval_mpfr(tgt, -inf, inf)
++        arb_zero_pm_inf(target)
++    else:
++        arb_set_interval_mpfr(target, left, right, precision)
+     if _do_sig(precision): sig_off()
+ 
+     mpfr_clear(left)
+@@ -649,17 +652,15 @@ class RealBallField(UniqueRepresentation, Field):
+         EXAMPLES::
+ 
+             sage: RBF.some_elements()
+-            [1.000000000000000,
+-            [0.3333333333333333 +/- 7.04e-17],
++            [0, 1.000000000000000, [0.3333333333333333 +/- 7.04e-17],
+             [-4.733045976388941e+363922934236666733021124 +/- 3.46e+363922934236666733021108],
+-            [+/- inf],
+-            [+/- inf],
+-            nan]
++            [+/- inf], [+/- inf], [+/- inf], nan]
+         """
+         import sage.symbolic.constants
+-        return [self(1), self(1)/3,
++        inf = self(sage.rings.infinity.Infinity)
++        return [self(0), self(1), self(1)/3,
+                 -self(2)**(Integer(2)**80),
+-                self(sage.rings.infinity.Infinity), ~self(0),
++                inf, -inf, self.zero().add_error(inf),
+                 self.element_class(self, sage.symbolic.constants.NotANumber())]
+ 
+     def _sum_of_products(self, terms):
+@@ -881,7 +882,7 @@ class RealBallField(UniqueRepresentation, Field):
+             sage: RBF.gamma(5)
+             24.00000000000000
+             sage: RBF.gamma(10**20)
+-            [+/- 5.92e+1956570551809674821757]
++            [+/- 5.50e+1956570552410610660600]
+             sage: RBF.gamma(1/3)
+             [2.678938534707747 +/- 8.99e-16]
+             sage: RBF.gamma(-5)
+@@ -2247,7 +2248,7 @@ cdef class RealBall(RingElement):
+             sage: inf = RBF(+infinity)
+             sage: other_inf = RBF(+infinity, 42.r)
+             sage: neg_inf = RBF(-infinity)
+-            sage: extended_line = 1/RBF(0)
++            sage: extended_line = RBF(0).add_error(infinity)
+             sage: exact_nan = inf - inf
+             sage: exact_nan.mid(), exact_nan.rad()
+             (NaN, 0.00000000)
+@@ -2659,7 +2660,7 @@ cdef class RealBall(RingElement):
+             sage: ~RBF(5)
+             [0.2000000000000000 +/- 4.45e-17]
+             sage: ~RBF(0)
+-            [+/- inf]
++            nan
+             sage: RBF(RIF(-0.1,0.1))
+             [+/- 0.101]
+ 
+@@ -2739,7 +2740,7 @@ cdef class RealBall(RingElement):
+             sage: RBF(pi)/RBF(e)
+             [1.155727349790922 +/- 8.43e-16]
+             sage: RBF(2)/RBF(0)
+-            [+/- inf]
++            nan
+         """
+         cdef RealBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
+@@ -2765,7 +2766,7 @@ cdef class RealBall(RingElement):
+             sage: RBF(-1)^(1/3)
+             nan
+             sage: RBF(0)^(-1)
+-            [+/- inf]
++            nan
+             sage: RBF(-e)**RBF(pi)
+             nan
+ 
+@@ -3129,7 +3130,7 @@ cdef class RealBall(RingElement):
+             sage: RBF(1).tan()
+             [1.557407724654902 +/- 3.26e-16]
+             sage: RBF(pi/2).tan()
+-            [+/- inf]
++            nan
+         """
+         cdef RealBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
+@@ -3146,7 +3147,7 @@ cdef class RealBall(RingElement):
+             sage: RBF(1).cot()
+             [0.642092615934331 +/- 4.79e-16]
+             sage: RBF(pi).cot()
+-            [+/- inf]
++            nan
+         """
+         cdef RealBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
+@@ -3257,7 +3258,7 @@ cdef class RealBall(RingElement):
+             sage: RBF(1).coth()
+             [1.313035285499331 +/- 4.97e-16]
+             sage: RBF(0).coth()
+-            [+/- inf]
++            nan
+         """
+         cdef RealBall res = self._new()
+         if _do_sig(prec(self)): sig_on()
diff --git a/pkgs/applications/science/math/sage/patches/dochtml-optional.patch b/pkgs/applications/science/math/sage/patches/dochtml-optional.patch
new file mode 100644
index 0000000000000..a51e30312ed94
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/dochtml-optional.patch
@@ -0,0 +1,127 @@
+diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py
+index 25f94f7b7d..9f6139ea4a 100644
+--- a/src/doc/common/conf.py
++++ b/src/doc/common/conf.py
+@@ -622,9 +622,9 @@ def call_intersphinx(app, env, node, contnode):
+     Check that the link from the thematic tutorials to the reference
+     manual is relative, see :trac:`20118`::
+ 
+-        sage: from sage.env import SAGE_DOC
+-        sage: thematic_index = os.path.join(SAGE_DOC, "html", "en", "thematic_tutorials", "index.html")
+-        sage: for line in open(thematic_index).readlines():
++        sage: from sage.env import SAGE_DOC  # optional - dochtml
++        sage: thematic_index = os.path.join(SAGE_DOC, "html", "en", "thematic_tutorials", "index.html")  # optional - dochtml
++        sage: for line in open(thematic_index).readlines():  # optional - dochtml
+         ....:     if "padics" in line:
+         ....:         sys.stdout.write(line)
+         <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics ...)"><span>Introduction to the -adics</span></a></li>
+diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
+index 4236fd05e0..8e499cbaf7 100644
+--- a/src/sage/doctest/control.py
++++ b/src/sage/doctest/control.py
+@@ -87,7 +87,7 @@ class DocTestDefaults(SageObject):
+         self.sagenb = False
+         self.long = False
+         self.warn_long = None
+-        self.optional = set(['sage']) | auto_optional_tags
++        self.optional = set(['sage', 'dochtml']) | auto_optional_tags
+         self.randorder = None
+         self.global_iterations = 1  # sage-runtests default is 0
+         self.file_iterations = 1    # sage-runtests default is 0
+@@ -343,7 +343,8 @@ class DocTestController(SageObject):
+                     if not optionaltag_regex.search(o):
+                         raise ValueError('invalid optional tag {!r}'.format(o))
+ 
+-                options.optional |= auto_optional_tags
++                if "sage" in options.optional:
++                    options.optional |= auto_optional_tags
+ 
+         self.options = options
+         self.files = args
+@@ -741,7 +742,7 @@ class DocTestController(SageObject):
+             sage: DC = DocTestController(DD, [dirname])
+             sage: DC.expand_files_into_sources()
+             sage: sorted(DC.sources[0].options.optional)  # abs tol 1
+-            ['guava', 'magma', 'py3']
++            ['guava', 'magma']
+ 
+         We check that files are skipped appropriately::
+ 
+@@ -968,7 +969,7 @@ class DocTestController(SageObject):
+             sage: from sage.doctest.control import DocTestDefaults, DocTestController
+             sage: DC = DocTestController(DocTestDefaults(), [])
+             sage: DC._optional_tags_string()
+-            'sage'
++            'dochtml,sage'
+             sage: DC = DocTestController(DocTestDefaults(optional="all,and,some,more"), [])
+             sage: DC._optional_tags_string()
+             'all'
+diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
+index 9255aa848f..cc4712d3ec 100644
+--- a/src/sage/misc/sagedoc.py
++++ b/src/sage/misc/sagedoc.py
+@@ -18,9 +18,9 @@ TESTS:
+ Check that argspecs of extension function/methods appear correctly,
+ see :trac:`12849`::
+ 
+-    sage: from sage.env import SAGE_DOC
+-    sage: docfilename = os.path.join(SAGE_DOC, 'html', 'en', 'reference', 'calculus', 'sage', 'symbolic', 'expression.html')
+-    sage: with open(docfilename) as fobj:
++    sage: from sage.env import SAGE_DOC  # optional - dochtml
++    sage: docfilename = os.path.join(SAGE_DOC, 'html', 'en', 'reference', 'calculus', 'sage', 'symbolic', 'expression.html')  # optional - dochtml
++    sage: with open(docfilename) as fobj:  # optional - dochtml
+     ....:     for line in fobj:
+     ....:         if "#sage.symbolic.expression.Expression.numerical_approx" in line:
+     ....:             print(line)
+@@ -790,11 +790,12 @@ def _search_src_or_doc(what, string, extra1='', extra2='', extra3='',
+ 
+     ::
+ 
+-        sage: len(_search_src_or_doc('src', r'matrix\(', 'incidence_structures', 'self', 'combinat', interact=False).splitlines()) > 1
++        sage: from sage.misc.sagedoc import _search_src_or_doc  # optional - dochtml
++        sage: len(_search_src_or_doc('src', r'matrix\(', 'incidence_structures', 'self', 'combinat', interact=False).splitlines()) > 1  # optional - dochtml
+         True
+-        sage: 'abvar/homology' in _search_src_or_doc('doc', 'homology', 'variety', interact=False)  # long time (4s on sage.math, 2012)
++        sage: 'abvar/homology' in _search_src_or_doc('doc', 'homology', 'variety', interact=False)  # optional - dochtml, long time (4s on sage.math, 2012)
+         True
+-        sage: 'divisors' in _search_src_or_doc('src', '^ *def prime', interact=False)
++        sage: 'divisors' in _search_src_or_doc('src', '^ *def prime', interact=False)  # optional - dochtml
+         True
+     """
+     # process keywords
+@@ -1160,9 +1161,9 @@ def search_doc(string, extra1='', extra2='', extra3='', extra4='',
+     counting the length of ``search_doc('tree',
+     interact=False).splitlines()`` gives the number of matches. ::
+ 
+-        sage: len(search_doc('tree', interact=False).splitlines()) > 4000  # long time
++        sage: len(search_doc('tree', interact=False).splitlines()) > 4000  # optional - dochtml, long time
+         True
+-        sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000  # long time
++        sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000  # optional - dochtml, long time
+         True
+     """
+     return _search_src_or_doc('doc', string, extra1=extra1, extra2=extra2,
+@@ -1332,9 +1333,9 @@ class _sage_doc:
+ 
+     EXAMPLES::
+ 
+-        sage: browse_sage_doc._open("reference", testing=True)[0]  # indirect doctest
++        sage: browse_sage_doc._open("reference", testing=True)[0]  # optional - dochtml, indirect doctest
+         'http://localhost:8000/doc/live/reference/index.html'
+-        sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47]
++        sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47]  # optional - dochtml
+         'Full MatrixSpace of 3 by 3 sparse matrices over Integer Ring'
+     """
+     def __init__(self):
+@@ -1494,9 +1495,9 @@ class _sage_doc:
+ 
+         EXAMPLES::
+ 
+-            sage: browse_sage_doc._open("reference", testing=True)[0]
++            sage: browse_sage_doc._open("reference", testing=True)[0]  # optional - dochtml
+             'http://localhost:8000/doc/live/reference/index.html'
+-            sage: browse_sage_doc._open("tutorial", testing=True)[1]
++            sage: browse_sage_doc._open("tutorial", testing=True)[1]  # optional - dochtml
+             '.../html/en/tutorial/index.html'
+         """
+         url = self._base_url + os.path.join(name, "index.html")
diff --git a/pkgs/applications/science/math/sage/patches/eclib-regulator-precision.patch b/pkgs/applications/science/math/sage/patches/eclib-regulator-precision.patch
new file mode 100644
index 0000000000000..a1464b8fe3108
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/eclib-regulator-precision.patch
@@ -0,0 +1,98 @@
+diff --git a/src/sage/libs/eclib/interface.py b/src/sage/libs/eclib/interface.py
+index f77000c478..9d17d412ae 100644
+--- a/src/sage/libs/eclib/interface.py
++++ b/src/sage/libs/eclib/interface.py
+@@ -1014,7 +1014,7 @@ class mwrank_MordellWeil(SageObject):
+             WARNING: saturation at primes p > 2 will not be done;
+             ...
+             Gained index 2
+-            New regulator =  93.857300720636393209
++            New regulator =  93.85730...
+             (False, 2, '[ ]')
+             sage: EQ.points()
+             [[-2, 3, 1], [2707496766203306, 864581029138191, 2969715140223272], [-13422227300, -49322830557, 12167000000]]
+@@ -1025,7 +1025,7 @@ class mwrank_MordellWeil(SageObject):
+             WARNING: saturation at primes p > 3 will not be done;
+             ...
+             Gained index 3
+-            New regulator =  10.4285889689595992455
++            New regulator =  10.42858...
+             (False, 3, '[ ]')
+             sage: EQ.points()
+             [[-2, 3, 1], [-14, 25, 8], [-13422227300, -49322830557, 12167000000]]
+@@ -1036,7 +1036,7 @@ class mwrank_MordellWeil(SageObject):
+             WARNING: saturation at primes p > 5 will not be done;
+             ...
+             Gained index 5
+-            New regulator =  0.417143558758383969818
++            New regulator =  0.41714...
+             (False, 5, '[ ]')
+             sage: EQ.points()
+             [[-2, 3, 1], [-14, 25, 8], [1, -1, 1]]
+@@ -1221,7 +1221,7 @@ class mwrank_MordellWeil(SageObject):
+             WARNING: saturation at primes p > 2 will not be done;
+             ...
+             Gained index 2
+-            New regulator =  93.857300720636393209
++            New regulator =  93.85730...
+             (False, 2, '[ ]')
+             sage: EQ
+             Subgroup of Mordell-Weil group: [[-2:3:1], [2707496766203306:864581029138191:2969715140223272], [-13422227300:-49322830557:12167000000]]
+@@ -1235,7 +1235,7 @@ class mwrank_MordellWeil(SageObject):
+             WARNING: saturation at primes p > 3 will not be done;
+             ...
+             Gained index 3
+-            New regulator =  10.4285889689595992455
++            New regulator =  10.42858...
+             (False, 3, '[ ]')
+             sage: EQ
+             Subgroup of Mordell-Weil group: [[-2:3:1], [-14:25:8], [-13422227300:-49322830557:12167000000]]
+@@ -1249,7 +1249,7 @@ class mwrank_MordellWeil(SageObject):
+             WARNING: saturation at primes p > 5 will not be done;
+             ...
+             Gained index 5
+-            New regulator =  0.417143558758383969818
++            New regulator =  0.41714...
+             (False, 5, '[ ]')
+             sage: EQ
+             Subgroup of Mordell-Weil group: [[-2:3:1], [-14:25:8], [1:-1:1]]
+diff --git a/src/sage/libs/eclib/mwrank.pyx b/src/sage/libs/eclib/mwrank.pyx
+index a4f89e1ca5..f8a22d2f55 100644
+--- a/src/sage/libs/eclib/mwrank.pyx
++++ b/src/sage/libs/eclib/mwrank.pyx
+@@ -1234,9 +1234,9 @@ cdef class _two_descent:
+             sage: D2.saturate()
+             Searching for points (bound = 8)...done:
+               found points which generate a subgroup of rank 3
+-              and regulator 0.417143558758383969817119544618093396749810106098479
++              and regulator 0.41714...
+             Processing points found during 2-descent...done:
+-              now regulator = 0.417143558758383969817119544618093396749810106098479
++              now regulator = 0.41714...
+             No saturation being done
+             sage: D2.getbasis()
+             '[[1:-1:1], [-2:3:1], [-14:25:8]]'
+@@ -1281,9 +1281,9 @@ cdef class _two_descent:
+             sage: D2.saturate()
+             Searching for points (bound = 8)...done:
+               found points which generate a subgroup of rank 3
+-              and regulator 0.417143558758383969817119544618093396749810106098479
++              and regulator 0.41714...
+             Processing points found during 2-descent...done:
+-              now regulator = 0.417143558758383969817119544618093396749810106098479
++              now regulator = 0.41714...
+             No saturation being done
+             sage: D2.getbasis()
+             '[[1:-1:1], [-2:3:1], [-14:25:8]]'
+@@ -1329,9 +1329,9 @@ cdef class _two_descent:
+             sage: D2.saturate()
+             Searching for points (bound = 8)...done:
+               found points which generate a subgroup of rank 3
+-              and regulator 0.417143558758383969817119544618093396749810106098479
++              and regulator 0.41714...
+             Processing points found during 2-descent...done:
+-              now regulator = 0.417143558758383969817119544618093396749810106098479
++              now regulator = 0.41714...
+             No saturation being done
+             sage: D2.getbasis()
+             '[[1:-1:1], [-2:3:1], [-14:25:8]]'
diff --git a/pkgs/applications/science/math/sage/patches/matplotlib-normed-deprecated.patch b/pkgs/applications/science/math/sage/patches/matplotlib-normed-deprecated.patch
new file mode 100644
index 0000000000000..41747635cacdf
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/matplotlib-normed-deprecated.patch
@@ -0,0 +1,12 @@
+diff --git a/src/sage/all.py b/src/sage/all.py
+index 14cec431f1..25a35a0522 100644
+--- a/src/sage/all.py
++++ b/src/sage/all.py
+@@ -310,6 +310,7 @@ warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0))
+ # Ignore all deprecations from IPython etc.
+ warnings.filterwarnings('ignore',
+     module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)')
++warnings.filterwarnings('ignore', "The 'normed' kwarg is deprecated, and has been replaced by the 'density' kwarg.") # matplotlib normed deprecation
+ # However, be sure to keep OUR deprecation warnings
+ warnings.filterwarnings('default',
+     '[\s\S]*See http://trac.sagemath.org/[0-9]* for details.')
diff --git a/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch b/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch
new file mode 100644
index 0000000000000..fad434e52adab
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch
@@ -0,0 +1,48 @@
+diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py
+index 961c20aaac..3d601d8939 100644
+--- a/src/sage/interfaces/maxima_abstract.py
++++ b/src/sage/interfaces/maxima_abstract.py
+@@ -1743,7 +1743,7 @@ class MaximaAbstractElement(ExtraTabCompletion, InterfaceElement):
+             sage: y,d = var('y,d')
+             sage: f = function('f')
+             sage: latex(maxima(derivative(f(x*y), x)))
+-            \left(\left.{{{\it \partial}}\over{{\it \partial}\,  {\it t_0}}}\,f\left({\it t_0}\right)  \right|_{{\it t_0}={\it x}\,  {\it y}}\right)\,{\it y}
++            \left(\left.{{{\it \partial}}\over{{\it \partial}\,  {\it t}_{0}}}\,f\left({\it t}_{0}\right)  \right|_{{\it t}_{0}={\it x}\,  {\it y}}\right)\,{\it y}
+             sage: latex(maxima(derivative(f(x,y,d), d,x,x,y)))
+             {{{\it \partial}^4}\over{{\it \partial}\,{\it d}\,  {\it \partial}\,{\it x}^2\,{\it \partial}\,  {\it y}}}\,f\left({\it x} ,  {\it y} , {\it d}\right)
+             sage: latex(maxima(d/(d-2)))
+diff --git a/src/sage/manifolds/differentiable/metric.py b/src/sage/manifolds/differentiable/metric.py
+index 3cd6ad3235..1e18af1a6b 100644
+--- a/src/sage/manifolds/differentiable/metric.py
++++ b/src/sage/manifolds/differentiable/metric.py
+@@ -993,7 +993,7 @@ class PseudoRiemannianMetric(TensorField):
+              2-dimensional differentiable manifold S^2
+             sage: g.riemann()[:]
+             [[[[0, 0], [0, 0]], [[0, sin(th)^2], [-sin(th)^2, 0]]],
+-             [[[0, (cos(th)^2 - 1)/sin(th)^2], [1, 0]], [[0, 0], [0, 0]]]]
++             [[[0, -1], [1, 0]], [[0, 0], [0, 0]]]]
+ 
+         In dimension 2, the Riemann tensor can be expressed entirely in terms of
+         the Ricci scalar `r`:
+diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
+index dfb8751467..27402e54ab 100644
+--- a/src/sage/symbolic/expression.pyx
++++ b/src/sage/symbolic/expression.pyx
+@@ -7154,7 +7154,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: ex = lcm(sin(x)^2 - 1, sin(x)^2 + sin(x)); ex
+             (sin(x)^2 + sin(x))*(sin(x)^2 - 1)/(sin(x) + 1)
+             sage: ex.simplify_full()
+-            -cos(x)^2*sin(x)
++            sin(x)^3 - sin(x)
+ 
+         TESTS:
+ 
+@@ -10004,7 +10004,7 @@ cdef class Expression(CommutativeRingElement):
+ 
+             sage: f=tan(3*x)
+             sage: f.simplify_trig()
+-            (4*cos(x)^2 - 1)*sin(x)/(4*cos(x)^3 - 3*cos(x))
++            -(4*cos(x)^2 - 1)*sin(x)/(4*cos(x)*sin(x)^2 - cos(x))
+             sage: f.simplify_trig(False)
+             sin(3*x)/cos(3*x)
+ 
diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch b/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
new file mode 100644
index 0000000000000..5927bc116096c
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
@@ -0,0 +1,812 @@
+diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst
+index 79b4205fd3..9a89bd2136 100644
+--- a/src/doc/en/faq/faq-usage.rst
++++ b/src/doc/en/faq/faq-usage.rst
+@@ -338,7 +338,7 @@ ints. For example::
+     sage: RealNumber = float; Integer = int
+     sage: from scipy import stats
+     sage: stats.ttest_ind(list([1,2,3,4,5]),list([2,3,4,5,.6]))
+-    Ttest_indResult(statistic=0.076752955645333687, pvalue=0.94070490247380478)
++    Ttest_indResult(statistic=0.0767529..., pvalue=0.940704...)
+     sage: stats.uniform(0,15).ppf([0.5,0.7])
+     array([  7.5,  10.5])
+ 
+diff --git a/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst b/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst
+index 314811c42b..e5f54ec4c2 100644
+--- a/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst
++++ b/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst
+@@ -48,11 +48,13 @@ we could do the following.
+     sage: B = numpy.array([1.0]*5)
+     sage: B.shape=(5,1)
+     sage: print(B)
+-    [[ 1.]
+-     [ 1.]
+-     [ 1.]
+-     [ 1.]
+-     [ 1.]]
++    [[1.]
++     [1.]
++     [1.]
++     [1.]
++     [1.]]
++
++
+     sage: print(A)
+     [ 2.00e+00  3.00e+00     0         0         0    ]
+     [ 3.00e+00     0      4.00e+00     0      6.00e+00]
+diff --git a/src/doc/en/thematic_tutorials/numerical_sage/numpy.rst b/src/doc/en/thematic_tutorials/numerical_sage/numpy.rst
+index 5b89cd75ee..e50b2ea5d4 100644
+--- a/src/doc/en/thematic_tutorials/numerical_sage/numpy.rst
++++ b/src/doc/en/thematic_tutorials/numerical_sage/numpy.rst
+@@ -84,7 +84,7 @@ well as take slices
+     sage: l[3]
+     3.0
+     sage: l[3:6]
+-    array([ 3.,  4.,  5.])
++    array([3., 4., 5.])
+ 
+ You can do basic arithmetic operations
+ 
+@@ -147,11 +147,11 @@ also do matrix vector multiplication, and matrix addition
+     sage: n = numpy.matrix([[1,2],[3,4]],dtype=float)
+     sage: v = numpy.array([[1],[2]],dtype=float)
+     sage: n*v
+-    matrix([[  5.],
+-            [ 11.]])
++    matrix([[ 5.],
++            [11.]])
+     sage: n+n
+-    matrix([[ 2.,  4.],
+-            [ 6.,  8.]])
++    matrix([[2., 4.],
++            [6., 8.]])
+ 
+ If ``n`` was created with :meth:`numpy.array`, then to do matrix vector
+ multiplication, you would use ``numpy.dot(n,v)``.
+@@ -170,11 +170,11 @@ to manipulate
+             22.,  23.,  24.])
+     sage: n.shape=(5,5)
+     sage: n
+-    array([[  0.,   1.,   2.,   3.,   4.],
+-           [  5.,   6.,   7.,   8.,   9.],
+-           [ 10.,  11.,  12.,  13.,  14.],
+-           [ 15.,  16.,  17.,  18.,  19.],
+-           [ 20.,  21.,  22.,  23.,  24.]])
++    array([[ 0.,  1.,  2.,  3.,  4.],
++           [ 5.,  6.,  7.,  8.,  9.],
++           [10., 11., 12., 13., 14.],
++           [15., 16., 17., 18., 19.],
++           [20., 21., 22., 23., 24.]])
+ 
+ This changes the one-dimensional array into a `5\times 5` array.
+ 
+@@ -187,8 +187,8 @@ NumPy arrays can be sliced as well
+     sage: n=numpy.array(range(25),dtype=float)
+     sage: n.shape=(5,5)
+     sage: n[2:4,1:3]
+-    array([[ 11.,  12.],
+-           [ 16.,  17.]])
++    array([[11., 12.],
++           [16., 17.]])
+ 
+ It is important to note that the sliced matrices are references to
+ the original
+@@ -224,8 +224,8 @@ Some particularly useful commands are
+ 
+     sage: x=numpy.arange(0,2,.1,dtype=float)
+     sage: x
+-    array([ 0. ,  0.1,  0.2,  0.3,  0.4,  0.5,  0.6,  0.7,  0.8,  0.9,  1. ,
+-            1.1,  1.2,  1.3,  1.4,  1.5,  1.6,  1.7,  1.8,  1.9])
++    array([0. , 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1. , 1.1, 1.2,
++           1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9])
+ 
+ You can see that :meth:`numpy.arange` creates an array of floats increasing by 0.1
+ from 0 to 2. There is a useful command :meth:`numpy.r_` that is best explained by example
+@@ -240,10 +240,11 @@ from 0 to 2. There is a useful command :meth:`numpy.r_` that is best explained b
+     sage: Integer=int
+     sage: n=r_[0.0:5.0]
+     sage: n
+-    array([ 0.,  1.,  2.,  3.,  4.])
++    array([0., 1., 2., 3., 4.])
+     sage: n=r_[0.0:5.0, [0.0]*5]
+     sage: n
+-    array([ 0.,  1.,  2.,  3.,  4.,  0.,  0.,  0.,  0.,  0.])
++    array([0., 1., 2., 3., 4., 0., 0., 0., 0., 0.])
++
+ 
+ :meth:`numpy.r_` provides a shorthand for constructing NumPy arrays efficiently.
+ Note in the above ``0.0:5.0`` was shorthand for ``0.0, 1.0, 2.0, 3.0, 4.0``.
+@@ -255,7 +256,7 @@ intervals. We can do this as follows
+ ::
+ 
+     sage: r_[0.0:5.0:11*j]
+-    array([ 0. ,  0.5,  1. ,  1.5,  2. ,  2.5,  3. ,  3.5,  4. ,  4.5,  5. ])
++    array([0. , 0.5, 1. , 1.5, 2. , 2.5, 3. , 3.5, 4. , 4.5, 5. ])
+ 
+ The notation ``0.0:5.0:11*j`` expands to a list of 11 equally space
+ points between 0 and 5 including both endpoints. Note that ``j`` is the
+@@ -287,23 +288,23 @@ an equally spaced grid with `\Delta x = \Delta y = .25` for
+     sage: y=numpy.r_[0.0:1.0:5*j]
+     sage: xx,yy= meshgrid(x,y)
+     sage: xx
+-    array([[ 0.  ,  0.25,  0.5 ,  0.75,  1.  ],
+-           [ 0.  ,  0.25,  0.5 ,  0.75,  1.  ],
+-           [ 0.  ,  0.25,  0.5 ,  0.75,  1.  ],
+-           [ 0.  ,  0.25,  0.5 ,  0.75,  1.  ],
+-           [ 0.  ,  0.25,  0.5 ,  0.75,  1.  ]])
++    array([[0.  , 0.25, 0.5 , 0.75, 1.  ],
++           [0.  , 0.25, 0.5 , 0.75, 1.  ],
++           [0.  , 0.25, 0.5 , 0.75, 1.  ],
++           [0.  , 0.25, 0.5 , 0.75, 1.  ],
++           [0.  , 0.25, 0.5 , 0.75, 1.  ]])
+     sage: yy
+-    array([[ 0.  ,  0.  ,  0.  ,  0.  ,  0.  ],
+-           [ 0.25,  0.25,  0.25,  0.25,  0.25],
+-           [ 0.5 ,  0.5 ,  0.5 ,  0.5 ,  0.5 ],
+-           [ 0.75,  0.75,  0.75,  0.75,  0.75],
+-           [ 1.  ,  1.  ,  1.  ,  1.  ,  1.  ]])
++    array([[0.  , 0.  , 0.  , 0.  , 0.  ],
++           [0.25, 0.25, 0.25, 0.25, 0.25],
++           [0.5 , 0.5 , 0.5 , 0.5 , 0.5 ],
++           [0.75, 0.75, 0.75, 0.75, 0.75],
++           [1.  , 1.  , 1.  , 1.  , 1.  ]])
+     sage: f(xx,yy)
+-    array([[ 0.    ,  0.0625,  0.25  ,  0.5625,  1.    ],
+-           [ 0.0625,  0.125 ,  0.3125,  0.625 ,  1.0625],
+-           [ 0.25  ,  0.3125,  0.5   ,  0.8125,  1.25  ],
+-           [ 0.5625,  0.625 ,  0.8125,  1.125 ,  1.5625],
+-           [ 1.    ,  1.0625,  1.25  ,  1.5625,  2.    ]])
++    array([[0.    , 0.0625, 0.25  , 0.5625, 1.    ],
++           [0.0625, 0.125 , 0.3125, 0.625 , 1.0625],
++           [0.25  , 0.3125, 0.5   , 0.8125, 1.25  ],
++           [0.5625, 0.625 , 0.8125, 1.125 , 1.5625],
++           [1.    , 1.0625, 1.25  , 1.5625, 2.    ]])
+ 
+ You can see that :meth:`numpy.meshgrid` produces a pair of matrices, here denoted
+ `xx` and `yy`, such that `(xx[i,j],yy[i,j])` has coordinates
+@@ -324,7 +325,7 @@ equation `Ax=b` do
+     sage: b=numpy.array(range(1,6))
+     sage: x=linalg.solve(A,b)
+     sage: numpy.dot(A,x)
+-    array([ 1.,  2.,  3.,  4., 5.])
++    array([1., 2., 3., 4., 5.])
+ 
+ This creates a random 5x5 matrix ``A``, and solves `Ax=b` where
+ ``b=[0.0,1.0,2.0,3.0,4.0]``. There are many other routines in the :mod:`numpy.linalg`
+diff --git a/src/sage/calculus/riemann.pyx b/src/sage/calculus/riemann.pyx
+index df85cce43d..34ea164be0 100644
+--- a/src/sage/calculus/riemann.pyx
++++ b/src/sage/calculus/riemann.pyx
+@@ -1191,30 +1191,30 @@ cpdef complex_to_spiderweb(np.ndarray[COMPLEX_T, ndim = 2] z_values,
+         sage: zval = numpy.array([[0, 1, 1000],[.2+.3j,1,-.3j],[0,0,0]],dtype = numpy.complex128)
+         sage: deriv = numpy.array([[.1]],dtype = numpy.float64)
+         sage: complex_to_spiderweb(zval, deriv,deriv, 4,4,[0,0,0],1,False,0.001)
+-        array([[[ 1.,  1.,  1.],
+-                [ 1.,  1.,  1.],
+-                [ 1.,  1.,  1.]],
++        array([[[1., 1., 1.],
++                [1., 1., 1.],
++                [1., 1., 1.]],
+         <BLANKLINE>
+-               [[ 1.,  1.,  1.],
+-                [ 0.,  0.,  0.],
+-                [ 1.,  1.,  1.]],
++               [[1., 1., 1.],
++                [0., 0., 0.],
++                [1., 1., 1.]],
+         <BLANKLINE>
+-               [[ 1.,  1.,  1.],
+-                [ 1.,  1.,  1.],
+-                [ 1.,  1.,  1.]]])
++               [[1., 1., 1.],
++                [1., 1., 1.],
++                [1., 1., 1.]]])
+ 
+         sage: complex_to_spiderweb(zval, deriv,deriv, 4,4,[0,0,0],1,True,0.001)
+-        array([[[ 1.        ,  1.        ,  1.        ],
+-                [ 1.        ,  0.05558355,  0.05558355],
+-                [ 0.17301243,  0.        ,  0.        ]],
++        array([[[1.        , 1.        , 1.        ],
++                [1.        , 0.05558355, 0.05558355],
++                [0.17301243, 0.        , 0.        ]],
+         <BLANKLINE>
+-               [[ 1.        ,  0.96804683,  0.48044583],
+-                [ 0.        ,  0.        ,  0.        ],
+-                [ 0.77351965,  0.5470393 ,  1.        ]],
++               [[1.        , 0.96804683, 0.48044583],
++                [0.        , 0.        , 0.        ],
++                [0.77351965, 0.5470393 , 1.        ]],
+         <BLANKLINE>
+-               [[ 1.        ,  1.        ,  1.        ],
+-                [ 1.        ,  1.        ,  1.        ],
+-                [ 1.        ,  1.        ,  1.        ]]])
++               [[1.        , 1.        , 1.        ],
++                [1.        , 1.        , 1.        ],
++                [1.        , 1.        , 1.        ]]])
+      """
+     cdef Py_ssize_t i, j, imax, jmax
+     cdef FLOAT_T x, y, mag, arg, width, target, precision, dmag, darg
+@@ -1279,14 +1279,14 @@ cpdef complex_to_rgb(np.ndarray[COMPLEX_T, ndim = 2] z_values):
+         sage: from sage.calculus.riemann import complex_to_rgb
+         sage: import numpy
+         sage: complex_to_rgb(numpy.array([[0, 1, 1000]], dtype = numpy.complex128))
+-        array([[[ 1.        ,  1.        ,  1.        ],
+-                [ 1.        ,  0.05558355,  0.05558355],
+-                [ 0.17301243,  0.        ,  0.        ]]])
++        array([[[1.        , 1.        , 1.        ],
++                [1.        , 0.05558355, 0.05558355],
++                [0.17301243, 0.        , 0.        ]]])
+ 
+         sage: complex_to_rgb(numpy.array([[0, 1j, 1000j]], dtype = numpy.complex128))
+-        array([[[ 1.        ,  1.        ,  1.        ],
+-                [ 0.52779177,  1.        ,  0.05558355],
+-                [ 0.08650622,  0.17301243,  0.        ]]])
++        array([[[1.        , 1.        , 1.        ],
++                [0.52779177, 1.        , 0.05558355],
++                [0.08650622, 0.17301243, 0.        ]]])
+ 
+ 
+     TESTS::
+diff --git a/src/sage/combinat/fully_packed_loop.py b/src/sage/combinat/fully_packed_loop.py
+index 61b1003002..4baee9cbbd 100644
+--- a/src/sage/combinat/fully_packed_loop.py
++++ b/src/sage/combinat/fully_packed_loop.py
+@@ -72,11 +72,11 @@ def _make_color_list(n, colors=None,  color_map=None, randomize=False):
+         sage: _make_color_list(5, ['blue', 'red'])
+         ['blue', 'red', 'blue', 'red', 'blue']
+         sage: _make_color_list(5, color_map='summer')
+-        [(0.0, 0.5, 0.40000000000000002),
+-         (0.25098039215686274, 0.62549019607843137, 0.40000000000000002),
+-         (0.50196078431372548, 0.75098039215686274, 0.40000000000000002),
+-         (0.75294117647058822, 0.87647058823529411, 0.40000000000000002),
+-         (1.0, 1.0, 0.40000000000000002)]
++        [(0.0, 0.5, 0.4),
++         (0.25098039215686274, 0.6254901960784314, 0.4),
++         (0.5019607843137255, 0.7509803921568627, 0.4),
++         (0.7529411764705882, 0.8764705882352941, 0.4),
++         (1.0, 1.0, 0.4)]
+         sage: _make_color_list(8, ['blue', 'red'], randomize=True)
+         ['blue', 'blue', 'red', 'blue', 'red', 'red', 'red', 'blue']
+     """
+diff --git a/src/sage/finance/time_series.pyx b/src/sage/finance/time_series.pyx
+index c37700d14e..49b7298d0b 100644
+--- a/src/sage/finance/time_series.pyx
++++ b/src/sage/finance/time_series.pyx
+@@ -109,8 +109,8 @@ cdef class TimeSeries:
+ 
+             sage: import numpy
+             sage: v = numpy.array([[1,2], [3,4]], dtype=float); v
+-            array([[ 1.,  2.],
+-                   [ 3.,  4.]])
++            array([[1., 2.],
++                   [3., 4.]])
+             sage: finance.TimeSeries(v)
+             [1.0000, 2.0000, 3.0000, 4.0000]
+             sage: finance.TimeSeries(v[:,0])
+@@ -2098,14 +2098,14 @@ cdef class TimeSeries:
+ 
+             sage: w[0] = 20
+             sage: w
+-            array([ 20. ,  -3. ,   4.5,  -2. ])
++            array([20. , -3. ,  4.5, -2. ])
+             sage: v
+             [20.0000, -3.0000, 4.5000, -2.0000]
+ 
+         If you want a separate copy do not give the ``copy=False`` option. ::
+ 
+             sage: z = v.numpy(); z
+-            array([ 20. ,  -3. ,   4.5,  -2. ])
++            array([20. , -3. ,  4.5, -2. ])
+             sage: z[0] = -10
+             sage: v
+             [20.0000, -3.0000, 4.5000, -2.0000]
+diff --git a/src/sage/functions/hyperbolic.py b/src/sage/functions/hyperbolic.py
+index 931a4b41e4..bf33fc483d 100644
+--- a/src/sage/functions/hyperbolic.py
++++ b/src/sage/functions/hyperbolic.py
+@@ -214,7 +214,7 @@ class Function_coth(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2, 5)
+             sage: coth(a)
+-            array([ 1.03731472,  1.00496982,  1.00067115])
++            array([1.03731472, 1.00496982, 1.00067115])
+         """
+         return 1.0 / tanh(x)
+ 
+@@ -267,7 +267,7 @@ class Function_sech(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2, 5)
+             sage: sech(a)
+-            array([ 0.26580223,  0.09932793,  0.03661899])
++            array([0.26580223, 0.09932793, 0.03661899])
+         """
+         return 1.0 / cosh(x)
+ 
+@@ -318,7 +318,7 @@ class Function_csch(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2, 5)
+             sage: csch(a)
+-            array([ 0.27572056,  0.09982157,  0.03664357])
++            array([0.27572056, 0.09982157, 0.03664357])
+         """
+         return 1.0 / sinh(x)
+ 
+@@ -586,7 +586,7 @@ class Function_arccoth(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2,5)
+             sage: acoth(a)
+-            array([ 0.54930614,  0.34657359,  0.25541281])
++            array([0.54930614, 0.34657359, 0.25541281])
+         """
+         return arctanh(1.0 / x)
+ 
+diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py
+index 017c85a96f..33fbb499c5 100644
+--- a/src/sage/functions/orthogonal_polys.py
++++ b/src/sage/functions/orthogonal_polys.py
+@@ -810,12 +810,12 @@ class Func_chebyshev_T(ChebyshevFunction):
+             sage: z2 = numpy.array([[1,2],[1,2]])
+             sage: z3 = numpy.array([1,2,3.])
+             sage: chebyshev_T(1,z)
+-            array([ 1.,  2.])
++            array([1., 2.])
+             sage: chebyshev_T(1,z2)
+-            array([[ 1.,  2.],
+-                   [ 1.,  2.]])
++            array([[1., 2.],
++                   [1., 2.]])
+             sage: chebyshev_T(1,z3)
+-            array([ 1.,  2.,  3.])
++            array([1., 2., 3.])
+             sage: chebyshev_T(z,0.1)
+             array([ 0.1 , -0.98])
+         """
+@@ -1095,12 +1095,12 @@ class Func_chebyshev_U(ChebyshevFunction):
+             sage: z2 = numpy.array([[1,2],[1,2]])
+             sage: z3 = numpy.array([1,2,3.])
+             sage: chebyshev_U(1,z)
+-            array([ 2.,  4.])
++            array([2., 4.])
+             sage: chebyshev_U(1,z2)
+-            array([[ 2.,  4.],
+-                   [ 2.,  4.]])
++            array([[2., 4.],
++                   [2., 4.]])
+             sage: chebyshev_U(1,z3)
+-            array([ 2.,  4.,  6.])
++            array([2., 4., 6.])
+             sage: chebyshev_U(z,0.1)
+             array([ 0.2 , -0.96])
+         """
+diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
+index 679384c907..d63b295a4c 100644
+--- a/src/sage/functions/other.py
++++ b/src/sage/functions/other.py
+@@ -390,7 +390,7 @@ class Function_ceil(BuiltinFunction):
+             sage: import numpy
+             sage: a = numpy.linspace(0,2,6)
+             sage: ceil(a)
+-            array([ 0.,  1.,  1.,  2.,  2.,  2.])
++            array([0., 1., 1., 2., 2., 2.])
+ 
+         Test pickling::
+ 
+@@ -539,7 +539,7 @@ class Function_floor(BuiltinFunction):
+             sage: import numpy
+             sage: a = numpy.linspace(0,2,6)
+             sage: floor(a)
+-            array([ 0.,  0.,  0.,  1.,  1.,  2.])
++            array([0., 0., 0., 1., 1., 2.])
+             sage: floor(x)._sympy_()
+             floor(x)
+ 
+@@ -840,7 +840,7 @@ def sqrt(x, *args, **kwds):
+             sage: import numpy
+             sage: a = numpy.arange(2,5)
+             sage: sqrt(a)
+-            array([ 1.41421356,  1.73205081,  2.        ])
++            array([1.41421356, 1.73205081, 2.        ])
+         """
+         if isinstance(x, float):
+             return math.sqrt(x)
+diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py
+index e7e7a311cd..e7ff78a9de 100644
+--- a/src/sage/functions/trig.py
++++ b/src/sage/functions/trig.py
+@@ -731,7 +731,7 @@ class Function_arccot(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2, 5)
+             sage: arccot(a)
+-            array([ 0.46364761,  0.32175055,  0.24497866])
++            array([0.46364761, 0.32175055, 0.24497866])
+         """
+         return math.pi/2 - arctan(x)
+ 
+@@ -787,7 +787,7 @@ class Function_arccsc(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2, 5)
+             sage: arccsc(a)
+-            array([ 0.52359878,  0.33983691,  0.25268026])
++            array([0.52359878, 0.33983691, 0.25268026])
+         """
+         return arcsin(1.0/x)
+ 
+@@ -845,7 +845,7 @@ class Function_arcsec(GinacFunction):
+             sage: import numpy
+             sage: a = numpy.arange(2, 5)
+             sage: arcsec(a)
+-            array([ 1.04719755,  1.23095942,  1.31811607])
++            array([1.04719755, 1.23095942, 1.31811607])
+         """
+         return arccos(1.0/x)
+ 
+@@ -920,13 +920,13 @@ class Function_arctan2(GinacFunction):
+             sage: a = numpy.linspace(1, 3, 3)
+             sage: b = numpy.linspace(3, 6, 3)
+             sage: atan2(a, b)
+-            array([ 0.32175055,  0.41822433,  0.46364761])
++            array([0.32175055, 0.41822433, 0.46364761])
+ 
+             sage: atan2(1,a)
+-            array([ 0.78539816,  0.46364761,  0.32175055])
++            array([0.78539816, 0.46364761, 0.32175055])
+ 
+             sage: atan2(a, 1)
+-            array([ 0.78539816,  1.10714872,  1.24904577])
++            array([0.78539816, 1.10714872, 1.24904577])
+ 
+         TESTS::
+ 
+diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx
+index 19a1d37df0..5780dfae1c 100644
+--- a/src/sage/matrix/constructor.pyx
++++ b/src/sage/matrix/constructor.pyx
+@@ -494,8 +494,8 @@ class MatrixFactory(object):
+         [7 8 9]
+         Full MatrixSpace of 3 by 3 dense matrices over Integer Ring
+         sage: n = matrix(QQ, 2, 2, [1, 1/2, 1/3, 1/4]).numpy(); n
+-        array([[ 1.        ,  0.5       ],
+-               [ 0.33333333,  0.25      ]])
++        array([[1.        , 0.5       ],
++               [0.33333333, 0.25      ]])
+         sage: matrix(QQ, n)
+         [  1 1/2]
+         [1/3 1/4]
+diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx
+index 48e0a8a97f..1be5d35b19 100644
+--- a/src/sage/matrix/matrix_double_dense.pyx
++++ b/src/sage/matrix/matrix_double_dense.pyx
+@@ -2546,7 +2546,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+             sage: P.is_unitary(algorithm='orthonormal')
+             Traceback (most recent call last):
+             ...
+-            ValueError: failed to create intent(cache|hide)|optional array-- must have defined dimensions but got (0,)
++            error: ((lwork==-1)||(lwork >= MAX(1,2*n))) failed for 3rd keyword lwork: zgees:lwork=0
+ 
+         TESTS::
+ 
+@@ -3662,8 +3662,8 @@ cdef class Matrix_double_dense(Matrix_dense):
+             [0.0 1.0 2.0]
+             [3.0 4.0 5.0]
+             sage: m.numpy()
+-            array([[ 0.,  1.,  2.],
+-                   [ 3.,  4.,  5.]])
++            array([[0., 1., 2.],
++                   [3., 4., 5.]])
+ 
+         Alternatively, numpy automatically calls this function (via
+         the magic :meth:`__array__` method) to convert Sage matrices
+@@ -3674,16 +3674,16 @@ cdef class Matrix_double_dense(Matrix_dense):
+             [0.0 1.0 2.0]
+             [3.0 4.0 5.0]
+             sage: numpy.array(m)
+-            array([[ 0.,  1.,  2.],
+-                   [ 3.,  4.,  5.]])
++            array([[0., 1., 2.],
++                   [3., 4., 5.]])
+             sage: numpy.array(m).dtype
+             dtype('float64')
+             sage: m = matrix(CDF, 2, range(6)); m
+             [0.0 1.0 2.0]
+             [3.0 4.0 5.0]
+             sage: numpy.array(m)
+-            array([[ 0.+0.j,  1.+0.j,  2.+0.j],
+-                   [ 3.+0.j,  4.+0.j,  5.+0.j]])
++            array([[0.+0.j, 1.+0.j, 2.+0.j],
++                   [3.+0.j, 4.+0.j, 5.+0.j]])
+             sage: numpy.array(m).dtype
+             dtype('complex128')
+ 
+diff --git a/src/sage/matrix/special.py b/src/sage/matrix/special.py
+index c698ba5e97..b743bab354 100644
+--- a/src/sage/matrix/special.py
++++ b/src/sage/matrix/special.py
+@@ -705,7 +705,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+ 
+         sage: import numpy
+         sage: entries = numpy.array([1.2, 5.6]); entries
+-        array([ 1.2,  5.6])
++        array([1.2, 5.6])
+         sage: A = diagonal_matrix(3, entries); A
+         [1.2 0.0 0.0]
+         [0.0 5.6 0.0]
+@@ -715,7 +715,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+ 
+         sage: j = numpy.complex(0,1)
+         sage: entries = numpy.array([2.0+j, 8.1, 3.4+2.6*j]); entries
+-        array([ 2.0+1.j ,  8.1+0.j ,  3.4+2.6j])
++        array([2. +1.j , 8.1+0.j , 3.4+2.6j])
+         sage: A = diagonal_matrix(entries); A
+         [2.0 + 1.0*I         0.0         0.0]
+         [        0.0         8.1         0.0]
+diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx
+index 230f142117..2ab1c0ae68 100644
+--- a/src/sage/modules/free_module_element.pyx
++++ b/src/sage/modules/free_module_element.pyx
+@@ -982,7 +982,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
+             sage: v.numpy()
+             array([1, 2, 5/6], dtype=object)
+             sage: v.numpy(dtype=float)
+-            array([ 1.        ,  2.        ,  0.83333333])
++            array([1.        , 2.        , 0.83333333])
+             sage: v.numpy(dtype=int)
+             array([1, 2, 0])
+             sage: import numpy
+@@ -993,7 +993,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
+         be more efficient but may have unintended consequences::
+ 
+             sage: v.numpy(dtype=None)
+-            array([ 1.        ,  2.        ,  0.83333333])
++            array([1.        , 2.        , 0.83333333])
+ 
+             sage: w = vector(ZZ, [0, 1, 2^63 -1]); w
+             (0, 1, 9223372036854775807)
+diff --git a/src/sage/modules/vector_double_dense.pyx b/src/sage/modules/vector_double_dense.pyx
+index 39fc2970de..2badf98284 100644
+--- a/src/sage/modules/vector_double_dense.pyx
++++ b/src/sage/modules/vector_double_dense.pyx
+@@ -807,13 +807,13 @@ cdef class Vector_double_dense(FreeModuleElement):
+ 
+             sage: v = vector(CDF,4,range(4))
+             sage: v.numpy()
+-            array([ 0.+0.j,  1.+0.j,  2.+0.j,  3.+0.j])
++            array([0.+0.j, 1.+0.j, 2.+0.j, 3.+0.j])
+             sage: v = vector(CDF,0)
+             sage: v.numpy()
+             array([], dtype=complex128)
+             sage: v = vector(RDF,4,range(4))
+             sage: v.numpy()
+-            array([ 0.,  1.,  2.,  3.])
++            array([0., 1., 2., 3.])
+             sage: v = vector(RDF,0)
+             sage: v.numpy()
+             array([], dtype=float64)
+@@ -823,11 +823,11 @@ cdef class Vector_double_dense(FreeModuleElement):
+             sage: import numpy
+             sage: v = vector(CDF, 3, range(3))
+             sage: v.numpy()
+-            array([ 0.+0.j,  1.+0.j,  2.+0.j])
++            array([0.+0.j, 1.+0.j, 2.+0.j])
+             sage: v.numpy(dtype=numpy.float64)
+-            array([ 0.,  1.,  2.])
++            array([0., 1., 2.])
+             sage: v.numpy(dtype=numpy.float32)
+-            array([ 0.,  1.,  2.], dtype=float32)
++            array([0., 1., 2.], dtype=float32)
+         """
+         if dtype is None or dtype is self._vector_numpy.dtype:
+             from copy import copy
+diff --git a/src/sage/numerical/optimize.py b/src/sage/numerical/optimize.py
+index 17b5ebb84b..92ce35c502 100644
+--- a/src/sage/numerical/optimize.py
++++ b/src/sage/numerical/optimize.py
+@@ -486,9 +486,9 @@ def minimize_constrained(func,cons,x0,gradient=None,algorithm='default', **args)
+                 else:
+                     min = optimize.fmin_tnc(f, x0, approx_grad=True, bounds=cons, messages=0, **args)[0]
+         elif isinstance(cons[0], function_type) or isinstance(cons[0], Expression):
+-            min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
++            min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
+     elif isinstance(cons, function_type) or isinstance(cons, Expression):
+-        min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
++        min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
+     return vector(RDF, min)
+ 
+ 
+diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
+index ad9693da62..758fb709b7 100644
+--- a/src/sage/plot/complex_plot.pyx
++++ b/src/sage/plot/complex_plot.pyx
+@@ -61,9 +61,9 @@ cdef inline double mag_to_lightness(double r):
+ 
+         sage: from sage.plot.complex_plot import complex_to_rgb
+         sage: complex_to_rgb([[0, 1, 10]])
+-        array([[[ 0.        ,  0.        ,  0.        ],
+-                [ 0.77172568,  0.        ,  0.        ],
+-                [ 1.        ,  0.22134776,  0.22134776]]])
++        array([[[0.        , 0.        , 0.        ],
++                [0.77172568, 0.        , 0.        ],
++                [1.        , 0.22134776, 0.22134776]]])
+     """
+     return atan(log(sqrt(r)+1)) * (4/PI) - 1
+ 
+@@ -82,13 +82,13 @@ def complex_to_rgb(z_values):
+ 
+         sage: from sage.plot.complex_plot import complex_to_rgb
+         sage: complex_to_rgb([[0, 1, 1000]])
+-        array([[[ 0.        ,  0.        ,  0.        ],
+-                [ 0.77172568,  0.        ,  0.        ],
+-                [ 1.        ,  0.64421177,  0.64421177]]])
++        array([[[0.        , 0.        , 0.        ],
++                [0.77172568, 0.        , 0.        ],
++                [1.        , 0.64421177, 0.64421177]]])
+         sage: complex_to_rgb([[0, 1j, 1000j]])
+-        array([[[ 0.        ,  0.        ,  0.        ],
+-                [ 0.38586284,  0.77172568,  0.        ],
+-                [ 0.82210588,  1.        ,  0.64421177]]])
++        array([[[0.        , 0.        , 0.        ],
++                [0.38586284, 0.77172568, 0.        ],
++                [0.82210588, 1.        , 0.64421177]]])
+     """
+     import numpy
+     cdef unsigned int i, j, imax, jmax
+diff --git a/src/sage/plot/line.py b/src/sage/plot/line.py
+index 23f5e61446..3b1b51d7cf 100644
+--- a/src/sage/plot/line.py
++++ b/src/sage/plot/line.py
+@@ -502,14 +502,12 @@ def line2d(points, **options):
+     from sage.plot.all import Graphics
+     from sage.plot.plot import xydata_from_point_list
+     from sage.rings.all import CC, CDF
++    points = list(points) # make sure points is a python list
+     if points in CC or points in CDF:
+         pass
+     else:
+-        try:
+-            if not points:
+-                return Graphics()
+-        except ValueError: # numpy raises a ValueError if not empty
+-            pass
++        if len(points) == 0:
++            return Graphics()
+     xdata, ydata = xydata_from_point_list(points)
+     g = Graphics()
+     g._set_extra_kwds(Graphics._extract_kwds_for_show(options))
+diff --git a/src/sage/plot/plot_field.py b/src/sage/plot/plot_field.py
+index 0025098a8d..23c80902f3 100644
+--- a/src/sage/plot/plot_field.py
++++ b/src/sage/plot/plot_field.py
+@@ -49,9 +49,10 @@ class PlotField(GraphicPrimitive):
+             sage: r.xpos_array
+             [0.0, 0.0, 1.0, 1.0]
+             sage: r.yvec_array
+-            masked_array(data = [0.0 0.70710678118... 0.70710678118... 0.89442719...],
+-                         mask = [False False False False],
+-                   fill_value = 1e+20)
++            masked_array(data=[0.0, 0.70710678118..., 0.70710678118...,
++                               0.89442719...],
++                         mask=[False, False, False, False],
++                   fill_value=1e+20)
+ 
+         TESTS:
+ 
+diff --git a/src/sage/plot/streamline_plot.py b/src/sage/plot/streamline_plot.py
+index f3da57c370..3806f4b32f 100644
+--- a/src/sage/plot/streamline_plot.py
++++ b/src/sage/plot/streamline_plot.py
+@@ -38,16 +38,14 @@ class StreamlinePlot(GraphicPrimitive):
+             sage: r.options()['plot_points']
+             2
+             sage: r.xpos_array
+-            array([ 0.,  1.])
++            array([0., 1.])
+             sage: r.yvec_array
+-            masked_array(data =
+-             [[1.0 1.0]
+-             [0.5403023058681398 0.5403023058681398]],
+-                         mask =
+-             [[False False]
+-             [False False]],
+-                   fill_value = 1e+20)
+-            <BLANKLINE>
++            masked_array(
++              data=[[1.0, 1.0],
++                    [0.5403023058681398, 0.5403023058681398]],
++              mask=[[False, False],
++                    [False, False]],
++              fill_value=1e+20)
+ 
+         TESTS:
+ 
+diff --git a/src/sage/probability/probability_distribution.pyx b/src/sage/probability/probability_distribution.pyx
+index f66cd898b9..35995886d5 100644
+--- a/src/sage/probability/probability_distribution.pyx
++++ b/src/sage/probability/probability_distribution.pyx
+@@ -130,7 +130,17 @@ cdef class ProbabilityDistribution:
+              0.0,
+              1.4650000000000003]
+             sage: b
+-            [0.0, 0.20000000000000001, 0.40000000000000002, 0.60000000000000009, 0.80000000000000004, 1.0, 1.2000000000000002, 1.4000000000000001, 1.6000000000000001, 1.8, 2.0]
++            [0.0,
++             0.2,
++             0.4,
++             0.6000000000000001,
++             0.8,
++             1.0,
++             1.2000000000000002,
++             1.4000000000000001,
++             1.6,
++             1.8,
++             2.0]
+         """
+         import pylab
+         l = [float(self.get_random_element()) for _ in range(num_samples)]
+diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx
+index a0bfe080f5..7d95e7a1a8 100644
+--- a/src/sage/rings/rational.pyx
++++ b/src/sage/rings/rational.pyx
+@@ -1056,7 +1056,7 @@ cdef class Rational(sage.structure.element.FieldElement):
+             dtype('O')
+ 
+             sage: numpy.array([1, 1/2, 3/4])
+-            array([ 1.  ,  0.5 ,  0.75])
++            array([1.  , 0.5 , 0.75])
+         """
+         if mpz_cmp_ui(mpq_denref(self.value), 1) == 0:
+             if mpz_fits_slong_p(mpq_numref(self.value)):
+diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx
+index 4c630867a4..64e2187f5b 100644
+--- a/src/sage/rings/real_mpfr.pyx
++++ b/src/sage/rings/real_mpfr.pyx
+@@ -1438,7 +1438,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
+ 
+             sage: import numpy
+             sage: numpy.arange(10.0)
+-            array([ 0.,  1.,  2.,  3.,  4.,  5.,  6.,  7.,  8.,  9.])
++            array([0., 1., 2., 3., 4., 5., 6., 7., 8., 9.])
+             sage: numpy.array([1.0, 1.1, 1.2]).dtype
+             dtype('float64')
+             sage: numpy.array([1.000000000000000000000000000000000000]).dtype
+diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py
+index 3d270ebf9d..1144f168e3 100644
+--- a/src/sage/schemes/elliptic_curves/height.py
++++ b/src/sage/schemes/elliptic_curves/height.py
+@@ -1623,18 +1623,18 @@ class EllipticCurveCanonicalHeight:
+         even::
+ 
+             sage: H.wp_on_grid(v,4)
+-            array([[ 25.43920182,   5.28760943,   5.28760943,  25.43920182],
+-            [  6.05099485,   1.83757786,   1.83757786,   6.05099485],
+-            [  6.05099485,   1.83757786,   1.83757786,   6.05099485],
+-            [ 25.43920182,   5.28760943,   5.28760943,  25.43920182]])
++            array([[25.43920182,  5.28760943,  5.28760943, 25.43920182],
++                   [ 6.05099485,  1.83757786,  1.83757786,  6.05099485],
++                   [ 6.05099485,  1.83757786,  1.83757786,  6.05099485],
++                   [25.43920182,  5.28760943,  5.28760943, 25.43920182]])
+ 
+         The array of values on the half-grid::
+ 
+             sage: H.wp_on_grid(v,4,True)
+-            array([[ 25.43920182,   5.28760943],
+-            [  6.05099485,   1.83757786],
+-            [  6.05099485,   1.83757786],
+-            [ 25.43920182,   5.28760943]])
++            array([[25.43920182,  5.28760943],
++                   [ 6.05099485,  1.83757786],
++                   [ 6.05099485,  1.83757786],
++                   [25.43920182,  5.28760943]])
+         """
+         tau = self.tau(v)
+         fk, err = self.fk_intervals(v, 15, CDF)
+diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx
+index 2dcb0492b9..2b1a06385c 100644
+--- a/src/sage/symbolic/ring.pyx
++++ b/src/sage/symbolic/ring.pyx
+@@ -1135,7 +1135,7 @@ cdef class NumpyToSRMorphism(Morphism):
+         sage: cos(numpy.int('2'))
+         cos(2)
+         sage: numpy.cos(numpy.int('2'))
+-        -0.41614683654714241
++        -0.4161468365471424
+     """
+     cdef _intermediate_ring
+ 
diff --git a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch b/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
new file mode 100644
index 0000000000000..49cdfd189b92a
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch
@@ -0,0 +1,20 @@
+diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py
+index 6bdc9a0..31fc780 100644
+--- a/src/sage/doctest/parsing.py
++++ b/src/sage/doctest/parsing.py
+@@ -40,6 +40,7 @@ from .external import available_software
+ 
+ float_regex = re.compile('\s*([+-]?\s*((\d*\.?\d+)|(\d+\.?))([eE][+-]?\d+)?)')
+ optional_regex = re.compile(r'(py2|py3|long time|not implemented|not tested|known bug)|([^ a-z]\s*optional\s*[:-]*((\s|\w)*))')
++pari_stack_warning_regex = re.compile(r'\s*\*\*\*.*(Warning: increasing stack size to )\d+\.')
+ find_sage_prompt = re.compile(r"^(\s*)sage: ", re.M)
+ find_sage_continuation = re.compile(r"^(\s*)\.\.\.\.:", re.M)
+ random_marker = re.compile('.*random', re.I)
+@@ -935,6 +936,7 @@ class SageOutputChecker(doctest.OutputChecker):
+             <type 'float'>
+         """
+         got = self.human_readable_escape_sequences(got)
++        got = pari_stack_warning_regex.sub('', got)
+         if isinstance(want, MarkedOutput):
+             if want.random:
+                 return True
diff --git a/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch b/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch
new file mode 100644
index 0000000000000..22f274d608d40
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch
@@ -0,0 +1,479 @@
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index 3a417d9d5c..fadaadbaf6 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -231,7 +231,7 @@ Another example::
+     sage: f(x=3)
+     arcsinh(1)
+     sage: f.derivative(x)
+-    1/3/sqrt(1/9*x^2 + 1)
++    1/sqrt(x^2 + 9)
+ 
+ We compute the length of the parabola from 0 to 2::
+ 
+@@ -1509,8 +1509,8 @@ def laplace(ex, t, s, algorithm='maxima'):
+     Testing SymPy::
+ 
+         sage: laplace(t^n, t, s, algorithm='sympy')
+-        (s^(-n)*gamma(n + 1)/s, 0, -re(n) < 1)
+-        
++        (gamma(n + 1)/(s*s^n), 0, -re(n) < 1)
++
+     Testing Maxima::
+ 
+         sage: laplace(t^n, t, s, algorithm='maxima')
+diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py
+index 1fc2db5c94..f3e49b9cdb 100644
+--- a/src/sage/functions/hypergeometric.py
++++ b/src/sage/functions/hypergeometric.py
+@@ -34,7 +34,7 @@ Simplification (note that ``simplify_full`` does not yet call
+     sage: a.simplify_hypergeometric()
+     1/((-e^x + 1)^e^x)
+     sage: a.simplify_hypergeometric(algorithm='sage')
+-    (-e^x + 1)^(-e^x)
++    1/((-e^x + 1)^e^x)
+ 
+ Equality testing::
+ 
+@@ -145,7 +145,7 @@ Series expansions of confluent hypergeometric functions::
+ 
+     sage: hypergeometric_M(2, 2, x).series(x, 3)
+     1 + 1*x + 1/2*x^2 + Order(x^3)
+-    sage: hypergeometric_U(2, 2, x).series(x == 3, 100).subs(x=1).n()
++    sage: hypergeometric_U(2, 2, x).series(x == 3, 100).subs(x=1).n() # known bug (see :trac:`25688`)
+     0.403652637676806
+     sage: hypergeometric_U(2, 2, 1).n()
+     0.403652637676806
+@@ -773,7 +773,7 @@ def closed_form(hyp):
+         sage: closed_form(hypergeometric([], [], z))
+         e^z
+         sage: closed_form(hypergeometric([a], [], z))
+-        (-z + 1)^(-a)
++        1/((-z + 1)^a)
+         sage: closed_form(hypergeometric([1, 1, 2], [1, 1], z))
+         (z - 1)^(-2)
+         sage: closed_form(hypergeometric([2, 3], [1], x))
+@@ -1121,7 +1121,7 @@ class Hypergeometric_U(BuiltinFunction):
+                 sage: var('a b z')
+                 (a, b, z)
+                 sage: hypergeometric_U(a, b, z).generalized()
+-                z^(-a)*hypergeometric((a, a - b + 1), (), -1/z)
++                hypergeometric((a, a - b + 1), (), -1/z)/z^a
+                 sage: hypergeometric_U(1, 3, 1/2).generalized()
+                 2*hypergeometric((1, -1), (), -2)
+                 sage: hypergeometric_U(3, I, 2).generalized()
+diff --git a/src/sage/functions/log.py b/src/sage/functions/log.py
+index 75d1bf8060..61968582af 100644
+--- a/src/sage/functions/log.py
++++ b/src/sage/functions/log.py
+@@ -518,17 +518,17 @@ class Function_polylog(GinacFunction):
+ 
+             sage: BF = RealBallField(100)
+             sage: polylog(2, BF(1/3))
+-            [0.36621322997706348761674629766 +/- 4.51e-30]
++            [0.36621322997706348761674629766... +/- ...]
+             sage: polylog(2, BF(4/3))
+-            nan
++            [2.27001825336107090380391448586 +/- 5.64e-30] + [-0.90377988538400159956755721265 +/- 8.39e-30]*I
+             sage: parent(_)
+-            Real ball field with 100 bits of precision
++            Complex ball field with 100 bits of precision
+             sage: polylog(2, CBF(1/3))
+-            [0.366213229977063 +/- 5.85e-16]
++            [0.366213229977063 +/- ...]
+             sage: parent(_)
+             Complex ball field with 53 bits of precision
+             sage: polylog(2, CBF(1))
+-            [1.644934066848226 +/- 6.59e-16]
++            [1.644934066848226 +/- ...]
+             sage: parent(_)
+             Complex ball field with 53 bits of precision
+         """
+diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py
+index e7e7a311cd..1f2926d6c9 100644
+--- a/src/sage/functions/trig.py
++++ b/src/sage/functions/trig.py
+@@ -529,13 +529,8 @@ class Function_arcsin(GinacFunction):
+             arcsin
+             sage: asin(complex(1,1))
+             (0.6662394324925152+1.0612750619050357j)
+-
+-        Check that :trac:`22823` is fixed::
+-
+-            sage: bool(asin(SR(2.1)) == NaN)
+-            True
+-            sage: asin(SR(2.1)).is_real()
+-            False
++            sage: asin(SR(2.1))
++            1.57079632679490 - 1.37285914424258*I
+         """
+         GinacFunction.__init__(self, 'arcsin', latex_name=r"\arcsin",
+                 conversions=dict(maxima='asin', sympy='asin', fricas="asin", giac="asin"))
+@@ -595,13 +590,8 @@ class Function_arccos(GinacFunction):
+             arccos
+             sage: acos(complex(1,1))
+             (0.9045568943023814-1.0612750619050357j)
+-
+-        Check that :trac:`22823` is fixed::
+-
+-            sage: bool(acos(SR(2.1)) == NaN)
+-            True
+-            sage: acos(SR(2.1)).is_real()
+-            False
++            sage: acos(SR(2.1))
++            1.37285914424258*I
+         """
+         GinacFunction.__init__(self, 'arccos', latex_name=r"\arccos",
+                 conversions=dict(maxima='acos', sympy='acos', fricas='acos', giac='acos'))
+@@ -807,7 +797,7 @@ class Function_arcsec(GinacFunction):
+             sage: arcsec(2).n(100)
+             1.0471975511965977461542144611
+             sage: arcsec(1/2).n(100)
+-            NaN
++            1.3169578969248167086250463473*I
+             sage: RDF(arcsec(2))  # abs tol 1e-15
+             1.0471975511965976
+             sage: arcsec(1 + I)
+@@ -958,7 +948,9 @@ class Function_arctan2(GinacFunction):
+             sage: atan2(0,0,hold=True)
+             arctan2(0, 0)
+             sage: atan2(0,0,hold=True).n()
+-            NaN
++            Traceback (most recent call last):
++            ...
++            RuntimeError: atan2(): division by zero
+ 
+         Check if :trac:`10062` is fixed, this was caused by
+         ``(I*I).is_positive()`` returning ``True``::
+diff --git a/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py b/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py
+index 3b5c8d1729..1c6b73a16c 100644
+--- a/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py
++++ b/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py
+@@ -1422,8 +1422,10 @@ class HyperbolicGeodesicUHP(HyperbolicGeodesic):
+         expressions do not generate runtime errors. ::
+ 
+             sage: g=HyperbolicPlane().UHP().get_geodesic(-1+I,1+I)
+-            sage: g.midpoint()
+-            Point in UHP 1/2*(sqrt(2)*e^(1/2*arccosh(3)) - sqrt(2) + (I - 1)*e^(1/2*arccosh(3)) + I - 1)/((1/4*I - 1/4)*sqrt(2)*e^(1/2*arccosh(3)) - (1/4*I - 1/4)*sqrt(2) + 1/2*e^(1/2*arccosh(3)) + 1/2)
++            sage: point = g.midpoint(); point
++            Point in UHP -1/2*(sqrt(2)*...
++            sage: QQbar(point.coordinates()).radical_expression()
++            I*sqrt(2)
+ 
+         Check that floating points remain floating points
+         in :meth:`midpoint` ::
+diff --git a/src/sage/interfaces/fricas.py b/src/sage/interfaces/fricas.py
+index 82aae78e37..8501ea2a18 100644
+--- a/src/sage/interfaces/fricas.py
++++ b/src/sage/interfaces/fricas.py
+@@ -1084,14 +1084,14 @@ class FriCASElement(ExpectElement):
+              0.451026811796262,
+              0.732815101786507,
+              0.837981225008390,
+-             NaN,
+-             NaN,
++             1.57079632679490 - 0.467145308103262*I,
++             0.467145308103262*I,
+              1.11976951499863,
+              0.451026811796262,
+              0.732815101786507,
+              0.837981225008390,
+-             NaN,
+-             NaN]
++             1.57079632679490 - 0.467145308103262*I,
++             0.467145308103262*I]
+             sage: l = [tanh, sinh, cosh, coth, sech, csch, asinh, acosh, atanh, acoth, asech, acsch, arcsinh, arccosh, arctanh, arccoth, arcsech, arccsch]
+             sage: [f(x)._fricas_().sage().subs(x=0.9) for f in l]               # optional - fricas
+             [0.716297870199024,
+diff --git a/src/sage/libs/pynac/pynac.pyx b/src/sage/libs/pynac/pynac.pyx
+index 9e9d8f664b..e3406f007e 100644
+--- a/src/sage/libs/pynac/pynac.pyx
++++ b/src/sage/libs/pynac/pynac.pyx
+@@ -1824,7 +1824,7 @@ cdef py_atan2(x, y):
+         sage: atan2(CC(I), CC(I+1))
+         0.553574358897045 + 0.402359478108525*I
+         sage: atan2(CBF(I), CBF(I+1))
+-        [0.55357435889705 +/- 5.58e-15] + [0.402359478108525 +/- 7.11e-16]*I
++        [0.55357435889705 +/- ...] + [0.402359478108525 +/- ...]*I
+ 
+     Check that :trac:`23776` is fixed and RDF input gives real output::
+ 
+diff --git a/src/sage/matrix/matrix_symbolic_dense.pyx b/src/sage/matrix/matrix_symbolic_dense.pyx
+index 46a15e53eb..7a0beb437b 100644
+--- a/src/sage/matrix/matrix_symbolic_dense.pyx
++++ b/src/sage/matrix/matrix_symbolic_dense.pyx
+@@ -200,7 +200,7 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense):
+             sage: eval, [evec], mult = es[0]
+             sage: delta = eval*evec - evec*A
+             sage: abs(abs(delta)) < 1e-10
+-            sqrt(9/25*((2*sqrt(6) - 3)*(sqrt(6) - 2) + 7*sqrt(6) - 18)^2 + 9/25*((sqrt(6) - 2)*(sqrt(6) - 4) + 6*sqrt(6) - 14)^2) < (1.00000000000000e-10)
++            3/5*sqrt(((2*sqrt(6) - 3)*(sqrt(6) - 2) + 7*sqrt(6) - 18)^2 + ((sqrt(6) - 2)*(sqrt(6) - 4) + 6*sqrt(6) - 14)^2) < (1.00000000000000e-10)
+             sage: abs(abs(delta)).n() < 1e-10
+             True
+ 
+diff --git a/src/sage/modules/matrix_morphism.py b/src/sage/modules/matrix_morphism.py
+index 17a1d6e290..03892ceec0 100644
+--- a/src/sage/modules/matrix_morphism.py
++++ b/src/sage/modules/matrix_morphism.py
+@@ -214,9 +214,9 @@ class MatrixMorphism_abstract(sage.categories.morphism.Morphism):
+             sage: f((1, 0))
+             Traceback (most recent call last):
+             ...
+-            TypeError: Unable to coerce entries (=[1.00000000000000*I, 0.000000000000000]) to coefficients in Real Field with 53 bits of precision
++            TypeError: Unable to coerce entries (=[1.00000000000000*I, 0]) to coefficients in Real Field with 53 bits of precision
+             sage: f((1, 0), coerce=False)
+-            (1.00000000000000*I, 0.000000000000000)
++            (1.00000000000000*I, 0)
+ 
+         """
+         if self.domain().is_ambient():
+diff --git a/src/sage/plot/plot.py b/src/sage/plot/plot.py
+index 77cdeb8c46..e501e74036 100644
+--- a/src/sage/plot/plot.py
++++ b/src/sage/plot/plot.py
+@@ -2061,7 +2061,7 @@ def _plot(funcs, xrange, parametric=False,
+     plot properly (:trac:`13246`)::
+ 
+         sage: parametric_plot((x, arcsec(x)), (x, -2, 2))
+-        Graphics object consisting of 1 graphics primitive
++        Graphics object consisting of 2 graphics primitives
+ 
+     """
+     from sage.plot.colors import Color
+diff --git a/src/sage/repl/display/formatter.py b/src/sage/repl/display/formatter.py
+index 8ce2e839d7..948207c95e 100644
+--- a/src/sage/repl/display/formatter.py
++++ b/src/sage/repl/display/formatter.py
+@@ -25,11 +25,11 @@ generally, all sage expression as an ASCII art object::
+     sage: shell = get_test_shell()
+     sage: shell.run_cell('%display ascii_art')
+     sage: shell.run_cell('integral(x^2/pi^x, x)')
+-     / 2    2                      \  -x*log(pi)
+-    -\x *log (pi) + 2*x*log(pi) + 2/*e
+-    ---------------------------------------------
+-                         3
+-                      log (pi)
++       -x / 2    2                      \ 
++    -pi  *\x *log (pi) + 2*x*log(pi) + 2/ 
++    --------------------------------------
++                     3                   
++                   log (pi)               
+     sage: shell.run_cell("i = var('i')")
+     sage: shell.run_cell('sum(i*x^i, i, 0, 10)')
+         10      9      8      7      6      5      4      3      2
+diff --git a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
+index d8ebbf4f76..8c60f65e99 100644
+--- a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
++++ b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py
+@@ -151,8 +151,8 @@ A multiple point example (Example 6.5 of [RaWi2012]_)::
+      [(x + 2*y - 1, 1), (2*x + y - 1, 1)])
+     sage: F1 = decomp[1]
+     sage: F1.asymptotics(p, alpha, 2)
+-    (-3*((2*a^2 - 5*a*b + 2*b^2)*r^2 + (a + b)*r + 3)*((1/3)^(-a)*(1/3)^(-b))^r,
+-     (1/3)^(-a)*(1/3)^(-b), -3*(2*a^2 - 5*a*b + 2*b^2)*r^2 - 3*(a + b)*r - 9)
++    (-3*((2*a^2 - 5*a*b + 2*b^2)*r^2 + (a + b)*r + 3)*(1/((1/3)^a*(1/3)^b))^r,
++     1/((1/3)^a*(1/3)^b), -3*(2*a^2 - 5*a*b + 2*b^2)*r^2 - 3*(a + b)*r - 9)
+     sage: alpha = [4, 3]
+     sage: decomp =  F.asymptotic_decomposition(alpha)
+     sage: F1 = decomp[1]
+@@ -2159,7 +2159,7 @@ class FractionWithFactoredDenominator(RingElement):
+             sage: p = {x: 1/3, y: 1/3}
+             sage: alpha = (var('a'), var('b'))
+             sage: F.asymptotics_multiple(p, alpha, 2, var('r')) # long time
+-            (3*((1/3)^(-a)*(1/3)^(-b))^r*e^(2/3), (1/3)^(-a)*(1/3)^(-b), 3*e^(2/3))
++            (3*(1/((1/3)^a*(1/3)^b))^r*e^(2/3), 1/((1/3)^a*(1/3)^b), 3*e^(2/3))
+         """
+         from itertools import product
+         from sage.calculus.functions import jacobian
+diff --git a/src/sage/stats/basic_stats.py b/src/sage/stats/basic_stats.py
+index 16a268a02c..5fd244e93b 100644
+--- a/src/sage/stats/basic_stats.py
++++ b/src/sage/stats/basic_stats.py
+@@ -183,7 +183,7 @@ def std(v, bias=False):
+         sage: std([])
+         NaN
+         sage: std([I, sqrt(2), 3/5])
+-        sqrt(1/450*(10*sqrt(2) - 5*I - 3)^2 + 1/450*(5*sqrt(2) - 10*I + 3)^2 + 1/450*(5*sqrt(2) + 5*I - 6)^2)
++        1/15*sqrt(1/2)*sqrt((10*sqrt(2) - 5*I - 3)^2 + (5*sqrt(2) - 10*I + 3)^2 + (5*sqrt(2) + 5*I - 6)^2)
+         sage: std([RIF(1.0103, 1.0103), RIF(2)])
+         0.6998235813403261?
+         sage: import numpy
+diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
+index ab4c05de3a..60f0dc549a 100644
+--- a/src/sage/symbolic/expression.pyx
++++ b/src/sage/symbolic/expression.pyx
+@@ -622,7 +622,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: x^(-5)
+             x^(-5)
+             sage: x^(-y)
+-            x^(-y)
++            1/(x^y)
+             sage: 2*x^(-1)
+             2/x
+             sage: i*x
+@@ -3621,14 +3621,14 @@ cdef class Expression(CommutativeRingElement):
+             sage: repl_dict = {b_0: b_0, b_3: b_1, b_2: b_3, b_1: b_2}
+             sage: P = precomp.substitute(repl_dict)
+             sage: P.expand()
+-            -2^(-b_0)*2^(-b_2)*2^b_3 - 2^b_0*2^(-b_2)*2^b_3 -
+-            2^(-b_0)*2^b_2*2^b_3 + 2^b_0*2^b_2*2^b_3 - 2*2^(-b_0)*2^(-b_2)
+-            - 2*2^b_0*2^(-b_2) - 2*2^(-b_0)*2^b_2 + 2*2^b_0*2^b_2 +
+-            2^(-b_0)*2^b_3 + 2^b_0*2^b_3 + 2^(-b_2)*2^b_3 + 2^b_2*2^b_3 +
+-            2*2^(-b_0) + 2*2^b_0 + 2*2^(-b_2) + 2*2^b_2 - 9*2^b_3 -
+-            2^(-b_0)*2^(-b_2)/2^b_3 - 2^b_0*2^(-b_2)/2^b_3 -
+-            2^(-b_0)*2^b_2/2^b_3 + 2^b_0*2^b_2/2^b_3 + 2^(-b_0)/2^b_3 +
+-            2^b_0/2^b_3 + 2^(-b_2)/2^b_3 + 2^b_2/2^b_3 - 9/2^b_3 - 18
++            2^b_0*2^b_2*2^b_3 + 2*2^b_0*2^b_2 + 2^b_0*2^b_3 + 2^b_2*2^b_3 +
++            2*2^b_0 + 2*2^b_2 - 9*2^b_3 + 2^b_0*2^b_2/2^b_3 -
++            2^b_0*2^b_3/2^b_2 - 2^b_2*2^b_3/2^b_0 - 2*2^b_0/2^b_2 -
++            2*2^b_2/2^b_0 + 2^b_0/2^b_3 + 2^b_2/2^b_3 + 2^b_3/2^b_0 +
++            2^b_3/2^b_2 + 2/2^b_0 + 2/2^b_2 - 2^b_0/(2^b_2*2^b_3) -
++            2^b_2/(2^b_0*2^b_3) - 9/2^b_3 - 2^b_3/(2^b_0*2^b_2) -
++            2/(2^b_0*2^b_2) + 1/(2^b_0*2^b_3) + 1/(2^b_2*2^b_3) -
++            1/(2^b_0*2^b_2*2^b_3) - 18
+ 
+             sage: _0,b_1,b_2=var('b_0,b_1,b_2')
+             sage: f = 1/27*b_2^2/(2^b_2)^2 + 1/27*b_1^2/(2^b_1)^2 + \
+@@ -3809,7 +3809,7 @@ cdef class Expression(CommutativeRingElement):
+ 
+             sage: x = SR.symbol('x', domain='real')
+             sage: (x^3)^(1/3)
+-            (x^3)^(1/3)
++            x
+             sage: (x^4)^(1/4)
+             abs(x)
+             sage: (x^8)^(1/4)
+@@ -3872,7 +3872,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: 2^(x/log(2))
+             e^x
+             sage: 2^(-x^2/2/log(2))
+-            e^(-1/2*x^2)
++            1/e^(1/2*x^2)
+             sage: x^(x/log(x))
+             x^(x/log(x))
+             sage: assume(x > 0)
+@@ -4816,18 +4816,24 @@ cdef class Expression(CommutativeRingElement):
+             sage: ((x+y)^(x+y)).match(w0^w0)
+             {$0: x + y}
+             sage: t = ((a+b)*(a+c)).match((a+w0)*(a+w1))
+-            sage: t[w0], t[w1]
+-            (c, b)
++            sage: set([t[w0], t[w1]]) == set([b, c])
++            True
+             sage: ((a+b)*(a+c)).match((w0+b)*(w0+c))
+             {$0: a}
+             sage: t = ((a+b)*(a+c)).match((w0+w1)*(w0+w2))
+-            sage: t[w0], t[w1], t[w2]
+-            (a, c, b)
+-            sage: print(((a+b)*(a+c)).match((w0+w1)*(w1+w2)))
+-            None
++            sage: t[w0]
++            a
++            sage: set([t[w1], t[w2]]) == set([b, c])
++            True
++            sage: t = ((a+b)*(a+c)).match((w0+w1)*(w1+w2))
++            sage: t[w1]
++            a
++            sage: set([t[w0], t[w2]]) == set([b, c])
++            True
+             sage: t = (a*(x+y)+a*z+b).match(a*w0+w1)
+-            sage: t[w0], t[w1]
+-            (x + y, a*z + b)
++            sage: s = set([t[w0], t[w1]])
++            sage: s == set([x+y, a*z+b]) or s == set([z, a*(x+y)+b])
++            True
+             sage: print((a+b+c+d+f+g).match(c))
+             None
+             sage: (a+b+c+d+f+g).has(c)
+@@ -4836,7 +4842,7 @@ cdef class Expression(CommutativeRingElement):
+             {$0: a + b + d + f + g}
+             sage: (a+b+c+d+f+g).match(c+g+w0)
+             {$0: a + b + d + f}
+-            sage: (a+b).match(a+b+w0)
++            sage: (a+b).match(a+b+w0) # known bug
+             {$0: 0}
+             sage: print((a*b^2).match(a^w0*b^w1))
+             None
+@@ -5009,7 +5015,7 @@ cdef class Expression(CommutativeRingElement):
+             a^3 + b^3 + (x + y)^3
+ 
+             sage: t.subs(w0 == w0^2)
+-            (x^2 + y^2)^18 + a^16 + b^16
++            a^8 + b^8 + (x^2 + y^2)^6
+ 
+             sage: t.subs(a == b, b == c)
+             (x + y)^3 + b^2 + c^2
+@@ -8392,9 +8398,13 @@ cdef class Expression(CommutativeRingElement):
+             sage: SR(I).arctan2(1)
+             arctan2(I, 1)
+             sage: SR(CDF(0,1)).arctan2(1)
+-            NaN + +infinity*I
+-            sage: SR(1).arctan2(CDF(0,1))   # known bug
+-            0.7853981633974484 - 19.012501686914433*I
++            Traceback (most recent call last):
++            ...
++            ValueError: power::eval(): division by zero
++            sage: SR(1).arctan2(CDF(0,1))
++            Traceback (most recent call last):
++            ...
++            ValueError: power::eval(): division by zero
+ 
+             sage: arctan2(0,oo)
+             0
+@@ -8656,7 +8666,7 @@ cdef class Expression(CommutativeRingElement):
+             1/2*I*pi
+             sage: SR(1/2).arccosh()
+             arccosh(1/2)
+-            sage: SR(CDF(1/2)).arccosh()  # rel tol 1e-15
++            sage: SR(CDF(1/2)).arccosh() #  rel tol 1e-15
+             1.0471975511965976*I
+             sage: maxima('acosh(0.5)')
+             1.04719755119659...*%i
+@@ -11687,7 +11697,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: a.solve(t)
+             []
+             sage: b = a.canonicalize_radical(); b
+-            -23040.0*(-2.0*e^(1800*t) + 25.0*e^(900*t) - 32.0)*e^(-2400*t)
++            (46080.0*e^(1800*t) - 576000.0*e^(900*t) + 737280.0)*e^(-2400*t)
+             sage: b.solve(t)
+             []
+             sage: b.solve(t, to_poly_solve=True)
+@@ -12163,14 +12173,14 @@ cdef class Expression(CommutativeRingElement):
+ 
+             sage: (n,k,j)=var('n,k,j')
+             sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n)
+-            -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n)
++            -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n)
+             sage: assume(j>-1)
+             sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n)
+             1
+             sage: forget()
+             sage: assume(n>=j)
+             sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n)
+-            -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n)
++            -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n)
+             sage: forget()
+             sage: assume(j==-1)
+             sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n)
+@@ -12178,7 +12188,7 @@ cdef class Expression(CommutativeRingElement):
+             sage: forget()
+             sage: assume(j<-1)
+             sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n)
+-            -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n)
++            -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n)
+             sage: forget()
+ 
+         Check that :trac:`16176` is fixed::
+diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
+index da6f0eef42..4bd65ef572 100644
+--- a/src/sage/symbolic/relation.py
++++ b/src/sage/symbolic/relation.py
+@@ -895,7 +895,7 @@ def solve(f, *args, **kwds):
+         sage: (r[0][x], r[0][y])
+         (2*lambert_w(1/2), 1)
+         sage: solve(-2*x**3 + 4*x**2 - 2*x + 6 > 0, x, algorithm='sympy')
+-        [x < (1/6*sqrt(77) + 79/54)^(1/3) + 1/9/(1/6*sqrt(77) + 79/54)^(1/3) + 2/3]
++        [x < 1/3*(1/2)^(1/3)*(9*sqrt(77) + 79)^(1/3) + 2/3*(1/2)^(2/3)/(9*sqrt(77) + 79)^(1/3) + 2/3]
+         sage: solve(sqrt(2*x^2 - 7) - (3 - x),x,algorithm='sympy')
+         [x == -8, x == 2]
+         sage: solve(sqrt(2*x + 9) - sqrt(x + 1) - sqrt(x + 4),x,algorithm='sympy')
diff --git a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch b/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
new file mode 100644
index 0000000000000..1b64f39fe60f9
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch
@@ -0,0 +1,28 @@
+diff --git a/src/sage/all.py b/src/sage/all.py
+index ca309ef..be3186b 100644
+--- a/src/sage/all.py
++++ b/src/sage/all.py
+@@ -298,6 +298,23 @@ warnings.filterwarnings('ignore', module='matplotlib[.]font_manager')
+ warnings.filterwarnings('default',
+     '[\s\S]*See http://trac.sagemath.org/[0-9]* for details.')
+ 
++# Hotpatch around https://bugs.python.org/issue5755 which won't be fixed for
++# python 2.7. Idea by https://stackoverflow.com/a/36293331.
++from distutils.command.build_ext import build_ext
++from distutils.sysconfig import customize_compiler
++
++_build_extensions = build_ext.build_extensions
++
++def build_extensions_patched(self):
++    customize_compiler(self.compiler)
++    try:
++        self.compiler.compiler_so.remove("-Wstrict-prototypes")
++    except (AttributeError, ValueError):
++        pass
++    _build_extensions(self)
++
++build_ext.build_extensions = build_extensions_patched
++
+ 
+ # Set a new random number seed as the very last thing
+ # (so that printing initial_seed() and using that seed
diff --git a/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch b/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch
new file mode 100644
index 0000000000000..ff1dcd22acf3d
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch
@@ -0,0 +1,40 @@
+diff --git a/src/sage/tests/py3_syntax.py b/src/sage/tests/py3_syntax.py
+index e564860b48..86ab3725f9 100644
+--- a/src/sage/tests/py3_syntax.py
++++ b/src/sage/tests/py3_syntax.py
+@@ -179,15 +179,30 @@ class Python3SyntaxTest(SortedDirectoryWalkerABC):
+             sage: py3_syntax = Python3SyntaxTest()
+             sage: py3_syntax.test(src.name)
+             Invalid Python 3 syntax found:
+-              File "...py", line 1
+-                print "invalid print statement"
+-                                              ^
+-            SyntaxError: Missing parentheses in call to 'print'
++            Missing parentheses in call to 'print'...
+             sage: os.unlink(src.name)
+         """
++
++        # compile all given files in memory, printing all errors
++        # inspired by the py_compile module (but without writing to file)
++        script = """
++import sys
++import importlib.machinery
++rv = 0
++for file in sys.argv[1:]:
++    loader = importlib.machinery.SourceFileLoader('<sage_test>', file)
++    source_bytes = loader.get_data(file)
++    try:
++        code = loader.source_to_code(source_bytes, file)
++    except Exception as err:
++        print(err)
++        rv = 1
++sys.exit(rv)
++"""
+         cmd = [
+             'python3',
+-            '-m', 'py_compile'
++            '-c',
++            script,
+         ] + list(filenames)
+         process = subprocess.Popen(
+             cmd,
diff --git a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch b/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch
new file mode 100644
index 0000000000000..b57e48b86dec0
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch
@@ -0,0 +1,14 @@
+reverted:
+--- b/src/sage/geometry/polyhedron/backend_cdd.py
++++ a/src/sage/geometry/polyhedron/backend_cdd.py
+@@ -154,7 +154,9 @@
+             ...    [0.62, -1.38, 0.38],[0.144, -1.04, 0.04],
+             ...    [0.1309090909, -1.0290909091, 0.04]]
+             sage: Polyhedron(point_list)
++            Traceback (most recent call last):
++            ...
++            ValueError: *Error: Numerical inconsistency is found.  Use the GMP exact arithmetic.
+-            A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 14 vertices
+             sage: Polyhedron(point_list, base_ring=QQ)
+             A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 14 vertices
+         """
diff --git a/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch b/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch
new file mode 100644
index 0000000000000..42deef4eab0c1
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch
@@ -0,0 +1,31 @@
+From 7419e0246230594ebfd5e7a2fe6b80d67abfc98a Mon Sep 17 00:00:00 2001
+From: Jeroen Demeyer <jdemeyer@cage.ugent.be>
+Date: Tue, 20 Mar 2018 10:40:41 +0100
+Subject: Fix sphinxify doctests
+
+---
+ sagenb/misc/sphinxify.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sagenb/misc/sphinxify.py b/sagenb/misc/sphinxify.py
+index 4f76d41..15623d9 100644
+--- a/sagenb/misc/sphinxify.py
++++ b/sagenb/misc/sphinxify.py
+@@ -47,11 +47,11 @@ def sphinxify(docstring, format='html'):
+ 
+         sage: from sage.misc.sphinxify import sphinxify
+         sage: sphinxify('A test')
+-        '...<div class="docstring">\n    \n  <p>A test</p>\n\n\n</div>'
++        '<div class="docstring">\n    \n  <p>A test</p>\n\n\n</div>'
+         sage: sphinxify('**Testing**\n`monospace`')
+-        '...<div class="docstring"...<strong>Testing</strong>\n<span class="math"...</p>\n\n\n</div>'
++        '<div class="docstring"...<strong>Testing</strong>\n<span class="math notranslate"...</p>\n\n\n</div>'
+         sage: sphinxify('`x=y`')
+-        '...<div class="docstring">\n    \n  <p><span class="math">x=y</span></p>\n\n\n</div>'
++        '<div class="docstring">\n    \n  <p><span class="math notranslate">x=y</span></p>\n\n\n</div>'
+         sage: sphinxify('`x=y`', format='text')
+         'x=y\n'
+         sage: sphinxify(':math:`x=y`', format='text')
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch b/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch
new file mode 100644
index 0000000000000..c67b8942e28bb
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch
@@ -0,0 +1,62 @@
+diff --git a/src/bin/sage b/src/bin/sage
+index 397f30cbed..3fc473c343 100755
+--- a/src/bin/sage
++++ b/src/bin/sage
+@@ -980,8 +980,11 @@ if [ "$1" = '-rsyncdist' -o "$1" = "--rsyncdist" ]; then
+ fi
+ 
+ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
++    # Redirect stdin from /dev/null. This helps with running TeX which
++    # tends to ask interactive questions if something goes wrong. These
++    # cause the build to hang. If stdin is /dev/null, TeX just aborts.
+     shift
+-    exec sage-python23 -m "sage_setup.docbuild" "$@"
++    exec sage-python23 -m sage_setup.docbuild "$@" </dev/null
+ fi
+ 
+ if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
+diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py
+index 25f94f7b7d..3f07474d9b 100644
+--- a/src/doc/common/conf.py
++++ b/src/doc/common/conf.py
+@@ -627,7 +627,7 @@ def call_intersphinx(app, env, node, contnode):
+         sage: for line in open(thematic_index).readlines():
+         ....:     if "padics" in line:
+         ....:         sys.stdout.write(line)
+-        <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics ...)"><span>Introduction to the -adics</span></a></li>
++        <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics v...)"><span>Introduction to the -adics</span></a></li>
+     """
+     debug_inf(app, "???? Trying intersphinx for %s"%node['reftarget'])
+     builder = app.builder
+diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py
+index 4f76d4113a..8f426b5989 100644
+--- a/src/sage/misc/sphinxify.py
++++ b/src/sage/misc/sphinxify.py
+@@ -47,11 +47,11 @@ def sphinxify(docstring, format='html'):
+ 
+         sage: from sage.misc.sphinxify import sphinxify
+         sage: sphinxify('A test')
+-        '...<div class="docstring">\n    \n  <p>A test</p>\n\n\n</div>'
++        '<div class="docstring">\n    \n  <p>A test</p>\n\n\n</div>'
+         sage: sphinxify('**Testing**\n`monospace`')
+-        '...<div class="docstring"...<strong>Testing</strong>\n<span class="math"...</p>\n\n\n</div>'
++        '<div class="docstring"...<strong>Testing</strong>\n<span class="math...</p>\n\n\n</div>'
+         sage: sphinxify('`x=y`')
+-        '...<div class="docstring">\n    \n  <p><span class="math">x=y</span></p>\n\n\n</div>'
++        '<div class="docstring">\n    \n  <p><span class="math notranslate nohighlight">x=y</span></p>\n\n\n</div>'
+         sage: sphinxify('`x=y`', format='text')
+         'x=y\n'
+         sage: sphinxify(':math:`x=y`', format='text')
+diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
+index fda76a4174..d3413239dd 100644
+--- a/src/sage_setup/docbuild/sphinxbuild.py
++++ b/src/sage_setup/docbuild/sphinxbuild.py
+@@ -207,7 +207,7 @@ def runsphinx():
+     try:
+         sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir))
+         sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir))
+-        sphinx.cmdline.main(sys.argv)
++        sphinx.cmdline.main(sys.argv[1:])
+     finally:
+         sys.stdout = saved_stdout
+         sys.stderr = saved_stderr
diff --git a/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch b/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch
new file mode 100644
index 0000000000000..febab37027711
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch
@@ -0,0 +1,31 @@
+diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py
+index aa23c8405d..8a87de0591 100644
+--- a/src/sage/repl/ipython_kernel/install.py
++++ b/src/sage/repl/ipython_kernel/install.py
+@@ -112,7 +112,7 @@ class SageKernelSpec(object):
+         EXAMPLES::
+ 
+             sage: from sage.repl.ipython_kernel.install import SageKernelSpec
+-            sage: spec = SageKernelSpec()
++            sage: spec = SageKernelSpec(prefix = tmp_dir())
+             sage: spec.use_local_mathjax()
+             sage: mathjax = os.path.join(spec.nbextensions_dir, 'mathjax')
+             sage: os.path.isdir(mathjax)
+@@ -129,7 +129,7 @@ class SageKernelSpec(object):
+         EXAMPLES::
+ 
+             sage: from sage.repl.ipython_kernel.install import SageKernelSpec
+-            sage: spec = SageKernelSpec()
++            sage: spec = SageKernelSpec(prefix = tmp_dir())
+             sage: spec.use_local_jsmol()
+             sage: jsmol = os.path.join(spec.nbextensions_dir, 'jsmol')
+             sage: os.path.isdir(jsmol)
+@@ -146,7 +146,7 @@ class SageKernelSpec(object):
+         EXAMPLES::
+ 
+             sage: from sage.repl.ipython_kernel.install import SageKernelSpec
+-            sage: spec = SageKernelSpec()
++            sage: spec = SageKernelSpec(prefix = tmp_dir())
+             sage: spec.use_local_threejs()
+             sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs')
+             sage: os.path.isdir(threejs)
diff --git a/pkgs/applications/science/math/sage/patches/zn_poly_version.patch b/pkgs/applications/science/math/sage/patches/zn_poly_version.patch
new file mode 100644
index 0000000000000..92ea4303e477f
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/zn_poly_version.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py
+index 7ff4f21675..1d72168833 100644
+--- a/src/sage/misc/package.py
++++ b/src/sage/misc/package.py
+@@ -350,7 +350,7 @@ def package_versions(package_type, local=False):
+         sage: 'gap' in std
+         True
+         sage: std['zn_poly']
+-        ('0.9.p11', '0.9.p11')
++        ('0.9', '0.9.p11')
+     """
+     return {pkg['name']: (pkg['installed_version'], pkg['remote_version']) for pkg in list_packages(package_type, local=local).values()}
+ 
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix
new file mode 100644
index 0000000000000..f5cb39603c325
--- /dev/null
+++ b/pkgs/applications/science/math/sage/pybrial.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+, buildPythonPackage
+}:
+# This has a cyclic dependency with sage. I don't include sage in the
+# buildInputs and let python figure it out at runtime. Because of this,
+# I don't include the package in the main nipxkgs tree. It wouldn't be useful
+# outside of sage anyways (as you could just directly depend on sage and use
+# it).
+buildPythonPackage rec {
+    pname = "pyBRiAl";
+    version = "1.2.3";
+
+    # included with BRiAl source
+    src = fetchFromGitHub {
+      owner = "BRiAl";
+      repo = "BRiAl";
+      rev = "${version}";
+      sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
+    };
+
+    sourceRoot = "source/sage-brial";
+
+    meta = with stdenv.lib; {
+      description = "python implementation of BRiAl";
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ timokau ];
+    };
+}
diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix
new file mode 100644
index 0000000000000..184eaf29bdd3d
--- /dev/null
+++ b/pkgs/applications/science/math/sage/python-openid.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, django
+, nose
+, twill
+, pycrypto
+}:
+
+buildPythonPackage rec {
+  pname = "python-openid";
+  version = "2.2.5";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
+  };
+
+  propagatedBuildInputs = [
+    django
+    twill
+    pycrypto
+  ];
+
+  # Cannot access the djopenid example module.
+  # I don't know how to fix that (adding the examples dir to PYTHONPATH doesn't work)
+  doCheck = false;
+  checkInputs = [ nose ];
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenID library for Python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ timokau ];
+    homepage = https://github.com/openid/python-openid/;
+  };
+}
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
new file mode 100644
index 0000000000000..317eb6e16c495
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -0,0 +1,162 @@
+{ stdenv
+, lib
+, writeTextFile
+, python
+, sage-src
+, sagelib
+, env-locations
+, gfortran
+, bash
+, coreutils
+, gnused
+, gnugrep
+, binutils
+, pythonEnv
+, python3
+, pkg-config
+, pari
+, gap-libgap-compatible
+, libgap
+, ecl
+, maxima-ecl
+, singular
+, giac
+, palp
+, rWrapper
+, gfan
+, cddlib
+, jmol
+, tachyon
+, glpk
+, eclib
+, sympow
+, nauty
+, sqlite
+, ppl
+, ecm
+, lcalc
+, rubiks
+, flintqs
+, openblas-cblas-pc
+, flint
+, gmp
+, mpfr
+, pynac
+, zlib
+, gsl
+, ntl
+}:
+
+let
+  runtimepath = (lib.makeBinPath ([
+    "@sage-local@"
+    "@sage-local@/build"
+    pythonEnv
+    # empty python env to add python wrapper that clears PYTHONHOME (see
+    # wrapper.nix). This is necessary because sage will call the python3 binary
+    # (from python2 code). The python2 PYTHONHOME (again set in wrapper.nix)
+    # will then confuse python3, if it is not overwritten.
+    python3.buildEnv
+    gfortran # for inline fortran
+    stdenv.cc # for cython
+    bash
+    coreutils
+    gnused
+    gnugrep
+    binutils.bintools
+    pkg-config
+    pari
+    gap-libgap-compatible
+    libgap
+    ecl
+    maxima-ecl
+    singular
+    giac
+    palp
+    rWrapper
+    gfan
+    cddlib
+    jmol
+    tachyon
+    glpk
+    eclib
+    sympow
+    nauty
+    sqlite
+    ppl
+    ecm
+    lcalc
+    rubiks
+    flintqs
+  ]
+  ));
+in
+writeTextFile rec {
+  name = "sage-env";
+  destination = "/${name}";
+  text = ''
+    export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
+        # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
+        # for it outside of the tests. However since singular and openblas are runtime dependencies anyways
+        # and openblas-cblas-pc is tiny, it doesn't really hurt to include.
+        singular
+        openblas-cblas-pc
+      ])
+    }'
+    export SAGE_ROOT='${sage-src}'
+    export SAGE_LOCAL='@sage-local@'
+    export SAGE_SHARE='${sagelib}/share'
+    orig_path="$PATH"
+    export PATH='${runtimepath}'
+
+    # set dependent vars, like JUPYTER_CONFIG_DIR
+    source "${sage-src}/src/bin/sage-env"
+    export PATH="${runtimepath}:$orig_path" # sage-env messes with PATH
+
+    export SAGE_LOGS="$TMPDIR/sage-logs"
+    export SAGE_DOC="''${SAGE_DOC_OVERRIDE:-doc-placeholder}"
+    export SAGE_DOC_SRC="''${SAGE_DOC_SRC_OVERRIDE:-${sage-src}/src/doc}"
+
+    # set locations of dependencies
+    . ${env-locations}/sage-env-locations
+
+    # needed for cython
+    export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
+    # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
+    export LDFLAGS='${
+      lib.concatStringsSep " " (map (pkg: "-L${pkg}/lib") [
+        flint
+        libgap
+        glpk
+        gmp
+        mpfr
+        pari
+        pynac
+        zlib
+        eclib
+        gsl
+        ntl
+        jmol
+        sympow
+      ])
+    }'
+    export CFLAGS='${
+      lib.concatStringsSep " " (map (pkg: "-isystem ${pkg}/include") [
+        singular
+        gmp.dev
+        glpk
+        flint
+        libgap
+        pynac
+        mpfr.dev
+      ])
+    }'
+
+    export SAGE_LIB='${sagelib}/${python.sitePackages}'
+
+    export SAGE_EXTCODE='${sage-src}/src/ext'
+
+    # for find_library
+    export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}:$DYLD_LIBRARY_PATH"
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
new file mode 100644
index 0000000000000..348adf5d5095c
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -0,0 +1,204 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+}:
+stdenv.mkDerivation rec {
+  version = "8.2";
+  name = "sage-src-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sagemath";
+    repo = "sage";
+    rev = version;
+    sha256 = "0d7vc16s7dj23an2cb8v5bhbnc6nsw20qhnnxr0xh8qg629027b8";
+  };
+
+  nixPatches = [
+    # https://trac.sagemath.org/ticket/25309
+    (fetchpatch {
+      name = "spkg-paths.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=97f06fddee920399d4fcda65aa9b0925774aec69&id=a86151429ccce1ddd085e8090ada8ebdf02f3310";
+      sha256 = "1xb9108rzzkdhn71vw44525620d3ww9jv1fph5a77v9y7nf9wgr7";
+    })
+    (fetchpatch {
+      name = "maxima-fas.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=97f06fddee920399d4fcda65aa9b0925774aec69";
+      sha256 = "14s50yg3hpw9cp3v581dx7zfmpm2j972im7x30iwki8k45mjvk3i";
+    })
+
+    # https://trac.sagemath.org/ticket/25328
+    # https://trac.sagemath.org/ticket/25546
+    # https://trac.sagemath.org/ticket/25722
+    (fetchpatch {
+      name = "install-jupyter-kernel-in-correct-prefix.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id=72167b98e3f64326df6b2c78785df25539472fcc";
+      sha256 = "0pscnjhm7r2yr2rxnv4kkkq626vwaja720lixa3m3w9rwlxll5a7";
+    })
+    ./patches/test-in-tmpdir.patch
+
+    # https://trac.sagemath.org/ticket/25358
+    (fetchpatch {
+      name = "safe-directory-test-without-patch.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463";
+      sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7";
+    })
+
+    # https://trac.sagemath.org/ticket/25357 rebased on 8.2
+    ./patches/python3-syntax-without-write.patch
+
+    # https://trac.sagemath.org/ticket/25314
+    (fetchpatch {
+      name = "make-qepcad-test-optional.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=fe294c58bd035ef427e268901d54a6faa0058138";
+      sha256 = "003d5baf5c0n5rfg010ijwkwz8kg0s414cxwczs2vhdayxdixbix";
+    })
+
+    # https://trac.sagemath.org/ticket/25316
+    ./patches/python-5755-hotpatch.patch
+
+    # https://trac.sagemath.org/ticket/25354
+    # https://trac.sagemath.org/ticket/25531
+    (fetchpatch {
+      name = "cysignals-include.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=28778bd25a37c80884d2b24e0683fb2989300cef";
+      sha256 = "0fiiiw91pgs8avm9ggj8hb64bhqzl6jcw094d94nhirmh8w2jmc5";
+    })
+
+    # https://trac.sagemath.org/ticket/25315
+    (fetchpatch {
+      name = "find-libraries-in-dyld-library-path.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=20d4593876ce9c6004eac2ab6fd61786d0d96a06";
+      sha256 = "1k3afq3qlzmgqwx6rzs5wv153vv9dsf5rk8pi61g57l3r3npbjmc";
+    })
+
+    # Pari upstream has since accepted a patch, so this patch won't be necessary once sage updates pari.
+    # https://trac.sagemath.org/ticket/25312
+    ./patches/pari-stackwarn.patch
+
+    # https://trac.sagemath.org/ticket/25311
+    ./patches/zn_poly_version.patch
+
+    # https://trac.sagemath.org/ticket/25345
+    # (upstream patch doesn't apply on 8.2 source)
+    ./patches/dochtml-optional.patch
+  ];
+
+  packageUpgradePatches = [
+    (fetchpatch {
+      name = "cypari2-1.2.1.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=62fe6eb15111327d930336d4252d5b23cbb22ab9";
+      sha256 = "1xax7vvs8h4xip16xcsp47xdb6lig6f2r3pl8cksvlz8lhgbyxh2";
+    })
+
+    # matplotlib 2.2.2 deprecated `normed` (replaced by `density`).
+    # This patch only ignores the warning. It would be equally easy to fix it
+    # (by replacing all mentions of `normed` by `density`), but its better to
+    # stay close to sage upstream. I didn't open an upstream ticket about it
+    # because the matplotlib update also requires a new dependency (kiwisolver)
+    # and I don't want to invest the time to learn how to add it.
+    ./patches/matplotlib-normed-deprecated.patch
+
+    # Update to 20171219 broke the doctests because of insignificant precision
+    # changes, make the doctests less fragile.
+    # I didn't open an upstream ticket because its not entirely clear if
+    # 20171219 is really "released" yet. It is listed on the github releases
+    # page, but not marked as "latest release" and the homepage still links to
+    # the last version.
+    ./patches/eclib-regulator-precision.patch
+
+    # sphinx 1.6 -> 1.7 upgrade
+    # https://trac.sagemath.org/ticket/24935
+    ./patches/sphinx-1.7.patch
+
+    # Adapt hashes to new boost version
+    # https://trac.sagemath.org/ticket/22243
+    # (this ticket doesn't only upgrade boost but also avoids this problem in the future)
+    (fetchpatch {
+      name = "boost-upgrade.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id=a24a9c6b30b93957333a3116196214a931325b69";
+      sha256 = "0z3870g2ms2a81vnw08dc2i4k7jr62w8fggvcdwaavgd1wvdxwfl";
+    })
+
+    # gfan 0.6.2
+    # https://trac.sagemath.org/ticket/23353
+    (fetchpatch {
+      name = "gfan-update.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?h=420215fc469cde733ec7a339e59b78ad6eec804c&id=112498a293ea2bf563e41aed35f1aa608f01b349";
+      sha256 = "0ga3hkx8cr23dpc919lgvpi5lmy0d728jkq9z6kf0fl9s8g31mxb";
+    })
+
+    # New glpk version has new warnings, filter those out until upstream sage has found a solution
+    # https://trac.sagemath.org/ticket/24824
+    (fetchpatch {
+      url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch";
+      sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp";
+      stripLen = 1;
+    })
+
+    # https://trac.sagemath.org/ticket/25329
+    (fetchpatch {
+      name = "dont-check-exact-glpk-version.patch";
+      url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=89d068d8d77316bfffa6bf8e9ebf70b3b3b88e5c";
+      sha256 = "00knwxs6fmymfgfl0q5kcavmxm9sf90a4r76y35n5s55gj8pl918";
+    })
+
+    # https://trac.sagemath.org/ticket/25355
+    (fetchpatch {
+      name = "maxima-5.41.0.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?id=87328023c4739abdf24108038201e3fa9bdfc739";
+      sha256 = "0hxi7qr5mfx1bc32r8j7iba4gzd7c6v63asylyf5cbyp86azpb7i";
+    })
+
+    # Update cddlib from 0.94g to 0.94h.
+    # https://trac.sagemath.org/ticket/25341 (doesn't apply to 8.2 sources)
+    (fetchpatch {
+      url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/u2-version-cddlib-094h.patch";
+      sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k";
+      stripLen = 1;
+    })
+    ./patches/revert-269c1e1551285.patch
+
+
+    # Only formatting changes.
+    # https://trac.sagemath.org/ticket/25260
+    ./patches/numpy-1.14.3.patch
+
+    # https://trac.sagemath.org/ticket/24374
+    (fetchpatch {
+      name = "networkx-2.1.patch";
+      url = "https://salsa.debian.org/science-team/sagemath/raw/487df9ae48ca1d93d9b1cb3af8745d31e30fb741/debian/patches/u0-version-networkx-2.1.patch";
+      sha256 = "1xxxawygbgxgvlv7b4w8hhzgdnva4rhmgdxaiaa3pwdwln0yc750";
+      stripLen = 1;
+    })
+
+    # https://trac.sagemath.org/ticket/24927 rebased
+    ./patches/arb-2.13.0.patch
+
+    # https://trac.sagemath.org/ticket/24838 rebased
+    ./patches/pynac-0.7.22.patch
+  ];
+
+  patches = nixPatches ++ packageUpgradePatches;
+
+  postPatch = ''
+    # make sure shebangs etc are fixed, but sage-python23 still works
+    find . -type f -exec sed \
+      -e 's/sage-python23/python/g' \
+      -i {} \;
+
+    echo '#!${stdenv.shell}
+    python "$@"' > build/bin/sage-python23
+
+    # Do not use sage-env-config (generated by ./configure).
+    # Instead variables are set manually.
+    echo '# do nothing' >  src/bin/sage-env-config
+  '';
+
+  configurePhase = "# do nothing";
+
+  buildPhase = "# do nothing";
+
+  installPhase = ''
+    cp -r . "$out"
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
new file mode 100644
index 0000000000000..3d1ebe87c6b71
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -0,0 +1,129 @@
+{ stdenv
+, lib
+, makeWrapper
+, sage-env
+, sage-src
+, sagelib
+, sagedoc
+, openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
+, pkg-config
+, three
+, singular
+, libgap
+, gap-libgap-compatible
+, gcc
+, giac
+, maxima-ecl
+, pari
+, gmp
+, gfan
+, python2
+, flintqs
+, eclib
+, ntl
+, ecm
+, pynac
+, pythonEnv
+}:
+
+let
+  buildInputs = [
+    pythonEnv # for patchShebangs
+    makeWrapper
+    pkg-config
+    openblasCompat # lots of segfaults with regular (64 bit) openblas
+    openblas-blas-pc
+    openblas-cblas-pc
+    openblas-lapack-pc
+    singular
+    three
+    pynac
+    giac
+    libgap
+    gap-libgap-compatible
+    pari
+    gmp
+    gfan
+    maxima-ecl
+    eclib
+    flintqs
+    ntl
+    ecm
+  ];
+
+  # remove python prefix, replace "-" in the name by "_", apply patch_names
+  # python2.7-some-pkg-1.0 -> some_pkg-1.0
+  pkg_to_spkg_name = pkg: patch_names: let
+    parts = lib.splitString "-" pkg.name;
+    # remove python2.7-
+    stripped_parts = if (builtins.head parts) == python2.libPrefix then builtins.tail parts else parts;
+    version = lib.last stripped_parts;
+    orig_pkgname = lib.init stripped_parts;
+    pkgname = patch_names (lib.concatStringsSep "_" orig_pkgname);
+  in pkgname + "-" + version;
+
+
+  # return the names of all dependencies in the transitive closure
+  transitiveClosure = dep:
+  if isNull dep then
+    # propagatedBuildInputs might contain null
+    # (although that might be considered a programming error in the derivation)
+    []
+  else
+    [ dep ] ++ (
+      if builtins.hasAttr "propagatedBuildInputs" dep then
+        lib.unique (builtins.concatLists (map transitiveClosure dep.propagatedBuildInputs))
+      else
+      []
+    );
+
+  allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs);
+  transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
+  # fix differences between spkg and sage names
+  # (could patch sage instead, but this is more lightweight and also works for packages depending on sage)
+  patch_names = builtins.replaceStrings [
+    "zope.interface"
+    "node_three"
+  ] [
+    "zope_interface"
+    "threejs"
+  ];
+  # spkg names (this_is_a_package-version) of all transitive deps
+  input_names = map (dep: pkg_to_spkg_name dep patch_names) transitiveDeps;
+in
+stdenv.mkDerivation rec {
+  version = sage-src.version;
+  name = "sage-with-env-${version}";
+
+  inherit buildInputs;
+
+  src = sage-src;
+
+  configurePhase = "#do nothing";
+
+  buildPhase = ''
+    mkdir installed
+    for pkg in ${lib.concatStringsSep " " input_names}; do
+      touch "installed/$pkg"
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/var/lib/sage"
+    cp -r installed $out/var/lib/sage
+
+    mkdir -p "$out/etc"
+    # sage tests will try to create this file if it doesn't exist
+    touch "$out/etc/sage-started.txt"
+
+    mkdir -p "$out/build"
+    cp -r src/bin "$out/bin"
+    cp -r build/bin "$out/build/bin"
+    cp -f '${sage-env}/sage-env' "$out/bin/sage-env"
+    substituteInPlace "$out/bin/sage-env" \
+      --subst-var-by sage-local "$out"
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix
new file mode 100644
index 0000000000000..06b667f426fa9
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sage-wrapper.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, makeWrapper
+, sage
+, sage-src
+, sagedoc
+, withDoc
+}:
+
+stdenv.mkDerivation rec {
+  version = sage.version;
+  name = "sage-wrapper-${version}";
+
+  buildInputs = [
+    makeWrapper
+  ];
+
+  unpackPhase = "#do nothing";
+  configurePhase = "#do nothing";
+  buildPhase = "#do nothing";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    makeWrapper "${sage}/bin/sage" "$out/bin/sage" \
+      --set SAGE_DOC_SRC_OVERRIDE "${sage-src}/src/doc" ${
+      stdenv.lib.optionalString withDoc "--set SAGE_DOC_OVERRIDE ${sagedoc}/share/doc/sage"
+    }
+  '';
+
+  doInstallCheck = withDoc;
+  installCheckPhase = ''
+    export HOME="$TMPDIR/sage-home"
+    mkdir -p "$HOME"
+    "$out/bin/sage" -c 'browse_sage_doc._open("reference", testing=True)'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
new file mode 100644
index 0000000000000..b1e5d7278b0f7
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, sage-with-env
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  version = sage-with-env.version;
+  name = "sage-${version}";
+
+  buildInputs = [
+    makeWrapper
+  ];
+
+  unpackPhase = "#do nothing";
+  configurePhase = "#do nothing";
+  buildPhase = "#do nothing";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    # Like a symlink, but make sure that $0 points to the original.
+    makeWrapper "${sage-with-env}/bin/sage" "$out/bin/sage"
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    export HOME="$TMPDIR/sage-home"
+    mkdir -p "$HOME"
+
+    # "--long" tests are in the order of 1h, without "--long" its 1/2h
+    "$out/bin/sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage --long --all
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
new file mode 100644
index 0000000000000..7b280e9e02806
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -0,0 +1,97 @@
+{ pkgs
+, stdenv
+, sage-src
+, env-locations
+, sage-with-env
+, sagelib
+, python2
+, psutil
+, future
+, sphinx
+, sagenb
+, maxima-ecl
+, networkx
+, scipy
+, sympy
+, matplotlib
+, pillow
+, ipykernel
+, jupyter_client
+, tachyon
+, jmol
+, ipywidgets
+, typing
+, cddlib
+, pybrial
+}:
+
+stdenv.mkDerivation rec {
+  version = sage-src.version;
+  name = "sagedoc-${version}";
+
+
+  # Building the documentation has many dependencies, because all documented
+  # modules are imported and because matplotlib is used to produce plots.
+  buildInputs = [
+    sagelib
+    python2
+    psutil
+    future
+    sphinx
+    sagenb
+    maxima-ecl
+    networkx
+    scipy
+    sympy
+    matplotlib
+    pillow
+    ipykernel
+    jupyter_client
+    tachyon
+    jmol
+    ipywidgets
+    typing
+    cddlib
+    pybrial
+  ];
+
+  unpackPhase = ''
+    export SAGE_DOC_OVERRIDE="$PWD/share/doc/sage"
+    export SAGE_DOC_SRC_OVERRIDE="$PWD/docsrc"
+
+    cp -r "${sage-src}/src/doc" "$SAGE_DOC_SRC_OVERRIDE"
+    chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE"
+  '';
+
+  buildPhase = ''
+    export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
+    export HOME="$TMPDIR/sage_home"
+    mkdir -p "$HOME"
+
+    ${sage-with-env}/bin/sage -python -m sage_setup.docbuild \
+      --mathjax \
+      --no-pdf-links \
+      all html
+  '';
+
+  installPhase = ''
+    cd "$SAGE_DOC_OVERRIDE"
+
+    mkdir -p "$out/share/doc/sage"
+    cp -r html "$out"/share/doc/sage
+
+    # Replace duplicated files by symlinks (Gentoo)
+    cd "$out"/share/doc/sage
+    mv html/en/_static{,.tmp}
+    for _dir in `find -name _static` ; do
+          rm -r $_dir
+          ln -s /share/doc/sage/html/en/_static $_dir
+    done
+    mv html/en/_static{.tmp,}
+  '';
+
+  doCheck = true;
+  checkPhase = ''
+    ${sage-with-env}/bin/sage -t --optional=dochtml --all
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
new file mode 100644
index 0000000000000..a053d997bf9a6
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -0,0 +1,139 @@
+{ stdenv
+, sage-src
+, perl
+, buildPythonPackage
+, arb
+, openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
+, brial
+, cliquer
+, cypari2
+, cysignals
+, cython
+, ecl
+, eclib
+, ecm
+, flint
+, gd
+, givaro
+, glpk
+, gsl
+, iml
+, jinja2
+, lcalc
+, lrcalc
+, libgap
+, linbox
+, m4ri
+, m4rie
+, libmpc
+, mpfi
+, ntl
+, numpy
+, pari
+, pkgconfig
+, planarity
+, ppl
+, pynac
+, python
+, ratpoints
+, readline
+, rankwidth
+, symmetrica
+, zn_poly
+, fflas-ffpack
+, boost
+, singular
+, pip
+, jupyter_core
+}:
+
+buildPythonPackage rec {
+  format = "other";
+  version = sage-src.version;
+  pname = "sagelib";
+
+  src = sage-src;
+
+  nativeBuildInputs = [
+    iml
+    perl
+    openblas-blas-pc
+    openblas-cblas-pc
+    openblas-lapack-pc
+    jupyter_core
+  ];
+
+  buildInputs = [
+    gd
+    readline
+  ];
+
+  propagatedBuildInputs = [
+    cypari2
+    jinja2
+    numpy
+    pkgconfig
+    boost
+    arb
+    brial
+    cliquer
+    ecl
+    eclib
+    ecm
+    fflas-ffpack
+    flint
+    givaro
+    glpk
+    gsl
+    lcalc
+    libgap
+    libmpc
+    linbox
+    lrcalc
+    m4ri
+    m4rie
+    mpfi
+    ntl
+    openblasCompat
+    pari
+    planarity
+    ppl
+    pynac
+    rankwidth
+    ratpoints
+    singular
+    symmetrica
+    zn_poly
+    pip
+    cython
+    cysignals
+  ];
+
+  buildPhase = ''
+    export SAGE_ROOT="$PWD"
+    export SAGE_LOCAL="$SAGE_ROOT"
+    export SAGE_SHARE="$SAGE_LOCAL/share"
+    export JUPYTER_PATH="$SAGE_LOCAL/jupyter"
+
+    export PATH="$SAGE_ROOT/build/bin:$SAGE_ROOT/src/bin:$PATH"
+
+    export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
+
+    mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
+    mkdir -p "var/lib/sage/installed"
+
+    cd src
+    source bin/sage-dist-helpers
+
+    ${python.interpreter} -u setup.py --no-user-cfg build
+  '';
+
+  installPhase = ''
+    ${python.interpreter} -u setup.py --no-user-cfg install --prefix=$out
+
+    rm -r "$out/${python.sitePackages}/sage/cython_debug"
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix
new file mode 100644
index 0000000000000..cc883cc24b427
--- /dev/null
+++ b/pkgs/applications/science/math/sage/sagenb.nix
@@ -0,0 +1,57 @@
+# Has a cyclic dependency with sage (not expressed here) and is not useful outside of sage
+{ stdenv
+, fetchpatch
+, python
+, buildPythonPackage
+, fetchFromGitHub
+, mathjax
+, twisted
+, flask
+, flask-oldsessions
+, flask-openid
+, flask-autoindex
+, flask-babel
+}:
+
+buildPythonPackage rec {
+  pname = "sagenb";
+  version = "2018-06-26"; # not 1.0.1 because of new flask syntax
+
+  src = fetchFromGitHub {
+    owner = "sagemath";
+    repo = "sagenb";
+    rev = "b360a0172e15501fb0163d02dce713a561fee2af";
+    sha256 = "12anydw0v9w23rbc0a94bqmjhjdir9h820c5zdhipw9ccdcc2jlf";
+  };
+
+  propagatedBuildInputs = [
+    twisted
+    flask
+    flask-oldsessions
+    flask-openid
+    flask-autoindex
+    flask-babel
+  ];
+
+  # tests depend on sage
+  doCheck = false;
+
+  patches = [
+    # work with latest flask-babel
+    (fetchpatch {
+      url = "https://github.com/sagemath/sagenb/commit/ba065eca63dd34a383e4c7ba7561430a90fcd087.patch";
+      sha256 = "1lamzsrgymdd618imrasjp6ivhw2aynh83gkybsd7pm1rzjcq4x8";
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Sage Notebook";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ timokau ];
+  };
+
+  # let sagenb use mathjax
+  postInstall = ''
+    ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/mathjax"
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/shebangs.patch b/pkgs/applications/science/math/sage/shebangs.patch
deleted file mode 100644
index 96ed5a4bc6c3a..0000000000000
--- a/pkgs/applications/science/math/sage/shebangs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
-index 83e61a7e0d..942ba206c7 100755
---- a/build/bin/sage-spkg
-+++ b/build/bin/sage-spkg
-@@ -648,8 +648,12 @@ if ! sage-apply-patches; then
-     error_msg "Error applying patches"
-     exit 1
- fi
-+
-+@bash@/bin/bash @patchSageShebangs@ .
-+
- cd ..
- 
-+
- ##################################################################
- # The package has been extracted, prepare for installation
- ##################################################################
-@@ -671,7 +675,7 @@ write_script_wrapper() {
-     local tmpscript="$(dirname "$script")/.tmp-${script##*/}"
- 
-     cat > "$tmpscript" <<__EOF__
--#!/usr/bin/env bash
-+#! @bash@/bin/bash
- 
- export SAGE_ROOT="$SAGE_ROOT"
- export SAGE_SRC="$SAGE_SRC"
-@@ -833,6 +837,9 @@ if [ "$UNAME" = "CYGWIN" ]; then
-     sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null
- fi
- 
-+@bash@/bin/bash @patchSageShebangs@ .
-+@bash@/bin/bash @patchSageShebangs@ "$out/bin"
-+
- echo "Successfully installed $PKG_NAME"
- 
- if [ "$SAGE_CHECK" = "yes" ]; then
diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch
deleted file mode 100644
index c79d4422133d7..0000000000000
--- a/pkgs/applications/science/math/sage/spkg-giac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install
-index bdd8df6cb8..3fd7a3ef8a 100644
---- a/build/pkgs/giac/spkg-install
-+++ b/build/pkgs/giac/spkg-install
-@@ -2,6 +2,15 @@
- ## Giac
- ###########################################
- 
-+# Fix hardcoded paths, while making sure to only update timestamps of actually
-+# changed files (otherwise confuses make)
-+grep -rlF '/bin/cp' . | while read file
-+do
-+	sed -e 's@/bin/cp@cp@g' -i "$file"
-+done
-+
-+# Fix input parser syntax
-+sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc'
- 
- if [ "$SAGE_LOCAL" = "" ]; then
-    echo "SAGE_LOCAL undefined ... exiting";
diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch
deleted file mode 100644
index 74f552dd3c369..0000000000000
--- a/pkgs/applications/science/math/sage/spkg-git.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install
-index 87874de3d8..b0906245fa 100644
---- a/build/pkgs/git/spkg-install
-+++ b/build/pkgs/git/spkg-install
-@@ -33,6 +33,13 @@ fi
- 
- cd src
- 
-+# Fix hardcoded paths, while making sure to only update timestamps of actually
-+# changed files (otherwise confuses make)
-+grep -rlF '/usr/bin/perl' . | while read file
-+do
-+	sed -e 's@/usr/bin/perl@perl@g' -i "$file"
-+done
-+
- # We don't want to think about Fink or Macports
- export NO_FINK=1
- export NO_DARWIN_PORTS=1
diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch
deleted file mode 100644
index e39981b6552a8..0000000000000
--- a/pkgs/applications/science/math/sage/spkg-python.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/pkgs/python3/spkg-build b/build/pkgs/python3/spkg-build
-index 56db087ae5..b450703c5f 100644
---- a/build/pkgs/python3/spkg-build
-+++ b/build/pkgs/python3/spkg-build
-@@ -27,6 +27,8 @@ fi
- export EXTRA_CFLAGS="`testcflags.sh -Wno-unused` $CFLAGS"
- unset CFLAGS
- 
-+export LDFLAGS="$LDFLAGS -lcrypt"
-+
- if [ "$UNAME" = Darwin ]; then
-     PYTHON_CONFIGURE="--disable-toolbox-glue $PYTHON_CONFIGURE"
- 
diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch
deleted file mode 100644
index 606ffcd3ad4ed..0000000000000
--- a/pkgs/applications/science/math/sage/spkg-singular.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install
-index 8caafb1699..3c34e6608a 100644
---- a/build/pkgs/singular/spkg-install
-+++ b/build/pkgs/singular/spkg-install
-@@ -2,6 +2,13 @@
- ## Singular
- ###########################################
- 
-+# Fix hardcoded paths, while making sure to only update timestamps of actually
-+# changed files (otherwise confuses make)
-+grep -rlF '/bin/rm' . | while read file
-+do
-+	sed -e 's@/bin/rm@rm@g' -i "$file"
-+done
-+
- if [ -z "$SAGE_LOCAL" ]; then
-     echo >&2 "Error: SAGE_LOCAL undefined -- exiting..."
-     echo >&2 "Maybe run 'sage -sh'?"
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index 154f1ba39e3c6..ad0231d37b0ee 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   inherit name;
 
   src = fetchurl {
-    url = "http://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz";
+    url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz";
     sha256 =
       if stdenv.system == "i686-linux" then
         "6143a95ded40411a35630a89b365875a6526cd4db1e2865ac5612929a7db937a"
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix
index bb52b430f8cb2..fcdbb6b985d69 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "4.1.2";
   name = "scilab-${version}";
   src = fetchurl {
-    url = "http://www.scilab.org/download/${version}/${name}-src.tar.gz";
+    url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz";
     sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc";
   };
 
diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index 3b01c684d529b..8fa020ba07c97 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bison openmpi flex zlib ];
 
   src = fetchurl {
-    url = "http://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz";
     sha256 = "f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7";
   };
 
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index a7212299aa630..6123fd7306d91 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl}:
+{ stdenv
+, fetchurl
+, fetchpatch
+}:
 stdenv.mkDerivation rec {
   name = "symmetrica-${version}";
   version = "2.0";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
     url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz";
     sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz";
     name = "symmetrica-2.0.tar.gz";
   };
-  buildInputs = [];
   sourceRoot = ".";
   installPhase = ''
     mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica}
@@ -18,6 +19,22 @@ stdenv.mkDerivation rec {
     cp *.h "$out/include/symmetrica"
     cp README *.doc "$out/share/doc/symmetrica"
   '';
+  patches = [
+      # don't show banner ("SYMMETRICA VERSION X - STARTING)
+      # it doesn't contain very much helpful information and a banner is not ideal for a library
+      (fetchpatch {
+        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/de.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+        sha256 = "0df0vqixcfpzny6dkhyj87h8aznz3xn3zfwwlj8pd10bpb90k6gb";
+      })
+
+      # use int32_t and uint32_t for type INT
+      # see https://trac.sagemath.org/ticket/13413
+      (fetchpatch {
+        name = "fix_64bit_integer_overflow.patch";
+        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/int32.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+        sha256 = "0p33c85ck4kd453z687ni4bdcqr1pqx2756j7aq11bf63vjz4cyz";
+      })
+  ];
   meta = {
     inherit version;
     description = ''A collection of routines for representation theory and combinatorics'';
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 8ecbf656a8213..0f0b44ccfa5ea 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}:
 stdenv.mkDerivation rec {
   baseName="golly";
-  version = "3.1";
+  version = "3.2";
   name="${baseName}-${version}";
 
   src = fetchurl {
-    sha256 = "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7";
+    sha256 = "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd";
     url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
   };
 
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index b139f30b3d187..0f0c6aaf74da6 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -8,7 +8,7 @@
 , enableDocs ? false }:
 
 stdenv.mkDerivation rec {
-  version = "1.1";
+  version = "1.3";
   name = "openmvg-${version}";
 
   src = fetchgit {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
     # Tag v1.1
     rev = "refs/tags/v${version}";
-    sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f";
+    sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index ef539ac9c8df3..4e5b986a428e5 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -24,10 +24,28 @@ stdenv.mkDerivation rec {
       "-DBUILD_STATIC_RUNTIME=ON"
       "-DINSTALL_BIN_DIR=$out/bin"
       "-DVCG_DIR=${vcg}"
+      "-DCGAL_ROOT=${cgal}/lib/cmake/CGAL"
       "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/"
     )
   '';
+  
+  postFixup = ''
+    rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud)
+    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud
 
+    rp=$(patchelf --print-rpath $out/bin/InterfaceVisualSFM)
+    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/InterfaceVisualSFM
+
+    rp=$(patchelf --print-rpath $out/bin/ReconstructMesh)
+    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/ReconstructMesh
+
+    rp=$(patchelf --print-rpath $out/bin/RefineMesh)
+    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/RefineMesh
+
+    rp=$(patchelf --print-rpath $out/bin/TextureMesh)
+    patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh
+  '';
+  
   cmakeDir = "./";
 
   dontUseCmakeBuildDir = true;
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 11087846e05c8..295e726c679d7 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
 
 
 stdenv.mkDerivation {
-  name = "gromacs-2018.1";
+  name = "gromacs-2018.2";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.1.tar.gz";
-    sha256 = "1k85sz0b9rmq00g58v22y9v671gsa512sjivx3n3yclr0hs36dad";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz";
+    sha256 = "0mvqsg2j4h529a0vvvgpa4cb3p8zan18zcdlmx1na2si1h9fipab";
   };
 
   buildInputs = [cmake fftw]
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index 6c25f720ebf96..64b88dcc3d4fc 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.0";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz";
+    url = "https://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz";
     sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g";
   };
 
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index 340428e8e7770..66a9bebacf0dd 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.5";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
+    url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
     sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5";
   };
 
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
index beef26c6032a3..e0993a5801936 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildEnv, callPackage_i686, fetchFromGitHub, python27Packages, graphviz
+{ stdenv, lib, buildEnv, pkgsi686Linux, fetchFromGitHub, python27Packages, graphviz
 , includeGUI ? true
 , includeProtocols ? true
 }:
@@ -20,7 +20,7 @@ let
     platforms = platforms.linux;
   };
 
-  cli = callPackage_i686 ./cli.nix {
+  cli = pkgsi686Linux.callPackage ./cli.nix {
     inherit version src meta;
   };
 
@@ -47,7 +47,7 @@ let
       python27Packages.wxPython
       graphviz
     ];
- 
+
     installPhase = ''
       mkdir -p "$out"/gui "$out"/bin
       cp -r gui/* "$out"/gui
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 3edf75a4bffe9..1d933d569486f 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   name = "gazebo-${version}";
 
   src = fetchurl {
-    url = "http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2";
+    url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2";
     sha256 = src-sha256;
   };
 
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index ade8af254496b..01a4f4023023f 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -2,7 +2,8 @@
 , qt4, xapian, file, python, perl
 , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
 , libwpd, unrtf, untex
-, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }:
+, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib
+, withGui ? true }:
 
 assert stdenv.system != "powerpc-linux";
 
@@ -11,14 +12,17 @@ stdenv.mkDerivation rec {
   name = "recoll-${ver}";
 
   src = fetchurl {
-    url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
+    url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz";
     sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn";
   };
 
-  configureFlags = [ "--enable-recollq" ] ++
-    (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
+  configureFlags = [ "--enable-recollq" ]
+    ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
+    ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
 
-  buildInputs = [ qt4 xapian file python bison ];
+  buildInputs = [ xapian file python bison zlib ]
+    ++ lib.optional withGui qt4
+    ++ lib.optional stdenv.isDarwin libiconv;
 
   patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index d890001489ff5..a6efb8d339e96 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "1.1";
 
   src = fetchurl {
-    url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
+    url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
     sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288";
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 9a4ef524dde9f..24da6a71c5808 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -95,6 +95,8 @@ rec {
 
   git-stree = callPackage ./git-stree { };
 
+  git-sync = callPackage ./git-sync { };
+
   git2cl = callPackage ./git2cl { };
 
   gitFastExport = callPackage ./fast-export { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 02dc7f86fb3fc..4993910634af4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
 
 let
-  version = "0.2.3";
+  version = "0.2.4";
   repo = "git-secret";
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
     inherit repo;
     owner = "sobolevn";
     rev = "v${version}";
-    sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6";
+    sha256 = "0lx2rjyhy3xh6ik755lbbl40v7a7ayyqk68jj8mnv42f2vhd66xl";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
new file mode 100644
index 0000000000000..7ba7d8ec24346
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git
+}:
+
+stdenv.mkDerivation rec {
+  name = "git-sync-${version}";
+  version = "20151024";
+
+  src = fetchFromGitHub {
+    owner = "simonthum";
+    repo = "git-sync";
+    rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
+    sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a git-sync $out/bin/git-sync
+  '';
+
+  wrapperPath = with stdenv.lib; makeBinPath [
+    coreutils
+    git
+    gnugrep
+    gnused
+  ];
+
+  fixupPhase = ''
+    patchShebangs $out/bin
+
+    wrapProgram $out/bin/git-sync \
+      --prefix PATH : "${wrapperPath}"
+  '';
+
+  meta = {
+    description = "A script to automatically synchronize a git repository";
+    homepage = https://github.com/simonthum/git-sync;
+    maintainers = with stdenv.lib.maintainers; [ imalison ];
+    license = stdenv.lib.licenses.cc0;
+    platforms = with stdenv.lib.platforms; unix;
+  };
+}
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 ceec9f1e75b64..4e9b7d2428de8 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -109,6 +109,7 @@ stdenv.mkDerivation {
   preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/bin
     cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
+    rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
   '';
 
   postInstall =
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 1a6e8bc56f40d..c9f666390b55d 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,38 +1,35 @@
-{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }:
+{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "hub-${version}";
   version = "2.4.0";
 
-  src = fetchgit {
-    url = https://github.com/github/hub.git;
-    rev = "refs/tags/v${version}";
+  goPackagePath = "github.com/github/hub";
+
+  src = fetchFromGitHub {
+    owner = "github";
+    repo = "hub";
+    rev = "v${version}";
     sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2";
   };
 
+  buildInputs = [ groff ronn ruby utillinux ] ++
+    stdenv.lib.optional stdenv.isDarwin Security;
 
-  buildInputs = [ go ronn groff utillinux ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
-
-  buildPhase = ''
+  postPatch = ''
     mkdir bin
     ln -s ${ronn}/bin/ronn bin/ronn
-
     patchShebangs .
-    make all man-pages
   '';
 
-  installPhase = ''
-    prefix=$out sh -x < script/install.sh
-
-    mkdir -p "$out/share/zsh/site-functions"
-    cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub"
-
-    mkdir -p "$out/etc/bash_completion.d"
-    cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/"
+  postInstall = ''
+    cd go/src/${goPackagePath}
+    install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub"
+    install -D etc/hub.bash_completion.sh "$bin/etc/bash_completion.d/hub.bash_completion.sh"
+    install -D etc/hub.fish_completion  "$bin/share/fish/vendor_completions.d/hub.fish"
 
-    # Should we also install provided git-hooks?
-    # And fish completion?
+    make man-pages
+    cp -r share/man $bin/share/man
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 597429c0cc7a8..001ee2ddb6818 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     make install-doc
-    mkdir -p $out/etc/bash_completion.d/
-    cp contrib/tig-completion.bash $out/etc/bash_completion.d/
+    install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash
+    install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig
+    cp contrib/vim.tigrc $out/etc/
 
     wrapProgram $out/bin/tig \
       --prefix PATH ':' "${git}/bin"
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 375e7ad001d12..52d46a9911875 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -23,6 +23,8 @@ in buildGoPackage rec {
     inherit rubyEnv;
   };
 
+  buildInputs = [rubyEnv.wrappedRuby];
+
   postInstall = ''
     mkdir -p $ruby
     cp -rv $src/ruby/{bin,lib,vendor} $ruby
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 71b59ed4aef7f..917deac6daa32 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm";
+    sha256 = "15iqvfvijg46444pybi7vg7xhl2x0pr5p1416qlc2nakkn3drpi1";
   };
 
   patches = [ ./static-root-path.patch ];
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index dc983e0033657..db2fdf0199e39 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1bl4zz4k9whv5q6bkf6hyki26dkjhm19rzx2800zzadbrdgs7iz4";
+    sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x";
   };
 
   libPath = makeLibraryPath [
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index d617d363fa0c3..c52a2049a11de 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.48";
+  version = "0.49";
   name = "gource-${version}";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
-    sha256 = "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp";
+    sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index f6816ec154848..3f05bd08f3f4c 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "meld";
-  version = "3.18.1";
+  version = "3.18.2";
   inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis";
+    sha256 = "109px6phfizi2jqrc7d7k7j6nvmanbfp5lykqfrk2sky77sand0r";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index 27e029d39d1e1..f82b80067bf24 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz";
-    sha256 = "f317607f1bc8877db01ff020b8b0857c2d0f8600474d152749264aea0be66b21";
+    sha256 = "9ded42683141e1808535ec3e87d3149f890315c192d6e97212794fd54862b9a4";
   };
 
   dontBuild = true;
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index f2786b15f3445..1535d88026a3d 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "redmine-${version}";
 
   src = fetchurl {
-    url = "http://www.redmine.org/releases/${name}.tar.gz";
+    url = "https://www.redmine.org/releases/${name}.tar.gz";
     sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0";
   };
 
diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch
deleted file mode 100644
index 411922cfd8e7b..0000000000000
--- a/pkgs/applications/version-management/sit/aarch64-isel.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/.cargo/config b/.cargo/config
-new file mode 100644
-index 0000000..15e7649
---- /dev/null
-+++ b/.cargo/config
-@@ -0,0 +1,3 @@
-+# https://github.com/rust-lang/rust/issues/50516
-+[target.'cfg(all(debug_assertions, target_arch = "aarch64"))']
-+rustflags = ["-C", "llvm-args=-fast-isel"]
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index e189241531d6c..75368bd884632 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, 
+  # Darwin
+  libiconv, CoreFoundation, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "sit-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
-    owner = "sit-it";
+    owner = "sit-fyi";
     repo = "sit";
     rev = "v${version}";
-    sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57";
+    sha256 = "10ycs6vc7mfzxnxrki09xn974pcwh196h1pfnsds98x6r87hxkpn";
   };
 
-  buildInputs = [ cmake libzip ];
+  buildInputs = [ cmake libzip gnupg ] ++
+    (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []);
 
-  cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
 
-  patches = [ ./aarch64-isel.patch ];
+  cargoSha256 = "023anmnprxbsvqww1b1bdyfhbhjh1ah2kc67cdihvdvi4lqdmbia";
 
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
-    homepage = https://sit.sh/;
+    homepage = https://sit.fyi/;
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ dywedir yrashk ];
     platforms = platforms.all;
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 2da53d1da8932..8753d4f6f5718 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Infrastructure for exploration, analysis, and manipulation of source code";
-    homepage = http://www.srcml.org;
+    homepage = https://www.srcml.org;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ leenaars ];
   };
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 4d41cad0d8e66..dc202e9e7b490 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec {
   src = fetchurl {
     urls = [
       "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
-      "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
+      "https://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
     ];
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 991842ba0dc15..b36147009a661 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir
+{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir
 , zlib, gettext, libvdpau, libva, libXv, sqlite
 , yasm, freetype, fontconfig, fribidi
 , makeWrapper, libXext, libGLU, qttools, qtbase
@@ -25,21 +25,16 @@ assert !withQT -> default != "qt5";
 
 stdenv.mkDerivation rec {
   name = "avidemux-${version}";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy";
+    sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w";
   };
 
   patches = [
     ./dynamic_install_dir.patch
     ./bootstrap_logging.patch
-    # glibc 2.27 compat
-    (fetchpatch {
-      url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch;
-      sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6";
-    })
   ];
 
   nativeBuildInputs = [ yasm cmake pkgconfig ];
@@ -58,7 +53,10 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withQT [ qttools qtbase ]
     ++ lib.optional withVPX libvpx;
 
-  buildCommand = ''
+  buildCommand = let
+    qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}";
+    wrapProgram = f: "wrapProgram ${f} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
+  in ''
     unpackPhase
     cd "$sourceRoot"
     patchPhase
@@ -73,11 +71,13 @@ stdenv.mkDerivation rec {
     mkdir $out
     cp -R install/usr/* $out
 
-    for i in $out/bin/*; do
-      wrapProgram $i \
-        --set ADM_ROOT_DIR $out \
-        --prefix LD_LIBRARY_PATH ":" "${libXext}/lib"
-    done
+    ${wrapProgram "$out/bin/avidemux3_cli"}
+
+    ${stdenv.lib.optionalString withQT ''
+      ${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+      ${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+    ''}
+
     ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux"
 
     fixupPhase
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
index 1e671b4ea7bf2..6281c78840158 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "dvb-apps-7f68f9c8d311";
 
   src = fetchurl {
-    url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz";
+    url = "https://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz";
     sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82";
   };
 
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 544e4917f4538..ef01ac4cdae3c 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "23.0.0";
+  version = "25.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "13n2jvwws87bws483dncvhf9vqsjy3l0lxh7x741g71075299w73";
+    sha256 = "04m57719q7q0h0gcj1b2bh8xbdcl5bijic4hw71xf9xd19a95k78";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 58628aa1f8e8e..7880c3150872c 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -7,11 +7,13 @@
     libGLU_combined       ? null,
     libX11     ? null,
     libXext    ? null,
-    libXxf86vm ? null
+    libXxf86vm ? null,
+    libXrandr  ? null
 
-, waylandSupport ? false,
-    wayland      ? null,
-    libxkbcommon ? null
+, waylandSupport ? false
+  , wayland           ? null
+  , wayland-protocols ? null
+  , libxkbcommon      ? null
 
 , rubberbandSupport  ? true,  rubberband    ? null
 , xineramaSupport    ? true,  libXinerama   ? null
@@ -46,8 +48,8 @@ with stdenv.lib;
 let
   available = x: x != null;
 in
-assert x11Support         -> all available [libGLU_combined libX11 libXext libXxf86vm];
-assert waylandSupport     -> all available [wayland libxkbcommon];
+assert x11Support         -> all available [libGLU_combined libX11 libXext libXxf86vm libXrandr];
+assert waylandSupport     -> all available [wayland wayland-protocols libxkbcommon];
 assert rubberbandSupport  -> available rubberband;
 assert xineramaSupport    -> x11Support && available libXinerama;
 assert xvSupport          -> x11Support && available libXv;
@@ -150,8 +152,8 @@ in stdenv.mkDerivation rec {
     ++ optional vapoursynthSupport vapoursynth
     ++ optional archiveSupport     libarchive
     ++ optionals dvdnavSupport     [ libdvdnav libdvdnav.libdvdread ]
-    ++ optionals x11Support        [ libX11 libXext libGLU_combined libXxf86vm ]
-    ++ optionals waylandSupport    [ wayland libxkbcommon ]
+    ++ optionals x11Support        [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
+    ++ optionals waylandSupport    [ wayland wayland-protocols libxkbcommon ]
     ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       libiconv Cocoa CoreAudio
     ]);
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 289c0ffd70743..62c4eba4db529 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "obs-linuxbrowser-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
   src = fetchFromGitHub {
     owner = "bazukas";
     repo = "obs-linuxbrowser";
     rev = version;
-    sha256 = "0dql7wxyhksqa08j1dn5d09v2jwhgywc1p7psifhhvh97rkp4z7j";
+    sha256 = "1nqi04ici9n1xjliy1gaqy2bq8zj1z32dffk890x2hi7ml688y9h";
   };
   nativeBuildInputs = [ cmake ];
   buildInputs = [ obs-studio ];
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index aa9643416485d..d1849e2b4b351 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -4,13 +4,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "openshot-qt-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
     rev = "v${version}";
-    sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml";
+    sha256 = "0m4fq9vj8gc5ngk8qf6ikj85qgzxhfk7nnz7n7362dzlfymaz18q";
   };
 
   nativeBuildInputs = [ doxygen wrapGAppsHook ];
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index a0118bea92f4f..db6ceedbbf72d 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-audio-${version}";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot-audio";
     rev = "v${version}";
-    sha256 = "0rn87jxyfq1yip1lb2255l5ilkakkqg9rn0lr0h6dn2xrmlbmg8l";
+    sha256 = "0cf8wx6a8ba4rhfby6abpr8ks2a0hxj76mas9751ihz59w1vdisy";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index f84e2e83761a7..9e5e278ba8941 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.1.9";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3";
+    sha256 = "15i7wir1ph4g47634f8j3s8ay20zypj6p6fq8781g4w9gzgwrz2c";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 6572164c797e5..0df5d42ee0ea8 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase
 , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols
 , qtgraphicaleffects, libmlt
-, qmake, makeWrapper }:
+, qmake, makeWrapper, fetchpatch, qttools }:
 
 assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
 assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.05.08";
+  version = "18.06.02";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk";
+    sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v";
   };
 
   enableParallelBuilding = true;
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
+  qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ];
 
   prePatch = ''
     sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
@@ -34,6 +35,12 @@ stdenv.mkDerivation rec {
     sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
   '';
 
+  patches = [ (fetchpatch {
+    url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch;
+    name = "qt511.patch";
+    sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9";
+    } ) ];
+
   postInstall = ''
     mkdir -p $out/share/shotcut
     cp -r src/qml $out/share/shotcut/
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 75dbb06235b98..107939086325d 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-18.5.0";
+  name = "smplayer-18.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0fxd8zmp5dyk7y9yymjhj2i5218nfvfqb4830pgzzjqz1zdax8rn";
+    sha256 = "0pb862l175ycm6fm90nryzgbqy8kbwpv3i6cbn13h7jh1yrz8nqx";
   };
 
   buildInputs = [ qtscript ];
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 3f5f0c05c3088..491e6fcd16486 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,19 +1,19 @@
 { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.12.1";
+  version = "0.14.2";
   name = "streamlink-${version}";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = "${version}";
-    sha256 = "0r63fjp5qhnbp5kr4w2nn3gnj0wr0ik1pw1gyry8jl9rp2jq9db5";
+    sha256 = "1njwfy1h8a9n5z6crrfnknlw4ys0bap2jam6ga6njgkd10aly9qr";
   };
 
-  checkInputs = with pythonPackages; [ pytest mock requests-mock ];
+  checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
 
-  propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ];
+  propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/streamlink/streamlink;
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index c3665daad9dec..d9bc2ed18b1aa 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc";
       sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p";
     })
+    (fetchpatch {
+      url = "https://github.com/videolan/vlc/commit/26e2d3906658c30f2f88f4b1bc9630ec43bf5525.patch";
+      sha256 = "0sm73cbzxva8sww526bh5yin1k2pdkvj826wdlmqnj7xf0f3mki4";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index d249d29686e4a..1b1bb8147d31f 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -2,10 +2,10 @@
 , libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}:
 
 stdenv.mkDerivation rec {
-  name = "xawtv-3.103";
+  name = "xawtv-3.105";
   src = fetchurl {
-    url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
-    sha256 = "0lnxr3xip80g0rz7h6n14n9d1qy0cm56h0g1hsyr982rbldskwrc";
+    url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
+    sha256 = "03v4k0dychjz1kj890d9pc7v8jh084m01g71x1clmmvc6vc9kn1b";
   };
 
   preConfigure = ''
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 3854c577188ff..46d03ad3d622b 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "containerd-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8";
+    sha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria";
   };
 
   hardeningDisable = [ "fortify" ];
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2ab2bd0221996..1a2c850f15699 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -27,7 +27,7 @@ rec {
       patches = [];
     });
 
-    docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+    docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec {
       name = "docker-containerd";
       src = fetchFromGitHub {
         owner = "docker";
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index 5b3610243be02..711838b294478 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -3,7 +3,7 @@
 buildGoPackage rec {
   name    = "${pname}-${version}";
   pname   = "amazon-ecs-agent";
-  version = "1.14.0";
+  version = "1.18.0";
 
   goPackagePath = "github.com/aws/${pname}";
   subPackages   = [ "agent" ];
@@ -12,7 +12,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "aws";
     repo   = pname;
-    sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3";
+    sha256 = "1l6c2if6wpjmq2hh6k818w38s1rsbwgd6igqy948dwcrb1g1mixr";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index bd014dd60d371..36d8e1ca70a5f 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub
 , pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
-, libX11, freefont_ttf
+, libX11, freefont_ttf, nettle, libconfig
 }:
 
 stdenv.mkDerivation rec {
   name = "looking-glass-client-${version}";
-  version = "a10";
+  version = "a11";
 
   src = fetchFromGitHub {
     owner = "gnif";
     repo = "LookingGlass";
     rev = version;
-    sha256 = "10jxnkrvskjzkg86iz3hnb5v91ykzx6pvcnpy1v4436g5f2d62wn";
+    sha256 = "0q4isn86pl5wddf6h8qd62fw3577ns2sd2myzw969sbl796bwcil";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
     SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
-    libX11 freefont_ttf
+    libX11 freefont_ttf nettle libconfig
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 8c429ff1d0625..05d8c1edec293 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -15,6 +15,7 @@
 , xenSupport ? false, xen
 , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
 , virglSupport ? openGLSupport, virglrenderer
+, smbdSupport ? false, samba
 , hostCpuOnly ? false
 , nixosTestRunner ? false
 }:
@@ -63,7 +64,8 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
     ++ optionals xenSupport [ xen ]
     ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
-    ++ optionals virglSupport [ virglrenderer ];
+    ++ optionals virglSupport [ virglrenderer ]
+    ++ optionals smbdSupport [ samba ];
 
   enableParallelBuilding = true;
 
@@ -100,8 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags =
-    [ "--smbd=smbd" # use `smbd' from $PATH
-      "--audio-drv-list=${audio}"
+    [ "--audio-drv-list=${audio}"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
     ]
@@ -117,7 +118,8 @@ stdenv.mkDerivation rec {
     ++ optional gtkSupport "--enable-gtk"
     ++ optional xenSupport "--enable-xen"
     ++ optional openGLSupport "--enable-opengl"
-    ++ optional virglSupport "--enable-virglrenderer";
+    ++ optional virglSupport "--enable-virglrenderer"
+    ++ optional smbdSupport "--smbd=${samba}/bin/smbd";
 
   doCheck = false; # tries to access /dev
 
diff --git a/pkgs/applications/virtualization/rancher-compose/default.nix b/pkgs/applications/virtualization/rancher-compose/default.nix
deleted file mode 100644
index 57aa6809d6c1f..0000000000000
--- a/pkgs/applications/virtualization/rancher-compose/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-let
-  generic = { version, sha256 }: buildGoPackage rec {
-    name = "rancher-compose-${version}";
-
-    goPackagePath = "github.com/rancher/rancher-compose";
-
-    src = fetchFromGitHub {
-      owner = "rancher";
-      repo = "rancher-compose";
-      rev = "v${version}";
-      inherit sha256;
-    };
-
-    buildFlagsArray = ''
-      -ldflags=
-          -X github.com/rancher/rancher-compose/version.VERSION=${version}
-    '';
-
-    excludedPackages = "scripts";
-
-    meta = with lib; {
-      description = "Docker compose compatible client to deploy to Rancher";
-      homepage = https://docs.rancher.com/rancher/rancher-compose/;
-      license = licenses.asl20;
-      platforms = platforms.unix;
-      maintainers = [maintainers.mic92];
-    };
-  };
-in {
-  # should point to a version compatible
-  # with the latest stable release of rancher
-  rancher-compose = generic {
-    version = "0.9.2";
-    sha256 = "1wlsdjaa4j2b3c034hb6zci5h900b1msimmshz5h4g5hiaqb3khq";
-  };
-
-  # for rancher v1.2.0-pre3+
-  rancher-compose_0_10 = generic {
-    version = "0.10.0";
-    sha256 = "17f3ya4qq0dzk4wvhgxp0lh9p8c87kpq7hmh3g21ashzqwmcflxl";
-  };
-}
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index b6f4a5976e446..ff05cb7570660 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   enableParallelBuilding = true;
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d";
+    sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 15ae244b3291a..b12e7bd5f4704 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -2,10 +2,10 @@
  libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
  systemd}:
 stdenv.mkDerivation rec {
-  name = "spice-vdagent-0.17.0";
+  name = "spice-vdagent-0.18.0";
   src = fetchurl {
-    url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi";
+    url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
+    sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0";
   };
   postPatch = ''
     substituteInPlace data/spice-vdagent.desktop --replace /usr $out
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3c5d3e6dc1b04..883cd1c867a17 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2
-, libXrandr, libXinerama
+{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
+, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
+, zlib, libpng, glib, lvm2, libXrandr, libXinerama
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, gawk, nettools, dbus
 , xorriso, makeself, perl
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
   name = "virtualbox-${version}";
 
   src = fetchurl {
-    url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
+    url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
     sha256 = main;
   };
 
@@ -94,9 +94,14 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ];
-
-
+  ++ [
+    ./qtx11extras.patch
+    (fetchpatch {
+      name = "010-qt-5.11.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox";
+      sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn";
+    })
+  ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
new file mode 100644
index 0000000000000..9f1e565d16668
--- /dev/null
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
+, enableAlsaUtils ? true, alsaUtils }:
+
+rustPlatform.buildRustPackage rec {
+  name = "dwm-status-${version}";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Gerschtli";
+    repo = "dwm-status";
+    rev = version;
+    sha256 = "0k6r72qgns8i2y1ks0k9fwlabgndww5rssd13mis5bvkqla8j9i9";
+  };
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
+
+  cargoSha256 = "13ibcbk8shfajk200d8v2p6y3zfrz5dlvxqfw1zsm630s5dmy6qx";
+
+  postInstall = lib.optionalString enableAlsaUtils ''
+    wrapProgram $out/bin/dwm-status \
+      --prefix "PATH" : "${alsaUtils}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Highly performant and configurable DWM status service";
+    homepage = https://github.com/Gerschtli/dwm-status;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 0b9c286aa9def..20a95f36cee3a 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -9,12 +9,12 @@ assert gestures -> libstroke != null;
 
 stdenv.mkDerivation rec {
   pname = "fvwm";
-  version = "2.6.7";
+  version = "2.6.8";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz";
-    sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73";
+    sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index b2e34a016adca..6f3505056c37e 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "herbstluftwm-0.7.0";
 
   src = fetchurl {
-    url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
+    url = "https://herbstluftwm.org/tarballs/${name}.tar.gz";
     sha256 = "09xfs213vg1dpird61wik5bqb9yf8kh63ssy18ihf54inwqgqbvy";
   };
 
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix
new file mode 100644
index 0000000000000..337ecdd651ff0
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/easyfocus.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms
+, xlibs , i3ipc-glib , glib
+}:
+
+stdenv.mkDerivation rec {
+  name = "i3easyfocus-${version}";
+  version = "20180622";
+
+  src = fetchFromGitHub {
+    owner = "cornerman";
+    repo = "i3-easyfocus";
+    rev = "3631d5af612d58c3d027f59c86b185590bd78ae1";
+    sha256 = "1wgknmmm7iz0wxsdh29gmx4arizva9101pzhnmac30bmixf3nzhr";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ];
+
+  # Makefile has no rule for 'install'
+  installPhase = ''
+    mkdir -p $out/bin
+    cp i3-easyfocus $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Focus and select windows in i3";
+    homepage = https://github.com/cornerman/i3-easyfocus;
+    maintainers = with maintainers; [teto];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index d6668cde2bdcc..251b893f92ffe 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, i3, autoreconfHook }:
 
-i3.overrideDerivation (super : rec {
+i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
   version = "4.15.0.1";
@@ -11,7 +11,7 @@ i3.overrideDerivation (super : rec {
     sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
   };
 
-  nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
 
   postUnpack = ''
       echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
@@ -19,7 +19,6 @@ i3.overrideDerivation (super : rec {
 
   # fatal error: GENERATED_config_enums.h: No such file or directory
   enableParallelBuilding = false;
-}) // {
 
   meta = with stdenv.lib; {
     description = "A fork of the i3 tiling window manager with some additional features";
@@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec {
       Configured via plain text file. Multi-monitor. UTF-8 clean.
     '';
   };
-
-}
+})
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
new file mode 100644
index 0000000000000..87e11774d43b5
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb
+, autoreconfHook, json-glib, gtk-doc, which
+, gobjectIntrospection
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "i3ipc-glib-${version}";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "acrisci";
+    repo = "i3ipc-glib";
+    rev = "v${version}";
+    sha256 = "1gmk1zjafrn6jh4j7r0wkwrpwvf9drl1lcw8vya23i1f4zbk0wh4";
+  };
+
+  nativeBuildInputs = [ autoreconfHook which pkgconfig ];
+
+  buildInputs = [ libxcb json-glib gtk-doc xproto gobjectIntrospection ];
+
+
+  preAutoreconf = ''
+    gtkdocize
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A C interface library to i3wm";
+    homepage = https://github.com/acrisci/i3ipc-glib;
+    maintainers = with maintainers; [teto];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 2e50d35d44177..fa1ddcf810b7a 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
         - clock: time/date with configurable format
         - keyboard-layout
     '';
-    homepage = http://github.com/PandorasFox/i3lock-color;
+    homepage = https://github.com/PandorasFox/i3lock-color;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
 
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 014434011af0c..11b7c49f5ebe4 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "i3status-rust-${version}";
-  version = "0.9.0.2018-03-31";
+  version = "0.9.0.2018-06-22";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = "i3status-rust";
-    rev = "18f99299bcd5b63da4e315c8d78622c4bbf59c45";
-    sha256 = "1pfcq3f724ri6jzchkgf96zd7lb5mc882r64ffx634gqf3n8ch41";
+    rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00";
+    sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd";
   };
 
-  cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h";
+  cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq";
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 17084d6a6a704..635265b04abc9 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmatchbox ];
 
   src = fetchurl {
-    url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
+    url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
     sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
   };
 
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index c219c81c2a50b..887a58b748da9 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   sourceName = "sawfish_${version}";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz";
+    url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz";
     sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31";
   };
 
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 4a15e3236168e..d967f55b81c8a 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   version = "4.0.0";
 
   src = fetchurl {
-    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
     sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50";
   };
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Reference implementation of a Wayland compositor";
-    homepage = http://wayland.freedesktop.org/;
+    homepage = https://wayland.freedesktop.org/;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index a5d02093e3f62..6fc1797dd2517 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
 , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
 , configFile ? null, lib
-, rev, sha256, version
+, rev, sha256, version, patches ? []
 }:
 
 stdenv.mkDerivation {
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
     repo  = "yabar";
   };
 
+  inherit patches;
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix
index 4d42e3082f35a..a33a75676ee94 100644
--- a/pkgs/applications/window-managers/yabar/default.nix
+++ b/pkgs/applications/window-managers/yabar/default.nix
@@ -1,10 +1,18 @@
-{ callPackage, attrs ? {} }:
+{ callPackage, attrs ? {}, fetchpatch }:
 
 let
-  overrides = {
+  overrides = rec {
     version = "0.4.0";
 
-    rev = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b";
+    rev = version;
     sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
+
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch";
+        sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s";
+      })
+    ];
+
   } // attrs;
 in callPackage ./build.nix overrides
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 34e8532265016..025f6aa6e7aa2 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -13,7 +13,7 @@ set -u
 bintoolsWrapper_addLDVars () {
     # See ../setup-hooks/role.bash
     local role_post role_pre
-    getTargetRoleEnvHook
+    getHostRoleEnvHook
 
     if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
         export NIX_${role_pre}LDFLAGS+=" -L$1/lib64"
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 349a7e5aa333b..07d37451ddf9a 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bazel }:
+{ stdenv, bazel, enableNixHacks ? true }:
 
 args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
 
@@ -17,14 +17,15 @@ in stdenv.mkDerivation (fBuildAttrs // {
     nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ];
 
     preHook = fFetchAttrs.preHook or "" + ''
-      export bazelOut="$NIX_BUILD_TOP/output"
+      export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
+      export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
       export HOME="$NIX_BUILD_TOP"
     '';
 
     buildPhase = fFetchAttrs.buildPhase or ''
       runHook preBuild
 
-      bazel --output_base="$bazelOut" fetch $bazelFlags $bazelTarget
+      bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
 
       runHook postBuild
     '';
@@ -52,10 +53,11 @@ in stdenv.mkDerivation (fBuildAttrs // {
     outputHash = fetchAttrs.sha256;
   });
 
-  nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ];
+  nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (if enableNixHacks then (bazel.override { enableNixHacks = true; }) else bazel) ];
 
   preHook = fBuildAttrs.preHook or "" + ''
     export bazelOut="$NIX_BUILD_TOP/output"
+    export bazelUserRoot="$NIX_BUILD_TOP/tmp"
     export HOME="$NIX_BUILD_TOP"
   '';
 
@@ -71,7 +73,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
   buildPhase = fBuildAttrs.buildPhase or ''
     runHook preBuild
 
-    bazel --output_base="$bazelOut" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget
+    bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget
 
     runHook postBuild
   '';
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 7a18993d607f4..aca96f58ed97d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -42,7 +42,7 @@ let
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
   coreutils_bin = if nativeTools then "" else getBin coreutils;
 
-  default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools)
+  default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc)
     "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
 
   dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config;
@@ -280,6 +280,10 @@ stdenv.mkDerivation {
       hardening_unsupported_flags+=" pic"
     ''
 
+    + optionalString targetPlatform.isMinGW ''
+      hardening_unsupported_flags+=" stackprotector"
+    ''
+
     + ''
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 9dacacc1f369d..28060de741186 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -68,7 +68,7 @@ set -u
 ccWrapper_addCVars () {
     # See ../setup-hooks/role.bash
     local role_post role_pre
-    getTargetRoleEnvHook
+    getHostRoleEnvHook
 
     if [[ -d "$1/include" ]]; then
         export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index b01f0b7227242..ff45cf81d7e5f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -420,8 +420,8 @@ rec {
   buildImage = args@{
     # Image name.
     name,
-    # Image tag.
-    tag ? "latest",
+    # Image tag, when null then the nix output hash will be used.
+    tag ? null,
     # Parent image, to append to.
     fromImage ? null,
     # Name of the parent image; will be read from the image otherwise.
@@ -471,12 +471,19 @@ rec {
         buildInputs = [ jshon pigz coreutils findutils jq ];
         # Image name and tag must be lowercase
         imageName = lib.toLower name;
-        imageTag = lib.toLower tag;
+        imageTag = if tag == null then "" else lib.toLower tag;
         inherit fromImage baseJson;
         layerClosure = writeReferencesToFile layer;
         passthru.buildArgs = args;
         passthru.layer = layer;
       } ''
+        ${lib.optionalString (tag == null) ''
+          outName="$(basename "$out")"
+          outHash=$(echo "$outName" | cut -d - -f 1)
+
+          imageTag=$outHash
+        ''}
+
         # Print tar contents:
         # 1: Interpreted as relative to the root directory
         # 2: With no trailing slashes on directories
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index ca7f780937945..ec2667310cdd3 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -13,6 +13,7 @@ rec {
   # 1. basic example
   bash = buildImage {
     name = "bash";
+    tag = "latest";
     contents = pkgs.bashInteractive;
   };
 
@@ -65,6 +66,7 @@ rec {
   in
   buildImage {
     name = "nginx-container";
+    tag = "latest";
     contents = pkgs.nginx;
 
     runAsRoot = ''
@@ -106,6 +108,7 @@ rec {
   # docker run -it --rm nix nix-store -qR $(nix-build '<nixpkgs>' -A nix)
   nix = buildImageWithNixDb {
     name = "nix";
+    tag = "latest";
     contents = [
       # nix-store uses cat program to display results as specified by
       # the image env variable NIX_PAGER.
@@ -121,6 +124,7 @@ rec {
   # dockerTools chain.
   onTopOfPulledImage = buildImage {
     name = "onTopOfPulledImage";
+    tag = "latest";
     fromImage = nixFromDockerHub;
     contents = [ pkgs.hello ];
   };
@@ -129,6 +133,7 @@ rec {
   # See issue #34779 and PR #40947 for details.
   runAsRootExtraCommands = pkgs.dockerTools.buildImage {
     name = "runAsRootExtraCommands";
+    tag = "latest";
     contents = [ pkgs.coreutils ];
     # The parens here are to create problematic bash to embed and eval. In case
     # this is *embedded* into the script (with nix expansion) the initial quotes
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 1d993dcc1094b..3cf4ecc280fee 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -356,7 +356,7 @@ print_results() {
   "rev": "$(json_escape "$fullRev")",
   "date": "$(json_escape "$commitDateStrict8601")",
   "$(json_escape "$hashType")": "$(json_escape "$hash")",
-  "fetchSubmodules": $([[ -n "fetchSubmodules" ]] && echo true || echo false)
+  "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false)
 }
 EOF
     fi
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 7c2bdf260b4e2..f9bc8b602f4cc 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -2,20 +2,24 @@ source $stdenv/setup
 
 source $mirrorsFile
 
+curlVersion=$(curl -V | head -1 | cut -d' ' -f2)
 
 # Curl flags to handle redirects, not use EPSV, handle cookies for
 # servers to need them during redirects, and work on SSL without a
 # certificate (this isn't a security problem because we check the
 # cryptographic hash of the output anyway).
-curl="curl \
- --location --max-redirs 20 \
- --retry 3 \
- --disable-epsv \
- --cookie-jar cookies \
- --insecure \
- $curlOpts \
- $NIX_CURL_FLAGS"
-
+curl=(
+    curl
+    --location
+    --max-redirs 20
+    --retry 3
+    --disable-epsv
+    --cookie-jar cookies
+    --insecure
+    --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion"
+    $curlOpts
+    $NIX_CURL_FLAGS
+)
 
 downloadedFile="$out"
 if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi
@@ -32,7 +36,7 @@ tryDownload() {
     # if we get error code 18, resume partial download
     while [ $curlexit -eq 18 ]; do
        # keep this inside an if statement, since on failure it doesn't abort the script
-       if $curl -C - --fail "$url" --output "$downloadedFile"; then
+       if "${curl[@]}" -C - --fail "$url" --output "$downloadedFile"; then
           success=1
           break
        else
@@ -61,7 +65,7 @@ tryHashedMirrors() {
 
     for mirror in $hashedMirrors; do
         url="$mirror/$outputHashAlgo/$outputHash"
-        if $curl --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \
+        if "${curl[@]}" --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \
             --fail --silent --show-error --head "$url" \
             --write-out "%{http_code}" --output /dev/null > code 2> log; then
             tryDownload "$url"
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 0bf529caa75ec..5f0c1384c79ed 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -92,7 +92,6 @@ in
 assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
 
 let
-
   urls_ =
     if urls != [] && url == "" then
       (if lib.isList urls then urls
@@ -107,7 +106,6 @@ let
     else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
     else if sha1   != "" then { outputHashAlgo = "sha1";   outputHash = sha1; }
     else throw "fetchurl requires a hash for fixed-output derivation: ${lib.concatStringsSep ", " urls_}";
-
 in
 
 stdenvNoCC.mkDerivation {
@@ -135,6 +133,8 @@ stdenvNoCC.mkDerivation {
 
   impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;
 
+  nixpkgsVersion = lib.trivial.release;
+
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.
   preferLocalBuild = true;
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index cc015f9d60466..d5f29e3daf1bb 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -319,51 +319,48 @@ rec {
   ];
 
   # Sage mirrors (http://www.sagemath.org/mirrors.html)
-  sagemath = [
+  sageupstream = [
     # Africa
-    http://sagemath.polytechnic.edu.na/src/
-    ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/
-    http://sagemath.mirror.ac.za/src/
-    https://ftp.leg.uct.ac.za/pub/packages/sage/src/
-    http://mirror.ufs.ac.za/sagemath/src/
+    http://sagemath.polytechnic.edu.na/spkg/upstream/
+    ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/
+    http://sagemath.mirror.ac.za/spkg/upstream/
+    https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/
+    http://mirror.ufs.ac.za/sagemath/spkg/upstream/
 
     # America, North
-    http://mirrors-usa.go-parts.com/sage/sagemath/src/
-    http://mirrors.mit.edu/sage/src/
-    http://www.cecm.sfu.ca/sage/src/
-    http://files.sagemath.org/src/
-    http://mirror.clibre.uqam.ca/sage/src/
-    https://mirrors.xmission.com/sage/src/
+    http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/
+    http://mirrors.mit.edu/sage/spkg/upstream/
+    http://www.cecm.sfu.ca/sage/spkg/upstream/
+    http://files.sagemath.org/spkg/upstream/
+    http://mirror.clibre.uqam.ca/sage/spkg/upstream/
+    https://mirrors.xmission.com/sage/spkg/upstream/
 
     # America, South
-    http://sagemath.c3sl.ufpr.br/src/
-    http://linorg.usp.br/sage/
+    http://sagemath.c3sl.ufpr.br/spkg/upstream/
+    http://linorg.usp.br/sage/spkg/upstream
 
     # Asia
-    http://sage.asis.io/src/
-    http://mirror.hust.edu.cn/sagemath/src/
-    https://ftp.iitm.ac.in/sage/src/
-    http://ftp.kaist.ac.kr/sage/src/
-    http://ftp.riken.jp/sagemath/src/
-    https://mirrors.tuna.tsinghua.edu.cn/sagemath/src/
-    https://mirrors.ustc.edu.cn/sagemath/src/
-    http://ftp.tsukuba.wide.ad.jp/software/sage/src/
-    http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/
-    https://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/
+    http://sage.asis.io/spkg/upstream/
+    http://mirror.hust.edu.cn/sagemath/spkg/upstream/
+    https://ftp.iitm.ac.in/sage/spkg/upstream/
+    http://ftp.kaist.ac.kr/sage/spkg/upstream/
+    http://ftp.riken.jp/sagemath/spkg/upstream/
+    https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/
+    https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/
+    http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/
+    http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/
+    https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/
 
     # Australia
-    http://echidna.maths.usyd.edu.au/sage/src/
+    http://echidna.maths.usyd.edu.au/sage/spkg/upstream/
 
     # Europe
-    http://sage.mirror.garr.it/mirrors/sage/src/
-    http://sunsite.rediris.es/mirror/sagemath/src/
-    http://mirror.switch.ch/mirror/sagemath/src/
-    http://mirrors.fe.up.pt/pub/sage/src/
-    http://www-ftp.lip6.fr/pub/math/sagemath/src/
-    http://ftp.ntua.gr/pub/sagemath/src/
-
-    # Old versions
-    http://sagemath.org/src-old/
+    http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/
+    http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/
+    http://mirror.switch.ch/mirror/sagemath/spkg/upstream/
+    http://mirrors.fe.up.pt/pub/sage/spkg/upstream/
+    http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/
+    http://ftp.ntua.gr/pub/sagemath/spkg/upstream/
   ];
 
   # MySQL mirrors
@@ -405,4 +402,12 @@ rec {
     http://repo1.maven.org/maven2/
     http://central.maven.org/maven2/
   ];
+
+  # Alsa Project
+  alsa = [
+     ftp://ftp.alsa-project.org/pub/
+     http://alsa.cybermirror.org/
+     http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/
+     http://alsa.mirror.fr/
+  ];
 }
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 5c738dd7f0b35..be76c283babc5 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -15,6 +15,12 @@ let makeDeps = dependencies:
            " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}")
       ) dependencies);
 
+    # This doesn't appear to be officially documented anywhere yet.
+    # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
+    target_os = if buildPlatform.isDarwin
+      then "macos"
+      else buildPlatform.parsed.kernel.name;
+
     echo_build_heading = colors: ''
       echo_build_heading() {
        start=""
@@ -101,7 +107,7 @@ let makeDeps = dependencies:
       export CARGO_PKG_AUTHORS="${authors}"
 
       export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name}
-      export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name}
+      export CARGO_CFG_TARGET_OS=${target_os}
       export CARGO_CFG_TARGET_FAMILY="unix"
       export CARGO_CFG_UNIX=1
       export CARGO_CFG_TARGET_ENV="gnu"
diff --git a/pkgs/build-support/setup-hooks/prune-libtool-files.sh b/pkgs/build-support/setup-hooks/prune-libtool-files.sh
new file mode 100644
index 0000000000000..d75812e05b60c
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/prune-libtool-files.sh
@@ -0,0 +1,22 @@
+# Clear dependency_libs in libtool files for shared libraries.
+
+# Shared libraries already encode their dependencies with locations.  .la
+# files do not always encode those locations, and sometimes encode the
+# locations in the wrong Nix output. .la files are not needed for shared
+# libraries, but without dependency_libs they do not hurt either.
+
+fixupOutputHooks+=(_pruneLibtoolFiles)
+
+_pruneLibtoolFiles() {
+    if [ "$dontPruneLibtoolFiles" ]; then
+       return
+    fi
+
+    # Libtool uses "dlname" and "library_names" fields for shared libraries and
+    # the "old_library" field for static libraries.  We are processing only
+    # those .la files that do not describe static libraries.
+    find "$prefix" -type f -name '*.la' \
+         -exec grep -q '^# Generated by libtool' {} \; \
+         -exec grep -q "^old_library=''" {} \; \
+         -exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \;
+}
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 60271e592a23f..db2bef367e9ee 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -96,7 +96,7 @@ rec {
             echo creating
             singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
             echo importing
-            mkdir -p /var/singularity/mnt/container
+            mkdir -p /var/singularity/mnt/{container,final,overlay,session,source}
             tar -c . | singularity image.import $out
           '');
 
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 73da775f7f56d..f9816b2d0d7cc 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -72,6 +72,24 @@ rec {
       '';
     };
 
+  # Create a C binary
+  writeCBin = name: code:
+    runCommandCC name
+    {
+      inherit name code;
+      executable = true;
+      passAsFile = ["code"];
+      # Pointless to do this on a remote machine.
+      preferLocalBuild = true;
+      allowSubstitutes = false;
+    }
+    ''
+    n=$out/bin/$name
+    mkdir -p "$(dirname "$n")"
+    mv "$codePath" code.c
+    $CC -x c code.c -o "$n"
+    '';
+
   # Create a forest of symlinks to the files in `paths'.
   symlinkJoin =
     args_@{ name
@@ -163,6 +181,7 @@ rec {
       outputHashAlgo = hashAlgo;
       outputHash = hash;
       preferLocalBuild = true;
+      allowSubstitutes = false;
       builder = writeScript "restrict-message" ''
         source ${stdenvNoCC}/setup
         cat <<_EOF_
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 622fba0686f4c..6a6deaa875a7c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -14,16 +14,6 @@ rec {
 
   qemu = pkgs.qemu_kvm;
 
-  qemu-220 = lib.overrideDerivation pkgs.qemu_kvm (attrs: rec {
-    version = "2.2.0";
-    src = fetchurl {
-      url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-      sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n";
-    };
-    patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ];
-  });
-
-
   modulesClosure = makeModulesClosure {
     inherit kernel rootModules;
     firmware = kernel;
@@ -975,22 +965,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.10-jessie-i386";
-      fullName = "Debian 8.10 Jessie (i386)";
+      name = "debian-8.11-jessie-i386";
+      fullName = "Debian 8.11 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "1w1gm195dcrndy5486kcv0h9l3br9dqnqyyhmavp4vr5w2zk7amk";
+        sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.10-jessie-amd64";
-      fullName = "Debian 8.10 Jessie (amd64)";
+      name = "debian-8.11-jessie-amd64";
+      fullName = "Debian 8.11 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "045700qsrmd3lng2rw8nfs5ci7pf660lwl6alpzkyjikyp6pg7k8";
+        sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix
deleted file mode 100644
index 32dd06abfaf39..0000000000000
--- a/pkgs/build-support/vsenv/build-solution.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, vs}:
-{ name
-, src
-, slnFile
-, baseDir ? "."
-, extraBuildInputs ? []
-}:
-
-stdenv.mkDerivation {
-  inherit name src;
-  installPhase = ''
-    cd ${baseDir}
-    vcbuild.exe /rebuild ${slnFile}
-    mkdir -p $out
-    cp Debug/* $out
-  '';
-  buildInputs = [ vs ] ++ extraBuildInputs;
-}
diff --git a/pkgs/build-support/vsenv/default.nix b/pkgs/build-support/vsenv/default.nix
deleted file mode 100644
index 689762535197f..0000000000000
--- a/pkgs/build-support/vsenv/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv, vs}:
-
-{
-  buildSolution = import ./build-solution.nix {
-    inherit stdenv vs;
-  };  
-}
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index fbf62e3ba3867..67080e73c46da 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchzip}:
 
 let
-  version = "11.0.2";
+  version = "11.0.3";
 in fetchzip {
   name = "babelstone-han-${version}";
 
@@ -10,7 +10,7 @@ in fetchzip {
     mkdir -p $out/share/fonts/truetype
     unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
   '';
-  sha256 = "003cz520riskjp729y3piqhmnzfw3jyrmb94im7jyvlc7hp14cdh";
+  sha256 = "0c8s21kllyilwivrb8gywq818y67w3zpann34hz36vy0wyiswn1c";
 
   meta = with stdenv.lib; {
     description = "Unicode CJK font with over 36000 Han characters";
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index cbca697cb262f..5dc8e53282ab6 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "clearlyU-12-1.9";
 
   src = fetchurl {
-    url = http://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
+    url = https://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
     sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
   };
   
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index 4fc6aab95108b..2f50a83a70b4b 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -3,17 +3,17 @@
 fetchzip {
   name = "fira-mono-3.206";
 
-  url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip;
+  url = https://github.com/mozilla/Fira/archive/4.106.zip;
 
   postFetch = ''
     mkdir -p $out/share/fonts
-    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    unzip -j $downloadedFile Fira-4.106/otf/FiraMono\*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256 = "0m4kdjh4xjyznybpgh21a0gibv4wsxq0rqyl3wv942zk6mclmgdf";
+  sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj";
 
   meta = with stdenv.lib; {
-    homepage = http://www.carrois.com/fira-4-1/;
+    homepage = https://mozilla.github.io/Fira/;
     description = "Monospace font for Firefox OS";
     longDescription = ''
       Fira Mono is a monospace font designed by Erik Spiekermann,
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index cddb8cd726a5b..ce6e011d8a657 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -3,17 +3,17 @@
 fetchzip rec {
   name = "fira-4.106";
 
-  url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip;
+  url = https://github.com/mozilla/Fira/archive/4.106.zip;
 
   postFetch = ''
     mkdir -p $out/share/fonts
-    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    unzip -j $downloadedFile Fira-4.106/otf/FiraSans\*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256 = "174nwmpvxqg1qjfj6h3yvrphs1s3n6zricdh27iaxilajm0ilbgs";
+  sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4";
 
   meta = with stdenv.lib; {
-    homepage = http://www.carrois.com/fira-4-1/;
+    homepage = https://mozilla.github.io/Fira/;
     description = "Sans-serif font for Firefox OS";
     longDescription = ''
       Fira Sans is a sans-serif font designed by Erik Spiekermann,
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index 6bb175f1ecac4..77c2ed4d780c2 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "5.0.6";
+  version = "5.1.0";
 in fetchzip rec {
   name = "font-awesome-${version}";
 
@@ -14,7 +14,7 @@ in fetchzip rec {
     unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype
   '';
 
-  sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4";
+  sha256 = "12m35bk61d8pddhybg2jpl5xv16dclz1qacdmk05m11nzshd3nz1";
 
   meta = with stdenv.lib; {
     description = "Font Awesome - OTF font";
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
index 5ebb365ecdfb2..b2207e01df1a1 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "proggyfonts-0.1";
 
   src = fetchurl {
-    url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz";
+    url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz";
     sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
   };
 
diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix
new file mode 100644
index 0000000000000..fc016a457c22d
--- /dev/null
+++ b/pkgs/data/fonts/source-han-code-jp/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchzip }:
+
+let
+  pname = "source-han-code-jp";
+  version = "2.011R";
+in fetchzip {
+  name = "${pname}-${version}";
+
+  url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+  '';
+
+  sha256 = "184vrjkymcm29k1cx00cdvjchzqr1w17925lmh85f0frx7vwljcd";
+
+  meta = {
+    description = "A monospaced Latin font suitable for coding";
+    maintainers = with stdenv.lib.maintainers; [ mt-caret ];
+    platforms = with stdenv.lib.platforms; all;
+    homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html;
+    license = stdenv.lib.licenses.ofl;
+  };
+}
diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix
index 84bf45a52bbeb..6529e5c571c21 100644
--- a/pkgs/data/icons/arc-icon-theme/default.nix
+++ b/pkgs/data/icons/arc-icon-theme/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
     description = "Arc icon theme";
     homepage = https://github.com/horst3180/arc-icon-theme;
     license = licenses.gpl3;
-    platforms = platforms.all;
+    # moka-icon-theme dependency is restricted to linux
+    platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix
index fdad4f0f46da1..e9d9efcfcb02d 100644
--- a/pkgs/data/icons/faba-icon-theme/default.nix
+++ b/pkgs/data/icons/faba-icon-theme/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }:
+{ stdenv, fetchFromGitHub, meson, ninja, gtk3, elementary-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "faba-icon-theme";
-  version = "2016-09-13";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "moka-project";
     repo = package-name;
-    rev = "00431894bce5fb1b8caccaee064788996be228a7";
-    sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns";
+    rev = "v${version}";
+    sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
   };
 
-  nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ];
+  nativeBuildInputs = [ meson ninja gtk3 elementary-icon-theme ];
 
   postPatch = ''
-    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+    patchShebangs meson/post_install.py
   '';
 
-  postFixup = "gtk-update-icon-cache $out/share/icons/Faba";
-
   meta = with stdenv.lib; {
     description = "A sexy and modern icon theme with Tango influences";
     homepage = https://snwh.org/moka;
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix
index bdb6f651e6a5b..a4ffefe1f26da 100644
--- a/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     description = "The full set of Faba monochrome panel icons";
     homepage = https://snwh.org/moka;
     license = licenses.gpl3;
-    platforms = platforms.all;
+    # moka-icon-theme dependency is restricted to linux
+    platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index 03c5be143ded6..2c0872188e02d 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "hicolor-icon-theme-0.17";
 
   src = fetchurl {
-    url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://icon-theme.freedesktop.org/releases/${name}.tar.xz";
     sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i";
   };
 
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index f3180db54dcfc..2b4bb5d67c3b9 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,30 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }:
+{ stdenv, fetchFromGitHub, meson, ninja, gtk3, faba-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "moka-icon-theme";
-  version = "5.3.6";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr";
+    sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd";
   };
 
-  nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ];
+  nativeBuildInputs = [ meson ninja gtk3 faba-icon-theme ];
 
   postPatch = ''
-    substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out
+    patchShebangs meson/post_install.py
   '';
 
-  postFixup = "gtk-update-icon-cache $out/share/icons/Moka";
-
   meta = with stdenv.lib; {
     description = "An icon theme designed with a minimal flat style using simple geometry and bright colours";
     homepage = https://snwh.org/moka;
     license = with licenses; [ cc-by-sa-40 gpl3 ];
-    platforms = platforms.all;
+    # darwin cannot deal with file names differing only in case
+    platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index f49009e76f3e0..34c949519baaa 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,30 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk3 }:
+{ stdenv, fetchFromGitHub, meson, ninja, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "paper-icon-theme";
-  version = "2017-11-20";
+  version = "2018-06-24";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = pname;
-    rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8";
-    sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m";
+    rev = "c7cd013fba06dd8fd5cdff9f885520e2923266b8";
+    sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v";
   };
 
-  nativeBuildInputs = [ autoreconfHook gtk3 ];
+  nativeBuildInputs = [ meson ninja gtk3 ];
 
-  postFixup = ''
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
+  postPatch = ''
+    patchShebangs meson/post_install.py
   '';
 
   meta = with stdenv.lib; {
     description = "Modern icon theme designed around bold colours and simple geometric shapes";
     homepage = https://snwh.org/paper;
     license = with licenses; [ cc-by-sa-40 lgpl3 ];
-    platforms = platforms.all;
+    # darwin cannot deal with file names differing only in case
+    platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix
index 6c59a0faf0491..54b54d278ffb3 100644
--- a/pkgs/data/misc/brise/default.nix
+++ b/pkgs/data/misc/brise/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       to support various Chinese input methods, including those based on
       modern dialects or historical diasystems of the Chinese language.
     '';
-    homepage = http://rime.im;
+    homepage = https://rime.im;
     # Note that individual packages in this collection
     # may be released under different licenses
     license = licenses.gpl3;
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix
new file mode 100644
index 0000000000000..18331b5ada9da
--- /dev/null
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  name = "combinatorial_designs-${version}";
+  version = "20140630";
+
+  src = fetchurl {
+    url = "mirror://sageupstream/combinatorial_designs/combinatorial_designs-${version}.tar.bz2";
+    sha256 = "0bj8ngiq59hipa6izi6g5ph5akmy4cbk0vlsb0wa67f7grnnqj69";
+  };
+
+  installPhase = ''
+    mkdir -p "$out/share/combinatorial_designs"
+    mv * "$out/share/combinatorial_designs"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Data for Combinatorial Designs";
+    longDescription = ''
+      Current content:
+
+      - The table of MOLS (10 000 integers) from the Handbook of Combinatorial
+        Designs, 2ed.
+    '';
+    license = licenses.publicDomain;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
new file mode 100644
index 0000000000000..fec422b33acf0
--- /dev/null
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchurl
+, python
+}:
+
+stdenv.mkDerivation rec {
+  name = "conway_polynomials-${version}";
+  version = "0.5";
+
+  pythonEnv = python.withPackages (ps: with ps; [ six ]);
+
+  src = fetchurl {
+    url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2";
+    sha256 = "05zb1ly9x2bbscqv0jgc45g48xx77mfs7qdbqhn4ihmihn57iwnq";
+  };
+
+  # Script that creates the "database" (nested python array) and pickles it
+  spkg-install = fetchurl {
+    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+    sha256 = "0m12nfb37j3bn4bp06ddgnyp2d6z0hg5f83pbbjszxw7vxs33a82";
+  };
+
+  installPhase = ''
+    # directory layout as spkg-install.py expects
+    dir="$PWD"
+    cd ..
+    ln -s "$dir" "src"
+
+    # environment spkg-install.py expects
+    mkdir -p "$out/share"
+    export SAGE_SHARE="$out/share"
+    export PYTHONPATH=$PWD
+
+    ${pythonEnv.interpreter} ${spkg-install}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Contains a small database of Conway polynomials.";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
new file mode 100644
index 0000000000000..528486328c68f
--- /dev/null
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, fetchurl
+, python
+}:
+
+stdenv.mkDerivation rec {
+  pname = "elliptic_curves";
+  version = "0.8";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
+    sha256 = "0pzaym44x88dn8rydiwqgm73yghzlgf7gqvd7qqsrsdl2vyp091w";
+  };
+
+
+  # Script that creates the sqlite database from the allcurves textfile
+  spkg-install = fetchurl {
+    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+    sha256 = "116g684i6mvs11fvb6fzfsr4fn903axn31vigdyb8bgpf8l4hvc5";
+  };
+
+  installPhase = ''
+    # directory layout as spkg-install.py expects
+    dir="$PWD"
+    cd ..
+    ln -s "$dir" "src"
+
+    # environment spkg-install.py expects
+    mkdir -p "$out/share"
+    export SAGE_SHARE="$out/share"
+    export PYTHONPATH=$PWD
+
+    ${python.interpreter} ${spkg-install}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Databases of elliptic curves";
+    longDescription = ''
+      Includes two databases:
+
+       * A small subset of the data in John Cremona's database of elliptic curves up
+         to conductor 10000. See http://www.warwick.ac.uk/~masgaj/ftp/data/ or
+         http://sage.math.washington.edu/cremona/INDEX.html
+       * William Stein's database of interesting curves
+    '';
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix
index ac015c02b1996..e48470a67bb78 100644
--- a/pkgs/data/misc/freepats/default.nix
+++ b/pkgs/data/misc/freepats/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "freepats-20060219";
 
   src = fetchurl {
-    url = "http://freepats.zenvoid.org/${name}.tar.bz2";
+    url = "https://freepats.zenvoid.org/${name}.tar.bz2";
     sha256 = "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82";
   };
 
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix
new file mode 100644
index 0000000000000..aea5feef46c7d
--- /dev/null
+++ b/pkgs/data/misc/graphs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "graphs";
+  version = "20161026";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
+    sha256 = "0a2b5lly9nifphvknz88rrhfbbc8vqnlqcv19zdpfq8h8nnyjbb2";
+  };
+
+  installPhase = ''
+    mkdir -p "$out/share/graphs"
+    cp * "$out/share/graphs/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A database of graphs";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 4612556f73dba..7e7813b4650fb 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a869307fd58b59579f78e5631b9bc8ae6b9bb92.tar.gz";
-  sha256 = "1i6gg49gibbqgc0iq87qlf6cqmi67pk8y2zbiz3gynqzrcmqbhfd";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/0986b1ed62a71528e09a660493955d79f0bf2fbf.tar.gz";
+  sha256 = "1s8xffqpkwv1x038mi1vw0rk6k3scwpp2l1phq9zs2vxrhblriaw";
 }
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index d5ab50f0b8c2c..f3b9bf150e005 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iana-etc-${version}";
-  version = "20180405";
+  version = "20180711";
 
   src = fetchurl {
     url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
-    sha256 = "0x6i95arrc4lcq2il3r05hbnd9vsi87z4yc8s3agkvbj74d6hfhj";
+    sha256 = "0xigkz6pcqx55px7fap7j6p3hz27agv056crbl5pgfcdix7y8z26";
   };
 
   installPhase = ''
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
new file mode 100644
index 0000000000000..222fd2f887070
--- /dev/null
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  version = "20080411";
+  name = "pari-galdata-${version}";
+
+  src = fetchurl {
+    url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz";
+    sha256 = "1pch6bk76f1i6cwwgm7hhxi5h71m52lqayp4mnyj0jmjk406bhdp";
+  };
+
+  installPhase = ''
+    mkdir -p "$out/share/pari"
+    cp -R * "$out/share/pari/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PARI database needed to compute Galois group in degrees 8 through 11";
+    homepage = http://pari.math.u-bordeaux.fr/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
new file mode 100644
index 0000000000000..967122c1bd4d4
--- /dev/null
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  version = "20090618";
+  name = "pari-seadata-small-${version}";
+
+  src = fetchurl {
+    url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz";
+    sha256 = "13qafribxwkz8h3haa0cng7arz0kh7398br4y7vqs9ib8w9yjnxz";
+  };
+
+  installPhase = ''
+    mkdir -p "$out/share/pari"
+    cp -R * "$out/share/pari/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PARI database needed by ellap for large primes";
+    homepage = http://pari.math.u-bordeaux.fr/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix
new file mode 100644
index 0000000000000..85f2cff09db24
--- /dev/null
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "polytopes_db";
+  version = "20170220";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
+    sha256 = "1q0cd811ilhax4dsj9y5p7z8prlalqr7k9mzq178c03frbgqny6b";
+  };
+
+  installPhase = ''
+    mkdir -p "$out/share/reflexive_polytopes"
+    cp -R * "$out/share/reflexive_polytopes/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Reflexive polytopes database";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index d7a5ce33bd26c..d14ccdec2ead4 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "poppler-data-0.4.9";
 
   src = fetchurl {
-    url = "http://poppler.freedesktop.org/${name}.tar.gz";
+    url = "https://poppler.freedesktop.org/${name}.tar.gz";
     sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
   };
 
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 8e64fa6980582..a72bae4384a95 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,32 +1,31 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "deepin-terminal-${version}";
-  version = "2.9.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-terminal";
     rev = version;
-    sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2";
+    sha256 = "11f2yc0fj05lwhgvdrbrs8xsdm7qgp6wb5wd1f9iyc5nxn7ccl1r";
   };
 
   patches = [
     # Do not build vendored zssh and vte
     (fetchurl {
       name = "remove-vendor.patch";
-      url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c;
-      sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6";
+      url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e;
+      sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv";
     })
   ];
 
   postPatch = ''
-    substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
     substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh"
   '';
 
   nativeBuildInputs = [
-    pkgconfig vala cmake gettext
+    pkgconfig vala cmake ninja gettext
     # For setup hook
     gobjectIntrospection
   ];
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 5ed4b487bdd90..06510c8f34aca 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -5,13 +5,13 @@
 , gnome3, libxml2 }:
 
 let
-  version = "3.28.2";
+  version = "3.28.3";
 in stdenv.mkDerivation rec {
   name = "bijiben-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs";
+    sha256 = "0lg92fl6dmrybkxs3gqhyr8rq945y64k51l6s72yiads7pqabli2";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 4470f11597eb5..6c7f57b0162a2 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.28.2";
+  version = "3.28.3";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74";
+    sha256 = "1s1vlznc22q1f8fm8fhggi8xak52b6n952s562f3kpv6g0dm2x6k";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 2a26f93011233..6d55cbe8ee799 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.4";
+  version = "3.28.5";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1378zzqdwv0hnirg8k91s5vgkcl1brfild3hgach5jhg78nxdb4j";
+    sha256 = "1z1qimspx1nw7l79rardxcx2bydj9nmk60vsdb611xzlqa3hkppm";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 3bd3222dc0c2f..7db21d9e74830 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha";
+    sha256 = "1i0s246bg9xcjxgbajph744pn65bq5gk6r9kkl3f5iwdq3rjc0pm";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 614308f7b6313..18f7f9f6fd4ed 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -1,19 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils
+, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${version}";
-  version = "3.28.2";
+  version = "3.28.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0";
+    sha256 = "0zw6nx1hckv46hn978g57anp4zq4alvz9dpwibgx02wb6gq1r23a";
   };
 
-  configureFlags = [ "--disable-tests" ];
+  mesonFlags = [
+    "-Dtests=true"
+    "-Dman=true"
+  ];
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ];
-  buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+  nativeBuildInputs = [
+    (python3.withPackages (pkgs: with pkgs; [ dogtail ]))
+    meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
+    libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
+  doCheck = true;
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index f55be458addf6..9613606f777ae 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.28.2.1";
+  version = "3.28.3.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s";
+    sha256 = "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9";
   };
 
   # Tests need an X display
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index a951620685996..5146123cfd465 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,19 +1,26 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection
-, intltool, libsoup, libxml2, libsecret, icu, sqlite
+{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection
+, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata
 , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.28.2";
+  version = "3.28.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk";
+    sha256 = "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit tzdata;
+    })
+  ];
+
   nativeBuildInputs = [
     cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala
   ];
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
new file mode 100644
index 0000000000000..334235516591f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
@@ -0,0 +1,11 @@
+--- a/src/calendar/libecal/e-cal-system-timezone.c
++++ b/src/calendar/libecal/e-cal-system-timezone.c
+@@ -26,7 +26,7 @@
+ #ifdef HAVE_SOLARIS
+ #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab"
+ #else
+-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo"
++#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo"
+ #endif
+ 
+ #define ETC_TIMEZONE        "/etc/timezone"
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 03fdf4b14fe0b..794f37fcbbdc5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-calculator-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "05zpdp9mkfjz22hs7hfjikkxhzmvy02mxrldrjxsv8ff17w9xvic";
+    sha256 = "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 08a6b784e9bd1..ab35a3bd35ac4 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, vala, glib, liboauth, gtk3
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
 
 let
   pname = "grilo";
@@ -7,6 +8,9 @@ let
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputBin = "dev";
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0vh67gja6yn7czh77ssmx6ncp99fl2926pbi2hplqms27c2n8sbw";
@@ -14,20 +18,24 @@ in stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+  configureFlags = [
+    "--enable-grl-pls"
+    "--enable-grl-net"
+    "--enable-gtk-doc"
+  ];
 
   preConfigure = ''
     for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$dev/share/gir-1.0/"
        substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser ];
-
-  propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
+  nativeBuildInputs = [
+    file intltool pkgconfig gobjectIntrospection vala
+    gtk-doc docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ];
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 45a4a97205b85..1562c42b374a3 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,41 +1,55 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme
-, glib, desktop-file-utils, bash, appdata-tools
+{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme
+, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool
 , wrapGAppsHook, gnome3, itstool, libxml2
 , callPackage, unzip, gobjectIntrospection }:
 
-stdenv.mkDerivation rec {
+let
+  unicode-data = callPackage ./unicode-data.nix {};
+in stdenv.mkDerivation rec {
   name = "gucharmap-${version}";
-  version = "10.0.4";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gucharmap"; };
+  version = "11.0.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "gucharmap";
+    rev = version;
+    sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi";
   };
 
-  doCheck = true;
-
-  preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";
-
   nativeBuildInputs = [
     pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools
+    autoconf automake libtool gtk-doc
     gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection
   ];
 
   buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ];
 
-  unicode-data = callPackage ./unicode-data.nix {};
+  configureFlags = [
+    "--with-unicode-data=${unicode-data}"
+  ];
 
-  configureFlags = "--with-unicode-data=${unicode-data}";
+  doCheck = true;
+
+  postPatch = ''
+    patchShebangs gucharmap/gen-guch-unicode-tables.pl
+  '';
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gucharmap";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gucharmap;
     description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = gnome3.maintainers;
+    homepage = https://wiki.gnome.org/Apps/Gucharmap;
     license = licenses.gpl3;
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
index 72299b8a3690b..6bf2fd39a2d3a 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
@@ -1,30 +1,31 @@
 { fetchurl, stdenv, gnome3 }:
-stdenv.mkDerivation {
-  name = "unicode-data-10.0.0";
+stdenv.mkDerivation rec {
+  name = "unicode-data-${version}";
+  version = "11.0.0";
   srcs = [
     (fetchurl {
-      url = "http://www.unicode.org/Public/10.0.0/ucd/Blocks.txt";
-      sha256 = "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas";
+      url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt";
+      sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b";
     })
     (fetchurl {
-      url = "http://www.unicode.org/Public/10.0.0/ucd/DerivedAge.txt";
-      sha256 = "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h";
+      url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt";
+      sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb";
     })
     (fetchurl {
-      url = "http://www.unicode.org/Public/10.0.0/ucd/NamesList.txt";
-      sha256 = "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1";
+      url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt";
+      sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8";
     })
     (fetchurl {
-      url = "http://www.unicode.org/Public/10.0.0/ucd/Scripts.txt";
-      sha256 = "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh";
+      url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt";
+      sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9";
     })
     (fetchurl {
-      url = "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt";
-      sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj";
+      url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt";
+      sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9";
     })
     (fetchurl {
-      url = "http://www.unicode.org/Public/10.0.0/ucd/Unihan.zip";
-      sha256 = "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1";
+      url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip";
+      sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj";
     })
   ];
   phases = "installPhase";
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index fbae8fbcfbd41..beab024652729 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libgweather";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm";
+    sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 457cee3b3f250..279e7f2e95af1 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobjectIntrospection, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "totem-pl-parser-${version}";
-  version = "3.26.0";
+  version = "3.26.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb";
+    sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka";
   };
 
   passthru = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
-  buildInputs = [ gmime libxml2 libsoup ];
+  buildInputs = [ gmime libxml2 ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index b4c15b5dce2e9..df37377e52e80 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -6,39 +6,25 @@
 
 stdenv.mkDerivation rec {
   name = "totem-${version}";
-  version = "3.26.0";
+  version = "3.26.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13";
+    sha256 = "10n302fdp3lhkzbij5sbzmsnln738029xil6cnng2d4dxv4n1099";
   };
 
   doCheck = true;
 
-  # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
-  # https://bugzilla.gnome.org/show_bug.cgi?id=784236
-  # https://github.com/mesonbuild/meson/issues/1994
-  enableParallelBuilding = false;
-
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobjectIntrospection wrapGAppsHook ];
   buildInputs = [
     gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
     gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
     gnome3.gsettings-desktop-schemas tracker nautilus
-  ];
-
-  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
-
-  patches = [
-    (fetchurl {
-      name = "remove-pycompile.patch";
-      url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204";
-      sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi";
-    })
+    python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
   ];
 
   postPatch = ''
@@ -46,7 +32,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
+  mesonFlags = [
+    "-Dwith-nautilusdir=lib/nautilus/extensions-3.0"
+  ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 44b0de37d69cd..dc55fa9a7b4ac 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -7,16 +7,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "tracker-miners";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";
+    sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4";
   };
 
-  # https://github.com/NixOS/nixpkgs/issues/39547
-  LIBRARY_PATH = stdenv.lib.makeLibraryPath [ giflib ];
-
   nativeBuildInputs = [
     intltool
     itstool
@@ -71,31 +68,11 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit (gnome3) tracker;
     })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795573
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371422;
-      sha256 = "1rzwzrc7q73k42s1j1iw52chy10w6y3xksfrzg2l42nn9wk7n281";
-    })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795574
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371423;
-      sha256 = "0b2ck8z4b2yrgwg4v9jsac5n8h3a91qkp90vv17wxcvr4v50fg48";
-    })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795575
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371424;
-      sha256 = "03i29fabxrpraydh7712vdrc571qmiq0l4axj24gbi6h77xn7mxc";
-    })
     # https://bugzilla.gnome.org/show_bug.cgi?id=795576
     (fetchurl {
       url = https://bugzilla.gnome.org/attachment.cgi?id=371427;
       sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
     })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795577
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371425;
-      sha256 = "05m629469jr2lm2cjs54n7xwyim2d5rwwvdjxzcwh5qpfjds5phm";
-    })
   ];
 
   passthru = {
@@ -114,7 +91,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
   '';
-  
+
   # https://bugzilla.gnome.org/show_bug.cgi?id=796145
   postFixup = ''
     rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index cbf16c6807ff7..649960c0bf3f0 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "tracker";
-  version = "2.0.3";
+  version = "2.0.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss";
+    sha256 = "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d0c6558a611b3..6605d15a697ee 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -1,18 +1,6 @@
 { pkgs, lib }:
 
-let
-
-  pkgsFun = overrides:
-    let
-      self = self_ // overrides;
-      self_ = with self; {
-
-  overridePackages = f:
-    let newself = pkgsFun (f newself self);
-    in newself;
-
-  callPackage = pkgs.newScope self;
-
+lib.makeScope pkgs.newScope (self: with self; {
   # Convert a version to branch (3.26.18 → 3.26)
   # Used for finding packages on GNOME mirrors
   versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version));
@@ -52,7 +40,7 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3
+  inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
     clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
@@ -375,8 +363,6 @@ let
 
   gitg = callPackage ./misc/gitg { };
 
-  gspell = callPackage ./misc/gspell { };
-
   libgnome-games-support = callPackage ./misc/libgnome-games-support { };
 
   libgda = callPackage ./misc/libgda { };
@@ -433,7 +419,4 @@ let
   yelp_xsl = yelp-xsl; # added 2018-02-25
   yelp_tools = yelp-tools; # added 2018-02-25
 
-    };
-  in self; # pkgsFun
-
-in pkgsFun {}
+})
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 548936dc5e525..37f149c7ad9aa 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -6,14 +6,14 @@
 
 let
   pname = "geary";
-  version = "0.12.2";
+  version = "0.12.3";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "09j5gh4zm49fcg2ycvy00dkkw69rfppqwc3lqdi4994hry4jivx9";
+    sha256 = "18zzjzs075zja00xpnyvjrrdzm54icdhfw4ywhpr6rqfcpnzifw7";
   };
 
   nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index b5013f5ac1aa4..409afe6d77290 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsysstat-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libsysstat";
     rev = version;
-    sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx";
+    sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb";
   };
 
   nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
index 8d369f464335d..c52533a344b22 100644
--- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }:
 
 stdenv.mkDerivation rec {
   name = "lxqt-build-tools-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-build-tools";
     rev = version;
-    sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
+    sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt5.qtbase glib pcre ];
 
   preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
 
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index 612fbeafe1999..f3a50814d638a 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -7,13 +7,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libfm-qt";
-  version = "0.12.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i";
+    sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
index 10b767aedac00..8324cdc3dff0d 100644
--- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lxqt-l10n-${version}";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-l10n";
     rev = version;
-    sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4";
+    sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index c5fae1e9ecb30..7d3d464e0bb0b 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -7,13 +7,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-qtplugin";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv";
+    sha256 = "19y5dvbj7gwyh8glc6vi6hb5snvkd3jwvss6j0sn2sy2gp9g9ryb";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
index 6251667430b23..5f996c78643dd 100644
--- a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-themes";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n";
+    sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index 862a4ff9cf994..5a284d9b89a7c 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pavucontrol-qt";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27";
+    sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
     homepage = https://github.com/lxde/pavucontrol-qt;
     license = licenses.gpl2;
-    platforms = with platforms; unix;
+    platforms = with platforms; linux;
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
index d9e2a651c3a88..d51e27409649c 100644
--- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pcmanfm-qt";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb";
+    sha256 = "0xnhdxx45fmbi5dqic3j2f7yq01s0xysimafj5zqs0a29zw3i4m0";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
index f882088d07b81..56c42cb285325 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qtermwidget";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4";
+    sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg";
   };
 
   nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 253f8112f5b2c..1c2ade5938e00 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "compton-conf";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb";
+    sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index 80921cac891db..8b185703ec736 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lximage-qt";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym";
+    sha256 = "1slmaic9cmj5lqa5kwc1qfbbycwh8840wnkg0nxc99ls0aazlpzi";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index c40b9c4e9f94f..cd3b91f4cbdfc 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "obconf-qt";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5";
+    sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index 88c4740760f86..9f8e4482e21f3 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qterminal";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw";
+    sha256 = "1z9wlyj5i192jfq3dcxjf8wzx9x332f19c9ll7zv69cq21kyy9wn";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 3383847f16c61..cd47f7b62b4f4 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-extensions-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1abi7s31mx7v8x0f747bmb3s8hrv8fv007pflv2n545yvn0m1dpj";
+    sha256 = "01k7c3gw6rfd7vlch61zig22bvz40wlnalc5p3rz4d9i98fr643n";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index a04dbb27a88b1..63ad4e6712549 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-${version}";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "013lmngnm0i2746qrkkyhg62kyh4cjdd0i634cz5fm7ah65ylxg4";
+    sha256 = "0kswpghpsz69l417ammniy1ja0dsg1hrsm2k0rx28q9mhdfdmnwq";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 74d32ce1f216b..2becc40a46c30 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "engrampa-${version}";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1pk053i14a0r5s9qkipwnp4qjg76b763203z64ymnpkslrrarnnm";
+    sha256 = "0y79rzmv3i03la443bp8f6gsgm03vr4nd88npwrvjqlxs59lg1gw";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 23e167412919d..ee297237f6e03 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "eom-${version}";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0320ph6cyh0m4cfyvky10j9prk2hry6rpm4jzgcn7ig03dnj4y0s";
+    sha256 = "165n314hxapq8glzlv7vs5x44z13wjmpysl5p7q3ckrsxy5pczww";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index fb7a8308ee5fa..15b81a628863d 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmatekbd-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426";
+    sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 10a690546f766..8bf0d9bec18cc 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmatemixer-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0jpfaqbspn2mjv6ysgzdmzhb07gx61yiiiwmrw94qymld2igrzb5";
+    sha256 = "00p67mi0flsbgn15qpwq60rzf917s5islbmhirbvz6npcvv0d493";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 7efad3a5e3ae8..9a7ba4f006f7b 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmateweather-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1c8mvydb0h7z3zn0qahwlp15z5wl6nrv24q4z7ldhm340jnxsvh7";
+    sha256 = "0bp1nn3b5gf5nqrdwl43fxbb82j74s3x8jkmp40ilv2qpc2mxwr1";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 42c74aa1173d3..c1c6d96688ba7 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marco-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1qnx47aibvl00qaf1jik457cwncxb71pf5pd1m3gdg7ky61ljkm4";
+    sha256 = "1fn0yfqjp44gr4kly96qjsd73x06z1xyw6bpyhh09kdqwd80rgiy";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 7e501fcf379b1..52f21225cbb8f 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-calc-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87";
+    sha256 = "1ghz03j9lfgrjrh8givsw83dpbkw4wlhq4ar3r5g1bf1z636jlx0";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 6bde7d7a01722..bc7538b6306fc 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
-  version = "1.20.2";
+  version = "1.20.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl";
+    sha256 = "0wpi8b3zz10xd5i7ir7nd737a9vl4q17rc5nh8vfrqpyrcilqzkd";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index f84b6b2542078..124cd644467e0 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-desktop-${version}";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0jxhhf9w6mz8ha6ymgj2alzmiydylg4ngqslkjxx37vvpvms2dyx";
+    sha256 = "0qd76p5zqgifiawkgv2casb9ll55j4qq4pfxgxj3j5zvjr3dgr47";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 7291b475fe16e..c18dd77838091 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5";
+    sha256 = "170vir6h9sgsibd4kfq5qgz542qrw94q3qakqry77clls5wj6b62";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index 512327c062084..c099d070221e9 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-indicator-applet-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1fc6j5dnxghpgz8xbf5p8j2jprk97q4q3ajkh6sg5l71gqlnampg";
+    sha256 = "0gxis834w8h33xmrx335jjad2xaqpkamirl0x4j7wsk4zs25jkyd";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 514da3a117240..efc9a3d2c39ff 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-media-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "09vbw7nc91ljnxm5sbrch0w7zzn2i6qjb1b50q402niwr5b0zicr";
+    sha256 = "1db47m80qfb1xyrg1qxwvmkc53qp97yhvh86fgwjv00x96c3j9s9";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 51263f0d74e71..9815952c5405a 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-menus-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1w1k6kdabmabhpqvkizk1si6ri4rmspsbj0252ki834ml0dxpnhg";
+    sha256 = "1p8pkw6aby2hq2liqrnsf3lvyn2jqamfbs83fv6q7clw5w179sy6";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 508e1d359c9a3..35a7f1dae6105 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-netbook-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1w92kny1fnlwbq4b8y50n5s1vsvvl4xrvspsp9lqfxyz3jxiwbrz";
+    sha256 = "1ils0lav6j779kgz2py6zdalcfifpnp01clspbnkhb3v1ha1ncsq";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 59df2b7d59bde..748a45eda79c2 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-notification-daemon-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0dq457npzid20yfwigdh8gfqgf5wv8p6jhbxfnzybam9xidlqc5f";
+    sha256 = "0hwswgc3i6d7zvmj0as95xjjw431spxkf1d37mxwaf6j80gx0p78";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index 3db773af9fc5f..a65077872cfb6 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-polkit-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "00c1rmi31gv1a3lk7smjp489kd3wrj0d6npagnb8p1rz0g88ha94";
+    sha256 = "05g6k5z903p9p0dbi0y61z5chip52gqrhy5zrjn6xjxv1ad29lsk";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index c056b1f62fbdb..e2b50127b89bc 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-power-manager-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1s46jvjcrai6xb2k0dy7i121b9ihfl5h3y5809fg9fzrbvw6bafn";
+    sha256 = "1z754jxnwashwxxfg3cxb9ifbqyjxgavzzwy2mjnzl6z7k95hvjh";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 3b5d303816ba6..3289ff5081b5d 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-screensaver-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1698608m6kf4dn91xdwy7l809yagz02h1k594smj75wvnhr7x4k9";
+    sha256 = "1mcr2915wymwjy55m2z0l6b9dszabbv0my0xxsa1fb8xkr4hk4qh";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index d82cd4b073a2c..b108a20d5f061 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-sensors-applet-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x";
+    sha256 = "0khxzwjjf2gp9ma6ji0ynvvqlw6hhr8j4gff9klkrn60xbg5h16b";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 97c80cdc2e4ed..47657375bbab7 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0vzr6y9shw4zb3ddfrj0nn7yqggpq9sv6h33p0xxdx71ydl40p2g";
+    sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 490500fca6970..cf63e3e69d944 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-settings-daemon-${version}";
-  version = "1.20.1";
+  version = "1.20.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq";
+    sha256 = "018f2yg4jd6hy0z7ks0s3jyjgpyi3vhd9j61951v5lb1x8ckzxhk";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index 8c67044a42206..0dc21f276732c 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-system-monitor-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "059aryj0gz4sic719nsmckhkjl4yhqxmyplvh78clf5khh4apwn5";
+    sha256 = "1a68il7pbch5028fm2caxyjkfrdc6ixhqnaspbwfziw6y8p9bscn";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index b90211ae06111..036f996da6aa1 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-terminal-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az";
+    sha256 = "0yfr857mpxy35zzdmicvd7mpwka8s1h0rqagfjqc2p1gv4a7ka97";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 55cd82eecdc74..9992d911814d4 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-user-guide-${version}";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1n1rlvymz8k7vvjmd9qkv26wz3770w1ywsa41kbisbfp9x7mr0w2";
+    sha256 = "0ayg570000calzpj51dwhh5mil11s0nrhl21c0si3sxr8f5cld6q";
   };
 
   nativeBuildInputs = [ itstool intltool libxml2 ];
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index 23123fd2db1a7..9baa3f24e038f 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-user-share-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0lv5ndjk2br4w7cw8gsgj7aa2iadxv7m4wii4c49pajmd950iff2";
+    sha256 = "0v5xilk978zl5443vlxf25z8z1g5sw9xl5sq76gvrmdlz2parfrn";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index f96eecb0a4e63..8ea8ab33700c7 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-utils-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "10a6k8gi7cajlkbj1jbvk3s633hw58lan3rc85v8jlrkwm7wmhpl";
+    sha256 = "1kr0612h6r2gj3yg4ccyzr844lh640cd4wdj3gl8qzqikjx0n7ka";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index e98d16d774e27..387df5d45b3d3 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mozo-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1108avdappfjadd46ld7clhh5m9f4b5khl5y33l377m8ky9dy87g";
+    sha256 = "16rkwbq385i2acll0kcsnp4ghdyljylhp06bjdsvbwv6bjspyyrp";
   };
   
   pythonPath = [ mate.mate-menus pythonPackages.pygobject3 ];
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index c1b57504317d1..9dd992c4699ff 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pluma-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1y3zl0rzp069pix1vgrhzkkfc3lvhq9ahfgbmc88cwqw9aw3mgk0";
+    sha256 = "0sc69bz0h3f4cpgkyda9fnpjfkvbc20ldh6v3jj8fd3n460bc8ai";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 4be84589080ce..b5ff3f5dd05da 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -11,8 +11,4 @@ mkDerivation {
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
-  postInstall = ''
-    # Fix the location of logic.js for the plasmoid
-    ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
-  '';
 }
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 6da0ad22d1154..0b1668038f596 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -124,6 +124,7 @@ let
       libksysguard = callPackage ./libksysguard {};
       milou = callPackage ./milou.nix {};
       oxygen = callPackage ./oxygen.nix {};
+      plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
       plasma-desktop = callPackage ./plasma-desktop {};
       plasma-integration = callPackage ./plasma-integration {};
       plasma-nm = callPackage ./plasma-nm {};
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index c73598f03d026..9e5faf96de294 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.5/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index ae2736fde1135..d2870c27e6597 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
-  kwindowsystem, kxmlgui
+  kwindowsystem, kxmlgui, kcrash
 }:
 
 mkDerivation {
@@ -10,6 +10,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
-    kxmlgui
+    kxmlgui kcrash
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 63219d8cbe1ab..3364ee2c06324 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, extra-cmake-modules, kdoctools,
   kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
-  qtsvg, qtx11extras, kactivities
+  qtsvg, qtx11extras, kactivities, plasma-workspace
 }:
 
 mkDerivation {
@@ -9,6 +9,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
-    qtx11extras kactivities
+    qtx11extras kactivities plasma-workspace
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index d8f996421ac96..569da3c703499 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -1,8 +1,8 @@
-{ mkDerivation, extra-cmake-modules, qtbase }:
+{ mkDerivation, extra-cmake-modules, qtbase, ki18n }:
 
 mkDerivation {
   name = "kdecoration";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qtbase ki18n ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index b9f40563ef64a..e23ffd3644a04 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
   knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
-  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras,
+  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
 }:
 
 mkDerivation {
@@ -12,6 +12,6 @@ mkDerivation {
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
     kross krunner kservice ksysguard kunitconversion ibus plasma-framework
-    plasma-workspace qtdeclarative qtx11extras
+    plasma-workspace qtdeclarative qtx11extras kholidays
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 7fdaedbb78d70..422bb95c6059a 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
-  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects
+  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwindowsystem, 
+  kdeclarative, plasma-framework
 }:
 
 mkDerivation {
@@ -10,6 +11,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
-    libkscreen qtdeclarative qtgraphicaleffects
+    libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative
+    plasma-framework
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 87a25885b40ff..2c9d824999e2c 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -30,13 +30,7 @@ mkDerivation {
     libcap
   ];
   outputs = [ "bin" "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [
-    # This patch should be removed in 5.12.2
-    (fetchpatch {
-      url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch";
-      sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x";
-    })
-  ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
   ];
diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
new file mode 100644
index 0000000000000..e01efabe8a6a6
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
@@ -0,0 +1,11 @@
+{ mkDerivation, extra-cmake-modules, qtbase, kio, ki18n, kconfig
+, kdbusaddons, knotifications, krunner, kwindowsystem, kactivities
+}:
+
+mkDerivation {
+  name = "plasma-browser-integration";
+  nativeBuildInputs = [
+    extra-cmake-modules qtbase kio ki18n kconfig kdbusaddons
+    knotifications krunner kwindowsystem kactivities
+  ];
+}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
deleted file mode 100644
index d3f5166d5ed94..0000000000000
--- a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml
-+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
-@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas
- import org.kde.kquickcontrolsaddons 2.0
-
- import org.kde.private.desktopcontainment.folder 0.1 as Folder
--import "FolderTools.js" as FolderTools
-+import "../code/FolderTools.js" as FolderTools
-
- Item {
-     id: main
-Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml
-+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
-@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0
-
- import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-
--import "LayoutManager.js" as LayoutManager
--import "FolderTools.js" as FolderTools
-+import "../code/LayoutManager.js" as LayoutManager
-+import "../code/FolderTools.js" as FolderTools
-
- DragDrop.DropArea {
-     id: root
-Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
-===================================================================
---- plasma-desktop-5.8.5.orig/containments/panel/contents/ui/main.qml
-+++ plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
- import org.kde.kquickcontrolsaddons 2.0
- import org.kde.draganddrop 2.0 as DragDrop
-
--import "LayoutManager.js" as LayoutManager
-+import "../code/LayoutManager.js" as LayoutManager
-
- DragDrop.DropArea {
-     id: root
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series
index 6334deb7d9735..26517ba93565d 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/series
+++ b/pkgs/desktops/plasma-5/plasma-desktop/series
@@ -1,3 +1,2 @@
-qml-import-paths.patch
 hwclock-path.patch
 tzdir.patch
diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix
index 300627163e574..e016944be4563 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix
@@ -5,6 +5,7 @@
   kactivities,
   plasma-framework,
   kwindowsystem,
+  networkmanager-qt,
   libksysguard,
 
   encfs,
@@ -24,6 +25,7 @@ mkDerivation {
 
   buildInputs = [
     kactivities plasma-framework kwindowsystem libksysguard
+    networkmanager-qt
   ];
 
   CXXFLAGS = [
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 0e98b095e893e..ab011576b2b75 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, fetchpatch,
 
   extra-cmake-modules, kdoctools,
 
@@ -9,8 +9,9 @@
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff,
   knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
-  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard,
-  networkmanager-qt, phonon, plasma-framework, prison, solid,
+  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate,
+  networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays,
+  breeze-qt5,
 
   qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
   qtwayland, qtx11extras,
@@ -28,8 +29,8 @@ mkDerivation {
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
-    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
-    networkmanager-qt phonon plasma-framework prison solid
+    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate
+    networkmanager-qt phonon plasma-framework prison solid kholidays
 
     qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
   ];
@@ -51,6 +52,7 @@ mkDerivation {
     "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep"
     "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown"
     "-DNIXPKGS_SED=${getBin gnused}/bin/sed"
+    "-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/"
   ];
 
   # To regenerate ./plasma-workspace.patch,
@@ -64,7 +66,13 @@ mkDerivation {
   # Add upstream patches to the list below. For new patchs, particularly if not
   # submitted upstream, please make a pull request and add it to
   # ./plasma-workspace.patch.
-  patches = [ ./plasma-workspace.patch ];
+  patches = [
+    ./plasma-workspace.patch
+    (fetchpatch {
+      url = "https://github.com/KDE/plasma-workspace/commit/11e570d861858f3b3e2694e5f9ec242d7f9f12b9.patch";
+      sha256 = "1vk9yacb59k0v5mgbpgmciflca9r0ll4wh1d83ffx2y2v8sqwiv2";
+    })
+  ];
 
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\""
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index e012537e4028a..272088b72b7b6 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -1,76 +1,15 @@
-diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-index 7e2d975..40a5797 100644
---- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.plasma.workspace.components 2.0
- import org.kde.kcoreaddons 1.0 as KCoreAddons
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batteryItem
-diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-index 50deee5..45b6b37 100644
---- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.kcoreaddons 1.0 as KCoreAddons
- import org.kde.kquickcontrolsaddons 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batterymonitor
-diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
-index 80e7e53..0083cf0 100644
---- a/applets/lock_logout/contents/ui/lockout.qml
-+++ b/applets/lock_logout/contents/ui/lockout.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0
- import org.kde.kquickcontrolsaddons 2.0
--import "data.js" as Data
-+import "../code/data.js" as Data
- 
- Flow {
-     id: lockout
-diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
-index cb15cfa..a6976ba 100644
---- a/applets/notifications/package/contents/ui/main.qml
-+++ b/applets/notifications/package/contents/ui/main.qml
-@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
- import org.kde.plasma.private.notifications 1.0
- 
--import "uiproperties.js" as UiProperties
-+import "../code/uiproperties.js" as UiProperties
- 
- MouseEventListener {
-     id: notificationsApplet
-diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
-index 8571521..294eab0 100644
---- a/krunner/dbus/org.kde.krunner.service.in
-+++ b/krunner/dbus/org.kde.krunner.service.in
+diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
+index 69d30705..52e91028 100644
+--- a/sddm-theme/theme.conf.cmake
++++ b/sddm-theme/theme.conf.cmake
 @@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=org.kde.krunner
--Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
-+Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner
- 
-diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
-index 7a86d07..5b3030c 100644
---- a/kuiserver/org.kde.kuiserver.service.in
-+++ b/kuiserver/org.kde.kuiserver.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.kde.kuiserver
--Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5
-+Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5
+ [General]
+ type=image
+ color=#1d99f3
+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
-index fe29f57..247db95 100644
+index cb75aeca..247db953 100644
 --- a/startkde/CMakeLists.txt
 +++ b/startkde/CMakeLists.txt
 @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
@@ -79,14 +18,14 @@ index fe29f57..247db95 100644
  
 -#FIXME: reconsider, looks fishy
 -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
--    set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
+-    set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
 -endif()
 -
  configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde  @ONLY)
  configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor  @ONLY)
  configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma  @ONLY)
 diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp
-index c992785..bd506ce 100644
+index 493218ea..d507aa55 100644
 --- a/startkde/kstartupconfig/kstartupconfig.cpp
 +++ b/startkde/kstartupconfig/kstartupconfig.cpp
 @@ -147,5 +147,5 @@ int main()
@@ -97,7 +36,7 @@ index c992785..bd506ce 100644
 +    return system( NIXPKGS_KDOSTARTUPCONFIG5 );
      }
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index b3117b4..e70110e 100644
+index f9e2e429..0a4267a9 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,22 +1,31 @@
@@ -436,37 +375,7 @@ index b3117b4..e70110e 100644
  # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
  # from some users that they're confused and don't know what to do. This is
  # especially necessary on slow machines, where starting KDE takes one or two
-@@ -211,28 +236,10 @@ xset fp rehash
- # If the user has overwritten fonts, the cursor font may be different now
- # so don't move this up.
- #
--xsetroot -cursor_name left_ptr
--
--# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
--if test -n "$GS_LIB" ; then
--    GS_LIB=$usr_fdir:$GS_LIB
--    export GS_LIB
--else
--    GS_LIB=$usr_fdir
--    export GS_LIB
--fi
-+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
- 
- echo 'startkde: Starting up...'  1>&2
- 
--# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
--# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
--# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
--# /usr/local.
--if test -z "$XDG_DATA_DIRS"; then
--    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
--fi
--export XDG_DATA_DIRS
--
- # Mark that full KDE session is running (e.g. Konqueror preloading works only
- # with full KDE running). The KDE_FULL_SESSION property can be detected by
- # any X client connected to the same X session, even if not launched
-@@ -257,44 +264,65 @@ export XDG_DATA_DIRS
+@@ -257,44 +282,65 @@ export XDG_DATA_DIRS
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -545,7 +454,7 @@ index b3117b4..e70110e 100644
  
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -306,34 +334,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
+@@ -306,34 +352,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
  # We only check for 255 which means that the ksmserver process could not be
  # started, any problems thereafter, e.g. ksmserver failing to initialize,
  # will remain undetected.
@@ -594,7 +503,7 @@ index b3117b4..e70110e 100644
              done
              break
          fi
-@@ -342,15 +373,17 @@ fi
+@@ -342,15 +391,17 @@ fi
  
  echo 'startkde: Shutting down...'  1>&2
  # just in case
@@ -617,7 +526,7 @@ index b3117b4..e70110e 100644
  
  echo 'startkde: Done.'  1>&2
 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
-index a5d09fa..d42c284 100644
+index a5d09fa7..d42c284b 100644
 --- a/startkde/startplasma.cmake
 +++ b/startkde/startplasma.cmake
 @@ -1,6 +1,6 @@
@@ -809,7 +718,7 @@ index a5d09fa..d42c284 100644
  
  echo 'startplasma: Done.'  1>&2
 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index 8ac47aa..49970ef 100644
+index dd9e304d..49d456e9 100644
 --- a/startkde/startplasmacompositor.cmake
 +++ b/startkde/startplasmacompositor.cmake
 @@ -1,118 +1,165 @@
@@ -1013,27 +922,26 @@ index 8ac47aa..49970ef 100644
  #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
  export QT_AUTO_SCREEN_SCALE_FACTOR=0
  
+-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
 +XCURSOR_PATH=~/.icons
 +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
 +for xdgDir in "${xdgDirs[@]}"; do
 +    XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
 +done
 +export XCURSOR_PATH
-+
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
--if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
--    @EXPORT_XCURSOR_PATH@
--
+ 
 -    # TODO: is kapplymousetheme a core app?
--    #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
++# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
++if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
+     #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
 -    if test $? -eq 10; then
 -        XCURSOR_THEME=breeze_cursors
 -        export XCURSOR_THEME
 -    elif test -n "$kcminputrc_mouse_cursortheme"; then
 -        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
 -        export XCURSOR_THEME
-+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
-+    #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
 +    if [ $? -eq 10 ]; then
 +        export XCURSOR_THEME=breeze_cursors
 +    elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
@@ -1110,7 +1018,7 @@ index 8ac47aa..49970ef 100644
      : # ok
  else
      echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?'  1>&2
-@@ -212,7 +228,7 @@ export KDE_FULL_SESSION
+@@ -212,26 +228,47 @@ export KDE_FULL_SESSION
  KDE_SESSION_VERSION=5
  export KDE_SESSION_VERSION
  
@@ -1119,9 +1027,7 @@ index 8ac47aa..49970ef 100644
  export KDE_SESSION_UID
  
  XDG_CURRENT_DESKTOP=KDE
-@@ -222,20 +238,41 @@ export XDG_CURRENT_DESKTOP
- QT_QPA_PLATFORM=wayland
- export QT_QPA_PLATFORM
+ export XDG_CURRENT_DESKTOP
  
 +# Source scripts found in <config locations>/plasma-workspace/env/*.sh
 +# (where <config locations> correspond to the system and user's configuration
@@ -1171,12 +1077,3 @@ index 8ac47aa..49970ef 100644
  
  echo 'startplasmacompositor: Shutting down...'  1>&2
  
-diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
-index 0a51b84..f48b5d8 100644
---- a/startkde/waitforname/org.kde.plasma.Notifications.service.in
-+++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.freedesktop.Notifications
--Exec=@CMAKE_INSTALL_PREFIX@/bin/plasma_waitforname org.freedesktop.Notifications
-+Exec=@CMAKE_INSTALL_FULL_BINDIR@/plasma_waitforname org.freedesktop.Notifications
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index cc1fdb889207c..966237b73a82e 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz";
-      sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a";
-      name = "bluedevil-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/bluedevil-5.13.2.tar.xz";
+      sha256 = "16ip2myq0s5d1yjipr0k0cvbq22mc668pms33qhs2836mqxq4c87";
+      name = "bluedevil-5.13.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz";
-      sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n";
-      name = "breeze-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/breeze-5.13.2.tar.xz";
+      sha256 = "1yl41rjh2qmplny6x9hm885mwsfn6w5asw8dkp7rk0qpyb607jkq";
+      name = "breeze-5.13.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz";
-      sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad";
-      name = "breeze-grub-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/breeze-grub-5.13.2.tar.xz";
+      sha256 = "1j2lh8prbdivy7vlv3iyizgkmsc2qwpjkivyn9b9r6gpp0ii0dwk";
+      name = "breeze-grub-5.13.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz";
-      sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd";
-      name = "breeze-gtk-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/breeze-gtk-5.13.2.tar.xz";
+      sha256 = "12hs3nqjf20kcn18ab64qdwc8aq33l220giqfffdb7rh8n7wyknx";
+      name = "breeze-gtk-5.13.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz";
-      sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9";
-      name = "breeze-plymouth-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/breeze-plymouth-5.13.2.tar.xz";
+      sha256 = "18020rppw59iwqdrmm0xsmq2cl98z6m5na8walvvzvlqsskc7hh6";
+      name = "breeze-plymouth-5.13.2.tar.xz";
     };
   };
   discover = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz";
-      sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m";
-      name = "discover-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/discover-5.13.2.tar.xz";
+      sha256 = "0jh2d9gk72fm2csf8i41hq4i0dd467m3cw5y81wbrz3k9qd3llrb";
+      name = "discover-5.13.2.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz";
-      sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq";
-      name = "drkonqi-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/drkonqi-5.13.2.tar.xz";
+      sha256 = "1zfd4pbrqp67zqmhydimqdbq49bc5b20d9z8px27l1rgj951ms2j";
+      name = "drkonqi-5.13.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz";
-      sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1";
-      name = "kactivitymanagerd-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kactivitymanagerd-5.13.2.tar.xz";
+      sha256 = "1z6nncnlzmk0l1k4vsg9g2z18k1z4k73j2gv7bbhyx9xmb0aypdf";
+      name = "kactivitymanagerd-5.13.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz";
-      sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh";
-      name = "kde-cli-tools-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kde-cli-tools-5.13.2.tar.xz";
+      sha256 = "04hyhbr288girwsp5h8rbxkp8m56wm69h9vhbb7g4lr5b3jrr1ps";
+      name = "kde-cli-tools-5.13.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz";
-      sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d";
-      name = "kdecoration-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kdecoration-5.13.2.tar.xz";
+      sha256 = "1gjp1ma0d0kxkky13kx16gwmwwjllz2w9h4ffa9hnw93sk0z1rb0";
+      name = "kdecoration-5.13.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz";
-      sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh";
-      name = "kde-gtk-config-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kde-gtk-config-5.13.2.tar.xz";
+      sha256 = "0np7r02ihgii1894fysr8ik9jxs3b6bdb5blkdnh51j44dr7c5a4";
+      name = "kde-gtk-config-5.13.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz";
-      sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s";
-      name = "kdeplasma-addons-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kdeplasma-addons-5.13.2.tar.xz";
+      sha256 = "03a0w3gimiak32zhhqwi4y35lpdq7fblbjg8xfgsdzrps7zh1n7x";
+      name = "kdeplasma-addons-5.13.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz";
-      sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c";
-      name = "kgamma5-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kgamma5-5.13.2.tar.xz";
+      sha256 = "0d3yhwgyag5yzny9adsxvdd1dmfq0k6aslz9cgi5fn7k9jppvn6j";
+      name = "kgamma5-5.13.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz";
-      sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg";
-      name = "khotkeys-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/khotkeys-5.13.2.tar.xz";
+      sha256 = "13fffa73mddm4wb436kw6m7i2p1mv8c3z8dj6gr7ccbcsmzhlj88";
+      name = "khotkeys-5.13.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz";
-      sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5";
-      name = "kinfocenter-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kinfocenter-5.13.2.tar.xz";
+      sha256 = "00cvc3idbghl74nbrbii9xp969vngr0jbdsjh1rriv1is8vfldfn";
+      name = "kinfocenter-5.13.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz";
-      sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw";
-      name = "kmenuedit-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kmenuedit-5.13.2.tar.xz";
+      sha256 = "0ss2dwnaqsfir0s95iyp1sjmh1kx19jihj1nbnix5hdlwgbp5qvd";
+      name = "kmenuedit-5.13.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz";
-      sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l";
-      name = "kscreen-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kscreen-5.13.2.tar.xz";
+      sha256 = "080m1kii0xxd2r1b2gvz40qj7ixkammgb3ki3sbxa74avwxd1p10";
+      name = "kscreen-5.13.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz";
-      sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq";
-      name = "kscreenlocker-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kscreenlocker-5.13.2.tar.xz";
+      sha256 = "0hczdgx03i2r6y8qfrpj7pk4n5l1maigsip77qbgsli3d3fapri9";
+      name = "kscreenlocker-5.13.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz";
-      sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4";
-      name = "ksshaskpass-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/ksshaskpass-5.13.2.tar.xz";
+      sha256 = "1f4b12vqzg351m4ps316w0spbywm7mv21p95sd17zz17fm39pzzn";
+      name = "ksshaskpass-5.13.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz";
-      sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv";
-      name = "ksysguard-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/ksysguard-5.13.2.tar.xz";
+      sha256 = "0b4achg5dvb97mf25bd9s08nanj4ag6y4bwdbpr3zgbp1dp790n7";
+      name = "ksysguard-5.13.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz";
-      sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33";
-      name = "kwallet-pam-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kwallet-pam-5.13.2.tar.xz";
+      sha256 = "1dpd7lgycfjrd9lgv1na4gb3wf22dvprigsxsqiq3zw9xqkc9778";
+      name = "kwallet-pam-5.13.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz";
-      sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3";
-      name = "kwayland-integration-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kwayland-integration-5.13.2.tar.xz";
+      sha256 = "0bhx5678f21mxmrdlh6r8cxjj6dh45minkgarh6j2zdvzfxxif1s";
+      name = "kwayland-integration-5.13.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz";
-      sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3";
-      name = "kwin-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kwin-5.13.2.tar.xz";
+      sha256 = "03fhjl3zyk725xp6bj6ljgfmniw5zgwpacarfl7ifnnwzgfbni6f";
+      name = "kwin-5.13.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz";
-      sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz";
-      name = "kwrited-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/kwrited-5.13.2.tar.xz";
+      sha256 = "0m6ks0l9nyfpdl5lvfzlip9qk7z5cfnx3jvh4v20vm4cvr9rb1yr";
+      name = "kwrited-5.13.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz";
-      sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4";
-      name = "libkscreen-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/libkscreen-5.13.2.tar.xz";
+      sha256 = "05r56xynavq3zd3bvchy1yx3z0h8si12w8fcf8pqgdvr38vrqqm5";
+      name = "libkscreen-5.13.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz";
-      sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9";
-      name = "libksysguard-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/libksysguard-5.13.2.tar.xz";
+      sha256 = "1xbjb4lm7bn41zpy9plsg4qdqg3i4m9gzvpaqd1rvd9v24qzy7pi";
+      name = "libksysguard-5.13.2.tar.xz";
     };
   };
   milou = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz";
-      sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc";
-      name = "milou-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/milou-5.13.2.tar.xz";
+      sha256 = "1mzhgj6q4siaiy9kccrdr4dpjij5gkd1l60kmw0lk80sn92cc5pd";
+      name = "milou-5.13.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz";
-      sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l";
-      name = "oxygen-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/oxygen-5.13.2.tar.xz";
+      sha256 = "09dxn73fx78j7d0qfvv7hw7h0pv0yaz1f7s2m9f5f9d666v8fja5";
+      name = "oxygen-5.13.2.tar.xz";
+    };
+  };
+  plasma-browser-integration = {
+    version = "5.13.2";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.13.2/plasma-browser-integration-5.13.2.tar.xz";
+      sha256 = "08gdm4qyi89zffrk630cj8k6h0qimmv3va99s85bqwvjzslsf9i6";
+      name = "plasma-browser-integration-5.13.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz";
-      sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6";
-      name = "plasma-desktop-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-desktop-5.13.2.tar.xz";
+      sha256 = "17xcvjbr5j75m8j54g9i7ny9qsiqvv930fgwdxzdwhvskca9lshi";
+      name = "plasma-desktop-5.13.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz";
-      sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm";
-      name = "plasma-integration-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-integration-5.13.2.tar.xz";
+      sha256 = "0273510djc7kbcvxw13dlhj3cislfrbryg8im8c4dasabafxfhmx";
+      name = "plasma-integration-5.13.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz";
-      sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6";
-      name = "plasma-nm-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-nm-5.13.2.tar.xz";
+      sha256 = "1shbgdm4019crijpg4xbs9lsan6h63gijqckh4acvjfplbmk39q0";
+      name = "plasma-nm-5.13.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz";
-      sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd";
-      name = "plasma-pa-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-pa-5.13.2.tar.xz";
+      sha256 = "0sn59f3w3bz7xm41x6i03s9vd9p6vwynnj9xcnyc2797l0bf9vq9";
+      name = "plasma-pa-5.13.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz";
-      sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g";
-      name = "plasma-sdk-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-sdk-5.13.2.tar.xz";
+      sha256 = "1z1p8n327v1pgkdqj125nwdhip482lny1ryi7c2cdvivhppjdhv3";
+      name = "plasma-sdk-5.13.2.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz";
-      sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij";
-      name = "plasma-tests-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-tests-5.13.2.tar.xz";
+      sha256 = "0p7j3nhqvlywg32j627ci58ifn5zq9rgyiw0mv8gn79kghzkfc39";
+      name = "plasma-tests-5.13.2.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz";
-      sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d";
-      name = "plasma-vault-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-vault-5.13.2.tar.xz";
+      sha256 = "15w2qyjb4iab302v5n0a8xfiwj9hb62js82v17sln49axcs95xfb";
+      name = "plasma-vault-5.13.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz";
-      sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk";
-      name = "plasma-workspace-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-5.13.2.tar.xz";
+      sha256 = "1rjdh6ikiri6nikl5idhczlk17bzcn29m3g1c7gd67s2fglvak0p";
+      name = "plasma-workspace-5.13.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz";
-      sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7";
-      name = "plasma-workspace-wallpapers-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-wallpapers-5.13.2.tar.xz";
+      sha256 = "0bx7r1xz8k1imi0h9l2rbrk68dbr9zyydj5khvpdbl81c7mmfw8r";
+      name = "plasma-workspace-wallpapers-5.13.2.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz";
-      sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9";
-      name = "plymouth-kcm-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/plymouth-kcm-5.13.2.tar.xz";
+      sha256 = "14n8b1ajrw8sx6b1bmlc2krsf3f6f2hwmp6rxay1bn3m3z1blndy";
+      name = "plymouth-kcm-5.13.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.5";
+    version = "1-5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz";
-      sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if";
-      name = "polkit-kde-agent-1-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/polkit-kde-agent-1-5.13.2.tar.xz";
+      sha256 = "1z455nh28hhh4f1wxwd6zrxcg4cfpiz02jrbbgqi7x3bflmswc2a";
+      name = "polkit-kde-agent-1-5.13.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz";
-      sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk";
-      name = "powerdevil-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/powerdevil-5.13.2.tar.xz";
+      sha256 = "0g9ag9y9pip4q5agvbmp642vjcvj9355gc1j25wh3innml6z7jp0";
+      name = "powerdevil-5.13.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz";
-      sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h";
-      name = "sddm-kcm-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/sddm-kcm-5.13.2.tar.xz";
+      sha256 = "0ya9l65i3lhk9zcnscsy1ps334k2nk7j3ixrv1xbfgr2w1plhkqx";
+      name = "sddm-kcm-5.13.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz";
-      sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8";
-      name = "systemsettings-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/systemsettings-5.13.2.tar.xz";
+      sha256 = "0gzdh4cgvmbr99c96p6pw4a5l181rkpwpwfa79xm8pmr6lmcy254";
+      name = "systemsettings-5.13.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz";
-      sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010";
-      name = "user-manager-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/user-manager-5.13.2.tar.xz";
+      sha256 = "1k3xkyfxs9xbgggs4ymyx1cx7fphxcnh0cfmwqdjbsa6fqjbh7jh";
+      name = "user-manager-5.13.2.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.5";
+    version = "5.13.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz";
-      sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv";
-      name = "xdg-desktop-portal-kde-5.12.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.2/xdg-desktop-portal-kde-5.13.2.tar.xz";
+      sha256 = "1vydh7vqycd9fgkiysnz3kf4xqqkvmzr2pmhbng4yz7vy4pci981";
+      name = "xdg-desktop-portal-kde-5.13.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index a6199d9fbef2a..9ff906f79745f 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -2,7 +2,7 @@
   mkDerivation, extra-cmake-modules, kdoctools,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
-  kactivities, kactivities-stats, kirigami2, kcrash
+  kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
   buildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
-    kactivities kactivities-stats kirigami2 kcrash
+    kactivities kactivities-stats kirigami2 kcrash plasma-workspace
   ];
   outputs = [ "bin" "dev" "out" ];
 }
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 115c5f2ac7180..5fdd6bea46407 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -1,13 +1,13 @@
 {
   mkDerivation,
   extra-cmake-modules, gettext, kdoctools, python,
-  kcoreaddons, knotifications
+  kcoreaddons, knotifications, kwayland, kwidgetsaddons
 }:
 
 mkDerivation {
   name = "xdg-desktop-portal-kde";
   nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
   buildInputs = [
-    kcoreaddons knotifications
+    kcoreaddons knotifications kwayland kwidgetsaddons
   ];
 }
diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index ae68e84ab1c2e..8f93a0b377219 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -13,6 +13,7 @@ let
               inherit version;
               sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a";
             };
+            patches = [];
           });
 
           platformio = self.callPackage ./core.nix { };
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 9d30c22685545..de0585309996f 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "platformio";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec";
+    sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011";
   };
 
   propagatedBuildInputs =  [
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
index eda895d726a00..ce754813dda16 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.9.28";
 
   src = fetchurl {
-    url = "http://lionet.info/soft/asn1c-${version}.tar.gz";
+    url = "https://lionet.info/soft/asn1c-${version}.tar.gz";
     sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
   };
 
diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 4dc384f70a342..387ae906b88da 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib jdk ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error";
+  NIX_CFLAGS_COMPILE = "-Wno-error";
 
   postPatch = ''
     substituteInPlace makefile \
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index ad9e57f794f0d..ceeff56330b2e 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   binaryVersion = 8;
 
   src = fetchurl {
-    url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
+    url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
     sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd";
   };
 
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index 3fed2289f9549..16ac8b7872192 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
+        url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
         sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
     })
     else throw "Architecture not supported";
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 0dfa10f28a123..516268e0efd59 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20180506";
+  version = "20180610";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "10w9vs61fs14k8g3wlng0ifj0knfm0xfc4rsnd2c75464hkdxvr9";
+    sha256 = "1qg9a1whmrkrifqrsb9m541cgr3rf1nnkqlv4q7rq30m8bdilvk5";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index ffbe3c5a62f49..61b24a851941f 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.13.0.6";
 
   src = fetchurl {
-    url = "http://www.colm.net/files/colm/${name}.tar.gz";
+    url = "https://www.colm.net/files/colm/${name}.tar.gz";
     sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26";
   };
 
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 7b83e0e68b730..237ca7e5aed44 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,26 +1,27 @@
-{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, makeWrapper }:
+{ stdenv, fetchurl, makeWrapper
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }:
 
 stdenv.mkDerivation rec {
   name = "crystal-${version}";
-  version = "0.24.2";
+  version = "0.25.0";
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "1l7nrrfgz1yxxjphypwzlxj6dbari20p71zb4l0gix09lmas8l6y";
+    sha256 = "1pnx21ky6cqfyv6df4mmjnyd1yh1bvcqkdzq6f0mk0yrkcl57k3q";
   };
 
-  prebuiltName = "crystal-0.24.2-1";
+  prebuiltName = "crystal-0.25.0-1";
   prebuiltSrc = let arch = {
     "x86_64-linux" = "linux-x86_64";
     "i686-linux" = "linux-i686";
     "x86_64-darwin" = "darwin-x86_64";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   in fetchurl {
-    url = "https://github.com/crystal-lang/crystal/releases/download/0.24.2/${prebuiltName}-${arch}.tar.gz";
+    url = "https://github.com/crystal-lang/crystal/releases/download/0.25.0/${prebuiltName}-${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "1xf6riwd5k5f95988m1hsppsfii5v96svgmy12ncy7mgmm7k4dh3";
-      "i686-linux" = "0ar05kj89pm3zxfnxwhf0mz9vrd9q5p47y4969sh0r6knccri0kp";
-      "x86_64-darwin" = "1vz8bi5rfgggiic4ayxbcf6pfmdjvqcg4lsivnk2fyshr1m8l0h5";
+      "x86_64-linux" = "1q006086pbbvhmscbjzzgbdq1jkppd4p4kl9z9fn9j6np8fhi8ms";
+      "i686-linux" = "074ndm9n0mzsa7dkl3chhf234l85msm99yjksa5980lyqynyrw1d";
+      "x86_64-darwin" = "006f2j5984dkp5lsq8kns5mkxbhj50syjvzqk9z931pxl92wc7iy";
     }."${stdenv.system}";
   };
 
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 .build/crystal $out/bin/crystal
     wrapProgram $out/bin/crystal \
+        --suffix PATH : ${clang}/bin \
         --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
         --suffix LIBRARY_PATH : $libPath
     install -dm755 $out/lib/crystal
@@ -79,7 +81,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   meta = {
     description = "A compiled language with Ruby like syntax and type inference";
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index 291b0ed013d6d..c27f2a2267051 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -53,6 +53,14 @@ stdenv.mkDerivation {
       url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch";
       sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb";
     })
+    (fetchpatch {
+      # Fix getcwd with long pathnames
+      # Rebased version of
+      # https://gitlab.com/embeddable-common-lisp/ecl/commit/ac5f011f57a85a38627af154bc3ee7580e7fecd4.patch
+      name = "getcwd.patch";
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb";
+    })
   ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 5c1f931da9a2a..f9f083f04d755 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A functional CLI language";
-    homepage = http://fsharp.org/;
+    homepage = https://fsharp.org/;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index 354723dfa740a..3ce7ae60e114c 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A functional CLI language";
-    homepage = http://fsharp.org/;
+    homepage = https://fsharp.org/;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index fab9b8fe7458c..d671743ee629e 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -254,6 +254,9 @@ stdenv.mkDerivation ({
     ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
     ;
 
+  # TODO: Use optionalString with next rebuild.
+  ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument";
+
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index 6ea21207f19f8..675522d54ead1 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation {
   name = "gforth-${version}";
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
     sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
   };
 
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
index 48e2ca0a585c1..53693ff505213 100644
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix
@@ -153,7 +153,10 @@ stdenv.mkDerivation rec {
     [ $(./main) == "yes" ]
   '';
 
-  passthru = { targetPrefix = ""; };
+  passthru = {
+    targetPrefix = "";
+    enableShared = true;
+  };
 
   meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"];
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 2565afab334bf..2a906d918aa35 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -16,7 +16,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? !(gmp.meta.available or false), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -30,8 +30,6 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
-assert !enableIntegerSimple -> gmp != null;
-
 let
   inherit (bootPkgs) ghc;
 
@@ -179,6 +177,7 @@ stdenv.mkDerivation rec {
     inherit bootPkgs targetPrefix;
 
     inherit llvmPackages;
+    inherit enableShared;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-7.10.3";
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 4aa9f3fc81cba..8062e93df549d 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? !(gmp.meta.available or false), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -29,8 +29,6 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
-assert !enableIntegerSimple -> gmp != null;
-
 let
   inherit (bootPkgs) ghc;
 
@@ -185,6 +183,7 @@ stdenv.mkDerivation rec {
     inherit bootPkgs targetPrefix;
 
     inherit llvmPackages;
+    inherit enableShared;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-8.0.2";
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index c88d2a8685a6b..bfb9c4cd61648 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -1,6 +1,6 @@
 { stdenv
 , fetchurl, perl, gcc, llvm_39
-, ncurses5, gmp, libiconv
+, ncurses5, gmp, glibc, libiconv
 }:
 
 # Prebuilt only does native
@@ -14,6 +14,13 @@ let
   libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
     + "LD_LIBRARY_PATH";
 
+  glibcDynLinker = assert stdenv.isLinux;
+    if stdenv.hostPlatform.libc == "glibc" then
+       # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
+       ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
+    else
+      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+
 in
 
 stdenv.mkDerivation rec {
@@ -95,7 +102,7 @@ stdenv.mkDerivation rec {
       find . -type f -perm -0100 -exec patchelf \
           --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
           --replace-needed libtinfo.so libtinfo.so.5 \
-          --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
+          --interpreter ${glibcDynLinker} {} \;
 
       paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
 
@@ -107,7 +114,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
     "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
 
   # Stripping combined with patchelf breaks the executables (they die
   # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
@@ -155,7 +163,10 @@ stdenv.mkDerivation rec {
     [ $(./main) == "yes" ]
   '';
 
-  passthru = { targetPrefix = ""; };
+  passthru = {
+    targetPrefix = "";
+    enableShared = true;
+  };
 
   meta.license = stdenv.lib.licenses.bsd3;
   # AArch64 should work in theory but eventually some builds start segfaulting
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 87de0fd53f62e..d740a7ee673b8 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -8,7 +8,7 @@
 
 , libffi, libiconv ? null, ncurses
 
-, useLLVM ? !targetPlatform.isx86
+, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
   # build-time dependency too.
@@ -16,7 +16,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? !(gmp.meta.available or false), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -34,8 +34,6 @@
   deterministicProfiling ? false
 }:
 
-assert !enableIntegerSimple -> gmp != null;
-
 let
   inherit (bootPkgs) ghc;
 
@@ -53,13 +51,16 @@ let
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
@@ -95,6 +96,27 @@ stdenv.mkDerivation rec {
       sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f";
     })
     (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; })
+  ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform && targetPlatform.system == hostPlatform.system) [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch";
+      sha256 = "1hxj80bjx0x3w0f35cj3k2wipppr1ald03jwfy5q0xlxygdha17w";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch";
+      sha256 = "12xsln3zyfpvml8bwdpbc003h6zl1qh2qcq1rhdrw02n45dz8lvc";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch";
+      sha256 = "03dcqf5af3vjhrky3f2z26j4d9h8qd9nkv76xp0l97h4cqk7vfqb";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch";
+      sha256 = "0pi2m85wjxaaablq6n4q5vyn9qxvry5d7nmja4b28i68yb4ly9g1";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch";
+      sha256 = "1fszfavf1cvrf02x500mi7jykcpvpl2i7i4qzr2qz9sbmyq063f0";
+    })
   ] ++ stdenv.lib.optional deterministicProfiling
     (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism
       url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch";
@@ -136,6 +158,7 @@ stdenv.mkDerivation rec {
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
@@ -201,6 +224,7 @@ stdenv.mkDerivation rec {
     inherit bootPkgs targetPrefix;
 
     inherit llvmPackages;
+    inherit enableShared;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-8.2.2";
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 0fecb1d29622b..182afa6b3496e 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -7,7 +7,7 @@
 
 , libffi, libiconv ? null, ncurses
 
-, useLLVM ? !targetPlatform.isx86
+, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
   # build-time dependency too.
@@ -15,14 +15,14 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? !(gmp.meta.available or false), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt
 
 , # Whetherto build terminfo.
   enableTerminfo ? !targetPlatform.isWindows
@@ -32,8 +32,6 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
-assert !enableIntegerSimple -> gmp != null;
-
 let
   inherit (bootPkgs) ghc;
 
@@ -51,7 +49,8 @@ let
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
@@ -76,7 +75,7 @@ let
   targetCC = builtins.head toolsForTarget;
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   version = "8.4.3";
   name = "${targetPrefix}ghc-${version}";
 
@@ -123,6 +122,24 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
   '';
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
@@ -195,6 +212,7 @@ stdenv.mkDerivation rec {
     inherit bootPkgs targetPrefix;
 
     inherit llvmPackages;
+    inherit enableShared;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-8.4.3";
@@ -207,4 +225,8 @@ stdenv.mkDerivation rec {
     inherit (ghc.meta) license platforms;
   };
 
-}
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 9a57161d3a71a..fb294d1fdbaff 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -7,7 +7,7 @@
 
 , libffi, libiconv ? null, ncurses
 
-, useLLVM ? !targetPlatform.isx86
+, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
   # build-time dependency too.
@@ -15,14 +15,14 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? !(gmp.meta.available or false), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt
 
 , # Whetherto build terminfo.
   enableTerminfo ? !targetPlatform.isWindows
@@ -32,8 +32,6 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
-assert !enableIntegerSimple -> gmp != null;
-
 let
   inherit (bootPkgs) ghc;
 
@@ -51,7 +49,8 @@ let
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
@@ -76,27 +75,19 @@ let
   targetCC = builtins.head toolsForTarget;
 
 in
-stdenv.mkDerivation rec {
-  version = "8.4.2";
+stdenv.mkDerivation (rec {
+  version = "8.6.0.20180627";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01";
+    url = "https://downloads.haskell.org/~ghc/8.6.1-alpha1/ghc-${version}-src.tar.xz";
+    sha256 = "0vmki10ypdhca3nykxz3lgarr14mfanfkif43m1s2p1q0b1z576n";
   };
 
   enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 
-  patches = [(fetchpatch {
-    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
-    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
-    extraPrefix = "utils/hsc2hs/";
-    stripLen = 1;
-  })]
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
@@ -123,6 +114,24 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
   '';
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
@@ -195,9 +204,10 @@ stdenv.mkDerivation rec {
     inherit bootPkgs targetPrefix;
 
     inherit llvmPackages;
+    inherit enableShared;
 
     # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.4.2";
+    haskellCompilerName = "ghc-8.4.3";
   };
 
   meta = {
@@ -207,4 +217,8 @@ stdenv.mkDerivation rec {
     inherit (ghc.meta) license platforms;
   };
 
-}
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index c9effb90ac330..4c1e5d986dcf7 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,7 +7,7 @@
 
 , libffi, libiconv ? null, ncurses
 
-, useLLVM ? !targetPlatform.isx86
+, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
   # non-x86, we need LLVM to bootstrap later stages, so it becomes a
   # build-time dependency too.
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? !(gmp.meta.available or false), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -33,8 +33,6 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
-assert !enableIntegerSimple -> gmp != null;
-
 let
   inherit (bootPkgs) ghc;
 
@@ -52,7 +50,8 @@ let
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
     BUILD_SPHINX_PDF = NO
@@ -168,10 +167,10 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
-  hardeningDisable = [ "format" ];
-
   checkTarget = "test";
 
+  hardeningDisable = [ "format" ];
+
   postInstall = ''
     for bin in "$out"/lib/${name}/bin/*; do
       isELF "$bin" || continue
@@ -193,6 +192,7 @@ stdenv.mkDerivation rec {
     inherit bootPkgs targetPrefix;
 
     inherit llvmPackages;
+    inherit enableShared;
 
     # Our Cabal compiler name
     haskellCompilerName = "ghc-8.5";
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 04c3431f6f23c..9aa3efe614eb3 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -42,15 +42,19 @@ let
     inherit (bootGhcjs) version;
     isGhcjs = true;
 
+    enableShared = true;
+
     socket-io = nodePackages."socket.io";
 
     # Relics of the old GHCJS build system
     stage1Packages = [];
     mkStage2 = _: {};
+
+    haskellCompilerName = "ghcjs-${bootGhcjs.version}";
   };
 
   bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
-  libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
+  libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin" "i686"] ["osx" "i386"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
     name = bootGhcjs.name;
@@ -67,7 +71,8 @@ in stdenv.mkDerivation {
     ] ++ lib.optionals stdenv.isDarwin [
       gcc # https://github.com/ghcjs/ghcjs/issues/663
     ];
-    phases = ["unpackPhase" "buildPhase"];
+    dontConfigure = true;
+    dontInstall = true;
     buildPhase = ''
       export HOME=$TMP
       mkdir $HOME/.cabal
@@ -75,12 +80,12 @@ in stdenv.mkDerivation {
       cd lib/boot
 
       mkdir -p $out/bin
-      mkdir -p $out/libexec
+      mkdir -p $out/lib/${bootGhcjs.name}
       lndir ${libexec} $out/bin
 
-      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
-      wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
-      wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
+      wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
+      wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d"
 
       env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
     '';
@@ -93,4 +98,3 @@ in stdenv.mkDerivation {
 
     meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
   }
-
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 07662d32d2580..f09a577110b76 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -174,11 +174,13 @@ in mkDerivation (rec {
     isGhcjs = true;
     inherit nodejs ghcjsBoot;
     socket-io = pkgs.nodePackages."socket.io";
-    haskellCompilerName = "ghcjs";
+    haskellCompilerName = "ghcjs-${version}";
 
     # let us assume ghcjs is never actually cross compiled
     targetPrefix = "";
 
+    enableShared = true;
+
     inherit stage1Packages;
     mkStage2 = stage2 {
       inherit ghcjsBoot;
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index ca1e2f54df930..cc27d19781fe6 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "glslang-git-${version}";
-  version = "2018-02-05";
+  version = "2018-06-21";
 
-  # `vulkan-loader` requires a specific version of `glslang` as specified in
-  # `<vulkan-loader-repo>/external_revisions/glslang_revision`.
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "2651ccaec8";
-    sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq";
+    rev = "ef1f899b5d64a9628023f1bb129198674cba2b97";
+    sha256 = "052w6rahmy1wlphv533wz8nyn82icky28lprvl8w3acfq3831zg6";
   };
 
   buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 23e7ec222a63a..b4fa005c3de85 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -25,15 +25,17 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "1lbxnlj5l9i8k1dg33dh8ndx9vspk9dkpcbg06jbbswy6kadmx6f";
+    sha256 = "0i89298dgnmpmam3ifkm0ax266vvbq1yz7wfw8wwrcma0szrbrnb";
   };
 
+  GOCACHE = "off";
+
   # perl is used for testing go vet
   nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
   buildInputs = [ cacert pcre ]
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index ff269afd1a640..7944674437151 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
+{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
 
 let
   # pre-download some cache entries ('mx' will not be able to download under nixbld1)
@@ -8,69 +8,84 @@ let
       buildCommand = ''
         mkdir $out
         ${lib.concatMapStrings ({url, name, sha1}: ''
-                                  ln -s ${fetchurl { inherit url sha1; }} $out/${name}
+                                  install -D ${fetchurl { inherit url sha1; }} $out/${name}
                                   echo -n ${sha1} > $out/${name}.sha1
                                 '') list}
       '';
     };
 
   jvmci8-mxcache = [
-    rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar";                            url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; }
-    rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar";                    url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; }
-    rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar";                          url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; }
-    rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar";                  url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; }
-    rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar";                        url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; }
-    rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar";                url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; }
-    rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar";         url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; }
-    rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; }
-    rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}.jar";         url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; }
-    rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; }
-    rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar";                         url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; }
-    rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar";                     url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; }
-    rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar";             url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; }
-    rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar";                              url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; }
-    rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar";                      url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; }
-    rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}.jar";                              url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; }
-    rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21.sources_${sha1}.jar";                      url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; }
-    rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar";                                 url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; }
-    rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar";                         url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; }
-    rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar";                              url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; }
-    rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar";                      url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; }
-    rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so";                                  url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; }
+    rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}/jacococore.jar";                                               url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; }
+    rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE_${sha1}/jacococore.sources.jar";                                       url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; }
+    rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}/jacocoreport.jar";                                           url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; }
+    rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT_${sha1}/jacocoreport.sources.jar";                                   url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; }
+    rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar";                                       url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; }
+    rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar";                               url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; }
+    rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.jar";         url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; }
+    rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}/jmh-generator-annprocess-1-18.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; }
+    rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar";         url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; }
+    rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; }
+    rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}/asm-debug-all.jar";                                         url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; }
+    rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar";                                 url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; }
+    rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar";                         url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; }
+    rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}/jmh-1-18.jar";                                                   url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; }
+    rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18_${sha1}/jmh-1-18.sources.jar";                                           url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; }
+    rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar";                                                   url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; }
+    rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar";                                           url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; }
+    rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar";                                                         url = mirror://maven/junit/junit/4.12/junit-4.12.jar; }
+    rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar";                                                 url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; }
+    rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar";                                                   url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; }
+    rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar";                                           url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; }
+    rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "jvmci/intel-hsdis-amd64-linux-${sha1}.so";                                        url = "https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
   ];
 
   graal-mxcache = jvmci8-mxcache ++ [
-    rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar";                   url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; }
-    rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar";                             url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; }
-    rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar";                              url = mirror://maven/org/json/json/20160810/json-20160810.jar; }
-    rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar";                                 url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; }
-    rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar";          url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; }
-    rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar";                                  url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; }
-    rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar";                             url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; }
-    rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz";                             url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
-    rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar";                         url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; }
-    rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar";                 url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; }
+    rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar";                             url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; }
+    rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar";                                                 url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; }
+    rec { sha1 = "30b13b7efc55b7feea667691509cf59902375001"; name = "ANTLR4_${sha1}/antlr4.jar";                                                       url = mirror://maven/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7.jar; }
+    rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}/jline.jar";                                                         url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; }
+    rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar";           url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; }
+    rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar";                                                           url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; }
+    rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar";                                                 url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; }
+    rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz";                                                    url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
+    rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar";                                             url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; }
+    rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar";                                       url = https://github.com/graalvm/mx/releases/download/checkstyle-8.8/checkstyle-8.8-all.jar; }
   ];
 
+  findbugs = fetchzip {
+    name   = "findbugs-3.0.0";
+    url    = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip;
+    sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m";
+  };
+
 in rec {
 
   mx = stdenv.mkDerivation rec {
-    version = "5.171.0";
+    version = "5.176.4";
     name = "mx";
     src = fetchFromGitHub {
       owner  = "graalvm";
       repo   = "mx";
       rev    = version;
-      sha256 = "0ag3g49fnjrnlmjb55dbn9l2cwyvanx36f5hyf21ad8px05fh6jv";
+      sha256 = "0xmx4hpnd6m9hk49lgwnvwd0q11s2m4d8axwq7zzc8wm10d692xw";
     };
     nativeBuildInputs = [ makeWrapper ];
     buildPhase = ''
       substituteInPlace mx --replace /bin/pwd pwd
+
+      # forbid network access while simulate success for passing obligatory "VerifyLibraryURL"
+      substituteInPlace mx.py --replace \
+        'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):' \
+        'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
+          print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
+          return True'
     '';
     installPhase = ''
       mkdir -p $out/bin
       cp -dpR * $out/bin
-      wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]}
+      wrapProgram $out/bin/mx \
+        --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \
+        --set    FINDBUGS_HOME ${findbugs}
     '';
     meta = with stdenv.lib; {
       homepage = https://github.com/graalvm/mx;
@@ -82,7 +97,7 @@ in rec {
 
   # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
   jvmci8 = stdenv.mkDerivation rec {
-    version = "0.43";
+    version = "0.45";
     name = let
              n = "jvmci8u171-${version}";
            in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
@@ -93,7 +108,7 @@ in rec {
       owner  = "graalvm";
       repo   = "graal-jvmci-8";
       rev    = "jvmci-${version}";
-      sha256 = "0jkp67m7s252kngxnj0yp397pgx5z95v1lbi68v9g4dw050l28rk";
+      sha256 = "1nppk9dpamisiadss1iy82i3rf6igndbf1vax85w9lz310kh0d12";
     };
     buildInputs = [ mx mercurial ];
     postUnpack = ''
@@ -122,6 +137,8 @@ in rec {
     installPhase = ''
       mv jdk1.8.0_*/linux-amd64/product $out
       find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \;
+
+      install -v -m0555 -D $MX_CACHE_DIR/jvmci/*hsdis*.so $out/jre/lib/amd64/hsdis-amd64.so
     '';
     dontFixup = true; # do not nuke path of ffmpeg etc
     dontStrip = true; # why? see in oraclejdk derivation
@@ -129,7 +146,7 @@ in rec {
   };
 
   graalvm8 = stdenv.mkDerivation rec {
-    version = "1.0.0-rc1";
+    version = "1.0.0-rc3";
     name = let
              n = "graal-${version}";
            in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
@@ -140,7 +157,7 @@ in rec {
       owner  = "oracle";
       repo   = "graal";
       rev    = "vm-${version}";
-      sha256 = "1j1m53d8x0mkvqr9lwlkjddfha5jrsq9hxlblbjv1bqcivfmmfn7";
+      sha256 = "1hcs4m6ailapgi3bikav1i517vqn5pn595cyqqjfvlnkjwihbnc3";
     };
     buildInputs = [ mx zlib mercurial jvmci8 ];
     postUnpack = ''
@@ -161,20 +178,42 @@ in rec {
 
       export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
       export MX_CACHE_DIR=${makeMxCache graal-mxcache}
-      ( cd substratevm; mx --java-home $out build --no-daemon )
+      ( cd substratevm
+
+        mkdir -p clibraries
+        mx --java-home $out build
+
+        # bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4)
+        mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/svm-driver.jar com.oracle.svm.driver.NativeImage
+      )
+      ( cd tools
+        mx --java-home $out build
+      )
     '';
     installPhase = ''
-      # add graal files
-      mkdir -p $out/jre/tools/{profiler,chromeinspector}
-      cp -pR  substratevm/svmbuild/native-image-root/linux-amd64/bin/*  $out/jre/bin/
-      cp -pLR substratevm/svmbuild/native-image-root/lib/*              $out/jre/lib/           || true # ignore "same file" error when dereferencing symlinks
-      cp -pLR substratevm/svmbuild/native-image-root/tools/*            $out/jre/tools/
-      cp -pR  $MX_ALT_OUTPUT_ROOT/truffle/dists/*                       $out/jre/lib/truffle/
-      cp -pR  $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler*         $out/jre/tools/profiler/
-      cp -pR  $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector*          $out/jre/tools/chromeinspector/
-      echo "name=GraalVM ${version}"                                  > $out/jre/lib/amd64/server/vm.properties
-      ln -s --relative $out/jre/bin/native-image                        $out/bin/native-image
-      cp -dpR $out/jre/lib/svm/clibraries                               $out/jre/lib/svm/builder/
+      # add graal files modelling after directory structure of "graalvm-ce" binary distribution
+      mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include}
+      cp -vpLR substratevm/svmbuild/native-image-root/lib/*                         $out/jre/lib/           || true # ignore "same file" error when dereferencing symlinks
+      cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/*     $out/jre/lib/amd64/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-*processor*.jar             $out/jre/lib/graal/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-management.jar              $out/jre/lib/jvmci/
+      cp -vdpR $out/jre/lib/svm/clibraries                                          $out/jre/lib/svm/builder/
+      cp -vpR  $MX_ALT_OUTPUT_ROOT/truffle/dists/*                                  $out/jre/lib/truffle/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/
+      cp -vpLR substratevm/svmbuild/native-image-root/tools/*                       $out/jre/tools/
+      cp -vpR  $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector*                     $out/jre/tools/chromeinspector/
+      cp -vpR  $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler*                    $out/jre/tools/profiler/
+      cp -vpR  $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/*         $out/jre/tools/truffle/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/dists/truffle-nfi.jar                    $out/jre/tools/truffle/builder/
+
+      echo "name=GraalVM ${version}"                                              > $out/jre/lib/amd64/server/vm.properties
+      echo -n "graal"                                                             > $out/jre/lib/jvmci/compiler-name
+      echo -n "../truffle/truffle-api.jar:../truffle/truffle-nfi.jar"             > $out/jre/lib/jvmci/parentClassLoader.classpath
+
+      install -v -m0555 -D substratevm/com.oracle.svm.driver.nativeimage            $out/jre/lib/svm/bin/native-image
+      ln -s                ../lib/svm/bin/native-image                              $out/jre/bin/native-image
+      ln -s                ../jre/bin/native-image                                  $out/bin/native-image
 
       # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
       substituteInPlace $out/jre/lib/security/java.security \
diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
index 9f0d0250c5d1f..49bbaf0e8df11 100644
--- a/pkgs/development/compilers/julia/0.6.nix
+++ b/pkgs/development/compilers/julia/0.6.nix
@@ -44,7 +44,7 @@ let
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
     sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
-  
+
   virtualenvVersion = "15.0.0";
   virtualenv = fetchurl {
     url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
@@ -53,7 +53,7 @@ let
 
   majorVersion = "0";
   minorVersion = "6";
-  maintenanceVersion = "2";
+  maintenanceVersion = "4";
   version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
 in
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0ym4n9vn6w8vj175mmsc2nzvdk2ij0cdrs44lkr3p0signji73b5";
+    sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
   };
   prePatch = ''
     mkdir deps/srccache
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_GMP=1"
       "USE_SYSTEM_LIBGIT2=1"
       "USE_SYSTEM_LIBUNWIND=1"
-      
+
       "USE_SYSTEM_LLVM=1"
       "LLVM_VER=3.9.1"
 
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 76f29eeaa0c0d..89c6151a186bd 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.41";
+  version = "1.2.51";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg";
+    sha256 = "0b7rlv4w3bqfxwp0sici8lraskavmx08qgf1jddjcgaxh0f72x4a";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 4e1a0ef6409a3..1bd4b88c72d48 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -16,7 +16,7 @@ let
   compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
   clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv isl version fetch; });
   in {
     llvm = callPackage ./llvm.nix {
@@ -41,9 +41,9 @@ let
     };
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
   in {
 
@@ -54,6 +54,6 @@ let
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index d2be57b1a5fab..2c79d7b3b1b56 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -11,7 +11,8 @@ in stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4";
 
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 05893704d8726..cc25a41b04009 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -13,7 +13,8 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libxml2 llvm python ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ libxml2 llvm python ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
@@ -27,6 +28,8 @@ let
     postPatch = ''
       sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp
     '';
 
     outputs = [ "out" "lib" "python" ];
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 6fa1a0cf2e267..28f908ee829f0 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -15,12 +15,11 @@ let
   compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
   clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv isl version fetch; });
  in {
     llvm = callPackage ./llvm.nix {
       inherit compiler-rt_src;
-      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
@@ -42,9 +41,9 @@ let
     };
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
   in {
 
@@ -55,6 +54,6 @@ let
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index cc3f5545146cf..5a0410302f2ff 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -17,15 +17,22 @@ stdenv.mkDerivation rec {
   patches = [
     # glibc 2.26 fix
     ../../3.9/libc++/xlocale-glibc-2.26.patch
-  ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
+  ]
+  ++ lib.optional stdenv.isDarwin ./darwin.patch
+  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    ../../libcxx-0001-musl-hacks.patch
+    ../../libcxx-max_align_t.patch
+  ];
+
+  nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ];
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
index 6b98a5726cf6d..8b25681c2dbf4 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
 
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
@@ -14,6 +15,9 @@ stdenv.mkDerivation {
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
   '';
 
   installPhase = if stdenv.isDarwin
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index 0f259977f702d..a6fb611981760 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -13,7 +13,6 @@
 , version
 , zlib
 , compiler-rt_src
-, libcxxabi
 , debugVersion ? false
 , enableSharedLibraries ? true
 }:
@@ -31,15 +30,18 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
-  buildInputs = [ perl groff cmake libxml2 python libffi ]
-    ++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
+  buildInputs = [ perl groff cmake libxml2 python libffi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
   # Fix a segfault in llc
   # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
-  patches = [ ./D17533-1.patch ] ++
-    stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch];
+  patches = [ ./D17533-1.patch ]
+   ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch
+   ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+     ../TLI-musl.patch
+     ../dynamiclibrary-musl.patch
+   ];
 
   # hacky fix: New LLVM releases require a newer macOS SDK than
   # 10.9. This is a temporary measure until nixpkgs darwin support is
@@ -51,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \
       --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
   ''
-  + stdenv.lib.optionalString (stdenv ? glibc) ''
+  + ''
     (
       cd projects/compiler-rt
       patch -p1 < ${
@@ -76,6 +78,10 @@ in stdenv.mkDerivation rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
+
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
+    "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
   ] ++ stdenv.lib.optional enableSharedLibraries [
     "-DLLVM_LINK_LLVM_DYLIB=ON"
   ] ++ stdenv.lib.optional (!isDarwin)
@@ -83,6 +89,11 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals ( isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    # Not yet supported
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
+
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index 1f6d80ab3be9b..f597c559dba66 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -29,6 +29,8 @@ let
     postPatch = ''
       sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp
     '';
 
     outputs = [ "out" "lib" "python" ];
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index c3bf0b48d649e..ea3ea36eb6d36 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -15,12 +15,11 @@ let
   compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
   clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv isl version fetch; });
   in {
     llvm = callPackage ./llvm.nix {
       inherit compiler-rt_src;
-      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
@@ -42,9 +41,9 @@ let
     };
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
   in {
 
@@ -55,6 +54,6 @@ let
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index 7e5c30bdfd359..bd2cc19d2e0bc 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -17,15 +17,21 @@ stdenv.mkDerivation rec {
   patches = [
     # glibc 2.26 fix
     ./xlocale-glibc-2.26.patch
-  ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
+  ]
+  ++ lib.optional stdenv.isDarwin ./darwin.patch
+  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    ../../libcxx-0001-musl-hacks.patch
+    ../../libcxx-max_align_t.patch
+  ];
 
-  buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   cmakeFlags = [
-      "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
-      "-DLIBCXX_LIBCPPABI_VERSION=2"
-      "-DLIBCXX_CXX_ABI=libcxxabi"
-    ];
+    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+    "-DLIBCXX_LIBCPPABI_VERSION=2"
+    "-DLIBCXX_CXX_ABI=libcxxabi"
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index 1ad2cb1029507..dffb207a32b68 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
 
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
@@ -14,6 +15,9 @@ stdenv.mkDerivation {
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
   '';
 
   installPhase = if stdenv.isDarwin
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index f80201167505f..458ad7db8efde 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -13,7 +13,6 @@
 , version
 , zlib
 , compiler-rt_src
-, libcxxabi
 , debugVersion ? false
 , enableSharedLibraries ? (buildPlatform == hostPlatform)
 , darwin
@@ -53,7 +52,7 @@ in stdenv.mkDerivation rec {
     groff
     libxml2
     libffi
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
+  ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -63,7 +62,10 @@ in stdenv.mkDerivation rec {
       url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch;
       sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl";
    })
-  ];
+   ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+     ../TLI-musl.patch
+     ../dynamiclibrary-musl.patch
+   ];
 
   postPatch = ""
   + ''
@@ -92,7 +94,7 @@ in stdenv.mkDerivation rec {
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
   ''
-  + stdenv.lib.optionalString (stdenv ? glibc) ''
+  + ''
     (
       cd projects/compiler-rt
       patch -p1 < ${
@@ -120,6 +122,10 @@ in stdenv.mkDerivation rec {
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
     "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
+    "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
   ] ++ stdenv.lib.optional enableSharedLibraries [
     "-DLLVM_LINK_LLVM_DYLIB=ON"
   ] ++ stdenv.lib.optional (!isDarwin)
@@ -130,6 +136,11 @@ in stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [
     "-DCMAKE_CROSSCOMPILING=True"
     "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen"
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    # Not yet supported
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
+
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index fecf65136bcd9..ae674d1fa8e8d 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -22,13 +22,12 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
     llvm = overrideManOutput (callPackage ./llvm.nix {
       inherit compiler-rt_src;
-      inherit (targetLlvmLibraries) libcxxabi;
     });
     clang-unwrapped = overrideManOutput (callPackage ./clang {
       inherit clang-tools-extra_src;
@@ -53,9 +52,9 @@ let
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -68,6 +67,6 @@ let
     libcxxabi = callPackage ./libc++abi.nix {};
 
     openmp = callPackage ./openmp.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 718abc420a971..6ce9c0d4792b4 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     ./xlocale-glibc-2.26.patch
   ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
-    ./max_align_t.patch
+    ../../libcxx-max_align_t.patch
   ];
 
   prePatch = ''
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 41eb40e124eb0..5eeec395b97ae 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     export TRIPLE=x86_64-apple-darwin
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
-    patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch}
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
   '';
 
   installPhase = if stdenv.isDarwin
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index bc8453f743ade..e9140d3fcc6aa 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -12,7 +12,6 @@
 , release_version
 , zlib
 , compiler-rt_src
-, libcxxabi
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
@@ -42,8 +41,7 @@ in stdenv.mkDerivation (rec {
   nativeBuildInputs = [ cmake python ]
     ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-  buildInputs = [ libxml2 libffi ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
+  buildInputs = [ libxml2 libffi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -85,7 +83,7 @@ in stdenv.mkDerivation (rec {
     patch -p0 < ${../aarch64.patch}
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
-    patch -p1 -i ${./dynamiclibrary-musl.patch}
+    patch -p1 -i ${../dynamiclibrary-musl.patch}
     patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
@@ -102,6 +100,10 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
     "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
+    "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
   ]
   ++ stdenv.lib.optional enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"
@@ -117,11 +119,6 @@ in stdenv.mkDerivation (rec {
   ++ stdenv.lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
-  ]
-  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
-    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
-    "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 8027733bc5277..07738048f8e25 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -30,10 +30,7 @@ let
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ]
-    # Maybe with compiler-rt this won't be needed?
-    ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}"
-    ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
+    ];
 
     patches = [ ./purity.patch ];
 
@@ -50,13 +47,12 @@ let
 
     outputs = [ "out" "lib" "python" ];
 
+    # Clang expects to find LLVMgold in its own prefix
     postInstall = ''
-      # Clang expects to find LLVMgold in its own prefix
       if [ -e ${llvm}/lib/LLVMgold.so ]; then
         ln -sv ${llvm}/lib/LLVMgold.so $out/lib
       fi
-      # Clang expects to find sanitizer libraries in its own prefix
-      ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
+
       ln -sv $out/bin/clang $out/bin/cpp
 
       # Move libclang to 'lib' output
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
new file mode 100644
index 0000000000000..19833e4d3d4ab
--- /dev/null
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -0,0 +1,37 @@
+{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "compiler-rt-${version}";
+  inherit version;
+  src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
+
+  nativeBuildInputs = [ cmake python llvm ];
+  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+  configureFlags = [
+    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  patches = [
+    ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+  ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+  '';
+
+  # Hack around weird upsream RPATH bug
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index feeadf1f13064..ef2e1c29088fd 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -14,7 +14,6 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
   clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
 
   # Add man output without introducing extra dependencies.
@@ -22,14 +21,21 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    mkExtraBuildCommands = cc: ''
+      rsrc="$out/resource-root"
+      mkdir "$rsrc"
+      ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+      echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+    '';
   in {
 
-    llvm = overrideManOutput (callPackage ./llvm.nix {
-      inherit compiler-rt_src;
-      inherit (targetLlvmLibraries) libcxxabi;
-    });
+    llvm = overrideManOutput (callPackage ./llvm.nix { });
+
     clang-unwrapped = overrideManOutput (callPackage ./clang {
       inherit clang-tools-extra_src;
     });
@@ -40,25 +46,36 @@ let
 
     clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
-    libstdcxxClang = wrapCCWith {
+    libstdcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ libstdcxxHook ];
+      extraPackages = [
+        libstdcxxHook
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
     };
 
-    libcxxClang = wrapCCWith {
+    libcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
     };
 
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
+    compiler-rt = callPackage ./compiler-rt.nix {};
+
     stdenv = overrideCC stdenv buildLlvmTools.clang;
 
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
@@ -68,6 +85,6 @@ let
     libcxxabi = callPackage ./libc++abi.nix {};
 
     openmp = callPackage ./openmp.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 66985861e386b..8809859b59055 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -11,7 +11,6 @@
 , version
 , release_version
 , zlib
-, compiler-rt_src
 , libcxxabi
 , debugVersion ? false
 , enableManpages ? false
@@ -32,8 +31,6 @@ in stdenv.mkDerivation (rec {
     unpackFile ${src}
     mv llvm-${version}* llvm
     sourceRoot=$PWD/llvm
-    unpackFile ${compiler-rt_src}
-    mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
   outputs = [ "out" "python" ]
@@ -43,19 +40,12 @@ in stdenv.mkDerivation (rec {
     ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
   buildInputs = [ libxml2 libffi ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
+    # TODO(@Ericson2314): Remove next mass rebuild
+    ++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
-  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
-  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
-  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
-  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
-  # a flag and turn the flag off during the stdenv build.
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \
-      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-
     substituteInPlace cmake/modules/AddLLVM.cmake \
       --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \
       --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
@@ -69,9 +59,6 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "Path.cpp" ""
     rm unittests/Support/Path.cpp
-
-    # Revert compiler-rt commit that makes codesign mandatory
-    patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
   '' + stdenv.lib.optionalString stdenv.isAarch64 ''
     patch -p0 < ${../aarch64.patch}
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
@@ -79,7 +66,6 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
-    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -94,7 +80,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
-    "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
   ]
   ++ stdenv.lib.optional enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index 333818f7dbdef..88bccca364764 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, fetch, cmake, python, llvm }:
+{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "compiler-rt-${version}";
@@ -6,12 +6,13 @@ stdenv.mkDerivation rec {
   src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h";
 
   nativeBuildInputs = [ cmake python llvm ];
+  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 
   configureFlags = [
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
   ];
 
-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];
 
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
@@ -27,5 +28,10 @@ stdenv.mkDerivation rec {
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
   '';
 
+  # Hack around weird upsream RPATH bug
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '';
+
   enableParallelBuilding = true;
 }
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 17c743c040823..40d602e222ed4 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -21,13 +21,21 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  tools = let
+  tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    mkExtraBuildCommands = cc: ''
+      rsrc="$out/resource-root"
+      mkdir "$rsrc"
+      ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+      echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+    '';
   in {
 
-    llvm = overrideManOutput (callPackage ./llvm.nix {
-      inherit (targetLlvmLibraries) libcxxabi;
-    });
+    llvm = overrideManOutput (callPackage ./llvm.nix { });
+
     clang-unwrapped = overrideManOutput (callPackage ./clang {
       inherit clang-tools-extra_src;
     });
@@ -40,16 +48,11 @@ let
 
     libstdcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ libstdcxxHook targetLlvmLibraries.compiler-rt ];
-      extraBuildCommands = ''
-        rsrc="$out/resource-root"
-        mkdir "$rsrc"
-        ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
-        ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
-        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
-        echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
-      '';
+      extraPackages = [
+        libstdcxxHook
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
     };
 
     libcxxClang = wrapCCWith rec {
@@ -59,23 +62,15 @@ let
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
       ];
-      extraBuildCommands = ''
-        rsrc="$out/resource-root"
-        mkdir "$rsrc"
-        ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
-        ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
-        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-      '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
-        echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
-      '';
+      extraBuildCommands = mkExtraBuildCommands cc;
     };
 
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
-  };
+  });
 
-  libraries = let
+  libraries = stdenv.lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
@@ -90,6 +85,6 @@ let
     libcxxabi = callPackage ./libc++abi.nix {};
 
     openmp = callPackage ./openmp.nix {};
-  };
+  });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 8877ccd116211..9cae65ef10302 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -11,7 +11,6 @@
 , version
 , release_version
 , zlib
-, libcxxabi
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
@@ -40,8 +39,7 @@ in stdenv.mkDerivation (rec {
   nativeBuildInputs = [ cmake python ]
     ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-  buildInputs = [ libxml2 libffi ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
+  buildInputs = [ libxml2 libffi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
 
diff --git a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch
index d5d7f07b5e113..d5d7f07b5e113 100644
--- a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch
+++ b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch
diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch
index 060be5b23de82..060be5b23de82 100644
--- a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch
+++ b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index c2352b8126e01..048dd598a4807 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "14.01.1";
 
   src = fetchurl {
-    url    = "http://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
+    url    = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
     sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq";
   };
 
diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr
index 017ebe62b4959..9b84b20d03a3a 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/pkgs/development/compilers/mint/crystal2nix.cr
@@ -5,16 +5,23 @@ class PrefetchJSON
   JSON.mapping(sha256: String)
 end
 
+class ShardLock
+  YAML.mapping(
+    version: String,
+    shards: Hash(String, Hash(String, String))
+  )
+end
+
 File.open "shards.nix", "w+" do |file|
   file.puts %({)
-  yaml = YAML.parse(File.read("shard.lock"))
-  yaml["shards"].each do |key, value|
-    owner, repo = value["github"].as_s.split("/")
+  yaml = ShardLock.from_yaml(File.read("shard.lock"))
+  yaml.shards.each do |key, value|
+    owner, repo = value["github"].split("/")
     url = "https://github.com/#{value["github"]}"
     rev = if value["version"]?
             "v#{value["version"]}"
           else
-            value["commit"].as_s
+            value["commit"]
           end
 
     sha256 = ""
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 08a55dc609f62..0e558e766f77b 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -28,21 +28,19 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "0.0.3";
+  version = "0.1.0";
   name = "mint-${version}";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = "0.0.3";
-    sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0";
+    rev = "0.1.0";
+    sha256 = "0n9lnkm2k8lv3wcw0jc7bcpgvcjyp3a8cywn0w7ipb22q8cl0n96";
   };
 
   buildInputs = [ crystal zlib openssl duktape ];
 
   buildPhase = ''
-    mkdir -p $out/bin
-
-    mkdir tmp
+    mkdir -p $out/bin tmp
     cd tmp
     ln -s ${crystalLib} lib
     cp -r $src/* .
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index dcf7454b4ca88..7810eb5ff09ee 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -8,26 +8,26 @@
   ameba = {
     owner = "veelenga";
     repo = "ameba";
-    rev = "v0.6.0";
-    sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b";
+    rev = "v0.7.0";
+    sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17";
   };
   baked_file_system = {
     owner = "schovi";
     repo = "baked_file_system";
-    rev = "v0.9.6";
-    sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx";
+    rev = "e1447549d5ac0560720fae62179b2f2c62c9bfd1";
+    sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z";
   };
   duktape = {
     owner = "jessedoyle";
     repo = "duktape.cr";
-    rev = "v0.13.0";
-    sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w";
+    rev = "v0.14.1";
+    sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1";
   };
   kemal = {
     owner = "kemalcr";
     repo = "kemal";
-    rev = "v0.22.0";
-    sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10";
+    rev = "a5870e7d24e5ec75c956bcf3e4423f55a2c4ff78";
+    sha256 = "1f2bm4xmfg6zqs3a8744pbk1vx964flf17g1mj01yslfcnzxywal";
   };
   kilt = {
     owner = "jeromegn";
@@ -50,8 +50,8 @@
   time_format = {
     owner = "vladfaust";
     repo = "time_format.cr";
-    rev = "v0.1.0";
-    sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g";
+    rev = "v0.1.1";
+    sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v";
   };
   tree_template = {
     owner = "anykeyh";
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix
index 929d00491382f..c8afd0dcc9065 100644
--- a/pkgs/development/compilers/mono/generic-cmake.nix
+++ b/pkgs/development/compilers/mono/generic-cmake.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     inherit sha256;
-    url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
   };
 
   buildInputs =
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index a62f2f24dd871..e39de76117af4 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     inherit sha256;
-    url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
   };
 
   buildInputs =
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 89dd7dc3fdc50..a0daa7df1737d 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.13.03";
 
   src = fetchurl {
-    url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
+    url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
     sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nasm.us/;
+    homepage = https://www.nasm.us/;
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";
     platforms = platforms.unix;
     maintainers = with maintainers; [ pSub willibutz ];
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 42a585ff51f07..e2aa5736c7a3a 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A high-level dynamically typed programming language";
-    homepage = http://nekovm.org;
+    homepage = https://nekovm.org;
     license = licenses.lgpl21;
     maintainers = [ maintainers.marcweber ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index de383410b9c6f..a4b706d35aa52 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
   };
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index ab71090b35802..9eec23f1ba88f 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
+        url = "https://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
         sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878";
       }
     else if stdenv.system == "i686-linux" then
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index ca21612776f0b..99a65dec1501f 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation (rec {
   version = "3.10.0";
 
   src = fetchurl {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
     sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index df62cd3656b4f..e65510c172e6d 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "3.11.2";
   
   src = fetchurl {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
     sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
   };
 
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index 8cfe2bb7bcfef..8636f670059c5 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "3.12.1";
   
   src = fetchurl {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
     sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
   };
 
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 8bad5494e8b96..0a30ef1352c45 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "4.00.1";
   
   src = fetchurl {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
     sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
   };
 
diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix
index b39d57cc092bc..5a3e75e648d90 100644
--- a/pkgs/development/compilers/ocaml/4.07.nix
+++ b/pkgs/development/compilers/ocaml/4.07.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "07";
-  patch_version = "0+beta2";
-  sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n";
+  patch_version = "0+rc1";
+  sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8";
 
   # If the executable is stripped it does not work
   dontStrip = true;
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
index 81c8cd534025a..16d7e2580b38e 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "104";
 
   src = fetchurl {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz";
+    url = "https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz";
     sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb";
   };
 
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index d3f654749b040..1abf44f23495c 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://opendylan.org;
+    homepage = https://opendylan.org;
     description = "A multi-paradigm functional and object-oriented programming language";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix
index 95f4dc5b215f1..d00080282d7c7 100644
--- a/pkgs/development/compilers/opendylan/default.nix
+++ b/pkgs/development/compilers/opendylan/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";
 
   meta = {
-    homepage = http://opendylan.org;
+    homepage = https://opendylan.org;
     description = "A multi-paradigm functional and object-oriented programming language";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
index 7882fa49b07e8..2c76d59512b67 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
 , libjpeg, giflib
 , setJavaClassPath
 , minimal ? false
@@ -36,7 +36,7 @@ let
     buildInputs = [
       cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
-      libXi libXinerama libXcursor lndir fontconfig
+      libXi libXinerama libXcursor libXrandr lndir fontconfig
     ] ++ lib.optionals (!minimal && enableGnome2) [
       gtk3 gnome_vfs GConf glib
     ];
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 9db5e8ba23c92..57771e383279b 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
 , libjpeg, giflib
 , setJavaClassPath
 , minimal ? false
@@ -70,7 +70,7 @@ let
     buildInputs = [
       cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
-      libXi libXinerama libXcursor lndir fontconfig
+      libXi libXinerama libXcursor libXrandr lndir fontconfig
     ] ++ lib.optionals (!minimal && enableGnome2) [
       gtk2 gnome_vfs GConf glib
     ];
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
index b5abc1d794db4..6203064f5c068 100644
--- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
@@ -8,12 +8,22 @@
       *    jssecacerts
       *    cacerts
       */
-@@ -144,6 +145,9 @@
+@@ -132,7 +133,8 @@
+                 public TrustStoreDescriptor run() {
+                     // Get the system properties for trust store.
+                     String storePropName = System.getProperty(
+-                            "javax.net.ssl.trustStore", jsseDefaultStore);
++                            "javax.net.ssl.trustStore",
++                            System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));
+                     String storePropType = System.getProperty(
+                             "javax.net.ssl.trustStoreType",
+                             KeyStore.getDefaultType());
+@@ -144,6 +146,9 @@
                      String temporaryName = "";
                      File temporaryFile = null;
                      long temporaryTime = 0L;
-+                    if (storePropName == null){
-+                        storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
++                    if (storePropName == null) {
++                        storePropName = jsseDefaultStore;
 +                    }
                      if (!"NONE".equals(storePropName)) {
                          String[] fileNames =
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
new file mode 100644
index 0000000000000..65d8110646f8a
--- /dev/null
+++ b/pkgs/development/compilers/osl/default.nix
@@ -0,0 +1,39 @@
+{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
+openimageio, llvm, boost165, flex, bison, partio, pugixml,
+utillinux, python
+}:
+
+let boost_static = boost165.override { enableStatic = true; };
+in clangStdenv.mkDerivation rec {
+  # In theory this could use GCC + Clang rather than just Clang,
+  # but https://github.com/NixOS/nixpkgs/issues/29877 stops this
+  name = "openshadinglanguage-${version}";
+  version = "1.9.9";
+
+  src = fetchFromGitHub {
+    owner = "imageworks";
+    repo = "OpenShadingLanguage";
+    rev = "Release-1.9.9";
+    sha256 = "1w6wbz013nirzsiw11c9dpdkcwlfncs5va8q583pdw0q2pfkj5dn";
+  };
+
+  cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
+  enableParallelBuilding = true;
+
+  preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash '';
+  
+  buildInputs = [
+     cmake zlib openexr openimageio llvm
+     boost_static flex bison partio pugixml
+     utillinux # needed just for hexdump
+     python # CMake doesn't check this?
+  ];
+  # TODO: How important is partio? CMake doesn't seem to find it
+  meta = with stdenv.lib; {
+    description = "Advanced shading language for production GI renderers";
+    homepage = http://opensource.imageworks.com/?p=osl;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index d7590146e2ad6..94b89cf3a952a 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -5,7 +5,7 @@ let
   fname = "pakcs-1.14.0";
 
   fsrc = fetchurl {
-    url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
+    url = "https://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
     sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s";
   };
 
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 8b5d14e7f5fbc..7f22f4de62444 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
     '';
-    homepage = http://www.polyml.org/;
+    homepage = https://www.polyml.org/;
     license = stdenv.lib.licenses.lgpl21;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = [ #Add your name here!
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index de5b850552730..b7feed84c37fd 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
     '';
-    homepage = http://www.polyml.org/;
+    homepage = https://www.polyml.org/;
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
     maintainers = with maintainers; [ z77z yurrriq ];
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 061b9b8639d20..36dc8b6f1471a 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.22.6";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "05y0qcfdyzv6cgizhbg6yl7rrlbfbkcr0jmxjlzhvhz7dypk20cl";
+    sha256 = "1yq82jj0c9nxrx4vxcb3s6yr154kaj2a3wrk12m6fm3dscsqsqq1";
   };
 
   buildInputs = [ llvm makeWrapper which ];
@@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec {
 
   meta = with stdenv.lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
-    homepage = http://www.ponylang.org;
+    homepage = https://www.ponylang.org;
     license = licenses.bsd2;
     maintainers = with maintainers; [ doublec kamilchm patternspandemic ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch
index d15561721e22c..f8c996137af94 100644
--- a/pkgs/development/compilers/ponyc/disable-tests.patch
+++ b/pkgs/development/compilers/ponyc/disable-tests.patch
@@ -12,16 +12,3 @@ index baf29e7..b63f368 100644
      test(_TestTCPWritev)
      test(_TestTCPExpect)
      test(_TestTCPMute)
-diff --git a/packages/net/http/_test.pony b/packages/net/http/_test.pony
-index e55d5a7..40a4cb6 100644
---- a/packages/net/http/_test.pony
-+++ b/packages/net/http/_test.pony
-@@ -29,8 +29,6 @@ actor Main is TestList
-     test(_Valid)
-     test(_ToStringFun)
- 
--    test(_HTTPConnTest)
--
- class iso _Encode is UnitTest
-   fun name(): String => "net/http/URLEncode.encode"
- 
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index ce4d44774f69c..f27147d9743aa 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pony-stable-${version}";
-  version = "0.1.2";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "pony-stable";
     rev = version;
-    sha256 = "1g0508r66qjx857cb1cycq98b0gw7s1zn1l7bplyj1psk8mqh7kz";
+    sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx";
   };
 
   buildInputs = [ ponyc ];
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 849917c4a0c47..4c3c5d008f061 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -70,7 +70,7 @@ rec {
       # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
       # (or similar) here. It causes strange effects where rustc loads
       # the wrong libraries in a bootstrap-build causing failures that
-      # are very hard to track dow. For details, see
+      # are very hard to track down. For details, see
       # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
     '';
   };
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 9d67dd8f8564b..563250097ae15 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.26.1";
+  version = "1.26.2";
 
   # fetch hashes by running `print-hashes.sh 1.24.1`
   hashes = {
-    i686-unknown-linux-gnu = "d704ba5cbaaf93c5e2112d211630db0e460d5dc819a43464ba91581e5c821df3";
-    x86_64-unknown-linux-gnu = "b7e964bace1286696d511c287b945f3ece476ba77a231f0c31f1867dfa5080e0";
-    armv7-unknown-linux-gnueabihf = "34fbcebc8e60b6496f1ce7998cf0b50cd618770f039da529b65110fff1f25fa0";
-    aarch64-unknown-linux-gnu = "d4a369053c2dfd5f457de6853557dab563944579fa4bb55bc919bacf259bff6d";
-    i686-apple-darwin = "047c31a872161ebb1d21ef616f7658190403769a8734f84364a3cf15838b4708";
-    x86_64-apple-darwin = "ebf898b9fa7e2aafc53682a41f18af5ca6660ebe82dd78f28cd9799fe4dc189a";
+    i686-unknown-linux-gnu = "e22286190a074bfb6d47c9fde236d712a53675af1563ba85ea33e0d40165f755";
+    x86_64-unknown-linux-gnu = "d2b4fb0c544874a73c463993bde122f031c34897bb1eeb653d2ba2b336db83e6";
+    armv7-unknown-linux-gnueabihf = "1140387a61083e3ef10e7a097269200fc7e9db6f6cc9f270e04319b3b429c655";
+    aarch64-unknown-linux-gnu = "3dfad0dc9c795f7ee54c2099c9b7edf06b942adbbf02e9ed9e5d4b5e3f1f3759";
+    i686-apple-darwin = "3a5de30f3e334a66bd320ec0e954961d348434da39a826284e00d55ea60f8370";
+    x86_64-apple-darwin = "f193705d4c0572a358670dbacbf0ffadcd04b3989728b442f4680fa1e065fa72";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 44b43a7af5427..d368c977f8f85 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,11 +6,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.26.2";
-  cargoVersion = "1.26.2";
+  version = "1.27.0";
+  cargoVersion = "1.27.0";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv";
+    sha256 = "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c";
   };
 in rec {
   rustc = callPackage ./rustc.nix {
@@ -18,7 +18,10 @@ in rec {
 
     patches = [
       ./patches/net-tcp-disable-tests.patch
-      ./patches/stdsimd-disable-doctest.patch
+
+      # Re-evaluate if this we need to disable this one
+      #./patches/stdsimd-disable-doctest.patch
+
       # Fails on hydra - not locally; the exact reason is unknown.
       # Comments in the test suggest that some non-reproducible environment
       # variables such $RANDOM can make it fail.
@@ -33,7 +36,10 @@ in rec {
     # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
     # So we do the same.
     # 2. Tests run out of memory for i686
-    doCheck = !stdenv.isAarch64 && !stdenv.isi686;
+    #doCheck = !stdenv.isAarch64 && !stdenv.isi686;
+
+    # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598.
+    doCheck = false;
   };
 
   cargo = callPackage ./cargo.nix rec {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index d3dcc8e2f6c99..b0dae9d2042aa 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
                 ++ optional (targets != []) "--target=${target}"
                 ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
 
-  # The boostrap.py will generated a Makefile that then executes the build.
+  # The bootstrap.py will generated a Makefile that then executes the build.
   # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
   # to the bootstrap builder.
   postConfigure = ''
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index bac36d61068d5..16e0389ad0311 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "scala-2.10.7";
 
   src = fetchurl {
-    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
+    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
     sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       Code sizes are typically reduced by a factor of two to three when
       compared to an equivalent Java application.
     '';
-    homepage = http://www.scala-lang.org/;
+    homepage = https://www.scala-lang.org/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
     branch = "2.10";
diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
index 1145ebab52451..a1f803b67193f 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "scala-2.11.12";
 
   src = fetchurl {
-    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
+    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
     sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       Code sizes are typically reduced by a factor of two to three when
       compared to an equivalent Java application.
     '';
-    homepage = http://www.scala-lang.org/;
+    homepage = https://www.scala-lang.org/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
     branch = "2.11";
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index a25d4f6e65446..8a20066becb7f 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "scala-2.12.6";
 
   src = fetchurl {
-    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
+    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
     sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs";
   };
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       Code sizes are typically reduced by a factor of two to three when
       compared to an equivalent Java application.
     '';
-    homepage = http://www.scala-lang.org/;
+    homepage = https://www.scala-lang.org/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix
new file mode 100644
index 0000000000000..a6abe6791d7ed
--- /dev/null
+++ b/pkgs/development/compilers/seexpr/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
+bison, flex, libGLU, pythonPackages
+}:
+
+stdenv.mkDerivation rec {
+  name = "seexpr-${version}";
+  version = "2.11";
+  src = fetchFromGitHub {
+    owner  = "wdas";
+    repo   = "SeExpr";
+    rev    = "v2.11";
+    sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4";
+  };
+
+  buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
+  meta = with stdenv.lib; {
+    description = "Embeddable expression evaluation engine from Disney Animation";
+    homepage = https://www.disneyanimation.com/technology/seexpr.html;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 9df7186949135..1176d348d9d31 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -1,32 +1,52 @@
-{ stdenv, fetchFromGitHub, cmake, glslang, spirv-tools, python }:
+{ stdenv, fetchFromGitHub, cmake, python }:
+# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use
+# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from
+# https://github.com/google/shaderc/blob/known-good/known_good.json
 
-stdenv.mkDerivation rec {
+# Future work: extract and fetch all revisions automatically based on a revision of shaderc's known-good branch.
+let
+  glslang = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "glslang";
+    rev = "32d3ec319909fcad0b2b308fe1635198773e8316";
+    sha256 = "1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj";
+  };
+  spirv-tools = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Tools";
+    rev = "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c";
+    sha256 = "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x";
+  };
+  spirv-headers = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "SPIRV-Headers";
+    rev = "3ce3e49d73b8abbf2ffe33f829f941fb2a40f552";
+    sha256 = "0yk4bzqifdqpmdxkhvrxbdqhf5ngkga0ig1yyz7khr7rklqfz7wp";
+  };
+in stdenv.mkDerivation rec {
   name = "shaderc-git-${version}";
-  version = "2016-09-08";
+  version = "2018-06-01";
 
-  # `vulkan-loader` requires a specific version of `glslang` as specified in
-  # `<vulkan-loader-repo>/glslang_revision`.
   src = fetchFromGitHub {
     owner = "google";
     repo = "shaderc";
-    rev = "e17bb8ba3b8b0b9142b788d988612a40541c54ce";
-    sha256 = "17qfjqkz6j355qi130kixaz51svl09k9b5sfikksgnbmzglzcwki";
+    rev = "be8e0879750303a1de09385465d6b20ecb8b380d";
+    sha256 = "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd";
   };
 
   patchPhase = ''
-    cp -r ${spirv-tools.src} third_party/spirv-tools
-    chmod -R +w third_party/spirv-tools
-    ln -s ${spirv-tools.headers} third_party/spirv-tools/external/spirv-headers
+    cp -r --no-preserve=mode ${glslang} third_party/glslang
+    cp -r --no-preserve=mode ${spirv-tools} third_party/spirv-tools
+    ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers
   '';
 
-  buildInputs = [ cmake glslang python ];
+  buildInputs = [ cmake python ];
   enableParallelBuilding = true;
 
-  cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" "-DSHADERC_GLSLANG_DIR=${glslang.src}" ];
+  cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A collection of tools, libraries and tests for shader compilation.";
-    broken = true;
   };
 }
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 75daad36f7622..9b4816bb282ee 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
   '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
     sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
 \  \*x86-darwin\*)\
-\    INCLFILE=${apple_sdk.sdk}/include/unistd.h\
+\    INCLFILE=${stdenv.lib.getDev apple_sdk.sdk}/include/unistd.h\
 \    ;;\
 \  \*) ;;
 ' base/runtime/config/gen-posix-names.sh
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index d94ce75e3f551..edb7fc61d2a32 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
 
 let
-  version = "0.4.23";
-  rev = "124ca40dc525a987a88176c6e5170978e82fa290";
-  sha256 = "07l8rfqh95yrdmbxc4pfb77s06k5v65dk3rgdqscqmwchkndrmm0";
-  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
+  version = "0.4.24";
+  rev = "e67f0147998a9e3835ed3ce8bf6a0a0c634216c5";
+  sha256 = "1gy2miv6ia1z98zy6w4y03balwfr964bnvwzyg8v7pn2mayqnaap";
+  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
-    sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
+    sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
   };
 in
-
 stdenv.mkDerivation {
   name = "solc-${version}";
 
@@ -21,7 +20,6 @@ stdenv.mkDerivation {
   };
 
   patches = [
-    ./patches/boost-shared-libs.patch
     ./patches/shared-libs-install.patch
   ];
 
@@ -30,17 +28,23 @@ stdenv.mkDerivation {
     echo >commit_hash.txt "${rev}"
     substituteInPlace cmake/jsoncpp.cmake \
       --replace "${jsoncppURL}" ${jsoncpp}
-    substituteInPlace cmake/EthCompilerSettings.cmake \
-      --replace "add_compile_options(-Werror)" ""
+
+    # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
+    substituteInPlace cmake/jsoncpp.cmake \
+      --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
+      --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
   '';
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
     "-DBUILD_SHARED_LIBS=ON"
     "-DINSTALL_LLLC=ON"
-    "-DTESTS=OFF"
   ];
 
+  doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
+  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
+               "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost z3 ];
 
diff --git a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch
deleted file mode 100644
index 499fc46c6caf9..0000000000000
--- a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
-index 97b01c83..0bdec4b4 100644
---- a/libsolidity/CMakeLists.txt
-+++ b/libsolidity/CMakeLists.txt
-@@ -28,7 +28,7 @@ else()
- endif()
- 
- add_library(solidity ${sources} ${headers})
--target_link_libraries(solidity PUBLIC evmasm devcore)
-+target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
- 
- if (${Z3_FOUND})
-   target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
-diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
-index 5c480093..d6538ee2 100644
---- a/lllc/CMakeLists.txt
-+++ b/lllc/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_executable(lllc main.cpp)
--target_link_libraries(lllc PRIVATE lll)
-+target_link_libraries(lllc PRIVATE lll ${Boost_SYSTEM_LIBRARY})
- 
- if (INSTALL_LLLC)
- 	include(GNUInstallDirs)
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 732797e5ae7dd..70162bfbcb6a1 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -1,11 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ac56b43..dacf3853 100644
+index 0c05208f..8893648e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -48,6 +48,19 @@ add_subdirectory(libevmasm)
+@@ -48,6 +48,20 @@ add_subdirectory(libevmasm)
  add_subdirectory(libsolidity)
  add_subdirectory(libsolc)
  
++
 +install(DIRECTORY libdevcore/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
 +        FILES_MATCHING PATTERN "*.h")
@@ -38,7 +39,7 @@ index 86192c1b..e7f15e93 100644
 @@ -3,3 +3,4 @@ file(GLOB headers "*.h")
  
  add_library(evmasm ${sources} ${headers})
- target_link_libraries(evmasm PUBLIC jsoncpp devcore)
+ target_link_libraries(evmasm PUBLIC devcore)
 +install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
 index 4cdc073a..b61f03c7 100644
@@ -50,11 +51,10 @@ index 4cdc073a..b61f03c7 100644
  target_link_libraries(lll PUBLIC evmasm devcore)
 +install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
-index 97b01c83..e876177e 100644
+index 0bdec4b4..e876177e 100644
 --- a/libsolidity/CMakeLists.txt
 +++ b/libsolidity/CMakeLists.txt
-@@ -28,7 +28,8 @@ else()
- endif()
+@@ -29,6 +29,7 @@ endif()
  
  add_library(solidity ${sources} ${headers})
  target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix
deleted file mode 100644
index 341833fdf4724..0000000000000
--- a/pkgs/development/compilers/vs90wrapper/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv}:
-
-stdenv.mkDerivation {
-  name = "visual-studio-9.0";
-  buildCommand = ''
-    mkdir -p $out/bin
-    ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe
-  '';
-}
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix
new file mode 100644
index 0000000000000..8cb1e8e5f2cda
--- /dev/null
+++ b/pkgs/development/compilers/wcc/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
+
+stdenv.mkDerivation rec {
+  name = "wcc-unstable-${version}";
+  version = "2018-04-05";
+
+  src = fetchFromGitHub {
+    owner = "endrazine";
+    repo = "wcc";
+    rev = "f141963ff193d7e1931d41acde36d20d7221e74f";
+    sha256 = "1f0w869x0176n5nsq7m70r344gv5qvfmk7b58syc0jls8ghmjvb4";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ capstone libbfd libelf libiberty readline ];
+
+  postPatch = ''
+    sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \
+      -e "s#/usr/share/wcc#$out/share/wcc#"
+  '';
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  preInstall = ''
+    mkdir -p $out/usr/bin
+  '';
+
+  postInstall = ''
+    mv $out/usr/* $out
+    rmdir $out/usr
+    mkdir -p $out/share/man/man1
+    cp doc/manpages/*.1 $out/share/man/man1/
+  '';
+
+  preFixup = ''
+    # Let patchShebangs rewrite shebangs with wsh.
+    PATH+=:$out/bin
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/endrazine/wcc;
+    description = "Witchcraft compiler collection: tools to convert and script ELF files";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index d93da8cb99657..7c6b545285cc7 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "yap-${version}";
 
   src = fetchurl {
-    url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
+    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
     sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
   };
 
diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix
index 738b63fe1ad76..5aea623b91d4f 100644
--- a/pkgs/development/compilers/yasm/default.nix
+++ b/pkgs/development/compilers/yasm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "yasm-1.3.0";
 
   src = fetchurl {
-    url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz";
+    url = "https://www.tortall.net/projects/yasm/releases/${name}.tar.gz";
     sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix";
   };
 
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 1867d9605661a..fa17d37b4bd37 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, coq }:
 
-let param =
-  {
+let
+  params = {
     "8.6" = {
       version = "1.0";
       rev = "v1.0";
@@ -14,8 +14,14 @@ let param =
       sha256 = "1bavg4zl1xn0jqrdq8iw7xqzdvdf39ligj9saz5m9c507zri952h";
     };
 
-  }."${coq.coq-version}"
-; in
+    "8.8" = {
+      version = "1.0";
+      rev = "v1.0-8.8";
+      sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn";
+    };
+  };
+  param = params."${coq.coq-version}";
+in
 
 stdenv.mkDerivation rec {
 
@@ -43,7 +49,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
 
 }
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 77c2687e2911e..bd047da4c9192 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -176,15 +176,6 @@ go.stdenv.mkDerivation (
   installPhase = args.installPhase or ''
     runHook preInstall
 
-    mkdir -p $out
-    pushd "$NIX_BUILD_TOP/go"
-    while read f; do
-      echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
-      mkdir -p "$(dirname "$out/share/go/$f")"
-      cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
-    done < <(find . -type f)
-    popd
-
     mkdir -p $bin
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $bin
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix
new file mode 100644
index 0000000000000..010c523507fd9
--- /dev/null
+++ b/pkgs/development/guile-modules/guile-reader/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, fetchpatch, pkgconfig
+, gperf, guile, guile-lib, libffi }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "guile-reader-${version}";
+  version = "0.6.2";
+
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz";
+    sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx";
+  };
+
+  patches = [
+    (fetchpatch {
+       name = "0001-fix-prototypes.patch";
+       url = https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31;
+       sha256 = "01ar34xgpxyli8v2bk4kj6876kyrxhxhfpv9v07lx36d254bzrjb";
+     }) ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gperf guile guile-lib libffi ];
+
+  GUILE_SITE="${guile-lib}/share/guile/site";
+
+  configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ];
+
+  meta = with stdenv.lib; {
+    description = "A simple framework for building readers for GNU Guile";
+    longDescription = ''
+       Guile-Reader is a simple framework for building readers for GNU
+       Guile.
+
+       The idea is to make it easy to build procedures that extend
+       Guile's read procedure. Readers supporting various syntax
+       variants can easily be written, possibly by re-using existing
+       "token readers" of a standard Scheme readers. For example, it
+       is used to implement Skribilo's R5RS-derived document syntax.
+    '';
+    homepage = https://www.gnu.org/software/guile-reader;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.gnu;
+  };
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ad07da83c4e3f..c7e7cd4f4c3ff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -61,6 +61,10 @@ self: super: {
   statistics = dontCheck super.statistics;
   vector-builder = dontCheck super.vector-builder;
 
+  # These packages (and their reverse deps) cannot be built with profiling enabled.
+  ghc-heap-view = disableLibraryProfiling super.ghc-heap-view;
+  ghc-datasize = disableLibraryProfiling super.ghc-datasize;
+
   # This test keeps being aborted because it runs too quietly for too long
   Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
 
@@ -77,35 +81,26 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = ((overrideCabal super.git-annex (drv: {
+  git-annex = (overrideSrc super.git-annex {
     src = pkgs.fetchgit {
-      name = "git-annex-${drv.version}-src";
+      name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
-      rev = "refs/tags/" + drv.version;
-      sha256 = "0cz044zjp067xjx0dw1yg3n7vnrkn1j3rvnk9i3jf1aqfvm1szwy";
+      rev = "refs/tags/" + super.git-annex.version;
+      sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb";
     };
-  })).overrideScope (self: super: {
-    aws = dontCheck (self.aws_0_18);
-    conduit = self.conduit_1_2_13_1;
-    conduit-extra = self.conduit-extra_1_2_3_2;
-    cryptonite-conduit = dontCheck super.cryptonite-conduit;  # test suite does not compile with old versions used here
-    html-conduit = self.html-conduit_1_2_1_2;
-    http-conduit = self.http-conduit_2_2_4;
-    persistent = self.persistent_2_7_3_1;
-    persistent-sqlite = self.persistent-sqlite_2_6_4;
-    resourcet = self.resourcet_1_1_11;
-    xml-conduit = self.xml-conduit_1_7_1_2;
-    yesod = self.yesod_1_4_5;
-    yesod-core = self.yesod-core_1_4_37_3;
-    yesod-form = self.yesod-form_1_4_16;
-    yesod-persistent = self.yesod-persistent_1_4_3;
-    yesod-static = self.yesod-static_1_5_3_1;
-    yesod-test = self.yesod-test_1_5_9_1;
-  })).override {
+  }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
+  esqueleto = overrideSrc (addBuildDepend (dontCheck (dontHaddock super.esqueleto)) self.unliftio) {
+    src = pkgs.fetchFromGitHub {
+      owner = "bitemyapp";
+      repo = "esqueleto";
+      rev = "b81e0d951e510ebffca03c5a58658ad884cc6fbd";
+      sha256 = "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa";
+    };
+  };
 
   # Fix test trying to access /home directory
   shell-conduit = (overrideCabal super.shell-conduit (drv: {
@@ -208,7 +203,7 @@ self: super: {
   # https://github.com/jputcu/serialport/issues/25
   serialport = dontCheck super.serialport;
 
-  serialise = dontCheck super.serialise;
+  # Test suite build depends on ancient tasty 0.11.x.
   cryptohash-sha512 = dontCheck super.cryptohash-sha512;
 
   # https://github.com/kazu-yamamoto/simple-sendfile/issues/17
@@ -260,6 +255,7 @@ self: super: {
        })
     ];
     testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
+    broken = true;   # can't cope with deriving-compat 0.5.x.
   }));
 
   # Fails for non-obvious reasons while attempting to use doctest.
@@ -348,7 +344,7 @@ self: super: {
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
-  language-nix = overrideCabal super.language-nix (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); # Tests crash on 32-bit linux; see https://github.com/peti/language-nix/issues/4
+  language-nix = if pkgs.stdenv.isi686 then dontCheck super.language-nix else super.language-nix;
   ldap-client = dontCheck super.ldap-client;
   lensref = dontCheck super.lensref;
   lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
@@ -364,6 +360,7 @@ self: super: {
   notcpp = dontCheck super.notcpp;
   ntp-control = dontCheck super.ntp-control;
   numerals = dontCheck super.numerals;
+  odpic-raw = dontCheck super.odpic-raw; # needs a running oracle database server
   opaleye = dontCheck super.opaleye;
   openpgp = dontCheck super.openpgp;
   optional = dontCheck super.optional;
@@ -505,8 +502,14 @@ self: super: {
   doctest-prop = dontCheck super.doctest-prop;
 
   # Depends on itself for testing
-  doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover);
-  tasty-discover = addBuildTool super.tasty-discover (dontCheck super.tasty-discover);
+  doctest-discover = addBuildTool super.doctest-discover
+    (if pkgs.buildPlatform != pkgs.hostPlatform
+     then self.buildHaskellPackages.doctest-discover
+     else dontCheck super.doctest-discover);
+  tasty-discover = addBuildTool super.tasty-discover
+    (if pkgs.buildPlatform != pkgs.hostPlatform
+     then self.buildHaskellPackages.tasty-discover
+     else dontCheck super.tasty-discover);
 
   # generic-deriving bound is too tight
   aeson = doJailbreak super.aeson;
@@ -527,8 +530,8 @@ self: super: {
   # https://github.com/alphaHeavy/lzma-enumerator/issues/3
   lzma-enumerator = dontCheck super.lzma-enumerator;
 
-  # https://github.com/haskell-hvr/lzma/pull/11
-  lzma = appendPatch super.lzma ./patches/lzma-tests.patch;
+  # https://github.com/haskell-hvr/lzma/issues/14
+  lzma = dontCheck super.lzma;
 
   # https://github.com/BNFC/bnfc/issues/140
   BNFC = dontCheck super.BNFC;
@@ -592,8 +595,14 @@ self: super: {
   # Install icons, metadata and cli program.
   bustle = overrideCabal super.bustle (drv: {
     buildDepends = [ pkgs.libpcap ];
-    buildTools = with pkgs; [ gettext perl help2man intltool ];
-    doCheck = false; # https://github.com/wjt/bustle/issues/6
+    buildTools = with pkgs.buildPackages; [ gettext perl help2man intltool ];
+    patches = [
+      # Add missing gio-unix-2.0 dependency
+      (pkgs.fetchpatch {
+        url = https://github.com/wjt/bustle/commit/bcc3d56d367635c0dfdb4eab0d1265829aba6400.patch;
+        sha256 = "1ybviivfbs5janiyw01ww365vxckni6fk0j10609clxk4na2nvb9";
+      })
+    ];
     postInstall = ''
       make install PREFIX=$out
     '';
@@ -615,18 +624,15 @@ self: super: {
 
   # Build the latest git version instead of the official release. This isn't
   # ideal, but Chris doesn't seem to make official releases any more.
-  structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: {
+  structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: {
     src = pkgs.fetchFromGitHub {
       owner = "chrisdone";
       repo = "structured-haskell-mode";
-      rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d";
-      sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c";
+      rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e";
+      sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa";
     };
-    version = "20170523-git";
+    version = "20170205-git";
     editedCabalFile = null;
-    # Statically linked Haskell libraries make the tool start-up much faster,
-    # which is important for use in Emacs.
-    enableSharedExecutables = false;
     # Make elisp files available at a location where people expect it. We
     # cannot easily byte-compile these files, unfortunately, because they
     # depend on a new version of haskell-mode that we don't have yet.
@@ -635,8 +641,15 @@ self: super: {
       mkdir -p $data/share/emacs
       ln -s $lispdir $data/share/emacs/site-lisp
     '';
-  })).override {
-    haskell-src-exts = self.haskell-src-exts_1_19_1;
+  });
+  descriptive = overrideSrc super.descriptive {
+    version = "20180514-git";
+    src = pkgs.fetchFromGitHub {
+      owner = "chrisdone";
+      repo = "descriptive";
+      rev = "c088960113b2add758553e41cbe439d183b750cd";
+      sha256 = "17p65ihcvm1ghq23ww6phh8gdj7hwxlypjvh9jabsxvfbp2s8mrk";
+    };
   };
 
   # Make elisp files available at a location where people expect it.
@@ -651,12 +664,6 @@ self: super: {
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
   }));
 
-  # Need newer versions of their dependencies than the ones we have in LTS-11.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
-  dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
-  graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_1; });
-  status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
-
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 
@@ -687,8 +694,8 @@ self: super: {
   jsaddle = dontCheck super.jsaddle;
 
   # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
-  cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
-  pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
+  cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
+  pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
   gtk =
     if pkgs.stdenv.isDarwin
     then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
@@ -873,9 +880,6 @@ self: super: {
     testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
   });
 
-  # Needs newer versions than what we have in LTS-11.x at the moment.
-  stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; });
-
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
   SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
@@ -914,6 +918,7 @@ self: super: {
   # With ghc-8.2.x haddock would time out for unknown reason
   # See https://github.com/haskell/haddock/issues/679
   language-puppet = dontHaddock super.language-puppet;
+  filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; });
 
   # Missing FlexibleContexts in testsuite
   # https://github.com/EduardSergeev/monad-memo/pull/4
@@ -945,9 +950,11 @@ self: super: {
   happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
   hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
   servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;
   swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
+  # requires a release including https://github.com/haskell-servant/servant-swagger/commit/249530d9f85fe76dfb18b100542f75a27e6a3079
+  servant-swagger = dontCheck super.servant-swagger;
+
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
@@ -977,7 +984,7 @@ self: super: {
       cp -v embeddedfiles/*.info* $out/share/info/
     '';
   });
-  hledger-ui = overrideCabal super.hledger-ui (drv: {
+  hledger-ui = (overrideCabal super.hledger-ui (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
         for j in *.$i; do
@@ -988,7 +995,7 @@ self: super: {
       mkdir -p $out/share/info
       cp -v *.info* $out/share/info/
     '';
-  });
+  }));
   hledger-web = overrideCabal super.hledger-web (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
@@ -1033,10 +1040,10 @@ self: super: {
   # This package refers to the wrong library (itself in fact!)
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
-  # Builds only with the latest version of indexed-list-literals.
-  vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override {
-    indexed-list-literals = self.indexed-list-literals_0_2_1_1;
-  };
+  # # Builds only with the latest version of indexed-list-literals.
+  # vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override {
+  #   indexed-list-literals = self.indexed-list-literals_0_2_1_1;
+  # };
 
   # https://github.com/dmwit/encoding/pull/3
   encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
@@ -1044,21 +1051,53 @@ self: super: {
   # Work around overspecified constraint on github ==0.18.
   github-backup = doJailbreak super.github-backup;
 
-}
+  # https://github.com/fpco/streaming-commons/issues/49
+  streaming-commons = dontCheck super.streaming-commons;
 
-//
+  # Test suite depends on old QuickCheck 2.10.x.
+  cassava = dontCheck super.cassava;
 
-(let
-  amazonkaOverrides = self: super: {
-    conduit = self.conduit_1_2_13_1;
-    conduit-extra = self.conduit-extra_1_2_3_2;
-    resourcet = self.resourcet_1_1_11;
-    xml-conduit = self.xml-conduit_1_7_1_2;
-    http-conduit = self.http-conduit_2_2_4;
-  };
-  amazonka-core = super.amazonka-core.overrideScope amazonkaOverrides;
-  amazonka = super.amazonka.overrideScope amazonkaOverrides;
-  amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides;
-in {
-  inherit amazonka amazonka-core amazonka-test;
-})
+  # Test suite depends on cabal-install
+  doctest = dontCheck super.doctest;
+
+  # Over-specified constraint on X11 ==1.8.*.
+  xmonad = doJailbreak super.xmonad;
+
+  # Test has either build errors or fails anyway, depending on the compiler.
+  vector-algorithms = dontCheck super.vector-algorithms;
+
+  # The test suite attempts to use the network.
+  dhall = dontCheck super.dhall;
+
+  # https://github.com/well-typed/cborg/issues/174
+  cborg = doJailbreak super.cborg;
+  serialise = doJailbreak (dontCheck super.serialise);
+
+  # https://github.com/phadej/tree-diff/issues/19
+  tree-diff = doJailbreak super.tree-diff;
+
+  # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
+  haddock-library = doJailbreak (dontCheck super.haddock-library);
+  haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
+
+  # The test suite does not know how to find the 'cabal2nix' binary.
+  cabal2nix = overrideCabal super.cabal2nix (drv: {
+    preCheck = ''
+      export PATH="$PWD/dist/build/cabal2nix:$PATH"
+      export HOME="$TMPDIR/home"
+    '';
+  });
+
+  # Break out of "aeson <1.3, temporary <1.3".
+  stack = doJailbreak super.stack;
+
+  # https://github.com/pikajude/stylish-cabal/issues/11
+  stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
+  hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
+
+  # musl fixes
+  # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
+  unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
+  # dontCheck: printf double rounding behavior
+  prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter;
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 15220c24b4f29..9bd45c9887f17 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -36,10 +36,17 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # These are now core libraries in GHC 8.4.x.
+  mtl = self.mtl_2_2_2;
+  parsec = self.parsec_3_1_13_0;
+  parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
+  stm = self.stm_2_4_5_0;
+  text = self.text_1_2_3_0;
+
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
 
-  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; };
+  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; };
 
   # https://github.com/mrkkrp/megaparsec/issues/282
   megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
@@ -195,7 +202,6 @@ self: super: {
   mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
   natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
   optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
-  parsec = addBuildDepends super.parsec [self.fail self.semigroups];
   parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   reflection = addBuildDepend super.reflection self.semigroups;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 7924a39fa96d3..1a4638c51e15b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -35,6 +35,12 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # These are now core libraries in GHC 8.4.x.
+  mtl = self.mtl_2_2_2;
+  parsec = self.parsec_3_1_13_0;
+  stm = self.stm_2_4_5_0;
+  text = self.text_1_2_3_0;
+
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
@@ -44,9 +50,6 @@ self: super: {
   # Requires ghc 8.2
   ghc-proofs = dontDistribute super.ghc-proofs;
 
-  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
-  vector-algorithms = dontCheck super.vector-algorithms;
-
   # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
   yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index ce24d9a27f48e..f73172e02d38e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -36,6 +36,12 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # These are now core libraries in GHC 8.4.x.
+  mtl = self.mtl_2_2_2;
+  parsec = self.parsec_3_1_13_0;
+  stm = self.stm_2_4_5_0;
+  text = self.text_1_2_3_0;
+
   # Make sure we can still build Cabal 1.x.
   Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
     prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
@@ -50,10 +56,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
-  vector-algorithms = dontCheck super.vector-algorithms;
-
-
   # https://github.com/nominolo/ghc-syb/issues/20
   ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b0dc20128fc49..881771a3a4c2b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -39,409 +39,27 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  ## Shadowed:
-
-  ## Needs bump to a versioned attribute
-  ## Issue: https://github.com/sol/doctest/issues/189
-  doctest = overrideCabal super.doctest_0_15_0 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## ghc >=7.0 && <8.4
-    ##
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.11.3
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## Cabal <2.2
-  ## Older versions don't compile.
-  hackage-db = super.hackage-db_2_0_1;
-
-  ## Needs bump to a versioned attribute
-  haddock-library = overrideCabal super.haddock-library_1_5_0_1 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    ## Older versions don't compile
-    ##
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck ==2.11.*
-    doCheck         = false;
-    ## Running Haddock on library for haddock-library-1.5.0.1..
-    ## Setup: internal error when calculating transitive package dependencies.
-    ## Debug info: []
-    doHaddock       = false;
-  });
-
-  ## On Hackage:
-
-  ## Upstreamed, awaiting a Hackage release
-  http-api-data = overrideCabal super.http-api-data (drv: {
-    ##     • No instance for (Semigroup Form)
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       Possible fix:
-    src = pkgs.fetchFromGitHub {
-      owner  = "fizruk";
-      repo   = "http-api-data";
-      rev    = "83aac9540f4a304927c601c5db12f4dc2bf93816";
-      sha256 = "14hy13szr09vsisxi25a4qfajqjwznvn222bqk55dcdlnrgf0zi9";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  ## Upstreamed, awaiting a Hackage release
-  lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## aeson >=0.9 && <0.12,
-    ## base >=4.7 && <4.10,
-    ## directory ==1.2.*,
-    ## megaparsec ==5.0.*,
-    ## vector ==0.11.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "lambdacube3d";
-      repo   = "lambdacube-compiler";
-      rev    = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8";
-      sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m";
-    };
-  });
-
-  ## Upstreamed, awaiting a Hackage release
-  lambdacube-ir = overrideCabal super.lambdacube-ir (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## aeson >=0.9 && <0.12, base >=4.8 && <4.10, vector ==0.11.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "lambdacube3d";
-      repo   = "lambdacube-ir";
-      rev    = "b86318b510ef59606c5b7c882cad33af52ce257c";
-      sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x";
-    };
-    prePatch        = "cd lambdacube-ir.haskell; ";
-  });
-
-  singletons = dontCheck super.singletons_2_4_1;
-  th-desugar = super.th-desugar_1_8;
-
-  ## Upstreamed, awaiting a Hackage release
-  websockets = overrideCabal super.websockets (drv: {
-    ##     • No instance for (Semigroup SizeLimit)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid SizeLimit’
-    src = pkgs.fetchFromGitHub {
-      owner  = "jaspervdj";
-      repo   = "websockets";
-      rev    = "11ba6d15cf47bace1936b13a58192e37908b0300";
-      sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf";
-    };
-  });
-
-  ## Bounds related: it wants base-compat 0.9.
-  criterion = super.criterion_1_4_1_0;
-
-  ## Unmerged
-
-  ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3
-  bytestring-trie = overrideCabal super.bytestring-trie (drv: {
-    ##     • Could not deduce (Semigroup (Trie a))
-    ##         arising from the superclasses of an instance declaration
-    ##       from the context: Monoid a
-    src = pkgs.fetchFromGitHub {
-      owner  = "RyanGlScott";
-      repo   = "bytestring-trie";
-      rev    = "e0ae0cb1ad40dedd560090d69cc36f9760797e29";
-      sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## HUnit >=1.3.1.1 && <1.7,
-    ## QuickCheck >=2.4.1 && <2.11,
-    ## lazysmallcheck ==0.6.*,
-    ## smallcheck >=1.1.1 && <1.2
-    doCheck         = false;
-    ## Setup: Encountered missing dependencies:
-    ## data-or ==1.0.*
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
-  });
-
-  ## Unmerged.  PR: https://github.com/hanshoglund/monadplus/pull/3
-  monadplus = overrideCabal super.monadplus (drv: {
-    ##     • No instance for (Semigroup (Partial a b))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (Partial a b)’
-    src = pkgs.fetchFromGitHub {
-      owner  = "asr";
-      repo   = "monadplus";
-      rev    = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb";
-      sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc";
-    };
-  });
-
-  ## Unmerged.  PR: https://github.com/reflex-frp/reflex/pull/158
-  reflex = overrideCabal super.reflex (drv: {
-    ##     • Could not deduce (Semigroup (Event t a))
-    ##         arising from the superclasses of an instance declaration
-    ##       from the context: (Semigroup a, Reflex t)
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "reflex";
-      rev    = "4fb50139db45a37493b91973eeaad9885b4c63ca";
-      sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx";
-    };
-    ## haddock: internal error: internal: extractDecl (ClsInstD)
-    ## CallStack (from HasCallStack):
-    ##   error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1067:16 in main:Haddock.Interface.Create
-    doHaddock       = false;
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5
-    jailbreak       = true;
-    ## Setup: Encountered missing dependencies:
-    ## data-default -any,
-    ## lens -any,
-    ## monad-control -any,
-    ## prim-uniq -any,
-    ## reflection -any,
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]);
-  });
-
-  ## Unmerged.  PR: https://github.com/bos/text-format/pull/21
-  text-format = overrideCabal super.text-format (drv: {
-    ##     • No instance for (Semigroup Format)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Format’
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "text-format";
-      rev    = "a1cda87c222d422816f956c7272e752ea12dbe19";
-      sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr";
-    };
-  });
-
-  ## Non-code, configuration-only change
-
-  adjunctions = overrideCabal super.adjunctions (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## free ==4.*
-    jailbreak       = true;
-  });
-
-  async = overrideCabal super.async (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.3 && <4.11
-    jailbreak       = true;
-  });
-
-  bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## template-haskell >=2.10 && <2.13
-    jailbreak       = true;
-  });
-
-  deepseq-generics = overrideCabal super.deepseq-generics (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    ## https://github.com/haskell-hvr/deepseq-generics/pull/4
-    jailbreak       = true;
-  });
-
-  exception-transformers = overrideCabal super.exception-transformers (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## HUnit >=1.2 && <1.6
-    jailbreak       = true;
-  });
-
-  github = overrideCabal super.github (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck ==2.11.*
-    doCheck         = false;
-    doHaddock       = false;
-  });
-
-  hashable = overrideCabal super.hashable (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.4 && <4.11
-    jailbreak       = true;
-  });
-
-  hashable-time = overrideCabal super.hashable-time (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  haskell-src-meta = overrideCabal super.haskell-src-meta (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13
-    jailbreak       = true;
-  });
-
-  hnix = overrideCabal super.hnix (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## deriving-compat ==0.3.*
-    jailbreak       = true;
-  });
-
-  integer-logarithms = overrideCabal super.integer-logarithms (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.3 && <4.11
-    jailbreak       = true;
-  });
-
-  kan-extensions = overrideCabal super.kan-extensions (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## free ==4.*
-    jailbreak       = true;
-  });
-
-  keys = overrideCabal super.keys (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## free ==4.*
-    jailbreak       = true;
-  });
-
-  lambdacube-gl = overrideCabal super.lambdacube-gl (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## vector ==0.11.*
-    jailbreak       = true;
-  });
-
-  lifted-async = overrideCabal super.lifted-async (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
-  newtype-generics = overrideCabal super.newtype-generics (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.6 && <4.11
-    jailbreak       = true;
-  });
-
-  protolude = overrideCabal super.protolude (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.6 && <4.11
-    jailbreak       = true;
-  });
-
-  quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
-  rapid = overrideCabal super.rapid (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.8 && <4.11
-    jailbreak       = true;
-  });
-
-  resolv = overrideCabal super.resolv (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## tasty >=0.11.2 && <0.12
-    doCheck         = false;
-  });
-
-  setlocale = overrideCabal super.setlocale (drv: {
-    ## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
-    jailbreak       = true;
-  });
-
-  stylish-cabal = overrideCabal super.stylish-cabal (drv: {
-    ## https://github.com/pikajude/stylish-cabal/issues/6
-    doHaddock       = false;
-  });
-
-  tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
-  tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.8 && <4.11
-    jailbreak       = true;
-  });
-
-  ## Issue: https://github.com/ChrisPenner/rasa/issues/54
-  text-lens = overrideCabal super.text-lens (drv: {
-    ## Failures:
-    ##   test/Spec.hs:136:
-    ##   1) TextLens.range gets "" if invalid range
-    ##        uncaught exception: ErrorCall (Data.Text.Array.new: size overflow
-    ##        CallStack (from HasCallStack):
-    ##          error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array)
-    ## Randomized with seed 1899912238
-    ## Finished in 0.0027 seconds
-    doCheck         = false;
-    ## Setup: Encountered missing dependencies:
-    ## extra >=1.4.10 && <1.5, lens ==4.14.*
-    jailbreak       = true;
-  });
-
-  ## Issue: https://github.com/phadej/tree-diff/issues/15
-  tree-diff = overrideCabal super.tree-diff (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  vector-algorithms = overrideCabal super.vector-algorithms (drv: {
-    ##     • Ambiguous type variable ‘mv0’
-    doCheck         = false;
-  });
-
-  wavefront = overrideCabal super.wavefront (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.8 && <4.11
-    jailbreak       = true;
-  });
-
   # https://github.com/jcristovao/enclosed-exceptions/issues/12
   enclosed-exceptions = dontCheck super.enclosed-exceptions;
 
-  # Older versions don't compile.
-  base-compat = self.base-compat_0_10_1;
-  brick = self.brick_0_37_1;
-  dhall = self.dhall_1_14_0;
-  dhall_1_13_0 = doJailbreak super.dhall_1_14_0;  # support ansi-terminal 0.8.x
-  HaTeX = self.HaTeX_3_19_0_0;
-  hpack = self.hpack_0_28_2;
-  hspec = dontCheck super.hspec_2_5_1;
-  hspec-core = dontCheck super.hspec-core_2_5_1;
-  hspec-discover = self.hspec-discover_2_5_1;
-  hspec-smallcheck = self.hspec-smallcheck_0_5_2;
-  matrix = self.matrix_0_3_6_1;
-  pandoc = self.pandoc_2_2_1;
-  pandoc-types = self.pandoc-types_1_17_4_2;
-  wl-pprint-text = self.wl-pprint-text_1_2_0_0;
-
   # https://github.com/xmonad/xmonad/issues/155
-  xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
-    { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
-      sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
-    })) self.semigroups;
+  xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch {
+    url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
+    sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
+  })) self.semigroups;
 
   # https://github.com/xmonad/xmonad-contrib/issues/235
   xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
 
-  # Contributed by Bertram Felgenhauer <int-e@gmx.de>.
-  arrows = appendPatch super.arrows (pkgs.fetchpatch {
-    url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/arrows-0.4.4.1.patch;
-    sha256 = "0j859vclcfnz8n2mw466mv00kjsa9gdbrppjc1m3b68jbypdmfvr";
-  });
+  # Our xmonad claims that it's version 0.14, which is outside of this
+  # package's version constraints.
+  xmonad-extras = doJailbreak super.xmonad-extras;
 
-  # Contributed by Bertram Felgenhauer <int-e@gmx.de>.
-  flexible-defaults = appendPatch super.flexible-defaults (pkgs.fetchpatch {
-    url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/flexible-defaults-0.0.1.2.patch;
-    sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8";
+  # This package desperately needs a maintainer.
+  xmobar = super.xmobar.overrideScope (self: super: {
+    hinotify = self.hinotify_0_3_9;  # https://github.com/jaor/xmobar/issues/356
+    dbus = self.dbus_0_10_15;        # https://github.com/jaor/xmobar/issues/346
   });
-
-  lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch;
+  hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
new file mode 100644
index 0000000000000..bc540cbe36d65
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -0,0 +1,47 @@
+{ pkgs, haskellLib }:
+
+with haskellLib;
+
+self: super: {
+
+  # Use the latest LLVM.
+  inherit (pkgs) llvmPackages;
+
+  # Disable GHC 8.6.x core libraries.
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
+  ghc-heap = null;
+  ghc-prim = null;
+  ghci = null;
+  haskeline = null;
+  hpc = null;
+  integer-gmp = null;
+  libiserv = null;
+  mtl = null;
+  parsec = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  stm = null;
+  template-haskell = null;
+  terminfo = null;
+  text = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+
+  # Use to be a core-library, but no longer is since GHC 8.4.x.
+  hoopl = self.hoopl_3_10_2_2;
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 99003102ec584..93a39beb8a9dc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -7,11 +7,10 @@ self: super: {
   # Use the latest LLVM.
   inherit (pkgs) llvmPackages;
 
-  # Disable GHC 7.11.x core libraries.
+  # Disable GHC 8.7.x core libraries.
   array = null;
   base = null;
   binary = null;
-  bin-package-db = null;
   bytestring = null;
   Cabal = null;
   containers = null;
@@ -24,14 +23,17 @@ self: super: {
   ghc-prim = null;
   ghci = null;
   haskeline = null;
-  hoopl = null;
   hpc = null;
   integer-gmp = null;
+  mtl = null;
+  parsec = null;
   pretty = null;
   process = null;
   rts = null;
+  stm = null;
   template-haskell = null;
   terminfo = null;
+  text = null;
   time = null;
   transformers = null;
   unix = null;
@@ -92,5 +94,5 @@ self: super: {
   test-framework = doJailbreak super.test-framework;
   atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch);
   hashable = doJailbreak super.hashable;
-  stm = doJailbreak super.stm;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c04686734675d..f1a60f5ea878f 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -23,16 +23,9 @@ self: super:
       };
   in stage1 // stage2 // {
 
-  old-time = overrideCabal stage2.old-time (drv: {
-    postPatch = ''
-      ${pkgs.autoconf}/bin/autoreconf --install --force --verbose
-    '';
-    buildTools = pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv;
-  });
-
-  network = addBuildTools super.network (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
-  zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
-  unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
+  network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
+  zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
+  unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
 
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
@@ -128,7 +121,7 @@ self: super:
   });
 
   ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
-    setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.Cabal_1_24_2_0 ];
+    setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ];
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
     isLibrary = true;
   });
@@ -201,4 +194,7 @@ self: super:
   # triggers an internal pattern match failure in haddock
   # https://github.com/haskell/haddock/issues/553
   wai = dontHaddock super.wai;
+
+  base-orphans = dontCheck super.base-orphans;
+  distributive = dontCheck super.distributive;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c53fd35c48ecf..1daaf3409b5a5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,36 +1,39 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.2.2
+compiler: ghc-8.4.3
 
 core-packages:
   - array-0.5.2.0
-  - base-4.10.1.0
+  - base-4.11.1.0
   - binary-0.8.5.1
   - bytestring-0.10.8.2
-  - Cabal-2.0.1.0
-  - containers-0.5.10.2
+  - Cabal-2.2.0.1
+  - containers-0.5.11.0
   - deepseq-1.4.3.0
-  - directory-1.3.0.2
-  - filepath-1.4.1.2
-  - ghc-8.2.2
-  - ghc-boot-8.2.2
-  - ghc-boot-th-8.2.2
+  - directory-1.3.1.5
+  - filepath-1.4.2
+  - ghc-8.4.3
+  - ghc-boot-8.4.3
+  - ghc-boot-th-8.4.3
   - ghc-compact-0.1.0.0
-  - ghc-prim-0.5.1.1
-  - ghci-8.2.2
-  - haskeline-0.7.4.0
-  - hoopl-3.10.2.2
+  - ghc-prim-0.5.2.0
+  - ghci-8.4.3
+  - haskeline-0.7.4.2
   - hpc-0.6.0.3
-  - integer-gmp-1.0.1.0
-  - pretty-1.1.3.3
-  - process-1.6.1.0
+  - integer-gmp-1.0.2.0
+  - mtl-2.2.2
+  - parsec-3.1.13.0
+  - pretty-1.1.3.6
+  - process-1.6.3.0
   - rts-1.0
-  - template-haskell-2.12.0.0
-  - terminfo-0.4.1.0
+  - stm-2.4.5.0
+  - template-haskell-2.13.0.0
+  - terminfo-0.4.1.1
+  - text-1.2.3.0
   - time-1.8.0.2
-  - transformers-0.5.2.0
+  - transformers-0.5.5.0
   - unix-2.7.2.2
-  - xhtml-3000.2.2
+  - xhtml-3000.2.2.1
 
   # Hack: The following package is a core package of GHCJS. If we don't declare
   # it, then hackage2nix will generate a Hackage database where all dependants
@@ -38,22 +41,12 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.12
+  # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
+  - base-compat-batteries ==0.10.1
+  # LTS Haskell 12.0
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
-  - accelerate ==1.1.1.0
-  - accelerate-arithmetic ==1.0.0.1
-  - accelerate-bignum ==0.1.0.0
-  - accelerate-blas ==0.1.0.1
-  - accelerate-fft ==1.1.0.0
-  - accelerate-fftw ==1.0.0.1
-  - accelerate-fourier ==1.0.0.5
-  - accelerate-io ==1.0.0.1
-  - accelerate-llvm ==1.1.0.0
-  - accelerate-llvm-native ==1.1.0.1
-  - accelerate-llvm-ptx ==1.1.0.1
-  - accelerate-utility ==1.0.0.1
   - accuerr ==0.2.0.2
   - ace ==0.6
   - action-permutations ==0.0.0.1
@@ -63,33 +56,35 @@ default-package-overrides:
   - adler32 ==0.1.2.0
   - aern2-mp ==0.1.2.0
   - aern2-real ==0.1.1.0
-  - aeson ==1.2.4.0
+  - aeson ==1.3.1.1
+  - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
-  - aeson-compat ==0.3.7.1
+  - aeson-compat ==0.3.8
   - aeson-diff ==1.1.0.5
-  - aeson-extra ==0.4.1.0
+  - aeson-extra ==0.4.1.1
   - aeson-generic-compat ==0.0.1.2
-  - aeson-injector ==1.1.0.0
+  - aeson-iproute ==0.2
   - aeson-picker ==0.1.0.4
   - aeson-pretty ==0.8.7
   - aeson-qq ==0.8.2
   - aeson-typescript ==0.1.0.6
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
-  - Agda ==2.5.3
-  - airship ==0.9.3
-  - alarmclock ==0.4.0.4
+  - Agda ==2.5.4
+  - al ==0.1.4.2
+  - alarmclock ==0.5.0.2
   - alerts ==0.1.0.0
   - alex ==3.2.4
+  - alg ==0.2.5.0
   - algebra ==4.3.1
-  - algebraic-graphs ==0.1.1.1
+  - Allure ==0.8.3.0
+  - almost-fix ==0.0.2
   - alsa-core ==0.5.0.1
-  - alsa-mixer ==0.2.0.3
   - alsa-pcm ==0.6.1
   - alsa-seq ==0.6.0.7
   - alternative-vector ==0.0.0
-  - alternators ==0.1.2.0
+  - alternators ==1.0.0.0
   - ALUT ==2.4.0.2
   - amazonka ==1.6.0
   - amazonka-apigateway ==1.6.0
@@ -182,44 +177,41 @@ default-package-overrides:
   - amazonka-xray ==1.6.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
-  - ansigraph ==0.3.0.5
   - ansi-terminal ==0.8.0.4
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
-  - apecs ==0.2.4.7
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.4
-  - apply-refact ==0.4.1.0
+  - apply-refact ==0.5.0.0
   - apportionment ==0.0.0.2
   - approximate ==0.3.1
   - app-settings ==0.2.0.11
-  - arithmoi ==0.6.0.1
+  - arithmoi ==0.7.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
-  - asciidiagram ==1.3.3.1
   - ascii-progress ==0.3.3.0
   - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
   - assert-failure ==0.1.2.2
-  - astro ==0.4.2.0
-  - async ==2.1.1.1
+  - astro ==0.4.2.1
+  - async ==2.2.1
   - async-extra ==0.2.0.0
-  - async-refresh ==0.2.0.2
-  - async-refresh-tokens ==0.3.0.1
-  - async-timer ==0.1.4.1
+  - async-refresh ==0.3.0.0
+  - async-refresh-tokens ==0.4.0.0
+  - async-timer ==0.2.0.0
   - atom-basic ==0.2.5
   - atom-conduit ==0.5.0.1
   - atomic-primops ==0.8.2
   - atomic-write ==0.2.0.5
   - attoparsec ==0.13.2.2
+  - attoparsec-base64 ==0.0.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - attoparsec-ip ==0.0.1
   - attoparsec-iso8601 ==1.0.0.0
   - attoparsec-path ==0.0.0.1
-  - attoparsec-time ==1
   - attoparsec-uri ==0.0.4
   - audacity ==0.0.2
   - authenticate ==1.3.4
@@ -227,40 +219,38 @@ default-package-overrides:
   - auto ==0.4.3.1
   - autoexporter ==1.1.9
   - auto-update ==0.1.4
+  - avro ==0.3.2.0
   - avwx ==0.3.0.2
-  - axiom ==0.4.6
-  - b9 ==0.5.49
-  - backprop ==0.1.5.2
+  - backprop ==0.2.5.0
   - bank-holidays-england ==0.1.0.7
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
   - base58string ==0.10.0
   - base64-bytestring ==1.0.0.1
+  - base64-bytestring-type ==1
   - base64-string ==0.2
-  - base-compat ==0.9.3
+  - base-compat ==0.10.4
+  - base-compat-batteries ==0.10.1
   - basement ==0.0.7
   - base-orphans ==0.7
-  - base-prelude ==1.2.1
+  - base-prelude ==1.3
   - base-unicode-symbols ==0.2.2.4
   - basic-prelude ==0.7.0
   - bbdb ==0.8
   - bcrypt ==0.0.11
-  - beam-core ==0.7.2.1
-  - beam-migrate ==0.3.2.0
-  - beam-sqlite ==0.3.2.1
-  - bench ==1.0.9
-  - benchpress ==0.2.2.10
+  - beam-core ==0.7.2.2
+  - beam-migrate ==0.3.2.1
+  - bench ==1.0.11
   - bencode ==0.6.0.0
-  - bento ==0.1.0
   - between ==0.11.0.0
-  - bhoogle ==0.1.2.7
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5.2
+  - bifunctors ==5.5.3
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
   - binary-conduit ==1.3
+  - binary-ext ==2.0.4
   - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.8.0
@@ -270,16 +260,10 @@ default-package-overrides:
   - binary-shared ==0.8.3
   - binary-tagged ==0.1.5
   - bindings-DSL ==1.0.25
-  - bindings-GLFW ==3.1.2.4
+  - bindings-GLFW ==3.2.1.1
   - bindings-libzip ==1.0.1
   - bindings-uname ==0.1
-  - bioace ==0.0.1
-  - bioalign ==0.0.5
   - BiobaseNewick ==0.0.0.2
-  - biocore ==0.3.1
-  - biofasta ==0.0.3
-  - biofastq ==0.1
-  - biopsl ==0.4
   - bitarray ==0.0.1.1
   - bitcoin-api ==0.12.1
   - bitcoin-api-extra ==0.9.1
@@ -289,104 +273,104 @@ default-package-overrides:
   - bitcoin-types ==0.9.2
   - bits ==0.5.1
   - bitset-word8 ==0.1.1.0
+  - bits-extra ==0.0.1.3
   - bit-stream ==0.1.0.2
   - bitx-bitcoin ==0.12.0.0
   - blake2 ==0.2.0
+  - blank-canvas ==0.6.3
   - blas-carray ==0.0.1.1
   - blas-ffi ==0.0.1.1
   - blas-hs ==0.1.1.0
-  - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.1.0
-  - blaze-html ==0.9.0.1
+  - blaze-colonnade ==1.2.2
+  - blaze-html ==0.9.1.1
   - blaze-markup ==0.8.2.1
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
-  - bloodhound ==0.15.0.2
-  - blosum ==0.1.1.4
   - bmp ==1.2.6.3
   - bno055-haskell ==0.1.0
   - boltzmann-samplers ==0.1.1.0
-  - bookkeeping ==0.2.1.4
   - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
   - boolsimplifier ==0.1.8
-  - boomerang ==1.4.5.5
   - bordacount ==0.1.0.0
+  - boring ==0.1
   - both ==0.1.1.0
   - bound ==2.0.1
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.34.1
-  - brittany ==0.9.0.1
+  - brick ==0.37.1
+  - brittany ==0.11.0.0
   - broadcast-chan ==0.1.1
   - bsb-http-chunked ==0.0.0.2
   - bson ==0.3.2.6
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
-  - buchhaltung ==0.0.7
-  - buffer-builder ==0.2.4.5
+  - buffer-builder ==0.2.4.6
   - buffer-pipe ==0.0
-  - butcher ==1.3.0.0
+  - butcher ==1.3.1.1
+  - butter ==0.1.0.6
   - bv ==0.5
   - bv-little ==0.1.1
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
-  - bytes ==0.15.4
+  - bytes ==0.15.5
   - byteset ==0.1.1.0
   - bytestring-builder ==0.10.8.1.0
   - bytestring-conversion ==0.3.1
   - bytestring-lexing ==0.5.0.2
-  - bytestring-strict-builder ==0.4.5
-  - bytestring-tree-builder ==0.2.7.1
-  - bytestring-trie ==0.2.4.1
+  - bytestring-strict-builder ==0.4.5.1
+  - bytestring-tree-builder ==0.2.7.2
   - bzlib ==0.5.0.5
   - bzlib-conduit ==0.3.0.1
-  - c2hs ==0.28.3
-  - Cabal ==2.0.1.1
+  - c2hs ==0.28.5
+  - Cabal ==2.2.0.1
+  - cabal2spec ==2.1.1
   - cabal-doctest ==1.0.6
-  - cabal-file-th ==0.2.4
   - cabal-rpm ==0.12.4
-  - cabal-toolkit ==0.0.5
   - cache ==0.1.1.0
+  - cachix ==0.1.0.2
+  - cachix-api ==0.1.0.1
   - cairo ==0.13.5.0
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
-  - capataz ==0.1.0.1
+  - capataz ==0.2.0.0
   - carray ==0.1.6.8
-  - cartel ==0.18.0.2
   - cased ==0.1.0.0
   - case-insensitive ==1.2.0.11
   - cases ==0.1.3.2
   - casing ==0.1.4.0
   - cassava ==0.5.1.0
-  - cassava-conduit ==0.4.0.2
+  - cassava-conduit ==0.5.0
   - cassava-records ==0.1.0.4
-  - cassette ==0.1.0
   - cast ==0.1.0.2
-  - cayley-client ==0.4.6
+  - category ==0.2.0.1
   - cereal ==0.5.5.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
+  - cfenv ==0.1.0.0
+  - chan ==0.0.3
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
-  - Chart ==1.8.3
-  - Chart-cairo ==1.8.3
+  - chart-unit ==0.7.0.0
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
-  - chatwork ==0.1.3.3
+  - chatwork ==0.1.3.4
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
   - check-email ==1.0.2
   - checkers ==0.4.10
+  - checksum ==0.0
   - choice ==0.2.2
+  - chronologique ==0.3.1.1
   - chunked-data ==0.3.1
   - cipher-aes ==0.2.11
   - cipher-aes128 ==0.7.0.3
@@ -397,62 +381,66 @@ default-package-overrides:
   - circle-packing ==0.1.0.6
   - cisco-spark-api ==0.1.0.3
   - clang-compilation-database ==0.1.0.1
+  - clash-ghc ==0.99.2
+  - clash-lib ==0.99.2
+  - clash-prelude ==0.99.2
   - classyplate ==0.3.1.0
   - classy-prelude ==1.4.0
   - classy-prelude-conduit ==1.4.0
   - classy-prelude-yesod ==1.4.0
-  - clay ==0.12.2
-  - cli ==0.1.2
+  - clay ==0.13.1
   - clientsession ==0.9.1.2
   - Clipboard ==2.3.2.0
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
+  - closed ==0.2.0
   - clr-host ==0.2.0.1
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.3
-  - cmark ==0.5.6
-  - cmark-gfm ==0.1.3
-  - cmark-highlight ==0.2.0.0
-  - cmark-lucid ==0.1.0.0
+  - cmark-gfm ==0.1.4
   - cmdargs ==0.10.20
   - code-builder ==0.1.3
   - codec ==0.2.1
+  - codec-beam ==0.2.0
+  - codec-rpm ==0.2.2
   - code-page ==0.1.3
   - codo-notation ==0.5.2
+  - coercible-utils ==0.0.0
+  - colonnade ==1.2.0.1
   - colorful-monoids ==0.2.1.1
   - colorize-haskell ==1.0.1
   - colour ==2.3.4
-  - colour-accelerate ==0.2.0.0
   - combinatorial ==0.1
   - comfort-graph ==0.0.3
   - commutative ==0.0.1.4
-  - comonad ==5.0.3
-  - compact ==0.1.0.1
+  - comonad ==5.0.4
   - compactmap ==0.1.4.2.1
   - compensated ==0.7.2
   - compiler-warnings ==0.1.0
+  - componentm ==0.0.0.2
+  - componentm-devel ==0.0.0.2
   - composable-associations ==0.1.0.0
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - composition-prelude ==1.3.0.8
+  - composition-prelude ==1.5.0.6
   - compressed ==3.11
   - concise ==0.1.0.1
-  - concurrency ==1.4.0.2
+  - concurrency ==1.6.0.0
   - concurrent-extra ==0.7.0.12
-  - concurrent-output ==1.10.5
+  - concurrent-output ==1.10.6
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0.2
+  - conduit ==1.3.0.3
   - conduit-algorithms ==0.0.8.1
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
   - conduit-extra ==1.3.0
   - conduit-iconv ==0.1.1.3
+  - conduit-parse ==0.2.1.0
   - conduit-throttle ==0.3.1.0
-  - ConfigFile ==1.1.4
   - config-ini ==0.2.2.0
   - configuration-tools ==0.3.1
   - configurator ==0.3.0.0
@@ -460,7 +448,8 @@ default-package-overrides:
   - connection ==0.2.8
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
-  - constraints ==0.10
+  - constraint ==0.1.1.1
+  - constraints ==0.10.1
   - consul-haskell ==0.4.2
   - containers-unicode-symbols ==0.3.1.1
   - contravariant ==1.4.1
@@ -471,17 +460,18 @@ default-package-overrides:
   - convertible ==1.1.1.0
   - cookie ==0.4.4
   - countable ==1.0
-  - country ==0.1.5
+  - country ==0.1.6
   - courier ==0.1.1.5
+  - cpio-conduit ==0.7.0
   - cpphs ==1.20.8
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
-  - cql ==3.1.1
-  - cql-io ==0.16.0
-  - crackNum ==1.9
+  - cql ==4.0.1
+  - cql-io ==1.0.1
   - credential-store ==0.1.2
-  - criterion ==1.3.0.0
+  - criterion ==1.4.1.0
+  - criterion-measurement ==0.1.0.0
   - cron ==0.6.1
   - crypto-api ==0.13.3
   - crypto-api-tests ==0.3
@@ -498,29 +488,30 @@ default-package-overrides:
   - cryptohash-sha512 ==0.11.100.1
   - cryptonite ==0.25
   - cryptonite-conduit ==0.2.2
-  - cryptonite-openssl ==0.6
+  - cryptonite-openssl ==0.7
+  - crypto-numbers ==0.2.7
+  - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
-  - csp ==1.3.1
+  - csg ==0.1.0.3
+  - csp ==1.4.0
   - css-syntax ==0.0.7
   - css-text ==0.1.3.0
   - csv ==0.1.2
-  - csv-conduit ==0.6.8.1
   - ctrie ==0.2
+  - cubicbezier ==0.6.0.5
   - cubicspline ==0.1.2
-  - cublas ==0.4.0.1
-  - cuda ==0.9.0.3
   - cue-sheet ==1.0.1
-  - cufft ==0.8.0.0
   - curl ==1.3.8
-  - curl-runnings ==0.2.0
-  - currencies ==0.1.1.1
-  - cusolver ==0.1.0.1
-  - cusparse ==0.1.0.1
+  - curl-runnings ==0.6.0
+  - currencies ==0.2.0.0
+  - currency ==0.2.0.0
   - cutter ==0.0
-  - czipwith ==1.0.0.0
+  - cyclotomic ==0.5.1
+  - czipwith ==1.0.1.0
+  - darcs ==2.14.1
   - data-accessor ==0.2.2.7
   - data-accessor-mtl ==0.2.0.4
   - data-accessor-template ==0.2.1.15
@@ -534,8 +525,8 @@ default-package-overrides:
   - data-default-instances-containers ==0.0.1
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
-  - data-diverse ==2.0.1.0
-  - data-diverse-lens ==2.1.0.0
+  - data-diverse ==4.6.0.0
+  - data-diverse-lens ==4.3.0.0
   - datadog ==0.2.2.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
@@ -559,62 +550,70 @@ default-package-overrides:
   - DAV ==1.3.2
   - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
-  - dbus ==0.10.15
+  - dbus ==1.0.1
   - debian-build ==0.10.1.1
   - debug ==0.1.1
+  - debug-trace-var ==0.2.0
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.3.2.0
+  - dejafu ==1.11.0.1
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.4.2
-  - descriptive ==0.9.4
-  - dhall ==1.11.1
-  - dhall-json ==1.0.13
-  - dice ==0.1
-  - dictionaries ==0.2.0.4
+  - deriving-compat ==0.5
+  - derulo ==1.0.2
+  - detour-via-sci ==1.0.0
+  - df1 ==0.1.1
+  - dhall ==1.15.1
+  - dhall-bash ==1.0.14
+  - dhall-json ==1.2.1
+  - dhall-text ==1.0.11
+  - di ==1.0.1
+  - diagrams ==1.4
+  - diagrams-builder ==0.8.0.3
+  - diagrams-cairo ==1.4.1
+  - diagrams-canvas ==1.4.1
+  - diagrams-contrib ==1.4.3
+  - diagrams-core ==1.4.1.1
+  - diagrams-gtk ==1.4
+  - diagrams-html5 ==1.4.1
+  - diagrams-lib ==1.4.2.3
+  - diagrams-postscript ==1.4.1
+  - diagrams-rasterific ==1.4.1
+  - diagrams-solve ==0.1.1
+  - diagrams-svg ==1.4.2
+  - di-core ==1.0
+  - dictionary-sharing ==0.1.0.0
+  - di-df1 ==1.0.2
   - Diff ==0.3.4
-  - diff3 ==0.3.1
   - digest ==0.0.1.2
   - digits ==0.3.1
+  - di-handle ==1.0
   - dimensional ==1.1
+  - di-monad ==1.0.2
   - directory-tree ==0.12.1
-  - direct-rocksdb ==0.0.3
   - direct-sqlite ==2.3.23
   - discount ==0.1.1
   - discrimination ==0.3
   - disk-free-space ==0.1.0.1
-  - disposable ==0.2.0.4
-  - distance ==0.1.0.0
   - distributed-closure ==0.4.0
-  - distributed-process ==0.7.3
-  - distributed-process-lifted ==0.3.0.1
-  - distributed-process-monad-control ==0.5.1.3
-  - distributed-process-simplelocalnet ==0.2.4
-  - distributed-process-tests ==0.4.11
   - distributed-static ==0.3.8
-  - distribution ==1.1.1.0
   - distributive ==0.5.3
-  - diversity ==0.8.1.0
-  - djinn-ghc ==0.0.2.3
-  - djinn-lib ==0.0.1.3
   - dlist ==0.8.0.4
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.4
-  - docker ==0.5.1.1
-  - docker-build-cacher ==1.9.2
+  - docker ==0.6.0.0
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.2.2.1
-  - doctest ==0.13.0
-  - doctest-discover ==0.1.0.7
-  - doctest-driver-gen ==0.2.0.2
+  - doctest ==0.16.0
+  - doctest-discover ==0.1.0.9
+  - doctest-driver-gen ==0.2.0.3
   - do-list ==1.0.1
-  - dom-parser ==3.0.0
+  - dom-parser ==3.1.0
   - dotenv ==0.5.2.5
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
@@ -624,12 +623,15 @@ default-package-overrides:
   - drifter ==0.2.3
   - drifter-postgresql ==0.2.1
   - dsp ==0.2.4
+  - dual-tree ==0.2.2
   - dublincore-xml-conduit ==0.1.0.2
+  - dunai ==0.4.0.0
   - dvorak ==0.1.0.0
-  - dynamic-state ==0.3
+  - dynamic-state ==0.3.1
   - dyre ==0.8.12
   - Earley ==0.12.1.0
   - easy-file ==0.2.2
+  - easytest ==0.2
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ed25519 ==0.0.5.0
@@ -638,7 +640,7 @@ default-package-overrides:
   - edit-distance ==0.2.2.1
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
-  - either ==5
+  - either ==5.0.1
   - either-unwrap ==1.1
   - ekg ==0.4.0.15
   - ekg-core ==0.1.1.4
@@ -646,69 +648,66 @@ default-package-overrides:
   - ekg-statsd ==0.2.3.0
   - ekg-wai ==0.1.0.3
   - elerea ==2.9.0
-  - eliminators ==0.3
+  - elf ==0.29
+  - eliminators ==0.4.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - elm-export-persistent ==0.2.0
-  - emailaddress ==0.2.0.0
-  - email-validate ==2.3.2.5
+  - email-validate ==2.3.2.6
   - enclosed-exceptions ==1.0.2
-  - entropy ==0.3.8
+  - entropy ==0.4.1.1
   - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
+  - enum-subset-generate ==0.1.0.0
   - envelope ==0.2.2.0
-  - envparse ==0.4
   - envy ==1.5.0.0
   - epub-metadata ==4.5
-  - eq ==4.1
+  - eq ==4.2
   - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
-  - errors ==2.2.5
+  - errors ==2.3.0
   - errors-ext ==0.4.1
   - error-util ==0.0.1.2
-  - ersatz ==0.4.2
-  - ether ==0.5.1.0
-  - euler-tour-tree ==0.1.0.1
+  - ersatz ==0.4.3
+  - etc ==0.4.0.3
   - event ==0.1.4
   - eventful-core ==0.2.0
   - eventful-memory ==0.2.0
-  - eventful-postgresql ==0.2.0
   - eventful-sql-common ==0.2.0
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventsource-api ==1.3.1
-  - eventsource-geteventstore-store ==1.1.0
-  - eventsource-store-specs ==1.1.1
-  - eventsource-stub-store ==1.0.3
   - eventstore ==1.1.4
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
   - exceptional ==0.3.0.0
+  - exception-hierarchy ==0.1.0.1
   - exception-mtl ==0.4.0.1
-  - exceptions ==0.8.3
+  - exceptions ==0.10.0
   - exception-transformers ==0.4.0.7
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
-  - exhaustive ==1.1.6
+  - exinst ==0.6
+  - exomizer ==1.0.0
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
-  - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.8
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
+  - facts ==0.0.1.0
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
-  - fasta ==0.10.4.2
-  - fast-builder ==0.0.1.0
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.11
-  - fb ==1.2.0
+  - fast-math ==1.0.2
+  - fay ==0.24.0.1
+  - fay-base ==0.21.1.0
+  - fay-dom ==0.5.0.1
+  - fb ==1.2.1
   - fclabels ==2.0.3.3
   - feature-flags ==0.1.0.1
   - fedora-haskell-tools ==0.5.1
@@ -716,49 +715,49 @@ default-package-overrides:
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
   - fgl ==5.6.0.0
-  - filecache ==0.3.2
+  - filecache ==0.4.0
   - file-embed ==0.0.10.1
+  - file-embed-lzma ==0
   - filelock ==0.1.1.2
   - filemanip ==0.3.6.3
   - file-modules ==0.1.2.4
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
+  - filtrable ==0.1.1.0
+  - fin ==0.0.1
+  - Fin ==0.2.3.0
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
-  - fingertree-psqueue ==0.3
   - finite-typelits ==0.1.3.0
-  - fitspec ==0.4.4
+  - first-class-patterns ==0.3.2.4
   - fixed ==0.2.1.1
   - fixed-length ==0.2
   - fixed-vector ==1.1.0.0
-  - fixed-vector-hetero ==0.4.0.0
+  - fixed-vector-hetero ==0.5.0.0
   - flac ==0.1.2
   - flac-picture ==0.1.1
   - flat-mcmc ==1.5.0
-  - flexible-defaults ==0.0.1.2
-  - FloatingHex ==0.4
+  - flay ==0.4
+  - flexible-defaults ==0.0.2
   - floatshow ==0.2.4
-  - flow ==1.0.12
+  - flow ==1.0.13
   - fmlist ==0.9.2
-  - fmt ==0.5.0.0
   - fn ==0.3.0.2
   - focus ==0.1.5.2
   - fold-debounce ==0.2.0.7
   - fold-debounce-conduit ==0.2.0.1
-  - foldl ==1.3.7
+  - foldl ==1.4.2
   - folds ==0.7.4
-  - follow-file ==0.0.2
   - FontyFruity ==0.5.3.3
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
   - ForestStructures ==0.0.0.2
-  - forma ==0.2.0
+  - forkable-monad ==0.2.0.3
+  - forma ==1.1.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.3.4
+  - formatting ==6.3.6
   - foundation ==0.0.20
-  - FPretty ==1.1
-  - Frames ==0.3.0.2
   - free ==5.0.2
   - freenect ==1.2.1
   - freer-simple ==1.1.0.0
@@ -770,252 +769,228 @@ default-package-overrides:
   - frisby ==0.2.2
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
-  - fsnotify ==0.2.1.1
-  - fsnotify-conduit ==0.1.1.0
+  - fsnotify ==0.3.0.1
+  - fsnotify-conduit ==0.1.1.1
   - funcmp ==1.9
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
+  - fuzzy-dates ==0.1.1.1
   - fuzzyset ==0.1.0.6
-  - gauge ==0.2.1
+  - gauge ==0.2.3
   - gc ==0.0.2
   - gd ==3000.7.3
   - gdax ==0.6.0.0
-  - Genbank ==1.0.3
+  - gdp ==0.0.0.2
   - general-games ==1.1.1
   - generic-aeson ==0.2.0.9
   - generic-arbitrary ==0.1.0
-  - generic-deriving ==1.12.1
-  - generic-lens ==0.5.1.0
+  - generic-deriving ==1.12.2
+  - generic-lens ==1.0.0.1
   - GenericPretty ==1.2.2
-  - generic-random ==1.1.0.2
-  - generics-eot ==0.2.1.2
+  - generic-random ==1.2.0.0
+  - generics-eot ==0.4
   - generics-sop ==0.3.2.0
   - generics-sop-lens ==0.1.2.1
   - generic-xmlpickler ==0.1.0.5
   - geniplate-mirror ==0.7.6
-  - genvalidity ==0.4.0.4
-  - genvalidity-aeson ==0.1.0.0
-  - genvalidity-bytestring ==0.1.0.0
-  - genvalidity-containers ==0.3.0.0
-  - genvalidity-hspec ==0.5.0.0
-  - genvalidity-hspec-aeson ==0.1.0.2
-  - genvalidity-hspec-binary ==0.1.0.0
-  - genvalidity-hspec-cereal ==0.1.0.0
-  - genvalidity-hspec-hashable ==0.1.0.0
-  - genvalidity-path ==0.2.0.2
-  - genvalidity-property ==0.1.0.0
-  - genvalidity-scientific ==0.1.0.0
-  - genvalidity-text ==0.4.0.0
-  - genvalidity-time ==0.1.0.1
-  - genvalidity-unordered-containers ==0.1.0.0
-  - genvalidity-uuid ==0.0.0.0
-  - genvalidity-vector ==0.1.0.0
+  - genvalidity ==0.5.1.0
+  - genvalidity-aeson ==0.2.0.2
+  - genvalidity-bytestring ==0.2.0.2
+  - genvalidity-containers ==0.5.0.0
+  - genvalidity-hspec ==0.6.1.1
+  - genvalidity-hspec-aeson ==0.3.0.0
+  - genvalidity-hspec-binary ==0.2.0.2
+  - genvalidity-hspec-cereal ==0.2.0.2
+  - genvalidity-hspec-hashable ==0.2.0.2
+  - genvalidity-path ==0.3.0.2
+  - genvalidity-property ==0.2.1.0
+  - genvalidity-scientific ==0.2.0.1
+  - genvalidity-text ==0.5.0.2
+  - genvalidity-time ==0.2.1.0
+  - genvalidity-unordered-containers ==0.2.0.3
+  - genvalidity-uuid ==0.1.0.2
+  - genvalidity-vector ==0.2.0.2
+  - geodetics ==0.0.6
   - getopt-generics ==0.13.0.2
-  - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
-  - ghc-events ==0.7.2
   - ghc-exactprint ==0.5.6.1
-  - ghcid ==0.6.10
-  - ghcjs-base-stub ==0.1.0.4
-  - ghcjs-codemirror ==0.0.0.1
-  - ghcjs-perch ==0.3.3.2
+  - ghcid ==0.7
+  - ghcjs-base-stub ==0.2.0.0
+  - ghcjs-codemirror ==0.0.0.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.1.2
-  - ghc-syb-utils ==0.2.3.3
-  - ghc-tcplugins-extra ==0.2.5
-  - ghc-typelits-extra ==0.2.4
-  - ghc-typelits-knownnat ==0.4.2
-  - ghc-typelits-natnormalise ==0.5.10
+  - ghc-syntax-highlighter ==0.0.2.0
+  - ghc-tcplugins-extra ==0.3
+  - ghc-typelits-extra ==0.2.5
+  - ghc-typelits-knownnat ==0.5
+  - ghc-typelits-natnormalise ==0.6.1
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.17
-  - gi-glib ==2.0.16
+  - gi-gdk ==3.0.16
+  - gi-gdkpixbuf ==2.0.16
+  - gi-gio ==2.0.18
+  - gi-glib ==2.0.17
   - gi-gobject ==2.0.16
+  - gi-gtk ==3.0.23
+  - gi-gtk-hs ==0.3.6.1
+  - gi-gtksource ==3.0.16
   - gi-javascriptcore ==4.0.15
-  - ginger ==0.7.3.0
-  - git ==0.2.1
+  - gio ==0.13.5.0
+  - gi-pango ==1.0.16
+  - giphy-api ==0.6.0.1
   - github ==0.19
-  - github-release ==1.1.6
+  - github-release ==1.2.1
   - github-types ==0.2.1
-  - github-webhook-handler ==0.0.8
-  - github-webhook-handler-snap ==0.0.7
-  - github-webhooks ==0.9.1
+  - github-webhooks ==0.10.0
   - gitrev ==1.3.1
+  - git-vogue ==0.3.0.2
   - gl ==0.8.0
-  - glabrous ==0.3.5
+  - glabrous ==0.3.6
   - glaze ==0.3.0.1
-  - glazier ==0.11.0.1
-  - glazier-pipes ==0.1.5.1
-  - GLFW-b ==1.4.8.3
+  - glazier ==1.0.0.0
+  - GLFW-b ==3.2.1.0
   - glib ==0.13.6.0
   - Glob ==0.9.2
-  - glob-posix ==0.1.0.1
-  - gloss ==1.11.1.1
-  - gloss-accelerate ==2.0.0.1
-  - gloss-algorithms ==1.11.1.1
-  - gloss-raster ==1.11.1.1
-  - gloss-raster-accelerate ==2.0.0.0
-  - gloss-rendering ==1.11.1.1
+  - gloss ==1.12.0.0
+  - gloss-raster ==1.12.0.0
+  - gloss-rendering ==1.12.0.0
   - GLURaw ==2.0.0.4
   - GLUT ==2.7.0.13
-  - gluturtle ==0.0.58.1
   - gnuplot ==0.5.5.2
   - goggles ==0.3.2
-  - google-cloud ==0.0.4
-  - google-oauth2-jwt ==0.2.2
-  - GPipe ==2.2.3
+  - google-oauth2-jwt ==0.3.0
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphs ==0.7.1
+  - graphviz ==2999.20.0.2
   - graph-wrapper ==0.2.5.1
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
+  - greskell ==0.2.0.2
+  - greskell-core ==0.1.2.1
+  - greskell-websocket ==0.1.0.0
   - groom ==0.1.2.1
-  - groundhog ==0.8.0.1
-  - groundhog-inspector ==0.8.0.2
-  - groundhog-mysql ==0.8.0.1
-  - groundhog-postgresql ==0.8.0.3
-  - groundhog-sqlite ==0.8.0.1
-  - groundhog-th ==0.8.0.2
-  - group-by-date ==0.1.0.2
-  - grouped-list ==0.2.2.0
   - groups ==0.4.1.0
+  - gtk ==0.14.10
   - gtk2hs-buildtools ==0.13.4.0
-  - H ==0.9.0.1
+  - gtk3 ==0.14.9
+  - gym-http-api ==0.1.0.1
   - h2c ==1.0.0
-  - hackage-db ==2.0
+  - hackage-db ==2.0.1
   - hackage-security ==0.5.3.0
-  - haddock-library ==1.4.5
+  - haddock-library ==1.5.0.1
   - hailgun ==0.4.1.8
-  - hailgun-simple ==0.1.0.0
   - hakyll ==4.12.3.0
-  - half ==0.2.2.3
-  - hamilton ==0.1.0.2
+  - half ==0.3
+  - hamilton ==0.1.0.3
+  - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.6
-  - happstack-jmacro ==7.0.12
-  - happstack-server ==7.5.1
-  - happstack-server-tls ==7.1.6.5
+  - hapistrano ==0.3.5.7
+  - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
   - hashable ==1.2.7.0
-  - hashable-time ==0.2.0.1
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
   - hashtables ==1.2.3.1
-  - haskeline ==0.7.4.2
+  - haskeline ==0.7.4.3
   - haskell-gi ==0.21.3
   - haskell-gi-base ==0.21.1
-  - haskell-gi-overloading ==0.0
+  - haskell-gi-overloading ==1.0
   - haskell-lexer ==1.0.1
-  - haskell-lsp ==0.2.0.1
-  - haskell-lsp-client ==1.0.0.1
-  - haskell-names ==0.9.1
-  - haskell-neo4j-client ==0.3.2.4
+  - haskell-lsp ==0.2.2.0
+  - haskell-lsp-types ==0.2.2.0
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.4.0
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.2
+  - haskell-src-exts-simple ==1.20.0.0
   - haskell-src-exts-util ==0.2.3
-  - haskell-src-meta ==0.8.0.2
-  - haskell-tools-ast ==1.0.1.1
-  - haskell-tools-backend-ghc ==1.0.1.1
-  - haskell-tools-prettyprint ==1.0.1.1
-  - haskell-tools-refactor ==1.0.1.2
-  - haskell-tools-rewrite ==1.0.1.1
+  - haskell-src-meta ==0.8.0.3
+  - haskell-tools-ast ==1.1.0.1
+  - haskell-tools-backend-ghc ==1.1.0.1
+  - haskell-tools-builtin-refactorings ==1.1.0.1
+  - haskell-tools-debug ==1.1.0.1
+  - haskell-tools-demo ==1.1.0.1
+  - haskell-tools-prettyprint ==1.1.0.1
+  - haskell-tools-refactor ==1.1.0.1
+  - haskell-tools-rewrite ==1.1.0.1
+  - haskey ==0.3.0.2
+  - haskey-btree ==0.3.0.0
+  - haskey-mtl ==0.3.1.0
   - haskintex ==0.8.0.0
-  - hasmin ==1.0.2
-  - hasql ==1.1.1
-  - hasql-migration ==0.1.3
-  - hasql-optparse-applicative ==0.3.0.2
-  - hasql-pool ==0.4.3.1
-  - hasql-transaction ==0.6.0.1
-  - hastache ==0.6.1
+  - hasql ==1.3.0.2
+  - hasql-optparse-applicative ==0.3.0.3
+  - hasql-pool ==0.5
+  - hasql-transaction ==0.7
   - hasty-hamiltonian ==1.3.2
-  - HaTeX ==3.18.0.0
-  - haxl ==0.5.1.0
-  - HaXml ==1.25.4
-  - haxr ==3000.11.2
+  - HaTeX ==3.19.0.0
+  - haxl ==2.0.1.0
   - hbeanstalk ==0.2.4
-  - Hclip ==3.0.0.4
   - HCodecs ==0.5.1
   - hdaemonize ==0.5.5
   - HDBC ==2.4.0.2
   - HDBC-mysql ==0.7.1.0
-  - HDBC-session ==0.1.1.1
-  - hdevtools ==0.1.6.1
+  - HDBC-session ==0.1.2.0
   - heap ==1.0.4
   - heaps ==0.3.6
-  - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
-  - hedgehog ==0.5.3
-  - hedgehog-quickcheck ==0.1
+  - hedgehog ==0.6
+  - hedgehog-corpus ==0.1.0
   - hedis ==0.10.2
-  - heist ==1.0.1.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
-  - herms ==1.8.1.4
   - heterocephalus ==1.0.5.2
   - hex ==0.1.2
   - hexml ==0.3.3
   - hexml-lens ==0.2.1
   - hexpat ==0.20.13
   - hexstring ==0.11.1
-  - hformat ==0.3.2.0
   - hfsevents ==0.1.6
-  - hid ==0.2.2
   - hidapi ==0.1.4
   - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
+  - hierarchy ==1.0.2
   - higher-leveldb ==0.5.0.1
-  - highjson ==0.4.0.0
-  - highjson-swagger ==0.4.0.0
-  - highjson-th ==0.4.0.0
   - highlighting-kate ==0.6.4
-  - hinotify ==0.3.9
-  - hint ==0.7.0
-  - histogram-fill ==0.8.5.0
-  - hit ==0.6.3
+  - hinotify ==0.3.10
+  - hint ==0.8.0
+  - histogram-fill ==0.9.0.0
   - hjsmin ==0.2.0.2
-  - hjsonpointer ==1.3.0
-  - hjsonschema ==1.7.2
   - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.6.1
-  - hmatrix ==0.18.2.0
-  - hmatrix-backprop ==0.1.2.0
-  - hmatrix-gsl ==0.18.2.0
+  - hlibsass ==0.1.7.0
+  - hmatrix ==0.19.0.0
+  - hmatrix-backprop ==0.1.2.3
+  - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.7
-  - hmatrix-morpheus ==0.1.1.1
-  - hmatrix-repa ==0.1.2.2
-  - hmatrix-special ==0.4.0.1
+  - hmatrix-morpheus ==0.1.1.2
+  - hmatrix-special ==0.19.0.0
   - hmatrix-vector-sized ==0.1.1.0
   - hmpfr ==0.4.4
-  - hocilib ==0.2.0
   - Hoed ==0.5.1
-  - hOpenPGP ==2.6.2
+  - hoopl ==3.10.2.2
+  - hOpenPGP ==2.7
+  - hopenpgp-tools ==0.21.1
   - hopfli ==0.2.2.1
-  - hosc ==0.16
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.11
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.8.0.2
-  - hpack ==0.27.0
-  - hpc-coveralls ==1.0.10
+  - hpack ==0.28.2
   - HPDF ==1.4.10
-  - hpio ==0.9.0.6
-  - hpp ==0.5.2
-  - hpqtypes ==1.5.2.0
+  - hpqtypes ==1.5.3.0
+  - hprotoc ==2.4.11
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
-  - hruby ==0.3.5.1
-  - hsass ==0.5.0
-  - hsb2hs ==0.3.1
-  - hs-bibutils ==6.2.0.1
+  - hruby ==0.3.5.4
+  - hsass ==0.7.0
+  - hs-bibutils ==6.6.0.0
   - hscolour ==1.24.4
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
@@ -1023,69 +998,67 @@ default-package-overrides:
   - HSet ==0.0.1
   - hset ==2.2.0
   - hsexif ==0.6.1.5
+  - hs-functors ==0.1.2.0
   - hs-GeoIP ==0.3
-  - hsignal ==0.2.7.5
+  - hsini ==0.5.1.2
   - hsinstall ==1.6
   - HSlippyMap ==3.0.1
   - hslogger ==1.2.10
   - hslua ==0.9.5.2
-  - hslua-aeson ==0.3.0.1
+  - hslua-aeson ==0.3.0.2
   - hslua-module-text ==0.1.2.1
-  - hsndfile ==0.8.0
-  - hsndfile-vector ==0.5.2
   - HsOpenSSL ==0.11.4.14
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.4.8
+  - hspec ==2.5.4
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
-  - hspec-contrib ==0.4.0
-  - hspec-core ==2.4.8
-  - hspec-discover ==2.4.8
+  - hspec-contrib ==0.5.0
+  - hspec-core ==2.5.4
+  - hspec-discover ==2.5.4
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.4
-  - hspec-golden-aeson ==0.5.1.0
+  - hspec-golden-aeson ==0.7.0.0
   - hspec-megaparsec ==1.0.0
   - hspec-meta ==2.4.6
   - hspec-pg-transact ==0.1.0.2
-  - hspec-smallcheck ==0.5.0
+  - hspec-smallcheck ==0.5.2
   - hspec-wai ==0.9.0
   - hspec-wai-json ==0.9.0
-  - hspec-webdriver ==1.2.0
-  - hsshellscript ==3.4.5
-  - hstatistics ==0.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8.1
   - hsyslog ==5.0.1
-  - hsyslog-udp ==0.2.2
-  - htaglib ==1.1.1
+  - hsyslog-udp ==0.2.3
+  - htaglib ==1.2.0
   - HTF ==0.13.2.4
   - html ==1.0.1.2
-  - html-conduit ==1.3.0
+  - html-conduit ==1.3.1
   - html-email-validate ==0.2.0.0
+  - html-entities ==1.1.4.2
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.11
+  - HTTP ==4000.3.12
   - http2 ==1.6.3
-  - http-api-data ==0.3.7.2
-  - http-client ==0.5.12.1
+  - http-api-data ==0.3.8.1
+  - http-client ==0.5.13.1
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
-  - http-conduit ==2.3.1
+  - http-conduit ==2.3.2
   - http-date ==0.0.7
+  - httpd-shed ==0.4.0.3
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
-  - http-reverse-proxy ==0.5.0.1
+  - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.6.1
   - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==1.1.0.3
+  - hunit-dejafu ==1.2.0.6
   - hvect ==0.4.0.0
   - hw-balancedparens ==0.2.0.1
   - hw-bits ==0.7.0.2
@@ -1093,18 +1066,18 @@ default-package-overrides:
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
-  - hw-fingertree ==0.1.0.1
   - hw-fingertree-strict ==0.1.1.1
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.5
   - hw-int ==0.0.0.3
+  - hw-ip ==0.1.0.0
   - hw-json ==0.6.0.0
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.5.0.5
+  - hw-prim ==0.6.2.0
   - hw-rankselect ==0.10.0.3
-  - hw-rankselect-base ==0.2.0.2
+  - hw-rankselect-base ==0.3.2.0
   - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
   - hw-xml ==0.1.0.3
@@ -1126,27 +1099,22 @@ default-package-overrides:
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - iff ==0.0.6
-  - ignore ==0.1.1.0
   - ihaskell ==0.9.0.3
   - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
-  - immortal ==0.2.2.1
-  - imprint ==0.0.1.0
+  - immortal ==0.3
   - include-file ==0.1.0.3
-  - incremental-parser ==0.2.5.4
+  - incremental-parser ==0.3.1.1
   - indentation-core ==0.0.0.1
   - indentation-parsec ==0.0.0.1
-  - indents ==0.4.0.1
-  - indexed-list-literals ==0.1.0.1
+  - indents ==0.5.0.0
+  - indexed-list-literals ==0.2.1.1
   - inflections ==0.4.0.3
-  - influxdb ==1.3.0.1
+  - influxdb ==1.6.0.6
   - ini ==0.3.6
-  - inline-c ==0.6.0.6
-  - inline-c-cpp ==0.2.1.0
-  - inline-java ==0.8.2
-  - inline-r ==0.9.1
+  - inliterate ==0.1.0
   - insert-ordered-containers ==0.2.1.0
   - inspection-testing ==0.2.0.1
   - instance-control ==0.1.2.0
@@ -1156,11 +1124,12 @@ default-package-overrides:
   - interpolate ==0.2.0
   - interpolatedstring-perl6 ==1.0.0
   - interpolation ==0.1.0.2
-  - IntervalMap ==0.5.3.1
+  - IntervalMap ==0.6.0.0
   - intervals ==0.8.1
   - intro ==0.3.1.0
   - invariant ==0.5
   - invertible ==0.2.0.5
+  - invertible-grammar ==0.1.1
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1169,186 +1138,169 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.5.0.1
   - io-streams-haproxy ==1.0.0.2
-  - ip ==1.1.2
-  - ip6addr ==0.5.3
+  - ip ==1.3.0
+  - ip6addr ==1.0.0
   - iproute ==1.7.5
-  - IPv6Addr ==1.0.3
-  - IPv6DB ==0.2.6
+  - IPv6Addr ==1.1.0
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.3
+  - irc-client ==1.1.0.4
   - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
-  - iso8601-time ==0.1.4
+  - iso8601-time ==0.1.5
   - iterable ==3.0
-  - ixset ==1.0.7
-  - ixset-typed ==0.3.1.1
+  - ixset-typed ==0.4
   - ix-shapable ==0.1.0
   - jack ==0.7.1.3
-  - javascript-extras ==0.3.2.0
   - jmacro ==0.6.15
-  - jmacro-rpc ==0.3.2
-  - jmacro-rpc-happstack ==0.3.2
+  - jmacro-rpc ==0.3.3
   - jmacro-rpc-snap ==0.3
-  - jni ==0.6.0
-  - jose ==0.6.0.3
+  - jose ==0.7.0.0
   - jose-jwt ==0.7.8
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.9.2
-  - json-autotype ==1.0.18
-  - json-builder ==0.3
+  - json-feed ==1.0.2
+  - json-rpc-client ==0.2.5.0
   - json-rpc-generic ==0.2.1.4
-  - json-schema ==0.7.4.1
-  - json-stream ==0.4.2.3
+  - json-rpc-server ==0.2.6.0
+  - json-schema ==0.7.4.2
   - JuicyPixels ==3.2.9.5
+  - JuicyPixels-blp ==0.1.0.1
   - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.2
   - justified-containers ==0.3.0.0
-  - jvm ==0.4.2
-  - jvm-batching ==0.1.1
-  - jvm-streaming ==0.3.1
   - jwt ==0.7.2
-  - kan-extensions ==5.1
-  - kanji ==3.1.0.1
-  - katydid ==0.1.1.0
+  - kan-extensions ==5.2
+  - kanji ==3.4.0
+  - kansas-comet ==0.4
   - kawhi ==0.3.0
   - kdt ==0.2.4
   - keycode ==0.2.2
-  - keys ==3.12
+  - keys ==3.12.1
+  - kleene ==0
   - kmeans ==0.1.3
-  - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.2
-  - lambdabot-core ==5.1.0.1
-  - lambdabot-irc-plugins ==5.1.0.1
+  - lackey ==1.0.4
+  - LambdaHack ==0.8.3.0
   - lame ==0.1.1
-  - language-c ==0.7.2
-  - language-c-quote ==0.12.1
-  - language-docker ==2.0.1
-  - language-ecmascript ==0.17.2.0
-  - language-fortran ==0.5.1
-  - language-glsl ==0.2.1
+  - language-c ==0.8.1
+  - language-c-quote ==0.12.2
+  - language-docker ==6.0.3
+  - language-ecmascript ==0.19
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.17
+  - language-puppet ==1.3.19
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.0.1
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - latex ==0.1.0.3
-  - lattices ==1.7.1
+  - lattices ==1.7.1.1
+  - lawful ==0.1.0.0
   - lazyio ==0.1.0.4
   - lca ==0.3.1
   - leancheck ==0.7.0
   - leapseconds-announced ==2017.1.0.1
+  - learn-physics ==0.6.2
   - lens ==4.16.1
-  - lens-accelerate ==0.1.0.0
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
   - lens-datetime ==0.3
   - lens-family ==1.2.2
   - lens-family-core ==1.2.2
-  - lens-family-th ==0.5.0.1
-  - lens-labels ==0.1.0.2
+  - lens-family-th ==0.5.0.2
+  - lens-labels ==0.2.0.1
+  - lens-misc ==0.0.2.0
   - lens-properties ==4.11.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
-  - lentil ==1.0.11.3
+  - lenz ==0.3.0.0
   - leveldb-haskell ==0.6.5
-  - lexer-applicative ==2.1.0.1
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
-  - libinfluxdb ==0.0.4
   - libmpd ==0.9.0.8
-  - liboath-hs ==0.0.1.0
-  - libsystemd-journal ==1.4.3
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
-  - licensor ==0.2.2
-  - lifted-async ==0.9.3.3
+  - lifted-async ==0.10.0.2
   - lifted-base ==0.2.3.12
   - lift-generics ==0.1.2
   - line ==4.0.1
-  - linear ==1.20.7
-  - linear-accelerate ==0.5.0.1
+  - linear ==1.20.8
   - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
-  - linux-namespaces ==0.1.2.0
+  - linux-namespaces ==0.1.3.0
   - List ==0.6.2
   - ListLike ==4.6
   - listsafe ==0.1.0.1
   - list-t ==1.0.1
-  - llvm-hs ==5.1.3
-  - llvm-hs-pure ==5.1.2
+  - llvm-hs ==6.3.0
+  - llvm-hs-pretty ==0.5.0.0
+  - llvm-hs-pure ==6.2.1
   - lmdb ==0.2.5
-  - load-env ==0.1.2
+  - load-env ==0.2.0.1
+  - locators ==0.2.4.4
   - loch-th ==0.2.2
   - lockfree-queue ==0.2.3.1
-  - log ==0.9.0.1
   - log-base ==0.7.4.0
   - log-domain ==0.12
-  - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.6
-  - logging-effect-extra ==1.2.2
-  - logging-effect-extra-file ==1.1.2
-  - logging-effect-extra-handler ==1.1.4
+  - logging-effect ==1.3.2
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
   - log-postgres ==0.7.0.2
-  - log-warper ==1.8.11
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
   - lucid ==2.9.10
-  - lxd-client ==0.1.0.6
+  - lucid-extras ==0.1.0.1
   - lxd-client-config ==0.1.0.1
+  - lz4 ==0.2.3.1
   - lzma ==0.0.0.3
   - lzma-conduit ==1.2.1
-  - machines ==0.6.3
+  - machines ==0.6.4
   - machines-binary ==0.3.0.3
   - machines-directory ==0.2.1.0
   - machines-io ==0.2.0.13
-  - mainland-pretty ==0.6.1
+  - magicbane ==0.3.0
+  - mainland-pretty ==0.7
+  - main-tester ==0.1.0.0
   - makefile ==1.1.0.0
   - managed ==1.0.6
-  - mandrill ==0.5.3.3
   - mapquest-api ==0.3.1
-  - map-syntax ==0.2.0.2
   - markdown ==0.1.17.1
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - markup ==4.0.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.1.6.1
-  - massiv-io ==0.1.3.0
+  - massiv ==0.2.0.0
+  - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
-  - matplotlib ==0.6.0
   - matrices ==0.4.5
-  - matrix ==0.3.5.0
+  - matrix ==0.3.6.1
   - matrix-market-attoparsec ==0.1.0.8
   - maximal-cliques ==0.1.1
   - mbox ==0.3.4
   - mbox-utility ==0.0.1
   - mbtiles ==0.6.0.0
+  - mbug ==1.3
   - mcmc-types ==1.0.3
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
-  - megaparsec ==6.4.1
+  - megaparsec ==6.5.0
+  - mega-sdist ==0.3.3
   - memory ==0.14.16
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
@@ -1356,15 +1308,15 @@ default-package-overrides:
   - messagepack ==0.5.4
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
-  - MFlow ==0.4.6.0
-  - microformats2-parser ==1.0.1.7
-  - microlens ==0.4.8.3
+  - mfsolve ==0.3.2.0
+  - microformats2-parser ==1.0.1.8
+  - microlens ==0.4.9.1
   - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
-  - microlens-ghc ==0.4.8.0
+  - microlens-ghc ==0.4.9
   - microlens-mtl ==0.1.11.1
-  - microlens-platform ==0.3.9.0
-  - microlens-th ==0.4.1.3
+  - microlens-platform ==0.3.10
+  - microlens-th ==0.4.2.1
   - microspec ==0.1.0.0
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
@@ -1372,17 +1324,17 @@ default-package-overrides:
   - milena ==0.5.2.2
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.1
-  - mime-types ==0.1.0.7
+  - mime-types ==0.1.0.8
   - minimorph ==0.1.6.1
-  - minio-hs ==1.0.1
+  - minio-hs ==1.2.0
+  - minisat-solver ==0.1
   - miniutter ==0.4.7.0
   - mintty ==0.1.2
-  - misfortune ==0.1.1.2
-  - miso ==0.14.0.0
+  - miso ==0.21.1.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mixed-types-num ==0.3.1.4
-  - mltool ==0.1.0.2
+  - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.5.6
   - mmark-cli ==0.0.3.0
@@ -1390,32 +1342,25 @@ default-package-overrides:
   - mmorph ==1.1.2
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
-  - model ==0.4.4
   - modern-uri ==0.2.1.0
-  - modify-fasta ==0.8.3.0
   - moesocks ==1.0.0.44
-  - mole ==0.0.6
   - monad-control ==1.0.2.3
   - monad-control-aligned ==0.0.1.1
   - monad-coroutine ==0.9.0.4
   - monad-extras ==0.6.0
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
-  - monadloc ==0.7.1
   - monad-logger ==0.3.28.5
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.10
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
-  - monad-metrics ==0.2.1.1
-  - monad-mock ==0.2.0.0
-  - monadoid ==0.0.2
+  - monad-metrics ==0.2.1.2
   - monad-par ==0.3.4.8
   - monad-parallel ==0.7.2.3
   - monad-par-extras ==0.3.3
   - monad-peel ==0.2.1.2
-  - monadplus ==1.4.2
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
   - MonadRandom ==0.5.1.1
@@ -1423,17 +1368,17 @@ default-package-overrides:
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
   - monads-tf ==0.1.0.3
-  - monad-time ==0.2
+  - monad-time ==0.3.1.0
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.3.0.5
+  - mongoDB ==2.4.0.0
   - monoidal-containers ==0.3.1.0
-  - monoid-extras ==0.4.4
+  - monoid-extras ==0.5
   - monoid-subclasses ==0.4.6
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.19
+  - morte ==1.6.20
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.2
@@ -1442,58 +1387,57 @@ default-package-overrides:
   - multiarg ==0.30.0.10
   - multimap ==1.2.1
   - multipart ==0.1.2
-  - multiset ==0.3.4
-  - multistate ==0.7.1.2
+  - multistate ==0.8.0.0
   - murmur-hash ==0.1.0.9
+  - MusicBrainz ==0.4
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
-  - mwc-probability ==2.0.3
+  - mwc-probability ==2.0.4
+  - mwc-probability-transition ==0.4
   - mwc-random ==0.13.6.0
-  - mwc-random-accelerate ==0.1.0.0
   - mysql ==0.1.5
   - mysql-haskell ==0.8.3.0
   - mysql-haskell-nem ==0.1.0.0
   - mysql-haskell-openssl ==0.8.3.0
   - mysql-simple ==0.4.5
   - nagios-check ==0.3.2
-  - names-th ==0.2.0.4
+  - named ==0.1.0.0
+  - names-th ==0.3.0.0
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
-  - naqsha ==0.2.0.1
   - nats ==1.1.2
+  - natural-induction ==0.2.0.0
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
-  - neat-interpolation ==0.3.2.1
+  - neat-interpolation ==0.3.2.2
   - netlib-carray ==0.0.1.1
-  - netlib-ffi ==0.0.1
+  - netlib-ffi ==0.1
   - netpbm ==1.0.2
-  - nettle ==0.2.0
+  - nettle ==0.3.0
   - netwire ==5.0.3
   - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.10
-  - network ==2.6.3.5
+  - network ==2.6.3.6
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.12
-  - network-conduit-tls ==1.3.0
+  - network-conduit-tls ==1.3.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.10
   - network-ip ==0.3.0.2
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.3
   - network-simple ==0.4.1
+  - network-simple-tls ==0.3
   - network-transport ==0.5.2
   - network-transport-composed ==0.2.1
   - network-transport-inmemory ==0.5.2
-  - network-transport-tcp ==0.6.0
   - network-transport-tests ==0.2.4.2
   - network-uri ==2.6.1.0
   - newtype ==0.2
   - newtype-generics ==0.5.3
   - next-ref ==0.1.0.2
-  - nfc ==0.1.0
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
@@ -1503,40 +1447,40 @@ default-package-overrides:
   - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
-  - normalization-insensitive ==2.0.1
-  - NoTrace ==0.3.0.2
   - nsis ==0.3.2
-  - n-tuple ==0.0.2.0
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3
-  - numhask ==0.1.4.0
-  - numhask-range ==0.1.3.0
+  - numhask ==0.2.3.1
+  - numhask-prelude ==0.1.0.1
+  - numhask-range ==0.2.3.1
+  - numhask-test ==0.1.0.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - nvvm ==0.8.0.3
+  - nvim-hs ==1.0.0.2
+  - nvim-hs-contrib ==1.0.0.0
   - oauthenticated ==0.2.1.0
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
-  - ochintin-daicho ==0.1.0.1
-  - o-clock ==0.1.1
+  - o-clock ==1.0.0
+  - odbc ==0.2.0
   - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
+  - om-elm ==1.0.0.3
   - once ==0.2
-  - one-liner ==0.9.2
+  - one-liner ==1.0
   - one-liner-instances ==0.1.2.1
   - OneTuple ==0.2.2
-  - online ==0.2.1.0
+  - online ==0.3.0.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.7000.0
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.1
   - OpenGL ==3.0.2.1
-  - OpenGLRaw ==3.2.7.0
+  - OpenGLRaw ==3.3.0.1
   - openpgp-asciiarmor ==0.1.1
   - opensource ==0.1.0.0
   - openssl-streams ==1.2.1.3
@@ -1551,95 +1495,85 @@ default-package-overrides:
   - optparse-simple ==0.1.0
   - optparse-text ==0.1.1.0
   - overhang ==1.0.0
-  - package-description-remote ==0.2.0.0
-  - packdeps ==0.4.4
+  - packcheck ==0.3.1
+  - packdeps ==0.4.5
   - pager ==0.1.1.0
-  - pagerduty ==0.0.8
   - pagination ==0.2.1
-  - palette ==0.1.0.5
-  - pandoc ==2.1.2
+  - palette ==0.3.0.1
+  - pandoc ==2.2.1
   - pandoc-citeproc ==0.14.3.1
-  - pandoc-types ==1.17.3.1
+  - pandoc-types ==1.17.5.1
   - pango ==0.13.5.0
-  - papillon ==0.1.0.5
+  - papillon ==0.1.0.6
   - parallel ==3.2.1.1
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.13.0
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
-  - parser-combinators ==0.4.0
-  - parsers ==0.12.8
+  - parser-combinators ==1.0.0
+  - parsers ==0.12.9
   - partial-handler ==1.0.3
   - partial-isomorphisms ==0.2.2.1
   - partial-order ==0.1.2.1
-  - partial-semigroup ==0.3.0.3
   - path ==0.6.1
-  - path-extra ==0.0.6
+  - path-extra ==0.2.0
   - path-io ==1.3.3
   - path-pieces ==0.2.1
-  - path-text-utf8 ==0.0.1.0
   - pathtype ==0.8.1
   - pathwalk ==0.3.1.2
-  - patience ==0.1.1
   - pattern-arrows ==0.0.2
   - pcf-font ==0.2.2.0
   - pcf-font-embed ==0.1.2.0
+  - pcg-random ==0.1.3.5
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.0.4
   - pcre-utils ==0.1.8.1.1
   - pdfinfo ==1.5.4
-  - pdf-toolbox-content ==0.0.5.1
-  - pdf-toolbox-core ==0.0.4.1
-  - pdf-toolbox-document ==0.0.7.1
-  - pell ==0.1.1.0
+  - peano ==0.1.0.1
   - pem ==0.2.4
-  - perf ==0.3.1.1
+  - perf ==0.4.1.0
   - perfect-hash-generator ==0.2.0.6
-  - persistable-record ==0.6.0.3
-  - persistable-types-HDBC-pg ==0.0.3.2
+  - persistable-record ==0.6.0.4
+  - persistable-types-HDBC-pg ==0.0.3.5
   - persistent ==2.8.2
-  - persistent-mongoDB ==2.8.0
+  - persistent-iproute ==0.2.3
   - persistent-mysql ==2.8.1
-  - persistent-mysql-haskell ==0.4.0
+  - persistent-mysql-haskell ==0.4.1
   - persistent-postgresql ==2.8.2.0
-  - persistent-redis ==2.5.2.2
   - persistent-refs ==0.4
   - persistent-sqlite ==2.8.1.2
   - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
-  - picedit ==0.2.3.0
-  - picoparsec ==0.1.2.3
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
   - pinboard ==0.9.12.10
-  - pinch ==0.3.2.0
   - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
+  - pipes-binary ==0.4.2
   - pipes-bytestring ==2.1.6
   - pipes-category ==0.3.0.0
-  - pipes-concurrency ==2.0.10
+  - pipes-concurrency ==2.0.11
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.14
+  - pipes-extras ==1.0.15
   - pipes-fastx ==0.3.0.0
-  - pipes-fluid ==0.6.0.0
-  - pipes-group ==1.0.10
-  - pipes-misc ==0.4.0.1
-  - pipes-mongodb ==0.1.0.0
+  - pipes-fluid ==0.6.0.1
+  - pipes-group ==1.0.12
+  - pipes-http ==1.0.5
+  - pipes-misc ==0.5.0.0
   - pipes-network ==0.6.5
+  - pipes-network-tls ==0.3
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.4
   - pipes-safe ==2.2.9
-  - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
-  - pixelated-avatar-generator ==0.1.3
   - pkcs10 ==0.2.0.0
   - placeholders ==0.1
-  - plot ==0.2.3.9
-  - plot-light ==0.2.9
+  - plot-light ==0.4.3
+  - plotlyhs ==0.2
   - pointed ==5.0.1
   - pointedlist ==0.6.1
   - pointless-fun ==1.1.0.6
@@ -1647,10 +1581,8 @@ default-package-overrides:
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
-  - pomaps ==0.0.0.4
   - pooled-io ==0.0.2.1
-  - PortMidi ==0.1.6.1
-  - posix-paths ==0.2.1.5
+  - portable-lines ==0.1
   - postgresql-binary ==0.12.1.1
   - postgresql-libpq ==0.9.4.1
   - postgresql-schema ==0.1.14
@@ -1661,103 +1593,93 @@ default-package-overrides:
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.3.0
   - post-mess-age ==0.2.1.0
-  - pptable ==0.2.0.0
+  - pptable ==0.3.0.0
   - pqueue ==1.4.1.1
-  - pred-set ==0.0.1
-  - pred-trie ==0.5.1.2
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.1
   - prelude-extras ==0.4.0.3
   - prelude-safeenum ==0.1.1.2
-  - preprocessor-tools ==1.0.1
   - present ==4.1.0
   - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
-  - prettyprinter ==1.2.0.1
+  - prettyprinter ==1.2.1
   - prettyprinter-ansi-terminal ==1.1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
-  - pretty-show ==1.6.16
+  - prettyprinter-convert-ansi-wl-pprint ==1.1
+  - pretty-show ==1.7
   - pretty-simple ==2.1.0.0
   - pretty-types ==0.2.3.1
-  - prim-array ==0.2.2
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
   - prim-uniq ==0.1.0.1
   - probability ==0.2.5.1
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.2
-  - product-profunctors ==0.9.0.0
+  - product-profunctors ==0.10.0.0
   - profiterole ==0.1
   - profunctors ==5.2.2
   - projectroot ==0.2.0.1
   - project-template ==0.2.0.1
   - prometheus-client ==0.3.0
-  - prometheus-metrics-ghc ==0.3.0
   - promises ==0.3
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.2
   - protobuf-simple ==0.1.0.5
-  - protocol-buffers ==2.4.10
-  - protocol-buffers-descriptor ==2.4.10
+  - protocol-buffers ==2.4.11
+  - protocol-buffers-descriptor ==2.4.11
   - protocol-radius ==0.0.1.0
   - protocol-radius-test ==0.0.1.0
-  - proto-lens ==0.2.2.0
-  - proto-lens-arbitrary ==0.1.1.1
-  - proto-lens-descriptors ==0.2.2.0
+  - proto-lens ==0.3.1.0
+  - proto-lens-arbitrary ==0.1.2.1
+  - proto-lens-combinators ==0.1.0.10
   - proto-lens-optparse ==0.1.1.1
+  - proto-lens-protobuf-types ==0.3.0.1
+  - proto-lens-protoc ==0.3.1.0
   - protolude ==0.2.2
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
-  - PSQueue ==1.1
   - psqueues ==0.2.7.0
-  - pthread ==0.2.0
-  - publicsuffix ==0.20171229
-  - pure-io ==0.2.1
+  - publicsuffix ==0.20180513
   - pureMD5 ==2.1.3
-  - purescript-bridge ==0.11.1.2
+  - purescript-bridge ==0.13.0.0
+  - pure-zlib ==0.6.4
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==1.5.1.4
-  - pwstore-fast ==2.4.4
-  - qchas ==1.1.0.0
   - qm-interpolated-string ==0.3.0.0
+  - qnap-decrypt ==0.3.2
   - QuasiText ==0.1.2.6
   - quickbench ==1.0
-  - QuickCheck ==2.10.1
+  - QuickCheck ==2.11.3
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-classes ==0.3.3
-  - quickcheck-combinators ==0.0.2
   - quickcheck-instances ==0.3.18
   - quickcheck-io ==0.2.0
-  - quickcheck-properties ==0.1
-  - quickcheck-simple ==0.1.0.3
+  - quickcheck-simple ==0.1.0.4
   - quickcheck-special ==0.1.0.6
-  - quickcheck-state-machine ==0.3.1
   - quickcheck-text ==0.1.2.1
   - quickcheck-unicode ==1.0.1.0
-  - quickcheck-with-counterexamples ==1.0
-  - raaz ==0.2.0
-  - rainbow ==0.28.0.4
-  - rainbox ==0.18.0.10
-  - rakuten ==0.1.1.3
+  - quicklz ==1.5.0.11
+  - rainbow ==0.30.0.2
+  - rainbox ==0.20.0.0
+  - rakuten ==0.1.1.4
   - ramus ==0.1.2
   - random ==1.1
+  - random-bytestring ==0.1.3.1
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
   - range-set-list ==0.1.3
   - rank1dynamic ==0.4.0
-  - rank2classes ==1.0.2
-  - rank-product ==0.2.0.1
+  - rank2classes ==1.1.0.1
   - Rasterific ==0.7.3
   - rasterific-svg ==0.3.3.1
-  - ratel ==1.0.3
+  - ratel ==1.0.4
   - ratel-wai ==1.0.2
   - ratio-int ==0.1.2
+  - rattletrap ==4.1.1
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
@@ -1768,19 +1690,15 @@ default-package-overrides:
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - recursion-schemes ==5.0.2
-  - redis-io ==0.7.0
-  - redis-resp ==0.4.0
-  - reducers ==3.12.2
+  - rebase ==1.2.4
+  - record-dot-preprocessor ==0.1.1
+  - recursion-schemes ==5.0.3
+  - reducers ==3.12.3
   - refact ==0.3.0.2
   - references ==0.3.3.1
   - ref-fd ==0.4.0.1
-  - refined ==0.1.2.1
-  - reflection ==2.1.3
-  - reform ==0.2.7.2
-  - reform-blaze ==0.2.4.3
-  - reform-hamlet ==0.0.5.3
-  - reform-happstack ==0.2.5.2
+  - refined ==0.2.3.0
+  - reflection ==2.1.4
   - RefSerialize ==0.4.0
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
@@ -1791,178 +1709,179 @@ default-package-overrides:
   - regex-pcre-builtin ==0.94.4.8.8.35
   - regex-pcre-text ==0.94.0.1
   - regex-posix ==0.95.2
-  - regex-tdfa ==1.2.3
+  - regex-tdfa ==1.2.3.1
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.11.1.0
-  - relational-query-HDBC ==0.6.6.1
-  - relational-record ==0.2.1.2
-  - relational-schemas ==0.1.6.1
-  - rematch ==0.2.0.0
+  - relational-query ==0.12.0.1
+  - relational-query-HDBC ==0.7.0.0
+  - relational-record ==0.2.2.0
+  - relational-schemas ==0.1.6.2
   - renderable ==0.2.0.1
   - repa ==3.4.1.3
-  - repa-algorithms ==3.4.1.2
-  - repa-io ==3.4.1.1
   - repline ==0.1.7.0
-  - req ==1.0.0
+  - req ==1.1.0
+  - req-conduit ==1.0.0
+  - require ==0.2.1
   - req-url-extra ==0.1.0.0
-  - reroute ==0.4.1.0
+  - resolv ==0.1.1.1
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.1
-  - rest-core ==0.39
-  - rest-snap ==0.3.0.0
   - rest-stringmap ==0.2.0.7
-  - rest-types ==1.14.1.2
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.7.6.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
-  - riak ==1.1.2.4
+  - rhine ==0.4.0.1
+  - riak ==1.1.2.5
   - riak-protobuf ==0.23.0.0
-  - rio ==0.1.2.0
+  - rio ==0.1.4.0
+  - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
-  - rollbar-hs ==0.2.0.0
-  - rose-trees ==0.0.4.4
   - rot13 ==0.2.0.1
   - RSA ==2.3.0
   - rss-conduit ==0.4.2.1
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
-  - s3-signer ==0.3.0.0
+  - s3-signer ==0.5.0.0
   - safe ==0.3.17
   - safecopy ==0.9.4.1
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
+  - safe-foldable ==0.1.0.0
   - safeio ==0.0.5.0
+  - safe-money ==0.6
   - SafeSemaphore ==0.10.1
+  - saltine ==0.1.0.1
+  - salve ==1.0.3
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
+  - sandi ==0.4.2
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - sbp ==2.3.16
-  - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
-  - schematic ==0.4.2.0
   - scientific ==0.3.6.2
-  - scotty ==0.11.1
+  - scotty ==0.11.2
   - scrypt ==0.5.0
-  - sdl2 ==2.4.0.1
+  - sdl2 ==2.4.1.0
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
-  - sdl2-ttf ==2.0.2
+  - sdl2-ttf ==2.1.0
   - search-algorithms ==0.3.0
   - securemem ==0.1.10
   - SegmentTree ==0.3
-  - selda ==0.1.12.1
+  - selda ==0.2.0.0
   - selda-postgresql ==0.1.7.2
   - selda-sqlite ==0.1.6.0
   - semigroupoid-extras ==5
   - semigroupoids ==5.2.2
-  - semigroups ==0.18.4
+  - semigroups ==0.18.5
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
   - sendfile ==0.7.9
-  - sensu-run ==0.4.0.5
   - seqalign ==0.2.0.4
-  - seqloc ==0.6.1.1
-  - sequence ==0.9.8
   - serf ==0.1.1.0
-  - servant ==0.13.0.1
+  - servant ==0.14.1
+  - servant-auth ==0.3.2.0
+  - servant-auth-client ==0.3.3.0
+  - servant-auth-docs ==0.2.10.0
+  - servant-auth-server ==0.4.0.0
+  - servant-auth-swagger ==0.2.10.0
   - servant-blaze ==0.8
   - servant-cassava ==0.10
-  - servant-client ==0.13.0.1
-  - servant-client-core ==0.13.0.1
+  - servant-checked-exceptions ==2.0.0.0
+  - servant-checked-exceptions-core ==2.0.0.0
+  - servant-client ==0.14
+  - servant-client-core ==0.14.1
+  - servant-dhall ==0.1.0.1
   - servant-docs ==0.11.2
-  - servant-elm ==0.4.0.1
+  - servant-elm ==0.5.0.0
   - servant-exceptions ==0.1.1
   - servant-foreign ==0.11.1
-  - servant-generic ==0.1.0.1
   - servant-github-webhook ==0.4.1.0
   - servant-js ==0.9.3.2
-  - servant-JuicyPixels ==0.3.0.3
-  - servant-kotlin ==0.1.1.1
-  - servant-lucid ==0.8
+  - servant-JuicyPixels ==0.3.0.4
+  - servant-lucid ==0.8.1
   - servant-mock ==0.8.4
   - servant-pandoc ==0.5.0.0
-  - servant-purescript ==0.9.0.2
-  - servant-ruby ==0.7.0.0
-  - servant-server ==0.13.0.1
-  - servant-static-th ==0.2.0.1
-  - servant-subscriber ==0.6.0.1
+  - servant-ruby ==0.8.0.1
+  - servant-server ==0.14.1
+  - servant-static-th ==0.2.2.0
+  - servant-streaming ==0.3.0.0
+  - servant-streaming-client ==0.3.0.0
+  - servant-streaming-server ==0.3.0.0
   - servant-swagger ==1.1.5
-  - servant-swagger-ui ==0.2.5.3.9.1
+  - servant-swagger-ui ==0.3.0.3.13.2
+  - servant-swagger-ui-core ==0.3.1
+  - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
+  - serverless-haskell ==0.6.1
   - serversession ==1.0.1
-  - serversession-backend-persistent ==1.0.4
-  - serversession-backend-redis ==1.0.3
   - serversession-frontend-wai ==1.0
   - servius ==1.2.0.3
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
   - setlocale ==1.0.0.6
-  - set-monad ==0.2.0.0
-  - sets ==0.0.5.2
+  - sexp-grammar ==2.0.1
   - SHA ==1.6.4.4
   - shake ==0.16.4
-  - shake-language-c ==0.11.0
+  - shake-language-c ==0.12.0
   - shakespeare ==2.0.15
+  - shell-conduit ==4.7.0
+  - shell-escape ==0.2.0
   - shelltestrunner ==1.9
-  - shelly ==1.7.2
-  - shikensu ==0.3.8
+  - shelly ==1.8.1
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.1.0.0
-  - show-prettyprint ==0.2.0.2
+  - show-prettyprint ==0.2.2
+  - siggy-chardust ==1.0.0
   - signal ==0.1.0.4
   - silently ==1.2.5
-  - simple ==0.11.2
-  - simple-log ==0.9.5
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
-  - simple-session ==0.10.1.1
-  - simple-templates ==0.8.0.1
+  - simplest-sqlite ==0.1.0.0
+  - simple-vec3 ==0.4.0.7
+  - since ==0.0.0
   - singleton-bool ==0.1.4
   - singleton-nats ==0.4.1
-  - singletons ==2.3.1
+  - singletons ==2.4.1
   - siphash ==1.0.3
+  - size-based ==0.1.1.0
   - skein ==1.0.9.4
-  - skeletons ==0.4.0
-  - skylighting ==0.6
-  - slack-web ==0.2.0.4
+  - skylighting ==0.7.2
+  - skylighting-core ==0.7.2
+  - slack-web ==0.2.0.6
   - slave-thread ==1.0.2
-  - slug ==0.1.7
-  - smallcheck ==1.1.4
-  - smoothie ==0.4.2.8
+  - smallcheck ==1.1.5
+  - smoothie ==0.4.2.9
   - smtp-mail ==0.1.4.6
-  - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.3.2
-  - snap-server ==1.0.3.3
+  - snappy ==0.2.0.2
+  - snap-server ==1.1.0.0
   - snowflake ==0.1.1.1
   - soap ==0.2.3.6
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.4
-  - socket ==0.8.0.1
   - socket-activation ==0.1.0.2
   - socks ==0.5.6
   - sort ==1.0.0.0
-  - sorted-list ==0.2.0.0
+  - sorted-list ==0.2.1.0
   - sourcemap ==0.1.6
   - sox ==0.2.3
   - soxlib ==0.0.3
-  - sparkle ==0.7.4
-  - sparse-linear-algebra ==0.2.9.9
-  - spdx ==0.2.2.0
+  - sparse-linear-algebra ==0.3.1
   - special-values ==0.1.0.0
   - speculate ==0.3.2
   - speculation ==1.5.0.3
@@ -1971,31 +1890,25 @@ default-package-overrides:
   - Spintax ==0.3.2
   - splice ==0.6.1.1
   - split ==0.2.3.3
-  - splitmix ==0
-  - Spock ==0.12.0.0
-  - Spock-api ==0.12.0.0
-  - Spock-api-server ==0.12.0.0
-  - Spock-core ==0.12.0.0
-  - Spock-lucid ==0.4.0.1
-  - Spock-worker ==0.3.1.0
+  - splitmix ==0.0.1
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.7
-  - sqlite-simple ==0.4.15.0
-  - sql-words ==0.1.6.1
-  - squeal-postgresql ==0.1.1.4
+  - sqlite-simple ==0.4.16.0
+  - sqlite-simple-errors ==0.6.1.0
+  - sql-words ==0.1.6.2
+  - squeal-postgresql ==0.3.1.0
   - srcloc ==0.5.1.2
   - stache ==1.2.1
-  - stack-type ==0.1.0.0
-  - starter ==0.2.1
+  - starter ==0.3.0
   - state-codes ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.1.0
-  - stateWriter ==0.2.10
+  - static-canvas ==0.2.0.3
   - static-text ==0.2.0.1
   - statistics ==0.14.0.2
   - stb-image-redux ==0.2.1.2
-  - stitch ==0.5.0.0
+  - step-function ==0.2
   - stm ==2.4.5.0
   - stm-chans ==3.0.0.4
   - stm-conduit ==4.0.0
@@ -2005,28 +1918,27 @@ default-package-overrides:
   - STMonadTrans ==0.4.3
   - stm-split ==0.0.2
   - stm-stats ==0.2.0.0
-  - stm-supply ==0.2.0.0
   - stopwatch ==0.1.0.5
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.4
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
-  - store ==0.4.3.2
-  - store-core ==0.4.3
+  - store ==0.5.0
+  - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.19.1
+  - stratosphere ==0.24.1
   - streaming ==0.2.1.0
+  - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
-  - streaming-commons ==0.1.19
-  - streamly ==0.1.2
+  - streaming-commons ==0.2.1.0
+  - streaming-wai ==0.1.1
+  - streamly ==0.3.0
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
   - strict-base-types ==0.6.1
   - strict-concurrency ==0.2.4.2
-  - strict-types ==0.1.2
-  - stringable ==0.1.3
   - stringbuilder ==0.5.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
@@ -2034,20 +1946,21 @@ default-package-overrides:
   - string-conversions ==0.4.0.1
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
-  - string-transform ==1.0.0
-  - stripe-core ==2.3.0
-  - strive ==5.0.4
+  - string-transform ==1.1.0
+  - strive ==5.0.5
   - structs ==0.1.1
+  - stylish-haskell ==0.9.2.0
+  - summoner ==1.0.4
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
   - svg-builder ==0.1.1
+  - SVGFonts ==1.7
   - svg-tree ==0.6.2.2
   - swagger ==0.3.0
-  - swagger2 ==2.2.1
+  - swagger2 ==2.2.2
   - swish ==0.9.2.1
   - syb ==0.7
-  - syb-with-class ==0.6.1.9
   - symbol ==0.2.4
   - symengine ==0.1.2.0
   - sysinfo ==0.1.1
@@ -2059,27 +1972,27 @@ default-package-overrides:
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.1
   - tagged-identity ==0.1.2
+  - tagged-transformer ==0.8.1
   - tagshare ==0.0
   - tagsoup ==0.14.6
   - tagstream-conduit ==0.5.5.3
+  - tao ==1.0.0
+  - tao-example ==1.0.0
   - tar ==0.5.1.0
-  - tar-conduit ==0.2.3
+  - tar-conduit ==0.2.3.1
   - tardis ==0.4.1.0
-  - tasty ==1.0.1.1
+  - tasty ==1.1.0.2
   - tasty-ant-xml ==1.1.4
-  - tasty-auto ==0.2.0.0
-  - tasty-dejafu ==1.1.0.2
-  - tasty-discover ==4.2.0
+  - tasty-dejafu ==1.2.0.7
+  - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.1
-  - tasty-golden ==2.3.1.3
-  - tasty-hedgehog ==0.1.0.2
-  - tasty-hspec ==1.1.4
-  - tasty-html ==0.4.1.1
+  - tasty-golden ==2.3.2
+  - tasty-hedgehog ==0.2.0.0
+  - tasty-hspec ==1.1.5
   - tasty-hunit ==0.10.0.1
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
-  - tasty-quickcheck ==0.9.2
-  - tasty-rerun ==1.1.12
+  - tasty-quickcheck ==0.10
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.4
@@ -2088,69 +2001,63 @@ default-package-overrides:
   - tce-conf ==1.3
   - tcp-streams ==1.0.1.0
   - tcp-streams-openssl ==1.0.1.0
-  - tdigest ==0.1
-  - teardown ==0.3.0.0
-  - template ==0.2.0.10
-  - temporary ==1.2.1.1
+  - tdigest ==0.2.1
+  - teardown ==0.5.0.0
+  - telegram-bot-simple ==0.2.0
+  - temporary ==1.3
   - temporary-rc ==1.2.0.3
   - tensorflow-test ==0.1.0.0
-  - termcolor ==0.2.0.0
-  - terminal-progress-bar ==0.2
   - terminal-size ==0.3.2.1
-  - test-fixture ==0.5.1.0
   - test-framework ==0.8.2.0
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
-  - testing-feat ==0.4.0.3
-  - texmath ==0.10.1.2
+  - testing-feat ==1.1.0.0
+  - testing-type-modifiers ==0.1.0.1
+  - texmath ==0.11.0.1
   - text ==1.2.3.0
   - text-binary ==0.2.1.1
+  - text-builder ==0.5.1.1
   - text-conversions ==0.3.0
-  - text-format ==0.3.1.1
-  - text-generic-pretty ==1.2.1
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.12
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
-  - text-postgresql ==0.0.3.0
+  - text-postgresql ==0.0.3.1
   - text-printer ==0.5
-  - text-region ==0.3.1.0
   - text-short ==0.1.2
-  - text-show ==3.7.2
-  - text-show-instances ==3.6.3
+  - text-show ==3.7.4
+  - text-show-instances ==3.6.5
   - text-zipper ==0.10.1
   - tfp ==1.0.0.2
   - tf-random ==0.5
-  - th-abstraction ==0.2.6.0
+  - th-abstraction ==0.2.8.0
   - th-data-compat ==0.0.2.6
-  - th-desugar ==1.7
+  - th-desugar ==1.8
   - these ==0.7.4
   - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.10
   - th-lift-instances ==0.1.11
-  - th-orphans ==0.13.5
+  - th-nowq ==0.1.0.2
+  - th-orphans ==0.13.6
+  - th-printf ==0.5.1
   - thread-hierarchy ==0.3.0.0
-  - thread-local-storage ==0.1.2
+  - thread-local-storage ==0.2
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
-  - threepenny-editors ==0.5.6
-  - threepenny-gui ==0.8.2.3
-  - threepenny-gui-flexbox ==0.4.2
+  - threepenny-gui ==0.8.2.4
   - th-reify-compat ==0.0.1.4
   - th-reify-many ==0.1.8
   - throttle-io-stream ==0.2.0.1
   - through-text ==0.1.0.0
   - throwable-exceptions ==0.1.0.9
   - th-strict-compat ==0.1.0.1
-  - th-to-exp ==0.0.1.1
   - th-utilities ==0.2.0.1
   - tibetan-utils ==0.1.1.5
-  - tidal ==0.9.9
   - tile ==0.3.0.0
   - time-compat ==0.1.0.3
   - timeit ==2.0
@@ -2158,50 +2065,39 @@ default-package-overrides:
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.4
   - time-locale-vietnamese ==1.0.0.0
-  - timemap ==0.0.7
   - time-parsers ==0.1.2.0
   - timerep ==2.0.0.2
-  - timespan ==0.3.0.0
   - timezone-olson ==0.1.9
   - timezone-series ==0.1.9
+  - tintin ==1.9.1
   - tinylog ==0.14.1
-  - tinytemplate ==0.1.2.0
   - titlecase ==1.0.1
-  - tldr ==0.3.0
   - tls ==1.4.1
   - tls-debug ==0.4.5
   - tls-session-manager ==0.0.0.2
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.1.1
-  - token-bucket ==0.1.0.1
+  - tomland ==0.3
   - tostring ==0.2.1.1
-  - transformers-base ==0.4.4
+  - transaction ==0.1.1.3
+  - transformers-base ==0.4.5.2
   - transformers-bifunctors ==0.1
-  - transformers-compat ==0.5.1.4
-  - transformers-either ==0.0.2
+  - transformers-compat ==0.6.2
   - transformers-fix ==1.0
   - transformers-lift ==0.2.0.1
-  - transient ==0.5.9.2
-  - transient-universe ==0.4.6.1
   - traverse-with-class ==1.0.0.0
   - tree-diff ==0.0.1
   - tree-fun ==0.8.1.0
-  - tries ==0.0.5
-  - trifecta ==1.7.1.1
+  - trifecta ==2
   - triplesec ==0.1.2.0
-  - true-name ==0.1.0.3
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
+  - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.8
-  - turtle-options ==0.1.0.4
-  - type-assertions ==0.1.0.0
-  - type-combinators ==0.2.4.3
-  - type-combinators-singletons ==0.2.1.0
-  - TypeCompose ==0.9.12
+  - turtle ==1.5.10
   - typed-process ==0.2.2.0
   - type-fun ==0.1.1
   - type-hint ==0.1
@@ -2209,19 +2105,20 @@ default-package-overrides:
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - typelits-witnesses ==0.3.0.2
-  - type-of-html ==1.3.4.0
+  - typenums ==0.1.1.1
+  - type-of-html ==1.4.0.1
+  - type-of-html-static ==0.1.0.2
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
   - tz ==0.1.3.1
   - tzdata ==0.1.20180122.0
-  - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
   - unbound-generics ==0.3.3
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
-  - unexceptionalio ==0.3.0
+  - unconstrained ==0.1.0.2
   - unfoldable ==0.9.6
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0.1
@@ -2231,18 +2128,17 @@ default-package-overrides:
   - union ==0.1.1.2
   - union-find ==0.2
   - uniplate ==1.6.12
+  - uniprot-kb ==0.1.2.0
   - uniq-deep ==1.1.0.0
-  - Unique ==0.4.7.2
   - unique ==0
   - unit-constraint ==0.0.0
-  - units-parser ==0.1.1.2
   - universe ==1.0
   - universe-base ==1.0.2.1
   - universe-instances-base ==1.0
   - universe-instances-extended ==1.0.0.1
   - universe-instances-trans ==1.0.0.1
   - universe-reverse-instances ==1.0
-  - universum ==1.1.1
+  - universum ==1.2.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
@@ -2250,113 +2146,103 @@ default-package-overrides:
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
-  - unordered-intmap ==0.1.0.0
+  - unordered-intmap ==0.1.1
   - unsafe ==0.0
   - uri-bytestring ==0.3.2.0
-  - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
-  - urlpath ==8.0.1
-  - userid ==0.1.3.2
+  - urlpath ==9.0.0
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
   - utf8-light ==0.4.2
   - utf8-string ==1.0.1.1
+  - util ==0.1.10.1
   - utility-ht ==0.0.14
   - uuid ==1.3.13
   - uuid-types ==1.0.3
-  - vado ==0.0.9
   - validation ==1
-  - validationt ==0.2.0.0
-  - validity ==0.4.0.4
-  - validity-aeson ==0.1.0.0
-  - validity-bytestring ==0.2.0.0
-  - validity-containers ==0.2.0.0
-  - validity-path ==0.2.0.2
-  - validity-scientific ==0.1.0.0
-  - validity-text ==0.2.0.1
-  - validity-time ==0.1.0.0
-  - validity-unordered-containers ==0.1.0.0
-  - validity-uuid ==0.0.0.0
-  - validity-vector ==0.1.0.0
-  - varying ==0.7.0.3
+  - validity ==0.7.0.0
+  - validity-aeson ==0.2.0.2
+  - validity-bytestring ==0.3.0.2
+  - validity-containers ==0.3.1.0
+  - validity-path ==0.3.0.1
+  - validity-scientific ==0.2.0.1
+  - validity-text ==0.3.0.1
+  - validity-time ==0.2.0.1
+  - validity-unordered-containers ==0.2.0.1
+  - validity-uuid ==0.1.0.1
+  - validity-vector ==0.2.0.1
+  - valor ==0.1.0.0
   - vault ==0.3.1.1
-  - vcswrapper ==0.1.6
+  - vec ==0.1
   - vector ==0.12.0.1
   - vector-algorithms ==0.7.0.1
   - vector-binary-instances ==0.2.4
   - vector-buffer ==0.4.1
   - vector-builder ==0.3.4.1
-  - vector-fftw ==0.1.3.8
+  - vector-bytes-instances ==0.1.1
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
-  - vector-sized ==0.6.1.0
+  - vector-sized ==1.0.3.0
   - vector-space ==0.13
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.3.0
+  - vectortiles ==1.4.0
   - verbosity ==0.2.3.0
-  - versions ==3.3.2
-  - vhd ==0.2.2
+  - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - vinyl ==0.7.0
+  - viewprof ==0.0.0.18
+  - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
   - vivid-supercollider ==0.3.0.0
   - void ==0.7.2
-  - vty ==5.20
+  - vty ==5.21
   - wai ==3.2.1.2
   - wai-app-static ==3.1.6.2
   - wai-cli ==0.1.1
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.22.0
-  - wai-handler-launch ==3.0.2.3
+  - wai-extra ==3.0.22.1
+  - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
-  - wai-middleware-caching-redis ==0.2.0.0
   - wai-middleware-consul ==0.1.0.2
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
-  - wai-middleware-prometheus ==0.3.0
-  - wai-middleware-rollbar ==0.10.0
   - wai-middleware-static ==0.8.2
-  - wai-middleware-throttle ==0.2.2.1
+  - wai-middleware-travisci ==0.1.0
   - wai-predicates ==0.10.0
-  - wai-route ==0.3.1.2
-  - wai-routing ==0.13.0
   - wai-session ==0.3.3
   - wai-session-postgresql ==0.2.1.2
   - wai-slack-middleware ==0.2.0
-  - wai-transformers ==0.0.7
+  - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
   - warp ==3.2.22
   - warp-tls ==3.2.4.3
+  - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
-  - wavefront ==0.7.1.2
+  - wcwidth ==0.0.2
+  - web3 ==0.7.3.0
   - webdriver ==0.8.5
-  - webdriver-angular ==0.1.11
-  - webpage ==0.0.5
+  - webex-teams-api ==0.2.0.0
+  - webex-teams-conduit ==0.2.0.0
+  - webex-teams-pipes ==0.2.0.0
   - web-plugins ==0.2.9
   - web-routes ==0.27.14.2
-  - web-routes-boomerang ==0.28.4.2
-  - web-routes-happstack ==0.23.11
   - web-routes-hsp ==0.24.6.1
-  - web-routes-th ==0.22.6.3
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.5.0
-  - websockets-rpc ==0.6.0
-  - websockets-simple ==0.0.6.3
+  - websockets ==0.12.5.1
   - websockets-snap ==0.10.3.0
   - weigh ==0.0.12
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
-  - wild-bind ==0.1.2.0
-  - wild-bind-x11 ==0.2.0.3
+  - wild-bind ==0.1.2.1
+  - wild-bind-x11 ==0.2.0.4
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
   - withdependencies ==0.2.4.2
@@ -2364,20 +2250,17 @@ default-package-overrides:
   - with-location ==0.1.0
   - witness ==0.4
   - wizards ==1.0.2
-  - wl-pprint ==1.2.1
   - wl-pprint-annotated ==0.1.0.0
   - wl-pprint-console ==0.1.0.1
   - wl-pprint-extras ==3.5.0.5
   - wl-pprint-terminfo ==3.7.1.4
-  - wl-pprint-text ==1.1.1.0
+  - wl-pprint-text ==1.2.0.0
   - word24 ==2.0.1
   - word8 ==0.1.3
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
-  - Workflow ==0.8.3
   - world-peace ==0.1.0.0
   - wrap ==0.0.0
-  - wrecker ==1.3.1.0
   - wreq ==0.5.2.1
   - wreq-stringless ==0.5.9.1
   - writer-cps-full ==0.1.0.0
@@ -2385,8 +2268,9 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
+  - ws ==0.0.4
   - wuss ==1.1.9
-  - X11 ==1.8
+  - X11 ==1.9
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
   - x509 ==1.7.3
@@ -2397,36 +2281,32 @@ default-package-overrides:
   - xdg-basedir ==0.2.2
   - xeno ==0.3.4
   - xenstore ==0.1.1
-  - xhtml ==3000.2.2
+  - xhtml ==3000.2.2.1
   - xls ==0.1.1
   - xlsx ==0.7.2
-  - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3
+  - xmlbf ==0.4.1
+  - xmlbf-xeno ==0.1.1
   - xml-conduit ==1.8.0
+  - xml-conduit-parse ==0.3.1.2
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0
-  - xmlhtml ==0.2.5.2
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
-  - xml-isogen ==0.2.1
+  - xml-isogen ==0.3.0
   - xml-lens ==0.1.6.3
   - xml-picklers ==0.3.6
   - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
-  - xmonad ==0.13
-  - xmonad-contrib ==0.13
-  - xmonad-extras ==0.13.3
-  - xss-sanitize ==0.3.5.7
-  - xturtle ==0.2.0.0
-  - xxhash ==0.0.2
+  - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.30
-  - Yampa ==0.10.7
-  - YampaSynth ==0.2
-  - yeshql ==3.0.1.3
+  - yaml ==0.8.31.1
+  - yeshql ==4.1.0.0
+  - yeshql-core ==4.1.0.0
+  - yeshql-hdbc ==4.1.0.0
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
   - yesod-auth ==1.6.3
@@ -2438,41 +2318,32 @@ default-package-overrides:
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
   - yesod-form ==1.6.1
-  - yesod-form-bootstrap4 ==0.1.1
+  - yesod-form-bootstrap4 ==1.0.0
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
-  - yesod-paginator ==0.11.0
+  - yesod-paginator ==1.1.0.0
   - yesod-persistent ==1.6.0
+  - yesod-recaptcha2 ==0.2.4
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
-  - yesod-table ==2.0.3
   - yesod-test ==1.6.4
+  - yesod-text-markdown ==0.1.10
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
-  - yi-core ==0.17.1
-  - yi-frontend-vty ==0.17.1
-  - yi-fuzzy-open ==0.17.1
-  - yi-ireader ==0.17.1
-  - yi-keymap-cua ==0.17.1
-  - yi-keymap-emacs ==0.17.1
-  - yi-keymap-vim ==0.17.1
   - yi-language ==0.17.1
-  - yi-misc-modes ==0.17.1
-  - yi-mode-haskell ==0.17.1
-  - yi-mode-javascript ==0.17.1
-  - yi-rope ==0.10
-  - yi-snippet ==0.17.1
-  - yjsvg ==0.2.0.1
+  - yi-rope ==0.11
   - yjtools ==0.9.18
   - yoga ==0.0.0.2
   - youtube ==0.2.1.1
   - zero ==0.1.4
   - zeromq4-haskell ==0.7.0
+  - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zip ==1.0.0
-  - zip-archive ==0.3.2.5
+  - zip ==1.1.0
+  - zip-archive ==0.3.3
   - zippers ==0.2.5
+  - zip-stream ==0.1.1
   - zlib ==0.6.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
@@ -2496,6 +2367,7 @@ extra-packages:
   - conduit-extra >=1.1 && <1.3         # pre-lts-11.x versions neeed by git-annex 6.20180227
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
+  - dbus <1                             # for xmonad-0.26
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
@@ -2511,7 +2383,11 @@ extra-packages:
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
+  - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
   - hoogle == 5.0.14                    # required by hie-hoogle
+  - hspec < 2.5                         # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
+  - hspec-core < 2.5                    # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
+  - hspec-discover < 2.5                # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
   - html-conduit ^>= 1.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - inline-c < 0.6                      # required on GHC 8.0.x
@@ -2652,6 +2528,7 @@ dont-distribute-packages:
   accelerate-fourier-benchmark:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm-ptx:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-yices:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolector:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccelerate-cuda:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cublas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cufft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2662,6 +2539,7 @@ dont-distribute-packages:
   matlab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Obsidian:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  odpic-raw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   patch-image:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices-easy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices-painless:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2721,6 +2599,7 @@ dont-distribute-packages:
   # soft restrictions because of build errors
   3dmodels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   4Blocks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  a50:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AAI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   abacate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   abcBridge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2740,21 +2619,32 @@ dont-distribute-packages:
   AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-Vector-Fancy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-Vector:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-typelits:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   access-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  access-token-provider:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   acid-state-dist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   acid-state-tls:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-all-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-comonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-flipping-tables:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-hq9plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-inator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-kitchen-sink:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-left-pad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-miscorder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-mutable-package:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-now:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-numbersystem:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-operators:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2762,9 +2652,11 @@ dont-distribute-packages:
   acme-schoenfinkel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-strfry:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-stringly-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-zalgo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-zero:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  activehs-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   activitystreams-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2779,9 +2671,7 @@ dont-distribute-packages:
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ADPfusionForest:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ADPfusionSet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2793,9 +2683,9 @@ dont-distribute-packages:
   aeson-applicative:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-diff-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-flowtyped:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-injector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-prefix:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2804,11 +2694,12 @@ dont-distribute-packages:
   aeson-t:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-tiled:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-typescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-value-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  affine:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ag-pictgen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agda-executable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2824,21 +2715,23 @@ dont-distribute-packages:
   airtable-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aivika-experiment-diagrams:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alerta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebraic-graphs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-prelude:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   algo-s:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algolia:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlgoRhythm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   align-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2848,6 +2741,7 @@ dont-distribute-packages:
   alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-seq-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  altcomposition:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   alternative-extra:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   alternative-io:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2856,120 +2750,12 @@ dont-distribute-packages:
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-apigateway:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-application-autoscaling:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-appstream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-athena:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-autoscaling:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-batch:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-budgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-certificatemanager:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-clouddirectory:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudformation:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudfront:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudhsm:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudhsmv2:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudsearch-domains:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudsearch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudtrail:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudwatch-events:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudwatch-logs:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cloudwatch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-codebuild:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-codecommit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-codedeploy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-codepipeline:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-codestar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cognito-identity:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cognito-idp:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cognito-sync:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-config:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-cur:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-datapipeline:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-devicefarm:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-directconnect:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-discovery:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-dms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ds:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-dynamodb-dax:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-dynamodb-streams:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-dynamodb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ec2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ecr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ecs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-efs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-elasticache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-elasticbeanstalk:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-elasticsearch:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-elastictranscoder:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-elb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-elbv2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-emr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-gamelift:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-glacier:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-glue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-greengrass:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-health:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-iam:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-importexport:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-inspector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-iot-dataplane:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-iot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-kinesis-analytics:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-kinesis-firehose:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-kinesis:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-kms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-lambda:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-lex-models:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-lex-runtime:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-lightsail:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-marketplace-analytics:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-marketplace-entitlement:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-marketplace-metering:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-mechanicalturk:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-migrationhub:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-mobile:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-opsworks-cm:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-opsworks:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-organizations:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-pinpoint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-polly:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-pricing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-rds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-redshift:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-rekognition:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-resourcegroupstagging:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-route53-domains:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-route53:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-s3-streaming:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-s3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sdb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-servicecatalog:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-shield:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-snowball:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sns:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ssm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-stepfunctions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-storagegateway:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-support:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-swf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-waf-regional:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-waf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-workdocs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-workspaces:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-xray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   amqp-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amqp-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amqp-worker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   analyze-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   analyze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2989,9 +2775,10 @@ dont-distribute-packages:
   animate-sdl2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   annah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Annotations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ansi-terminal-game:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ansigraph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   antagonist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3029,10 +2816,10 @@ dont-distribute-packages:
   AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-fail:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  applicative-quoters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3040,6 +2827,7 @@ dont-distribute-packages:
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   archnews:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arghwxhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3050,6 +2838,7 @@ dont-distribute-packages:
   arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  armor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3061,6 +2850,7 @@ dont-distribute-packages:
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii-table:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3068,9 +2858,14 @@ dont-distribute-packages:
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   assert:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  assertions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asset-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ast-monad-json:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ast-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-combinators:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3080,26 +2875,30 @@ dont-distribute-packages:
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atmos-dimensional-tf:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   atndapi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atomic-modify:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atp-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-format:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-pkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ats-setup:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-storable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atto-lisp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-time:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-trans:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-varword:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   attosplit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atuin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3124,7 +2923,6 @@ dont-distribute-packages:
   avl-static:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   avr-shake:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesome-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-raw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3147,15 +2945,15 @@ dont-distribute-packages:
   aws-sdk-text-converter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-ses-easy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  axiom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   babylon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   backtracking-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3171,6 +2969,7 @@ dont-distribute-packages:
   bamboo-theme-mini-html5:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamstats:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bank-holiday-usa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   banwords:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3182,30 +2981,24 @@ dont-distribute-packages:
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base-compat-batteries:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base-compat-migrate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-feature-macros:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base-noprelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base64-bytestring-type:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  baserock-schema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  basic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  batch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   batchd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  battleplace-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  battleplace:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  battleship-combinatorics:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bdcs-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bdcs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam-migrate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam-postgres:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3217,6 +3010,7 @@ dont-distribute-packages:
   belka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bench-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  benchpress:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BerkeleyDBXML:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3239,15 +3033,13 @@ dont-distribute-packages:
   billeksah-services:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-communicator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-ext:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-serialise-cbor:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-strict:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-typed:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3269,7 +3061,6 @@ dont-distribute-packages:
   bindings-hamlib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-levmar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libg15:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3278,14 +3069,16 @@ dont-distribute-packages:
   bindings-lxc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-monetdb-mapi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-portaudio:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-wlc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bio-sequence:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bioace:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bioalign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseBlast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3298,9 +3091,13 @@ dont-distribute-packages:
   BiobaseTypes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseXNA:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BioHMM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biocore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biofasta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biofastq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biophd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biopsl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biostockholm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3313,7 +3110,6 @@ dont-distribute-packages:
   Bitly:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitmaps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bits-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3331,15 +3127,17 @@ dont-distribute-packages:
   blas-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlastHTTP:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blastxml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-builder-enumerator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-truncate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-textual-native:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blazeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ble:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blink1:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bliplib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3348,7 +3146,7 @@ dont-distribute-packages:
   Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bloodhound-amazonka-auth:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blosum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3357,6 +3155,8 @@ dont-distribute-packages:
   bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BNFC-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bno055-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3367,21 +3167,23 @@ dont-distribute-packages:
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bookkeeping-jp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolexpr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boombox:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boring-window-switcher:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bowntz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brain-bleep:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brainheck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brick-skylighting:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bricks-internal-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bricks-internal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-parsec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-rendering:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3400,6 +3202,7 @@ dont-distribute-packages:
   buffer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bugzilla:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  build:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3408,36 +3211,40 @@ dont-distribute-packages:
   bunz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   burnt-explorer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   burst-detection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bus-pirate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bv-sized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  byline:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-builder-varword:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-encodings:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-handle:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-strict-builder:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-time:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-tree-builder:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-trie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c2ats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ca:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-bounds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-cargs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-dependency-licenses:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-dev:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-dir:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-file-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3447,7 +3254,8 @@ dont-distribute-packages:
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-lenses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-macosx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-plan:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3457,6 +3265,7 @@ dont-distribute-packages:
   cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-src:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-toolkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3469,11 +3278,12 @@ dont-distribute-packages:
   cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   CabalSearch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalvchk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cachix:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cacophony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   caffegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3481,6 +3291,7 @@ dont-distribute-packages:
   calc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   calculator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   caldims:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  caledon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   call-haskell-from-anything:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   call:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   camfort:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3489,17 +3300,19 @@ dont-distribute-packages:
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  canteven-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  capataz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capped-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   carettah:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cartel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cartesian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   casa-abbreviations-and-acronyms:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-control:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3524,6 +3337,7 @@ dont-distribute-packages:
   cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassava-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cassava:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cassette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   castle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   casui:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3534,7 +3348,6 @@ dont-distribute-packages:
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cautious-gen:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3560,7 +3373,6 @@ dont-distribute-packages:
   cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-io-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3587,6 +3399,7 @@ dont-distribute-packages:
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   checkmate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chell-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chitauri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3598,7 +3411,9 @@ dont-distribute-packages:
   chp-transformers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   chr-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chr-data:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chr-lang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chr-parse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ChristmasTree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   chronograph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chu2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3639,18 +3454,27 @@ dont-distribute-packages:
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-miso:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  classy-prelude-yesod:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-ircbot:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-mailinglist:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-media:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-page:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-theme-bootstrap:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-clckwrks:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cld2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cless:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clexer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cli-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3668,6 +3492,7 @@ dont-distribute-packages:
   cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-seeder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clr-inline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3684,6 +3509,7 @@ dont-distribute-packages:
   cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CMQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3699,6 +3525,7 @@ dont-distribute-packages:
   cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coincident-root-loci:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   colada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   colchis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3716,13 +3543,15 @@ dont-distribute-packages:
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat-compat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comark-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Command:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3735,9 +3564,9 @@ dont-distribute-packages:
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-mutable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-socket:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact-string-fix:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-automata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-dags:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-param:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3745,17 +3574,19 @@ dont-distribute-packages:
   competition:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  componentm-devel:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  componentm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compose-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-aeson-refined:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  composite-base:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  composite-ekg:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-opaleye:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  composite-swagger:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   composition-tree:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   compression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compstrat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   computational-algebra:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  computations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3768,13 +3599,12 @@ dont-distribute-packages:
   concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   condorcet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-song:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-find:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3788,7 +3618,9 @@ dont-distribute-packages:
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   confide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-schema:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-value-getopt:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   configifier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3798,27 +3630,31 @@ dont-distribute-packages:
   conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   conkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   conlogger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  connection-string:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Conscript:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   console-program:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constrained-categories:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-reflection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constraints-emerge:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   consumers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  container:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   containers-benchmark:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   containers-verified:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   content-store:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  context-free-grammar:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contiguous-checked:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   contiguous:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3827,6 +3663,9 @@ dont-distribute-packages:
   control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-exception-monadsfd:             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-exception-monadstf:             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-exception-mtl:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-exception:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-failure-mtl:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-failure:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Control-Monad-MultiPass:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3834,13 +3673,14 @@ dont-distribute-packages:
   contstuff-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   contstuff-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   convert-annotation:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  convert:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coordinate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-c99:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-language:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-libraries:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-sbv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-theorem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3851,7 +3691,6 @@ dont-distribute-packages:
   CoreDump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreErlang:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  corenlp-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-object:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3862,6 +3701,7 @@ dont-distribute-packages:
   couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   countable-inflections:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  courier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cparsing:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3871,7 +3711,7 @@ dont-distribute-packages:
   cplusplus-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cprng-aes-effect:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cpuperf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpython:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cql-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-memory:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3908,16 +3748,14 @@ dont-distribute-packages:
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crypt-sha512:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptocompare:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cryptohash-sha512:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cryptol:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3929,28 +3767,29 @@ dont-distribute-packages:
   cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csv-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cube:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cubical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  currency-codes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curryrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cursedcsv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   curve25519:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  d-bus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  damnpacket:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  danibot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3962,13 +3801,13 @@ dont-distribute-packages:
   darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcswatch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-rcon-util:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-rcon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darkplaces-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dash-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monadLib:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-fd:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3982,38 +3821,48 @@ dont-distribute-packages:
   data-easy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-embed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-emoticons:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-extend-generic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-filepath:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-flagset:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-forest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-interval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens-fd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-map-multikey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-named:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-pprint:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-r-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-repr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-result:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rev:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rtuple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-size:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-stringmap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-structure-inferrer:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-variant:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   datafix:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dataflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  date-conversions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dates:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dawdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4026,10 +3875,9 @@ dont-distribute-packages:
   dbmigrations-sqlite:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbus-hslogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbus-th-introspection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dclabel-eci11:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dcpu16:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddate:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4053,13 +3901,18 @@ dont-distribute-packages:
   dde:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Deadpan-DDP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  debian:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  debug-trace-var:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  decimal-literals:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   decoder-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dedukti:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DeepArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deepcontrol:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   deeplearning-hs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   deepseq-bounded:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   deepseq-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4074,6 +3927,7 @@ dont-distribute-packages:
   definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  delaunay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   delimiter-separated:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4090,64 +3944,62 @@ dont-distribute-packages:
   derive-enumerable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-monoid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   descript-lang:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   deterministic-game-engine:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  detour-via-uom:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   deunicode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  devil:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dewdrop:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dflow:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dfsbuild:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dhall-bash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dhall-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-to-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   di-df1:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   di-handle:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  di-monad:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   di:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dia-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dia-functions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-braille:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-cairo:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-contrib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-graphviz:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-gtk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-html5:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-lib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pandoc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-postscript:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-qrcode:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-rasterific:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-rubiks-cube:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice2tex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dictionaries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   difference-monoid:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   difftodo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-bootstrap:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-foundation-lucid:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-aeson:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-blaze:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-happstack:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-heist:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-lucid:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-scotty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-snap:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4180,6 +4032,7 @@ dont-distribute-packages:
   diskhash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dist-upload:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distance:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-fork-aws-lambda:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4188,7 +4041,6 @@ dont-distribute-packages:
   distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-extras:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-fsm:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-lifted:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4196,10 +4048,13 @@ dont-distribute-packages:
   distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distribution:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diversity:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dixi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   djembe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   djinn-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  djinn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dmcc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dmenu-pkill:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dmenu-pmount:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dmenu-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4212,18 +4067,17 @@ dont-distribute-packages:
   doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-driver-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   docvim:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DOH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   doi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   domain-auth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   domplate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dot-linker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dotenv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dotfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   doublify-toolkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4241,7 +4095,6 @@ dont-distribute-packages:
   dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DPutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dresdner-verkehrsbetriebe:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4261,15 +4114,15 @@ dont-distribute-packages:
   dson:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DSTM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DTC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtw:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dual:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dublincore-xml-conduit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   duckling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dumb-cas:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dump-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4279,6 +4132,7 @@ dont-distribute-packages:
   dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvi-processing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dwarfadt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dyckword:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4289,10 +4143,11 @@ dont-distribute-packages:
   dynobud:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DysFRP-Cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DysFRP-Craftwerk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DysFRP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dywapitchtrack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dzen-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   eager-sockets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   earclipper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ease:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   easy-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4315,19 +4170,22 @@ dont-distribute-packages:
   editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   effect-handlers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effects-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effects:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eight-Ball-Pool-Hack-Cheats:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  either-both:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  either-list-functions:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg-cloudwatch:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-elastic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ekg-elasticsearch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-influxdb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-prometheus-adapter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4339,15 +4197,18 @@ dont-distribute-packages:
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  emailaddress:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   embroidery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   emgm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Emping:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  empty-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Empty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   enchant:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   encoding-io:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4362,15 +4223,20 @@ dont-distribute-packages:
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enumerator-fd:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enumerator-tf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enumerator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumfun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   enummapmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enummapset-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  envy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  envparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   epanet-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eprocess:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   EqualitySolver:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4389,31 +4255,35 @@ dont-distribute-packages:
   ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ert:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  escoger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   espial:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ess:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EstProgress:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   estreps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EtaMOO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  etc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   etcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity-timestamped:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ether:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-client-haskell:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-merkle-patricia-db:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eths-rlp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  euler-tour-tree:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   euphoria:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Euterpea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eve-cli:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eve:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventful-dynamodb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4427,11 +4297,7 @@ dont-distribute-packages:
   exact-cover:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real-positional:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exception-hierarchy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-monads-fd:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exception-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exception-mtl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exception-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   execs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   executor:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exference:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4441,15 +4307,13 @@ dont-distribute-packages:
   exinst-bytes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-deepseq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-hashable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exitcode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exp-pairs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   expiring-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  explicit-constraint-lens:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-determinant:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-bytestring:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-text:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4457,26 +4321,30 @@ dont-distribute-packages:
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expressions:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extended-reals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extensible-effects:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   extract-dependencies:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extralife:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Facebook-Password-Hacker-Online-Latest-Version: [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facts:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   factual-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-braids:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-xml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FAI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FAI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  failable-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   failure-detector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fake-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   family-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4489,6 +4357,8 @@ dont-distribute-packages:
   fastcgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastirc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fastly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fastparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   FastPush:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   FastxPipe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fathead-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4515,6 +4385,7 @@ dont-distribute-packages:
   FComp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fdo-trash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   feature-flipper-postgres:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feature-flipper:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fedora-packages:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-collect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4529,38 +4400,42 @@ dont-distribute-packages:
   FermatsLastMargin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fernet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FerryCore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  festung:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Feval:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fficxx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ffmpeg-light:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fftwRaw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fgl-extras-decompositions:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ficketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-collection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-command-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-location:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fileneglect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Files:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filestore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fillit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filtrable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Fin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filter-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   final-pretty-printer:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   find-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  find-source-files:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fingertree-psqueue:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fingertree-tf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  finite-field:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   FiniteMap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   firefly-example:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   first-and-last:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4575,11 +4450,12 @@ dont-distribute-packages:
   fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-precision:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-vector-cborg:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixhs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fizzbuzz-as-a-service:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fizzbuzz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4592,8 +4468,10 @@ dont-distribute-packages:
   flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   flickr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flight-igc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flight-kml:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Flippi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  float-binstring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow-er:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4606,15 +4484,16 @@ dont-distribute-packages:
   fluent-logger-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluent-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flux-monoid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fmt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-statistics:                             [ 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 ]
+  follow-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   font-opengl-basic4x6:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4627,7 +4506,6 @@ dont-distribute-packages:
   forest-fire:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Forestry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forkable-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForkableT:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4647,8 +4525,11 @@ dont-distribute-packages:
   foscam-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Foster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpco-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FpMLv53:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpnla-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FPretty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fptest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fquery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fractaler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fractals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4657,7 +4538,6 @@ dont-distribute-packages:
   Frank:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fraxl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-concurrent:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4668,6 +4548,7 @@ dont-distribute-packages:
   free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer-converse:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer-effects:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4675,18 +4556,18 @@ dont-distribute-packages:
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   freq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fresco-binding:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   frown:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-gtk3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-vty:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fsnotify-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswait:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4695,18 +4576,20 @@ dont-distribute-packages:
   ftp-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTPLine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ftree:                                        [ 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 ]
   fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-git-hook:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  funcons-lambda-cbv-mp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   funcons-tools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-combine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-instances-algebra:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functor-combo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   functor-infix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functor-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   functor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   funflow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4718,7 +4601,6 @@ dont-distribute-packages:
   futun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-javascript:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4732,12 +4614,14 @@ dont-distribute-packages:
   garepinoh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gargoyle-postgresql:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gargoyle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gasp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gbu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gc-monitoring-wai:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gcodehs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdax:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gearbox:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeBoP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gedcom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4752,6 +4636,7 @@ dont-distribute-packages:
   gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gen-imports:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gen-passwd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Genbank:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gencheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gender:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   genders:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4763,11 +4648,15 @@ dont-distribute-packages:
   generic-binary:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-church:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-enum:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-lens-labels:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-lucid-scaffold:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-maybe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-pretty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-storable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-trie:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-tree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generics-mrsop:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genesis-test:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   genesis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4782,25 +4671,9 @@ dont-distribute-packages:
   GenSmsPdu:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gentlemark:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenussFold:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-aeson:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-bytestring:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-containers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec-aeson:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec-binary:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec-cereal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec-hashable:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-path:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-scientific:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-unordered-containers:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-uuid:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geodetics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4814,7 +4687,6 @@ dont-distribute-packages:
   gf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-core-smallstep:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-datasize:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-tree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4825,16 +4697,20 @@ dont-distribute-packages:
   ghc-generic-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-heap-view:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-instances:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-justdoit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-man-completion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-mod:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-proofs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-syb-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-syntax-highlighter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-time-alloc-prof:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-typelits-presburger:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-usage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4846,90 +4722,66 @@ dont-distribute-packages:
   ghcjs-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-fetch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-atk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-dbusmenu:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-dbusmenugtk3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdkpixbuf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdkx11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-ggit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-girepository:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-glib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gobject:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gstaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gstbase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstpbutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gsttag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gstvideo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtk-hs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtkosxapplication:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtksource:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-notify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-ostree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-pango:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-pangocairo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-poppler:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-secret:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-soup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-xlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-wnck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ginger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ginsu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  giphy-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-config:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-fmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-freq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-mediate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-monitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-object:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  githash:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-data:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-webhook-handler:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   githud:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-cmdline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlab-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-libgit2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-sample:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-test:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  givegif:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   glapp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glazier-pipes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   glazier-react-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glazier-react-widget:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glazier-react:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-b-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   glob-posix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4940,19 +4792,22 @@ dont-distribute-packages:
   GlomeView:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-devil:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-sodium:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glpk-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-common:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-ekg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GLUtil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gluturtle:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gmap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gmndl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnome-desktop:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnome-keyring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnuidn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-geometry:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4963,7 +4818,6 @@ dont-distribute-packages:
   goatee:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gochan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goggles-gcs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-adexchange-buyer:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-adexchange-seller:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-admin-datatransfer:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5073,16 +4927,14 @@ dont-distribute-packages:
   gogol-youtube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-cloud:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-mail-filters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-maps-geocoding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-easy:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-server-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-static-maps:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleCodeJam:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5096,10 +4948,13 @@ dont-distribute-packages:
   gore-and-ash-demo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-glfw:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-lambdacube:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gore-and-ash-logging:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sdl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sync:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gore-and-ash:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GotoT-transformers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gotta-go-fast:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpah:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5111,12 +4966,17 @@ dont-distribute-packages:
   gpx-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   graceful:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graflog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grafos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grakn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-frp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-ui-gtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-ui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-matchings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5139,9 +4999,11 @@ dont-distribute-packages:
   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 ]
+  graphmod:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gray-code:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gray-extended:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graylog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5152,6 +5014,8 @@ dont-distribute-packages:
   Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grenade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   greplicate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greskell-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greskell-websocket:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   greskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5162,7 +5026,14 @@ dont-distribute-packages:
   gross:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog-inspector:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog-mysql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog-postgresql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog-sqlite:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   group-with:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grouped-list:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrowlNotify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5170,15 +5041,11 @@ dont-distribute-packages:
   gruff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gstorable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-sni-tray:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-strut:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gnomevfs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5194,21 +5061,24 @@ dont-distribute-packages:
   GtkGLTV:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkimageview:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkrsync:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GtkTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   guarded-rewriting:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   guess-combinator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   guid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GuiHaskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GuiTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gulcii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gyah-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gym-http-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2c:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HABQT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5234,8 +5104,8 @@ dont-distribute-packages:
   hackage-mirror:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-processing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-whatsnew:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackager:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5251,9 +5121,11 @@ dont-distribute-packages:
   haddocset:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadolint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-formats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hadoop-rpc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haggressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hahp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haiji:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hail:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hailgun-send:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5270,24 +5142,23 @@ dont-distribute-packages:
   hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-convert:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-dir-list:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-filestore:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-ogmarkup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-sass:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-shortcode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   halive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hall-symbols:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-telegram-bot:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamtsolo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   handa-gdata:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5310,6 +5181,7 @@ dont-distribute-packages:
   happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-authenticate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-clientsession:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5328,10 +5200,10 @@ dont-distribute-packages:
   happstack-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-server-tls-cryptonite:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-static-routing:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-yui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happy-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5346,9 +5218,11 @@ dont-distribute-packages:
   hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HarmTrace-Base:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   HarmTrace:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  harpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   harvest-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5363,6 +5237,7 @@ dont-distribute-packages:
   hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashable-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashable-generics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hashable-orphans:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashabler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5372,6 +5247,7 @@ dont-distribute-packages:
   hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskades:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskanoid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskbot-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskdeep:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5393,15 +5269,19 @@ dont-distribute-packages:
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-gi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-gettext:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-go-checkers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-holes-th:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-in-space:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-lsp-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-ml:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-overridez:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-packages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-pdf-presenter:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-platform-test:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5410,6 +5290,7 @@ dont-distribute-packages:
   haskell-read-editor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-reflect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-rules:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-snake:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-observe:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-qq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5425,6 +5306,7 @@ dont-distribute-packages:
   haskell-tools-demo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-experimental-refactorings:      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-refactor:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-rewrite:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-typescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5460,6 +5342,7 @@ dont-distribute-packages:
   haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelzinc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskey-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskey:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskgame:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5503,6 +5386,8 @@ dont-distribute-packages:
   hasql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hastache-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hastache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-app:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-markup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5514,7 +5399,6 @@ dont-distribute-packages:
   HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-qq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hats:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haven:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haverer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5522,8 +5406,10 @@ dont-distribute-packages:
   hax:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-amazonka:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-facebook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaXml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxr-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haxr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hayland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hayoo-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5534,8 +5420,10 @@ dont-distribute-packages:
   hBDD-CMUBDD:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hBDD-CUDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hbeat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hburg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HCard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcg-minus-cairo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5560,6 +5448,7 @@ dont-distribute-packages:
   hdbi-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdevtools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hDFA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdigest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5574,13 +5463,16 @@ dont-distribute-packages:
   hdr-histogram:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDRUtils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   headergen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heartbeat-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger-amazon:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heavy-logger-instances:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heavy-logger:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hecc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heckle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-checkers-lens:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-checkers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-gen-json:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hedgehog-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-config:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-pile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5591,6 +5483,7 @@ dont-distribute-packages:
   heist-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   helics-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   helics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   helisp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5599,6 +5492,7 @@ dont-distribute-packages:
   hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hellnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   help-esb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemkay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemokit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5615,12 +5509,12 @@ dont-distribute-packages:
   Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herms:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hetero-dict:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heterolist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   heukarya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5631,10 +5525,11 @@ dont-distribute-packages:
   hexmino:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexml-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hext:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heyefi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfann:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5675,38 +5570,44 @@ dont-distribute-packages:
   hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgrev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi3status:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hi:                                           [ 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 ]
   hid-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hierarchy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiernotify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HiggsSet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highjson-swagger:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highjson-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   highlight-versions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   highlight:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   himpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hindley-milner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinduce-classifier-decisiontree:              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinduce-classifier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinduce-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinquire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinterface:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5725,10 +5626,13 @@ dont-distribute-packages:
   hist-pl-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hit-graph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJavaScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjcase:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJScript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hjson-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjsonpointer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjsonschema:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5742,23 +5646,17 @@ dont-distribute-packages:
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlibsass:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HList:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HListPP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlrdb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hls:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlwm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-backprop:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5771,6 +5669,7 @@ dont-distribute-packages:
   hmatrix-sparse:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-sundials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-svdlibc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5790,6 +5689,7 @@ dont-distribute-packages:
   HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnormalise:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoauth2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5806,7 +5706,7 @@ dont-distribute-packages:
   hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoist-error:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hold-em:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5822,20 +5722,23 @@ dont-distribute-packages:
   honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoobuddy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-builder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-publish:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-render:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoogle-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hooks-dir:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoopl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
-  hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5858,28 +5761,31 @@ dont-distribute-packages:
   hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpc-coveralls:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPDB-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPDB:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPDF:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPhone:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hplaylist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPlot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpodder:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPong:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hprotoc-fork:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hprotoc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-cairo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-kmeans:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPushover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpygments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpyrg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hquery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5908,9 +5814,9 @@ dont-distribute-packages:
   hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-multiaddr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pkg-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-rs-notify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5925,7 +5831,6 @@ dont-distribute-packages:
   hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsaml2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbackup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5973,9 +5878,9 @@ dont-distribute-packages:
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHTSLib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsI2C:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsignal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hskeleton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5993,13 +5898,14 @@ dont-distribute-packages:
   hsns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsnsq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSoM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsParrot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-expectations-match:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-hedgehog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6009,6 +5915,9 @@ dont-distribute-packages:
   hspec-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-structured-formatter:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-webdriver:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspecVariant:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsPerl5:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspkcs11:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6033,6 +5942,7 @@ dont-distribute-packages:
   hssqlppp-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hssqlppp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstatistics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstidy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6054,14 +5964,18 @@ dont-distribute-packages:
   HTab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hTalos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   htar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hTensor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   htestu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTicTacToe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   htlset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-entities:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  html-kure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  html-parse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-rules:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-tokenizer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hts:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn-import:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htsn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-attoparsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-auth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-lens:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6076,16 +5990,17 @@ dont-distribute-packages:
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-pony-serve-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-querystring:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-response-decoder:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-reverse-proxy:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-wget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http2-client-grpc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hubigraph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   huck:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HueAPI:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6094,8 +6009,9 @@ dont-distribute-packages:
   hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  human-parse:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  human-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hums:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6103,24 +6019,16 @@ dont-distribute-packages:
   hunspell-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hup:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurriyet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   husky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hutton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hvega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-balancedparens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-dsv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-kafka-avro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-prim-bits:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-rankselect-base:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hweblib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwhile:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6156,17 +6064,20 @@ dont-distribute-packages:
   Hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hylide:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyper-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyper-haskell-server:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyper:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperfunctions:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyperloglog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyperion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglogplus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperpublic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyphenate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hzenity:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hzulip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   i18n:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   iap-verifier:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6174,7 +6085,7 @@ dont-distribute-packages:
   iban:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ical:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  icon-fonts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iconv-typed:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6192,14 +6103,16 @@ dont-distribute-packages:
   ig:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ige:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ignore:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   igraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   igrf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-basic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-display:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell-hvega:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell-inline-r:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-rlangqq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell-widgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagemagick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6208,27 +6121,33 @@ dont-distribute-packages:
   imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imj-animation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imj-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imj-game-hamazed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imj-measure-stdout:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imj-prelude:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ImperativeHaskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-logging:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-params:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  implicit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   importify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   imports:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  impossible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  impure-containers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  include-file:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indentation-trifecta:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indentation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indents:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexed-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indextype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   indieweb-algorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   inf-interval:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6239,7 +6158,10 @@ dont-distribute-packages:
   InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inilist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inline-java:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inline-r:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   inserts:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inspector-wrecker:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6249,6 +6171,7 @@ dont-distribute-packages:
   instant-hashable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   instapaper-sender:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  instinct:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   int-multimap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   integreat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6261,14 +6184,15 @@ dont-distribute-packages:
   interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interprocess:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intricacy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-hlist:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  invertible-hxt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  invertible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6287,17 +6211,19 @@ dont-distribute-packages:
   irc-fun-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-color:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  irc-fun-messages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  irc-fun-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Irc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   iri:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   iridium:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   irt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  is:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   isdicom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   IsNull:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iso8583-bitmaps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isobmff-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isotope:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6313,8 +6239,14 @@ dont-distribute-packages:
   ivor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-backend-c:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-bitdata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-eval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-hw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-opts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-serialize:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-stdlib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivy-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixdopp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixmonad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6332,21 +6264,27 @@ dont-distribute-packages:
   jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jason:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  java-adt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  java-character:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   javaclass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jbi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jenga:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jenkinsPlugins2nix:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jml-web-service:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jni:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  join-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6361,23 +6299,26 @@ dont-distribute-packages:
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-ast-json-encoder:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-bytes-builder:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator-Examples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-encoder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-fu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-incremental-decoder:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-litobj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-pointer-aeson:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-pointer-hasql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-pointer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-python:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-tracer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6387,10 +6328,12 @@ dont-distribute-packages:
   jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonrpc-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsons-to-schema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsonschema-gen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonsql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsontsv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonxlsx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  juandelacosa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   judge:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   judy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   juicy-gcode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6400,9 +6343,12 @@ dont-distribute-packages:
   JunkDB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   JuPyTer-notebook:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   jupyter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JustParse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm-batching:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm-streaming:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-glut:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6412,9 +6358,10 @@ dont-distribute-packages:
   kafka-device-vrpn:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kaleidoscope:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kangaroo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-comet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-cores:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6422,13 +6369,14 @@ dont-distribute-packages:
   karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  katip-rollbar:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  katip-scalyr-scribe:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-syslog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kdt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-i18n:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-protectedmodel:         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6450,7 +6398,6 @@ dont-distribute-packages:
   keyring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keysafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keystore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keyvaluehash:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   keyword-args:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   khph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6460,8 +6407,8 @@ dont-distribute-packages:
   KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kleene:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kmeans-vector:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmp-dfa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   knead-arithmetic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   knead:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6476,6 +6423,7 @@ dont-distribute-packages:
   KSP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ktx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kure:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6506,16 +6454,18 @@ dont-distribute-packages:
   lambdacube-ir:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaDesigner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaHack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdajudge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaShell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatex:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Lambdaya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6525,22 +6475,29 @@ dont-distribute-packages:
   language-boogie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-c-comments:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-c-inline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-c-quote:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-css:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-dart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-dockerfile:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-dot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-ecmascript-analysis:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-ecmascript:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-eiffel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-elm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-gcl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-glsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-go:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-guess:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-hcl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-java-classfile:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-kort:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-lua2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-oberon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-openscad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                              [ i686-linux, x86_64-darwin ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6551,9 +6508,9 @@ dont-distribute-packages:
   language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-thrift:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-typescript:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-vhdl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-webidl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lapack-carray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lapack-ffi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lapack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LargeCardinalHierarchy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6564,10 +6521,12 @@ dont-distribute-packages:
   latex-formulae-pandoc:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LATS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layered-state:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lawless-concurrent-machines:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   layout-bootstrap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  layout-rules:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  layout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   layouting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lazy-hash-cache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lazy-hash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6577,13 +6536,14 @@ dont-distribute-packages:
   lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LazyVault:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ld-intervals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldapply:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   leapseconds:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Learning:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   leetify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-discovery-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-discovery:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6596,13 +6556,10 @@ dont-distribute-packages:
   lens-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-toml-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lens-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lensref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lenz-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lenz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  level-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lfst:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6619,28 +6576,28 @@ dont-distribute-packages:
   libexpect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   libGenI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libhbb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libinfluxdb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   libjenkins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblastfm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblawless:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblinear-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   libltdl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libmolude:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libnotify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboath-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboleg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   librandomorg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   librato:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libstackexchange:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  licensor:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  life-sync:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lifted-stm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lightning-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6652,6 +6609,7 @@ dont-distribute-packages:
   limp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   linda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   linden:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  line:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-algebra-cblas:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6669,16 +6627,21 @@ dont-distribute-packages:
   linode-v4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-cgroup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-inotify:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-kmod:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-perf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-ptrace:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   linx-gateway:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lio-eci11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lio-fs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lio-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lipsum-gen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquid-fixpoint:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquidhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-fusion-probe:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-prompt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6687,7 +6650,6 @@ dont-distribute-packages:
   list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-tries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   listenbrainz-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6708,19 +6670,25 @@ dont-distribute-packages:
   llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-hs-pretty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-pkg-config:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-pretty-bc-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lmdb-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  load-balancing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   load-font:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loc-test:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  localize:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  located:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lock-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lockpool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6732,7 +6700,11 @@ dont-distribute-packages:
   log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logging-effect-extra-file:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logging-effect-extra-handler:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logging-effect-extra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logic-TPTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-MPI:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6765,6 +6737,7 @@ dont-distribute-packages:
   loup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lp-diagrams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6791,17 +6764,13 @@ dont-distribute-packages:
   lye:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lykah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lz4-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-amazonka:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-process:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maclight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   madlang:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6840,34 +6809,40 @@ dont-distribute-packages:
   manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mandrill:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manifolds-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mapalgebra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mapping:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mapquest-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marked-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   marvin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marxup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MASMGen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   master-plan:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   matchers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mathblog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mathflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mathlink:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   matplotlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  matrix-as-xyz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   matsuri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   matterhorn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mattermost-api-qc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mattermost-api:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent-learner-hw-gui:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maxent-learner-hw:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6875,6 +6850,7 @@ dont-distribute-packages:
   MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MBot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mcl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6893,16 +6869,17 @@ dont-distribute-packages:
   mecab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mech:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mecha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-fdk-aac:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-rtp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  median-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meep:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mellon-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mellon-gpio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcache-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6911,18 +6888,19 @@ dont-distribute-packages:
   memcached:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   memis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-ptr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   memoization-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   memorable-bits:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  memorypool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  menoh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mercury-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  merge-bash-history:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mergeless:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   merkle-patricia-db:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-misc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-par-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meta-par:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metadata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MetaHDBC:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MetaObject:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   metaplug:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metric:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6930,25 +6908,29 @@ dont-distribute-packages:
   metronome:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mezzo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mezzolens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MFlow:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mgeneric:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   microaeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microformats2-parser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microgroove:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   microsoft-translator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   MicrosoftTranslator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mikmod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miku:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mime-directory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   minecraft-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   minesweeper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   MiniAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6967,9 +6949,10 @@ dont-distribute-packages:
   MissingPy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mkcabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ml-w:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmark-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mltool:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6985,17 +6968,15 @@ dont-distribute-packages:
   module-management:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulespection:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Moe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  moe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MoeDict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mohws:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mollie-api-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-abort-fd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-classes-logging:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-finally:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-http:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7004,14 +6985,17 @@ dont-distribute-packages:
   monad-log:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-mock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-open:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-parallel-progressbar:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-persist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-resumption:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ste:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-timing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-tx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-unify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-wrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7022,12 +7006,13 @@ dont-distribute-packages:
   MonadCatchIO-transformers:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadLib-compose:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadloc-pp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadlog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadoid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadplus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monads-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadStack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monarch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7039,19 +7024,23 @@ dont-distribute-packages:
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monitor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-absorbing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoid-subclasses:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-statistics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monzo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   moo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   moonshine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  more-containers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   morfette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   morfeusz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   motor-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   motor-reflection:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7095,6 +7084,7 @@ dont-distribute-packages:
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multi-instance:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7102,9 +7092,9 @@ dont-distribute-packages:
   multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipath:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiplate-simplified:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multiplate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-alt-deriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multirec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   multisetrewrite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   multivariant:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Munkres-simple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7128,6 +7118,7 @@ dont-distribute-packages:
   mutable-iter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MutationOrder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mute-unmute:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mvar-lock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7138,7 +7129,6 @@ dont-distribute-packages:
   mxnet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   my-package-testing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   my-test-docs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  myanimelist-export:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mybitcoin-sci:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MyPrimes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7152,13 +7142,16 @@ dont-distribute-packages:
   mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mystem:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mywatch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   n-ary-functor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  n-tuple:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nakadi-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NameGenerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   namelist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  namespace:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-cryptr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-hmac:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-md5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7170,9 +7163,12 @@ dont-distribute-packages:
   NanoProlog:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanovg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Naperian:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  naperian:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  naqsha:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nat-sized-numbers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  native:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nationstates:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   naver-translate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   NearContextAlgebra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7182,6 +7178,7 @@ dont-distribute-packages:
   nehe-tuts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   neither:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   neko-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  neko-obfs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Neks:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nemesis-titan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7190,6 +7187,7 @@ dont-distribute-packages:
   nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nest:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nested-sequence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   NestedFunctor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nestedmap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   netclock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7204,7 +7202,6 @@ dont-distribute-packages:
   nettle-frp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-input-javascript:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7216,16 +7213,18 @@ dont-distribute-packages:
   network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-connection:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-dbus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-hans:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-interfacerequest:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-msgpack-rpc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-netpacket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-pgi:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-protocol-xmpp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-rpca:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-service:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-simple-sockaddr:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-simple-tls:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-stream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7234,6 +7233,7 @@ dont-distribute-packages:
   network-voicetext:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  networked-game:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-blashs:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-hmatrix:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7243,11 +7243,13 @@ dont-distribute-packages:
   newtype-deriving:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   next-ref:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nextstep-plist:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   nfc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ngrams-loader:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nice-html:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nicovideo-translator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nikepub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nimber:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7262,7 +7264,9 @@ dont-distribute-packages:
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlopt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nlp-scores:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7274,18 +7278,19 @@ dont-distribute-packages:
   Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  non-empty-zipper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nonfree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization-ad:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  normalization-insensitive:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   not-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   notcpp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notzero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NoTrace:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nqe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7294,7 +7299,7 @@ dont-distribute-packages:
   null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullary:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullpipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  number-length:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numbered-semigroups:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberTheory:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7305,12 +7310,9 @@ dont-distribute-packages:
   numhask-histogram:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-range:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask-test:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nutri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs-ghcid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nylas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7329,11 +7331,10 @@ dont-distribute-packages:
   octane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Octree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   odbc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OddWord:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oden-go-packages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  odpic-raw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   off-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7342,11 +7343,10 @@ dont-distribute-packages:
   ois-input-manager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   old-version:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   olwrapper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  om-elm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ombra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnifmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7359,12 +7359,14 @@ dont-distribute-packages:
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opaleye:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-signals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-symbology:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenAFP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opench-meteo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLWrappers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7380,6 +7382,7 @@ dont-distribute-packages:
   OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-crypto-api:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-Crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openpgp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenSCAD:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   opensoundcontrol-ht:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   openssh-github-keys:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7389,7 +7392,7 @@ dont-distribute-packages:
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   openweathermap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opml-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  operational-extra:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optional:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7402,10 +7405,12 @@ dont-distribute-packages:
   order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-statistic-tree:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ordered:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   orders:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ordinary:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ordrea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   organize-imports:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgstat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7413,28 +7418,31 @@ dont-distribute-packages:
   OrPatterns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   oscpacking:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  osdkeys:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   oso2pdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   otp-authenticator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  overload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   overloaded-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  package-description-remote:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-o-tron:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-dawg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-multikey-map:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  packed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   packunused:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pacman-memcache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pads-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pagarme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pagerduty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pagure-hook-receiver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paillier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pam:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7443,15 +7451,12 @@ dont-distribute-packages:
   pandoc-include-code:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pang-a-lambda:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pangraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panpipe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-export:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-implement:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-include:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7467,6 +7472,8 @@ dont-distribute-packages:
   Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Parallel-Arrows-Eden:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parameterized-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parameterized:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   paramtree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   paranoia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7487,14 +7494,17 @@ dont-distribute-packages:
   partage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-order:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial-semigroup-hedgehog:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial-semigroup-test:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial-semigroup:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PasswordGenerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pasta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pastis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pasty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  patat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   patches-vector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  path-text-utf8:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pathfinder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pathfindingcore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   PathTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7507,11 +7517,18 @@ dont-distribute-packages:
   pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pbc4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PBKDF2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pcap-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcre-light-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-slave-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdf-slave:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-toolbox-content:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-toolbox-core:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-toolbox-document:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-toolbox-viewer:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdfname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdfsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdynload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   peakachu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7519,7 +7536,6 @@ dont-distribute-packages:
   pec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   peg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   peggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pencil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7531,11 +7547,11 @@ dont-distribute-packages:
   peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perhaps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  permutations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7544,12 +7560,13 @@ dont-distribute-packages:
   persistent-equivalence:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-hssqlppp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-migration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-mysql-haskell:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-odbc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-ratelimit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-test:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-vector:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona-idp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7578,43 +7595,37 @@ dont-distribute-packages:
   phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pi-forall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pi-hoole:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pia-forward:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  picedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   picologic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pictikz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pier:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinchot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinpon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipe-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-bgzf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-break:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-bytestring:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-bzip:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cacophony:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-csv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-fastx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-group:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-illumina:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-lines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-lzma:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-protolude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7636,7 +7647,10 @@ dont-distribute-packages:
   pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   plailude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   plan-applicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plan-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  planb-token-introspection:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plankton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   platinum-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlayingCards:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7648,11 +7662,10 @@ dont-distribute-packages:
   Plot-ho-matic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-light-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plots:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plur:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plugins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7660,7 +7673,6 @@ dont-distribute-packages:
   pocket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointfree-fancy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pointful:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7670,7 +7682,6 @@ dont-distribute-packages:
   polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polimorf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  poly-cont:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   poly-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polydata-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   polydata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7689,7 +7700,6 @@ dont-distribute-packages:
   pool-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   popenhs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  poppler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   portager:                                     [ 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 ]
@@ -7701,7 +7711,7 @@ dont-distribute-packages:
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgres-embedded:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgres-websockets:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-binary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-copy-escape:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-named:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7711,7 +7721,6 @@ dont-distribute-packages:
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-url:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-syntax:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7723,19 +7732,22 @@ dont-distribute-packages:
   potoki-cereal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-hasql:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  potoki-zlib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  potrace-diagrams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerqueue-distributed:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerqueue-levelmem:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerqueue-sqs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  powerqueue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   PPrinter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   praglude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  precursor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  predicate-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7744,15 +7756,22 @@ dont-distribute-packages:
   prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   preprocess-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   preprocessor:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  presburger:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pretty-ncols:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-relative-time:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pretty-sop:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  preview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primes-type:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-checked:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-containers:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-indexed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-maybe:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-sort:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pringletons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7760,6 +7779,7 @@ dont-distribute-packages:
   printcess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  priority-sync:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7778,7 +7798,6 @@ dont-distribute-packages:
   product:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  profiteur:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress-meter:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7790,10 +7809,12 @@ dont-distribute-packages:
   prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prologue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prometheus-effect:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prometheus-metrics-ghc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prometheus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   promise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pronounce:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proof-combinators:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   propane:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Proper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   properties:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7801,8 +7822,8 @@ dont-distribute-packages:
   proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prosper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-descriptors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-protoc:                            [ i686-linux, x86_64-linux, 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 ]
@@ -7812,14 +7833,18 @@ dont-distribute-packages:
   proxy-kindness:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   proxy-mapping:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   psc-ide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pseudo-boolean:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pseudo-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PSQueue:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pthread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ptr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   publicsuffixlistcreate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubnub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubsub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   puffytools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugixml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pugs-DrIFT:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-hsregex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7828,13 +7853,11 @@ dont-distribute-packages:
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-cdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pure-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-tsd-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-apn:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7851,6 +7874,7 @@ dont-distribute-packages:
   python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   q4c12-twofinger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   qc-oi-testgenerator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qchas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7874,12 +7898,19 @@ dont-distribute-packages:
   qudb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Quelea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quenya-verb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  queryparser-demo:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  queryparser-hive:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  queryparser-presto:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  queryparser-vertica:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  queryparser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   querystring-pickle:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   questioner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quick-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-arbitrary-template:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-poly:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-comb:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-monad:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7887,18 +7918,21 @@ dont-distribute-packages:
   quickcheck-relaxng:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-report:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-state-machine:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-string-random:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  QuickCheckVariant:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Quickson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickspec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quicktest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickwebapp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper-rendering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quiver-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-groups:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7907,8 +7941,8 @@ dont-distribute-packages:
   quoridor-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   qux:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   R-pandoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  raaz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rad:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radian:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   radix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7926,22 +7960,22 @@ dont-distribute-packages:
   rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-class:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-fu-multivariate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-string:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  range-set-list:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ranged-sets:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rank2classes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rapid-term:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rapid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-cmd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7966,18 +8000,18 @@ dont-distribute-packages:
   rc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  react-flux-servant:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  react-flux:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-bunch:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-gi-gtk:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl2:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-wx:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7997,12 +8031,16 @@ dont-distribute-packages:
   record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   record:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  records-sop:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  redland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  redis-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  redis-resp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  redis-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  redis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8022,6 +8060,7 @@ dont-distribute-packages:
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reformat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  refresht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   refurb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8031,12 +8070,15 @@ dont-distribute-packages:
   regex-pderiv:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-pipes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-quasiquoter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-tdfa-rc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-utf8:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-type:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-with-pcre:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexchar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexdot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexpr-symbolic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexqq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8055,6 +8097,7 @@ dont-distribute-packages:
   rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relapse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8084,6 +8127,7 @@ dont-distribute-packages:
   repl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   RepLib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   replicant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ReplicateEffects:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   repo-based-blog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8093,13 +8137,9 @@ dont-distribute-packages:
   req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  require:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reroute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reserve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resolv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   resolve-trivial-conflicts:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   resolve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8108,11 +8148,15 @@ dont-distribute-packages:
   resource-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   respond:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-gen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-happstack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-snap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-types:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   restful-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  restless-git:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   RESTng:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   restyle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8128,15 +8172,20 @@ dont-distribute-packages:
   rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rfc3339:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc-env:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc-http-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc-prelude:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc-psql:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc-redis:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc-servant:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rhine-gloss:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rhine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   RichConditional:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  riemann:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   riff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ring-buffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple-federation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8166,11 +8215,11 @@ dont-distribute-packages:
   robots-txt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   roc-cluster-demo:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roc-cluster:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rocksdb-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   roku-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rollbar-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   roller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8182,7 +8231,9 @@ dont-distribute-packages:
   rosso:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rounding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip-string:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-xml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-generator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-planning:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rowrecord:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8194,8 +8245,6 @@ dont-distribute-packages:
   rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RtMidi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtnetlink:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8212,15 +8261,19 @@ dont-distribute-packages:
   runtime-arbitrary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  s-expression:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-access:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-buffer-monad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-failure-cme:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-length:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-money:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safecopy-migrate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   safepath:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8238,7 +8291,9 @@ dont-distribute-packages:
   salvia-websocket:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   samtools-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  samtools-enumerator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   samtools-iteratee:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  samtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sandlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sarasvati:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sarsi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8251,12 +8306,15 @@ dont-distribute-packages:
   satchmo-minisat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-toysat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   savage:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sax:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sbvPlugin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sc3-rdu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalable-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8270,7 +8328,6 @@ dont-distribute-packages:
   scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   scons2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8279,29 +8336,42 @@ dont-distribute-packages:
   scottish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-binding-play:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-blaze:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-cookie:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-fay:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-format:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-hastache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-params-parser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-resource:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-rest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-tls:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-view:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrabble-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrape-changes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ScratchFs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  script-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrobble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scroll:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sde-solver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-fps:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-mixer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-sprite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-ttf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seakale-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seakale-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seakale:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   secdh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   seclib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8314,10 +8384,12 @@ dont-distribute-packages:
   SelectSequencesFromMSA:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  self-extract:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Semantique:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   semdoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Semigroup:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroupoids-syntax:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring-num:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8325,6 +8397,7 @@ dont-distribute-packages:
   semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sendgrid-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sendgrid-v3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sensei:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentence-jp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8332,51 +8405,52 @@ dont-distribute-packages:
   seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqid-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqloc-datafiles:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqloc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serialise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   serialize-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   serokell-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   serpentine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-aeson-specs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-cookie:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-server:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-acid:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-token-api:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-leveldb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-persistent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-rocksdb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-cassava:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-client-core:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-token:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-ede:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-ekg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-elm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-generic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-iCalendar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-match:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-js:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-nix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-proto-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-purescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pushbullet-client:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-py:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-rawm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-router:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-streaming-client:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8392,8 +8466,10 @@ dont-distribute-packages:
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessiontypes-distributed:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessiontypes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  setoid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sets:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   setters:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8410,13 +8486,12 @@ dont-distribute-packages:
   sgf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sha-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   shadower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shadowsocks:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shady-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shady-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-ats:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-cabal-build:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shake-ext:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-minify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-pack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8425,15 +8500,23 @@ dont-distribute-packages:
   shakespeare-babel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-sass:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shapes-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-fields:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shared-memory:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shell-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-compatline:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-haskeline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-readline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shellmate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shivers-cfg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8442,16 +8525,19 @@ dont-distribute-packages:
   ShortestPathProblems:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shuffle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  si-clock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sigma-ij:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sign:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   silvi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-actors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-atom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8459,7 +8545,6 @@ dont-distribute-packages:
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-download:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-effects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8471,12 +8556,18 @@ dont-distribute-packages:
   simple-nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-pascal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-rope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-sql-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-stacked-vm:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-tar:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-templates:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-zipper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleargs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleconfig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8485,9 +8576,9 @@ dont-distribute-packages:
   simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleServer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simplest-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   singleton-dict:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  singleton-typelits:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   singnal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8495,25 +8586,29 @@ dont-distribute-packages:
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sitepipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized-grid:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-types:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sizes:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sjsp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skeletal-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skulk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   skylark-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slack-web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   slave-thread:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   slot-lambda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smallcaps:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-laws:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-series:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8546,8 +8641,10 @@ dont-distribute-packages:
   snap-error-collector:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-loader-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-templates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8610,9 +8707,11 @@ dont-distribute-packages:
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-icmp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-unix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8628,6 +8727,7 @@ dont-distribute-packages:
   sorted:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sorting:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sorty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sound-collage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   source-code-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   SourceGraph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sousit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8639,14 +8739,19 @@ dont-distribute-packages:
   spanout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparkle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparrow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparse-lin-alg:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsebit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparser:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spatial-math:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spatial-rotations:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   spdx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  special-keys:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  speechmatics:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   spelling-suggest:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphinx-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8654,6 +8759,7 @@ dont-distribute-packages:
   spice:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SpinCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   spir-v:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  splay:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   splaytree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   spline3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   splines:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8661,7 +8767,6 @@ dont-distribute-packages:
   splot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-api-ghcjs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-api-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Spock-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-auth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-digestive:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8672,15 +8777,17 @@ dont-distribute-packages:
   spoty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sprig:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spritz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sproxy-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-pool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlcipher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sqlite-simple-errors:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqlite:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   squeal-postgresql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8695,13 +8802,13 @@ dont-distribute-packages:
   SSTG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stable-marriage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-memo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack2nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8729,7 +8836,7 @@ dont-distribute-packages:
   state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateWriter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  static-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  static-closure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-tensor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8738,7 +8845,7 @@ dont-distribute-packages:
   stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  status-notifier-item:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stb-image-redux:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8747,7 +8854,6 @@ dont-distribute-packages:
   stego-uuid:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stemmer-german:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stemmer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8756,13 +8862,13 @@ dont-distribute-packages:
   stm-containers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-promise:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-supply:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stochastic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  StockholmAlignment:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  storable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  store-streaming:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-ATermLib:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8776,21 +8882,30 @@ dont-distribute-packages:
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-base64:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-cassava:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-pcap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-png:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-postgresql-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-process:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   strelka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  strict-data:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  strict-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StrictCheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   strictly:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-isos:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stringtable-atom:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stripe-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stripe-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stripe-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stripe-http-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-tests:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-induction:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8800,17 +8915,20 @@ dont-distribute-packages:
   stt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stutter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stylish-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   submark:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subsample:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  substring-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  successors:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffix-array:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  summoner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sump:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunlight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8824,23 +8942,26 @@ dont-distribute-packages:
   superevent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supermonad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  superrecord:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supplemented:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  surjective:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sv-cassava:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVD2HS:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svg-builder-fork:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg-tree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SVGFonts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svm-light-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swagger-petstore:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swagger-test:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   swift-lda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SWMMoutGetMB:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-with-class-instances-text:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8852,6 +8973,7 @@ dont-distribute-packages:
   symantic-lib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  symmetric-properties:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync-mht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8866,15 +8988,15 @@ dont-distribute-packages:
   syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntaxnet-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sys-process:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-command:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-linux-proc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   t-regex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8884,15 +9006,16 @@ dont-distribute-packages:
   table-layout:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   table:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TableAlgebra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tableaux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tablify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tablize:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  taffybar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tabs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tag-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tag-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-exception-core:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8903,10 +9026,10 @@ dont-distribute-packages:
   tagsoup-megaparsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Tahin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tai64:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tai:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tailfile-hinotify:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  takahashi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tal:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8914,10 +9037,9 @@ dont-distribute-packages:
   tamarin-prover-theory:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tape:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tar-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tart:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8929,7 +9051,6 @@ dont-distribute-packages:
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-travis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Taxonomy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TaxonomyTools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8941,7 +9062,6 @@ dont-distribute-packages:
   tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdigest-Chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tdigest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teeth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8974,22 +9094,26 @@ dont-distribute-packages:
   tensorflow:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  termcolor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   terminal-text:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   termplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-fixture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-skip:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-framework-testing-feat:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-pkg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-sandbox-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testCom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9000,18 +9124,24 @@ dont-distribute-packages:
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   texbuilder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-all:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-containers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-format-heavy:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-format:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-icu-translit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-locale-encoding:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-markup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-plus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-position:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-replace:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-show-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9027,10 +9157,12 @@ dont-distribute-packages:
   th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-dict-discovery:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-fold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-format:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-to-exp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   thank-you-stars:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9044,14 +9176,14 @@ dont-distribute-packages:
   thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threepenny-editors:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threepenny-gui-flexbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thrist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  throwable-exceptions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   thumbnail-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tibetan-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tictactoe3d:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9068,7 +9200,6 @@ dont-distribute-packages:
   time-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-machine:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-parsers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-quote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series-lib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9077,17 +9208,18 @@ dont-distribute-packages:
   time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   timemap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeout-with-results:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timerep:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timers-tick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timespan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tintin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tiny-scheduler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tinyMesh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tinytemplate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyURL:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-haskell-frontend:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9111,12 +9243,14 @@ dont-distribute-packages:
   tokyocabinet-haskell:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyotyrant-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tomato-rubato-openal:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toml-parser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                          [ 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 ]
   torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TORCS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  total-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9128,12 +9262,11 @@ dont-distribute-packages:
   trace-function-call:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tracetree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trackit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traildb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   trajectory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transaction:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   transactional-events:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   transf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   transfer-db:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9144,17 +9277,16 @@ dont-distribute-packages:
   transformers-runnable:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TransformersStepByStep:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   transient-universe-tls:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transient-universe:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transient:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   translatable-intset:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate-cli:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trasa-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trasa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tree-diff:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tree-traversals:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   treemap-html-tools:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9173,6 +9305,7 @@ dont-distribute-packages:
   tripLL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   trivia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tropical:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trurl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsession-happstack:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsession:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tskiplist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9189,8 +9322,12 @@ dont-distribute-packages:
   tuple-hlist:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-lenses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tuple-ops:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  turtle-options:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9204,16 +9341,12 @@ dont-distribute-packages:
   twhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twidge:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twilight-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twilio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twill:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twiml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-feed:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   txt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9221,9 +9354,12 @@ dont-distribute-packages:
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tyfam-witnesses:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-combinators-quote:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-combinators-singletons:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-combinators:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-digits:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-eq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-indexed-queues:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9231,7 +9367,9 @@ dont-distribute-packages:
   type-level-bst:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-induction:          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-level-sets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-list:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-map:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-natural:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9240,9 +9378,9 @@ dont-distribute-packages:
   type-spine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-structure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-tree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeCompose:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9250,7 +9388,7 @@ dont-distribute-packages:
   typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeNat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   types-compat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   typesafe-precure:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9261,11 +9399,11 @@ dont-distribute-packages:
   uber:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   uberlast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   udp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhexdump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uhttpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   unagi-bloomfilter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9286,21 +9424,28 @@ dont-distribute-packages:
   unicode-normalization:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-show:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unicoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unique-logic-tf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Unique:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uniquely-represented-sets:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  units-defs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  units-parser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  units:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unity-testresult-parser:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unitym-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-fcntl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-handle:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-process-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unm-hip:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unordered-graphs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unpacked-either:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unpacked-maybe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpacked-these:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpacked-validation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   unroll-ghc-plugin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9311,6 +9456,7 @@ dont-distribute-packages:
   uom-plugin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   up:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   update-nix-fetchgit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Updater:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   uploadcare:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   upskirt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ureader:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9327,7 +9473,6 @@ dont-distribute-packages:
   urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urlencoded:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9340,11 +9485,19 @@ dont-distribute-packages:
   users-persistent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   utc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  utf8-validator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  util:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-cco-examples:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-cco-hut-parsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-cco-uu-parsinglib:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-cco:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uuagc-bootstrap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uuagc-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uuagc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuid-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uulib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9357,26 +9510,30 @@ dont-distribute-packages:
   valid-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   validate-input:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   validated-literals:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validated-types:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   validations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vampire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   varan:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   variable-precision:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   variables:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  varying:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vault-tool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcsgui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcswrapper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating-accelerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-bytes-instances:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-bytestring:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-clock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9388,14 +9545,16 @@ dont-distribute-packages:
   vector-space-map:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-space-opengl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-static:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Verba:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   verbalexpressions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  verifiable-expressions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   verify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vfr-waypoints:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vhd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vhdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vicinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ViennaRNA-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9404,9 +9563,11 @@ dont-distribute-packages:
   vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vinyl-gl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-operational:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vinyl-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-vectors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   virthualenv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vision:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9414,6 +9575,8 @@ dont-distribute-packages:
   visual-prof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   visualize-cbn:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vk-aws-route53:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  VKHS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vorbiscomment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vpq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9424,12 +9587,11 @@ dont-distribute-packages:
   vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vulkan-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vulkan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wacom-daemon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   waddle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wahsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-devel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-digestive-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-dispatch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-frontend-monadcgi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-git-http:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9442,6 +9604,7 @@ dont-distribute-packages:
   wai-hmac-auth:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-logger-buffered:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-auth:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9450,18 +9613,19 @@ dont-distribute-packages:
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-consul:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-content-type:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-crowd:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-etag:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-headers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-metrics:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-rollbar:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-request-spec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-secure-cookies:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-session-alt:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-postgresql:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9473,8 +9637,8 @@ dont-distribute-packages:
   warc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-dynamic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-tls-uid:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WashNGo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wasm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   watcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   watchit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavefront-obj:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9488,6 +9652,7 @@ dont-distribute-packages:
   web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-page:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routes-regular:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9498,20 +9663,24 @@ dont-distribute-packages:
   webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WebBits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcloud:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebCont:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-dispatch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webdriver-w3c:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   webfinger-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit2gtk3-javascriptcore:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webpage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  websockets-rpc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  websockets-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wedged:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted-regexp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   welshy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9528,13 +9697,12 @@ dont-distribute-packages:
   why3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wild-bind-task-x11:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   windns:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  winery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wire-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wires:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wl-pprint-ansiterm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9546,9 +9714,9 @@ dont-distribute-packages:
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   word2vec-model:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  word:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordchoice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9558,6 +9726,7 @@ dont-distribute-packages:
   workflow-extra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-pure:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  workflow-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-windows:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9565,7 +9734,6 @@ dont-distribute-packages:
   wrecker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wreq-sb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ws:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsjtx-udp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9595,6 +9763,7 @@ dont-distribute-packages:
   X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xcb-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcffib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9602,6 +9771,7 @@ dont-distribute-packages:
   xdot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xformat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhaskell-library:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhb-atom-cache:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhb-ewmh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9610,15 +9780,13 @@ dont-distribute-packages:
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xleb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsx-tabular:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-conduit-decode:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-html-conduit-lens:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-pipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9633,6 +9801,7 @@ dont-distribute-packages:
   XML:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmlbf-xeno:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmlbf-xmlhtml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmlhtml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMLParser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9643,20 +9812,25 @@ dont-distribute-packages:
   xmonad-contrib-bluetilebranch:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-gpl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-vanessa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-wallpaper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-windownames:                           [ 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 ]
   Xorshift128Plus:                              [ i686-linux, x86_64-linux, 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 ]
   xournal-render:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xpathdsv:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xournal-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xsact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   XSaiga:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xsd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xslt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xtc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xturtle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xxhash:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   y0l0bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yabi-muno:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9667,11 +9841,8 @@ dont-distribute-packages:
   yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yam-app:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yam-job:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-servant:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-transaction-odbc:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yam-transaction-postgresql:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-pretty-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9681,19 +9852,25 @@ dont-distribute-packages:
   yamlkeysdiff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-sdl2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yandex-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yarn-lock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yarn2nix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yarr-image-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yavie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ycextra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yeller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yeshql-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yeshql-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yeshql-postgresql-simple:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yeshql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-angular-ui:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-angular:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-articles:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-account-fork:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-account:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9708,13 +9885,10 @@ dont-distribute-packages:
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-nopassword:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-oauth:                             [ 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 ]
   yesod-auth-zendesk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-bootstrap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9722,18 +9896,17 @@ dont-distribute-packages:
   yesod-crud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-dsl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-elements:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-fast-devel:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-fay:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-form-richtext:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-gitrev:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-ip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-job-queue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-lucid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-media-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-markdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paypal-rest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9745,6 +9918,7 @@ dont-distribute-packages:
   yesod-raml-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-recaptcha2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-recaptcha:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-flow:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9755,7 +9929,6 @@ dont-distribute-packages:
   yesod-session-redis:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-static-angular:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-test-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-text-markdown:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9763,19 +9936,35 @@ dont-distribute-packages:
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-dynamic-configuration:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-frontend-pango:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-frontend-vty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-fuzzy-open:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-ireader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-keymap-cua:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-keymap-emacs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-keymap-vim:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-misc-modes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-mode-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-mode-javascript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-monokai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-snippet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-solarized:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-spolsky:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp-libs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yjsvg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yoctoparsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yu-auth:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yst:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-launch:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-tool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9793,7 +9982,9 @@ dont-distribute-packages:
   zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq4-clone-pattern:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq4-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq4-patterns:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeroth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-cabal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9803,11 +9994,11 @@ dont-distribute-packages:
   zifter-hlint:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-stack:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zim-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zip-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ZipFold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zipper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9822,9 +10013,10 @@ dont-distribute-packages:
   zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-refs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zre:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zstd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ztail:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ztar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zuramaru:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zxcvbn-c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 72c13707f48d8..2e3a8e1c867db 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -138,19 +138,15 @@ self: super: builtins.intersectAttrs super {
     else super.x509-system;
 
   # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
-  gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
-  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
+  gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
+  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
   gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
-  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
+  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
   gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
 
   # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
-  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })).override { dbus = self.dbus_1_0_1; };
-
-  # Specify needed dbus version
-  dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; };
-  status-notifier-item = super.status-notifier-item.override { dbus = self.dbus_1_0_1; };
+  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; }));
 
   # Add necessary reference to gtk3 package
   gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;
@@ -269,6 +265,10 @@ self: super: builtins.intersectAttrs super {
     );
 
   llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; };
+  llvm-hs_6_3_0 = super.llvm-hs_6_3_0.override {
+    llvm-config = pkgs.llvm_6;
+    llvm-hs-pure = super.llvm-hs-pure_6_2_1;
+  };
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
@@ -301,7 +301,7 @@ self: super: builtins.intersectAttrs super {
 
   # https://github.com/edwinb/EpiVM/issues/13
   # https://github.com/edwinb/EpiVM/issues/14
-  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
+  epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp];
 
   # https://github.com/ekmett/wl-pprint-terminfo/issues/7
   wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
@@ -465,10 +465,10 @@ self: super: builtins.intersectAttrs super {
   io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
 
   # requires autotools to build
-  secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
+  secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
 
   # tests require git
-  hapistrano = addBuildTool super.hapistrano pkgs.git;
+  hapistrano = addBuildTool super.hapistrano pkgs.buildPackages.git;
 
   # This propagates this to everything depending on haskell-gi-base
   haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
@@ -504,6 +504,7 @@ self: super: builtins.intersectAttrs super {
   # Break cyclic reference that results in an infinite recursion.
   partial-semigroup = dontCheck super.partial-semigroup;
   colour = dontCheck super.colour;
+  manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; };
 
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
@@ -513,8 +514,4 @@ self: super: builtins.intersectAttrs super {
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 
-  # cabal2nix generates a dependency on base-compat, which is the wrong version
-  base-compat-batteries = super.base-compat-batteries.override {
-    base-compat = super.base-compat_0_10_1;
-  };
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 629910fd62e1a..d1304c7969499 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -30,7 +30,7 @@ in
 , profilingDetail ? "all-functions"
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? false
-, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
+, enableSharedLibraries ? (ghc.enableShared or false)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
 , enableStaticLibraries ? !hostPlatform.isWindows
 , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
@@ -98,7 +98,7 @@ let
                         else "package-conf";
 
   # the target dir for haddock documentation
-  docdir = docoutput: docoutput + "/share/doc";
+  docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version;
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
@@ -167,7 +167,7 @@ let
   ] ++ crossCabalFlags);
 
   setupCompileFlags = [
-    (optionalString (!coreSetup) "-${nativePackageDbFlag}=$packageConfDir")
+    (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
     (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
     # https://github.com/haskell/cabal/issues/2398
     (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
@@ -179,14 +179,17 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+  depsBuildBuild = [ nativeGhc ];
+  nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
                       setupHaskellDepends ++
-                      buildTools ++ libraryToolDepends ++ executableToolDepends;
+                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
+                      optionals doCheck testToolDepends ++
+                      optionals doBenchmark benchmarkToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
                      allPkgconfigDepends ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++
-                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends);
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
+                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
 
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
@@ -205,23 +208,11 @@ let
 
   nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
 
-  buildPkgDb = ghcName: ''
+  buildPkgDb = ghcName: packageConfDir: ''
     if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then
-      cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf $packageConfDir/
+      cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/
       continue
     fi
-    if [ -d "$p/include" ]; then
-      configureFlags+=" --extra-include-dirs=$p/include"
-    fi
-    if [ -d "$p/lib" ]; then
-      configureFlags+=" --extra-lib-dirs=$p/lib"
-    fi
-  ''
-  # It is not clear why --extra-framework-dirs does work fine on Linux
-  + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") ''
-    if [[ -d "$p/Library/Frameworks" ]]; then
-      configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
-    fi
   '';
 
 in
@@ -242,7 +233,7 @@ stdenv.mkDerivation ({
 
   inherit src;
 
-  inherit nativeBuildInputs;
+  inherit depsBuildBuild nativeBuildInputs;
   buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
   propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;
 
@@ -264,10 +255,8 @@ stdenv.mkDerivation ({
     echo "Build with ${ghc}."
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
-  '' + (optionalString (setupHaskellDepends != []) ''
     setupPackageConfDir="$TMPDIR/setup-package.conf.d"
     mkdir -p $setupPackageConfDir
-  '') + ''
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
 
@@ -278,17 +267,29 @@ stdenv.mkDerivation ({
   # dependencies for the build machine.
   #
   # pkgs* arrays defined in stdenv/setup.hs
-  + (optionalString (setupHaskellDepends != []) ''
+  + ''
     for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
-      ${buildPkgDb nativeGhc.name}
+      ${buildPkgDb nativeGhc.name "$setupPackageConfDir"}
     done
     ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
-  '')
-
-    # For normal components
+  ''
+  # For normal components
   + ''
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
-      ${buildPkgDb ghc.name}
+      ${buildPkgDb ghc.name "$packageConfDir"}
+      if [ -d "$p/include" ]; then
+        configureFlags+=" --extra-include-dirs=$p/include"
+      fi
+      if [ -d "$p/lib" ]; then
+        configureFlags+=" --extra-lib-dirs=$p/lib"
+      fi
+    ''
+    # It is not clear why --extra-framework-dirs does work fine on Linux
+    + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") ''
+      if [[ -d "$p/Library/Frameworks" ]]; then
+        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+      fi
+  '' + ''
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the
@@ -323,11 +324,7 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${optionalString (setupHaskellDepends != [])
-       ''
-       echo GHC_PACKAGE_PATH="$setupPackageConfDir:"
-       GHC_PACKAGE_PATH="$setupPackageConfDir:" ''
-    }${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6acf619797714..43bf0faf07840 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -212,6 +212,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-Vector-Fancy" = callPackage
@@ -223,6 +224,7 @@ self: {
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ACME" = callPackage
@@ -264,7 +266,6 @@ self: {
        ];
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusionForest" = callPackage
@@ -316,7 +317,6 @@ self: {
        ];
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -717,50 +717,6 @@ self: {
 
   "Agda" = callPackage
     ({ mkDerivation, alex, array, async, base, binary, blaze-html
-     , boxes, bytestring, containers, cpphs, data-hash, deepseq
-     , directory, EdisonCore, edit-distance, emacs, equivalence
-     , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables
-     , haskeline, ieee754, monadplus, mtl, murmur-hash, parallel, pretty
-     , process, regex-tdfa, stm, strict, template-haskell, text, time
-     , transformers, unordered-containers, uri-encode, zlib
-     }:
-     mkDerivation {
-       pname = "Agda";
-       version = "2.5.3";
-       sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a";
-       revision = "5";
-       editedCabalFile = "0cly9p549phqv86dlqacxrs2w50y5jmsw21657gpn84ryz3cmjbs";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base binary blaze-html boxes bytestring containers
-         data-hash deepseq directory EdisonCore edit-distance equivalence
-         filepath geniplate-mirror gitrev hashable hashtables haskeline
-         ieee754 monadplus mtl murmur-hash parallel pretty process
-         regex-tdfa stm strict template-haskell text time transformers
-         unordered-containers uri-encode zlib
-       ];
-       libraryToolDepends = [ alex cpphs happy ];
-       executableHaskellDepends = [ base directory filepath process ];
-       executableToolDepends = [ emacs ];
-       postInstall = ''
-         files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
-         for f in "''${files[@]}" ; do
-           $out/bin/agda $f
-         done
-         for f in "''${files[@]}" ; do
-           $out/bin/agda -c --no-main $f
-         done
-         $out/bin/agda-mode compile
-       '';
-       description = "A dependently typed functional programming language and proof assistant";
-       license = "unknown";
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
-     }) {inherit (pkgs) emacs;};
-
-  "Agda_2_5_4" = callPackage
-    ({ mkDerivation, alex, array, async, base, binary, blaze-html
      , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
      , directory, EdisonCore, edit-distance, emacs, equivalence
      , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables
@@ -799,7 +755,6 @@ self: {
        '';
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
@@ -917,27 +872,26 @@ self: {
   "Allure" = callPackage
     ({ mkDerivation, async, base, containers, enummapset, filepath
      , LambdaHack, optparse-applicative, random, template-haskell, text
-     , zlib
+     , transformers, zlib
      }:
      mkDerivation {
        pname = "Allure";
-       version = "0.8.0.0";
-       sha256 = "0mg5srs0mfvdwf898fwkf8ji1722rkc55d0z8d4fb3aq8dvxgsxv";
-       revision = "1";
-       editedCabalFile = "10b34p2wv4nqldj0yaas9injjizxb151ks15k6wdx976fjpkqjqd";
+       version = "0.8.3.0";
+       sha256 = "1yzqiidc8qbjlpgs2d3jkikzggyd7ajq7i7l1dgwqv6sh4r030vb";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base containers enummapset filepath LambdaHack
-         optparse-applicative random template-haskell text zlib
+         optparse-applicative random template-haskell text transformers zlib
        ];
        testHaskellDepends = [
          base containers enummapset filepath LambdaHack optparse-applicative
-         random template-haskell text zlib
+         random template-haskell text transformers zlib
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad game";
-       license = stdenv.lib.licenses.agpl3;
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -982,6 +936,7 @@ self: {
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -1237,6 +1192,7 @@ self: {
        ];
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -1253,6 +1209,7 @@ self: {
        ];
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Baggins" = callPackage
@@ -1440,7 +1397,6 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Biobase" = callPackage
@@ -1834,8 +1790,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.6.1";
-       sha256 = "1hnw8lzbrhpjwjvy19ppkybxmw9v88rgc8y0sp4z056i2fki09jw";
+       version = "0.8.6.2";
+       sha256 = "0prk58bxmy0va5i1blc02w8szspavnj4jz6dv9pjg7z64cs863jy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1847,6 +1803,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -2210,6 +2167,7 @@ self: {
        ];
        description = "cwmwl udp message queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "COrdering" = callPackage
@@ -2494,6 +2452,7 @@ self: {
        pname = "Cabal";
        version = "2.2.0.1";
        sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
+       setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          mtl parsec pretty process text time transformers unix
@@ -2683,10 +2642,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.8.3";
-       sha256 = "13s64fhb2pmkdmx5bkgbgcn25qjihs364fvr47a1dw25f804kiy1";
-       revision = "1";
-       editedCabalFile = "1z4vpzdhphd6qdab73ar7a7yn3x6z4602ffgai2mccc02w5412fl";
+       version = "1.9";
+       sha256 = "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
@@ -2701,8 +2658,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-cairo";
-       version = "1.8.3";
-       sha256 = "1581k1nkvv28a078mc32fwxh98daxqsn3424k1frbrgsppwvlm94";
+       version = "1.9";
+       sha256 = "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr";
        libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
@@ -2719,8 +2676,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-diagrams";
-       version = "1.8.3";
-       sha256 = "1p1spkx1xkwfiqjkji9wxca1ar0h6n6vqn6h45ly4szr9qyixvdy";
+       version = "1.9";
+       sha256 = "1n1fa6198yp5iv7xy0fdxfj794kkll0w7kn2zdq7g52rfx6nkall";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
@@ -2739,8 +2696,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.8.3";
-       sha256 = "051w4ik5174502z6d4va84hv7a57y31iy94w09gl5qwihzfs7wz4";
+       version = "1.9";
+       sha256 = "1p8nf50q031xa1mhv4w3zbyv61i2jyhvd8bq7dqkcqhgknxxpkv0";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -3014,6 +2971,7 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Commando" = callPackage
@@ -3573,26 +3531,26 @@ self: {
   "DOH" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
      , filepath, http-client, http-client-tls, http-types
-     , interpolatedstring-perl6, lens, mtl, QuickCheck
-     , quickcheck-instances, text, time, unordered-containers, uri
+     , interpolatedstring-perl6, lens, mtl, network-uri, QuickCheck
+     , quickcheck-instances, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "DOH";
-       version = "0.1.2.0";
-       sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w";
+       version = "0.1.4.0";
+       sha256 = "1rpmsl07m4qy33axhw39qxay6bw299cs4zqa8nq6w4bcqz44fqav";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
-         http-client-tls http-types lens mtl text time unordered-containers
-         uri
+         http-client-tls http-types lens mtl network-uri text time
+         unordered-containers
        ];
        testHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
          http-client-tls http-types interpolatedstring-perl6 lens mtl
-         QuickCheck quickcheck-instances text time unordered-containers uri
+         network-uri QuickCheck quickcheck-instances text time
+         unordered-containers
        ];
        description = "Complete API bindings for DigitalOcean API V2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DOM" = callPackage
@@ -3669,7 +3627,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "utilities for DP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DRBG" = callPackage
@@ -3936,6 +3893,7 @@ self: {
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DebugTraceHelpers" = callPackage
@@ -3975,7 +3933,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DeepArrow" = callPackage
@@ -3987,6 +3944,7 @@ self: {
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        description = "Arrows for \"deep application\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DeepDarkFantasy" = callPackage
@@ -4528,6 +4486,7 @@ self: {
        ];
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DysFRP-Cairo" = callPackage
@@ -4568,7 +4527,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Earley" = callPackage
@@ -4892,6 +4850,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EtaMOO" = callPackage
@@ -5008,17 +4967,16 @@ self: {
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "2.0.4";
-       sha256 = "1n0b4ksdrr1457abvij76z8r4ski4cic80picddilpg83mxaasw6";
-       revision = "3";
-       editedCabalFile = "19llqvhhc1dl8khggvag47xs2ly0kf7wyba4d092r1c9rz4visy9";
+       version = "2.0.5";
+       sha256 = "186r8a2829sqx4l6n80vifc7g8b5ap66jl3hnqdwzg7s2c0r9saq";
+       revision = "1";
+       editedCabalFile = "1fy3f610i8nwfipfm1dxgb8807k1vix9d65rgn59k579390xfvw8";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
        ];
        description = "Library for computer music research and education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EventSocket" = callPackage
@@ -5057,6 +5015,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "FAI" = callPackage
+    ({ mkDerivation, base, cudart, hspec, inline-c }:
+     mkDerivation {
+       pname = "FAI";
+       version = "0.1.0.10";
+       sha256 = "0hg1598cb44p8bk3a70qahxsvfs8qfm08zzp516b6wg54ky26npg";
+       libraryHaskellDepends = [ base inline-c ];
+       librarySystemDepends = [ cudart ];
+       testHaskellDepends = [ base hspec inline-c ];
+       description = "Haskell Foreign Accelerate Interface";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {cudart = null;};
+
   "FComp" = callPackage
     ({ mkDerivation, array, base, binary, deepseq, ghc-prim
      , HarmTrace-Base, haskore, instant-generics, ListLike, midi, mtl
@@ -5121,6 +5093,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FTGL" = callPackage
@@ -5194,6 +5167,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Facts" = callPackage
@@ -5424,7 +5398,6 @@ self: {
        libraryHaskellDepends = [ base natural-induction peano ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -5740,6 +5713,7 @@ self: {
        libraryHaskellDepends = [ base HaXml ];
        description = "A binding for the Financial Products Markup Language (v5.3)";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FractalArt" = callPackage
@@ -5779,34 +5753,6 @@ self: {
      }) {};
 
   "Frames" = callPackage
-    ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml
-     , HUnit, pipes, pipes-bytestring, pipes-group, pipes-parse
-     , pipes-safe, pipes-text, pretty, primitive, readable
-     , regex-applicative, template-haskell, temporary, text
-     , transformers, unordered-containers, vector, vinyl
-     }:
-     mkDerivation {
-       pname = "Frames";
-       version = "0.3.0.2";
-       sha256 = "1a0dq3dfiqj5nmqk5ivn07ds7k51rf24k5kcbk19m8nwy4hvi896";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base ghc-prim pipes pipes-bytestring pipes-group pipes-parse
-         pipes-safe pipes-text primitive readable template-haskell text
-         transformers vector vinyl
-       ];
-       testHaskellDepends = [
-         base directory hspec htoml HUnit pipes pretty regex-applicative
-         template-haskell temporary text unordered-containers
-       ];
-       benchmarkHaskellDepends = [ base criterion pipes transformers ];
-       description = "Data frames For working with tabular data files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Frames_0_4_0" = callPackage
     ({ mkDerivation, base, contravariant, criterion, deepseq, directory
      , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes
      , pipes-bytestring, pipes-group, pipes-parse, pipes-safe
@@ -5969,23 +5915,6 @@ self: {
      }:
      mkDerivation {
        pname = "GLFW-b";
-       version = "1.4.8.3";
-       sha256 = "01dp6akv70wq9c5qib5f8cmrva9xmqrmdcf30k9y4kklrvbk599z";
-       libraryHaskellDepends = [ base bindings-GLFW deepseq ];
-       testHaskellDepends = [
-         base bindings-GLFW deepseq HUnit test-framework
-         test-framework-hunit
-       ];
-       description = "Bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "GLFW-b_3_2_1_0" = callPackage
-    ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit
-     , test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "GLFW-b";
        version = "3.2.1.0";
        sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i";
        libraryHaskellDepends = [ base bindings-GLFW deepseq ];
@@ -5995,7 +5924,6 @@ self: {
        ];
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLFW-b-demo" = callPackage
@@ -6125,6 +6053,7 @@ self: {
        ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPX" = callPackage
@@ -6368,6 +6297,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Gene-CluEDO" = callPackage
@@ -6967,6 +6897,7 @@ self: {
        ];
        description = "Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GuiHaskell" = callPackage
@@ -7016,6 +6947,32 @@ self: {
        ];
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HABQT" = callPackage
+    ({ mkDerivation, base, hmatrix, hmatrix-gsl, mtl, mwc-random
+     , newtype-generics, optparse-applicative, QuickCheck, streaming
+     , utility-ht, validation, vector
+     }:
+     mkDerivation {
+       pname = "HABQT";
+       version = "0.1.0.0";
+       sha256 = "02lni851v2997im77izycl3x2yw84sm8lsa1alpb0yp6y2f1ghay";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base hmatrix hmatrix-gsl mtl mwc-random newtype-generics streaming
+         utility-ht validation vector
+       ];
+       executableHaskellDepends = [ base optparse-applicative streaming ];
+       testHaskellDepends = [
+         base hmatrix mwc-random newtype-generics QuickCheck streaming
+         utility-ht vector
+       ];
+       description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HARM" = callPackage
@@ -7273,8 +7230,8 @@ self: {
     ({ mkDerivation, base, HDBC }:
      mkDerivation {
        pname = "HDBC-session";
-       version = "0.1.1.1";
-       sha256 = "16ffb6fd6y3qxms6pf4qyc2b03pvnz62bbzrlszp7j48z1alwp15";
+       version = "0.1.2.0";
+       sha256 = "1qwnqb62zgmm4dy5qlcj04aczja6yn16c92jc63zkln9pcc7y1da";
        libraryHaskellDepends = [ base HDBC ];
        description = "Bracketed connection for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -7400,6 +7357,7 @@ self: {
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D" = callPackage
@@ -7993,7 +7951,6 @@ self: {
        ];
        description = "Fast heterogeneous maps and unconstrained typeable-like functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HMarkov" = callPackage
@@ -8036,6 +7993,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HNumeric" = callPackage
+    ({ mkDerivation, base, math-functions, parallel, parallel-io
+     , random
+     }:
+     mkDerivation {
+       pname = "HNumeric";
+       version = "0.5.0.2";
+       sha256 = "1z6r9z7s89z9bihiy37scjrb8k3gb6zi7fl77d3sdldy2x0ajgrh";
+       libraryHaskellDepends = [
+         base math-functions parallel parallel-io random
+       ];
+       testHaskellDepends = [
+         base math-functions parallel parallel-io random
+       ];
+       description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HODE" = callPackage
     ({ mkDerivation, array, base, ode }:
      mkDerivation {
@@ -8080,7 +8055,6 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -8432,7 +8406,6 @@ self: {
        ];
        description = "Library for computer music education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSoundFile" = callPackage
@@ -8537,8 +8510,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTTP";
-       version = "4000.3.11";
-       sha256 = "0idnclf1gnvqsygppanr0gj6dfvxj1rsz8q7hhahfw82v0wjplps";
+       version = "4000.3.12";
+       sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -8782,26 +8755,6 @@ self: {
      }:
      mkDerivation {
        pname = "HaTeX";
-       version = "3.18.0.0";
-       sha256 = "13w1kn85yg8hmhk5m0rv95nr6db5k7z4ycy9s32gs2m3f0v338jz";
-       libraryHaskellDepends = [
-         base bytestring containers hashable matrix parsec QuickCheck text
-         transformers wl-pprint-extras
-       ];
-       testHaskellDepends = [
-         base parsec QuickCheck tasty tasty-quickcheck text
-       ];
-       description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HaTeX_3_19_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, matrix
-     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
-     , wl-pprint-extras
-     }:
-     mkDerivation {
-       pname = "HaTeX";
        version = "3.19.0.0";
        sha256 = "0ja7w9l1pnf4pgbggr8cmsq0234cvsn75b9jzvd64jplhajpgn8z";
        libraryHaskellDepends = [
@@ -8813,7 +8766,6 @@ self: {
        ];
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -8889,6 +8841,7 @@ self: {
        executableHaskellDepends = [ base directory polyparse pretty ];
        description = "Utilities for manipulating XML documents";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hach" = callPackage
@@ -9054,6 +9007,7 @@ self: {
        ];
        description = "Parsing and unambiguously representing musical chords";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HasBigDecimal" = callPackage
@@ -9881,6 +9835,7 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsPerl5" = callPackage
@@ -9938,15 +9893,15 @@ self: {
      }:
      mkDerivation {
        pname = "HsYAML";
-       version = "0.1.1.0";
-       sha256 = "1dih7i0c1fayqrz9x27hfhvg0rb0w1m70a702qhbyjr5jczlh6rb";
+       version = "0.1.1.2";
+       sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers dlist mtl parsec text
        ];
        description = "Pure Haskell YAML 1.2 parser";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "Hsed" = callPackage
@@ -10158,8 +10113,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6Addr";
-       version = "1.0.3";
-       sha256 = "17bk63qi9krfghplrmck4v1hv54kwdppl50hfm7349dqfhdbf129";
+       version = "1.1.0";
+       sha256 = "0f7dckgiv5yq87gb7fd31k0h4adqi6xmdc010rdb6yfgpbk10k29";
        libraryHaskellDepends = [
          aeson attoparsec base iproute network network-info random text
        ];
@@ -10280,6 +10235,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IntGraph" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "IntGraph";
+       version = "0.1.1.0";
+       sha256 = "08cvlvqvjzcxsnqs9lh493y9yjxv5wcfaqc4pq9rl3wlhixjlrp6";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers ];
+       description = "Dynamically sized graph library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Interpolation" = callPackage
     ({ mkDerivation, base, haskell-src-meta, syb, template-haskell }:
      mkDerivation {
@@ -10310,24 +10277,6 @@ self: {
      }:
      mkDerivation {
        pname = "IntervalMap";
-       version = "0.5.3.1";
-       sha256 = "08cc7zasgj083yqhkd0bh3nmwnmbk6sqb6579irqpm3ayrcm8mws";
-       libraryHaskellDepends = [ base containers deepseq ];
-       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq fingertree random SegmentTree
-         weigh
-       ];
-       description = "Containers for intervals, with efficient search";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IntervalMap_0_6_0_0" = callPackage
-    ({ mkDerivation, base, Cabal, containers, criterion, deepseq
-     , fingertree, QuickCheck, random, SegmentTree, weigh
-     }:
-     mkDerivation {
-       pname = "IntervalMap";
        version = "0.6.0.0";
        sha256 = "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg";
        libraryHaskellDepends = [ base containers deepseq ];
@@ -10338,7 +10287,6 @@ self: {
        ];
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Irc" = callPackage
@@ -10608,6 +10556,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.3";
+       sha256 = "1v2xfqi65qcw31021fjpdbaixp2ijq4kmixy5zzkykwc6ap53ln4";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-blp" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, directory
      , filepath, hashable, JuicyPixels, optparse-simple, text-show
@@ -10649,8 +10614,8 @@ self: {
        pname = "JuicyPixels-extra";
        version = "0.3.0";
        sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865";
-       revision = "1";
-       editedCabalFile = "17y0d11hgdnzcgv7q7zl3wic2w2xhqn123vzfsdivncgdgqlvy0c";
+       revision = "3";
+       editedCabalFile = "1xr4vjhzjw3ynibb6693dhcz2jbvbx4yg2bir8w2s98n37gwsxd7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
@@ -10679,6 +10644,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.2";
        sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
+       revision = "1";
+       editedCabalFile = "1snx05qpllybd9yvy03p0lpnmimj0m24x1bxa4svxcsiv56yv9w8";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -10771,6 +10738,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KMP" = callPackage
@@ -11083,6 +11051,7 @@ self: {
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaHack" = callPackage
@@ -11095,10 +11064,8 @@ self: {
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.8.0.0";
-       sha256 = "1g7lmplcgj2swk2mvams42fjmmiamk0hxhhzgzdv29jlq9gzmfv2";
-       revision = "1";
-       editedCabalFile = "1l0s7vqv2qpq50352x772584zz4q7ip0z7jc17b72vnipqln7jkd";
+       version = "0.8.3.0";
+       sha256 = "0v07c8v7l8yg111fysl735scsbsl9l6q3vzigy7rv05sjfl276ss";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -11125,6 +11092,7 @@ self: {
        ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaINet" = callPackage
@@ -11203,6 +11171,7 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -11232,7 +11201,6 @@ self: {
        ];
        description = "Library for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LargeCardinalHierarchy" = callPackage
@@ -11327,6 +11295,7 @@ self: {
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Level0" = callPackage
@@ -11381,7 +11350,6 @@ self: {
        ];
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Limit" = callPackage
@@ -11471,20 +11439,20 @@ self: {
 
   "ListLike" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , dlist, fmlist, HUnit, QuickCheck, random, semigroups, text
-     , utf8-string, vector
+     , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
+     , vector
      }:
      mkDerivation {
        pname = "ListLike";
        version = "4.6";
        sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1";
        libraryHaskellDepends = [
-         array base bytestring containers deepseq dlist fmlist semigroups
-         text utf8-string vector
+         array base bytestring containers deepseq dlist fmlist text
+         utf8-string vector
        ];
        testHaskellDepends = [
          array base bytestring containers dlist fmlist HUnit QuickCheck
-         random semigroups text utf8-string vector
+         random text utf8-string vector
        ];
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
@@ -11760,6 +11728,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -11804,6 +11773,7 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MHask" = callPackage
@@ -12069,6 +12039,7 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Metrics" = callPackage
@@ -12267,6 +12238,7 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MoeDict" = callPackage
@@ -12720,6 +12692,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NTRU" = callPackage
@@ -12819,6 +12792,7 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim vector ];
        description = "Naperian Functors for APL-like programming";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
@@ -13043,6 +13017,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Noise" = callPackage
@@ -13420,6 +13395,7 @@ self: {
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OddWord" = callPackage
@@ -13433,7 +13409,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Omega" = callPackage
@@ -13524,6 +13499,7 @@ self: {
        ];
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -13640,22 +13616,6 @@ self: {
      }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "3.2.7.0";
-       sha256 = "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2";
-       libraryHaskellDepends = [
-         base bytestring containers fixed half text transformers
-       ];
-       librarySystemDepends = [ libGL ];
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libGL;};
-
-  "OpenGLRaw_3_3_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "OpenGLRaw";
        version = "3.3.0.1";
        sha256 = "0jzipa8avnrsw2via8ks012illwg2in27l01y1bp35ci0w2f92fq";
        libraryHaskellDepends = [
@@ -13664,7 +13624,6 @@ self: {
        librarySystemDepends = [ libGL ];
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libGL;};
 
   "OpenGLRaw21" = callPackage
@@ -13921,6 +13880,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Priority Search Queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PTQ" = callPackage
@@ -14405,8 +14365,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.12.2.1";
-       sha256 = "0wxz9skscs72bxb2fac82pyn1wkcxc666l40s42q32rbq17d9x44";
+       version = "0.12.2.2";
+       sha256 = "07zxn4gqkmprrpfyd8vvsf4c2350965k029nzvs0zvrwfbkxin4m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14525,7 +14485,6 @@ self: {
        ];
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
@@ -14548,7 +14507,6 @@ self: {
        ];
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Printf-TH" = callPackage
@@ -14870,23 +14828,6 @@ self: {
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.10.1";
-       sha256 = "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx";
-       libraryHaskellDepends = [
-         base containers deepseq random template-haskell tf-random
-         transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "QuickCheck_2_11_3" = callPackage
-    ({ mkDerivation, base, containers, deepseq, random
-     , template-haskell, tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "QuickCheck";
        version = "2.11.3";
        sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328";
        libraryHaskellDepends = [
@@ -14896,7 +14837,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -14925,12 +14865,13 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "QuickCheckVariant";
-       version = "1.0.0.0";
-       sha256 = "0gxq90fh1bgy2vcpyzbdgnly7q88bbqx06dq44rmv3fwjs61rc82";
+       version = "1.0.0.1";
+       sha256 = "12yxavf2bcd6cpf09j4d97myks4v34jki5hqjl9kcwar8k8j8gls";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickPlot" = callPackage
@@ -15336,6 +15277,7 @@ self: {
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        description = "Ranged sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ranka" = callPackage
@@ -15505,6 +15447,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReviewBoard" = callPackage
@@ -16051,7 +15994,6 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGPath" = callPackage
@@ -16079,7 +16021,6 @@ self: {
        ];
        description = "A parser for SWMM 5 binary .OUT files";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SableCC2Hs" = callPackage
@@ -16184,7 +16125,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ScratchFs" = callPackage
@@ -16291,6 +16231,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SeqAlign" = callPackage
@@ -16359,6 +16300,7 @@ self: {
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -16372,6 +16314,7 @@ self: {
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -16397,6 +16340,7 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -16410,6 +16354,7 @@ self: {
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShortestPathProblems" = callPackage
@@ -16466,7 +16411,6 @@ self: {
        executableHaskellDepends = [ base GLUT ];
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleAES" = callPackage
@@ -16856,10 +16800,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.12.0.0";
-       sha256 = "1ng360aac2n7c9vjwh6q48v1y7p10q7hhlg9pz33hqml6kpd34l3";
-       revision = "1";
-       editedCabalFile = "0a9mfn2p1b6r6pc6n3a2l7xl4607mjj3fvsvpcipp2zvqsryi9c8";
+       version = "0.13.0.0";
+       sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa";
        libraryHaskellDepends = [
          base base64-bytestring bytestring containers cryptonite focus
          hashable http-types hvect list-t monad-control mtl reroute
@@ -16879,14 +16821,11 @@ self: {
     ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
      mkDerivation {
        pname = "Spock-api";
-       version = "0.12.0.0";
-       sha256 = "005ydqf5nq527n3axm8mdi3igsjx76kghabxzfawa9m45yyvrzcc";
-       revision = "1";
-       editedCabalFile = "0w0xah0lirgrs1xvlw5z6saa3wvzdl5r3yq3zxipg7kmrfxgbfbz";
+       version = "0.12.0.1";
+       sha256 = "0mg5r6rdcgy1yc1lx739bwhlndwyfb9hx0dcwqii7a5sy20qy960";
        libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-api-ghcjs" = callPackage
@@ -16895,8 +16834,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock-api-ghcjs";
-       version = "0.12.0.0";
-       sha256 = "00d5irb8gf3rmapyd5xyn8805n5qa6yrf53khx9pyhc4bzd0g9w4";
+       version = "0.12.0.1";
+       sha256 = "1n03ax4iwz58b4myh8jwkixiclpiyvx55h247248xfh6a0xr96l0";
        libraryHaskellDepends = [
          aeson base bytestring ghcjs-base hvect Spock-api text
        ];
@@ -16909,8 +16848,8 @@ self: {
     ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
      mkDerivation {
        pname = "Spock-api-server";
-       version = "0.12.0.0";
-       sha256 = "1kiin49jgdbw38cf4x89f00hpdxd2bq4plfasxqyqx9qh8344wr9";
+       version = "0.12.0.1";
+       sha256 = "14si03c1xcjfhmjpv717x4ipbd5x7h2sqrld7nnh0pgajzfx8m08";
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
@@ -16932,25 +16871,26 @@ self: {
   "Spock-core" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, containers, cookie, directory, hashable, hspec
-     , hspec-wai, http-api-data, http-types, hvect, mtl, old-locale
-     , reroute, resourcet, stm, superbuffer, text, time, transformers
-     , unordered-containers, vault, wai, wai-extra, warp
+     , hspec-wai, http-api-data, http-types, hvect, monad-control, mtl
+     , old-locale, reroute, resourcet, stm, superbuffer, text, time
+     , transformers, transformers-base, unordered-containers, vault, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "Spock-core";
-       version = "0.12.0.0";
-       sha256 = "15bqx4b6xslgcbq8hzsadyyqmqvmpxdy5jkbai6n9yi763m716z6";
-       revision = "1";
-       editedCabalFile = "0xk6kmka807ifwldr34wjgkwdn19p848ik6lmm2zyah08amvcgqq";
+       version = "0.13.0.0";
+       sha256 = "0qjiv0jqs3bsgx6mpflsykr2rpvw5cch5v7r6z5306ccli1bvjjy";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
-         cookie directory hashable http-api-data http-types hvect mtl
-         old-locale reroute resourcet stm superbuffer text time transformers
-         unordered-containers vault wai wai-extra warp
+         cookie directory hashable http-api-data http-types hvect
+         monad-control mtl old-locale reroute resourcet stm superbuffer text
+         time transformers transformers-base unordered-containers vault wai
+         wai-extra warp
        ];
        testHaskellDepends = [
          aeson base base64-bytestring bytestring hspec hspec-wai http-types
-         reroute text time transformers unordered-containers wai
+         monad-control reroute text time transformers transformers-base
+         unordered-containers wai
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
@@ -17101,7 +17041,6 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stomp" = callPackage
@@ -17216,6 +17155,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "StrictCheck" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, deepseq
+     , generics-sop, HUnit, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "StrictCheck";
+       version = "0.1.0";
+       sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z";
+       libraryHaskellDepends = [
+         base bifunctors containers generics-sop QuickCheck template-haskell
+       ];
+       testHaskellDepends = [
+         base deepseq generics-sop HUnit QuickCheck
+       ];
+       description = "StrictCheck: Keep Your Laziness In Check";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "StringUtils" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17413,6 +17371,7 @@ self: {
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        description = "Tangible Values -- composable interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TYB" = callPackage
@@ -17444,6 +17403,7 @@ self: {
        ];
        description = "Ferry Table Algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tables" = callPackage
@@ -17491,7 +17451,6 @@ self: {
        ];
        description = "Tahin Password Generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tainted" = callPackage
@@ -17544,7 +17503,6 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -17638,8 +17596,8 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
-       revision = "4";
-       editedCabalFile = "04qpbdcpfayghrc4hgy9bacg3s5cqfhjgmbmdba00wmqlja0yz8d";
+       revision = "5";
+       editedCabalFile = "088x66qy58308nsdsif9zknh4787r3fvdxf6qxzc5vc8dib1j64z";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
@@ -18023,6 +17981,7 @@ self: {
        libraryHaskellDepends = [ base base-orphans ];
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypeIlluminator" = callPackage
@@ -18048,6 +18007,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypingTester" = callPackage
@@ -18164,6 +18124,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Unixutils" = callPackage
@@ -18202,6 +18163,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UrlDisp" = callPackage
@@ -18262,6 +18224,7 @@ self: {
        executableHaskellDepends = [ regexpr text ];
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Validation" = callPackage
@@ -18411,20 +18374,22 @@ self: {
      }) {};
 
   "Villefort" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, HDBC
-     , HDBC-sqlite3, hspec, MissingH, mtl, process, QuickCheck, random
-     , scotty, split, strict, text, time, transformers, unix, webdriver
+    ({ mkDerivation, base, bytestring, convertible, directory, filepath
+     , HDBC, HDBC-sqlite3, hspec, MissingH, mtl, process, QuickCheck
+     , random, scotty, split, strict, text, time, transformers, unix
+     , webdriver
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.2.11";
-       sha256 = "0ggcp3sgqv1m5xs8q87c2n6rms7mypbf3j9f5702qllzyns2r79l";
+       version = "0.1.2.13";
+       sha256 = "06550iga9spy478lyzd6a9r464j6963dmbb2xafqzagw0vj7g2l5";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath HDBC HDBC-sqlite3 MissingH mtl
-         process random scotty split strict text time transformers unix
+         base bytestring convertible directory filepath HDBC HDBC-sqlite3
+         MissingH mtl process random scotty split strict text time
+         transformers unix
        ];
        executableHaskellDepends = [
          base HDBC HDBC-sqlite3 random scotty split text time
@@ -18601,6 +18566,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WebBits-Html" = callPackage
@@ -18942,6 +18908,8 @@ self: {
        pname = "WordNet";
        version = "1.1.0";
        sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k";
+       revision = "2";
+       editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -18954,6 +18922,8 @@ self: {
        pname = "WordNet-ghc74";
        version = "0.1.3";
        sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8";
+       revision = "1";
+       editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -19015,24 +18985,6 @@ self: {
      }:
      mkDerivation {
        pname = "X11";
-       version = "1.8";
-       sha256 = "13lxq36856fzp61y4api78vssykyh8fm2aplr0nsj18ymdm1c6sl";
-       libraryHaskellDepends = [ base data-default ];
-       librarySystemDepends = [
-         libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
-       ];
-       description = "A binding to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
-         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
-         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
-
-  "X11_1_9" = callPackage
-    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
-     , libXrandr, libXrender, libXScrnSaver
-     }:
-     mkDerivation {
-       pname = "X11";
        version = "1.9";
        sha256 = "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh";
        libraryHaskellDepends = [ base data-default ];
@@ -19041,7 +18993,6 @@ self: {
        ];
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
@@ -19383,20 +19334,6 @@ self: {
     ({ mkDerivation, base, deepseq, random }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.10.7";
-       sha256 = "1ifijcqk6il68h8yr62mvqh8fqc1ss15slfp73vwd92jkv5kvc8l";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base deepseq random ];
-       testHaskellDepends = [ base ];
-       description = "Library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Yampa_0_11" = callPackage
-    ({ mkDerivation, base, deepseq, random }:
-     mkDerivation {
-       pname = "Yampa";
        version = "0.11";
        sha256 = "0frybgsj73r57rd6ckv9pgd9ff1g72qrlad90plb13cf2s6jdp3f";
        isLibrary = true;
@@ -19405,7 +19342,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yampa-core" = callPackage
@@ -19541,6 +19477,7 @@ self: {
        libraryHaskellDepends = [ base TypeCompose ];
        description = "Zipping folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZipperAG" = callPackage
@@ -19599,6 +19536,7 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "abacate" = callPackage
@@ -19808,25 +19746,6 @@ self: {
      }) {};
 
   "accelerate" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, base-orphans, containers
-     , deepseq, directory, exceptions, fclabels, filepath, ghc-prim
-     , hashable, hashtables, mtl, template-haskell, time, transformers
-     , unique, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "accelerate";
-       version = "1.1.1.0";
-       sha256 = "1qcfhaz48fmn2di5g65mmwmqhvgl194k922nps5qa3mx5d3q5x54";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base base-orphans containers deepseq directory
-         exceptions fclabels filepath ghc-prim hashable hashtables mtl
-         template-haskell time transformers unique unix unordered-containers
-       ];
-       description = "An embedded language for accelerated array processing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate_1_2_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans
      , bytestring, Cabal, cabal-doctest, constraints, containers
      , cryptonite, deepseq, directory, doctest, exceptions, filepath
@@ -19850,7 +19769,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -19869,38 +19787,10 @@ self: {
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-bignum" = callPackage
-    ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm
-     , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion
-     , ghc-prim, llvm-hs-pure, mwc-random, tasty, tasty-quickcheck
-     , template-haskell, vector, vector-th-unbox, wide-word
-     }:
-     mkDerivation {
-       pname = "accelerate-bignum";
-       version = "0.1.0.0";
-       sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w";
-       revision = "2";
-       editedCabalFile = "00s0n5jqahn15m8x81chavv8blzjjb8z6368pl3diaadd8bi8hsv";
-       libraryHaskellDepends = [
-         accelerate accelerate-llvm accelerate-llvm-native
-         accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
-       ];
-       testHaskellDepends = [
-         accelerate accelerate-llvm-native accelerate-llvm-ptx base tasty
-         tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx
-         base criterion mwc-random vector vector-th-unbox wide-word
-       ];
-       description = "Fixed-length large integer arithmetic for Accelerate";
-       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "accelerate-bignum_0_2_0_0" = callPackage
+  "accelerate-bignum" = callPackage
     ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm
      , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion
      , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty
@@ -19933,36 +19823,6 @@ self: {
      , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs
      , bytestring, containers, criterion, cublas, cuda, deepseq
      , file-embed, hedgehog, hmatrix, llvm-hs-pure, mtl, mwc-random
-     , mwc-random-accelerate, storable-complex
-     }:
-     mkDerivation {
-       pname = "accelerate-blas";
-       version = "0.1.0.1";
-       sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd";
-       revision = "2";
-       editedCabalFile = "1bxh38hyn7lq73z1dqg8rsbdblvy3551lp08jlm2h8p9b8bsriia";
-       libraryHaskellDepends = [
-         accelerate accelerate-llvm accelerate-llvm-native
-         accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda
-         file-embed llvm-hs-pure mtl storable-complex
-       ];
-       testHaskellDepends = [
-         accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog
-       ];
-       benchmarkHaskellDepends = [
-         accelerate accelerate-llvm-native accelerate-llvm-ptx base
-         criterion deepseq hmatrix mwc-random mwc-random-accelerate
-       ];
-       description = "Numeric Linear Algebra in Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "accelerate-blas_0_2_0_0" = callPackage
-    ({ mkDerivation, accelerate, accelerate-llvm
-     , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs
-     , bytestring, containers, criterion, cublas, cuda, deepseq
-     , file-embed, hedgehog, hmatrix, llvm-hs-pure, mtl, mwc-random
      , mwc-random-accelerate, tasty, tasty-hedgehog
      }:
      mkDerivation {
@@ -20101,25 +19961,6 @@ self: {
   "accelerate-fft" = callPackage
     ({ mkDerivation, accelerate, accelerate-llvm
      , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring
-     , carray, cuda, cufft, fft, file-embed, storable-complex
-     }:
-     mkDerivation {
-       pname = "accelerate-fft";
-       version = "1.1.0.0";
-       sha256 = "0q2ihnangmm708bwdhfyc5z7s1ng11x8imgb7y06fc5n2m7sxn9l";
-       libraryHaskellDepends = [
-         accelerate accelerate-llvm accelerate-llvm-native
-         accelerate-llvm-ptx base bytestring carray cuda cufft fft
-         file-embed storable-complex
-       ];
-       description = "FFT using the Accelerate library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "accelerate-fft_1_2_0_0" = callPackage
-    ({ mkDerivation, accelerate, accelerate-llvm
-     , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring
      , carray, containers, cuda, cufft, fft, file-embed, hashable
      , hedgehog, lens-accelerate, mtl, tasty, tasty-hedgehog
      , unordered-containers
@@ -20155,6 +19996,7 @@ self: {
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier" = callPackage
@@ -20180,6 +20022,7 @@ self: {
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -20202,23 +20045,6 @@ self: {
      }) {};
 
   "accelerate-io" = callPackage
-    ({ mkDerivation, accelerate, array, base, bmp, bytestring, repa
-     , vector
-     }:
-     mkDerivation {
-       pname = "accelerate-io";
-       version = "1.0.0.1";
-       sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm";
-       revision = "1";
-       editedCabalFile = "1qf7f1swy5h1fqaciw1swvwrvmqrcmi03v0vqsx6ccxf2zxcjlal";
-       libraryHaskellDepends = [
-         accelerate array base bmp bytestring repa vector
-       ];
-       description = "Read and write Accelerate arrays in various formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-io_1_2_0_0" = callPackage
     ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog
      , primitive, repa, tasty, tasty-hedgehog, vector
      }:
@@ -20234,35 +20060,11 @@ self: {
        ];
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
     ({ mkDerivation, abstract-deque, accelerate, base, bytestring
      , chaselev-deque, containers, data-default-class, deepseq
-     , directory, dlist, exceptions, fclabels, filepath, llvm-hs
-     , llvm-hs-pure, mtl, mwc-random, template-haskell
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "accelerate-llvm";
-       version = "1.1.0.0";
-       sha256 = "1x42gaafdm998k3x9qfpv8qb5jn7mh5h8rim3ywaj5cm9fk280qw";
-       revision = "1";
-       editedCabalFile = "1h26kcajp26w72fhl31i3bagdyn20za4qpb26fb90v15iygq9q46";
-       libraryHaskellDepends = [
-         abstract-deque accelerate base bytestring chaselev-deque containers
-         data-default-class deepseq directory dlist exceptions fclabels
-         filepath llvm-hs llvm-hs-pure mtl mwc-random template-haskell
-         unordered-containers vector
-       ];
-       description = "Accelerate backend component generating LLVM IR";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-llvm_1_2_0_0" = callPackage
-    ({ mkDerivation, abstract-deque, accelerate, base, bytestring
-     , chaselev-deque, containers, data-default-class, deepseq
      , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure
      , mtl, mwc-random, primitive, template-haskell
      , unordered-containers, vector
@@ -20284,28 +20086,6 @@ self: {
 
   "accelerate-llvm-native" = callPackage
     ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
-     , c2hs, Cabal, cereal, containers, directory, dlist, fclabels
-     , filepath, ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure
-     , mtl, template-haskell, time, unique, unix, vector
-     }:
-     mkDerivation {
-       pname = "accelerate-llvm-native";
-       version = "1.1.0.1";
-       sha256 = "0hxws9lsmcsrhj0gxwnl86mcsg8x7wyv13lbb2lrglkychqkkv5l";
-       revision = "1";
-       editedCabalFile = "1kqv7bpa3mm4qzc141z5kqq934930b1cv2djr9m2ycwvb3y8ysfl";
-       libraryHaskellDepends = [
-         accelerate accelerate-llvm base bytestring Cabal cereal containers
-         directory dlist fclabels filepath ghc ghc-prim hashable libffi
-         llvm-hs llvm-hs-pure mtl template-haskell time unique unix vector
-       ];
-       libraryToolDepends = [ c2hs ];
-       description = "Accelerate backend for multicore CPUs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-llvm-native_1_2_0_0" = callPackage
-    ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
      , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc
      , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, mtl
      , template-haskell, time, unique, unix, vector
@@ -20328,27 +20108,6 @@ self: {
 
   "accelerate-llvm-ptx" = callPackage
     ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
-     , containers, cuda, deepseq, directory, dlist, fclabels, file-embed
-     , filepath, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty
-     , process, template-haskell, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "accelerate-llvm-ptx";
-       version = "1.1.0.1";
-       sha256 = "0j1j4y0gx219ib8hyklydv0l610j53zg6qan4n7477rs58ninv5j";
-       libraryHaskellDepends = [
-         accelerate accelerate-llvm base bytestring containers cuda deepseq
-         directory dlist fclabels file-embed filepath hashable llvm-hs
-         llvm-hs-pure mtl nvvm pretty process template-haskell time
-         unordered-containers
-       ];
-       description = "Accelerate backend for NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "accelerate-llvm-ptx_1_2_0_0" = callPackage
-    ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
      , containers, cuda, deepseq, directory, dlist, file-embed, filepath
      , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process
      , template-haskell, time, unordered-containers
@@ -20412,6 +20171,7 @@ self: {
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accentuateus" = callPackage
@@ -20462,6 +20222,7 @@ self: {
        ];
        description = "Provides Access Token for Services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accuerr" = callPackage
@@ -20751,6 +20512,7 @@ self: {
        ];
        description = "fastest Haskell PONG server in the world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-inator" = callPackage
@@ -20894,6 +20656,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-now" = callPackage
@@ -21098,6 +20861,7 @@ self: {
        libraryHaskellDepends = [ array base random ];
        description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-zero" = callPackage
@@ -21194,6 +20958,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -21232,8 +20997,8 @@ self: {
        pname = "ad";
        version = "4.3.5";
        sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw";
-       revision = "3";
-       editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5";
+       revision = "5";
+       editedCabalFile = "0yzyfqhsafzaqzj8wmjrj5ghm6jwbxya3wxc9sjl59j9q20jc4nq";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
@@ -21367,6 +21132,8 @@ self: {
        pname = "adjunctions";
        version = "4.4";
        sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h";
+       revision = "1";
+       editedCabalFile = "0582nnn3fab63nd7ng8smk2c8j7pciiyzfj1na34wqid2hs675as";
        libraryHaskellDepends = [
          array base comonad containers contravariant distributive free mtl
          profunctors semigroupoids semigroups tagged transformers
@@ -21529,15 +21296,14 @@ self: {
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
      , hashable-time, HUnit, integer-logarithms, QuickCheck
-     , quickcheck-instances, scientific, tagged, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, th-abstraction, time, time-locale-compat
-     , unordered-containers, uuid-types, vector
+     , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-abstraction, time
+     , time-locale-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.2.4.0";
-       sha256 = "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l";
+       version = "1.3.1.1";
+       sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text
@@ -21548,27 +21314,27 @@ self: {
          attoparsec base base-compat base-orphans base16-bytestring
          bytestring containers directory dlist filepath generic-deriving
          ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
-         quickcheck-instances scientific tagged template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time time-locale-compat unordered-containers uuid-types vector
+         quickcheck-instances scientific tagged tasty tasty-hunit
+         tasty-quickcheck template-haskell text time time-locale-compat
+         unordered-containers uuid-types vector
        ];
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_3_1_1" = callPackage
+  "aeson_1_4_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, HUnit, integer-logarithms, QuickCheck
+     , hashable-time, integer-logarithms, QuickCheck
      , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, th-abstraction, time
      , time-locale-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.3.1.1";
-       sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
+       version = "1.4.0.0";
+       sha256 = "042phqkabjrlrl3azr3ba9q7naz4c2cjl5nplbfz8iidpf6j0sli";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text
@@ -21578,7 +21344,7 @@ self: {
        testHaskellDepends = [
          attoparsec base base-compat base-orphans base16-bytestring
          bytestring containers directory dlist filepath generic-deriving
-         ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
+         ghc-prim hashable hashable-time integer-logarithms QuickCheck
          quickcheck-instances scientific tagged tasty tasty-hunit
          tasty-quickcheck template-haskell text time time-locale-compat
          unordered-containers uuid-types vector
@@ -21682,10 +21448,10 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-compat";
-       version = "0.3.7.1";
-       sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
-       revision = "3";
-       editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9";
+       version = "0.3.8";
+       sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i";
+       revision = "1";
+       editedCabalFile = "0ayf5hkhl63lmlxpl7w5zvnz0lvpxb2rwmf0wbslff0y2s449mbf";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-iso8601 base base-compat bytestring
          containers exceptions hashable scientific tagged text time
@@ -21744,7 +21510,6 @@ self: {
        ];
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-diff-generic" = callPackage
@@ -21769,36 +21534,6 @@ self: {
 
   "aeson-extra" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec
-     , attoparsec-iso8601, base, base-compat, bytestring, containers
-     , deepseq, exceptions, hashable, parsec, quickcheck-instances
-     , recursion-schemes, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, these, time
-     , time-parsers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-extra";
-       version = "0.4.1.0";
-       sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y";
-       revision = "1";
-       editedCabalFile = "0fqhf8prdgjskr3qpryx2pn5s78l9dpapm4kmghak0dxh90sfp33";
-       libraryHaskellDepends = [
-         aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat
-         bytestring containers deepseq exceptions hashable parsec
-         recursion-schemes scientific template-haskell text these time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base containers quickcheck-instances tasty tasty-hunit
-         tasty-quickcheck these time time-parsers unordered-containers
-         vector
-       ];
-       description = "Extra goodies for aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-extra_0_4_1_1" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, attoparsec
      , attoparsec-iso8601, base, base-compat-batteries, bytestring
      , containers, deepseq, exceptions, hashable, parsec
      , quickcheck-instances, recursion-schemes, scientific, tasty
@@ -21809,6 +21544,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.1.1";
        sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl";
+       revision = "1";
+       editedCabalFile = "14blp4jmcd81ipxany6q7x706xj8fhy019a73c391n767r1nwpq1";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec attoparsec-iso8601 base
          base-compat-batteries bytestring containers deepseq exceptions
@@ -21831,12 +21568,14 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-filthy";
-       version = "0.1.1";
-       sha256 = "1jv3avgbjrpgp7sfamvrlk04gbiczbjbqw6m88i9b6m45gxs7zaq";
+       version = "0.1.2";
+       sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8";
        libraryHaskellDepends = [
          aeson base bytestring text unordered-containers
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         aeson base bytestring doctest text unordered-containers
+       ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21922,6 +21661,7 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -22285,8 +22025,8 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi";
-       revision = "6";
-       editedCabalFile = "06jpkp95sicqv9kjasgwwd89kfrnz37402ppvgg5567sbg1wm9zh";
+       revision = "7";
+       editedCabalFile = "0lnlmsn5imbapdhbza1175wm04ynn1w75llkhlk1akpanx1dnd15";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -22310,6 +22050,7 @@ self: {
        ];
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-yak" = callPackage
@@ -22351,7 +22092,6 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Affine spaces (generalized)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "affine-invariant-ensemble-mcmc" = callPackage
@@ -22431,6 +22171,7 @@ self: {
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agda-server" = callPackage
@@ -22534,8 +22275,8 @@ self: {
      }:
      mkDerivation {
        pname = "aig";
-       version = "0.2.5";
-       sha256 = "115rp0iymwnvd69ymp9kdvc812axrgn2qzwqnqlx4gpn05wh8brr";
+       version = "0.2.6";
+       sha256 = "1xcwchzsz6kxd6b0bqqmfhyrjsmqyikrf5qdry81y6p5bphk098i";
        libraryHaskellDepends = [ base base-compat mtl QuickCheck vector ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-ant-xml tasty-quickcheck
@@ -22702,8 +22443,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika";
-       version = "5.7";
-       sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m";
+       version = "5.8";
+       sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp";
        libraryHaskellDepends = [
          array base binary containers deepseq exceptions mtl mwc-random
          random semigroups vector
@@ -22864,8 +22605,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "5.7";
-       sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r";
+       version = "5.8";
+       sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0";
        libraryHaskellDepends = [
          aivika array base containers exceptions mtl mwc-random random
          semigroups vector
@@ -22913,18 +22654,22 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
-    ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
+    ({ mkDerivation, async, base, clock, hspec, stm, time
+     , unbounded-delays
+     }:
      mkDerivation {
        pname = "alarmclock";
-       version = "0.4.0.4";
-       sha256 = "0jrd0855mxx3hqxnp7g1xg60p9d4i5km9imxajy0q3k94049hxyx";
+       version = "0.5.0.2";
+       sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15";
        libraryHaskellDepends = [
          async base clock stm time unbounded-delays
        ];
+       testHaskellDepends = [
+         async base clock hspec stm time unbounded-delays
+       ];
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23008,6 +22753,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex-prelude" = callPackage
@@ -23026,8 +22772,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.3";
-       sha256 = "119g5am7nr8wbk0gjyia80pkj81p2z9ag3s97vbmzrkfamsjaik0";
+       version = "0.4";
+       sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -23061,7 +22807,6 @@ self: {
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -23195,6 +22940,7 @@ self: {
        ];
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -23239,6 +22985,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "algolia" = callPackage
+    ({ mkDerivation, aeson, aeson-iproute, attoparsec, base, bytestring
+     , cryptonite, data-has, exceptions, hashable, http-client
+     , http-client-tls, http-types, iproute, memory, mtl, retry
+     , scientific, tasty, tasty-discover, tasty-hunit, text, time
+     , unordered-containers, uri-templater, vector
+     }:
+     mkDerivation {
+       pname = "algolia";
+       version = "0.1.0.0";
+       sha256 = "1gasyh2hv38i4936p4shmqmdxr06n785nydbxhaljrwwzih5mh3p";
+       libraryHaskellDepends = [
+         aeson aeson-iproute attoparsec base bytestring cryptonite data-has
+         exceptions hashable http-client http-client-tls http-types iproute
+         memory mtl retry scientific text time unordered-containers
+         uri-templater vector
+       ];
+       testHaskellDepends = [
+         aeson base tasty tasty-discover tasty-hunit
+       ];
+       description = "A client implementing the Algolia search API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "align" = callPackage
     ({ mkDerivation, base, containers, transformers, vector }:
      mkDerivation {
@@ -23564,6 +23335,7 @@ self: {
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alternative-extra" = callPackage
@@ -23608,12 +23380,16 @@ self: {
      }) {};
 
   "alternators" = callPackage
-    ({ mkDerivation, base, mmorph, transformers }:
+    ({ mkDerivation, base, lens, mmorph, mtl, newtype-generics, stm
+     , transformers
+     }:
      mkDerivation {
        pname = "alternators";
-       version = "0.1.2.0";
-       sha256 = "19i2yhi6nsd2nl7sisbj6wrii5nw1z7xj7zk0fjmivyclnj03r5g";
-       libraryHaskellDepends = [ base mmorph transformers ];
+       version = "1.0.0.0";
+       sha256 = "0ffk7xhx7n7h5mhb43ss6kprm9mzc0jzdnagz5wdsgqr8a5mnfa4";
+       libraryHaskellDepends = [
+         base lens mmorph mtl newtype-generics stm transformers
+       ];
        description = "Handy functions when using transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23749,7 +23525,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-alexa-business" = callPackage
@@ -23784,7 +23559,6 @@ self: {
        ];
        description = "Amazon API Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -23802,7 +23576,6 @@ self: {
        ];
        description = "Amazon Application Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -23820,7 +23593,6 @@ self: {
        ];
        description = "Amazon AppStream SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-appsync" = callPackage
@@ -23855,7 +23627,6 @@ self: {
        ];
        description = "Amazon Athena SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -23873,7 +23644,6 @@ self: {
        ];
        description = "Amazon Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-autoscaling-plans" = callPackage
@@ -23908,7 +23678,6 @@ self: {
        ];
        description = "Amazon Batch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -23926,7 +23695,6 @@ self: {
        ];
        description = "Amazon Budgets SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -23944,7 +23712,6 @@ self: {
        ];
        description = "Amazon Certificate Manager SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-certificatemanager-pca" = callPackage
@@ -23996,7 +23763,6 @@ self: {
        ];
        description = "Amazon CloudDirectory SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudformation" = callPackage
@@ -24014,7 +23780,6 @@ self: {
        ];
        description = "Amazon CloudFormation SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudfront" = callPackage
@@ -24032,7 +23797,6 @@ self: {
        ];
        description = "Amazon CloudFront SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
@@ -24050,7 +23814,6 @@ self: {
        ];
        description = "Amazon CloudHSM SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudhsmv2" = callPackage
@@ -24068,7 +23831,6 @@ self: {
        ];
        description = "Amazon CloudHSM V2 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
@@ -24086,7 +23848,6 @@ self: {
        ];
        description = "Amazon CloudSearch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
@@ -24104,7 +23865,6 @@ self: {
        ];
        description = "Amazon CloudSearch Domain SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
@@ -24122,7 +23882,6 @@ self: {
        ];
        description = "Amazon CloudTrail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
@@ -24140,7 +23899,6 @@ self: {
        ];
        description = "Amazon CloudWatch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
@@ -24158,7 +23916,6 @@ self: {
        ];
        description = "Amazon CloudWatch Events SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
@@ -24176,7 +23933,6 @@ self: {
        ];
        description = "Amazon CloudWatch Logs SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -24194,7 +23950,6 @@ self: {
        ];
        description = "Amazon CodeBuild SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -24212,7 +23967,6 @@ self: {
        ];
        description = "Amazon CodeCommit SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codedeploy" = callPackage
@@ -24230,7 +23984,6 @@ self: {
        ];
        description = "Amazon CodeDeploy SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codepipeline" = callPackage
@@ -24248,7 +24001,6 @@ self: {
        ];
        description = "Amazon CodePipeline SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codestar" = callPackage
@@ -24266,7 +24018,6 @@ self: {
        ];
        description = "Amazon CodeStar SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
@@ -24284,7 +24035,6 @@ self: {
        ];
        description = "Amazon Cognito Identity SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -24302,7 +24052,6 @@ self: {
        ];
        description = "Amazon Cognito Identity Provider SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
@@ -24320,7 +24069,6 @@ self: {
        ];
        description = "Amazon Cognito Sync SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-comprehend" = callPackage
@@ -24355,7 +24103,6 @@ self: {
        ];
        description = "Amazon Config SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-connect" = callPackage
@@ -24403,7 +24150,6 @@ self: {
        ];
        description = "Core data types and functionality for Amazonka libraries";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cost-explorer" = callPackage
@@ -24438,7 +24184,6 @@ self: {
        ];
        description = "Amazon Cost and Usage Report Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-datapipeline" = callPackage
@@ -24456,7 +24201,6 @@ self: {
        ];
        description = "Amazon Data Pipeline SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-devicefarm" = callPackage
@@ -24474,7 +24218,6 @@ self: {
        ];
        description = "Amazon Device Farm SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-directconnect" = callPackage
@@ -24492,7 +24235,6 @@ self: {
        ];
        description = "Amazon Direct Connect SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-discovery" = callPackage
@@ -24510,7 +24252,6 @@ self: {
        ];
        description = "Amazon Application Discovery Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dms" = callPackage
@@ -24528,7 +24269,6 @@ self: {
        ];
        description = "Amazon Database Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ds" = callPackage
@@ -24546,7 +24286,6 @@ self: {
        ];
        description = "Amazon Directory Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb" = callPackage
@@ -24564,7 +24303,6 @@ self: {
        ];
        description = "Amazon DynamoDB SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb-dax" = callPackage
@@ -24582,7 +24320,6 @@ self: {
        ];
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
@@ -24600,7 +24337,6 @@ self: {
        ];
        description = "Amazon DynamoDB Streams SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ec2" = callPackage
@@ -24618,7 +24354,6 @@ self: {
        ];
        description = "Amazon Elastic Compute Cloud SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -24636,7 +24371,6 @@ self: {
        ];
        description = "Amazon EC2 Container Registry SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -24654,7 +24388,6 @@ self: {
        ];
        description = "Amazon EC2 Container Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -24672,7 +24405,6 @@ self: {
        ];
        description = "Amazon Elastic File System SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticache" = callPackage
@@ -24690,7 +24422,6 @@ self: {
        ];
        description = "Amazon ElastiCache SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
@@ -24708,7 +24439,6 @@ self: {
        ];
        description = "Amazon Elastic Beanstalk SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
@@ -24726,7 +24456,6 @@ self: {
        ];
        description = "Amazon Elasticsearch Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
@@ -24744,7 +24473,6 @@ self: {
        ];
        description = "Amazon Elastic Transcoder SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elb" = callPackage
@@ -24762,7 +24490,6 @@ self: {
        ];
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -24780,7 +24507,6 @@ self: {
        ];
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -24798,7 +24524,6 @@ self: {
        ];
        description = "Amazon Elastic MapReduce SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-fms" = callPackage
@@ -24833,7 +24558,6 @@ self: {
        ];
        description = "Amazon GameLift SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-glacier" = callPackage
@@ -24851,7 +24575,6 @@ self: {
        ];
        description = "Amazon Glacier SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-glue" = callPackage
@@ -24869,7 +24592,6 @@ self: {
        ];
        description = "Amazon Glue SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-greengrass" = callPackage
@@ -24887,7 +24609,6 @@ self: {
        ];
        description = "Amazon Greengrass SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-guardduty" = callPackage
@@ -24922,7 +24643,6 @@ self: {
        ];
        description = "Amazon Health APIs and Notifications SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -24940,7 +24660,6 @@ self: {
        ];
        description = "Amazon Identity and Access Management SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iam-policy" = callPackage
@@ -24978,7 +24697,6 @@ self: {
        ];
        description = "Amazon Import/Export SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-inspector" = callPackage
@@ -24996,7 +24714,6 @@ self: {
        ];
        description = "Amazon Inspector SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot" = callPackage
@@ -25014,7 +24731,6 @@ self: {
        ];
        description = "Amazon IoT SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot-analytics" = callPackage
@@ -25049,7 +24765,6 @@ self: {
        ];
        description = "Amazon IoT Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot-jobs-dataplane" = callPackage
@@ -25084,7 +24799,6 @@ self: {
        ];
        description = "Amazon Kinesis SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -25102,7 +24816,6 @@ self: {
        ];
        description = "Amazon Kinesis Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -25120,7 +24833,6 @@ self: {
        ];
        description = "Amazon Kinesis Firehose SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-video" = callPackage
@@ -25189,7 +24901,6 @@ self: {
        ];
        description = "Amazon Key Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lambda" = callPackage
@@ -25207,7 +24918,6 @@ self: {
        ];
        description = "Amazon Lambda SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lex-models" = callPackage
@@ -25225,7 +24935,6 @@ self: {
        ];
        description = "Amazon Lex Model Building Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lex-runtime" = callPackage
@@ -25243,7 +24952,6 @@ self: {
        ];
        description = "Amazon Lex Runtime Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -25261,7 +24969,6 @@ self: {
        ];
        description = "Amazon Lightsail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -25279,7 +24986,6 @@ self: {
        ];
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-entitlement" = callPackage
@@ -25297,7 +25003,6 @@ self: {
        ];
        description = "Amazon Marketplace Entitlement Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
@@ -25315,7 +25020,6 @@ self: {
        ];
        description = "Amazon Marketplace Metering SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-mechanicalturk" = callPackage
@@ -25333,7 +25037,6 @@ self: {
        ];
        description = "Amazon Mechanical Turk SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-mediaconvert" = callPackage
@@ -25436,7 +25139,6 @@ self: {
        ];
        description = "Amazon Migration Hub SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ml" = callPackage
@@ -25454,7 +25156,6 @@ self: {
        ];
        description = "Amazon Machine Learning SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-mobile" = callPackage
@@ -25472,7 +25173,6 @@ self: {
        ];
        description = "Amazon Mobile SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-mq" = callPackage
@@ -25507,7 +25207,6 @@ self: {
        ];
        description = "Amazon OpsWorks SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -25525,7 +25224,6 @@ self: {
        ];
        description = "Amazon OpsWorks for Chef Automate SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-organizations" = callPackage
@@ -25543,7 +25241,6 @@ self: {
        ];
        description = "Amazon Organizations SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -25561,7 +25258,6 @@ self: {
        ];
        description = "Amazon Pinpoint SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -25579,7 +25275,6 @@ self: {
        ];
        description = "Amazon Polly SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-pricing" = callPackage
@@ -25597,7 +25292,6 @@ self: {
        ];
        description = "Amazon Price List Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -25615,7 +25309,6 @@ self: {
        ];
        description = "Amazon Relational Database Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -25633,7 +25326,6 @@ self: {
        ];
        description = "Amazon Redshift SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -25651,7 +25343,6 @@ self: {
        ];
        description = "Amazon Rekognition SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-resourcegroups" = callPackage
@@ -25686,7 +25377,6 @@ self: {
        ];
        description = "Amazon Resource Groups Tagging API SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -25704,7 +25394,6 @@ self: {
        ];
        description = "Amazon Route 53 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53-autonaming" = callPackage
@@ -25739,7 +25428,6 @@ self: {
        ];
        description = "Amazon Route 53 Domains SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3" = callPackage
@@ -25757,7 +25445,6 @@ self: {
        ];
        description = "Amazon Simple Storage Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -25830,7 +25517,6 @@ self: {
        ];
        description = "Amazon SimpleDB SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-secretsmanager" = callPackage
@@ -25882,7 +25568,6 @@ self: {
        ];
        description = "Amazon Service Catalog SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -25900,7 +25585,6 @@ self: {
        ];
        description = "Amazon Simple Email Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -25918,7 +25602,6 @@ self: {
        ];
        description = "Amazon Shield SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -25936,7 +25619,6 @@ self: {
        ];
        description = "Amazon Server Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -25954,7 +25636,6 @@ self: {
        ];
        description = "Amazon Import/Export Snowball SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -25972,7 +25653,6 @@ self: {
        ];
        description = "Amazon Simple Notification Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sqs" = callPackage
@@ -25990,7 +25670,6 @@ self: {
        ];
        description = "Amazon Simple Queue Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -26008,7 +25687,6 @@ self: {
        ];
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -26026,7 +25704,6 @@ self: {
        ];
        description = "Amazon Step Functions SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -26044,7 +25721,6 @@ self: {
        ];
        description = "Amazon Storage Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sts" = callPackage
@@ -26062,7 +25738,6 @@ self: {
        ];
        description = "Amazon Security Token Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-support" = callPackage
@@ -26080,7 +25755,6 @@ self: {
        ];
        description = "Amazon Support SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-swf" = callPackage
@@ -26098,7 +25772,6 @@ self: {
        ];
        description = "Amazon Simple Workflow Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-test" = callPackage
@@ -26120,7 +25793,6 @@ self: {
        ];
        description = "Common functionality for Amazonka library test-suites";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-transcribe" = callPackage
@@ -26172,7 +25844,6 @@ self: {
        ];
        description = "Amazon WAF SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-waf-regional" = callPackage
@@ -26190,7 +25861,6 @@ self: {
        ];
        description = "Amazon WAF Regional SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-workdocs" = callPackage
@@ -26208,7 +25878,6 @@ self: {
        ];
        description = "Amazon WorkDocs SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-workmail" = callPackage
@@ -26243,7 +25912,6 @@ self: {
        ];
        description = "Amazon WorkSpaces SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -26261,7 +25929,6 @@ self: {
        ];
        description = "Amazon X-Ray SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amby" = callPackage
@@ -26371,20 +26038,22 @@ self: {
 
   "amqp-utils" = callPackage
     ({ mkDerivation, amqp, base, bytestring, connection, containers
-     , data-default-class, process, text, time, tls, x509-system
+     , data-default-class, hinotify, magic, process, text, time, tls
+     , unix, x509-system
      }:
      mkDerivation {
        pname = "amqp-utils";
-       version = "0.3.0.0";
-       sha256 = "05yz8pgj1g8m2y35psvkkpf0xr9dr0qz0andqv452w0ak7vy54bk";
+       version = "0.3.3.1";
+       sha256 = "1psv3n3hgysica7dk9hcvkvxwx6fq8srhrxvpf7mb7mrzjyljvrk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          amqp base bytestring connection containers data-default-class
-         process text time tls x509-system
+         hinotify magic process text time tls unix x509-system
        ];
        description = "Generic Haskell AMQP Consumer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-worker" = callPackage
@@ -26893,8 +26562,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
-       revision = "4";
-       editedCabalFile = "0yp5wihvl22vfcr0x22xdbvrk79hcahx1kyfpwpvv0jkahc5c03q";
+       revision = "5";
+       editedCabalFile = "18vg7p8ymwk3kfhvg8cn8vq574x52n8a2c7ihrg4jg1gdsdrn0vi";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -26934,7 +26603,6 @@ self: {
        testHaskellDepends = [ array base hspec linebreak ];
        description = "sdl-like functions for terminal applications, based on ansi-terminal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -26960,6 +26628,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antagonist" = callPackage
@@ -27207,8 +26876,8 @@ self: {
      }:
      mkDerivation {
        pname = "apart";
-       version = "0.1.0";
-       sha256 = "05jpxq68pm1hs05nxz6wd787jmdxf59kd13nmsa89p5qcdh7znqw";
+       version = "0.1.1";
+       sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27231,33 +26900,17 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.2.4.7";
-       sha256 = "0hqx0q52688zd7hdy6bcmbhycscy1laxggy8fvswglbfdm9m9n8s";
+       version = "0.4.1.1";
+       sha256 = "0ybw09hpjfjm22bza74n57aarv6nhwf5zi27q7q7a6yf5jpa5ccg";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
-       testHaskellDepends = [ base containers QuickCheck vector ];
-       benchmarkHaskellDepends = [ base criterion linear ];
-       description = "A fast ECS for game engine programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apecs_0_3_0_2" = callPackage
-    ({ mkDerivation, async, base, containers, criterion, linear, mtl
-     , QuickCheck, template-haskell, vector
-     }:
-     mkDerivation {
-       pname = "apecs";
-       version = "0.3.0.2";
-       sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i";
-       libraryHaskellDepends = [
-         async base containers mtl template-haskell vector
+       testHaskellDepends = [
+         base containers criterion linear QuickCheck vector
        ];
-       testHaskellDepends = [ base containers QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion linear ];
-       description = "A fast ECS for game engine programming";
+       description = "Fast ECS framework for game programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apelsin" = callPackage
@@ -27871,6 +27524,7 @@ self: {
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "applicative-splice" = callPackage
@@ -27929,37 +27583,6 @@ self: {
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.4.1.0";
-       sha256 = "00hmfdwyrva90wnkww2n6jl7h6s24brz58cacqy8wkgacqrb73kw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apply-refact_0_5_0_0" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
        version = "0.5.0.0";
        sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz";
        isLibrary = true;
@@ -27981,7 +27604,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -28046,7 +27668,6 @@ self: {
        ];
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate-equality" = callPackage
@@ -28297,6 +27918,7 @@ self: {
        ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arff" = callPackage
@@ -28517,34 +28139,6 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, exact-pi
-     , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck
-     , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, transformers
-     }:
-     mkDerivation {
-       pname = "arithmoi";
-       version = "0.6.0.1";
-       sha256 = "0dhr55r5vi10d9wqr054fy8rxp7h9z0kfpwvckaly0j90d6gvkqm";
-       revision = "3";
-       editedCabalFile = "1ah8b17pxa96gdap3sr7872km29lz95bqjwswqzfkirig2njlf9q";
-       configureFlags = [ "-f-llvm" ];
-       libraryHaskellDepends = [
-         array base containers exact-pi ghc-prim integer-gmp
-         integer-logarithms mtl random
-       ];
-       testHaskellDepends = [
-         base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion integer-logarithms random
-       ];
-       description = "Efficient basic number-theoretic functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "arithmoi_0_7_0_0" = callPackage
     ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim
      , integer-gmp, integer-logarithms, mtl, QuickCheck, random
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
@@ -28570,7 +28164,6 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "armada" = callPackage
@@ -28603,6 +28196,7 @@ self: {
        ];
        description = "Armor data structures against serialization backwards compatibility problems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arpa" = callPackage
@@ -28970,6 +28564,7 @@ self: {
        ];
        description = "ASCII table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ascii-vector-avc" = callPackage
@@ -29065,6 +28660,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "asn" = callPackage
+    ({ mkDerivation, aeson, base, hashable, primitive, scientific, text
+     }:
+     mkDerivation {
+       pname = "asn";
+       version = "0.1.0.0";
+       sha256 = "05gzplhf2p13wjz4gry6mxibds27gsa4pjipr4b2faajwdb3cyjf";
+       libraryHaskellDepends = [
+         aeson base hashable primitive scientific text
+       ];
+       description = "asn type and encoding/decoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asn1-codec" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , containers, contravariant, cryptonite, directory, hashable, HUnit
@@ -29231,6 +28841,7 @@ self: {
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asset-bundle" = callPackage
@@ -29244,6 +28855,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asset-map" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , hspec, template-haskell, th-lift-instances
+     }:
+     mkDerivation {
+       pname = "asset-map";
+       version = "0.1.0.0";
+       sha256 = "0c33ghr2wd9dr153zpcmifdysfw39x3bhzz49wy9vm81a7rmw9kg";
+       libraryHaskellDepends = [
+         aeson base bytestring containers filepath template-haskell
+         th-lift-instances
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Asset map support for the JavaScript broccoli-asset-rev library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "assimp" = callPackage
     ({ mkDerivation, assimp, base, c2hs, haskell98, vect }:
      mkDerivation {
@@ -29270,6 +28899,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ast-monad-json" = callPackage
@@ -29284,6 +28914,7 @@ self: {
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astar" = callPackage
@@ -29325,8 +28956,8 @@ self: {
      }:
      mkDerivation {
        pname = "astro";
-       version = "0.4.2.0";
-       sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6";
+       version = "0.4.2.1";
+       sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs";
        libraryHaskellDepends = [ base matrix time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -29369,22 +29000,6 @@ self: {
      }) {};
 
   "async" = callPackage
-    ({ mkDerivation, base, HUnit, stm, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "async";
-       version = "2.1.1.1";
-       sha256 = "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd";
-       libraryHaskellDepends = [ base stm ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit
-       ];
-       description = "Run IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async_2_2_1" = callPackage
     ({ mkDerivation, base, hashable, HUnit, stm, test-framework
      , test-framework-hunit
      }:
@@ -29400,7 +29015,6 @@ self: {
        ];
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-ajax" = callPackage
@@ -29529,27 +29143,6 @@ self: {
 
   "async-refresh" = callPackage
     ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async
-     , microlens, microlens-th, monad-control, monad-logger
-     , safe-exceptions, stm, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "async-refresh";
-       version = "0.2.0.2";
-       sha256 = "1hq1h9ngvg12rwn2xbby69w9y19gm4qaqzdfc1iv5019l5kqncls";
-       libraryHaskellDepends = [
-         base formatting lifted-async microlens microlens-th monad-control
-         monad-logger safe-exceptions stm text
-       ];
-       testHaskellDepends = [
-         base criterion HUnit monad-logger stm test-framework
-         test-framework-hunit text
-       ];
-       description = "Package implementing core logic for refreshing of expiring data";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async-refresh_0_3_0_0" = callPackage
-    ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async
      , microlens, microlens-th, monad-logger, safe-exceptions, stm
      , test-framework, test-framework-hunit, text, unliftio
      , unliftio-core
@@ -29568,33 +29161,10 @@ self: {
        ];
        description = "Package implementing core logic for refreshing of expiring data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-refresh-tokens" = callPackage
     ({ mkDerivation, async-refresh, base, bytestring, criterion
-     , formatting, HUnit, lifted-async, microlens, microlens-th
-     , monad-control, monad-logger, safe-exceptions, stm, test-framework
-     , test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "async-refresh-tokens";
-       version = "0.3.0.1";
-       sha256 = "15m7zrdnla5rjrm33zp1054virx9v58sz8zi89ja7iza8hfwdvdx";
-       libraryHaskellDepends = [
-         async-refresh base bytestring formatting lifted-async microlens
-         microlens-th monad-control monad-logger safe-exceptions stm text
-       ];
-       testHaskellDepends = [
-         base criterion HUnit monad-logger stm test-framework
-         test-framework-hunit
-       ];
-       description = "Package implementing core logic for refreshing of expiring access tokens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async-refresh-tokens_0_4_0_0" = callPackage
-    ({ mkDerivation, async-refresh, base, bytestring, criterion
      , formatting, HUnit, microlens, microlens-th, monad-logger
      , safe-exceptions, test-framework, test-framework-hunit, text
      , unliftio, unliftio-core
@@ -29613,31 +29183,9 @@ self: {
        ];
        description = "Package implementing core logic for refreshing of expiring access tokens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-timer" = callPackage
-    ({ mkDerivation, base, containers, criterion, HUnit, lifted-async
-     , lifted-base, monad-control, safe-exceptions, test-framework
-     , test-framework-hunit, transformers-base
-     }:
-     mkDerivation {
-       pname = "async-timer";
-       version = "0.1.4.1";
-       sha256 = "1653hcx4a265drbgp0js9bhg3zfaspqxkx12f4v22vrfg64lvan2";
-       libraryHaskellDepends = [
-         base lifted-async lifted-base monad-control safe-exceptions
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base containers criterion HUnit lifted-async test-framework
-         test-framework-hunit
-       ];
-       description = "Provides API for timer based execution of IO actions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async-timer_0_2_0_0" = callPackage
     ({ mkDerivation, async, base, containers, criterion
      , safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core
      }:
@@ -29653,7 +29201,6 @@ self: {
        ];
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asynchronous-exceptions" = callPackage
@@ -29751,7 +29298,6 @@ self: {
        ];
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atmos" = callPackage
@@ -29868,7 +29414,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -29907,6 +29452,7 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops" = callPackage
@@ -29915,6 +29461,8 @@ self: {
        pname = "atomic-primops";
        version = "0.8.2";
        sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37";
+       revision = "1";
+       editedCabalFile = "0gdcd84x2s4jiry0was74rzv9l53an1q6ad8jiaj37fr4fim0wcc";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        description = "A safe approach to CAS and other atomic ops in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -30011,7 +29559,6 @@ self: {
        testHaskellDepends = [ base containers HUnit time ];
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atrans" = callPackage
@@ -30049,32 +29596,32 @@ self: {
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
      , Cabal, cli-setup, composition-prelude, containers, cpphs
-     , dependency, dhall, directory, file-embed, filemanip, hashable
-     , http-client, http-client-tls, lzma, microlens, microlens-th, mtl
+     , dependency, dhall, directory, file-embed, filemanip, filepath
+     , hashable, http-client, http-client-tls, lzma, microlens, mtl
      , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-ext, tar, temporary, text, unix, zip-archive, zlib
+     , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.2.2";
-       sha256 = "080wkmv04zdzm86zrmgvyyfv7gkjxfr1fwy9470vviy7hywh1xin";
-       revision = "1";
-       editedCabalFile = "02wam77mcbknvfx8hb0d9d8m9ppvrd1w3xklwky5fz2dv071alm3";
+       version = "3.0.0.2";
+       sha256 = "0sv7xgmipb9cqyiry5mp0fr6abr7r45167ifq7sa518gz7a2a7ax";
        isLibrary = true;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal cli-setup ];
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring bzlib Cabal
          composition-prelude containers dependency dhall directory
-         file-embed filemanip hashable http-client http-client-tls lzma
-         microlens microlens-th mtl parallel-io process shake shake-ats
+         file-embed filemanip filepath hashable http-client http-client-tls
+         lzma microlens mtl parallel-io process shake shake-ats shake-c
          shake-ext tar text unix zip-archive zlib
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
-         base composition-prelude directory microlens optparse-applicative
-         parallel-io shake shake-ats temporary text
+         base bytestring cli-setup composition-prelude dependency directory
+         microlens optparse-applicative parallel-io shake shake-ats
+         temporary text
        ];
+       doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30096,6 +29643,7 @@ self: {
        ];
        description = "ATS scripts for Cabal builds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ats-storable" = callPackage
@@ -30104,8 +29652,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-storable";
-       version = "0.3.0.4";
-       sha256 = "0yjbhlxnrprdvf0k93j0w4dpbr55pdcxcs1jhw4b7ngd64a6nvw5";
+       version = "0.3.0.5";
+       sha256 = "1jafhbvlndr4sv1qb0an588dha549fh3bs7iwsnpc8s2xsxzk7wb";
        libraryHaskellDepends = [
          base bytestring composition-prelude text
        ];
@@ -30166,6 +29714,7 @@ self: {
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attomail" = callPackage
@@ -30289,6 +29838,7 @@ self: {
        ];
        description = "Parsers for the standard Haskell data types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -30302,6 +29852,7 @@ self: {
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-expr" = callPackage
@@ -30430,6 +29981,7 @@ self: {
        ];
        description = "Attoparsec parsers of time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-trans" = callPackage
@@ -30474,6 +30026,7 @@ self: {
        ];
        description = "Variable-length integer decoding for Attoparsec";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attosplit" = callPackage
@@ -31067,8 +30620,10 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.4";
-       sha256 = "1f7wq5c7x99gbibwx9mdmq6d8gyz9szrj7k747gavvf5is8z9h6f";
+       version = "0.3.2.0";
+       sha256 = "046nlq75p2ng5fm4nd4zv6lna1qvivfmcxq7kypw7hra60bkj1a0";
+       revision = "1";
+       editedCabalFile = "08pi93ia3pqndr3429c4mm338kg4bj6byjyzd9vhkss4lc3i13n0";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -31082,7 +30637,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -31230,7 +30784,6 @@ self: {
        ];
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signed-cookies" = callPackage
@@ -31723,7 +31276,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Wrapper over Amazonka's SES";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sign4" = callPackage
@@ -31798,22 +31350,6 @@ self: {
      }:
      mkDerivation {
        pname = "axiom";
-       version = "0.4.6";
-       sha256 = "0i78rbkzmlfr9454m6ax1wk2f76ks5mc2qp0zqir0ds1x2614rc3";
-       libraryHaskellDepends = [
-         base bytestring containers directory ghcjs-perch mtl transformers
-         transient transient-universe
-       ];
-       description = "Web EDSL for running in browsers and server nodes using transient";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "axiom_0_4_7" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , ghcjs-perch, mtl, transformers, transient, transient-universe
-     }:
-     mkDerivation {
-       pname = "axiom";
        version = "0.4.7";
        sha256 = "14vdmkyfqn2i5ibc9d6nfhi5hqbk1552x8paq2x0yvsng4kj228x";
        libraryHaskellDepends = [
@@ -31971,6 +31507,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes ];
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "b9" = callPackage
@@ -32054,47 +31591,24 @@ self: {
      }) {};
 
   "backprop" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, criterion, deepseq
-     , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
-     , primitive, random, reflection, time, transformers
-     , type-combinators, vector
-     }:
-     mkDerivation {
-       pname = "backprop";
-       version = "0.1.5.2";
-       sha256 = "1mb99dwpng07vsaa3vhl6b0kn8ym6qz7i9a0gyj8hafxawbrznfh";
-       libraryHaskellDepends = [
-         base binary deepseq microlens primitive random reflection
-         transformers type-combinators vector
-       ];
-       benchmarkHaskellDepends = [
-         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
-         mwc-random time transformers vector
-       ];
-       description = "Heterogeneous automatic differentation (backpropagation)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "backprop_0_2_4_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, directory
-     , hmatrix, lens, microlens, mwc-random, primitive, reflection
-     , simple-reflect, time, transformers, type-combinators, vector
+     , hmatrix, microlens, microlens-th, mwc-random, primitive
+     , reflection, simple-reflect, time, transformers, vector, vinyl
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.4.0";
-       sha256 = "0l53ixz171nv92wgmrj7zcv458svg3b3zrxn3a8rx5aphb3m9vwc";
+       version = "0.2.5.0";
+       sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection
-         simple-reflect transformers type-combinators vector
+         simple-reflect transformers vector vinyl
        ];
        benchmarkHaskellDepends = [
-         base criterion deepseq directory hmatrix lens mwc-random time
-         vector
+         base criterion deepseq directory hmatrix microlens microlens-th
+         mwc-random time vector
        ];
        description = "Heterogeneous automatic differentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -32359,6 +31873,7 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bank-holiday-usa" = callPackage
@@ -32406,6 +31921,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "barbies" = callPackage
+    ({ mkDerivation, base, bifunctors, QuickCheck, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "barbies";
+       version = "0.1.3.1";
+       sha256 = "0jddnjygqmcczhg2s1ifqgmbd1liqrkhnza4bmcplwmqkg4bkbr5";
+       libraryHaskellDepends = [ base bifunctors ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       description = "Classes for working with types that can change clothes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "barchart" = callPackage
     ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }:
      mkDerivation {
@@ -32531,27 +32060,14 @@ self: {
      }) {invalid-cabal-flag-settings = null;};
 
   "base-compat" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, unix }:
-     mkDerivation {
-       pname = "base-compat";
-       version = "0.9.3";
-       sha256 = "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x";
-       libraryHaskellDepends = [ base unix ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-compat_0_10_1" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "base-compat";
-       version = "0.10.1";
-       sha256 = "0vdv28qylnpqhq6jnhiqvnc0rmbrb0dvnsfdvp094sm7sj9j3v5j";
+       version = "0.10.4";
+       sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
        libraryHaskellDepends = [ base unix ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-compat-batteries" = callPackage
@@ -32567,6 +32083,21 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "base-compat with extra batteries";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "base-compat-batteries_0_10_4" = callPackage
+    ({ mkDerivation, base, base-compat, contravariant, hspec
+     , hspec-discover, QuickCheck
+     }:
+     mkDerivation {
+       pname = "base-compat-batteries";
+       version = "0.10.4";
+       sha256 = "11k4k2n88kyaa41431cmjwmnlnhjbqx95r67mgrdxfyqxxwnxwp8";
+       libraryHaskellDepends = [ base base-compat contravariant ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "base-compat with extra batteries";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -32574,17 +32105,14 @@ self: {
     ({ mkDerivation, base, base-compat }:
      mkDerivation {
        pname = "base-compat-migrate";
-       version = "0.1.0.0";
-       sha256 = "1xppwdkg347k1qq4pibivv89y4k8q70bmj9fmq6qwsbkizp7hsym";
-       revision = "1";
-       editedCabalFile = "047zifghyzjg7c0pdbjg1r5w3d6v0pz5miifam1jrzp2pp9a2jai";
+       version = "0.1.1.0";
+       sha256 = "1k7yjqqc9kd2a1dch33hs3xiyh868a83klx9iz69ix72khacggvk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat ];
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-encoding" = callPackage
@@ -32612,6 +32140,7 @@ self: {
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-generics" = callPackage
@@ -32648,7 +32177,6 @@ self: {
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -32665,18 +32193,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "base-prelude" = callPackage
-    ({ mkDerivation, base }:
+  "base-orphans_0_8" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
+     }:
      mkDerivation {
-       pname = "base-prelude";
-       version = "1.2.1";
-       sha256 = "1f4s2f454zpcfrb5qi7pdlmljsfyw8zpk0kzs3dngki0ysh0rwq7";
-       libraryHaskellDepends = [ base ];
-       description = "The most complete prelude formed solely from the \"base\" package";
+       pname = "base-orphans";
+       version = "0.8";
+       sha256 = "05s8s9zbnvcwnnd8z23jbdcjpd1h07c8fgaw0g9jl8mlpxbcdvmc";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-prelude_1_3" = callPackage
+  "base-prelude" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -32685,7 +32217,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The most complete prelude formed solely from the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -32814,8 +32345,8 @@ self: {
        pname = "base64-bytestring-type";
        version = "1";
        sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl";
-       revision = "2";
-       editedCabalFile = "02ywscryrrh6xwfi0gl4qvxy36jzy7i8y2jsv6mma2av2abr9ms7";
+       revision = "3";
+       editedCabalFile = "18p6iz3b73qyf76azhfpcpgsc1fb2qhv889l0cj1niqlyp7kw69s";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring binary bytestring cereal
          deepseq hashable QuickCheck text
@@ -32825,7 +32356,6 @@ self: {
        ];
        description = "A newtype around ByteString, for base64 encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base64-conduit" = callPackage
@@ -32891,6 +32421,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basement_0_0_8" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "basement";
+       version = "0.0.8";
+       sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "Foundation scrap box of array & string";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "basen-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck }:
      mkDerivation {
@@ -32903,33 +32445,32 @@ self: {
      }) {};
 
   "baserock-schema" = callPackage
-    ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors
-     , flippers, gitlab-api, hspec, microlens-platform, mtl, QuickCheck
-     , rio, yaml, yaml-pretty-extras
+    ({ mkDerivation, aeson, base, etc, gitlab-api, hashable, hspec
+     , lens-aeson, microlens-platform, QuickCheck, rio
+     , yaml-pretty-extras
      }:
      mkDerivation {
        pname = "baserock-schema";
-       version = "0.0.2.0";
-       sha256 = "02lz48177jrnn7fwk7kjlh38a6kv7f197skf69mx0xgs88xjwrn9";
+       version = "0.0.3.5";
+       sha256 = "0f12xazhmcw82ck3byjwcv7z15mzz0ihkzbdb2d6vph7719yxbg3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         algebraic-graphs base errors flippers microlens-platform mtl rio
-         yaml yaml-pretty-extras
+         aeson base microlens-platform rio yaml-pretty-extras
        ];
        executableHaskellDepends = [
-         algebraic-graphs base docopt errors flippers gitlab-api
-         microlens-platform mtl rio yaml yaml-pretty-extras
+         aeson base etc gitlab-api hashable lens-aeson microlens-platform
+         rio yaml-pretty-extras
        ];
        testHaskellDepends = [
-         algebraic-graphs base bytestring errors flippers hspec
-         microlens-platform mtl QuickCheck rio yaml yaml-pretty-extras
+         aeson base hspec microlens-platform QuickCheck rio
+         yaml-pretty-extras
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {gitlab-api = null;};
+     }) {};
 
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
@@ -32971,7 +32512,6 @@ self: {
        ];
        description = "Lifting values from base types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basic-cpuid" = callPackage
@@ -33058,6 +32598,7 @@ self: {
        testHaskellDepends = [ base hspec stm timespan ];
        description = "Simplify queuing up data and processing it in batch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "batch-rename" = callPackage
@@ -33147,7 +32688,6 @@ self: {
        ];
        description = "Core definitions for BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battleplace-api" = callPackage
@@ -33161,7 +32701,6 @@ self: {
        ];
        description = "Public API definitions of BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battleship-combinatorics" = callPackage
@@ -33185,6 +32724,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battleships" = callPackage
@@ -33332,15 +32872,15 @@ self: {
      , gi-ggit, gi-gio, gi-glib, gitrev, haskell-gi-base, hspec, htoml
      , http-client, http-media, http-types, libgit2-glib, monad-logger
      , monad-loops, mtl, network, persistent, persistent-sqlite
-     , resourcet, safe-exceptions, semver, servant-client
-     , servant-options, servant-server, split, stm, string-conversions
-     , string-qq, tar, temporary, text, time, transformers, unix, uuid
-     , wai, wai-cors, warp
+     , resourcet, semver, servant-client, servant-options
+     , servant-server, split, stm, string-conversions, string-qq, tar
+     , temporary, text, time, transformers, unix, uuid, wai, wai-cors
+     , warp
      }:
      mkDerivation {
        pname = "bdcs-api";
-       version = "0.1.0";
-       sha256 = "1hnzbmihpq4nr0yxpwsaq5har2ws20zaialx98g9ws1k8k1kgzh0";
+       version = "0.1.3";
+       sha256 = "1pjcbw7z79bvmyik6ykjha388gdcjb2h1bf3csc2yjy1g87qmq05";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33348,20 +32888,19 @@ self: {
          containers directory extra filepath gi-ggit gi-gio gi-glib gitrev
          haskell-gi-base htoml http-media http-types monad-logger
          monad-loops mtl network persistent persistent-sqlite resourcet
-         safe-exceptions semver servant-options servant-server split stm
-         string-conversions tar temporary text time transformers unix uuid
-         wai wai-cors warp
+         semver servant-options servant-server split stm string-conversions
+         tar temporary text time transformers unix uuid wai wai-cors warp
        ];
        libraryPkgconfigDepends = [ libgit2-glib ];
-       executableHaskellDepends = [ base safe-exceptions ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          aeson base bdcs bytestring cond directory filepath hspec
-         http-client monad-loops safe-exceptions servant-client
-         servant-server string-conversions string-qq temporary text time wai
-         warp
+         http-client monad-loops servant-client servant-server
+         string-conversions string-qq temporary text time wai warp
        ];
        description = "BDCS API Server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) libgit2-glib;};
 
   "bdd" = callPackage
@@ -33434,8 +32973,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-core";
-       version = "0.7.2.1";
-       sha256 = "0v9mspr3r7g5n73pgdwipgx2z23cd5g537g8afd1hj22p7d993jw";
+       version = "0.7.2.2";
+       sha256 = "160ga0w0i1l4nbag6jg8wn3a3csid93x6fdd4j4pah2zk7dswc8j";
        libraryHaskellDepends = [
          aeson base bytestring containers dlist free ghc-prim hashable
          microlens mtl network-uri tagged text time vector-sized
@@ -33445,7 +32984,6 @@ self: {
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-migrate" = callPackage
@@ -33456,8 +32994,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-migrate";
-       version = "0.3.2.0";
-       sha256 = "1a6m27cpa2xlwmwfi1374p3a23i2hm8fjfsl6bdn0zpnawgi5rhf";
+       version = "0.3.2.1";
+       sha256 = "0wwkyg87wf3qcj8c5j3ammdkmjacgzw35pgxbq75bvfkx8k5j69d";
        libraryHaskellDepends = [
          aeson base beam-core bytestring containers deepseq dependent-map
          dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel
@@ -33466,7 +33004,6 @@ self: {
        ];
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-postgres" = callPackage
@@ -33478,8 +33015,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-postgres";
-       version = "0.3.2.0";
-       sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf";
+       version = "0.3.2.2";
+       sha256 = "1wa2ajwrgha5wbbynh68jbqbivfvmr7habnn89yhhfh6gmxqj5yk";
        libraryHaskellDepends = [
          aeson base beam-core beam-migrate bytestring case-insensitive
          conduit free hashable haskell-src-exts lifted-base monad-control
@@ -33488,7 +33025,6 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -33498,15 +33034,14 @@ self: {
      }:
      mkDerivation {
        pname = "beam-sqlite";
-       version = "0.3.2.1";
-       sha256 = "1ijgqlywb7gvig32zrhgryq0nkfabyxvxy81c36x9zfpyj36x04k";
+       version = "0.3.2.2";
+       sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp";
        libraryHaskellDepends = [
          aeson attoparsec base beam-core beam-migrate bytestring dlist free
          hashable mtl network-uri scientific sqlite-simple text time unix
        ];
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-th" = callPackage
@@ -33685,8 +33220,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench";
-       version = "1.0.9";
-       sha256 = "0c58m6w0xci76h97p7dkzcnxn8l9drsl9gz5gihhfzdxiardahrw";
+       version = "1.0.11";
+       sha256 = "15rv999kajlmhvd1cajcn8vir3r950c1v2njyywpqaz6anm6ykm8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33737,6 +33272,7 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencode" = callPackage
@@ -33979,8 +33515,8 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, time }:
      mkDerivation {
        pname = "bgmax";
-       version = "0.2.0.2";
-       sha256 = "05mw9zv1r1zarnqbbz5qhgd173y52nkkv099x5zi2w1j96ca2pmd";
+       version = "0.2.0.3";
+       sha256 = "15w8ib36spnlsvr41rb4n6dp6nh6ksyb07lzwlcf1a4ajfx23ns6";
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
@@ -34004,18 +33540,18 @@ self: {
 
   "bhoogle" = callPackage
     ({ mkDerivation, base, brick, bytestring, containers, directory
-     , filepath, hoogle, lens, process, protolude, text, time, vector
-     , vty
+     , filepath, hoogle, lens, process, protolude, text, time
+     , typed-process, vector, vty
      }:
      mkDerivation {
        pname = "bhoogle";
-       version = "0.1.2.7";
-       sha256 = "0mcqkiddg7lxzambfqwqyqbppn7996a3kjyh1a8fv6h4xqcaf9pz";
+       version = "0.1.2.9";
+       sha256 = "0cgvwmk9ck9xvpa11vvdd703bx2wd1czcin3g68zyy416v6xwyki";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base brick bytestring containers directory filepath hoogle lens
-         process protolude text time vector vty
+         process protolude text time typed-process vector vty
        ];
        description = "Simple terminal GUI for local hoogle";
        license = stdenv.lib.licenses.bsd3;
@@ -34108,13 +33644,11 @@ self: {
      }:
      mkDerivation {
        pname = "bifunctors";
-       version = "5.5.2";
-       sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark";
-       revision = "2";
-       editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319";
+       version = "5.5.3";
+       sha256 = "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l";
        libraryHaskellDepends = [
          base base-orphans comonad containers semigroups tagged
-         template-haskell th-abstraction transformers transformers-compat
+         template-haskell th-abstraction transformers
        ];
        testHaskellDepends = [
          base hspec QuickCheck template-haskell transformers
@@ -34456,7 +33990,6 @@ self: {
        ];
        description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-file" = callPackage
@@ -34552,8 +34085,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.8.0";
        sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi";
-       revision = "2";
-       editedCabalFile = "1kvrp3dfqx49lkvjvglv18r7yzb165wisg953yih9sgksm02pxf5";
+       revision = "4";
+       editedCabalFile = "1hsp8y26g51rjskmgfkgmggzpdg5y30sv8g7rb3id9r43w37zj1q";
        libraryHaskellDepends = [
          aeson base binary case-insensitive hashable scientific tagged text
          text-binary time unordered-containers vector
@@ -34587,7 +34120,6 @@ self: {
        ];
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-parsers" = callPackage
@@ -34675,7 +34207,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cborg serialise ];
        description = "Yet Another Binary Serialisation Library (compatibility shim)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-shared" = callPackage
@@ -34751,6 +34282,7 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers mtl ];
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-tagged" = callPackage
@@ -34764,6 +34296,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.5";
        sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl";
+       revision = "1";
+       editedCabalFile = "0vddb305g3455f0rh0xs6c9i2vllnf83y0pbp53wjwb3l575bqyp";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable scientific SHA tagged text time
@@ -34939,31 +34473,6 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.1.2.4";
-       sha256 = "0d8fjckqykvxy9fs6b7k1fb5161wfbnif5ghrc1q1nlx9ngiykkr";
-       libraryHaskellDepends = [ base bindings-DSL ];
-       librarySystemDepends = [
-         libGL libX11 libXcursor libXext libXfixes libXi libXinerama
-         libXrandr libXxf86vm
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit
-       ];
-       description = "Low-level bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libGL; 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;};
-
-  "bindings-GLFW_3_2_1_1" = callPackage
-    ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
-     , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
-     , libXxf86vm, test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "bindings-GLFW";
        version = "3.2.1.1";
        sha256 = "03hn12bdqypwd6x9hxa7685bm6w86nsf6cmcwkr8zzgb41mwc93b";
        libraryHaskellDepends = [ base bindings-DSL ];
@@ -34976,7 +34485,6 @@ self: {
        ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
          inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
@@ -35278,7 +34786,6 @@ self: {
        librarySystemDepends = [ blas liblapack ];
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "bindings-libcddb" = callPackage
@@ -35497,6 +35004,7 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -35676,7 +35184,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binembed" = callPackage
@@ -35777,6 +35284,7 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioalign" = callPackage
@@ -35788,6 +35296,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biocore" = callPackage
@@ -35799,6 +35308,7 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biofasta" = callPackage
@@ -35810,6 +35320,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biofastq" = callPackage
@@ -35821,6 +35332,7 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biohazard" = callPackage
@@ -35831,8 +35343,8 @@ self: {
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "1.0.1";
-       sha256 = "0gzsrrapv3ih598qqacnipqgxxzxmci98rzvc54jxv3hajsnxkqb";
+       version = "1.0.2";
+       sha256 = "0g954m7ch3lzcc2j49qcmpb7v4apdijq9km8d4r08qr9w6xq5pc8";
        libraryHaskellDepends = [
          async attoparsec base base-prelude bytestring containers exceptions
          hashable primitive stm text transformers unix unordered-containers
@@ -35840,6 +35352,7 @@ self: {
        ];
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -35909,6 +35422,7 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biosff" = callPackage
@@ -36359,8 +35873,8 @@ self: {
        pname = "bits";
        version = "0.5.1";
        sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
-       revision = "4";
-       editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl";
+       revision = "5";
+       editedCabalFile = "012qycmsfz5l6y82d3zgjmp1k3pgvhlpjdk6rwlpc1wlfbpdqiaw";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
@@ -36433,19 +35947,20 @@ self: {
 
   "bits-extra" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec
-     , hw-hedgehog, hw-hspec-hedgehog, vector
+     , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector
      }:
      mkDerivation {
        pname = "bits-extra";
-       version = "0.0.1.2";
-       sha256 = "1d950vjf2f8wp9fjpw6nkvafag6pd42zhxg9mmzvcyxvk28i6znq";
+       version = "0.0.1.3";
+       sha256 = "1vdgj5zz5q7y4n11bsn4v53x5yi0fckj13vbfyrgb454x6rhhav9";
        libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
+       description = "Useful bitwise operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits-extras" = callPackage
@@ -36874,6 +36389,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6.3";
        sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk";
+       revision = "2";
+       editedCabalFile = "0sybv2swx9gwpkjh704xfmilm9jhdb66jqc296agpzp85s2s75zz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat-batteries base64-bytestring bytestring
@@ -36957,6 +36474,7 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blatex" = callPackage
@@ -37062,7 +36580,6 @@ self: {
        testHaskellDepends = [ base colonnade doctest ];
        description = "Helper functions for using blaze-html with colonnade";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-from-html" = callPackage
@@ -37087,8 +36604,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-html";
-       version = "0.9.0.1";
-       sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf";
+       version = "0.9.1.1";
+       sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa";
        libraryHaskellDepends = [
          base blaze-builder blaze-markup bytestring text
        ];
@@ -37272,6 +36789,7 @@ self: {
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ble" = callPackage
@@ -37322,6 +36840,7 @@ self: {
        ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blip" = callPackage
@@ -37440,29 +36959,29 @@ self: {
 
   "bloodhound" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , data-default-class, errors, exceptions, generics-sop, hashable
-     , hspec, http-client, http-types, mtl, mtl-compat, network-uri
-     , QuickCheck, quickcheck-properties, scientific, semigroups
-     , temporary, text, time, transformers, unix-compat
-     , unordered-containers, vector
+     , errors, exceptions, hashable, hspec, http-client, http-types
+     , microlens, microlens-aeson, mtl, network-uri, pretty-simple
+     , QuickCheck, quickcheck-arbitrary-template, quickcheck-properties
+     , scientific, semigroups, semver, temporary, text, time
+     , transformers, unix-compat, unordered-containers, vector
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.15.0.2";
-       sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i";
+       version = "0.16.0.0";
+       sha256 = "0g4x2g0qmwgfrz39iwwagrr7p19fmmz1fpfk29bkmvqvbfvsjgqz";
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers data-default-class
-         exceptions hashable http-client http-types mtl mtl-compat
-         network-uri scientific semigroups text time transformers
-         unordered-containers vector
+         aeson base blaze-builder bytestring containers exceptions hashable
+         http-client http-types mtl network-uri scientific semigroups semver
+         text time transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring containers errors exceptions generics-sop
-         hspec http-client http-types mtl network-uri QuickCheck
-         quickcheck-properties semigroups temporary text time unix-compat
-         unordered-containers vector
+         aeson base bytestring containers errors exceptions hspec
+         http-client http-types microlens microlens-aeson mtl network-uri
+         pretty-simple QuickCheck quickcheck-arbitrary-template
+         quickcheck-properties semigroups semver temporary text time
+         unix-compat unordered-containers vector
        ];
-       description = "ElasticSearch client library for Haskell";
+       description = "Elasticsearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -37486,7 +37005,6 @@ self: {
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -37950,18 +37468,6 @@ self: {
      }) {};
 
   "bookkeeping" = callPackage
-    ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
-     mkDerivation {
-       pname = "bookkeeping";
-       version = "0.2.1.4";
-       sha256 = "1r17x9a5fapqn8ldvyr19l5g5qfxmvzqc5d3rp6rjg60r7k98hpz";
-       libraryHaskellDepends = [ base dlist mtl text time ];
-       testHaskellDepends = [ base doctest Glob ];
-       description = "A module for bookkeeping by double entry";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "bookkeeping_0_4_0_1" = callPackage
     ({ mkDerivation, base, doctest, Glob, mono-traversable, text, time
      , transaction
      }:
@@ -37975,7 +37481,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "A module for bookkeeping by double entry";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bookkeeping-jp" = callPackage
@@ -37992,7 +37497,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Helper functions for Japanese bookkeeping";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -38057,8 +37561,29 @@ self: {
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "boolector" = callPackage
+    ({ mkDerivation, base, boolector, c2hs, containers, directory, mtl
+     , temporary
+     }:
+     mkDerivation {
+       pname = "boolector";
+       version = "0.0.0.3";
+       sha256 = "0wi22ccshk2p4hgd286h9xz1zgm5ng4vr9z9k0kv3kqwyz0qy1qk";
+       libraryHaskellDepends = [
+         base containers directory mtl temporary
+       ];
+       librarySystemDepends = [ boolector ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base ];
+       testSystemDepends = [ boolector ];
+       description = "Haskell bindings for the Boolector SMT solver";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) boolector;};
+
   "boolexpr" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -38068,6 +37593,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bools" = callPackage
@@ -38125,6 +37651,7 @@ self: {
        ];
        description = "Chronokinetic stream sources and incremental consumers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boomerang" = callPackage
@@ -38242,7 +37769,6 @@ self: {
        ];
        description = "Boring and Absurd types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boring-game" = callPackage
@@ -38272,6 +37798,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bot" = callPackage
@@ -38320,8 +37847,8 @@ self: {
        pname = "bound";
        version = "2.0.1";
        sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
-       revision = "4";
-       editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx";
+       revision = "6";
+       editedCabalFile = "18fqzxy3f8r09jwcsfzjlrpvnlz711jq5gcjp4dal1pvsbbw6i09";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -38520,8 +38047,8 @@ self: {
      }:
      mkDerivation {
        pname = "brainheck";
-       version = "0.1.0.7";
-       sha256 = "17x5jyamc4863glxxdp7qdpnma7kinc67230snyplz2xzifpxq7k";
+       version = "0.1.0.8";
+       sha256 = "01jz6j37rjdj3jcs8j27xgwcqykx3sarkb9759qn63v1ln5kv5nj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38531,7 +38058,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "break" = callPackage
@@ -38600,15 +38126,13 @@ self: {
   "brick" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
-     , microlens-th, stm, template-haskell, text, text-zipper
-     , transformers, vector, vty, word-wrap
+     , microlens-th, QuickCheck, stm, template-haskell, text
+     , text-zipper, transformers, vector, vty, word-wrap
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.34.1";
-       sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys";
-       revision = "2";
-       editedCabalFile = "0yk4wxlv693gnax8b0gr6g2zqsm53izwar0aagqc4w3bq3llx63b";
+       version = "0.37.1";
+       sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38616,11 +38140,12 @@ self: {
          microlens microlens-mtl microlens-th stm template-haskell text
          text-zipper transformers vector vty word-wrap
        ];
+       testHaskellDepends = [ base containers QuickCheck ];
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_37_1" = callPackage
+  "brick_0_37_2" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -38628,8 +38153,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.37.1";
-       sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy";
+       version = "0.37.2";
+       sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38658,7 +38183,6 @@ self: {
        ];
        description = "Show syntax-highlighted text in your Brick UI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bricks" = callPackage
@@ -38701,6 +38225,7 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bricks-internal-test" = callPackage
@@ -38716,6 +38241,7 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bricks-parsec" = callPackage
@@ -38807,47 +38333,6 @@ self: {
      , containers, czipwith, data-tree-print, deepseq, directory, extra
      , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
      , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
-     , safe, semigroups, strict, syb, text, transformers, uniplate
-     , unsafe, yaml
-     }:
-     mkDerivation {
-       pname = "brittany";
-       version = "0.9.0.1";
-       sha256 = "1ndmnakzq6kiyxlxmgrjmzzpknrn4ib5ck5vxxr90qw8rw6yqi88";
-       revision = "1";
-       editedCabalFile = "1ac9g160kaaz78xk6xdfpkm0qadgkanjghi8g0b9fy17983fiw7a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra ghc ghc-boot-th
-         ghc-exactprint ghc-paths monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       executableHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       testHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
-         neat-interpolation parsec pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "brittany_0_11_0_0" = callPackage
-    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
-     , containers, czipwith, data-tree-print, deepseq, directory, extra
-     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
-     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
      , random, safe, semigroups, strict, syb, text, transformers
      , uniplate, unsafe, yaml
      }:
@@ -38855,8 +38340,8 @@ self: {
        pname = "brittany";
        version = "0.11.0.0";
        sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
-       revision = "1";
-       editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf";
+       revision = "2";
+       editedCabalFile = "1f20w6zzbygnpa7f6xbaqxx34l62r53ikywg2snn0zkfizf3lcgx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38882,7 +38367,6 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -39217,8 +38701,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.2.4.5";
-       sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc";
+       version = "0.2.4.6";
+       sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l";
        libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
@@ -39312,8 +38796,8 @@ self: {
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.1.1";
-       sha256 = "09jv8qr795ag12xf035ywpvnd61q7cgsqcx1irvyh9zlmiixb975";
+       version = "0.0.1.2";
+       sha256 = "0xd0vxvvbp2fzy4z9yfrc6j5km1612ivnhrx71zzv17m5r2z50sv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39355,8 +38839,8 @@ self: {
      }:
      mkDerivation {
        pname = "build";
-       version = "0.0.1.1";
-       sha256 = "1p3814if20x9prd7m3q414v9a1c735bxzgblp55lb9bbsaja7zyl";
+       version = "1.0";
+       sha256 = "1ga8qjv2p94y2nd6dmwz940vkbmx51kvcvysfvbxadl29n4wg840";
        libraryHaskellDepends = [
          algebraic-graphs base containers extra filepath mtl random
          transformers
@@ -39364,6 +38848,7 @@ self: {
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildable" = callPackage
@@ -39497,17 +38982,17 @@ self: {
      }) {};
 
   "burnt-explorer" = callPackage
-    ({ mkDerivation, aeson, base, bitcoin-script, bytestring, process
-     , scientific
+    ({ mkDerivation, aeson, base, bitcoin-script, bytestring, cassava
+     , process, scientific
      }:
      mkDerivation {
        pname = "burnt-explorer";
-       version = "1.0.0";
-       sha256 = "1lddgjbm62k7avxvq8mlw7z4swbjavffk05nx5nla5fll7v4q219";
+       version = "2.0.0";
+       sha256 = "08r0hzpzyc8frx1k6rxv6b37hbz9yr5gfjsd9ikybx9m78cbgg3n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base bitcoin-script bytestring process scientific
+         aeson base bitcoin-script bytestring cassava process scientific
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
@@ -39542,6 +39027,7 @@ self: {
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buster" = callPackage
@@ -39603,8 +39089,8 @@ self: {
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.6.2";
-       sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf";
+       version = "0.7.1";
+       sha256 = "0mwp99ac22h2byz6llgbdacv8abh8zb2cg78ipnpl3icv0mpcvd9";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -39615,52 +39101,57 @@ self: {
          gtk3 hgettext mtl pango pcap process setlocale text time
        ];
        testHaskellDepends = [
-         base bytestring cairo containers dbus directory filepath gtk3 HUnit
-         mtl pango pcap QuickCheck test-framework test-framework-hunit text
+         base bytestring cairo containers dbus directory filepath gtk3
+         hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
+         test-framework-hunit text
        ];
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
   "butcher" = callPackage
     ({ mkDerivation, base, bifunctors, containers, deque, extra, free
-     , microlens, microlens-th, mtl, multistate, pretty, transformers
-     , unsafe, void
+     , hspec, microlens, microlens-th, mtl, multistate, pretty
+     , transformers, unsafe, void
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.3.0.0";
-       sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng";
-       revision = "1";
-       editedCabalFile = "1zw355fg08p90xv3f1qcray0vz68h4sab0q2zfb3hk3j8mpplgvp";
+       version = "1.3.1.1";
+       sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z";
+       revision = "2";
+       editedCabalFile = "0r600p7pd4l4p75igklwfqqxp2jyl2ghqc3y6jhn473rrw31g36m";
        libraryHaskellDepends = [
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
        ];
+       testHaskellDepends = [
+         base containers deque extra free hspec microlens microlens-th mtl
+         multistate pretty transformers unsafe
+       ];
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "butcher_1_3_1_1" = callPackage
-    ({ mkDerivation, base, bifunctors, containers, deque, extra, free
-     , hspec, microlens, microlens-th, mtl, multistate, pretty
-     , transformers, unsafe, void
+  "butter" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , forkable-monad, free, HUnit, network-simple, stm
+     , template-haskell, text, transformers
      }:
      mkDerivation {
-       pname = "butcher";
-       version = "1.3.1.1";
-       sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z";
+       pname = "butter";
+       version = "0.1.0.6";
+       sha256 = "0r215qycck6w6286w0y69ghpzmcp1bl23j44arabrh2p39lb4h46";
        libraryHaskellDepends = [
-         base bifunctors containers deque extra free microlens microlens-th
-         mtl multistate pretty transformers unsafe void
+         aeson base bytestring containers forkable-monad free HUnit
+         network-simple stm template-haskell text transformers
        ];
        testHaskellDepends = [
-         base containers deque extra free hspec microlens microlens-th mtl
-         multistate pretty transformers unsafe
+         aeson base bytestring containers forkable-monad free HUnit
+         network-simple stm template-haskell text transformers
        ];
-       description = "Chops a command or program invocation into digestable pieces";
+       description = "Monad Transformer for Asyncronous Message Passing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butterflies" = callPackage
@@ -39755,7 +39246,6 @@ self: {
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytable" = callPackage
@@ -39826,8 +39316,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytes";
-       version = "0.15.4";
-       sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm";
+       version = "0.15.5";
+       sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytestring cereal containers hashable mtl scientific
@@ -39887,6 +39377,7 @@ self: {
        ];
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -39915,6 +39406,7 @@ self: {
        ];
        description = "Variable-length integer encoding";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-class" = callPackage
@@ -40026,6 +39518,7 @@ self: {
        ];
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -40161,24 +39654,23 @@ self: {
 
   "bytestring-strict-builder" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, criterion
-     , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
+     , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "bytestring-strict-builder";
-       version = "0.4.5";
-       sha256 = "1kpkz1vd1g4y0wlpp6r77vgwas28s34drdn46mpzfb54a6cjs6fg";
+       version = "0.4.5.1";
+       sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups
        ];
        testHaskellDepends = [
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "An efficient strict bytestring builder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-time" = callPackage
@@ -40200,26 +39692,25 @@ self: {
 
   "bytestring-tree-builder" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq
-     , quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
+     , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "bytestring-tree-builder";
-       version = "0.2.7.1";
-       sha256 = "1mbbs77zcz4y95np8rkwvgmslhyjsv46sv7zzh6qfs20waraa0xf";
+       version = "0.2.7.2";
+       sha256 = "03h2nmhyrr63gw4xmflsrmwf80gvayhs32wnpg3k9aqfjzpz4bd1";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups text
        ];
        testHaskellDepends = [
-         base-prelude bytestring quickcheck-instances tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
+         base-prelude bytestring QuickCheck quickcheck-instances tasty
+         tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
          base-prelude bytestring criterion deepseq
        ];
        description = "A very efficient ByteString builder implementation based on the binary tree";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-trie" = callPackage
@@ -40233,6 +39724,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "An efficient finite map from (byte)strings to values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-typenats" = callPackage
@@ -40461,6 +39953,7 @@ self: {
        ];
        description = "Translate C code into ATS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c2hs" = callPackage
@@ -40470,30 +39963,6 @@ self: {
      }:
      mkDerivation {
        pname = "c2hs";
-       version = "0.28.3";
-       sha256 = "1k7i2b1s596yz5i86p5kdy0b071a7chnjkiv0hl06z7f8nwnvk40";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         array base bytestring containers directory dlist filepath
-         language-c pretty process
-       ];
-       testHaskellDepends = [
-         base filepath HUnit shelly test-framework test-framework-hunit text
-         transformers
-       ];
-       description = "C->Haskell FFI tool that gives some cross-language type safety";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "c2hs_0_28_5" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , dlist, filepath, HUnit, language-c, pretty, process, shelly
-     , test-framework, test-framework-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "c2hs";
        version = "0.28.5";
        sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x";
        isLibrary = false;
@@ -40509,7 +39978,6 @@ self: {
        ];
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c2hs-extra" = callPackage
@@ -40559,7 +40027,6 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Cellular Automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cab" = callPackage
@@ -40641,7 +40108,6 @@ self: {
        ];
        description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -40664,7 +40130,6 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -40711,8 +40176,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.38";
-       sha256 = "0c5c3xd3lipnwdyvnvlxk4wk8gi2akbjwmhnc1bsdyr6g6ihai81";
+       version = "4.38.1";
+       sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40727,6 +40192,7 @@ self: {
        ];
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -40779,6 +40245,7 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-doctest" = callPackage
@@ -40807,6 +40274,7 @@ self: {
        testHaskellDepends = [ base Cabal ];
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-ghc-dynflags" = callPackage
@@ -41020,7 +40488,6 @@ self: {
        ];
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-macosx" = callPackage
@@ -41047,6 +40514,7 @@ self: {
        ];
        description = "Cabal support for creating Mac OSX application bundles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-meta" = callPackage
@@ -41068,6 +40536,7 @@ self: {
        ];
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-mon" = callPackage
@@ -41340,6 +40809,7 @@ self: {
        ];
        description = "Helper functions for writing custom Setup.hs scripts.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -41448,8 +40918,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.9.2";
-       sha256 = "1wcc7a2xzi8kq7k0rv0jc0z4z1w9ry6h71a730m3rz601j8n7q2v";
+       version = "2.9.3";
+       sha256 = "10l1k8rilf032v6pchwhxaq53mr0d08h6xkllidc3c7wfkzcx7qj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41464,7 +40934,8 @@ self: {
          monad-par-extras mtl optparse-applicative pretty
        ];
        testHaskellDepends = [
-         base Cabal filepath language-nix lens pretty tasty tasty-golden
+         base Cabal containers directory filepath language-nix lens pretty
+         process tasty tasty-golden
        ];
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
@@ -41622,6 +41093,7 @@ self: {
        ];
        description = "Cabal binary sandboxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabocha" = callPackage
@@ -41682,6 +41154,101 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cachix" = callPackage
+    ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
+     , bifunctors, bytestring, cachix-api, conduit, conduit-combinators
+     , conduit-extra, cookie, cryptonite, dhall, directory, ed25519
+     , fsnotify, here, hspec, hspec-discover, http-client
+     , http-client-tls, http-conduit, http-types, lzma-conduit
+     , megaparsec, memory, mmorph, optparse-applicative, process
+     , protolude, resourcet, servant, servant-auth, servant-auth-client
+     , servant-client, servant-client-core, servant-streaming-client
+     , streaming, text, unix, uri-bytestring, versions
+     }:
+     mkDerivation {
+       pname = "cachix";
+       version = "0.1.0.2";
+       sha256 = "1r3an3j24dsg2nfm6vj33skwjf3wmbl6lxbfw3ak977z6fxcbwcl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-combinators conduit-extra
+         cookie cryptonite dhall directory ed25519 fsnotify here http-client
+         http-client-tls http-conduit http-types lzma-conduit megaparsec
+         memory mmorph optparse-applicative process protolude resourcet
+         servant servant-auth servant-auth-client servant-client
+         servant-client-core servant-streaming-client streaming text unix
+         uri-bytestring versions
+       ];
+       executableHaskellDepends = [
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-combinators conduit-extra
+         cookie cryptonite dhall directory ed25519 fsnotify here http-client
+         http-client-tls http-conduit http-types lzma-conduit megaparsec
+         memory mmorph optparse-applicative process protolude resourcet
+         servant servant-auth servant-auth-client servant-client
+         servant-client-core servant-streaming-client streaming text unix
+         uri-bytestring versions
+       ];
+       executableToolDepends = [ hspec-discover ];
+       testHaskellDepends = [
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-combinators conduit-extra
+         cookie cryptonite dhall directory ed25519 fsnotify here hspec
+         http-client http-client-tls http-conduit http-types lzma-conduit
+         megaparsec memory mmorph optparse-applicative process protolude
+         resourcet servant servant-auth servant-auth-client servant-client
+         servant-client-core servant-streaming-client streaming text unix
+         uri-bytestring versions
+       ];
+       description = "Command line client for Nix binary cache hosting https://cachix.org";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cachix-api" = callPackage
+    ({ mkDerivation, aeson, amazonka, base, base16-bytestring
+     , bytestring, conduit, conduit-combinators, cookie, cryptonite
+     , hspec, hspec-discover, http-api-data, http-media, lens, memory
+     , protolude, servant, servant-auth, servant-auth-server
+     , servant-auth-swagger, servant-streaming, servant-swagger
+     , servant-swagger-ui-core, string-conv, swagger2, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "cachix-api";
+       version = "0.1.0.1";
+       sha256 = "0z9dbci88qyyqc4b8kl6ab3k8yvgnmswi590qwyjvhc6va2fn3y6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka base base16-bytestring bytestring conduit
+         conduit-combinators cookie cryptonite http-api-data http-media lens
+         memory servant servant-auth servant-auth-server
+         servant-auth-swagger servant-streaming servant-swagger
+         servant-swagger-ui-core string-conv swagger2 text transformers
+       ];
+       executableHaskellDepends = [
+         aeson amazonka base base16-bytestring bytestring conduit
+         conduit-combinators cookie cryptonite http-api-data http-media lens
+         memory servant servant-auth servant-auth-server
+         servant-auth-swagger servant-streaming servant-swagger
+         servant-swagger-ui-core string-conv swagger2 text transformers
+       ];
+       testHaskellDepends = [
+         aeson amazonka base base16-bytestring bytestring conduit
+         conduit-combinators cookie cryptonite hspec http-api-data
+         http-media lens memory protolude servant servant-auth
+         servant-auth-server servant-auth-swagger servant-streaming
+         servant-swagger servant-swagger-ui-core string-conv swagger2 text
+         transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Servant HTTP API specification for https://cachix.org";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "cacophony" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
      , bytestring, criterion, cryptonite, deepseq, directory, exceptions
@@ -41818,7 +41385,6 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -41981,6 +41547,7 @@ self: {
        ];
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "calendar-recycling" = callPackage
@@ -42207,6 +41774,7 @@ self: {
        ];
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canteven-parsedate" = callPackage
@@ -42302,31 +41870,6 @@ self: {
      }) {};
 
   "capataz" = callPackage
-    ({ mkDerivation, async, base, bytestring, data-default, microlens
-     , pretty-show, protolude, safe-exceptions, stm, tasty, tasty-hunit
-     , tasty-rerun, tasty-smallcheck, teardown, text, time
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "capataz";
-       version = "0.1.0.1";
-       sha256 = "0ldxnm5mib9gg7qhf29psifkcfzfcrbnfzk93hvnb08lfrdc8d1d";
-       libraryHaskellDepends = [
-         async base bytestring data-default microlens protolude
-         safe-exceptions stm teardown text time unordered-containers uuid
-         vector
-       ];
-       testHaskellDepends = [
-         async base bytestring data-default microlens pretty-show protolude
-         safe-exceptions stm tasty tasty-hunit tasty-rerun tasty-smallcheck
-         teardown text time unordered-containers uuid vector
-       ];
-       description = "OTP-like supervision trees in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "capataz_0_2_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, pretty-show
      , prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck
      , teardown, time, uuid
@@ -42345,7 +41888,6 @@ self: {
        ];
        description = "OTP-like supervision trees in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capped-list" = callPackage
@@ -42357,6 +41899,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capri" = callPackage
@@ -42537,22 +42080,28 @@ self: {
        ];
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "casa-abbreviations-and-acronyms" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
-     , template-haskell
+    ({ mkDerivation, base, bytestring, containers, fuzzy, lens
+     , monoid-subclasses, optparse-applicative, these, wreq
      }:
      mkDerivation {
        pname = "casa-abbreviations-and-acronyms";
-       version = "0.0.1";
-       sha256 = "12pcw19jf31kvccqfvsxk49ff7zldq0r3kf6zabvzyr9qbas9gjy";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
+       version = "0.0.6";
+       sha256 = "0dsw097629a1jkl36s4bip7pl60i3mw7v9d70p5jmajxv9wn3zjy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers fuzzy lens monoid-subclasses these wreq
+       ];
+       executableHaskellDepends = [
+         base bytestring containers fuzzy lens monoid-subclasses
+         optparse-applicative wreq
        ];
        description = "CASA Abbreviations and Acronyms";
-       license = "unknown";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -43040,8 +42589,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-conduit";
-       version = "0.4.0.2";
-       sha256 = "0kqa91m4ihs3jsp4d22q9qvsanfigawkc3i98p7zns54g0qckgiz";
+       version = "0.5.0";
+       sha256 = "0xj8hxyijkajgrg6g52lxfbg83d8gp01b2x35z0mqia2k6whlihr";
        libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit containers mtl
          text
@@ -43146,6 +42695,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassy" = callPackage
@@ -43394,7 +42944,6 @@ self: {
          hspec QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-client" = callPackage
@@ -43576,8 +43125,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.1.2";
-       sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1";
+       version = "0.1.1.5";
+       sha256 = "0vsljgsgrgb072xk53f02xqrlyp3zv94skmj0q5446ca7i3grppk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43882,7 +43431,6 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -43960,6 +43508,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cfenv" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , raw-strings-qq
+     }:
+     mkDerivation {
+       pname = "cfenv";
+       version = "0.1.0.0";
+       sha256 = "0zklgqkm33n8a2pq8h313xij4nvrv0brh7v4q024bglyam1ndscc";
+       libraryHaskellDepends = [ aeson base bytestring containers ];
+       testHaskellDepends = [
+         aeson base containers hspec raw-strings-qq
+       ];
+       description = "A library getting the environment when running on Cloud Foundry";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cfipu" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , dequeue, mtl
@@ -44334,28 +43898,20 @@ self: {
 
   "chart-unit" = callPackage
     ({ mkDerivation, base, colour, data-default, diagrams-lib
-     , diagrams-svg, doctest, foldl, formatting, generic-lens
-     , generic-lens-labels, lens, linear, mwc-probability, mwc-random
-     , numhask, numhask-histogram, numhask-prelude, numhask-range
-     , palette, primitive, protolude, scientific, svg-builder, SVGFonts
-     , tasty, tasty-hspec, text, time
+     , diagrams-svg, doctest, foldl, formatting, generic-lens, lens
+     , linear, numhask, numhask-prelude, numhask-range, palette
+     , protolude, scientific, svg-builder, SVGFonts, tasty, tasty-hspec
+     , text, time
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.6.3.0";
-       sha256 = "0r8c2g4jq2ldxn8msyyfa8r04hw5acgvb70q77jhh9v9jk5m93aa";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.7.0.0";
+       sha256 = "03mjp806mw0qw3wc9fx5x04cj17cdznr22fki8yzk37jm7rr7y4p";
        libraryHaskellDepends = [
          base colour data-default diagrams-lib diagrams-svg foldl formatting
          generic-lens lens linear numhask numhask-prelude numhask-range
          palette protolude scientific svg-builder SVGFonts text time
        ];
-       executableHaskellDepends = [
-         base diagrams-lib formatting generic-lens-labels lens
-         mwc-probability mwc-random numhask numhask-histogram
-         numhask-prelude numhask-range primitive protolude text time
-       ];
        testHaskellDepends = [
          base doctest numhask numhask-prelude numhask-range tasty
          tasty-hspec
@@ -44469,8 +44025,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.3.3";
-       sha256 = "15al7z2b73bb0ibd1pf3jljay6jc55sxpkr41hm6r97qri7fkd1m";
+       version = "0.1.3.4";
+       sha256 = "16r8bfqw9dlzlzv4ydfn8ywjjly32b0ld5h9f1qrc7hdxb12qkv2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44705,6 +44261,7 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chesshs" = callPackage
@@ -44940,6 +44497,7 @@ self: {
        ];
        description = "Datatypes required for chr library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chr-lang" = callPackage
@@ -44973,6 +44531,7 @@ self: {
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chr-pretty" = callPackage
@@ -45584,8 +45143,8 @@ self: {
     ({ mkDerivation, base, criterion, QuickCheck, random }:
      mkDerivation {
        pname = "cl3";
-       version = "1.0.0.0";
-       sha256 = "1a15nbx0q260bs5bh10vckvlbzfgjs5f676r3drki77hggkidvjh";
+       version = "1.0.0.2";
+       sha256 = "1ibwjry5xmf8dr8wbfdw3mzq4cz9dy5kvxy4sqkshcc08kjm2kp5";
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -45598,8 +45157,8 @@ self: {
     ({ mkDerivation, base, cl3, hmatrix }:
      mkDerivation {
        pname = "cl3-hmatrix-interface";
-       version = "1.0.0.0";
-       sha256 = "0cz1pzbnxld2kpiqggln0yags46zhlc8pzghz3mykblwdvgk7z7s";
+       version = "1.0.0.1";
+       sha256 = "1fixwb8y2v0zwww6p08rwsq7wfz63aj3zv2yjs9z0rp2xm3mq67w";
        libraryHaskellDepends = [ base cl3 hmatrix ];
        description = "Interface to/from Cl3 and HMatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -45610,8 +45169,8 @@ self: {
     ({ mkDerivation, base, cl3, linear }:
      mkDerivation {
        pname = "cl3-linear-interface";
-       version = "1.0.0.0";
-       sha256 = "02yyajy8n9j7jd3kz2qas4h2vyv5b42jrjj092cy18lfj9hr22as";
+       version = "1.0.0.1";
+       sha256 = "1i4f9xxsdzba49h1dv8x14zz1bv1zamhvw2ngi5d6a17qd11g319";
        libraryHaskellDepends = [ base cl3 linear ];
        description = "Interface to/from Cl3 and Linear";
        license = stdenv.lib.licenses.bsd3;
@@ -45738,21 +45297,23 @@ self: {
      }) {};
 
   "clang-pure" = callPackage
-    ({ mkDerivation, base, bytestring, clang, containers, contravariant
-     , inline-c, microlens, microlens-contra, singletons, stm
-     , template-haskell, vector
+    ({ mkDerivation, base, bytestring, Cabal, clang, containers
+     , contravariant, inline-c, lens, microlens, microlens-contra
+     , process, singletons, stm, template-haskell, vector
      }:
      mkDerivation {
        pname = "clang-pure";
-       version = "0.2.0.2";
-       sha256 = "0k30w0hdvhvdbv03jjs0284639njlcs60fljfffskmpslcxqzm7s";
+       version = "0.2.0.3";
+       sha256 = "1x7mw4qw5mfkv6nhqaxp9pgry7xdsb3x24fvkpb7c2iigv1yyk8n";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal inline-c process ];
        libraryHaskellDepends = [
          base bytestring containers contravariant inline-c microlens
          microlens-contra singletons stm template-haskell vector
        ];
        librarySystemDepends = [ clang ];
+       testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45823,10 +45384,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.99.1";
-       sha256 = "0ybkjqza4wl6v4wghrbm87j7ns3qgsg4lb8g6i8rj9nb8yn43jsm";
-       revision = "1";
-       editedCabalFile = "1j11iplvng6m882c013fr0jzni1sqmvcw28k5p9icl3dgad990kf";
+       version = "0.99.2";
+       sha256 = "1f57rxw4v17c8hxxkr41zz9rvwmqm88szvyz44jihkr9m2y79v24";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45853,8 +45412,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.99.1";
-       sha256 = "1jrfvi3jxwmzc32nnf2kjyciws649ldixc38g7acsbapkpjhcfy5";
+       version = "0.99.2";
+       sha256 = "0spkxkh06dqdyv6wjj9511lb0ahj5qjb5q9pyd1nc9kczbv3spvf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base bytestring clash-prelude
@@ -45892,8 +45451,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.99.1";
-       sha256 = "03yys72aq9zhl6g9lw1mvx7ds90ch6jx90n7pv9995lg1nhc83fd";
+       version = "0.99.2";
+       sha256 = "1gs4f3kg2yq2a9y2xypm4k8mdp141889r7kh9495w3qwljhhpb7i";
        libraryHaskellDepends = [
          array base bifunctors constraints data-binary-ieee754 data-default
          deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat
@@ -46101,6 +45660,7 @@ self: {
        ];
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classyplate" = callPackage
@@ -46118,20 +45678,6 @@ self: {
      }) {};
 
   "clay" = callPackage
-    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
-     mkDerivation {
-       pname = "clay";
-       version = "0.12.2";
-       sha256 = "12p9hrky0dynsraz46ddhr4ah5aw9kragvcd5xza7j388ni9b2za";
-       revision = "1";
-       editedCabalFile = "1db2rc6q4a1699n43xmq31mv24b7ayc4ivc3n748zkzhs6ff4nbg";
-       libraryHaskellDepends = [ base mtl text ];
-       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
-       description = "CSS preprocessor as embedded Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "clay_0_13_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, mtl, text }:
      mkDerivation {
        pname = "clay";
@@ -46141,7 +45687,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover mtl text ];
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks" = callPackage
@@ -46176,6 +45721,7 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -46193,6 +45739,7 @@ self: {
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-dot-com" = callPackage
@@ -46264,6 +45811,7 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-mailinglist" = callPackage
@@ -46288,6 +45836,7 @@ self: {
        ];
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -46311,6 +45860,7 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-page" = callPackage
@@ -46337,6 +45887,7 @@ self: {
        ];
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -46354,6 +45905,7 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
@@ -46396,7 +45948,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable text ];
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clean-home" = callPackage
@@ -46471,6 +46022,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cli" = callPackage
@@ -46487,6 +46039,7 @@ self: {
        ];
        description = "Command Line Interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cli-builder" = callPackage
@@ -46616,18 +46169,19 @@ self: {
      }) {};
 
   "clifm" = callPackage
-    ({ mkDerivation, base, brick, byteunits, directory, filepath
-     , optparse-applicative, pointedlist, process, time, vector, vty
+    ({ mkDerivation, base, brick, byteunits, conduit, containers
+     , directory, filepath, lens, optparse-applicative, pointedlist
+     , process, time, vector, vty
      }:
      mkDerivation {
        pname = "clifm";
-       version = "0.4.1.0";
-       sha256 = "0q0m662sg4n2k9lgx82d72gi16widm74a7j08psnjmwhk55ir3cb";
+       version = "0.5.2.1";
+       sha256 = "0prbasvk804mzdwjzprj7v1s1wjzlqjih0pdzi1vdskfqjcyy9n2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base brick byteunits directory filepath optparse-applicative
-         pointedlist process time vector vty
+         base brick byteunits conduit containers directory filepath lens
+         optparse-applicative pointedlist process time vector vty
        ];
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
@@ -46948,6 +46502,7 @@ self: {
        ];
        description = "Haskell CloudI API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudyfs" = callPackage
@@ -47231,8 +46786,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark-gfm";
-       version = "0.1.3";
-       sha256 = "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k";
+       version = "0.1.4";
+       sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        benchmarkHaskellDepends = [
@@ -47610,8 +47165,8 @@ self: {
      }:
      mkDerivation {
        pname = "codec-beam";
-       version = "0.1.1";
-       sha256 = "1d6dsa4di4wil6wqc2jpfqvf09vk4zw9c2905py5vygl87q1y9jq";
+       version = "0.2.0";
+       sha256 = "0rg398vh36fb5bkb0anq0iv7g5z55avchswpkwjcjzilbx765sv1";
        libraryHaskellDepends = [ base bytestring containers text zlib ];
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
@@ -47740,8 +47295,8 @@ self: {
      }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.2.3";
-       sha256 = "0rn4lzjrw930phg62pmrziq4g3dv7rjzxxfsnz11k46w845zzgih";
+       version = "0.2.4";
+       sha256 = "17rpm9414fbwzxnpdvp67zlv6sl7ymkflgbbb50nhq7vv9z69dbc";
        libraryHaskellDepends = [
          base blank-canvas cereal cereal-text containers hashable mtl random
          random-shuffle text time
@@ -47805,6 +47360,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "coercible-utils" = callPackage
+    ({ mkDerivation, base, gauge }:
+     mkDerivation {
+       pname = "coercible-utils";
+       version = "0.0.0";
+       sha256 = "164cn0cs7fjfm599v2z8wsgsz599f97wky4h7vycf460rn34jqia";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base gauge ];
+       description = "Utility functions for Coercible types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cofunctor" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -47922,6 +47490,7 @@ self: {
        ];
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colada" = callPackage
@@ -48109,14 +47678,14 @@ self: {
 
   "colonnade" = callPackage
     ({ mkDerivation, base, bytestring, contravariant, doctest
-     , profunctors, semigroups, text, vector
+     , profunctors, text, vector
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "1.2.0";
-       sha256 = "0a9xh1vg64wyby370djsdcvrhg0vx2bdrwdh7csqri9nbxpzj8jn";
+       version = "1.2.0.1";
+       sha256 = "12ryrg42qgg1hnflz757fik1lrg51l9bg4145bb678y9c1ixisrj";
        libraryHaskellDepends = [
-         base bytestring contravariant profunctors semigroups text vector
+         base bytestring contravariant profunctors text vector
        ];
        testHaskellDepends = [ base doctest ];
        description = "Generic types and functions for columnar encoding and decoding";
@@ -48275,23 +47844,11 @@ self: {
     ({ mkDerivation, accelerate, base }:
      mkDerivation {
        pname = "colour-accelerate";
-       version = "0.2.0.0";
-       sha256 = "10176caf5j7g8z24d8wmr35p6gg6xv7ma0ibgbc7q6r71qvq0zzc";
-       libraryHaskellDepends = [ accelerate base ];
-       description = "Working with colours in Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "colour-accelerate_0_3_0_0" = callPackage
-    ({ mkDerivation, accelerate, base }:
-     mkDerivation {
-       pname = "colour-accelerate";
        version = "0.3.0.0";
        sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz";
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-space" = callPackage
@@ -48302,6 +47859,8 @@ self: {
        pname = "colour-space";
        version = "0.1.4.0";
        sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq";
+       revision = "1";
+       editedCabalFile = "1n9n76g9zjp1i02f964dlfy65m978m8whbcivd063pf1acp9njax";
        libraryHaskellDepends = [
          base colour constrained-categories JuicyPixels linear
          linearmap-category manifolds semigroups vector-space
@@ -48437,6 +47996,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat" = callPackage
@@ -48456,6 +48016,7 @@ self: {
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-compat" = callPackage
@@ -48475,7 +48036,6 @@ self: {
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -48758,10 +48318,8 @@ self: {
      }:
      mkDerivation {
        pname = "comonad";
-       version = "5.0.3";
-       sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57";
-       revision = "2";
-       editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry";
+       version = "5.0.4";
+       sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
@@ -48914,6 +48472,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compactable" = callPackage
@@ -48921,14 +48480,13 @@ self: {
      }:
      mkDerivation {
        pname = "compactable";
-       version = "0.1.2.1";
-       sha256 = "00fxrwyn1znyhfpql2ygh308b7nl6a3lgxvl39q3qm89wzh2gisc";
+       version = "0.1.2.2";
+       sha256 = "0jmc2b7mvqjwv54k7xnqydqf2qa7drr0l0f2vzd1a9pasbw5kx8x";
        libraryHaskellDepends = [
          base bifunctors containers transformers vector
        ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compactmap" = callPackage
@@ -49162,7 +48720,6 @@ self: {
        ];
        description = "Monad for allocation and cleanup of application resources";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "componentm-devel" = callPackage
@@ -49176,7 +48733,6 @@ self: {
        ];
        description = "Easy REPL driven development using ComponentM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composable-associations" = callPackage
@@ -49297,6 +48853,7 @@ self: {
        ];
        description = "Shared utilities for composite-* packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composite-ekg" = callPackage
@@ -49311,6 +48868,7 @@ self: {
        ];
        description = "EKG Metrics for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composite-opaleye" = callPackage
@@ -49355,6 +48913,7 @@ self: {
        ];
        description = "Swagger for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition" = callPackage
@@ -49379,28 +48938,14 @@ self: {
      }) {};
 
   "composition-prelude" = callPackage
-    ({ mkDerivation, base, cpphs }:
-     mkDerivation {
-       pname = "composition-prelude";
-       version = "1.3.0.8";
-       sha256 = "17ihwvkv7plwnwnk7ny81cj4xy2v776yk85gssgix92yc65p47b2";
-       libraryHaskellDepends = [ base ];
-       libraryToolDepends = [ cpphs ];
-       description = "Higher-order function combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "composition-prelude_1_5_0_0" = callPackage
-    ({ mkDerivation, base, cpphs }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.0.0";
-       sha256 = "01rbbqnwmm615af1yrg4afk4dvv24y2k52m6c1rz9xkyyg8ii0hq";
+       version = "1.5.0.6";
+       sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn";
        libraryHaskellDepends = [ base ];
-       libraryToolDepends = [ cpphs ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition-tree" = callPackage
@@ -49568,6 +49113,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concatenative" = callPackage
@@ -49797,31 +49343,14 @@ self: {
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.4.0.2";
-       sha256 = "07wj25nlmry0hqxksdqrvpbg0b4r4fwzf66vfvbap9cxaqkrlxij";
-       libraryHaskellDepends = [
-         array atomic-primops base exceptions monad-control mtl stm
-         transformers
-       ];
-       description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "concurrency_1_5_0_0" = callPackage
-    ({ mkDerivation, array, atomic-primops, base, exceptions
-     , monad-control, mtl, stm, transformers
-     }:
-     mkDerivation {
-       pname = "concurrency";
-       version = "1.5.0.0";
-       sha256 = "0c07jkhsi9fy3ssjs19511dxsqq62yqbh9qd90r666wdhs0v86qh";
+       version = "1.6.0.0";
+       sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
        ];
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -49924,8 +49453,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.10.5";
-       sha256 = "1hx51zihgr6awgx2widqv8y8hbi0baaq081m5kmr3mb4hqi9dh4q";
+       version = "1.10.6";
+       sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions process stm
          terminal-size text transformers unix
@@ -50159,8 +49688,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0.2";
-       sha256 = "0nqy9bffg2p2ij8isz99r7i5zm7sib0m9fqwisknakjh8b99kw60";
+       version = "1.3.0.3";
+       sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mono-traversable mtl
          primitive resourcet text transformers unix unliftio-core vector
@@ -50211,7 +49740,6 @@ self: {
        ];
        description = "Conduit-based algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -50689,6 +50217,8 @@ self: {
        pname = "config-schema";
        version = "0.5.0.1";
        sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
+       revision = "2";
+       editedCabalFile = "0wibr3739xwkvdl48cahppaxn8v20gcmhrjxjj8hkhvgnbpfi2gn";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -50696,6 +50226,7 @@ self: {
        testHaskellDepends = [ base config-value text ];
        description = "Schema definitions for the config-value package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-select" = callPackage
@@ -50735,6 +50266,7 @@ self: {
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configifier" = callPackage
@@ -51013,6 +50545,7 @@ self: {
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "consistent" = callPackage
@@ -51090,10 +50623,10 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, vector }:
      mkDerivation {
        pname = "constaparser";
-       version = "0.1.0.0";
-       sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d";
+       version = "0.1.0.1";
+       sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd";
        libraryHaskellDepends = [ attoparsec base bytestring vector ];
-       description = "Parse ByteStrings of a constant length";
+       description = "Parse ByteStrings of a prescribed length";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -51106,6 +50639,7 @@ self: {
        libraryHaskellDepends = [ base tagged void ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-dynamic" = callPackage
@@ -51212,8 +50746,8 @@ self: {
      }:
      mkDerivation {
        pname = "constraints";
-       version = "0.10";
-       sha256 = "1ii6j62xihxwb85akvy8cdd73g9qr7rd5zl37h4925y2acpbh962";
+       version = "0.10.1";
+       sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
        libraryHaskellDepends = [
          base binary deepseq ghc-prim hashable mtl semigroups transformers
          transformers-compat
@@ -51238,6 +50772,7 @@ self: {
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrictor" = callPackage
@@ -51331,12 +50866,11 @@ self: {
     ({ mkDerivation, base, containers, convert, lens, text }:
      mkDerivation {
        pname = "container";
-       version = "1.1.0";
-       sha256 = "19x7jvzc499y4349gallwwy4wpw4pf4azbsp4gr8ly4j0flfgk6g";
+       version = "1.1.1";
+       sha256 = "1kmi57bx9bahr2vc0b89rgy68r26vn0y531m53fs4avdcadnjl9q";
        libraryHaskellDepends = [ base containers convert lens text ];
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "container-builder" = callPackage
@@ -51375,15 +50909,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_5_11_0" = callPackage
+  "containers_0_6_0_1" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
      , ghc-prim, HUnit, QuickCheck, random, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
-       version = "0.5.11.0";
-       sha256 = "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq";
+       version = "0.6.0.1";
+       sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -51442,10 +50976,8 @@ self: {
     ({ mkDerivation, containers }:
      mkDerivation {
        pname = "containers-verified";
-       version = "0.5.11.0";
-       sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
-       revision = "3";
-       editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3";
+       version = "0.6.0.1";
+       sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9";
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
@@ -51498,6 +51030,7 @@ self: {
        ];
        description = "Basic algorithms on context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "context-stack" = callPackage
@@ -51518,14 +51051,25 @@ self: {
     ({ mkDerivation, base, primitive }:
      mkDerivation {
        pname = "contiguous";
-       version = "0.1.0.0";
-       sha256 = "19j58q0iq8ghhvrz6hqh4k7biiw8nnnxd2q3b3gwnlgfv08g8h7b";
+       version = "0.2.0.0";
+       sha256 = "1cm6syjrql90m54hsinyknfjhspj47ikskq3fv408bl4sx3gk2kl";
        libraryHaskellDepends = [ base primitive ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "contiguous-checked" = callPackage
+    ({ mkDerivation, base, contiguous, primitive }:
+     mkDerivation {
+       pname = "contiguous-checked";
+       version = "0.2.0.0";
+       sha256 = "0cb7cankkmn8nb7v6fy4ykcglfd4sd5nc916lg1nyj7fjr5v7y4l";
+       libraryHaskellDepends = [ base contiguous primitive ];
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "continue" = callPackage
     ({ mkDerivation, base, bifunctors, monad-control, mtl
      , semigroupoids, transformers, transformers-base
@@ -51615,6 +51159,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "contravariant_1_5" = callPackage
+    ({ mkDerivation, base, StateVar, transformers }:
+     mkDerivation {
+       pname = "contravariant";
+       version = "1.5";
+       sha256 = "1hn31wl0jai2jrwc6cz19aflbv9xbyl3m5ab57zzysddjav6gw3f";
+       libraryHaskellDepends = [ base StateVar transformers ];
+       description = "Contravariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "contravariant-extras" = callPackage
     ({ mkDerivation, base, base-prelude, contravariant, semigroups
      , template-haskell, tuple-th
@@ -51706,6 +51262,7 @@ self: {
        ];
        description = "Explicitly typed, checked exceptions with stack traces";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-exception-monadsfd" = callPackage
@@ -51737,6 +51294,7 @@ self: {
        ];
        description = "Monads-tf instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-exception-mtl" = callPackage
@@ -51749,6 +51307,7 @@ self: {
        doHaddock = false;
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-failure" = callPackage
@@ -51942,19 +51501,19 @@ self: {
 
   "convert" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , data-default, lens, template-haskell, text, utf8-string
+     , data-default, impossible, lens, template-haskell, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "convert";
-       version = "1.4.2";
-       sha256 = "0lmbshg6nx0ifnc6qmhvacr5lr5nlay3sjkjg2n5624qm7aiq806";
+       version = "1.5";
+       sha256 = "0hw2qmb3g9p7zqqk92hwnzamld6kg121dkv4va4hkpcjlhb8af6g";
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring containers data-default lens
-         template-haskell text utf8-string
+         ansi-wl-pprint base bytestring containers data-default impossible
+         lens template-haskell text utf8-string
        ];
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "convert-annotation" = callPackage
@@ -52065,6 +51624,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cookies" = callPackage
+    ({ mkDerivation, base, bytestring, chronos, hashable, text, time }:
+     mkDerivation {
+       pname = "cookies";
+       version = "0.1.0.0";
+       sha256 = "1vf7n6q8kp2a3ndv0cqscxqwk4wda03913lmqkk34gjxn37sgyg5";
+       libraryHaskellDepends = [
+         base bytestring chronos hashable text time
+       ];
+       description = "web cookies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "coordinate" = callPackage
     ({ mkDerivation, base, HUnit, lens, papa, transformers }:
      mkDerivation {
@@ -52075,7 +51647,6 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "A representation of latitude and longitude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot" = callPackage
@@ -52122,6 +51693,7 @@ self: {
        ];
        description = "A compiler for Copilot targeting C99";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-cbmc" = callPackage
@@ -52154,6 +51726,7 @@ self: {
        ];
        description = "An intermediate representation for Copilot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-language" = callPackage
@@ -52202,6 +51775,7 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -52334,7 +51908,6 @@ self: {
        librarySystemDepends = [ rocksdb ];
        description = "Launches CoreNLP and parses the JSON output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rocksdb;};
 
   "coroutine-enumerator" = callPackage
@@ -52533,16 +52106,17 @@ self: {
      }) {};
 
   "country" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, ghc-prim
-     , hashable, primitive, scientific, text, unordered-containers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+     , ghc-prim, hashable, primitive, scientific, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "country";
-       version = "0.1.5";
-       sha256 = "0shp4kq8bibfwrjldz8akghgm3n2lq00dybxnq4grmbl5phj3a9s";
+       version = "0.1.6";
+       sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring ghc-prim hashable primitive
-         scientific text unordered-containers
+         aeson attoparsec base bytestring deepseq ghc-prim hashable
+         primitive scientific text unordered-containers
        ];
        testHaskellDepends = [ base ];
        description = "Country data type and functions";
@@ -52585,6 +52159,7 @@ self: {
        ];
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "court" = callPackage
@@ -52766,8 +52341,8 @@ self: {
     ({ mkDerivation, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.5.1";
-       sha256 = "01kknyznwyxd5cgw9q21wmzykl1yiava0s1y3vrrdxzvixk1f89l";
+       version = "3.6.0";
+       sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -52839,31 +52414,9 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) python34;};
 
   "cql" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
-     , network, QuickCheck, tasty, tasty-quickcheck, template-haskell
-     , text, time, transformers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "cql";
-       version = "3.1.1";
-       sha256 = "18vdhr89skxrkbwvfkjx2xzbv2pgbka1hzmi5vq5sszvkmcxkc25";
-       libraryHaskellDepends = [
-         base bytestring cereal Decimal iproute network template-haskell
-         text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         base bytestring cereal Decimal iproute network QuickCheck tasty
-         tasty-quickcheck text time uuid
-       ];
-       description = "Cassandra CQL binary protocol";
-       license = "unknown";
-     }) {};
-
-  "cql_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, Decimal
      , iproute, network, QuickCheck, tasty, tasty-quickcheck
      , template-haskell, text, time, transformers, uuid, vector
@@ -52882,34 +52435,10 @@ self: {
        ];
        description = "Cassandra CQL binary protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cql-io" = callPackage
     ({ mkDerivation, async, auto-update, base, bytestring, containers
-     , cql, cryptohash, data-default-class, exceptions, hashable
-     , HsOpenSSL, iproute, lens, monad-control, mtl, mwc-random, network
-     , retry, semigroups, stm, text, time, tinylog, transformers
-     , transformers-base, uuid, vector
-     }:
-     mkDerivation {
-       pname = "cql-io";
-       version = "0.16.0";
-       sha256 = "012043s6cfkybj764hlrc7i9ql6afl79s2vnjbn9vz99p7wszrc2";
-       revision = "1";
-       editedCabalFile = "07vrizkarip8ap5hp6ngp7yf8xfdmm3r6zbaxafk48raxyfkl8xd";
-       libraryHaskellDepends = [
-         async auto-update base bytestring containers cql cryptohash
-         data-default-class exceptions hashable HsOpenSSL iproute lens
-         monad-control mtl mwc-random network retry semigroups stm text time
-         tinylog transformers transformers-base uuid vector
-       ];
-       description = "Cassandra CQL client";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "cql-io_1_0_0" = callPackage
-    ({ mkDerivation, async, auto-update, base, bytestring, containers
      , cql, cryptohash, data-default-class, Decimal, exceptions
      , hashable, HsOpenSSL, iproute, lens, monad-control, mtl
      , mwc-random, network, raw-strings-qq, retry, semigroups, stm
@@ -52918,8 +52447,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql-io";
-       version = "1.0.0";
-       sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx";
+       version = "1.0.1";
+       sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q";
        libraryHaskellDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable HsOpenSSL iproute lens
@@ -53132,24 +52661,6 @@ self: {
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "1.9";
-       sha256 = "1i9r2sxrmx5ppgrvfncai6ap0ibmqdb8h166nw9pb0qp9rvqp9x5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base data-binary-ieee754 FloatingHex ieee754
-       ];
-       executableHaskellDepends = [
-         base data-binary-ieee754 FloatingHex ieee754
-       ];
-       description = "Crack various integer, floating-point data formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crackNum_2_0" = callPackage
-    ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
-     mkDerivation {
-       pname = "crackNum";
        version = "2.0";
        sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp";
        isLibrary = true;
@@ -53162,7 +52673,6 @@ self: {
        ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craft" = callPackage
@@ -53341,8 +52851,8 @@ self: {
      }:
      mkDerivation {
        pname = "crdt";
-       version = "10.0";
-       sha256 = "10wg1s47r70gxgl9bfg3cxhj8w74k7wn0c3lh418mxypb2p3ffww";
+       version = "10.2";
+       sha256 = "1yg4nhsjlyj2wh5ck320v8kb3pva5wy0dssn85sia5sz0xlm8kz3";
        libraryHaskellDepends = [
          base binary bytestring containers Diff hashable mtl network-info
          safe stm time vector
@@ -53547,63 +53057,62 @@ self: {
      }) {};
 
   "criterion" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary
-     , bytestring, cassava, code-page, containers, deepseq, directory
-     , exceptions, filepath, Glob, HUnit, js-flot, js-jquery
-     , microstache, mtl, mwc-random, optparse-applicative, parsec
-     , QuickCheck, semigroups, statistics, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, transformers-compat
-     , vector, vector-algorithms
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
+     , base-compat-batteries, binary, bytestring, cassava, code-page
+     , containers, deepseq, directory, exceptions, filepath, Glob, HUnit
+     , js-flot, js-jquery, microstache, mtl, mwc-random
+     , optparse-applicative, parsec, QuickCheck, semigroups, statistics
+     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
+     , transformers-compat, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.3.0.0";
-       sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q";
-       revision = "3";
-       editedCabalFile = "0bdz45r1mf6ydcs7l333xn7da9p583g9y7n3dzvnry4by0fkcqw6";
+       version = "1.4.1.0";
+       sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint base base-compat binary bytestring cassava
-         code-page containers deepseq directory exceptions filepath Glob
-         js-flot js-jquery microstache mtl mwc-random optparse-applicative
-         parsec semigroups statistics text time transformers
-         transformers-compat vector vector-algorithms
+         aeson ansi-wl-pprint base base-compat-batteries binary bytestring
+         cassava code-page containers deepseq directory exceptions filepath
+         Glob js-flot js-jquery microstache mtl mwc-random
+         optparse-applicative parsec semigroups statistics text time
+         transformers transformers-compat vector vector-algorithms
        ];
        executableHaskellDepends = [
-         base base-compat optparse-applicative semigroups
+         base base-compat-batteries optparse-applicative semigroups
        ];
        testHaskellDepends = [
-         aeson base base-compat bytestring deepseq directory HUnit
-         QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector
+         aeson base base-compat base-compat-batteries bytestring deepseq
+         directory HUnit QuickCheck statistics tasty tasty-hunit
+         tasty-quickcheck vector
        ];
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "criterion_1_4_1_0" = callPackage
+  "criterion_1_5_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
      , base-compat-batteries, binary, bytestring, cassava, code-page
-     , containers, deepseq, directory, exceptions, filepath, Glob, HUnit
-     , js-flot, js-jquery, microstache, mtl, mwc-random
-     , optparse-applicative, parsec, QuickCheck, semigroups, statistics
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
-     , transformers-compat, vector, vector-algorithms
+     , containers, criterion-measurement, deepseq, directory, exceptions
+     , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl
+     , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups
+     , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, transformers-compat, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.4.1.0";
-       sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
+       version = "1.5.0.0";
+       sha256 = "0j9qaahlnjnwp8glzxn83924mdpnb38inyq696bs2fbdjzh8nq0x";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base-compat-batteries binary bytestring
-         cassava code-page containers deepseq directory exceptions filepath
-         Glob js-flot js-jquery microstache mtl mwc-random
-         optparse-applicative parsec semigroups statistics text time
-         transformers transformers-compat vector vector-algorithms
+         cassava code-page containers criterion-measurement deepseq
+         directory exceptions filepath Glob js-flot js-jquery microstache
+         mtl mwc-random optparse-applicative parsec semigroups statistics
+         text time transformers transformers-compat vector vector-algorithms
        ];
        executableHaskellDepends = [
          base base-compat-batteries optparse-applicative semigroups
@@ -53618,6 +53127,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "criterion-measurement" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, binary, containers
+     , deepseq, vector
+     }:
+     mkDerivation {
+       pname = "criterion-measurement";
+       version = "0.1.0.0";
+       sha256 = "1kn6xcnmjab0rqxjjgrdpbm5z919jwmsraqnpxqkazswgbbj6r7y";
+       libraryHaskellDepends = [
+         aeson base base-compat binary containers deepseq vector
+       ];
+       description = "Criterion measurement functionality and associated types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "criterion-plus" = callPackage
     ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th
      , monad-control, mtl, optparse-applicative, placeholders
@@ -53838,7 +53362,6 @@ self: {
        ];
        description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-api" = callPackage
@@ -54001,7 +53524,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -54366,7 +53888,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-512 implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptoids" = callPackage
@@ -54450,6 +53971,7 @@ self: {
        ];
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite" = callPackage
@@ -54498,24 +54020,6 @@ self: {
      }) {};
 
   "cryptonite-openssl" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, memory, openssl
-     , tasty, tasty-hunit, tasty-kat, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite-openssl";
-       version = "0.6";
-       sha256 = "19jhhz1ad5jw8zc7ia9bl77g7nw2g0qjk5nmz1zpngpvdg4rgjx8";
-       libraryHaskellDepends = [ base bytestring cryptonite memory ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [
-         base bytestring cryptonite tasty tasty-hunit tasty-kat
-         tasty-quickcheck
-       ];
-       description = "Crypto stuff using OpenSSL cryptographic library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openssl;};
-
-  "cryptonite-openssl_0_7" = callPackage
     ({ mkDerivation, base, basement, bytestring, cryptonite, memory
      , openssl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck
      }:
@@ -54533,7 +54037,6 @@ self: {
        ];
        description = "Crypto stuff using OpenSSL cryptographic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "cryptsy-api" = callPackage
@@ -54568,6 +54071,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "csa" = callPackage
+    ({ mkDerivation, base, hedgehog, hmatrix, tasty, tasty-hedgehog
+     , tasty-hspec
+     }:
+     mkDerivation {
+       pname = "csa";
+       version = "0.1.0";
+       sha256 = "0jnhn4lgj5l466c31h2lwslnal3ypk3ma2j75zw0ghjf35i07qvr";
+       libraryHaskellDepends = [ base hmatrix ];
+       testHaskellDepends = [
+         base hedgehog hmatrix tasty tasty-hedgehog tasty-hspec
+       ];
+       description = "Connection-set algebra (CSA) library";
+       license = "GPL";
+     }) {};
+
   "cse-ghc-plugin" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -54588,8 +54107,8 @@ self: {
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1.0.2";
-       sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm";
+       version = "0.1.0.3";
+       sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54714,27 +54233,12 @@ self: {
      }:
      mkDerivation {
        pname = "csp";
-       version = "1.3.1";
-       sha256 = "02skz77bii61kcalx4hdwcdnk6fb291wkjpsijprd9rjvm8mwg6q";
-       libraryHaskellDepends = [ base containers mtl nondeterminism ];
-       testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
-       description = "Discrete constraint satisfaction problem (CSP) solver";
-       license = "LGPL";
-     }) {};
-
-  "csp_1_4_0" = callPackage
-    ({ mkDerivation, base, containers, mtl, nondeterminism, tasty
-     , tasty-hunit
-     }:
-     mkDerivation {
-       pname = "csp";
        version = "1.4.0";
        sha256 = "15ilx5ycvh12c71wza2d25cp4llvncxc9csmmisjcxwny5gpz1q8";
        libraryHaskellDepends = [ base containers mtl nondeterminism ];
        testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
        description = "Discrete constraint satisfaction problem (CSP) solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cspmchecker" = callPackage
@@ -54823,31 +54327,6 @@ self: {
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
      , conduit, conduit-extra, containers, data-default, directory
      , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl
-     , primitive, resourcet, test-framework, test-framework-hunit, text
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "csv-conduit";
-       version = "0.6.8.1";
-       sha256 = "0j1hg34h57wg7jd8n15a2plrjnn89mj4w7azg19z6vahhsdn6d5n";
-       libraryHaskellDepends = [
-         array attoparsec base blaze-builder bytestring conduit
-         conduit-extra containers data-default exceptions ghc-prim mmorph
-         monad-control mtl primitive resourcet text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory HUnit mtl primitive
-         test-framework test-framework-hunit text transformers vector
-       ];
-       description = "A flexible, fast, conduit-based CSV parser library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "csv-conduit_0_7_0_0" = callPackage
-    ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
-     , conduit, conduit-extra, containers, data-default, directory
-     , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl
      , primitive, resourcet, semigroups, test-framework
      , test-framework-hunit, text, transformers, unordered-containers
      , vector
@@ -54868,7 +54347,6 @@ self: {
        ];
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csv-enumerator" = callPackage
@@ -54886,6 +54364,7 @@ self: {
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csv-nptools" = callPackage
@@ -55034,6 +54513,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cubicbezier" = callPackage
@@ -55160,24 +54640,6 @@ self: {
      }:
      mkDerivation {
        pname = "cufft";
-       version = "0.8.0.0";
-       sha256 = "0n6x079d41s05s050vjyph67xm0gx8nnl9wbmqqgdfimgc8xiggp";
-       setupHaskellDepends = [
-         base Cabal cuda directory filepath template-haskell
-       ];
-       libraryHaskellDepends = [ base cuda ];
-       libraryToolDepends = [ c2hs ];
-       description = "Haskell bindings for the CUFFT library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cufft_0_9_0_0" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "cufft";
        version = "0.9.0.0";
        sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv";
        setupHaskellDepends = [
@@ -55216,27 +54678,6 @@ self: {
      }) {};
 
   "curl-runnings" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs
-     , directory, hspec, hspec-expectations, http-conduit, text
-     , unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "curl-runnings";
-       version = "0.2.0";
-       sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hspec
-         hspec-expectations http-conduit text unordered-containers yaml
-       ];
-       executableHaskellDepends = [ base cmdargs text ];
-       testHaskellDepends = [ base directory hspec hspec-expectations ];
-       description = "A framework for declaratively writing curl based API tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "curl-runnings_0_6_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, cmdargs, directory, hspec, hspec-expectations
      , http-conduit, http-types, megaparsec, text, unordered-containers
@@ -55257,7 +54698,6 @@ self: {
        testHaskellDepends = [ base directory hspec hspec-expectations ];
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curlhs" = callPackage
@@ -55278,8 +54718,8 @@ self: {
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "currencies";
-       version = "0.1.1.1";
-       sha256 = "1w0b7wp3kz8iqm25s28w131g923pysp9s1p7ll7df5wr64fh53nm";
+       version = "0.2.0.0";
+       sha256 = "16c4m6px6kvdr8v2k5gspjn3xag69ki6yf6ij2b3ii5rlpa94wpv";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Currencies representation, pretty printing and conversion";
@@ -55314,7 +54754,6 @@ self: {
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "currency-convert" = callPackage
@@ -55353,7 +54792,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Curry types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curry-base" = callPackage
@@ -55371,6 +54809,7 @@ self: {
        testHaskellDepends = [ base Cabal filepath mtl ];
        description = "Functions for manipulating Curry programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curry-frontend" = callPackage
@@ -55446,6 +54885,7 @@ self: {
        ];
        description = "Terminal tool for viewing tabular data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curve25519" = callPackage
@@ -55619,27 +55059,12 @@ self: {
     ({ mkDerivation, base, template-haskell, transformers }:
      mkDerivation {
        pname = "czipwith";
-       version = "1.0.0.0";
-       sha256 = "1q9cgig8zvycbfryb1ax35yq1x66qpc6a91qijbbfk1zsw7sz8j5";
-       revision = "1";
-       editedCabalFile = "1vz6nrmxhl2rrwcg16dpp09q64pk9z9j0ka97lqhxdzpvqm0fg88";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base transformers ];
-       description = "CZipWith class and deriving via TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "czipwith_1_0_1_0" = callPackage
-    ({ mkDerivation, base, template-haskell, transformers }:
-     mkDerivation {
-       pname = "czipwith";
        version = "1.0.1.0";
        sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
        description = "CZipWith class and deriving via TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d-bus" = callPackage
@@ -55670,6 +55095,7 @@ self: {
        ];
        description = "Permissively licensed D-Bus client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d3d11binding" = callPackage
@@ -55764,21 +55190,20 @@ self: {
 
   "damnpacket" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, fail, hspec
-     , html-entities, HUnit, QuickCheck, template-haskell, text
-     , th-lift-instances
+     , html-entity, HUnit, QuickCheck, semigroups, template-haskell
+     , text, th-lift-instances
      }:
      mkDerivation {
        pname = "damnpacket";
-       version = "1.1.0";
-       sha256 = "07xxlfl4n336k9r8jm12bdx4j8hx02wbq0l2gxlwam6dqpclwa38";
+       version = "1.3.1";
+       sha256 = "1b58n30shmfncv8swj7q68dp0j0p184rlyy6psd8yq07vsk02vq1";
        libraryHaskellDepends = [
-         attoparsec base bytestring fail html-entities template-haskell text
-         th-lift-instances
+         attoparsec base bytestring fail html-entity semigroups
+         template-haskell text th-lift-instances
        ];
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "danibot" = callPackage
@@ -55801,7 +55226,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dao" = callPackage
@@ -55861,16 +55285,14 @@ self: {
      , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network
      , network-uri, old-time, parsec, process, QuickCheck, random
      , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm
-     , tar, temporary, terminfo, test-framework, test-framework-hunit
+     , tar, terminfo, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, time, transformers, unix
      , unix-compat, utf8-string, vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.14.0";
-       sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr";
-       revision = "1";
-       editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h";
+       version = "2.14.1";
+       sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
@@ -55880,8 +55302,8 @@ self: {
          containers cryptohash data-ordlist directory fgl filepath graphviz
          hashable haskeline html HTTP mmap mtl network network-uri old-time
          parsec process random regex-applicative regex-compat-tdfa sandi stm
-         tar temporary terminfo text time transformers unix unix-compat
-         utf8-string vector zip-archive zlib
+         tar terminfo text time transformers unix unix-compat utf8-string
+         vector zip-archive zlib
        ];
        librarySystemDepends = [ curl ];
        executableHaskellDepends = [ base ];
@@ -55897,7 +55319,6 @@ self: {
        '';
        description = "a distributed, interactive, smart revision control system";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -56226,6 +55647,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dash-haskell" = callPackage
@@ -56753,8 +56175,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "2.0.1.0";
-       sha256 = "0997mn0amfl4k70rvrxjw24dzyr6sv42nr1d24whyy114lsiv05b";
+       version = "4.6.0.0";
+       sha256 = "1m6bxi37c7qkn96296lxfc0x3ab33w7yyjkvf3avla94dd248k89";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
@@ -56764,57 +56186,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_4_1_0_0" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
-     , hspec, tagged
-     }:
-     mkDerivation {
-       pname = "data-diverse";
-       version = "4.1.0.0";
-       sha256 = "154a7jipfk1wav7pjzghcs54saaphdpxgfgn7jhkvacd51phs0if";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim tagged
-       ];
-       testHaskellDepends = [ base hspec tagged ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Extensible records and polymorphic variants";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "data-diverse-lens" = callPackage
-    ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
-     , profunctors, tagged
-     }:
-     mkDerivation {
-       pname = "data-diverse-lens";
-       version = "2.1.0.0";
-       sha256 = "1i71f67agjaflb1cz8v6qpfy1qfwwmw8fjq8zl6kqd28z4k0mms7";
-       libraryHaskellDepends = [
-         base data-diverse generic-lens lens profunctors tagged
-       ];
-       testHaskellDepends = [
-         base data-diverse generic-lens hspec lens tagged
-       ];
-       description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-diverse-lens_4_2_0_1" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, hspec, lens
      , profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "4.2.0.1";
-       sha256 = "07nwbvjhwx3qyh2ksk027qgci91nsckgd4yskkbafndpiri1fxds";
+       version = "4.3.0.0";
+       sha256 = "11nrisgx7yb7qp03s3hxkbygc170fggbi3mcid196dhakxv4kl4p";
        libraryHaskellDepends = [
          base data-diverse data-has lens profunctors tagged
        ];
        testHaskellDepends = [ base data-diverse hspec lens tagged ];
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-dword" = callPackage
@@ -56923,7 +56308,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Extend Haskell data or newtype like in OOP languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-extra" = callPackage
@@ -57079,6 +56463,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-fresh" = callPackage
@@ -57174,6 +56559,7 @@ self: {
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-inttrie" = callPackage
@@ -57279,6 +56665,7 @@ self: {
        ];
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -57413,6 +56800,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base binary containers text ];
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-nat" = callPackage
@@ -57519,6 +56907,7 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-quotientref" = callPackage
@@ -57549,6 +56938,7 @@ self: {
        ];
        description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-ref" = callPackage
@@ -57677,6 +57067,7 @@ self: {
        ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-spacepart" = callPackage
@@ -57691,6 +57082,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-standards" = callPackage
+    ({ mkDerivation, base, hashable, unordered-containers }:
+     mkDerivation {
+       pname = "data-standards";
+       version = "0.1.0.0";
+       sha256 = "014fk5lsj35iax9amgcn0r9kifyr2ar3afi4zs651l1xl7csmywz";
+       revision = "1";
+       editedCabalFile = "0g4hlyzkski4zha53w6asanjnk9s2jp5dgql353szm4flldfsx07";
+       libraryHaskellDepends = [ base hashable unordered-containers ];
+       description = "A collection of standards representable by simple data types";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "data-stm32" = callPackage
     ({ mkDerivation, ansi-wl-pprint, attoparsec, base, containers, hxt
      , hxt-xpath, pretty-simple, text, time
@@ -57911,6 +57315,7 @@ self: {
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "database-migrate" = callPackage
@@ -58031,6 +57436,7 @@ self: {
        ];
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "datalog" = callPackage
@@ -58155,6 +57561,7 @@ self: {
        testHaskellDepends = [ base dates hspec QuickCheck time ];
        description = "Date conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dates" = callPackage
@@ -58168,6 +57575,7 @@ self: {
        ];
        description = "Small library for parsing different dates formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "datetime" = callPackage
@@ -58406,7 +57814,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbus" = callPackage
+  "dbus_0_10_15" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, criterion
      , deepseq, directory, extra, filepath, libxml-sax, network, parsec
      , process, QuickCheck, random, resourcet, tasty, tasty-hunit
@@ -58430,9 +57838,10 @@ self: {
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbus_1_0_1" = callPackage
+  "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, criterion
      , deepseq, directory, extra, filepath, lens, libxml-sax, network
      , parsec, process, QuickCheck, random, resourcet, split, tasty
@@ -58458,7 +57867,6 @@ self: {
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-client" = callPackage
@@ -58509,7 +57917,6 @@ self: {
        ];
        description = "Expose a dbus server to control hslogger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-qq" = callPackage
@@ -58562,7 +57969,6 @@ self: {
        ];
        description = "Generate bindings for DBus calls by using DBus introspection and dbus-th";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dclabel" = callPackage
@@ -58597,6 +58003,7 @@ self: {
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dcpu16" = callPackage
@@ -58926,8 +58333,8 @@ self: {
      }:
      mkDerivation {
        pname = "dde";
-       version = "0.2.0";
-       sha256 = "0c0mhyvipn7g1sfjgw8r0qybzcvxm3lzmr1ips2xbr8vv2mxmpm4";
+       version = "0.3.0";
+       sha256 = "0jji0q9wqgpl0g2nvac0i4vrlarx4pz0rb8xgpq1iqyprniz5k4p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59015,6 +58422,7 @@ self: {
        testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ];
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debian-binary" = callPackage
@@ -59146,13 +58554,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "debug-trace-var" = callPackage
+    ({ mkDerivation, base, template-haskell, unicode-show }:
+     mkDerivation {
+       pname = "debug-trace-var";
+       version = "0.2.0";
+       sha256 = "12dlnvzvnjk6z37pnajmghd5wcrzkf4pkpc0r2nrjp4h3p9pjkqp";
+       libraryHaskellDepends = [ base template-haskell unicode-show ];
+       description = "You do not have to write variable names twice in Debug.Trace";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "debug-tracy" = callPackage
-    ({ mkDerivation, base, random, transformers }:
+    ({ mkDerivation, base, lens, random, transformers }:
      mkDerivation {
        pname = "debug-tracy";
-       version = "0.1.0.1";
-       sha256 = "1cp3m776yrg8r2lmcbn81y5as27qidzgb3j49ksnq4swry78jhg5";
-       libraryHaskellDepends = [ base random transformers ];
+       version = "0.1.0.2";
+       sha256 = "057rh5gksfbnpxzqh9g3jai1hhmvk42jqgmqgq1qklakhfnbxs2w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lens random transformers ];
+       executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59208,6 +58631,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "declarative" = callPackage
@@ -59294,6 +58718,7 @@ self: {
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deeplearning-hs" = callPackage
@@ -59449,8 +58874,8 @@ self: {
     ({ mkDerivation, base, containers, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.4.1";
-       sha256 = "0r74biiq9mwf15ky4pb8pan1gjyfc38fsl9ndn9iirsx288fhins";
+       version = "0.5.1";
+       sha256 = "0fyfm59fyz30mn5w7y47l2vx6d0ap5vijadlfff1j07ak6lnq1x3";
        libraryHaskellDepends = [ base containers foldl ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
@@ -59590,29 +59015,29 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, profunctors, random, ref-fd, transformers
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.2.0";
-       sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9";
+       version = "1.11.0.1";
+       sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck
-         profunctors random ref-fd transformers
+         base concurrency containers contravariant deepseq exceptions
+         leancheck profunctors random transformers
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_8_0_0" = callPackage
+  "dejafu_1_11_0_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.8.0.0";
-       sha256 = "09l1z86vzccvbmsbar5q2a9zc7i8qh8ykinfhvrzcir1yhyz422i";
+       version = "1.11.0.2";
+       sha256 = "0v4vbka3s8hmxvhf7kpfbncv4fr0mks01xd8phg3sqw07qyc871l";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -59670,6 +59095,7 @@ self: {
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delay" = callPackage
@@ -59842,18 +59268,17 @@ self: {
      }) {};
 
   "dependency" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, containers, cpphs
+    ({ mkDerivation, ansi-wl-pprint, base, binary, containers
      , criterion, deepseq, hspec, micro-recursion-schemes, microlens
      }:
      mkDerivation {
        pname = "dependency";
-       version = "1.2.0.0";
-       sha256 = "19b7f0j5b34yaf5gk8kasg275sphjs5bsgbn4cfi1fm874h5612m";
+       version = "1.2.0.1";
+       sha256 = "0qk5qd4dihgix6jhb9g0d56ba3rhsfswn0407a7p6al7mnd8kxxv";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary containers deepseq
          micro-recursion-schemes microlens
        ];
-       libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Dependency resolution for package management";
@@ -60008,8 +59433,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive";
-       version = "2.6.3";
-       sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj";
+       version = "2.6.4";
+       sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60019,7 +59444,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-IG" = callPackage
@@ -60081,6 +59505,7 @@ self: {
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-storable" = callPackage
@@ -60157,8 +59582,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.4.2";
-       sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz";
+       version = "0.5";
+       sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell
          th-abstraction transformers transformers-compat
@@ -60199,8 +59624,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "1.0.1";
-       sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67";
+       version = "1.0.2";
+       sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -60319,6 +59744,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "detour-via-sci" = callPackage
+    ({ mkDerivation, aeson, base, cassava, doctest, hlint, newtype
+     , scientific, siggy-chardust, template-haskell
+     }:
+     mkDerivation {
+       pname = "detour-via-sci";
+       version = "1.0.0";
+       sha256 = "1r417lp98k0nizlxh7r74c2c4g1ij33pk5ip0bm7ssmzyya127j5";
+       revision = "1";
+       editedCabalFile = "00dj8vf9gg9ww37sir6mblf3xhcpam8qgfz5bfana23arhf2cixj";
+       libraryHaskellDepends = [
+         aeson base cassava newtype scientific siggy-chardust
+         template-haskell
+       ];
+       testHaskellDepends = [
+         aeson base cassava doctest hlint newtype scientific siggy-chardust
+         template-haskell
+       ];
+       description = "JSON and CSV encoding for rationals as decimal point numbers";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "detour-via-uom" = callPackage
+    ({ mkDerivation, aeson, base, cassava, detour-via-sci, doctest
+     , hlint, newtype, scientific, uom-plugin
+     }:
+     mkDerivation {
+       pname = "detour-via-uom";
+       version = "1.0.0";
+       sha256 = "07jhj5mrfkfi2l05fyax6aylq4rp0nixvpsymv2xjzvbv2pfmdq7";
+       revision = "1";
+       editedCabalFile = "1l8az0mqcms0w59dr1bvklplmdqzr8yliwq522smcrn4krj3rl10";
+       libraryHaskellDepends = [
+         aeson base cassava detour-via-sci newtype scientific uom-plugin
+       ];
+       testHaskellDepends = [
+         aeson base cassava detour-via-sci doctest hlint newtype scientific
+         uom-plugin
+       ];
+       description = "JSON and CSV encoding for quantities";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "detrospector" = callPackage
     ({ mkDerivation, base, binary, bytestring, cmdargs, containers
      , hashable, mwc-random, text, unordered-containers, zlib
@@ -60367,6 +59836,7 @@ self: {
        ];
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dewdrop" = callPackage
@@ -60402,6 +59872,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dfinity-radix-tree" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
+     , BoundedChan, bytestring, cmdargs, conduit, containers
+     , cryptohash-sha256, data-default-class, deepseq, ghc-prim
+     , lens-simple, leveldb-haskell, lrucaching, resourcet, semigroups
+     , serialise, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dfinity-radix-tree";
+       version = "0.1.0";
+       sha256 = "14q9ick40mz5a0bdz1s7ga4fhw27hkidrsf543nmgm14q5w8q2nf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base16-bytestring bloomfilter BoundedChan bytestring conduit
+         containers cryptohash-sha256 data-default-class deepseq ghc-prim
+         lens-simple leveldb-haskell lrucaching resourcet semigroups
+         serialise
+       ];
+       executableHaskellDepends = [
+         aeson base base16-bytestring bytestring cmdargs cryptohash-sha256
+         data-default-class leveldb-haskell resourcet text
+         unordered-containers
+       ];
+       description = "A generic data integrity layer";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "dfrac" = callPackage
     ({ mkDerivation, base, scientific }:
      mkDerivation {
@@ -60459,100 +59957,61 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , contravariant, cryptonite, deepseq, directory, exceptions
-     , filepath, haskeline, http-client, http-client-tls
-     , insert-ordered-containers, lens-family-core, memory, mtl
-     , optparse-generic, parsers, prettyprinter
-     , prettyprinter-ansi-terminal, repline, scientific, tasty
-     , tasty-hunit, text, text-format, transformers, trifecta
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.11.1";
-       sha256 = "1vaggm5i89yry8z6xyx8852d91nmcdlmf527bnps37fmgrkvhga4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
-         containers contravariant cryptonite directory exceptions filepath
-         http-client http-client-tls insert-ordered-containers
-         lens-family-core memory parsers prettyprinter
-         prettyprinter-ansi-terminal scientific text text-format
-         transformers trifecta unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base haskeline mtl optparse-generic prettyprinter
-         prettyprinter-ansi-terminal repline text trifecta
-       ];
-       testHaskellDepends = [
-         base deepseq insert-ordered-containers prettyprinter tasty
-         tasty-hunit text vector
-       ];
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall_1_14_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
-     , containers, contravariant, cryptonite, deepseq, directory
-     , doctest, exceptions, filepath, formatting, haskeline, http-client
+     , containers, contravariant, criterion, cryptonite, deepseq, Diff
+     , directory, doctest, exceptions, filepath, haskeline, http-client
      , http-client-tls, insert-ordered-containers, lens-family-core
-     , megaparsec, memory, mtl, optparse-applicative, parsers
+     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
      , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
-     , tasty, tasty-hunit, text, transformers, unordered-containers
-     , vector
+     , tasty, tasty-hunit, template-haskell, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.14.0";
-       sha256 = "0dm823rr4gkx1m7f0v9wvqlkhn1mmmml854p4zsi2j6ai4l885gl";
+       version = "1.15.1";
+       sha256 = "0c4fr0cs56wkfqiylbpi5qlyxxk9k6x5f9yphq12xf06l2vb6fza";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring case-insensitive containers
-         contravariant cryptonite directory exceptions filepath formatting
-         http-client http-client-tls insert-ordered-containers
-         lens-family-core megaparsec memory parsers prettyprinter
-         prettyprinter-ansi-terminal scientific text transformers
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base haskeline megaparsec mtl optparse-applicative
-         prettyprinter prettyprinter-ansi-terminal repline text
+         contravariant cryptonite Diff directory exceptions filepath
+         haskeline http-client http-client-tls insert-ordered-containers
+         lens-family-core megaparsec memory mtl optparse-applicative parsers
+         prettyprinter prettyprinter-ansi-terminal repline scientific
+         template-haskell text transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base deepseq doctest insert-ordered-containers prettyprinter tasty
-         tasty-hunit text vector
+         base deepseq directory doctest filepath insert-ordered-containers
+         mockery prettyprinter tasty tasty-hunit text vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory text
        ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall, formatting
+    ({ mkDerivation, base, bytestring, containers, dhall
      , insert-ordered-containers, neat-interpolation, optparse-generic
      , shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.13";
-       sha256 = "04f9ksw36kqb1g41211hcfcgg21pxkdszsznpa1vh09dcmlv6i7i";
+       version = "1.0.14";
+       sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dhall formatting
-         insert-ordered-containers neat-interpolation shell-escape text
+         base bytestring containers dhall insert-ordered-containers
+         neat-interpolation shell-escape text
        ];
        executableHaskellDepends = [
          base bytestring dhall optparse-generic text
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-check" = callPackage
@@ -60575,33 +60034,13 @@ self: {
 
   "dhall-json" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, trifecta, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.0.13";
-       sha256 = "03spz9csxgamj970ha9l5swcpbkrvzbjy9w028c1kswzs806699s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring dhall text trifecta unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-generic text yaml
-       ];
-       description = "Compile Dhall to JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-json_1_2_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
      , insert-ordered-containers, optparse-applicative, text
      , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.2.0";
-       sha256 = "0ks8ycgysimj1jqabzdrrsdcqkp3bi5f0zhwgmilsprx88dxrddz";
+       version = "1.2.1";
+       sha256 = "0zf88py0hfrzsa3jq5i8nz0wv8m1b753bdakvykmkj6r0dgd574r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60614,7 +60053,6 @@ self: {
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-lex" = callPackage
@@ -60637,19 +60075,19 @@ self: {
      }) {};
 
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, formatting
-     , hnix, insert-ordered-containers, neat-interpolation
-     , optparse-generic, scientific, text
+    ({ mkDerivation, base, containers, data-fix, dhall, hnix
+     , insert-ordered-containers, neat-interpolation, optparse-generic
+     , text
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.4";
-       sha256 = "1yhnpmvisizl5vm37sns8sn0ff496aqr2i76v3c2034cjd9v0mdb";
+       version = "1.1.5";
+       sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-fix dhall formatting hnix
-         insert-ordered-containers neat-interpolation scientific text
+         base containers data-fix dhall hnix insert-ordered-containers
+         neat-interpolation text
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text
@@ -60660,34 +60098,35 @@ self: {
      }) {};
 
   "dhall-text" = callPackage
-    ({ mkDerivation, base, dhall, optparse-generic, text }:
+    ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.10";
-       sha256 = "07cxc3m2pqg5lk0d03i20ch6bsq779sg3ci4yy1fkai8vs513yjq";
+       version = "1.0.11";
+       sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base dhall optparse-generic text ];
+       executableHaskellDepends = [
+         base dhall optparse-applicative text
+       ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-to-cabal" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
-     , dhall, Diff, filepath, formatting, hashable
-     , insert-ordered-containers, optparse-applicative, prettyprinter
-     , tasty, tasty-golden, text, transformers, vector
+     , dhall, Diff, filepath, hashable, insert-ordered-containers
+     , optparse-applicative, prettyprinter, tasty, tasty-golden, text
+     , transformers, vector
      }:
      mkDerivation {
        pname = "dhall-to-cabal";
-       version = "1.1.0.0";
-       sha256 = "1vmyc9pbcndqimh2wpdwbnnzjkgkqahq13migasbj8p96ck1kbcn";
+       version = "1.2.0.0";
+       sha256 = "0iyqpj06hzshxkf2ymc12rnn5rzmp83h5x99kv8pdypkd8rzvr1r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers contravariant dhall formatting
-         hashable insert-ordered-containers text transformers vector
+         base bytestring Cabal containers contravariant dhall hashable
+         insert-ordered-containers text transformers vector
        ];
        executableHaskellDepends = [
          base bytestring Cabal dhall insert-ordered-containers
@@ -60801,7 +60240,6 @@ self: {
        ];
        description = "mtl flavoured typeful hierarchical structured logging for di-core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dia-base" = callPackage
@@ -60815,6 +60253,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dia-functions" = callPackage
@@ -60832,6 +60271,7 @@ self: {
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams" = callPackage
@@ -60848,7 +60288,6 @@ self: {
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -60900,8 +60339,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.8.0.2";
-       sha256 = "1jr98sza6bhzq9myfb9f2p8lfbs9qcxck67h2hvxisgpvmy0gjn2";
+       version = "0.8.0.3";
+       sha256 = "1g8anclzfm88nd6z539g5f2h6yfb538hdl59sbiqv0vk1c4sr01s";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -60917,7 +60356,6 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -60938,7 +60376,6 @@ self: {
        ];
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -60984,7 +60421,6 @@ self: {
        ];
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -60994,17 +60430,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.4.1";
-       sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl";
-       revision = "1";
-       editedCabalFile = "0qv5jq4l0adks83zj2n4cgfazmg39flfb4k2i39l1w0bcmrzqjsc";
+       version = "1.4.1.1";
+       sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
        ];
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -61020,7 +60453,6 @@ self: {
        ];
        description = "Graph layout and drawing with GrahpViz and diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-gtk" = callPackage
@@ -61036,7 +60468,6 @@ self: {
        ];
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -61048,8 +60479,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.4.0.1";
-       sha256 = "1x22fgmssbrda7iqz41y2dlc8jqkdiic72q490gm3kmxpd3xakjr";
+       version = "0.4.0.2";
+       sha256 = "1f4sapi4zhb3nrlq92lr309c4aarnl29bzghnmsvs1kqmimq23y0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61067,7 +60498,6 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -61103,7 +60533,6 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-lib" = callPackage
@@ -61118,10 +60547,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.4.2.2";
-       sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
-       revision = "3";
-       editedCabalFile = "033w27x3w0s567hsifb7nxc1msv9fvzz8idl88n8d5pifpgxg803";
+       version = "1.4.2.3";
+       sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -61137,7 +60564,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion diagrams-core ];
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -61221,7 +60647,6 @@ self: {
        ];
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -61258,7 +60683,6 @@ self: {
        testHaskellDepends = [ base diagrams-core diagrams-lib ];
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -61292,7 +60716,6 @@ self: {
        ];
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-solve" = callPackage
@@ -61303,8 +60726,8 @@ self: {
        pname = "diagrams-solve";
        version = "0.1.1";
        sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
-       revision = "1";
-       editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb";
+       revision = "2";
+       editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
@@ -61332,7 +60755,6 @@ self: {
        ];
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -61404,6 +60826,7 @@ self: {
        ];
        description = "A simple, forward build system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dice" = callPackage
@@ -61492,6 +60915,7 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dictionary-sharing" = callPackage
@@ -61538,6 +60962,7 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diff" = callPackage
@@ -61662,6 +61087,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diffmap" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "diffmap";
+       version = "0.1.0.0";
+       sha256 = "0i6dyvp8ds1wz9jm7nva076pc18mz24fiz50gqgq3xv76aghl0i0";
+       libraryHaskellDepends = [ base containers ];
+       description = "diff on maps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "difftodo" = callPackage
     ({ mkDerivation, base, bytestring, diff-parse, highlighter2
      , optparse-applicative, pretty-show, process, protolude, tasty
@@ -61737,6 +61173,7 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -61775,6 +61212,7 @@ self: {
        ];
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-aeson" = callPackage
@@ -61784,8 +61222,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.24";
-       sha256 = "01zizzhq9abyka21600234wj8yy9crx4n8qywiry4gjmq7l8gzm5";
+       version = "1.1.26";
+       sha256 = "173vdqd4d6p9gfs71ip07nzz5w33akrnp9wi19b8pnmi3fqck5nw";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -61796,6 +61234,7 @@ self: {
        ];
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -61811,6 +61250,7 @@ self: {
        ];
        description = "Blaze frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-happstack" = callPackage
@@ -61826,6 +61266,7 @@ self: {
        ];
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -61867,6 +61308,7 @@ self: {
        libraryHaskellDepends = [ base digestive-functors lucid text ];
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-scotty" = callPackage
@@ -61885,6 +61327,7 @@ self: {
        ];
        description = "Scotty backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -61901,6 +61344,7 @@ self: {
        ];
        description = "Snap backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digit" = callPackage
@@ -62277,14 +61721,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_2_2" = callPackage
+  "directory_1_3_3_0" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.2.2";
-       sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj";
-       revision = "1";
-       editedCabalFile = "1qdpglb2xzgcm1yja9d9hvw75cg85wai292f7rb6h0hsjnhrans3";
+       version = "1.3.3.0";
+       sha256 = "02s1vj56mqfjjgvs0vpz805582rz06p8mrp7784a3mwx78m8p4n9";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -62663,12 +62105,12 @@ self: {
      }) {};
 
   "disposable" = callPackage
-    ({ mkDerivation, base, dlist, ghcjs-base-stub }:
+    ({ mkDerivation, base, ghcjs-base-stub, stm }:
      mkDerivation {
        pname = "disposable";
-       version = "0.2.0.4";
-       sha256 = "0sn93wmwajzbdj6h4cjwmyj1mbn6ga9gw1i2sny4kvqarqny2gy2";
-       libraryHaskellDepends = [ base dlist ghcjs-base-stub ];
+       version = "1.0.0.0";
+       sha256 = "0kzyzbhhjm005fi2n59j4in58kps4rciaza9pzi0qd2xnn9j5iqv";
+       libraryHaskellDepends = [ base ghcjs-base-stub stm ];
        description = "Allows storing different resource-releasing actions together";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62699,6 +62141,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distance-of-time" = callPackage
@@ -62736,8 +62179,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-fork";
-       version = "0.0.1.2";
-       sha256 = "0sdabc688fm1xajrdr9q6wzxd2fhzs9ary07sxh2sx0dwlyzk773";
+       version = "0.0.1.3";
+       sha256 = "182dd0lnc53ij1bh2rbw6zr3mnyyjddii1mak0i4s1za1jsh14hp";
        libraryHaskellDepends = [
          async base binary bytestring constraints distributed-closure
          exceptions stm terminal-size text transformers typed-process
@@ -62751,20 +62194,20 @@ self: {
     ({ mkDerivation, aeson, aeson-qq, amazonka, amazonka-cloudformation
      , amazonka-core, amazonka-lambda, amazonka-s3, amazonka-sqs, async
      , base, base64-bytestring, bytestring, containers, distributed-fork
-     , interpolate, lens, lens-aeson, safe-exceptions, SHA, stratosphere
-     , tasty, tasty-hunit, text, time, typed-process
+     , elf, interpolate, lens, lens-aeson, safe-exceptions, SHA, stm
+     , stratosphere, tasty, tasty-hunit, text, time
      , unordered-containers, zip-archive
      }:
      mkDerivation {
        pname = "distributed-fork-aws-lambda";
-       version = "0.0.1.2";
-       sha256 = "1y511vildwj2f6kcswwqw65xhv06q106pnnv1pnhjc91x7r7sbzm";
+       version = "0.0.2.0";
+       sha256 = "02lkr9w766v2392k7c0lh8r4g9iyw1hnb3z2pqablqjxpi514s4g";
        libraryHaskellDepends = [
          aeson aeson-qq amazonka amazonka-cloudformation amazonka-core
          amazonka-lambda amazonka-s3 amazonka-sqs async base
-         base64-bytestring bytestring containers distributed-fork
-         interpolate lens lens-aeson safe-exceptions SHA stratosphere text
-         time typed-process unordered-containers zip-archive
+         base64-bytestring bytestring containers distributed-fork elf
+         interpolate lens lens-aeson safe-exceptions SHA stm stratosphere
+         text time unordered-containers zip-archive
        ];
        testHaskellDepends = [
          base distributed-fork tasty tasty-hunit text
@@ -62782,10 +62225,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.7.3";
-       sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5";
-       revision = "1";
-       editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5";
+       version = "0.7.4";
+       sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -62800,23 +62241,25 @@ self: {
 
   "distributed-process-async" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, containers
-     , data-accessor, deepseq, distributed-process, exceptions
-     , fingertree, hashable, HUnit, mtl, network, network-transport
-     , network-transport-tcp, rematch, stm, test-framework
-     , test-framework-hunit, time, transformers, unordered-containers
+     , data-accessor, deepseq, distributed-process
+     , distributed-process-systest, exceptions, fingertree, hashable
+     , mtl, network, network-transport, network-transport-tcp, rematch
+     , stm, test-framework, test-framework-hunit, time, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "distributed-process-async";
-       version = "0.2.4.1";
-       sha256 = "1a8a6rpjwm4gp4735z3715y4g99sqdqlbhm0hhzss4d7fprbxqkq";
+       version = "0.2.6";
+       sha256 = "0d10na24a7w1rd1qkq62xq01fkywm457421lp0frhs5p5c1kb7aw";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          exceptions fingertree hashable mtl stm time transformers
          unordered-containers
        ];
        testHaskellDepends = [
-         ansi-terminal base binary deepseq exceptions HUnit network
-         network-transport network-transport-tcp rematch stm test-framework
+         ansi-terminal base binary deepseq distributed-process
+         distributed-process-systest exceptions network network-transport
+         network-transport-tcp rematch stm test-framework
          test-framework-hunit transformers
        ];
        description = "Cloud Haskell Async API";
@@ -62858,8 +62301,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-client-server";
-       version = "0.2.3";
-       sha256 = "17y2knzmd277b15hynz0hfz1r4i53mq9a5n14ja5kmm0rhkvpp84";
+       version = "0.2.5.1";
+       sha256 = "15wd3nb68igg7izjb1zzcdcgsh8a9akhfw41arzdp7xcwp6prxy7";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras exceptions
@@ -62940,10 +62383,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.3.2";
-       sha256 = "1cyw171wlhpcc2vp3zidwl1yb5qhp25icqnzg35cdnggh4w12crk";
-       revision = "2";
-       editedCabalFile = "04d3v54xyq4dq8al8zf3na0ccpvyzhdbsjq7mayq9ih7bf247s8c";
+       version = "0.3.5";
+       sha256 = "0yva1ydm34fjvzn1z3jfb436d1m3d54fzs3kxqzgsf1nwxpz25rk";
        libraryHaskellDepends = [
          base binary containers deepseq distributed-process exceptions
          fingertree hashable mtl stm time transformers unordered-containers
@@ -63017,7 +62458,6 @@ self: {
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-monad-control" = callPackage
@@ -63146,29 +62586,28 @@ self: {
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , containers, data-accessor, deepseq, distributed-process
      , distributed-process-client-server, distributed-process-extras
-     , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl
-     , network, network-transport, network-transport-tcp, rematch, stm
-     , test-framework, test-framework-hunit, time, transformers
-     , unordered-containers
+     , distributed-static, exceptions, fingertree, ghc-prim, hashable
+     , HUnit, mtl, network, network-transport, network-transport-tcp
+     , random, rematch, stm, test-framework, test-framework-hunit, time
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "distributed-process-supervisor";
-       version = "0.1.3.2";
-       sha256 = "1x1x0lgkdk5skixh0974la3d7zvjm6g24l7cncdx8rzv1aa9r6ry";
-       revision = "1";
-       editedCabalFile = "0paylszj1av8k6yz8qvy8dqp7kcc5kwjanlwx8al5mmpbyp0hcxj";
+       version = "0.2.1";
+       sha256 = "1cawbyz0nnx0kad1pqi1815nvdcvsap68j5a4ksdg8h8rlkvm05q";
        libraryHaskellDepends = [
-         base binary containers data-accessor deepseq distributed-process
-         distributed-process-client-server distributed-process-extras
-         fingertree hashable mtl stm time transformers unordered-containers
+         base binary bytestring containers data-accessor deepseq
+         distributed-process distributed-process-client-server
+         distributed-process-extras distributed-static exceptions fingertree
+         hashable mtl stm time transformers unordered-containers
        ];
        testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-client-server
-         distributed-process-extras distributed-static fingertree ghc-prim
-         hashable HUnit mtl network network-transport network-transport-tcp
-         rematch stm test-framework test-framework-hunit time transformers
-         unordered-containers
+         distributed-process-extras distributed-static exceptions fingertree
+         ghc-prim hashable HUnit mtl network network-transport
+         network-transport-tcp random rematch stm test-framework
+         test-framework-hunit time transformers unordered-containers
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -63310,6 +62749,7 @@ self: {
        ];
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution-nixpkgs" = callPackage
@@ -63356,8 +62796,8 @@ self: {
        pname = "distributive";
        version = "0.5.3";
        sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
-       revision = "5";
-       editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7";
+       revision = "6";
+       editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans tagged transformers transformers-compat
@@ -63367,6 +62807,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_6" = callPackage
+    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
+     , generic-deriving, hspec, hspec-discover, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.6";
+       sha256 = "1m61ppv851nifid98fimvpml0z0j3ximj7nxd72hshrslr0i7bx4";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base base-orphans tagged transformers ];
+       testHaskellDepends = [ base doctest generic-deriving hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "Distributive functors -- Dual to Traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diversity" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -63457,6 +62914,7 @@ self: {
        ];
        description = "Generate Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "djinn-ghc" = callPackage
@@ -63531,8 +62989,8 @@ self: {
        pname = "dlist-nonempty";
        version = "0.1.1";
        sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
-       revision = "2";
-       editedCabalFile = "1968b6i0azv0bi3x6cw85ga89md1dh1wdmly3ivvvyb6i9mgwrn6";
+       revision = "3";
+       editedCabalFile = "0gy0xkfy3811xz7jjz451a3rldlzg8crmrl5gn0a8fgyjdgqxc46";
        libraryHaskellDepends = [
          base base-compat deepseq dlist semigroupoids
        ];
@@ -63586,6 +63044,7 @@ self: {
        ];
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dmenu" = callPackage
@@ -63816,8 +63275,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.5.1.1";
-       sha256 = "09lska2v4fngbp4pbxxwshcdz6g4sbsyx8apm95hs3hxfpd0j74a";
+       version = "0.6.0.0";
+       sha256 = "0i90nkj1fc4swr6nral2y6raa6mmdz8x40sg47ww42dw18q00fjd";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit conduit-combinators
          conduit-extra containers data-default-class directory exceptions
@@ -63842,25 +63301,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.2";
-       sha256 = "11k91vvdisnh031w9l5r650ibngjd3fgylkcllp01wz1s67w78v7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base containers foldl language-docker system-filepath text turtle
-       ];
-       description = "Builds a services with docker and caches all of its intermediate stages";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "docker-build-cacher_1_9_4" = callPackage
-    ({ mkDerivation, base, containers, foldl, language-docker
-     , system-filepath, text, turtle
-     }:
-     mkDerivation {
-       pname = "docker-build-cacher";
-       version = "1.9.4";
-       sha256 = "1p62q8hq19zgjwaqgclkjqh6ylpbr5jxw82f36xzqximws1jsmkp";
+       version = "2.0.0";
+       sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63868,7 +63310,6 @@ self: {
        ];
        description = "Builds a services with docker and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockercook" = callPackage
@@ -63902,7 +63343,6 @@ self: {
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockerfile" = callPackage
@@ -63977,34 +63417,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.13.0";
-       sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit mockery process QuickCheck setenv silently
-         stringbuilder syb transformers with-location
-       ];
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_15_0" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
-     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
-     , with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.15.0";
-       sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi";
+       version = "0.16.0";
+       sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64022,7 +63436,6 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -64031,29 +63444,6 @@ self: {
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.7";
-       sha256 = "0w5xgw841fxp26n4c9srp84g0m0b105sa1snwrjg5dvxa7d6asmc";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring directory doctest filepath
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring directory doctest filepath
-       ];
-       testHaskellDepends = [ base doctest ];
-       doHaddock = false;
-       description = "Easy way to run doctests via cabal";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "doctest-discover_0_1_0_9" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , filepath
-     }:
-     mkDerivation {
-       pname = "doctest-discover";
        version = "0.1.0.9";
        sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
        isLibrary = true;
@@ -64100,8 +63490,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
-       version = "0.2.0.2";
-       sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl";
+       version = "0.2.0.3";
+       sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base doctest ];
@@ -64209,27 +63599,6 @@ self: {
      }:
      mkDerivation {
        pname = "dom-parser";
-       version = "3.0.0";
-       sha256 = "143lvcx11dmj3f0aa4h7wh693ak6nbjyc7bz18w0iwpvp9krgla9";
-       libraryHaskellDepends = [
-         base case-insensitive containers lens mtl scientific semigroups
-         text transformers xml-conduit xml-lens
-       ];
-       testHaskellDepends = [
-         base data-default hspec lens semigroups shakespeare text
-         xml-conduit
-       ];
-       description = "Simple monadic DOM parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dom-parser_3_1_0" = callPackage
-    ({ mkDerivation, base, case-insensitive, containers, data-default
-     , hspec, lens, mtl, scientific, semigroups, shakespeare, text
-     , transformers, xml-conduit, xml-lens
-     }:
-     mkDerivation {
-       pname = "dom-parser";
        version = "3.1.0";
        sha256 = "1hra4sh34dr1gv4z55dg3f8s2g9l2qb7nlb0j4w0imr71fp5rqfp";
        libraryHaskellDepends = [
@@ -64242,7 +63611,6 @@ self: {
        ];
        description = "Simple monadic DOM parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dom-selector" = callPackage
@@ -64322,9 +63690,12 @@ self: {
        pname = "dot";
        version = "0.2.2";
        sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3";
+       revision = "1";
+       editedCabalFile = "1dc8piglcvaxj0nq946xv185ynh1bk5ca0czrw25p4hji9iji0w1";
        libraryHaskellDepends = [ base impure-containers text ];
        description = "Data types and encoding for graphviz dot files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dot-linker" = callPackage
@@ -65138,7 +64509,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd" = callPackage
@@ -65292,7 +64662,6 @@ self: {
        ];
        description = "XML streaming parser/renderer for the Dublin Core standard elements";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "duckling" = callPackage
@@ -65304,8 +64673,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.6.0";
-       sha256 = "0hk7nnqq20wl6sc3jlaykgsn9b4crgw6hl91xml2dh5d83sknvvq";
+       version = "0.1.6.1";
+       sha256 = "0lvvp13f5zcnf3cnl40avnfh3mgj304d5qfw08mbnwqz1bqp94xy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65341,6 +64710,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dump" = callPackage
@@ -65378,6 +64748,7 @@ self: {
        ];
        description = "A plug-in for rendering GHC core";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dunai" = callPackage
@@ -65581,8 +64952,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "dwergaz";
-       version = "0.2.0.1";
-       sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9";
+       version = "0.2.0.2";
+       sha256 = "1ja2pxkd5mwp404lcyk3p81y41vbwds31446gkscr2qgzrc1sb7s";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A minimal testing library";
@@ -65641,6 +65012,7 @@ self: {
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-cabal" = callPackage
@@ -65751,6 +65123,8 @@ self: {
        pname = "dynamic-plot";
        version = "0.3.0.0";
        sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c";
+       revision = "1";
+       editedCabalFile = "0f0n6pkgvhgvqh33dlzid3mb35r87w9kirdilky6zk8bcr2li4da";
        libraryHaskellDepends = [
          base colour colour-space constrained-categories containers
          data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
@@ -65791,8 +65165,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-state";
-       version = "0.3";
-       sha256 = "0aa97yv9p0mw1g7nk5jaayfl70bkp2i4kcybvp4a30gr12dpjqmv";
+       version = "0.3.1";
+       sha256 = "0drmlb3cvx0blsnqrxzdylpff5jxvpazsy1bxq2szcp70gghpmf4";
        libraryHaskellDepends = [
          base binary bytestring hashable unordered-containers
        ];
@@ -65898,6 +65272,7 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "each" = callPackage
@@ -65933,8 +65308,8 @@ self: {
      }:
      mkDerivation {
        pname = "eap";
-       version = "0.9.0.1";
-       sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab";
+       version = "0.9.0.2";
+       sha256 = "0bgx7sxpmvhd84j7kkqznazw7p1fl862w7jxlap473g2q5365kqc";
        libraryHaskellDepends = [
          base binary bytestring cryptonite memory mtl pretty-hex
        ];
@@ -65962,12 +65337,11 @@ self: {
     ({ mkDerivation, base, data-default }:
      mkDerivation {
        pname = "ease";
-       version = "0.1.0.0";
-       sha256 = "17zj7s0qq3y4w6qd06hi4fc54m4j1f07wxm7yfnc47lsg5n9f4g0";
+       version = "0.1.0.1";
+       sha256 = "14wd2r4c2akxzhqa997gjwf8xvdnk8mhp1hv3na35x2b7xs74njm";
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easy-api" = callPackage
@@ -66588,6 +65962,7 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects" = callPackage
@@ -66641,6 +66016,7 @@ self: {
        libraryHaskellDepends = [ base containers newtype-generics void ];
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effects-parser" = callPackage
@@ -66652,6 +66028,7 @@ self: {
        libraryHaskellDepends = [ base effects ];
        description = "Parser Effect for the Control.Effects Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effin" = callPackage
@@ -66663,6 +66040,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison" = callPackage
@@ -66734,6 +66112,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "egyptian-fractions" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "egyptian-fractions";
+       version = "0.1.0.2";
+       sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv";
+       libraryHaskellDepends = [ base ];
+       description = "Egyptian fractions in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ehaskell" = callPackage
     ({ mkDerivation, base, directory, filepath, mtlparse, process
      , regexpr, utf8-string, yjtools
@@ -66812,17 +66201,20 @@ self: {
      }) {};
 
   "either" = callPackage
-    ({ mkDerivation, base, bifunctors, hedgehog, mtl, profunctors
-     , semigroupoids, semigroups
+    ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck
+     , semigroupoids, semigroups, test-framework
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "either";
-       version = "5";
-       sha256 = "087lrgvyns9jfgi95rr2lliivxf7fsd4d0hzqzk80kx385vf5kkm";
+       version = "5.0.1";
+       sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
        libraryHaskellDepends = [
          base bifunctors mtl profunctors semigroupoids semigroups
        ];
-       testHaskellDepends = [ base hedgehog ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
        description = "Combinators for working with sums";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66836,7 +66228,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Either or both";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either-list-functions" = callPackage
@@ -66849,6 +66240,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either-unwrap" = callPackage
@@ -66900,8 +66292,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.13";
-       sha256 = "0w9zafd8ipq2hpxqmd9iywryjl0ym5gwwrv90kx80jxmv2dpqpzp";
+       version = "1.0.14";
+       sha256 = "1dfdaff9ig60xacw7fb1r3xq85hrk3x06cr3lwmrxwz493n0vsxl";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -66941,7 +66333,6 @@ self: {
        ];
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-core" = callPackage
@@ -66994,6 +66385,7 @@ self: {
        ];
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-influxdb" = callPackage
@@ -67215,35 +66607,18 @@ self: {
      }) {};
 
   "elf" = callPackage
-    ({ mkDerivation, base, binary, bytestring }:
+    ({ mkDerivation, base, binary, bytestring, containers, hspec }:
      mkDerivation {
        pname = "elf";
-       version = "0.28";
-       sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy";
-       enableSeparateDataOutput = true;
+       version = "0.29";
+       sha256 = "1b4g98fk1p8mk0zdh6fwzm3vnzcrhvpysx4g4ahcbgbr4bqhjra2";
        libraryHaskellDepends = [ base binary bytestring ];
-       description = "Parser for ELF object format";
+       testHaskellDepends = [ base bytestring containers hspec ];
+       description = "An Elf parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "eliminators" = callPackage
-    ({ mkDerivation, base, extra, hspec, singleton-nats, singletons
-     , template-haskell, th-abstraction, th-desugar
-     }:
-     mkDerivation {
-       pname = "eliminators";
-       version = "0.3";
-       sha256 = "1x52m3dqq0l5lz0apkcgd9m5nlw58d42gdi0q8c8cf0dk8m3b8mn";
-       libraryHaskellDepends = [
-         base extra singleton-nats singletons template-haskell
-         th-abstraction th-desugar
-       ];
-       testHaskellDepends = [ base hspec singleton-nats singletons ];
-       description = "Dependently typed elimination functions using singletons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eliminators_0_4_1" = callPackage
     ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
      , singletons, template-haskell, th-abstraction, th-desugar
      }:
@@ -67259,7 +66634,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elision" = callPackage
@@ -67731,6 +67105,7 @@ self: {
        ];
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-postmark" = callPackage
@@ -67755,8 +67130,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-validate";
-       version = "2.3.2.5";
-       sha256 = "0k2fczw7qk442b3k0qblypaad8bva06x5sai5zgp7h6ckvlg8kvv";
+       version = "2.3.2.6";
+       sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5";
        libraryHaskellDepends = [
          attoparsec base bytestring template-haskell
        ];
@@ -67818,6 +67193,7 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emailparse" = callPackage
@@ -67827,8 +67203,8 @@ self: {
      }:
      mkDerivation {
        pname = "emailparse";
-       version = "0.2.0.9";
-       sha256 = "13fg4sly6a3v8xy9prrn9nh3ly14y8k2jghr9b7dmyi7pvmlpss7";
+       version = "0.2.0.10";
+       sha256 = "0w6jkimaiy1ld6aydmq5jz4g248awkj4wnpq6knpn0wfxjsqz0r8";
        libraryHaskellDepends = [
          attoparsec base bytestring either either-unwrap mime MissingH
          strptime text text-icu time word8
@@ -67942,6 +67318,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enchant" = callPackage
@@ -67983,6 +67360,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "enclosed-exceptions_1_0_3" = callPackage
+    ({ mkDerivation, async, base, deepseq, hspec, lifted-base
+     , monad-control, QuickCheck, stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "enclosed-exceptions";
+       version = "1.0.3";
+       sha256 = "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg";
+       libraryHaskellDepends = [
+         base deepseq lifted-base monad-control transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         async base deepseq hspec lifted-base monad-control QuickCheck stm
+         transformers transformers-base
+       ];
+       description = "Catching all exceptions from within an enclosed computation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "encode-string" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances
      , text
@@ -68196,27 +67594,12 @@ self: {
      }:
      mkDerivation {
        pname = "entropy";
-       version = "0.3.8";
-       sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl";
-       setupHaskellDepends = [ base Cabal directory filepath process ];
-       libraryHaskellDepends = [ base bytestring unix ];
-       description = "A platform independent entropy source";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "entropy_0_4_1_1" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , process, unix
-     }:
-     mkDerivation {
-       pname = "entropy";
        version = "0.4.1.1";
        sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A platform independent entropy source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enum-subset-generate" = callPackage
@@ -68317,6 +67700,7 @@ self: {
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerator-fd" = callPackage
@@ -68328,6 +67712,7 @@ self: {
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerator-tf" = callPackage
@@ -68339,6 +67724,7 @@ self: {
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumfun" = callPackage
@@ -68400,6 +67786,7 @@ self: {
        ];
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumset" = callPackage
@@ -68470,6 +67857,7 @@ self: {
        testHaskellDepends = [ base containers hspec text ];
        description = "Parse environment variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envy" = callPackage
@@ -68489,7 +67877,6 @@ self: {
        ];
        description = "An environmentally friendly way to deal with environment variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epanet-haskell" = callPackage
@@ -68558,6 +67945,7 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epub" = callPackage
@@ -68642,23 +68030,11 @@ self: {
     ({ mkDerivation, base, semigroupoids }:
      mkDerivation {
        pname = "eq";
-       version = "4.1";
-       sha256 = "10k1xnvga7c6ijmkfq2qd4vc5i2lnkz4xjmba74g0xzhk6gkvp0n";
-       libraryHaskellDepends = [ base semigroupoids ];
-       description = "Leibnizian equality";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eq_4_2" = callPackage
-    ({ mkDerivation, base, semigroupoids }:
-     mkDerivation {
-       pname = "eq";
        version = "4.2";
        sha256 = "1s3h77i0h4z3dg97sqqjl027rz0k82h48cpzp0c7a75g0qx70q21";
        libraryHaskellDepends = [ base semigroupoids ];
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "equal-files" = callPackage
@@ -68680,16 +68056,16 @@ self: {
      }) {};
 
   "equational-reasoning" = callPackage
-    ({ mkDerivation, base, containers, semigroups, singletons
-     , template-haskell, th-desugar, th-extras, void
+    ({ mkDerivation, base, containers, singletons, template-haskell
+     , th-desugar, th-extras, void
      }:
      mkDerivation {
        pname = "equational-reasoning";
        version = "0.5.1.0";
        sha256 = "11203rdw4q9s5ramhmr2hdimgwin3zwjas8csxqxxldkv3x9a05l";
        libraryHaskellDepends = [
-         base containers semigroups singletons template-haskell th-desugar
-         th-extras void
+         base containers singletons template-haskell th-desugar th-extras
+         void
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
@@ -68960,22 +68336,6 @@ self: {
 
   "errors" = callPackage
     ({ mkDerivation, base, exceptions, safe, text, transformers
-     , transformers-compat, unexceptionalio
-     }:
-     mkDerivation {
-       pname = "errors";
-       version = "2.2.5";
-       sha256 = "0p3kpipixdcwhwjcwq8ks8iik78dsddglxrn929dfwsm1ibcl5z9";
-       libraryHaskellDepends = [
-         base exceptions safe text transformers transformers-compat
-         unexceptionalio
-       ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_3_0" = callPackage
-    ({ mkDerivation, base, exceptions, safe, text, transformers
      , transformers-compat
      }:
      mkDerivation {
@@ -68987,7 +68347,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "errors-ext" = callPackage
@@ -69040,10 +68399,8 @@ self: {
      }:
      mkDerivation {
        pname = "ersatz";
-       version = "0.4.2";
-       sha256 = "1rr46awz0rbzg0i6424rnrykcwkgwxfzgx5d5qmva4y41l62vkxf";
-       revision = "1";
-       editedCabalFile = "098i7593rlc81618y1cz6bmsp2y0vlimz8hnqlzja4m8mclfsbx2";
+       version = "0.4.3";
+       sha256 = "0c0yrh342682k47phy5xwc0gya4h9d07j53dakkwhnx0r4p6gjfn";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -69143,6 +68500,7 @@ self: {
        doHaddock = false;
        description = "Terminal fuzzy selector";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esotericbot" = callPackage
@@ -69184,8 +68542,8 @@ self: {
      }:
      mkDerivation {
        pname = "espial";
-       version = "0.0.1";
-       sha256 = "19zkd2vki74ny69w2bdc3qr71fzawk20a56vsv3an9q5xx0f36a6";
+       version = "0.0.3";
+       sha256 = "1j6q97xlk1m1l80qb41jmrqx1mawmrwaq8pby2b4mvmz5ighxx4i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69247,7 +68605,6 @@ self: {
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -69325,7 +68682,6 @@ self: {
        testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
        description = "Declarative configuration spec for Haskell projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "etcd" = callPackage
@@ -69429,6 +68785,7 @@ self: {
        ];
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -69615,6 +68972,7 @@ self: {
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ety" = callPackage
@@ -69674,6 +69032,7 @@ self: {
        ];
        description = "Euler tour trees";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "euphoria" = callPackage
@@ -69735,6 +69094,7 @@ self: {
        ];
        description = "An extensible event framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eve-cli" = callPackage
@@ -69751,6 +69111,7 @@ self: {
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event" = callPackage
@@ -70279,7 +69640,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exception-mailer" = callPackage
@@ -70322,7 +69682,6 @@ self: {
        ];
        description = "Exception monad transformer instances for monads-tf classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exception-mtl" = callPackage
@@ -70336,7 +69695,6 @@ self: {
        ];
        description = "Exception monad transformer instances for mtl classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exception-transformers" = callPackage
@@ -70356,7 +69714,6 @@ self: {
        ];
        description = "Type classes and monads for unchecked extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exceptional" = callPackage
@@ -70372,28 +69729,6 @@ self: {
 
   "exceptions" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
-     , test-framework, test-framework-quickcheck2, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "exceptions";
-       version = "0.8.3";
-       sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd";
-       revision = "5";
-       editedCabalFile = "1kfgp41i6mfz9gjczp3flvqxfhnznd81rwldv8j05807n6mnqqii";
-       libraryHaskellDepends = [
-         base mtl stm template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck stm template-haskell test-framework
-         test-framework-quickcheck2 transformers transformers-compat
-       ];
-       description = "Extensible optionally-pure exceptions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "exceptions_0_10_0" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , transformers, transformers-compat
      }:
@@ -70401,6 +69736,8 @@ self: {
        pname = "exceptions";
        version = "0.10.0";
        sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
+       revision = "1";
+       editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
        libraryHaskellDepends = [
          base mtl stm template-haskell transformers transformers-compat
        ];
@@ -70411,7 +69748,6 @@ self: {
        ];
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "execs" = callPackage
@@ -70580,7 +69916,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -70683,28 +70018,39 @@ self: {
      }) {};
 
   "exitcode" = callPackage
-    ({ mkDerivation, base, checkers, lens, mtl, QuickCheck
-     , semigroupoids, semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , transformers
+    ({ mkDerivation, base, checkers, hedgehog, lens, mmorph, mtl
+     , QuickCheck, semigroupoids, semigroups, tasty, tasty-hedgehog
+     , tasty-hunit, tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "exitcode";
-       version = "0.1.0.0";
-       sha256 = "0nkb1mbgmb67qc57s2ypcpg8ky905bqy8ns9y7zq6hmizmyn34f3";
-       revision = "1";
-       editedCabalFile = "077gibwagbkr07lgj8gy2bziam9zb320ry6z889zkqpg74fskbi1";
+       version = "0.1.0.1";
+       sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
        libraryHaskellDepends = [
-         base lens mtl semigroupoids semigroups transformers
+         base lens mmorph mtl semigroupoids semigroups transformers
        ];
        testHaskellDepends = [
-         base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
-         transformers
+         base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
+         tasty-hunit tasty-quickcheck transformers
        ];
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exomizer" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs }:
+     mkDerivation {
+       pname = "exomizer";
+       version = "1.0.0";
+       sha256 = "1lngwbwgmh6dvskambn35ncrni7cxlychwbircb6srhjdm1lvhll";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       description = "Compression and decompression in the exomizer format";
+       license = "unknown";
+     }) {};
+
   "exp-cache" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , hashable, HUnit, psqueues, QuickCheck, random, tasty, tasty-hunit
@@ -70738,7 +70084,6 @@ self: {
        libraryHaskellDepends = [ base compensated log-domain ];
        description = "floating point with extended exponent range";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exp-pairs" = callPackage
@@ -70759,7 +70104,6 @@ self: {
        ];
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -70869,6 +70213,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -70998,8 +70343,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.6";
-       sha256 = "081yglpbk0297s7qyq845x9pfkl0dcbz4i2dv1rppslvkhpwa270";
+       version = "0.1.9";
+       sha256 = "1620ljwnprqsrbp2dp0c2f7kpjg7j1xz12x794kpq3csbdp52afk";
        libraryHaskellDepends = [
          attoparsec base containers free lattices singletons text
          transformers
@@ -71007,7 +70352,6 @@ self: {
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expressions-z3" = callPackage
@@ -71016,8 +70360,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.5";
-       sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr";
+       version = "0.1.6";
+       sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a";
        libraryHaskellDepends = [
          base containers expressions list-t singletons transformers z3
        ];
@@ -71026,7 +70370,6 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extcore" = callPackage
@@ -71097,6 +70440,7 @@ self: {
        ];
        description = "Extension of real numbers with positive/negative infinities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible" = callPackage
@@ -71121,6 +70465,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_10" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+     , constraints, deepseq, exceptions, ghc-prim, hashable, lens
+     , monad-skeleton, mtl, prettyprinter, primitive, profunctors
+     , QuickCheck, resourcet, semigroups, StateVar, tagged
+     , template-haskell, text, th-lift, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.10";
+       sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava comonad constraints deepseq
+         exceptions ghc-prim hashable monad-skeleton mtl prettyprinter
+         primitive profunctors QuickCheck resourcet semigroups StateVar
+         tagged template-haskell text th-lift transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ base lens QuickCheck template-haskell ];
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -71138,40 +70507,17 @@ self: {
      }) {};
 
   "extensible-effects" = callPackage
-    ({ mkDerivation, base, criterion, HUnit, mtl, QuickCheck, silently
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "extensible-effects";
-       version = "2.4.0.0";
-       sha256 = "024566vv5mmnma2fwnbfg9bzayi6inl1a6ys4nqg0cv57rqny6nc";
-       libraryHaskellDepends = [ base transformers transformers-base ];
-       testHaskellDepends = [
-         base HUnit QuickCheck silently test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th
-       ];
-       benchmarkHaskellDepends = [
-         base criterion HUnit mtl test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th
-       ];
-       description = "An Alternative to Monad Transformers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "extensible-effects_2_6_2_0" = callPackage
-    ({ mkDerivation, base, criterion, HUnit, monad-control, mtl
-     , QuickCheck, silently, test-framework, test-framework-hunit
+    ({ mkDerivation, base, criterion, doctest, HUnit, monad-control
+     , mtl, QuickCheck, silently, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.6.2.0";
-       sha256 = "1gc7packzrh405sz2v4h088knn192kq0hq6zvjab6xqxmrl6bm6f";
+       version = "3.0.0.0";
+       sha256 = "1sqvdwqi3aqqhsjny7h1i7gany4b79nqc539b5arwksjvsgmv2yb";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
-         base HUnit monad-control QuickCheck silently test-framework
+         base doctest HUnit monad-control QuickCheck silently test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
        benchmarkHaskellDepends = [
@@ -71180,24 +70526,27 @@ self: {
        ];
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-effects-concurrent" = callPackage
-    ({ mkDerivation, base, containers, directory, extensible-effects
-     , filepath, lens, logging-effect, monad-control, mtl, parallel
-     , process, QuickCheck, random, stm, tagged, time, transformers
+    ({ mkDerivation, base, containers, deepseq, directory
+     , extensible-effects, filepath, HUnit, lens, logging-effect
+     , monad-control, mtl, parallel, process, QuickCheck, random, stm
+     , tagged, tasty, tasty-discover, tasty-hunit, time, transformers
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.1.2.2";
-       sha256 = "0iylnsg2q7gx7y2zi7sfklx71p6lghyink0692clipd7z5915ysf";
+       version = "0.4.0.0";
+       sha256 = "0asqibn8hf4i627k9ms8sak90wmyis919ggb41lra4rlv03r61rc";
        libraryHaskellDepends = [
-         base containers directory extensible-effects filepath lens
+         base containers deepseq directory extensible-effects filepath lens
          logging-effect monad-control mtl parallel process QuickCheck random
          stm tagged time transformers
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers deepseq extensible-effects HUnit lens QuickCheck
+         stm tasty tasty-discover tasty-hunit
+       ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71317,6 +70666,7 @@ self: {
        ];
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extrapolate" = callPackage
@@ -71407,6 +70757,17 @@ self: {
        license = "GPL";
      }) {};
 
+  "facts" = callPackage
+    ({ mkDerivation, base, exceptions, mtl, template-haskell }:
+     mkDerivation {
+       pname = "facts";
+       version = "0.0.1.0";
+       sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx";
+       libraryHaskellDepends = [ base exceptions mtl template-haskell ];
+       description = "Refined types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "factual-api" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , curl, dataenc, hoauth, HTTP, MissingH, text, unordered-containers
@@ -71511,6 +70872,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "failure" = callPackage
@@ -71567,6 +70929,7 @@ self: {
        testHaskellDepends = [ base hspec random text time ];
        description = "Randomly generated fake data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fake-type" = callPackage
@@ -71675,16 +71038,20 @@ self: {
      }) {};
 
   "fast-arithmetic" = callPackage
-    ({ mkDerivation, arithmoi, base, combinat, composition-prelude
-     , criterion, gmpint, hspec, QuickCheck
+    ({ mkDerivation, arithmoi, base, combinat-compat
+     , composition-prelude, criterion, gmpint, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "fast-arithmetic";
        version = "0.6.0.7";
        sha256 = "12ma6p4qy7wc22dd63dxqq3sq7spsx2hdzn82zf0w9y33y2jyaml";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
-       testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
-       benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
+       testHaskellDepends = [
+         arithmoi base combinat-compat hspec QuickCheck
+       ];
+       benchmarkHaskellDepends = [
+         arithmoi base combinat-compat criterion
+       ];
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71937,6 +71304,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fastly" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-lexing, hspec
+     , http-client, http-client-tls, http-types, iproute, mtl
+     , old-locale, text, thyme, unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "fastly";
+       version = "0.1.0.0";
+       sha256 = "0b23dh7cfbjmynqbzc44kz5809dg3zx8i32sdglb1b0nxhabnp7b";
+       libraryHaskellDepends = [
+         aeson base bytestring bytestring-lexing http-client http-client-tls
+         http-types iproute mtl old-locale text thyme unordered-containers
+         wai
+       ];
+       testHaskellDepends = [ base hspec text ];
+       description = "A highly experimental Fastly API client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fastparser" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, containers
      , criterion, kan-extensions, microlens, thyme, transformers
@@ -71953,6 +71340,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A fast, but bare bones, bytestring parser combinators library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fastpbkdf2" = callPackage
@@ -72028,10 +71416,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.24.0.0";
-       sha256 = "1my71a3cmd637ch5jwsdpyvfx6vsi2vnvshbrwmcx9ya1xm6x7z2";
-       revision = "1";
-       editedCabalFile = "1bx1dyxir8h0c1qybkfdra36rmdhk7gpgz071v9spl9lplqvpw9s";
+       version = "0.24.0.1";
+       sha256 = "05z8dyw1yf2bh42mrrk1d9rxqdz1p6gn8sjnpk66s2k76xrg4vm2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -72087,6 +71473,8 @@ self: {
        pname = "fay-dom";
        version = "0.5.0.1";
        sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
+       revision = "1";
+       editedCabalFile = "1lhmkf2n7prv6w51bl3szz4g9cn2dkhb873m7f568nnwysqibv8b";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
@@ -72165,6 +71553,8 @@ self: {
        pname = "fay-text";
        version = "0.3.2.2";
        sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
+       revision = "1";
+       editedCabalFile = "0zwip7arbrbz1qhjyy5synnlrvl2wica4804wkizpxr9l7acasn6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
@@ -72196,35 +71586,6 @@ self: {
      }:
      mkDerivation {
        pname = "fb";
-       version = "1.2.0";
-       sha256 = "04ppg1qhm93w5j6arv7ykp0vf85nfwhv6dkpyji34c0nalqzyx6l";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         bytestring cereal conduit conduit-extra crypto-api cryptohash
-         cryptohash-cryptoapi data-default http-client http-conduit
-         http-types monad-logger old-locale resourcet text time transformers
-         transformers-base unliftio unliftio-core unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit containers data-default hspec
-         http-conduit HUnit QuickCheck resourcet text time transformers
-         unliftio
-       ];
-       description = "Bindings to Facebook's API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fb_1_2_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, bytestring, cereal, conduit, conduit-extra
-     , containers, crypto-api, cryptohash, cryptohash-cryptoapi
-     , data-default, hspec, http-client, http-conduit, http-types, HUnit
-     , monad-logger, old-locale, QuickCheck, resourcet, text, time
-     , transformers, transformers-base, unliftio, unliftio-core
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "fb";
        version = "1.2.1";
        sha256 = "05ax0pd9j6c64n48r9q03k5pg2axkmv11cz6azjg7k72cfkp1mm9";
        libraryHaskellDepends = [
@@ -72241,7 +71602,6 @@ self: {
        ];
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb-persistent" = callPackage
@@ -72372,8 +71732,8 @@ self: {
        pname = "fclabels";
        version = "2.0.3.3";
        sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
-       revision = "1";
-       editedCabalFile = "0fs17vv85ybl3ws8k25sg758vq49l19vhn4asm8r6q5j9xic2kvl";
+       revision = "2";
+       editedCabalFile = "0mn82r0h9zhdsaf7qz45fcps6y1kdkqi8xf8dsz8419by2x5ygfx";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -72454,6 +71814,7 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feature-flipper-postgres" = callPackage
@@ -72870,6 +72231,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "festung" = callPackage
+    ({ mkDerivation, aeson, argparser, async, base, base64-bytestring
+     , bytestring, case-insensitive, containers, directory, either
+     , exceptions, filepath, hspec, http-types, HUnit, mtl, scientific
+     , sqlcipher, temporary, text, transformers, unordered-containers
+     , utf8-string, vector, wai, wai-extra, yesod, yesod-core
+     , yesod-test
+     }:
+     mkDerivation {
+       pname = "festung";
+       version = "0.9.1.2";
+       sha256 = "09vcwds5vvk7a899nb4xvpfwkdgmm21w1lv4lacsdl7rvrw84f4l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson argparser async base base64-bytestring bytestring
+         case-insensitive containers directory either exceptions filepath
+         http-types mtl scientific sqlcipher text transformers
+         unordered-containers utf8-string vector wai yesod yesod-core
+       ];
+       executableHaskellDepends = [ argparser base yesod ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring containers directory
+         exceptions filepath hspec HUnit scientific temporary text wai-extra
+         yesod yesod-test
+       ];
+       description = "Remote multi-db SQLCipher server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fez-conf" = callPackage
     ({ mkDerivation, base, containers, regex-compat }:
      mkDerivation {
@@ -72904,8 +72296,8 @@ self: {
      }:
      mkDerivation {
        pname = "fficxx";
-       version = "0.3.1";
-       sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k";
+       version = "0.4.1";
+       sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
@@ -72936,8 +72328,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.12.1.0";
-       sha256 = "081qrvf3hpnn7mgj6i7z8lh1jfmz0ndawc7ya9x3nx7kx3d35crp";
+       version = "0.12.2.0";
+       sha256 = "005q3is5n6lpridfszw3c3la15byc0sbq1b1lwsw59jyffgc587c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72949,7 +72341,6 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -72997,6 +72388,7 @@ self: {
        librarySystemDepends = [ fftw ];
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
@@ -73158,6 +72550,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "file-collection" = callPackage
@@ -73307,25 +72700,6 @@ self: {
      }:
      mkDerivation {
        pname = "filecache";
-       version = "0.3.2";
-       sha256 = "1ddpji3293hrhw7rgl7b41prhffjsb7rgf5x2ijjbiblnzwazr42";
-       libraryHaskellDepends = [
-         base containers directory exceptions filepath fsnotify mtl stm
-         strict-base-types time
-       ];
-       testHaskellDepends = [
-         base containers directory filepath hspec stm temporary
-       ];
-       description = "A cache system associating values to files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "filecache_0_4_0" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
-     }:
-     mkDerivation {
-       pname = "filecache";
        version = "0.4.0";
        sha256 = "0x2ffqx6wfv6n3k3396463f771zs9ps1rcw8ga3qw4vm5sv8s26d";
        libraryHaskellDepends = [
@@ -73337,7 +72711,6 @@ self: {
        ];
        description = "A cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filediff" = callPackage
@@ -73398,6 +72771,7 @@ self: {
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filepath_1_4_2" = callPackage
@@ -73495,7 +72869,6 @@ self: {
        ];
        description = "Interface for versioning file stores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filesystem-conduit" = callPackage
@@ -73589,6 +72962,7 @@ self: {
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Filterable request logging wai middleware. Change how data is logged and when.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filtrable" = callPackage
@@ -73600,7 +72974,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class of filtrable containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fin" = callPackage
@@ -73615,7 +72988,6 @@ self: {
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "final" = callPackage
@@ -73714,6 +73086,7 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fingertree" = callPackage
@@ -73742,6 +73115,7 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fingertree-tf" = callPackage
@@ -73753,6 +73127,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "finite-field" = callPackage
@@ -73775,6 +73150,7 @@ self: {
        ];
        description = "Finite Fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "finite-typelits" = callPackage
@@ -73788,6 +73164,46 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "finite-typelits_0_1_4_0" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "finite-typelits";
+       version = "0.1.4.0";
+       sha256 = "1kq48lq4v2iq4zqyynr2zzps4wgzh4c6aad157r156jlgyn4nkc4";
+       libraryHaskellDepends = [ base deepseq ];
+       description = "A type inhabited by finitely many values, indexed by type-level naturals";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "firebase-database" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , generic-random, HsOpenSSL, hspec, http-client, http-client-tls
+     , http-streams, http-types, io-streams, lens, mtl, nano-http
+     , QuickCheck, split, string-conversions, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "firebase-database";
+       version = "0.0.1";
+       sha256 = "1pwf4jb2kajs21dlq7qz90s3xzv05h1mblra1yszq3gkvz8afalh";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring generic-random HsOpenSSL
+         http-client http-client-tls http-streams http-types io-streams lens
+         mtl nano-http split string-conversions text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring generic-random HsOpenSSL hspec
+         http-client http-client-tls http-streams http-types io-streams lens
+         mtl nano-http QuickCheck split string-conversions text
+         unordered-containers
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Google Firebase Database SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {nano-http = null;};
+
   "firefly" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
      , case-insensitive, containers, cookie, http-types, mtl, regex-pcre
@@ -73835,12 +73251,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "first-class-families" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "first-class-families";
+       version = "0.1.0.0";
+       sha256 = "19lm7p45rn3rlz51pi08ka2sc6nd01ba56pdp6nxakynmc44mw25";
+       libraryHaskellDepends = [ base ];
+       description = "First class type families";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "first-class-patterns" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "first-class-patterns";
-       version = "0.3.2.3";
-       sha256 = "051pmakbg3ipa4vrzk47c0v9ng3sj19wd99qi6gvp40gdkjjmplk";
+       version = "0.3.2.4";
+       sha256 = "1dc24hgmxyhg7jrij3f3x46ra96y5fw047828f8ahxvj14ljix1v";
        libraryHaskellDepends = [ base transformers ];
        description = "First class patterns and pattern matching, using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -74118,7 +73545,6 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -74141,25 +73567,11 @@ self: {
     ({ mkDerivation, base, deepseq, fixed-vector, primitive }:
      mkDerivation {
        pname = "fixed-vector-hetero";
-       version = "0.4.0.0";
-       sha256 = "1x163xw7r95xj8m7nrsbi090pvbmvqw6wplg5ki96k6wa5slidin";
-       revision = "1";
-       editedCabalFile = "0gc12lyp07yjs1xhdbfwllbw2ccdr131w0naxv5cn09bh9iay5xs";
-       libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
-       description = "Generic heterogeneous vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector-hetero_0_5_0_0" = callPackage
-    ({ mkDerivation, base, deepseq, fixed-vector, primitive }:
-     mkDerivation {
-       pname = "fixed-vector-hetero";
        version = "0.5.0.0";
        sha256 = "1446xsj030xr7zry2pqq0yxv4f0j46jmpisfmp357jb0n9l5kwm3";
        libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
        description = "Generic heterogeneous vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-width" = callPackage
@@ -74274,6 +73686,7 @@ self: {
        ];
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixie" = callPackage
@@ -74375,6 +73788,7 @@ self: {
        ];
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flac" = callPackage
@@ -74471,21 +73885,22 @@ self: {
      }) {};
 
   "flat" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, cpu, deepseq
-     , derive, dlist, ghc-prim, mono-traversable, pretty, primitive
-     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, vector
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , dlist, doctest, filemanip, ghc-prim, mono-traversable, pretty
+     , primitive, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "flat";
-       version = "0.3";
-       sha256 = "10kn80qydxmfkbgx0j35f478i781lhn52c76ijsww5iccm889ykw";
+       version = "0.3.2";
+       sha256 = "0489w132m6j47m0jf1svwvql3fmw58iz9l2rqnhn4c5gg91wj53q";
        libraryHaskellDepends = [
-         array base bytestring containers cpu deepseq dlist ghc-prim
-         mono-traversable pretty primitive text transformers vector
+         array base bytestring containers deepseq dlist ghc-prim
+         mono-traversable pretty primitive text vector
        ];
        testHaskellDepends = [
-         base bytestring containers cpu deepseq derive ghc-prim pretty tasty
-         tasty-hunit tasty-quickcheck text
+         base bytestring containers deepseq doctest filemanip ghc-prim
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -74557,8 +73972,8 @@ self: {
      }:
      mkDerivation {
        pname = "flexible-defaults";
-       version = "0.0.1.2";
-       sha256 = "1hkdnylmv1inmxgw2rx5wvy06z5spbxq82rs7xkpv4syrz734w42";
+       version = "0.0.2";
+       sha256 = "0r4aq6n5h9xnal535hds111vq8whzsvyc3yibmcbp7fndldd9mgk";
        libraryHaskellDepends = [
          base containers template-haskell th-extras transformers
        ];
@@ -74645,6 +74060,8 @@ self: {
        pname = "flight-igc";
        version = "0.1.0";
        sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl";
+       revision = "1";
+       editedCabalFile = "0yaqp249gjqgch7w9d8y963afvjl43mhaywgni3x8ld14h55m7ia";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec ];
@@ -74658,6 +74075,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "flight-kml" = callPackage
+    ({ mkDerivation, aeson, base, detour-via-sci, doctest, hlint, hxt
+     , hxt-xpath, parsec, path, raw-strings-qq, siggy-chardust
+     , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, template-haskell, time
+     }:
+     mkDerivation {
+       pname = "flight-kml";
+       version = "1.0.0";
+       sha256 = "0h04f0hkcri1qjk9kfc4r0sg8wyf6hx6s4cjgzaqnmfak6sa9j9c";
+       libraryHaskellDepends = [
+         aeson base detour-via-sci hxt hxt-xpath parsec path siggy-chardust
+         split time
+       ];
+       testHaskellDepends = [
+         aeson base detour-via-sci doctest hlint hxt hxt-xpath parsec path
+         raw-strings-qq siggy-chardust smallcheck split tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck template-haskell time
+       ];
+       description = "Parsing of pilot tracklogs dumped as KML";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flip-cmd" = callPackage
     ({ mkDerivation, base, process, safe-exceptions }:
      mkDerivation {
@@ -74735,6 +74176,7 @@ self: {
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "floating-bits" = callPackage
@@ -74783,8 +74225,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
-       version = "1.0.12";
-       sha256 = "0c9mg6d8krv7c0sxlkgcpvhcspb8g65hp0h7pgjql4644ivqpn3p";
+       version = "1.0.13";
+       sha256 = "0dg29g1d7xi14yf4yjxiy9cmslqgz5c4z141q4bzqn6ms0rwrxx7";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Write more understandable Haskell";
@@ -75175,6 +74617,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fluidsynth;};
 
+  "flux-monoid" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "flux-monoid";
+       version = "0.1.0.0";
+       sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m";
+       libraryHaskellDepends = [ base ];
+       description = "A monoid for tracking changes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fmark" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils
      }:
@@ -75205,33 +74659,6 @@ self: {
      }) {};
 
   "fmt" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, containers, criterion, deepseq, formatting, hspec
-     , interpolate, microlens, neat-interpolation, text, text-format
-     , time, time-locale-compat, vector
-     }:
-     mkDerivation {
-       pname = "fmt";
-       version = "0.5.0.0";
-       sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf";
-       revision = "1";
-       editedCabalFile = "1vdgh45qv5jk1ym4y54sjgk0cnqhrqqi6iirrw8drq20v1srbpl3";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring containers
-         microlens text text-format time time-locale-compat
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec neat-interpolation text vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion deepseq formatting interpolate
-         text text-format vector
-       ];
-       description = "A new formatting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fmt_0_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, call-stack
      , containers, criterion, deepseq, doctest, doctest-discover
      , formatting, hspec, interpolate, microlens, neat-interpolation
@@ -75349,42 +74776,21 @@ self: {
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
-     , profunctors, semigroups, text, transformers, unordered-containers
-     , vector, vector-builder
+     , profunctors, semigroupoids, semigroups, text, transformers
+     , unordered-containers, vector, vector-builder
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.3.7";
-       sha256 = "113966zyk1jj8l1k1izfix8bc1hmpr9w1zahkz592f56wmvmy8kn";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors semigroups text transformers
-         unordered-containers vector vector-builder
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_4_0" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, criterion, hashable, mwc-random, primitive
-     , profunctors, semigroups, text, transformers, unordered-containers
-     , vector, vector-builder
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.4.0";
-       sha256 = "16vx35yl853g9ql9ncpa6r29bg5cai40s7jnpjj2d06ij9cad955";
+       version = "1.4.2";
+       sha256 = "14ccc2spv63v7vipfrmk8jbbw2x1dkkxsyzqzcpnkzjw0yg4ghc9";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors semigroups text transformers
-         unordered-containers vector vector-builder
+         mwc-random primitive profunctors semigroupoids semigroups text
+         transformers unordered-containers vector vector-builder
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -75458,7 +74864,6 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -75480,7 +74885,6 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds" = callPackage
@@ -75561,6 +74965,7 @@ self: {
        ];
        description = "Be notified when a file gets appended, solely with what was added";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "follower" = callPackage
@@ -75824,34 +75229,14 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "forkable-monad";
-       version = "0.1.1";
-       sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h";
+       version = "0.2.0.3";
+       sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp";
        libraryHaskellDepends = [ base transformers ];
        description = "An implementation of forkIO for monad stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forma" = callPackage
-    ({ mkDerivation, aeson, base, containers, data-default-class, hspec
-     , mtl, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "forma";
-       version = "0.2.0";
-       sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00";
-       revision = "1";
-       editedCabalFile = "1hqay7gjhnlxya08qwmxnwriy958awafvyi7rws6wla5m1cq0wr6";
-       libraryHaskellDepends = [
-         aeson base containers data-default-class mtl text
-         unordered-containers
-       ];
-       testHaskellDepends = [ aeson base hspec mtl text ];
-       description = "Parse and validate forms in JSON format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "forma_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, mtl, text
      , unordered-containers
      }:
@@ -75859,13 +75244,14 @@ self: {
        pname = "forma";
        version = "1.1.0";
        sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p";
+       revision = "1";
+       editedCabalFile = "0yn650g1x3v56d45iqks1x7bz6ji8454ppr0qx48bmjnlbb34s1q";
        libraryHaskellDepends = [
          aeson base containers mtl text unordered-containers
        ];
        testHaskellDepends = [ aeson base containers hspec mtl text ];
        description = "Parse and validate forms in JSON format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formal" = callPackage
@@ -75962,8 +75348,8 @@ self: {
      }:
      mkDerivation {
        pname = "formatting";
-       version = "6.3.4";
-       sha256 = "1rcnnzbn1671lcwllpppgh3yv99k83y2n40r8mgsk08hsk1qs0wx";
+       version = "6.3.6";
+       sha256 = "06nkm9scy3a41v4m7npgkl9lvy5py6v7chsx0yhdy4pr4mvdna3a";
        libraryHaskellDepends = [
          array base bytestring clock ghc-prim integer-gmp old-locale
          scientific semigroups text time transformers
@@ -76113,8 +75499,8 @@ self: {
      }:
      mkDerivation {
        pname = "fortytwo";
-       version = "1.0.3";
-       sha256 = "113z46b5dnf6z7bxw1a4vhr84w5pw0iridsi3wjimhjz0rr530cm";
+       version = "1.0.4";
+       sha256 = "0gbvhlsyhfslxrwkdldn15adj8f371rhx5qxfapcpqfa6pwbjsfd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base text ];
@@ -76215,6 +75601,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foundation_0_0_21" = callPackage
+    ({ mkDerivation, base, basement, gauge, ghc-prim }:
+     mkDerivation {
+       pname = "foundation";
+       version = "0.0.21";
+       sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf";
+       libraryHaskellDepends = [ base basement ghc-prim ];
+       testHaskellDepends = [ base basement ];
+       benchmarkHaskellDepends = [ base basement gauge ];
+       description = "Alternative prelude with batteries and no dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foundation-edge" = callPackage
     ({ mkDerivation, bytestring, foundation, text }:
      mkDerivation {
@@ -76362,6 +75762,7 @@ self: {
        ];
        description = "Installed package query tool for Gentoo Linux";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fractal" = callPackage
@@ -76523,6 +75924,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "free_5_1" = callPackage
+    ({ mkDerivation, base, comonad, containers, distributive
+     , exceptions, mtl, profunctors, semigroupoids, template-haskell
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "free";
+       version = "5.1";
+       sha256 = "117axvibwyz429ixdws6mm3sk5vm0jygdxf45456m8yyh9f4shkh";
+       libraryHaskellDepends = [
+         base comonad containers distributive exceptions mtl profunctors
+         semigroupoids template-haskell transformers transformers-base
+       ];
+       description = "Monads for free";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "free-concurrent" = callPackage
     ({ mkDerivation, base, type-aligned }:
      mkDerivation {
@@ -76564,7 +75983,6 @@ self: {
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-game" = callPackage
@@ -76786,6 +76204,7 @@ self: {
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freenect" = callPackage
@@ -77001,7 +76420,6 @@ self: {
        ];
        description = "Fresco binding for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fresh" = callPackage
@@ -77139,6 +76557,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fromhtml" = callPackage
+    ({ mkDerivation, base, bytestring, process, text }:
+     mkDerivation {
+       pname = "fromhtml";
+       version = "0.1.0.3";
+       sha256 = "1zj811728g1hwpagq7jl1qxppn164vn4b27pxn20151iljipq1va";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring process text ];
+       executableHaskellDepends = [ base bytestring process text ];
+       description = "Simple adapter for transformation of HTML to other formats";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "frontmatter" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck
      , text, yaml
@@ -77178,7 +76610,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow" = callPackage
@@ -77191,6 +76622,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow-gloss" = callPackage
@@ -77206,6 +76638,7 @@ self: {
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -77222,6 +76655,7 @@ self: {
        ];
        description = "Program GUIs with GTK and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow-gtk3" = callPackage
@@ -77319,28 +76753,6 @@ self: {
      }) {};
 
   "fsnotify" = callPackage
-    ({ mkDerivation, async, base, containers, directory, filepath
-     , hinotify, tasty, tasty-hunit, temporary, text, time, unix-compat
-     }:
-     mkDerivation {
-       pname = "fsnotify";
-       version = "0.2.1.1";
-       sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp";
-       revision = "1";
-       editedCabalFile = "0kag32lqkjmv03bycf6ip2vd6vzpcpq4iqs6ivyjh93v40252xxp";
-       libraryHaskellDepends = [
-         async base containers directory filepath hinotify text time
-         unix-compat
-       ];
-       testHaskellDepends = [
-         async base directory filepath tasty tasty-hunit temporary
-         unix-compat
-       ];
-       description = "Cross platform library for file change notification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fsnotify_0_3_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , filepath, hinotify, random, shelly, tasty, tasty-hunit, temporary
      , text, time, unix, unix-compat
@@ -77361,7 +76773,6 @@ self: {
        ];
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsnotify-conduit" = callPackage
@@ -77370,26 +76781,6 @@ self: {
      }:
      mkDerivation {
        pname = "fsnotify-conduit";
-       version = "0.1.1.0";
-       sha256 = "03mlb8yhdajf00dzddvbmb7jm3p05zw1y33f2acaa52pk45zh063";
-       libraryHaskellDepends = [
-         base conduit directory filepath fsnotify resourcet transformers
-       ];
-       testHaskellDepends = [
-         base conduit directory filepath fsnotify hspec resourcet temporary
-         transformers
-       ];
-       description = "Get filesystem notifications as a stream of events";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "fsnotify-conduit_0_1_1_1" = callPackage
-    ({ mkDerivation, base, conduit, directory, filepath, fsnotify
-     , hspec, resourcet, temporary, transformers
-     }:
-     mkDerivation {
-       pname = "fsnotify-conduit";
        version = "0.1.1.1";
        sha256 = "1kh1y1p4dw2yhxrl1rrkmpkvm3q5nq12cwl8dfcscrkx3wqhz683";
        libraryHaskellDepends = [
@@ -77401,7 +76792,6 @@ self: {
        ];
        description = "Get filesystem notifications as a stream of events";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fst" = callPackage
@@ -77461,8 +76851,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatch";
-       version = "0.1.0.3";
-       sha256 = "1k68h4jzcqsnmmhnm3sp0zlkz99q0d925iragl3dbnsbk837sq25";
+       version = "0.1.0.5";
+       sha256 = "0f1rvvkfqm3q12dvagmsdpvw0c9r5a9gj6g34rrsyjdbpc818prw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77531,16 +76921,15 @@ self: {
      }) {};
 
   "ftp-client-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit-combinators, connection
-     , exceptions, ftp-client, ftp-clientconduit, resourcet
+    ({ mkDerivation, base, bytestring, conduit, connection, exceptions
+     , ftp-client, ftp-clientconduit, resourcet
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.5.0.0";
-       sha256 = "16g1j2a8kikva08bi6n22sw0limlwj8r53acrlq6licg2sdlzp06";
+       version = "0.5.0.1";
+       sha256 = "08v5zf3idm65b9aihmaplznmcshaydx3f1ns0f6kzfhmvbdpwc2c";
        libraryHaskellDepends = [
-         base bytestring conduit-combinators connection exceptions
-         ftp-client resourcet
+         base bytestring conduit connection exceptions ftp-client resourcet
        ];
        testHaskellDepends = [ base ftp-clientconduit ];
        description = "Transfer file with FTP and FTPS with Conduit";
@@ -77592,6 +76981,7 @@ self: {
        libraryHaskellDepends = [ base ShowF type-unary ];
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftshell" = callPackage
@@ -77766,6 +77156,24 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "funcons-lambda-cbv-mp" = callPackage
+    ({ mkDerivation, base, containers, funcons-tools, gll, text }:
+     mkDerivation {
+       pname = "funcons-lambda-cbv-mp";
+       version = "0.1.0.2";
+       sha256 = "0bns3n93s1bmpja5bhxyrmbamh5ywamz8c9ys6iia79zxf8pq61d";
+       revision = "1";
+       editedCabalFile = "0dpd7z4s47198zgm280prl04ckgrkqmin74n5ysam751bvabjrgy";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers funcons-tools gll text
+       ];
+       description = "call-by-value lambda-calculus with meta-programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "funcons-tools" = callPackage
     ({ mkDerivation, base, bv, containers, directory, funcons-values
      , gll, mtl, multiset, random-strings, regex-applicative, split
@@ -77773,10 +77181,8 @@ self: {
      }:
      mkDerivation {
        pname = "funcons-tools";
-       version = "0.2.0.1";
-       sha256 = "1a27xhzakvrc29kli293ivkzmqfma71s942a9bsyvss15g1881fn";
-       revision = "1";
-       editedCabalFile = "1lfqgrrc814j0zyx2z8v0nx367bgifr93gb86dd4hshz2vvq5b49";
+       version = "0.2.0.5";
+       sha256 = "16a4jn2l13da7n4c73raqplisz4xg7g4rpi707vks5x9gi44pag4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77798,12 +77204,12 @@ self: {
      }:
      mkDerivation {
        pname = "funcons-values";
-       version = "0.1.0.2";
-       sha256 = "0pywpqnjhwny1l1kz6hn135rbmgdglzpvfvq4ffjllzdj2w9ciy2";
+       version = "0.1.0.3";
+       sha256 = "0j9sn5b6c6v1vllkvrc02r81bpcmh2a3srq74na8vvzq8pp6midy";
        libraryHaskellDepends = [
          base bv containers multiset random-strings text vector
        ];
-       description = "Library providing values and operations on values";
+       description = "Library providing values and operations on values in a fixed universe";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -77910,6 +77316,7 @@ self: {
        ];
        description = "Functor combinators with tries & zippers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-friends" = callPackage
@@ -77955,7 +77362,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functorm" = callPackage
@@ -77993,8 +77399,8 @@ self: {
      }:
      mkDerivation {
        pname = "funflow";
-       version = "1.0.0";
-       sha256 = "1lcww83dzhbmml5l4yrypbw18l8x1m3pzblcnmgd90a9874gmq0f";
+       version = "1.1.0";
+       sha256 = "1fly82yffcdldjvqkk920rj7aq4ncy71g5zix1cnn1hks6n8xp8b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78167,7 +77573,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzy-dates" = callPackage
@@ -78521,21 +77926,22 @@ self: {
        libraryHaskellDepends = [ base binary containers ];
        description = "A framework of algebraic classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gauge" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, directory
-     , HUnit, process, tasty, tasty-hunit, vector
+     , foundation, process, vector
      }:
      mkDerivation {
        pname = "gauge";
-       version = "0.2.1";
-       sha256 = "0401b5jzfib4wxwicqynhkn79q98hnxrpiqk1b353a6wix55hy1d";
+       version = "0.2.3";
+       sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
        libraryHaskellDepends = [
          base basement deepseq directory process vector
        ];
        testHaskellDepends = [
-         base bytestring deepseq directory HUnit tasty tasty-hunit
+         base bytestring deepseq directory foundation
        ];
        benchmarkHaskellDepends = [ base ];
        description = "small framework for performance measurement and analysis";
@@ -78751,6 +78157,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "gdp" = callPackage
+    ({ mkDerivation, base, lawful }:
+     mkDerivation {
+       pname = "gdp";
+       version = "0.0.0.2";
+       sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lawful ];
+       executableHaskellDepends = [ base ];
+       description = "Reason about invariants and preconditions with ghosts of departed proofs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gearbox" = callPackage
     ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
      mkDerivation {
@@ -78762,6 +78182,7 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gedcom" = callPackage
@@ -79127,8 +78548,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.6.2.0";
-       sha256 = "1id0zc617wskz5p8mbawqin03f73vvqy3d8jm6ywzyw3in5y82hs";
+       version = "0.7.0.0";
+       sha256 = "0jvrwjry0kgw27qhnqxm5zvpks69cvvj0iz1ipvdsd5hi16dxarb";
        libraryHaskellDepends = [
          base binary cereal lens linear spatial-math TypeCompose
        ];
@@ -79148,8 +78569,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.9";
        sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l";
-       revision = "3";
-       editedCabalFile = "0dlxl7p1nf8d4yh6r5yfdnrsn4wb5wl7bj9ymln744b498frlfln";
+       revision = "4";
+       editedCabalFile = "0m2m2wfv9nhq8m7xl1nrmj4wy3yip3s31b4448za58ryrwkdgjzd";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -79240,16 +78661,16 @@ self: {
 
   "generic-deriving" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
-     , template-haskell
+     , template-haskell, th-abstraction
      }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.12.1";
-       sha256 = "0wwl29f5mlxmrigh0kp35q7aj10ymknnjabmdrdfxpi079rkzzgm";
+       version = "1.12.2";
+       sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n";
        revision = "1";
-       editedCabalFile = "1vr9lyvcrdiar6ndqnspwvhvrbnc1fvsjyx458ivpcr6j75j0l5j";
+       editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz";
        libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
+         base containers ghc-prim template-haskell th-abstraction
        ];
        testHaskellDepends = [ base hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
@@ -79271,23 +78692,6 @@ self: {
      }) {};
 
   "generic-lens" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, doctest
-     , inspection-testing, lens, profunctors, QuickCheck, tagged
-     }:
-     mkDerivation {
-       pname = "generic-lens";
-       version = "0.5.1.0";
-       sha256 = "09q13axb00kgy2w9c7lq84sh113vhxlw0g8zcjg07a1kp9wj7l47";
-       libraryHaskellDepends = [ base profunctors tagged ];
-       testHaskellDepends = [ base doctest inspection-testing lens ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq lens QuickCheck
-       ];
-       description = "Generic data-structure operations exposed as lenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generic-lens_1_0_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
      , inspection-testing, lens, profunctors, QuickCheck, tagged
      }:
@@ -79316,6 +78720,7 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -79327,6 +78732,7 @@ self: {
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-maybe" = callPackage
@@ -79371,20 +78777,6 @@ self: {
      }) {};
 
   "generic-random" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "generic-random";
-       version = "1.1.0.2";
-       sha256 = "0zslrz4cizw8c76q5szgmpc58f25hx4qf01lavxshynn771cx271";
-       revision = "1";
-       editedCabalFile = "1qhjsxaadvnh41qrlnzp2wxrbxxsbsz9np4mhwq5vck07kqws5bk";
-       libraryHaskellDepends = [ base QuickCheck ];
-       testHaskellDepends = [ base QuickCheck ];
-       description = "Generic random generators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-random_1_2_0_0" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "generic-random";
@@ -79394,7 +78786,6 @@ self: {
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-records" = callPackage
@@ -79441,6 +78832,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-trie" = callPackage
@@ -79454,7 +78846,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-xml" = callPackage
@@ -79492,25 +78883,6 @@ self: {
 
   "generics-eot" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, hspec
-     , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
-     , shake
-     }:
-     mkDerivation {
-       pname = "generics-eot";
-       version = "0.2.1.2";
-       sha256 = "07vaywcqrp9jcsbcgj63i5mcs3zbf69zprkkmh9in3rnkvq9cfjf";
-       libraryHaskellDepends = [ base markdown-unlit ];
-       testHaskellDepends = [
-         base directory doctest filepath hspec interpolate markdown-unlit
-         mockery QuickCheck shake
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A library for generic programming that aims to be easy to understand";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-eot_0_4" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, hspec
      , interpolate, markdown-unlit, mockery, QuickCheck, shake, silently
      }:
      mkDerivation {
@@ -79524,7 +78896,6 @@ self: {
        ];
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-mrsop" = callPackage
@@ -79536,6 +78907,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop" = callPackage
@@ -79558,8 +78930,8 @@ self: {
        pname = "generics-sop-lens";
        version = "0.1.2.1";
        sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
-       revision = "3";
-       editedCabalFile = "1phq0hjpgxfvb8ay9v4ix6axk07mbd266javss9nmqmqmn3vnb51";
+       revision = "4";
+       editedCabalFile = "1ms3y1cqpzlzl9yr2v53971vvnaapa3bni9yv19l1ilxhr8xzqfr";
        libraryHaskellDepends = [ base generics-sop lens ];
        description = "Lenses for types in generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -79798,25 +79170,12 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.4.0.4";
-       sha256 = "0gfndjss4j2dmyk46r9ab3ahw8pmc6bry7nzzx7qpgim6zz5597w";
-       libraryHaskellDepends = [ base QuickCheck validity ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity_0_5_0_3" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, validity }:
-     mkDerivation {
-       pname = "genvalidity";
-       version = "0.5.0.3";
-       sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk";
+       version = "0.5.1.0";
+       sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-aeson" = callPackage
@@ -79827,31 +79186,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-aeson";
-       version = "0.1.0.0";
-       sha256 = "141khs49k352w79p034rcfkdmyd1j4mxy0kbk3vwbwk1i48ri1sg";
-       libraryHaskellDepends = [
-         aeson base genvalidity genvalidity-scientific genvalidity-text
-         genvalidity-unordered-containers genvalidity-vector QuickCheck
-         validity validity-aeson
-       ];
-       testHaskellDepends = [
-         aeson base genvalidity genvalidity-hspec hspec
-       ];
-       description = "GenValidity support for aeson";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-aeson_0_2_0_1" = callPackage
-    ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
-     , genvalidity-scientific, genvalidity-text
-     , genvalidity-unordered-containers, genvalidity-vector, hspec
-     , QuickCheck, validity, validity-aeson
-     }:
-     mkDerivation {
-       pname = "genvalidity-aeson";
-       version = "0.2.0.1";
-       sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8";
+       version = "0.2.0.2";
+       sha256 = "1c77lbw4y6fmrsdzxwm38la161n6k3zvjwisg17ssz0a1bm4y96i";
        libraryHaskellDepends = [
          aeson base genvalidity genvalidity-scientific genvalidity-text
          genvalidity-unordered-containers genvalidity-vector QuickCheck
@@ -79862,7 +79198,6 @@ self: {
        ];
        description = "GenValidity support for aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-bytestring" = callPackage
@@ -79871,27 +79206,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-bytestring";
-       version = "0.1.0.0";
-       sha256 = "1blwjkfcf2ah0d4nb8yaff4j6rpqa2hh5f34k7aalh1p2y5a32jb";
-       libraryHaskellDepends = [
-         base bytestring genvalidity QuickCheck validity validity-bytestring
-       ];
-       testHaskellDepends = [
-         base bytestring genvalidity genvalidity-hspec hspec QuickCheck
-       ];
-       description = "GenValidity support for ByteString";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-bytestring_0_2_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
-     , hspec, QuickCheck, validity, validity-bytestring
-     }:
-     mkDerivation {
-       pname = "genvalidity-bytestring";
-       version = "0.2.0.1";
-       sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl";
+       version = "0.2.0.2";
+       sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3";
        libraryHaskellDepends = [
          base bytestring genvalidity QuickCheck validity validity-bytestring
        ];
@@ -79900,7 +79216,6 @@ self: {
        ];
        description = "GenValidity support for ByteString";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-containers" = callPackage
@@ -79909,27 +79224,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.3.0.0";
-       sha256 = "09z0jg12kkrmrgpaykfnwc86piv94cza8kr93sn3njwpc5g5fy8c";
-       libraryHaskellDepends = [
-         base containers genvalidity QuickCheck validity validity-containers
-       ];
-       testHaskellDepends = [
-         base containers genvalidity genvalidity-hspec hspec
-       ];
-       description = "GenValidity support for containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-containers_0_4_0_1" = callPackage
-    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
-     , hspec, QuickCheck, validity, validity-containers
-     }:
-     mkDerivation {
-       pname = "genvalidity-containers";
-       version = "0.4.0.1";
-       sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf";
+       version = "0.5.0.0";
+       sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -79938,47 +79234,25 @@ self: {
        ];
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
-     , hspec, hspec-core, QuickCheck, validity
+     , hspec, hspec-core, QuickCheck, transformers, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.5.0.0";
-       sha256 = "1g0cicmkymw3n1k42rhicx0d91sghjf46vqcdmkahpas8bhwl3xm";
-       libraryHaskellDepends = [
-         base genvalidity genvalidity-property hspec hspec-core QuickCheck
-         validity
-       ];
-       testHaskellDepends = [
-         base doctest genvalidity hspec hspec-core QuickCheck
-       ];
-       description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec_0_6_0_3" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
-     , hspec, hspec-core, QuickCheck, validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec";
-       version = "0.6.0.3";
-       sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63";
+       version = "0.6.1.1";
+       sha256 = "0jqdsslag6zz499z5ilra3dklsdvil92kzdx6gb591xvc30a74vs";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
-         validity
+         transformers validity
        ];
        testHaskellDepends = [
          base doctest genvalidity hspec hspec-core QuickCheck
        ];
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -79988,30 +79262,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.1.0.2";
-       sha256 = "05h3y3bnq2i9xhjh5i5rghazfwz5n1vsvrmx4r3ircd6zv4nm2g1";
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
-         QuickCheck
-       ];
-       testHaskellDepends = [
-         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
-         genvalidity-text hspec text
-       ];
-       description = "Standard spec's for aeson-related instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec-aeson_0_2_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , genvalidity, genvalidity-aeson, genvalidity-hspec
-     , genvalidity-text, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-aeson";
-       version = "0.2.0.1";
-       sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh";
+       version = "0.3.0.0";
+       sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
@@ -80022,7 +79274,6 @@ self: {
        ];
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
@@ -80031,32 +79282,14 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-binary";
-       version = "0.1.0.0";
-       sha256 = "15d53hd9wyvm89c8n3l3xmr568vw810q581nzsllp8rb1rb5mxnl";
-       libraryHaskellDepends = [
-         base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
-       ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
-       description = "Standard spec's for binary-related Instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec-binary_0_2_0_1" = callPackage
-    ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
-     , genvalidity-hspec, hspec, QuickCheck
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-binary";
-       version = "0.2.0.1";
-       sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0";
+       version = "0.2.0.2";
+       sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211";
        libraryHaskellDepends = [
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [ base doctest genvalidity hspec ];
        description = "Standard spec's for binary-related Instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
@@ -80065,32 +79298,14 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.1.0.0";
-       sha256 = "01gdk8g3ci709zzqyqb5knfq8g67qf184hz60qbgv31hd2hgqc7k";
-       libraryHaskellDepends = [
-         base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
-       ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
-       description = "Standard spec's for cereal-related instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec-cereal_0_2_0_1" = callPackage
-    ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
-     , genvalidity-hspec, hspec, QuickCheck
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-cereal";
-       version = "0.2.0.1";
-       sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn";
+       version = "0.2.0.2";
+       sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [ base doctest genvalidity hspec ];
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
@@ -80100,30 +79315,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-hashable";
-       version = "0.1.0.0";
-       sha256 = "0026ms1l4f216vg80pfc3sx92yl1c72fsyygy7ya94y7p0qn33nf";
-       libraryHaskellDepends = [
-         base genvalidity genvalidity-hspec genvalidity-property hashable
-         hspec QuickCheck validity
-       ];
-       testHaskellDepends = [
-         base doctest genvalidity genvalidity-hspec hashable hspec
-         hspec-core QuickCheck
-       ];
-       description = "Standard spec's for Hashable instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec-hashable_0_2_0_1" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
-     , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
-     , validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-hashable";
-       version = "0.2.0.1";
-       sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm";
+       version = "0.2.0.2";
+       sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec genvalidity-property hashable
          hspec QuickCheck validity
@@ -80134,7 +79327,6 @@ self: {
        ];
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-mergeless" = callPackage
@@ -80162,28 +79354,13 @@ self: {
      }) {genvalidity-typed-uuid = null; typed-uuid = null;};
 
   "genvalidity-path" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path
-     , validity-path
-     }:
-     mkDerivation {
-       pname = "genvalidity-path";
-       version = "0.2.0.2";
-       sha256 = "140myxs62amq43mrxdkyxg33ilj8ll4jwd602c5cwz05x0wn634h";
-       libraryHaskellDepends = [ base genvalidity path validity-path ];
-       testHaskellDepends = [ base genvalidity-hspec hspec path ];
-       description = "GenValidity support for Path";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec
      , hspec, path, QuickCheck, validity-path
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.3.0.1";
-       sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x";
+       version = "0.3.0.2";
+       sha256 = "1fj0lc1il2yjlj6wmczvnk505c1dlvz4xw2aml0agkal9lpnvz00";
        libraryHaskellDepends = [
          base genvalidity path QuickCheck validity-path
        ];
@@ -80193,7 +79370,6 @@ self: {
        ];
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-property" = callPackage
@@ -80202,31 +79378,14 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.1.0.0";
-       sha256 = "1xbai5cr5qskyjrbzsll2a74szbfyzvpj1xc6p3q5w90j3z39myz";
-       libraryHaskellDepends = [
-         base genvalidity hspec QuickCheck validity
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       description = "Standard properties for functions on `Validity` types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-property_0_2_0_2" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, genvalidity
-     , hspec, QuickCheck, validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-property";
-       version = "0.2.0.2";
-       sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp";
+       version = "0.2.1.0";
+       sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Standard properties for functions on `Validity` types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-scientific" = callPackage
@@ -80235,25 +79394,6 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.1.0.0";
-       sha256 = "18b66syzkh3y08mdi1jn5kr2488s2b9n17v60cc98jwf41mbncgj";
-       libraryHaskellDepends = [
-         base genvalidity QuickCheck scientific validity validity-scientific
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec QuickCheck scientific
-       ];
-       description = "GenValidity support for Scientific";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-scientific_0_2_0_1" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, scientific, validity, validity-scientific
-     }:
-     mkDerivation {
-       pname = "genvalidity-scientific";
        version = "0.2.0.1";
        sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn";
        libraryHaskellDepends = [
@@ -80264,7 +79404,6 @@ self: {
        ];
        description = "GenValidity support for Scientific";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-text" = callPackage
@@ -80273,27 +79412,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.4.0.0";
-       sha256 = "1vdc1x1nhn7f3jmiamr7v3hwrycfksr03ps93dap80vpv0rkd6vn";
-       libraryHaskellDepends = [
-         array base genvalidity QuickCheck text validity validity-text
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec QuickCheck text
-       ];
-       description = "GenValidity support for Text";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-text_0_5_0_1" = callPackage
-    ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, text, validity, validity-text
-     }:
-     mkDerivation {
-       pname = "genvalidity-text";
-       version = "0.5.0.1";
-       sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw";
+       version = "0.5.0.2";
+       sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -80302,7 +79422,6 @@ self: {
        ];
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-time" = callPackage
@@ -80311,32 +79430,14 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.1.0.1";
-       sha256 = "1d9j6scv83kzxk4jngmad4i0843lm2bkr7yq4qsdbxpsj6akkdrg";
-       libraryHaskellDepends = [
-         base genvalidity QuickCheck time validity-time
-       ];
-       testHaskellDepends = [ base genvalidity-hspec hspec time ];
-       description = "GenValidity support for time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-time_0_2_0_2" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, time, validity-time
-     }:
-     mkDerivation {
-       pname = "genvalidity-time";
-       version = "0.2.0.2";
-       sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1";
+       version = "0.2.1.0";
+       sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
@@ -80346,27 +79447,6 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.1.0.0";
-       sha256 = "12pkwy161byi04kgiirk47s4zr8j718il4m73xl22vl06q9c7yp8";
-       libraryHaskellDepends = [
-         base genvalidity hashable QuickCheck unordered-containers validity
-         validity-unordered-containers
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec unordered-containers
-       ];
-       description = "GenValidity support for unordered-containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-unordered-containers_0_2_0_3" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
-     , hspec, QuickCheck, unordered-containers, validity
-     , validity-unordered-containers
-     }:
-     mkDerivation {
-       pname = "genvalidity-unordered-containers";
        version = "0.2.0.3";
        sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd";
        libraryHaskellDepends = [
@@ -80378,7 +79458,6 @@ self: {
        ];
        description = "GenValidity support for unordered-containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-uuid" = callPackage
@@ -80387,27 +79466,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-uuid";
-       version = "0.0.0.0";
-       sha256 = "1dd90ym534b5dwvdvrxx1q0cfv8f3bf834df2smbyps6n2dlny5b";
-       libraryHaskellDepends = [
-         base genvalidity QuickCheck uuid validity validity-uuid
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec QuickCheck uuid
-       ];
-       description = "GenValidity support for UUID";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-uuid_0_1_0_1" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, uuid, validity, validity-uuid
-     }:
-     mkDerivation {
-       pname = "genvalidity-uuid";
-       version = "0.1.0.1";
-       sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6";
+       version = "0.1.0.2";
+       sha256 = "04pladdynmjdcd553cp44nli7k5hxp82rlpyihi1ynm7q3glndfi";
        libraryHaskellDepends = [
          base genvalidity QuickCheck uuid validity validity-uuid
        ];
@@ -80416,7 +79476,6 @@ self: {
        ];
        description = "GenValidity support for UUID";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-vector" = callPackage
@@ -80425,27 +79484,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-vector";
-       version = "0.1.0.0";
-       sha256 = "1ii07ywx0j5b7dgihfi1micjcp7r8x9dp0b0yzm31ajvkpqc83lr";
-       libraryHaskellDepends = [
-         base genvalidity QuickCheck validity validity-vector vector
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec vector
-       ];
-       description = "GenValidity support for vector";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-vector_0_2_0_1" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, validity, validity-vector, vector
-     }:
-     mkDerivation {
-       pname = "genvalidity-vector";
-       version = "0.2.0.1";
-       sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n";
+       version = "0.2.0.2";
+       sha256 = "0f1ycxpvi6jmwakfs26ydzwd8gw8qzlybr2v1ppyvvjn6a7rilhi";
        libraryHaskellDepends = [
          base genvalidity QuickCheck validity validity-vector vector
        ];
@@ -80454,7 +79494,6 @@ self: {
        ];
        description = "GenValidity support for vector";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geo-resolver" = callPackage
@@ -80546,8 +79585,8 @@ self: {
      }:
      mkDerivation {
        pname = "geodetics";
-       version = "0.0.5";
-       sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq";
+       version = "0.0.6";
+       sha256 = "0hp5p6m6szj1h5hzmrs3pyj4cfvcvkgdc95s5xa0lcxc3z8bn7g2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
@@ -80556,7 +79595,6 @@ self: {
        ];
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geohash" = callPackage
@@ -80935,7 +79973,6 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-datasize" = callPackage
@@ -81032,8 +80069,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events";
-       version = "0.7.2";
-       sha256 = "1gzz71b0xnrri85pz5jl5ar0pyr13gbq31xll1iwv3s45bvl65mh";
+       version = "0.7.3";
+       sha256 = "13na5pkmid2jg9ivav62x5dzbcacwl4lcsqd7i7brg4h95iqnmpd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81214,6 +80251,7 @@ self: {
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-justdoit" = callPackage
@@ -81460,6 +80498,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_3" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.3";
+       sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -81514,6 +80574,7 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-server" = callPackage
@@ -81597,6 +80658,7 @@ self: {
        testHaskellDepends = [ base directory filepath ghc ghc-paths ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-syntax-highlighter" = callPackage
@@ -81611,30 +80673,17 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Syntax highlighter for Haskell using lexer of GHC itself";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
-       version = "0.2.5";
-       sha256 = "0xkq24dr2div9d9hr4rpz65968syqjignn9xn5q48vmzh1m1xwws";
-       libraryHaskellDepends = [ base ghc ];
-       description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-tcplugins-extra_0_3" = callPackage
-    ({ mkDerivation, base, ghc }:
-     mkDerivation {
-       pname = "ghc-tcplugins-extra";
        version = "0.3";
        sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
@@ -81687,10 +80736,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-extra";
-       version = "0.2.4";
-       sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg";
-       revision = "1";
-       editedCabalFile = "1ysf5mr85877a995951wjdg633ylrbpqhpqnn27yb6ayimky5z7a";
+       version = "0.2.5";
+       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
        libraryHaskellDepends = [
          base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise integer-gmp transformers
@@ -81703,15 +80750,15 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-typelits-extra_0_2_5" = callPackage
+  "ghc-typelits-extra_0_2_6" = callPackage
     ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
      , tasty, tasty-hunit, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-extra";
-       version = "0.2.5";
-       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
+       version = "0.2.6";
+       sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm";
        libraryHaskellDepends = [
          base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise integer-gmp transformers
@@ -81732,10 +80779,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.4.2";
-       sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr";
-       revision = "1";
-       editedCabalFile = "16x3i6js5z0qr1yw9pfpc7hwhb28djijas2pkx4idwp997mryjaj";
+       version = "0.5";
+       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -81747,15 +80792,15 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-typelits-knownnat_0_5" = callPackage
+  "ghc-typelits-knownnat_0_5_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.5";
-       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
+       version = "0.5.1";
+       sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -81770,30 +80815,28 @@ self: {
 
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell
+     , tasty-hunit, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.5.10";
-       sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny";
-       revision = "1";
-       editedCabalFile = "1d4j47glcw0xvdr6sgr221rfpjs48bijx5c5hyqqz6jfp0164grr";
+       version = "0.6.1";
+       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
        libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp
+         base ghc ghc-tcplugins-extra integer-gmp transformers
        ];
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-typelits-natnormalise_0_6_1" = callPackage
+  "ghc-typelits-natnormalise_0_6_2" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.6.1";
-       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
+       version = "0.6.2";
+       sha256 = "04a338yfcl6jm1daax08zsy03myii4llzih4mlprkyid8i0yn740";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp transformers
        ];
@@ -81819,6 +80862,7 @@ self: {
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-usage" = callPackage
@@ -81833,6 +80877,7 @@ self: {
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-vis" = callPackage
@@ -81968,32 +81013,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.6.10";
-       sha256 = "1qqd619pwdlcxvkgfawsqq19a5kl1584ra35ib8769874i6y9awj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base cmdargs directory extra filepath process time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process terminal-size time unix
-       ];
-       testHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process tasty tasty-hunit terminal-size time unix
-       ];
-       description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghcid_0_7" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
-     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
-     , terminal-size, time, unix
-     }:
-     mkDerivation {
-       pname = "ghcid";
        version = "0.7";
        sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg";
        isLibrary = true;
@@ -82011,7 +81030,6 @@ self: {
        ];
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-ajax" = callPackage
@@ -82032,40 +81050,24 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-base-stub";
-       version = "0.1.0.4";
-       sha256 = "1a0jmckbz3346h7mvi1b0r9jx2w1yli3lw9xh4cnqyv7pfcjpar7";
-       libraryHaskellDepends = [
-         aeson attoparsec base containers deepseq ghc-prim primitive
-         scientific text transformers unordered-containers vector
-       ];
-       description = "Allow GHCJS projects to compile under GHC and develop using intero";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghcjs-base-stub_0_2_0_0" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, containers, deepseq
-     , ghc-prim, primitive, scientific, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "ghcjs-base-stub";
        version = "0.2.0.0";
        sha256 = "05k59a6jg1a5s8zvqfah5rvm5kg34sqpv2zx4chczihx3n9prfv7";
+       revision = "1";
+       editedCabalFile = "0hvmgwyhv28d39was8bm52anwqh6x4mbd1mzzqxazlm0d0l8bpwp";
        libraryHaskellDepends = [
          aeson attoparsec base containers deepseq ghc-prim primitive
          scientific text transformers unordered-containers vector
        ];
        description = "Allow GHCJS projects to compile under GHC and develop using intero";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-codemirror" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghcjs-codemirror";
-       version = "0.0.0.1";
-       sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
+       version = "0.0.0.2";
+       sha256 = "15r09fdx6q3l8jk8k0hziw9hzvdj7p9jssj8nx78fjkdkxj2rfvc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Installs CodeMirror JavaScript files";
@@ -82192,6 +81194,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -82349,7 +81352,6 @@ self: {
        doHaddock = false;
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
@@ -82374,7 +81376,6 @@ self: {
        '';
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
@@ -82395,7 +81396,6 @@ self: {
        doHaddock = false;
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdbusmenu-glib;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -82418,7 +81418,6 @@ self: {
        doHaddock = false;
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
@@ -82441,7 +81440,6 @@ self: {
        doHaddock = false;
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gdkpixbuf" = callPackage
@@ -82462,7 +81460,6 @@ self: {
        doHaddock = false;
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-gdkx11" = callPackage
@@ -82483,7 +81480,6 @@ self: {
        doHaddock = false;
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-ggit" = callPackage
@@ -82504,7 +81500,6 @@ self: {
        doHaddock = false;
        description = "libgit2-glib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -82525,7 +81520,6 @@ self: {
        doHaddock = false;
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
@@ -82546,7 +81540,6 @@ self: {
        doHaddock = false;
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "gi-glib" = callPackage
@@ -82556,8 +81549,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.16";
-       sha256 = "03hl5szq0cyzg37kxh4kyxzciibs4grsypf78ihfsa6nvj4n5fqw";
+       version = "2.0.17";
+       sha256 = "0rxbkrwlwnjf46z0qpw0vjw1nv9kl91xp7k2098rqs36kl5bwylx";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -82567,7 +81560,6 @@ self: {
        doHaddock = false;
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
@@ -82588,7 +81580,6 @@ self: {
        doHaddock = false;
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
@@ -82609,7 +81600,6 @@ self: {
        doHaddock = false;
        description = "GStreamer bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -82630,7 +81620,6 @@ self: {
        doHaddock = false;
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
@@ -82651,7 +81640,6 @@ self: {
        doHaddock = false;
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -82716,7 +81704,6 @@ self: {
        doHaddock = false;
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -82739,7 +81726,6 @@ self: {
        doHaddock = false;
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gtk-hs" = callPackage
@@ -82757,7 +81743,6 @@ self: {
        ];
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -82801,7 +81786,6 @@ self: {
        doHaddock = false;
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
@@ -82864,7 +81848,7 @@ self: {
        doHaddock = false;
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -82889,7 +81873,6 @@ self: {
        '';
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-pangocairo" = callPackage
@@ -82915,7 +81898,6 @@ self: {
        '';
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-poppler" = callPackage
@@ -82957,7 +81939,6 @@ self: {
        doHaddock = false;
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) libsecret;};
 
   "gi-soup" = callPackage
@@ -82978,7 +81959,6 @@ self: {
        doHaddock = false;
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) libsoup;};
 
   "gi-vte" = callPackage
@@ -83072,6 +82052,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkitgtk-web-extension = null;};
 
+  "gi-wnck" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-gdk, gi-gdkpixbuf, gi-gobject, gi-gtk, haskell-gi
+     , haskell-gi-base, haskell-gi-overloading, libwnck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-wnck";
+       version = "3.0.1";
+       sha256 = "06l1gqnznpa7rgimk1l49i3yfzdaawb26vqz3baswrksmi9mhrhh";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject
+         gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ libwnck ];
+       doHaddock = false;
+       description = "Wnck bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.gnome2) libwnck;};
+
   "gi-xlib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers, x11
@@ -83089,7 +82092,6 @@ self: {
        doHaddock = false;
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) x11;};
 
   "giak" = callPackage
@@ -83152,6 +82154,7 @@ self: {
        ];
        description = "An implementation of the Jinja2 template language in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ginsu" = callPackage
@@ -83242,7 +82245,6 @@ self: {
        ];
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -83285,6 +82287,7 @@ self: {
        doCheck = false;
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-all" = callPackage
@@ -83303,38 +82306,34 @@ self: {
        ];
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, aws, base, blaze-builder
-     , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
-     , clientsession, concurrent-output, conduit, containers, crypto-api
-     , cryptonite, curl, data-default, DAV, dbus, directory
-     , disk-free-space, dlist, dns, edit-distance, esqueleto, exceptions
-     , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger
-     , http-client, http-conduit, http-types, IfElse, lsof, magic
+    ({ mkDerivation, aeson, async, base, bloomfilter, bup, byteable
+     , bytestring, Cabal, case-insensitive, concurrent-output, conduit
+     , connection, containers, crypto-api, cryptonite, curl
+     , data-default, DAV, dbus, directory, disk-free-space, dlist, dns
+     , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
+     , free, git, gnupg, hinotify, hslogger, http-client
+     , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
      , memory, monad-control, monad-logger, mountpoints, mtl, network
      , network-info, network-multicast, network-uri, old-locale, openssh
-     , optparse-applicative, path-pieces, perl, persistent
-     , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
-     , template-haskell, text, time, torrent, transformers, unix
-     , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
-     , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
-     , yesod-form, yesod-static
+     , optparse-applicative, perl, persistent, persistent-sqlite
+     , persistent-template, process, QuickCheck, random, regex-tdfa
+     , resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split
+     , stm, stm-chans, tagsoup, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-rerun, text, time, torrent, transformers, unix, unix-compat
+     , unordered-containers, utf8-string, uuid, vector, wget, which
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180529";
-       sha256 = "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5";
+       version = "6.20180626";
+       sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
-         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
-         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
-         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-f-webapp"
+         "-f-webapp-secure" "-fwebdav" "-fxmpp"
        ];
        isLibrary = false;
        isExecutable = true;
@@ -83343,21 +82342,19 @@ self: {
          hslogger IfElse process split unix-compat utf8-string
        ];
        executableHaskellDepends = [
-         aeson async aws base blaze-builder bloomfilter byteable bytestring
-         case-insensitive clientsession concurrent-output conduit containers
-         crypto-api cryptonite data-default DAV dbus directory
-         disk-free-space dlist dns edit-distance esqueleto exceptions
-         fdo-notify feed filepath free hinotify hslogger http-client
-         http-conduit http-types IfElse magic memory monad-control
-         monad-logger mountpoints mtl network network-info network-multicast
-         network-uri old-locale optparse-applicative path-pieces persistent
-         persistent-sqlite persistent-template process QuickCheck random
-         regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
-         socks split stm stm-chans tagsoup tasty tasty-hunit
-         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         aeson async base bloomfilter byteable bytestring case-insensitive
+         concurrent-output conduit connection containers crypto-api
+         cryptonite data-default DAV dbus directory disk-free-space dlist
+         dns edit-distance esqueleto exceptions fdo-notify feed filepath
+         free hinotify hslogger http-client http-client-tls http-conduit
+         http-types IfElse magic memory monad-control monad-logger
+         mountpoints mtl network network-info network-multicast network-uri
+         old-locale optparse-applicative persistent persistent-sqlite
+         persistent-template process QuickCheck random regex-tdfa resourcet
+         SafeSemaphore sandi securemem socks split stm stm-chans tagsoup
+         tasty tasty-hunit tasty-quickcheck tasty-rerun text time torrent
          transformers unix unix-compat unordered-containers utf8-string uuid
-         vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
-         yesod-static
+         vector
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -83498,7 +82495,6 @@ self: {
        ];
        description = "A Git subcommand to show total addition, deletion per file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-gpush" = callPackage
@@ -83552,6 +82548,7 @@ self: {
        ];
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-monitor" = callPackage
@@ -83668,7 +82665,6 @@ self: {
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitHUD" = callPackage
@@ -83727,6 +82723,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "githash" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , process, template-haskell, temporary
+     }:
+     mkDerivation {
+       pname = "githash";
+       version = "0.1.0.0";
+       sha256 = "183f1kbyvcikvm2damm7radhimhlhgnblcvw5j2s794x2h4akcci";
+       libraryHaskellDepends = [
+         base bytestring directory filepath process template-haskell
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec process template-haskell
+         temporary
+       ];
+       description = "Compile git revision info into Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
@@ -83741,8 +82757,8 @@ self: {
        pname = "github";
        version = "0.19";
        sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph";
-       revision = "2";
-       editedCabalFile = "0ib40npsrwd92mgiqv5rqv21dnhmdh5x6ql84i8ivz8vs2a43hqq";
+       revision = "3";
+       editedCabalFile = "0s3zmkzgfbh1mc0492i7rjiawxkzg0im8z2p10niv5ff58m87yri";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -83785,7 +82801,6 @@ self: {
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -83835,31 +82850,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "1.1.6";
-       sha256 = "1amvbrs7sb6d2l20rr4qc8gjj6m9xlhgkbrr13nrnjfg5fg0midn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_2_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.2.0";
-       sha256 = "0rfg0l5f0g1qdpvj5xsynxkkwgdaxnsphrif02fk48khhad0i4p9";
+       version = "1.2.1";
+       sha256 = "1q01yk6nl60iylsqzz1gzg3q1gpjn6bi13p5lddx1z5hd6hri80h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83872,7 +82864,6 @@ self: {
        ];
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -83940,6 +82931,7 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -83958,6 +82950,7 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-webhooks" = callPackage
@@ -83967,24 +82960,6 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhooks";
-       version = "0.9.1";
-       sha256 = "1h4wqix0rgsq7n3dv3nraqa3sbf5hgavq5k9dymfnw68qz5ii68b";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite deepseq
-         deepseq-generics memory text time vector
-       ];
-       testHaskellDepends = [ aeson base bytestring hspec text vector ];
-       description = "Aeson instances for GitHub Webhook payloads";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-webhooks_0_10_0" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
-     , vector
-     }:
-     mkDerivation {
-       pname = "github-webhooks";
        version = "0.10.0";
        sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8";
        libraryHaskellDepends = [
@@ -83994,7 +82969,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
        description = "Aeson instances for GitHub Webhook payloads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "githud" = callPackage
@@ -84071,6 +83045,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gitlab-api" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-conduit, http-types
+     , microlens-platform, rio, yaml
+     }:
+     mkDerivation {
+       pname = "gitlab-api";
+       version = "0.0.0.2";
+       sha256 = "1lfwsqhncj3sp7h6ixmm0yv9vnby9qfi2y4q980d9d473mzvy7rv";
+       libraryHaskellDepends = [
+         aeson base http-conduit http-types microlens-platform rio yaml
+       ];
+       testHaskellDepends = [ base hspec rio ];
+       description = "Gitlab Web API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gitlib" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, conduit
      , conduit-combinators, containers, directory, exceptions, filepath
@@ -84089,7 +83080,6 @@ self: {
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cmdline" = callPackage
@@ -84117,7 +83107,6 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -84209,7 +83198,6 @@ self: {
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-test" = callPackage
@@ -84332,7 +83320,6 @@ self: {
        ];
        description = "CLI Giphy search tool with previews in iTerm 2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gjk" = callPackage
@@ -84397,8 +83384,8 @@ self: {
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.3.5";
-       sha256 = "0n3mqpcmxz9z339r18dac5s4zdgkknlx470cd1mfi9gd932cr4z9";
+       version = "0.3.6";
+       sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -84505,17 +83492,23 @@ self: {
      }) {};
 
   "glazier" = callPackage
-    ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
-     , transformers
+    ({ mkDerivation, alternators, base, data-diverse, data-diverse-lens
+     , dlist, lens, mtl, stm, tagged, transformers, unliftio
+     , unliftio-core
      }:
      mkDerivation {
        pname = "glazier";
-       version = "0.11.0.1";
-       sha256 = "0ihbnrbpizjdsqbryqgxl1gwg3343ip9yc9vzhchn523g4f06l8i";
+       version = "1.0.0.0";
+       sha256 = "193igffdh2sdb8sharv7ycxj0daxii2x2n0c53kbz6cbwi865ig9";
        libraryHaskellDepends = [
-         base lens mmorph mtl semigroupoids transformers
+         alternators base data-diverse data-diverse-lens dlist lens mtl
+         transformers unliftio unliftio-core
        ];
-       description = "Composable widgets framework with enhanced with transformers and lens";
+       testHaskellDepends = [
+         alternators base data-diverse data-diverse-lens dlist lens mtl stm
+         tagged transformers unliftio unliftio-core
+       ];
+       description = "Extensible effects using ContT, State and variants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84532,27 +83525,26 @@ self: {
        ];
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react" = callPackage
-    ({ mkDerivation, base, containers, deepseq, disposable, dlist, free
-     , ghcjs-base-stub, glazier, javascript-extras, lens, mmorph, mtl
-     , pipes-concurrency, profunctors, semigroupoids, stm, text
-     , transformers, unordered-containers
+    ({ mkDerivation, alternators, base, containers, data-diverse
+     , data-diverse-lens, deepseq, dlist, ghcjs-base-stub, glazier
+     , javascript-extras, lens, lens-misc, mtl, newtype-generics, stm
+     , tagged, transformers, unliftio, unliftio-core
      }:
      mkDerivation {
        pname = "glazier-react";
-       version = "0.6.0.0";
-       sha256 = "06myq4g4g4n61l601848irqjribrlq3f4wa9cqkzl19wbfsxbdsp";
+       version = "1.0.0.0";
+       sha256 = "07srw64bmjhyhc8vvp4qc21smi7h7dmxkcj0ks650clbvh6g5887";
        libraryHaskellDepends = [
-         base containers deepseq disposable dlist free ghcjs-base-stub
-         glazier javascript-extras lens mmorph mtl pipes-concurrency
-         profunctors semigroupoids stm text transformers
-         unordered-containers
+         alternators base containers data-diverse data-diverse-lens deepseq
+         dlist ghcjs-base-stub glazier javascript-extras lens lens-misc mtl
+         newtype-generics stm tagged transformers unliftio unliftio-core
        ];
-       description = "ReactJS binding using Glazier and Pipes.Fluid";
+       description = "ReactJS binding using Glazier.Command.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -84565,6 +83557,8 @@ self: {
        pname = "glazier-react-examples";
        version = "0.6.0.0";
        sha256 = "1a1abb24kfnfqvgrxs8hfpxgfyhiqwc13pgdpsq6rk0c1ys9vhzm";
+       revision = "1";
+       editedCabalFile = "141zbnixssldmfq12sh0i8i2mwr1kv9m5n2l63p50qlmzrqx4nqx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84579,22 +83573,22 @@ self: {
      }) {};
 
   "glazier-react-widget" = callPackage
-    ({ mkDerivation, base, containers, disposable, dlist, free
-     , ghcjs-base-stub, glazier, glazier-react, javascript-extras, lens
-     , mmorph, mtl, pipes-concurrency, stm, transformers
+    ({ mkDerivation, base, containers, data-diverse, data-diverse-lens
+     , deepseq, Diff, dlist, ghcjs-base-stub, glazier, glazier-react
+     , javascript-extras, lens, lens-misc, monadlist, mtl, tagged
+     , transformers
      }:
      mkDerivation {
        pname = "glazier-react-widget";
-       version = "0.6.0.0";
-       sha256 = "1b7ywbyv2maqk8fdxx7g847gh5i25rsxyjy458ysy9gydswngrla";
+       version = "1.0.0.0";
+       sha256 = "1ac7ybkdi4zafdrhs7sv0db3x5lfalj3ny13rlix8r12bf24mxs0";
        libraryHaskellDepends = [
-         base containers disposable dlist free ghcjs-base-stub glazier
-         glazier-react javascript-extras lens mmorph mtl pipes-concurrency
-         stm transformers
+         base containers data-diverse data-diverse-lens deepseq Diff dlist
+         ghcjs-base-stub glazier glazier-react javascript-extras lens
+         lens-misc monadlist mtl tagged transformers
        ];
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gli" = callPackage
@@ -84695,8 +83689,8 @@ self: {
        pname = "glirc";
        version = "2.26";
        sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0";
-       revision = "1";
-       editedCabalFile = "0wbkapxwzlmjcmkp6inm2xj6bghd8nl4a4ddljizm6xvwcpvp75j";
+       revision = "2";
+       editedCabalFile = "0fwyd1xvz11b1433lw0c9rb8md1f87mg9kinq3hrfq8jjmaws478";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -84711,6 +83705,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gll" = callPackage
@@ -84726,6 +83721,7 @@ self: {
        ];
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glob-posix" = callPackage
@@ -84855,23 +83851,6 @@ self: {
      }:
      mkDerivation {
        pname = "gloss";
-       version = "1.11.1.1";
-       sha256 = "0lyns4jzh4najgbavlhalix6br1dc0smqrakj46ls30jp909bq0l";
-       revision = "1";
-       editedCabalFile = "1bxdf2kmdcqndg25jgh0l1bmr39795gxrcx0rgzcich4n8l88pvb";
-       libraryHaskellDepends = [
-         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
-       ];
-       description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss_1_12_0_0" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
-     , gloss-rendering, GLUT, OpenGL
-     }:
-     mkDerivation {
-       pname = "gloss";
        version = "1.12.0.0";
        sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9";
        libraryHaskellDepends = [
@@ -84879,7 +83858,6 @@ self: {
        ];
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -84897,25 +83875,11 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, gloss }:
      mkDerivation {
        pname = "gloss-algorithms";
-       version = "1.11.1.1";
-       sha256 = "1wi3mrx8wzmsjz8al284rzgpsn9z77yw9l8p802hbld2hwf5d9z1";
-       revision = "1";
-       editedCabalFile = "08w84grwvl079gzjwnshfgs12kh1p2gbc5kvbw6qdxc7g292hd5m";
-       libraryHaskellDepends = [ base containers ghc-prim gloss ];
-       description = "Data structures and algorithms for working with 2D graphics";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss-algorithms_1_12_0_0" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, gloss }:
-     mkDerivation {
-       pname = "gloss-algorithms";
        version = "1.12.0.0";
        sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-banana" = callPackage
@@ -84961,7 +83925,6 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-game" = callPackage
@@ -85000,23 +83963,6 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-raster";
-       version = "1.11.1.1";
-       sha256 = "0ikwg3ckq82qysbc3jisvxylcq13x7cnwyci6gi6dys64vmrfy17";
-       revision = "1";
-       editedCabalFile = "1kx0n4kwy5xdg4b5b79a815y8yqcsld8s5p784qhgg92s0cmnsjf";
-       libraryHaskellDepends = [
-         base containers ghc-prim gloss gloss-rendering repa
-       ];
-       description = "Parallel rendering of raster images";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss-raster_1_12_0_0" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
-     , repa
-     }:
-     mkDerivation {
-       pname = "gloss-raster";
        version = "1.12.0.0";
        sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8";
        libraryHaskellDepends = [
@@ -85024,7 +83970,6 @@ self: {
        ];
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -85049,21 +83994,6 @@ self: {
     ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
      mkDerivation {
        pname = "gloss-rendering";
-       version = "1.11.1.1";
-       sha256 = "1x2a8w49ik4w03wzf31icqbpr7fds9a1c7w263xwpm1445nrl2hz";
-       revision = "1";
-       editedCabalFile = "1z580vh4idsbndjjla6gniz8cacxwj9206llyafl83brrqjhm14b";
-       libraryHaskellDepends = [
-         base bmp bytestring containers GLUT OpenGL
-       ];
-       description = "Gloss picture data types and rendering functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss-rendering_1_12_0_0" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
-     mkDerivation {
-       pname = "gloss-rendering";
        version = "1.12.0.0";
        sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0";
        libraryHaskellDepends = [
@@ -85071,7 +84001,6 @@ self: {
        ];
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-sodium" = callPackage
@@ -85097,6 +84026,7 @@ self: {
        librarySystemDepends = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glpk;};
 
   "glue" = callPackage
@@ -85232,6 +84162,7 @@ self: {
        ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gmap" = callPackage
@@ -85270,12 +84201,12 @@ self: {
      }) {};
 
   "gmpint" = callPackage
-    ({ mkDerivation, base, gmp }:
+    ({ mkDerivation, base, gmp, micro-recursion-schemes }:
      mkDerivation {
        pname = "gmpint";
-       version = "0.1.0.14";
-       sha256 = "08a3ksaq1xx8w153v0xd5k7g2b65wgkr1jshj7533pkg59s8zdxs";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.1.1";
+       sha256 = "02zr0acsf7zpyl369c9063qp6dgpblcb73q2m9fwz63ya58ixbk4";
+       libraryHaskellDepends = [ base micro-recursion-schemes ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
        license = stdenv.lib.licenses.bsd3;
@@ -85339,8 +84270,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.44";
-       sha256 = "11khp73xa1vy6w5plk644ksgv47q6j4y3jmxds6iv90mqv47z0al";
+       version = "0.3.52";
+       sha256 = "00ixm0pvi4d7512lxk3qyl3vnb8c5x3n23mblmbw66f4hvn8x88g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85379,6 +84310,7 @@ self: {
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -85636,7 +84568,6 @@ self: {
        ];
        description = "`goggles` interface to Google Cloud Storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol" = callPackage
@@ -86987,6 +85918,7 @@ self: {
        ];
        description = "Client for the Google Cloud APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-dictionary" = callPackage
@@ -87066,15 +85998,14 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.4.0.0";
-       sha256 = "1n8zdmm9j8ghd73i0ph8llzbb4bmkni05r16zvs9rfs6ii126bg3";
+       version = "0.4.0.1";
+       sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
        ];
        description = "Google Maps Geocoding API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -87141,21 +86072,6 @@ self: {
      }:
      mkDerivation {
        pname = "google-oauth2-jwt";
-       version = "0.2.2";
-       sha256 = "0alvq0sxmzi1mxc7bahwxydbgmhp8hva0w8p9h6cb1fh2vam5p1q";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
-       ];
-       description = "Get a signed JWT for Google Service Accounts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "google-oauth2-jwt_0_3_0" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
-     , RSA, text, unix-time
-     }:
-     mkDerivation {
-       pname = "google-oauth2-jwt";
        version = "0.3.0";
        sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj";
        libraryHaskellDepends = [
@@ -87163,7 +86079,6 @@ self: {
        ];
        description = "Get a signed JWT for Google Service Accounts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-search" = callPackage
@@ -87209,8 +86124,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.5.0.1";
-       sha256 = "10yzb9blgiya4b4cfd63i4367d71apxc71m0bff6bcp6aq01fw66";
+       version = "0.5.0.2";
+       sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory network-uri
@@ -87218,7 +86133,6 @@ self: {
        ];
        description = "Bindings to the Google Static Maps API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -87235,7 +86149,6 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "googleplus" = callPackage
@@ -87330,6 +86243,7 @@ self: {
        ];
        description = "Core of FRP game engine called Gore&Ash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-actor" = callPackage
@@ -87452,6 +86366,7 @@ self: {
        ];
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-network" = callPackage
@@ -87530,6 +86445,7 @@ self: {
        ];
        description = "A command line utility for practicing typing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpah" = callPackage
@@ -87687,6 +86603,7 @@ self: {
        ];
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grakn" = callPackage
@@ -87774,6 +86691,7 @@ self: {
        ];
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -87789,6 +86707,7 @@ self: {
        ];
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -87800,6 +86719,7 @@ self: {
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -87816,6 +86736,7 @@ self: {
        ];
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -87836,6 +86757,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "graph" = callPackage
+    ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck }:
+     mkDerivation {
+       pname = "graph";
+       version = "0.0.0.0";
+       sha256 = "1v94nii7q6smm37m3yk390mcxpa69qclxqqdzcmay8f096dzk3pd";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Class of graphs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "graph-core" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl
      , QuickCheck, safe, unordered-containers, vector
@@ -87862,8 +86795,8 @@ self: {
      }:
      mkDerivation {
        pname = "graph-generators";
-       version = "0.1.3.0";
-       sha256 = "0l1xc09zpxxdv31ba09l24ayazcfnzzz1b3z8vd1hay5nw99gq0z";
+       version = "0.1.4.0";
+       sha256 = "1wqxkykg9q8dwk7gbx63501n58pr8drsnyfpg64faggrr72c1c5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88255,6 +87188,7 @@ self: {
        ];
        description = "Present the module dependencies of a program as a \"dot\" graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphql" = callPackage
@@ -88303,6 +87237,8 @@ self: {
        pname = "graphs";
        version = "0.7.1";
        sha256 = "02g21jpz8jm8j1kpszk8vglw1733z2jp32dc650z40nxlmxpmlxc";
+       revision = "1";
+       editedCabalFile = "1cjyxswlkachki6l4mcaffwpjajyx86jzipzlqjg7c080vwvb19g";
        libraryHaskellDepends = [
          array base containers transformers transformers-compat void
        ];
@@ -88341,9 +87277,9 @@ self: {
 
   "graphviz" = callPackage
     ({ mkDerivation, base, bytestring, colour, containers, criterion
-     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, hspec
-     , hspec-discover, mtl, polyparse, process, QuickCheck, temporary
-     , text, wl-pprint-text
+     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz
+     , hspec, hspec-discover, mtl, polyparse, process, QuickCheck
+     , temporary, text, wl-pprint-text
      }:
      mkDerivation {
        pname = "graphviz";
@@ -88359,10 +87295,11 @@ self: {
          base containers fgl fgl-arbitrary filepath hspec hspec-discover
          QuickCheck text
        ];
+       testSystemDepends = [ graphviz ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) graphviz;};
 
   "graql" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit
@@ -88432,6 +87369,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gray-extended" = callPackage
@@ -88604,15 +87542,15 @@ self: {
   "greskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
      , greskell-core, hint, hspec, semigroups, text, transformers
-     , unordered-containers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "greskell";
-       version = "0.1.1.0";
-       sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi";
+       version = "0.2.0.2";
+       sha256 = "01nzqyk0flj4p87iin9ggvy61csvxcnby9phczahqbc0m9v5pi3h";
        libraryHaskellDepends = [
          aeson base greskell-core semigroups text transformers
-         unordered-containers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring doctest doctest-discover greskell-core hint
@@ -88624,21 +87562,48 @@ self: {
      }) {};
 
   "greskell-core" = callPackage
-    ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec
-     , QuickCheck, scientific, semigroups, text, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "greskell-core";
-       version = "0.1.1.0";
-       sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0";
+       version = "0.1.2.1";
+       sha256 = "1w3rzgkrdd62v734k4pap46780wz9q8fnr0apjvcdzga7h2685hs";
        libraryHaskellDepends = [
-         aeson base scientific semigroups text unordered-containers
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
        ];
        testHaskellDepends = [
-         aeson base doctest doctest-discover hspec QuickCheck text
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
        ];
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "greskell-websocket" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+     , unordered-containers, uuid, vector, websockets
+     }:
+     mkDerivation {
+       pname = "greskell-websocket";
+       version = "0.1.0.0";
+       sha256 = "171pr07dlsvkmj0jqr60dc6a4g8sfqaz0hvwwfagzklg31m961mq";
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring greskell-core
+         hashtables safe-exceptions stm text unordered-containers uuid
+         vector websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring greskell-core hspec unordered-containers uuid
+         vector
+       ];
+       description = "Haskell client for Gremlin Server using WebSocket serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grid" = callPackage
@@ -88839,6 +87804,7 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -88881,6 +87847,7 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-mysql" = callPackage
@@ -88898,6 +87865,7 @@ self: {
        ];
        description = "MySQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-postgresql" = callPackage
@@ -88917,6 +87885,7 @@ self: {
        ];
        description = "PostgreSQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-sqlite" = callPackage
@@ -88934,6 +87903,7 @@ self: {
        ];
        description = "Sqlite3 backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-th" = callPackage
@@ -88950,6 +87920,7 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "group-by-date" = callPackage
@@ -89017,6 +87988,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -89194,7 +88166,6 @@ self: {
        librarySystemDepends = [ gssapi_krb5 krb5 ];
        description = "libgssapi and libkrb5 bindings for haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gssapi_krb5 = null; inherit (pkgs) krb5;};
 
   "gssapi-wai" = callPackage
@@ -89211,7 +88182,6 @@ self: {
        ];
        description = "WAI Middleware for SPNEGO authentiaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gstorable" = callPackage
@@ -89398,8 +88368,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.3.1";
-       sha256 = "1wsq7d47px11c64k38nqxms408yd4il35ai8r53p76qnd04s8saw";
+       version = "0.1.4.0";
+       sha256 = "1cxs2rgyjkjwz7y2n205pwqnji4c27k6ilx6prv9a5nsd0msr1h2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89415,7 +88385,6 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gtk-strut" = callPackage
@@ -89427,7 +88396,6 @@ self: {
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        description = "Libary for creating strut windows with gi-gtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-toggle-button-list" = callPackage
@@ -89793,6 +88761,7 @@ self: {
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gutenberg-fibonaccis" = callPackage
@@ -89826,8 +88795,8 @@ self: {
      }:
      mkDerivation {
        pname = "gym-http-api";
-       version = "0.1.0.0";
-       sha256 = "0id8npw9ziqibm0j5fqkjw7r75la2cd4zlyzsk90rpx2xf5xy20p";
+       version = "0.1.0.1";
+       sha256 = "0469n34s0p313nwnw8zpg1n9aaf6sqn5h7yl0jhc6yydc6rdjgrc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89839,7 +88808,6 @@ self: {
        ];
        description = "REST client to the gym-http-api project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "h-booru" = callPackage
@@ -90154,55 +89122,6 @@ self: {
      , containers, criterion, crypto-cipher-types, cryptonite, errors
      , hashable, incremental-parser, ixset-typed, lens, memory
      , monad-loops, nettle, network, network-uri, newtype
-     , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet
-     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, time-locale-compat, transformers, unliftio-core
-     , unordered-containers, wl-pprint-extras, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.6.2";
-       sha256 = "1jlhhil5ilsw4nzjwsmfppcsfg59w5hw7nxjba92dgm3bsicf1ln";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring
-         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
-         conduit conduit-extra containers crypto-cipher-types cryptonite
-         errors hashable incremental-parser ixset-typed lens memory
-         monad-loops nettle network-uri newtype openpgp-asciiarmor resourcet
-         semigroups split text time time-locale-compat transformers
-         unliftio-core unordered-containers wl-pprint-extras zlib
-       ];
-       testHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype QuickCheck quickcheck-instances
-         resourcet semigroups split tasty tasty-hunit tasty-quickcheck text
-         time time-locale-compat transformers unliftio-core
-         unordered-containers wl-pprint-extras zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype openpgp-asciiarmor resourcet semigroups
-         split text time time-locale-compat transformers unliftio-core
-         unordered-containers wl-pprint-extras zlib
-       ];
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hOpenPGP_2_7" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, base64-bytestring, bifunctors, binary
-     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite, errors
-     , hashable, incremental-parser, ixset-typed, lens, memory
-     , monad-loops, nettle, network, network-uri, newtype
      , openpgp-asciiarmor, prettyprinter, QuickCheck
      , quickcheck-instances, resourcet, semigroups, split, tasty
      , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
@@ -90243,7 +89162,6 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -90407,6 +89325,7 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hVOIDP" = callPackage
@@ -90937,30 +89856,6 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-db";
-       version = "2.0";
-       sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq";
-       revision = "1";
-       editedCabalFile = "1zsdy9c0gngl8k690311zchd3lhl7h64arab77p7v9j5bradziiq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers directory filepath tar time
-         utf8-string
-       ];
-       executableHaskellDepends = [
-         base bytestring Cabal containers utf8-string
-       ];
-       description = "Access Hackage's package database via Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "hackage-db_2_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , directory, filepath, tar, time, utf8-string
-     }:
-     mkDerivation {
-       pname = "hackage-db";
        version = "2.0.1";
        sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
        isLibrary = true;
@@ -90971,7 +89866,6 @@ self: {
        ];
        description = "Access Hackage's package database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -91098,7 +89992,6 @@ self: {
        ];
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security" = callPackage
@@ -91112,6 +90005,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.3.0";
        sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
+       revision = "1";
+       editedCabalFile = "0m0xhcivjqq6cwmhr60sva4qz2ciknyacv7dxpdiwbsl3kwyx9sz";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -91216,6 +90111,7 @@ self: {
        ];
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -91599,24 +90495,6 @@ self: {
      }) {};
 
   "haddock-library" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , hspec-discover, QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.4.5";
-       sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
-       testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doHaddock = false;
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haddock-library_1_5_0_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
      , QuickCheck, transformers, tree-diff
@@ -91636,7 +90514,6 @@ self: {
        doHaddock = false;
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-library_1_6_0" = callPackage
@@ -91702,26 +90579,26 @@ self: {
 
   "hadolint" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, gitrev, hspec, HUnit, language-docker
-     , optparse-applicative, parsec, ShellCheck, split, text, yaml
+     , filepath, gitrev, hspec, HUnit, language-docker, megaparsec, mtl
+     , optparse-applicative, ShellCheck, split, text, void, yaml
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.6.6";
-       sha256 = "13rkz6f5dzkh9qy674ia34ld25xwpylja2mivmwfsijh5pc5qvwq";
+       version = "1.10.2";
+       sha256 = "0x9szi43a4l7ii8qbhpgakln2ddaix5p42n39i08w8h54qbx6c08";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers language-docker parsec ShellCheck
-         split text
+         aeson base bytestring containers language-docker megaparsec mtl
+         ShellCheck split text void
        ];
        executableHaskellDepends = [
-         base directory filepath gitrev language-docker optparse-applicative
-         parsec yaml
+         base containers directory filepath gitrev language-docker
+         megaparsec optparse-applicative text yaml
        ];
        testHaskellDepends = [
-         aeson base bytestring hspec HUnit language-docker parsec ShellCheck
-         split
+         aeson base bytestring hspec HUnit language-docker megaparsec
+         ShellCheck split text
        ];
        description = "Dockerfile Linter JavaScript API";
        license = stdenv.lib.licenses.gpl3;
@@ -91764,6 +90641,7 @@ self: {
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -91867,6 +90745,7 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haiji" = callPackage
@@ -92341,7 +91220,6 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -92412,7 +91290,6 @@ self: {
        ];
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-series" = callPackage
@@ -92495,17 +91372,6 @@ self: {
      }) {};
 
   "half" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "half";
-       version = "0.2.2.3";
-       sha256 = "0p4sb7vv9cljv48wlx65wgdnkryrk5d6yfh7g4yrm20w1p449hl5";
-       libraryHaskellDepends = [ base ];
-       description = "Half-precision floating-point";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "half_0_3" = callPackage
     ({ mkDerivation, base, deepseq, hspec, QuickCheck, template-haskell
      }:
      mkDerivation {
@@ -92516,7 +91382,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halfs" = callPackage
@@ -92597,6 +91462,7 @@ self: {
        ];
        description = "Symmetry operations generater of Hall Symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma" = callPackage
@@ -92687,6 +91553,7 @@ self: {
        testHaskellDepends = [ base hedgehog lens ];
        description = "Splitting/combining data structures to/from halves, quarters, eighths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halvm-web" = callPackage
@@ -92722,29 +91589,6 @@ self: {
      }) {};
 
   "hamilton" = callPackage
-    ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers
-     , free, hmatrix, hmatrix-gsl, optparse-applicative
-     , typelits-witnesses, vector, vector-sized, vty
-     }:
-     mkDerivation {
-       pname = "hamilton";
-       version = "0.1.0.2";
-       sha256 = "1fhwvimqim9jj33wps42wsbwjz28h3waqn7wrwhqci307xbcib0m";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ad base comonad free hmatrix hmatrix-gsl typelits-witnesses
-         vector-sized
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base containers hmatrix optparse-applicative vector
-         vector-sized vty
-       ];
-       description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hamilton_0_1_0_3" = callPackage
     ({ mkDerivation, ad, ansi-wl-pprint, base, containers
      , finite-typelits, ghc-typelits-knownnat, hmatrix, hmatrix-gsl
      , hmatrix-vector-sized, optparse-applicative, typelits-witnesses
@@ -92767,7 +91611,6 @@ self: {
        ];
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamlet" = callPackage
@@ -92858,7 +91701,6 @@ self: {
        ];
        description = "Intel AMT serial-over-lan (SOL) client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamusic" = callPackage
@@ -93123,8 +91965,8 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.5.6";
-       sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c";
+       version = "0.3.5.7";
+       sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -93347,6 +92189,7 @@ self: {
        ];
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -93630,8 +92473,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-jmacro";
-       version = "7.0.12";
-       sha256 = "1bmffidqi784y1qwgqxncwcw6knklnkliznbdx66gjvkfccv9d5s";
+       version = "7.0.12.1";
+       sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
@@ -93697,8 +92540,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.5.1";
-       sha256 = "18cfkwffwfz410x9wjbciynbqs9srpzg60rappzx778lb33px1rj";
+       version = "7.5.1.1";
+       sha256 = "0qgx142xbig19j5j31b4vcgznzaw9c6fg4009vzp9yhvfbfnajk1";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -93784,7 +92627,6 @@ self: {
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-util" = callPackage
@@ -93886,6 +92728,7 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara" = callPackage
@@ -94151,6 +92994,7 @@ self: {
        ];
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harvest-api" = callPackage
@@ -94225,8 +93069,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.10";
-       sha256 = "1h1cz15x531y0h7ss79jbhziypjwwjl70w5hrpcljdfy1kkcgd2m";
+       version = "0.0.0.11";
+       sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr";
        libraryHaskellDepends = [
          base containers free hasbolt lens mtl neat-interpolation
          template-haskell text th-lift-instances
@@ -94485,6 +93329,7 @@ self: {
        libraryHaskellDepends = [ base hashable sorted-list time ];
        description = "Provides instances missing from Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-time" = callPackage
@@ -94791,6 +93636,7 @@ self: {
        ];
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskarrow" = callPackage
@@ -94895,14 +93741,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskeline_0_7_4_2" = callPackage
+  "haskeline_0_7_4_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , process, stm, terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
-       version = "0.7.4.2";
-       sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm";
+       version = "0.7.4.3";
+       sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
          base bytestring containers directory filepath process stm terminfo
@@ -95149,8 +93995,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-dap";
-       version = "0.0.5.0";
-       sha256 = "1sb6jqq1nfzaycr1cx4an5yaaad3k8ijig7ss0xa6wvjkyc37xqa";
+       version = "0.0.6.0";
+       sha256 = "1w14vz2fgj90lx6w7w93zk9blmafpyv32gxzz7pm5fwnbrr07ds2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -95183,8 +94029,7 @@ self: {
   "haskell-docs" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
      , containers, cryptohash, directory, filepath, ghc, ghc-paths
-     , haddock-api, haddock-library, monad-loops, process, text
-     , unordered-containers
+     , haddock-api, monad-loops, process, text, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-docs";
@@ -95194,8 +94039,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Cabal containers cryptohash
-         directory filepath ghc ghc-paths haddock-api haddock-library
-         monad-loops process text unordered-containers
+         directory filepath ghc ghc-paths haddock-api monad-loops process
+         text unordered-containers
        ];
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
@@ -95333,6 +94178,7 @@ self: {
        ];
        description = "GetText runtime library implementation in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-gi" = callPackage
@@ -95359,7 +94205,6 @@ self: {
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; 
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
@@ -95375,7 +94220,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-overloading" = callPackage
+  "haskell-gi-overloading_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "haskell-gi-overloading";
@@ -95384,9 +94229,10 @@ self: {
        doHaddock = false;
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-gi-overloading_1_0" = callPackage
+  "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "haskell-gi-overloading";
@@ -95395,7 +94241,6 @@ self: {
        doHaddock = false;
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-go-checkers" = callPackage
@@ -95495,6 +94340,7 @@ self: {
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -95530,35 +94376,35 @@ self: {
 
   "haskell-lsp" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec
-     , sorted-list, stm, text, time, transformers, unordered-containers
-     , vector, yi-rope
+     , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
+     , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
+     , transformers, unordered-containers, vector, yi-rope
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.2.0.1";
-       sha256 = "0xvgm1kkfz5yf1949f07phg5lic1zhwy5pdbgfnqdpaxrwscxm8y";
+       version = "0.2.2.0";
+       sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
-         hashable hslogger lens mtl parsec sorted-list stm text time
-         unordered-containers yi-rope
+         hashable haskell-lsp-types hslogger lens mtl network-uri parsec
+         sorted-list stm text time unordered-containers yi-rope
        ];
        executableHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
-         hslogger lens mtl parsec stm text time transformers
+         hslogger lens mtl network-uri parsec stm text time transformers
          unordered-containers vector yi-rope
        ];
        testHaskellDepends = [
-         aeson base containers directory hashable hspec lens sorted-list
-         text yi-rope
+         aeson base containers directory filepath hashable hspec lens
+         network-uri sorted-list text yi-rope
        ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_2_2_0" = callPackage
+  "haskell-lsp_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
      , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -95566,8 +94412,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.2.2.0";
-       sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
+       version = "0.4.0.0";
+       sha256 = "1djypqp2agwd834qrhjq8q2692mjaddpzpw758aq3g7284aig76n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95607,6 +94453,7 @@ self: {
        ];
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lsp-types" = callPackage
@@ -95625,6 +94472,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-lsp-types_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
+     , hashable, lens, network-uri, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "haskell-lsp-types";
+       version = "0.4.0.0";
+       sha256 = "1f0lyk02q0kqica0wa4rsm3j90ypbczmpr9fd5q90bwqfq9ydf2c";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default filepath hashable lens
+         network-uri text unordered-containers
+       ];
+       description = "Haskell library for the Microsoft Language Server Protocol, data types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-menu" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -95653,6 +94517,7 @@ self: {
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-modbus" = callPackage
@@ -95777,8 +94642,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-overridez";
-       version = "0.10.0.1";
-       sha256 = "0p50hsnj57hjd2sngcamicjp1yj9h4fk9jyp37ygy1j0yzyhn3a5";
+       version = "0.10.1.1";
+       sha256 = "0djxy9qfn318qmym711ba9rca2a9l9dpfvdwqmjsnihh33myjk1d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95788,6 +94653,7 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-packages" = callPackage
@@ -95987,6 +94853,7 @@ self: {
        ];
        description = "Snake game implemetation in Haskell using SDL2";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -96026,6 +94893,8 @@ self: {
        pname = "haskell-src-exts";
        version = "1.19.1";
        sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh";
+       revision = "1";
+       editedCabalFile = "120jvvksnzj3dfgxx1774asalw4wn2i507n3lyhfp95k9z1ny5rh";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -96150,10 +95019,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-src-meta";
-       version = "0.8.0.2";
-       sha256 = "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb";
-       revision = "1";
-       editedCabalFile = "07xxp2r8amd420bzl7xlyfydhyrcrvaxq24ydnx7y2sz4v2nlzsz";
+       version = "0.8.0.3";
+       sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -96224,8 +95091,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "1.0.1.1";
-       sha256 = "0ckszqvl843g1gywhc7sj2s4wr58ng2cqyxi0kihdbfq7xmk943b";
+       version = "1.1.0.1";
+       sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355";
        libraryHaskellDepends = [
          base classyplate ghc mtl pretty references template-haskell
          uniplate
@@ -96292,8 +95159,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "1.0.1.1";
-       sha256 = "05bn79ysb2bw42hid2ksqddqidimvqsx09nr771wf1ha7qapksmq";
+       version = "1.1.0.1";
+       sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4";
        libraryHaskellDepends = [
          base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
          references safe split template-haskell transformers uniplate
@@ -96307,20 +95174,20 @@ self: {
      , deepseq, directory, either, filepath, ghc, ghc-paths
      , haskell-tools-ast, haskell-tools-backend-ghc
      , haskell-tools-prettyprint, haskell-tools-refactor
-     , haskell-tools-rewrite, minisat-solver, mtl, references, split
-     , tasty, tasty-hunit, template-haskell, time, transformers
-     , uniplate
+     , haskell-tools-rewrite, minisat-solver, mtl, portable-lines
+     , references, split, tasty, tasty-hunit, template-haskell, time
+     , transformers, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-builtin-refactorings";
-       version = "1.0.1.1";
-       sha256 = "00yp1gvfvg3c2fa9ndnqphxbnsrshifida3247yafd7q9hhgd7q8";
+       version = "1.1.0.1";
+       sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa";
        libraryHaskellDepends = [
          aeson base Cabal classyplate containers deepseq directory filepath
          ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite minisat-solver mtl references split
-         template-haskell transformers uniplate
+         haskell-tools-rewrite minisat-solver mtl portable-lines references
+         split template-haskell transformers uniplate
        ];
        testHaskellDepends = [
          base Cabal containers directory either filepath ghc ghc-paths
@@ -96343,8 +95210,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "1.0.1.2";
-       sha256 = "03s7jhq7449z52h6vq9gbay3xdn66s8ma7snak0kk6nra41zrlpp";
+       version = "1.1.0.1";
+       sha256 = "1gc20ajz1xzp3343j013w0knqdvhwa5hxwvxr6ydpxgrigjxk18p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96380,8 +95247,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "1.0.1.1";
-       sha256 = "0r48z9vkkgzgvlryfri6dzivf090pkjv52k517z9wvis3jxhqi7i";
+       version = "1.1.0.1";
+       sha256 = "0vq8d7n8k978d2jv4f3sbvccjj9vqydci33xl1axamslani0k8x2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96413,8 +95280,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "1.0.1.1";
-       sha256 = "1ml4rbkcajgwssi1a0jgbbqnnci9f74w90zj9cxdxxkkck4fkypl";
+       version = "1.1.0.1";
+       sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96439,8 +95306,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "1.0.1.1";
-       sha256 = "01fkl2xkq7v3mkm5dzfpfz53i2js68xhc3gvkc1lv8mg92zymfbb";
+       version = "1.1.0.1";
+       sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96470,8 +95337,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-experimental-refactorings";
-       version = "1.0.1.1";
-       sha256 = "0dyiixq7rdzjczzfv57b7f2859r4nmxrk68vq0flkazjqh9w08yb";
+       version = "1.1.0.1";
+       sha256 = "16qdvs68zlzjx5gj8034w5qwc79i640kfdnwc81wi84hch7xwy4p";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -96497,8 +95364,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "1.0.1.1";
-       sha256 = "0j1ral0azwgxj550yf1jyyxprv0wb0cgd7sfk3dh52caqfwchi2p";
+       version = "1.1.0.1";
+       sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split text
          uniplate
@@ -96517,8 +95384,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.0.1.2";
-       sha256 = "0fbfmbrskhmzqcsrv4aviaf6b4rn7i3zs2ckl3l4r1q7rslxw3fk";
+       version = "1.1.0.1";
+       sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g";
        libraryHaskellDepends = [
          aeson base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -96544,8 +95411,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "1.0.1.1";
-       sha256 = "11psrwb8hmxian29n9y9301mlkfhx3y2nb06ml9808yrzpbwg1m2";
+       version = "1.1.0.1";
+       sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -96556,6 +95423,7 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -97160,6 +96028,7 @@ self: {
        ];
        description = "CP in Haskell through MiniZinc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskey" = callPackage
@@ -97893,48 +96762,18 @@ self: {
      , criterion, data-default-class, dlist, hashable, hashtables
      , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
      , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , tasty, tasty-hunit, tasty-quickcheck, text, text-builder
      , transformers, vector
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1.1.1";
-       sha256 = "12q83n9ylykk9zkjlk4qfvk7qls9syrfn9g78ljarbq8b8vi8996";
-       libraryHaskellDepends = [
-         attoparsec base base-prelude bytestring bytestring-strict-builder
-         contravariant contravariant-extras data-default-class dlist
-         hashable hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors semigroups text transformers vector
-       ];
-       testHaskellDepends = [
-         bug data-default-class QuickCheck quickcheck-instances rebase
-         rerebase tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ bug criterion rerebase ];
-       description = "An efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql_1_3_0_1" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
-     , bytestring-strict-builder, contravariant, contravariant-extras
-     , criterion, data-default-class, dlist, hashable, hashtables
-     , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
-     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-builder, transformers, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "1.3.0.1";
-       sha256 = "07v79w80k0xrvr4whlcx205a9fpdvlbqdzhq911r7sh3df10kg8f";
+       version = "1.3.0.2";
+       sha256 = "12xq08y54r6fia9nk4cp9gqflmml7b0zd8xhgnx3ylycl8r52h8m";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring bytestring-strict-builder
          contravariant contravariant-extras data-default-class dlist
          hashable hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors semigroups text text-builder
-         transformers vector
+         postgresql-libpq profunctors text text-builder transformers vector
        ];
        testHaskellDepends = [
          bug data-default-class QuickCheck quickcheck-instances rebase
@@ -98047,19 +96886,17 @@ self: {
      }) {};
 
   "hasql-migration" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, contravariant
-     , cryptohash, data-default-class, directory, hasql
-     , hasql-transaction, hspec, text, time, transformers
+    ({ mkDerivation, base, bytestring, contravariant, cryptonite
+     , data-default-class, directory, hasql, hasql-transaction, hspec
+     , memory, text, time, transformers
      }:
      mkDerivation {
        pname = "hasql-migration";
-       version = "0.1.3";
-       sha256 = "1cv8y16hkh7h421hljvi3hp7s20dn6alf5pjmd852xzdlnvy6j9d";
-       revision = "1";
-       editedCabalFile = "156s0y5yfc3y0mgv95gcs6n3pv9nd0mgy06x0xriwsf68wjb07ap";
+       version = "0.2.0";
+       sha256 = "03dd0m2ggsv094nga0d8yaqcqb0r9ngdh3zvvr8127n9ka6805l1";
        libraryHaskellDepends = [
-         base base64-bytestring bytestring contravariant cryptohash
-         data-default-class directory hasql hasql-transaction text time
+         base bytestring contravariant cryptonite data-default-class
+         directory hasql hasql-transaction memory text time
        ];
        testHaskellDepends = [
          base bytestring hasql hasql-transaction hspec transformers
@@ -98075,22 +96912,6 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-optparse-applicative";
-       version = "0.3.0.2";
-       sha256 = "1yrqq9lpvrvqvxhrkflyi9fy7nzkga5r4pqn24c939jxi83ncvl1";
-       libraryHaskellDepends = [
-         base-prelude hasql hasql-pool optparse-applicative
-       ];
-       description = "\"optparse-applicative\" parsers for \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-optparse-applicative_0_3_0_3" = callPackage
-    ({ mkDerivation, base-prelude, hasql, hasql-pool
-     , optparse-applicative
-     }:
-     mkDerivation {
-       pname = "hasql-optparse-applicative";
        version = "0.3.0.3";
        sha256 = "0d33y3bzy3q5yj4vizi9i2xwwnw1lzyxq72jk2daqjs347dc7d33";
        libraryHaskellDepends = [
@@ -98105,18 +96926,6 @@ self: {
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.4.3.1";
-       sha256 = "1hjlfxlakzqjghm25a29y7rhfk2m9bhsjfkbqfk9z1221qybwg6s";
-       libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
-       description = "A pool of connections for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-pool_0_5" = callPackage
-    ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
-     mkDerivation {
-       pname = "hasql-pool";
        version = "0.5";
        sha256 = "0bsxh9yf5p2iknrnssrif563n42ih14cj95qmy9z2lz2kbycscrs";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
@@ -98214,25 +97023,6 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.6.0.1";
-       sha256 = "0fw207hnpqg1r7ypwfqj5jpi91dx73q1syr1jisrhf78j3yw8rni";
-       libraryHaskellDepends = [
-         base base-prelude bytestring bytestring-tree-builder contravariant
-         contravariant-extras hasql mtl transformers
-       ];
-       testHaskellDepends = [ async hasql rebase ];
-       description = "A composable abstraction over the retryable transactions for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-transaction_0_7" = callPackage
-    ({ mkDerivation, async, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , hasql, mtl, rebase, transformers
-     }:
-     mkDerivation {
-       pname = "hasql-transaction";
        version = "0.7";
        sha256 = "1kvzj16mw471z2vgm27k0nfwfgf5cq3w6qaqwqz4247p11dkrjyy";
        libraryHaskellDepends = [
@@ -98271,6 +97061,7 @@ self: {
        ];
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache-aeson" = callPackage
@@ -98287,6 +97078,7 @@ self: {
        ];
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haste" = callPackage
@@ -98590,6 +97382,8 @@ self: {
        pname = "haven";
        version = "0.2.0.0";
        sha256 = "0cclphiq2jkk1msp5yg2mpkfn98jlqnc0vvwmi3vqcy5ln7641v1";
+       revision = "1";
+       editedCabalFile = "1p4m1iv3649b2wf6wdgbknhpms8rna5sibdi93zxyj0a4b23dh23";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98598,7 +97392,6 @@ self: {
        ];
        description = "Recursively retrieve maven dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haverer" = callPackage
@@ -98677,40 +97470,13 @@ self: {
   "haxl" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
-     , test-framework, test-framework-hunit, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "haxl";
-       version = "0.5.1.0";
-       sha256 = "09x84igm35d60rg97bcm1q9ivin01i5x64n3hl1j3ls62q28bm29";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base binary bytestring containers deepseq exceptions filepath
-         ghc-prim hashable HUnit pretty text time transformers
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [ base hashable time ];
-       testHaskellDepends = [
-         aeson base binary bytestring containers deepseq filepath hashable
-         HUnit test-framework test-framework-hunit text time
-         unordered-containers
-       ];
-       description = "A Haskell library for efficient, concurrent, and concise data access";
-       license = "unknown";
-     }) {};
-
-  "haxl_2_0_0_0" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
      , stm, test-framework, test-framework-hunit, text, time
      , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "haxl";
-       version = "2.0.0.0";
-       sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy";
+       version = "2.0.1.0";
+       sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98725,7 +97491,6 @@ self: {
        ];
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -98811,6 +97576,7 @@ self: {
        ];
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxr-th" = callPackage
@@ -98993,6 +97759,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
+  "hbf" = callPackage
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , doctest, filepath, hedgehog, hedgehog-checkers, HUnit
+     , optparse-applicative, parsec, primitive, smallcheck, tasty
+     , tasty-discover, tasty-hedgehog, tasty-hunit, tasty-smallcheck
+     , temporary, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hbf";
+       version = "0.2.0.0";
+       sha256 = "1w0q30vxfw8pz9sjnkiw40sq5m9xdigvnw9ppixzj1kd4d9b29z9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring deepseq filepath optparse-applicative parsec
+         primitive text transformers vector
+       ];
+       executableHaskellDepends = [
+         base binary bytestring deepseq filepath optparse-applicative parsec
+         primitive text transformers vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq doctest filepath hedgehog
+         hedgehog-checkers HUnit optparse-applicative parsec primitive
+         smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit
+         tasty-smallcheck temporary text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion deepseq filepath
+         optparse-applicative parsec primitive text transformers vector
+       ];
+       description = "An optimizing Brainfuck compiler and evaluator";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hblas" = callPackage
     ({ mkDerivation, base, blas, hspec, liblapack, primitive
      , storable-complex, vector
@@ -99109,6 +97911,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcc" = callPackage
@@ -99514,6 +98317,7 @@ self: {
        ];
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdf" = callPackage
@@ -99771,7 +98575,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heaps" = callPackage
@@ -99782,8 +98585,8 @@ self: {
        pname = "heaps";
        version = "0.3.6";
        sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q";
-       revision = "2";
-       editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in";
+       revision = "3";
+       editedCabalFile = "0k6wsm1hwn3vaxdvw8p7cidxg7p8zply2ig4w4qrbpyjhl6dj9x9";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
@@ -99813,6 +98616,7 @@ self: {
        libraryHaskellDepends = [ async base io-streams time ];
        description = "Heartbeats for io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heatshrink" = callPackage
@@ -99852,6 +98656,7 @@ self: {
        ];
        description = "Full-weight logging based on fast-logger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heavy-logger-amazon" = callPackage
@@ -99888,6 +98693,7 @@ self: {
        ];
        description = "Orphan instances for data types in heavy-logger package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hebrew-time" = callPackage
@@ -99950,34 +98756,6 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "0.5.3";
-       sha256 = "1vv8vnkv6d0fvm0vwfm11ajyd9da3hfy2wdkd4p7dhfyscq9cwx4";
-       revision = "1";
-       editedCabalFile = "0hhzkl88xk9j62897y11f4xx84qdh0mdap55iw30cl4zwlgp10ir";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet semigroups stm
-         template-haskell text th-lift time transformers transformers-base
-         unix wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers pretty-show semigroups text transformers
-       ];
-       description = "Hedgehog will eat all your bugs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog_0_6" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, semigroups, stm, template-haskell, text
-     , th-lift, time, transformers, transformers-base, unix
-     , wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
        version = "0.6";
        sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
        libraryHaskellDepends = [
@@ -99992,7 +98770,6 @@ self: {
        ];
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -100070,6 +98847,7 @@ self: {
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        description = "Use QuickCheck generators in Hedgehog and vice versa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis" = callPackage
@@ -100250,47 +99028,6 @@ self: {
      }:
      mkDerivation {
        pname = "heist";
-       version = "1.0.1.2";
-       sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71";
-       revision = "3";
-       editedCabalFile = "0siqhy0svk9lfi8rx7lhjhjihrmjk6plvyjnhhyhvyakmycggqpc";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html bytestring
-         containers directory directory-tree dlist filepath hashable
-         lifted-base map-syntax monad-control mtl process random text time
-         transformers transformers-base unordered-containers vector xmlhtml
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base bifunctors blaze-builder blaze-html
-         bytestring containers directory directory-tree dlist filepath
-         hashable HUnit lens lifted-base map-syntax monad-control mtl
-         process QuickCheck random test-framework test-framework-hunit
-         test-framework-quickcheck2 text time transformers transformers-base
-         unordered-containers vector xmlhtml
-       ];
-       benchmarkHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html bytestring
-         containers criterion directory directory-tree dlist filepath
-         hashable HUnit lifted-base map-syntax monad-control mtl process
-         random statistics test-framework test-framework-hunit text time
-         transformers transformers-base unordered-containers vector xmlhtml
-       ];
-       description = "An Haskell template system supporting both HTML5 and XML";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "heist_1_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
-     , blaze-html, bytestring, containers, criterion, directory
-     , directory-tree, dlist, filepath, hashable, HUnit, lens
-     , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
-     , random, statistics, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-base, unordered-containers, vector, xmlhtml
-     }:
-     mkDerivation {
-       pname = "heist";
        version = "1.1";
        sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq";
        libraryHaskellDepends = [
@@ -100369,6 +99106,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "helics" = callPackage
@@ -100595,6 +99333,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A functionally reactive game engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "help-esb" = callPackage
@@ -100867,32 +99606,12 @@ self: {
 
   "herms" = callPackage
     ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
-     , microlens-th, optparse-applicative, semigroups, split, vty
-     }:
-     mkDerivation {
-       pname = "herms";
-       version = "1.8.1.4";
-       sha256 = "1hgrwp39q6fwq0ssfkbfq8ndwmyiv1szpl8qa1p0fss5ddf002bc";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         ansi-terminal base brick directory microlens microlens-th
-         optparse-applicative semigroups split vty
-       ];
-       description = "A command-line manager for delicious kitchen recipes";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "herms_1_9_0_0" = callPackage
-    ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
      , microlens-th, mtl, optparse-applicative, semigroups, split, vty
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.9.0.0";
-       sha256 = "0k3fn5rq294qly8zzfbjdp3sc2zvxslkhyfhh8na9azrkgz2szia";
+       version = "1.9.0.2";
+       sha256 = "0gl2zwmqcvmkk63xip7zqn37qwpii5b8qbf7h289iyrc46a3z29z";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -100902,7 +99621,6 @@ self: {
        ];
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -101064,6 +99782,7 @@ self: {
        ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hetero-map" = callPackage
@@ -101096,12 +99815,12 @@ self: {
      }) {};
 
   "heterogeneous-list-literals" = callPackage
-    ({ mkDerivation, base, OneTuple }:
+    ({ mkDerivation, base, Only }:
      mkDerivation {
        pname = "heterogeneous-list-literals";
-       version = "0.1.0.1";
-       sha256 = "0cb38kpw01fzwfrhlgi2l1869b8hd9cd7kzbyr1ap6ik5gkljq6k";
-       libraryHaskellDepends = [ base OneTuple ];
+       version = "0.2.0.0";
+       sha256 = "1b21ap20mp3vyj0cx4b3sj645bdykgf7ap3vsmbhmccq4iklvran";
+       libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
@@ -101346,14 +100065,13 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat-lens";
-       version = "0.1.6";
-       sha256 = "0d395r8rc1s3q1gldynb47g20l4585w18div21jm397gga4cgkmx";
+       version = "0.1.7";
+       sha256 = "0r9psvrgwkg8y9xvgc3rkay828ri5xbp2z5jjf6b52v99j8aipd8";
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-pickle" = callPackage
@@ -101431,6 +100149,7 @@ self: {
        ];
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexquote" = callPackage
@@ -101480,6 +100199,7 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heyefi" = callPackage
@@ -101632,8 +100352,8 @@ self: {
      }:
      mkDerivation {
        pname = "hformat";
-       version = "0.3.2.0";
-       sha256 = "1761gw0g7ar4ls4pzm8vq3k48nckd4lliq7f9s7br961215sjgx9";
+       version = "0.3.3.0";
+       sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j";
        libraryHaskellDepends = [
          ansi-terminal base base-unicode-symbols text
        ];
@@ -101880,6 +100600,7 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgis" = callPackage
@@ -101890,14 +100611,15 @@ self: {
      }:
      mkDerivation {
        pname = "hgis";
-       version = "1.0.0.0";
-       sha256 = "1j70p3bgy8v1nzpqiv20lpxq7vxi54f9j3mwl8046hanra99wdr5";
+       version = "1.0.0.2";
+       sha256 = "1z730c48pvi6ylb0pjzx2x9jnd03aadpmsx3psrlf2vp0bvm6ims";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring Chart Chart-cairo
          Chart-diagrams colour composition-prelude data-binary-ieee754
          data-default directory filepath lens monad-loops
        ];
        testHaskellDepends = [ base hspec ];
+       doHaddock = false;
        description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102022,6 +100744,7 @@ self: {
        ];
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgrib" = callPackage
@@ -102084,7 +100807,6 @@ self: {
        ];
        description = "Generate scaffold for cabal project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hi3status" = callPackage
@@ -102163,6 +100885,8 @@ self: {
        pname = "hid-examples";
        version = "0.1.0.0";
        sha256 = "0x8i9532w5gxlajx4pw7n31qf6hbqf5335lsqwvwvk12igww7mg8";
+       revision = "1";
+       editedCabalFile = "0ifcgqm81vh7qidpxzgkx5g3wcyif0zgclz7svsnvw5vvpij350p";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -102282,7 +101006,6 @@ self: {
        ];
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hiernotify" = callPackage
@@ -102386,6 +101109,7 @@ self: {
        ];
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highjson-swagger" = callPackage
@@ -102404,6 +101128,7 @@ self: {
        ];
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highjson-th" = callPackage
@@ -102424,6 +101149,7 @@ self: {
        ];
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highlight" = callPackage
@@ -102617,14 +101343,14 @@ self: {
 
   "hindent" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, criterion
-     , deepseq, descriptive, Diff, directory, exceptions, filepath
-     , ghc-prim, haskell-src-exts, hspec, monad-loops, mtl, path
-     , path-io, text, transformers, unix-compat, utf8-string, yaml
+     , deepseq, Diff, directory, exceptions, filepath, ghc-prim
+     , haskell-src-exts, hspec, monad-loops, mtl, optparse-applicative
+     , path, path-io, text, transformers, unix-compat, utf8-string, yaml
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.5";
-       sha256 = "19lckzwsqy8d1wry7hlg5vcg10dc5isai1z0n8srap5hlqvifw1g";
+       version = "5.2.7";
+       sha256 = "06p7rn689ynlxxgpy7ix8r69zwz4iwp7rfvcjxa6kxayfiq3hc2w";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -102633,9 +101359,9 @@ self: {
          haskell-src-exts monad-loops mtl text transformers utf8-string yaml
        ];
        executableHaskellDepends = [
-         base bytestring deepseq descriptive directory exceptions ghc-prim
-         haskell-src-exts path path-io text transformers unix-compat
-         utf8-string yaml
+         base bytestring deepseq directory exceptions ghc-prim
+         haskell-src-exts optparse-applicative path path-io text
+         transformers unix-compat utf8-string yaml
        ];
        testHaskellDepends = [
          base bytestring deepseq Diff directory exceptions haskell-src-exts
@@ -102690,6 +101416,7 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -102707,6 +101434,7 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -102726,6 +101454,7 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -102739,7 +101468,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hinotify" = callPackage
+  "hinotify_0_3_9" = callPackage
     ({ mkDerivation, async, base, containers, directory, unix }:
      mkDerivation {
        pname = "hinotify";
@@ -102751,9 +101480,10 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hinotify_0_3_10" = callPackage
+  "hinotify" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , unix
      }:
@@ -102767,7 +101497,6 @@ self: {
        testHaskellDepends = [ base bytestring directory unix ];
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinotify-bytestring" = callPackage
@@ -102827,27 +101556,8 @@ self: {
 
   "hint" = callPackage
     ({ mkDerivation, base, directory, exceptions, extensible-exceptions
-     , filepath, ghc, ghc-paths, HUnit, mtl, random, unix
-     }:
-     mkDerivation {
-       pname = "hint";
-       version = "0.7.0";
-       sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9";
-       revision = "2";
-       editedCabalFile = "1w96sfg6vlrw5q7cjdg1rz9jf2yl47fyas9qg3jfa9bcfmvs8cg2";
-       libraryHaskellDepends = [
-         base directory exceptions filepath ghc ghc-paths mtl random unix
-       ];
-       testHaskellDepends = [
-         base directory exceptions extensible-exceptions filepath HUnit
-       ];
-       description = "Runtime Haskell interpreter (GHC API wrapper)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hint_0_8_0" = callPackage
-    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
-     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
+     , unix
      }:
      mkDerivation {
        pname = "hint";
@@ -102855,14 +101565,13 @@ self: {
        sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f";
        libraryHaskellDepends = [
          base directory exceptions filepath ghc ghc-boot ghc-paths mtl
-         random unix
+         random temporary unix
        ];
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit unix
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hint-server" = callPackage
@@ -102883,7 +101592,8 @@ self: {
 
   "hinter" = callPackage
     ({ mkDerivation, base, directory, exceptions, extensible-exceptions
-     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
+     , unix
      }:
      mkDerivation {
        pname = "hinter";
@@ -102891,14 +101601,13 @@ self: {
        sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl";
        libraryHaskellDepends = [
          base directory exceptions filepath ghc ghc-boot ghc-paths mtl
-         random unix
+         random temporary unix
        ];
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit unix
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinterface" = callPackage
@@ -103221,29 +101930,12 @@ self: {
      }:
      mkDerivation {
        pname = "histogram-fill";
-       version = "0.8.5.0";
-       sha256 = "0csijwl60v81inn7awl27b302c9ibblplr58ka7xih17dxyidpgv";
-       revision = "1";
-       editedCabalFile = "0pa5i5187g0y7r7ngy4gf9lqp76k9saz5qjri4nx0f98kwsacagg";
-       libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
-       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       description = "Library for histograms creation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "histogram-fill_0_9_0_0" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ghc-prim, mwc-random
-     , primitive, vector
-     }:
-     mkDerivation {
-       pname = "histogram-fill";
        version = "0.9.0.0";
        sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "histogram-fill-binary" = callPackage
@@ -103309,6 +102001,7 @@ self: {
        ];
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hit-graph" = callPackage
@@ -103324,6 +102017,7 @@ self: {
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjcase" = callPackage
@@ -103414,32 +102108,10 @@ self: {
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hspec, http-types
-     , QuickCheck, semigroups, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hjsonpointer";
-       version = "1.3.0";
-       sha256 = "0cfq6lrwww81hppjdfnj6ys11ajzdz4rrpzlp220mv88cin4jns4";
-       revision = "1";
-       editedCabalFile = "053x0iy7kzmf8b9mqr94lapv95d2rm2zm14lvvviyccqsd3k5gjd";
-       libraryHaskellDepends = [
-         aeson base hashable QuickCheck semigroups text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-types QuickCheck text unordered-containers
-         vector
-       ];
-       description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsonpointer_1_4_0" = callPackage
+  "hjsonpointer" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, text, unordered-containers, vector
      }:
@@ -103464,33 +102136,6 @@ self: {
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
-     , http-client, http-types, pcre-heavy, profunctors, protolude
-     , QuickCheck, scientific, semigroups, text, unordered-containers
-     , vector, wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "hjsonschema";
-       version = "1.7.2";
-       sha256 = "1czxfwfhl7zxx8385x8qskiym8qb1fpjdxmbywl8p4p102cb9083";
-       libraryHaskellDepends = [
-         aeson base bytestring containers file-embed filepath hashable
-         hjsonpointer http-client http-types pcre-heavy profunctors
-         protolude QuickCheck scientific semigroups text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring directory filepath hjsonpointer hspec
-         profunctors protolude QuickCheck semigroups text
-         unordered-containers vector wai-app-static warp
-       ];
-       description = "JSON Schema library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hjsonschema_1_9_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-client-tls, http-types, pcre-heavy, profunctors
      , protolude, QuickCheck, safe-exceptions, scientific, text
      , unordered-containers, vector, wai-app-static, warp
@@ -103646,51 +102291,54 @@ self: {
      }) {};
 
   "hledger" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , cmdargs, containers, criterion, csv, data-default, Decimal, Diff
-     , directory, file-embed, filepath, hashable, haskeline, here
-     , hledger-lib, html, HUnit, lucid, megaparsec, mtl, mtl-compat
-     , old-time, parsec, pretty-show, process, regex-tdfa, safe
-     , shakespeare, split, tabular, temporary, terminfo, test-framework
-     , test-framework-hunit, text, time, timeit, transformers
-     , unordered-containers, utf8-string, utility-ht, wizards
+    ({ mkDerivation, ansi-terminal, base, base-compat-batteries
+     , bytestring, cmdargs, containers, criterion, csv, data-default
+     , Decimal, Diff, directory, file-embed, filepath, hashable
+     , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl
+     , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
+     , safe, shakespeare, split, tabular, temporary, terminfo
+     , test-framework, test-framework-hunit, text, time, timeit
+     , transformers, unordered-containers, utf8-string, utility-ht
+     , wizards
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.9.1";
-       sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3";
-       revision = "1";
-       editedCabalFile = "0qmvkw2zbcpjmkf71janpdpdha45yi29f9kv54rxqbckkh1ziych";
+       version = "1.10";
+       sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base base-compat bytestring cmdargs containers csv
-         data-default Decimal Diff directory file-embed filepath hashable
-         haskeline here hledger-lib HUnit lucid megaparsec mtl mtl-compat
-         old-time pretty-show process regex-tdfa safe shakespeare split
-         tabular temporary terminfo text time transformers
+         ansi-terminal base base-compat-batteries bytestring cmdargs
+         containers csv data-default Decimal Diff directory file-embed
+         filepath hashable haskeline here hledger-lib HUnit lucid megaparsec
+         mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split tabular temporary terminfo text time transformers
          unordered-containers utf8-string utility-ht wizards
        ];
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring cmdargs containers csv
-         data-default Decimal directory file-embed filepath haskeline here
-         hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show
-         process regex-tdfa safe shakespeare split tabular temporary
-         terminfo text time unordered-containers utf8-string utility-ht
-         wizards
+         ansi-terminal base base-compat-batteries bytestring cmdargs
+         containers csv data-default Decimal directory file-embed filepath
+         haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
+         parsec pretty-show process regex-tdfa safe shakespeare split
+         tabular temporary terminfo text time transformers
+         unordered-containers utf8-string utility-ht wizards
        ];
        testHaskellDepends = [
-         ansi-terminal base base-compat bytestring cmdargs containers csv
-         data-default Decimal directory file-embed filepath haskeline here
-         hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show
-         process regex-tdfa safe shakespeare split tabular temporary
-         terminfo test-framework test-framework-hunit text time
-         unordered-containers utf8-string utility-ht wizards
+         ansi-terminal base base-compat-batteries bytestring cmdargs
+         containers csv data-default Decimal directory file-embed filepath
+         haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
+         parsec pretty-show process regex-tdfa safe shakespeare split
+         tabular temporary terminfo test-framework test-framework-hunit text
+         time transformers unordered-containers utf8-string utility-ht
+         wizards
        ];
        benchmarkHaskellDepends = [
-         ansi-terminal base base-compat criterion directory file-embed
-         filepath here hledger-lib html pretty-show process shakespeare
-         tabular temporary terminfo time timeit utility-ht
+         ansi-terminal base base-compat-batteries bytestring cmdargs
+         containers criterion csv data-default Decimal directory file-embed
+         filepath haskeline here hledger-lib html HUnit megaparsec mtl
+         mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split tabular temporary terminfo text time timeit
+         transformers unordered-containers utf8-string utility-ht wizards
        ];
        description = "Command-line interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
@@ -103705,8 +102353,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.9.1";
-       sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8";
+       version = "1.10";
+       sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103749,7 +102397,6 @@ self: {
        executableHaskellDepends = [ base hledger-lib text time ];
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -103807,8 +102454,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.14";
-       sha256 = "06y1y6qgq9arhqwdna1kfafhjwin8qmlczl5rxazms3g45dl72rr";
+       version = "0.1.1.15";
+       sha256 = "06fbahn3pp73an5xxn0qnh8h7hkjvvl5z4z52vgcpxh13frd65hx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103816,63 +102463,59 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-lib" = callPackage
-    ({ mkDerivation, ansi-terminal, array, base, base-compat
+    ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
      , blaze-markup, bytestring, cmdargs, containers, csv, data-default
      , Decimal, deepseq, directory, doctest, easytest, extra, filepath
      , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time
-     , parsec, pretty-show, regex-tdfa, safe, split, tabular
-     , test-framework, test-framework-hunit, text, time, transformers
-     , uglymemo, utf8-string
+     , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split
+     , tabular, test-framework, test-framework-hunit, text, time
+     , transformers, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.9.1";
-       sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az";
-       revision = "1";
-       editedCabalFile = "1j7yhnjkiw2vm63d6va18kknjxkywb2j0h525ys4z3y6840i8b8k";
+       version = "1.10";
+       sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1";
        libraryHaskellDepends = [
-         ansi-terminal array base base-compat blaze-markup bytestring
-         cmdargs containers csv data-default Decimal deepseq directory extra
-         filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec
-         pretty-show regex-tdfa safe split tabular text time transformers
-         uglymemo utf8-string
+         ansi-terminal array base base-compat-batteries blaze-markup
+         bytestring cmdargs containers csv data-default Decimal deepseq
+         directory extra filepath hashtables HUnit megaparsec mtl mtl-compat
+         old-time parsec parser-combinators pretty-show regex-tdfa safe
+         split tabular text time transformers uglymemo utf8-string
        ];
        testHaskellDepends = [
-         ansi-terminal array base base-compat blaze-markup bytestring
-         cmdargs containers csv data-default Decimal deepseq directory
-         doctest easytest extra filepath Glob hashtables HUnit megaparsec
-         mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split
-         tabular test-framework test-framework-hunit text time transformers
-         uglymemo utf8-string
+         ansi-terminal array base base-compat-batteries blaze-markup
+         bytestring cmdargs containers csv data-default Decimal deepseq
+         directory doctest easytest extra filepath Glob hashtables HUnit
+         megaparsec mtl mtl-compat old-time parsec parser-combinators
+         pretty-show regex-tdfa safe split tabular test-framework
+         test-framework-hunit text time transformers uglymemo utf8-string
        ];
        description = "Core data types, parsers and functionality for the hledger accounting tools";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "hledger-ui" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, base-compat, brick
-     , cmdargs, containers, data-default, directory, filepath, fsnotify
-     , hledger, hledger-lib, HUnit, megaparsec, microlens
+    ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
+     , brick, cmdargs, containers, data-default, directory, filepath
+     , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens
      , microlens-platform, pretty-show, process, safe, split, text
      , text-zipper, time, transformers, vector, vty
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.9.1";
-       sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0";
-       revision = "1";
-       editedCabalFile = "0dy5vrm969cqp4mz31524z8w1m3lznrr17kgn204rgq91j7zzwx2";
+       version = "1.10.1";
+       sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal async base base-compat brick cmdargs containers
-         data-default directory filepath fsnotify hledger hledger-lib HUnit
-         megaparsec microlens microlens-platform pretty-show process safe
-         split text text-zipper time transformers vector vty
+         ansi-terminal async base base-compat-batteries brick cmdargs
+         containers data-default directory filepath fsnotify hledger
+         hledger-lib HUnit megaparsec microlens microlens-platform
+         pretty-show process safe split text text-zipper time transformers
+         vector vty
        ];
        description = "Curses-style user interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
@@ -103898,46 +102541,29 @@ self: {
      }) {};
 
   "hledger-web" = callPackage
-    ({ mkDerivation, base, base-compat, blaze-html, blaze-markup
-     , bytestring, clientsession, cmdargs, conduit-extra, data-default
-     , directory, filepath, hjsmin, hledger, hledger-lib, hspec
-     , http-client, http-conduit, HUnit, json, megaparsec, mtl, parsec
-     , safe, shakespeare, template-haskell, text, time, transformers
-     , wai, wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core
-     , yesod-form, yesod-static, yesod-test
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , case-insensitive, clientsession, cmdargs, conduit, conduit-extra
+     , data-default, directory, filepath, hjsmin, hledger, hledger-lib
+     , http-client, http-conduit, HUnit, json, megaparsec, mtl
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, wai-extra, wai-handler-launch, warp, yaml
+     , yesod, yesod-core, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.9.2";
-       sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3";
-       revision = "1";
-       editedCabalFile = "1njgbfl71iif3f7z3kkyqgab98md93a56mpl6laq0kw4azgdsajy";
+       version = "1.10";
+       sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base base-compat blaze-html blaze-markup bytestring clientsession
-         cmdargs conduit-extra data-default directory filepath hjsmin
-         hledger hledger-lib http-client http-conduit HUnit json megaparsec
-         mtl parsec safe shakespeare template-haskell text time transformers
-         wai wai-extra wai-handler-launch warp yaml yesod yesod-core
-         yesod-form yesod-static
-       ];
-       executableHaskellDepends = [
-         base base-compat blaze-html blaze-markup bytestring clientsession
-         cmdargs conduit-extra data-default directory filepath hjsmin
-         hledger hledger-lib http-client http-conduit HUnit json megaparsec
-         mtl parsec safe shakespeare template-haskell text time transformers
-         wai wai-extra wai-handler-launch warp yaml yesod yesod-core
-         yesod-form yesod-static
-       ];
-       testHaskellDepends = [
-         base base-compat blaze-html blaze-markup bytestring clientsession
-         cmdargs conduit-extra data-default directory filepath hjsmin
-         hledger hledger-lib hspec http-client http-conduit HUnit json
-         megaparsec mtl parsec safe shakespeare template-haskell text time
-         transformers wai wai-extra wai-handler-launch warp yaml yesod
-         yesod-core yesod-form yesod-static yesod-test
+         base blaze-html blaze-markup bytestring case-insensitive
+         clientsession cmdargs conduit conduit-extra data-default directory
+         filepath hjsmin hledger hledger-lib http-client http-conduit HUnit
+         json megaparsec mtl semigroups shakespeare template-haskell text
+         time transformers wai wai-extra wai-handler-launch warp yaml yesod
+         yesod-core yesod-form yesod-static
        ];
+       executableHaskellDepends = [ base ];
        description = "Web interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -104002,22 +102628,6 @@ self: {
     ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.6.1";
-       sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy";
-       configureFlags = [ "-fexternalLibsass" ];
-       setupHaskellDepends = [ base Cabal directory ];
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ libsass ];
-       testHaskellDepends = [ base hspec ];
-       description = "Low-level bindings to Libsass";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libsass;};
-
-  "hlibsass_0_1_7_0" = callPackage
-    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
-     mkDerivation {
-       pname = "hlibsass";
        version = "0.1.7.0";
        sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
        configureFlags = [ "-fexternalLibsass" ];
@@ -104027,7 +102637,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
@@ -104039,8 +102648,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.5";
-       sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1";
+       version = "2.1.8";
+       sha256 = "1kkmgqbw2n4sl7wcqbdqv54n7p5zjfx8c970s1lw25mfs3ryn4wp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104078,7 +102687,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Heterogeneous list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlogger" = callPackage
@@ -104126,7 +102734,6 @@ self: {
        ];
        description = "High-level Redis Database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlrdb-core" = callPackage
@@ -104135,8 +102742,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.1.1";
-       sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d";
+       version = "0.1.2.0";
+       sha256 = "1j3ds4kkr1ns7y46b3s29bhi63n31ggvcq4mlyp2xafw2z4nbyl3";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -104229,25 +102836,6 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix";
-       version = "0.18.2.0";
-       sha256 = "0q452gpmyxb0qp7pnwyrvvw3nc650qm68z3g0cd88s1x2j0xq34n";
-       configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq random semigroups split
-         storable-complex vector
-       ];
-       librarySystemDepends = [ openblasCompat ];
-       description = "Numeric Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openblasCompat;};
-
-  "hmatrix_0_19_0_0" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , openblasCompat, random, semigroups, split, storable-complex
-     , vector
-     }:
-     mkDerivation {
-       pname = "hmatrix";
        version = "0.19.0.0";
        sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj";
        configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
@@ -104258,34 +102846,9 @@ self: {
        librarySystemDepends = [ openblasCompat ];
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-backprop" = callPackage
-    ({ mkDerivation, ANum, backprop, base, finite-typelits
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
-     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
-     , vector, vector-sized
-     }:
-     mkDerivation {
-       pname = "hmatrix-backprop";
-       version = "0.1.2.0";
-       sha256 = "0lrdy5zxl8kvzfsgb4i5lqvdaqpnwixgjnjsvkm89fw6ms86bqac";
-       libraryHaskellDepends = [
-         ANum backprop base finite-typelits ghc-typelits-knownnat
-         ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens
-         vector vector-sized
-       ];
-       testHaskellDepends = [
-         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
-         microlens microlens-platform vector-sized
-       ];
-       description = "hmatrix operations lifted for backprop";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hmatrix-backprop_0_1_2_2" = callPackage
     ({ mkDerivation, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
      , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
@@ -104293,8 +102856,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-backprop";
-       version = "0.1.2.2";
-       sha256 = "130lby9nx21mcn85qy86xgmzjm9qyb98b0fhgafkyr2fgfnnqphj";
+       version = "0.1.2.3";
+       sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx";
        libraryHaskellDepends = [
          backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
          hmatrix hmatrix-vector-sized microlens vector vector-sized
@@ -104349,21 +102912,6 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-gsl";
-       version = "0.18.2.0";
-       sha256 = "0gvghbyavlk808826qwy4r667i9mxf2ml5xjsbna5slx4sbj7jfs";
-       libraryHaskellDepends = [
-         array base hmatrix process random vector
-       ];
-       libraryPkgconfigDepends = [ gsl ];
-       description = "Numerical computation";
-       license = "GPL";
-     }) {inherit (pkgs) gsl;};
-
-  "hmatrix-gsl_0_19_0_1" = callPackage
-    ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
-     }:
-     mkDerivation {
-       pname = "hmatrix-gsl";
        version = "0.19.0.1";
        sha256 = "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm";
        libraryHaskellDepends = [
@@ -104372,7 +102920,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Numerical computation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
@@ -104410,8 +102957,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-morpheus";
-       version = "0.1.1.1";
-       sha256 = "1y7ckwgv20j72ji0n30jj0iiibx9i3k053jh2cp17q1lnks836vj";
+       version = "0.1.1.2";
+       sha256 = "19q52n5j1n5db7b2pv0iabh1xygpybgiszswginab5khc01fxwzj";
        libraryHaskellDepends = [ base hmatrix ];
        librarySystemDepends = [ blas liblapack ];
        testHaskellDepends = [
@@ -104493,23 +103040,11 @@ self: {
     ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
      mkDerivation {
        pname = "hmatrix-special";
-       version = "0.4.0.1";
-       sha256 = "0kpcqdchi7ikzhqacy4rh4dxz3v37paxyb84wqa66sysb72wkabj";
-       libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
-       description = "Interface to GSL special functions";
-       license = "GPL";
-     }) {};
-
-  "hmatrix-special_0_19_0_0" = callPackage
-    ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
-     mkDerivation {
-       pname = "hmatrix-special";
        version = "0.19.0.0";
        sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz";
        libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
        description = "Interface to GSL special functions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-static" = callPackage
@@ -104564,6 +103099,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -105072,6 +103608,7 @@ self: {
        ];
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -105365,14 +103902,11 @@ self: {
     ({ mkDerivation, base, either, mtl }:
      mkDerivation {
        pname = "hoist-error";
-       version = "0.2.0.0";
-       sha256 = "1hb479bwn3z1qdsrnz85wfdd9skmmxydxd6xkcrwbcfwy5vap64h";
-       revision = "1";
-       editedCabalFile = "1nai9ds3r15x78rnj5gvy3mbps2jkq9ndqg56l8g7rxizfzidwfb";
+       version = "0.2.1.0";
+       sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hol" = callPackage
@@ -105403,6 +103937,7 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hold-em" = callPackage
@@ -105607,6 +104142,7 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hood-off" = callPackage
@@ -105630,6 +104166,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodie" = callPackage
@@ -105685,6 +104222,7 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-core" = callPackage
@@ -105826,6 +104364,7 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoogle_5_0_14" = callPackage
@@ -105942,7 +104481,7 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {inherit (pkgs) openssl;};
 
-  "hoopl_3_10_2_2" = callPackage
+  "hoopl" = callPackage
     ({ mkDerivation, base, containers, filepath, mtl, parsec
      , test-framework, test-framework-hunit
      }:
@@ -106053,7 +104592,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopenssl" = callPackage
@@ -106612,42 +105150,6 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.27.0";
-       sha256 = "1vrbf2b5bin9sdm80bj0jkcwc2d9zh29jh4qjhfvcpk4ggbl8iym";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob http-client http-client-tls
-         http-types pretty scientific text transformers unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob http-client http-client-tls
-         http-types pretty scientific text transformers unordered-containers
-         vector yaml
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob hspec http-client http-client-tls
-         http-types HUnit interpolate mockery pretty QuickCheck scientific
-         template-haskell temporary text transformers unordered-containers
-         vector yaml
-       ];
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack_0_28_2" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , http-client, http-client-tls, http-types, HUnit, interpolate
-     , mockery, pretty, QuickCheck, scientific, template-haskell
-     , temporary, text, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
        version = "0.28.2";
        sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r";
        isLibrary = true;
@@ -106673,7 +105175,6 @@ self: {
        ];
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpack-convert" = callPackage
@@ -106710,22 +105211,20 @@ self: {
 
   "hpack-dhall" = callPackage
     ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec
-     , interpolate, mockery, text, transformers, trifecta
+     , interpolate, megaparsec, mockery, text, transformers
      }:
      mkDerivation {
        pname = "hpack-dhall";
-       version = "0.1.0";
-       sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0";
-       revision = "3";
-       editedCabalFile = "02pvzwqrs163mgxdydgv6pa1gq75xav68kpjycrxgdbpag6s9ynv";
+       version = "0.2.0";
+       sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base dhall dhall-json hpack text transformers trifecta
+         aeson base dhall dhall-json hpack megaparsec text transformers
        ];
        testHaskellDepends = [
-         aeson base dhall dhall-json hpack hspec interpolate mockery text
-         transformers trifecta
+         aeson base dhall dhall-json hpack hspec interpolate megaparsec
+         mockery text transformers
        ];
        description = "Dhall support for Hpack";
        license = stdenv.lib.licenses.publicDomain;
@@ -106911,6 +105410,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpc-strobe" = callPackage
@@ -106989,6 +105489,7 @@ self: {
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpio" = callPackage
@@ -107090,39 +105591,10 @@ self: {
        testHaskellDepends = [ base bytestring transformers ];
        description = "A Haskell pre-processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpqtypes" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , data-default-class, directory, exceptions, filepath, HUnit
-     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
-     , resource-pool, scientific, semigroups, test-framework
-     , test-framework-hunit, text, text-show, time, transformers
-     , transformers-base, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hpqtypes";
-       version = "1.5.2.0";
-       sha256 = "0ghqrayylsm68nkqzrb7y81n3zslqv0rjpd0fyya67cy26ks43gw";
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default-class exceptions
-         lifted-base monad-control mtl resource-pool semigroups text
-         text-show time transformers transformers-base vector
-       ];
-       librarySystemDepends = [ postgresql ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions HUnit lifted-base monad-control
-         mtl QuickCheck random scientific test-framework
-         test-framework-hunit text text-show time transformers-base
-         unordered-containers vector
-       ];
-       description = "Haskell bindings to libpqtypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) postgresql;};
-
-  "hpqtypes_1_5_3_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
      , data-default-class, directory, exceptions, filepath, HUnit
      , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
@@ -107183,8 +105655,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.10";
-       sha256 = "14zihg4gb42kr68y73mzb7a9ryc2yi4h50n3a4v8idw17f3fdhlz";
+       version = "2.4.11";
+       sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107201,7 +105673,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -107331,6 +105802,7 @@ self: {
        ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hquantlib" = callPackage
@@ -107380,6 +105852,7 @@ self: {
        ];
        description = "A query language for transforming HTML5";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hranker" = callPackage
@@ -107466,13 +105939,15 @@ self: {
      }) {};
 
   "hruby" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
-     , ruby, scientific, stm, text, unordered-containers, vector
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , process, QuickCheck, ruby, scientific, stm, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.5.1";
-       sha256 = "0gzg7yhkrzgqaip5fd1lbd15j1274w28kqv0k6ls6sfk52gq56wn";
+       version = "0.3.5.4";
+       sha256 = "17nm55xg6v71dp8cvaz9rp2siyywpynlxqxr1j44ciyw114h36vk";
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -107501,25 +105976,13 @@ self: {
     ({ mkDerivation, base, syb }:
      mkDerivation {
        pname = "hs-bibutils";
-       version = "6.2.0.1";
-       sha256 = "0c56sjgg82kjcg5rrplnyn7vf02ccsj3kkcbgc87zxlv0j880rjb";
+       version = "6.6.0.0";
+       sha256 = "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l";
        libraryHaskellDepends = [ base syb ];
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
        license = "GPL";
      }) {};
 
-  "hs-bibutils_6_4_0_0" = callPackage
-    ({ mkDerivation, base, syb }:
-     mkDerivation {
-       pname = "hs-bibutils";
-       version = "6.4.0.0";
-       sha256 = "1kravnc0cn0r7bnm3fmcd6d1l4z1ax41wcm32jrp5rafq15lyg9f";
-       libraryHaskellDepends = [ base syb ];
-       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hs-blake2" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
      , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -107980,6 +106443,7 @@ self: {
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-pkpass" = callPackage
@@ -108193,18 +106657,20 @@ self: {
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
      , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, microlens, system-filepath
+     , hspec-dirstream, language-ats, microlens, optparse-generic
+     , system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.3.0.2";
-       sha256 = "0yimapbxy0il6yv12r1xx03vjjgc8hl3iyyi21y41bqdzzl4f37p";
+       version = "0.3.0.3";
+       sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base casing composition-prelude cpphs deepseq
          haskell-src-exts language-ats microlens
        ];
+       executableHaskellDepends = [ base optparse-generic ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
        ];
@@ -108273,6 +106739,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsSqlite3" = callPackage
@@ -108333,29 +106800,6 @@ self: {
 
   "hsass" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, filepath
-     , hlibsass, hspec, hspec-discover, monad-loops, temporary
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hsass";
-       version = "0.5.0";
-       sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d";
-       revision = "1";
-       editedCabalFile = "00va8x51p6rbg8jbkxpyz74pa2pfm5dsrpi57icbyickx39iaydd";
-       libraryHaskellDepends = [
-         base bytestring data-default-class filepath hlibsass monad-loops
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring data-default-class hspec hspec-discover temporary
-       ];
-       description = "Integrating Sass into Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hsass_0_7_0" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, filepath
      , hlibsass, hspec, hspec-discover, monad-loops, temporary, text
      , transformers
      }:
@@ -108373,7 +106817,6 @@ self: {
        ];
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -109067,28 +107510,30 @@ self: {
      , attoparsec, base, bytestring, Cabal, containers, cpphs
      , data-default, deepseq, direct-sqlite, directory, exceptions
      , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils
-     , haddock-api, haskell-names, haskell-src-exts, hdocs, hformat
-     , hlint, hspec, HTTP, lens, lifted-base, mmorph, monad-control
-     , monad-loops, mtl, network, optparse-applicative, process
-     , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm
-     , syb, template-haskell, text, text-region, time, transformers
-     , transformers-base, uniplate, unix, unordered-containers, vector
+     , haddock-api, haddock-library, haskell-names, haskell-src-exts
+     , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph
+     , monad-control, monad-loops, mtl, network, optparse-applicative
+     , process, regex-pcre-builtin, scientific, simple-log
+     , sqlite-simple, stm, syb, template-haskell, text, text-region
+     , time, transformers, transformers-base, traverse-with-class
+     , uniplate, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.1.3";
-       sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj";
+       version = "0.3.1.4";
+       sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array async attoparsec base bytestring Cabal
          containers cpphs data-default deepseq direct-sqlite directory
          exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils
-         haddock-api haskell-names haskell-src-exts hdocs hformat hlint HTTP
-         lens lifted-base mmorph monad-control monad-loops mtl network
-         optparse-applicative process regex-pcre-builtin scientific
-         simple-log sqlite-simple stm syb template-haskell text text-region
-         time transformers transformers-base uniplate unix
+         haddock-api haddock-library haskell-names haskell-src-exts hdocs
+         hformat hlint HTTP lens lifted-base mmorph monad-control
+         monad-loops mtl network optparse-applicative process
+         regex-pcre-builtin scientific simple-log sqlite-simple stm syb
+         template-haskell text text-region time transformers
+         transformers-base traverse-with-class uniplate unix
          unordered-containers vector
        ];
        executableHaskellDepends = [
@@ -109447,7 +107892,6 @@ self: {
        ];
        description = "A command line program for extending the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsini" = callPackage
@@ -109654,10 +108098,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-aeson";
-       version = "0.3.0.1";
-       sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w";
-       revision = "1";
-       editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp";
+       version = "0.3.0.2";
+       sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2";
        libraryHaskellDepends = [
          aeson base hashable hslua scientific text unordered-containers
          vector
@@ -110025,7 +108467,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec" = callPackage
+  "hspec_2_4_8" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
@@ -110045,17 +108487,18 @@ self: {
        ];
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec_2_5_1" = callPackage
+  "hspec" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.1";
-       sha256 = "1hip8937prrvkdp63jwicg80b9fpj1yb4rfwl68jd76x2j15hyyl";
+       version = "2.5.4";
+       sha256 = "19shs06srgq4j3mm0lz09yxqn7hzq4pnyl32wmi9nf2a7s3xwlm8";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -110067,7 +108510,6 @@ self: {
        ];
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -110104,30 +108546,15 @@ self: {
     ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
        pname = "hspec-contrib";
-       version = "0.4.0";
-       sha256 = "05hchslqqg0k5ksrgy3n8gay0xxnr1zjp4zfj4zp4v0pxq0j57kg";
-       revision = "2";
-       editedCabalFile = "029h7dl49vlrhn62v8kgk8zdavjjc80ga1m8fwhl0pnmvnfkn7sq";
-       libraryHaskellDepends = [ base hspec-core HUnit ];
-       testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
-       description = "Contributed functionality for Hspec";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-contrib_0_5_0" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
-     mkDerivation {
-       pname = "hspec-contrib";
        version = "0.5.0";
        sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core" = callPackage
+  "hspec-core_2_4_8" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, hspec-meta, HUnit
      , process, QuickCheck, quickcheck-io, random, setenv, silently, stm
@@ -110151,9 +108578,10 @@ self: {
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core_2_5_1" = callPackage
+  "hspec-core" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -110161,8 +108589,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.1";
-       sha256 = "0yfw5rxyh830sb4l0zmsvjyanlg4q20y9hd90d3np5qwhpz4b3p8";
+       version = "2.5.4";
+       sha256 = "1r9h59nqdl3bx4ka1f7fwp9b6724vs1260aa0a9xn18xkabkm72q";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -110177,7 +108605,6 @@ self: {
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-dirstream" = callPackage
@@ -110198,7 +108625,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hspec-discover" = callPackage
+  "hspec-discover_2_4_8" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
@@ -110214,15 +108641,16 @@ self: {
        ];
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-discover_2_5_1" = callPackage
+  "hspec-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.1";
-       sha256 = "0a3j58jxfv9i15shifhmm7i6i0xd9p4pd3grm4my5c80nhsps61w";
+       version = "2.5.4";
+       sha256 = "1wzf6gf7qfq0n045gq4rpr5vs5g6rnwd3i6c4fmaza0k7pxd9znl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -110232,7 +108660,6 @@ self: {
        ];
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -110288,6 +108715,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -110342,27 +108770,6 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-golden-aeson";
-       version = "0.5.1.0";
-       sha256 = "0d3ww44c0al841j6z5w6br1qa91v5nr0lfbzaa4cdydynvi4s6lq";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath hspec
-         QuickCheck quickcheck-arbitrary-adt random transformers
-       ];
-       testHaskellDepends = [
-         aeson base directory hspec hspec-core QuickCheck
-         quickcheck-arbitrary-adt silently transformers
-       ];
-       description = "Use tests to monitor changes in Aeson serialization";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-golden-aeson_0_7_0_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
-     , random, silently, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-golden-aeson";
        version = "0.7.0.0";
        sha256 = "18jc992dhln1v5sfg8yjfsm2i5c7c38ph3bxrjxgc9bl7fzcsk0i";
        libraryHaskellDepends = [
@@ -110375,7 +108782,6 @@ self: {
        ];
        description = "Use tests to monitor changes in Aeson serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-hashable" = callPackage
@@ -110594,24 +109000,6 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit
-     , QuickCheck, smallcheck
-     }:
-     mkDerivation {
-       pname = "hspec-smallcheck";
-       version = "0.5.0";
-       sha256 = "0lff095qm855y7dd055c4h5ip8lcx1i6pady2b81fby4wgf78g1m";
-       libraryHaskellDepends = [
-         base call-stack hspec-core HUnit smallcheck
-       ];
-       testHaskellDepends = [
-         base call-stack hspec hspec-core HUnit QuickCheck smallcheck
-       ];
-       description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-smallcheck_0_5_2" = callPackage
     ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core
      , HUnit, QuickCheck, smallcheck
      }:
@@ -110628,7 +109016,6 @@ self: {
        ];
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-snap" = callPackage
@@ -110674,6 +109061,7 @@ self: {
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -110774,6 +109162,7 @@ self: {
        ];
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec2" = callPackage
@@ -110798,6 +109187,7 @@ self: {
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspkcs11" = callPackage
@@ -111226,6 +109616,7 @@ self: {
        ];
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstats" = callPackage
@@ -111593,8 +109984,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsyslog-udp";
-       version = "0.2.2";
-       sha256 = "1fr8cn3jwasnp9q23q5pmz3z6zh7z04jhcv77igacwpgw0729hd4";
+       version = "0.2.3";
+       sha256 = "1gmnyiqd7abh7b4vk9y24s9r0jgfvqd8jqpz9f1p97yidzic8gzh";
        libraryHaskellDepends = [
          base bytestring hsyslog network text time unix
        ];
@@ -111618,24 +110009,6 @@ self: {
 
   "htaglib" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, hspec
-     , taglib, text, transformers
-     }:
-     mkDerivation {
-       pname = "htaglib";
-       version = "1.1.1";
-       sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3";
-       revision = "1";
-       editedCabalFile = "0znih19z9ly4m1nadwkalq28xz0vy6pc0yyamyz2fz5s5nv69lr0";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base bytestring text transformers ];
-       librarySystemDepends = [ taglib ];
-       testHaskellDepends = [ base directory filepath hspec ];
-       description = "Bindings to TagLib, audio meta-data library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) taglib;};
-
-  "htaglib_1_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, hspec
      , hspec-discover, taglib, text, transformers
      }:
      mkDerivation {
@@ -111649,7 +110022,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -111780,6 +110152,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "html-charset" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, charsetdetect-ae
+     , doctest, doctest-discover, hlint, optparse-applicative
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "html-charset";
+       version = "0.1.0";
+       sha256 = "05d0syzpxbr3y8hkk35pfpsfm8gwg5zwb72l89frrl7i6cv1b24i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring charsetdetect-ae
+       ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative
+       ];
+       testHaskellDepends = [
+         base bytestring doctest doctest-discover hlint QuickCheck
+       ];
+       description = "Determine character encoding of HTML documents/fragments";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {};
+
   "html-conduit_1_2_1_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, hspec, HUnit, resourcet, tagstream-conduit, text
@@ -111802,20 +110198,20 @@ self: {
      }) {};
 
   "html-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, containers, hspec
-     , HUnit, resourcet, tagstream-conduit, text, transformers
-     , xml-conduit, xml-types
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
+     , transformers, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "html-conduit";
-       version = "1.3.0";
-       sha256 = "15pf15w55g39h2fwl4wlq1f0jbfknajb6qyk1l7xv6q7fphhkgvq";
+       version = "1.3.1";
+       sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
        libraryHaskellDepends = [
-         base bytestring conduit containers resourcet tagstream-conduit text
-         transformers xml-conduit xml-types
+         attoparsec base bytestring conduit conduit-extra containers
+         resourcet text transformers xml-conduit xml-types
        ];
        testHaskellDepends = [
-         base bytestring containers hspec HUnit xml-conduit
+         base bytestring containers deepseq hspec HUnit text xml-conduit
        ];
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
@@ -111854,14 +110250,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "html-entity" = callPackage
+    ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, doctest
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "html-entity";
+       version = "0.1.3.0";
+       sha256 = "07l7pz28gck0zwq8mk4gnmvpcc4nf9zkrw6mrkrlx9csjha2khpc";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec base text unordered-containers
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "HTML entity decoding and encoding for Text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "html-entity-map" = callPackage
     ({ mkDerivation, base, criterion, text, unordered-containers }:
      mkDerivation {
        pname = "html-entity-map";
        version = "0.1.0.0";
        sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq";
-       revision = "2";
-       editedCabalFile = "1ycg39ys6zzfi6j88l03gdyyzwjpfzzlzy7dbs6i8p1l70ywizfr";
+       revision = "3";
+       editedCabalFile = "0aj61kpf39rhn4d7nk3vwq933b826ywhwklw479y9nkczac5lpz8";
        libraryHaskellDepends = [ base text unordered-containers ];
        benchmarkHaskellDepends = [
          base criterion text unordered-containers
@@ -111879,6 +110295,7 @@ self: {
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-minimalist" = callPackage
@@ -111914,6 +110331,7 @@ self: {
        ];
        description = "A high-performance HTML tokenizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-rules" = callPackage
@@ -112053,8 +110471,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "2.0.0.0";
-       sha256 = "0szpk1zszpvd0hs4jljjnlrr60159b33rqxhb1bgbbap2nxzxsgs";
+       version = "2.0.0.2";
+       sha256 = "1z0p35l2rjclxkmbvwg6fcfx50ibfd6v7gia5wbnkbgh3cwyp19d";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -112114,6 +110532,7 @@ self: {
        ];
        description = "Parse XML files from The Sports Network feed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htsn-common" = callPackage
@@ -112175,32 +110594,6 @@ self: {
      , Cabal, cabal-doctest, containers, directory, doctest, filepath
      , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
-     , unordered-containers, uri-bytestring, uuid, uuid-types
-     }:
-     mkDerivation {
-       pname = "http-api-data";
-       version = "0.3.7.2";
-       sha256 = "10kcpxl9m1q2dl4z2ig6ysrhrdmdg35skfh8kwx0h7f0n7d6wlb8";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         attoparsec attoparsec-iso8601 base bytestring containers hashable
-         http-types text time time-locale-compat unordered-containers
-         uri-bytestring uuid-types
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hspec HUnit QuickCheck
-         quickcheck-instances text time unordered-containers uuid
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_3_8_1" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
-     , Cabal, cabal-doctest, containers, directory, doctest, filepath
-     , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
-     , quickcheck-instances, text, time, time-locale-compat
      , unordered-containers, uri-bytestring, uuid-types
      }:
      mkDerivation {
@@ -112220,7 +110613,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -112244,10 +110636,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.12.1";
-       sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab";
-       revision = "1";
-       editedCabalFile = "03x2ms2nl3jjm2sfk8dwy02v920czhmdlkyfy3kqc1sg4nw2134y";
+       version = "0.5.13.1";
+       sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1";
        libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive containers
          cookie deepseq exceptions filepath ghc-prim http-types memory
@@ -112303,8 +110693,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-extra";
-       version = "0.1.2.0";
-       sha256 = "087qwyg2ws3fz26ghys4vafdcbkfx6bxsz1pzni8102ynk3hwn5m";
+       version = "0.1.3.0";
+       sha256 = "112x03s2iqdbp6gpa7hmsnjl86s8cpmpb82n4fxiy9d3rbp72a0j";
        libraryHaskellDepends = [
          aeson array base base64-bytestring blaze-builder bytestring
          case-insensitive containers data-default exceptions http-client
@@ -112359,6 +110749,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-openssl_0_2_2_0" = callPackage
+    ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types
+     , network
+     }:
+     mkDerivation {
+       pname = "http-client-openssl";
+       version = "0.2.2.0";
+       sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn";
+       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
+       testHaskellDepends = [
+         base HsOpenSSL hspec http-client http-types
+       ];
+       doCheck = false;
+       description = "http-client backend using the OpenSSL library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-request-modifiers" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, http-client
      , http-media, http-types, network, network-uri
@@ -112376,6 +110784,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-client-restricted" = callPackage
+    ({ mkDerivation, base, connection, data-default, http-client
+     , http-client-tls, network, utf8-string
+     }:
+     mkDerivation {
+       pname = "http-client-restricted";
+       version = "0.0.1";
+       sha256 = "0n4rmi30hlppgfz1vfqmcnqxrk1qfg2f05chdvniiq7l94id0kcw";
+       libraryHaskellDepends = [
+         base connection data-default http-client http-client-tls network
+         utf8-string
+       ];
+       description = "restricting the servers that http-client will use";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "http-client-session" = callPackage
     ({ mkDerivation, base-prelude, bytestring, either, http-client
      , mtl-prelude
@@ -112490,8 +110914,10 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.3.1";
-       sha256 = "0nbq3xklz5nfc4k50qj413q2acwcbs0g5am4pncbjhiamgqc6lc2";
+       version = "2.3.2";
+       sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km";
+       revision = "1";
+       editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra http-client
          http-client-tls http-types mtl resourcet transformers unliftio-core
@@ -112882,6 +111308,7 @@ self: {
        ];
        description = "The HTTP query builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-response-decoder" = callPackage
@@ -112905,33 +111332,6 @@ self: {
      }) {};
 
   "http-reverse-proxy" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, containers
-     , data-default-class, hspec, http-client, http-conduit, http-types
-     , lifted-base, monad-control, network, resourcet, streaming-commons
-     , text, transformers, wai, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "http-reverse-proxy";
-       version = "0.5.0.1";
-       sha256 = "1fl4gsp5743a7kzd12d7r3mwyvdq3fb7ngxlkywzphjlx61asl2y";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive conduit
-         conduit-extra containers data-default-class http-client http-types
-         lifted-base monad-control network resourcet streaming-commons text
-         transformers wai wai-logger word8
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra hspec
-         http-conduit http-types lifted-base network resourcet
-         streaming-commons transformers wai warp
-       ];
-       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "http-reverse-proxy_0_6_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , conduit, conduit-extra, containers, hspec, http-client
      , http-conduit, http-types, network, resourcet, streaming-commons
@@ -112953,7 +111353,6 @@ self: {
        ];
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-server" = callPackage
@@ -113136,6 +111535,23 @@ self: {
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "http2-client-grpc" = callPackage
+    ({ mkDerivation, base, binary, bytestring, data-default-class
+     , http2, http2-client, proto-lens, proto-lens-protoc, text, zlib
+     }:
+     mkDerivation {
+       pname = "http2-client-grpc";
+       version = "0.1.0.0";
+       sha256 = "11ckgp56k6ypk4smc91909gs8cvlbqji8blsr48k8fbclhi5cqwv";
+       libraryHaskellDepends = [
+         base binary bytestring data-default-class http2 http2-client
+         proto-lens proto-lens-protoc text zlib
+       ];
+       testHaskellDepends = [ base ];
+       description = "Implement gRPC-over-HTTP2 clients";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -113145,6 +111561,8 @@ self: {
        pname = "httpd-shed";
        version = "0.4.0.3";
        sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
+       revision = "1";
+       editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network network-uri ];
@@ -113265,6 +111683,7 @@ self: {
        libraryHaskellDepends = [ base containers haxr mtl ];
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hubris" = callPackage
@@ -113410,6 +111829,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "human-readable-duration" = callPackage
@@ -113434,6 +111854,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hums" = callPackage
@@ -113481,32 +111902,19 @@ self: {
        ];
        description = "CSS-like syntax for file system manipulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.1.0.3";
-       sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl";
+       version = "1.2.0.6";
+       sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_3" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
-       version = "1.2.0.3";
-       sha256 = "1qja9warghakl06fv5v7fimb3bqnb38lhs9y264x9hrc7i0nx2xj";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -113692,6 +112100,7 @@ self: {
        ];
        description = "Upload packages or documentation to a hackage server";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hurdle" = callPackage
@@ -113854,6 +112263,7 @@ self: {
        libraryHaskellDepends = [ aeson base text vector ];
        description = "Create Vega and Vega-Lite visualizations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-balancedparens" = callPackage
@@ -113876,7 +112286,6 @@ self: {
        ];
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-bits" = callPackage
@@ -113908,6 +112317,8 @@ self: {
        pname = "hw-conduit";
        version = "0.2.0.3";
        sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a";
+       revision = "1";
+       editedCabalFile = "0zr1r7px2qgpf5fgq18l6ziy2xaz773qbxc87cp84x0vpwas0yg7";
        libraryHaskellDepends = [
          array base bytestring conduit conduit-combinators time word8
        ];
@@ -113932,36 +112343,36 @@ self: {
 
   "hw-dsv" = callPackage
     ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion
-     , directory, hedgehog, hspec, hspec-discover, hw-bits
+     , deepseq, directory, hedgehog, hspec, hspec-discover, hw-bits
      , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base
      , lens, mmap, optparse-applicative, resourcet, text, vector, weigh
      }:
      mkDerivation {
        pname = "hw-dsv";
-       version = "0.1.0.0";
-       sha256 = "1qyqvb4ky4fl0hys1yihn54xxmh1ajnb81szgsv8crh1idvx0fil";
-       revision = "1";
-       editedCabalFile = "0g99dyjx8vrhm9rdblla1gwd1z1p7fpaddq21y56k5bfg9zjcivw";
+       version = "0.2.1";
+       sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bits-extra bytestring hw-bits hw-prim hw-rankselect
+         base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
          hw-rankselect-base vector
        ];
        executableHaskellDepends = [
-         base bits-extra bytestring hedgehog hw-bits hw-prim hw-rankselect
-         hw-rankselect-base lens optparse-applicative resourcet vector
+         base bits-extra bytestring deepseq hedgehog hw-bits hw-prim
+         hw-rankselect hw-rankselect-base lens optparse-applicative
+         resourcet vector
        ];
        testHaskellDepends = [
-         base bits-extra bytestring cassava directory hedgehog hspec hw-bits
-         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text
-         vector weigh
+         base bits-extra bytestring cassava deepseq directory hedgehog hspec
+         hw-bits hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base
+         text vector weigh
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
-         base bits-extra bytestring cassava criterion directory hw-bits
-         hw-prim hw-rankselect hw-rankselect-base mmap vector weigh
+         base bits-extra bytestring cassava criterion deepseq directory
+         hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector
        ];
+       description = "Unbelievably fast streaming DSV file parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -114000,7 +112411,6 @@ self: {
        ];
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-fingertree" = callPackage
@@ -114102,6 +112512,8 @@ self: {
        pname = "hw-json";
        version = "0.6.0.0";
        sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv";
+       revision = "1";
+       editedCabalFile = "18w22jnsjv8f4k2q3548vdzl80p4r80pn96rnp69f6l36ibmx771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114129,7 +112541,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -114163,34 +112574,32 @@ self: {
        ];
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-kafka-avro" = callPackage
     ({ mkDerivation, aeson, avro, base, binary, bytestring, cache
-     , containers, errors, hashable, hspec, http-client, http-types, mtl
-     , pure-zlib, QuickCheck, semigroups, servant, servant-client
-     , tagged, text, transformers, unordered-containers
+     , containers, errors, hashable, hspec, http-client, http-types
+     , lens, mtl, pure-zlib, QuickCheck, semigroups, tagged, text
+     , transformers, unordered-containers, wreq
      }:
      mkDerivation {
        pname = "hw-kafka-avro";
-       version = "1.4.0";
-       sha256 = "19lk0vyrl6hcd8f053yh7m1hym2hqs9srhjq9isq19s8nqgpijc4";
+       version = "2.1.0";
+       sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson avro base binary bytestring cache containers errors hashable
-         http-client http-types mtl pure-zlib semigroups servant
-         servant-client tagged text transformers unordered-containers
+         http-client http-types lens mtl pure-zlib semigroups tagged text
+         transformers unordered-containers wreq
        ];
        testHaskellDepends = [
          aeson avro base binary bytestring cache containers errors hashable
-         hspec http-client mtl pure-zlib QuickCheck semigroups servant
-         servant-client text transformers unordered-containers
+         hspec http-client mtl pure-zlib QuickCheck semigroups text
+         transformers unordered-containers
        ];
        description = "Avro support for Kafka infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-kafka-client" = callPackage
@@ -114292,28 +112701,6 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.5.0.5";
-       sha256 = "1bl1jfdcp8vpl83qcnq168rnvmpl4kxz7mv94vzal8mi2sw7iilk";
-       revision = "1";
-       editedCabalFile = "0i40x22z95zdzhnz0kz8nlaajdykviplgyyxh4v21z0i69xqlxgr";
-       libraryHaskellDepends = [ base bytestring mmap vector ];
-       testHaskellDepends = [
-         base bytestring directory exceptions hedgehog hspec
-         hw-hspec-hedgehog mmap QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion mmap vector
-       ];
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_6_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
-     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
        version = "0.6.2.0";
        sha256 = "0pafq65nx222innl45k4s5qdavbh4yrsky1q6l1dzpbqdsxx28nx";
        revision = "1";
@@ -114328,7 +112715,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -114349,7 +112735,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect" = callPackage
@@ -114383,21 +112768,19 @@ self: {
        ];
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-rankselect_0_12_0_2" = callPackage
+  "hw-rankselect_0_12_0_3" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
-     , directory, hedgehog, hspec, hw-balancedparens, hw-bits
-     , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
-     , mmap, mtl, optparse-applicative, QuickCheck, resourcet, vector
+     , directory, hedgehog, hspec, hspec-discover, hw-balancedparens
+     , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim
+     , hw-rankselect-base, lens, mmap, mtl, optparse-applicative
+     , QuickCheck, resourcet, transformers, vector
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.12.0.2";
-       sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk";
-       revision = "1";
-       editedCabalFile = "0wggs7k8b0syivi3lyz6qplkiqb11im94bqhhbn6dqikf5sv6qv7";
+       version = "0.12.0.3";
+       sha256 = "0qngw9dw15km09z69hrdlyav89s1kbmmml9791m2iwzk4ckd0yhi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114410,8 +112793,9 @@ self: {
        ];
        testHaskellDepends = [
          base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
-         hw-prim hw-rankselect-base mmap QuickCheck vector
+         hw-prim hw-rankselect-base mmap QuickCheck transformers vector
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bytestring conduit criterion directory hw-bits hw-prim
          hw-rankselect-base mmap resourcet vector
@@ -114422,28 +112806,6 @@ self: {
      }) {};
 
   "hw-rankselect-base" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim
-     , hw-string-parse, QuickCheck, safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-rankselect-base";
-       version = "0.2.0.2";
-       sha256 = "0yp2p87ijvb8lbh0spw1yjk10sq8gaa1iv517iy4fbxfjzdqhkyy";
-       libraryHaskellDepends = [
-         base hw-bits hw-int hw-prim hw-string-parse safe vector
-       ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion hw-bits hw-prim vector
-       ];
-       description = "Rank-select base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-rankselect-base_0_3_2_0" = callPackage
     ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec
      , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
@@ -114464,7 +112826,6 @@ self: {
        ];
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -114495,7 +112856,6 @@ self: {
        ];
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-vector" = callPackage
@@ -114547,7 +112907,6 @@ self: {
        ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -115357,6 +113716,7 @@ self: {
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hylogen" = callPackage
@@ -115426,6 +113786,7 @@ self: {
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-extra" = callPackage
@@ -115460,6 +113821,7 @@ self: {
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperdrive" = callPackage
@@ -115522,6 +113884,7 @@ self: {
        ];
        description = "Reliable performance measurement with robust data export";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperloglog" = callPackage
@@ -115547,7 +113910,6 @@ self: {
        ];
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperloglogplus" = callPackage
@@ -115592,7 +113954,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Text hyphenation algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyphenation" = callPackage
@@ -115603,8 +113964,8 @@ self: {
        pname = "hyphenation";
        version = "0.7.1";
        sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52";
-       revision = "2";
-       editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk";
+       revision = "4";
+       editedCabalFile = "0pp7qm40alsfd9z5dvp6l2c7dp9zp0skl9g0iib3jahxs3n8qcrr";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -115647,6 +114008,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hyraxAbif" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, filepath
+     , hedgehog, hscolour, pretty-show, protolude, text
+     }:
+     mkDerivation {
+       pname = "hyraxAbif";
+       version = "0.2.3.5";
+       sha256 = "09csc3bm2il2hwglc1vvbz1pik4di5d7xwl9vfl5ahjkqdjlczzk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring directory filepath protolude text
+       ];
+       executableHaskellDepends = [
+         base bytestring hscolour pretty-show protolude text
+       ];
+       testHaskellDepends = [
+         base binary bytestring hedgehog protolude text
+       ];
+       description = "Modules for parsing, generating and manipulating AB1 files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hzaif" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, text }:
      mkDerivation {
@@ -115682,13 +114066,14 @@ self: {
      }:
      mkDerivation {
        pname = "hzenity";
-       version = "0.1";
-       sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk";
+       version = "0.2";
+       sha256 = "1ckc95a9hn8blv8yqdgpcs41wdk1j3mydy5pj41cl73jkir18a0f";
        libraryHaskellDepends = [
          base containers data-default process process-extras text time
        ];
        description = "Haskell interface to Zenity dialogs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hzk" = callPackage
@@ -115857,6 +114242,8 @@ self: {
        pname = "ical";
        version = "0.0.1";
        sha256 = "10nqlypcv7rpc8q83rjhpb2n3sfqfx6p3xhf123hmacs4ks5vr7m";
+       revision = "1";
+       editedCabalFile = "0sxh3m5iscf1kdkmc8bqgb8snn878ljm962h0f1sgx8z72avawr9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115878,7 +114265,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Package for handling icon fonts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iconv" = callPackage
@@ -115906,6 +114292,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend" = callPackage
@@ -116434,6 +114821,7 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "igraph" = callPackage
@@ -116516,7 +114904,6 @@ self: {
        ];
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -116572,7 +114959,6 @@ self: {
        ];
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -116618,6 +115004,7 @@ self: {
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-inline-r" = callPackage
@@ -116635,6 +115022,7 @@ self: {
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -116727,6 +115115,7 @@ self: {
        ];
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihs" = callPackage
@@ -116897,8 +115286,8 @@ self: {
      }:
      mkDerivation {
        pname = "imap";
-       version = "0.3.0.7";
-       sha256 = "0d5g1fiyfp1d207fjkpyfnp6hi5hdf1jsh50a06mrcdb8dawpbqa";
+       version = "0.3.0.8";
+       sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers either exceptions
          hslogger list-t network pipes random rolling-queue stm stm-delay
@@ -116986,6 +115375,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Animation Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imj-base" = callPackage
@@ -117010,6 +115400,7 @@ self: {
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imj-game-hamazed" = callPackage
@@ -117030,6 +115421,7 @@ self: {
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imj-measure-stdout" = callPackage
@@ -117045,6 +115437,7 @@ self: {
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imj-prelude" = callPackage
@@ -117056,62 +115449,45 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
-     , blaze-html, blaze-markup, bytestring, case-insensitive
-     , chunked-data, comonad, conduit, conduit-combinators, connection
-     , containers, directory, dyre, fast-logger, filepath, free
-     , hashable, HaskellNet, HaskellNet-SSL, http-client
-     , http-client-tls, http-types, microlens, mime-mail
-     , mono-traversable, monoid-subclasses, network, opml-conduit
-     , optparse-applicative, rainbow, rainbox, rss-conduit
-     , safe-exceptions, tagged, text, time, timerep, tls, transformers
-     , uri-bytestring, xml, xml-conduit, xml-types
+    ({ mkDerivation, aeson, atom-conduit, base, blaze-html
+     , blaze-markup, bytestring, case-insensitive, conduit, connection
+     , containers, directory, dyre, fast-logger, filepath, hashable
+     , HaskellNet, HaskellNet-SSL, http-client, http-client-tls
+     , http-types, lifted-base, microlens, mime-mail, monad-time
+     , mono-traversable, monoid-subclasses, mtl, network, opml-conduit
+     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+     , rss-conduit, safe-exceptions, stm, streaming-bytestring
+     , streaming-with, streamly, text, time, timerep, tls, transformers
+     , transformers-base, uri-bytestring, xml, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "imm";
-       version = "1.2.1.0";
-       sha256 = "0m869l6z50zf57hfy28ad70id3phfqjwkna64m59yycvcqlkj064";
+       version = "1.3.0.0";
+       sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup
-         bytestring case-insensitive chunked-data comonad conduit
-         conduit-combinators connection containers directory dyre
-         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
-         http-client http-client-tls http-types microlens mime-mail
-         mono-traversable monoid-subclasses network opml-conduit
-         optparse-applicative rainbow rainbox rss-conduit safe-exceptions
-         tagged text time timerep tls transformers uri-bytestring xml
-         xml-conduit xml-types
+         aeson atom-conduit base blaze-html blaze-markup bytestring
+         case-insensitive conduit connection containers directory dyre
+         fast-logger filepath hashable HaskellNet HaskellNet-SSL http-client
+         http-client-tls http-types lifted-base microlens mime-mail
+         monad-time mono-traversable monoid-subclasses mtl network
+         opml-conduit optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal rss-conduit safe-exceptions stm
+         streaming-bytestring streaming-with streamly text time timerep tls
+         transformers transformers-base uri-bytestring xml xml-conduit
+         xml-types
        ];
-       executableHaskellDepends = [ base free ];
+       executableHaskellDepends = [ base ];
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
-    ({ mkDerivation, base, lifted-base, monad-control, stm, tasty
-     , tasty-hunit, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "immortal";
-       version = "0.2.2.1";
-       sha256 = "13lddk62byx8w41k80d24q31mmijacnqqz64zrrkls9si2ia2jpd";
-       libraryHaskellDepends = [
-         base lifted-base monad-control stm transformers-base
-       ];
-       testHaskellDepends = [
-         base lifted-base stm tasty tasty-hunit transformers
-       ];
-       description = "Spawn threads that never die (unless told to do so)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "immortal_0_3" = callPackage
     ({ mkDerivation, base, stm, tasty, tasty-hunit, transformers
      , unliftio-core
      }:
@@ -117123,7 +115499,6 @@ self: {
        testHaskellDepends = [ base stm tasty tasty-hunit transformers ];
        description = "Spawn threads that never die (unless told to do so)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imparse" = callPackage
@@ -117224,7 +115599,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion parsec random ];
        description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "implicit-logging" = callPackage
@@ -117303,12 +115677,11 @@ self: {
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "impossible";
-       version = "1.1.2";
-       sha256 = "13iwy9pn3w3whg8hqy83mgbzcb156pz88nfcx4axkw9hpkh4810s";
+       version = "1.1.3";
+       sha256 = "01p9s6nzzlmgg1gr42ys6wkxnzp1jqs3ay8jz5lbm1nkbjlabs4n";
        libraryHaskellDepends = [ base lens ];
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imprevu" = callPackage
@@ -117388,8 +115761,8 @@ self: {
      }:
      mkDerivation {
        pname = "impure-containers";
-       version = "0.4.3";
-       sha256 = "003r3ppwdwndg8q84bnh299f04b88bhnxxl65nbrz9xl77lfz2y0";
+       version = "0.5.0";
+       sha256 = "0rwk7wsymga61192mmjj42079v209dj9gdcjpwjmji1ivxwzy13p";
        libraryHaskellDepends = [
          base containers ghc-prim hashable primitive vector
        ];
@@ -117398,8 +115771,9 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers vector
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       description = "Mutable containers in haskell";
+       description = "Mutable containers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inc-ref" = callPackage
@@ -117462,6 +115836,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental" = callPackage
@@ -117527,26 +115902,6 @@ self: {
      }:
      mkDerivation {
        pname = "incremental-parser";
-       version = "0.2.5.4";
-       sha256 = "0891m40bl9jlblfg3wf6fi3bgzfl9d8lhmab5s755mpp1bw9gr6w";
-       libraryHaskellDepends = [ base monoid-subclasses ];
-       testHaskellDepends = [
-         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq monoid-subclasses text
-       ];
-       description = "Generic parser library capable of providing partial results from partial input";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "incremental-parser_0_3_1_1" = callPackage
-    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
-     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "incremental-parser";
        version = "0.3.1.1";
        sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
        libraryHaskellDepends = [ base monoid-subclasses ];
@@ -117558,7 +115913,6 @@ self: {
        ];
        description = "Generic parser library capable of providing partial results from partial input";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -117606,6 +115960,7 @@ self: {
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-core" = callPackage
@@ -117647,6 +116002,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentparser" = callPackage
@@ -117666,8 +116022,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
      mkDerivation {
        pname = "indents";
-       version = "0.4.0.1";
-       sha256 = "0zv8mzn6r14fjgm2llg3babzgdfdkb97r2avj34lfjzmql4yrkql";
+       version = "0.5.0.0";
+       sha256 = "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n";
        libraryHaskellDepends = [ base mtl parsec ];
        testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
        description = "indentation sensitive parser-combinators for parsec";
@@ -117735,18 +116091,6 @@ self: {
      }) {};
 
   "indexed-list-literals" = callPackage
-    ({ mkDerivation, base, OneTuple }:
-     mkDerivation {
-       pname = "indexed-list-literals";
-       version = "0.1.0.1";
-       sha256 = "1l38x0s90gfsrfz43k9sx0xbv4pg93m2pfm6hy3rk52wdxrw0qad";
-       libraryHaskellDepends = [ base OneTuple ];
-       testHaskellDepends = [ base ];
-       description = "Type safe indexed list literals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "indexed-list-literals_0_2_1_1" = callPackage
     ({ mkDerivation, base, hspec, Only }:
      mkDerivation {
        pname = "indexed-list-literals";
@@ -117756,7 +116100,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Type safe indexed list literals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indextype" = callPackage
@@ -117769,6 +116112,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indian-language-font-converter" = callPackage
@@ -117951,41 +116295,14 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
-     , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th
-     , template-haskell, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
-       version = "1.3.0.1";
-       sha256 = "08i7bflcmvg5s4r5hv1xxd5niyq5irnawnjwmbz7w3ys0ink1bfl";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit
-         tasty-quickcheck tasty-th template-haskell text vector
-       ];
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_6_0_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, clock, containers, doctest, foldl, http-client
-     , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
      , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck
      , tasty-th, template-haskell, text, time, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.0.2";
-       sha256 = "0f5lcwvs4cw7ipqw3da5baf2sw4m1a7g29iw3big5m93wc2flk38";
+       version = "1.6.0.6";
+       sha256 = "1wdr7a0h6c8zg63bzvv1172fi71bdnj1wxpmf52n0z6ygs3n83l7";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -118000,7 +116317,6 @@ self: {
        ];
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -118076,6 +116392,28 @@ self: {
        ];
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "inj" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "inj";
+       version = "1.0";
+       sha256 = "1dhssqy5369vzcxkkrv8bi5bjz0z67dawwzc27mz9m40bq7324j0";
+       description = "A class for injective (one-to-one) functions";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
+  "inj-base" = callPackage
+    ({ mkDerivation, base, inj }:
+     mkDerivation {
+       pname = "inj-base";
+       version = "0.1.0.0";
+       sha256 = "1mxpx2lw7vxjr3mynxx90a49qavsmkf71afqshd2h4xz1kxnjnjh";
+       libraryHaskellDepends = [ base inj ];
+       description = "'Inj' instances for 'base'";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "inject" = callPackage
@@ -118144,31 +116482,6 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.6";
-       sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring containers hashable mtl parsec
-         parsers template-haskell transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
-         raw-strings-qq regex-posix template-haskell transformers
-         unordered-containers vector
-       ];
-       description = "Write Haskell source files including C code inline. No FFI required.";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inline-c_0_6_1_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
-     , regex-posix, template-haskell, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "inline-c";
        version = "0.6.1.0";
        sha256 = "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h";
        isLibrary = true;
@@ -118184,7 +116497,6 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-c-cpp_0_1_0_0" = callPackage
@@ -118206,22 +116518,6 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.2.1.0";
-       sha256 = "02m7w3n9rjynirniplp2gc2vy7c1jyalsqznh5mz366ps6vr19ip";
-       libraryHaskellDepends = [
-         base inline-c safe-exceptions template-haskell
-       ];
-       testHaskellDepends = [ base hspec inline-c safe-exceptions ];
-       description = "Lets you embed C++ code into Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inline-c-cpp_0_2_2_1" = callPackage
-    ({ mkDerivation, base, hspec, inline-c, safe-exceptions
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "inline-c-cpp";
        version = "0.2.2.1";
        sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
        libraryHaskellDepends = [
@@ -118230,7 +116526,6 @@ self: {
        testHaskellDepends = [ base hspec inline-c safe-exceptions ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-c-win32" = callPackage
@@ -118255,8 +116550,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.8.2";
-       sha256 = "0f38w4p29xzrzqjdn2r3yfh2m9iai6dwbj52jhrliiy87gnvwwmy";
+       version = "0.8.3";
+       sha256 = "01xg2ml1khdns5w30n83ibl3k0lc2ym7n0dgvkxgy17b5m8r6kbb";
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath ghc jni jvm language-java
          mtl process template-haskell temporary text
@@ -118264,6 +116559,7 @@ self: {
        testHaskellDepends = [ base hspec jni jvm text ];
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-r" = callPackage
@@ -118277,8 +116573,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-r";
-       version = "0.9.1";
-       sha256 = "1wpvyagc56yjkxvaw7a64gl2i4qfn4cgb47nx53pc6wcph7cyras";
+       version = "0.9.2";
+       sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default-class deepseq
          exceptions inline-c mtl pretty primitive process reflection setenv
@@ -118298,6 +116594,7 @@ self: {
        ];
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) R;};
 
   "inliterate" = callPackage
@@ -118344,8 +116641,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.1.0";
        sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
-       revision = "6";
-       editedCabalFile = "0dna826vhnal6m213llszn68phjs27pd43f7s8wdhdmjdx1nzk72";
+       revision = "8";
+       editedCabalFile = "0ry5jsyimf1dx6013k1bhvsy3vjpg94q7z0sy9yxhmfdf16zb1fa";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -118404,6 +116701,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inspection-testing_0_3" = callPackage
+    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "inspection-testing";
+       version = "0.3";
+       sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al";
+       libraryHaskellDepends = [
+         base containers ghc mtl template-haskell transformers
+       ];
+       testHaskellDepends = [ base ];
+       description = "GHC plugin to do inspection testing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inspector-wrecker" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , connection, data-default, http-client, http-client-tls
@@ -118553,6 +116867,7 @@ self: {
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instrument-chord" = callPackage
@@ -118831,8 +117146,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.31";
-       sha256 = "0d6pc7mza12889wbzxy7gb5fb86v3b5pm2cdvcvnh6gd6x4ii336";
+       version = "0.1.32";
+       sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -118956,16 +117271,18 @@ self: {
      }) {};
 
   "interprocess" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, typed-process }:
      mkDerivation {
        pname = "interprocess";
-       version = "0.1.0.0";
-       sha256 = "13bxwgzbqb2ih76j5il5l6fqaq9lxl7c6h7r0y6hlpzm9f9izcpa";
+       version = "0.2.0.1";
+       sha256 = "1s8q8nvd7x55vzvgbj0clfcjl1wh5xy04hxrqj1qz6gg0irm2iq8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base typed-process ];
        description = "Shared memory and control structures for IPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interruptible" = callPackage
@@ -119010,6 +117327,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intervals" = callPackage
@@ -119021,8 +117339,8 @@ self: {
        pname = "intervals";
        version = "0.8.1";
        sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
-       revision = "3";
-       editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95";
+       revision = "4";
+       editedCabalFile = "1qx3q0v13l1zaln9zdk8chxpxhshbz5x0vqm0qda7d1kpv7h6a7r";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [
@@ -119053,6 +117371,7 @@ self: {
        ];
        description = "A game of competitive puzzle-design";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intrinsic-superclasses" = callPackage
@@ -119172,8 +117491,8 @@ self: {
        pname = "invariant";
        version = "0.5";
        sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0";
-       revision = "1";
-       editedCabalFile = "04sxa2jfv613ff3fxpnk0cn31f6fr80gzr7va47nrc0abp34vd7y";
+       revision = "2";
+       editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1";
        libraryHaskellDepends = [
          array base bifunctors comonad containers contravariant ghc-prim
          profunctors semigroups StateVar stm tagged template-haskell
@@ -119201,7 +117520,6 @@ self: {
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-grammar" = callPackage
@@ -119211,8 +117529,8 @@ self: {
      }:
      mkDerivation {
        pname = "invertible-grammar";
-       version = "0.1.0";
-       sha256 = "0wi0s07v95yh1bmhc4z6n5r47mbmg0mvf3a3ks999gdma4sva1iz";
+       version = "0.1.1";
+       sha256 = "1vqv0q3096hfclakh7xk1hkwdbpghvllbzd795sgdf438zshr419";
        libraryHaskellDepends = [
          base bifunctors containers mtl prettyprinter profunctors semigroups
          tagged template-haskell text transformers
@@ -119244,7 +117562,6 @@ self: {
        ];
        description = "invertible transformer instances for HXT Picklers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -119544,44 +117861,18 @@ self: {
 
   "ip" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , doctest, hashable, HUnit, primitive, QuickCheck
+     , doctest, hashable, hspec, HUnit, primitive, QuickCheck
      , quickcheck-classes, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, vector
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.1.2";
-       sha256 = "16vjbcrjpvs4wh89r4k3d5hpkklvcvrk50qjnx67bsi2jjhcn0aj";
+       version = "1.3.0";
+       sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring doctest HUnit QuickCheck
-         quickcheck-classes test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion text
-       ];
-       description = "Library for IP and MAC addresses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ip_1_2_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , doctest, hashable, hspec, HUnit, primitive, QuickCheck
-     , quickcheck-classes, semigroups, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, vector
-     }:
-     mkDerivation {
-       pname = "ip";
-       version = "1.2.1";
-       sha256 = "024cl4dx0580wch2z9m45siak2n9dpbj3853gc4p9r257zp5xalr";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring hashable primitive semigroups text
-         vector
-       ];
-       testHaskellDepends = [
          attoparsec base bytestring doctest hspec HUnit QuickCheck
          quickcheck-classes test-framework test-framework-hunit
          test-framework-quickcheck2 text
@@ -119591,7 +117882,6 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip-quoter" = callPackage
@@ -119624,8 +117914,8 @@ self: {
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
        pname = "ip6addr";
-       version = "0.5.3";
-       sha256 = "1ih3dsqahn1c8nhs7w4idzpz0qb7amqhs25wnip5ly4iwsa0ky8z";
+       version = "1.0.0";
+       sha256 = "1wc03z05fiylg6fmi0whj8scnm1n81bzmns02zkv1pvysx9bw1g8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
@@ -119837,8 +118127,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.3";
-       sha256 = "1lw271lkl7ps0lxd2as95hi7hbkhmmy21i178h4hrp8v28lsmqxy";
+       version = "1.1.0.4";
+       sha256 = "1ag1rmsk53v3j5r0raipfc6w9mfc21w92gbanjfdl5nzsr4fzh87";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -119918,8 +118208,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234";
-       revision = "7";
-       editedCabalFile = "01mvdqabbxa68abq49s2kwpl0y8gb6lf258jjg7w098f5v0p4m36";
+       revision = "8";
+       editedCabalFile = "1ya1bl8pdzbs3gxkq7hsyvkaajf8prrdhr1lx5hm9pi1nqsi879z";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -120000,6 +118290,7 @@ self: {
        ];
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-fun-types" = callPackage
@@ -120011,6 +118302,7 @@ self: {
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbot" = callPackage
@@ -120163,10 +118455,11 @@ self: {
        pname = "is";
        version = "0.4.1";
        sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a";
-       libraryHaskellDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base template-haskell ];
        description = "Generic pattern predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isdicom" = callPackage
@@ -120280,15 +118573,33 @@ self: {
        ];
        description = "Parse and merge ISO 8583-style bitmaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "iso8601-duration" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing
+     , hspec, hspec-core, QuickCheck, quickcheck-instances, time
+     }:
+     mkDerivation {
+       pname = "iso8601-duration";
+       version = "0.1.1.0";
+       sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-lexing time
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-core QuickCheck quickcheck-instances
+         time
+       ];
+       description = "Types and parser for ISO8601 durations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "iso8601-time" = callPackage
     ({ mkDerivation, base, hspec, HUnit, time }:
      mkDerivation {
        pname = "iso8601-time";
-       version = "0.1.4";
-       sha256 = "09h1jfdj9fv1nsryhka2mgl8nig9840f5kv06vyyh7l4l1z767bn";
+       version = "0.1.5";
+       sha256 = "1j7h1xix7vpb88dnksis14rnvw0p528m3d54fg3h51765d5l9kgj";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
        description = "Convert to/from the ISO 8601 time format";
@@ -120620,6 +118931,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -120693,6 +119005,7 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -120728,6 +119041,7 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -120746,6 +119060,7 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -120784,6 +119099,7 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -120796,6 +119112,7 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivy-web" = callPackage
@@ -120866,38 +119183,21 @@ self: {
      }) {};
 
   "ixset" = callPackage
-    ({ mkDerivation, base, containers, safecopy, syb, syb-with-class
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "ixset";
-       version = "1.0.7";
-       sha256 = "1la2gdlblgwpymlawcc9zqr7c5w942di12yshm35wg0x3dc5l3ig";
-       libraryHaskellDepends = [
-         base containers safecopy syb syb-with-class template-haskell
-       ];
-       description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ixset_1_1" = callPackage
     ({ mkDerivation, base, Cabal, containers, HUnit, QuickCheck, random
-     , safecopy, semigroups, syb, syb-with-class, template-haskell
+     , safecopy, syb, syb-with-class, template-haskell
      }:
      mkDerivation {
        pname = "ixset";
        version = "1.1";
        sha256 = "147fr6hqvbnlrhy7zpxzg1iiciz4gzk2g281fkp4ylklq1lz9c4v";
        libraryHaskellDepends = [
-         base containers safecopy semigroups syb syb-with-class
-         template-haskell
+         base containers safecopy syb syb-with-class template-haskell
        ];
        testHaskellDepends = [
          base Cabal containers HUnit QuickCheck random
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ixset-typed" = callPackage
@@ -120907,25 +119207,6 @@ self: {
      }:
      mkDerivation {
        pname = "ixset-typed";
-       version = "0.3.1.1";
-       sha256 = "04nwmmw9rfvz7bm7vqlahyfx7rxn7qx9zdyh6m8g2vf55in4csyh";
-       libraryHaskellDepends = [
-         base containers deepseq safecopy syb template-haskell
-       ];
-       testHaskellDepends = [
-         base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ixset-typed_0_4" = callPackage
-    ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
-     , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "ixset-typed";
        version = "0.4";
        sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
        libraryHaskellDepends = [
@@ -120936,7 +119217,6 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ixshader" = callPackage
@@ -121145,6 +119425,8 @@ self: {
        pname = "jammittools";
        version = "0.5.5";
        sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz";
+       revision = "1";
+       editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121159,13 +119441,17 @@ self: {
      }) {};
 
   "japanese-holidays" = callPackage
-    ({ mkDerivation, base, doctest, hspec, QuickCheck, time }:
+    ({ mkDerivation, base, doctest, hspec, QuickCheck
+     , quickcheck-instances, time
+     }:
      mkDerivation {
        pname = "japanese-holidays";
-       version = "0.1.0.0";
-       sha256 = "1phlq2jzvkdr9askpnbryc7aw6mk7121kh2fz5wqr23cs8mg5m6b";
+       version = "0.1.1.0";
+       sha256 = "1xcamcv6n6k2pmbhxy9dbzff94cr2ijf2ykvyrc3s2idk6jhd2bh";
        libraryHaskellDepends = [ base time ];
-       testHaskellDepends = [ base doctest hspec QuickCheck time ];
+       testHaskellDepends = [
+         base doctest hspec QuickCheck quickcheck-instances time
+       ];
        description = "Japanese holidays utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121246,6 +119532,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Create immutable algebraic data structures for Java";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -121293,6 +119580,7 @@ self: {
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-poker" = callPackage
@@ -121343,36 +119631,23 @@ self: {
      }) {};
 
   "javascript-extras" = callPackage
-    ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
-     mkDerivation {
-       pname = "javascript-extras";
-       version = "0.3.2.0";
-       sha256 = "0y8cckckg5709in084vyxaad15w6pl1rvmin505s321znfifh838";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base deepseq ghcjs-base-stub parallel text
-       ];
-       executableHaskellDepends = [ base ghcjs-base-stub ];
-       description = "Extra javascript functions when using GHCJS";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "javascript-extras_0_4_0_0" = callPackage
-    ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
+    ({ mkDerivation, base, deepseq, ghcjs-base-stub, newtype-generics
+     , parallel, text
+     }:
      mkDerivation {
        pname = "javascript-extras";
-       version = "0.4.0.0";
-       sha256 = "0qpz8q5pr939y35y3r8x83irb2nl9vmh50wzjii824kr25z5wipd";
+       version = "0.5.0.0";
+       sha256 = "1p87nkjmc5gjbj95wdchvj7ha7v5zfbricibakqkcbsahmgddk4c";
+       revision = "1";
+       editedCabalFile = "0y29kvmhpngv5qm0hi8kixmpxzgzih0dlpg77658ikw3mn5x30p1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base deepseq ghcjs-base-stub parallel text
+         base deepseq ghcjs-base-stub newtype-generics parallel text
        ];
        executableHaskellDepends = [ base ghcjs-base-stub ];
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javasf" = callPackage
@@ -121432,6 +119707,7 @@ self: {
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -121578,24 +119854,6 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro-rpc";
-       version = "0.3.2";
-       sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-html bytestring containers
-         contravariant jmacro mtl scientific split text unordered-containers
-         vector
-       ];
-       description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jmacro-rpc_0_3_3" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , containers, contravariant, jmacro, mtl, scientific, split, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jmacro-rpc";
        version = "0.3.3";
        sha256 = "0gqyv8y4hjk2fwvzar173hvhgw860as0wijfhxqnxbkhd7f2r4gf";
        libraryHaskellDepends = [
@@ -121605,7 +119863,6 @@ self: {
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -121657,6 +119914,7 @@ self: {
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jni" = callPackage
@@ -121675,6 +119933,7 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -121727,6 +119986,7 @@ self: {
        ];
        description = "Bindings for Join push notifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "joinlist" = callPackage
@@ -121780,37 +120040,6 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.6.0.3";
-       sha256 = "1d6d2w61v5di6mfd1ss14sx7i29bzvhjn7yplg0q2nmxnba5p2xx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring concise
-         containers cryptonite lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe semigroups template-haskell
-         text time unordered-containers vector x509
-       ];
-       executableHaskellDepends = [ aeson base bytestring lens mtl ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring concise
-         containers cryptonite hspec lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec
-         tasty-quickcheck template-haskell text time unordered-containers
-         vector x509
-       ];
-       description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "jose_0_7_0_0" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, concise, containers, cryptonite, hspec, lens, memory
-     , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
-     , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck
-     , template-haskell, text, time, unordered-containers, vector, x509
-     }:
-     mkDerivation {
-       pname = "jose";
        version = "0.7.0.0";
        sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc";
        isLibrary = true;
@@ -121831,7 +120060,6 @@ self: {
        ];
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -121928,19 +120156,20 @@ self: {
 
   "jsaddle" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, containers, deepseq, filepath, ghc-prim, http-types
-     , lens, primitive, process, random, ref-tf, scientific, stm, text
-     , time, transformers, unordered-containers, vector
+     , bytestring, containers, deepseq, exceptions, filepath, ghc-prim
+     , http-types, lens, primitive, process, random, ref-tf, scientific
+     , stm, text, time, transformers, unliftio-core
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.9.4.0";
-       sha256 = "0lk4cbvl2n3zcc709hjcnxw3wm1vd49dqlm12cwy9im4aif1zbq1";
+       version = "0.9.5.0";
+       sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
-         deepseq filepath ghc-prim http-types lens primitive process random
-         ref-tf scientific stm text time transformers unordered-containers
-         vector
+         deepseq exceptions filepath ghc-prim http-types lens primitive
+         process random ref-tf scientific stm text time transformers
+         unliftio-core unordered-containers vector
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -122146,8 +120375,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-assertions";
-       version = "1.0.11";
-       sha256 = "000a528gmkb25zcl7am6qh8fjrq2v2l71c27fxzm6wpf0ml0vv7z";
+       version = "1.0.13";
+       sha256 = "01jv8risxswq6ihpl376vf19g8abav3sgbfjmb79yqwzgx7vbjcx";
        libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
@@ -122185,7 +120414,6 @@ self: {
        ];
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-ast-quickcheck" = callPackage
@@ -122211,42 +120439,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "1.0.18";
-       sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h";
-       revision = "2";
-       editedCabalFile = "1b7q8af32zpsrq32m34d4h4245ww19kxfqjrbq6s2mfx5qd5s5y6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers filepath GenericPretty hashable
-         lens mtl optparse-applicative pretty process scientific text
-         uniplate unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers filepath GenericPretty hashable
-         lens mtl optparse-applicative pretty process scientific text
-         uniplate unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath GenericPretty
-         hashable lens mtl optparse-applicative pretty process QuickCheck
-         scientific smallcheck text uniplate unordered-containers vector
-       ];
-       description = "Automatic type declaration for JSON input data";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "json-autotype_1_1_2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, GenericPretty, hashable, lens, mtl
-     , optparse-applicative, pretty, process, QuickCheck, scientific
-     , smallcheck, text, uniplate, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "json-autotype";
-       version = "1.1.2";
-       sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j";
+       version = "2.0.0";
+       sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122265,7 +120459,6 @@ self: {
        ];
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -122306,6 +120499,7 @@ self: {
        ];
        description = "Data structure agnostic JSON serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-bytes-builder" = callPackage
@@ -122323,6 +120517,7 @@ self: {
        benchmarkHaskellDepends = [ aeson criterion rebase ];
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-encoder" = callPackage
@@ -122340,7 +120535,6 @@ self: {
        ];
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-enumerator" = callPackage
@@ -122384,8 +120578,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "1.0.1";
-       sha256 = "16x0k1iwq9z9sq7z6a2007w8cczy6yd7sniylhacqnf1gsjfb4q6";
+       version = "1.0.2";
+       sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -122416,6 +120610,7 @@ self: {
        ];
        description = "Generic JSON serialization / deserialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-incremental-decoder" = callPackage
@@ -122465,6 +120660,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base-prelude text ];
        description = "JSON Pointer parsing and interpretation utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-pointer-aeson" = callPackage
@@ -122480,6 +120676,7 @@ self: {
        ];
        description = "Integration layer for \"json-pointer\" and \"aeson\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-pointer-hasql" = callPackage
@@ -122569,8 +120766,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
-       revision = "5";
-       editedCabalFile = "0fi7cij476s4lhjpi7m1yp9p30qv7pyv0hlcj30kd0zq74nwwrdz";
+       revision = "6";
+       editedCabalFile = "1x5vivxcnmf8igc5m3sh301nlag2kj6n7dgpiw58k0f0cdbh86i3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122615,8 +120812,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
-       revision = "4";
-       editedCabalFile = "19nasv4sxjn3j0xvr1pd9x6bf8f8566wwd15y3wwll89bpnyd4z9";
+       revision = "5";
+       editedCabalFile = "0hvkfbgg3jbgs0d2jp5djhpd2qp3q9hs5cr4ds93bc9nyncymyq9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122631,24 +120828,23 @@ self: {
      }) {};
 
   "json-schema" = callPackage
-    ({ mkDerivation, aeson, aeson-utils, attoparsec, base, bytestring
-     , containers, generic-aeson, generic-deriving, mtl, scientific
-     , tasty, tasty-hunit, tasty-th, text, time, unordered-containers
-     , vector
+    ({ mkDerivation, aeson, attoparsec, base, base-compat-batteries
+     , bytestring, containers, generic-aeson, generic-deriving, mtl
+     , scientific, tasty, tasty-hunit, tasty-th, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.4.1";
-       sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "14";
-       editedCabalFile = "0pf2j8v62mfh6dk0v4a93l75by6i6jsfangbsabksdbzhh64hyrr";
+       version = "0.7.4.2";
+       sha256 = "09bgcc00q1v24rdglw9b24dgi690mlax6abarhcgvgmn22406wp8";
        libraryHaskellDepends = [
-         aeson base containers generic-aeson generic-deriving mtl scientific
-         text time unordered-containers vector
+         aeson base base-compat-batteries containers generic-aeson
+         generic-deriving mtl scientific text time unordered-containers
+         vector
        ];
        testHaskellDepends = [
-         aeson aeson-utils attoparsec base bytestring generic-aeson tasty
-         tasty-hunit tasty-th text vector
+         aeson attoparsec base base-compat-batteries bytestring
+         generic-aeson tasty tasty-hunit tasty-th text vector
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
@@ -122670,6 +120866,7 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-state" = callPackage
@@ -122764,7 +120961,6 @@ self: {
        ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-types" = callPackage
@@ -122942,6 +121138,7 @@ self: {
        ];
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonsql" = callPackage
@@ -123045,6 +121242,7 @@ self: {
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "judge" = callPackage
@@ -123219,6 +121417,7 @@ self: {
        ];
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-batching" = callPackage
@@ -123247,22 +121446,32 @@ self: {
      }) {};
 
   "jvm-binary" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , directory, filepath, tasty, tasty-discover, tasty-hspec
-     , tasty-quickcheck, text, vector
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , criterion, data-binary-ieee754, deepseq, deriving-compat
+     , directory, filepath, generic-random
+     , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty
+     , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell
+     , text, vector
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.0.2";
-       sha256 = "1hdqhp84il50c6wimdvxwdd95gw580hskhmrnn2snqcwj7n1ywfh";
+       version = "0.1.0";
+       sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881";
        libraryHaskellDepends = [
-         base binary bytestring containers text vector
+         attoparsec base binary bytestring containers data-binary-ieee754
+         deepseq deriving-compat mtl template-haskell text vector
        ];
        testHaskellDepends = [
-         base binary bytestring containers directory filepath tasty
-         tasty-discover tasty-hspec tasty-quickcheck text
+         attoparsec base binary bytestring containers data-binary-ieee754
+         deepseq deriving-compat directory filepath generic-random
+         hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover
+         tasty-hspec tasty-quickcheck template-haskell text vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base binary bytestring containers criterion
+         data-binary-ieee754 deepseq deriving-compat mtl template-haskell
+         text vector
        ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123282,6 +121491,7 @@ self: {
        ];
        description = "A parser for JVM bytecode files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-streaming" = callPackage
@@ -123561,18 +121771,16 @@ self: {
 
   "kan-extensions" = callPackage
     ({ mkDerivation, adjunctions, array, base, comonad, containers
-     , contravariant, distributive, fail, free, mtl, profunctors
+     , contravariant, distributive, free, invariant, mtl, profunctors
      , semigroupoids, tagged, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "kan-extensions";
-       version = "5.1";
-       sha256 = "019jyrilk97i5bj8v044ig03m66h02q4b073m1fksrk7y9c8wgqr";
-       revision = "1";
-       editedCabalFile = "1xaam291gxmsbibi2ai4l6c36iwkpmfy6vik1916j6jp326pa3z9";
+       version = "5.2";
+       sha256 = "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb";
        libraryHaskellDepends = [
          adjunctions array base comonad containers contravariant
-         distributive fail free mtl profunctors semigroupoids tagged
+         distributive free invariant mtl profunctors semigroupoids tagged
          transformers transformers-compat
        ];
        description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
@@ -123594,39 +121802,14 @@ self: {
   "kanji" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
-     , microlens-platform, optparse-applicative, protolude, tasty
-     , tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "kanji";
-       version = "3.1.0.1";
-       sha256 = "1qxjaqqb3i8w65qda3nxnqxwvgcpfics38yifzf3chy49c3v04wj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base containers deepseq hashable text
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base containers microlens microlens-aeson
-         microlens-platform optparse-applicative protolude text
-       ];
-       testHaskellDepends = [
-         aeson base containers HUnit-approx tasty tasty-hunit text
-       ];
-       benchmarkHaskellDepends = [ aeson base containers criterion text ];
-       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "kanji_3_4_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
-     , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
      , optparse-applicative, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "kanji";
        version = "3.4.0";
        sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr";
+       revision = "2";
+       editedCabalFile = "1bcc3kh6kndmkqi3vaxp27mg1qb7xbg1h8pgjc1kk1iawnhl930j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123642,7 +121825,6 @@ self: {
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-comet" = callPackage
@@ -123653,8 +121835,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz";
-       revision = "13";
-       editedCabalFile = "0qdj3giwfjic87xln1lkrfa9dw8yj31s7x3dsr7n1343jcap2m7n";
+       revision = "16";
+       editedCabalFile = "1fnncjd9wjwrnl0247gizlvwklihjbfk21pad6a4mqnaa3li5672";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
@@ -123662,6 +121844,7 @@ self: {
        ];
        description = "A JavaScript push mechanism based on the comet idiom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava" = callPackage
@@ -123813,8 +121996,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.5.1";
-       sha256 = "0q72kjjrn6x1qr2rp6c3mhf5s3cq4pdsl917a9bflid9zmk5n30b";
+       version = "0.6.0.0";
+       sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -123846,8 +122029,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
-       version = "0.4.1.0";
-       sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1";
+       version = "0.4.2.0";
+       sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x";
        libraryHaskellDepends = [
          aeson async base bloodhound bytestring enclosed-exceptions
          exceptions http-client http-types katip retry scientific semigroups
@@ -123895,6 +122078,7 @@ self: {
        ];
        description = "Katip scribe that logs to Rollbar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "katip-scalyr-scribe" = callPackage
@@ -123913,6 +122097,7 @@ self: {
        ];
        description = "A katip scribe for logging to json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "katip-syslog" = callPackage
@@ -123955,28 +122140,6 @@ self: {
      }) {};
 
   "katydid" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, HUnit, hxt
-     , json, mtl, parsec, regex-tdfa, tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "katydid";
-       version = "0.1.1.0";
-       sha256 = "1j1ld7krxyaazyracpzdhngm4lqfi5g9iw5hn40a1gj1dyjxwyvw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers hxt json mtl parsec regex-tdfa
-       ];
-       executableHaskellDepends = [ base mtl ];
-       testHaskellDepends = [
-         base containers directory filepath HUnit hxt json mtl parsec tasty
-         tasty-hunit
-       ];
-       description = "A haskell implementation of Katydid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "katydid_0_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
      , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
@@ -124002,7 +122165,6 @@ self: {
        ];
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kawa" = callPackage
@@ -124093,7 +122255,6 @@ self: {
        benchmarkHaskellDepends = [ async base containers criterion stm ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -124179,7 +122340,6 @@ self: {
        ];
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keccak" = callPackage
@@ -124252,6 +122412,7 @@ self: {
        ];
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -124668,10 +122829,8 @@ self: {
      }:
      mkDerivation {
        pname = "keys";
-       version = "3.12";
-       sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl";
-       revision = "2";
-       editedCabalFile = "0cy2fdxxqg0bgkb8xhnw6zws00d78bpk48xv7zzmvnj549l819ib";
+       version = "3.12.1";
+       sha256 = "1yqm4gpshsgswx6w78z64c83gpydh6jhgslx2lnc10nzhy0s9kkz";
        libraryHaskellDepends = [
          array base comonad containers free hashable semigroupoids
          semigroups tagged transformers transformers-compat
@@ -124757,7 +122916,6 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyword-args" = callPackage
@@ -124937,7 +123095,6 @@ self: {
        ];
        description = "Kleene algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans" = callPackage
@@ -124987,6 +123144,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmp-dfa" = callPackage
@@ -125283,6 +123441,7 @@ self: {
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kure-your-boilerplate" = callPackage
@@ -125475,14 +123634,25 @@ self: {
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
-       version = "1.0.2";
-       sha256 = "00zvbdls0nr4q18889xr8z3cpfldi5gg3m2g7d572bcxvwfhm4y4";
+       version = "1.0.4";
+       sha256 = "1x0jrsk9jp7k0l6xz7nxrcdkglld1ab21kh6w1a253zklpwd3vz1";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lacroix" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lacroix";
+       version = "0.1.0.0";
+       sha256 = "0d65dqvbfrrvgdnagjyiq8xf7635rd46wda722g85dxzxr1l7mbn";
+       libraryHaskellDepends = [ base ];
+       description = "fizzy n dizzy";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -125727,8 +123897,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.1.0.1";
-       sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14";
+       version = "5.1.0.2";
+       sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -125752,8 +123922,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-core";
-       version = "5.1.0.1";
-       sha256 = "0w49s8n0bj0fbdjikgy6p2mlbrcq5069m7yqwdwiqmffi7hl5dgb";
+       version = "5.1.0.2";
+       sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -125778,8 +123948,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.1.0.2";
-       sha256 = "1vr4f92zsjdr2j1zxb2v1hmyrb4lvq32c08jgind7apkmvqjgm19";
+       version = "5.1.0.3";
+       sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
@@ -126365,31 +124535,13 @@ self: {
      }) {};
 
   "language-c" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , directory, filepath, happy, pretty, process, syb
-     }:
-     mkDerivation {
-       pname = "language-c";
-       version = "0.7.2";
-       sha256 = "1ra9spagayal2iw996qc0vafglxgyjf04fa2sv44f5z5v3fj5bb3";
-       libraryHaskellDepends = [
-         array base bytestring containers directory filepath pretty process
-         syb
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [ base directory filepath process ];
-       description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-c_0_8" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
      , directory, filepath, happy, pretty, process, syb
      }:
      mkDerivation {
        pname = "language-c";
-       version = "0.8";
-       sha256 = "0ms0hfg65d7phfr2dq6183vcbmq9ddpvmlqbs8nwbqhqvcdpfl4w";
+       version = "0.8.1";
+       sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process syb
@@ -126398,7 +124550,6 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-comments" = callPackage
@@ -126440,31 +124591,6 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.12.1";
-       sha256 = "111mvmbr9m8np5zayj95mv8bjcrgwjafq4lskq5qjs20fvskfdgc";
-       libraryHaskellDepends = [
-         array base bytestring containers exception-mtl
-         exception-transformers filepath haskell-src-meta mainland-pretty
-         mtl srcloc syb symbol template-haskell
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         base bytestring HUnit mainland-pretty srcloc symbol test-framework
-         test-framework-hunit
-       ];
-       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "language-c-quote_0_12_2" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , exception-mtl, exception-transformers, filepath, happy
-     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
-     , symbol, template-haskell, test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "language-c-quote";
        version = "0.12.2";
        sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb";
        libraryHaskellDepends = [
@@ -126479,7 +124605,6 @@ self: {
        ];
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-cil" = callPackage
@@ -126526,6 +124651,7 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dart" = callPackage
@@ -126538,42 +124664,18 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-docker" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
-     , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , semigroups, split, template-haskell, text, th-lift
-     , th-lift-instances, time, transformers, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "language-docker";
-       version = "2.0.1";
-       sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc";
-       libraryHaskellDepends = [
-         aeson base bytestring directory filepath free Glob mtl parsec
-         pretty semigroups split template-haskell text th-lift
-         th-lift-instances time transformers unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath free Glob hspec HUnit mtl
-         parsec pretty process QuickCheck semigroups split template-haskell
-         text th-lift th-lift-instances time transformers
-         unordered-containers yaml
-       ];
-       description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-docker_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
      , QuickCheck, split, template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "6.0.0";
-       sha256 = "0b3m6vzfhypwqnlwdy1b1cx6dfca0rcq2m4zivd608ny2ii22ajv";
+       version = "6.0.3";
+       sha256 = "0rp94hgbh2knz8xn146shgaw0qp6lnp0skxzknsi0l6d3xzzr7qr";
        libraryHaskellDepends = [
          base bytestring containers free megaparsec mtl prettyprinter split
          template-haskell text th-lift time
@@ -126585,7 +124687,6 @@ self: {
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -126630,32 +124731,10 @@ self: {
        testHaskellDepends = [ base mtl parsec pretty ];
        description = "A library for the analysis and creation of Graphviz DOT files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-ecmascript" = callPackage
-    ({ mkDerivation, base, charset, containers, data-default-class
-     , Diff, directory, filepath, HUnit, mtl, parsec, QuickCheck
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint
-     }:
-     mkDerivation {
-       pname = "language-ecmascript";
-       version = "0.17.2.0";
-       sha256 = "1szn269x93k7x2r1z6aj0fqraim1f6vyb7qbg5nfkv8l0gcrz10l";
-       libraryHaskellDepends = [
-         base charset containers data-default-class Diff mtl parsec
-         QuickCheck template-haskell testing-feat uniplate wl-pprint
-       ];
-       testHaskellDepends = [
-         base containers data-default-class Diff directory filepath HUnit
-         mtl parsec QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 uniplate wl-pprint
-       ];
-       description = "JavaScript parser and pretty-printer library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-ecmascript_0_19" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, charset, containers
      , data-default-class, Diff, directory, filepath, HUnit, mtl, parsec
      , QuickCheck, template-haskell, test-framework
@@ -126694,6 +124773,7 @@ self: {
        ];
        description = "JavaScript static analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-eiffel" = callPackage
@@ -126761,6 +124841,8 @@ self: {
        pname = "language-glsl";
        version = "0.2.1";
        sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0";
+       revision = "1";
+       editedCabalFile = "1dlax6dfjc8ca0p5an3k1f29b078hgb44aj48njf97shvl9hqf5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec prettyclass ];
@@ -126770,6 +124852,7 @@ self: {
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-go" = callPackage
@@ -126926,17 +125009,17 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
-     , directory, filepath, happy, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text
+    ({ mkDerivation, alex, alex-tools, array, base, bytestring
+     , criterion, deepseq, directory, filepath, happy, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "language-lua";
-       version = "0.10.0";
-       sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c";
-       revision = "2";
-       editedCabalFile = "08c0ivrp357lpxhxqq78z8wqnhwdd3gycsn6yhmf8xnk8bv6yz7h";
-       libraryHaskellDepends = [ array base bytestring deepseq text ];
+       version = "0.11.0";
+       sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59";
+       libraryHaskellDepends = [
+         alex-tools array base bytestring deepseq text
+       ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          base bytestring deepseq directory filepath QuickCheck tasty
@@ -126989,6 +125072,7 @@ self: {
        ];
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-mixal" = callPackage
@@ -127073,8 +125157,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-oberon";
-       version = "0.1.1";
-       sha256 = "0b63yryiaw4fr793qif2bq64fcx4ml3yi8wgkz1rg77j0nnga2vs";
+       version = "0.2";
+       sha256 = "052kgd4d1cwdqs8znkx2fagjlb39x6c2lhvic6il2c67ali53nhr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127125,6 +125209,7 @@ self: {
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-pig" = callPackage
@@ -127162,8 +125247,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.17";
-       sha256 = "0n71grhaw59z3vqkys499kx06q10fn6l5r4sfim17vyxdy0bz8xq";
+       version = "1.3.19";
+       sha256 = "1g6b6dmjx1nk29r55qccvk6csbjig2yc493bmq0dlnqgbn0aiimp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127185,14 +125270,59 @@ self: {
        ];
        testHaskellDepends = [
          base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         protolude scientific strict-base-types temporary text transformers
-         unordered-containers vector
+         pcre-utils protolude scientific strict-base-types temporary text
+         transformers unordered-containers vector
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
+  "language-puppet_1_3_19_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, exceptions, filecache, filepath
+     , formatting, Glob, hashable, hruby, hslogger, hspec
+     , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
+     , megaparsec, memory, mtl, operational, optparse-applicative
+     , parallel-io, parsec, pcre-utils, process, protolude, random
+     , regex-pcre-builtin, scientific, servant, servant-client, split
+     , stm, strict-base-types, temporary, text, time, transformers, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "language-puppet";
+       version = "1.3.19.1";
+       sha256 = "0f1g9sq3ysyjyps8p68wxh1rmjb3v7iw9gmj8zd7wb5kyjlc4xph";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory exceptions
+         filecache filepath formatting hashable hruby hslogger hspec
+         http-api-data http-client lens lens-aeson megaparsec memory mtl
+         operational parsec pcre-utils process protolude random
+         regex-pcre-builtin scientific servant servant-client split stm
+         strict-base-types text time transformers unix unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring containers Glob hslogger
+         http-client lens megaparsec mtl optparse-applicative parallel-io
+         regex-pcre-builtin strict-base-types text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
+         pcre-utils protolude scientific strict-base-types temporary text
+         transformers unordered-containers vector
+       ];
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -127401,6 +125531,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-vhdl" = callPackage
@@ -127412,6 +125543,7 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-webidl" = callPackage
@@ -127458,7 +125590,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lapack-ffi" = callPackage
@@ -127471,7 +125602,6 @@ self: {
        libraryPkgconfigDepends = [ liblapack ];
        description = "Auto-generated interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) liblapack;};
 
   "lapack-ffi-tools" = callPackage
@@ -127690,10 +125820,8 @@ self: {
      }:
      mkDerivation {
        pname = "lattices";
-       version = "1.7.1";
-       sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x";
-       revision = "2";
-       editedCabalFile = "0ngxvs48hqdr5353fbblcrq5hqrwr89xl39akxg8rkridkr3hq96";
+       version = "1.7.1.1";
+       sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r";
        libraryHaskellDepends = [
          base base-compat containers deepseq hashable semigroupoids tagged
          universe-base universe-reverse-instances unordered-containers
@@ -127725,6 +125853,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lawful" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lawful";
+       version = "0.1.0.0";
+       sha256 = "014drjks30wij31fm371q5d8m6x3fpf3z52dim6zmxxv0r0pjmh0";
+       libraryHaskellDepends = [ base ];
+       description = "Assert the lawfulness of your typeclass instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lawless-concurrent-machines" = callPackage
     ({ mkDerivation, async, base, containers, lifted-async, machines
      , monad-control, semigroups, tasty, tasty-hunit, time, transformers
@@ -127744,6 +125883,7 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lax" = callPackage
@@ -127765,8 +125905,8 @@ self: {
      }:
      mkDerivation {
        pname = "layered-state";
-       version = "1.1.3";
-       sha256 = "01pi8bslw7pmd3cm7jxxs500i35ny2lbaqi0hnl2a7kzjjxfrs6s";
+       version = "1.1.4";
+       sha256 = "06mwkz6816nkwlsc51hfx0y67dhf42rkib165xag7kga7843idxa";
        libraryHaskellDepends = [
          base constraints data-default exceptions lens lens-utils
          monad-branch monoid mtl primitive profunctors prologue transformers
@@ -127777,7 +125917,6 @@ self: {
        ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layers" = callPackage
@@ -127821,6 +125960,7 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -127846,6 +125986,7 @@ self: {
        libraryHaskellDepends = [ alex-tools base text ];
        description = "A collection of different layout implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layouting" = callPackage
@@ -128070,6 +126211,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lda" = callPackage
@@ -128248,25 +126390,19 @@ self: {
      }) {};
 
   "learn-physics" = callPackage
-    ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss
-     , spatial-math, vector-space
-     }:
+    ({ mkDerivation, base, gloss, gnuplot, hmatrix, vector-space }:
      mkDerivation {
        pname = "learn-physics";
-       version = "0.6.0.2";
-       sha256 = "1bncqp4k1gbhc2yqnkja9xcxlh03wfaix1hiyv5llbzz06s9ia8a";
+       version = "0.6.2";
+       sha256 = "0j69q7jyznjjizkyyn032dfc1g9r6fssxp4b183bapj1xp9n116j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base gloss gnuplot hmatrix linear not-gloss spatial-math
-         vector-space
-       ];
-       executableHaskellDepends = [
-         base gloss gnuplot not-gloss spatial-math
+         base gloss gnuplot hmatrix vector-space
        ];
+       executableHaskellDepends = [ base gloss gnuplot ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -128529,6 +126665,8 @@ self: {
        pname = "lens";
        version = "4.16.1";
        sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
+       revision = "2";
+       editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -128553,20 +126691,48 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "lens-accelerate" = callPackage
-    ({ mkDerivation, accelerate, base, lens }:
+  "lens_4_17" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , Cabal, cabal-doctest, call-stack, comonad, containers
+     , contravariant, criterion, deepseq, directory, distributive
+     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
+     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
+     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
+     , tagged, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text
+     , th-abstraction, transformers, transformers-compat
+     , unordered-containers, vector, void
+     }:
      mkDerivation {
-       pname = "lens-accelerate";
-       version = "0.1.0.0";
-       sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4";
-       revision = "2";
-       editedCabalFile = "1yk1zjwp7sabh90rgz4sa15vqj1wq837nypqjb0qhymslmrnvvnl";
-       libraryHaskellDepends = [ accelerate base lens ];
-       description = "Instances to mix lens with accelerate";
-       license = stdenv.lib.licenses.bsd3;
+       pname = "lens";
+       version = "4.17";
+       sha256 = "1k087zfy10rijr3cikalj8p58d8ypfmhb4d29bsbw8qhakg68dj7";
+       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring call-stack comonad
+         containers contravariant distributive exceptions filepath free
+         ghc-prim hashable kan-extensions mtl parallel profunctors
+         reflection semigroupoids semigroups tagged template-haskell text
+         th-abstraction transformers transformers-compat
+         unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
+         simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring comonad containers criterion deepseq
+         generic-deriving transformers unordered-containers vector
+       ];
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lens-accelerate_0_2_0_0" = callPackage
+  "lens-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, lens }:
      mkDerivation {
        pname = "lens-accelerate";
@@ -128575,7 +126741,6 @@ self: {
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-action" = callPackage
@@ -128606,8 +126771,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.2";
        sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
-       revision = "4";
-       editedCabalFile = "1gas30rarvr8337a06z089m3dp5kvdcvhyac2mrp5pjlfp4zz226";
+       revision = "6";
+       editedCabalFile = "1pg5v8fnlqw1krgi3d2a03a0zkjjdv5yp5f5z6q4mlb5jldz99a8";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
@@ -128658,31 +126823,18 @@ self: {
      }) {};
 
   "lens-family-th" = callPackage
-    ({ mkDerivation, base, hspec, lens-family, template-haskell }:
+    ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
        pname = "lens-family-th";
-       version = "0.5.0.1";
-       sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs";
-       revision = "1";
-       editedCabalFile = "190jxqskd61irc97zb95h08zlkszlhpik4zmb7y4vk7x06zz00m6";
+       version = "0.5.0.2";
+       sha256 = "1rmhcnnlnll4mq7pqld5qg6crxh74gp0fqiwl6wn8l3ssgx5l9ww";
        libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base hspec lens-family template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell transformers ];
        description = "Generate lens-family style lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lens-labels" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "lens-labels";
-       version = "0.1.0.2";
-       sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Integration of lenses with OverloadedLabels";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-labels_0_2_0_1" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
        pname = "lens-labels";
@@ -128691,7 +126843,17 @@ self: {
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lens-misc" = callPackage
+    ({ mkDerivation, base, lens, tagged, template-haskell }:
+     mkDerivation {
+       pname = "lens-misc";
+       version = "0.0.2.0";
+       sha256 = "1jyqxi83imkyd318m17p2z84zqaxyb08mk5gy7q7saay2blmz4jr";
+       libraryHaskellDepends = [ base lens tagged template-haskell ];
+       description = "Miscellaneous lens utilities";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lens-named" = callPackage
@@ -128852,7 +127014,6 @@ self: {
        ];
        description = "Collection of missing lens utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-xml" = callPackage
@@ -128933,7 +127094,6 @@ self: {
        ];
        description = "Van Laarhoven lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz-template" = callPackage
@@ -128951,7 +127111,6 @@ self: {
        ];
        description = "Van Laarhoven lens templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "level-monad" = callPackage
@@ -128963,6 +127122,7 @@ self: {
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leveldb-haskell" = callPackage
@@ -129010,7 +127170,6 @@ self: {
        ];
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
@@ -129045,22 +127204,6 @@ self: {
      }:
      mkDerivation {
        pname = "lexer-applicative";
-       version = "2.1.0.1";
-       sha256 = "1754rimbj7jdhdhc3ql5ks5mccqip4l6cffkw2bzjw3x1s0155iy";
-       libraryHaskellDepends = [ base regex-applicative srcloc ];
-       testHaskellDepends = [
-         base deepseq regex-applicative srcloc tasty tasty-hunit
-       ];
-       description = "Simple lexer based on applicative regular expressions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lexer-applicative_2_1_0_2" = callPackage
-    ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty
-     , tasty-hunit
-     }:
-     mkDerivation {
-       pname = "lexer-applicative";
        version = "2.1.0.2";
        sha256 = "1gjwxc9d2al8az89mrxkvh8fmmdk78685dgdxi4fil2r587kqhxf";
        libraryHaskellDepends = [ base regex-applicative srcloc ];
@@ -129069,7 +127212,6 @@ self: {
        ];
        description = "Simple lexer based on applicative regular expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lfst" = callPackage
@@ -129407,6 +127549,7 @@ self: {
        ];
        description = "libinfluxdb";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libjenkins" = callPackage
@@ -129593,6 +127736,7 @@ self: {
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
@@ -129783,15 +127927,16 @@ self: {
      }:
      mkDerivation {
        pname = "libstackexchange";
-       version = "0.3.0.0";
-       sha256 = "00v8hmk67dsb0j1bncc06fh46jkz4raf5a796l223mg6x0l3a828";
+       version = "0.3.1";
+       sha256 = "1fj5pf1hjl749pbx54p1sja8m7k99bd0ijyyzxh3dygxx06inc6i";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          http-conduit profunctors text
        ];
        description = "StackExchange API interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libsystemd-daemon" = callPackage
@@ -129859,7 +128004,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libvirt;};
 
   "libvorbis" = callPackage
@@ -129976,6 +128120,7 @@ self: {
        ];
        description = "A license compatibility helper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "life" = callPackage
@@ -129992,6 +128137,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "life-sync" = callPackage
+    ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
+     , containers, filepath, fmt, hedgehog, microlens-platform
+     , optparse-applicative, path, path-io, process, tasty
+     , tasty-discover, tasty-hedgehog, text, tomland, universum
+     }:
+     mkDerivation {
+       pname = "life-sync";
+       version = "1.0";
+       sha256 = "04w83c96zhjl52j5iyy3149gpj3m02jfyfvbvvgg34xxqm0vwzha";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base-noprelude bytestring containers fmt
+         microlens-platform path path-io process text tomland universum
+       ];
+       executableHaskellDepends = [
+         base-noprelude containers optparse-applicative path
+       ];
+       testHaskellDepends = [
+         base-noprelude containers filepath hedgehog path tasty
+         tasty-hedgehog
+       ];
+       testToolDepends = [ tasty-discover ];
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lift-generics" = callPackage
     ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
      , hspec, template-haskell
@@ -130000,8 +128173,8 @@ self: {
        pname = "lift-generics";
        version = "0.1.2";
        sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf";
-       revision = "1";
-       editedCabalFile = "02hg33ikmwl81zsw8fgppix740rdc3h8fv6nr9b9h37vizhs50zw";
+       revision = "2";
+       editedCabalFile = "171f8cpn0kw9psikx3n7cdwyqfwg8rr8gf1hja6g7pnm0683l5l8";
        libraryHaskellDepends = [
          base generic-deriving ghc-prim template-haskell
        ];
@@ -130025,27 +128198,6 @@ self: {
 
   "lifted-async" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
-     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
-     , tasty-th, transformers-base
-     }:
-     mkDerivation {
-       pname = "lifted-async";
-       version = "0.9.3.3";
-       sha256 = "1gqd4ih72mky1s97120yx9gmabaxb1l54b3jwijsl8fxng5djdxf";
-       libraryHaskellDepends = [
-         async base constraints lifted-base monad-control transformers-base
-       ];
-       testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
-         tasty-th
-       ];
-       benchmarkHaskellDepends = [ async base criterion deepseq ];
-       description = "Run lifted IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-async_0_10_0_2" = callPackage
-    ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty
      , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
      }:
@@ -130063,7 +128215,6 @@ self: {
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-base" = callPackage
@@ -130119,7 +128270,6 @@ self: {
        ];
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-threads" = callPackage
@@ -130386,6 +128536,7 @@ self: {
        ];
        description = "Haskell SDK for the LINE API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "line-break" = callPackage
@@ -130439,10 +128590,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.20.7";
-       sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b";
-       revision = "4";
-       editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3";
+       version = "1.20.8";
+       sha256 = "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -130464,27 +128613,10 @@ self: {
      }:
      mkDerivation {
        pname = "linear-accelerate";
-       version = "0.5.0.1";
-       sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l";
-       revision = "2";
-       editedCabalFile = "0b7amkafmf82q6a8q49q6n3v33xs16n5h6y005jva5bhpxkmn26w";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         accelerate base distributive lens linear
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Lifting linear vector spaces into Accelerate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "linear-accelerate_0_6_0_0" = callPackage
-    ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
-     , distributive, doctest, lens, linear
-     }:
-     mkDerivation {
-       pname = "linear-accelerate";
        version = "0.6.0.0";
        sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s";
+       revision = "1";
+       editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
@@ -130492,7 +128624,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -130621,20 +128752,19 @@ self: {
      }) {};
 
   "linearmap-category" = callPackage
-    ({ mkDerivation, base, constrained-categories, containers
-     , free-vector-spaces, ieee754, lens, linear, manifolds-core
-     , semigroups, tagged, transformers, vector, vector-space
+    ({ mkDerivation, base, call-stack, constrained-categories
+     , containers, free-vector-spaces, ieee754, lens, linear
+     , manifolds-core, semigroups, tagged, transformers, vector
+     , vector-space
      }:
      mkDerivation {
        pname = "linearmap-category";
-       version = "0.3.4.0";
-       sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp";
-       revision = "1";
-       editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw";
+       version = "0.3.5.0";
+       sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
        libraryHaskellDepends = [
-         base constrained-categories containers free-vector-spaces ieee754
-         lens linear manifolds-core semigroups tagged transformers vector
-         vector-space
+         base call-stack constrained-categories containers
+         free-vector-spaces ieee754 lens linear manifolds-core semigroups
+         tagged transformers vector vector-space
        ];
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
@@ -130687,6 +128817,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lines-of-action" = callPackage
+    ({ mkDerivation, base, containers, mtl, safe }:
+     mkDerivation {
+       pname = "lines-of-action";
+       version = "0.0.1";
+       sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42";
+       libraryHaskellDepends = [ base containers mtl safe ];
+       description = "Lines of Action, 2-player strategy board game";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "linguistic-ordinals" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -130907,6 +129048,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-kmod" = callPackage
@@ -130934,13 +129076,13 @@ self: {
      }) {};
 
   "linux-namespaces" = callPackage
-    ({ mkDerivation, base, unix }:
+    ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "linux-namespaces";
-       version = "0.1.2.0";
-       sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q";
-       libraryHaskellDepends = [ base unix ];
-       description = "Create new or enter an existing linux namespaces";
+       version = "0.1.3.0";
+       sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl";
+       libraryHaskellDepends = [ base bytestring unix ];
+       description = "Work with linux namespaces: create new or enter existing ones";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -131026,6 +129168,7 @@ self: {
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lio-eci11" = callPackage
@@ -131058,7 +129201,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lio-simple" = callPackage
@@ -131157,6 +129300,7 @@ self: {
        doCheck = false;
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) git; inherit (pkgs) nettools; 
          inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
@@ -131199,6 +129343,7 @@ self: {
        testSystemDepends = [ z3 ];
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "liquidhaskell-cabal" = callPackage
@@ -131473,7 +129618,6 @@ self: {
        ];
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-zip-def" = callPackage
@@ -131905,39 +130049,14 @@ self: {
   "llvm-hs" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
-     , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, temporary, transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "llvm-hs";
-       version = "5.1.3";
-       sha256 = "0swpc431w16g9yip5w67kd77ilc6yqqk526h7sl5n4sn7xlc9nnc";
-       revision = "1";
-       editedCabalFile = "0r8xgz6r2miw1l3az343jwz8f9jgzqywxnzl2xhanv05g3i462yh";
-       setupHaskellDepends = [ base Cabal containers ];
-       libraryHaskellDepends = [
-         array attoparsec base bytestring containers exceptions llvm-hs-pure
-         mtl template-haskell transformers utf8-string
-       ];
-       libraryToolDepends = [ llvm-config ];
-       testHaskellDepends = [
-         base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
-         tasty tasty-hunit tasty-quickcheck temporary transformers
-       ];
-       description = "General purpose LLVM bindings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {llvm-config = null;};
-
-  "llvm-hs_6_2_0" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
-     , containers, exceptions, llvm-config, llvm-hs-pure, mtl
-     , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, temporary, transformers, utf8-string
+     , pretty-show, process, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, transformers
+     , utf8-string
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "6.2.0";
-       sha256 = "1s7n0sansq1mhs6dibp3ikkpn3n0h6cw2ja5m36nphjmzn47dvrk";
+       version = "6.3.0";
+       sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -131945,8 +130064,9 @@ self: {
        ];
        libraryToolDepends = [ llvm-config ];
        testHaskellDepends = [
-         base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
-         tasty tasty-hunit tasty-quickcheck temporary transformers
+         base bytestring containers llvm-hs-pure mtl pretty-show process
+         QuickCheck tasty tasty-hunit tasty-quickcheck temporary
+         transformers
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -131955,15 +130075,15 @@ self: {
 
   "llvm-hs-pretty" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
-     , llvm-hs, llvm-hs-pure, mtl, tasty, tasty-golden, tasty-hspec
-     , tasty-hunit, text, transformers, wl-pprint-text
+     , llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden
+     , tasty-hspec, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.4.0.0";
-       sha256 = "1b398yxyd0x2mlv5b70vgy1q3i8nk77fch7asyx8s42pnff4qqkq";
+       version = "0.5.0.0";
+       sha256 = "1715x7wggllp445kkb6f2pkc87qw504yvl2adzz2i4fz8jzm1jhd";
        libraryHaskellDepends = [
-         array base bytestring llvm-hs-pure text wl-pprint-text
+         array base bytestring llvm-hs-pure prettyprinter text
        ];
        testHaskellDepends = [
          base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden
@@ -131976,34 +130096,13 @@ self: {
 
   "llvm-hs-pure" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
-     , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "llvm-hs-pure";
-       version = "5.1.2";
-       sha256 = "0m6r8l37151y5a7ad5bbb1xw5f18y4hm91ildmz10wnsmhx9kl64";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers fail mtl template-haskell
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec mtl tasty tasty-hunit
-         tasty-quickcheck text transformers unordered-containers
-       ];
-       description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "llvm-hs-pure_6_2_0" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, fail
      , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "llvm-hs-pure";
-       version = "6.2.0";
-       sha256 = "1qqwhq9mjlgpyy5h8wnk1zg8y16c229397fslxyyz3bjqg5a0ghv";
+       version = "6.2.1";
+       sha256 = "1a9xzg6q4gd6j7dkvpkqpnrmh8y1fabllpjbh0m181v1c52aj23r";
        libraryHaskellDepends = [
          attoparsec base bytestring containers fail mtl template-haskell
          transformers unordered-containers
@@ -132013,7 +130112,6 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ht" = callPackage
@@ -132060,6 +130158,7 @@ self: {
        libraryHaskellDepends = [ base containers monadLib parsec pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
@@ -132086,6 +130185,7 @@ self: {
        ];
        description = "LLVM bitcode parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-tf" = callPackage
@@ -132183,7 +130283,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Simple API for LMDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmonad" = callPackage
@@ -132237,21 +130336,10 @@ self: {
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "load-env" = callPackage
-    ({ mkDerivation, base, directory, hspec, parsec }:
-     mkDerivation {
-       pname = "load-env";
-       version = "0.1.2";
-       sha256 = "1d5xms4q969w1ry3j3qv4gz82sc9j9qhw7nyc25rbn66gznxlb06";
-       libraryHaskellDepends = [ base directory parsec ];
-       testHaskellDepends = [ base directory hspec parsec ];
-       description = "Load environment variables from a file";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "load-env_0_2_0_1" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, hspec, parsec
      , temporary
      }:
@@ -132265,7 +130353,6 @@ self: {
        ];
        description = "Load environment variables from a file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "load-font" = callPackage
@@ -132306,6 +130393,7 @@ self: {
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loc-test" = callPackage
@@ -132317,6 +130405,7 @@ self: {
        libraryHaskellDepends = [ base containers hedgehog loc ];
        description = "Test-related utilities related to the /loc/ package";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "local-address" = callPackage
@@ -132374,6 +130463,7 @@ self: {
        ];
        description = "GNU Gettext-based messages localization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "located" = callPackage
@@ -132385,6 +130475,7 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "located-base" = callPackage
@@ -132472,7 +130563,6 @@ self: {
        ];
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "locked-poll" = callPackage
@@ -132583,8 +130673,8 @@ self: {
        pname = "log-domain";
        version = "0.12";
        sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
-       revision = "2";
-       editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d";
+       revision = "3";
+       editedCabalFile = "19xc24jwfhzy3v26689sc4ma50w4ylqd378dpxphl0nrxili645z";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
@@ -132639,29 +130729,10 @@ self: {
      }:
      mkDerivation {
        pname = "log-elasticsearch";
-       version = "0.9.1.0";
-       sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5";
-       revision = "2";
-       editedCabalFile = "11c7jrc16nwg5jxwsggip5bsvw9zbk8c3gw1my22rwfglnpxg885";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bloodhound bytestring
-         deepseq http-client http-client-tls log-base semigroups text
-         text-show time transformers unordered-containers vector
-       ];
-       description = "Structured logging solution (Elasticsearch back end)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-elasticsearch_0_10_0_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , bloodhound, bytestring, deepseq, http-client, http-client-tls
-     , log-base, semigroups, text, text-show, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "log-elasticsearch";
        version = "0.10.0.0";
        sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5";
+       revision = "1";
+       editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bloodhound bytestring
          deepseq http-client http-client-tls log-base semigroups text
@@ -132669,7 +130740,6 @@ self: {
        ];
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-postgres" = callPackage
@@ -132854,46 +130924,24 @@ self: {
   "logging-effect" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.2.6";
-       sha256 = "091ii2cq5wns9mc3mckwjcjgav9s2jj8nnamwqd2vf24w932ilv7";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_3_0" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , prettyprinter, semigroups, stm, stm-delay, text, time
-     , transformers, transformers-base, wl-pprint-text
+     , transformers, transformers-base, unliftio-core
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.3.0";
-       sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn";
+       version = "1.3.2";
+       sha256 = "1q8mhshz95xckqn4d8wxj0nsg4qrxmc6a826fjzxm1ii0krwpgbd";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl prettyprinter
          semigroups stm stm-delay text time transformers transformers-base
+         unliftio-core
        ];
        benchmarkHaskellDepends = [
          base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
+         prettyprinter text time
        ];
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -132913,6 +130961,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra-file" = callPackage
@@ -132931,6 +130980,7 @@ self: {
        executableHaskellDepends = [ base logging-effect wl-pprint-text ];
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra-handler" = callPackage
@@ -132949,6 +130999,7 @@ self: {
        executableHaskellDepends = [ base logging-effect wl-pprint-text ];
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -133010,6 +131061,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Import, export etc. for TPTP, a syntax for first-order logic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logic-classes" = callPackage
@@ -133629,6 +131681,7 @@ self: {
        ];
        description = "An EDSL for diagrams based based on linear constraints";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -133670,8 +131723,8 @@ self: {
        pname = "lrucaching";
        version = "0.3.3";
        sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
-       revision = "2";
-       editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa";
+       revision = "3";
+       editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb";
        libraryHaskellDepends = [
          base base-compat deepseq hashable psqueues vector
        ];
@@ -133953,10 +132006,8 @@ self: {
     ({ mkDerivation, base, colonnade, lucid, text }:
      mkDerivation {
        pname = "lucid-colonnade";
-       version = "1.0";
-       sha256 = "13jb1vh2pxz1w2ycswdmyhr05c00i0x30agcwf93i359rwzcmbmc";
-       revision = "1";
-       editedCabalFile = "08zcksc8pd7sh4z78i80rinlmr3mghhclhcqn8kdkgv4p7ynldlv";
+       version = "1.0.1";
+       sha256 = "0gbpfh1ky5pq0f0rz619hxfgll4yj0ky056dvrvq0s741l3gnhv8";
        libraryHaskellDepends = [ base colonnade lucid text ];
        description = "Helper functions for using lucid with colonnade";
        license = stdenv.lib.licenses.bsd3;
@@ -134352,7 +132403,6 @@ self: {
        ];
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -134385,7 +132435,6 @@ self: {
        ];
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lzma-enumerator" = callPackage
@@ -134531,21 +132580,18 @@ self: {
        ];
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
     ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
-     , conduit, conduit-combinators, containers, criterion, distributive
-     , doctest, mtl, pipes, pointed, profunctors, semigroupoids
-     , semigroups, transformers, transformers-compat, void
+     , conduit, containers, criterion, distributive, doctest, mtl, pipes
+     , pointed, profunctors, semigroupoids, semigroups, streaming
+     , transformers, transformers-compat, void
      }:
      mkDerivation {
        pname = "machines";
-       version = "0.6.3";
-       sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz";
-       revision = "6";
-       editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7";
+       version = "0.6.4";
+       sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base comonad containers distributive mtl pointed
@@ -134554,7 +132600,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [
-         base conduit conduit-combinators criterion mtl pipes
+         base conduit criterion mtl pipes streaming
        ];
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -134719,7 +132765,6 @@ self: {
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -134833,31 +132878,33 @@ self: {
      }) {};
 
   "magicbane" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, async, attoparsec, base
-     , bytestring, conduit, conduit-combinators, data-default, data-has
-     , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
+     , conduit, conduit-combinators, data-default, data-has, ekg-core
+     , ekg-wai, envy, errors, exceptions, fast-logger, http-api-data
      , http-client, http-client-tls, http-conduit, http-link-header
-     , http-types, lifted-async, lifted-base, monad-control
-     , monad-logger, monad-metrics, mono-traversable, mtl, network-uri
-     , raw-strings-qq, refined, safe-exceptions, servant-server, split
+     , http-types, lifted-base, monad-control, monad-logger
+     , monad-metrics, mono-traversable, mtl, network-uri, raw-strings-qq
+     , refined, rio, rio-orphans, servant-server, split
      , string-conversions, text, transformers, transformers-base
-     , unordered-containers, wai, wai-cli, wai-middleware-metrics
+     , unliftio, unliftio-core, unordered-containers, wai, wai-cli
+     , wai-middleware-metrics
      }:
      mkDerivation {
        pname = "magicbane";
-       version = "0.2.0";
-       sha256 = "0v67mycp7mgawcwnkw68pivyicp9p2nj0f9isrdb14x5smm1f1zd";
+       version = "0.3.0";
+       sha256 = "1jg6mhi046gdp0mhwzx2n40dv2ysrj8mkif6krb4vg3mdwh39lr0";
        libraryHaskellDepends = [
-         aeson aeson-qq async attoparsec base bytestring conduit
+         aeson aeson-qq attoparsec base bytestring conduit
          conduit-combinators data-default data-has ekg-core ekg-wai envy
-         errors fast-logger http-api-data http-client http-client-tls
-         http-conduit http-link-header http-types lifted-async lifted-base
-         monad-control monad-logger monad-metrics mono-traversable mtl
-         network-uri raw-strings-qq refined safe-exceptions servant-server
-         split string-conversions text transformers transformers-base
+         errors exceptions fast-logger http-api-data http-client
+         http-client-tls http-conduit http-link-header http-types
+         lifted-base monad-control monad-logger monad-metrics
+         mono-traversable mtl network-uri raw-strings-qq refined rio
+         rio-orphans servant-server split string-conversions text
+         transformers transformers-base unliftio unliftio-core
          unordered-containers wai wai-cli wai-middleware-metrics
        ];
-       description = "A web framework that integrates Servant, EKG, fast-logger, wai-cli…";
+       description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -135039,19 +133086,6 @@ self: {
     ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.6.1";
-       sha256 = "1q25vn93jlxbrlprh5vv1mb4z0qjjl58snc7mv5a5lnjgj3j8ip3";
-       libraryHaskellDepends = [
-         base containers srcloc text transformers
-       ];
-       description = "Pretty printing designed for printing source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mainland-pretty_0_7" = callPackage
-    ({ mkDerivation, base, containers, srcloc, text, transformers }:
-     mkDerivation {
-       pname = "mainland-pretty";
        version = "0.7";
        sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi";
        libraryHaskellDepends = [
@@ -135059,7 +133093,6 @@ self: {
        ];
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "majordomo" = callPackage
@@ -135632,6 +133665,7 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -135698,8 +133732,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.4.5.0";
-       sha256 = "0z21jcrzky80fq172b2s0hwna4g1kzfzval40cdl6glf0l2zfimv";
+       version = "0.5.0.0";
+       sha256 = "19p2yh8yrav6dljmw8mz3xnghxf2h9a5z5wqxnb6zsrl11mds95g";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -135710,27 +133744,29 @@ self: {
      }) {};
 
   "manifolds" = callPackage
-    ({ mkDerivation, base, call-stack, comonad, constrained-categories
-     , containers, deepseq, free, free-vector-spaces, lens, linear
-     , linearmap-category, manifolds-core, MemoTrie, number-show
-     , placeholders, pragmatic-show, QuickCheck, semigroups, tagged
+    ({ mkDerivation, array, base, call-stack, comonad
+     , constrained-categories, containers, deepseq, free
+     , free-vector-spaces, ieee754, lens, linear, linearmap-category
+     , manifolds-core, MemoTrie, number-show, placeholders
+     , pragmatic-show, QuickCheck, semigroups, spatial-rotations, tagged
      , tasty, tasty-hunit, tasty-quickcheck, transformers, vector
      , vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.4.5.0";
-       sha256 = "0paq7x9nhna74q4y7gvwlvwfpzxil9dx9ysg3r6k5as4i9687442";
+       version = "0.5.0.0";
+       sha256 = "1261vap8raffngdxmzv042carjdlcssqbpa9vs3qi0x3jbbwiywc";
        libraryHaskellDepends = [
-         base call-stack comonad constrained-categories containers deepseq
-         free free-vector-spaces lens linear linearmap-category
-         manifolds-core MemoTrie number-show placeholders pragmatic-show
-         QuickCheck semigroups tagged transformers vector vector-space void
+         array base call-stack comonad constrained-categories containers
+         deepseq free free-vector-spaces ieee754 lens linear
+         linearmap-category manifolds-core MemoTrie number-show placeholders
+         pragmatic-show QuickCheck semigroups spatial-rotations tagged
+         transformers vector vector-space void
        ];
        testHaskellDepends = [
          base constrained-categories containers lens linear
-         linearmap-category pragmatic-show tasty tasty-hunit
-         tasty-quickcheck vector-space
+         linearmap-category pragmatic-show spatial-rotations tasty
+         tasty-hunit tasty-quickcheck vector-space
        ];
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
@@ -135741,11 +133777,12 @@ self: {
     ({ mkDerivation, base, call-stack, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.4.5.0";
-       sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p";
+       version = "0.5.0.0";
+       sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-classes" = callPackage
@@ -135784,24 +133821,6 @@ self: {
      }:
      mkDerivation {
        pname = "map-syntax";
-       version = "0.2.0.2";
-       sha256 = "12jdv9myffpkhhrwm5kzhbqzbxfb0rb4fvww33d0yq4s6sk9b3xi";
-       revision = "2";
-       editedCabalFile = "12b3pbrd70xpx634ngl4dcvda5p9494wq6mc8s1wv4624hwlgja6";
-       libraryHaskellDepends = [ base containers mtl ];
-       testHaskellDepends = [
-         base containers deepseq hspec HUnit mtl QuickCheck transformers
-       ];
-       description = "Syntax sugar for defining maps";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "map-syntax_0_3" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl
-     , QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "map-syntax";
        version = "0.3";
        sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k";
        libraryHaskellDepends = [ base containers mtl ];
@@ -135810,7 +133829,6 @@ self: {
        ];
        description = "Syntax sugar for defining maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mapalgebra" = callPackage
@@ -135837,6 +133855,7 @@ self: {
        ];
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mappy" = callPackage
@@ -135859,7 +133878,6 @@ self: {
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mapquest-api" = callPackage
@@ -135875,7 +133893,6 @@ self: {
        ];
        description = "Bindings to the MapQuest API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marihana" = callPackage
@@ -136018,6 +134035,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markov" = callPackage
@@ -136062,24 +134080,6 @@ self: {
   "markup" = callPackage
     ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
      , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
-     , path-extra, resourcet, text, transformers-base, urlpath
-     }:
-     mkDerivation {
-       pname = "markup";
-       version = "4.0.4";
-       sha256 = "1brk619d2abryvwyw9pj7g4axs1rc6p51cf4yf5q1p6f0zvi2dyb";
-       libraryHaskellDepends = [
-         attoparsec-uri base blaze-html blaze-markup clay comonad lucid
-         mmorph monad-control monad-logger mtl path-extra resourcet text
-         transformers-base urlpath
-       ];
-       description = "Abstraction for HTML-embedded content";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "markup_4_2_0" = callPackage
-    ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
-     , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
      , path, path-extra, resourcet, text, transformers-base, urlpath
      }:
      mkDerivation {
@@ -136093,7 +134093,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -136268,6 +134267,7 @@ self: {
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -136299,8 +134299,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.1.6.1";
-       sha256 = "1ifkzalbhp3jv41x9zwsn0ks3ahrab6gs1x57c4y0ww56qf0gv2y";
+       version = "0.2.0.0";
+       sha256 = "0jyripzh4da29bvbhrfmwvjicr22ll9vbd0f3wiv4gcmlpnhls9j";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -136317,8 +134317,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv-io";
-       version = "0.1.3.0";
-       sha256 = "08jngww0ki28d2mhfj9vw4rlxigzzvgb295k5fnj0cr7xmhr48zx";
+       version = "0.1.4.0";
+       sha256 = "0yah1g7cm959kzzlqkgbzrx5aswd697518v89z7r5380f6hqq4cc";
        libraryHaskellDepends = [
          base bytestring data-default deepseq directory filepath JuicyPixels
          massiv netpbm process vector
@@ -136469,6 +134469,7 @@ self: {
        ];
        description = "Dependently typed tensorflow modeler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -136584,21 +134585,6 @@ self: {
 
   "matrix" = callPackage
     ({ mkDerivation, base, criterion, deepseq, loop, primitive
-     , QuickCheck, tasty, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "matrix";
-       version = "0.3.5.0";
-       sha256 = "1d9mrbkzg6k9frvash5hf6gxmj3r2zwfk6mjaw03c4k2yv042gbs";
-       libraryHaskellDepends = [ base deepseq loop primitive vector ];
-       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "A native implementation of matrix operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "matrix_0_3_6_1" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, loop, primitive
      , QuickCheck, semigroups, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
@@ -136612,7 +134598,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A native implementation of matrix operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matrix-as-xyz" = callPackage
@@ -136620,14 +134605,15 @@ self: {
      }:
      mkDerivation {
        pname = "matrix-as-xyz";
-       version = "0.1.1.0";
-       sha256 = "0ckirpbflr69a51k21nfak74d5r4jxra2sl4ys2gyicjm77b5a3s";
+       version = "0.1.1.1";
+       sha256 = "1hca54xrd0ia4vcqpgkjn65qgk35rzrs3hjl6d758dj3gshq30xp";
        libraryHaskellDepends = [ base hspec matrix parsec QuickCheck ];
        testHaskellDepends = [
          base doctest hspec matrix parsec QuickCheck
        ];
        description = "Read and Display representation of matrix like \"x,y,z\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matrix-market" = callPackage
@@ -136836,6 +134822,7 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maxent-learner-hw-gui" = callPackage
@@ -136993,25 +134980,25 @@ self: {
      }) {};
 
   "mbug" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, http-client
-     , http-client-tls, optparse-applicative, process, scalpel-core
-     , tagsoup, text, th-printf, time, xdg-basedir
+    ({ mkDerivation, base, bytestring, directory, extra, formatting
+     , http-client, http-client-tls, mtl, optparse-applicative, process
+     , scalpel-core, tagsoup, text, time, xdg-basedir
      }:
      mkDerivation {
        pname = "mbug";
-       version = "1.0";
-       sha256 = "1bz8bwmapxssgs1j98xvad47185i81sqkydjf6r7329c4sn5gipv";
+       version = "1.3";
+       sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory extra http-client http-client-tls
-         optparse-applicative process scalpel-core tagsoup text th-printf
-         time xdg-basedir
+         base bytestring directory extra formatting http-client
+         http-client-tls mtl optparse-applicative process scalpel-core
+         tagsoup text time xdg-basedir
        ];
        executableHaskellDepends = [
-         base bytestring directory extra http-client http-client-tls
-         optparse-applicative process scalpel-core tagsoup text th-printf
-         time xdg-basedir
+         base bytestring directory extra formatting http-client
+         http-client-tls mtl optparse-applicative process scalpel-core
+         tagsoup text time xdg-basedir
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
@@ -137411,7 +135398,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Constant-time queries for the median of a stream of numeric data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediawiki" = callPackage
@@ -137493,53 +135479,49 @@ self: {
        ];
        description = "A silly container";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mega-sdist" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , http-conduit, optparse-simple, rio, tar-conduit, yaml
+     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
+     , yaml
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.2";
-       sha256 = "05v061giv1q0gq4n8x1g44pyfxjy95aqxnnv5bc4cclrp233m5b1";
+       version = "0.3.3";
+       sha256 = "0vwk3fq34f8nnviw7fxpyqx365v4khvjr45pzgxsgc7rfx7hcw9c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring conduit conduit-extra http-conduit optparse-simple
-         rio tar-conduit yaml
+         rio rio-orphans tar-conduit yaml
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, hspec, hspec-expectations, mtl
-     , parser-combinators, QuickCheck, scientific, text, transformers
-     , weigh
+  "mega-sdist_0_3_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
+     , yaml
      }:
      mkDerivation {
-       pname = "megaparsec";
-       version = "6.4.1";
-       sha256 = "0w0kw8g7c6c3sp0fpgfqjc2w032dv9s7jnyn1dx71hk5mifh2h6y";
-       revision = "2";
-       editedCabalFile = "0vh4l2kl9nfxlr8l82qicldybwiv6vbksi3jdk0xjzxmkvgm0jnf";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-expectations mtl QuickCheck
-         scientific text transformers
+       pname = "mega-sdist";
+       version = "0.3.3.1";
+       sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra http-conduit optparse-simple
+         rio rio-orphans tar-conduit yaml
        ];
-       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
+       description = "Handles uploading to Hackage from mega repos";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec_6_5_0" = callPackage
+  "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-discover, hspec-expectations
      , mtl, parser-combinators, QuickCheck, scientific, text
@@ -137549,8 +135531,8 @@ self: {
        pname = "megaparsec";
        version = "6.5.0";
        sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
-       revision = "1";
-       editedCabalFile = "1gfqxpzjr64jzj366ibxm5l55qba5jw7wnpc89b0mf8f752h5w1l";
+       revision = "2";
+       editedCabalFile = "0ahvqr29ym3g46yv2jxniccyn1ng1yqicqdbamkzm89gjnxd9n25";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -137563,7 +135545,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -137597,6 +135578,7 @@ self: {
        ];
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -137608,6 +135590,7 @@ self: {
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mellon-web" = callPackage
@@ -137842,7 +135825,6 @@ self: {
        libraryHaskellDepends = [ base direct-sqlite text ];
        description = "memoize functions using SQLite3 database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memoization-utils" = callPackage
@@ -137932,6 +135914,7 @@ self: {
        ];
        description = "basic memory pool outside of haskell heap/GC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memscript" = callPackage
@@ -137948,6 +135931,32 @@ self: {
        license = "GPL";
      }) {};
 
+  "menoh" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , JuicyPixels, menoh, monad-control, optparse-applicative
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "menoh";
+       version = "0.1.1";
+       sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
+       revision = "1";
+       editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers monad-control transformers vector
+       ];
+       libraryPkgconfigDepends = [ menoh ];
+       executableHaskellDepends = [
+         base filepath JuicyPixels optparse-applicative vector
+       ];
+       description = "Haskell binding for Menoh DNN inference library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {menoh = null;};
+
   "mercury-api" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory
      , hashable, HUnit, optparse-applicative, text, unordered-containers
@@ -137992,7 +136001,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mergeless" = callPackage
@@ -138001,14 +136009,13 @@ self: {
      }:
      mkDerivation {
        pname = "mergeless";
-       version = "0.0.0.0";
-       sha256 = "1wldriwz4247ikf73prlrgd2s5jfazq27p5b7yyfqmylx0h49vaz";
+       version = "0.1.0.0";
+       sha256 = "1sdi5h88xfb2rcxb9f7nzvlm94spgilsrkp4bs41s4j7cnhglyy6";
        libraryHaskellDepends = [
          aeson base containers mtl time validity validity-containers
          validity-time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "merkle-patricia-db" = callPackage
@@ -138160,6 +136167,7 @@ self: {
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meta-par-accelerate" = callPackage
@@ -138436,8 +136444,45 @@ self: {
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "1.0.1.7";
-       sha256 = "1waqcw63ygn6yjs7720l94kssfsrjdxfsp70kri498zsziia9w6y";
+       version = "1.0.1.8";
+       sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
+         containers data-default either errors html-conduit lens-aeson
+         network-uri pcre-heavy safe tagsoup text time transformers
+         unordered-containers vector xml-lens xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base base-compat blaze-html blaze-markup
+         data-default network network-uri options scotty text wai-cli
+         wai-extra
+       ];
+       testHaskellDepends = [
+         aeson-qq base base-compat bytestring data-default hspec
+         hspec-expectations-pretty-diff html-conduit mtl network-uri
+         raw-strings-qq template-haskell text time xml-lens
+       ];
+       description = "A Microformats 2 parser";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microformats2-parser_1_0_1_9" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+     , base-compat, blaze-html, blaze-markup, bytestring, containers
+     , data-default, either, errors, hspec
+     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
+     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
+     , scotty, tagsoup, template-haskell, text, time, transformers
+     , unordered-containers, vector, wai-cli, wai-extra, xml-lens
+     , xss-sanitize
+     }:
+     mkDerivation {
+       pname = "microformats2-parser";
+       version = "1.0.1.9";
+       sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138458,6 +136503,7 @@ self: {
        ];
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microformats2-types" = callPackage
@@ -138485,29 +136531,18 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.8.3";
-       sha256 = "17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k";
-       libraryHaskellDepends = [ base ];
-       description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens_0_4_9_1" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "microlens";
        version = "0.4.9.1";
        sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51";
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -138519,6 +136554,8 @@ self: {
        pname = "microlens-aeson";
        version = "2.3.0";
        sha256 = "1iahlh505jrlpd9ndkr5asfnzdpp6m6m2lm44ds15461py485wpj";
+       revision = "2";
+       editedCabalFile = "1ri98vr3bbx0l9b4vpmcwhf8fm5lgj92kw4g0v3jx6xajwwc5dc8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring deepseq hashable microlens
          scientific text unordered-containers vector
@@ -138564,21 +136601,6 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.4.8.0";
-       sha256 = "0yk9b0c1zm1z2y9hcgmdjkdis0g2wimb758y8fxnxshxlqpym8fy";
-       libraryHaskellDepends = [
-         array base bytestring containers microlens transformers
-       ];
-       description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-ghc_0_4_9" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, microlens
-     , transformers
-     }:
-     mkDerivation {
-       pname = "microlens-ghc";
        version = "0.4.9";
        sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma";
        libraryHaskellDepends = [
@@ -138586,7 +136608,6 @@ self: {
        ];
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-mtl" = callPackage
@@ -138610,22 +136631,6 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.3.9.0";
-       sha256 = "0f9m6yd4pf839flw3w4g1irplrlmncj0kxfci7dnbkp52x66y1wk";
-       libraryHaskellDepends = [
-         base hashable microlens microlens-ghc microlens-mtl microlens-th
-         text unordered-containers vector
-       ];
-       description = "Feature-complete microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-platform_0_3_10" = callPackage
-    ({ mkDerivation, base, hashable, microlens, microlens-ghc
-     , microlens-mtl, microlens-th, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "microlens-platform";
        version = "0.3.10";
        sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv";
        libraryHaskellDepends = [
@@ -138634,23 +136639,9 @@ self: {
        ];
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell }:
-     mkDerivation {
-       pname = "microlens-th";
-       version = "0.4.1.3";
-       sha256 = "15a12cqxlgbcn1n73zwrxnp2vfm8b0ma0a0sdd8zmjbs8zy3np4f";
-       libraryHaskellDepends = [
-         base containers microlens template-haskell
-       ];
-       description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-th_0_4_2_1" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
      }:
@@ -138665,7 +136656,6 @@ self: {
        testHaskellDepends = [ base microlens ];
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micrologger" = callPackage
@@ -138724,8 +136714,8 @@ self: {
        pname = "microstache";
        version = "1.0.1.1";
        sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
-       revision = "1";
-       editedCabalFile = "1var5mgzvkxl9s78hbxylkvv67z7fnbs5rb1l9q0cqxyw85cbr6j";
+       revision = "2";
+       editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath parsec
          text transformers unordered-containers vector
@@ -138845,7 +136835,6 @@ self: {
        ];
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-simple" = callPackage
@@ -138874,10 +136863,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-util";
-       version = "0.2";
-       sha256 = "1vnpc4ja72a1p6b44ypx0pirg2wnin9jfnfmcq715f599dyxaapr";
-       revision = "2";
-       editedCabalFile = "0nl8vrrffm8780pj8kadchq2sdyglvnl91bn1yrflh4pqlm2jzq8";
+       version = "0.2.0.1";
+       sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
        libraryHaskellDepends = [
          base containers event-list midi non-negative
        ];
@@ -139061,6 +137048,7 @@ self: {
        ];
        description = "A minimum web dev DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "milena" = callPackage
@@ -139110,6 +137098,7 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-mail" = callPackage
@@ -139168,8 +137157,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "mime-types";
-       version = "0.1.0.7";
-       sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3";
+       version = "0.1.0.8";
+       sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8";
        libraryHaskellDepends = [ base bytestring containers text ];
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
@@ -139323,27 +137312,27 @@ self: {
   "minio-hs" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, conduit, conduit-extra, containers, cryptonite
-     , cryptonite-conduit, data-default, directory, filepath
-     , http-client, http-conduit, http-types, memory, protolude
-     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, temporary, text, time, transformers, unliftio
-     , unliftio-core, xml-conduit
+     , cryptonite-conduit, directory, filepath, http-client
+     , http-conduit, http-types, ini, memory, protolude, QuickCheck
+     , resourcet, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     , temporary, text, time, transformers, unliftio, unliftio-core
+     , xml-conduit
      }:
      mkDerivation {
        pname = "minio-hs";
-       version = "1.0.1";
-       sha256 = "0hxl56zx9xhyi14pmd4mns8r43pym1nhhfqrni3wxqrxh1w6qbsv";
+       version = "1.2.0";
+       sha256 = "14qhaiki7g09gkakl1irf0a5fnrcaj2x84vvh09g3dfsgybr851i";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive conduit
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         filepath http-client http-conduit http-types memory protolude
+         conduit-extra containers cryptonite cryptonite-conduit directory
+         filepath http-client http-conduit http-types ini memory protolude
          resourcet text time transformers unliftio unliftio-core xml-conduit
        ];
        testHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive conduit
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         directory filepath http-client http-conduit http-types memory
-         protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck
+         conduit-extra containers cryptonite cryptonite-conduit directory
+         filepath http-client http-conduit http-types ini memory protolude
+         QuickCheck resourcet tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck temporary text time transformers unliftio
          unliftio-core xml-conduit
        ];
@@ -139586,27 +137575,8 @@ self: {
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.14.0.0";
-       sha256 = "16qi1wcijncjjrjdwxs90jn3xclw1cgb0j1gby1w9d457ys6hmnx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data http-types lucid
-         network-uri servant servant-lucid text transformers vector
-       ];
-       description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miso_0_20_0_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
-     , http-types, lucid, network-uri, servant, servant-lucid, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "miso";
-       version = "0.20.0.0";
-       sha256 = "0nr7j9065mrwmmqwjsgl9krh21mhxjddbwmkwja0b207aglc072j";
+       version = "0.21.1.0";
+       sha256 = "1yz909nmm0qjvm4kbq5r8a5r4881pcq0n2jzf29y9svcz8apw08l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139615,7 +137585,6 @@ self: {
        ];
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -139720,6 +137689,7 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ml-w" = callPackage
@@ -139751,37 +137721,14 @@ self: {
 
   "mltool" = callPackage
     ({ mkDerivation, ascii-progress, base, deepseq, hmatrix
-     , hmatrix-gsl, hmatrix-gsl-stats, HUnit, MonadRandom, random
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , vector
-     }:
-     mkDerivation {
-       pname = "mltool";
-       version = "0.1.0.2";
-       sha256 = "1gzm8a8abz8bnh80ylq0clp3isz2cx05mmyqwsdmh6kf94xsg71p";
-       libraryHaskellDepends = [
-         ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-gsl-stats
-         MonadRandom random vector
-       ];
-       testHaskellDepends = [
-         base hmatrix hmatrix-gsl-stats HUnit MonadRandom random
-         test-framework test-framework-hunit test-framework-quickcheck2
-         vector
-       ];
-       description = "Machine Learning Toolbox";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mltool_0_2_0_0" = callPackage
-    ({ mkDerivation, ascii-progress, base, deepseq, hmatrix
      , hmatrix-gsl, hmatrix-morpheus, HUnit, MonadRandom, random
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , vector
      }:
      mkDerivation {
        pname = "mltool";
-       version = "0.2.0.0";
-       sha256 = "0yjq9wbvni9sgh966jccfcsm6ajicrfkgvwg08383rwnsqbbjm8q";
+       version = "0.2.0.1";
+       sha256 = "1zz06c0xv718faygnsgzmhg17xc5hrjsj9xkdaf3qmzbr1gwfvki";
        libraryHaskellDepends = [
          ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-morpheus
          MonadRandom random vector
@@ -139821,8 +137768,8 @@ self: {
        pname = "mmark";
        version = "0.0.5.6";
        sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw";
-       revision = "2";
-       editedCabalFile = "0hzz7l9npv364yzw6i6q6699nn1raj1p2cmwmlqp43rz8s3ryawn";
+       revision = "4";
+       editedCabalFile = "0jc342mpqp1s6s9al7dyky54wpvbx6a1jl8yljmwgmhafrbg1kdk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -139848,8 +137795,8 @@ self: {
        pname = "mmark-cli";
        version = "0.0.3.0";
        sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp";
-       revision = "1";
-       editedCabalFile = "0rzz4m7z02m6rmigmmpgqhik1d7kc0i4mri0gpj1i3j7a59p7s1q";
+       revision = "2";
+       editedCabalFile = "0i3gvfgm4bfbdyflhhaf4gdr7cbkw51i330f25rgha9k3s4v59w3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139858,12 +137805,12 @@ self: {
        ];
        description = "Command line interface to MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-ext" = callPackage
-    ({ mkDerivation, base, foldl, hspec, hspec-discover, lucid
-     , microlens, mmark, modern-uri, skylighting, text
+    ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec
+     , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting
+     , text
      }:
      mkDerivation {
        pname = "mmark-ext";
@@ -139871,7 +137818,8 @@ self: {
        sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base foldl lucid microlens mmark modern-uri skylighting text
+         base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
+         skylighting text
        ];
        testHaskellDepends = [ base hspec lucid mmark text ];
        testToolDepends = [ hspec-discover ];
@@ -140044,8 +137992,8 @@ self: {
        pname = "modern-uri";
        version = "0.2.1.0";
        sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
-       revision = "4";
-       editedCabalFile = "00vr4g5cmhd3d1329hwcdq55yjq8n5jxz15sgl0sawcg5mw5ihyy";
+       revision = "5";
+       editedCabalFile = "089smjciwx6iav6wqpxhwdzlm0d1jdmgcgjv0r2c4vqrwdd1wb4h";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -140230,6 +138178,7 @@ self: {
        ];
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moesocks" = callPackage
@@ -140303,6 +138252,7 @@ self: {
        ];
        description = "A glorified string replacement tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mollie-api-haskell" = callPackage
@@ -140311,8 +138261,8 @@ self: {
      }:
      mkDerivation {
        pname = "mollie-api-haskell";
-       version = "0.2.0.0";
-       sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n";
+       version = "0.2.0.1";
+       sha256 = "0hyxfa2diqjlcd0x5fxscn8lsmjkwzpvvj04w2n52q5dnm76qacm";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
@@ -140321,7 +138271,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-abort-fd" = callPackage
@@ -140338,7 +138287,6 @@ self: {
        ];
        description = "A better error monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-atom" = callPackage
@@ -140418,7 +138366,6 @@ self: {
        ];
        description = "more flexible mtl";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-classes-logging" = callPackage
@@ -140437,7 +138384,6 @@ self: {
        ];
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-codec" = callPackage
@@ -140574,7 +138520,6 @@ self: {
        ];
        description = "Guard monadic computations with cleanup actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-fork" = callPackage
@@ -140847,6 +138792,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-markov" = callPackage
+    ({ mkDerivation, base, base-compat, MonadRandom, mtl, random
+     , transformers
+     }:
+     mkDerivation {
+       pname = "monad-markov";
+       version = "0.1.0.0";
+       sha256 = "173qlab980aq5hzxs4xxkx1ykvm40q84zsn6a8rksfq7sh1gzc1l";
+       libraryHaskellDepends = [
+         base base-compat MonadRandom mtl random transformers
+       ];
+       description = "Markov process monad";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-memo" = callPackage
     ({ mkDerivation, array, base, containers, criterion, mtl, primitive
      , QuickCheck, random, test-framework, test-framework-quickcheck2
@@ -140888,8 +138848,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-metrics";
-       version = "0.2.1.1";
-       sha256 = "11gr6ir4678alscv9m6w33l6nbn0k1xspy4lzlgdqpfq5narl5zy";
+       version = "0.2.1.2";
+       sha256 = "0zxvdx75psdninvh7f7wqj498wav2cjmn94n5a3f5g8nvrs0n4rq";
        libraryHaskellDepends = [
          base clock ekg-core exceptions hashable microlens mtl text
          transformers unordered-containers
@@ -140915,6 +138875,7 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-open" = callPackage
@@ -141122,6 +139083,7 @@ self: {
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-skeleton" = callPackage
@@ -141255,27 +139217,12 @@ self: {
     ({ mkDerivation, base, mtl, time }:
      mkDerivation {
        pname = "monad-time";
-       version = "0.2";
-       sha256 = "0pdhx2xfh0ik3vzflg2jmw9nplljvc32aisa6xgivixljk503fd9";
-       revision = "1";
-       editedCabalFile = "1v59w75w589mh6n3ga2fcihgmjmg0vd0q7fg9l2q52yhgx5pz9m3";
-       libraryHaskellDepends = [ base mtl time ];
-       testHaskellDepends = [ base mtl time ];
-       description = "Type class for monads which carry the notion of the current time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-time_0_3_1_0" = callPackage
-    ({ mkDerivation, base, mtl, time }:
-     mkDerivation {
-       pname = "monad-time";
        version = "0.3.1.0";
        sha256 = "0z30c0k5bqlz86vwajnm6kj26i09zx6dzqwd00z6ba8hqyzm1x0a";
        libraryHaskellDepends = [ base mtl time ];
        testHaskellDepends = [ base mtl time ];
        description = "Type class for monads which carry the notion of the current time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-timing" = callPackage
@@ -141293,6 +139240,7 @@ self: {
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-tx" = callPackage
@@ -141490,7 +139438,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -141595,6 +139542,7 @@ self: {
        ];
        description = "A monoid for monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadplus" = callPackage
@@ -141606,6 +139554,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monads-fd" = callPackage
@@ -141715,38 +139664,6 @@ self: {
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
      , lifted-base, monad-control, mtl, network, nonce, old-locale
-     , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text
-     , time, tls, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "mongoDB";
-       version = "2.3.0.5";
-       sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9";
-       revision = "2";
-       editedCabalFile = "0bx2vdwp53c9dgil09qg22hd1j1dilwqcg6ighp28ajmnxkyl8j0";
-       libraryHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring conduit conduit-extra containers cryptohash
-         data-default-class hashtables lifted-base monad-control mtl network
-         nonce parsec pureMD5 random random-shuffle resourcet tagged text
-         time tls transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec mtl old-locale text time ];
-       benchmarkHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring containers criterion cryptohash data-default-class
-         hashtables lifted-base monad-control mtl network nonce parsec
-         random random-shuffle text transformers-base
-       ];
-       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "mongoDB_2_4_0_0" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, conduit, conduit-extra, containers
-     , criterion, cryptohash, data-default-class, hashtables, hspec
-     , lifted-base, monad-control, mtl, network, nonce, old-locale
      , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged
      , text, time, tls, transformers, transformers-base
      }:
@@ -141770,7 +139687,6 @@ self: {
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -141823,6 +139739,7 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monky" = callPackage
@@ -141933,6 +139850,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-extras" = callPackage
@@ -141940,26 +139858,12 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-extras";
-       version = "0.4.4";
-       sha256 = "1ik88ilg5zjrajqllg3zjp92bz8mhvrc8q9mx6llkwry5k3avsfx";
-       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Various extra monoid-related definitions and utilities";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-extras_0_5" = callPackage
-    ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
-     }:
-     mkDerivation {
-       pname = "monoid-extras";
        version = "0.5";
        sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-owns" = callPackage
@@ -142002,6 +139906,7 @@ self: {
        ];
        description = "Monoids for calculation of statistics of sample";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-subclasses" = callPackage
@@ -142021,7 +139926,6 @@ self: {
        ];
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -142231,6 +140135,7 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "A few more collections";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "more-extensible-effects" = callPackage
@@ -142300,6 +140205,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple database migrator for PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morte" = callPackage
@@ -142312,8 +140218,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.19";
-       sha256 = "1mqkjdn3hr3ihjai9qpcfrbn318pkddnlkck96v8byfmil6d4dph";
+       version = "1.6.20";
+       sha256 = "01m382137sa9if332y9aag8fl77f4sd3i8kxz5cp8g1p10iyjjbl";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -142926,7 +140832,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mtl" = callPackage
+  "mtl_2_2_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mtl";
@@ -142935,6 +140841,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-c" = callPackage
@@ -143259,6 +141166,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multi-trie" = callPackage
@@ -143381,6 +141289,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "multihashmap" = callPackage
+    ({ mkDerivation, base, hashable, unordered-containers }:
+     mkDerivation {
+       pname = "multihashmap";
+       version = "0.1.0.0";
+       sha256 = "1bripl4vqj275n4wnka7vrdcjyyppbc773pfsbmvfjvl2qqi5jrb";
+       libraryHaskellDepends = [ base hashable unordered-containers ];
+       description = "hashmap from keys to hashsets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multimap" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -143460,7 +141379,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Lightweight generic library for mutually recursive data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiplate-simplified" = callPackage
@@ -143492,6 +141410,67 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multipool" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, monad-logger, mtl
+     , persistent, resource-pool, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool";
+       version = "0.1.0.1";
+       sha256 = "1mcdsn4ja9w8bnxrz4dglwbzq6bxg5xq2iik8da49n8l8ah2xq78";
+       libraryHaskellDepends = [
+         base bytestring hashable monad-logger mtl persistent resource-pool
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring hashable monad-logger mtl persistent resource-pool
+         text unordered-containers
+       ];
+       description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multipool-persistent" = callPackage
+    ({ mkDerivation, base, mtl, multipool, persistent, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool-persistent";
+       version = "0.1.0.1";
+       sha256 = "0nw56wpgwvzk8ib3av42zkpj5xviw3m3qlig791rl4074yj60wn2";
+       libraryHaskellDepends = [
+         base mtl multipool persistent unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         base mtl multipool persistent unliftio-core unordered-containers
+       ];
+       description = "Read and write from appropriate persistent sql instances in replicated environments";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multipool-persistent-postgresql" = callPackage
+    ({ mkDerivation, base, monad-logger, mtl, multipool
+     , multipool-persistent, persistent, persistent-postgresql
+     , postgresql-common-persistent, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool-persistent-postgresql";
+       version = "0.1.0.1";
+       sha256 = "11y8hr9f5f7ni7nxz1h6bi7jn3pj09ngjrqgliwihx60ind2dk6q";
+       libraryHaskellDepends = [
+         base monad-logger mtl multipool multipool-persistent persistent
+         persistent-postgresql postgresql-common-persistent unliftio-core
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base monad-logger mtl multipool multipool-persistent persistent
+         persistent-postgresql postgresql-common-persistent unliftio-core
+         unordered-containers
+       ];
+       description = "Read and write appropriately from both master and replicated postgresql instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multirec" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -143502,6 +141481,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multirec-alt-deriver" = callPackage
@@ -143574,28 +141554,10 @@ self: {
      }:
      mkDerivation {
        pname = "multistate";
-       version = "0.7.1.2";
-       sha256 = "1mcl0gp2l9wvscq942mz6p0pwlaf4i8li9kp20bp608kahy332ci";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base monad-control mtl tagged transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec transformers ];
-       description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "multistate_0_8_0_0" = callPackage
-    ({ mkDerivation, base, hspec, monad-control, mtl, tagged
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "multistate";
        version = "0.8.0.0";
        sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1";
-       revision = "1";
-       editedCabalFile = "1p5xf8i7y56fb4m7is0x1z852cq82sv0342z1h4qz1mi8vpln7zz";
+       revision = "2";
+       editedCabalFile = "1dp52gacm8ql3g7xvb1dzp3migwpz2kcnz8pafbf7rs1lmccj1zf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143604,7 +141566,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multivariant" = callPackage
@@ -144218,6 +142179,7 @@ self: {
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mvc" = callPackage
@@ -144272,8 +142234,8 @@ self: {
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
-       version = "2.0.3";
-       sha256 = "18gnr5bjmz2bl717dhvg6hwj6z06y5sw2nmsw7d3vl37qd9rp6by";
+       version = "2.0.4";
+       sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
@@ -144515,10 +142477,8 @@ self: {
      }:
      mkDerivation {
        pname = "myanimelist-export";
-       version = "0.2.0.0";
-       sha256 = "1d9fqna5qavp1lzpsg8yg816m3smybdsx25gafqr9wc2555rj1gg";
-       revision = "1";
-       editedCabalFile = "1ni5bmhfra2rlxlv55iah865shyibz7bwl2zz6161v4s35bs68dj";
+       version = "0.3.0.0";
+       sha256 = "1jr0xb9ygx864b3ssbv0yk83a5lfvxmsnnyacwfzbsdg8fi1ip0k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144531,7 +142491,6 @@ self: {
        ];
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -144792,6 +142751,7 @@ self: {
        ];
        description = "Web application to view and kill MySQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mzv" = callPackage
@@ -144842,6 +142802,7 @@ self: {
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nagios-check" = callPackage
@@ -145037,8 +142998,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
-       version = "0.2.0.4";
-       sha256 = "03nj3qdqkdl4wgb9s4p1dmrcx19ffc03br0a3n8z85bih0p4vgsq";
+       version = "0.3.0.0";
+       sha256 = "09m5zflpk1h7jwz40mijhnpbsd8qnnay1jm3lpfrvdmg49m8zqqb";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
@@ -145054,6 +143015,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Generic Haskell library for managing namespaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nano-cryptr" = callPackage
@@ -145206,6 +143168,8 @@ self: {
        pname = "nanovg";
        version = "0.6.0.0";
        sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3";
+       revision = "1";
+       editedCabalFile = "1lhfsq50r9bdby7mfscw8ih3wsz2m19lr2a2z9b6diaf5kz76vij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
@@ -145252,6 +143216,7 @@ self: {
        ];
        description = "Efficient representable functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "naqsha" = callPackage
@@ -145266,6 +143231,7 @@ self: {
        testHaskellDepends = [ base groups hspec HUnit QuickCheck ];
        description = "A library for working with geospatial data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "narc" = callPackage
@@ -145318,6 +143284,7 @@ self: {
        ];
        description = "NationStates API client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "native" = callPackage
@@ -145338,7 +143305,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Native library manager for Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nats" = callPackage
@@ -145347,6 +143313,8 @@ self: {
        pname = "nats";
        version = "1.1.2";
        sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
+       revision = "1";
+       editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh";
        doHaddock = false;
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -145456,8 +143424,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "5";
-       editedCabalFile = "1wlmkq9k9aym4wig9rn5w6sygq2fg9kd02d18pfzgxw70icqjlq3";
+       revision = "6";
+       editedCabalFile = "0qdjf1756gmq6vjd1p7i4b398s7j1gqfiaz3yf894h5p6x1ym0zl";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -145587,15 +143555,15 @@ self: {
      }) {};
 
   "neat-interpolation" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell
-     , text
+    ({ mkDerivation, base, base-prelude, HTF, megaparsec
+     , template-haskell, text
      }:
      mkDerivation {
        pname = "neat-interpolation";
-       version = "0.3.2.1";
-       sha256 = "0550dy0vwh81byi9bxhdzqx5y9lnvkwj5rbks5rbj2fylhyf8c2m";
+       version = "0.3.2.2";
+       sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n";
        libraryHaskellDepends = [
-         base base-prelude parsec template-haskell text
+         base base-prelude megaparsec template-haskell text
        ];
        testHaskellDepends = [ base-prelude HTF ];
        description = "A quasiquoter for neat and simple multiline text interpolation";
@@ -145726,6 +143694,7 @@ self: {
        ];
        description = "a TCP tunnel with packet length obfuscation";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nemesis" = callPackage
@@ -145891,6 +143860,7 @@ self: {
        ];
        description = "List-like data structures with O(log(n)) random access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nested-sets" = callPackage
@@ -146027,23 +143997,11 @@ self: {
     ({ mkDerivation, base, storable-complex, transformers }:
      mkDerivation {
        pname = "netlib-ffi";
-       version = "0.0.1";
-       sha256 = "1v973ibi6jsv09q3n9bmyavv9wqvnljzr9nrvf4pbi6p5l2kyjnw";
-       libraryHaskellDepends = [ base storable-complex transformers ];
-       description = "Helper modules for FFI to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "netlib-ffi_0_1" = callPackage
-    ({ mkDerivation, base, storable-complex, transformers }:
-     mkDerivation {
-       pname = "netlib-ffi";
        version = "0.1";
        sha256 = "0ckwa5r8fx2j7qb5phy6gm3xbg9crr9amglcicdxgnzgjd8aap2h";
        libraryHaskellDepends = [ base storable-complex transformers ];
        description = "Helper modules for FFI to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -146204,8 +144162,8 @@ self: {
      }:
      mkDerivation {
        pname = "nettle";
-       version = "0.2.0";
-       sha256 = "1plv9r86ljgjvvb8ny8zayrcdrmy7cd8jfvq4vp56b407dqq8092";
+       version = "0.3.0";
+       sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
@@ -146217,7 +144175,6 @@ self: {
        ];
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -146374,22 +144331,24 @@ self: {
     ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }:
      mkDerivation {
        pname = "network";
-       version = "2.6.3.5";
-       sha256 = "0h84pv672psxhh5ls407w175cik0gbyx39zynzmw991hr7jgc64s";
+       version = "2.6.3.6";
+       sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring doctest hspec HUnit ];
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network_2_7_0_0" = callPackage
+  "network_2_7_0_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
      , unix
      }:
      mkDerivation {
        pname = "network";
-       version = "2.7.0.0";
-       sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1";
+       version = "2.7.0.2";
+       sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf";
+       revision = "1";
+       editedCabalFile = "06pc3iybcn9dyvx7q3qh6cczalb0bfinbay8pjhcahg6mwvgf32s";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring directory doctest hspec HUnit
@@ -146623,8 +144582,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-conduit-tls";
-       version = "1.3.0";
-       sha256 = "11a9s8spqccnv2x41846pqgkwvb554lrq7qdas78p7biw1d28vbl";
+       version = "1.3.2";
+       sha256 = "0zxdsf7isv3l2g58vsvi8iwlrgf85v7ksa8636kr6ffycbhn1zgc";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra connection data-default-class
          network streaming-commons tls transformers unliftio-core
@@ -146715,6 +144674,7 @@ self: {
        ];
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-fancy" = callPackage
@@ -146907,6 +144867,7 @@ self: {
        ];
        description = "Library for writing PGI applications";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-protocol-xmpp" = callPackage
@@ -146923,6 +144884,7 @@ self: {
        ];
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-rpca" = callPackage
@@ -147020,7 +144982,6 @@ self: {
        ];
        description = "Simple interface to TLS secured network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-socket-options" = callPackage
@@ -147330,6 +145291,7 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neural" = callPackage
@@ -147504,6 +145466,8 @@ self: {
        pname = "newtype-generics";
        version = "0.5.3";
        sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj";
+       revision = "1";
+       editedCabalFile = "1glnwq1lw7780qgahqvh1qfx6k2ciwmbhc2wcc78v3aa3s954c8v";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
@@ -147562,6 +145526,7 @@ self: {
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nf" = callPackage
@@ -147685,6 +145650,7 @@ self: {
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nicify" = callPackage
@@ -147899,8 +145865,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.2";
-       sha256 = "1n1f3p5hamvlc7jhl9m569d8li9kxqwkjmv5nn1mq1n1ldhdlwxj";
+       version = "1.0.3";
+       sha256 = "1580gqc5jy2zrd62drwzl1i7lcq0r0l653yi9s0c08a7xk5vsz7h";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -148021,6 +145987,7 @@ self: {
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nlp-scores-scripts" = callPackage
@@ -148362,6 +146329,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "non-empty-containers" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "non-empty-containers";
+       version = "0.1.1.0";
+       sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc";
+       libraryHaskellDepends = [ base containers ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "non-empty-sequence" = callPackage
     ({ mkDerivation, base, containers, semigroups }:
      mkDerivation {
@@ -148389,13 +146366,12 @@ self: {
     ({ mkDerivation, base, checkers, QuickCheck }:
      mkDerivation {
        pname = "non-empty-zipper";
-       version = "0.1.0.8";
-       sha256 = "0fyq9x0x04pv45v73mkc273ih5kd9ac40psr00zva58n352f9az9";
+       version = "0.1.0.9";
+       sha256 = "1y1r6058y47g7xy2yknz7fhgx2qbmmxj50zwvyvrrikmrkljr5ba";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-negative" = callPackage
@@ -148449,6 +146425,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonemptymap" = callPackage
+    ({ mkDerivation, base, containers, semigroupoids }:
+     mkDerivation {
+       pname = "nonemptymap";
+       version = "0.0.4.0";
+       sha256 = "0rkdhbg0bps8ws20xspw98fkmbcgzfir9kk5pxwir8x6pwwbfd8h";
+       libraryHaskellDepends = [ base containers semigroupoids ];
+       description = "A NonEmptyMap Implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nonfree" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -148458,6 +146445,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonlinear-optimization" = callPackage
@@ -148527,8 +146515,8 @@ self: {
        pname = "normalization-insensitive";
        version = "2.0.1";
        sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v";
-       revision = "2";
-       editedCabalFile = "0djclsv0vzd56139ddzhykbwb3ny9mf8k2pryp8w33h9i4hv7axc";
+       revision = "3";
+       editedCabalFile = "1p1pw5llhw0jp1w8yvwd79w06lk7rz74rryppzvw8vpc5axl99bq";
        libraryHaskellDepends = [
          base bytestring deepseq hashable text unicode-transforms
        ];
@@ -148539,20 +146527,22 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "normalize" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, lens
-     , optparse-generic, statistics, text, vector
+     , optparse-generic, statistics, text, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "normalize";
-       version = "0.3.0.1";
-       sha256 = "1wx7jfbc5s1zpksyq1vhb3460gll1fl6lkdbp3349rxifz0l27dq";
+       version = "0.3.1.1";
+       sha256 = "03qlp2vixw7ihzd14vhxv4jrfpnv2yzz9nvqcfcmkkv5p20ldpxy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cassava containers lens statistics text vector
+         vector-algorithms
        ];
        executableHaskellDepends = [
          base bytestring cassava containers optparse-generic text vector
@@ -148704,7 +146694,6 @@ self: {
        ];
        description = "A data type for representing numeric values, except zero";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "np-extras" = callPackage
@@ -148955,7 +146944,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Number of digits in a number in decimal and hexadecimal representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "number-show" = callPackage
@@ -148980,6 +146968,7 @@ self: {
        libraryHaskellDepends = [ base call-stack semigroups ];
        description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numbering" = callPackage
@@ -149191,34 +147180,14 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, base, doctest, protolude, QuickCheck, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "numhask";
-       version = "0.1.4.0";
-       sha256 = "1324d4fqsjidrq3i0n869a5xq1w1nl2q2lpcf7bpb5a7wgmsfmgj";
-       libraryHaskellDepends = [
-         base protolude QuickCheck tasty tasty-quickcheck
-       ];
-       testHaskellDepends = [
-         base doctest protolude QuickCheck tasty tasty-quickcheck
-       ];
-       description = "A numeric prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "numhask_0_2_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.2.0";
-       sha256 = "0i0acm03qirj6xnpyv87v4vss7bmcnzkv8j7rymvshp92nrxihgd";
+       version = "0.2.3.1";
+       sha256 = "04f1gzfhaikwazvdz0aigf6lz8yk75p8ji9pjb0wsdyxs8mly21k";
        libraryHaskellDepends = [ base ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -149244,70 +147213,68 @@ self: {
 
   "numhask-histogram" = callPackage
     ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude
-     , numhask-range, protolude, tasty, tdigest
+     , numhask-range, tdigest
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.2.1";
-       sha256 = "0pjl4xqfi9kr56sr83ais1mx9k3rz739axr9wrj0n1xzdp4q9yr9";
+       version = "0.1.3.0";
+       sha256 = "1d4b1iv6czhc9747p5df3qlbj34nzlz608qp975cg31i63inz2ix";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
-       testHaskellDepends = [ base doctest protolude tasty ];
+       testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-prelude" = callPackage
-    ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck
-     , tasty, tasty-quickcheck
-     }:
+    ({ mkDerivation, base, doctest, numhask, protolude }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.5.1";
-       sha256 = "0bpisfh0ngxbxpb080fpd02bjvl451n0rqdr1c3zxyljv6xnkbvj";
-       libraryHaskellDepends = [
-         base numhask protolude QuickCheck tasty tasty-quickcheck
-       ];
-       testHaskellDepends = [ base doctest QuickCheck tasty ];
+       version = "0.1.0.1";
+       sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi";
+       libraryHaskellDepends = [ base numhask protolude ];
+       testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-range" = callPackage
-    ({ mkDerivation, adjunctions, base, distributive, doctest, numhask
-     , protolude, QuickCheck, semigroupoids, tasty
+    ({ mkDerivation, adjunctions, base, distributive, doctest
+     , numhask-prelude, numhask-test, protolude, QuickCheck
+     , semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.1.3.0";
-       sha256 = "1h42p48ridvvaxzjjh17pfjmfw9sjlzlmippi952m7jf1rfjxjpi";
+       version = "0.2.3.1";
+       sha256 = "1zfw49cgjwbx6v6ljqbl46d1nkiah0p79pjargjsfpfks9ra2qkc";
        libraryHaskellDepends = [
-         adjunctions base distributive numhask protolude QuickCheck
+         adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
        ];
-       testHaskellDepends = [ base doctest numhask tasty ];
+       testHaskellDepends = [
+         base doctest numhask-prelude numhask-test tasty
+       ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_2_1" = callPackage
-    ({ mkDerivation, adjunctions, base, distributive, doctest
-     , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
+  "numhask-test" = callPackage
+    ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty
+     , tasty-quickcheck
      }:
      mkDerivation {
-       pname = "numhask-range";
-       version = "0.2.2.1";
-       sha256 = "1bay0jsarz7d2kbgi3zvdl2dip9arv9qdlk41szgvsbgqbadxjxf";
+       pname = "numhask-test";
+       version = "0.1.0.0";
+       sha256 = "1czcgnqxxm835q9m2iw3xyd8qwjpgdpjs1n9zzpd5sk6rklcjx6y";
        libraryHaskellDepends = [
-         adjunctions base distributive numhask-prelude protolude QuickCheck
-         semigroupoids
+         base numhask-prelude QuickCheck tasty tasty-quickcheck
        ];
-       testHaskellDepends = [ base doctest numhask-prelude tasty ];
-       description = "Numbers that are range representations";
+       testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
+       description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -149403,8 +147370,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "1.0.0.1";
-       sha256 = "05kqrnzxhydns3iyqk1rhdgx3cyqgcskhfwa1d87hcyx0p4w51pw";
+       version = "1.0.0.2";
+       sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149428,7 +147395,6 @@ self: {
        ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -149451,7 +147417,6 @@ self: {
        ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -149469,7 +147434,6 @@ self: {
        ];
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvvm" = callPackage
@@ -149547,8 +147511,8 @@ self: {
      }:
      mkDerivation {
        pname = "o-clock";
-       version = "0.1.1";
-       sha256 = "1adksq9s86gqxvn74qpa22w4fciq8k8j5v3qh0cas2rwabxqdr00";
+       version = "1.0.0";
+       sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim ];
@@ -149778,6 +147742,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "observable" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "observable";
+       version = "0.1.0";
+       sha256 = "1y4rm73dqhdp5nvlqn68v1pkc9lg9wbhd1dx7nn3ckp8m5fv2kh0";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Make your action to be observable and listen events from them";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "observable-sharing" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -149818,18 +147793,6 @@ self: {
      }) {};
 
   "ochintin-daicho" = callPackage
-    ({ mkDerivation, base, bookkeeping, doctest, Glob, text }:
-     mkDerivation {
-       pname = "ochintin-daicho";
-       version = "0.1.0.1";
-       sha256 = "1s2n0k8ix4lc9x07s2qhgiiln6xyfswkkz14ri6jm1k9k3hr946l";
-       libraryHaskellDepends = [ base bookkeeping text ];
-       testHaskellDepends = [ base doctest Glob ];
-       description = "A module to manage payroll books for Japanese companies";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ochintin-daicho_0_3_1_1" = callPackage
     ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable
      , text, transaction
      }:
@@ -149843,7 +147806,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "A module to manage payroll books for Japanese companies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octane" = callPackage
@@ -149944,25 +147906,26 @@ self: {
 
   "odbc" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , formatting, hspec, optparse-applicative, QuickCheck, semigroups
-     , text, time, transformers, unixODBC, unliftio-core, weigh
+     , formatting, hspec, optparse-applicative, parsec, QuickCheck
+     , semigroups, template-haskell, text, time, transformers, unixODBC
+     , unliftio-core, weigh
      }:
      mkDerivation {
        pname = "odbc";
-       version = "0.0.5";
-       sha256 = "06b52hd9bxidp62y2h856ac90pypcv72q533i7lywf4gjj1q0grn";
+       version = "0.2.0";
+       sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring containers deepseq formatting semigroups text
-         time transformers unliftio-core
+         async base bytestring containers deepseq formatting parsec
+         semigroups template-haskell text time transformers unliftio-core
        ];
        librarySystemDepends = [ unixODBC ];
        executableHaskellDepends = [
          base bytestring optparse-applicative text
        ];
        testHaskellDepends = [
-         base bytestring hspec QuickCheck text time
+         base bytestring hspec parsec QuickCheck text time
        ];
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
@@ -149987,26 +147950,25 @@ self: {
      }) {};
 
   "odpic-raw" = callPackage
-    ({ mkDerivation, base, c2hs, conduit, hspec, monad-control
-     , monad-logger, odpic, QuickCheck, resourcet, text, time
-     , unliftio-core
+    ({ mkDerivation, base, bytestring, c2hs, conduit, Decimal, hspec
+     , odpic, resourcet, time
      }:
      mkDerivation {
        pname = "odpic-raw";
-       version = "0.2.0";
-       sha256 = "0g83ag8ggcwmf82zghzdds990l5hvcfiv85rlj95phb0lpdskj5m";
+       version = "0.3.0";
+       sha256 = "0s4n82kddl4xwjaj98xmgisip68l2ib6ca7z4nqfy8lzchvmls6j";
        libraryHaskellDepends = [
-         base conduit monad-control resourcet text time unliftio-core
+         base bytestring conduit Decimal resourcet time
        ];
        librarySystemDepends = [ odpic ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base conduit hspec monad-logger QuickCheck resourcet text
+         base bytestring conduit Decimal hspec resourcet time
        ];
        description = "Oracle Database Bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {odpic = null;};
+     }) {inherit (pkgs) odpic;};
 
   "oeis" = callPackage
     ({ mkDerivation, base, HTTP, HUnit, network, network-uri
@@ -150225,7 +148187,6 @@ self: {
        ];
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -150416,23 +148377,6 @@ self: {
      }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.9.2";
-       sha256 = "1my7ykfbfgx8z4qcklqxacycs5hl736fqh5s22cdm19nhfqmcc5b";
-       libraryHaskellDepends = [
-         base bifunctors contravariant ghc-prim profunctors tagged
-         transformers
-       ];
-       testHaskellDepends = [ base contravariant HUnit ];
-       description = "Constraint-based generics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "one-liner_1_0" = callPackage
-    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
-     , profunctors, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "one-liner";
        version = "1.0";
        sha256 = "1diigbl8l0m8q1sl0kxjjqbhl3vkpf0rrzxlbqaamp3ahpmgpx67";
        libraryHaskellDepends = [
@@ -150442,7 +148386,6 @@ self: {
        testHaskellDepends = [ base contravariant HUnit ];
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "one-liner-instances" = callPackage
@@ -150498,30 +148441,6 @@ self: {
      }) {};
 
   "online" = callPackage
-    ({ mkDerivation, base, doctest, foldl, formatting, numhask
-     , optparse-generic, perf, protolude, scientific, tasty, tdigest
-     , text, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "online";
-       version = "0.2.1.0";
-       sha256 = "16s1hcf2jk8lzs3z0v2xp4jn2q6idzhqaksy97r64hcgnys7sylx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base foldl numhask protolude tdigest vector vector-algorithms
-       ];
-       executableHaskellDepends = [
-         base foldl formatting numhask optparse-generic perf protolude
-         scientific text
-       ];
-       testHaskellDepends = [ base doctest protolude tasty ];
-       description = "online statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "online_0_3_0_0" = callPackage
     ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude
      , tasty, tdigest, vector, vector-algorithms
      }:
@@ -150614,6 +148533,7 @@ self: {
        ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -150754,7 +148674,6 @@ self: {
        sha256 = "0dz6ci2i43mghp0v40q11pz2q3511m25sxds44dixish14cs5gym";
        libraryHaskellDepends = [ attoparsec base conduit mtl text ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-typerep" = callPackage
@@ -150815,6 +148734,7 @@ self: {
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -151059,6 +148979,7 @@ self: {
        ];
        description = "Implementation of the OpenPGP message format";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openpgp-Crypto" = callPackage
@@ -151524,6 +149445,7 @@ self: {
        ];
        description = "Interpretation functions and simple instruction sets for operational";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opml" = callPackage
@@ -151563,7 +149485,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -151730,8 +149651,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-applicative-simple";
-       version = "1.0.2";
-       sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2";
+       version = "1.0.3";
+       sha256 = "07v47fa2yc3rxdn1lbgbsq8ggfd7zlknz2ib8wf628g95n0dl7ya";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base-prelude optparse-applicative text
        ];
@@ -151971,6 +149892,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A definition of Posets";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ordered-containers" = callPackage
@@ -152078,6 +150000,7 @@ self: {
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orgstat" = callPackage
@@ -152090,8 +150013,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.1.3";
-       sha256 = "16vla9aq12hvv1b18j7zl8n1dhr31p4hb361gjfd0b1wf95j81r5";
+       version = "0.1.4";
+       sha256 = "063iqrxcqj4mxlic934ksrl23alvpwr3q5k2w666sqc02nkmcv88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152216,6 +150139,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Show keys pressed with an on-screen display (Linux only)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "osm-conduit" = callPackage
@@ -152382,7 +150306,6 @@ self: {
        ];
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "overloaded-records" = callPackage
@@ -152449,6 +150372,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "package-o-tron" = callPackage
@@ -152490,8 +150414,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "packcheck";
-       version = "0.3.0";
-       sha256 = "02ixa91wp0jxdc046gi5qxyyw332znkgknfz5chf4j3ydn7qjlha";
+       version = "0.3.1";
+       sha256 = "1s171bgqpqh61vaf8s91bbpgn816380bma4wb8in4pnnaf2s0xhv";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
@@ -152506,28 +150430,6 @@ self: {
      }:
      mkDerivation {
        pname = "packdeps";
-       version = "0.4.4";
-       sha256 = "0zlbcbid9q1fyl9gqr2h3z1bmdip1xzxr14q6kgwgdjw785x9a2l";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal containers directory filepath split tar text
-         time
-       ];
-       executableHaskellDepends = [
-         base Cabal containers optparse-applicative process semigroups
-       ];
-       description = "Check your cabal packages for lagging dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "packdeps_0_4_5" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , filepath, optparse-applicative, process, semigroups, split, tar
-     , text, time
-     }:
-     mkDerivation {
-       pname = "packdeps";
        version = "0.4.5";
        sha256 = "07nsnxxs5y77w0v5dxw9mqgq98s3riws5846qshlnhq4l5q73php";
        isLibrary = true;
@@ -152541,7 +150443,6 @@ self: {
        ];
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packed" = callPackage
@@ -152558,7 +150459,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packed-dawg" = callPackage
@@ -152754,6 +150654,7 @@ self: {
        ];
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagarme" = callPackage
@@ -152817,6 +150718,7 @@ self: {
        ];
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagination" = callPackage
@@ -152846,6 +150748,7 @@ self: {
        ];
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paint" = callPackage
@@ -152860,19 +150763,6 @@ self: {
      }) {};
 
   "palette" = callPackage
-    ({ mkDerivation, array, base, colour, containers }:
-     mkDerivation {
-       pname = "palette";
-       version = "0.1.0.5";
-       sha256 = "04lqmd0c02fp3x57gbga9qf05f4a6hr8p2ywlasm0dkr740m6d3l";
-       revision = "1";
-       editedCabalFile = "1a5qsbd43wmw1f3dj6vnmzd9imh9gsnz29jc47ivbgj4x6mdmsq1";
-       libraryHaskellDepends = [ array base colour containers ];
-       description = "Utilities for choosing and creating color schemes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "palette_0_3_0_1" = callPackage
     ({ mkDerivation, array, base, colour, containers, MonadRandom }:
      mkDerivation {
        pname = "palette";
@@ -152883,7 +150773,6 @@ self: {
        ];
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "palindromes" = callPackage
@@ -152945,14 +150834,12 @@ self: {
      , process, QuickCheck, random, safe, scientific, SHA, skylighting
      , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
      , tasty-quickcheck, temporary, texmath, text, time, unix
-     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.1.2";
-       sha256 = "0rgba2vfh2n7kh2g75hmxa6pbjk6p73a4zwj00pfsvhwyvpjc2yw";
-       revision = "2";
-       editedCabalFile = "0s7hhycdkjqw4sd6qj4n7lrf76aa4yaw4kaq35ivpjin7hrf011j";
+       version = "2.2.1";
+       sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -152976,70 +150863,20 @@ self: {
          xml zip-archive
        ];
        benchmarkHaskellDepends = [
-         base bytestring containers criterion text time
-       ];
-       doCheck = false;
-       description = "Conversion between markup formats";
-       license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_2_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat
-     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , Cabal, case-insensitive, cmark-gfm, containers, criterion
-     , data-default, deepseq, Diff, directory, doctemplates, exceptions
-     , executable-path, filepath, Glob, haddock-library, hslua
-     , hslua-module-text, HTTP, http-client, http-client-tls, http-types
-     , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
-     , process, QuickCheck, random, safe, scientific, SHA, skylighting
-     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, temporary, texmath, text, time, unix
-     , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.2.1";
-       sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat base64-bytestring binary
-         blaze-html blaze-markup bytestring case-insensitive cmark-gfm
-         containers data-default deepseq directory doctemplates exceptions
-         filepath Glob haddock-library hslua hslua-module-text HTTP
-         http-client http-client-tls http-types JuicyPixels mtl network
-         network-uri pandoc-types parsec process random safe scientific SHA
-         skylighting split syb tagsoup temporary texmath text time unix
-         unordered-containers vector xml yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [ base base-compat ];
-       testHaskellDepends = [
-         base base-compat base64-bytestring bytestring containers Diff
-         directory executable-path filepath Glob hslua pandoc-types process
-         QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck
-         temporary text time xml zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base base-compat bytestring containers criterion mtl text time
-         weigh
+         base bytestring containers criterion mtl text time weigh
        ];
        doCheck = false;
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
-     , bytestring, Cabal, containers, data-default, directory, filepath
-     , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec
-     , process, rfc5051, setenv, split, syb, tagsoup, temporary, text
-     , time, unordered-containers, vector, xml-conduit, yaml
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
@@ -153050,18 +150887,18 @@ self: {
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
-         aeson base base-compat bytestring containers data-default directory
-         filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec
-         rfc5051 setenv split syb tagsoup text time unordered-containers
-         vector xml-conduit yaml
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base base-compat bytestring filepath
-         pandoc pandoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
        ];
        testHaskellDepends = [
-         aeson base base-compat bytestring containers directory filepath mtl
-         pandoc pandoc-types process temporary text yaml
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
        ];
        doCheck = false;
        description = "Supports using pandoc with citeproc";
@@ -153093,8 +150930,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.2.0";
-       sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia";
+       version = "0.3.2.1";
+       sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -153254,7 +151091,6 @@ self: {
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -153274,7 +151110,6 @@ self: {
        ];
        description = "Pandoc filter to include CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-plantuml-diagrams" = callPackage
@@ -153338,8 +151173,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.3.1";
-       sha256 = "0dhp5bcjl6605n2chiab5rp51zir3671gxkmwy34znh0s3vp85jb";
+       version = "1.17.5.1";
+       sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
          transformers
@@ -153353,32 +151188,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_4_2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.17.4.2";
-       sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap";
-       revision = "1";
-       editedCabalFile = "0izgzjfl7l4fb6xd5iqcy5zca4m1vzvr5xqgccw45vkm8q3arqnf";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers HUnit QuickCheck string-qq syb
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -153456,13 +151265,13 @@ self: {
      }:
      mkDerivation {
        pname = "pangraph";
-       version = "0.1.1.5";
-       sha256 = "0p03sm5sna88h1j7gxkwdq0j5zhak38spqyhjlwc2vsrxjc4vjiy";
+       version = "0.1.2";
+       sha256 = "03iqf77j7a382m7zwkgh872frbii98l04agh6sr4ic96554b0gzl";
        libraryHaskellDepends = [
          algebraic-graphs base bytestring containers hexml
        ];
        testHaskellDepends = [ base bytestring containers HUnit ];
-       description = "A set of parsers for graph languages";
+       description = "A set of parsers for graph languages and conversions to graph libaries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -153494,8 +151303,8 @@ self: {
     ({ mkDerivation, base, gitrev, template-haskell }:
      mkDerivation {
        pname = "panic";
-       version = "0.4.0.0";
-       sha256 = "12m18s4d8xvwwf4vhv4p544h03abgkjx7bfwl22gxr1y8f7gb8wl";
+       version = "0.4.0.1";
+       sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m";
        libraryHaskellDepends = [ base gitrev template-haskell ];
        description = "A convenient way to panic";
        license = stdenv.lib.licenses.isc;
@@ -153549,7 +151358,6 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "papa" = callPackage
@@ -153917,26 +151725,6 @@ self: {
      }:
      mkDerivation {
        pname = "papillon";
-       version = "0.1.0.5";
-       sha256 = "1c42mmhgwgdz2adpby9134cyzgp8nfyxl0671d1fs3ybsl2zz17k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring monads-tf template-haskell transformers
-       ];
-       executableHaskellDepends = [
-         base directory filepath monads-tf template-haskell transformers
-       ];
-       description = "packrat parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "papillon_0_1_0_6" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "papillon";
        version = "0.1.0.6";
        sha256 = "1j0sxac7pgwfbgb545ysjsw7haz6m41m6gz5z8v3xawjhx662nib";
        isLibrary = true;
@@ -153949,7 +151737,6 @@ self: {
        ];
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pappy" = callPackage
@@ -154107,6 +151894,7 @@ self: {
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parameterized-data" = callPackage
@@ -154140,6 +151928,7 @@ self: {
        ];
        description = "Classes and data structures for working with data-kind indexed types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paramtree" = callPackage
@@ -154330,7 +152119,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "parsec" = callPackage
+  "parsec_3_1_13_0" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework
      , test-framework-hunit, text
      }:
@@ -154346,6 +152135,18 @@ self: {
        ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "parsec-class" = callPackage
+    ({ mkDerivation, base, parsec }:
+     mkDerivation {
+       pname = "parsec-class";
+       version = "1.0.0.0";
+       sha256 = "0wqpivsrjsp9996fz6lb06rxl3860afc4l8hbx8d1vxhwv2lx702";
+       libraryHaskellDepends = [ base parsec ];
+       description = "Class of types that can be constructed from their text representation";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "parsec-extra" = callPackage
@@ -154571,23 +152372,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "parser-combinators";
-       version = "0.4.0";
-       sha256 = "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i";
-       libraryHaskellDepends = [ base ];
-       description = "Lightweight package providing commonly useful parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parser-combinators_1_0_0" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "parser-combinators";
        version = "1.0.0";
        sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75";
        libraryHaskellDepends = [ base ];
        description = "Lightweight package providing commonly useful parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parser-helper" = callPackage
@@ -154644,17 +152433,17 @@ self: {
      }) {};
 
   "parsers" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+    ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring
      , charset, containers, mtl, parsec, QuickCheck
      , quickcheck-instances, scientific, semigroups, text, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "parsers";
-       version = "0.12.8";
-       sha256 = "1j3bh008klx5nqpp9566k783c2msjsv5ia2w2jdx6frzspyhmfjs";
+       version = "0.12.9";
+       sha256 = "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1";
        libraryHaskellDepends = [
-         attoparsec base base-orphans charset containers mtl parsec
+         attoparsec base base-orphans binary charset containers mtl parsec
          scientific semigroups text transformers unordered-containers
        ];
        testHaskellDepends = [
@@ -154699,6 +152488,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsix" = callPackage
+    ({ mkDerivation, base, containers, fingertree, mtl, parsers
+     , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "parsix";
+       version = "0.1.0.2";
+       sha256 = "0dg48xycw7dl3700ws9qi49i8095nqag6wr9n1jan2w2gd0vchy1";
+       libraryHaskellDepends = [
+         base containers fingertree mtl parsers prettyprinter
+         prettyprinter-ansi-terminal text transformers
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Parser combinators with slicing, error recovery, and syntax highlighting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "partage" = callPackage
     ({ mkDerivation, base, containers, data-lens-light, data-partition
      , dawg-ord, HUnit, mmorph, mtl, pipes, PSQueue, random, tasty
@@ -154795,6 +152604,7 @@ self: {
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-semigroup-hedgehog" = callPackage
@@ -154806,6 +152616,7 @@ self: {
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-semigroup-test" = callPackage
@@ -154818,6 +152629,7 @@ self: {
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-uri" = callPackage
@@ -154992,7 +152804,6 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -155077,17 +152888,6 @@ self: {
      }) {};
 
   "path-extra" = callPackage
-    ({ mkDerivation, base, exceptions, path }:
-     mkDerivation {
-       pname = "path-extra";
-       version = "0.0.6";
-       sha256 = "0db91bgp57abzpqfpm1vrdvmsvnxqr2fsm0rvx0hsfqbarqs6fl8";
-       libraryHaskellDepends = [ base exceptions path ];
-       description = "Chris Done's path library, enriched with URL-related goodies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path-extra_0_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, path, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text
      }:
@@ -155102,7 +152902,6 @@ self: {
        ];
        description = "URLs without host information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-io" = callPackage
@@ -155154,6 +152953,7 @@ self: {
        ];
        description = "Read and write UTF-8 text files";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pathfinding" = callPackage
@@ -155459,6 +153259,7 @@ self: {
        ];
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pcd-loader" = callPackage
@@ -155705,6 +153506,7 @@ self: {
        ];
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -155721,6 +153523,7 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -155737,6 +153540,7 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -155755,6 +153559,7 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -155775,6 +153580,7 @@ self: {
        ];
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf2line" = callPackage
@@ -155824,6 +153630,7 @@ self: {
        ];
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdfsplit" = callPackage
@@ -156008,7 +153815,6 @@ self: {
        ];
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pem" = callPackage
@@ -156225,30 +154031,6 @@ self: {
      }) {};
 
   "perf" = callPackage
-    ({ mkDerivation, base, containers, doctest, foldl, formatting
-     , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest
-     , text, time, vector
-     }:
-     mkDerivation {
-       pname = "perf";
-       version = "0.3.1.1";
-       sha256 = "0zwv6d18sxjn7xz4z0mx43gj3bavm4vyw1sxys6zlxr6xfpka20q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers foldl numhask protolude rdtsc tdigest time
-       ];
-       executableHaskellDepends = [
-         base formatting numhask optparse-generic protolude scientific text
-         vector
-       ];
-       testHaskellDepends = [ base doctest protolude ];
-       description = "low-level performance statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "perf_0_4_1_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc
      , text, time, transformers
      }:
@@ -156357,6 +154139,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Perhaps, a monad";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "period" = callPackage
@@ -156444,7 +154227,6 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "permute" = callPackage
@@ -156482,8 +154264,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.6.0.3";
-       sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466";
+       version = "0.6.0.4";
+       sha256 = "1ygqllybclw9mm0n05vh635wbz6qlsl2yhas3fxr3xhwsrrvwfkd";
        libraryHaskellDepends = [
          array base containers dlist names-th product-isomorphic
          template-haskell th-data-compat transformers
@@ -156500,8 +154282,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-types-HDBC-pg";
-       version = "0.0.3.2";
-       sha256 = "0ddzmc19in35vxivgqp9yi8p2afvg67q2dwgl39pkw6camrqlh2r";
+       version = "0.0.3.5";
+       sha256 = "0bzc7kv12mz7kan1ivqpf2k1kwn3f1h74gallfvfrqans3np6p4m";
        libraryHaskellDepends = [
          base bytestring convertible dlist HDBC persistable-record
          relational-query relational-query-HDBC text-postgresql
@@ -156717,6 +154499,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-migration" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, containers, exceptions
+     , fgl, monad-logger, mtl, persistent, persistent-postgresql
+     , persistent-template, process, QuickCheck, resource-pool, tasty
+     , tasty-golden, tasty-quickcheck, temporary, text, time
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "persistent-migration";
+       version = "0.0.2";
+       sha256 = "0vnc2jiagb2z11dy428fd47zhixw7ib96aras0lvhjbwyldzic5p";
+       libraryHaskellDepends = [
+         base containers fgl mtl persistent text time unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers exceptions monad-logger mtl
+         persistent persistent-postgresql persistent-template process
+         QuickCheck resource-pool tasty tasty-golden tasty-quickcheck
+         temporary text yaml
+       ];
+       description = "Manual migrations for the persistent library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-mongoDB" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal
      , conduit, containers, http-api-data, mongoDB, network, path-pieces
@@ -156762,8 +154569,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql-haskell";
-       version = "0.4.0";
-       sha256 = "1gcvfvyg0xf4m6qm78czdkqabqnx07wqkr6b6myfwy2g1frdhb0d";
+       version = "0.4.1";
+       sha256 = "1wp8va21l03i0wlchlmzik7npvrm4gma4wly0p9rljdwizhgh291";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156989,8 +154796,8 @@ self: {
        pname = "persistent-template";
        version = "2.5.4";
        sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc";
-       revision = "1";
-       editedCabalFile = "18mjv4z29cbrqjrsk2gm4bbc988437v8zxc5dynhj99fzjxzs9yr";
+       revision = "2";
+       editedCabalFile = "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6";
        libraryHaskellDepends = [
          aeson aeson-compat base bytestring containers ghc-prim
          http-api-data monad-control monad-logger path-pieces persistent
@@ -157040,7 +154847,6 @@ self: {
        ];
        description = "Tests for Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-vector" = callPackage
@@ -157058,6 +154864,7 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-zookeeper" = callPackage
@@ -157534,8 +155341,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.24.0";
-       sha256 = "1kk8bfvai1196960cqq6zg5xhs15jzwllw57n247csiifijs0b0v";
+       version = "0.0.25.0";
+       sha256 = "16l1w92i0nr6a9z4l9cq3372mqgis17nqhdky8a157cqa2if150b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -157759,6 +155566,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pi-lcd" = callPackage
@@ -157836,6 +155644,7 @@ self: {
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picologic" = callPackage
@@ -157939,8 +155748,8 @@ self: {
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "pidfile";
-       version = "0.1.0.2";
-       sha256 = "1iriansay0vq1b6crd1gc86ghv6iqcrnpflsa5b22x1lrlvxcwmj";
+       version = "0.1.0.3";
+       sha256 = "12m477kinanyxi5612wz0n72qb0cymjb2x9pp0ggsngfpkqzp1j6";
        libraryHaskellDepends = [ base unix ];
        description = "Run an IO action protected by a pidfile";
        license = stdenv.lib.licenses.bsd3;
@@ -158002,7 +155811,6 @@ self: {
        ];
        description = "dice game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piki" = callPackage
@@ -158046,20 +155854,20 @@ self: {
 
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
+     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups
+     , text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "pinch";
-       version = "0.3.2.0";
-       sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1";
+       version = "0.3.3.0";
+       sha256 = "0bhds7k9bsma1bvihvz6qf832gi2krak3yd8lnddcv87hnjsr4hq";
        libraryHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hashable text
-         unordered-containers vector
+         array base bytestring containers deepseq ghc-prim hashable
+         semigroups text unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
+         base bytestring containers hspec hspec-discover QuickCheck
+         semigroups text unordered-containers vector
        ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -158172,6 +155980,7 @@ self: {
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipeclip" = callPackage
@@ -158227,7 +156036,6 @@ self: {
        ];
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-async" = callPackage
@@ -158248,6 +156056,7 @@ self: {
        ];
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -158325,7 +156134,6 @@ self: {
        ];
        description = "Encode and decode binary streams using the pipes and binary libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-break" = callPackage
@@ -158342,7 +156150,6 @@ self: {
        testHaskellDepends = [ base bytestring mtl pipes QuickCheck ];
        description = "Pipes to group by any delimiter (such as lines with carriage returns)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -158359,7 +156166,6 @@ self: {
        ];
        description = "ByteString support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-bzip" = callPackage
@@ -158383,7 +156189,6 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
@@ -158497,8 +156302,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-concurrency";
-       version = "2.0.10";
-       sha256 = "1qrnwr7m8yjn80k4qzcr75g64jvbh7f903apvmlsqrgppwfp4xa6";
+       version = "2.0.11";
+       sha256 = "03h87b11c64yvj28lxgbvjvqrsx0zfqb92v0apd8ypb9xxabqd4m";
        libraryHaskellDepends = [
          async base contravariant pipes semigroups stm void
        ];
@@ -158566,7 +156371,6 @@ self: {
        ];
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-errors" = callPackage
@@ -158615,8 +156419,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-extras";
-       version = "1.0.14";
-       sha256 = "17f8aj6p074yryk0a26vg1iiy7dva5cjb1gzsrvsq41dhy28j7gx";
+       version = "1.0.15";
+       sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82";
        libraryHaskellDepends = [ base foldl lens pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -158638,7 +156442,6 @@ self: {
        ];
        description = "Streaming parsers for Fasta and Fastq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-files" = callPackage
@@ -158678,28 +156481,6 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-fluid";
-       version = "0.6.0.0";
-       sha256 = "11bmp27ya9kz3gvp3p6qmnm38969xwnpkgxcc9v6zbxz1di9fh4a";
-       libraryHaskellDepends = [
-         base constraints lens lifted-async monad-control pipes semigroups
-         stm these transformers transformers-base
-       ];
-       testHaskellDepends = [
-         async base constraints hspec lens lifted-async mmorph monad-control
-         mtl pipes pipes-concurrency pipes-misc stm transformers
-       ];
-       description = "Reactively combines Producers so that a value is yielded as soon as possible";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-fluid_0_6_0_1" = callPackage
-    ({ mkDerivation, async, base, constraints, hspec, lens
-     , lifted-async, mmorph, monad-control, mtl, pipes
-     , pipes-concurrency, pipes-misc, semigroups, stm, these
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "pipes-fluid";
        version = "0.6.0.1";
        sha256 = "01ig0czixnf5fypnfns2kzna676vd3mr2a52fb9f4cg7yy6qwp8h";
        libraryHaskellDepends = [
@@ -158712,7 +156493,6 @@ self: {
        ];
        description = "Reactively combines Producers so that a value is yielded as soon as possible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-group" = callPackage
@@ -158721,15 +156501,14 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-group";
-       version = "1.0.10";
-       sha256 = "1j37sj0i7lkmk228lchp5kkvf86fiwrkikwwrfibpb6xwixjmlr8";
+       version = "1.0.12";
+       sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-http" = callPackage
@@ -158772,6 +156551,7 @@ self: {
        libraryHaskellDepends = [ base containers heaps pipes ];
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-io" = callPackage
@@ -158844,7 +156624,6 @@ self: {
        ];
        description = "Pipes for grouping by lines with carriage returns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-lzma" = callPackage
@@ -158874,26 +156653,6 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-misc";
-       version = "0.4.0.1";
-       sha256 = "0rzn4vb2h3l6crggfsz0sf85csi5994ickclr2lv2q9s396ch0dr";
-       libraryHaskellDepends = [
-         base clock Decimal lens mmorph mtl pipes pipes-category
-         pipes-concurrency semigroups stm transformers
-       ];
-       testHaskellDepends = [
-         base hspec lens mmorph pipes pipes-concurrency stm transformers
-       ];
-       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-misc_0_5_0_0" = callPackage
-    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
-     , pipes, pipes-category, pipes-concurrency, semigroups, stm
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pipes-misc";
        version = "0.5.0.0";
        sha256 = "09ldpgza3yanpbsd6g2nlm352fwynq38sf226yp5kip0dqwpwbjf";
        libraryHaskellDepends = [
@@ -158905,7 +156664,6 @@ self: {
        ];
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-mongodb" = callPackage
@@ -158952,7 +156710,6 @@ self: {
        ];
        description = "TLS-secured network connections support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-p2p" = callPackage
@@ -159104,6 +156861,8 @@ self: {
        pname = "pipes-safe";
        version = "2.2.9";
        sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
+       revision = "1";
+       editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes primitive
          transformers transformers-base
@@ -159516,6 +157275,7 @@ self: {
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "planar-graph" = callPackage
@@ -159556,6 +157316,7 @@ self: {
        ];
        description = "Token Introspection for PlanB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plankton" = callPackage
@@ -159567,6 +157328,7 @@ self: {
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plat" = callPackage
@@ -159811,31 +157573,6 @@ self: {
      }) {};
 
   "plot-light" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
-     , colour, containers, data-default, hspec, mtl, palette, QuickCheck
-     , scientific, text, time
-     }:
-     mkDerivation {
-       pname = "plot-light";
-       version = "0.2.9";
-       sha256 = "0sz69a8q6r67s9d75vgb3x7iyp8vgrd2q85w2pykzpnpbdi56q5m";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base blaze-svg colour containers data-default hspec mtl
-         palette QuickCheck scientific text time
-       ];
-       executableHaskellDepends = [
-         attoparsec attoparsec-time base blaze-svg colour palette scientific
-         text time
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "A lightweight plotting library, exporting to SVG";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "plot-light_0_4_3" = callPackage
     ({ mkDerivation, base, blaze-markup, blaze-svg, colour, containers
      , exceptions, histogram-fill, hspec, mtl, QuickCheck, scientific
      , text, time, vector
@@ -159851,7 +157588,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A lightweight plotting library, exporting to SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-light-examples" = callPackage
@@ -159945,7 +157681,6 @@ self: {
        ];
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotserver-api" = callPackage
@@ -159973,6 +157708,7 @@ self: {
        ];
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plugins-auto" = callPackage
@@ -160031,15 +157767,14 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plural" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec }:
      mkDerivation {
        pname = "plural";
-       version = "0.0.2";
-       sha256 = "1f35w7rzwq6f1zzdpglij41ra8pwyzjklv2pbnpmbp9q6rpi836p";
+       version = "0.1.0.0";
+       sha256 = "0amzsa5sf2jdrxmsizl38h1452qqd5fby3c451h0b9zpraxj1fbd";
        libraryHaskellDepends = [ base bytestring containers ];
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
@@ -160201,6 +157936,8 @@ self: {
        pname = "pointed";
        version = "5.0.1";
        sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr";
+       revision = "1";
+       editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc";
        libraryHaskellDepends = [
          base comonad containers data-default-class hashable kan-extensions
          semigroupoids semigroups stm tagged transformers
@@ -160299,7 +158036,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-fun" = callPackage
@@ -160504,7 +158240,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Poly-kinded continuations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poly-control" = callPackage
@@ -160716,8 +158451,8 @@ self: {
      }:
      mkDerivation {
        pname = "pomaps";
-       version = "0.0.0.4";
-       sha256 = "0mjfzj2j8b6337ivvnry7ylrw5g1ajxpqqzar1wmscm73ybr0xbn";
+       version = "0.0.1.0";
+       sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim lattices
        ];
@@ -160985,7 +158720,6 @@ self: {
        libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; 
          inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;};
 
@@ -161400,7 +159134,40 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "postgresql-common" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }:
+     mkDerivation {
+       pname = "postgresql-common";
+       version = "0.1.0.1";
+       sha256 = "16b90sxn9f9rxrdr2l5gqcs6307djqaqzr31lnb4qa95dz72fl7n";
+       libraryHaskellDepends = [
+         attoparsec base bytestring postgresql-simple
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring postgresql-simple
+       ];
+       description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "postgresql-common-persistent" = callPackage
+    ({ mkDerivation, base, bytestring, persistent, postgresql-common
+     , text
+     }:
+     mkDerivation {
+       pname = "postgresql-common-persistent";
+       version = "0.1.0.0";
+       sha256 = "1kjmrnigc00362f1b55gw6k67i13rqpjaklz8v9z5jd78ac3xnq6";
+       libraryHaskellDepends = [
+         base bytestring persistent postgresql-common text
+       ];
+       testHaskellDepends = [
+         base bytestring persistent postgresql-common text
+       ];
+       description = "Persistent compatibility for postgresql-common";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "postgresql-config" = callPackage
@@ -161445,6 +159212,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-cube" = callPackage
@@ -161757,7 +159525,6 @@ self: {
        testHaskellDepends = [ rerebase ];
        description = "PostgreSQL SQL syntax utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {pg_query = null;};
 
   "postgresql-transactional" = callPackage
@@ -161940,8 +159707,8 @@ self: {
      }:
      mkDerivation {
        pname = "postmark-streams";
-       version = "0.1.0.1";
-       sha256 = "16ag5jghbvz6gialpcpy491x63cq2z7kwrh9ahy8z2ryilcp64vi";
+       version = "0.1.0.2";
+       sha256 = "00d6rnijlr2095nd1d0vqgbsy5k8w6admi2bn69vdmj39cahgca2";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring
          http-streams io-streams text time
@@ -161984,40 +159751,28 @@ self: {
      }) {};
 
   "potoki" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, bytestring
-     , directory, foldl, hashable, potoki-core, profunctors, ptr
-     , QuickCheck, quickcheck-instances, random, rerebase, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
-     , unordered-containers, vector
-     }:
+    ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "0.11.3";
-       sha256 = "134wy711qnkrwa9c78d7lv8vnc3b5a2dqyslzvs59xqx4csh61xj";
-       libraryHaskellDepends = [
-         attoparsec base base-prelude bytestring directory foldl hashable
-         potoki-core profunctors ptr text transformers unagi-chan
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec QuickCheck quickcheck-instances random rerebase tasty
-         tasty-hunit tasty-quickcheck
-       ];
+       version = "2.0.1.1";
+       sha256 = "1mn3wqk0n4ny8b0m891ndqswxr9zafl4hvb20i12q1d6mxirczlf";
+       libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "potoki-cereal" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring, cereal
-     , potoki-core, text
+    ({ mkDerivation, acquire, attoparsec, base, base-prelude
+     , bytestring, cereal, potoki-core, text
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.2";
-       sha256 = "06fb615lki0pa341a8fv68vkyw13zax4zw6cappnffqccplvdhyg";
+       version = "0.2.1.1";
+       sha256 = "19rd5ykifa7bv32cyxp8hi942sl7xwav0cqhygp6kngw3vsrsnv8";
        libraryHaskellDepends = [
-         base base-prelude bytestring cereal potoki-core text
+         acquire attoparsec base base-prelude bytestring cereal potoki-core
+         text
        ];
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
@@ -162025,24 +159780,24 @@ self: {
      }) {};
 
   "potoki-core" = callPackage
-    ({ mkDerivation, acquire, attoparsec, base, base-prelude
-     , bytestring, directory, foldl, hashable, profunctors, ptr
-     , QuickCheck, quickcheck-instances, random, rerebase, stm, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
+    ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
+     , foldl, hashable, ilist, profunctors, ptr, QuickCheck
+     , quickcheck-instances, random, rerebase, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unagi-chan
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2";
-       sha256 = "13zgqw4csypx5m97xfpbxxxic7rxms0xrz6wz5kk5x2pn6i9mgjl";
+       version = "2.2.1.1";
+       sha256 = "18szi60ngxj69y5xpiwfhvp51ggb81kv6kphd3ghjjai7as42nmk";
        libraryHaskellDepends = [
-         acquire attoparsec base base-prelude bytestring directory foldl
-         hashable profunctors ptr stm text transformers unagi-chan
+         acquire attoparsec base bytestring directory foldl hashable
+         profunctors ptr stm text transformers unagi-chan
          unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec QuickCheck quickcheck-instances random rerebase tasty
-         tasty-hunit tasty-quickcheck
+         acquire attoparsec foldl ilist QuickCheck quickcheck-instances
+         random rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
@@ -162050,21 +159805,35 @@ self: {
      }) {};
 
   "potoki-hasql" = callPackage
-    ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core
+    ({ mkDerivation, acquire, base, bytestring, hasql, potoki-core
      , profunctors, text, vector
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.5";
-       sha256 = "1pxl1fcw1khp4gbhpranv685ri67995d76nisx7ba7l2vg438mn8";
+       version = "1.6";
+       sha256 = "1na6nc9cbimhwzwppz48ssffhdx0j223pmkk8wkjkj9xpzpnx2w1";
        libraryHaskellDepends = [
-         base bytestring hasql potoki potoki-core profunctors text vector
+         acquire base bytestring hasql potoki-core profunctors text vector
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "potoki-zlib" = callPackage
+    ({ mkDerivation, acquire, base, bytestring, potoki-core, zlib }:
+     mkDerivation {
+       pname = "potoki-zlib";
+       version = "0.3";
+       sha256 = "0baayjaw3x5hfx6xdhiq3j8j012x6nrlql8fc6r51xpk3blwg588";
+       libraryHaskellDepends = [
+         acquire base bytestring potoki-core zlib
+       ];
+       description = "Streaming ZLib decompression";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "potrace" = callPackage
     ({ mkDerivation, base, bindings-potrace, bytestring, containers
      , data-default, JuicyPixels, vector
@@ -162092,7 +159861,6 @@ self: {
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powermate" = callPackage
@@ -162132,6 +159900,7 @@ self: {
        testHaskellDepends = [ async base hspec stm ];
        description = "A flexible job queue with exchangeable backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powerqueue-distributed" = callPackage
@@ -162207,26 +159976,6 @@ self: {
 
   "pptable" = callPackage
     ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit
-     , pretty, QuickCheck, syb, tasty, tasty-hunit, tasty-quickcheck
-     , vector
-     }:
-     mkDerivation {
-       pname = "pptable";
-       version = "0.2.0.0";
-       sha256 = "0bgv8yak70ki88sr67l9qj2d8ldi3i10kx8x0b8szqff8prp9367";
-       libraryHaskellDepends = [
-         base boxes containers generic-deriving pretty syb vector
-       ];
-       testHaskellDepends = [
-         base boxes containers HUnit QuickCheck tasty tasty-hunit
-         tasty-quickcheck vector
-       ];
-       description = "Pretty Print containers in a tabular format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pptable_0_3_0_0" = callPackage
-    ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit
      , markdown-unlit, pretty, QuickCheck, syb, tasty, tasty-hunit
      , tasty-quickcheck, vector
      }:
@@ -162245,7 +159994,6 @@ self: {
        ];
        description = "Pretty Print containers in a tabular format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqc" = callPackage
@@ -162398,6 +160146,7 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pred-set" = callPackage
@@ -162412,37 +160161,6 @@ self: {
      }) {};
 
   "pred-trie" = callPackage
-    ({ mkDerivation, attoparsec, base, composition-extra, containers
-     , criterion, deepseq, errors, hashable, hashtables, mtl, poly-arity
-     , pred-set, QuickCheck, quickcheck-instances, semigroups, sets
-     , tasty, tasty-hunit, tasty-quickcheck, text, tries
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "pred-trie";
-       version = "0.5.1.2";
-       sha256 = "0d0ab89l8hg9q5dp84ibafrmqkwx6cyd46dmxv8dljj4g0jlyys3";
-       libraryHaskellDepends = [
-         base composition-extra containers hashable hashtables mtl
-         poly-arity pred-set QuickCheck semigroups tries
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         attoparsec base composition-extra deepseq errors hashable mtl
-         poly-arity QuickCheck quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck text tries unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base composition-extra criterion deepseq hashable mtl
-         poly-arity QuickCheck semigroups sets text tries
-         unordered-containers
-       ];
-       description = "Predicative tries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pred-trie_0_6_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, containers, criterion, deepseq
      , errors, hashable, hashtables, mtl, poly-arity, pred-set
      , QuickCheck, semigroups, sets, strict, tasty, tasty-hunit
@@ -162480,6 +160198,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "predicates" = callPackage
@@ -162778,23 +160497,11 @@ self: {
     ({ mkDerivation, base, mtl, parsec, syb }:
      mkDerivation {
        pname = "preprocessor-tools";
-       version = "1.0.1";
-       sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
-       libraryHaskellDepends = [ base mtl parsec syb ];
-       description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "preprocessor-tools_2_0_2" = callPackage
-    ({ mkDerivation, base, mtl, parsec, syb }:
-     mkDerivation {
-       pname = "preprocessor-tools";
        version = "2.0.2";
        sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp";
        libraryHaskellDepends = [ base mtl parsec syb ];
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "presburger" = callPackage
@@ -162809,6 +160516,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "present" = callPackage
@@ -162957,6 +160665,7 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-relative-time" = callPackage
@@ -162979,26 +160688,6 @@ self: {
 
   "pretty-show" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
-     , haskell-lexer, pretty
-     }:
-     mkDerivation {
-       pname = "pretty-show";
-       version = "1.6.16";
-       sha256 = "0l03mhbdnf0sj6kw2s3cf2xhfbl0809jr9fhj7cmpkhjpxv89vnv";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base filepath ghc-prim haskell-lexer pretty
-       ];
-       libraryToolDepends = [ happy ];
-       executableHaskellDepends = [ base ];
-       description = "Tools for working with derived `Show` instances and generic inspection of values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pretty-show_1_7" = callPackage
-    ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
      mkDerivation {
@@ -163015,7 +160704,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-simple" = callPackage
@@ -163037,6 +160725,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pretty-simple_2_1_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, containers, criterion
+     , doctest, Glob, mtl, parsec, text, transformers
+     }:
+     mkDerivation {
+       pname = "pretty-simple";
+       version = "2.1.0.1";
+       sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base containers mtl parsec text transformers
+       ];
+       testHaskellDepends = [ base doctest Glob ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "pretty printer for data types with a 'Show' instance";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pretty-sop" = callPackage
     ({ mkDerivation, base, generics-sop, pretty-show }:
      mkDerivation {
@@ -163046,6 +160754,7 @@ self: {
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-terminal" = callPackage
@@ -163114,8 +160823,8 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "1.2.0.1";
-       sha256 = "0rh5bb6inq4yvv6r53sc1q3msmpvjcq8fw4sn3vwivrq44c7nf8i";
+       version = "1.2.1";
+       sha256 = "1kvza7jp5n833m8rj0bc35bd2p8wx3fq0iqflm9nbh3wm05kwrg7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -163127,7 +160836,7 @@ self: {
          ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
          random text transformers
        ];
-       description = "A modern, easy to use, well-documented, extensible prettyprinter";
+       description = "A modern, easy to use, well-documented, extensible pretty-printer";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -163231,6 +160940,7 @@ self: {
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-array" = callPackage
@@ -163303,6 +161013,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primesieve" = callPackage
@@ -163353,6 +161064,8 @@ self: {
        pname = "primitive";
        version = "0.6.4.0";
        sha256 = "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc";
+       revision = "1";
+       editedCabalFile = "18a14k1yiam1m4l29rin9a0y53yp3nxvkz358nysld8aqwy2qsjv";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
@@ -163363,11 +161076,60 @@ self: {
     ({ mkDerivation, base, primitive }:
      mkDerivation {
        pname = "primitive-checked";
-       version = "0.6.3.0";
-       sha256 = "02097f658qidmcfaisrcl4k3vmipx8w8p6mcbnajc8ndb3m58bbl";
+       version = "0.6.4.1";
+       sha256 = "02jac6ra9qws5lp2zwqhz87zqy5j9vhs2hinwp43nnpjd4kngms1";
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "primitive-containers" = callPackage
+    ({ mkDerivation, base, containers, contiguous, gauge, ghc-prim
+     , primitive, primitive-sort, QuickCheck, quickcheck-classes, random
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "primitive-containers";
+       version = "0.2.0";
+       sha256 = "11q0dvlsdabmsjsr0gznr8ndx1fyvbvv8jxfszj6na8jhrz7x84b";
+       libraryHaskellDepends = [
+         base contiguous primitive primitive-sort
+       ];
+       testHaskellDepends = [
+         base containers primitive QuickCheck quickcheck-classes tasty
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge ghc-prim primitive random
+       ];
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "primitive-indexed" = callPackage
+    ({ mkDerivation, base, doctest, primitive, QuickCheck }:
+     mkDerivation {
+       pname = "primitive-indexed";
+       version = "0.1.0.0";
+       sha256 = "0sbn3h426i6i609iyybar10lywpsklgfkzp355cg8dpfp4a3ibsf";
+       libraryHaskellDepends = [ base primitive ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "primitive-maybe" = callPackage
+    ({ mkDerivation, base, primitive }:
+     mkDerivation {
+       pname = "primitive-maybe";
+       version = "0.1.0";
+       sha256 = "0pxkgkwlpphk5x38f2jv9gl3n74l1spnfs15sb34hxgyggrz4k6j";
+       libraryHaskellDepends = [ base primitive ];
+       testHaskellDepends = [ base ];
+       description = "Arrays of Maybes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-simd" = callPackage
@@ -163394,6 +161156,8 @@ self: {
        pname = "primitive-sort";
        version = "0.1.0.0";
        sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3";
+       revision = "1";
+       editedCabalFile = "0b148bc30nbfrmdx1k7d4ky6k129w8vy146di90v9q12rvsdaz8w";
        libraryHaskellDepends = [ base contiguous ghc-prim primitive ];
        testHaskellDepends = [
          base containers doctest HUnit primitive QuickCheck smallcheck tasty
@@ -163574,6 +161338,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Cooperative task prioritization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "private-hackage-uploader" = callPackage
@@ -164011,25 +161776,10 @@ self: {
      }:
      mkDerivation {
        pname = "product-profunctors";
-       version = "0.9.0.0";
-       sha256 = "1kzadxbhqyhhihp3m38pckbkyflhgianpvf08ybvry1ng73577jn";
-       libraryHaskellDepends = [
-         base bifunctors contravariant profunctors tagged template-haskell
-       ];
-       testHaskellDepends = [ base profunctors ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "product-profunctors_0_10_0_0" = callPackage
-    ({ mkDerivation, base, bifunctors, contravariant, criterion
-     , deepseq, profunctors, tagged, template-haskell
-     }:
-     mkDerivation {
-       pname = "product-profunctors";
        version = "0.10.0.0";
        sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd";
+       revision = "1";
+       editedCabalFile = "17zi38fzg7yf9i5da2hlch6jw2qhmjcvs9wwkhyvra520605mlya";
        libraryHaskellDepends = [
          base bifunctors contravariant profunctors tagged template-haskell
        ];
@@ -164037,7 +161787,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof2dot" = callPackage
@@ -164111,7 +161860,6 @@ self: {
        ];
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -164134,8 +161882,8 @@ self: {
        pname = "profunctors";
        version = "5.2.2";
        sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9";
-       revision = "1";
-       editedCabalFile = "1g6fvxq2npnyi8wv9mvwy35an68lrm5bf7xmx9x61mbwdxb6d0cg";
+       revision = "2";
+       editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad contravariant distributive
          semigroups tagged transformers
@@ -164144,6 +161892,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profunctors_5_3" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , contravariant, distributive, semigroups, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "profunctors";
+       version = "5.3";
+       sha256 = "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad contravariant distributive
+         semigroups tagged transformers
+       ];
+       description = "Profunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "progress" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -164450,7 +162215,6 @@ self: {
        ];
        description = "Better, more general Prelude exporting common utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prometheus" = callPackage
@@ -164533,6 +162297,7 @@ self: {
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "promise" = callPackage
@@ -164585,6 +162350,7 @@ self: {
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proof-combinators" = callPackage
@@ -164596,6 +162362,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "propane" = callPackage
@@ -164692,6 +162459,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prospect" = callPackage
+    ({ mkDerivation, base, deepseq, free, hspec, inspection-testing
+     , kan-extensions, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "prospect";
+       version = "0.1.0.0";
+       sha256 = "1rvdhk3vnkmblg0zg9vw9akvlsqsc125av3889ipi0axzdcygykg";
+       libraryHaskellDepends = [
+         base deepseq free kan-extensions mtl transformers
+       ];
+       testHaskellDepends = [
+         base deepseq free hspec inspection-testing kan-extensions
+       ];
+       description = "Explore continuations with trepidation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prosper" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , HsOpenSSL, http-streams, io-streams, mtl, text, transformers
@@ -164727,23 +162512,6 @@ self: {
 
   "proto-lens" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, lens-family, parsec, pretty, text
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "proto-lens";
-       version = "0.2.2.0";
-       sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default-class
-         lens-family parsec pretty text transformers void
-       ];
-       description = "A lens-based implementation of protocol buffers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens_0_3_1_0" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, deepseq, lens-family, lens-labels, parsec
      , pretty, text, transformers, void
      }:
@@ -164758,7 +162526,6 @@ self: {
        ];
        description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-arbitrary" = callPackage
@@ -164767,21 +162534,6 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-arbitrary";
-       version = "0.1.1.1";
-       sha256 = "1jdp2axwvmdifssqq1i4ik1dv7zn0sdvj6jy45bi0nxyr5mqzhlm";
-       libraryHaskellDepends = [
-         base bytestring containers lens-family proto-lens QuickCheck text
-       ];
-       description = "Arbitrary instances for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-arbitrary_0_1_2_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-family
-     , proto-lens, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-arbitrary";
        version = "0.1.2.1";
        sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
        libraryHaskellDepends = [
@@ -164789,7 +162541,6 @@ self: {
        ];
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-combinators" = callPackage
@@ -164828,6 +162579,7 @@ self: {
        ];
        description = "Protocol buffers for describing the definitions of messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-optparse" = callPackage
@@ -164883,7 +162635,6 @@ self: {
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -164962,8 +162713,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.4.10";
-       sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk";
+       version = "2.4.11";
+       sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -164976,8 +162727,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.4.10";
-       sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0";
+       version = "2.4.11";
+       sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
@@ -165234,6 +162985,7 @@ self: {
        ];
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pseudo-trie" = callPackage
@@ -165247,6 +162999,7 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pseudomacros" = callPackage
@@ -165331,6 +163084,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover ];
        description = "Bindings for the pthread library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ptr" = callPackage
@@ -165372,7 +163126,6 @@ self: {
        ];
        description = "Pipe stdin to a redis pub/sub channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffix" = callPackage
@@ -165381,21 +163134,6 @@ self: {
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20171229";
-       sha256 = "03qvd0a13r4b45rz2wbf7kad17v0x3f6mrcv2slhyh0x4a1ca2s0";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion random ];
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20180513" = callPackage
-    ({ mkDerivation, base, criterion, filepath, hspec, random
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "publicsuffix";
        version = "0.20180513";
        sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm";
        libraryHaskellDepends = [ base filepath template-haskell ];
@@ -165403,7 +163141,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -165563,6 +163300,7 @@ self: {
        ];
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -165740,6 +163478,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pure-priority-queue" = callPackage
@@ -165780,8 +163519,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6.3";
-       sha256 = "1bsbpzywbh33kp2l7p80g8pnh66fd76sii4900f80x1yjig03gb8";
+       version = "0.6.4";
+       sha256 = "05rhvhvdn8ly5jldxg3q7ip6zflzqa1wyj8mlcl0scgsngn9lrzb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165796,7 +163535,6 @@ self: {
        benchmarkHaskellDepends = [ base base-compat bytestring time ];
        description = "A Haskell-only implementation of zlib / DEFLATE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pureMD5" = callPackage
@@ -165886,26 +163624,6 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.11.1.2";
-       sha256 = "1ihm5x42aa0qda5k96i7m43cx3j8ywcxgm13y7dasll697zwl04w";
-       libraryHaskellDepends = [
-         base containers directory filepath generic-deriving lens mtl text
-         transformers
-       ];
-       testHaskellDepends = [
-         base containers hspec hspec-expectations-pretty-diff text
-       ];
-       description = "Generate PureScript data types from Haskell data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "purescript-bridge_0_13_0_0" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
-     , mtl, text, transformers
-     }:
-     mkDerivation {
-       pname = "purescript-bridge";
        version = "0.13.0.0";
        sha256 = "0jai0vrfw997w7gjs168bk8n2xjw30hnhd82pch5n58w1sy6n6ib";
        libraryHaskellDepends = [
@@ -165917,7 +163635,6 @@ self: {
        ];
        description = "Generate PureScript data types from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -165935,7 +163652,6 @@ self: {
        ];
        description = "A fast alternative to Purescript's `psc-bundle` to be used during development";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -165944,8 +163660,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-tsd-gen";
-       version = "0.1.0.0";
-       sha256 = "0wnj2gvibwcdpbwz9hbn773ircp8rm85klb318933s27fl2z0zfb";
+       version = "0.2.0.0";
+       sha256 = "1l00xyz501gaig3fci9dyz28qdd2zdajzfwnp6hj17c46g8g95f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166008,8 +163724,8 @@ self: {
      }:
      mkDerivation {
        pname = "push-notify-apn";
-       version = "0.1.0.7";
-       sha256 = "1rkd7vr2l5136jv1afknqvg6lgvny5wdadh3fcy2k5phihmv9qfd";
+       version = "0.1.0.8";
+       sha256 = "1077sgc2fhaf99y7p09638bx3w1xlayg2jsf0sf2g85rc6j971nd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166023,7 +163739,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -166122,8 +163837,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.5.1.4";
-       sha256 = "1h6dl0h9ybbnjqs834bd1n5w4cx0vdbmi52mqdk2y9y267qc9k4a";
+       version = "1.5.1.5";
+       sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite hashable
          http-client http-types memory text time transformers
@@ -166485,6 +164200,7 @@ self: {
        testHaskellDepends = [ base hmatrix linear tasty tasty-hunit ];
        description = "A library for implementing Quantum Algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qd" = callPackage
@@ -166847,10 +164563,8 @@ self: {
      }:
      mkDerivation {
        pname = "quantification";
-       version = "0.3";
-       sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy";
-       revision = "1";
-       editedCabalFile = "1kcx4z6xwpbzkydl1kknf5kr1p2ry163jrw5k58f5jpv5gkn7mgn";
+       version = "0.4";
+       sha256 = "0bsdfmzaaxq2mf6bbbphg2dy8q6lhc7n3mfcy20fp4la0cj49aj2";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable path-pieces text
          unordered-containers vector
@@ -166973,6 +164687,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "queryparser-demo" = callPackage
@@ -166989,6 +164704,7 @@ self: {
        ];
        description = "Demo package containing queryparser examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "queryparser-hive" = callPackage
@@ -167008,6 +164724,7 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "queryparser-presto" = callPackage
@@ -167027,6 +164744,7 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "queryparser-vertica" = callPackage
@@ -167046,6 +164764,7 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -167206,6 +164925,7 @@ self: {
        ];
        description = "Generate QuickCheck Gen for Sum Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-assertions" = callPackage
@@ -167221,30 +164941,14 @@ self: {
      }) {};
 
   "quickcheck-classes" = callPackage
-    ({ mkDerivation, aeson, base, containers, prim-array, primitive
-     , QuickCheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "quickcheck-classes";
-       version = "0.3.3";
-       sha256 = "1czppkc56ny7nvfc11wdv96gng4vln7bkx87sgwlpdkw0q73rc14";
-       libraryHaskellDepends = [
-         aeson base containers prim-array primitive QuickCheck transformers
-       ];
-       testHaskellDepends = [ aeson base primitive QuickCheck vector ];
-       description = "QuickCheck common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-classes_0_4_11_1" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, semirings, tagged
      , transformers, vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.11.1";
-       sha256 = "1x75fm8axvxdvqds93df1cgb3gp047d4n3yr6ydwsl6xhvmb023g";
+       version = "0.4.12";
+       sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
@@ -167254,18 +164958,18 @@ self: {
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-combinators" = callPackage
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
        pname = "quickcheck-combinators";
-       version = "0.0.2";
-       sha256 = "0r8vf4dgczga2c0lkz4z6a22naxw44yfdj1wvfqncv9x18r7pkbz";
+       version = "0.0.4";
+       sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -167434,23 +165138,11 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-simple";
-       version = "0.1.0.3";
-       sha256 = "08f87mqnm04sgi21q5snvr4li3zm4m86jydc3s4b71i9czy4q8wg";
-       libraryHaskellDepends = [ base QuickCheck ];
-       description = "Test properties and default-mains for QuickCheck";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-simple_0_1_0_4" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "quickcheck-simple";
        version = "0.1.0.4";
        sha256 = "0524xkhx2qa6wfl7wf9qdjscr2djl0l08a1bk6ikigcpdabbb3l0";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-special" = callPackage
@@ -167484,6 +165176,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-state-machine-distributed" = callPackage
@@ -167523,6 +165216,7 @@ self: {
        ];
        description = "Helper to build generators with Text.StringRandom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-text" = callPackage
@@ -167659,7 +165353,6 @@ self: {
        ];
        description = "Equational laws for free!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickterm" = callPackage
@@ -167839,6 +165532,7 @@ self: {
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-groups" = callPackage
@@ -167991,6 +165685,7 @@ self: {
        ];
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -168033,7 +165728,6 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radium" = callPackage
@@ -168075,8 +165769,8 @@ self: {
      }:
      mkDerivation {
        pname = "radius";
-       version = "0.5.0.1";
-       sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh";
+       version = "0.5.0.2";
+       sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc";
        libraryHaskellDepends = [
          base binary bytestring cryptonite iproute memory
        ];
@@ -168215,24 +165909,6 @@ self: {
      }:
      mkDerivation {
        pname = "rainbow";
-       version = "0.28.0.4";
-       sha256 = "0cc89sn7ndy45ih3zcim076cw9mr5gx5ywfyqskaj875igw9d4l2";
-       libraryHaskellDepends = [
-         base bytestring lens-simple process text
-       ];
-       testHaskellDepends = [
-         base bytestring lens-simple process QuickCheck text
-       ];
-       description = "Print text to terminal with colors and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rainbow_0_30_0_2" = callPackage
-    ({ mkDerivation, base, bytestring, lens-simple, process, QuickCheck
-     , text
-     }:
-     mkDerivation {
-       pname = "rainbow";
        version = "0.30.0.2";
        sha256 = "1isy1xfgsp25x0254gmqkakc185g87wil3n19w5s1rn3bfq1w0my";
        libraryHaskellDepends = [
@@ -168243,7 +165919,6 @@ self: {
        ];
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbow-tests" = callPackage
@@ -168268,25 +165943,6 @@ self: {
      }:
      mkDerivation {
        pname = "rainbox";
-       version = "0.18.0.10";
-       sha256 = "018vp9vfl2302mflkq48bv7ywmm2dd6sx4v4ada49kmlcmayk4nn";
-       libraryHaskellDepends = [
-         base bytestring containers lens-simple rainbow text
-       ];
-       testHaskellDepends = [
-         base bytestring containers lens-simple QuickCheck rainbow tasty
-         tasty-quickcheck text
-       ];
-       description = "Two-dimensional box pretty printing, with colors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rainbox_0_20_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-simple
-     , QuickCheck, rainbow, tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "rainbox";
        version = "0.20.0.0";
        sha256 = "07xn8n2wyy7gfc7x725pa9p38m0bapbbk6zcbh31zd67zg962zwk";
        libraryHaskellDepends = [
@@ -168298,7 +165954,6 @@ self: {
        ];
        description = "Two-dimensional box pretty printing, with colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rake" = callPackage
@@ -168369,8 +166024,8 @@ self: {
      }:
      mkDerivation {
        pname = "rakuten";
-       version = "0.1.1.3";
-       sha256 = "1c578rmjrb8x26c9b0fraz2l6a7d01wky8arzwa1kigfgw9ihqxh";
+       version = "0.1.1.4";
+       sha256 = "010vfpnh4bhcdabrc6yl29q381fz8v5cx65s6vbh9hvilbsw2k09";
        libraryHaskellDepends = [
          aeson base bytestring connection constraints data-default-class
          extensible http-api-data http-client http-client-tls http-types
@@ -168539,7 +166194,6 @@ self: {
        libraryHaskellDepends = [ base primitive transformers util ];
        description = "Class of random value generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-derive" = callPackage
@@ -168619,6 +166273,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-hypergeometric" = callPackage
@@ -168704,7 +166359,6 @@ self: {
        ];
        description = "Generate a random base 16, 58, or 64 string";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-strings" = callPackage
@@ -168832,7 +166486,6 @@ self: {
        ];
        description = "Memory efficient sets with ranges of elements";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-space" = callPackage
@@ -168907,13 +166560,19 @@ self: {
      }) {};
 
   "rank2classes" = callPackage
-    ({ mkDerivation, base, doctest, template-haskell, transformers }:
+    ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
+     , template-haskell, transformers
+     }:
      mkDerivation {
        pname = "rank2classes";
-       version = "1.0.2";
-       sha256 = "1qkknjas2w0zrv5kx47i1cxaiyv7814fqj8y69kywsl93q919p42";
-       libraryHaskellDepends = [ base template-haskell transformers ];
-       testHaskellDepends = [ base doctest ];
+       version = "1.1.0.1";
+       sha256 = "1iw2xanyv7rw995sy3c0dvkjl3js4bd7n2hz0x509pkz8hzsa93w";
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
        description = "standard type constructor class hierarchy, only with methods of rank 2 types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168930,6 +166589,7 @@ self: {
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rapid-term" = callPackage
@@ -169184,6 +166844,8 @@ self: {
        pname = "rasterific-svg";
        version = "0.3.3.1";
        sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn";
+       revision = "1";
+       editedCabalFile = "0mhg2k786zx1cmblijnz73cf12h1s5grmkc0wb63612hnxxz53i7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169218,8 +166880,8 @@ self: {
      }:
      mkDerivation {
        pname = "ratel";
-       version = "1.0.3";
-       sha256 = "1f49nrkvyms9a8q46dpjgcx3h51l1x4zlq6pxnw26bvf8xx0yj4h";
+       version = "1.0.4";
+       sha256 = "14ivx9hb7hjy0i7ybz92mcr800zzfspfldzw9jr6qpmrnv43nqdd";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers http-client
          http-client-tls http-types text uuid
@@ -169276,8 +166938,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.1.0";
-       sha256 = "1skamrpkz8p9i19anyp0lqcncsa1zwzcikcxlm3gmrgqf2hq0m0i";
+       version = "4.1.1";
+       sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169488,20 +167150,24 @@ self: {
      }) {};
 
   "rc" = callPackage
-    ({ mkDerivation, base, dde, hmatrix, Learning, random, vector }:
+    ({ mkDerivation, base, dde, hmatrix, Learning, linear, random
+     , vector
+     }:
      mkDerivation {
        pname = "rc";
-       version = "0.1.0.1";
-       sha256 = "0hcivi8lpf8qfsanxqhxbjyrhhkx4aa5lzwgwir0zq08fakbxadm";
+       version = "0.3.0.0";
+       sha256 = "0p545hazdn5895w0yf7kywhv2y2a4pzfr9kdzkkyiapr0clsx9i6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base dde hmatrix Learning random vector
+         base dde hmatrix Learning linear random vector
        ];
        executableHaskellDepends = [
-         base dde hmatrix Learning random vector
+         base dde hmatrix Learning linear random vector
+       ];
+       testHaskellDepends = [
+         base dde hmatrix Learning linear random vector
        ];
-       testHaskellDepends = [ base dde hmatrix Learning random vector ];
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169532,8 +167198,8 @@ self: {
        pname = "rcu";
        version = "0.2.2";
        sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk";
-       revision = "2";
-       editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr";
+       revision = "4";
+       editedCabalFile = "18gaaz7pj7x9yv2na1zbqavirrj93c7q6z28r4502if0w1w8wk8f";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -169673,6 +167339,7 @@ self: {
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "react-flux-servant" = callPackage
@@ -169684,6 +167351,7 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "react-haskell" = callPackage
@@ -169809,7 +167477,6 @@ self: {
        ];
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-automation" = callPackage
@@ -169850,15 +167517,14 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-gi-gtk";
-       version = "0.2.0.0";
-       sha256 = "05gnxhxnf9s7zxmmda52f36sk3d8rh6cbh1ibxv28gz814v1ps4a";
+       version = "0.3.0.0";
+       sha256 = "1kcn95p2k4lb5xr0q4ag53gkym6dyz6hxsshm05pxf8778hm9c6f";
        libraryHaskellDepends = [
          base gi-gtk haskell-gi-base reactive-banana text transformers
        ];
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -170461,6 +168127,7 @@ self: {
        ];
        description = "Record subtyping and record utilities with generics-sop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records-th" = callPackage
@@ -170481,19 +168148,18 @@ self: {
      }) {};
 
   "recursion-schemes" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, comonad, free
-     , HUnit, semigroups, template-haskell, transformers
-     , transformers-compat
+    ({ mkDerivation, base, base-orphans, comonad, free, HUnit
+     , template-haskell, th-abstraction, transformers
      }:
      mkDerivation {
        pname = "recursion-schemes";
-       version = "5.0.2";
-       sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s";
-       revision = "2";
-       editedCabalFile = "13l08kal330r1nln13q6qn60mcs0iwcz0hx23na743xllha76nnl";
+       version = "5.0.3";
+       sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
+       revision = "1";
+       editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8";
        libraryHaskellDepends = [
-         base base-orphans bifunctors comonad free semigroups
-         template-haskell transformers transformers-compat
+         base base-orphans comonad free template-haskell th-abstraction
+         transformers
        ];
        testHaskellDepends = [ base HUnit template-haskell transformers ];
        description = "Generalized bananas, lenses and barbed wire";
@@ -170617,6 +168283,7 @@ self: {
        ];
        description = "A driver for Redis key-value database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis-hs" = callPackage
@@ -170656,6 +168323,7 @@ self: {
        ];
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -170684,6 +168352,7 @@ self: {
        ];
        description = "REdis Serialization Protocol (RESP) implementation";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis-simple" = callPackage
@@ -170695,6 +168364,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redland" = callPackage
@@ -170707,7 +168377,6 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {raptor2 = null; inherit (pkgs) redland;};
 
   "redo" = callPackage
@@ -170760,8 +168429,8 @@ self: {
      }:
      mkDerivation {
        pname = "reducers";
-       version = "3.12.2";
-       sha256 = "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65";
+       version = "3.12.3";
+       sha256 = "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki";
        libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
@@ -170953,17 +168622,6 @@ self: {
      }) {};
 
   "refined" = callPackage
-    ({ mkDerivation, base, base-prelude, template-haskell }:
-     mkDerivation {
-       pname = "refined";
-       version = "0.1.2.1";
-       sha256 = "0xz712w0qg8dv7v4ijiqq5r61v7cy6vn14d31ka37i5khsr0hvhm";
-       libraryHaskellDepends = [ base base-prelude template-haskell ];
-       description = "Refinement types with static and runtime checking";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "refined_0_2_3_0" = callPackage
     ({ mkDerivation, base, containers, exceptions, mtl, prettyprinter
      , template-haskell, these, transformers
      }:
@@ -170977,15 +168635,14 @@ self: {
        ];
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflection" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
-       version = "2.1.3";
-       sha256 = "01g4ilgj073vvn6dx4y1fkiq81xk01ccswbhvr8iw8fpmciiky48";
+       version = "2.1.4";
+       sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
@@ -171342,6 +168999,7 @@ self: {
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refty" = callPackage
@@ -171699,8 +169357,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-tdfa";
-       version = "1.2.3";
-       sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9";
+       version = "1.2.3.1";
+       sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -171749,6 +169407,7 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-text" = callPackage
@@ -171877,6 +169536,7 @@ self: {
        testHaskellDepends = [ base QuickCheck regexdot toolshed ];
        description = "A POSIX, extended regex-engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexdot" = callPackage
@@ -171892,6 +169552,7 @@ self: {
        ];
        description = "A polymorphic, POSIX, extended regex-engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexp-tries" = callPackage
@@ -172221,6 +169882,7 @@ self: {
        ];
        description = "Sensible RLP encoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relation" = callPackage
@@ -172261,8 +169923,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.11.1.0";
-       sha256 = "1iydq7jdsizacvanvxdfad52vjaazb2awv2h3lyiqrsmva1y0qmq";
+       version = "0.12.0.1";
+       sha256 = "0njmp3209499qvm30dy4k9gc3fpnf00bkkd42f8cif9gi5fhbwhz";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          product-isomorphic sql-words template-haskell text th-reify-compat
@@ -172278,39 +169940,47 @@ self: {
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
-     , relational-query, relational-schemas, sql-words, template-haskell
-     , th-data-compat, transformers
+     , QuickCheck, quickcheck-simple, relational-query
+     , relational-schemas, sql-words, template-haskell, th-data-compat
+     , transformers
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.6.1";
-       sha256 = "1aa4bjkv9i2an2igfdc0rvq2hmd6wv5zfgcbgw32y3qmy0zb3v2g";
+       version = "0.7.0.0";
+       sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
          relational-schemas sql-words template-haskell th-data-compat
          transformers
        ];
+       testHaskellDepends = [
+         base convertible HDBC QuickCheck quickcheck-simple
+       ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_7_0" = callPackage
+  "relational-query-HDBC_0_7_0_1" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
-     , relational-query, relational-schemas, sql-words, template-haskell
-     , th-data-compat, transformers
+     , QuickCheck, quickcheck-simple, relational-query
+     , relational-schemas, sql-words, template-haskell, th-data-compat
+     , transformers
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.7.0";
-       sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c";
+       version = "0.7.0.1";
+       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
          relational-schemas sql-words template-haskell th-data-compat
          transformers
        ];
+       testHaskellDepends = [
+         base convertible HDBC QuickCheck quickcheck-simple
+       ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172323,8 +169993,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.2.1.2";
-       sha256 = "068d6a9xp9byhc3k1rb9a1zwifyg7mhxv3r6xisgdjv4w6fizbay";
+       version = "0.2.2.0";
+       sha256 = "1nmkjq5jrs38d0mmdpy8ygkjncg3j5yjbkcv7mxrm8wlqdijdg8b";
        libraryHaskellDepends = [
          base persistable-record persistable-types-HDBC-pg
          product-isomorphic relational-query relational-query-HDBC
@@ -172340,8 +170010,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.5.0.0";
-       sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb";
+       version = "0.5.1.1";
+       sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172359,8 +170029,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-schemas";
-       version = "0.1.6.1";
-       sha256 = "1lkqaahfrdm2dlyqz3wn9dm0sw8cypmndasrigc67q94ha4lrv81";
+       version = "0.1.6.2";
+       sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm";
        libraryHaskellDepends = [
          base bytestring containers relational-query template-haskell time
        ];
@@ -173187,36 +170857,6 @@ self: {
   "req" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, data-default-class
-     , hspec, hspec-core, http-api-data, http-client, http-client-tls
-     , http-types, monad-control, mtl, QuickCheck, retry, text, time
-     , transformers, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "req";
-       version = "1.0.0";
-       sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087";
-       revision = "2";
-       editedCabalFile = "08yr09gfpml94ny6jmps2hn13bsb7r37rdn92gr2kmbryb188d1l";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson authenticate-oauth base blaze-builder bytestring
-         case-insensitive connection data-default-class http-api-data
-         http-client http-client-tls http-types monad-control mtl retry text
-         time transformers transformers-base
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive
-         data-default-class hspec hspec-core http-client http-types
-         monad-control mtl QuickCheck text time unordered-containers
-       ];
-       doCheck = false;
-       description = "Easy-to-use, type-safe, expandable, high-level HTTP library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "req_1_1_0" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
-     , bytestring, case-insensitive, connection, data-default-class
      , hspec, hspec-core, hspec-discover, http-api-data, http-client
      , http-client-tls, http-types, monad-control, mtl, QuickCheck
      , retry, text, time, transformers, transformers-base
@@ -173226,6 +170866,8 @@ self: {
        pname = "req";
        version = "1.1.0";
        sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7";
+       revision = "1";
+       editedCabalFile = "1qb458sldda1msrx8hyp31a5ybny2kdymsxhmsyk9i9c5gk0qqib";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -173242,7 +170884,6 @@ self: {
        doCheck = false;
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "req-conduit" = callPackage
@@ -173364,6 +171005,36 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "require_0_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, inliterate
+     , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
+     }:
+     mkDerivation {
+       pname = "require";
+       version = "0.4.0";
+       sha256 = "1kfi0y46ycjsylzv73lxh721a45qz5ki9m6czv4r53scrpbaywig";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
+       ];
+       executableHaskellDepends = [
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
+       ];
+       testHaskellDepends = [
+         base bytestring directory inliterate megaparsec optparse-generic
+         tasty tasty-hspec text universum
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion directory inliterate megaparsec
+         optparse-generic text universum
+       ];
+       description = "Scrap your qualified import clutter";
+       license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -173376,7 +171047,6 @@ self: {
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -173386,8 +171056,8 @@ self: {
      }:
      mkDerivation {
        pname = "reroute";
-       version = "0.4.1.0";
-       sha256 = "02159ifmv1i5y2dkh9927rw5b0kssxcjiw37d0z0nqa0086kza1l";
+       version = "0.5.0.0";
+       sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r";
        libraryHaskellDepends = [
          base deepseq hashable http-api-data hvect mtl text
          unordered-containers
@@ -173401,7 +171071,6 @@ self: {
        ];
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reserve" = callPackage
@@ -173474,7 +171143,6 @@ self: {
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve" = callPackage
@@ -173710,35 +171378,6 @@ self: {
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.39";
-       sha256 = "012l03am5hqhykn4apg5yhjaz4zv8mwqpq6x97crraf1gxad0q6p";
-       revision = "8";
-       editedCabalFile = "12ia5ic2cas82h3dksdy4hzmcw42f13wqwqw0ilbn50q85j2k4pf";
-       libraryHaskellDepends = [
-         aeson aeson-utils base base-compat bytestring case-insensitive
-         errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
-         multipart random rest-stringmap rest-types safe split text
-         transformers transformers-compat unordered-containers uri-encode
-         utf8-string uuid
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit mtl test-framework test-framework-hunit
-         transformers transformers-compat unordered-containers
-       ];
-       description = "Rest API library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-core_0_39_0_2" = callPackage
-    ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring
-     , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
-     , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
-     , rest-types, safe, split, test-framework, test-framework-hunit
-     , text, transformers, transformers-compat, unordered-containers
-     , uri-encode, utf8-string, uuid
-     }:
-     mkDerivation {
-       pname = "rest-core";
        version = "0.39.0.2";
        sha256 = "0vr538sp8i5qwgd91bzvq9fxv939imxck6358xfzlgrk6x89cr1z";
        libraryHaskellDepends = [
@@ -173841,6 +171480,7 @@ self: {
        ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-stringmap" = callPackage
@@ -173874,6 +171514,7 @@ self: {
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-wai" = callPackage
@@ -173898,18 +171539,19 @@ self: {
 
   "restful-snap" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , data-default, digestive-functors, errors, heist, lens, mtl
-     , old-locale, readable, snap, snap-core, snap-extras
-     , template-haskell, text, time, xmlhtml
+     , data-default, digestive-functors, errors, heist, lens, map-syntax
+     , mtl, old-locale, readable, snap, snap-core, snap-extras
+     , template-haskell, text, time, time-locale-compat, xmlhtml
      }:
      mkDerivation {
        pname = "restful-snap";
-       version = "0.2";
-       sha256 = "16gqbk9wl2a1ivhq30yh584h7p2vd7qvwx1rprin47amqzn5b6gc";
+       version = "0.4.1";
+       sha256 = "1447hbwky8lslblq3vpm7d1zyri4apmf459fbaq3m15kkd1qsyxq";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default
-         digestive-functors errors heist lens mtl old-locale readable snap
-         snap-core snap-extras template-haskell text time xmlhtml
+         digestive-functors errors heist lens map-syntax mtl old-locale
+         readable snap snap-core snap-extras template-haskell text time
+         time-locale-compat xmlhtml
        ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173931,6 +171573,7 @@ self: {
        ];
        description = "Easy Git repository serialization";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restricted-workers" = callPackage
@@ -174291,6 +171934,109 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rfc-env" = callPackage
+    ({ mkDerivation, base, envy, network, rfc-prelude, time }:
+     mkDerivation {
+       pname = "rfc-env";
+       version = "0.0.0.1";
+       sha256 = "1s3r5wpap3rj7fxx1wvxjk5671jcnllvplz631vagwbyl9p755zh";
+       libraryHaskellDepends = [ base envy network rfc-prelude time ];
+       description = "Environment variable support from the Robert Fischer Commons";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rfc-http-client" = callPackage
+    ({ mkDerivation, aeson, base, http-client, http-client-tls
+     , http-types, lens, network-uri, rfc-prelude, scientific
+     , servant-server, vector, wreq
+     }:
+     mkDerivation {
+       pname = "rfc-http-client";
+       version = "0.0.0.1";
+       sha256 = "0ksmv0vhprc8d2ck003jim03js5ifqw1vg7319afmwzzmqp8lwn1";
+       libraryHaskellDepends = [
+         aeson base http-client http-client-tls http-types lens network-uri
+         rfc-prelude scientific servant-server vector wreq
+       ];
+       description = "The HTTP client extensions from the Robert Fischer Commons";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rfc-prelude" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring
+     , classy-prelude, containers, data-default, http-api-data
+     , integer-logarithms, lens, monad-control, network-uri, text
+     , text-conversions, time, time-units, transformers, tuple, unliftio
+     , unliftio-core, uuid-types
+     }:
+     mkDerivation {
+       pname = "rfc-prelude";
+       version = "0.0.0.2";
+       sha256 = "1d2kvmidbglc60p3zy6wd9af6w27b303znqh09rjms5ifri0k6kf";
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring classy-prelude containers
+         data-default http-api-data integer-logarithms lens monad-control
+         network-uri text text-conversions time time-units transformers
+         tuple unliftio unliftio-core uuid-types
+       ];
+       description = "The Prelude from the Robert Fischer Commons";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rfc-psql" = callPackage
+    ({ mkDerivation, base, bytestring, network, postgresql-typed
+     , resource-pool, rfc-env, rfc-prelude, transformers
+     }:
+     mkDerivation {
+       pname = "rfc-psql";
+       version = "0.0.0.1";
+       sha256 = "1vaahacbk0c1zv7md6sb5lymncbzr7xxfn31cmd4dd8gjwdfk4zb";
+       libraryHaskellDepends = [
+         base bytestring network postgresql-typed resource-pool rfc-env
+         rfc-prelude transformers
+       ];
+       description = "The PostgreSQL extensions from the Robert Fischer Commons";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rfc-redis" = callPackage
+    ({ mkDerivation, base, hedis, rfc-env, rfc-prelude, time }:
+     mkDerivation {
+       pname = "rfc-redis";
+       version = "0.0.0.1";
+       sha256 = "00r8mghkgqgf6mh4v5jspahdcpb3bj5i82rmiyasv01a7gp6gzsg";
+       libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
+       description = "The Redis extensions from the Robert Fischer Commons";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rfc-servant" = callPackage
+    ({ mkDerivation, aeson, amazonka, base, binary, blaze-html
+     , data-default, http-types, lens, markdown, natural-transformation
+     , rfc-http-client, rfc-prelude, rfc-psql, rfc-redis, servant
+     , servant-blaze, servant-docs, servant-server, servant-swagger
+     , servant-swagger-ui, swagger2, wai, wreq
+     }:
+     mkDerivation {
+       pname = "rfc-servant";
+       version = "0.0.0.1";
+       sha256 = "1p4j2lv4hj6bxqbanj4w0j00d1qm7np94gp7ap1kmjkdznsl4vhz";
+       libraryHaskellDepends = [
+         aeson amazonka base binary blaze-html data-default http-types lens
+         markdown natural-transformation rfc-http-client rfc-prelude
+         rfc-psql rfc-redis servant servant-blaze servant-docs
+         servant-server servant-swagger servant-swagger-ui swagger2 wai wreq
+       ];
+       description = "The Servant extensions from the Robert Fischer Commons";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rfc1413-server" = callPackage
     ({ mkDerivation, base, network-simple, rfc1413-types }:
      mkDerivation {
@@ -174323,7 +172069,6 @@ self: {
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc5051" = callPackage
@@ -174355,8 +172100,25 @@ self: {
      }:
      mkDerivation {
        pname = "rhine";
-       version = "0.4.0.0";
-       sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x";
+       version = "0.4.0.1";
+       sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers dunai free time transformers
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Functional Reactive Programming with type-level clocks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rhine_0_4_0_2" = callPackage
+    ({ mkDerivation, base, containers, dunai, free, time, transformers
+     }:
+     mkDerivation {
+       pname = "rhine";
+       version = "0.4.0.2";
+       sha256 = "1lsa9sgfrxdwz1jgjd314n7g4a8q97gq990nqdsxrrq2bmvdhpv1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174372,15 +172134,14 @@ self: {
     ({ mkDerivation, base, dunai, gloss, rhine }:
      mkDerivation {
        pname = "rhine-gloss";
-       version = "0.4.0.0";
-       sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj";
+       version = "0.4.0.1";
+       sha256 = "054f7x6d2gi3ph9iw5fs8qxyl2jwv8q93794zhdkcnyz15371piq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base dunai gloss rhine ];
        executableHaskellDepends = [ base ];
-       description = "Wrapper to run reactive programs written in Rhine with Gloss as backend";
+       description = "Gloss backend for Rhine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -174414,8 +172175,8 @@ self: {
      }:
      mkDerivation {
        pname = "riak";
-       version = "1.1.2.4";
-       sha256 = "1j67p29jnw6zy3294qwsc947akdk8xawa426fvnflbba5lmzxial";
+       version = "1.1.2.5";
+       sha256 = "1ln7qm6rl8nr4fc1109pk0jmnqhw4dm3q2jfmvd4a34whplzwln7";
        libraryHaskellDepends = [
          aeson async attoparsec base bifunctors binary blaze-builder
          bytestring containers data-default-class deepseq
@@ -174555,6 +172316,7 @@ self: {
        ];
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riff" = callPackage
@@ -174588,6 +172350,7 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rio" = callPackage
@@ -174598,8 +172361,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.2.0";
-       sha256 = "0449jjgw38dwf0lw3vq0ri3gh7mlzfjkajz8xdvxr76ffs9kncwq";
+       version = "0.1.4.0";
+       sha256 = "06jjx3mv0bqjzvkajcik19961hj44mxcd23av8lw8n1nj27hmkhg";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens mtl primitive process text time typed-process
@@ -174615,18 +172378,20 @@ self: {
      }) {};
 
   "rio-orphans" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet
-     , rio, transformers-base
+    ({ mkDerivation, base, exceptions, fast-logger, hspec
+     , monad-control, monad-logger, resourcet, rio, transformers-base
      }:
      mkDerivation {
        pname = "rio-orphans";
-       version = "0.1.0.0";
-       sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7";
+       version = "0.1.1.0";
+       sha256 = "0klbshdsv3gq3l7g1d6gq2wxdqjlqxbnwk1lbg5dpbz7yrnjr3by";
        libraryHaskellDepends = [
-         base exceptions monad-control resourcet rio transformers-base
+         base exceptions fast-logger monad-control monad-logger resourcet
+         rio transformers-base
        ];
        testHaskellDepends = [
-         base exceptions hspec monad-control resourcet rio transformers-base
+         base exceptions fast-logger hspec monad-control monad-logger
+         resourcet rio transformers-base
        ];
        description = "Orphan instances for the RIO type in the rio package";
        license = stdenv.lib.licenses.mit;
@@ -175104,7 +172869,6 @@ self: {
        ];
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
@@ -175240,6 +173004,7 @@ self: {
        ];
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roller" = callPackage
@@ -175593,6 +173358,7 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -175625,6 +173391,7 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -175690,8 +173457,8 @@ self: {
      }:
      mkDerivation {
        pname = "row-types";
-       version = "0.2.2.0";
-       sha256 = "1xv42yzv0xrb1bwqlmpmk7wwmq2mcf6d73g91aycq99hjq18bmcq";
+       version = "0.2.3.0";
+       sha256 = "1dihp1bd6aw2hn2jbrg9kgq0rvbspbfwvcx6vv9zrq2j0jbbq250";
        libraryHaskellDepends = [
          base constraints deepseq hashable text unordered-containers
        ];
@@ -175926,7 +173693,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -175938,8 +173704,8 @@ self: {
      }:
      mkDerivation {
        pname = "rss2irc";
-       version = "1.1";
-       sha256 = "1phclqhf1kvnix729d8117kq851b2f2snsvghr6h6112rg22cf2q";
+       version = "1.2";
+       sha256 = "00q684w6s9ixwrci6sfpzzw2hrsl7j29g07d9j5a5j9csz0cr8gg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -175950,7 +173716,6 @@ self: {
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtcm" = callPackage
@@ -176344,8 +174109,8 @@ self: {
     ({ mkDerivation, base, HUnit, parsec, s-cargot, text }:
      mkDerivation {
        pname = "s-cargot-letbind";
-       version = "0.2.2.0";
-       sha256 = "0yv15kqfx21qwrm4i7rkwb1iybx27314f86xqbf2yyh4ala35wr1";
+       version = "0.2.3.0";
+       sha256 = "1fl7a9cny1l6swxyaw4x1izl2l6rxha6zz2k1bjw1ldwzhsrip83";
        libraryHaskellDepends = [ base s-cargot text ];
        testHaskellDepends = [ base HUnit parsec s-cargot text ];
        description = "Enables let-binding and let-expansion for s-cargot defined S-expressions";
@@ -176364,24 +174129,10 @@ self: {
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "s3-signer" = callPackage
-    ({ mkDerivation, base, base64-bytestring, cryptohash, http-types
-     , time, utf8-string
-     }:
-     mkDerivation {
-       pname = "s3-signer";
-       version = "0.3.0.0";
-       sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9";
-       libraryHaskellDepends = [
-         base base64-bytestring cryptohash http-types time utf8-string
-       ];
-       description = "Pre-signed Amazon S3 URLs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "s3-signer_0_5_0_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable
      , bytestring, case-insensitive, cryptohash, http-types, time
      , utf8-string
@@ -176400,7 +174151,6 @@ self: {
        ];
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe" = callPackage
@@ -176424,6 +174174,23 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple environment to control access to data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "safe-buffer-monad" = callPackage
+    ({ mkDerivation, base, hspec, mtl, safe-exceptions, stm, unliftio
+     }:
+     mkDerivation {
+       pname = "safe-buffer-monad";
+       version = "0.1.0";
+       sha256 = "0l82m3llk6haxzswk8hxkhn1gn37y0zzzan1dnkcg35gk7a9vakd";
+       libraryHaskellDepends = [ base mtl safe-exceptions stm ];
+       testHaskellDepends = [
+         base hspec mtl safe-exceptions stm unliftio
+       ];
+       description = "A monadic buffer resilient to exceptions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-coerce" = callPackage
@@ -176493,6 +174260,7 @@ self: {
        ];
        description = "control-monad-exception Instances for safe-failure";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-foldable" = callPackage
@@ -176583,7 +174351,6 @@ self: {
        ];
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-plugins" = callPackage
@@ -176682,6 +174449,7 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safeint" = callPackage
@@ -176838,6 +174606,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sakuraio-platform" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "sakuraio-platform";
+       version = "0.1.0.0";
+       sha256 = "04hk33n59c4iwbmqzsbq9sjsj99bfn75n82rrhipiaabjpjvcfvk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec time unordered-containers
+       ];
+       description = "Haskell representation of messages exchanged on the sakura.io platform.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "saltine" = callPackage
     ({ mkDerivation, base, bytestring, libsodium, profunctors
      , QuickCheck, semigroups, test-framework
@@ -176881,8 +174669,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "1.0.2";
-       sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni";
+       version = "1.0.3";
+       sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Semantic version numbers and constraints";
@@ -177060,6 +174848,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
@@ -177096,6 +174885,7 @@ self: {
        ];
        description = "Enumerator interface to SamTools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "samtools-iteratee" = callPackage
@@ -177385,6 +175175,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "say" = callPackage
@@ -177455,39 +175246,12 @@ self: {
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
      , process, QuickCheck, random, syb, tasty, tasty-golden
-     , tasty-hunit, template-haskell, time, z3
-     }:
-     mkDerivation {
-       pname = "sbv";
-       version = "7.5";
-       sha256 = "1c5drbqz0qld54v0k29zkra1zj09izkzf0rrmgcmgvzz7dfac4ik";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base containers crackNum data-binary-ieee754 deepseq
-         directory filepath generic-deriving ghc mtl pretty process
-         QuickCheck random syb template-haskell time
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-binary-ieee754 directory doctest
-         filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit
-         template-haskell
-       ];
-       testSystemDepends = [ z3 ];
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) z3;};
-
-  "sbv_7_8" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , crackNum, data-binary-ieee754, deepseq, directory, doctest
-     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
-     , process, QuickCheck, random, syb, tasty, tasty-golden
      , tasty-hunit, tasty-quickcheck, template-haskell, time, z3
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.8";
-       sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i";
+       version = "7.9";
+       sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -177502,7 +175266,6 @@ self: {
        testSystemDepends = [ z3 ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -177522,6 +175285,7 @@ self: {
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sc3-rdu" = callPackage
@@ -177751,6 +175515,7 @@ self: {
        ];
        description = "Generates unique passwords for various websites from a single password";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scc" = callPackage
@@ -178244,10 +176009,8 @@ self: {
      }:
      mkDerivation {
        pname = "scotty";
-       version = "0.11.1";
-       sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw";
-       revision = "1";
-       editedCabalFile = "0msb0ydgga07gicchs8k0f7d35gp18vrin649q6yqah75l5i2f9x";
+       version = "0.11.2";
+       sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class exceptions fail http-types monad-control mtl
@@ -178261,6 +176024,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -178313,6 +176077,7 @@ self: {
        ];
        description = "Cookie management helper functions for Scotty framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-fay" = callPackage
@@ -178386,6 +176151,7 @@ self: {
        ];
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-resource" = callPackage
@@ -178460,6 +176226,7 @@ self: {
        ];
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-view" = callPackage
@@ -178548,6 +176315,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "script-monad" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client
+     , http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, unordered-containers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "script-monad";
+       version = "0.0.1";
+       sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring http-client http-types lens
+         lens-aeson QuickCheck text time unordered-containers vector wreq
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Transformer stack of error, reader, writer, state, and prompt monads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scrobble" = callPackage
     ({ mkDerivation, base, containers, curl, MissingH, network
      , network-uri, old-locale, pureMD5, time, url
@@ -178589,7 +176380,6 @@ self: {
        ];
        description = "scroll(6), a roguelike game";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrypt" = callPackage
@@ -178712,13 +176502,13 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
-     , StateVar, text, transformers, vector
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
+     , SDL2, StateVar, text, transformers, vector, weigh
      }:
      mkDerivation {
        pname = "sdl2";
-       version = "2.4.0.1";
-       sha256 = "0kb4nl653b0p7bcv9h4b2bhpgdb49v2d49ri3cs4yykdrl58v2cs";
+       version = "2.4.1.0";
+       sha256 = "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -178727,8 +176517,10 @@ self: {
        ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
+       testHaskellDepends = [ base deepseq linear vector weigh ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -178740,6 +176532,7 @@ self: {
        libraryHaskellDepends = [ base cairo linear sdl2 ];
        description = "Render with Cairo on SDL textures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -178789,6 +176582,7 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-gfx" = callPackage
@@ -178830,6 +176624,7 @@ self: {
        executableHaskellDepends = [ base sdl2 text ];
        description = "Bindings to SDL2_image";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-mixer" = callPackage
@@ -178869,6 +176664,7 @@ self: {
        ];
        description = "Sprite previewer/animator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-ttf" = callPackage
@@ -178877,25 +176673,6 @@ self: {
      }:
      mkDerivation {
        pname = "sdl2-ttf";
-       version = "2.0.2";
-       sha256 = "1r0ajm5macas0gy9xd845bb8p85974hcp92ri9pa0qy4b62cmihd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring sdl2 template-haskell text transformers
-       ];
-       libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
-       description = "Bindings to SDL2_ttf";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
-
-  "sdl2-ttf_2_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
-     , template-haskell, text, transformers
-     }:
-     mkDerivation {
-       pname = "sdl2-ttf";
        version = "2.1.0";
        sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7";
        isLibrary = true;
@@ -178986,6 +176763,7 @@ self: {
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seakale-postgresql" = callPackage
@@ -179001,6 +176779,7 @@ self: {
        ];
        description = "PostgreSQL backend for Seakale";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seakale-tests" = callPackage
@@ -179016,6 +176795,7 @@ self: {
        ];
        description = "Helpers to test code using Seakale";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seal-module" = callPackage
@@ -179282,22 +177062,6 @@ self: {
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.1.12.1";
-       sha256 = "1iq0fnk17qn74vwl8mjv7zr1y90f3x1hwniy0dmg3h0s5clpcqa9";
-       libraryHaskellDepends = [
-         base bytestring exceptions hashable mtl psqueues text time
-         unordered-containers
-       ];
-       description = "Multi-backend, high-level EDSL for interacting with SQL databases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda_0_2_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
-     , psqueues, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "selda";
        version = "0.2.0.0";
        sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj";
        libraryHaskellDepends = [
@@ -179306,7 +177070,6 @@ self: {
        ];
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-postgresql" = callPackage
@@ -179416,18 +177179,22 @@ self: {
 
   "self-extract" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
-     , path, path-io, process, unix-compat
+     , path, path-io, process, unix-compat, ztar
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.2.1";
-       sha256 = "0as9qxqh1pc695ds7kah5x241psnmfsp9hz2ilvvl73yanfg7j90";
+       version = "0.3.1";
+       sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring Cabal extra file-embed path path-io process
-         unix-compat
+         unix-compat ztar
        ];
+       executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selfrestart" = callPackage
@@ -179535,8 +177302,8 @@ self: {
        pname = "semigroupoids";
        version = "5.2.2";
        sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
-       revision = "3";
-       editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4";
+       revision = "4";
+       editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -179548,6 +177315,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroupoids_5_3_1" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
+     , cabal-doctest, comonad, containers, contravariant, distributive
+     , doctest, hashable, semigroups, tagged, template-haskell
+     , transformers, transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "semigroupoids";
+       version = "5.3.1";
+       sha256 = "13iqjckq3jzp6rxldrf3bcvk3061ssvsr6y0g5y9jq32z1hyr2fd";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad containers contravariant
+         distributive hashable semigroups tagged template-haskell
+         transformers transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "Semigroupoids: Category sans id";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroupoids-syntax" = callPackage
     ({ mkDerivation, base, comonad, containers, contravariant
      , directory, distributive, doctest, filepath, QuickCheck
@@ -179573,8 +177362,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "semigroups";
-       version = "0.18.4";
-       sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq";
+       version = "0.18.5";
+       sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb";
        libraryHaskellDepends = [ base ];
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
@@ -179592,6 +177381,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "semilattices" = callPackage
+    ({ mkDerivation, base, containers, doctest, hashable, QuickCheck
+     , quickcheck-instances, unordered-containers
+     }:
+     mkDerivation {
+       pname = "semilattices";
+       version = "0.0.0.1";
+       sha256 = "0yqqww2mqspbhgkmzrkvljjkwfyi8iqndy8bm1c4sfmrza1h1byx";
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       testHaskellDepends = [
+         base doctest QuickCheck quickcheck-instances
+       ];
+       description = "Semilattices";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "semiring" = callPackage
     ({ mkDerivation, base, Boolean, containers, monoids }:
      mkDerivation {
@@ -179761,6 +177568,7 @@ self: {
        ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sensenet" = callPackage
@@ -179782,45 +177590,24 @@ self: {
      }) {};
 
   "sensu-run" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, filepath, http-client
-     , http-types, lens, network, optparse-applicative, process
-     , temporary, text, time, unix, unix-compat, vector, wreq
+    ({ mkDerivation, aeson, async, base, bytestring, directory
+     , filelock, filepath, http-client, http-client-tls, http-types
+     , lens, network, optparse-applicative, process, temporary, text
+     , time, unix, unix-compat, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.4.0.5";
-       sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring filepath http-client http-types lens network
-         optparse-applicative process temporary text time unix unix-compat
-         vector wreq
-       ];
-       description = "A tool to send command execution results to Sensu";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sensu-run_0_5_0_1" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, filepath
-     , http-client, http-client-tls, http-types, lens, network
-     , optparse-applicative, process, temporary, text, time, unix
-     , unix-compat, vector, wreq
-     }:
-     mkDerivation {
-       pname = "sensu-run";
-       version = "0.5.0.1";
-       sha256 = "1kxdndaimwgj9mjjhb5z8kb36k4awby8a3h1dpghvas1l64i5dfl";
+       version = "0.6.0";
+       sha256 = "1hzi5bkzc3wl031jhpr7j639zxijb33sdwg7zrb5xqdrpmfhg1zm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base bytestring filepath http-client http-client-tls
-         http-types lens network optparse-applicative process temporary text
-         time unix unix-compat vector wreq
+         aeson async base bytestring directory filelock filepath http-client
+         http-client-tls http-types lens network optparse-applicative
+         process temporary text time unix unix-compat vector wreq
        ];
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sentence-jp" = callPackage
@@ -179965,6 +177752,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqid-streams_0_1_0" = callPackage
@@ -180009,6 +177797,7 @@ self: {
        ];
        description = "Handle sequence locations for bioinformatics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqloc-datafiles" = callPackage
@@ -180184,7 +177973,6 @@ self: {
        ];
        description = "A binary serialisation library for Haskell values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serialize-instances" = callPackage
@@ -180318,8 +178106,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.13.0.1";
-       sha256 = "0vfypxdhz1yqkj6ini41ylas91jklvn05rrnarp4d57rli498jx7";
+       version = "0.14.1";
+       sha256 = "083layvq76llq3y49k27cdqzxka6mjgw541jhzndxx4avlcjzym7";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
@@ -180328,8 +178116,8 @@ self: {
          string-conversions tagged text vault
        ];
        testHaskellDepends = [
-         aeson aeson-compat attoparsec base base-compat bytestring doctest
-         hspec QuickCheck quickcheck-instances string-conversions text
+         aeson aeson-compat base base-compat bytestring doctest hspec
+         QuickCheck quickcheck-instances string-conversions text
        ];
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
@@ -180342,8 +178130,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-JuicyPixels";
-       version = "0.3.0.3";
-       sha256 = "0kb53kla03clkv0686awjm6nc57r5yw0zmfs02036iplq6cc1yb0";
+       version = "0.3.0.4";
+       sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -180386,8 +178174,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "servant-auth";
-       version = "0.3.1.0";
-       sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia";
+       version = "0.3.2.0";
+       sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v";
        libraryHaskellDepends = [ base ];
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -180402,8 +178190,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-client";
-       version = "0.3.2.0";
-       sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5";
+       version = "0.3.3.0";
+       sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9";
        libraryHaskellDepends = [
          base bytestring containers servant servant-auth servant-client-core
          text
@@ -180416,7 +178204,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-client/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -180457,8 +178244,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-docs";
-       version = "0.2.9.0";
-       sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l";
+       version = "0.2.10.0";
+       sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd";
+       revision = "1";
+       editedCabalFile = "0rg38ibrw110c3dllqda7badbf6y89g2ilqybkzipyprwkg8s69x";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens servant servant-auth servant-docs text
@@ -180513,36 +178302,29 @@ self: {
      , bytestring, bytestring-conversion, case-insensitive, cookie
      , crypto-api, data-default-class, entropy, hspec, hspec-discover
      , http-api-data, http-client, http-types, jose, lens, lens-aeson
-     , markdown-unlit, monad-time, mtl, QuickCheck, servant-auth
-     , servant-server, tagged, text, time, transformers
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant
+     , servant-auth, servant-server, tagged, text, time, transformers
      , unordered-containers, wai, warp, wreq
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.3.2.0";
-       sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.0";
+       sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
          data-default-class entropy http-api-data http-types jose lens
-         monad-time mtl servant-auth servant-server tagged text time
+         monad-time mtl servant servant-auth servant-server tagged text time
          unordered-containers wai
        ];
-       executableHaskellDepends = [
-         aeson base markdown-unlit mtl servant-auth servant-server
-         transformers warp
-       ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson mtl QuickCheck servant-server time wai warp
-         wreq
+         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+         servant-server time transformers wai warp wreq
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -180551,8 +178333,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-swagger";
-       version = "0.2.9.0";
-       sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc";
+       version = "0.2.10.0";
+       sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh";
        libraryHaskellDepends = [
          base lens servant servant-auth servant-swagger swagger2 text
        ];
@@ -180581,6 +178363,7 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -180619,6 +178402,7 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -180696,6 +178480,8 @@ self: {
        pname = "servant-blaze";
        version = "0.8";
        sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6";
+       revision = "1";
+       editedCabalFile = "1sw72b1x6diyk13mwxfmv50nix0n2lf7cv55p4n2d4bs7r5388q3";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
@@ -180710,8 +178496,8 @@ self: {
        pname = "servant-cassava";
        version = "0.10";
        sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
-       revision = "2";
-       editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4";
+       revision = "3";
+       editedCabalFile = "1asq4w9dbl0ccwqdpvkhbh5fkvwd73iqd09a776ynf0vq3k05kh6";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -180721,7 +178507,6 @@ self: {
        ];
        description = "Servant CSV content-type for cassava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-checked-exceptions" = callPackage
@@ -180772,31 +178557,30 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , containers, deepseq, exceptions, generics-sop, hspec
-     , hspec-discover, http-api-data, http-client, http-client-tls
-     , http-media, http-types, HUnit, monad-control, mtl, network
-     , QuickCheck, semigroupoids, servant, servant-client-core
-     , servant-server, stm, text, time, transformers, transformers-base
-     , transformers-compat, wai, warp
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , exceptions, generics-sop, hspec, hspec-discover, http-api-data
+     , http-client, http-media, http-types, HUnit, markdown-unlit
+     , monad-control, mtl, network, QuickCheck, semigroupoids, servant
+     , servant-client-core, servant-server, stm, text, time
+     , transformers, transformers-base, transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.13.0.1";
-       sha256 = "120qs135arlby811p9z6zqjyrhsm517dq1xq41x3s2f167zkd7q8";
+       version = "0.14";
+       sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
        revision = "1";
-       editedCabalFile = "12iac58pgx5w20x0v6l5ikxxapgl0ql0c91hyv8vcw8mbrjq2qpv";
+       editedCabalFile = "1ywyb3mycpfcvv7dfgd72ajnkqr8cyiyp84hsfxcfvppq8cigmms";
        libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring containers exceptions
-         http-client http-client-tls http-media http-types monad-control mtl
-         semigroupoids servant-client-core stm text time transformers
-         transformers-base transformers-compat
+         base base-compat bytestring containers exceptions http-client
+         http-media http-types monad-control mtl semigroupoids
+         servant-client-core stm text time transformers transformers-base
+         transformers-compat
        ];
        testHaskellDepends = [
-         aeson base base-compat bytestring containers deepseq generics-sop
-         hspec http-api-data http-client http-media http-types HUnit mtl
-         network QuickCheck servant servant-client-core servant-server text
-         transformers transformers-compat wai warp
+         aeson base base-compat bytestring generics-sop hspec http-api-data
+         http-client http-types HUnit markdown-unlit mtl network QuickCheck
+         servant servant-client-core servant-server text transformers
+         transformers-compat wai warp
        ];
        testToolDepends = [ hspec-discover ];
        description = "automatical derivation of querying functions for servant webservices";
@@ -180805,24 +178589,23 @@ self: {
 
   "servant-client-core" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
-     , containers, deepseq, exceptions, generics-sop, hspec
-     , hspec-discover, http-api-data, http-media, http-types, mtl
+     , containers, deepseq, exceptions, free, generics-sop, hspec
+     , hspec-discover, http-api-data, http-media, http-types
      , network-uri, QuickCheck, safe, servant, text
      }:
      mkDerivation {
        pname = "servant-client-core";
-       version = "0.13.0.1";
-       sha256 = "0fr5lb5ra0nzjay9rm3xyyc01ijqxwr9wa0yxsjx1vippfnbds70";
+       version = "0.14.1";
+       sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2";
        libraryHaskellDepends = [
          base base-compat base64-bytestring bytestring containers exceptions
-         generics-sop http-api-data http-media http-types mtl network-uri
+         free generics-sop http-api-data http-media http-types network-uri
          safe servant text
        ];
        testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-csharp" = callPackage
@@ -180883,6 +178666,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-dhall" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, dhall, http-media
+     , megaparsec, prettyprinter, servant, servant-server, text, wai
+     , warp
+     }:
+     mkDerivation {
+       pname = "servant-dhall";
+       version = "0.1.0.1";
+       sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll";
+       libraryHaskellDepends = [
+         base base-compat bytestring dhall http-media megaparsec
+         prettyprinter servant text
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring dhall http-media servant servant-server
+         wai warp
+       ];
+       description = "Servant Dhall content-type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-docs" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
@@ -180893,8 +178697,8 @@ self: {
        pname = "servant-docs";
        version = "0.11.2";
        sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
-       revision = "2";
-       editedCabalFile = "17nv36pm0vv0lgfyk5ay65h7i5bdfq48n0npawcvmqfjsls61xs4";
+       revision = "5";
+       editedCabalFile = "10b463waaa75aawjdag52yjv2bhkpnp3xygb39zyifpaf6iix100";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -180969,27 +178773,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-elm";
-       version = "0.4.0.1";
-       sha256 = "1igz8ac1q1yyjfs7wf6lw09lczcqan1glsnp4glw23v8pgfabcv9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base elm-export lens servant servant-foreign text wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base Diff elm-export hspec HUnit servant text
-       ];
-       description = "Automatically derive Elm functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-elm_0_5_0_0" = callPackage
-    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
-     , servant, servant-foreign, text, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-elm";
        version = "0.5.0.0";
        sha256 = "0l5rjml46qbnq4p3d7zjk8zl9gnpz8m5n6n8yf8kgy89ybm6xnfr";
        isLibrary = true;
@@ -181002,7 +178785,6 @@ self: {
        ];
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-examples" = callPackage
@@ -181067,8 +178849,8 @@ self: {
        pname = "servant-foreign";
        version = "0.11.1";
        sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
-       revision = "1";
-       editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb";
+       revision = "3";
+       editedCabalFile = "1ln18qi2bb9xfk3phydci5r2x0mf6dbgc9lc8k8qpx08bkid65x4";
        libraryHaskellDepends = [
          base base-compat http-types lens servant text
        ];
@@ -181084,8 +178866,8 @@ self: {
        pname = "servant-generate";
        version = "0.1";
        sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw";
-       revision = "1";
-       editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4";
+       revision = "2";
+       editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq";
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -181097,14 +178879,15 @@ self: {
      }:
      mkDerivation {
        pname = "servant-generic";
-       version = "0.1.0.1";
-       sha256 = "1zgw5j3wx4fyb9nhifslzsbfla3iagkvix86vb1x3d9fyz117wif";
+       version = "0.1.0.3";
+       sha256 = "0xnhl4yrx31rsdzjik5az18smx42sqr16r2g5187mqmd9d1671ag";
        libraryHaskellDepends = [ base servant servant-server ];
        testHaskellDepends = [
          base network-uri servant servant-server text warp
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-github" = callPackage
@@ -181226,8 +179009,8 @@ self: {
        pname = "servant-js";
        version = "0.9.3.2";
        sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
-       revision = "1";
-       editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad";
+       revision = "2";
+       editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181240,6 +179023,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -181249,8 +179033,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.1";
-       sha256 = "1spd6phk4n5llgbmydbdqyhlyx6bxr5rhx0rp2z4pnn1kn2qa3ry";
+       version = "0.1.1.2";
+       sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -181269,13 +179053,13 @@ self: {
 
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant, servant-server
-     , wai, warp
+     , text, wai, warp
      }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.8";
-       sha256 = "0vkhh6n51672l3cvd64xdddnzr351j9hd80j7raqkq6k1wrygfi5";
-       libraryHaskellDepends = [ base http-media lucid servant ];
+       version = "0.8.1";
+       sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6";
+       libraryHaskellDepends = [ base http-media lucid servant text ];
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
@@ -181295,7 +179079,6 @@ self: {
        testHaskellDepends = [ base hspec network-uri servant text ];
        description = "Standalone implementation of servant’s dispatching mechanism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-matrix-param" = callPackage
@@ -181329,8 +179112,8 @@ self: {
        pname = "servant-mock";
        version = "0.8.4";
        sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
-       revision = "1";
-       editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp";
+       revision = "2";
+       editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181356,8 +179139,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-multipart";
-       version = "0.11.1";
-       sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q";
+       version = "0.11.2";
+       sha256 = "0w58gab42l3sz7min2pgv6ihfjz28gys5yky0p83kj5smwhys5nx";
+       revision = "1";
+       editedCabalFile = "0xidc0kbagv4ksaci3hxwgb7rvshvnracpzqpcmv8n2whkk26f6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181390,6 +179175,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-nix" = callPackage
+    ({ mkDerivation, base, bytestring, hnix, http-client, http-media
+     , servant, servant-client, servant-server, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-nix";
+       version = "0.1";
+       sha256 = "1bg2pxfq5g4imppsn9snlw2mzl8qrdr1hpxk7pppwp9cpcy3bsvg";
+       revision = "1";
+       editedCabalFile = "0h4x2rjyrg6ah9cil6zsci6wra8gmvb1kv2zq6zs7mqw9426vvfb";
+       libraryHaskellDepends = [
+         base bytestring hnix http-media servant text
+       ];
+       testHaskellDepends = [
+         base hnix http-client servant servant-client servant-server wai
+         warp
+       ];
+       description = "Servant Nix content-type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-options" = callPackage
     ({ mkDerivation, base, bytestring, http-types, servant-foreign
      , servant-server, text, wai
@@ -181411,10 +179218,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-pagination";
-       version = "2.1.0";
-       sha256 = "00mbg8sxjwaxa6xjgaahdzjqppc01y6qzph6g5sc40rnp3j8ws2g";
-       revision = "1";
-       editedCabalFile = "0vb7v8yb1g1aqnnypa2hjsh58q2m9zhgz04dyj1vna1pg4yl3691";
+       version = "2.1.1";
+       sha256 = "1kinql7rmwnrmqmlqkz1pakl52xl1pq32gr589dff00l55df2w2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base safe servant servant-server text ];
@@ -181515,6 +179320,7 @@ self: {
        ];
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -181572,6 +179378,8 @@ self: {
        pname = "servant-quickcheck";
        version = "0.0.7.2";
        sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
+       revision = "1";
+       editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h";
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -181586,7 +179394,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-rawm" = callPackage
@@ -181650,14 +179457,14 @@ self: {
      }) {};
 
   "servant-ruby" = callPackage
-    ({ mkDerivation, base, casing, doctest, lens, QuickCheck
-     , servant-foreign, text
+    ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
+     , text
      }:
      mkDerivation {
        pname = "servant-ruby";
-       version = "0.7.0.0";
-       sha256 = "0r39ixsmqslbygd38bvz61a7n0r7g54zfrcgjfn506599ybianm9";
-       libraryHaskellDepends = [ base casing lens servant-foreign text ];
+       version = "0.8.0.1";
+       sha256 = "07pdz6zdax415virbx30cjbiywlzfwzsaq9426l14zwmgf7pw155";
+       libraryHaskellDepends = [ base casing servant-foreign text ];
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
@@ -181683,39 +179490,35 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
-     , directory, doctest, exceptions, filepath, hspec, hspec-discover
-     , hspec-wai, http-api-data, http-media, http-types, monad-control
-     , mtl, network, network-uri, parsec, QuickCheck, resourcet, safe
-     , servant, should-not-typecheck, split, string-conversions
-     , system-filepath, tagged, temporary, text, transformers
-     , transformers-base, transformers-compat, wai, wai-app-static
-     , wai-extra, warp, word8
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, Cabal, cabal-doctest, containers, directory, doctest
+     , exceptions, filepath, hspec, hspec-discover, hspec-wai
+     , http-api-data, http-media, http-types, monad-control, mtl
+     , network, network-uri, QuickCheck, resourcet, safe, servant
+     , should-not-typecheck, string-conversions, tagged, temporary, text
+     , transformers, transformers-base, transformers-compat, wai
+     , wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.13.0.1";
-       sha256 = "0fggdqz2d6q96x8vnm64yvarg4fgxqh0jd3vis6yxpybfi174arm";
-       revision = "1";
-       editedCabalFile = "102w8rbl7hrm3gqsdzk1g794vssvn1c89h5d2j0hqkc587qws0nd";
+       version = "0.14.1";
+       sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         containers exceptions filepath http-api-data http-media http-types
-         monad-control mtl network network-uri resourcet safe servant split
-         string-conversions system-filepath tagged text transformers
-         transformers-base transformers-compat wai wai-app-static warp word8
+         base base-compat base64-bytestring bytestring containers exceptions
+         filepath http-api-data http-media http-types monad-control mtl
+         network network-uri resourcet servant string-conversions tagged
+         text transformers transformers-base transformers-compat wai
+         wai-app-static word8
        ];
        executableHaskellDepends = [ aeson base servant text wai warp ];
        testHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring directory
-         doctest exceptions hspec hspec-wai http-types mtl network parsec
-         QuickCheck resourcet safe servant should-not-typecheck
-         string-conversions temporary text transformers transformers-compat
-         wai wai-extra warp
+         doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe
+         servant should-not-typecheck string-conversions temporary text
+         transformers transformers-compat wai wai-extra
        ];
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -181791,8 +179594,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-static-th";
-       version = "0.2.0.1";
-       sha256 = "1np3sh8jcil63kd56smlkcxqg25zsn01s4dx0d1i4cmc610nb33l";
+       version = "0.2.2.0";
+       sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181813,8 +179616,8 @@ self: {
     ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }:
      mkDerivation {
        pname = "servant-streaming";
-       version = "0.2.0.0";
-       sha256 = "10cs6yrzy75w8zvjddqw0gcnqmwmk28112vbj9dwpg2qgh1s1194";
+       version = "0.3.0.0";
+       sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq";
        libraryHaskellDepends = [ base http-types servant ];
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
@@ -181829,8 +179632,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-streaming-client";
-       version = "0.2.0.0";
-       sha256 = "056k8ysani675ab9x7ls6fns55frw26krcdrsznwc2808bi71p3x";
+       version = "0.3.0.0";
+       sha256 = "1h3haws61m064zziyzn03n0450swffmr46gsv9k88lrpz8lv5qj2";
        libraryHaskellDepends = [
          base bytestring http-media http-types resourcet servant
          servant-client-core servant-streaming streaming
@@ -181851,8 +179654,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-streaming-docs";
-       version = "0.2.0.0";
-       sha256 = "0a5f5bz4qgk9a7bfgym950mcqxx83629j3x35rmp7faxd50jx055";
+       version = "0.3.0.0";
+       sha256 = "0jy0na8cavym2vsy1a059n0yjzfb5a0xylyzxpz0i5apafv1xvlz";
        libraryHaskellDepends = [
          base lens servant servant-docs servant-streaming
        ];
@@ -181868,8 +179671,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-streaming-server";
-       version = "0.2.0.0";
-       sha256 = "1a95hzvcki51109hd563kk23zgv909pwdvpdxah3asbv78b9i7id";
+       version = "0.3.0.0";
+       sha256 = "0lsh3x6hkbk7p095pkp7ld0m54xlkw0101x6nrxhjvhmw13aiq66";
        libraryHaskellDepends = [
          base bytestring http-media http-types resourcet servant
          servant-server servant-streaming streaming streaming-wai wai
@@ -181908,6 +179711,7 @@ self: {
        executableHaskellDepends = [ base purescript-bridge ];
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger" = callPackage
@@ -181921,8 +179725,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.5";
        sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
-       revision = "1";
-       editedCabalFile = "005b3z7wxcrad8210yw3qsndh3zh0v2h8j50qxl8sj1l6wqb7zs6";
+       revision = "4";
+       editedCabalFile = "0jbi48mcqm4zzdpmpqscs6gvx6lc855fi0hk3ymd5kvpsj00lm9j";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -181939,33 +179743,6 @@ self: {
      }) {};
 
   "servant-swagger-ui" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
-     , directory, file-embed, filepath, http-media, lens, servant
-     , servant-blaze, servant-server, servant-swagger, swagger2
-     , template-haskell, text, transformers, transformers-compat, wai
-     , wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "servant-swagger-ui";
-       version = "0.2.5.3.9.1";
-       sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m";
-       revision = "1";
-       editedCabalFile = "16lixcz9vkkgvcfwdfj3p6pmf458hymyywklzwnbhk7z16wjjhnv";
-       libraryHaskellDepends = [
-         base blaze-markup bytestring directory file-embed filepath
-         http-media servant servant-blaze servant-server servant-swagger
-         swagger2 template-haskell text transformers transformers-compat
-         wai-app-static
-       ];
-       testHaskellDepends = [
-         aeson base base-compat lens servant servant-server servant-swagger
-         swagger2 text transformers transformers-compat wai warp
-       ];
-       description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger-ui_0_3_0_3_13_2" = callPackage
     ({ mkDerivation, base, bytestring, file-embed-lzma, servant
      , servant-server, servant-swagger-ui-core, swagger2, text
      }:
@@ -181973,13 +179750,14 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.3.0.3.13.2";
        sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n";
+       revision = "1";
+       editedCabalFile = "1ka19i4r7s85qlpk5sm90gm5yf82nd03clgyqzm8w8jn7y3fji19";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
        ];
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -181989,10 +179767,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui-core";
-       version = "0.3";
-       sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
-       revision = "1";
-       editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v";
+       version = "0.3.1";
+       sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -182010,6 +179786,8 @@ self: {
        pname = "servant-swagger-ui-jensoleg";
        version = "0.3";
        sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik";
+       revision = "1";
+       editedCabalFile = "1r097cz7kl3kknkp23ss3yl97nq6zzn0p9nxrxgxs5d9d62nb0rg";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182026,6 +179804,8 @@ self: {
        pname = "servant-swagger-ui-redoc";
        version = "0.3.0.1.21.2";
        sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl";
+       revision = "1";
+       editedCabalFile = "11lldvcppw71a7i963lymsqy74dkl46zhqnp30g33mfmbvgbwh23";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182110,8 +179890,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "19";
-       editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv";
+       revision = "20";
+       editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -182229,8 +180009,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.5.2";
-       sha256 = "1nsxc9kif57fvr6j1pp116llbmyb1ngvzgndcfjwvdbscl23jfwg";
+       version = "0.6.1";
+       sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -182441,6 +180221,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servius_1_2_1_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
+     , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static
+     }:
+     mkDerivation {
+       pname = "servius";
+       version = "1.2.1.0";
+       sha256 = "0hc7jiiij8i658sqxwrzc75jv53vishd9y8gx5pp361rcxq2h304";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base blaze-builder blaze-html bytestring cmark-gfm http-types
+         shakespeare text wai wai-app-static
+       ];
+       description = "Warp web server with template rendering";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ses-html" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, byteable
      , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time
@@ -182571,6 +180370,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-with" = callPackage
@@ -182666,6 +180466,7 @@ self: {
        ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setop" = callPackage
@@ -182783,16 +180584,16 @@ self: {
   "sexp-grammar" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , criterion, deepseq, happy, invertible-grammar, prettyprinter
-     , QuickCheck, recursion-schemes, scientific, semigroups, split
-     , tasty, tasty-hunit, tasty-quickcheck, text, utf8-string
+     , QuickCheck, recursion-schemes, scientific, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, utf8-string
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "2.0.0";
-       sha256 = "1wf9mrmz89kcvrkyif5mp0wwqxgg363f3jc7y9sf370qc4frm68p";
+       version = "2.0.1";
+       sha256 = "0znzxih07yhm0gjbwzm3gdvmrjm2676g7sqjicawc86fwww1rgms";
        libraryHaskellDepends = [
          array base bytestring containers deepseq invertible-grammar
-         prettyprinter recursion-schemes scientific semigroups split text
+         prettyprinter recursion-schemes scientific semigroups text
          utf8-string
        ];
        libraryToolDepends = [ alex happy ];
@@ -182978,6 +180779,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shadower" = callPackage
@@ -183030,7 +180832,6 @@ self: {
        ];
        description = "A fast SOCKS5 proxy that help you get through firewalls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shady-gen" = callPackage
@@ -183103,16 +180904,16 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, microlens, microlens-th, shake, shake-cabal
+     , hs2ats, language-ats, microlens, shake, shake-c, shake-cabal
      , shake-ext, text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.6";
-       sha256 = "00887a8dh26w2qj5w0scivrz3qjybbkflf4s135lmrz6s5pb7l6f";
+       version = "1.9.0.2";
+       sha256 = "0ximikdjf03qr4xzb68z3knbg2g1xdl3kzmm7fnq03sz7jczf6j3";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats
-         microlens microlens-th shake shake-cabal shake-ext text
+         microlens shake shake-c shake-cabal shake-ext text
        ];
        description = "Utilities for building ATS projects with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -183120,12 +180921,12 @@ self: {
      }) {};
 
   "shake-c" = callPackage
-    ({ mkDerivation, base, cdeps, shake }:
+    ({ mkDerivation, base, cdeps, composition-prelude, shake }:
      mkDerivation {
        pname = "shake-c";
-       version = "0.1.0.0";
-       sha256 = "0g6lavs5y62g5dpy1pfpm2bks43kf6i4m1gb9hdrkrz1iysgl209";
-       libraryHaskellDepends = [ base cdeps shake ];
+       version = "0.4.0.0";
+       sha256 = "1n8pm0431dxbrk3fqn1mijgvqbz4i7jcc8pqy60cj76p88kdn24q";
+       libraryHaskellDepends = [ base cdeps composition-prelude shake ];
        description = "Library for building C code with shake";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183135,10 +180936,10 @@ self: {
      }:
      mkDerivation {
        pname = "shake-cabal";
-       version = "0.1.0.0";
-       sha256 = "1zxxfjfklwnarzvdyq9n221n5aygq253xcr3hly54mrvalq337bb";
-       revision = "2";
-       editedCabalFile = "02hzlwp75i2vmvk8inaasnpgpy89a00xbawp6p4p5fg07czx3fap";
+       version = "0.1.0.1";
+       sha256 = "1x7bz1qzm1sfnz7f9zhwinzpyghj0yj8x2hag0p3ay8g6s2wxbs4";
+       revision = "1";
+       editedCabalFile = "1lvs3z5r37pswaanyg0an2zrys8lmjq4s22dbw6283rbxw4vjcvc";
        libraryHaskellDepends = [
          base Cabal composition-prelude directory shake
        ];
@@ -183185,19 +180986,14 @@ self: {
      }) {};
 
   "shake-ext" = callPackage
-    ({ mkDerivation, base, cdeps, composition-prelude, directory, shake
-     , template-haskell
-     }:
+    ({ mkDerivation, base, directory, shake }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.12.0.0";
-       sha256 = "1yvsywbszvn2vllbzbp8c9c10idaid87wv1qvhz2xq4jw2f8q38h";
-       libraryHaskellDepends = [
-         base cdeps composition-prelude directory shake template-haskell
-       ];
+       version = "3.0.1.0";
+       sha256 = "15n94922a4l74n65w59dj8jjpsv2vamm5lwnkii2hq6s1rpgccnm";
+       libraryHaskellDepends = [ base directory shake ];
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-extras" = callPackage
@@ -183222,24 +181018,6 @@ self: {
      }:
      mkDerivation {
        pname = "shake-language-c";
-       version = "0.11.0";
-       sha256 = "07ck1y3z3081s1m3yff37z6v2lp0gilqj0jb0l4vphszkckasx11";
-       libraryHaskellDepends = [
-         base data-default-class fclabels process shake split
-         unordered-containers
-       ];
-       testHaskellDepends = [ base directory doctest hspec shake ];
-       doCheck = false;
-       description = "Utilities for cross-compiling with Shake";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "shake-language-c_0_12_0" = callPackage
-    ({ mkDerivation, base, data-default-class, directory, doctest
-     , fclabels, hspec, process, shake, split, unordered-containers
-     }:
-     mkDerivation {
-       pname = "shake-language-c";
        version = "0.12.0";
        sha256 = "1c0smbshksjw114m09n5i1ynkhibvd9kix9n7h696p75g40ka7k6";
        libraryHaskellDepends = [
@@ -183250,7 +181028,6 @@ self: {
        doCheck = false;
        description = "Utilities for cross-compiling with Shake";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-literate" = callPackage
@@ -183558,6 +181335,7 @@ self: {
        ];
        description = "demos for the 'shapes' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shapes-math" = callPackage
@@ -183636,6 +181414,7 @@ self: {
        testHaskellDepends = [ base bytestring unix ];
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sharedio" = callPackage
@@ -183743,6 +181522,7 @@ self: {
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-pipe" = callPackage
@@ -183792,6 +181572,7 @@ self: {
        ];
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -183851,10 +181632,10 @@ self: {
     ({ mkDerivation, base, hspec, megaparsec, text }:
      mkDerivation {
        pname = "shellwords";
-       version = "0.1.1.0";
-       sha256 = "1k3wmkmxr1rvjjrgg2swz8pl2nwf723q8zwpybadss4kz0f4w314";
+       version = "0.1.2.0";
+       sha256 = "0w3fv5fv6ccd8r0rfl5i6cjnfkv4vbk8gcssn2inr8hihwg88kmy";
        libraryHaskellDepends = [ base megaparsec text ];
-       testHaskellDepends = [ base hspec text ];
+       testHaskellDepends = [ base hspec ];
        description = "Parse strings into words, like a shell would";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -183864,35 +181645,6 @@ self: {
      , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
      , HUnit, lifted-async, lifted-base, monad-control, mtl, process
      , system-fileio, system-filepath, text, time, transformers
-     , transformers-base, unix-compat
-     }:
-     mkDerivation {
-       pname = "shelly";
-       version = "1.7.2";
-       sha256 = "04gi3vixi69s95kwbbh0yxmfrkga1aafdp80zs2zfwcai13cfqkn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions lifted-async lifted-base monad-control mtl process
-         system-fileio system-filepath text time transformers
-         transformers-base unix-compat
-       ];
-       testHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions filepath hspec hspec-contrib HUnit lifted-async
-         lifted-base monad-control mtl process system-fileio system-filepath
-         text time transformers transformers-base unix-compat
-       ];
-       description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shelly_1_8_1" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
-     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
-     , system-fileio, system-filepath, text, time, transformers
      , transformers-base, unix, unix-compat
      }:
      mkDerivation {
@@ -183915,7 +181667,6 @@ self: {
        ];
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly-extra" = callPackage
@@ -183954,20 +181705,21 @@ self: {
 
   "shift" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
-     , composition, data-default, lens, optparse-applicative
-     , system-fileio, system-filepath, text, turtle
+     , composition-prelude, data-default, microlens
+     , optparse-applicative, system-fileio, system-filepath, text
+     , turtle
      }:
      mkDerivation {
        pname = "shift";
-       version = "0.2.0.1";
-       sha256 = "162b862m73dwdw3ci1k8ihwb2kng7nrn679zk01v5cq3s3qkbqgx";
-       isLibrary = true;
+       version = "0.2.0.3";
+       sha256 = "1k4fcb7j66fvdl1nqmx7315s6b9jmzv3dmcvc2sbkfh8m5wm2bby";
+       isLibrary = false;
        isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base binary bytestring composition data-default lens
-         optparse-applicative system-fileio system-filepath text turtle
+       executableHaskellDepends = [
+         ansi-terminal base binary bytestring composition-prelude
+         data-default microlens optparse-applicative system-fileio
+         system-filepath text turtle
        ];
-       executableHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -184201,8 +181953,8 @@ self: {
      }:
      mkDerivation {
        pname = "show-prettyprint";
-       version = "0.2.0.2";
-       sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg";
+       version = "0.2.2";
+       sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh";
        libraryHaskellDepends = [
          ansi-wl-pprint base prettyprinter trifecta
        ];
@@ -184337,6 +182089,7 @@ self: {
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sibe" = callPackage
@@ -184419,6 +182172,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
+  "siggy-chardust" = callPackage
+    ({ mkDerivation, base, doctest, hlint, smallcheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "siggy-chardust";
+       version = "1.0.0";
+       sha256 = "0hssby6mak0bq1fqv47hp6rnw51yz1kgzgsmnvh2k9jfq0y0qwwz";
+       revision = "1";
+       editedCabalFile = "1lknm1jr6h5qpixc727aj3zbmj4ia21r9lb8gzj50iildgmfk33b";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest hlint smallcheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       description = "Rounding rationals to significant digits and decimal places";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "sigma-ij" = callPackage
     ({ mkDerivation, array, base, combinat, containers
      , optparse-applicative, parsec2, random, time
@@ -184438,6 +182210,7 @@ self: {
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sign" = callPackage
@@ -184460,6 +182233,7 @@ self: {
        ];
        description = "Arithmetic over signs and sets of signs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "signal" = callPackage
@@ -184597,6 +182371,7 @@ self: {
        ];
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-actors" = callPackage
@@ -184611,6 +182386,7 @@ self: {
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-atom" = callPackage
@@ -184760,7 +182536,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-eval" = callPackage
@@ -185071,6 +182846,7 @@ self: {
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-sendfile" = callPackage
@@ -185121,6 +182897,7 @@ self: {
        ];
        description = "Cookie-based session management for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-sessions" = callPackage
@@ -185138,8 +182915,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "simple-smt";
-       version = "0.8";
-       sha256 = "0w4adm7zjiqbzm0vg8ky4xyldid00grsnjf7n4pkw5a2fw81qi3d";
+       version = "0.9.1";
+       sha256 = "13dg61jdgby49lpdb53anrg39wn8dwgvg6jpn8vh0y8rf2zilq9b";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
@@ -185194,6 +182971,7 @@ self: {
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-tabular" = callPackage
@@ -185240,6 +183018,7 @@ self: {
        ];
        description = "A basic template language for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-text-format" = callPackage
@@ -185281,8 +183060,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4.0.6";
-       sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1";
+       version = "0.4.0.7";
+       sha256 = "1snhvy9nlwi6ka6lj6qhc3p9wz9q88mj9yr80lir7z0i1qy0yvar";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
          base doctest doctest-driver-gen tasty tasty-quickcheck
@@ -185333,6 +183112,7 @@ self: {
        ];
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleirc" = callPackage
@@ -185450,7 +183230,6 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sqlite;};
 
   "simplex" = callPackage
@@ -185598,28 +183377,10 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singletons" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl
-     , process, syb, tasty, tasty-golden, template-haskell, text
-     , th-desugar
-     }:
-     mkDerivation {
-       pname = "singletons";
-       version = "2.3.1";
-       sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa";
-       libraryHaskellDepends = [
-         base containers mtl syb template-haskell text th-desugar
-       ];
-       testHaskellDepends = [
-         base Cabal directory filepath process tasty tasty-golden
-       ];
-       description = "A framework for generating singleton types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singletons_2_4_1" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc-boot-th
      , mtl, process, syb, tasty, tasty-golden, template-haskell, text
      , th-desugar, transformers
@@ -185637,7 +183398,6 @@ self: {
        ];
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singnal" = callPackage
@@ -185692,8 +183452,10 @@ self: {
      }:
      mkDerivation {
        pname = "siphon";
-       version = "0.8.0";
-       sha256 = "1ssjbpl4vdx7z2gbl3xywlljk8iq25kaqgcsryigsmx9mgv7194q";
+       version = "0.8.1";
+       sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx";
+       revision = "2";
+       editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531";
        libraryHaskellDepends = [
          attoparsec base bytestring colonnade streaming text transformers
          vector
@@ -185867,6 +183629,7 @@ self: {
        ];
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-types" = callPackage
@@ -185922,6 +183685,7 @@ self: {
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sjsp" = callPackage
@@ -185979,6 +183743,7 @@ self: {
        ];
        description = "Skeletal set - a set with equivalence relation different from equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skeleton" = callPackage
@@ -186054,6 +183819,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "skews" = callPackage
+    ({ mkDerivation, async, base, bytestring, deque, envy, hspec
+     , network, websockets
+     }:
+     mkDerivation {
+       pname = "skews";
+       version = "0.1.0.1";
+       sha256 = "03dn42hj50g4if1biln8m9rzf54iccqivkdciw06yrvx7q64hi5m";
+       libraryHaskellDepends = [ base bytestring deque websockets ];
+       testHaskellDepends = [
+         async base bytestring deque envy hspec network websockets
+       ];
+       description = "A very quick-and-dirty WebSocket server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "skip-list" = callPackage
     ({ mkDerivation, base, criterion, tasty, tasty-hunit }:
      mkDerivation {
@@ -186106,45 +183887,14 @@ self: {
   "skylighting" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
-     , case-insensitive, colour, containers, criterion, Diff, directory
-     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
-     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "skylighting";
-       version = "0.6";
-       sha256 = "1027rcj6zqmnwm6is5k5v28r8af8bsf6i36dwi128h5g92pg206f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base base64-bytestring binary
-         blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl regex-pcre-builtin safe text utf8-string
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath HUnit
-         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion directory filepath text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "skylighting_0_7_1" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
-     , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
      , mtl, regex-pcre-builtin, safe, skylighting-core, text
      , utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.7.1";
-       sha256 = "0x7mn1dn6hsqwvcq6l3yx74g5lpq1zwh96mba9h24xsw0zqd9g60";
+       version = "0.7.2";
+       sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186155,7 +183905,6 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-core" = callPackage
@@ -186168,8 +183917,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.7.1";
-       sha256 = "0gkjv36cbqyzvxvqfjdz816901x949zjmyasrvgwwlyvahsj5zjg";
+       version = "0.7.2";
+       sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186296,8 +184045,8 @@ self: {
      }:
      mkDerivation {
        pname = "slack-web";
-       version = "0.2.0.4";
-       sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah";
+       version = "0.2.0.6";
+       sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a";
        libraryHaskellDepends = [
          aeson base containers errors http-api-data http-client
          http-client-tls megaparsec mtl servant servant-client
@@ -186309,7 +184058,6 @@ self: {
        ];
        description = "Bindings for the Slack web API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slate" = callPackage
@@ -186424,6 +184172,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sloane" = callPackage
@@ -186503,8 +184252,8 @@ self: {
        pname = "slug";
        version = "0.1.7";
        sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
-       revision = "3";
-       editedCabalFile = "1kqaqhg8bkrkax41pbi18612s0m9w2324n5akn5nhmxq0zla73vh";
+       revision = "4";
+       editedCabalFile = "18h2wl2a3bb9094yq9dp6sjschb75ki4zlp1vrfzkpsrwb4v3ndr";
        libraryHaskellDepends = [
          aeson base exceptions http-api-data path-pieces persistent
          QuickCheck text
@@ -186548,14 +184297,15 @@ self: {
        ];
        description = "Flatten camel case text in LaTeX files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcheck" = callPackage
     ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
-       version = "1.1.4";
-       sha256 = "0x2p9rfsx0hvcmsq7v1m5qdgs9mvf4zrcpz4wywn4q8mr8hb416y";
+       version = "1.1.5";
+       sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h";
        libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
@@ -186790,8 +184540,8 @@ self: {
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.4.2.8";
-       sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s";
+       version = "0.4.2.9";
+       sha256 = "0kra42nh86dfp66ngr4bmb8d530nh7b9pra1vlykc0sx9b1zpjnk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
        description = "Smooth curves via several interpolation modes";
@@ -187028,44 +184778,6 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "1.1.0.0";
-       sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8";
-       revision = "3";
-       editedCabalFile = "0jkxlbbx4whwqqxb1c04xp1zanzmda4b4bwz8swk2pcixmmzx2xa";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring cereal clientsession configurator
-         containers directory directory-tree dlist filepath hashable heist
-         lens lifted-base map-syntax monad-control mtl mwc-random
-         pwstore-fast snap-core snap-server stm text time transformers
-         transformers-base unordered-containers xmlhtml
-       ];
-       testHaskellDepends = [
-         aeson async attoparsec base bytestring cereal clientsession
-         configurator containers deepseq directory directory-tree dlist
-         filepath hashable heist http-streams HUnit lens lifted-base
-         map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck
-         smallcheck snap-core snap-server stm syb test-framework
-         test-framework-hunit test-framework-quickcheck2
-         test-framework-smallcheck text time transformers transformers-base
-         unordered-containers xmlhtml
-       ];
-       description = "Top-level package for the Snap Web Framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "snap_1_1_1_0" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
-     , clientsession, configurator, containers, deepseq, directory
-     , directory-tree, dlist, filepath, hashable, heist, http-streams
-     , HUnit, lens, lifted-base, map-syntax, monad-control, mtl
-     , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core
-     , snap-server, stm, syb, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-smallcheck, text, time
-     , transformers, transformers-base, unordered-containers, xmlhtml
-     }:
-     mkDerivation {
-       pname = "snap";
        version = "1.1.1.0";
        sha256 = "08kgvry18kfkspif2xn8j7w9jfinhrnl33g6ap74fz7rsrg68jz7";
        libraryHaskellDepends = [
@@ -187266,8 +184978,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.12.1.1";
-       sha256 = "0x5j5d4g605i2pnkaryy1d7pxikdwz2pmns7lp9sliii7h6yq2n6";
+       version = "0.12.2.0";
+       sha256 = "18d1gfpk2gzvaidb6l13y64540hfyqk5hw6gpx7z495ay1dafdzr";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -187293,8 +185005,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-language";
-       version = "0.1.0.3";
-       sha256 = "18nw841pl2ba1ms3gksd9m928ihkhrh9553jq616sf22gwg7ykjh";
+       version = "0.1.0.4";
+       sha256 = "144l44s587hizsxkh38bqrabyjndwacipklsg30hiwk8cdhqa8f4";
        libraryHaskellDepends = [
          attoparsec base bytestring containers snap-core
        ];
@@ -187332,6 +185044,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-predicates" = callPackage
@@ -187390,48 +185103,6 @@ self: {
      }:
      mkDerivation {
        pname = "snap-server";
-       version = "1.0.3.3";
-       sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl";
-       revision = "3";
-       editedCabalFile = "0y0rd2skx59knkxm53zg6m4mi0p4rj9jw32vsj9mbl8sy2vw9hlj";
-       configureFlags = [ "-fopenssl" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder bytestring bytestring-builder
-         case-insensitive clock containers filepath HsOpenSSL io-streams
-         io-streams-haproxy lifted-base mtl network old-locale
-         openssl-streams snap-core text time unix unix-compat vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base16-bytestring blaze-builder bytestring
-         bytestring-builder case-insensitive clock containers deepseq
-         directory filepath HsOpenSSL http-common http-streams HUnit
-         io-streams io-streams-haproxy lifted-base monad-control mtl network
-         old-locale openssl-streams parallel QuickCheck random snap-core
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         threads time transformers unix unix-compat vector
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base blaze-builder bytestring bytestring-builder
-         criterion io-streams io-streams-haproxy snap-core vector
-       ];
-       description = "A web server for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "snap-server_1_1_0_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , bytestring, bytestring-builder, case-insensitive, clock
-     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
-     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
-     , lifted-base, monad-control, mtl, network, old-locale
-     , openssl-streams, parallel, QuickCheck, random, snap-core
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, threads, time, transformers, unix, unix-compat, vector
-     }:
-     mkDerivation {
-       pname = "snap-server";
        version = "1.1.0.0";
        sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
        revision = "1";
@@ -187460,7 +185131,6 @@ self: {
        ];
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-templates" = callPackage
@@ -187480,6 +185150,7 @@ self: {
        ];
        description = "Scaffolding CLI for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-testing" = callPackage
@@ -187557,21 +185228,21 @@ self: {
   "snaplet-actionlog" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , digestive-functors, digestive-functors-heist
-     , digestive-functors-snap, errors, heist, persistent
-     , persistent-postgresql, persistent-template, readable
+     , digestive-functors-snap, errors, heist, lens, map-syntax
+     , persistent, persistent-postgresql, persistent-template, readable
      , restful-snap, snap, snap-extras, snaplet-persistent, text, time
      , transformers, unordered-containers, xmlhtml
      }:
      mkDerivation {
        pname = "snaplet-actionlog";
-       version = "0.2.0.1";
-       sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv";
+       version = "0.3.1";
+       sha256 = "1cs1spfy253zf2lxjdx2ki20ikzyj035xcxkzldxkn994amw2p7l";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-builder bytestring digestive-functors
-         digestive-functors-heist digestive-functors-snap errors heist
-         persistent persistent-postgresql persistent-template readable
-         restful-snap snap snap-extras snaplet-persistent text time
+         digestive-functors-heist digestive-functors-snap errors heist lens
+         map-syntax persistent persistent-postgresql persistent-template
+         readable restful-snap snap snap-extras snaplet-persistent text time
          transformers unordered-containers xmlhtml
        ];
        description = "Generic action log snaplet for the Snap Framework";
@@ -188740,6 +186411,7 @@ self: {
        ];
        description = "An extensible socket library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -188762,6 +186434,7 @@ self: {
        libraryHaskellDepends = [ base socket ];
        description = "Definitions for ICMP with the `socket` library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-io" = callPackage
@@ -189076,25 +186749,12 @@ self: {
     ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
        pname = "sorted-list";
-       version = "0.2.0.0";
-       sha256 = "0f6ihm4xsg31izzl4c13lic2aq4m2rq0d7y5xjlx7x2nn23wflnc";
-       libraryHaskellDepends = [ base deepseq ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Type-enforced sorted lists and related functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sorted-list_0_2_1_0" = callPackage
-    ({ mkDerivation, base, criterion, deepseq }:
-     mkDerivation {
-       pname = "sorted-list";
        version = "0.2.1.0";
        sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l";
        libraryHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sorting" = callPackage
@@ -189143,6 +186803,7 @@ self: {
        ];
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sounddelay" = callPackage
@@ -189162,8 +186823,8 @@ self: {
     ({ mkDerivation, base, split, WAVE }:
      mkDerivation {
        pname = "soundgen";
-       version = "0.1.0.0";
-       sha256 = "0zlap41i7npx8n8c3wsdhq6mqm5yhidhid1mqn4lq726sa3njanq";
+       version = "0.1.1.0";
+       sha256 = "198nxjskmlqdn1wnw5zjwxqqs3b03qv2v48g1pzf9llcgvcy37vf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base split WAVE ];
@@ -189513,6 +187174,7 @@ self: {
        ];
        description = "Effective linear algebra on sparse matrices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse-linear-algebra" = callPackage
@@ -189522,28 +187184,6 @@ self: {
      }:
      mkDerivation {
        pname = "sparse-linear-algebra";
-       version = "0.2.9.9";
-       sha256 = "1n3cxrmj5v0l5g1x1zb017sd59whpr6kfkzw3pckl1f93yh0jhf1";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers exceptions hspec mtl primitive QuickCheck
-         transformers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec matrix-market-attoparsec mtl
-         mwc-random primitive QuickCheck scientific
-       ];
-       description = "Numerical computing in native Haskell";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "sparse-linear-algebra_0_3_1" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec
-     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
-     , scientific, transformers, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "sparse-linear-algebra";
        version = "0.3.1";
        sha256 = "1jfwydr0pzph932h7jvnmp1d8qqrhxsq7rbb6cjbmga55s5pfqn7";
        enableSeparateDataOutput = true;
@@ -189557,7 +187197,6 @@ self: {
        ];
        description = "Numerical computing in native Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparsebit" = callPackage
@@ -189597,6 +187236,7 @@ self: {
        ];
        description = "Lightweight parsing library based on partial functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spata" = callPackage
@@ -189632,6 +187272,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "spatial-rotations" = callPackage
+    ({ mkDerivation, base, containers, linear, manifolds
+     , manifolds-core, pragmatic-show, tasty, tasty-hunit
+     , tasty-quickcheck, vector-space
+     }:
+     mkDerivation {
+       pname = "spatial-rotations";
+       version = "0.1.0.0";
+       sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm";
+       revision = "1";
+       editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy";
+       libraryHaskellDepends = [
+         base linear manifolds-core vector-space
+       ];
+       testHaskellDepends = [
+         base containers manifolds pragmatic-show tasty tasty-hunit
+         tasty-quickcheck vector-space
+       ];
+       description = "Rotate about any suitable axis";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "spawn" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -189695,6 +187358,7 @@ self: {
        ];
        description = "Simple data types that help me here and there";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "special-values" = callPackage
@@ -189792,29 +187456,33 @@ self: {
      }) {};
 
   "speechmatics" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, hspec
-     , http-client, http-client-openssl, http-types, json-autotype, lens
-     , mime-types, monad-logger, mtl, neat-interpolation, options, SHA
-     , text, wreq
+    ({ mkDerivation, aeson, base, bytestring, heavy-logger, HsOpenSSL
+     , hspec, http-client, http-client-openssl, http-types
+     , json-autotype, lens, mime-types, monad-control, mtl
+     , neat-interpolation, options, SHA, text, text-format-heavy, wreq
      }:
      mkDerivation {
        pname = "speechmatics";
-       version = "0.5.0.0";
-       sha256 = "12hk79wfs935118y1dzzrya9k82jf525scn67ps0s314g8fzpnc0";
+       version = "0.7.1.0";
+       sha256 = "1sx4q4l1rx6xss6xp1qqdb1nscclaszpkn78cs47rxpa19lcnsd2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring HsOpenSSL http-client http-client-openssl
-         http-types json-autotype lens mime-types monad-logger mtl text wreq
+         aeson base bytestring heavy-logger HsOpenSSL http-client
+         http-client-openssl http-types json-autotype lens mime-types
+         monad-control mtl text text-format-heavy wreq
        ];
        executableHaskellDepends = [
-         base bytestring mime-types monad-logger mtl options SHA text
+         aeson base bytestring heavy-logger mime-types mtl options SHA text
+         text-format-heavy
        ];
        testHaskellDepends = [
-         base bytestring hspec monad-logger mtl neat-interpolation text
+         base bytestring heavy-logger hspec mtl neat-interpolation text
+         text-format-heavy
        ];
        description = "Speechmatics api client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speedy-slice" = callPackage
@@ -190010,6 +187678,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splaytree" = callPackage
@@ -190152,27 +187821,6 @@ self: {
      }) {};
 
   "splitmix" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers
-     , criterion, random, tf-random, time
-     }:
-     mkDerivation {
-       pname = "splitmix";
-       version = "0";
-       sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi";
-       revision = "2";
-       editedCabalFile = "0fl7z9lxkyvqk0d14d778j3lk8zi8jgncwq41gqi4z78a20xb2pg";
-       libraryHaskellDepends = [ base random time ];
-       testHaskellDepends = [
-         base base-compat bytestring random tf-random
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion random tf-random
-       ];
-       description = "Fast Splittable PRNG";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "splitmix_0_0_1" = callPackage
     ({ mkDerivation, async, base, base-compat-batteries, bytestring
      , containers, criterion, deepseq, process, random, tf-random, time
      , vector
@@ -190191,7 +187839,6 @@ self: {
        ];
        description = "Fast Splittable PRNG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splitter" = callPackage
@@ -190408,6 +188055,7 @@ self: {
        ];
        description = "Web interface to sproxy database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sproxy2" = callPackage
@@ -190479,6 +188127,7 @@ self: {
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple" = callPackage
@@ -190563,8 +188212,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
-       version = "0.1.6.1";
-       sha256 = "07prq4bcvl469m0sr767kxidr0kk27yynb9zsm48sjz84h0bx2v3";
+       version = "0.1.6.2";
+       sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "SQL keywords data constructors into OverloadedString";
@@ -190628,20 +188277,22 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
-     , semigroups, text, time, transformers
+     , semigroups, template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "sqlite-simple";
-       version = "0.4.15.0";
-       sha256 = "1qk9dzrqfyjavyl9p0l24hbncp2c1faxx0yvjz5iq3s4dl6fswf0";
+       version = "0.4.16.0";
+       sha256 = "1pih3nbfczyb91smci2dg9p1wvjsqiv5f5y97q6vqzlns64a3lk0";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
-         direct-sqlite Only semigroups text time transformers
+         direct-sqlite Only semigroups template-haskell text time
+         transformers
        ];
        testHaskellDepends = [
          base base16-bytestring bytestring direct-sqlite HUnit text time
@@ -190660,7 +188311,6 @@ self: {
        testHaskellDepends = [ base mtl sqlite-simple text ];
        description = "Wrapper around errors from sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite-simple-typed" = callPackage
@@ -190715,47 +188365,23 @@ self: {
      }) {};
 
   "squeal-postgresql" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , generics-sop, hspec, lifted-base, monad-control, mtl, network-ip
-     , postgresql-binary, postgresql-libpq, scientific, text, time
-     , transformers, transformers-base, uuid
-     }:
-     mkDerivation {
-       pname = "squeal-postgresql";
-       version = "0.1.1.4";
-       sha256 = "0s0dl4l6zbxi9a37ybrg8kq7yf642kayr6yjjp21i0wd0sa71b2h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq generics-sop lifted-base
-         monad-control mtl network-ip postgresql-binary postgresql-libpq
-         scientific text time transformers transformers-base uuid
-       ];
-       executableHaskellDepends = [
-         base bytestring generics-sop mtl text transformers
-         transformers-base
-       ];
-       testHaskellDepends = [ base doctest generics-sop hspec ];
-       description = "Squeal PostgreSQL Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "squeal-postgresql_0_2_1_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , generics-sop, lifted-base, mmorph, monad-control, mtl, network-ip
-     , postgresql-binary, postgresql-libpq, resource-pool, scientific
-     , text, time, transformers, transformers-base, uuid-types, vector
+    ({ mkDerivation, aeson, base, binary-parser, bytestring
+     , bytestring-strict-builder, deepseq, doctest, generics-sop
+     , lifted-base, mmorph, monad-control, mtl, network-ip
+     , postgresql-binary, postgresql-libpq, profunctors, resource-pool
+     , scientific, text, time, transformers, transformers-base
+     , uuid-types, vector
      }:
      mkDerivation {
        pname = "squeal-postgresql";
-       version = "0.2.1.0";
-       sha256 = "1qfz1c4yzjshgvc64plahy3aar96yvcmn2m5giyp17nrfgq266qs";
+       version = "0.3.1.0";
+       sha256 = "1v0z3k365k4h0lbnirsgnxkacpcvq5l5bdrwax17s93ywbn8i78p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring deepseq generics-sop lifted-base mmorph
-         monad-control mtl network-ip postgresql-binary postgresql-libpq
+         aeson base binary-parser bytestring bytestring-strict-builder
+         deepseq generics-sop lifted-base mmorph monad-control mtl
+         network-ip postgresql-binary postgresql-libpq profunctors
          resource-pool scientific text time transformers transformers-base
          uuid-types vector
        ];
@@ -191109,6 +188735,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stable-memo" = callPackage
@@ -191160,8 +188787,8 @@ self: {
        pname = "stache";
        version = "1.2.1";
        sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb";
-       revision = "4";
-       editedCabalFile = "03qy0mlyiwpv98aq74m3pyarg6v6w9vn8qlq6ljdlb40xi1p9s7z";
+       revision = "6";
+       editedCabalFile = "1h4llrsmd270vnw7fxzvw1a22bdkm3srdf5f3v19pbcgm2ahadsj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -191201,8 +188828,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "4";
-       editedCabalFile = "06imaj3adll2lwfivkv3axzfkaj6nfp0vbq6vsmpknw0r8s32xad";
+       revision = "5";
+       editedCabalFile = "1pfvn5xc3yq2i2qxml4ww3mm2lidkz1v4f76j0x08g37p37d2lbz";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -191384,15 +189011,14 @@ self: {
      }:
      mkDerivation {
        pname = "stack-prism";
-       version = "0.1.6";
-       sha256 = "1nwxjhwpjg40kp55g017918dmzxjzj0q0pndhr7gdjnd2d1w4fj9";
+       version = "0.1.7";
+       sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz";
        libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-run" = callPackage
@@ -191802,8 +189428,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage2nix";
-       version = "0.7.0";
-       sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl";
+       version = "0.7.1";
+       sha256 = "1yiz7gbzv8bqil6zgp28n18lj34mdpg6xx0bzk8x9956zxsiwhis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191958,8 +189584,8 @@ self: {
     ({ mkDerivation, base, fsnotify }:
      mkDerivation {
        pname = "starter";
-       version = "0.2.1";
-       sha256 = "1lghrnygc984a4ybdisp11kdcljwygx5ybiacnk7d0p1x8205zk0";
+       version = "0.3.0";
+       sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx";
        libraryHaskellDepends = [ base fsnotify ];
        description = "Develop applications without restarts";
        license = stdenv.lib.licenses.mpl20;
@@ -192160,7 +189786,6 @@ self: {
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "static-closure" = callPackage
@@ -192177,6 +189802,7 @@ self: {
        ];
        description = "Serialisable static pointers to functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "static-hash" = callPackage
@@ -192417,17 +190043,17 @@ self: {
 
   "status-notifier-item" = callPackage
     ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
-     , filepath, hslogger, lens, mtl, network, optparse-applicative
-     , spool, template-haskell, transformers, vector
+     , filepath, hslogger, lens, network, optparse-applicative, spool
+     , template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.2.2.0";
-       sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh";
+       version = "0.3.0.0";
+       sha256 = "18svwy4j6445n8apd0zx50cb9sc1z9n8rkvfkm4x7s7bgvmh49vv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dbus filepath hslogger lens mtl network
+         base bytestring containers dbus filepath hslogger lens network
          spool template-haskell transformers vector
        ];
        executableHaskellDepends = [
@@ -192435,7 +190061,6 @@ self: {
        ];
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statvfs" = callPackage
@@ -192451,26 +190076,27 @@ self: {
 
   "staversion" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
-     , containers, directory, filepath, hspec, http-client
+     , containers, directory, filepath, heredoc, hspec, http-client
      , http-client-tls, http-types, megaparsec, optparse-applicative
-     , pretty, QuickCheck, semigroups, text, transformers
+     , pretty, process, QuickCheck, semigroups, text, transformers
      , transformers-compat, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.1.4";
-       sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc";
+       version = "0.2.3.0";
+       sha256 = "012j2gcmcyjqsmfcpll2y61j7n191y8wipdki49p7i0d2n4ak88v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers directory
          filepath http-client http-client-tls http-types megaparsec
-         optparse-applicative pretty semigroups text transformers
+         optparse-applicative pretty process semigroups text transformers
          transformers-compat unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring Cabal filepath hspec QuickCheck semigroups text
+         base bytestring Cabal filepath heredoc hspec QuickCheck semigroups
+         text
        ];
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
@@ -192497,6 +190123,7 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-truetype" = callPackage
@@ -192562,28 +190189,29 @@ self: {
 
   "steeloverseer" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , containers, directory, filepath, fsnotify, hspec, mtl
-     , optparse-applicative, process, regex-tdfa, resourcet, semigroups
-     , stm, streaming, text, yaml
+     , containers, directory, exceptions, filepath, fsnotify, hspec
+     , managed, mtl, optparse-applicative, process, regex-tdfa
+     , semigroups, stm, streaming, text, unix, yaml
      }:
      mkDerivation {
        pname = "steeloverseer";
-       version = "2.0.1.0";
-       sha256 = "0njsj7kyyf4vkk4i2yy93swlhiz5xkrdam2dd060qfi7ya8n3h6x";
+       version = "2.0.2.0";
+       sha256 = "1jj8akshhns3azi9vgfclg9xhbl40nyr1lmf12pisw3mzbd7ld28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal async base bytestring containers fsnotify mtl
-         process regex-tdfa resourcet semigroups stm streaming text yaml
+         aeson ansi-terminal async base bytestring containers exceptions
+         fsnotify managed mtl process regex-tdfa semigroups stm streaming
+         text unix yaml
        ];
        executableHaskellDepends = [
-         async base bytestring directory filepath fsnotify mtl
-         optparse-applicative regex-tdfa resourcet semigroups stm streaming
-         text yaml
+         async base bytestring directory exceptions filepath fsnotify
+         managed mtl optparse-applicative regex-tdfa semigroups stm
+         streaming text yaml
        ];
        testHaskellDepends = [
-         async base bytestring fsnotify hspec mtl regex-tdfa resourcet
-         semigroups stm streaming text yaml
+         async base bytestring exceptions fsnotify hspec managed mtl
+         regex-tdfa semigroups stm streaming text yaml
        ];
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
@@ -192642,7 +190270,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stepwise" = callPackage
@@ -192712,7 +190339,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm" = callPackage
+  "stm_2_4_5_0" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
@@ -192721,6 +190348,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-channelize" = callPackage
@@ -192974,6 +190602,7 @@ self: {
        testHaskellDepends = [ async base QuickCheck random Unique ];
        description = "STM wrapper around Control.Concurrent.Supply.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-tlist" = callPackage
@@ -193116,6 +190745,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storable-complex" = callPackage
@@ -193234,57 +190864,6 @@ self: {
 
   "store" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
-     , base64-bytestring, bytestring, cereal, cereal-vector, conduit
-     , containers, contravariant, criterion, cryptohash, deepseq
-     , directory, filepath, free, ghc-prim, hashable, hspec
-     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
-     , mono-traversable, network, primitive, resourcet, safe, semigroups
-     , smallcheck, store-core, streaming-commons, syb, template-haskell
-     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
-       version = "0.4.3.2";
-       sha256 = "13ihh1n42j9lq2dhkcgisds7bzm7nm4a02abk8vadracn4a7r97c";
-       libraryHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring conduit
-         containers contravariant cryptohash deepseq directory filepath free
-         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
-         monad-control mono-traversable network primitive resourcet safe
-         semigroups smallcheck store-core streaming-commons syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       testHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers contravariant criterion cryptohash
-         deepseq directory filepath free ghc-prim hashable hspec
-         hspec-smallcheck integer-gmp lifted-base monad-control
-         mono-traversable network primitive resourcet safe semigroups
-         smallcheck store-core streaming-commons syb template-haskell text
-         th-lift th-lift-instances th-orphans th-reify-many th-utilities
-         time transformers unordered-containers vector
-         vector-binary-instances void weigh
-       ];
-       benchmarkHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring conduit
-         containers contravariant criterion cryptohash deepseq directory
-         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
-         lifted-base monad-control mono-traversable network primitive
-         resourcet safe semigroups smallcheck store-core streaming-commons
-         syb template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "store_0_5_0" = callPackage
-    ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
      , containers, contravariant, criterion, cryptohash, deepseq
      , directory, filepath, free, ghc-prim, hashable, hspec
@@ -193332,7 +190911,6 @@ self: {
        ];
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "store-core" = callPackage
@@ -193341,8 +190919,8 @@ self: {
      }:
      mkDerivation {
        pname = "store-core";
-       version = "0.4.3";
-       sha256 = "0fx4ylhqm79pi6k8qzby6nb0d7nlq5za8n3fir1v97wl34vmr3gf";
+       version = "0.4.4";
+       sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv";
        libraryHaskellDepends = [
          base bytestring ghc-prim primitive text transformers
        ];
@@ -193370,7 +190948,6 @@ self: {
        ];
        description = "Streaming interfaces for `store`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -193397,29 +190974,6 @@ self: {
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.19.1";
-       sha256 = "0wfpqbhbr15qvvp9k0v1m1az02hpp25pglj4yl0ay7smm2848wi9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_24_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
        version = "0.24.1";
        sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i";
        isLibrary = true;
@@ -193434,7 +190988,6 @@ self: {
        ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -193486,6 +191039,8 @@ self: {
        pname = "stratux-http";
        version = "0.0.9";
        sha256 = "121pansnd8pdhv9ki2qdav93cwldmnxnykjldhbkb2bkyr0skdyb";
+       revision = "1";
+       editedCabalFile = "0paq3zs9c39dcjxxyz975q4nccmgdxxay839wa60gka75hix34gs";
        libraryHaskellDepends = [
          aeson base either HTTP network-uri stratux-types utf8-string
        ];
@@ -193526,6 +191081,8 @@ self: {
        pname = "stratux-websockets";
        version = "0.0.9";
        sha256 = "0076n4i250frv71w9sysw935g5aq0py8shwaqrhjrv4jp6mb2k3q";
+       revision = "1";
+       editedCabalFile = "0863p5spgs68q6ddp3v9azm7x01wky1480yp3rrjxpkgay1ha4db";
        libraryHaskellDepends = [
          aeson base either network stratux-types text transformers
          websockets
@@ -193669,7 +191226,6 @@ self: {
        ];
        description = "Streaming conversion from/to base64";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-benchmarks" = callPackage
@@ -193755,41 +191311,18 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-commons" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , deepseq, directory, gauge, hspec, network, process, QuickCheck
-     , random, stm, text, transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "streaming-commons";
-       version = "0.1.19";
-       sha256 = "19qp8bnnfs31jk08991lmj3dywbjxh9iydriifbdjj2mvy8axz23";
-       libraryHaskellDepends = [
-         array async 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
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring deepseq gauge text
-       ];
-       description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "streaming-commons_0_2_0_0" = callPackage
     ({ mkDerivation, array, async, base, bytestring, deepseq, directory
      , gauge, hspec, network, process, QuickCheck, random, stm, text
      , transformers, unix, zlib
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.2.0.0";
-       sha256 = "0pyfibrz30azq22zq7zl4wvbl0mm9wrqw1047p437h950d3biqpl";
+       version = "0.2.1.0";
+       sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
        libraryHaskellDepends = [
          array async base bytestring directory network process random stm
          text transformers unix zlib
@@ -193801,7 +191334,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -193843,6 +191375,7 @@ self: {
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-eversion" = callPackage
@@ -193863,7 +191396,6 @@ self: {
        ];
        description = "Translate pull-based stream folds into push-based iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -193993,6 +191525,7 @@ self: {
        ];
        description = "Streaming support for running system process";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-sort" = callPackage
@@ -194068,41 +191601,19 @@ self: {
      }) {};
 
   "streamly" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, criterion
-     , exceptions, hspec, lifted-base, lockfree-queue, monad-control
-     , mtl, stm, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streamly";
-       version = "0.1.2";
-       sha256 = "1axqac7zi2b87q91hxv75dpk4pfd4d4fcvsna7cjgkhkdvvjarzp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         atomic-primops base containers exceptions lifted-base
-         lockfree-queue monad-control mtl stm transformers transformers-base
-       ];
-       testHaskellDepends = [ base containers hspec ];
-       benchmarkHaskellDepends = [ atomic-primops base criterion mtl ];
-       description = "Beautiful Streaming, Concurrent and Reactive Composition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streamly_0_2_1" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
-     , exceptions, gauge, hspec, lifted-base, lockfree-queue
-     , monad-control, mtl, QuickCheck, random, stm, transformers
-     , transformers-base
+     , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control
+     , mtl, QuickCheck, random, transformers, transformers-base
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.2.1";
-       sha256 = "157zxg03ibgxdrghpcdyj22fd7zd02fmgnib13yf0jwwc400c4gp";
+       version = "0.3.0";
+       sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         atomic-primops base containers exceptions lifted-base
-         lockfree-queue monad-control mtl stm transformers transformers-base
+         atomic-primops base containers exceptions heaps lockfree-queue
+         monad-control mtl transformers transformers-base
        ];
        testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck random transformers
@@ -194110,7 +191621,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq gauge random ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streamproc" = callPackage
@@ -194268,6 +191778,7 @@ self: {
        ];
        description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -194319,6 +191830,7 @@ self: {
        ];
        description = "A type level predicate ranging over strict types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-writer" = callPackage
@@ -194521,22 +192033,6 @@ self: {
      }:
      mkDerivation {
        pname = "string-transform";
-       version = "1.0.0";
-       sha256 = "0556blv06jl973pnkcab36bsa3kjzjhzs396q31qmkqnqlpday4d";
-       libraryHaskellDepends = [ base bytestring text utf8-string ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
-       ];
-       description = "simple and easy haskell string transform wrapper";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "string-transform_1_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
-     , tasty-smallcheck, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "string-transform";
        version = "1.1.0";
        sha256 = "1f76aiimm2knc68g08dc9j495mjkas87jw8w27silrsq3pzayzad";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
@@ -194545,7 +192041,6 @@ self: {
        ];
        description = "simple and easy haskell string transform wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-typelits" = callPackage
@@ -194653,6 +192148,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strio" = callPackage
@@ -194693,25 +192189,47 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-core";
-       version = "2.3.0";
-       sha256 = "08656c3s9326kgppwiys7whil47yw6qibjzmivjzykh6858j0kfm";
+       version = "2.4.0";
+       sha256 = "1xmi8msjmnf6321z09yvxz4spm7ac1abv9d7h3zin340h46zv1bx";
        libraryHaskellDepends = [
          aeson base bytestring mtl text time transformers
          unordered-containers
        ];
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-haskell" = callPackage
-    ({ mkDerivation, base, stripe-core, stripe-http-streams }:
+    ({ mkDerivation, base, stripe-core, stripe-http-client }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "2.3.0";
-       sha256 = "18358axxx2rkv06bh1n48hsx3bh3bj4h3xx1ma3hvv68l9cprwsm";
-       libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
+       version = "2.4.0";
+       sha256 = "0q2ikxzxhlk6n4a2pwfd02ayidp6xrl91hbs021ghhy0ni1vibhi";
+       libraryHaskellDepends = [ base stripe-core stripe-http-client ];
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "stripe-http-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, free, hspec, http-client
+     , http-client-tls, http-types, stripe-core, stripe-tests, text
+     }:
+     mkDerivation {
+       pname = "stripe-http-client";
+       version = "2.4.0";
+       sha256 = "0ljnvd5b2pzmbikdyjyr2s0qzq5ghh8k7jgwv1qm52d38jpnd82f";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         stripe-core text
+       ];
+       testHaskellDepends = [
+         base free hspec http-client stripe-core stripe-tests
+       ];
+       description = "Stripe API for Haskell - http-client backend";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-http-streams" = callPackage
@@ -194720,8 +192238,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-http-streams";
-       version = "2.3.0";
-       sha256 = "0nn244ghmyibdrvzfz9k8skhsfh47sh8g34v1c63rkswqb4wpnsp";
+       version = "2.4.0";
+       sha256 = "0xhv3y13m43a90i6hfgib0a18ldwgvw5sprh9mc6xnyqfklpg2zf";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
@@ -194732,6 +192250,7 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-tests" = callPackage
@@ -194741,8 +192260,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-tests";
-       version = "2.3.0";
-       sha256 = "14j0zvnrl0s2br0vwpm105wscdyddan62iqwrf0fg8c4mj6kpfrw";
+       version = "2.4.0";
+       sha256 = "0mpkqy1frx5h6sj4aj7h0faq2zzgrx0ckljqahczxn9ikpnzgmk5";
        libraryHaskellDepends = [
          aeson base bytestring free hspec hspec-core mtl random stripe-core
          text time transformers unordered-containers
@@ -194773,8 +192292,8 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "5.0.4";
-       sha256 = "1lj3fqyl1a6nix32y5irvlvsdl518gv7zvz67my5dp5fa3z9hklg";
+       version = "5.0.5";
+       sha256 = "1kzkhq791ycx5q20vg6pfl1y1mirlk9h00s4ii1pf5l56lw6kgq1";
        libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-client
          http-client-tls http-types template-haskell text time transformers
@@ -194808,8 +192327,8 @@ self: {
        pname = "structs";
        version = "0.1.1";
        sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z";
-       revision = "1";
-       editedCabalFile = "16ws2j3bhwawf6z1ipraiz73yvg65dg5l7hvj1lgbrqvn5lqizj3";
+       revision = "2";
+       editedCabalFile = "1v9gmnj17cm4p491rizvw9xdj255lk1y24gz6s8bqcz56sdb4d4s";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base deepseq ghc-prim primitive template-haskell
@@ -195054,6 +192573,7 @@ self: {
        doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylish-haskell" = callPackage
@@ -195248,6 +192768,7 @@ self: {
        ];
        description = "Match / replace substrings with a parser combinators";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subtitleParser" = callPackage
@@ -195322,6 +192843,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suffix-array" = callPackage
@@ -195416,8 +192938,8 @@ self: {
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.0.2";
-       sha256 = "164mcpcjmbqrpdxaw693394s15f13i8mvxaq7ib7rflavkjdm8qh";
+       version = "1.0.4";
+       sha256 = "1gwglx6lvg962q7a5m0vx372vqyiw3sf5kxsbwnl53pgrynmjhyn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195432,7 +192954,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Tool for creating completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -195450,6 +192971,7 @@ self: {
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sundown" = callPackage
@@ -195762,7 +193284,6 @@ self: {
        ];
        description = "Supercharged anonymous records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supervisor" = callPackage
@@ -195807,6 +193328,7 @@ self: {
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suspend" = callPackage
@@ -195863,6 +193385,7 @@ self: {
        ];
        description = "Integration to use sv with cassava's parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg-builder" = callPackage
@@ -195893,6 +193416,7 @@ self: {
        ];
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg-tree" = callPackage
@@ -195984,6 +193508,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svm-simple" = callPackage
@@ -196063,6 +193588,7 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger-test" = callPackage
@@ -196092,41 +193618,10 @@ self: {
        ];
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger2" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
-     , hashable, hspec, hspec-discover, http-media, HUnit
-     , insert-ordered-containers, lens, mtl, network, QuickCheck
-     , quickcheck-instances, scientific, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers
-     , uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.2.1";
-       sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz";
-       revision = "1";
-       editedCabalFile = "00snyp95rjh3h7yqfwg3x4y9gjhypm6zfv45i2sag4w5cydvkzb5";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers generics-sop hashable
-         http-media insert-ordered-containers lens mtl network scientific
-         template-haskell text time transformers transformers-compat
-         unordered-containers uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         quickcheck-instances text time unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_2_2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries
      , bytestring, Cabal, cabal-doctest, containers, doctest
      , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
@@ -196139,8 +193634,8 @@ self: {
        pname = "swagger2";
        version = "2.2.2";
        sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2";
-       revision = "1";
-       editedCabalFile = "08rjphysbbiy1zcakgrscv0f3ypxx604dcg6h84jg38azqsf8kff";
+       revision = "3";
+       editedCabalFile = "187jl8slpyr6blcxnhdp7wf85ab54pgqnbl11n816xg6fyqy7ylk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring containers generics-sop
@@ -196157,7 +193652,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -196258,10 +193752,8 @@ self: {
      }:
      mkDerivation {
        pname = "sws";
-       version = "0.4.1.0";
-       sha256 = "1xcbmwpwp2nvi7adihkddpgi9pkdc7q7ly08vm57r56lcpzvs70p";
-       revision = "1";
-       editedCabalFile = "1mlyk1959yy4lmx7zsc5iafw1y7vj1d39dndn9as34pqd1rvdk5j";
+       version = "0.4.2.0";
+       sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -196535,6 +194027,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "Monoids for sameness and uniqueness";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symon" = callPackage
@@ -196966,7 +194459,6 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell: Filter networks";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-inference" = callPackage
@@ -197159,6 +194651,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-fileio" = callPackage
@@ -197270,19 +194763,23 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-locale" = callPackage
-    ({ mkDerivation, attoparsec, base, hspec, process, text, time }:
+    ({ mkDerivation, attoparsec, base, bytestring, hspec, process, text
+     , time
+     }:
      mkDerivation {
        pname = "system-locale";
-       version = "0.2.0.0";
-       sha256 = "1mvzcnqybdv30xrpfp87l61kcdss2wgqsbgpdl2gl9nz62hyd5z5";
-       libraryHaskellDepends = [ attoparsec base process text time ];
+       version = "0.3.0.0";
+       sha256 = "08svyqndp6wvf5g0dyfc31i1m7a67zwvz4zb1iivpjszahw9czj9";
+       libraryHaskellDepends = [
+         attoparsec base bytestring process text time
+       ];
        testHaskellDepends = [ base hspec ];
        description = "Get system locales";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -197663,7 +195160,6 @@ self: {
        ];
        description = "Pretty-printing of CSV files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabloid" = callPackage
@@ -197697,6 +195193,7 @@ self: {
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabular" = callPackage
@@ -197714,38 +195211,39 @@ self: {
     ({ mkDerivation, base, cairo, ConfigFile, containers, dbus
      , dbus-hslogger, directory, dyre, either, enclosed-exceptions
      , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib
-     , gi-gtk, gi-gtk-hs, glib, gtk-sni-tray, gtk-strut, gtk-traymanager
-     , gtk3, haskell-gi, haskell-gi-base, hslogger, HStringTemplate
-     , HTTP, multimap, network, network-uri, old-locale
-     , optparse-applicative, parsec, process, rate-limit, regex-compat
-     , safe, split, status-notifier-item, stm, template-haskell, text
-     , time, time-locale-compat, time-units, transformers
-     , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir
-     , xml, xml-helpers, xmonad, xmonad-contrib
+     , gi-gtk, gi-gtk-hs, gi-pango, glib, gtk-sni-tray, gtk-strut, gtk3
+     , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP
+     , multimap, network, network-uri, old-locale, optparse-applicative
+     , parsec, process, rate-limit, regex-compat, safe, split
+     , status-notifier-item, stm, template-haskell, text, time
+     , time-locale-compat, time-units, transformers, transformers-base
+     , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers
+     , xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "2.1.1";
-       sha256 = "13bp0ydwb26k8y4f3cn47qy24lwxfx9v7ysm1q0r8iksjg9a6lhk";
+       version = "3.0.0";
+       sha256 = "0p3gjpfsj3l5z1v62mf1j3ia0qd5b0dxn2s77dzrxj4qd4iwjnld";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo ConfigFile containers dbus dbus-hslogger directory dyre
          either enclosed-exceptions filepath gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gdkx11 gi-glib gi-gtk gi-gtk-hs glib gtk-sni-tray gtk-strut
-         gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
-         HStringTemplate HTTP multimap network network-uri old-locale parsec
-         process rate-limit regex-compat safe split status-notifier-item stm
-         template-haskell text time time-locale-compat time-units
-         transformers transformers-base tuple unix utf8-string X11
-         xdg-basedir xml xml-helpers xmonad xmonad-contrib
+         gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango glib gtk-sni-tray
+         gtk-strut haskell-gi haskell-gi-base hslogger HStringTemplate HTTP
+         multimap network network-uri old-locale parsec process rate-limit
+         regex-compat safe split status-notifier-item stm template-haskell
+         text time time-locale-compat time-units transformers
+         transformers-base tuple unix utf8-string X11 xdg-basedir xml
+         xml-helpers xmonad xmonad-contrib
        ];
+       libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [ base hslogger optparse-applicative ];
+       executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk3 = pkgs.gnome3.gtk;};
 
   "tag-bits" = callPackage
     ({ mkDerivation, base, ghc-prim }:
@@ -197772,6 +195270,7 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagchup" = callPackage
@@ -197816,6 +195315,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagged_0_8_6" = callPackage
+    ({ mkDerivation, base, deepseq, template-haskell, transformers }:
+     mkDerivation {
+       pname = "tagged";
+       version = "0.8.6";
+       sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md";
+       libraryHaskellDepends = [
+         base deepseq template-haskell transformers
+       ];
+       description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged-binary" = callPackage
     ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }:
      mkDerivation {
@@ -198238,6 +195751,7 @@ self: {
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -198369,6 +195883,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe text ];
        description = "Blaze-style HTML templates as a Monad Transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tao" = callPackage
@@ -198435,20 +195950,20 @@ self: {
 
   "tar-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , containers, criterion, deepseq, directory, filepath, hspec
-     , QuickCheck, safe-exceptions, text, unix, weigh
+     , conduit-extra, containers, criterion, deepseq, directory
+     , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
      }:
      mkDerivation {
        pname = "tar-conduit";
-       version = "0.2.3";
-       sha256 = "1is2q5662zrrxgb2dm2n1qa1aqdrwf4g7il5jdpxhri28m7pp7jp";
+       version = "0.2.3.1";
+       sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators directory filepath
          safe-exceptions text unix
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-combinators containers deepseq
-         directory filepath hspec QuickCheck weigh
+         base bytestring conduit conduit-combinators conduit-extra
+         containers deepseq directory filepath hspec QuickCheck weigh
        ];
        benchmarkHaskellDepends = [
          base bytestring conduit conduit-combinators containers criterion
@@ -198456,7 +195971,6 @@ self: {
        ];
        description = "Extract and create tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -198531,7 +196045,6 @@ self: {
        ];
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "task" = callPackage
@@ -198612,34 +196125,18 @@ self: {
   "tasty" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
+     , wcwidth
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.0.1.1";
-       sha256 = "1czfvgm3wb9dlxccr7h49929m6rag7rc6q5hlj9yw0l4lm0hv4hs";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers mtl optparse-applicative
-         stm tagged unbounded-delays unix
-       ];
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_1_1_0_1" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
-     , optparse-applicative, stm, tagged, unbounded-delays, unix
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "1.1.0.1";
-       sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw";
+       version = "1.1.0.2";
+       sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers mtl optparse-applicative
-         stm tagged unbounded-delays unix
+         stm tagged unbounded-delays unix wcwidth
        ];
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -198684,23 +196181,11 @@ self: {
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.1.0.2";
-       sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_2_0_4" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "1.2.0.4";
-       sha256 = "151cr15l4v1p1zlfps4q3wv26v2mhcnplnnx03lmcq9di21y95yn";
+       version = "1.2.0.7";
+       sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
@@ -198710,32 +196195,6 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-discover";
-       version = "4.2.0";
-       sha256 = "19qs3sg28anjjajwvkd79xsh5iip59w6bwphc88sy7gyybq6q586";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath Glob
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath Glob
-       ];
-       testHaskellDepends = [
-         base containers directory filepath Glob hedgehog tasty
-         tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       description = "Test discovery for the tasty framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-discover_4_2_1" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, Glob
-     , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-discover";
        version = "4.2.1";
        sha256 = "0ghxrjkqp4w6i47pvdsd25zs6sj10rw4ybkf0pxr598l8qw5nv5y";
        isLibrary = true;
@@ -198753,7 +196212,6 @@ self: {
        ];
        description = "Test discovery for the tasty framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-expected-failure" = callPackage
@@ -198791,8 +196249,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-golden";
-       version = "2.3.1.3";
-       sha256 = "1xri8bnj22gzxkxz4hi2vqx0aaz51ww3zz9ac0ig0lw653kbj61p";
+       version = "2.3.2";
+       sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404";
        libraryHaskellDepends = [
          async base bytestring containers deepseq directory filepath mtl
          optparse-applicative process tagged tasty temporary
@@ -198829,35 +196287,36 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-hedgehog";
-       version = "0.1.0.2";
-       sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x";
-       revision = "1";
-       editedCabalFile = "1kmmry6zawyhxgi20v3j62m58lqjcjzvap0qp6b35yj31vbzl727";
+       version = "0.2.0.0";
+       sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
+       revision = "4";
+       editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       description = "Integrates the hedgehog testing library with the tasty testing framework";
+       description = "Integration for tasty and hedgehog";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tasty-hedgehog_0_2_0_0" = callPackage
-    ({ mkDerivation, base, hedgehog, tagged, tasty
-     , tasty-expected-failure
+  "tasty-hedgehog-coverage" = callPackage
+    ({ mkDerivation, base, containers, hedgehog, mtl, tagged, tasty
+     , tasty-expected-failure, tasty-hedgehog, text, transformers
+     , wl-pprint-annotated
      }:
      mkDerivation {
-       pname = "tasty-hedgehog";
-       version = "0.2.0.0";
-       sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "4";
-       editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
-       libraryHaskellDepends = [ base hedgehog tagged tasty ];
+       pname = "tasty-hedgehog-coverage";
+       version = "0.1.0.0";
+       sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c";
+       libraryHaskellDepends = [
+         base containers hedgehog mtl tagged tasty tasty-hedgehog text
+         transformers wl-pprint-annotated
+       ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       description = "Integration for tasty and hedgehog";
+       description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-hspec" = callPackage
@@ -198866,10 +196325,10 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-hspec";
-       version = "1.1.4";
-       sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3";
-       revision = "2";
-       editedCabalFile = "1ijz75l5jhyxjk6hjrhbsw4470dxfdnwdwn9q3akxbmk095hpzjl";
+       version = "1.1.5";
+       sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
+       revision = "1";
+       editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -198880,16 +196339,17 @@ self: {
 
   "tasty-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
-     , generic-deriving, mtl, stm, tagged, tasty, text, transformers
+     , generic-deriving, mtl, semigroups, stm, tagged, tasty, text
+     , transformers
      }:
      mkDerivation {
        pname = "tasty-html";
-       version = "0.4.1.1";
-       sha256 = "06hzb4y98aqmcn3zl6mr1gwmkkl73phqc4419fwsxwqyrygirshf";
+       version = "0.4.1.2";
+       sha256 = "1bffbp8qwyad85s9bl3ck3gxay3hphka527j09hn2sz1bfqzcihb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
-         stm tagged tasty text transformers
+         semigroups stm tagged tasty text transformers
        ];
        description = "Render tasty output to HTML";
        license = stdenv.lib.licenses.mit;
@@ -199034,20 +196494,6 @@ self: {
      }) {};
 
   "tasty-quickcheck" = callPackage
-    ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "tasty-quickcheck";
-       version = "0.9.2";
-       sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5";
-       libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
-       testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-       description = "QuickCheck support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-quickcheck_0_10" = callPackage
     ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
      , random, tagged, tasty, tasty-hunit
      }:
@@ -199063,7 +196509,6 @@ self: {
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-rerun" = callPackage
@@ -199387,37 +196832,12 @@ self: {
   "tdigest" = callPackage
     ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest
      , deepseq, doctest, reducers, semigroupoids, semigroups, tasty
-     , tasty-quickcheck, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "tdigest";
-       version = "0.1";
-       sha256 = "0jy57m7acda4sk0hkkcxbkb274bc6i39hmq8l79wwmk5pspb6dh0";
-       revision = "2";
-       editedCabalFile = "0g54mzya141wllmsv977san1qz08lz2z36znkv6cqxh8z4vyfwdk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-compat binary deepseq reducers semigroupoids semigroups
-         vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base base-compat binary deepseq doctest semigroups tasty
-         tasty-quickcheck vector vector-algorithms
-       ];
-       description = "On-line accumulation of rank-based statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tdigest_0_2" = callPackage
-    ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest
-     , deepseq, doctest, reducers, semigroupoids, semigroups, tasty
      , tasty-quickcheck, transformers, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "tdigest";
-       version = "0.2";
-       sha256 = "1wii4rkk1xqqdkwd24g6xb3imrrgr4y2vq0a7kg606g3a5mllsvq";
+       version = "0.2.1";
+       sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-compat binary deepseq reducers semigroupoids transformers
@@ -199429,7 +196849,6 @@ self: {
        ];
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdigest-Chart" = callPackage
@@ -199480,31 +196899,6 @@ self: {
      }) {};
 
   "teardown" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest
-     , exceptions, Glob, protolude, QuickCheck, safe-exceptions, tasty
-     , tasty-hspec, tasty-hunit, tasty-rerun, tasty-smallcheck, text
-     , time
-     }:
-     mkDerivation {
-       pname = "teardown";
-       version = "0.3.0.0";
-       sha256 = "0v47863md56nbkq0dwq4v7fw6krjjnz9m6fgag6qcbd3yx4lydc2";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base deepseq exceptions protolude safe-exceptions
-         text time
-       ];
-       testHaskellDepends = [
-         base doctest Glob protolude QuickCheck safe-exceptions tasty
-         tasty-hspec tasty-hunit tasty-rerun tasty-smallcheck text time
-       ];
-       benchmarkHaskellDepends = [
-         base criterion protolude safe-exceptions text time
-       ];
-       description = "Build composable components for your application with clear teardown semantics";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "teardown_0_5_0_0" = callPackage
     ({ mkDerivation, base, gauge, prettyprinter, rio, tasty
      , tasty-hunit, typed-process, unliftio
      }:
@@ -199523,7 +196917,6 @@ self: {
        ];
        description = "Build safe and composable teardown sub-routines for resources";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teeth" = callPackage
@@ -199988,24 +197381,6 @@ self: {
 
   "temporary" = callPackage
     ({ mkDerivation, base, base-compat, directory, exceptions, filepath
-     , tasty, tasty-hunit, transformers, unix
-     }:
-     mkDerivation {
-       pname = "temporary";
-       version = "1.2.1.1";
-       sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm";
-       libraryHaskellDepends = [
-         base directory exceptions filepath transformers unix
-       ];
-       testHaskellDepends = [
-         base base-compat directory filepath tasty tasty-hunit unix
-       ];
-       description = "Portable temporary file and directory support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "temporary_1_3" = callPackage
-    ({ mkDerivation, base, base-compat, directory, exceptions, filepath
      , random, tasty, tasty-hunit, transformers, unix
      }:
      mkDerivation {
@@ -200020,7 +197395,6 @@ self: {
        ];
        description = "Portable temporary file and directory support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporary-rc" = callPackage
@@ -200337,6 +197711,7 @@ self: {
        executableHaskellDepends = [ base cli ];
        description = "Composable terminal colors";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-progress-bar" = callPackage
@@ -200415,8 +197790,8 @@ self: {
      }:
      mkDerivation {
        pname = "terminfo-hs";
-       version = "0.2.1";
-       sha256 = "1zs8k82xk76lnhrpnd3kx6amz868fwaxjv9c08k01z79d96sfbv3";
+       version = "0.2.1.1";
+       sha256 = "0bxa0mi4vs8kdq4vlba380jz9bkzckp55v24adqzs9s27laaw9s8";
        libraryHaskellDepends = [
          attoparsec base bytestring containers directory errors filepath
        ];
@@ -200514,6 +197889,7 @@ self: {
        ];
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework" = callPackage
@@ -200694,6 +198070,7 @@ self: {
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-th" = callPackage
@@ -200742,6 +198119,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-karya" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, data-ordlist
+     , deepseq, Diff, directory, filepath, ghc-prim, haskell-src
+     , pcre-heavy, pcre-light, pretty, process, QuickCheck, text, unix
+     }:
+     mkDerivation {
+       pname = "test-karya";
+       version = "0.0.1";
+       sha256 = "0sq0v3bv0civ46ls5xqmbwp8h8g6ppzj4bzxv64rifzgwblqayb4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers data-ordlist deepseq Diff
+         directory filepath ghc-prim haskell-src pcre-heavy pcre-light
+         pretty process QuickCheck text unix
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory filepath pcre-heavy pcre-light
+         text
+       ];
+       description = "Testing framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "test-pkg" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -200887,6 +198288,7 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testPkg" = callPackage
@@ -200926,22 +198328,6 @@ self: {
      }) {};
 
   "testing-feat" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, tagshare, template-haskell
-     }:
-     mkDerivation {
-       pname = "testing-feat";
-       version = "0.4.0.3";
-       sha256 = "1kh7ak9qlxsr34hxccfgyz1ga90xxiaxqndk3jaln1f495w9rjil";
-       revision = "1";
-       editedCabalFile = "05j5i1sfg1k94prhwmg6z50w0flb9k181nhabwr3m9gkrrqzb4b4";
-       libraryHaskellDepends = [
-         base mtl QuickCheck tagshare template-haskell
-       ];
-       description = "Functional Enumeration of Algebraic Types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "testing-feat_1_1_0_0" = callPackage
     ({ mkDerivation, base, QuickCheck, size-based
      , testing-type-modifiers
      }:
@@ -200954,7 +198340,6 @@ self: {
        ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-type-modifiers" = callPackage
@@ -201091,28 +198476,6 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.10.1.2";
-       sha256 = "08fqlnl7r2izsl3rasa27ybnnijmn8ypvi0lbzsb3vs8rsq318px";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       description = "Conversion between formats used to represent mathematics";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "texmath_0_11_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
        version = "0.11.0.1";
        sha256 = "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf";
        isLibrary = true;
@@ -201126,7 +198489,6 @@ self: {
        ];
        description = "Conversion between formats used to represent mathematics";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -201150,7 +198512,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text" = callPackage
+  "text_1_2_3_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
      , quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -201171,6 +198533,7 @@ self: {
        doCheck = false;
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-all" = callPackage
@@ -201185,6 +198548,7 @@ self: {
        ];
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-and-plots" = callPackage
@@ -201222,8 +198586,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.5.1";
-       sha256 = "1x5dacn3zkc3v72kspdicmp0c1cr8yq83xp115lfj7aq5riw6z1r";
+       version = "0.5.1.1";
+       sha256 = "02h27jb5m5yz5ai1q7x5w41vh8imnkhd2fp7l65mwxp96khsa7ql";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups text
        ];
@@ -201306,6 +198670,7 @@ self: {
        ];
        description = "Text formatting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-format-heavy" = callPackage
@@ -201321,6 +198686,7 @@ self: {
        ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-format-simple" = callPackage
@@ -201417,7 +198783,6 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -201521,6 +198886,7 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-manipulate" = callPackage
@@ -201562,8 +198928,8 @@ self: {
        pname = "text-metrics";
        version = "0.3.0";
        sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q";
-       revision = "2";
-       editedCabalFile = "1371qwwmq8w4p6zg0z43qnrpf9yb8yadnw97ka56mx4jlagrdm8n";
+       revision = "3";
+       editedCabalFile = "0wgkpc8zsfgc8rwbzylpf7r2nnrwhw6rani2chzc9r7lfygpqmn1";
        libraryHaskellDepends = [ base containers text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
@@ -201602,6 +198968,7 @@ self: {
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-position" = callPackage
@@ -201625,8 +198992,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-postgresql";
-       version = "0.0.3.0";
-       sha256 = "0db08ri1zixxm8vhcnijv2wpmcyv3bali30a1fx4vmb8d6c1fh35";
+       version = "0.0.3.1";
+       sha256 = "1s42a1mq7hz63zfpcv7bl4141vnyrsyd0ir723iph6vmsa46iqn6";
        libraryHaskellDepends = [
          base dlist transformers transformers-compat
        ];
@@ -201723,6 +199090,7 @@ self: {
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-short" = callPackage
@@ -201746,45 +199114,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
-     , bytestring, bytestring-builder, containers, contravariant
-     , criterion, deepseq, deriving-compat, generic-deriving
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, integer-gmp, nats
-     , QuickCheck, quickcheck-instances, semigroups, tagged
-     , template-haskell, text, th-abstraction, th-lift, transformers
-     , transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.7.2";
-       sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s";
-       revision = "2";
-       editedCabalFile = "0fjysjlmvvzvndxsni2ja92kr1pyqgl4dyc5c7x2ffaf02g9h2d2";
-       libraryHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text
-         th-abstraction th-lift transformers transformers-compat void
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans bifunctors bytestring
-         bytestring-builder containers contravariant deriving-compat
-         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
-         QuickCheck quickcheck-instances semigroups tagged template-haskell
-         text th-lift transformers transformers-compat void
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant criterion deepseq generic-deriving
-         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
-         template-haskell text th-lift transformers transformers-compat void
-       ];
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_7_3" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers
      , contravariant, criterion, deepseq, deriving-compat
@@ -201795,8 +199124,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.7.3";
-       sha256 = "1d8wmdndl8qsz90fb67xxbrprlmmp47p4f3ik6psp5m6r0cdvpzg";
+       version = "3.7.4";
+       sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers contravariant generic-deriving
@@ -201805,88 +199134,44 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [
-         array base base-compat-batteries base-orphans bifunctors bytestring
-         bytestring-builder containers contravariant deriving-compat
-         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
-         QuickCheck quickcheck-instances semigroups tagged template-haskell
-         text th-lift transformers transformers-compat void
+         array base base-compat-batteries base-orphans bytestring
+         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
+         nats QuickCheck quickcheck-instances semigroups tagged
+         template-haskell text transformers transformers-compat
        ];
        testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         array base base-compat-batteries bifunctors bytestring
-         bytestring-builder containers contravariant criterion deepseq
-         generic-deriving ghc-boot-th ghc-prim integer-gmp nats semigroups
-         tagged template-haskell text th-lift transformers
-         transformers-compat void
-       ];
+       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+    ({ mkDerivation, base, base-compat-batteries, bifunctors, binary
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale
-     , old-time, pretty, process, QuickCheck, quickcheck-instances
-     , random, semigroups, tagged, template-haskell, terminfo, text
-     , text-show, th-orphans, time, transformers, transformers-compat
-     , unix, unordered-containers, vector, xhtml
+     , old-time, pretty, QuickCheck, quickcheck-instances, random
+     , semigroups, tagged, template-haskell, terminfo, text, text-show
+     , th-orphans, time, transformers, transformers-compat, unix
+     , unordered-containers, vector, xhtml
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.6.3";
-       sha256 = "14b5bz0xxihi44nd80c8ma81khn7yjcpl8xvavsdfqy4jz9sb9fr";
+       version = "3.6.5";
+       sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
        libraryHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
-         random semigroups tagged template-haskell terminfo text text-show
-         time transformers transformers-compat unix unordered-containers
-         vector xhtml
+         base base-compat-batteries bifunctors binary containers directory
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
+         semigroups tagged template-haskell terminfo text text-show time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
        ];
        testHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
+         base base-compat-batteries bifunctors binary containers directory
          generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
-         old-locale old-time pretty process QuickCheck quickcheck-instances
-         random semigroups tagged template-haskell terminfo text text-show
-         th-orphans time transformers transformers-compat unix
-         unordered-containers vector xhtml
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show-instances_3_6_4" = callPackage
-    ({ mkDerivation, base, base-compat-batteries, bifunctors, binary
-     , bytestring, containers, directory, generic-deriving, ghc-boot-th
-     , ghc-prim, haskeline, hoopl, hpc, hspec, hspec-discover
-     , old-locale, old-time, pretty, process, QuickCheck
-     , quickcheck-instances, random, semigroups, tagged
-     , template-haskell, terminfo, text, text-show, th-orphans, time
-     , transformers, transformers-compat, unix, unordered-containers
-     , vector, xhtml
-     }:
-     mkDerivation {
-       pname = "text-show-instances";
-       version = "3.6.4";
-       sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf";
-       revision = "1";
-       editedCabalFile = "0fb704bm4n99vv7cblzsg9l8i6gy2ybppp2xagh4mcrwn5g776l8";
-       libraryHaskellDepends = [
-         base base-compat-batteries bifunctors binary bytestring containers
-         directory ghc-boot-th haskeline hoopl hpc old-locale old-time
-         pretty process random semigroups tagged template-haskell terminfo
-         text text-show time transformers transformers-compat unix
-         unordered-containers vector xhtml
-       ];
-       testHaskellDepends = [
-         base base-compat-batteries bifunctors binary bytestring containers
-         directory generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc
-         hspec old-locale old-time pretty process QuickCheck
-         quickcheck-instances random semigroups tagged template-haskell
-         terminfo text text-show th-orphans time transformers
-         transformers-compat unix unordered-containers vector xhtml
+         old-locale old-time pretty QuickCheck quickcheck-instances random
+         tagged template-haskell terminfo text-show th-orphans time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
        ];
        testToolDepends = [ hspec-discover ];
        description = "Additional instances for text-show";
@@ -202041,6 +199326,8 @@ self: {
        pname = "text1";
        version = "0.0.6";
        sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2";
+       revision = "1";
+       editedCabalFile = "0qlgv9aabmj7lky55ah8qq7x2w0w6j3m1kykq8iy2d3ymss2jasw";
        libraryHaskellDepends = [ base binary lens semigroups text ];
        testHaskellDepends = [
          base HUnit lens QuickCheck semigroups text
@@ -202210,10 +199497,10 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.2.6.0";
-       sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5";
+       version = "0.2.8.0";
+       sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya";
        revision = "1";
-       editedCabalFile = "0k4s4nbg9jlgaza38842jnzs8s01ig85fzmjgd10k9hl02gc3r44";
+       editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -202318,28 +199605,6 @@ self: {
      }:
      mkDerivation {
        pname = "th-desugar";
-       version = "1.7";
-       sha256 = "1iqlqadax1ahgv9h1vdyddf55v2h4ghqrxfyqirrvk97iyk1rcsj";
-       revision = "1";
-       editedCabalFile = "06cxv8yx2dwppzzb9vjqiic2hiaiiqakg0kv0byp9k00sidabbm3";
-       libraryHaskellDepends = [
-         base containers mtl syb template-haskell th-expand-syns th-lift
-         th-orphans
-       ];
-       testHaskellDepends = [
-         base containers hspec HUnit mtl syb template-haskell th-expand-syns
-         th-lift th-orphans
-       ];
-       description = "Functions to desugar Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-desugar_1_8" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
-     , template-haskell, th-expand-syns, th-lift, th-orphans
-     }:
-     mkDerivation {
-       pname = "th-desugar";
        version = "1.8";
        sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv";
        revision = "1";
@@ -202354,7 +199619,6 @@ self: {
        ];
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-dict-discovery" = callPackage
@@ -202418,6 +199682,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-inline-io-action" = callPackage
@@ -202558,10 +199823,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-orphans";
-       version = "0.13.5";
-       sha256 = "1b9599vyn0wjwbq7b7n0w25s3wbihdxr958hscfpwc8lg55lsr4m";
-       revision = "1";
-       editedCabalFile = "1rgsrnh0qvlriz0c2c3q8wbb3ykby8d3lli0j553ml3n1sn9k4zv";
+       version = "0.13.6";
+       sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp";
        libraryHaskellDepends = [
          base mtl template-haskell th-lift th-lift-instances th-reify-many
        ];
@@ -202663,6 +199926,7 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-traced" = callPackage
@@ -202874,8 +200138,8 @@ self: {
        pname = "these";
        version = "0.7.4";
        sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
-       revision = "6";
-       editedCabalFile = "16dglq7aj28ag4h11m4ym8lm3jjq5kx3y0bycbhqm4q9xpnwfvfb";
+       revision = "8";
+       editedCabalFile = "0j3ps7ngrzgxvkbr5gf8zkfkd1ci4dnfh425ndbr2xp9ipy00nkd";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -202890,6 +200154,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "these-skinny" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "these-skinny";
+       version = "0.7.4";
+       sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
+       libraryHaskellDepends = [ base deepseq ];
+       description = "A fork of the 'these' package without the dependency bloat";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "thespian" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -202981,8 +200256,8 @@ self: {
     ({ mkDerivation, atomic-primops, base, containers, criterion }:
      mkDerivation {
        pname = "thread-local-storage";
-       version = "0.1.2";
-       sha256 = "0nfl0i9g0d2z199a824ja6vb2h9nqswizv0hn266j0mpid1p3hl5";
+       version = "0.2";
+       sha256 = "152j8r7rfixkjrh1ynv2s0586bl65cpy47frhsikd40q64bf0j6n";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ atomic-primops base ];
        benchmarkHaskellDepends = [ atomic-primops base criterion ];
@@ -203084,8 +200359,8 @@ self: {
      }:
      mkDerivation {
        pname = "threadscope";
-       version = "0.2.10";
-       sha256 = "1wmj5a7kfyj8msi9gfvd48rr4vpl4ggd251yrj09ly5la98zs8pv";
+       version = "0.2.11";
+       sha256 = "07v9szpjx4hd01rk1wq5a3bcpkxnm317f6xj3mi2klxrdwrhdyav";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -203096,7 +200371,6 @@ self: {
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -203131,27 +200405,28 @@ self: {
        ];
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, file-embed, filepath, hashable
-     , network-uri, safe, snap-core, snap-server, stm, template-haskell
-     , text, transformers, unordered-containers, vault, vector
-     , websockets, websockets-snap
+     , safe, snap-core, snap-server, stm, template-haskell, text
+     , transformers, unordered-containers, vault, vector, websockets
+     , websockets-snap
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.8.2.3";
-       sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb";
+       version = "0.8.2.4";
+       sha256 = "0fy8mwg4h78c7h1k6igc9i8k5r7avj59jkljbg47wlr0x8fs06yb";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
-         exceptions file-embed filepath hashable network-uri safe snap-core
-         snap-server stm template-haskell text transformers
-         unordered-containers vault vector websockets websockets-snap
+         exceptions file-embed filepath hashable safe snap-core snap-server
+         stm template-haskell text transformers unordered-containers vault
+         vector websockets websockets-snap
        ];
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
@@ -203184,6 +200459,7 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thrift" = callPackage
@@ -203218,6 +200494,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-threaded list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "throttle" = callPackage
@@ -203289,7 +200566,6 @@ self: {
        ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thumbnail" = callPackage
@@ -203411,7 +200687,6 @@ self: {
        ];
        description = "Parse and display tibetan numerals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -203480,8 +200755,8 @@ self: {
 
   "tidal" = callPackage
     ({ mkDerivation, base, colour, containers, hashable, hosc
-     , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty
-     , tasty-hunit, text, time, websockets
+     , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit
+     , text, time, websockets
      }:
      mkDerivation {
        pname = "tidal";
@@ -203489,7 +200764,7 @@ self: {
        sha256 = "1zpbnn1kw2ybmlg6g9yj39jhfp6sl12335rxqns0nfi8l2jjgbgr";
        libraryHaskellDepends = [
          base colour containers hashable hosc mersenne-random-pure64 mtl
-         parsec safe semigroups text time websockets
+         parsec safe text time websockets
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Pattern language for improvised music";
@@ -203876,12 +201151,11 @@ self: {
     ({ mkDerivation, base, intervals, time }:
      mkDerivation {
        pname = "time-patterns";
-       version = "0.1.4.2";
-       sha256 = "1xh50plr6dk21cpc3mqcq00xakhm7zvnsgwbi0hyk1prgr408asl";
+       version = "0.1.4.3";
+       sha256 = "0qyg2y41c0bn296zyxfhjjjm0bxn4vmns242vl90j0b0siz69qr0";
        libraryHaskellDepends = [ base intervals time ];
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-qq" = callPackage
@@ -204202,6 +201476,7 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeparsers" = callPackage
@@ -204268,7 +201543,6 @@ self: {
        ];
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -204296,7 +201570,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "tick based timers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers-updatable" = callPackage
@@ -204339,6 +201612,7 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Useful timespan datatype and functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timestamp" = callPackage
@@ -204460,19 +201734,19 @@ self: {
      }) {};
 
   "tintin" = callPackage
-    ({ mkDerivation, base, clay, data-has, directory, frontmatter
-     , inliterate, lucid, optparse-generic, process, require, temporary
-     , text, universum, yaml
+    ({ mkDerivation, base, clay, containers, data-has, directory
+     , frontmatter, inliterate, lucid, optparse-generic, process
+     , require, temporary, text, universum, yaml
      }:
      mkDerivation {
        pname = "tintin";
-       version = "1.8.0";
-       sha256 = "1i5hdyxrrflxbw59i55p7bxfn75m2j6dmn7h43f9qwcgn6fv3l3y";
+       version = "1.9.1";
+       sha256 = "0i44m49v9vxcasiacrrk6ypqan3j2qw4r9g2m99brmji9kwma2kb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base clay data-has directory frontmatter inliterate lucid process
-         require temporary text universum yaml
+         base clay containers data-has directory frontmatter inliterate
+         lucid process require temporary text universum yaml
        ];
        executableHaskellDepends = [
          base optparse-generic require universum
@@ -204480,7 +201754,6 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -204492,6 +201765,7 @@ self: {
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tinyMesh" = callPackage
@@ -204573,6 +201847,7 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tip-haskell-frontend" = callPackage
@@ -205200,17 +202475,18 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Parser for the TOML configuration language";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tomland" = callPackage
-    ({ mkDerivation, base, hashable, hedgehog, megaparsec, mtl
-     , parser-combinators, tasty, tasty-hedgehog, tasty-hspec, text
-     , time, unordered-containers
+    ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
+     , megaparsec, mtl, parser-combinators, tasty, tasty-discover
+     , tasty-hedgehog, tasty-hspec, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "tomland";
-       version = "0.2.1";
-       sha256 = "09d0i1sys7nljbcky53qz4w2ibjyhcysa8ik0drb1pcyqyzppj8x";
+       version = "0.3";
+       sha256 = "0crwapvykd26b50bmh22vxpcv44f1jv88r0ifvr3hjmvv0v43lwh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205219,9 +202495,10 @@ self: {
        ];
        executableHaskellDepends = [ base text time unordered-containers ];
        testHaskellDepends = [
-         base hedgehog tasty tasty-hedgehog tasty-hspec text
-         unordered-containers
+         base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog
+         tasty-hspec text time unordered-containers
        ];
+       testToolDepends = [ tasty-discover ];
        description = "TOML parser";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -205384,6 +202661,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Finitely represented /total/ maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "total-maps" = callPackage
@@ -205592,21 +202870,21 @@ self: {
 
   "tpdb" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
-     , filepath, hashable, HaXml, hxt, mtl, parsec, pretty
+     , exceptions, filepath, hashable, mtl, parsec, pretty
      , prettyprinter, text, time, xml-conduit, xml-hamlet
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "1.5.2";
-       sha256 = "08cckg0n6pbj067advjppgybbwbl256igk4lirwmiav6hf1m723k";
+       version = "2.1.0";
+       sha256 = "155vpz1l2qdxnyp87qmkyphdrab7jryqjdlvddb55ii7cdjdm6d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers data-default filepath hashable HaXml hxt
-         mtl parsec prettyprinter text time xml-conduit xml-hamlet
+         base bytestring containers data-default exceptions filepath
+         hashable mtl parsec prettyprinter text time xml-conduit xml-hamlet
        ];
        executableHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring HaXml pretty ];
+       testHaskellDepends = [ base pretty text ];
        description = "Data Type for Rewriting Systems";
        license = "GPL";
      }) {};
@@ -205691,7 +202969,6 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracker" = callPackage
@@ -205712,8 +202989,8 @@ self: {
      }:
      mkDerivation {
        pname = "trackit";
-       version = "0.3";
-       sha256 = "0n4ypg2g82ajnmvv94sgympvbwji0bkw5kmd4zfzrvzrdxq91yvh";
+       version = "0.4";
+       sha256 = "0dzcmb10imksryr6lpmnq8b7bzqkm9y1dkyx52k1ic5yms3rwxyx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -205722,6 +202999,7 @@ self: {
        ];
        description = "A command-line tool for live monitoring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracy" = callPackage
@@ -205795,7 +203073,6 @@ self: {
        ];
        description = "Monadic representation of transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transactional-events" = callPackage
@@ -205924,21 +203201,6 @@ self: {
      }) {};
 
   "transformers-base" = callPackage
-    ({ mkDerivation, base, stm, transformers, transformers-compat }:
-     mkDerivation {
-       pname = "transformers-base";
-       version = "0.4.4";
-       sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
-       revision = "1";
-       editedCabalFile = "196pr3a4lhgklyw6nq6rv1j9djwzmvx7xrpp58carxnb55gk06pv";
-       libraryHaskellDepends = [
-         base stm transformers transformers-compat
-       ];
-       description = "Lift computations from the bottom of a transformer stack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "transformers-base_0_4_5_2" = callPackage
     ({ mkDerivation, base, base-orphans, stm, transformers
      , transformers-compat
      }:
@@ -205951,7 +203213,6 @@ self: {
        ];
        description = "Lift computations from the bottom of a transformer stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-bifunctors" = callPackage
@@ -205969,23 +203230,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "transformers-compat";
-       version = "0.5.1.4";
-       sha256 = "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq";
-       libraryHaskellDepends = [ base ghc-prim transformers ];
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "transformers-compat_0_6_2" = callPackage
-    ({ mkDerivation, base, ghc-prim, transformers }:
-     mkDerivation {
-       pname = "transformers-compat";
        version = "0.6.2";
        sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "A small compatibility shim for the transformers library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-compose" = callPackage
@@ -206051,19 +203300,6 @@ self: {
      }) {effect-interpreters = null;};
 
   "transformers-either" = callPackage
-    ({ mkDerivation, base, text, transformers }:
-     mkDerivation {
-       pname = "transformers-either";
-       version = "0.0.2";
-       sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a";
-       revision = "1";
-       editedCabalFile = "134big9w9307vjmj6p6m3wgmh4lrvv8dyg0iw2nm54p9kg0c6ga8";
-       libraryHaskellDepends = [ base text transformers ];
-       description = "An Either monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "transformers-either_0_1_1" = callPackage
     ({ mkDerivation, base, exceptions, text, transformers }:
      mkDerivation {
        pname = "transformers-either";
@@ -206072,7 +203308,6 @@ self: {
        libraryHaskellDepends = [ base exceptions text transformers ];
        description = "An Either monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-fix" = callPackage
@@ -206145,26 +203380,6 @@ self: {
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.9.2";
-       sha256 = "0ij3ycc1zln9vnjp66d5mxsgwpzmfswbz018ci6w8m885zdf9dr2";
-       libraryHaskellDepends = [
-         atomic-primops base bytestring containers directory mtl random stm
-         time transformers
-       ];
-       testHaskellDepends = [
-         atomic-primops base bytestring containers directory mtl random stm
-         time transformers
-       ];
-       description = "composing programs with multithreading, events and distributed computing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "transient_0_6_0_1" = callPackage
-    ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , directory, mtl, random, stm, time, transformers
-     }:
-     mkDerivation {
-       pname = "transient";
        version = "0.6.0.1";
        sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy";
        libraryHaskellDepends = [
@@ -206188,38 +203403,6 @@ self: {
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.4.6.1";
-       sha256 = "1bsx6a0bkys99xwrz78nnd1f8y2ixzcbng0smh1kb6xrac8b1jin";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers directory filepath
-         hashable HTTP iproute mtl network network-info network-uri process
-         random stm TCache text time transformers transient vector
-         websockets
-       ];
-       executableHaskellDepends = [
-         base bytestring case-insensitive containers directory filepath
-         hashable HTTP mtl network network-info network-uri process random
-         stm TCache text time transformers transient vector websockets
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive containers directory filepath
-         hashable HTTP mtl network network-info network-uri process random
-         stm TCache text time transformers transient vector websockets
-       ];
-       description = "Remote execution and map-reduce: distributed computing for Transient";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "transient-universe_0_5_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , directory, filepath, hashable, HTTP, iproute, mtl, network
-     , network-info, network-uri, process, random, stm, TCache, text
-     , time, transformers, transient, vector, websockets
-     }:
-     mkDerivation {
-       pname = "transient-universe";
        version = "0.5.0.0";
        sha256 = "1d3bp4xjpi28ph7fa9wm49ssg53jfvlq77ka0zvrkilw1j6f8v3l";
        isLibrary = true;
@@ -206326,7 +203509,6 @@ self: {
        ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trasa-client" = callPackage
@@ -206348,7 +203530,6 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -206509,8 +203690,8 @@ self: {
        pname = "tree-diff";
        version = "0.0.1";
        sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
-       revision = "3";
-       editedCabalFile = "04ajimrbywfnnnlx9axz3hmbi33c4g62hrmv52plgifjiw6c4y2y";
+       revision = "4";
+       editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp";
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
          containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -206523,7 +203704,6 @@ self: {
        ];
        description = "Diffing of (expression) trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tree-fun" = callPackage
@@ -206764,10 +203944,8 @@ self: {
      }:
      mkDerivation {
        pname = "trifecta";
-       version = "1.7.1.1";
-       sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
-       revision = "4";
-       editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z";
+       version = "2";
+       sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -206934,6 +204112,7 @@ self: {
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "truthful" = callPackage
@@ -207363,14 +204542,15 @@ self: {
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-sop" = callPackage
     ({ mkDerivation, base, generics-sop }:
      mkDerivation {
        pname = "tuple-sop";
-       version = "0.3.0.0";
-       sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15";
+       version = "0.3.1.0";
+       sha256 = "0hv0fcz5sw93v1niq2r656wpkiwkg6larld7x9cwk4s98h7qvqgn";
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
        description = "functions on n-ary tuples using generics-sop";
@@ -207462,6 +204642,7 @@ self: {
        ];
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -207512,8 +204693,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.5.8";
-       sha256 = "0vp442byylqki6pabhg8bs27msqsdcwcnql40z003jx1hidccnq4";
+       version = "1.5.10";
+       sha256 = "0c2bfwfj1pf3s4kjr4k9g36166pj9wfpp2rrs5blzh77hjmak4rs";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -207540,6 +204721,7 @@ self: {
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tw" = callPackage
@@ -207602,20 +204784,20 @@ self: {
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition-prelude, containers, criterion
      , data-default, directory, extra, hspec, htoml-megaparsec
-     , http-client, http-client-tls, http-types, lens, megaparsec
+     , http-client, http-client-tls, http-types, megaparsec, microlens
      , optparse-applicative, split, text, unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.40";
-       sha256 = "0zbhnx2hl6cgfdzgd3iwmlzkf4kgdz87m0ghmq2irdblfiz5kspr";
+       version = "1.0.1.41";
+       sha256 = "1ybrsnppy7lnj5z2f8m38cd6ix89j6dlvgc2icl7lj3w14g6cfxm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring
          composition-prelude containers data-default extra htoml-megaparsec
-         http-client http-client-tls http-types lens megaparsec split text
-         unordered-containers
+         http-client http-client-tls http-types megaparsec microlens split
+         text unordered-containers
        ];
        executableHaskellDepends = [
          base bytestring directory optparse-applicative
@@ -207881,7 +205063,6 @@ self: {
        doCheck = false;
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twill" = callPackage
@@ -207918,7 +205099,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "TwiML library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twine" = callPackage
@@ -207971,6 +205151,7 @@ self: {
        ];
        description = "A high level file watcher DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter" = callPackage
@@ -208002,8 +205183,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.2.3";
-       sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9";
+       version = "0.3.0";
+       sha256 = "1p3cas4yy8k0knf5mljmjjzzknwhcaw1x08z7q4jlc9y06323by1";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
@@ -208022,7 +205203,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -208087,7 +205267,6 @@ self: {
        ];
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -208105,7 +205284,6 @@ self: {
        ];
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -208247,6 +205425,7 @@ self: {
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-booleans" = callPackage
@@ -208302,6 +205481,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-combinators-quote" = callPackage
@@ -208329,6 +205509,7 @@ self: {
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-digits" = callPackage
@@ -208579,6 +205760,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-tf" = callPackage
@@ -208618,6 +205800,7 @@ self: {
        ];
        description = "Type-indexed maps";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-natural" = callPackage
@@ -208645,27 +205828,6 @@ self: {
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.3.4.0";
-       sha256 = "11drppw8xl3wzjj5qks8mqrbl83yrj7c4r01s06v38bc319g8ksf";
-       libraryHaskellDepends = [
-         base bytestring double-conversion ghc-prim text
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion deepseq ghc ghc-paths random
-         temporary text weigh
-       ];
-       description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-of-html_1_4_0_1" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
-     , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck
-     , random, temporary, text, weigh
-     }:
-     mkDerivation {
-       pname = "type-of-html";
        version = "1.4.0.1";
        sha256 = "1bcjpkrqa7pmgb7a48q2q8rkx15yz40d91mn7jhj91hzc1h2z6g3";
        libraryHaskellDepends = [
@@ -208678,7 +205840,6 @@ self: {
        ];
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html-static" = callPackage
@@ -208853,7 +206014,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tree representations of datatypes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-unary" = callPackage
@@ -208926,8 +206086,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-spreadsheet";
-       version = "1.1.2";
-       sha256 = "10bbgyj6spc3c11fwgcrgk8yba97ijzkz82pabpf64r3xzr3pv2y";
+       version = "1.1.3";
+       sha256 = "1y59kd92f5v116y26dlznvqi5kcb6y89rliwcs8ay9sk76606fa6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -209022,8 +206182,8 @@ self: {
      }:
      mkDerivation {
        pname = "typedquery";
-       version = "0.1.0.3";
-       sha256 = "0d90zzd1xk8llviknm21ck45gkaawyg7qj4mnf3f5csw66x2isbk";
+       version = "0.1.1.1";
+       sha256 = "1p6hlx2hsp7sjhspw3c95b1px6r2hylr31f4hcjq505z3i33gm7m";
        libraryHaskellDepends = [
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers
@@ -209059,7 +206219,6 @@ self: {
        ];
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typelevel-tensor" = callPackage
@@ -209095,6 +206254,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typenums" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "typenums";
+       version = "0.1.1.1";
+       sha256 = "0zkm10hwdwh4msl60nzm81d409xlch03rb5vv38zhkd3hzqs104v";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "Type level numbers using existing Nat functionality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "typeof" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -209125,6 +206296,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "typerep-map" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq
+     , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat
+     , hedgehog, primitive, tasty, tasty-discover, tasty-hedgehog
+     , tasty-hspec, vector
+     }:
+     mkDerivation {
+       pname = "typerep-map";
+       version = "0.1.0";
+       sha256 = "1wswnbivzlkdvc3ylizh34a58m087azwss0524zbhqc5p9n8kmr8";
+       libraryHaskellDepends = [
+         base containers ghc-prim primitive vector
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat hedgehog tasty tasty-discover
+         tasty-hedgehog tasty-hspec
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq dependent-map dependent-sum
+         ghc-typelits-knownnat
+       ];
+       doHaddock = false;
+       description = "Efficient implementation of a dependent map with types as keys";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "types-compat" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -209331,8 +206528,8 @@ self: {
      }:
      mkDerivation {
        pname = "ua-parser";
-       version = "0.7.4.1";
-       sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf";
+       version = "0.7.5.0";
+       sha256 = "08nbzzhndxba039rl5s4ap5ndnfj774546xzvqf9ph8r05dmr690";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
@@ -209463,6 +206660,7 @@ self: {
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libudev;};
 
   "udp-conduit" = callPackage
@@ -209588,7 +206786,6 @@ self: {
        ];
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ui-command" = callPackage
@@ -209874,23 +207071,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "unexceptionalio";
-       version = "0.3.0";
-       sha256 = "1f7h7zwky4scdcyjspg4ksfh7x6yra0wjybxq70p7vcwpgk2nzlj";
-       libraryHaskellDepends = [ base ];
-       description = "IO without any non-error, synchronous exceptions";
-       license = "unknown";
-     }) {};
-
-  "unexceptionalio_0_4_0" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "unexceptionalio";
        version = "0.4.0";
        sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p";
        libraryHaskellDepends = [ base ];
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unexceptionalio-trans" = callPackage
@@ -210189,6 +207374,7 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unidecode" = callPackage
@@ -210254,8 +207440,8 @@ self: {
        pname = "union";
        version = "0.1.1.2";
        sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
-       revision = "3";
-       editedCabalFile = "1llczfg153qqrkp2biqaa9qqyzy6li5cnxbyp5p24d7f2dr0d5fc";
+       revision = "4";
+       editedCabalFile = "1pxx0bkvzglik34xkwza6zqcs98r2sqn5932xmcaah189qlsjq47";
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
@@ -210389,6 +207575,7 @@ self: {
        ];
        description = "Solve simple simultaneous equations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uniqueid" = callPackage
@@ -210417,6 +207604,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unit" = callPackage
@@ -210462,6 +207650,7 @@ self: {
        ];
        description = "A domain-specific type system for dimensional analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "units-attoparsec" = callPackage
@@ -210489,6 +207678,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell units ];
        description = "Definitions for use with the units package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "units-parser" = callPackage
@@ -210506,6 +207696,7 @@ self: {
        ];
        description = "A parser for units of measure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unittyped" = callPackage
@@ -210541,6 +207732,7 @@ self: {
          text
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unitym" = callPackage
@@ -210710,33 +207902,6 @@ self: {
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
-     , text, text-format, transformers, type-operators
-     , unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.1.1";
-       sha256 = "0l49k17f73hkywccvnir79iwlj7j7bb3p89j5kf5hdnk25biw2hq";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text text-format transformers
-         type-operators unordered-containers utf8-string vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge unordered-containers
-       ];
-       description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "universum_1_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
-     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
-     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
      , text, transformers, type-operators, unordered-containers
      , utf8-string, vector
      }:
@@ -210758,7 +207923,6 @@ self: {
        ];
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -210909,6 +208073,8 @@ self: {
        pname = "unjson";
        version = "0.15.2.0";
        sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj";
+       revision = "1";
+       editedCabalFile = "1kv5ybjgpqxq7xy8x1rgr8ia7kaffgih0z7jx74ixdijkqk69447";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific semigroups text time
@@ -211012,6 +208178,7 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unmed2" = callPackage
@@ -211091,8 +208258,8 @@ self: {
      }:
      mkDerivation {
        pname = "unordered-intmap";
-       version = "0.1.0.0";
-       sha256 = "0b4azafy32jwq3s9dy52l9lqkpy7hj4jqin3mj1hnh1qrlnm9jwr";
+       version = "0.1.1";
+       sha256 = "1vvn510v4gy70lk2bkx45bh7hk0kfdn62j3rp913j57d4c6azynq";
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [
          base containers deepseq primitive QuickCheck tasty tasty-quickcheck
@@ -211144,7 +208311,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -211157,7 +208323,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-these" = callPackage
@@ -211337,18 +208502,18 @@ self: {
 
   "uom-plugin" = callPackage
     ({ mkDerivation, base, containers, deepseq, ghc
-     , ghc-tcplugins-extra, tasty, tasty-hunit, template-haskell
+     , ghc-tcplugins-extra, hlint, tasty, tasty-hunit, template-haskell
      , units-parser
      }:
      mkDerivation {
        pname = "uom-plugin";
-       version = "0.2.0.1";
-       sha256 = "109fxbc9gwwc0p4a1p46jhc71j5cv5kc3hm9jh9h3i8p0bhd5yiy";
+       version = "0.3.0.0";
+       sha256 = "16a6l88z49nl0nqn3l7mki8rr39hh3i4wsn1q31gwahn3kfkzgll";
        libraryHaskellDepends = [
          base containers deepseq ghc ghc-tcplugins-extra template-haskell
          units-parser
        ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
+       testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211785,30 +208950,10 @@ self: {
        testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
-     , monad-control, monad-control-aligned, monad-logger, mtl
-     , path-extra, resourcet, split, strict, text, transformers
-     , transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "urlpath";
-       version = "8.0.1";
-       sha256 = "04w5ivbvfbh60jsfdsmznvm5cxracslmr1hyqhf0qdva29vcxj4z";
-       libraryHaskellDepends = [
-         attoparsec-uri base exceptions mmorph monad-control
-         monad-control-aligned monad-logger mtl path-extra resourcet split
-         strict text transformers transformers-base vector
-       ];
-       description = "Painfully simple URL deployment";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "urlpath_9_0_0" = callPackage
-    ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl, path
      , path-extra, resourcet, split, strict, text, transformers
      , transformers-base, vector
@@ -211824,7 +208969,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -212158,6 +209302,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util" = callPackage
@@ -212169,7 +209314,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-exception" = callPackage
@@ -212220,6 +209364,7 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-cco-examples" = callPackage
@@ -212233,6 +209378,7 @@ self: {
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-cco-hut-parsing" = callPackage
@@ -212244,6 +209390,7 @@ self: {
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-cco-uu-parsinglib" = callPackage
@@ -212255,16 +209402,17 @@ self: {
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-interleaved" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "uu-interleaved";
-       version = "0.2.0.0";
-       sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i";
+       version = "0.2.0.1";
+       sha256 = "097jm0w9idjvc66wk463dlbvjvyjcv9ivfb97v91d5vpyk6p0ryy";
        libraryHaskellDepends = [ base ];
-       description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
+       description = "Providing an interleaving combinator for use with applicative style implementations";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -212324,6 +209472,7 @@ self: {
        executableHaskellDepends = [ base uuagc-cabal ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc-bootstrap" = callPackage
@@ -212346,6 +209495,7 @@ self: {
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc-cabal" = callPackage
@@ -212361,6 +209511,7 @@ self: {
        ];
        description = "Cabal plugin for UUAGC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc-diagrams" = callPackage
@@ -212519,6 +209670,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell Utrecht Tools Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uvector" = callPackage
@@ -212679,8 +209831,8 @@ self: {
      }:
      mkDerivation {
        pname = "vado";
-       version = "0.0.9";
-       sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s";
+       version = "0.0.10";
+       sha256 = "04rdjhc1ny2xwmwvbf70bwjgyv5kzl8s83m79qr3i04vicax14gd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212759,6 +209911,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validation" = callPackage
@@ -212775,6 +209928,7 @@ self: {
        testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validations" = callPackage
@@ -212806,38 +209960,26 @@ self: {
      }:
      mkDerivation {
        pname = "validationt";
-       version = "0.2.0.0";
-       sha256 = "0gsi7mk958fvdydir55y6zqab5vfm3k3j54vxqr5dr51zznmqriy";
+       version = "0.2.1.0";
+       sha256 = "0b91rn6fvdc9cypaljhm4q8gn4fivyszk00h47qvvs4by8rx5q58";
        libraryHaskellDepends = [
          aeson base containers exceptions lens monad-control mtl QuickCheck
          text transformers transformers-base transformers-lift vector
        ];
-       description = "Straightforward validation monad. Convenient solution for validating web forms and APIs.";
+       description = "Straightforward validation monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "validity" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "validity";
-       version = "0.4.0.4";
-       sha256 = "1iva60sfaqnkwdk5b2w6skvsg6096x24bjyd5h057n9dlbimiblx";
-       libraryHaskellDepends = [ base ];
-       description = "Validity typeclass";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity_0_6_0_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "validity";
-       version = "0.6.0.0";
-       sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q";
+       version = "0.7.0.0";
+       sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Validity typeclass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-aeson" = callPackage
@@ -212846,91 +209988,39 @@ self: {
      }:
      mkDerivation {
        pname = "validity-aeson";
-       version = "0.1.0.0";
-       sha256 = "1bzqy6c85r3nsqmmvb06fmll7m7qjzgwk6mq25ivs5vqmfhv6kig";
-       libraryHaskellDepends = [
-         aeson base validity validity-scientific validity-text
-         validity-unordered-containers validity-vector
-       ];
-       description = "Validity instances for aeson";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-aeson_0_2_0_1" = callPackage
-    ({ mkDerivation, aeson, base, validity, validity-scientific
-     , validity-text, validity-unordered-containers, validity-vector
-     }:
-     mkDerivation {
-       pname = "validity-aeson";
-       version = "0.2.0.1";
-       sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy";
+       version = "0.2.0.2";
+       sha256 = "010x1sprssj282gv85n63955fmn6ngz6h6qii3174vrxrwlkvh7s";
        libraryHaskellDepends = [
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
        ];
        description = "Validity instances for aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.2.0.0";
-       sha256 = "118g7as13kvfbwid1qy461vswzgl7bbdclapi6hr2majmwvrlgl7";
-       libraryHaskellDepends = [ base bytestring validity ];
-       description = "Validity instances for bytestring";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-bytestring_0_3_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, validity }:
-     mkDerivation {
-       pname = "validity-bytestring";
-       version = "0.3.0.1";
-       sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9";
+       version = "0.3.0.2";
+       sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2";
        libraryHaskellDepends = [ base bytestring validity ];
        description = "Validity instances for bytestring";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-containers" = callPackage
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.2.0.0";
-       sha256 = "02kzrz78ikp3hx5szvflixmyddh30iipbapfrc8ypp5k5qar3sgh";
-       libraryHaskellDepends = [ base containers validity ];
-       description = "Validity instances for containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-containers_0_3_0_1" = callPackage
-    ({ mkDerivation, base, containers, validity }:
-     mkDerivation {
-       pname = "validity-containers";
-       version = "0.3.0.1";
-       sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf";
+       version = "0.3.1.0";
+       sha256 = "1ci07x5k9hjpn23pbp4bc0zvml5xbpppsmcxr1qfcg0g4036q29r";
        libraryHaskellDepends = [ base containers validity ];
        description = "Validity instances for containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-path" = callPackage
-    ({ mkDerivation, base, filepath, path, validity }:
-     mkDerivation {
-       pname = "validity-path";
-       version = "0.2.0.2";
-       sha256 = "0c01nzd998fgxpkiddz6p91s84i10202md9pa1zmza0gik4rcv6y";
-       libraryHaskellDepends = [ base filepath path validity ];
-       description = "Validity instances for Path";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
      }:
@@ -212944,95 +210034,45 @@ self: {
        ];
        description = "Validity instances for Path";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-scientific" = callPackage
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
-       version = "0.1.0.0";
-       sha256 = "0pd5kjdb8nwj8rwvqa3wr377fmcs6wad7zmdv7r41bxzch1qf5zc";
-       libraryHaskellDepends = [ base scientific validity ];
-       description = "Validity instances for scientific";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-scientific_0_2_0_1" = callPackage
-    ({ mkDerivation, base, scientific, validity }:
-     mkDerivation {
-       pname = "validity-scientific";
        version = "0.2.0.1";
        sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
        libraryHaskellDepends = [ base scientific validity ];
        description = "Validity instances for scientific";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-text" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.2.0.1";
-       sha256 = "1r96nn0y7hgm49y79kf3n86960z7gbz2mw4wcnsi9qlccnjq5qk4";
-       libraryHaskellDepends = [ base bytestring text validity ];
-       description = "Validity instances for text";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-text_0_3_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, text, validity }:
-     mkDerivation {
-       pname = "validity-text";
        version = "0.3.0.1";
        sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
        libraryHaskellDepends = [ base bytestring text validity ];
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-time" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.1.0.0";
-       sha256 = "1mwyh92vfjq5s2p54vqfyawvvwqvpl2g4f6bqmnk149qqqgxv32z";
-       libraryHaskellDepends = [ base time validity ];
-       description = "Validity instances for time";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-time_0_2_0_1" = callPackage
-    ({ mkDerivation, base, time, validity }:
-     mkDerivation {
-       pname = "validity-time";
        version = "0.2.0.1";
        sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
        libraryHaskellDepends = [ base time validity ];
        description = "Validity instances for time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-unordered-containers" = callPackage
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
-       version = "0.1.0.0";
-       sha256 = "1cz5xk427rl8x2nm7xbsspcjnx6w6cib0f5qjs18m912qxyh1g9d";
-       libraryHaskellDepends = [
-         base hashable unordered-containers validity
-       ];
-       description = "Validity instances for unordered-containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-unordered-containers_0_2_0_1" = callPackage
-    ({ mkDerivation, base, hashable, unordered-containers, validity }:
-     mkDerivation {
-       pname = "validity-unordered-containers";
        version = "0.2.0.1";
        sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
        libraryHaskellDepends = [
@@ -213040,53 +210080,40 @@ self: {
        ];
        description = "Validity instances for unordered-containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-uuid" = callPackage
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
        pname = "validity-uuid";
-       version = "0.0.0.0";
-       sha256 = "12v1r92skk4acnd8s3kqj1la24anvs5w1h9cjxzgs2j0pqmzdrbf";
-       libraryHaskellDepends = [ base uuid validity ];
-       description = "Validity instances for uuid";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-uuid_0_1_0_1" = callPackage
-    ({ mkDerivation, base, uuid, validity }:
-     mkDerivation {
-       pname = "validity-uuid";
        version = "0.1.0.1";
        sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
        libraryHaskellDepends = [ base uuid validity ];
        description = "Validity instances for uuid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-vector" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
-       version = "0.1.0.0";
-       sha256 = "0z74m1arw92f96156zxgpbkv1x6fll22hysn2iwrk4i3642127h1";
+       version = "0.2.0.1";
+       sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
        libraryHaskellDepends = [ base hashable validity vector ];
        description = "Validity instances for vector";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-vector_0_2_0_1" = callPackage
-    ({ mkDerivation, base, hashable, validity, vector }:
+  "valor" = callPackage
+    ({ mkDerivation, base, hspec, text, transformers }:
      mkDerivation {
-       pname = "validity-vector";
-       version = "0.2.0.1";
-       sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
-       libraryHaskellDepends = [ base hashable validity vector ];
-       description = "Validity instances for vector";
+       pname = "valor";
+       version = "0.1.0.0";
+       sha256 = "1rmsss4zffyzf6vf1p2zj07a6a32pyrbdb259gflr5gg817m3kh4";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base hspec text transformers ];
+       description = "Simple general structured validation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "value-supply" = callPackage
@@ -213231,6 +210258,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion time transformers ];
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault" = callPackage
@@ -213262,6 +210290,7 @@ self: {
        ];
        description = "Client library for HashiCorp's Vault tool (via HTTP API)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault-tool-server" = callPackage
@@ -213350,6 +210379,7 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcatt" = callPackage
@@ -213462,6 +210492,7 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vec" = callPackage
@@ -213473,8 +210504,8 @@ self: {
        pname = "vec";
        version = "0.1";
        sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y";
-       revision = "1";
-       editedCabalFile = "0ffzb4jps0grlpbq99vx30cp4g7mad87mwcng3s1w6xqa96xr6xh";
+       revision = "2";
+       editedCabalFile = "00z6y4a5hi5pwnnakj00qs3kglaykf4i3kwd9iz8bi2kmm6b09lx";
        libraryHaskellDepends = [
          adjunctions base base-compat deepseq distributive fin hashable lens
          semigroupoids
@@ -213483,7 +210514,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion fin vector ];
        description = "Vec: length-indexed (sized) list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vect" = callPackage
@@ -213657,7 +210687,6 @@ self: {
        testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ];
        description = "Serial (from the bytes package) for Vector (from the vector package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-bytestring" = callPackage
@@ -213840,26 +210869,29 @@ self: {
      }) {};
 
   "vector-sized" = callPackage
-    ({ mkDerivation, base, deepseq, finite-typelits, vector }:
+    ({ mkDerivation, adjunctions, base, deepseq, distributive
+     , finite-typelits, indexed-list-literals, primitive, vector
+     }:
      mkDerivation {
        pname = "vector-sized";
-       version = "0.6.1.0";
-       sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd";
-       revision = "1";
-       editedCabalFile = "0lcm7gdzqnp5v0rfd9f611yspa493j4azdj3gzy71398z3zda5w4";
-       libraryHaskellDepends = [ base deepseq finite-typelits vector ];
+       version = "1.0.3.0";
+       sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx";
+       libraryHaskellDepends = [
+         adjunctions base deepseq distributive finite-typelits
+         indexed-list-literals primitive vector
+       ];
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_0_2_0" = callPackage
+  "vector-sized_1_0_3_1" = callPackage
     ({ mkDerivation, adjunctions, base, deepseq, distributive
      , finite-typelits, indexed-list-literals, primitive, vector
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.2.0";
-       sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69";
+       version = "1.0.3.1";
+       sha256 = "0dzf3cg7zfg4k5jiq7h6dw2ihczs42as9cxn8dkswx5v6nahnnxx";
        libraryHaskellDepends = [
          adjunctions base deepseq distributive finite-typelits
          indexed-list-literals primitive vector
@@ -213976,7 +211008,6 @@ self: {
        ];
        description = "Text implementation based on unboxed char vector";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-th-unbox" = callPackage
@@ -213993,37 +211024,6 @@ self: {
 
   "vectortiles" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , hashable, hex, microlens, microlens-platform, protocol-buffers
-     , protocol-buffers-descriptor, tasty, tasty-hunit, text
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "vectortiles";
-       version = "1.3.0";
-       sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0";
-       revision = "2";
-       editedCabalFile = "0c3xkk3xks9c4kn1l6d58v0qsg7q3pdjwdwgpwd93npcjl3isc19";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq hashable protocol-buffers
-         protocol-buffers-descriptor text transformers unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hashable hex protocol-buffers
-         protocol-buffers-descriptor tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion hashable microlens
-         microlens-platform protocol-buffers protocol-buffers-descriptor
-         text unordered-containers vector
-       ];
-       description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vectortiles_1_4_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , hashable, hex, microlens, microlens-platform, mtl
      , protocol-buffers, protocol-buffers-descriptor, tasty, tasty-hunit
      , text, transformers, unordered-containers, vector
@@ -214032,6 +211032,8 @@ self: {
        pname = "vectortiles";
        version = "1.4.0";
        sha256 = "1h0mx5sl379486panyxpanld8qrlhak9knhz7jzqqv7is3rw8g1r";
+       revision = "1";
+       editedCabalFile = "1nlkhmfcvlzi96nzq8cpbqw5akrjahnrhl460q07vq6iyhibvf87";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable mtl protocol-buffers
          protocol-buffers-descriptor text transformers unordered-containers
@@ -214049,7 +211051,6 @@ self: {
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -214127,7 +211128,6 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verify" = callPackage
@@ -214166,23 +211166,57 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "versioning" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }:
+     mkDerivation {
+       pname = "versioning";
+       version = "0.2.0.0";
+       sha256 = "1c35s0hv6wgyr40ky7yh7ajv0jhphfb8m53zn9a59v7nibp476mq";
+       libraryHaskellDepends = [ aeson base bytestring semigroupoids ];
+       testHaskellDepends = [ aeson base bytestring hspec ];
+       description = "Type-safe data versioning";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "versions" = callPackage
-    ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec
-     , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+    ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
+     , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.3.2";
-       sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg";
+       version = "3.4.0.1";
+       sha256 = "0r7crjnzllip9ya3lgf7cckfgz57daq379sh19z7adlzj8rxhimg";
        libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
        testHaskellDepends = [
-         base checkers microlens QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
+         base base-prelude checkers megaparsec microlens QuickCheck tasty
+         tasty-hunit tasty-quickcheck text
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vfr-waypoints" = callPackage
+    ({ mkDerivation, base, containers, fuzzy, lens, monoid-subclasses
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "vfr-waypoints";
+       version = "0.1.0.1";
+       sha256 = "0xx7j57wrqg90h8sggq32jm7hp1hyjazylgyk8pnvfmzhirnqp4y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers fuzzy lens monoid-subclasses
+       ];
+       executableHaskellDepends = [
+         base fuzzy lens optparse-applicative
+       ];
+       description = "VFR waypoints, as published in the AIP (ERSA)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vgrep" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th
      , containers, directory, doctest, fingertree, generic-deriving
@@ -214210,6 +211244,7 @@ self: {
        ];
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vhd" = callPackage
@@ -214235,6 +211270,7 @@ self: {
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vhdl" = callPackage
@@ -214246,6 +211282,7 @@ self: {
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vicinity" = callPackage
@@ -214270,8 +211307,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.17";
-       sha256 = "0wj0y6dyyy11flkywv96m95nq0qlmj4wykfwj4xw8fwjjmsmg91f";
+       version = "0.0.0.18";
+       sha256 = "1cf37vhj21yd6d1bia7jlwwc0bw6d2lwj7wkl936argn3zzxrqf6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -214412,26 +211449,6 @@ self: {
      }) {};
 
   "vinyl" = callPackage
-    ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens
-     , linear, mwc-random, primitive, should-not-typecheck, singletons
-     , vector
-     }:
-     mkDerivation {
-       pname = "vinyl";
-       version = "0.7.0";
-       sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [
-         base doctest hspec lens should-not-typecheck singletons
-       ];
-       benchmarkHaskellDepends = [
-         base criterion lens linear mwc-random primitive vector
-       ];
-       description = "Extensible Records";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "vinyl_0_8_1_1" = callPackage
     ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
      , lens, linear, microlens, mwc-random, primitive
      , should-not-typecheck, singletons, tagged, vector
@@ -214440,6 +211457,8 @@ self: {
        pname = "vinyl";
        version = "0.8.1.1";
        sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh";
+       revision = "1";
+       editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          base doctest hspec lens microlens should-not-typecheck singletons
@@ -214449,7 +211468,6 @@ self: {
        ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -214471,6 +211489,7 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-json" = callPackage
@@ -214534,6 +211553,7 @@ self: {
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-vectors" = callPackage
@@ -214815,6 +211835,7 @@ self: {
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -214920,42 +211941,6 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.20";
-       sha256 = "0l9xlk4z8xlkd7qzhzkj4l0qb2gwl27mabr2hhkpz3yfv7z6j0a3";
-       revision = "1";
-       editedCabalFile = "01awxbjxls9v9jh7d7mic7lzmaabsx8g9lqks8fbrjixhka321fl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_21" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
        version = "5.21";
        sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas";
        isLibrary = true;
@@ -214977,7 +211962,6 @@ self: {
        ];
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -215059,19 +212043,17 @@ self: {
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "1.1.2.1";
-       sha256 = "0iwzjr2w6ifsj6lah8viahsxcqxiqy0dk1v6lnzi77nb05sjpr6d";
+       version = "1.1.3.0";
+       sha256 = "1sd7rasg7305dlfq1mwyxw45gwy4ria0cbcd18pnilwjgsla7kvc";
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wacom-daemon" = callPackage
@@ -215340,6 +212322,7 @@ self: {
        ];
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-dispatch" = callPackage
@@ -215368,36 +212351,6 @@ self: {
 
   "wai-extra" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.22.0";
-       sha256 = "0rwksl5jkhkgd10qi0wvhfw28g1qci60pc6chrv5bg0w0xqkv532";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring case-insensitive cookie fast-logger
-         hspec http-types HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_22_1" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
      , http-types, HUnit, iproute, lifted-base, network, old-locale
@@ -215424,7 +212377,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -215514,22 +212466,6 @@ self: {
      }) {inherit (pkgs) fcgi;};
 
   "wai-handler-launch" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring, http-types
-     , process, streaming-commons, transformers, wai, warp
-     }:
-     mkDerivation {
-       pname = "wai-handler-launch";
-       version = "3.0.2.3";
-       sha256 = "1lv1xybpx7zzyz89nb94sw3326pnmyfz6h4sqs00ib9zf05hxl3d";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring http-types process
-         streaming-commons transformers wai warp
-       ];
-       description = "Launch a web app in the default browser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-handler-launch_3_0_2_4" = callPackage
     ({ mkDerivation, async, base, bytestring, http-types, process
      , streaming-commons, transformers, wai, warp
      }:
@@ -215543,7 +212479,6 @@ self: {
        ];
        description = "Launch a web app in the default browser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-scgi" = callPackage
@@ -215713,6 +212648,7 @@ self: {
        ];
        description = "Buffer requets before logging them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -216009,7 +212945,6 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -216138,6 +213073,7 @@ self: {
        ];
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -216190,6 +213126,7 @@ self: {
        ];
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -216213,6 +213150,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-slack-verify" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, errors, hspec
+     , http-types, HUnit, memory, time, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-middleware-slack-verify";
+       version = "0.1.0.0";
+       sha256 = "18kcvr2w9zgl2hv3w6hfl5ll1jsc2idd2fh1hv4kh7b8mw71s605";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cryptonite errors http-types memory wai
+       ];
+       testHaskellDepends = [
+         base bytestring cryptonite errors hspec http-types HUnit memory
+         time wai wai-extra
+       ];
+       description = "WAI Slack request verification middleware";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wai-middleware-static" = callPackage
     ({ mkDerivation, base, bytestring, containers, cryptonite
      , directory, expiring-cache-map, filepath, http-types, memory
@@ -216222,6 +213180,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.2";
        sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b";
+       revision = "1";
+       editedCabalFile = "0n7i81jrjsrav8bpg31avrd18vh95l5z6bfj4fqkrdj4h1v6armi";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types mtl old-locale semigroups
@@ -216322,7 +213282,6 @@ self: {
        ];
        description = "Route Wai middlewares based on HTTP verbs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -216363,6 +213322,7 @@ self: {
        ];
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-responsible" = callPackage
@@ -216383,8 +213343,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-route";
-       version = "0.3.1.2";
-       sha256 = "1biiq5p8aa7icsafslgnnnv5n43v7gizz69y1snyxph5n0n7sl81";
+       version = "0.4.0";
+       sha256 = "1rdrb7v17svz6y502bg49pj1wik7zy7r2l8bldfkssqh9kbrjiyp";
        libraryHaskellDepends = [
          base bytestring http-types unordered-containers wai
        ];
@@ -216417,8 +213377,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.10.2";
-       sha256 = "0nhimzkws5v7qpfv305lp41qm61q0xxny5vvs0d26jarnmar9crq";
+       version = "0.10.3";
+       sha256 = "0q7928i2y0j0z68qz1ixgzh3cx2rmyp44vpzc5jxqrrbfsb0z56k";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -216430,7 +213390,6 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -216509,6 +213468,7 @@ self: {
        ];
        description = "An alternative session middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -216680,21 +213640,6 @@ self: {
      }) {};
 
   "wai-transformers" = callPackage
-    ({ mkDerivation, base, exceptions, transformers, wai
-     , wai-websockets, websockets
-     }:
-     mkDerivation {
-       pname = "wai-transformers";
-       version = "0.0.7";
-       sha256 = "0b735xdfl4p30nhfxvhrhsa8kikckn4wni4yl044if4f0ji0260s";
-       libraryHaskellDepends = [
-         base exceptions transformers wai wai-websockets websockets
-       ];
-       description = "Simple parameterization of Wai's Application type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-transformers_0_1_0" = callPackage
     ({ mkDerivation, base, exceptions, extractable-singleton
      , monad-control-aligned, transformers, wai, wai-websockets
      , websockets
@@ -216708,7 +213653,6 @@ self: {
          transformers wai wai-websockets websockets
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-util" = callPackage
@@ -216975,8 +213919,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls-uid";
-       version = "0.2.0.1";
-       sha256 = "1f9la7hz5x6xhyz3b4zgxqgp8hn0085k5fhp03fw9gzhkdgq1c08";
+       version = "0.2.0.5";
+       sha256 = "1b3kxpbai9nxqqv9kww4cr1vgaa0cz4fpkd3pfmj0hin10hr6mmq";
        libraryHaskellDepends = [
          base bytestring network streaming-commons unix wai warp warp-tls
        ];
@@ -216985,7 +213929,6 @@ self: {
        ];
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warped" = callPackage
@@ -217005,6 +213948,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wasm" = callPackage
+    ({ mkDerivation, alex, array, base, base64-bytestring, bytestring
+     , cereal, containers, deepseq, directory, filepath, happy, ieee754
+     , mtl, optparse-applicative, tasty, tasty-hunit, text, transformers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "wasm";
+       version = "1.0.0";
+       sha256 = "0l5llqc05fr7zkva3ll8hy0qxx19r17qs6zcp098yz6vsnkavzx6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring cereal containers deepseq ieee754 mtl text
+         transformers utf8-string vector
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring optparse-applicative
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath mtl tasty tasty-hunit text
+       ];
+       testToolDepends = [ alex happy ];
+       description = "WebAssembly Language Toolkit and Interpreter";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "watchdog" = callPackage
     ({ mkDerivation, base, mtl, time }:
      mkDerivation {
@@ -217335,6 +214307,7 @@ self: {
        ];
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-plugins" = callPackage
@@ -217754,6 +214727,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "webdriver-w3c" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bytestring, containers, directory, exceptions, http-client
+     , http-types, JuicyPixels, lens, lens-aeson, network-uri, parsec
+     , QuickCheck, random, scientific, script-monad, SHA, stm, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, time
+     , unordered-containers, uri-encode, vector, wreq
+     }:
+     mkDerivation {
+       pname = "webdriver-w3c";
+       version = "0.0.1";
+       sha256 = "0ynidfwhyarbfhiq8m284l6489ribmakx8p8gx6cz7kvh44qa1cv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring containers
+         directory exceptions http-client http-types JuicyPixels lens
+         lens-aeson network-uri QuickCheck random scientific script-monad
+         SHA stm tasty tasty-expected-failure text time unordered-containers
+         uri-encode vector wreq
+       ];
+       executableHaskellDepends = [ base tasty tasty-expected-failure ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring containers directory
+         exceptions http-client http-types JuicyPixels lens lens-aeson
+         parsec QuickCheck random scientific script-monad tasty
+         tasty-expected-failure tasty-hunit tasty-quickcheck text time
+         unordered-containers vector wreq
+       ];
+       description = "Bindings to the WebDriver API";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webex-teams-api" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
      , bytestring, conduit, data-default, hspec, http-conduit
@@ -217890,6 +214897,7 @@ self: {
        ];
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkit" = callPackage
@@ -217936,7 +214944,6 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -217985,6 +214992,7 @@ self: {
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webrtc-vad" = callPackage
@@ -218039,8 +215047,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.12.5.0";
-       sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd";
+       version = "0.12.5.1";
+       sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -218073,32 +215081,6 @@ self: {
      }:
      mkDerivation {
        pname = "websockets-rpc";
-       version = "0.6.0";
-       sha256 = "1kii5d0xfs8cj8j19g1hfx7h0fk0g7hx441xhs8wavsh75nmpkgg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers exceptions hashable
-         monad-control mtl QuickCheck stm text transformers
-         unordered-containers uuid wai-transformers websockets
-         websockets-simple
-       ];
-       testHaskellDepends = [
-         aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
-       ];
-       description = "Simple streaming RPC mechanism using WebSockets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets-rpc_0_7_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, hashable, monad-control, mtl, QuickCheck
-     , quickcheck-instances, stm, tasty, tasty-quickcheck, text
-     , transformers, unordered-containers, uuid, wai-transformers
-     , websockets, websockets-simple
-     }:
-     mkDerivation {
-       pname = "websockets-rpc";
        version = "0.7.0";
        sha256 = "0iywpaqp0y1mbysphz438adpj8mvlyr58wr1avj22wwm9n29yhin";
        libraryHaskellDepends = [
@@ -218119,24 +215101,6 @@ self: {
      }) {};
 
   "websockets-simple" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
-     , hspec, monad-control, stm, tasty, tasty-hspec, transformers
-     , wai-transformers, websockets
-     }:
-     mkDerivation {
-       pname = "websockets-simple";
-       version = "0.0.6.3";
-       sha256 = "057gm855nqx4rbmhsai4fw4l7p42a40d27567pgnb81chj638w9g";
-       libraryHaskellDepends = [
-         aeson async base bytestring every exceptions monad-control stm
-         transformers wai-transformers websockets
-       ];
-       testHaskellDepends = [ base hspec stm tasty tasty-hspec ];
-       description = "Simpler interface to the websockets api";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets-simple_0_1_2_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, exceptions
      , extractable-singleton, hspec, monad-control-aligned, profunctors
      , stm, tasty, tasty-hspec, transformers, vector, wai-transformers
@@ -218227,7 +215191,6 @@ self: {
        ];
        description = "Wedged postcard generator";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weeder" = callPackage
@@ -218237,8 +215200,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.5";
-       sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi";
+       version = "1.0.6";
+       sha256 = "07i84ypb0n1qnfcv5y2aksicl36lmxd2bmlmdn2riqj9bhy98vij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -218597,8 +215560,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind";
-       version = "0.1.2.0";
-       sha256 = "0c1nb713p11pd89ykwz76i60sk437q9cy48bingiiig1g9dfg3p6";
+       version = "0.1.2.1";
+       sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
        libraryHaskellDepends = [
          base containers semigroups text transformers
        ];
@@ -218639,7 +215602,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -218648,8 +215610,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.2.0.3";
-       sha256 = "0naqmgkqqq83mnrp4ic97i6f6ak3h862jk6pa77c83qmz4ahh4ld";
+       version = "0.2.0.4";
+       sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
        libraryHaskellDepends = [
          base containers fold-debounce mtl semigroups stm text transformers
          wild-bind X11
@@ -218732,33 +215694,40 @@ self: {
      }) {};
 
   "winery" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, mtl
-     , prettyprinter, prettyprinter-ansi-terminal, text, transformers
+    ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu
+     , deepseq, fingertree, gauge, hashable, mtl, prettyprinter
+     , prettyprinter-ansi-terminal, serialise, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0";
-       sha256 = "0bhgiw2zljr50cyhfc8rzkd217g8mvl56f82ys5z0kvr5gp8mjdw";
+       version = "0.1.1";
+       sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring containers hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring containers hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cassava containers cpu deepseq fingertree
+         gauge hashable mtl prettyprinter prettyprinter-ansi-terminal
+         serialise text transformers unordered-containers vector
        ];
        description = "Sustainable serialisation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "winio" = callPackage
@@ -218819,7 +215788,6 @@ self: {
        ];
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wiring" = callPackage
@@ -219080,23 +216048,11 @@ self: {
     ({ mkDerivation, base, base-compat, text }:
      mkDerivation {
        pname = "wl-pprint-text";
-       version = "1.1.1.0";
-       sha256 = "1k8ar8g03x3j95xisdqwzw2mjln7mpp3r2klvyhi5n853hhchq19";
-       libraryHaskellDepends = [ base base-compat text ];
-       description = "A Wadler/Leijen Pretty Printer for Text values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wl-pprint-text_1_2_0_0" = callPackage
-    ({ mkDerivation, base, base-compat, text }:
-     mkDerivation {
-       pname = "wl-pprint-text";
        version = "1.2.0.0";
        sha256 = "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0";
        libraryHaskellDepends = [ base base-compat text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wlc-hs" = callPackage
@@ -219233,7 +216189,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Words of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word-trie" = callPackage
@@ -219382,6 +216337,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordpass" = callPackage
@@ -219452,6 +216408,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "work-time" = callPackage
+    ({ mkDerivation, base, containers, megaparsec, text }:
+     mkDerivation {
+       pname = "work-time";
+       version = "0.1.2.0";
+       sha256 = "0vss3ik2q33nqiqy4d4gzyjfgr8grzgjx68lgi7wbwzgqmkk86bz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers megaparsec text ];
+       executableHaskellDepends = [ base text ];
+       description = "A library for parsing a chat-based work hour reporting scheme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "workdays" = callPackage
     ({ mkDerivation, base, containers, doctest, hspec, time }:
      mkDerivation {
@@ -219547,6 +216517,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\/mouse\/clipboard\/application interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "workflow-windows" = callPackage
@@ -219960,7 +216931,6 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ws-chans" = callPackage
@@ -220042,6 +217012,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wss-client" = callPackage
+    ({ mkDerivation, base, bytestring, envy, hspec, http-client
+     , http-client-tls, network-uri, skews, text, websockets
+     }:
+     mkDerivation {
+       pname = "wss-client";
+       version = "0.2.1.1";
+       sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring http-client http-client-tls network-uri websockets
+       ];
+       testHaskellDepends = [ base bytestring envy hspec skews text ];
+       description = "A-little-higher-level WebSocket client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wtk" = callPackage
     ({ mkDerivation, base, old-locale, time, transformers }:
      mkDerivation {
@@ -220554,6 +217542,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty xml ];
        description = "Parses XML files used by the XCB project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xcffib" = callPackage
@@ -220756,6 +217745,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xgboost-haskell" = callPackage
@@ -220991,6 +217981,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xls" = callPackage
@@ -221064,7 +218055,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -221081,7 +218071,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -221341,8 +218330,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-html-conduit-lens";
-       version = "0.3.2.3";
-       sha256 = "1r2slz8wqgn0wdbs5cn7fnr7shz9di8bkn3m11jf70ij1gxi1cib";
+       version = "0.3.2.4";
+       sha256 = "1axg0b5y43fnmj64jffqkivrlckx9arw31ijjqdlj0yb7qwfahhk";
        libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
@@ -221351,7 +218340,6 @@ self: {
        ];
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-html-qq" = callPackage
@@ -221396,27 +218384,6 @@ self: {
      }) {};
 
   "xml-isogen" = callPackage
-    ({ mkDerivation, base, data-default, dom-parser, generic-arbitrary
-     , hspec, lens, mtl, QuickCheck, quickcheck-instances, semigroups
-     , template-haskell, text, xml-conduit, xml-conduit-writer
-     }:
-     mkDerivation {
-       pname = "xml-isogen";
-       version = "0.2.1";
-       sha256 = "1kfv09ykz96dqd45bi618qi2qhzjkifh377ccylfzd55jkqnvn6l";
-       libraryHaskellDepends = [
-         base dom-parser lens mtl QuickCheck semigroups template-haskell
-         text xml-conduit xml-conduit-writer
-       ];
-       testHaskellDepends = [
-         base data-default dom-parser generic-arbitrary hspec QuickCheck
-         quickcheck-instances semigroups xml-conduit xml-conduit-writer
-       ];
-       description = "Generate XML-isomorphic types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xml-isogen_0_3_0" = callPackage
     ({ mkDerivation, base, data-default, deepseq, dom-parser
      , generic-arbitrary, hspec, lens, mtl, QuickCheck
      , quickcheck-instances, semigroups, template-haskell, text
@@ -221437,7 +218404,6 @@ self: {
        ];
        description = "Generate XML-isomorphic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-lens" = callPackage
@@ -221845,6 +218811,7 @@ self: {
        ];
        description = "XML parser and renderer with HTML 5 quirks mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmltv" = callPackage
@@ -221903,23 +218870,28 @@ self: {
   "xmobar" = callPackage
     ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
      , containers, dbus, directory, filepath, hinotify, hspec, HTTP
-     , iwlib, libmpd, libXpm, libXrandr, libXrender, mtl, old-locale
-     , parsec, process, regex-compat, stm, time, timezone-olson
-     , timezone-series, transformers, unix, utf8-string, wirelesstools
-     , X11, X11-xft
+     , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr
+     , libXrender, mtl, old-locale, parsec, process, regex-compat, stm
+     , time, timezone-olson, timezone-series, transformers, unix
+     , utf8-string, wirelesstools, X11, X11-xft
      }:
      mkDerivation {
        pname = "xmobar";
        version = "0.26";
        sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz";
-       configureFlags = [ "-fall_extensions" ];
+       configureFlags = [
+         "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
+         "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
+         "-fwith_rtsopts" "-fwith_threaded" "-fwith_utf8" "-fwith_uvmeter"
+         "-fwith_weather" "-fwith_xft" "-fwith_xpm"
+       ];
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          alsa-core alsa-mixer base bytestring containers dbus directory
-         filepath hinotify HTTP iwlib libmpd mtl old-locale parsec process
-         regex-compat stm time timezone-olson timezone-series transformers
-         unix utf8-string X11 X11-xft
+         filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl
+         old-locale parsec process regex-compat stm time timezone-olson
+         timezone-series transformers unix utf8-string X11 X11-xft
        ];
        executableSystemDepends = [
          libXpm libXrandr libXrender wirelesstools
@@ -222083,6 +219055,7 @@ self: {
        ];
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-screenshot" = callPackage
@@ -222138,6 +219111,7 @@ self: {
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-windownames" = callPackage
@@ -222253,6 +219227,7 @@ self: {
        ];
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-render" = callPackage
@@ -222288,6 +219263,7 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xpathdsv" = callPackage
@@ -222304,7 +219280,6 @@ self: {
        ];
        description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsact" = callPackage
@@ -222372,8 +219347,8 @@ self: {
      }:
      mkDerivation {
        pname = "xss-sanitize";
-       version = "0.3.5.7";
-       sha256 = "005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m";
+       version = "0.3.6";
+       sha256 = "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk";
        libraryHaskellDepends = [
          attoparsec base containers css-text network-uri tagsoup text
          utf8-string
@@ -222424,6 +219399,7 @@ self: {
        ];
        description = "turtle like LOGO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xxhash" = callPackage
@@ -222441,6 +219417,7 @@ self: {
        ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xxhash-ffi" = callPackage
@@ -222648,7 +219625,6 @@ self: {
        ];
        description = "Yam App";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-config" = callPackage
@@ -222675,7 +219651,6 @@ self: {
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-logger" = callPackage
@@ -222755,7 +219730,6 @@ self: {
          base containers persistent-postgresql unliftio-core yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-web" = callPackage
@@ -222808,8 +219782,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.30";
-       sha256 = "11dyjqs1rzhpidzfqdw3lg8rsm32jhjph54kc68k4dwib6fnwnyi";
+       version = "0.8.31.1";
+       sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -222828,6 +219802,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_9_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , conduit, containers, directory, filepath, hspec, HUnit, mockery
+     , resourcet, scientific, semigroups, template-haskell, temporary
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.9.0";
+       sha256 = "05mw3d6k2dahdsajghgbqhlk84x6iym6bci1g1qhpy4k2cfjyjzc";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat bytestring conduit containers
+         directory filepath hspec HUnit mockery resourcet scientific
+         semigroups template-haskell temporary text transformers
+         unordered-containers vector
+       ];
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -222835,8 +219838,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-combinators";
-       version = "1.1.1";
-       sha256 = "0zrvg0ccqn20gj8bbnc3xnlmbvf226qq7synx3q962cw95l53cyl";
+       version = "1.1.1.1";
+       sha256 = "1343q4wddqmszi21qx5a0jjawvqa1aqfzbkn8npi3sy2gmk42zi8";
        libraryHaskellDepends = [
          aeson base bytestring generics-sop scientific text transformers
          unordered-containers vector yaml
@@ -222884,8 +219887,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-light-lens";
-       version = "0.3.3.4";
-       sha256 = "1vvwgb302w2nz05c97gzxkjx7m2lp25bpp3l16bzh92mjvqddpbd";
+       version = "0.3.3.5";
+       sha256 = "11q6g00qycpr29n1yxpsgpailzk216pr3cfjy7pyrlvfpl4wx24f";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
@@ -222895,19 +219898,13 @@ self: {
      }) {};
 
   "yaml-pretty-extras" = callPackage
-    ({ mkDerivation, base, bytestring, errors, hspec, mtl, rio, text
-     , yaml
-     }:
+    ({ mkDerivation, base, hspec, microlens-platform, rio, yaml }:
      mkDerivation {
        pname = "yaml-pretty-extras";
-       version = "0.0.1.3";
-       sha256 = "15jk0hxpvq6hjysxrf4nilhn7s32cwvpfc4wbb3fgfvgzaxnnqfb";
-       libraryHaskellDepends = [
-         base bytestring errors mtl rio text yaml
-       ];
-       testHaskellDepends = [
-         base bytestring errors hspec mtl rio text yaml
-       ];
+       version = "0.0.2.2";
+       sha256 = "0pbpwrrbf4ibrid09ypqfz15d0b4kfgfs4ypfdn0bv5n25nn3ca2";
+       libraryHaskellDepends = [ base microlens-platform rio yaml ];
+       testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223035,8 +220032,8 @@ self: {
        pname = "yampa-canvas";
        version = "0.2.2";
        sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
-       revision = "4";
-       editedCabalFile = "1bqjfmssgg0jd6j5x727clk6wawbbh0hq8v0qpj4d5bfv4931pkb";
+       revision = "5";
+       editedCabalFile = "18my271nsvb26sh5l45ng2zvwnm6fzw589cr9cipbpdaaqhyppfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -223078,6 +220075,7 @@ self: {
        ];
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-sdl2" = callPackage
@@ -223164,8 +220162,8 @@ self: {
      }:
      mkDerivation {
        pname = "yarn-lock";
-       version = "0.4.1";
-       sha256 = "1jhw8ss2psap2shl8spwqbdvxchmvfxb354asvdjjgld608xz8wk";
+       version = "0.5.0";
+       sha256 = "1nwb0zc4qddvq2rkzb56c56iba7v0yms0hlam8y1nlcbvsqxrnc6";
        libraryHaskellDepends = [
          base containers either megaparsec protolude text
        ];
@@ -223181,38 +220179,38 @@ self: {
 
   "yarn2nix" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async-pool, base
-     , bytestring, containers, data-fix, directory, either, filepath
-     , hnix, mtl, neat-interpolation, optparse-applicative, process
-     , protolude, regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text, unix, unordered-containers
-     , yarn-lock
+     , bytestring, containers, data-fix, directory, filepath, hnix, mtl
+     , neat-interpolation, optparse-applicative, process, protolude
+     , regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text, transformers, unix
+     , unordered-containers, yarn-lock
      }:
      mkDerivation {
        pname = "yarn2nix";
-       version = "0.5.0";
-       sha256 = "1vnhf7na4ljlybxpwi0n7ivmigc1mwjzn1vbcl4rrwlr4qcvaylp";
+       version = "0.7.0";
+       sha256 = "0rna9z1vm05f99a0dkvvv893als9x2zjifzc4gphwylgkih7d826";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint async-pool base bytestring containers data-fix
-         directory either filepath hnix mtl process protolude regex-tdfa
-         regex-tdfa-text stm text unordered-containers yarn-lock
+         directory filepath hnix mtl process protolude regex-tdfa
+         regex-tdfa-text stm text transformers unordered-containers
+         yarn-lock
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint async-pool base bytestring containers data-fix
-         directory either filepath hnix mtl optparse-applicative process
-         protolude regex-tdfa regex-tdfa-text stm text unix
+         directory filepath hnix mtl optparse-applicative process protolude
+         regex-tdfa regex-tdfa-text stm text transformers unix
          unordered-containers yarn-lock
        ];
        testHaskellDepends = [
          aeson ansi-wl-pprint async-pool base bytestring containers data-fix
-         directory either filepath hnix mtl neat-interpolation process
-         protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit
-         tasty-quickcheck tasty-th text unordered-containers yarn-lock
+         directory filepath hnix mtl neat-interpolation process protolude
+         regex-tdfa regex-tdfa-text stm tasty tasty-hunit tasty-quickcheck
+         tasty-th text transformers unordered-containers yarn-lock
        ];
        description = "Convert yarn.lock files to nix expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yarr" = callPackage
@@ -223262,6 +220260,7 @@ self: {
        ];
        description = "Yet Another Template Engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yavie" = callPackage
@@ -223365,22 +220364,77 @@ self: {
      }) {};
 
   "yeshql" = callPackage
+    ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
+     mkDerivation {
+       pname = "yeshql";
+       version = "4.1.0.0";
+       sha256 = "04vi2m9av2dh6jxjlxvxi7j5llxjl2j1ww0cnjhkn7z2bllf77yq";
+       libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
+       description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yeshql-core" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, parsec
+     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "yeshql-core";
+       version = "4.1.0.0";
+       sha256 = "1zy2si96vm451z5yjmp5hzw94nqlx6v136l35130m82mdih0337w";
+       libraryHaskellDepends = [
+         base containers convertible filepath parsec template-haskell
+       ];
+       testHaskellDepends = [
+         base containers stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (core)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yeshql-hdbc" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
      , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell
+     , template-haskell, yeshql-core
      }:
      mkDerivation {
-       pname = "yeshql";
-       version = "3.0.1.3";
-       sha256 = "04svfqlmhm94ljyhirihhsdqpskvq989y3wwznclbn0isspjcq9p";
+       pname = "yeshql-hdbc";
+       version = "4.1.0.0";
+       sha256 = "152a2lw76jka83ywqliwhwijgwlsm6shlxj4qhbpmg8bam62b0k4";
        libraryHaskellDepends = [
          base containers convertible filepath HDBC parsec template-haskell
+         yeshql-core
        ];
        testHaskellDepends = [
-         base HDBC stm tasty tasty-hunit tasty-quickcheck
+         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
        ];
-       description = "YesQL-style SQL database abstraction";
+       description = "YesQL-style SQL database abstraction (HDBC backend)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yeshql-postgresql-simple" = callPackage
+    ({ mkDerivation, base, bytestring, containers, convertible
+     , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, yeshql-core
+     }:
+     mkDerivation {
+       pname = "yeshql-postgresql-simple";
+       version = "4.1.0.0";
+       sha256 = "1dnwlrgnxg3gvfg6xmfrxqvqbi73402g9m82phqb6s624ifjir0c";
+       libraryHaskellDepends = [
+         base containers convertible filepath parsec postgresql-simple
+         template-haskell yeshql-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers postgresql-simple stm tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod_1_4_5" = callPackage
@@ -223459,6 +220513,7 @@ self: {
        ];
        description = "Angular JS integratoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-angular-ui" = callPackage
@@ -223533,6 +220588,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_6_4_1" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , cryptonite, data-default, email-validate, file-embed, http-client
+     , http-client-tls, http-conduit, http-types, memory, network-uri
+     , nonce, persistent, random, safe, shakespeare, template-haskell
+     , text, time, transformers, unliftio, unliftio-core
+     , unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.6.4.1";
+       sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-client-tls http-conduit http-types
+         memory network-uri nonce persistent random safe shakespeare
+         template-haskell text time transformers unliftio unliftio-core
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -223815,7 +220899,6 @@ self: {
        ];
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-oauth2" = callPackage
@@ -223907,8 +220990,8 @@ self: {
        pname = "yesod-bin";
        version = "1.6.0.3";
        sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
-       revision = "1";
-       editedCabalFile = "0dr9i8jisp5vd0pz6pckdiax1ynm9rhgjjr2xhxlrlfy24k14gg3";
+       revision = "2";
+       editedCabalFile = "0h4nam6zkhz7km0z5z3zngnrgif7a42llvh013iava171kadn8xp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -223923,7 +221006,6 @@ self: {
        ];
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -223944,19 +221026,19 @@ self: {
      }) {};
 
   "yesod-colonnade" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, text
-     , yesod-core
+    ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, conduit
+     , conduit-extra, text, yesod-core, yesod-elements
      }:
      mkDerivation {
        pname = "yesod-colonnade";
-       version = "1.2.0";
-       sha256 = "1xbcwaklbly80fimmbi04j9wpl06knjdf1zy0m8i8cb1xmd8nh0k";
+       version = "1.3.0.1";
+       sha256 = "1x5m3xv4jq2x49fnvxw3v8bvbsx4hdccykcn32fz3cwavp4p1q1p";
        libraryHaskellDepends = [
-         base blaze-html blaze-markup colonnade text yesod-core
+         base blaze-html blaze-markup colonnade conduit conduit-extra text
+         yesod-core yesod-elements
        ];
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-comments" = callPackage
@@ -224103,6 +221185,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_6" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, byteable, bytestring, case-insensitive, cereal
+     , clientsession, conduit, conduit-extra, containers, cookie
+     , deepseq, fast-logger, gauge, hspec, hspec-expectations
+     , http-types, HUnit, monad-logger, mtl, network, parsec
+     , path-pieces, random, resourcet, rio, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , unix-compat, unliftio, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.6";
+       sha256 = "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types monad-logger mtl
+         parsec path-pieces random resourcet rio shakespeare
+         template-haskell text time transformers unix-compat unliftio
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -224227,15 +221346,18 @@ self: {
      }) {};
 
   "yesod-elements" = callPackage
-    ({ mkDerivation, base, blaze-html, yesod-core }:
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, text
+     , yesod-core
+     }:
      mkDerivation {
        pname = "yesod-elements";
-       version = "1.0";
-       sha256 = "0d0ihp0yk0b07v2ym6vvzj70pwh16ms6xyp7yan4dcavcy8cz86l";
-       libraryHaskellDepends = [ base blaze-html yesod-core ];
+       version = "1.1";
+       sha256 = "0rxx3lxl55q0mxdzfixwy2d0cnzmfxx2zg24k6kdgghg0k77g3d3";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring text yesod-core
+       ];
        description = "Non template haskell markup building function in the spirit of lucid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-eventsource" = callPackage
@@ -224295,6 +221417,7 @@ self: {
        ];
        description = "Fast live-reloading for yesod applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-fay" = callPackage
@@ -224380,18 +221503,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-form-bootstrap4" = callPackage
-    ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
+  "yesod-form_1_6_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, text, time, transformers, wai
+     , xss-sanitize, yesod-core, yesod-persistent
+     }:
      mkDerivation {
-       pname = "yesod-form-bootstrap4";
-       version = "0.1.1";
-       sha256 = "17bdd0pmhpj85w7vc7vzzb3iggl3azr1jzpkmy9x9mxdl1birgmg";
-       libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ];
-       description = "renderBootstrap4";
+       pname = "yesod-form";
+       version = "1.6.2";
+       sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare text time
+         transformers wai xss-sanitize yesod-core yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form-bootstrap4_1_0_0" = callPackage
+  "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
@@ -224402,6 +221537,17 @@ self: {
        ];
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "yesod-form-bootstrap4_1_0_2" = callPackage
+    ({ mkDerivation, base, text, yesod-core, yesod-form }:
+     mkDerivation {
+       pname = "yesod-form-bootstrap4";
+       version = "1.0.2";
+       sha256 = "0y68k6xnb8i7wa2c1c0msc3p69azs4z0iwjdgkr0kaqzahw56scq";
+       libraryHaskellDepends = [ base text yesod-core yesod-form ];
+       description = "renderBootstrap4";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -224491,7 +221637,6 @@ self: {
        ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-goodies" = callPackage
@@ -224623,6 +221768,7 @@ self: {
        testHaskellDepends = [ base blaze-html hspec text ];
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -224639,7 +221785,6 @@ self: {
        ];
        description = "Simple display of media types, served by yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-newsfeed" = callPackage
@@ -224690,26 +221835,6 @@ self: {
      }) {};
 
   "yesod-paginator" = callPackage
-    ({ mkDerivation, base, data-default, hspec, persistent, resourcet
-     , text, transformers, wai-extra, yesod, yesod-core, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-paginator";
-       version = "0.11.0";
-       sha256 = "15pbiar01qd66g4fjf3hyri53qzz1q5kw389rajn330zl6rakbv0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base persistent resourcet text transformers yesod
-       ];
-       testHaskellDepends = [
-         base data-default hspec wai-extra yesod-core yesod-test
-       ];
-       description = "A pagination approach for yesod";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-paginator_1_1_0_0" = callPackage
     ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
      , persistent, safe, text, transformers, uri-encode, yesod-core
      , yesod-persistent, yesod-test
@@ -224727,7 +221852,6 @@ self: {
        testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paypal-rest" = callPackage
@@ -225030,6 +222154,7 @@ self: {
        ];
        description = "yesod recaptcha2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes" = callPackage
@@ -225347,6 +222472,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_6_5" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , bytestring, case-insensitive, conduit, containers, cookie, hspec
+     , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
+     , semigroups, text, time, transformers, unliftio, wai, wai-extra
+     , xml-conduit, xml-types, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.6.5";
+       sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html bytestring
+         case-insensitive conduit containers cookie hspec-core html-conduit
+         http-types HUnit network pretty-show semigroups text time
+         transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit text
+         unliftio wai wai-extra xml-conduit yesod-core yesod-form
+       ];
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -225379,7 +222530,6 @@ self: {
        ];
        description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-tls" = callPackage
@@ -225556,6 +222706,7 @@ self: {
        ];
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-contrib" = callPackage
@@ -225605,6 +222756,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -225621,6 +222773,7 @@ self: {
        ];
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -225651,6 +222804,7 @@ self: {
        ];
        description = "Pango frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-frontend-vty" = callPackage
@@ -225668,6 +222822,7 @@ self: {
        ];
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-fuzzy-open" = callPackage
@@ -225686,6 +222841,7 @@ self: {
        ];
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -225713,6 +222869,7 @@ self: {
        ];
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-cua" = callPackage
@@ -225728,6 +222885,7 @@ self: {
        ];
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-emacs" = callPackage
@@ -225745,6 +222903,7 @@ self: {
        ];
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-vim" = callPackage
@@ -225771,6 +222930,7 @@ self: {
        ];
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-language" = callPackage
@@ -225815,6 +222975,7 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-mode-haskell" = callPackage
@@ -225832,6 +222993,7 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-mode-javascript" = callPackage
@@ -225850,6 +223012,7 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-monokai" = callPackage
@@ -225870,25 +223033,6 @@ self: {
      }:
      mkDerivation {
        pname = "yi-rope";
-       version = "0.10";
-       sha256 = "0lkaca2nnivzd6dbrawdkfydm9rd06bm0j0kbl1nhh53ghdp4cs9";
-       libraryHaskellDepends = [
-         base binary bytestring deepseq fingertree text
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck quickcheck-instances text
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq text ];
-       description = "A rope data structure used by Yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-rope_0_11" = callPackage
-    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
-     , fingertree, hspec, QuickCheck, quickcheck-instances, text
-     }:
-     mkDerivation {
-       pname = "yi-rope";
        version = "0.11";
        sha256 = "020hnyhl2g313ch6dng9lq3xdjy3ssnb069wiwzbpg816mlii4ws";
        libraryHaskellDepends = [
@@ -225900,7 +223044,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-snippet" = callPackage
@@ -225921,6 +223064,7 @@ self: {
        ];
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-solarized" = callPackage
@@ -226045,6 +223189,7 @@ self: {
        libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yjtools" = callPackage
@@ -226085,6 +223230,7 @@ self: {
        libraryHaskellDepends = [ base free mtl ];
        description = "A truly tiny monadic parsing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yoga" = callPackage
@@ -226194,6 +223340,7 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yu-auth" = callPackage
@@ -226208,7 +223355,6 @@ self: {
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yu-core" = callPackage
@@ -226657,6 +223803,7 @@ self: {
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeromq4-conduit" = callPackage
@@ -226720,6 +223867,7 @@ self: {
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeroth" = callPackage
@@ -226899,7 +224047,6 @@ self: {
        ];
        description = "Read and parse ZIM files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip" = callPackage
@@ -226911,33 +224058,6 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.0.0";
-       sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9";
-       revision = "3";
-       editedCabalFile = "0af1qpyn6vfzcdyi1md7aq39fznswxijzm0ap7mdwp0g0l7pcdyh";
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest directory dlist exceptions filepath
-         monad-control mtl resourcet text time transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers directory dlist exceptions
-         filepath hspec QuickCheck temporary text time transformers
-       ];
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zip_1_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, directory
-     , dlist, exceptions, filepath, hspec, monad-control, mtl
-     , QuickCheck, resourcet, temporary, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "zip";
        version = "1.1.0";
        sha256 = "1p6r4rmagq2x44wizpxk3844vh5nv2k51wl3h6vx5xnf5im2v535";
        libraryHaskellDepends = [
@@ -226952,28 +224072,27 @@ self: {
        ];
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
-     , digest, directory, filepath, HUnit, mtl, old-time, pretty
-     , process, temporary, text, time, unix, unzip, zlib
+     , digest, directory, filepath, HUnit, mtl, pretty, process
+     , temporary, text, time, unix, unzip, zlib
      }:
      mkDerivation {
        pname = "zip-archive";
-       version = "0.3.2.5";
-       sha256 = "14xkaj456zpxxbwd1h5prcxiiid42snli4mqm1052jp32c7xhf89";
+       version = "0.3.3";
+       sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          array base binary bytestring containers digest directory filepath
-         mtl old-time pretty text time unix zlib
+         mtl pretty text time unix zlib
        ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit old-time process temporary
-         time unix
+         base bytestring directory filepath HUnit process temporary time
+         unix
        ];
        testToolDepends = [ unzip ];
        description = "Library for creating and modifying zip archives";
@@ -227031,7 +224150,6 @@ self: {
        ];
        description = "ZIP archive streaming using conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zipedit" = callPackage
@@ -227072,6 +224190,7 @@ self: {
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zippers" = callPackage
@@ -227082,8 +224201,8 @@ self: {
        pname = "zippers";
        version = "0.2.5";
        sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id";
-       revision = "2";
-       editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm";
+       revision = "3";
+       editedCabalFile = "0y0klc2jaj611cjvmqi95dyj9yvribf9xhibn1andrz5rs6ysz3p";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens profunctors semigroupoids semigroups
@@ -227457,6 +224576,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "ZRE protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zsh-battery" = callPackage
@@ -227510,6 +224630,24 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ztar" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath, path
+     , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib
+     }:
+     mkDerivation {
+       pname = "ztar";
+       version = "0.1.0";
+       sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d";
+       libraryHaskellDepends = [
+         base bytestring directory filepath path tar zip zlib
+       ];
+       testHaskellDepends = [
+         base extra path path-io QuickCheck tasty tasty-quickcheck
+       ];
+       description = "Creating and extracting arbitrary archives";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index fb1302f60ea57..c9dc7254800e8 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -382,4 +382,23 @@ rec {
           allPkgconfigDepends;
       };
 
+  # Utility to convert a directory full of `cabal2nix`-generated files into a
+  # package override set
+  #
+  # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet
+  packagesFromDirectory =
+    { directory, ... }:
+
+    self: super:
+      let
+        haskellPaths = builtins.attrNames (builtins.readDir directory);
+
+        toKeyVal = file: {
+          name  = builtins.replaceStrings [ ".nix" ] [ "" ] file;
+
+          value = self.callPackage (directory + "/${file}") { };
+        };
+
+      in
+        builtins.listToAttrs (map toKeyVal haskellPaths);
 }
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index a54967c4e45e6..87ac65307aabb 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -97,7 +97,20 @@ let
       };
     in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
 
-  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;
+  mkScope = scope: let
+      ps = pkgs.__splicedPackages;
+      scopeSpliced = pkgs.splicePackages {
+        pkgsBuildBuild = scope.buildHaskellPackages.buildHaskellPackages;
+        pkgsBuildHost = scope.buildHaskellPackages;
+        pkgsBuildTarget = {};
+        pkgsHostHost = {};
+        pkgsHostTarget = scope;
+        pkgsTargetTarget = {};
+      } // {
+        # Don't splice these
+        inherit (scope) ghc buildHaskellPackages;
+      };
+    in ps // ps.xorg // ps.gnome2 // { inherit stdenv; } // scopeSpliced;
   defaultScope = mkScope self;
   callPackage = drv: args: callPackageWithScope defaultScope drv args;
 
@@ -150,7 +163,7 @@ let
 
 in package-set { inherit pkgs stdenv callPackage; } self // {
 
-    inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
+    inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
 
     inherit (haskellLib) packageSourceOverrides;
 
diff --git a/pkgs/development/haskell-modules/patches/lzma-tests.patch b/pkgs/development/haskell-modules/patches/lzma-tests.patch
deleted file mode 100644
index db9e62ee3c5f0..0000000000000
--- a/pkgs/development/haskell-modules/patches/lzma-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lzma.cabal
-+++ b/lzma.cabal
-@@ -76,7 +76,7 @@
-   -- additional dependencies that require version bounds
-   build-depends:       HUnit                      >= 1.2      && <1.7
-                      , QuickCheck                 >= 2.8      && <2.11
--                     , tasty                      >= 0.10     && <0.13
-+                     , tasty                      >= 0.10     && <1.1
-                      , tasty-hunit                >= 0.9      && <0.11
-                      , tasty-quickcheck           >= 0.8.3.2  && <0.10
- 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 03f0a1dd0a3e1..1a29732b651a6 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -38,7 +38,8 @@ let
   ghcCommand'    = if isGhcjs then "ghcjs" else "ghc";
   ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
   ghcCommandCaps= lib.toUpper ghcCommand';
-  libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}";
+  libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}"
+                  else "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
   paths         = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
@@ -104,7 +105,7 @@ symlinkJoin {
         --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
     fi
 
-  '' + (lib.optionalString targetPlatform.isDarwin ''
+  '' + (lib.optionalString (targetPlatform.isDarwin && !isGhcjs && !targetPlatform.isiOS) ''
     # Work around a linker limit in macOS Sierra (see generic-builder.nix):
     local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
     local dynamicLinksDir="$out/lib/links"
diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix
index cab7ccbcf7a89..38d25827d5084 100644
--- a/pkgs/development/idris-modules/array.nix
+++ b/pkgs/development/idris-modules/array.nix
@@ -1,18 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
-build-idris-package  {
+build-idris-package {
   name = "array";
   version = "2016-10-14";
 
-  idrisDeps = [ prelude base ];
-
-  extraBuildInputs = [ idris ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-array";
@@ -25,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/idris-hackers/idris-array;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
index fb43fbf209bb5..d16d9b2245d69 100644
--- a/pkgs/development/idris-modules/bi.nix
+++ b/pkgs/development/idris-modules/bi.nix
@@ -1,22 +1,20 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "bi";
-  version = "2018-01-17";
+  version = "2018-06-25";
 
-  idrisDeps = [ prelude contrib pruviloj ];
+  idrisDeps = [ contrib pruviloj ];
 
   src = fetchFromGitHub {
     owner = "sbp";
     repo = "idris-bi";
-    rev = "8ab40bc482ca948ac0f6ffb5b4c545a73688dd3a";
-    sha256 = "1lra945q2d6anwzjs94srprqj867lrz66rsns08p8828vg55fv97";
+    rev = "6bd90fb30b06ab02438efb5059e2fc699fdc7787";
+    sha256 = "1px550spigl8k1m1r64mjrw7qjvipa43xy95kz1pb5ibmy84d6r3";
   };
 
   meta = {
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/sbp/idris-bi;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix
index d8212fa3830a7..53b4fb0a004fa 100644
--- a/pkgs/development/idris-modules/bifunctors.nix
+++ b/pkgs/development/idris-modules/bifunctors.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "bifunctors";
   version = "2017-02-07";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "japesinator";
     repo = "Idris-Bifunctors";
@@ -26,6 +21,5 @@ build-idris-package  {
     description = "A small bifunctor library for idris";
     homepage = https://github.com/japesinator/Idris-Bifunctors;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index 44efa97a53193..1cd687058b3a4 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -10,6 +10,9 @@ build-idris-package {
   inherit name version;
   inherit (idris) src;
 
+  noPrelude = true;
+  noBase = true;
+
   idrisDeps = deps;
 
   postUnpack = ''
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 0416e76afa9e0..7168eb2c956f4 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -1,23 +1,29 @@
 # Build an idris package
-{ stdenv, idrisPackages, gmp }:
+{ stdenv, lib, idrisPackages, gmp }:
   { idrisDeps ? []
+  , noPrelude ? false
+  , noBase ? false
   , name
   , version
-  , src
-  , meta
   , extraBuildInputs ? []
-  , postUnpack ? ""
-  , doCheck ? true
-  }:
+  , ...
+  }@attrs:
 let
-  idris-with-packages = idrisPackages.with-packages idrisDeps;
+  allIdrisDeps = idrisDeps
+    ++ lib.optional (!noPrelude) idrisPackages.prelude
+    ++ lib.optional (!noBase) idrisPackages.base;
+  idris-with-packages = idrisPackages.with-packages allIdrisDeps;
+  newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // {
+    meta = attrs.meta // {
+      platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms;
+    };
+  };
 in
 stdenv.mkDerivation ({
-
   name = "${name}-${version}";
 
-  inherit postUnpack src doCheck meta;
-
+  buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs;
+  propagatedBuildInputs = allIdrisDeps;
 
   # Some packages use the style
   # opts = -i ../../path/to/package
@@ -27,20 +33,18 @@ stdenv.mkDerivation ({
   '';
 
   buildPhase = ''
-    ${idris-with-packages}/bin/idris --build *.ipkg
+    idris --build *.ipkg
   '';
 
   checkPhase = ''
     if grep -q test *.ipkg; then
-      ${idris-with-packages}/bin/idris --testpkg *.ipkg
+      idris --testpkg *.ipkg
     fi
   '';
 
   installPhase = ''
-    ${idris-with-packages}/bin/idris --install *.ipkg --ibcsubdir $out/libs
+    idris --install *.ipkg --ibcsubdir $out/libs
+    IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true
   '';
 
-  buildInputs = [ gmp ] ++ extraBuildInputs;
-
-  propagatedBuildInputs = idrisDeps;
-})
+} // newAttrs)
diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix
index 2e5518c953c4b..ad63cb28399dc 100644
--- a/pkgs/development/idris-modules/bytes.nix
+++ b/pkgs/development/idris-modules/bytes.nix
@@ -1,18 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "bytes";
   version = "2018-02-10";
 
-  idrisDeps = [ prelude ];
-
-  extraBuildInputs = [ idris ];
-
   src = fetchFromGitHub {
     owner = "ziman";
     repo = "idris-bytes";
@@ -24,6 +17,5 @@ build-idris-package  {
     description = "FFI-based byte buffers for Idris";
     homepage = https://github.com/ziman/idris-bytes;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix
index f29d59e50508e..72e5e3f5be7e5 100644
--- a/pkgs/development/idris-modules/canvas.nix
+++ b/pkgs/development/idris-modules/canvas.nix
@@ -1,15 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
 build-idris-package  {
   name = "canvas";
   version = "2017-11-09";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "JinWuZhao";
     repo = "idriscanvas";
@@ -21,6 +17,5 @@ build-idris-package  {
     description = "Idris FFI binding for html5 canvas 2d api";
     homepage = https://github.com/JinWuZhao/idriscanvas;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
index 32be0f6a37957..1e234b3f6934d 100644
--- a/pkgs/development/idris-modules/categories.nix
+++ b/pkgs/development/idris-modules/categories.nix
@@ -1,27 +1,22 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "categories";
-  version = "2017-03-01";
-
-  idrisDeps = [ prelude base ];
+  version = "2018-07-02";
 
+  # https://github.com/danilkolikov/categories/pull/5
   src = fetchFromGitHub {
-    owner = "danilkolikov";
+    owner = "infinisil";
     repo = "categories";
-    rev = "933fe418d154e10df39ddb09a74419cb4c4a57e8";
-    sha256 = "1dmpcv13zh7j4k6s2nlpf08gmpawaqaqkbqbg8zrgw253piwb0ci";
+    rev = "9722d62297e5025431e91b271ab09c5d14867236";
+    sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2";
   };
 
   meta = {
     description = "Category Theory";
     homepage = https://github.com/danilkolikov/categories;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix
index ed51bcfec6d06..7dbd12110888a 100644
--- a/pkgs/development/idris-modules/coda.nix
+++ b/pkgs/development/idris-modules/coda.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "coda";
   version = "2018-01-25";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "ostera";
     repo = "idris-coda";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/ostera/idris-coda;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix
index 5ecd6d9c585eb..a47739d52b1ab 100644
--- a/pkgs/development/idris-modules/comonad.nix
+++ b/pkgs/development/idris-modules/comonad.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "comonad";
   version = "2018-02-26";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "vmchale";
     repo = "comonad";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/comonad;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix
index 17dda31a5d157..de93d39395bcf 100644
--- a/pkgs/development/idris-modules/composition.nix
+++ b/pkgs/development/idris-modules/composition.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , hezarfen
 , lib
-, idris
 }:
 build-idris-package  {
   name = "composition";
   version = "2017-11-12";
 
-  idrisDeps = [ prelude hezarfen ];
+  idrisDeps = [ hezarfen ];
 
   src = fetchFromGitHub {
     owner = "vmchale";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/composition;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix
index 29cb828e06154..5c37961b7cb34 100644
--- a/pkgs/development/idris-modules/config.nix
+++ b/pkgs/development/idris-modules/config.nix
@@ -1,18 +1,16 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , containers
 , lightyear
 , test
 , lib
-, idris
 }:
 build-idris-package  {
   name = "config";
   version = "2017-11-06";
 
-  idrisDeps = [ prelude effects containers lightyear test ];
+  idrisDeps = [ effects containers lightyear test ];
 
   src = fetchFromGitHub {
     owner = "benclifford";
@@ -26,6 +24,5 @@ build-idris-package  {
     homepage = https://github.com/benclifford/idris-config;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix
index 27b85c97c68ea..71785483ce66c 100644
--- a/pkgs/development/idris-modules/console.nix
+++ b/pkgs/development/idris-modules/console.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , hrtime
 , webgl
 , lib
-, idris
 }:
 build-idris-package  {
   name = "console";
   version = "2017-04-20";
 
-  idrisDeps = [ prelude idrisscript hrtime webgl ];
+  idrisDeps = [ idrisscript hrtime webgl ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -25,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-console;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix
index fe4e729d0e04e..c12ea54f5f9f7 100644
--- a/pkgs/development/idris-modules/containers.nix
+++ b/pkgs/development/idris-modules/containers.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , test
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "containers";
   version = "2017-09-10";
 
-  idrisDeps = [ prelude effects test ];
+  idrisDeps = [ effects test ];
 
   src = fetchFromGitHub {
     owner = "jfdm";
@@ -29,6 +26,5 @@ build-idris-package  {
     homepage = https://github.com/jfdm/idris-containers;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix
index ce46c4538b5bb..7ccda5f21c064 100644
--- a/pkgs/development/idris-modules/cube.nix
+++ b/pkgs/development/idris-modules/cube.nix
@@ -1,17 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "cube";
   version = "2017-07-05";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "aatxe";
     repo = "cube.idr";
@@ -24,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/aatxe/cube.idr;
     license = lib.licenses.agpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/curses.nix b/pkgs/development/idris-modules/curses.nix
index 71bd9023840c6..98b42f827b9c7 100644
--- a/pkgs/development/idris-modules/curses.nix
+++ b/pkgs/development/idris-modules/curses.nix
@@ -1,18 +1,16 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , ncurses
 }:
 build-idris-package  {
   name = "curses";
   version = "2017-10-12";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
-  extraBuildInputs = [ ncurses.out ncurses.dev ];
+  extraBuildInputs = [ ncurses ];
 
   postUnpack = ''
     sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
@@ -31,6 +29,5 @@ build-idris-package  {
     homepage = https://github.com/JakobBruenker/curses-idris;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix
index 3cb78eabe96c0..1c515ec39754a 100644
--- a/pkgs/development/idris-modules/data.nix
+++ b/pkgs/development/idris-modules/data.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "data";
   version = "2018-03-19";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "jdevuyst";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/jdevuyst/idris-data;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 1dfa4e48899af..25f8dba00b02f 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -31,10 +31,9 @@
 
     # Idris wrapper with specified compiler and library paths, used to build packages
 
-    idris =
-        (pkgs.callPackage ./idris-wrapper.nix {})
-          idris-no-deps
-          { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
+    idris = pkgs.callPackage ./idris-wrapper.nix {
+      inherit idris-no-deps;
+    };
 
     # Utilities for building packages
 
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
index 6cc2ead71fc63..7b6cb64cfe370 100644
--- a/pkgs/development/idris-modules/derive.nix
+++ b/pkgs/development/idris-modules/derive.nix
@@ -1,22 +1,21 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "derive";
-  version = "2018-02-15";
+  version = "2018-07-02";
 
-  idrisDeps = [ prelude contrib pruviloj ];
+  idrisDeps = [ contrib pruviloj ];
 
+  # https://github.com/david-christiansen/derive-all-the-instances/pull/9
   src = fetchFromGitHub {
-    owner = "davlum";
+    owner = "infinisil";
     repo = "derive-all-the-instances";
-    rev = "2c8956807bd094ba33569227de921c6726401c42";
-    sha256 = "0l7263s04r52ql292vnnx2kngld6s1dipmaz5na7m82lj9p4x17y";
+    rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604";
+    sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn";
   };
 
   meta = {
@@ -24,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/davlum/derive-all-the-instances;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix
index 736b25c9684d0..8c808447f64c4 100644
--- a/pkgs/development/idris-modules/descncrunch.nix
+++ b/pkgs/development/idris-modules/descncrunch.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "descncrunch";
   version = "2017-11-15";
 
-  idrisDeps = [ prelude pruviloj ];
+  idrisDeps = [ pruviloj ];
 
   src = fetchFromGitHub {
     owner = "ahmadsalim";
@@ -23,6 +21,6 @@ build-idris-package  {
     homepage = https://github.com/ahmadsalim/desc-n-crunch;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix
index ea1cd5a9fe192..c17ed9eefa290 100644
--- a/pkgs/development/idris-modules/dict.nix
+++ b/pkgs/development/idris-modules/dict.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "dict";
   version = "2016-12-26";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "be5invis";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/be5invis/idris-dict;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix
index 0aee97f92e619..e215e069609aa 100644
--- a/pkgs/development/idris-modules/dom.nix
+++ b/pkgs/development/idris-modules/dom.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , html
 , xhr
 , lib
-, idris
 }:
 build-idris-package  {
   name = "dom";
   version = "2017-04-22";
 
-  idrisDeps = [ prelude idrisscript html xhr ];
+  idrisDeps = [ idrisscript html xhr ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -25,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-dom;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix
index 7dabfd8f45c45..3989b8f411357 100644
--- a/pkgs/development/idris-modules/electron.nix
+++ b/pkgs/development/idris-modules/electron.nix
@@ -1,18 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , jheiling-extras
 , jheiling-js
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "electron";
   version = "2016-03-07";
 
-  idrisDeps = [ prelude contrib jheiling-extras jheiling-js ];
+  idrisDeps = [ contrib jheiling-extras jheiling-js ];
 
   src = fetchFromGitHub {
     owner = "jheiling";
@@ -31,6 +28,5 @@ build-idris-package  {
     homepage = https://github.com/jheiling/idris-electron;
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix
index ddbc0d79b84e5..9e0529628fefa 100644
--- a/pkgs/development/idris-modules/eternal.nix
+++ b/pkgs/development/idris-modules/eternal.nix
@@ -1,21 +1,19 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "eternal";
-  version = "2018-01-25";
+  version = "2018-07-02";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "Heather";
     repo = "Control.Eternal.Idris";
-    rev = "7ead56ce6065b55104460ace945adbce38fb13eb";
-    sha256 = "0b4zys4mhl6r4rbpdxr7n2n20cdc0nkh4lm8n5v4wxkmjzna5cpd";
+    rev = "2f84b0dd49a7a29a2f852ba96cabfe8322e0852b";
+    sha256 = "1x8cwngiqi05f3wll0niznm47jj2byivx4mh5xf4sb47kciwkxvs";
   };
 
   postUnpack = ''
@@ -30,6 +28,5 @@ build-idris-package  {
     homepage = https://github.com/Heather/Control.Eternal.Idris;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix
index 2c88399eb3c04..bf0e609a61035 100644
--- a/pkgs/development/idris-modules/farrp.nix
+++ b/pkgs/development/idris-modules/farrp.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "farrp";
   version = "2018-02-13";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "lambda-11235";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/lambda-11235/FarRP;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix
index cc0820d3c6463..8e979ea796ec2 100644
--- a/pkgs/development/idris-modules/free.nix
+++ b/pkgs/development/idris-modules/free.nix
@@ -1,15 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
 build-idris-package  {
   name = "free";
   version = "2017-07-03";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-free";
@@ -22,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/idris-hackers/idris-free;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix
index 24f57af5257e7..c6d8d8cf9133b 100644
--- a/pkgs/development/idris-modules/fsm.nix
+++ b/pkgs/development/idris-modules/fsm.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "fsm";
   version = "2017-04-16";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "ctford";
     repo = "flying-spaghetti-monster";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/ctford/flying-spaghetti-monster;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix
index 041c18faedcdf..535f549a5ebed 100644
--- a/pkgs/development/idris-modules/glfw.nix
+++ b/pkgs/development/idris-modules/glfw.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , pkgs
 }:
-
 build-idris-package  {
   name = "glfw";
   version = "2016-12-05";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   extraBuildInputs = [ pkgs.glfw ];
 
@@ -27,6 +24,5 @@ build-idris-package  {
     homepage = https://github.com/eckart/glfw-idris;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix
index 3ea20d3d906e9..955b459289af0 100644
--- a/pkgs/development/idris-modules/graphviz.nix
+++ b/pkgs/development/idris-modules/graphviz.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitLab
-, prelude
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "graphviz";
   version = "2017-01-16";
 
-  idrisDeps = [ prelude lightyear ];
+  idrisDeps = [ lightyear ];
 
   src = fetchFromGitLab {
     owner = "mgttlinger";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/mgttlinger/idris-graphviz;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix
index 7a2d0d77c8322..17706d1b09691 100644
--- a/pkgs/development/idris-modules/hamt.nix
+++ b/pkgs/development/idris-modules/hamt.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "idris-hamt";
   version = "2016-11-15";
 
-  idrisDeps = [ prelude contrib effects ];
+  idrisDeps = [ contrib effects ];
 
   src = fetchFromGitHub {
     owner = "bamboo";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/bamboo/idris-hamt;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
index 8a283eada8a12..3fa546466c8a2 100644
--- a/pkgs/development/idris-modules/heyting-algebra.nix
+++ b/pkgs/development/idris-modules/heyting-algebra.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "heyting-algebra";
   version = "2017-08-18";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "Risto-Stevcev";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix
index 712508220a6b2..f538cb29850c9 100644
--- a/pkgs/development/idris-modules/hezarfen.nix
+++ b/pkgs/development/idris-modules/hezarfen.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "hezarfen";
   version = "2018-02-03";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "joom";
     repo = "hezarfen";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/joom/hezarfen;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix
index ba4df28ab26ea..09fabb6715dbe 100644
--- a/pkgs/development/idris-modules/hrtime.nix
+++ b/pkgs/development/idris-modules/hrtime.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , lib
-, idris
 }:
 build-idris-package  {
   name = "hrtime";
   version = "2017-04-16";
 
-  idrisDeps = [ prelude idrisscript ];
+  idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-hrtime;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix
index deec5b0eb6dcb..a44f0e70252d8 100644
--- a/pkgs/development/idris-modules/html.nix
+++ b/pkgs/development/idris-modules/html.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , hrtime
 , webgl
 , lib
-, idris
 }:
 build-idris-package  {
   name = "html";
   version = "2017-04-23";
 
-  idrisDeps = [ prelude idrisscript hrtime webgl ];
+  idrisDeps = [ idrisscript hrtime webgl ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -29,6 +27,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-html;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix
index 800a3a2eeb49c..beec74a2f6576 100644
--- a/pkgs/development/idris-modules/http.nix
+++ b/pkgs/development/idris-modules/http.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lightyear
 , bytes
 , lib
-, idris
 }:
 build-idris-package  {
   name = "http";
   version = "2018-02-25";
 
-  idrisDeps = [ prelude contrib lightyear bytes ];
+  idrisDeps = [ contrib lightyear bytes ];
 
   src = fetchFromGitHub {
     owner = "uwap";
@@ -25,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/uwap/idris-http;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix
index 5b79644c3a0b2..80e95745f0332 100644
--- a/pkgs/development/idris-modules/http4idris.nix
+++ b/pkgs/development/idris-modules/http4idris.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "http4idris";
   version = "2018-01-16";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "A1kmm";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/A1kmm/http4idris;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix
index 5b4f450fdf7ec..f317b980d5297 100644
--- a/pkgs/development/idris-modules/iaia.nix
+++ b/pkgs/development/idris-modules/iaia.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "iaia";
   version = "2017-11-10";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "sellout";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/sellout/Iaia;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
index fcd02c4da2462..f395bcd95d7c5 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -1,14 +1,12 @@
-{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }:
+{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
 
 symlinkJoin {
-  name = idris.name;
-  src = idris.src;
-  paths = [ idris ];
+  inherit (idris-no-deps) name src meta;
+  paths = [ idris-no-deps ];
   buildInputs = [ makeWrapper ];
-  meta.platforms = idris.meta.platforms;
   postBuild = ''
     wrapProgram $out/bin/idris \
-      --suffix PATH : ${ stdenv.lib.makeBinPath path } \
-      --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib}
-      '';
-  }
+      --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
+      --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]}
+  '';
+}
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix
index f3d06216976e6..d8b469ca76894 100644
--- a/pkgs/development/idris-modules/idrishighlighter.nix
+++ b/pkgs/development/idris-modules/idrishighlighter.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "idrishighlighter";
   version = "2018-02-22";
 
-  idrisDeps = [ prelude effects lightyear ];
+  idrisDeps = [ effects lightyear ];
 
   src = fetchFromGitHub {
     owner = "david-christiansen";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/david-christiansen/idris-code-highlighter;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix
index fd2f9e5821803..4365c588769bd 100644
--- a/pkgs/development/idris-modules/idrisscript.nix
+++ b/pkgs/development/idris-modules/idrisscript.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "idrisscript";
   version = "2017-07-01";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "IdrisScript";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/idris-hackers/IdrisScript;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix
index cdc1d593c0113..3a4c0954fe814 100644
--- a/pkgs/development/idris-modules/ipkgparser.nix
+++ b/pkgs/development/idris-modules/ipkgparser.nix
@@ -1,17 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "ipkgparser";
   version = "2017-11-14";
 
-  idrisDeps = [ prelude contrib effects lightyear ];
+  idrisDeps = [ contrib effects lightyear ];
 
   src = fetchFromGitHub {
     owner = "emptyflash";
@@ -24,6 +22,5 @@ build-idris-package  {
     description = "Parser for Idris iPkg files written in Idris using Lightyear";
     homepage = https://github.com/emptyflash/idris-ipkg-parser;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix
index 34981d28d3ea4..58f8a13864a46 100644
--- a/pkgs/development/idris-modules/jheiling-extras.nix
+++ b/pkgs/development/idris-modules/jheiling-extras.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "extras";
   version = "2018-03-06";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "jheiling";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/jheiling/idris-extras;
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix
index 5139631b9d525..2281e4821f7af 100644
--- a/pkgs/development/idris-modules/jheiling-js.nix
+++ b/pkgs/development/idris-modules/jheiling-js.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , jheiling-extras
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "jheiling-js";
   version = "2016-03-09";
 
-  idrisDeps = [ prelude contrib jheiling-extras ];
+  idrisDeps = [ contrib jheiling-extras ];
 
   src = fetchFromGitHub {
     owner = "jheiling";
@@ -25,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/jheiling/idris-js;
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix
index 0792a8c0f5d7f..55169caaa1011 100644
--- a/pkgs/development/idris-modules/js.nix
+++ b/pkgs/development/idris-modules/js.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "js";
   version = "2018-11-27";
 
-  idrisDeps = [ prelude contrib pruviloj ];
+  idrisDeps = [ contrib pruviloj ];
 
   src = fetchFromGitHub {
     owner = "rbarreiro";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/rbarreiro/idrisjs;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix
index e97c7cfafda19..490fd7bd2ed01 100644
--- a/pkgs/development/idris-modules/lens.nix
+++ b/pkgs/development/idris-modules/lens.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , bifunctors
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "lens";
   version = "2017-09-25";
 
-  idrisDeps = [ prelude bifunctors ];
+  idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {
     owner = "HuwCampbell";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/HuwCampbell/idris-lens;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix
index 6cedda0170f22..fd014db30ef74 100644
--- a/pkgs/development/idris-modules/lightyear.nix
+++ b/pkgs/development/idris-modules/lightyear.nix
@@ -1,17 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , effects
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "lightyear";
   version = "2017-09-10";
 
-  idrisDeps = [ prelude base effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "ziman";
@@ -25,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/ziman/lightyear;
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ siddharthist brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix
index 342a84882cd91..2346c89c48c49 100644
--- a/pkgs/development/idris-modules/logic.nix
+++ b/pkgs/development/idris-modules/logic.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , bifunctors
 , lib
-, idris
 }:
 build-idris-package  {
   name = "logic";
   version = "2016-12-02";
 
-  idrisDeps = [ prelude bifunctors ];
+  idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {
     owner = "yurrriq";
@@ -26,6 +24,5 @@ build-idris-package  {
     homepage = https://github.com/yurrriq/idris-logic;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix
index 84429c88765ec..a4ac168dc4fb8 100644
--- a/pkgs/development/idris-modules/mapping.nix
+++ b/pkgs/development/idris-modules/mapping.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "mapping";
   version = "2018-02-27";
 
-  idrisDeps = [ prelude ];
-
   src = fetchFromGitHub {
     owner = "zaoqi";
     repo = "Mapping.idr";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/zaoqi/Mapping.idr;
     license = lib.licenses.agpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix
index eae30886cd63f..9f4af7cc3b854 100644
--- a/pkgs/development/idris-modules/mhd.nix
+++ b/pkgs/development/idris-modules/mhd.nix
@@ -1,18 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , libmicrohttpd
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "mhd";
   version = "2016-04-22";
 
-  idrisDeps = [ prelude contrib effects ];
+  idrisDeps = [ contrib effects ];
 
   extraBuildInputs = [ libmicrohttpd ];
 
@@ -28,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/colin-adams/idris-libmicrohttpd;
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix
index 3650a3990f245..4ebffa3e87c27 100644
--- a/pkgs/development/idris-modules/pacman.nix
+++ b/pkgs/development/idris-modules/pacman.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , sdl2
 , lib
-, idris
 }:
 build-idris-package  {
   name = "pacman";
   version = "2017-11-10";
 
-  idrisDeps = [ prelude contrib sdl2 ];
+  idrisDeps = [ contrib sdl2 ];
 
   src = fetchFromGitHub {
     owner = "jdublu10";
@@ -27,6 +25,5 @@ build-idris-package  {
     description = "Proof that Idris is pacman complete";
     homepage = https://github.com/jdublu10/pacman;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix
index e3c1cb82f28c6..9ba8c6bb2d4d3 100644
--- a/pkgs/development/idris-modules/patricia.nix
+++ b/pkgs/development/idris-modules/patricia.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , specdris
 , lib
-, idris
 }:
 build-idris-package  {
   name = "patricia";
   version = "2017-10-27";
 
-  idrisDeps = [ prelude specdris ];
+  idrisDeps = [ specdris ];
 
   src = fetchFromGitHub {
     owner = "ChShersh";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/ChShersh/idris-patricia;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix
index af93f4af5e03b..8bcb67fa759a4 100644
--- a/pkgs/development/idris-modules/permutations.nix
+++ b/pkgs/development/idris-modules/permutations.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "permutations";
   version = "2018-01-19";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "vmchale";
     repo = "permutations";
@@ -27,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/permutations;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix
index 8ab75b9ee5096..f9fbd26a0ddb3 100644
--- a/pkgs/development/idris-modules/pfds.nix
+++ b/pkgs/development/idris-modules/pfds.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "pfds";
   version = "2017-09-25";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "timjb";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/timjb/idris-pfds;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix
index 943d8e470f07d..0f62d73b9dac4 100644
--- a/pkgs/development/idris-modules/pipes.nix
+++ b/pkgs/development/idris-modules/pipes.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "pipes";
   version = "2017-12-02";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "QuentinDuval";
     repo = "IdrisPipes";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/QuentinDuval/IdrisPipes;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix
index c6c44874b064a..194b60bd29834 100644
--- a/pkgs/development/idris-modules/posix.nix
+++ b/pkgs/development/idris-modules/posix.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "posix";
   version = "2017-11-18";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-posix";
@@ -25,6 +20,5 @@ build-idris-package  {
     description = "System POSIX bindings for Idris.";
     homepage = https://github.com/idris-hackers/idris-posix;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix
index 4b4c26942022d..1c2a58a6b7cbb 100644
--- a/pkgs/development/idris-modules/protobuf.nix
+++ b/pkgs/development/idris-modules/protobuf.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "protobuf";
   version = "2017-08-12";
 
-  idrisDeps = [ prelude lightyear ];
+  idrisDeps = [ lightyear ];
 
   src = fetchFromGitHub {
     owner = "artagnon";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/artagnon/idris-protobuf;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix
index 693d580fdd57a..7ce290c824ecf 100644
--- a/pkgs/development/idris-modules/rationals.nix
+++ b/pkgs/development/idris-modules/rationals.nix
@@ -1,16 +1,13 @@
-{ curl
-, build-idris-package
+{ build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package {
   name = "rationals";
   version = "2017-04-29";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "mcgordonite";
@@ -22,7 +19,6 @@ build-idris-package {
   meta = {
     description = "An idris rational number type built from paths in the Stern Brocot tree";
     homepage = https://github.com/mcgordonite/idris-binary-rationals;
-    inherit (idris.meta) platforms;
     maintainers = [ lib.maintainers.brainrape ];
   };
 }
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix
index 06e99da36089e..78f3674aeabd0 100644
--- a/pkgs/development/idris-modules/recursion_schemes.nix
+++ b/pkgs/development/idris-modules/recursion_schemes.nix
@@ -1,19 +1,17 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , free
 , composition
 , comonad
 , bifunctors
 , hezarfen
 , lib
-, idris
 }:
 build-idris-package  {
   name = "recursion_schemes";
   version = "2018-01-19";
 
-  idrisDeps = [ prelude free composition comonad bifunctors hezarfen ];
+  idrisDeps = [ free composition comonad bifunctors hezarfen ];
 
   src = fetchFromGitHub {
     owner = "vmchale";
@@ -31,6 +29,5 @@ build-idris-package  {
     homepage = https://github.com/vmchale/recursion_schemes;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix
index bd8e37f2b7f99..00252b6a7cd68 100644
--- a/pkgs/development/idris-modules/refined.nix
+++ b/pkgs/development/idris-modules/refined.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "refined";
   version = "2017-12-28";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "janschultecom";
     repo = "idris-refined";
@@ -27,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/janschultecom/idris-refined;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix
index 181959dca063d..4495e60d6bb6c 100644
--- a/pkgs/development/idris-modules/sdl.nix
+++ b/pkgs/development/idris-modules/sdl.nix
@@ -1,20 +1,17 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , SDL
 , SDL_gfx
 }:
-
 build-idris-package  {
   name = "sdl";
   version = "2017-03-24";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
-  extraBuildInputs = [ idris SDL SDL_gfx ];
+  extraBuildInputs = [ SDL SDL_gfx ];
 
   src = fetchFromGitHub {
     owner = "edwinb";
@@ -27,6 +24,7 @@ build-idris-package  {
     description = "SDL-idris framework for Idris";
     homepage = https://github.com/edwinb/SDL-idris;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
+    # Can't find file sdlrun.o
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
index 46d4e9fb8ddce..b0306040d730b 100644
--- a/pkgs/development/idris-modules/sdl2.nix
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -1,21 +1,18 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 , pkgconfig
 , SDL2
 , SDL2_gfx
 }:
-
 build-idris-package  {
   name = "sdl2";
   version = "2018-01-19";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
-  extraBuildInputs = [ idris pkgconfig SDL2 SDL2_gfx ];
+  extraBuildInputs = [ pkgconfig SDL2 SDL2_gfx ];
 
   src = fetchFromGitHub {
     owner = "steshaw";
@@ -28,6 +25,7 @@ build-idris-package  {
     description = "SDL2 binding for Idris";
     homepage = https://github.com/steshaw/idris-sdl2;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
+    # Can't find file sdl2.o
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix
index d10a85eb4f4a0..8e7428665cd28 100644
--- a/pkgs/development/idris-modules/semidirect.nix
+++ b/pkgs/development/idris-modules/semidirect.nix
@@ -1,28 +1,25 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , patricia
 , lib
-, idris
 }:
 build-idris-package  {
   name = "semidirect";
-  version = "2018-02-06";
+  version = "2018-07-02";
 
-  idrisDeps = [ prelude contrib patricia ];
+  idrisDeps = [ contrib patricia ];
 
   src = fetchFromGitHub {
     owner = "clayrat";
     repo = "idris-semidirect";
-    rev = "884c26c095784f8fd489c323d6673f2a8710a741";
-    sha256 = "0w36xkfxsqm6r91f0vs6qpmallrfwa09ql8i317xwm86nfk7akj9";
+    rev = "e19c58f7a25c53bba2ab058821e038bae3c093d2";
+    sha256 = "0182r9z34kbv3l78pw4qf48ng3hqj4sqzy53074mb0b2c3pikcrl";
   };
 
   meta = {
     description = "Semidirect products in Idris";
     homepage = https://github.com/clayrat/idris-semidirect;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix
index 76bf127818ce3..6db49c3c3c9f9 100644
--- a/pkgs/development/idris-modules/setoids.nix
+++ b/pkgs/development/idris-modules/setoids.nix
@@ -1,26 +1,24 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
+, contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "setoids";
-  version = "2017-03-13";
+  version = "2018-06-18";
 
-  idrisDeps = [ prelude ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "danilkolikov";
     repo = "setoids";
-    rev = "a50cfc010cb4321cc9b7988c0a4f387d83d34839";
-    sha256 = "0q0h2qj9vylkm16h70l78l2p5xjkx4qmg2a2ixfl8vq8b1zm8gch";
+    rev = "41b4af3b1a537d9471107a639ad77c7abee2de18";
+    sha256 = "0fl1g59s16vnrdnplps5ncv27j7a93nxp9cmqp2iavjxlzlzin1v";
   };
 
   meta = {
     description = "Idris proofs for extensional equalities";
     homepage = https://github.com/danilkolikov/setoids;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix
index c751f27d1c970..97ed06d307ad9 100644
--- a/pkgs/development/idris-modules/smproc.nix
+++ b/pkgs/development/idris-modules/smproc.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "smproc";
   version = "2018-02-08";
 
-  idrisDeps = [ prelude base contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "jameshaydon";
@@ -24,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/jameshaydon/smproc;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix
index 9dc2dd3f8e234..c8d993ccb8a28 100644
--- a/pkgs/development/idris-modules/snippets.nix
+++ b/pkgs/development/idris-modules/snippets.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "snippets";
   version = "2018-03-17";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "palladin";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/palladin/idris-snippets;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix
index 3d16e91e10f3b..577482433029c 100644
--- a/pkgs/development/idris-modules/software_foundations.nix
+++ b/pkgs/development/idris-modules/software_foundations.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , pruviloj
 , lib
-, idris
 }:
 build-idris-package  {
   name = "software_foundations";
   version = "2017-11-04";
 
-  idrisDeps = [ prelude pruviloj ];
+  idrisDeps = [ pruviloj ];
 
   src = fetchFromGitHub {
     owner = "idris-hackers";
@@ -22,6 +20,5 @@ build-idris-package  {
     description = "Code for Software Foundations in Idris";
     homepage = https://github.com/idris-hackers/software-foundations;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix
index b18d4a07d46f4..06982a0b2bad6 100644
--- a/pkgs/development/idris-modules/specdris.nix
+++ b/pkgs/development/idris-modules/specdris.nix
@@ -1,23 +1,20 @@
 { build-idris-package
-, fetchgit
-, prelude
-, base
+, fetchFromGitHub
 , effects
 , lib
-, idris
 }:
-
 build-idris-package {
   name = "specdris";
   version = "2018-01-23";
 
-  src = fetchgit {
-    url = "https://github.com/pheymann/specdris";
+  src = fetchFromGitHub {
+    owner = "pheymann";
+    repo = "specdris";
     rev = "625f88f5e118e53f30bcf5e5f3dcf48eb268ac21";
     sha256 = "1gc717xf4i7z75aqazy5wqm7b1dqfyx5pprdypxz1h3980m67fsa";
   };
 
-  idrisDeps = [ prelude base effects idris ];
+  idrisDeps = [ effects ];
 
   # tests use a different ipkg and directory structure
   doCheck = false;
diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix
index 5f6eccd98cd5e..7f80a1ce3c505 100644
--- a/pkgs/development/idris-modules/tap.nix
+++ b/pkgs/development/idris-modules/tap.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "tap";
   version = "2017-04-08";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "ostera";
@@ -27,6 +25,5 @@ build-idris-package  {
     homepage = https://github.com/ostera/tap-idris;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix
index d0688c54a6594..ccb575e270ccc 100644
--- a/pkgs/development/idris-modules/test.nix
+++ b/pkgs/development/idris-modules/test.nix
@@ -1,16 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "test";
   version = "2017-03-30";
 
-  idrisDeps = [ prelude effects ];
+  idrisDeps = [ effects ];
 
   src = fetchFromGitHub {
     owner = "jfdm";
@@ -19,7 +16,6 @@ build-idris-package  {
     sha256 = "1pmyhs3jx6wd0pzjd3igfxb9zjs8pqmk4ah352bxjrqdnhqwrl51";
   };
 
-
   doCheck = false;
 
   meta = {
@@ -27,6 +23,5 @@ build-idris-package  {
     homepage = https://github.com/jfdm/idris-testing;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix
index 9106e485c5f0b..ffe1e46d86e11 100644
--- a/pkgs/development/idris-modules/tlhydra.nix
+++ b/pkgs/development/idris-modules/tlhydra.nix
@@ -1,18 +1,15 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , effects
 , contrib
 , lightyear
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "tlhydra";
   version = "2017-13-26";
 
-  idrisDeps = [ prelude effects contrib lightyear ];
+  idrisDeps = [ effects contrib lightyear ];
 
   src = fetchFromGitHub {
     owner = "Termina1";
@@ -25,6 +22,5 @@ build-idris-package  {
     description = "Idris parser and serializer/deserealizer for TL language";
     homepage = https://github.com/Termina1/tlhydra;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix
index a5d99d1928435..402b5a01b7655 100644
--- a/pkgs/development/idris-modules/tomladris.nix
+++ b/pkgs/development/idris-modules/tomladris.nix
@@ -1,17 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lightyear
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "tomladris";
   version = "2017-11-14";
 
-  idrisDeps = [ prelude lightyear contrib ];
+  idrisDeps = [ lightyear contrib ];
 
   src = fetchFromGitHub {
     owner = "emptyflash";
@@ -25,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/emptyflash/tomladris;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siddharthist brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix
index db45f0408ab9d..1823e76c290d3 100644
--- a/pkgs/development/idris-modules/tp.nix
+++ b/pkgs/development/idris-modules/tp.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "tp";
   version = "2017-08-15";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "superfunc";
     repo = "tp";
@@ -26,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/superfunc/tp;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index a2077fca20d75..bd895a33bae3f 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -1,21 +1,16 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , lib
-, idris
 }:
-
 build-idris-package  {
   name = "tparsec";
-  version = "2017-12-12";
-
-  idrisDeps = [ prelude ];
+  version = "2018-06-26";
 
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "idris-tparsec";
-    rev = "fb87d08f8f58c934f37d8324b43b0979abcf2183";
-    sha256 = "0362076bfs976gqki4b4pxblhnk4xglgx5v2aycjpxsxlpxh6cfd";
+    rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2";
+    sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30";
   };
 
   meta = {
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/gallais/idris-tparsec;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix
index d63a11a023463..8f10f9bd247e9 100644
--- a/pkgs/development/idris-modules/transducers.nix
+++ b/pkgs/development/idris-modules/transducers.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "transducers";
   version = "2017-07-28";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "QuentinDuval";
     repo = "IdrisReducers";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/QuentinDuval/IdrisReducers;
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix
index 78ad70690b3a3..69042e27d3d5c 100644
--- a/pkgs/development/idris-modules/trees.nix
+++ b/pkgs/development/idris-modules/trees.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , bi
 , lib
-, idris
 }:
 build-idris-package  {
   name = "trees";
   version = "2018-03-19";
 
-  idrisDeps = [ prelude contrib bi ];
+  idrisDeps = [ contrib bi ];
 
   src = fetchFromGitHub {
     owner = "clayrat";
@@ -23,6 +21,5 @@ build-idris-package  {
     description = "Trees in Idris";
     homepage = https://github.com/clayrat/idris-trees;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix
index 845bec3d84e80..3a6dced48ceee 100644
--- a/pkgs/development/idris-modules/union_type.nix
+++ b/pkgs/development/idris-modules/union_type.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "union_type";
   version = "2018-01-30";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "berewt";
     repo = "UnionType";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/berewt/UnionType;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix
index 034bda583dbca..7f1ecb61c8ecd 100644
--- a/pkgs/development/idris-modules/vdom.nix
+++ b/pkgs/development/idris-modules/vdom.nix
@@ -1,16 +1,11 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package  {
   name = "vdom";
   version = "0.6.0";
 
-  idrisDeps = [ prelude base ];
-
   src = fetchFromGitHub {
     owner = "brandondyck";
     repo = "idris-vdom";
@@ -23,6 +18,5 @@ build-idris-package  {
     homepage = https://github.com/brandondyck/idris-vdom;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix
index d2fa9e31ae38b..bf7e56cf8c094 100644
--- a/pkgs/development/idris-modules/vecspace.nix
+++ b/pkgs/development/idris-modules/vecspace.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lib
-, idris
 }:
 build-idris-package  {
   name = "vecspace";
   version = "2018-01-12";
 
-  idrisDeps = [ prelude contrib ];
+  idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
     owner = "clayrat";
@@ -22,6 +20,5 @@ build-idris-package  {
     description = "Abstract vector spaces in Idris";
     homepage = https://github.com/clayrat/idris-vecspace;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix
index 3793a812e57f2..ddd0dec03a4ac 100644
--- a/pkgs/development/idris-modules/webgl.nix
+++ b/pkgs/development/idris-modules/webgl.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , lib
-, idris
 }:
 build-idris-package  {
   name = "webgl";
   version = "2017-05-08";
 
-  idrisDeps = [ prelude idrisscript ];
+  idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-webgl;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index 8b390d4bf5be2..47136839d01ab 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -15,6 +15,6 @@ stdenv.lib.appendToName "with-packages" (symlinkJoin {
   postBuild = ''
     wrapProgram $out/bin/idris \
       --set IDRIS_LIBRARY_PATH $out/libs
-      '';
+  '';
 
 })
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 55a926d780d6a..baceb2214e3cc 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -1,9 +1,6 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
-, base
 , lib
-, idris
 }:
 build-idris-package {
   name = "wl-pprint";
@@ -16,12 +13,9 @@ build-idris-package {
     sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d";
   };
 
-  idrisDeps = [ prelude base ];
-
   meta = {
     description = "Wadler-Leijen pretty-printing library";
     homepage = https://github.com/shayan-najd/wl-pprint;
     license = lib.licenses.bsd2;
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix
index a1724476f6c48..870bf1a6b9b8e 100644
--- a/pkgs/development/idris-modules/wyvern.nix
+++ b/pkgs/development/idris-modules/wyvern.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , effects
 , lib
-, idris
 }:
 build-idris-package  {
   name = "wyvern";
   version = "2017-06-26";
 
-  idrisDeps = [ prelude contrib effects ];
+  idrisDeps = [ contrib effects ];
 
   src = fetchFromGitHub {
     owner = "ericqweinstein";
@@ -28,6 +26,5 @@ build-idris-package  {
     homepage = https://github.com/ericqweinstein/wyvern;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix
index 15573cc94611c..9e6f40b963ff8 100644
--- a/pkgs/development/idris-modules/xhr.nix
+++ b/pkgs/development/idris-modules/xhr.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , idrisscript
 , lib
-, idris
 }:
 build-idris-package  {
   name = "xhr";
   version = "2017-04-22";
 
-  idrisDeps = [ prelude idrisscript ];
+  idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
     owner = "pierrebeaucamp";
@@ -23,6 +21,5 @@ build-idris-package  {
     homepage = https://github.com/pierrebeaucamp/idris-xhr;
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix
index ff935753ce936..ec689ce4805a8 100644
--- a/pkgs/development/idris-modules/yaml.nix
+++ b/pkgs/development/idris-modules/yaml.nix
@@ -1,16 +1,14 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , contrib
 , lightyear
 , lib
-, idris
 }:
 build-idris-package  {
   name = "yaml";
   version = "2018-01-25";
 
-  idrisDeps = [ prelude contrib lightyear ];
+  idrisDeps = [ contrib lightyear ];
 
   src = fetchFromGitHub {
     owner = "Heather";
@@ -24,6 +22,5 @@ build-idris-package  {
     homepage = https://github.com/Heather/Idris.Yaml;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix
index 661a55bfd7440..0231555b4ad66 100644
--- a/pkgs/development/idris-modules/yampa.nix
+++ b/pkgs/development/idris-modules/yampa.nix
@@ -1,15 +1,13 @@
 { build-idris-package
 , fetchFromGitHub
-, prelude
 , bifunctors
 , lib
-, idris
 }:
 build-idris-package  {
   name = "yampa";
   version = "2016-07-05";
 
-  idrisDeps = [ prelude bifunctors ];
+  idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {
     owner = "BartAdv";
@@ -22,6 +20,5 @@ build-idris-package  {
     description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types";
     homepage = https://github.com/BartAdv/idris-yampa;
     maintainers = [ lib.maintainers.brainrape ];
-    inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 42aaed0b65908..5cea1fd533f2d 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl }:
 
 mkDerivation rec {
-  version = "20.3.2";
-  sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1";
+  version = "20.3.8";
+  sha256 = "1griiszz1x34idmwi6234br7bqd1d7mimim63amjgi9ds79jh6jj";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
new file mode 100644
index 0000000000000..de00ebdf2cb06
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -0,0 +1,10 @@
+{ mkDerivation, fetchurl }:
+
+mkDerivation rec {
+  version = "21.0";
+  sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8";
+
+  prePatch = ''
+    substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
+  '';
+}
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index c13a26204e269..2478493d41d79 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -1,23 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib }:
+{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib
+, mbedtls, cacert
+}:
 
 stdenv.mkDerivation rec {
   name = "gauche-${version}";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
-    sha256 = "0g77nik15whm5frxb7l0pwzd95qlq949dym5pn5p04p17lhm72jc";
+    sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd";
   };
 
   nativeBuildInputs = [ pkgconfig texinfo ];
 
-  buildInputs = [ libiconv gdbm openssl zlib ];
+  buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
 
   configureFlags = [
-    "--enable-multibyte=utf-8"
     "--with-iconv=${libiconv}"
     "--with-dbm=gdbm"
     "--with-zlib=${zlib}"
+    "--with-ca-bundle=$SSL_CERT_FILE"
     # TODO: Enable slib
     #       Current slib in nixpkgs is specialized to Guile
     # "--with-slib=${slibGuile}/lib/slib"
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 87f2ebf2d70e3..790450d5bb065 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "joker-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   goPackagePath = "github.com/candid82/joker";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "1738gr25hlffc8ppzy6kik21jfix9iy316kv1kj1lqxr8giirhf6";
+    sha256 = "15q9w93yjc5zl9z45mkcfizgz5r3mzbkah0ng0hdxf0qqy6b09w8";
   };
 
   preBuild = "go generate ./...";
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
index 1d94fd33a72c5..be49d2dd92156 100644
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ b/pkgs/development/interpreters/lua-4/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lua-4.0.1";
 
   src = fetchurl {
-    url = http://www.lua.org/ftp/lua-4.0.1.tar.gz;
+    url = https://www.lua.org/ftp/lua-4.0.1.tar.gz;
     sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z";
   };
 
diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
index a9e725f128bc3..d343ec6c63b11 100644
--- a/pkgs/development/interpreters/lua-5/5.0.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.0.3.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lua-5.0.3";
 
   src = fetchurl {
-    url = http://www.lua.org/ftp/lua-5.0.3.tar.gz;
+    url = https://www.lua.org/ftp/lua-5.0.3.tar.gz;
     sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671";
   };
 
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 15077578f27f8..271490c995745 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   luaversion = "5.1";
 
   src = fetchurl {
-    url = "http://www.lua.org/ftp/${name}.tar.gz";
+    url = "https://www.lua.org/ftp/${name}.tar.gz";
     sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
   };
 
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index acddbcfd303c8..6221bf3fb8433 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "${luaversion}.3";
 
   src = fetchurl {
-    url = "http://www.lua.org/ftp/${name}.tar.gz";
+    url = "https://www.lua.org/ftp/${name}.tar.gz";
     sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
   };
 
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index 7f0703c62884d..5a4893db06375 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
     Libs: -L$out/lib -llua -lm
     Cflags: -I$out/include
     EOF
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
   '';
 
   meta = {
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 59394d3ccc887..73b979e9ca4fa 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -7,10 +7,8 @@ rec {
     version = "2.0.5";
     isStable = true;
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
-  } // {
-    # 64-bit ARM isn't supported upstream
-    meta = meta // {
-      platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
+    meta = genericMeta // {
+      platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
     };
   };
 
@@ -20,13 +18,12 @@ rec {
     sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
   };
 
-
-  meta = with stdenv.lib; {
+  genericMeta = with stdenv.lib; {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
+    maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
   };
 
   generic =
@@ -37,6 +34,7 @@ rec {
         url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
         inherit sha256;
       })
+    , meta ? genericMeta
     }:
 
     stdenv.mkDerivation rec {
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 4d6f426fae43f..08612ad284949 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -185,8 +185,6 @@ let
     setupHook = ./setup-hook-cross.sh;
   });
 in rec {
-  perl = perl524;
-
   perl522 = common {
     version = "5.22.4";
     sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
@@ -201,4 +199,9 @@ in rec {
     version = "5.26.1";
     sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7";
   };
+
+  perl528 = common {
+    version = "5.28.0";
+    sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky";
+  };
 }
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a669d71036a8c..3032b5e4c2a12 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -348,12 +348,12 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.18";
-    sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq";
+    version = "7.1.19";
+    sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k";
   };
 
   php72 = generic {
-    version = "7.2.6";
-    sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf";
+    version = "7.2.7";
+    sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc";
   };
 }
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 6f7f2df96bff6..37a5bdd0ce94d 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "picoLisp-${version}";
   version = "16.12";
   src = fetchurl {
-    url = "http://www.software-lab.de/${name}.tgz";
+    url = "https://www.software-lab.de/${name}.tgz";
     sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
   };
   buildInputs = optional stdenv.is64bit jdk;
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     homepage = https://picolisp.com/;
     license = licenses.mit;
     platforms = platforms.all;
+    broken = stdenv.isDarwin; # times out
     maintainers = with maintainers; [ raskin tohl ];
   };
 
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index b67ad3db2ef5e..18bc875fb334d 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -6,7 +6,7 @@ python2Packages.buildPythonPackage rec {
   name = "pyrex-${version}";
 
   src = fetchurl {
-    url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
+    url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
     sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z";
   };
 
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 7a0ac5a1e2299..2feb15b647dad 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -6,7 +6,7 @@ python2Packages.buildPythonPackage rec {
   name = "pyrex-${version}";
 
   src = fetchurl {
-    url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
+    url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
     sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8";
   };
 
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index ed1bc9dc817b9..cd1a0fc6e18f4 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -58,6 +58,24 @@ let
       # if DETERMINISTIC_BUILD env var is set
       ./deterministic-build.patch
 
+      # Fix python bug #27177 (https://bugs.python.org/issue27177)
+      # The issue is that `match.group` only recognizes python integers
+      # instead of everything that has `__index__`.
+      # This bug was fixed upstream, but not backported to 2.7
+      (fetchpatch {
+        name = "re_match_index.patch";
+        url = "https://bugs.python.org/file43084/re_match_index.patch";
+        sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
+      })
+
+      # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self".
+      # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor."
+      # https://github.com/python/cpython/pull/6118
+      (fetchpatch {
+        name = "type_getattro.patch";
+        url = "file://${./type_getattro.patch}";
+        sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
+      })
     ] ++ optionals (x11Support && stdenv.isDarwin) [
       ./use-correct-tcl-tk-on-darwin.patch
     ] ++ optionals stdenv.isLinux [
diff --git a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch b/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch
new file mode 100644
index 0000000000000..c69c86b642b4c
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch
@@ -0,0 +1,62 @@
+--- a/Objects/typeobject.c
++++ b/Objects/typeobject.c
+@@ -3137,6 +3137,7 @@
+     PyTypeObject *metatype = Py_TYPE(type);
+     PyObject *meta_attribute, *attribute;
+     descrgetfunc meta_get;
++    PyObject* res;
+ 
+     if (!PyUnicode_Check(name)) {
+         PyErr_Format(PyExc_TypeError,
+@@ -3158,6 +3159,7 @@
+     meta_attribute = _PyType_Lookup(metatype, name);
+ 
+     if (meta_attribute != NULL) {
++        Py_INCREF(meta_attribute);
+         meta_get = Py_TYPE(meta_attribute)->tp_descr_get;
+ 
+         if (meta_get != NULL && PyDescr_IsData(meta_attribute)) {
+@@ -3165,10 +3167,11 @@
+              * writes. Assume the attribute is not overridden in
+              * type's tp_dict (and bases): call the descriptor now.
+              */
+-            return meta_get(meta_attribute, (PyObject *)type,
+-                            (PyObject *)metatype);
++            res = meta_get(meta_attribute, (PyObject *)type,
++                           (PyObject *)metatype);
++            Py_DECREF(meta_attribute);
++            return res;
+         }
+-        Py_INCREF(meta_attribute);
+     }
+ 
+     /* No data descriptor found on metatype. Look in tp_dict of this
+@@ -3176,6 +3179,7 @@
+     attribute = _PyType_Lookup(type, name);
+     if (attribute != NULL) {
+         /* Implement descriptor functionality, if any */
++        Py_INCREF(attribute);
+         descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get;
+ 
+         Py_XDECREF(meta_attribute);
+@@ -3183,11 +3187,12 @@
+         if (local_get != NULL) {
+             /* NULL 2nd argument indicates the descriptor was
+              * found on the target object itself (or a base)  */
+-            return local_get(attribute, (PyObject *)NULL,
+-                             (PyObject *)type);
++            res = local_get(attribute, (PyObject *)NULL,
++                            (PyObject *)type);
++            Py_DECREF(attribute);
++            return res;
+         }
+ 
+-        Py_INCREF(attribute);
+         return attribute;
+     }
+ 
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst	
+@@ -0,0 +1,2 @@
++Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a
++descriptor deletes itself from the class.
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 5ee5c91795349..fc68aae1c0457 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -207,7 +207,7 @@ in stdenv.mkDerivation {
     withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
     pkgs = pythonPackages;
     isPy3 = true;
-    isPy35 = true;
+    isPy36 = true;
     is_py3k = true;  # deprecated
     interpreter = "${self}/bin/${executable}";
   };
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
new file mode 100644
index 0000000000000..4c84727d3cbcb
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -0,0 +1,185 @@
+{ stdenv, fetchurl, fetchpatch
+, glibc
+, bzip2
+, expat
+, libffi
+, gdbm
+, lzma
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
+, zlib
+, callPackage
+, self
+, CF, configd
+, python-setup-hook
+# For the Python package set
+, pkgs, packageOverrides ? (self: super: {})
+}:
+
+assert x11Support -> tcl != null
+                  && tk != null
+                  && xproto != null
+                  && libX11 != null;
+with stdenv.lib;
+
+let
+  majorVersion = "3.7";
+  minorVersion = "0";
+  minorVersionSuffix = "";
+  pythonVersion = majorVersion;
+  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
+  libPrefix = "python${majorVersion}";
+  sitePackages = "lib/${libPrefix}/site-packages";
+
+  buildInputs = filter (p: p != null) [
+    zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
+    ++ optionals x11Support [ tcl tk libX11 xproto ]
+    ++ optionals stdenv.isDarwin [ CF configd ];
+
+in stdenv.mkDerivation {
+  name = "python3-${version}";
+  pythonVersion = majorVersion;
+  inherit majorVersion version;
+
+  inherit buildInputs;
+
+  src = fetchurl {
+    url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
+    sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3";
+  };
+
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
+
+  # Determinism: We fix the hashes of str, bytes and datetime objects.
+  PYTHONHASHSEED=0;
+
+  prePatch = optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+    substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
+  '';
+
+  patches = [
+    ./no-ldconfig.patch
+
+    # Fix darwin build https://bugs.python.org/issue34027
+    (fetchpatch {
+      url = https://bugs.python.org/file47666/darwin-libutil.patch;
+      sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa";
+    })
+  ];
+
+  postPatch = ''
+  '' + optionalString (x11Support && (tix != null)) ''
+    substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+  '';
+
+  CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
+  LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
+  LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-threads"
+    "--without-ensurepip"
+    "--with-system-expat"
+    "--with-system-ffi"
+    "--with-openssl=${openssl.dev}"
+  ];
+
+  preConfigure = ''
+    for i in /usr /sw /opt /pkg; do	# improve purity
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+    ${optionalString stdenv.isDarwin ''
+       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
+       export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''}
+  '';
+
+  setupHook = python-setup-hook sitePackages;
+
+  postInstall = ''
+    # needed for some packages, especially packages that backport functionality
+    # to 2.x from 3.x
+    for item in $out/lib/python${majorVersion}/test/*; do
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
+        rm -rf "$item"
+      else
+        echo $item
+      fi
+    done
+    touch $out/lib/python${majorVersion}/test/__init__.py
+
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
+    paxmark E $out/bin/python${majorVersion}
+
+    # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
+    echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
+
+    # Determinism: Windows installers were not deterministic.
+    # We're also not interested in building Windows installers.
+    find "$out" -name 'wininst*.exe' | xargs -r rm -f
+
+    # Use Python3 as default python
+    ln -s "$out/bin/idle3" "$out/bin/idle"
+    ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
+    ln -s "$out/bin/python3" "$out/bin/python"
+    ln -s "$out/bin/python3-config" "$out/bin/python-config"
+    ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
+
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
+    # Determinism: rebuild all bytecode
+    # We exclude lib2to3 because that's Python 2 code which fails
+    # We rebuild three times, once for each optimization level
+    # Python 3.7 implements PEP 552, introducing support for deterministic bytecode.
+    # This is automatically used when `SOURCE_DATE_EPOCH` is set.
+    find $out -name "*.py" | $out/bin/python     -m compileall -q -f -x "lib2to3" -i -
+    find $out -name "*.py" | $out/bin/python -O  -m compileall -q -f -x "lib2to3" -i -
+    find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
+  '';
+
+  passthru = let
+    pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+  in rec {
+    inherit libPrefix sitePackages x11Support;
+    executable = "${libPrefix}m";
+    buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
+    withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
+    pkgs = pythonPackages;
+    isPy3 = true;
+    isPy37 = true;
+    is_py3k = true;  # deprecated
+    interpreter = "${self}/bin/${executable}";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://python.org;
+    description = "A high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = licenses.psfl;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ fridh kragniz ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
new file mode 100644
index 0000000000000..a1f9d68eb1663
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
@@ -0,0 +1,100 @@
+From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 68 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 5e8b31a854..7b45ce6c15 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -94,46 +94,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
+     def _findLib_gcc(name):
+-        # Run GCC's linker with the -t (aka --trace) option and examine the
+-        # library name it prints out. The GCC command will fail because we
+-        # haven't supplied a proper program with main(), but that does not
+-        # matter.
+-        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+-        c_compiler = shutil.which('gcc')
+-        if not c_compiler:
+-            c_compiler = shutil.which('cc')
+-        if not c_compiler:
+-            # No C compiler available, give up
+-            return None
+-
+-        temp = tempfile.NamedTemporaryFile()
+-        try:
+-            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+-            env = dict(os.environ)
+-            env['LC_ALL'] = 'C'
+-            env['LANG'] = 'C'
+-            try:
+-                proc = subprocess.Popen(args,
+-                                        stdout=subprocess.PIPE,
+-                                        stderr=subprocess.STDOUT,
+-                                        env=env)
+-            except OSError:  # E.g. bad executable
+-                return None
+-            with proc:
+-                trace = proc.stdout.read()
+-        finally:
+-            try:
+-                temp.close()
+-            except FileNotFoundError:
+-                # Raised if the file was already removed, which is the normal
+-                # behaviour of GCC if linking fails
+-                pass
+-        res = re.search(expr, trace)
+-        if not res:
+-            return None
+-        return os.fsdecode(res.group(0))
++        return None
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -255,34 +216,7 @@ elif os.name == "posix":
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+-            regex = os.fsencode(regex % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         def _findLib_ld(name):
+             # See issue #9998 for why this is needed
+-- 
+2.15.0
+
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 83e8f1d003022..1244ad5ecd2e5 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Perl 6 implementation";
-    homepage    = "http://www.rakudo.org";
+    homepage    = https://www.rakudo.org;
     license     = licenses.artistic2;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice vrthra ];
diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix
index b079ff0033479..25e125b9af636 100644
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/pkgs/development/interpreters/rascal/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "rascal-0.6.2";
 
   src = fetchurl {
-    url = "http://update.rascal-mpl.org/console/${name}.jar";
+    url = "https://update.rascal-mpl.org/console/${name}.jar";
     sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = http://www.rascal-mpl.org/;
+    homepage = https://www.rascal-mpl.org/;
     description = "Command-line REPL for the Rascal metaprogramming language";
     license = stdenv.lib.licenses.epl10;
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
index 36047759baae3..56ff02831741b 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/pkgs/development/interpreters/red/default.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ uralbash ];
     platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.bsd3;
-    homepage = http://www.red-lang.org/;
+    homepage = https://www.red-lang.org/;
   };
 }
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 220aa9abe5589..4dff7e6974ef4 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ren'Py Visual Novel Engine";
-    homepage = http://renpy.org/;
+    homepage = https://renpy.org/;
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 8e51b9b7d58e4..f333aa0b96d0b 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "gcc6.patch";
-      url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";
+      url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";
       sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
     })
   ] ++ stdenv.lib.optionals stdenv.isAarch32 [
diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix
index 9c47ebe79b6e1..e2eef0fab695f 100644
--- a/pkgs/development/interpreters/spidermonkey/17.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi
+, enableReadline ? (!stdenv.isDarwin), readline
+, libobjc }:
 
 stdenv.mkDerivation rec {
   version = "17.0.0";
@@ -14,7 +16,9 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ nspr ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl python2 zip libffi readline ];
+  buildInputs = [ perl python2 zip libffi readline ]
+             ++ stdenv.lib.optional enableReadline readline
+             ++ stdenv.lib.optional stdenv.isDarwin libobjc;
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
@@ -48,7 +52,7 @@ stdenv.mkDerivation rec {
     "--enable-threadsafe"
     "--with-system-nspr"
     "--with-system-ffi"
-    "--enable-readline"
+    (if enableReadline then "--enable-readline" else "--disable-readline")
   ];
 
   # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
@@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
     # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html
     echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls
 
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
     paxmark m shell/js17
     paxmark mr jsapi-tests/jsapi-tests
   '';
@@ -78,7 +83,6 @@ stdenv.mkDerivation rec {
     homepage = https://developer.mozilla.org/en/SpiderMonkey;
     # TODO: MPL/GPL/LGPL tri-license.
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 4657a51e48f97..bfbc48e753b77 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
 
 let
-  version = "52.8.0";
+  version = "52.9.0";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "11v2wwgrb92z08dv9cvk5x2dj3xj25qxzbjqjgiq6mz91bzd9gms";
+    sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
   };
 
   buildInputs = [ readline icu zlib nspr ];
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 474eaa0e1dc4f..cceec44e6ae60 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }:
+{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
 
 let
   # workaround https://github.com/NixOS/nixpkgs/issues/37364
@@ -19,12 +19,18 @@ in
       name = "jogl-${version}";
 
       src = fetchgit {
-        url = http://jogamp.org/srv/scm/jogl.git;
+        url = git://jogamp.org/srv/scm/jogl.git;
         rev = "v${version}";
         sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
         fetchSubmodules = true;
       };
 
+      postPatch = ''
+        find  .  -type f  -name '*.java' \
+          -exec sed -i 's@"libGL.so"@"${libGL}/lib/libGL.so"@'    {} \; \
+          -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
+      '';
+
       buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
 
       buildPhase = ''
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
index ea72bfb434b8b..7fecae0a66e71 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.8.3";
 
   src = fetchurl {
-    url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz";
+    url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz";
     sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1";
   };
 
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index d40b25cd80406..c7e4a9c29ac83 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   version = "1.2.15";
 
   src = fetchurl {
-    url    = "http://www.libsdl.org/release/${name}.tar.gz";
+    url    = "https://www.libsdl.org/release/${name}.tar.gz";
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index c32f59636a92b..7d8f5b2caee65 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, lib, fetchurl, pkgconfig, audiofile
+{ stdenv, lib, fetchurl, pkgconfig, pruneLibtoolFiles
 , openglSupport ? false, libGL
 , alsaSupport ? true, alsaLib
-, x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
+, x11Support ? true, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
 , waylandSupport ? true, wayland, wayland-protocols, libxkbcommon
 , dbusSupport ? false, dbus
 , udevSupport ? false, udev
 , ibusSupport ? false, ibus
 , pulseaudioSupport ? true, libpulseaudio
 , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
-, libiconv
+, audiofile, libiconv
 }:
 
 # NOTE: When editing this expression see if the same change applies to
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   version = "2.0.8";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/release/${name}.tar.gz";
     sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd";
   };
 
@@ -33,18 +33,26 @@ stdenv.mkDerivation rec {
 
   patches = [ ./find-headers.patch ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ];
 
-  propagatedBuildInputs = [ libiconv ]
+  propagatedBuildInputs = dlopenPropagatedBuildInputs;
+
+  dlopenPropagatedBuildInputs = [ ]
+    # Propagated for #include <GLES/gl.h> in SDL_opengles.h.
+    ++ optional openglSupport libGL
+    # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h.
+    ++ optionals x11Support [ libX11 xproto ];
+
+  dlopenBuildInputs = [ ]
+    ++ optional  alsaSupport alsaLib
     ++ optional  dbusSupport dbus
+    ++ optional  pulseaudioSupport libpulseaudio
     ++ optional  udevSupport udev
-    ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
     ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
-    ++ optional  alsaSupport alsaLib
-    ++ optional  pulseaudioSupport libpulseaudio;
+    ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ];
 
-  buildInputs = [ audiofile ]
-    ++ optional  openglSupport libGL
+  buildInputs = [ audiofile libiconv ]
+    ++ dlopenBuildInputs
     ++ optional  ibusSupport ibus
     ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
 
@@ -76,12 +84,13 @@ stdenv.mkDerivation rec {
   # SDL API that requires said libraries will fail to start.
   #
   # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to
-  # confirm that they actually use most of the `propagatedBuildInputs`
-  # from above in this way. This is pretty weird.
-  postFixup = ''
+  # list the symbols used in this way.
+  postFixup = let
+    rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);
+  in optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''
     for lib in $out/lib/*.so* ; do
-      if [[ -L "$lib" ]]; then
-        patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib"
+      if ! [[ -L "$lib" ]]; then
+        patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib"
       fi
     done
   '';
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index ea5f37513afbc..17a2dd14b272f 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.3";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
     sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m";
   };
 
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index f31fe33ea096a..3819aeb3c316c 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.0.2";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
     sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf";
   };
 
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 5cadfb9d90511..1cb74ac1b2d32 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.1";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
     sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
   };
 
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 83a2ffc077c33..68c8c16ed4e87 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.26";
 
   src = fetchurl {
-    url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
+    url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
     sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw";
   };
 
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index c8cab33ed57f9..56701e80b1f31 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2.12";
 
   src = fetchurl {
-    url    = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url    = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
     sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
   };
 
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
index e471c3cc556f8..2a009a3b7104a 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.3";
 
   src = fetchurl {
-    url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz";
+    url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz";
     sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
   };
 
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index f98e4a3b0ad38..cf6b53021f799 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.11";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+    url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
     sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
   };
 
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index f28ab55010b6c..0a71186cd4c7c 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "Xaw3d-1.6.2";
+  name = "Xaw3d-1.6.3";
   src = fetchurl {
-    url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2;
-    sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp";
+    url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
+    sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [imake gccmakedep libXpm libXp bison flex];
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index e428b9a8c785d..d1ddb17ba2fcd 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.4.8";
+  version = "6.5.0";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "190cyfs2najph2yycyj8abzddwa8s4wx8lx38iv237plwfl2308g";
+    sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 3db15892a144f..0f0e30ef0f3b4 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [
-      "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
+      "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
       "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
       "mirror://gnu/adns/adns-${version}.tar.gz"
     ];
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index c72572139c688..331039ec329fa 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -23,6 +23,7 @@ agda.mkDerivation (self: rec {
     description = "A standard library for use with the Agda compiler";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
+    broken = stdenv.isDarwin;
     maintainers = with maintainers; [ jwiegley fuuzetsu mudri ];
   };
 })
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index e20b2700f0e21..5e82a1a3c6be8 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A game programming library";
-    homepage = http://liballeg.org/;
+    homepage = https://liballeg.org/;
     license = licenses.zlib;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 12b2cbf07071d..21d9ce23d319b 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A game programming library";
-    homepage = http://liballeg.org/;
+    homepage = https://liballeg.org/;
     license = licenses.free; # giftware
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
new file mode 100644
index 0000000000000..2487711d9b156
--- /dev/null
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl
+, pkgconfig, gnome3, dbus, xvfb_run }:
+let
+  version = "4.99.1";
+  pname = "amtk";
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "00fhvw5y638z584s8cfdslh47ngfzcgx4f0b0456sw8p754j3f8d";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    dbus
+  ];
+
+  buildInputs = [
+    gnome3.gtk
+  ];
+
+  doCheck = stdenv.isLinux;
+  checkPhase = ''
+    export NO_AT_BRIDGE=1
+    ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      make check
+  '';
+
+  passthru.updateScript = gnome3.updateScript { packageName = pname; };
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Amtk;
+    description = "Actions, Menus and Toolbars Kit for GTK+ applications";
+    maintainers = [ maintainers.manveru ];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index b09f5f67f5635..3a0868ccecb43 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
 , libuuid, json-glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.8";
+  name = "appstream-glib-0.7.9";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
   outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "10hcl3sl3g8ajg9mssq3g4dbzz0d4b2ybimrcq71cpycqrqhilhx";
+    sha256 = "10b32qw7iy0v1jvmf18wqgs8d1cpy52zm5rzw0wv421n90qiyidk";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index a59641e99d397..ea70e6454536c 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+{stdenv, fetchFromGitHub, fetchpatch, mpir, gmp, mpfr, flint}:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "arb";
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     "--with-flint=${flint}"
   ];
   doCheck = true;
+  patches = [
+    # https://github.com/fredrik-johansson/arb/pull/210, included in next release
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/fredrik-johansson/arb/pull/210.patch";
+      name = "return-exact-zero-where-possible.patch";
+      sha256 = "01j9npnpmwh4dla9i05qdn606hy34gy9bz7c9bbsqm7az3n7pxjg";
+    })
+  ];
   meta = {
     inherit version;
     description = ''A library for arbitrary-precision interval arithmetic'';
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index abf251f97f97b..c61e960e051d6 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "8.500.1";
+  version = "8.600.0";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "0bm1g93yr79i74382pq1almakpyf42yipiqkqy742jyzwbxhxr5c";
+    sha256 = "0h3bj93s7pr7nfwgjx6c49hgf6jlp5ninp921a8krhkzx4swf02z";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/asio/1.10.nix b/pkgs/development/libraries/asio/1.10.nix
new file mode 100644
index 0000000000000..f63fbbd495cb7
--- /dev/null
+++ b/pkgs/development/libraries/asio/1.10.nix
@@ -0,0 +1,6 @@
+{callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "1.10.8";
+  sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6";
+})
diff --git a/pkgs/development/libraries/asio/1.12.nix b/pkgs/development/libraries/asio/1.12.nix
new file mode 100644
index 0000000000000..94fe4c7036702
--- /dev/null
+++ b/pkgs/development/libraries/asio/1.12.nix
@@ -0,0 +1,6 @@
+{callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "1.12.1";
+  sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9";
+})
diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
deleted file mode 100644
index 1126b4a7f2c9c..0000000000000
--- a/pkgs/development/libraries/asio/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, boost, openssl}:
-
-stdenv.mkDerivation rec {
-  name = "asio-1.12.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/asio/${name}.tar.bz2";
-    sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9";
-  };
-
-  propagatedBuildInputs = [ boost ];
-  buildInputs = [ openssl ];
-
-  meta = {
-    homepage = http://asio.sourceforge.net/;
-    description = "Cross-platform C++ library for network and low-level I/O programming";
-    license = stdenv.lib.licenses.boost;
-    platforms = stdenv.lib.platforms.unix;
-  };
-
-}
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
new file mode 100644
index 0000000000000..58dd4f6142313
--- /dev/null
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, boost, openssl
+, version, sha256, ...
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation {
+  name = "asio-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/asio/asio-${version}.tar.bz2";
+    inherit sha256;
+  };
+
+  propagatedBuildInputs = [ boost ];
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = http://asio.sourceforge.net/;
+    description = "Cross-platform C++ library for network and low-level I/O programming";
+    license = licenses.boost;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 1e5d003654ce5..688c9e300ed5f 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -1,24 +1,43 @@
-{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
-, intltool, dbus-glib, at-spi2-core, libSM }:
+{ stdenv
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+
+, at-spi2-core
+, atk
+, dbus
+, glib
+, libxml2
+
+, gnome3 # To pass updateScript
+}:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.26";
-  versionMinor = "1";
-  moduleName   = "at-spi2-atk";
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
+  name = "${pname}-${version}";
+  pname = "at-spi2-atk";
+  version = "2.26.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi
-                  dbus-glib at-spi2-core libSM ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
 
-  doCheck = false; # needs dbus daemon
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
+    description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
+    homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk;
+    license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2
+    maintainers = with maintainers; [ jtojnar gnome3.maintainers ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index b7547c2939285..ba34e7f5f3fe2 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -1,31 +1,46 @@
-{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib
-, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
+{ stdenv
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+, gobjectIntrospection
+
+, dbus
+, glib
+, libX11
+, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
+, libXi
+
+, gnome3 # To pass updateScript
+}:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.26";
-  versionMinor = "2";
-  moduleName   = "at-spi2-core";
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
+  name = "${pname}-${version}";
+  pname = "at-spi2-core";
+  version = "2.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];
-  buildInputs = [
-    python popt dbus-glib
-    libX11 xextproto libSM libICE libXtst libXi
-  ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+  buildInputs = [ dbus glib libX11 libXtst libXi ];
 
-  # ToDo: on non-NixOS we create a symlink from there?
-  configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
-
-  doCheck = false; # needs dbus daemon
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
+    description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
+    homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
+    license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2
+    maintainers = with maintainers; [ jtojnar gnome3.maintainers ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 51ae14be4046b..adcb86cedf844 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "aubio-0.4.6";
 
   src = fetchurl {
-    url = "http://aubio.org/pub/${name}.tar.bz2";
+    url = "https://aubio.org/pub/${name}.tar.bz2";
     sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx";
   };
 
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 4c2918c922da4..703679ba3a55a 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -11,7 +11,7 @@ let
         x86_64-linux = "x64/libbass.so";
       };
       urlpath = "bass${version}-linux.zip";
-      sha256 = "1a2z9isabkymz7qmkgklbjpj2wxkvv1cngfp9aj0c9178v97pjd7";
+      sha256 = "0alxx7knkvzwwifqrmzavafwq53flja7s1ckaabk6p2ir2f0j5cp";
     };
 
     bass_fx = {
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 427625d6fc673..710c5b1a92cbb 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.24.2";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p";
   };
 
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 1df696c0ec646..7f1e3d941a1a1 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 022c550459676..0f3f1fce42b06 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ autoconf automake libtool libjack2 alsaLib ];
 
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index d30cb1d369ebc..4709d0348537e 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6.0";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4";
   };
 
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 63f43ac7a2c01..e29c7b5cb1227 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${pname}-${version}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
     sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq";
   };
 
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 578bc7f4a2dc4..48a409b5367a7 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "zita-convolver-${version}";
-  version = "3.1.0";
+  version = "4.0.0";
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz";
+    sha256 = "0fx7f48ls0rlndqrmd4k7ifpnml39yxzc2f0n6xyysypgn06y673";
   };
 
   buildInputs = [ fftwFloat ];
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 182471acf4ae5..1ed457aa5fe19 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ];
 
   src = fetchurl {
-    url = "http://audiofile.68k.org/${name}.tar.gz";
+    url = "https://audiofile.68k.org/${name}.tar.gz";
     sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
   };
 
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 46e6a73433d02..9f41bf1af47ce 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.4.50";
+  version = "1.4.82";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "1qly5zn7w9j8w6a9pjw25xnr01sfq8dn8g5zrz6xyjgz590fj2x7";
+    sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69";
   };
 
   # FIXME: might be nice to put different APIs in different outputs
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index f3e7fc7f16217..844028008b02c 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.50";
+  name = "babl-0.1.52";
 
   src = fetchurl {
-    url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m";
+    url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
+    sha256 = "0v7pkr3qd5jnn0pra88d90ixkl5h9ngg6w660nn1cgh4zjh19xs0";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index dd926ac208179..0a2badea7cbfb 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
 , libstartup_notification, gobjectIntrospection, gtk-doc
-, python27, pythonPackages, libxml2 }:
+, xorgserver, dbus, python2 }:
 
 stdenv.mkDerivation rec {
   pname = "bamf";
   version = "0.5.3";
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "devdoc" ];
+
   src = fetchurl {
     url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
     sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
@@ -16,22 +18,40 @@ stdenv.mkDerivation rec {
     pkgconfig
     gtk-doc
     gobjectIntrospection
+    vala
+    # Tests
+    xorgserver
+    dbus
+    (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
   ];
 
-  buildInputs = [ libgtop libwnck3 vala libstartup_notification
-                  python27 pythonPackages.libxslt libxml2 glib ];
+  buildInputs = [
+    libgtop
+    libwnck3
+    libstartup_notification
+    glib
+  ];
 
+  # Fix hard-coded path
+  # https://bugs.launchpad.net/bamf/+bug/1780557
   postPatch = ''
     substituteInPlace data/Makefile.in \
-      --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user'
+      --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
   '';
 
+  configureFlags = [
+    "--enable-headless-tests"
+  ];
+
   # fix paths
   makeFlags = [
-    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
     "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
   ];
 
+  # TODO: Requires /etc/machine-id
+  doCheck = false;
+
   # ignore deprecation errors
   NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
 
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 14479a5609139..c11d6689624d3 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops, enableLargeConfig ? false
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
+, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
 , buildPlatform, hostPlatform
 }:
 
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [ (fetchpatch {
-    url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";
+    url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";
     sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
   }) ] ++
     # https://github.com/ivmai/bdwgc/pull/208
diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix
index 02cf511a6fdff..932ebdcb463a2 100644
--- a/pkgs/development/libraries/boost/1.66.nix
+++ b/pkgs/development/libraries/boost/1.66.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     # SHA256 from http://www.boost.org/users/history/version_1_66_0.html
     sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
   };
-
-  toolset = if stdenv.cc.isClang then "clang" else null;
 })
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
new file mode 100644
index 0000000000000..8b9e7ccca7f1a
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -0,0 +1,11 @@
+{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.67_0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
+    # SHA256 from http://www.boost.org/users/history/version_1_66_0.html
+    sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba";
+  };
+})
diff --git a/pkgs/development/libraries/boost/darwin-no-system-python.patch b/pkgs/development/libraries/boost/darwin-no-system-python.patch
new file mode 100644
index 0000000000000..73e0910336a10
--- /dev/null
+++ b/pkgs/development/libraries/boost/darwin-no-system-python.patch
@@ -0,0 +1,45 @@
+diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
+index 273b28a..2d2031e 100644
+--- a/tools/build/src/tools/python.jam
++++ b/tools/build/src/tools/python.jam
+@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? )
+ 
+ local rule darwin-installed-pythons ( version ? )
+ {
+-    version ?= $(.version-countdown) ;
+-
+-    local prefix
+-      = [ GLOB /System/Library/Frameworks /Library/Frameworks
+-          : Python.framework ] ;
+-
+-    return $(prefix)/Versions/$(version)/bin/python ;
++    return ;
+ }
+ 
+ 
+@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
+ 
+     # See if we can find a framework directory on darwin.
+     local framework-directory ;
+-    if $(target-os) = darwin
+-    {
+-        # Search upward for the framework directory.
+-        local framework-directory = $(libraries[-1]) ;
+-        while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework
+-        {
+-            framework-directory = $(framework-directory:D) ;
+-        }
+-
+-        if $(framework-directory:D=) = Python.framework
+-        {
+-            debug-message framework directory is \"$(framework-directory)\" ;
+-        }
+-        else
+-        {
+-            debug-message "no framework directory found; using library path" ;
+-            framework-directory = ;
+-        }
+-    }
+ 
+     local dll-path = $(libraries) ;
+ 
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index efe1151359d79..dab6fac6f0ccf 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
 , which
 , buildPackages, buildPlatform, hostPlatform
-, toolset ? /**/ if stdenv.cc.isClang                                then "clang"
-            else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross"
+, toolset ? /**/ if stdenv.cc.isClang  then "clang"
             else null
 , enableRelease ? true
 , enableDebug ? false
@@ -10,8 +9,8 @@
 , enableMultiThreaded ? true
 , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now
 , enableStatic ? !enableShared
-, enablePython ? hostPlatform == buildPlatform
-, enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65"
+, enablePython ? false
+, enableNumpy ? false
 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
 , patches ? []
 , mpi ? null
@@ -58,16 +57,26 @@ let
     "link=${link}"
     "-sEXPAT_INCLUDE=${expat.dev}/include"
     "-sEXPAT_LIBPATH=${expat.out}/lib"
+
+    # TODO: make this unconditional
+  ] ++ optionals (hostPlatform != buildPlatform) [
+    "address-model=${toString hostPlatform.parsed.cpu.bits}"
+    "architecture=${toString hostPlatform.parsed.cpu.family}"
+    "binary-format=${toString hostPlatform.parsed.kernel.execFormat.name}"
+    "target-os=${toString hostPlatform.parsed.kernel.name}"
+
+    # adapted from table in boost manual
+    # https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html
+    "abi=${if hostPlatform.parsed.cpu.family == "arm" then "aapcs"
+           else if hostPlatform.isWindows then "ms"
+           else if hostPlatform.isMips then "o32"
+           else "sysv"}"
   ] ++ optional (link != "static") "runtime-link=${runtime-link}"
     ++ optional (variant == "release") "debug-symbols=off"
     ++ optional (toolset != null) "toolset=${toolset}"
     ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"
     ++ optionals (hostPlatform.libc == "msvcrt") [
-    "target-os=windows"
     "threadapi=win32"
-    "binary-format=pe"
-    "address-model=${toString hostPlatform.parsed.cpu.bits}"
-    "architecture=x86"
   ]);
 
 in
@@ -78,11 +87,13 @@ stdenv.mkDerivation {
   inherit src;
 
   patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0";
-  patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {
-    url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
-        + "boost-mingw.patch";
-    sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
-  });
+  patches = patches
+    ++ optional stdenv.isDarwin ./darwin-no-system-python.patch
+    ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {
+      url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
+          + "boost-mingw.patch";
+      sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
+    });
 
   meta = {
     homepage = http://boost.org/;
diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
index 890f37897610b..91f7f6647304d 100644
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -1,9 +1,9 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  baseVersion = "2.6";
+  baseVersion = "2.7";
   revision = "0";
-  sha256 = "1iawmymmnp5j2mcjj70slivn6bgg8gbpppldc1rjqw5sbdan3wn1";
+  sha256 = "142aqabwc266jxn8wrp0f1ffrmcvdxwvyh8frb38hx9iaqazjbg4";
   postPatch = ''
     sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
   '';
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index a384a77078328..6f9b94fc872b3 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "c-ares-1.14.0";
 
   src = fetchurl {
-    url = "http://c-ares.haxx.se/download/${name}.tar.gz";
+    url = "https://c-ares.haxx.se/download/${name}.tar.gz";
     sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
   };
 
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 2f60fb7391fba..3793b70de4b50 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "c-blosc-${version}";
-  version = "1.11.3";
+  version = "1.14.3";
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "c-blosc";
     rev = "v${version}";
-    sha256 = "18665lwszwbb48pxgisyxxjh92sr764hv6h7jw8zzsmzdkgzrmcw";
+    sha256 = "051x2hh0yq1zhiyjmiarvc2radi59v03vzs2sa4hmgfhfaxcklld";
   };
 
   buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 44cdfc4e0eefa..4486149cfcef3 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
   name = "cairo-${version}";
 
   src = fetchurl {
-    url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
     sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn";
   };
 
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 09d162db85322..47250f2b3da28 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "cairomm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "http://www.cairographics.org/releases/${name}.tar.gz";
+    url = "https://www.cairographics.org/releases/${name}.tar.gz";
     # gnome doesn't have the latest version ATM; beware: same name but different hash
     # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz";
     sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25";
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
new file mode 100644
index 0000000000000..e61b5840cf933
--- /dev/null
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "cctz-${version}";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "cctz";
+    rev = "v${version}";
+    sha256 = "0liiqz1swfc019rzfaa9y5kavs2hwabs2vnwbn9jfczhyxy34y89";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  installTargets = [ "install_hdrs" "install_shared_lib" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/google/cctz;
+    description = "C++ library for translating between absolute and civil times";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 1e2017ef0e7f2..432e49c4354f6 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -20,19 +20,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ glog ]
+  buildInputs = [ eigen glog ]
     ++ stdenv.lib.optional (google-gflags != null) google-gflags;
 
-  inherit eigen;
-
   doCheck = runTests;
 
   checkTarget = "test";
 
-  cmakeFlags = "
-    -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
-  ";
-
   meta = with stdenv.lib; {
     description = "C++ library for modeling and solving large, complicated optimization problems";
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 22f205cdcec0c..9759e4904b294 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,8 +1,11 @@
-{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }:
+{ fetchurl, stdenv, pkgconfig, meson, ninja
+, gobjectIntrospection, clutter, gtk3, gnome3 }:
+
 let
   pname = "clutter-gtk";
   version = "1.8.4";
 in
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -12,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ clutter gtk3 ];
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 236d634a514b6..1f4b43db16c3e 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-hocon-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
-    sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc";
+    sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m";
     rev = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index e5391e7100d53..badfc630a47ef 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description =
       "Collection of open-source libraries for high level network programming";
-    homepage    = http://cpp-netlib.org;
+    homepage    = https://cpp-netlib.org;
     license     = licenses.boost;
     platforms   = platforms.all;
   };
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index 6dc496d0e5aaf..a2493e55fb0b5 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cppcms-${version}";
-  version = "1.0.5";
+  version = "1.2.1";
 
   src = fetchurl {
       url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
-      sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4";
+      sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 7b48ffcaccf83..0690bd425aeca 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.14.0";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/${name}.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/${name}.tar.gz";
     sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix";
   };
 
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index fd8fa1a994d65..d50aca1679b88 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.3.4";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz";
+    url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz";
     sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s";
   };
 
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index c1c867abcdf58..a2188f687d136 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "curlcpp-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "JosephP91";
     repo = "curlcpp";
     rev = "${version}";
-    sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q";
+    sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5";
   };
 
   buildInputs = [ cmake curl ];
diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
new file mode 100644
index 0000000000000..2d31f734166e9
--- /dev/null
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+, qtbase, libuuid, libcap, uwsgi, grantlee }:
+
+stdenv.mkDerivation rec {
+  name = "cutelyst-${version}";
+  version = "2.4.1";
+
+  src = fetchFromGitHub {
+    owner = "cutelyst";
+    repo = "cutelyst";
+    rev = "v${version}";
+    sha256 = "1kfapd5dkyw02g3j4gshxl16b90xdf5vgfhqrkdzix072f7hy5sl";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+  buildInputs = [ qtbase libuuid libcap uwsgi grantlee ];
+
+  cmakeFlags = [
+    "-DPLUGIN_UWSGI=ON"
+    "-DPLUGIN_STATICCOMPRESSED=ON"
+    "-DPLUGIN_CSRFPROTECTION=ON"
+    "-DPLUGIN_VIEW_GRANTLEE=ON"
+  ];
+
+  preBuild = ''
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/Cutelyst:`pwd`/EventLoopEPoll"
+  '';
+
+  postBuild = ''
+    unset LD_LIBRARY_PATH
+  '';
+
+  postInstall = ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --set QT_PLUGIN_PATH '${qtbase}/${qtbase.qtPluginPrefix}'
+    done
+  '';
+
+  meta = with lib; {
+    description = "C++ Web Framework built on top of Qt";
+    homepage = https://cutelyst.org/;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 06dde2ad4078d..fb12921817566 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
   name = "db-${version}";
 
   src = fetchurl {
-    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    url = "https://download.oracle.com/berkeley-db/${name}.tar.gz";
     sha256 = sha256;
   };
 
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 4f6bd829099f7..ade6c98df9421 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -14,7 +14,7 @@ self = stdenv.mkDerivation {
     inherit version;
 
     src = fetchurl {
-      url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
+      url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index e3815165f6e3f..d52f1b6a2cffa 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A D-Bus API for the dLeyna services";
-    homepage = http://01.org/dleyna;
+    homepage = https://01.org/dleyna;
     maintainers = [ maintainers.jtojnar ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix
index 11cfa31c04b6f..787030eed9877 100644
--- a/pkgs/development/libraries/dleyna-core/default.nix
+++ b/pkgs/development/libraries/dleyna-core/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library of utility functions that are used by the higher level dLeyna";
-    homepage = http://01.org/dleyna;
+    homepage = https://01.org/dleyna;
     maintainers = [ maintainers.jtojnar ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix
index a8ea7e8bd6277..99af28111a763 100644
--- a/pkgs/development/libraries/dleyna-renderer/default.nix
+++ b/pkgs/development/libraries/dleyna-renderer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library to discover and manipulate Digital Media Renderers";
-    homepage = http://01.org/dleyna;
+    homepage = https://01.org/dleyna;
     maintainers = [ maintainers.jtojnar ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix
index b4885145f6e42..79b0155c91321 100644
--- a/pkgs/development/libraries/dleyna-server/default.nix
+++ b/pkgs/development/libraries/dleyna-server/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library to discover, browse and manipulate Digital Media Servers";
-    homepage = http://01.org/dleyna;
+    homepage = https://01.org/dleyna;
     maintainers = [ maintainers.jtojnar ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index eaae1f7ecdad6..e5e3c2d662c2b 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, openblas, libpng, libjpeg
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg
 , guiSupport ? false, libX11
 }:
 
 stdenv.mkDerivation rec {
-  version = "19.9";
+  version = "19.13";
   name = "dlib-${version}";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     rev ="v${version}";
-    sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc";
+    sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3";
   };
 
   postPatch = ''
@@ -19,14 +19,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ openblas libpng libjpeg ] ++ lib.optional guiSupport libX11;
+  buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11;
 
   meta = with stdenv.lib; {
     description = "A general purpose cross-platform C++ machine learning library";
     homepage = http://www.dlib.net;
     license = licenses.boost;
-    maintainers = with maintainers; [ christopherpoole ];
+    maintainers = with maintainers; [ christopherpoole ma27 ];
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index a453a70dcad7e..5f70a7571baee 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib; 
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
-  version = "2.7.3";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "1nvip0cmbhzmgzyi65qw8406p460alw1842dw2r4nq1lpcyi9avg";
+    sha256 = "06rf6yzrszfqm74sq3485c7h6m0xjnz35sm31xkk70fxgk129fp0";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
new file mode 100644
index 0000000000000..d9b5a2b64d635
--- /dev/null
+++ b/pkgs/development/libraries/editline/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "editline-${version}";
+  version = "1.15.3";
+  src = fetchFromGitHub {
+    owner = "troglobit";
+    repo = "editline";
+    rev = version;
+    sha256 = "0dm5fgq0acpprr938idwml64nclg9l6c6avirsd8r6f40qicbgma";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  dontDisableStatic = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://troglobit.com/editline.html;
+    description = "A readline() replacement for UNIX without termcap (ncurses)";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index 8841855a24edf..015aeaed55bab 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "eigen-${v}";
 
   src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
+    url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
     sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj";
   };
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index 7de05926da59c..e6d13a5915a10 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "eigen-${version}";
   
   src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
+    url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
     sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
   };
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 4e1559e5c7388..c120132dcb8ba 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "eigen-${version}";
 
   src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
+    url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
     sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
   };
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
new file mode 100644
index 0000000000000..c973c2bd9449f
--- /dev/null
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
+openimageio, libjpeg, libpng, libpthreadstubs, libX11
+}:
+
+stdenv.mkDerivation rec {
+  name = "embree-${version}";
+  version = "2.17.4";
+
+  src = fetchFromGitHub {
+    owner = "embree";
+    repo = "embree";
+    rev = "v2.17.4";
+    sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9";
+  };
+
+  cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ];
+  enableParallelBuilding = true;
+  
+  buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
+  meta = with stdenv.lib; {
+    description = "High performance ray tracing kernels from Intel"; 
+    homepage = https://embree.github.io/;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index b784088dc652f..838693ba12d0f 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       Where you had a simple non-structrured string in syslog() you have a
       combination of description and tag/value pairs.
     '';
-    homepage = http://www.balabit.com/support/community/products/;
+    homepage = https://www.balabit.com/support/community/products/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 1f58fd698da3c..ac2c21d4cf0eb 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "exempi-2.4.5";
 
   src = fetchurl {
-    url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
+    url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2";
     sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
   };
 
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index ea28769668c57..5ffbc215d8b38 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.13";
+  version = "${branch}.14";
   branch = "2.8";
-  sha256 = "0y3712ivmpr5dw1nsk1bqpd4b7ldzd69ak4vwbl4q02ab35ri6yz";
+  sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
 })
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 3c5100f2f7f42..12b30cf0349fb 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   name = "fftw-${precision}-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
+    urls = [
+      "http://fftw.org/fftw-${version}.tar.gz"
+      "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"
+    ];
     sha256 = "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1";
   };
 
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index f26dad3ce15ef..9a7acc287cc4d 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -4,7 +4,7 @@
 , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:
 
 let
-  version = "0.11.7";
+  version = "0.99.2";
   desktop_schemas = gnome3.gsettings_desktop_schemas;
 in stdenv.mkDerivation rec {
   name = "flatpak-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1vq4j7v68lp4fsvpas1bcsx1z4snpj0mkbq2mi00kx3jb48z768h";
+    sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index a548f3882864e..0c2b7da79eb38 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -1,6 +1,6 @@
 --- a/tests/libtest.sh
 +++ b/tests/libtest.sh
-@@ -322,7 +322,7 @@
+@@ -324,7 +324,7 @@
          # running installed-tests: assume we know what we're doing
          :
      elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -9,7 +9,7 @@
          sed -e 's/^/# /' < bwrap-result
          echo "1..0 # SKIP Cannot run bwrap"
          exit 0
-@@ -330,7 +330,7 @@
+@@ -332,7 +332,7 @@
  }
  
  skip_without_python2 () {
@@ -18,7 +18,7 @@
          echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
          exit 0
      fi
-@@ -350,12 +350,12 @@
+@@ -352,12 +352,12 @@
  export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
  DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
  
@@ -28,30 +28,51 @@
  fi
  
  cleanup () {
--    /bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
-+    @coreutils@/bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
+-    /bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
++    @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
      gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
      fusermount -u $XDG_RUNTIME_DIR/doc || :
      if test -n "${TEST_SKIP_CLEANUP:-}"; then
 --- a/tests/make-test-runtime.sh
 +++ b/tests/make-test-runtime.sh
-@@ -21,6 +21,7 @@
- cat ${DIR}/metadata
+@@ -26,6 +26,7 @@
+ PATH="$PATH:/usr/sbin:/sbin"
  
  # Add bash and dependencies
 +mkdir -p ${DIR}/nix/store
  mkdir -p ${DIR}/usr/bin
  mkdir -p ${DIR}/usr/lib
  ln -s ../lib ${DIR}/usr/lib64
-@@ -30,47 +31,27 @@
+@@ -35,73 +36,27 @@
  else
      cp `which ldconfig` ${DIR}/usr/bin
  fi
--T=`mktemp`
--for i in $@; do
+-LIBS=`mktemp`
+-BINS=`mktemp`
+-
+-add_bin() {
+-    local f=$1
+-    shift
+-
+-    if grep -qFe "${f}" $BINS; then
+-        # Already handled
+-        return 0
+-    fi
+-
+-    echo $f >> $BINS
+-
+-    # Add library dependencies
+-    (ldd "${f}" | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | sort -u -o $LIBS $LIBS -)  || true
+-
+-    local shebang=$(sed -n '1s/^#!\([^ ]*\).*/\1/p' "${f}")
+-    if [ x$shebang != x ]; then
+-        add_bin "$shebang"
+-    fi
+-}
+-
+ for i in $@; do
 -    I=`which $i`
--    cp $I ${DIR}/usr/bin
--    ldd $I | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | grep ^/ >> $T
+-    add_bin $I
 -    if test $i == python2; then
 -        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
 -        # This is a hardcoded minimal set of modules we need in the current tests.
@@ -78,10 +99,13 @@
 -        done
 -    fi
 -done
- ln -s bash ${DIR}/usr/bin/sh
--for i in `sort -u $T`; do
+-for i in `cat $BINS`; do
+-    echo Adding binary $i 1>&2
+-    cp "$i" ${DIR}/usr/bin/
+-done
+-for i in `cat $LIBS`; do
+-    echo Adding library $i 1>&2
 -    cp "$i" ${DIR}/usr/lib/
-+for i in $@; do
 +    I=$(readlink -f $(which $i))
 +    requisites=$(nix-store --query --requisites "$I")
 +    for r in $requisites; do
@@ -92,6 +116,7 @@
 +    done
 +    ln -s $I ${DIR}/usr/bin/$i
  done
+ ln -s bash ${DIR}/usr/bin/sh
  
 -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
 -# the real en_US locale is often not available, because its in the
@@ -110,7 +135,7 @@
      collection_args=--collection-id=${COLLECTION_ID}
 --- a/tests/testlibrary.c
 +++ b/tests/testlibrary.c
-@@ -378,7 +378,7 @@
+@@ -610,7 +610,7 @@
      {
        gint exit_code = 0;
        char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net",
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index ddc962d0aab64..405d80031e37a 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
-, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng
-, cfg ? {}
+{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
+, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
 , darwin, libtiff, freetype
 }:
 
-let inherit (composableDerivation) edf; in
-
-let version = "1.3.4"; in
-composableDerivation.composableDerivation {} {
+let
+  version = "1.3.4";
+in stdenv.mkDerivation {
   name = "fltk-${version}";
 
   src = fetchurl {
@@ -18,6 +16,23 @@ composableDerivation.composableDerivation {} {
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [
+    libGLU_combined
+    libjpeg
+    zlib
+    libpng
+    libXft
+  ];
+
+  configureFlags = [
+    "--enable-gl"
+    "--enable-largefile"
+    "--enable-shared"
+    "--enable-threads"
+    "--enable-xft"
+  ];
+
   propagatedBuildInputs = [ inputproto ]
     ++ (if stdenv.isDarwin
         then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff])
@@ -25,33 +40,6 @@ composableDerivation.composableDerivation {} {
 
   enableParallelBuilding = true;
 
-  flags =
-    # this could be tidied up (?).. eg why does it require freeglut without glSupport?
-    edf { name = "cygwin"; }  #         use the CygWin libraries default=no
-    // edf { name = "debug"; }  #          turn on debugging default=no
-    // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; }  #             turn on OpenGL support default=yes
-    // edf { name = "shared"; }  #         turn on shared libraries default=no
-    // edf { name = "threads"; }  #        enable multi-threading support
-    // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; }  # don't konw yet what quartz is #         use Quartz instead of Quickdraw (default=no)
-    // edf { name = "largefile"; } #     omit support for large files
-    // edf { name = "localjpeg"; disable = { buildInputs = [libjpeg]; }; } #       use local JPEG library, default=auto
-    // edf { name = "localzlib"; disable = { buildInputs = [zlib]; }; } #       use local ZLIB library, default=auto
-    // edf { name = "localpng"; disable = { buildInputs = [libpng]; }; } #       use local PNG library, default=auto
-    // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } #       turn on Xinerama support default=no
-    // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } #            turn on Xft support default=no
-    // edf { name = "xdbe"; };  #           turn on Xdbe support default=no
-
-  cfg = {
-    largefileSupport = true; # is default
-    glSupport = true; # doesn't build without it. Why?
-    localjpegSupport = false;
-    localzlibSupport = false;
-    localpngSupport = false;
-    sharedSupport = true;
-    threadsSupport = true;
-    xftSupport = true;
-  } // cfg;
-
   meta = {
     description = "A C++ cross-platform lightweight GUI library";
     homepage = http://www.fltk.org;
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 8abd42fe17444..ccf2d6d058559 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.05.28.00";
+  version = "2018.07.09.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1n5zic8bgm4dfc7prjj3af2ipxalia6w7dk6w9pmrz1nkrpyd68c";
+    sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index a107c9a478f23..7a903f00ae601 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ stdenv
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+, fixDarwinDylibNames
+}:
 
 stdenv.mkDerivation rec {
-  name = "fribidi-${version}";
-  version = "0.19.7";
+  name = "${pname}-${version}";
+  pname = "fribidi";
+  version = "1.0.4";
 
-  src = fetchFromGitHub {
-    owner = "fribidi";
-    repo = "fribidi";
-    rev = version;
-    sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d";
+  # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
+  src = fetchurl {
+    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  # Configure script checks for glib, but it is only used for tests.
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   outputs = [ "out" "devdoc" ];
 
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index e15f2583f4da8..813ea0504653f 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "gdal-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
     sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg";
   };
 
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 7a80ce7fdb667..7d0b70ec627ed 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "gdal-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
+    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz";
     sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d";
   };
 
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index dcdb6a2297b24..a4eab462046c6 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, vtk }:
 
 stdenv.mkDerivation rec {
-  version = "2.8.6";
+  version = "2.8.7";
   name = "gdcm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
-    sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy";
+    sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62";
   };
 
   dontUseCmakeBuildDir = true;
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index 161153b7e3dc2..287c332438656 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "gegl-0.3.34";
 
   src = fetchurl {
-    url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
+    url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
     sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw";
   };
 
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index e9230b218be9c..f32bc120170c9 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -3,13 +3,13 @@
 , libwebp, gnome3, libintl }:
 
 let
-  version = "0.4.2";
+  version = "0.4.4";
 in stdenv.mkDerivation rec {
   name = "gegl-${version}";
 
   src = fetchurl {
-    url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba";
+    url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
+    sha256 = "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq";
   };
 
   # needs fonts otherwise, don't know how to pass them
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 4d348c92171b7..eb7a6d6aaf21a 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "geoclue-2.4.8";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
     sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
   };
 
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 24e3b4842fafa..b92f6e61f56a5 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "geos-3.6.2";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/geos/${name}.tar.bz2";
+    url = "https://download.osgeo.org/geos/${name}.tar.bz2";
     sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4";
   };
 
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index abc24700fa217..07db27dcc7916 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gettext-${version}";
-  version = "0.19.8";
+  version = "0.19.8.1";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "13ylc6n3hsk919c7xl0yyibc3pfddzb53avdykn4hmk8g6yzd91x";
+    sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
   };
   patches = [ ./absolute-paths.diff ];
 
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index 7ab06afdad614..0d0fa0b2ca5d1 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -1,18 +1,19 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "gf2x-${version}";
-  version = "1.1";
+  version = "1.2";
 
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz";
-    sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd";
+    # find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/
+    url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-1.2.tar.gz";
+    sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = ''Routines for fast arithmetic in GF(2)[x]'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = ["x86_64-linux"];
+    homepage = http://gf2x.gforge.inria.fr;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix
index 1980c633474f5..dd72637f2eb02 100644
--- a/pkgs/development/libraries/gle/default.nix
+++ b/pkgs/development/libraries/gle/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     urls = [
       "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz"
-      "http://www.linas.org/gle/pub/gle-3.1.0.tar.gz"
+      "https://www.linas.org/gle/pub/gle-3.1.0.tar.gz"
       ];
     sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
   };
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ac921227740cd..ff870f525f23b 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -54,7 +54,10 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
     ++ optional doCheck ./skip-timer-test.patch
-    ++ [ ./schema-override-variable.patch ];
+    ++ optionals stdenv.hostPlatform.isMusl [
+      ./quark_init_on_demand.patch
+      ./gobject_init_on_demand.patch
+    ] ++ [ ./schema-override-variable.patch ];
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/development/libraries/glib/gobject_init_on_demand.patch
new file mode 100644
index 0000000000000..d72d0b61dca27
--- /dev/null
+++ b/pkgs/development/libraries/glib/gobject_init_on_demand.patch
@@ -0,0 +1,87 @@
+--- glib-source/gobject/gtype.c	2016-08-17 17:20:47.000000000 +0200
++++ glib-source/gobject/gtype.c	2016-09-01 21:56:31.777406646 +0200
+@@ -209,6 +209,9 @@
+ static gboolean				type_node_is_a_L		(TypeNode		*node,
+ 									 TypeNode		*iface_node);
+ 
++#if !defined(__GLIBC__)
++static void gobject_init (void);
++#endif
+ 
+ /* --- enumeration --- */
+ 
+@@ -2631,7 +2634,10 @@
+ 			     GTypeFlags			 flags)
+ {
+   TypeNode *node;
+-  
++ 
++#if !defined(__GLIBC__)
++  gobject_init();
++#endif 
+   g_assert_type_system_initialized ();
+   g_return_val_if_fail (type_id > 0, 0);
+   g_return_val_if_fail (type_name != NULL, 0);
+@@ -2749,6 +2755,9 @@
+   TypeNode *pnode, *node;
+   GType type = 0;
+   
++#if !defined(__GLIBC__)
++  gobject_init();
++#endif 
+   g_assert_type_system_initialized ();
+   g_return_val_if_fail (parent_type > 0, 0);
+   g_return_val_if_fail (type_name != NULL, 0);
+@@ -2804,6 +2813,9 @@
+   TypeNode *pnode, *node;
+   GType type;
+   
++#if !defined(__GLIBC__)
++  gobject_init();
++#endif 
+   g_assert_type_system_initialized ();
+   g_return_val_if_fail (parent_type > 0, 0);
+   g_return_val_if_fail (type_name != NULL, 0);
+@@ -3319,6 +3331,9 @@
+ {
+   TypeNode *node;
+   
++#if !defined(__GLIBC__)
++  gobject_init();
++#endif 
+   g_assert_type_system_initialized ();
+   
+   node = lookup_type_node_I (type);
+@@ -4343,6 +4358,9 @@
+ void
+ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
+ {
++#if !defined(__GLIBC__)
++  gobject_init();
++#endif 
+   g_assert_type_system_initialized ();
+ 
+   if (debug_flags)
+@@ -4361,6 +4379,9 @@
+ void
+ g_type_init (void)
+ {
++#if !defined(__GLIBC__)
++  gobject_init();
++#endif 
+   g_assert_type_system_initialized ();
+ }
+ 
+@@ -4372,6 +4393,12 @@
+   TypeNode *node;
+   GType type;
+ 
++#if !defined(__GLIBC__)
++  static int gobject_initialized = 0;
++  if (gobject_initialized)
++    return;
++  gobject_initialized = 1;
++#endif
+   /* Ensure GLib is initialized first, see
+    * https://bugzilla.gnome.org/show_bug.cgi?id=756139
+    */
diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/development/libraries/glib/quark_init_on_demand.patch
new file mode 100644
index 0000000000000..168086484314f
--- /dev/null
+++ b/pkgs/development/libraries/glib/quark_init_on_demand.patch
@@ -0,0 +1,33 @@
+--- glib-source/glib/gquark.c	2016-08-17 17:20:47.000000000 +0200
++++ glib-source/glib/gquark.c	2016-08-30 07:49:13.298234757 +0200
+@@ -57,6 +57,9 @@
+ void
+ g_quark_init (void)
+ {
++  if (quark_ht)
++    return;
++
+   g_assert (quark_seq_id == 0);
+   quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
+   quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
+@@ -138,9 +141,12 @@
+     return 0;
+ 
+   G_LOCK (quark_global);
++#if !defined(__GLIBC__)
++  g_quark_init ();
++#endif
+   quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
+   G_UNLOCK (quark_global);
+
+   return quark;
+ }
+ 
+@@ -280,6 +286,7 @@
+   GQuark quark;
+   gchar **quarks_new;
+ 
++  g_quark_init ();
+   if (quark_seq_id % QUARK_BLOCK_SIZE == 0)
+     {
+       quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE);
diff --git a/pkgs/development/libraries/glibc/2.26-115to131.diff.gz b/pkgs/development/libraries/glibc/2.26-115to131.diff.gz
deleted file mode 100644
index 3d866c567a790..0000000000000
--- a/pkgs/development/libraries/glibc/2.26-115to131.diff.gz
+++ /dev/null
Binary files differdiff --git a/pkgs/development/libraries/glibc/2.26-75.patch.gz b/pkgs/development/libraries/glibc/2.26-75.patch.gz
deleted file mode 100644
index e2a8867e4fff6..0000000000000
--- a/pkgs/development/libraries/glibc/2.26-75.patch.gz
+++ /dev/null
Binary files differdiff --git a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz
deleted file mode 100644
index 9bf1a4f7d39b2..0000000000000
--- a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz
+++ /dev/null
Binary files differdiff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 9ce47ec2f1a2d..eeeff731a6e3a 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -11,14 +11,14 @@ assert idnSupport -> libidn != null;
 with stdenv.lib;
 
 let
-  version = "1.0.20";
+  version = "1.0.21";
 in
 stdenv.mkDerivation rec {
   name = "gloox-${version}";
 
   src = fetchurl {
-    url = "http://camaya.net/download/gloox-${version}.tar.bz2";
-    sha256 = "1a6yhs42wcdm8az3983m3lx4d9296bw0amz5v3b4012g1xn0hhq2";
+    url = "https://camaya.net/download/gloox-${version}.tar.bz2";
+    sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw";
   };
 
   buildInputs = [ ]
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 551e7e5e1f6b9..f62883529fc91 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, m4, cxx ? true
-, buildPackages
+{ stdenv, fetchurl, m4, cxx ? !hostPlatform.useAndroidPrebuilt
+, buildPackages, hostPlatform
 , withStatic ? false }:
 
 let inherit (stdenv.lib) optional optionalString; in
@@ -27,12 +27,13 @@ let self = stdenv.mkDerivation rec {
     # See <http://hydra.nixos.org/build/2760931>, for instance.
     #
     # no darwin because gmp uses ASM that clang doesn't like
-    optional (!stdenv.isSunOS) "--enable-fat"
+    optional (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "--enable-fat"
     ++ (if cxx then [ "--enable-cxx"  ]
                else [ "--disable-cxx" ])
     ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
-    ++ optional stdenv.isDarwin "ABI=64"
+    ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
     ++ optional stdenv.is64bit "--with-pic"
+    ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
     ;
 
   # The config.guess in GMP tries to runtime-detect various
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 3944d2ecab69f..9dde67b5c7958 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qt4, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "grantlee-0.4.0";
+  name = "grantlee-0.5.1";
 
 # Upstream download server has country code firewall, so I made a mirror.
   src = fetchurl {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       "http://downloads.grantlee.org/${name}.tar.gz"
       "http://www.loegria.net/grantlee/${name}.tar.gz"
     ];
-    sha256 = "0gqdckxx45qmyixyz5d7ipcqq2dw26r71m2fpsrlnh4j2c9di8hk";
+    sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r";
   };
 
   buildInputs = [ cmake qt4 ];
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 9113b67166491..c8ce99dc90dd6 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec{
   name = "grib-api-${version}";
-  version = "1.26.1";
+  version = "1.27.0";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
-    sha256 = "1v1apx9421m8zkjmych5yr66mvqjrrygc98bvyl4miasmsb4ndfs";
+    sha256 = "1vx6bx9jhz5vdh2vx5y532ihwgyylagqz6pbx2p2bsx4kmj4pxdd";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index f1eed726eb2ba..4f952359f7111 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, fetchpatch, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-2.4";
+  name = "gsl-2.5";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd";
+    sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index ca1fc3724fca8..051228aeb1529 100644
--- a/pkgs/desktops/gnome-3/misc/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "gspell";
-  version = "1.8.0";
+  version = "1.8.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv";
+    sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1";
   };
 
   propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
@@ -22,7 +22,6 @@ in stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
     };
   };
 
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 122285da99ec3..96e02c605f540 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja, gettext
 , pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
-, faad2, libass, libkate, libmms
-, libmodplug, mpeg2dec
+, faad2, libass, libkate, libmms, librdf, ladspaH
+, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
+, libbs2b, libmodplug, mpeg2dec
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls, mjpegtools
@@ -42,6 +43,12 @@ stdenv.mkDerivation rec {
         sha256 = "0hy0rcn35alq65yqwri4fqjz2hf3nyyg5c7rnndk51msmqjxpprk";
     })
     ./fix_pkgconfig_includedir.patch
+    # Enable bs2b compilation
+    # https://bugzilla.gnome.org/show_bug.cgi?id=794346
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=369724;
+      sha256 = "1716mp0h2866ab33w607isvfhv1zwyj71qb4jrkx5v0h276v1pwr";
+    })
   ];
 
   src = fetchurl {
@@ -56,6 +63,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst-plugins-base orc
     faad2 libass libkate libmms
+    libnice webrtc-audio-processing # webrtc
+    libbs2b
+    ladspaH librdf # ladspa plug-in
+    lilv lv2 serd sord sratom # lv2 plug-in
     libmodplug mpeg2dec
     openjpeg libopus librsvg
     fluidsynth libvdpau
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
index 36da2fb72aa40..d0a2d3691b493 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -6,7 +6,7 @@ let
     version="1.4";
     name="${baseName}-${version}";
     hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
-    url="http://foicica.com/gtdialog/download/gtdialog_1.4.zip";
+    url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
     sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 0a9513b0fc483..21f9adfdc8e34 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -12,14 +12,14 @@ assert cupsSupport -> cups != null;
 with stdenv.lib;
 
 let
-  version = "3.22.29";
+  version = "3.22.30";
 in
 stdenv.mkDerivation rec {
   name = "gtk+3-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
-    sha256 = "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0";
+    sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index cf4a990d7f717..f206a169b93de 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkd-${version}";
-  version = "3.6.5";
+  version = "3.8.3";
 
   src = fetchzip {
     url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
-    sha256 = "1ypxxqklad5wwyvc39wnphnqp5y4q5zbf9j5mxb3bg9vnls48vx1";
+    sha256 = "10jhwy1421bypq62ki1dzv8irvlgwr7s40z6l6vxallm4jkgk9gj";
     stripRoot = false;
   };
 
@@ -19,63 +19,63 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
-    substituteInPlace src/cairo/gtkc/cairo-compiletime.d \
+    substituteInPlace src/cairo/c/functions-compiletime.d \
       --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
       --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
-    substituteInPlace src/cairo/gtkc/cairo-runtime.d \
+    substituteInPlace src/cairo/c/functions-runtime.d \
       --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
       --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
-    substituteInPlace generated/gtkd/gtkc/gdkpixbuf.d \
+    substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \
       --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
       --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
-    substituteInPlace generated/gtkd/gtkc/atk.d \
+    substituteInPlace generated/gtkd/atk/c/functions.d \
       --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
       --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
-    substituteInPlace generated/gtkd/gtkc/pango.d \
+    substituteInPlace generated/gtkd/pango/c/functions.d \
       --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \
       --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
       --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
       --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
-    substituteInPlace generated/gtkd/gtkc/gobject.d \
+    substituteInPlace generated/gtkd/gobject/c/functions.d \
       --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
       --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
-    substituteInPlace generated/gtkd/gtkc/rsvg.d \
+    substituteInPlace generated/gtkd/rsvg/c/functions.d \
       --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
       --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
-    substituteInPlace generated/gtkd/gtkc/cairo.d \
+    substituteInPlace generated/gtkd/cairo/c/functions.d \
       --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
       --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
-    substituteInPlace generated/gtkd/gtkc/gdk.d \
+    substituteInPlace generated/gtkd/gdk/c/functions.d \
       --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
       --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib
-    substituteInPlace generated/peas/peasc/peas.d \
+    substituteInPlace generated/peas/peas/c/functions.d \
       --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \
       --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \
       --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \
       --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib
-    substituteInPlace generated/vte/vtec/vte.d \
+    substituteInPlace generated/vte/vte/c/functions.d \
       --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \
       --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib
-    substituteInPlace generated/gstreamer/gstreamerc/gstinterfaces.d \
+    substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \
       --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \
       --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib
-    substituteInPlace generated/sourceview/gsvc/gsv.d \
+    substituteInPlace generated/sourceview/gsv/c/functions.d \
       --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
       --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
-    substituteInPlace generated/gtkd/gtkc/glib.d \
+    substituteInPlace generated/gtkd/glib/c/functions.d \
       --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
       --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
       --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
       --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
       --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
       --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
-    substituteInPlace generated/gtkd/gtkc/gio.d \
+    substituteInPlace generated/gtkd/gio/c/functions.d \
       --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
       --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
-    substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \
+    substituteInPlace generated/gstreamer/gstreamer/c/functions.d \
       --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
       --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
-    substituteInPlace generated/gtkd/gtkc/gtk.d \
+    substituteInPlace generated/gtkd/gtk/c/functions.d \
       --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
       --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \
       --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 90bc4fc7f8206..d5fc094844a78 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection, vala}:
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
@@ -11,11 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection vala ];
   buildInputs = [ aspell gtk3 enchant isocodes ];
   propagatedBuildInputs = [ enchant ];
 
-  configureFlags = [ "--enable-introspection" ];
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-vala"
+  ];
 
   meta = with stdenv.lib; {
     homepage = http://gtkspell.sourceforge.net/;
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index d098dd8fd1464..88caf7476d02d 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.7.6";
+  version = "1.8.1";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys";
+    url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
+    sha256 = "0ifzhqbg4p6ka7ps5c7lapix09i9yy4z7achc1gf91dhvn967vgv";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 424ffd184994b..20dda589b9cc8 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     version = "1.1";
   };
 
+  PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
+
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.gz";
     sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6";
@@ -21,6 +23,5 @@ stdenv.mkDerivation rec {
     homepage = http://hspell.ivrix.org.il/;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
-# Note that I don't speak hebrew, so I can only fix compile problems
   };
 }
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
new file mode 100644
index 0000000000000..b97f62dcf25c9
--- /dev/null
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "iksemel-${version}";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "timothytylee";
+    repo = "iksemel-1.4";
+    rev = "v${version}";
+    sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ];
+  buildInputs = [ gnutls ];
+
+  meta = with stdenv.lib; {
+    description = "XML parser for jabber";
+
+    homepage = https://github.com/timothytylee/iksemel-1.4;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ disassembler ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index 82a4ec3375551..a48908f41dd47 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
-    url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz";
+    url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index cdb018d297b64..20a60f1a102db 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
 
   src = fetchurl {
-    url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
+    url = "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
     sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
   };
 
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index 23adfd80caac4..daee9adb1fdce 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "dbus-java-2.7";
   src = fetchurl {
-    url = http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz;
+    url = https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz;
     sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y";
   };
   JAVA_HOME=jdk;
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix
index 13b4df395e505..6af8885464a31 100644
--- a/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/pkgs/development/libraries/java/geoipjava/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "GeoIPJava-1.2.5";
   src = fetchurl {
-    url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip;
+    url = https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip;
     sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
   };
   buildInputs = [ jdk unzip ];
diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index 8775353316989..ad5192f94ce22 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libmatthew-java-0.8";
   src = fetchurl {
-    url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz;
+    url = https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz;
     sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
   };
   JAVA_HOME=jdk;
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index 6435e9fc32da7..321ebb46e4634 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jbigkit-2.1";
 
   src = fetchurl {
-    url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz";
+    url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz";
     sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy";
   };
 
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 70363e6d2e6a1..9b4f26a906334 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.46/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.47/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 7f4c42a5d1829..d0db2284509b6 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/attica-5.46.0.tar.xz";
-      sha256 = "0xj4wn7nd28hfvbcpx4gfgf00vdg3kyfvqy0vk4js49xq14q9j09";
-      name = "attica-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/attica-5.47.0.tar.xz";
+      sha256 = "17i580hhi9rpd6d4nf408snlnf8xivwskkzbjja0snajx0nrd8bj";
+      name = "attica-5.47.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/baloo-5.46.0.tar.xz";
-      sha256 = "01ww9yqw9zi2r71i8gh87vs20k3kmvc1mq9a3di21zk5glb8hdy3";
-      name = "baloo-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/baloo-5.47.0.tar.xz";
+      sha256 = "15jpbl47pr86h5ji2x3079b6x38fchc2pf03rjqlf5mgkabdpafq";
+      name = "baloo-5.47.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/bluez-qt-5.46.0.tar.xz";
-      sha256 = "0hgqxpxx1b2vpr5fxhgk8s4m1njc9i080zqb62bh4vvsdayzib6l";
-      name = "bluez-qt-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/bluez-qt-5.47.0.tar.xz";
+      sha256 = "1pqgvpgr9xmgv8cxgvqx08jnabgmgzh2skkhwc9d9rdc2i4g7b1k";
+      name = "bluez-qt-5.47.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz";
-      sha256 = "1sq7j0clqc1zm330p49ny76jasn0dvvf1lszclfldg540n376343";
-      name = "breeze-icons-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/breeze-icons-5.47.0.tar.xz";
+      sha256 = "0fyzk196r8r0mzvijs9ws8ldh5vrw4yrgnvd1szb57vyy1agnnd7";
+      name = "breeze-icons-5.47.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/extra-cmake-modules-5.46.0.tar.xz";
-      sha256 = "0xf232d9znln6a7i8mcff4nr0kd5x6qpp1hxbf5pp7g1cwdkxnp5";
-      name = "extra-cmake-modules-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/extra-cmake-modules-5.47.0.tar.xz";
+      sha256 = "1591d27r6a2b7jn6zi2ik0i195pvl014dwxfpxv974hbbb8qnvcp";
+      name = "extra-cmake-modules-5.47.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/frameworkintegration-5.46.0.tar.xz";
-      sha256 = "1nb5b81b5g1y8crn6mwkjhkf8dzamyfpcl49c3ml34i1d68jbil3";
-      name = "frameworkintegration-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/frameworkintegration-5.47.0.tar.xz";
+      sha256 = "0iwdfa7q8ryszsl2w3bgix8bxkn3jj2lfdlcicfz9qh6av76p4yf";
+      name = "frameworkintegration-5.47.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kactivities-5.46.0.tar.xz";
-      sha256 = "1a1339i0zag6zsp7mq2w86v7h2fz3bc5jd6w7kb5yphagnwdp9kk";
-      name = "kactivities-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kactivities-5.47.0.tar.xz";
+      sha256 = "01h5a4m0wkgz1gafhbqdidxdr2x6g5siwcx4csv9293pc5xf0qcd";
+      name = "kactivities-5.47.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kactivities-stats-5.46.0.tar.xz";
-      sha256 = "18mdx8fxrq71rwz7zgx7j30k5ch0yjiyh86nwx9a4yrf6d2ykxwj";
-      name = "kactivities-stats-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kactivities-stats-5.47.0.tar.xz";
+      sha256 = "0linsga4d7lincnpj747wnbgidp2x7xk3jzh31lpfq8izkmqz1q5";
+      name = "kactivities-stats-5.47.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kapidox-5.46.0.tar.xz";
-      sha256 = "16kn5mka2mzvqpdfa7w82zgj7vi0ig611qa16flgazzrcbl2m827";
-      name = "kapidox-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kapidox-5.47.0.tar.xz";
+      sha256 = "1z2ka5fnwqsmjhxdbahk7gkjmhgzndg3lq6196dmpws1zjqf14vq";
+      name = "kapidox-5.47.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/karchive-5.46.0.tar.xz";
-      sha256 = "1xphgm8lxicws4bss5svq7r81n1j1zssgfq35vmlms22cpr7pr28";
-      name = "karchive-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/karchive-5.47.0.tar.xz";
+      sha256 = "0r8xxfg1wsnpzyfggpzhxap853gqfsnmbci1al6xyd0pslgcsb5r";
+      name = "karchive-5.47.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kauth-5.46.0.tar.xz";
-      sha256 = "0w0zvaxzv6bl76hr8wxhg6w0cfp3sdcqdpimspyc7dvddvq3vbr3";
-      name = "kauth-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kauth-5.47.0.tar.xz";
+      sha256 = "1s80grzkxvbkw39z5xida50ijb0k3aqy80k5h0025m9rqpbc7ir9";
+      name = "kauth-5.47.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kbookmarks-5.46.0.tar.xz";
-      sha256 = "1i7dsw5rskf7fb8bylwnnysppgmrzizw35wl8n5rw2lkk814a7xl";
-      name = "kbookmarks-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kbookmarks-5.47.0.tar.xz";
+      sha256 = "0b4b2yp3pvlisf0g1gwnisn2rc94wn874aad3dlg0607kd11xmwk";
+      name = "kbookmarks-5.47.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kcmutils-5.46.0.tar.xz";
-      sha256 = "0bwvsn3fm53d3wqsapakkg0v791vx9kxla973576mlaqpk1zgn1v";
-      name = "kcmutils-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kcmutils-5.47.0.tar.xz";
+      sha256 = "0qpsjijd51cxmp3y8knr6k6bx8bg5hhngsh63nr8yskpms38kj5d";
+      name = "kcmutils-5.47.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kcodecs-5.46.0.tar.xz";
-      sha256 = "0ywj61zmfr09nwd9v8x11jnlymkv2r3bvvkbar1p4wc8291n7cfd";
-      name = "kcodecs-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kcodecs-5.47.0.tar.xz";
+      sha256 = "1qhdj54cx98dqdy8bqkxm8jgq8mm2i7l3h9vyd2bvvzc8nzhd1hv";
+      name = "kcodecs-5.47.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kcompletion-5.46.0.tar.xz";
-      sha256 = "01rj0z26ppv2m3a7h4gh5kz96q877afk79354bvmwqi5w99iqv5a";
-      name = "kcompletion-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kcompletion-5.47.0.tar.xz";
+      sha256 = "1wdw434bi90ldmdxw8wpkgszligqapy19klpnn528vh3gv5is00p";
+      name = "kcompletion-5.47.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kconfig-5.46.0.tar.xz";
-      sha256 = "1yx2f81mik3c3hdr424j92drqs3zmsqcjryfyzczxsbllsmf6zma";
-      name = "kconfig-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kconfig-5.47.0.tar.xz";
+      sha256 = "0ifv7i6w7jz221rw07vb40sljx95kdjhxd7l9nfx95dbd5bjb0nq";
+      name = "kconfig-5.47.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kconfigwidgets-5.46.0.tar.xz";
-      sha256 = "0d4x323j6yrjjf191vf25g4fl9iad652y0kgqdqv4r2sszb7w3bp";
-      name = "kconfigwidgets-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kconfigwidgets-5.47.0.tar.xz";
+      sha256 = "05pxa7519f0730wrbh2bsqzfvc9dwvrh8l9vjh24rkaiaxnzhd6k";
+      name = "kconfigwidgets-5.47.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kcoreaddons-5.46.0.tar.xz";
-      sha256 = "13chb3xh9xyacf72kzvw6rkc9i54p1gifcnk7wx5g223bdym7h3z";
-      name = "kcoreaddons-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kcoreaddons-5.47.0.tar.xz";
+      sha256 = "0ihbggv5ziazhv66cnc6d4h4m2bci0cgwh498k49phaagrsh9zs0";
+      name = "kcoreaddons-5.47.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kcrash-5.46.0.tar.xz";
-      sha256 = "0d9k9i7lk5cj9j91av87x5gjahzs2lhkk6m1q27675sadp9hb6ih";
-      name = "kcrash-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kcrash-5.47.0.tar.xz";
+      sha256 = "15wn4g7c26f3cpk7q2imci7p8pmcksw47h6csihyvlpi3b6ykqg9";
+      name = "kcrash-5.47.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdbusaddons-5.46.0.tar.xz";
-      sha256 = "07h3n06ld1p3gspky3xsx89vpl46hq5apjqr4f2ccahscmyk1fn3";
-      name = "kdbusaddons-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdbusaddons-5.47.0.tar.xz";
+      sha256 = "04270rnfmasb9cq7kj40wny7vgkb7hksjnhr4sgyg4v2p8v5dmib";
+      name = "kdbusaddons-5.47.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdeclarative-5.46.0.tar.xz";
-      sha256 = "10r20wx36q4kzr973kgwr7j2wq140xiarjawnqpmszcp1gm9qv8c";
-      name = "kdeclarative-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdeclarative-5.47.0.tar.xz";
+      sha256 = "183l926yyhdw270rcwqh2lf1rjd4a9vbkcjlqyss2k7d79mj6m9s";
+      name = "kdeclarative-5.47.0.tar.xz";
     };
   };
   kded = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kded-5.46.0.tar.xz";
-      sha256 = "0is8x8r2dpam2m83pylyb3wfjdnn6nnrdaqkpglmbrq3r71n002r";
-      name = "kded-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kded-5.47.0.tar.xz";
+      sha256 = "0z5xsxalxasnyhhkvy247a08l37012fiaahwyy0477p7p5x3c845";
+      name = "kded-5.47.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/portingAids/kdelibs4support-5.46.0.tar.xz";
-      sha256 = "19jjn5dxgayi9m3kglalg473zslbxc0818fqckichxxn4a0wmylz";
-      name = "kdelibs4support-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/portingAids/kdelibs4support-5.47.0.tar.xz";
+      sha256 = "1rij23ns9axlwi2fvbiz2wv3y3vh1p9cm3nxkkrj3axc0hs39n20";
+      name = "kdelibs4support-5.47.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdesignerplugin-5.46.0.tar.xz";
-      sha256 = "11xvl7vjmwv5s9bhkywcapc4h4g8sdrnkwgwzgjf528mfhysi76a";
-      name = "kdesignerplugin-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdesignerplugin-5.47.0.tar.xz";
+      sha256 = "0ijdjjfqj2wpl0jrr2n90i74d378986lkqwdicig2rwkylsivr1g";
+      name = "kdesignerplugin-5.47.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdesu-5.46.0.tar.xz";
-      sha256 = "0jm4cyy85afq69qaxxzvgfv59y80i76skvwrpa59w8sl173xh8di";
-      name = "kdesu-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdesu-5.47.0.tar.xz";
+      sha256 = "1rc2v13d4i0wwzmgrbwf6i6khcd4wfa79flq764cvx62flingfvr";
+      name = "kdesu-5.47.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdewebkit-5.46.0.tar.xz";
-      sha256 = "0vr4smvj34yycxrwzhaqd8kmh6jfjxf4a0y2c1j5k41m1w0wdppl";
-      name = "kdewebkit-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdewebkit-5.47.0.tar.xz";
+      sha256 = "1yg4lydz03y6cc1f44larfd4xnvnbnzpkfa97qxjzvvrk06hdxx3";
+      name = "kdewebkit-5.47.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdnssd-5.46.0.tar.xz";
-      sha256 = "1rpf9hjqcv3k8dcwdzdlbyx5shwmjkvck59cgfmzzh6jl81w9z6d";
-      name = "kdnssd-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdnssd-5.47.0.tar.xz";
+      sha256 = "0xgv4fvhyr3gk99vaicq45zqf5mnbc4xpyz66jfhsk1w655bqijp";
+      name = "kdnssd-5.47.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kdoctools-5.46.0.tar.xz";
-      sha256 = "1zkxnib2b08nb1mxc7sjij07nk0bbylfrrd7p1h8jrx0m4gip7ik";
-      name = "kdoctools-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kdoctools-5.47.0.tar.xz";
+      sha256 = "06zlk04ldi9cq3ricni74s3737gmvs73g2k9mgfkdjq5grcsw177";
+      name = "kdoctools-5.47.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kemoticons-5.46.0.tar.xz";
-      sha256 = "0yxi72x1acjpmkpnkpy8m4y7il095bmmrgnkc9yrax4lmr9hksil";
-      name = "kemoticons-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kemoticons-5.47.0.tar.xz";
+      sha256 = "1hg72mf629g67wll5b80rw9k85qia1jdfhabg64vy7n7i9fm912y";
+      name = "kemoticons-5.47.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kfilemetadata-5.46.0.tar.xz";
-      sha256 = "15panysvxn7di38dplslpii9xskich09j9x7s79p43pxyczmq0l3";
-      name = "kfilemetadata-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kfilemetadata-5.47.0.tar.xz";
+      sha256 = "0ywp45akvn0cky757azkf6p4ql2l02xy7fplbhv7j6qz39s0p2vm";
+      name = "kfilemetadata-5.47.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kglobalaccel-5.46.0.tar.xz";
-      sha256 = "0xnljxkp9rcl3y22mzlz7zlq923ngyvihg6s7mqpfh97ayfh3pvv";
-      name = "kglobalaccel-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kglobalaccel-5.47.0.tar.xz";
+      sha256 = "1lcac55kanddpn6nphmyixp33mk8zmhfih7p9vzhnxvrc5k9r6hb";
+      name = "kglobalaccel-5.47.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kguiaddons-5.46.0.tar.xz";
-      sha256 = "02x9aqdvy3gl1y25g03cpk340xzhrmdi84v5xw8y7i2xbmgax244";
-      name = "kguiaddons-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kguiaddons-5.47.0.tar.xz";
+      sha256 = "14pivzmpsmmqrhvmvlc10fc7mc6gdq214qy27r4dsxmjdvgljhhj";
+      name = "kguiaddons-5.47.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kholidays-5.46.0.tar.xz";
-      sha256 = "10xb35zinriah3q214qhdwx3riqfj7w0dvn2ds5kcfa070q694yq";
-      name = "kholidays-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kholidays-5.47.0.tar.xz";
+      sha256 = "001misp4bdd4q05ns4bch7gx1j8h2wpa2is7zdazqy0bp1blsfwb";
+      name = "kholidays-5.47.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/portingAids/khtml-5.46.0.tar.xz";
-      sha256 = "0cdq8y09qbciwaxvkln03n9jy91li0yp2g440sd580hd3n4zvs09";
-      name = "khtml-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/portingAids/khtml-5.47.0.tar.xz";
+      sha256 = "1c9fja1mb2jrlrial2mz2bvw004s14kn7jnakawqg0d19fhlqg1h";
+      name = "khtml-5.47.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/ki18n-5.46.0.tar.xz";
-      sha256 = "0lwjmxkfqhxwjm0m86f0saa3irzv70psl5y8pv1qib82q3fv73ns";
-      name = "ki18n-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/ki18n-5.47.0.tar.xz";
+      sha256 = "1a190wf2ms09cwzpk1ylx7kjfz8yvzv2p14fjwyld6vf32hgl9r6";
+      name = "ki18n-5.47.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kiconthemes-5.46.0.tar.xz";
-      sha256 = "1y8f2piy258n0k8jrlyhgflafxcqax18fi46719av29ls48cgcap";
-      name = "kiconthemes-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kiconthemes-5.47.0.tar.xz";
+      sha256 = "14j8d1glrcd6a9xn86jxa7wx80bpf5wax5vkv09swcbbshp7vqdp";
+      name = "kiconthemes-5.47.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kidletime-5.46.0.tar.xz";
-      sha256 = "0hvgvmgfrnfmfgi19mjc1cg31yli7pzr9fq2ny9pk63is6zgq3vm";
-      name = "kidletime-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kidletime-5.47.0.tar.xz";
+      sha256 = "0dirflwwnq83nxml66kk4bf70nl04dhrg8pvh9md3hip5cn6mq2f";
+      name = "kidletime-5.47.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kimageformats-5.46.0.tar.xz";
-      sha256 = "0gkmd5ma0dh06vdr8kzw5v9hqw6xqiizzvq7aya2y9lk42p4hay3";
-      name = "kimageformats-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kimageformats-5.47.0.tar.xz";
+      sha256 = "19j6wdfv9yncdgcm5ij0rz5rv0a3jlgdnwmyrw1gjyz5isv2qp4f";
+      name = "kimageformats-5.47.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kinit-5.46.0.tar.xz";
-      sha256 = "0szpvni3ff50i5w4c2jdi8wsb2i4dfhdna7wcmrzc5qd2l62yi6m";
-      name = "kinit-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kinit-5.47.0.tar.xz";
+      sha256 = "1rc0ig4gw7lkvkpwcik6krn5w1zqj6y710c58i9kr9vxxpffj170";
+      name = "kinit-5.47.0.tar.xz";
     };
   };
   kio = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kio-5.46.0.tar.xz";
-      sha256 = "19fkijl7h1p92sngsqypsd2ni9qld9cxwh8c7diq0ybp8qzpjspb";
-      name = "kio-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kio-5.47.0.tar.xz";
+      sha256 = "0847dxrhdywrx2v6knf6l70slm8dfz4n4j1c1si13jrj1fp2w4ji";
+      name = "kio-5.47.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kirigami2-5.46.0.tar.xz";
-      sha256 = "1d6w4kc6kf0jlgji83r8zn0r5rdggygi28938wyb3wz4pgaz8m8d";
-      name = "kirigami2-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kirigami2-5.47.0.tar.xz";
+      sha256 = "1mdahdb5z0i9bf63480b2j6xm7cgsh1anx0cljn2hivglpixjbgd";
+      name = "kirigami2-5.47.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kitemmodels-5.46.0.tar.xz";
-      sha256 = "0xy8bqbaqnkxk34p7hfslm42dm98ka86fwi77pz04gw9r6048wq2";
-      name = "kitemmodels-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kitemmodels-5.47.0.tar.xz";
+      sha256 = "0151arf7s5ns2qadn86z385i9v9z8rga0jcj8pnw329k4pjpc2ks";
+      name = "kitemmodels-5.47.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kitemviews-5.46.0.tar.xz";
-      sha256 = "1ni3c2ivqr5vczl7z5707nv469xbwys1vz625ypwfh8py2b9nnwz";
-      name = "kitemviews-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kitemviews-5.47.0.tar.xz";
+      sha256 = "0dnk7y50d5wxpl4fppb0hdzy5w6xa04a178y49zggpjm5x048mp5";
+      name = "kitemviews-5.47.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kjobwidgets-5.46.0.tar.xz";
-      sha256 = "129mxv7c0fmqdmzg1j8r0cb8sr9masrmkjl4dp8i6yark49k61hf";
-      name = "kjobwidgets-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kjobwidgets-5.47.0.tar.xz";
+      sha256 = "05vgqm3nfpbwbnv46ajb8hc5wzs1444513ahay1qn8vpah4kqbpp";
+      name = "kjobwidgets-5.47.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/portingAids/kjs-5.46.0.tar.xz";
-      sha256 = "002k1jbcwxyv8dcmz3x4m7zv1ry2gdzg5gl466vf5hlc5cwgjac5";
-      name = "kjs-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/portingAids/kjs-5.47.0.tar.xz";
+      sha256 = "1rhvmdwmsr48ih0qrpwphiwcl25af8shwj8nrkq619krc549gf8q";
+      name = "kjs-5.47.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/portingAids/kjsembed-5.46.0.tar.xz";
-      sha256 = "13l2i0i8qlzs993nfbcgaijkhy7w9npn5358d5hfkxjlay7imcq2";
-      name = "kjsembed-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/portingAids/kjsembed-5.47.0.tar.xz";
+      sha256 = "104nv33zpqh78zxqj1z9sj6cyliv0l9gzgmsc4n9nq9fcr1f2hdd";
+      name = "kjsembed-5.47.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/portingAids/kmediaplayer-5.46.0.tar.xz";
-      sha256 = "0y4cn63fa5g35vrdx2hfhrw1fzwg5k3lxgx84r3c33cybxswcigi";
-      name = "kmediaplayer-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/portingAids/kmediaplayer-5.47.0.tar.xz";
+      sha256 = "0cz0m2sa48893p6vq4pm92xmvq2aqqgfmijlskzdpd3gp3x9l1qw";
+      name = "kmediaplayer-5.47.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/knewstuff-5.46.0.tar.xz";
-      sha256 = "12r38m7p86b2dfhp8nybm335cvizma4p26gxrwn7jg1kcvbg3hf5";
-      name = "knewstuff-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/knewstuff-5.47.0.tar.xz";
+      sha256 = "04zn4iy0gy00d835qjfmb0prm802ggphj4aw328v29474nqs14nf";
+      name = "knewstuff-5.47.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/knotifications-5.46.0.tar.xz";
-      sha256 = "0hyf3wv3iy3v7l134pmb623bfa9j578rdymhz4sm5fix4mv23g5z";
-      name = "knotifications-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/knotifications-5.47.0.tar.xz";
+      sha256 = "08cm2aks35lzspchyb6p25bfk4mrljb6wf7yi29674k4kg7gr6sv";
+      name = "knotifications-5.47.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/knotifyconfig-5.46.0.tar.xz";
-      sha256 = "0wr0kliagkbpv89h9qviib6b16s2cw5j9jq4gpk3j5ij9zli4lkj";
-      name = "knotifyconfig-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/knotifyconfig-5.47.0.tar.xz";
+      sha256 = "0zava15sabmxc38ngmw9yylwnm27h8ah8df0jadxbqjpaaf0jssl";
+      name = "knotifyconfig-5.47.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kpackage-5.46.0.tar.xz";
-      sha256 = "1q45zjh0a741f1w1g0vggbcygzzvkzpwj0iy13fwhgf4g7qrdp8c";
-      name = "kpackage-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kpackage-5.47.0.tar.xz";
+      sha256 = "1pwlvcmn9crjgqf1ccwb86zq962jnwavx6h6dcx7vb982z772j98";
+      name = "kpackage-5.47.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kparts-5.46.0.tar.xz";
-      sha256 = "1hr0hy1jsi00rfnjy1wf59skricib6cc0c4bw0h0gw0rdy1vv80j";
-      name = "kparts-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kparts-5.47.0.tar.xz";
+      sha256 = "1b21kmn8bjq69qhldacqpby9pa56c4y8j84kkwailylk3nngilsf";
+      name = "kparts-5.47.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kpeople-5.46.0.tar.xz";
-      sha256 = "1gkm9ylwm4ajpw6lv78qy4zkmqirm4xnrf0nld3x7jrbpiadfrni";
-      name = "kpeople-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kpeople-5.47.0.tar.xz";
+      sha256 = "13x1f5jwxhmdq5qq43qzfmxm20j95dwa0fck1ns1rg8k7gazmdqb";
+      name = "kpeople-5.47.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kplotting-5.46.0.tar.xz";
-      sha256 = "1vkwv2khww1v13r2ys06nfb6c0fwyn152wrfc9vqzcdcv6znq48n";
-      name = "kplotting-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kplotting-5.47.0.tar.xz";
+      sha256 = "0sw448g5wa2gz6krzp7d8q1ryh6qs51hgxv432fjpblijnwzb6xx";
+      name = "kplotting-5.47.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kpty-5.46.0.tar.xz";
-      sha256 = "1m1spwgrgjiazkxwddh5xcii482bvxf015x70wnkyyygilbn6871";
-      name = "kpty-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kpty-5.47.0.tar.xz";
+      sha256 = "1q4hkm701ridf07a4m93zvifi1sk6vn8z1h0b1rz5srxasaxnxlh";
+      name = "kpty-5.47.0.tar.xz";
     };
   };
   kross = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/portingAids/kross-5.46.0.tar.xz";
-      sha256 = "0wnj01ml3j3ij4f6plw8d1by8k9fkbslq0finiyxrn64zqfkr1sd";
-      name = "kross-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/portingAids/kross-5.47.0.tar.xz";
+      sha256 = "13nav8fihj1pammiwz8na482qpsmcxmyxd47rqhwldvxz1z0kbq1";
+      name = "kross-5.47.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/krunner-5.46.0.tar.xz";
-      sha256 = "1nvcprp1b5npzvcdbwzi1yn6953f8kjyfnavhjjp9vfafp4jgdca";
-      name = "krunner-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/krunner-5.47.0.tar.xz";
+      sha256 = "0j3j6831y5j96cl19jdwcnd9h4rl95ymj3gy5sxilazgafzfihbd";
+      name = "krunner-5.47.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kservice-5.46.0.tar.xz";
-      sha256 = "0q502wqvqb61gwy07byg35nk9ac12d02hhqa0qhil6qkv9f7dx57";
-      name = "kservice-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kservice-5.47.0.tar.xz";
+      sha256 = "0ryipmvydh924zjpfzmwivwagaad9dicnfcfa4drrygbwnm60bd9";
+      name = "kservice-5.47.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/ktexteditor-5.46.0.tar.xz";
-      sha256 = "1yjyni3f123i2yx20gj13yw0v6cqwwdvk6x8f3maqqdzrfnqmm8b";
-      name = "ktexteditor-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/ktexteditor-5.47.0.tar.xz";
+      sha256 = "1k089k9ssk06734wnjyfmvlgxy2hqxh7fgy5qiyjvp807kmf4jkb";
+      name = "ktexteditor-5.47.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/ktextwidgets-5.46.0.tar.xz";
-      sha256 = "1bniracp5q6p4k1ji0gn1a51sylbgxh0bqdlrfkd953mp35rh1wf";
-      name = "ktextwidgets-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/ktextwidgets-5.47.0.tar.xz";
+      sha256 = "19w84d6v8yrci4fb6c7m91q2ykc9p24cf85cnm6lsb8ggis4dsyr";
+      name = "ktextwidgets-5.47.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kunitconversion-5.46.0.tar.xz";
-      sha256 = "14db0835zd375sn3d4v6d2pa5yp67gn9p8dxfs8111minmraqk43";
-      name = "kunitconversion-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kunitconversion-5.47.0.tar.xz";
+      sha256 = "0avm3g78zfzrh4h6ampf54n9j715ii5cra8praq0waiy94idn7cq";
+      name = "kunitconversion-5.47.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kwallet-5.46.0.tar.xz";
-      sha256 = "15fvbyfdbmdq7zvsbj1c7xzyyhfd5mhv9zvgiss00ranhghsbbzh";
-      name = "kwallet-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kwallet-5.47.0.tar.xz";
+      sha256 = "0hy3kzkcqbzkjkvnaaanfdcnwcidnbw6j14ifvhlh2padql7kyix";
+      name = "kwallet-5.47.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kwayland-5.46.0.tar.xz";
-      sha256 = "1dwvxhpa93k9l2iqbpyf6s7hkmi91kc56hm0v5q6k2mgb43g32nj";
-      name = "kwayland-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kwayland-5.47.0.tar.xz";
+      sha256 = "0j15xzlzxqi0g8lj5k9w0lbnvx26h6bblgz8rhqlkl80ml2wzgfv";
+      name = "kwayland-5.47.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kwidgetsaddons-5.46.0.tar.xz";
-      sha256 = "0h8n4hiyzynpg59bfrk3wgdc1w0b3pdbvimykgjvrrmn4wi6h8f9";
-      name = "kwidgetsaddons-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kwidgetsaddons-5.47.0.tar.xz";
+      sha256 = "0d2sxh6g7igjdsgj9agknx8zvymyvq9rb0xkfbr044vg5q0g99js";
+      name = "kwidgetsaddons-5.47.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kwindowsystem-5.46.0.tar.xz";
-      sha256 = "0rxhi8wjjxkqsspx0mqn5049f75s3jihkp73hdgxwwdp1qc66kx3";
-      name = "kwindowsystem-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kwindowsystem-5.47.0.tar.xz";
+      sha256 = "1hfbjy17b6iw6443a3zw304syi4j0vid7nmm5hqdv8685lnp4wx6";
+      name = "kwindowsystem-5.47.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kxmlgui-5.46.0.tar.xz";
-      sha256 = "0wwxry3kf2xsw40dhjpa8gh1qbh4wdnd1hp1g9mmh8l0wpfv289l";
-      name = "kxmlgui-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kxmlgui-5.47.0.tar.xz";
+      sha256 = "194linh0px5mk404hbgrzcfx9zblk4q835nvj4lrbl62nffzwnlp";
+      name = "kxmlgui-5.47.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/kxmlrpcclient-5.46.0.tar.xz";
-      sha256 = "05wf844ipikikhxcri0xpdwfxs8h3m677frsqkimf778g8vf7crh";
-      name = "kxmlrpcclient-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/kxmlrpcclient-5.47.0.tar.xz";
+      sha256 = "1wmsycpg5yljdpa0slv47baqpag6jzg75g0l2jddl3knznp7br8i";
+      name = "kxmlrpcclient-5.47.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/modemmanager-qt-5.46.0.tar.xz";
-      sha256 = "1h9hj1v4js02gyxbh1cizz69vh8pdwb93k9pi334a2s0lxbn5205";
-      name = "modemmanager-qt-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/modemmanager-qt-5.47.0.tar.xz";
+      sha256 = "00wxsc4wz5fflld4h1w77726w1c06g1ql5qld2r30yibx1fb2slb";
+      name = "modemmanager-qt-5.47.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/networkmanager-qt-5.46.0.tar.xz";
-      sha256 = "1pp5sgp76fjd62iqki3cc7b2drmfgq2fjhab9ai44r852ydgkzpn";
-      name = "networkmanager-qt-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/networkmanager-qt-5.47.0.tar.xz";
+      sha256 = "02c2d1jm3azzbwd52awq6ikjsgfg9f2dc12dkw14zkz41r87gcyh";
+      name = "networkmanager-qt-5.47.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/oxygen-icons5-5.46.0.tar.xz";
-      sha256 = "141qhbk6rakvh2clxyfhinzka3ap99ac8y90qplgss31ww0wxbb5";
-      name = "oxygen-icons5-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/oxygen-icons5-5.47.0.tar.xz";
+      sha256 = "19w7ab5b7qdhj3j0pg8378k918kwjd1m5lm13jdg2kkn1f4j0j4m";
+      name = "oxygen-icons5-5.47.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/plasma-framework-5.46.0.tar.xz";
-      sha256 = "0zpv6b128ll9yf23ys8hv35a95igmlbk3zid5k4385b6h0j4h367";
-      name = "plasma-framework-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/plasma-framework-5.47.0.tar.xz";
+      sha256 = "1d3f2k5y966jnwrjps1x5lx9scpakq3ri3111m5h0vidkrlvnhsa";
+      name = "plasma-framework-5.47.0.tar.xz";
     };
   };
   prison = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/prison-5.46.0.tar.xz";
-      sha256 = "1508pcqvyjfqg0yxk2jx32cqlvvz658z001n6iaf4c7hwclkyspg";
-      name = "prison-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/prison-5.47.0.tar.xz";
+      sha256 = "17j12mg11fnjnlj04fzxd5x95cs2f34xc2lk09hjlm7ihkw932xh";
+      name = "prison-5.47.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/purpose-5.46.0.tar.xz";
-      sha256 = "1mrssw484hb3nk9hafys0ns1ixd8h3l6m8qnyry9ky964xqmbkg1";
-      name = "purpose-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/purpose-5.47.0.tar.xz";
+      sha256 = "1symzvzk50d3szz2rh7c9jd60hzpvlv6d8n7r6j9rzrplvshk879";
+      name = "purpose-5.47.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/qqc2-desktop-style-5.46.0.tar.xz";
-      sha256 = "0hfl0qk4nadz2jykn0xaphppiqva0h83br4ym6zf2wc3c5sd6w91";
-      name = "qqc2-desktop-style-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/qqc2-desktop-style-5.47.0.tar.xz";
+      sha256 = "1w897ixs0bfhzrzq8v4yg3rsrd8zmb08j5xh52ysb4mp7zs8jcyk";
+      name = "qqc2-desktop-style-5.47.0.tar.xz";
     };
   };
   solid = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/solid-5.46.0.tar.xz";
-      sha256 = "0ywx5nbms6nk7dmcbbgjfm8w3lchhf90wlhv077yhmxlnqciv3im";
-      name = "solid-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/solid-5.47.0.tar.xz";
+      sha256 = "041fvxxlazbpdl5ncdpxzj8jq48rk31kd1nqsm8p5wqglzrz6dsl";
+      name = "solid-5.47.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/sonnet-5.46.0.tar.xz";
-      sha256 = "13jmyiqfwcc7r5y2mb2hwwnn28bq1l0pjlfv8g963r0agzyap424";
-      name = "sonnet-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/sonnet-5.47.0.tar.xz";
+      sha256 = "14nfrv1z1lpjhxsxhjx8bi88yp1qx4dzwf6v22w0mk71qc6z2rgr";
+      name = "sonnet-5.47.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/syntax-highlighting-5.46.0.tar.xz";
-      sha256 = "18b7v6l3ckqkhp5mxpfvyzl89yl3w9hcqbvfvbzzr9pd0lg09xxx";
-      name = "syntax-highlighting-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/syntax-highlighting-5.47.0.tar.xz";
+      sha256 = "0bv25cv3xvhl9v23dn3yxhdcv5ag2i1zhvna6gnng6k30n316v0c";
+      name = "syntax-highlighting-5.47.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.46.0";
+    version = "5.47.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.46/threadweaver-5.46.0.tar.xz";
-      sha256 = "0zndyxj3kkxs4mlznykf3lm5bq3mmwanxd80pb7y0rymnzsd2n7q";
-      name = "threadweaver-5.46.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.47/threadweaver-5.47.0.tar.xz";
+      sha256 = "0h48b6mvgq3igbs6jzngj1iad7m5kgkird17shk86ma79k6igriz";
+      name = "threadweaver-5.47.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index acd0d35a5f08e..873ccc5665df9 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "lasso-${version}";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
-    sha256 = "0n10zjjw84303c9vfy9bqhyzdl01459akbwy86cbgphd826mq45y";
+    sha256 = "1kqagm63a4mv5sw5qc3y0qlky7r9qg5lccq0c3cnfr0n4mxgysql";
 
   };
 
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 356433b54eb58..10441b9b871e5 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A LDAP-like embedded database";
-    homepage = http://ldb.samba.org/;
+    homepage = https://ldb.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 7b6834166d8c1..a269069fb048f 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
-    sha256 = "0n516gqv501ymj99bickbr2cbhr109azh9hc1hn7flbcjzz3aljc";
+    sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index 1e7720b0656a5..de796307de1a9 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
 
-    url = "http://download.osgeo.org/liblas/${name}.tar.bz2";
+    url = "https://download.osgeo.org/liblas/${name}.tar.bz2";
     sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
   };
 
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
index 187e06239c104..fe2229bcea6a0 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1.2";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
     sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb";
   };
 
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix
index 5f0b1ccd18ec0..ef58381885939 100644
--- a/pkgs/development/libraries/libantlr3c/default.nix
+++ b/pkgs/development/libraries/libantlr3c/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libantlr3c-3.4";
   src = fetchurl {
-    url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz;
+    url = https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz;
     sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa";
   };
 
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index d11bec2cb4ff2..b94c845479aaa 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,20 +1,17 @@
-{ stdenv, fetchgit, yasm, perl, cmake,  pkgconfig }:
+{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "libaom-0.1.0";
+  name = "libaom-${version}";
+  version = "1.0.0";
 
   src = fetchgit {
     url = "https://aomedia.googlesource.com/aom";
-    rev	= "105e9b195bb90c9b06edcbcb13b6232dab6db0b7";
-    sha256 = "1fl2sca4df01gyn00s0xcwwirxccfnjppvjdrxdnb8f2naj721by";
+    rev	= "v${version}";
+    sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82";
   };
 
-  buildInputs = [ perl yasm  ];
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  cmakeFlags = [
-    "-DCONFIG_UNIT_TESTS=0"
-  ];
+  buildInputs = [ perl yasm ];
+  nativeBuildInputs = [ cmake pkgconfig python3Packages.python ];
 
   meta = with stdenv.lib; {
     description = "AV1 Bitstream and Decoding Library";
@@ -22,4 +19,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ kiloreux ];
     platforms   = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 9a9c3b1fa64d5..7625abf38fb39 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
 {
-  fetchurl, stdenv, pkgconfig,
+  fetchurl, fetchpatch, stdenv, pkgconfig,
   acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
 
   # Optional but increases closure only negligibly.
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
   patches = [
     ./CVE-2017-14166.patch
     ./CVE-2017-14502.patch
+
+    # LibreSSL patch; this is from upstream, and can be removed when the next release is made.
+    (fetchpatch {
+      url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch";
+      sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v";
+    })
   ];
 
   outputs = [ "out" "lib" "dev" ];
@@ -46,6 +52,8 @@ stdenv.mkDerivation rec {
       -e 's|-llzo2|-L${lzo}/lib -llzo2|'
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Multi-format archive and compression library";
     longDescription = ''
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
index aab8fcd4beb8b..eebe667badb99 100644
--- a/pkgs/development/libraries/libaudclient/default.nix
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.5-rc2";
 
   src = fetchurl {
-    url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2";
+    url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2";
     sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
   };
 
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 5ccfb0d1b26f1..04bd3f3d71ed3 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
 , libusb1, udev }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ];
+  # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
+  buildInputs = [ cmake git doxygen help2man tecla libusb1 ]
+    ++ lib.optionals stdenv.isLinux [ udev ]
+    ++ lib.optionals stdenv.isDarwin [ ncurses ];
 
   # Fixup shebang
   prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
@@ -24,17 +27,19 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Debug"
+    "-DBUILD_DOCUMENTATION=ON"
+  ] ++ lib.optionals stdenv.isLinux [
     "-DUDEV_RULES_PATH=etc/udev/rules.d"
     "-DINSTALL_UDEV_RULES=ON"
-    "-DBUILD_DOCUMENTATION=ON"
   ];
 
-  meta = with stdenv.lib; {
-    homepage = https://www.nuand.com/;
+  hardeningDisable = [ "fortify" ];
+
+  meta = with lib; {
+    homepage = https://nuand.com/libbladeRF-doc;
     description = "Supporting library of the BladeRF SDR opensource hardware";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ funfunctor ];
-    platforms = with platforms; linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
new file mode 100644
index 0000000000000..e84df0c1aedf9
--- /dev/null
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
+, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml
+, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
+}:
+
+let
+  version = "2.18";
+in stdenv.mkDerivation rec {
+  name = "libblockdev-${version}";
+
+  src = fetchFromGitHub {
+    owner = "storaged-project";
+    repo = "libblockdev";
+    rev = "${version}-1";
+    sha256 = "03gbmji401nz1sff2zp61dhal80qls4blqwadj2p4ckbxdlmid4i";
+  };
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  postPatch = ''
+    patchShebangs scripts
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobjectIntrospection
+  ];
+
+  buildInputs = [
+    glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A library for manipulating block devices";
+    homepage = http://storaged.org/libblockdev/;
+    license = licenses.lgpl2Plus; # lgpl2Plus for the library, gpl2Plus for the utils
+    maintainers = with maintainers; [];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index ff9412ceb5804..36410e842a5dd 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.8.7";
 
   src = fetchurl {
-    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
     sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
   };
 
diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
new file mode 100644
index 0000000000000..f1dcf60b3b942
--- /dev/null
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
+, gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl
+, python3, pcre, gmp, mpfr
+}:
+
+let
+  version = "1.3";
+in stdenv.mkDerivation rec {
+  name = "libbytesize-${version}";
+
+  src = fetchFromGitHub {
+    owner = "storaged-project";
+    repo = "libbytesize";
+    rev = version;
+    sha256 = "1ys5d8rya8x4q34gn1hr96z7797s9gdzah0y0d7g84x5x6k50p30";
+  };
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ];
+
+  buildInputs = [ pcre gmp mpfr ];
+
+  meta = with stdenv.lib; {
+    description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes";
+    homepage = src.meta.homepage;
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 83f86c40c0d15..0d1772d0c549a 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
-, alsaLib, libpulseaudio, gst_all_1, libvorbis }:
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
+, gtk ? null
+, libpulseaudio, gst_all_1, libvorbis, libcap
+, withAlsa ? stdenv.isLinux, alsaLib }:
 
 stdenv.mkDerivation rec {
   name = "libcanberra-0.30";
@@ -11,11 +13,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    alsaLib libpulseaudio libvorbis gtk libcap
-  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]);
+    libpulseaudio libvorbis gtk
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
+    ++ lib.optional stdenv.isLinux libcap
+    ++ lib.optional withAlsa alsaLib;
 
   configureFlags = "--disable-oss";
 
+  patchFlags = "-p0";
+  patches = stdenv.lib.optional stdenv.isDarwin
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff";
+      sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31";
+    });
+
   postInstall = ''
     for f in $out/lib/*.la; do
       sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $f
@@ -42,6 +53,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 6d8cafcfaa604..8b5130b0eac8d 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libcdr-0.1.4";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
     sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7";
   };
 
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index ea27046279c70..6d37eb19c7122 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.4.0";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
     sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
   };
 
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 3386b081a104c..ce67a8efa80e6 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.9.0";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
     sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
   };
 
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index e4e61c9428367..4f0ba439417f2 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, collectd }:
 with stdenv.lib;
 
-overrideDerivation collectd (oldAttrs: {
+collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
   buildInputs = [ ];
 
@@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: {
 
   postInstall = "rm -rf $out/{bin,etc,sbin,share}";
 
-}) // {
   meta = with stdenv.lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = http://collectd.org;
@@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: {
     platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
     maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
   };
-}
+})
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index bf72ec767258c..6531a4cd9ed49 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.9.0";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "12s2iw4akil3hlvsccns7qw2c90yw5h67zj3wq03q938w8xcw0d0";
+    sha256 = "1ca3jp1nr5dk2w35wwyhsf96pblbw6n6n7a3ja264ivc9nhpkz4z";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ libevent openssl ];
 
-  doCheck = true;
+  doCheck = (!stdenv.isDarwin);
   checkPhase = "ctest";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index 7b4d39f955aab..81122a6eb520e 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2";
+    url = "https://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2";
     sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43";
   };
 
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index fc0221b93889f..5a0006ad6c6e3 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libuuid curl libxml2 ];
 
   src = fetchurl {
-    url = "http://www.opendap.org/pub/source/${name}.tar.gz";
+    url = "https://www.opendap.org/pub/source/${name}.tar.gz";
     sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj";
   };
 
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 67552181d9a62..7f4eaa5fd14b4 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -2,7 +2,7 @@
 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 let
-  version = "3.28.2";
+  version = "3.28.3";
   pname = "libdazzle";
 in
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1kfxnyqjwb1r8d4bpr59j1cikd94m6nxf1641hlg7dqlpl9rwlan";
+    sha256 = "0q8apibs99yvrwdxlknq4nayss88wsj0rp5fv2x4hh0bgfw8i7w7";
   };
 
   nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
new file mode 100644
index 0000000000000..07823072bad4a
--- /dev/null
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.3";
+  name = "libde265-${version}";
+
+  src = fetchFromGitHub {
+    owner = "strukturag";
+    repo = "libde265";
+    rev = "v${version}";
+    sha256 = "049g77f6c5sbk1h534zi9akj3y5h8zwnca5c9kqqjkn7f17irk10";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  meta = {
+    homepage = "https://github.com/strukturag/libde265";
+    description = "Open h.265 video codec implementation";
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ gebner ];
+  };
+
+}
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index a09e48dcc1d9b..c94806b50c10d 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6.0";
 
   src = fetchurl {
-    url = "http://www.libdivecomputer.org/releases/${name}.tar.gz";
+    url = "https://www.libdivecomputer.org/releases/${name}.tar.gz";
     sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0";
   };
 
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 4d1b4e4c3fdc3..93ef1957d2cd5 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libdrm-2.4.92";
 
   src = fetchurl {
-    url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
+    url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
     sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79";
   };
 
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 6057dae4be2e5..e76308d22acb6 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, libelf }:
 
 let
-  version = "20180129";
+  version = "20180527";
   src = fetchurl {
-    url = "http://www.prevanders.net/libdwarf-${version}.tar.gz";
+    url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
     # Upstream displays this hash broken into three parts:
     sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595"
            + "6d643921a173e6f9e0a184db7aef66f0fd2548d669"
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 5f422f7018b83..5127231dab60d 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libeatmydata-105";
   
   src = fetchurl {
-    url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz";
+    url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz";
     sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx";
   };
 
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 4b233301cce79..59651af2b8cfc 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libebml-1.3.5";
+  name = "libebml-${version}";
+  version = "1.3.6";
 
-  src = fetchurl {
-    url = "http://dl.matroska.org/downloads/libebml/${name}.tar.xz";
-    sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q";
+  src = fetchFromGitHub {
+    owner  = "Matroska-Org";
+    repo   = "libebml";
+    rev    = "release-${version}";
+    sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=YES"
+  ];
+
   meta = with stdenv.lib; {
     description = "Extensible Binary Meta Language library";
-    license = licenses.lgpl21;
     homepage = https://dl.matroska.org/downloads/libebml/;
-    maintainers = [ maintainers.spwhitt ];
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ spwhitt ];
     platforms = platforms.unix;
   };
 }
-
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 1541281442013..bc4cea1b47022 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, groff }:
 
 stdenv.mkDerivation rec {
-  name = "libedit-20170329-3.1";
+  name = "libedit-20180525-3.1";
 
   src = fetchurl {
-    url = "http://thrysoee.dk/editline/${name}.tar.gz";
-    sha256 = "1gnlgl0x8g9ky59s70nriy5gv47676d1s4ypvbv8y11apl7xkwli";
+    url = "https://thrysoee.dk/editline/${name}.tar.gz";
+    sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index b74e64aa8490a..d1b4e06dbc18e 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, findutils, fixDarwinDylibNames
+{ stdenv, fetchurl, fetchpatch, findutils, fixDarwinDylibNames
 , sslSupport? true, openssl
 }:
 
@@ -13,6 +13,18 @@ stdenv.mkDerivation rec {
     sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
   };
 
+  #NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release.
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
+      sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd";
+    })
+    (fetchpatch {
+      url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch";
+      sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb";
+    })
+  ];
+
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" ]
@@ -38,6 +50,8 @@ stdenv.mkDerivation rec {
     sed "/^libdir=/s|$out|$openssl|" -i "$openssl"/lib/libevent_openssl.la
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Event notification library";
     longDescription = ''
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 0ba703585bbba..8d264c929a5bc 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libexttextcat-3.4.5";
 
   src = fetchurl {
-    url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz";
     sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
   };
 
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix
index 6aca1d2be6d64..fa04655341d4e 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/pkgs/development/libraries/libfakekey/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1";
 
   src = fetchurl {
-    url = "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz";
+    url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz";
     sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k";
   };
 
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index f3a6983acae2a..a86cf9b935ce7 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1v461hwdk74whp89s490dj1z18gfqf9bz9140m5f11rsvrpid33p";
+    sha256 = "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
new file mode 100644
index 0000000000000..2c3085fc384fb
--- /dev/null
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen3_3,
+zlib, libpng, boost, qt5, guile
+}:
+
+stdenv.mkDerivation rec {
+  name = "libfive-${version}";
+  version = "2018-07-01";
+
+  src = fetchFromGitHub {
+    owner  = "libfive";
+    repo   = "libfive";
+    rev    = "0f517dde9521d751310a22f85ee69b2c84690267";
+    sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0";
+  };
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
+  buildInputs = [ eigen3_3 zlib libpng boost qt5.qtimageformats guile ];
+
+  # Link "Studio" binary to "libfive-studio" to be more obvious:
+  postFixup = ''
+    ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
+    homepage = https://libfive.com/;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index c6deb1fc92912..b59bf9a06ac5f 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "libftdi1-1.4";
 
   src = fetchurl {
-    url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2";
+    url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2";
     sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc";
   };
 
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index f90e741a57e9b..74b87a46ef0a8 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libftdi-0.20";
 
   src = fetchurl {
-    url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
+    url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
     sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
   };
 
diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix
index dec9676d5729f..42e812ec1f532 100644
--- a/pkgs/development/libraries/libgap/default.nix
+++ b/pkgs/development/libraries/libgap/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, gmp}:
+{ stdenv
+, fetchurl
+, gmp
+}:
+# will probably be obsolte (or at leat built from the upstream gap sources) soon (gap 4.9?). See
+# - https://github.com/gap-system/gap/projects/5#card-6239828
+# - https://github.com/markuspf/gap/issues/2
+# - https://trac.sagemath.org/ticket/22626
 stdenv.mkDerivation rec {
   name = "libgap-${version}";
+  # Has to be the same version as "gap"
   version = "4.8.6";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz";
+    url = "mirror://sageupstream/libgap/libgap-${version}.tar.gz";
     sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v";
   };
   buildInputs = [gmp];
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 6f36199bd1a57..638dec302b77b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libgcrypt-${version}";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8";
+    sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36";
   };
 
   outputs = [ "out" "dev" "info" ];
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
   # The build enables -O2 by default for everything else.
   hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
 
+  # Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034
+  patches = [ ./fix-jent-locking.patch ];
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = [ libgpgerror ]
diff --git a/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch b/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch
new file mode 100644
index 0000000000000..5394e51468e65
--- /dev/null
+++ b/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch
@@ -0,0 +1,29 @@
+From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Sun, 17 Jun 2018 18:53:58 -0500
+Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock,
+ hanging
+
+---
+ random/rndjent.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/random/rndjent.c b/random/rndjent.c
+index 0c5a820b..3740ddd4 100644
+--- a/random/rndjent.c
++++ b/random/rndjent.c
+@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active)
+     {
+       if (r_active)
+         {
+-          lock_rng ();
+           /* Make sure the RNG is initialized.  */
+           _gcry_rndjent_poll (NULL, 0, 0);
++
++          lock_rng ();
+           /* To ease debugging we store 2 for a clock_gettime based
+            * implementation and 1 for a rdtsc based code.  */
+           *r_active = jent_rng_collector? is_rng_available () : 0;
+-- 
+2.18.0-rc2
+
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 79f49c629b861..05c320c42aecc 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "libgdiplus-2.10.9";
 
   src = fetchurl {
-    url = "http://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2";
+    url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2";
     sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd";
   };
 
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 3d49fa064509e..48a1490caecfa 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libgeotiff-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz";
+    url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz";
     sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd";
   };
 
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index 90d41e30502f2..08fce9c521ec9 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.1.0";
 
   src = fetchurl {
-    url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
     sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6";
   };
 
diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix
deleted file mode 100644
index e29b3ed89dea4..0000000000000
--- a/pkgs/development/libraries/libgsystem/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection
-, glib, attr, systemd
-}:
-
-stdenv.mkDerivation {
-  name = "libgsystem-2015.1";
-
-  meta = with stdenv.lib; {
-    description = "GIO-based library with Unix/Linux specific API";
-    homepage    = "https://wiki.gnome.org/Projects/LibGSystem";
-    license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
-  };
-
-  src = fetchFromGitHub {
-    owner = "GNOME";
-    repo = "libgsystem";
-    rev = "v2015.1";
-    sha256 = "0j5dqn1pnspfxifklw4wkikqlbxr4faib07550n5gi58m89gg68n";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook pkgconfig gtk-doc gobjectIntrospection
-  ];
-
-  propagatedBuildInputs = [ glib attr systemd ];
-
-  preAutoreconf = ''
-    mkdir m4
-  '';
-}
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index 656395b8867df..6498014aee8d0 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, gnome3 }:
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }:
 let
   pname = "libgtop";
   version = "2.38.0";
@@ -11,8 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
   };
 
+  patches = [
+    # Fix darwin build
+    (fetchpatch {
+        url = https://gitlab.gnome.org/GNOME/libgtop/commit/42b049f338363f92c1e93b4549fc944098eae674.patch;
+        sha256 = "0kf9ihgb0wqji6dcvg36s6igkh7b79k6y1n7w7wzsxya84x3hhyn";
+      })
+  ];
+
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ pkgconfig perl gettext gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobjectIntrospection ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
 
   passthru = {
     updateScript = gnome3.updateScript {
@@ -24,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "A library that reads information about processes and the running system";
     license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 106de68d367a0..7569f2613bbd7 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
-  version = "1.38.0";
+  version = "1.38.2";
 
   src = fetchurl {
     url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
-    sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3";
+    sha256 = "16v2lpi9c0vnic2x0vpszmckh0x39bmf6x7y00vvzbwhszshxx3w";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
new file mode 100644
index 0000000000000..cdc03c01a022b
--- /dev/null
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "1.3.2";
+  name = "libheif-${version}";
+
+  src = fetchFromGitHub {
+    owner = "strukturag";
+    repo = "libheif";
+    rev = "v${version}";
+    sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ];
+  buildInputs = [ libde265 x265 libpng libjpeg ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://www.libheif.org/";
+    description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder";
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ gebner ];
+  };
+
+}
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 169a4d38bb53c..0e900ca9db644 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -1,6 +1,7 @@
 { fetchurl, stdenv, lib
 , buildPlatform, hostPlatform
 , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
+, enableShared ? !stdenv.hostPlatform.useAndroidPrebuilt
 }:
 
 # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross
@@ -23,10 +24,14 @@ stdenv.mkDerivation rec {
     lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc)
       ''
         sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
-      '';
+      ''
+    + lib.optionalString (!enableShared) ''
+      sed -i -e '/preload/d' Makefile.in
+    '';
 
   configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"
-    ++ lib.optional enableStatic "--enable-static";
+    ++ lib.optional enableStatic "--enable-static"
+    ++ lib.optional (!enableShared) "--disable-shared";
 
   meta = {
     description = "An iconv(3) implementation";
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index b6f08a9206ee9..66ae352525ffe 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.34";
+  name = "libidn-1.35";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
+    sha256 = "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 6773b7c1b1f12..bf08db6d3b7b2 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.10.3";
+  version = "1.11.0";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd";
+    url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
+    sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index ed595505fae1b..af3ab3a7c4eed 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "libivykis-${version}";
 
-  version = "0.42.1";
+  version = "0.42.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "0c90cfpxipw2m8i3ajr7vy7lb8gvcz2kh5n8sd542zphr4na8whq";
+    sha256 = "14vb613j4xas70wr7g5z9c9z871xhayd4zliywwf88myd41jcsw8";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index fcecd3a9d132b..798aef8e7da7c 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libX11 libXext libpng ];
 
   src = fetchurl {
-    url = "http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";
+    url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";
     sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15";
   };
 
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index 1b17ff0dd4334..8e429875b36b3 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ guile ];
 
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz";
     sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab";
   };
 
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index 764f4442e6cb9..bbc694619d4c4 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -1,23 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, libebml }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, libebml }:
 
 stdenv.mkDerivation rec {
-  name = "libmatroska-1.4.8";
+  name = "libmatroska-${version}";
+  version = "1.4.9";
 
-  src = fetchurl {
-    url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz";
-    sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq";
+  src = fetchFromGitHub {
+    owner  = "Matroska-Org";
+    repo   = "libmatroska";
+    rev    = "release-${version}";
+    sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ libebml ];
 
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=YES"
+  ];
+
   meta = with stdenv.lib; {
     description = "A library to parse Matroska files";
     homepage = https://matroska.org/;
     license = licenses.lgpl21;
-    maintainers = [ maintainers.spwhitt ];
+    maintainers = with maintainers; [ spwhitt ];
     platforms = platforms.unix;
   };
 }
-
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 2dbdb60b4b66d..7c4b451ae6d1a 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libmnl-1.0.4";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libmnl/files/${name}.tar.bz2";
     sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp";
   };
 
diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix
index 084d7ba73704b..a5a4d68ad9691 100644
--- a/pkgs/development/libraries/libmpcdec/default.nix
+++ b/pkgs/development/libraries/libmpcdec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libmpcdec-1.2.6";
 
   src = fetchurl {
-    url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2;
+    url = https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2;
     sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab";
   };
 
diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix
index b0adcf2375494..f1a061e5ab585 100644
--- a/pkgs/development/libraries/libmrss/default.nix
+++ b/pkgs/development/libraries/libmrss/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libmrss-0.19.2";
 
   src = fetchurl {
-    url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz";
+    url = "https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz";
     sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507";
   };
 
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 79d4c056341c3..ef250441daba2 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libmspack-0.6alpha";
 
   src = fetchurl {
-    url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz";
+    url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz";
     sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy";
   };
 
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 9eefbcfdb49ee..2b7258031c337 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1.9";
 
   src = fetchurl {
-    url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz";
+    url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz";
     sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y";
   };
 
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
new file mode 100644
index 0000000000000..4b547fde3ab0c
--- /dev/null
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
+}:
+
+let
+  version = "61.2";
+in stdenv.mkDerivation rec {
+  name = "libndctl-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pmem";
+    repo = "ndctl";
+    rev = "v${version}";
+    sha256 = "0vid78jzhmzh505bpwn8mvlamfhcvl6rlfjc29y4yn7zslpydxl7";
+  };
+
+  outputs = [ "out" "man" "dev" ];
+
+  nativeBuildInputs = [
+    autoreconfHook asciidoc pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+  ];
+
+  buildInputs = [
+    json_c kmod systemd utillinux
+  ];
+
+  patches = [
+    (fetchpatch {
+      name = "add-missing-include-for-ssize_t.patch";
+      url = "https://github.com/pmem/ndctl/commit/8f1798d14dda367c659b87362edb312739830ddf.patch";
+      sha256 = "1jr5kh087938msl22hgjngbf025n9iplz0czmybfp7lavl73m0pm";
+    })
+  ];
+
+  preAutoreconf = ''
+    substituteInPlace configure.ac --replace "which" "${which}/bin/which"
+    substituteInPlace git-version --replace /bin/bash ${stdenv.shell}
+    substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell}
+    echo "m4_define([GIT_VERSION], [${version}])" > version.m4;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Utility library for managing the libnvdimm (non-volatile memory device) sub-system in the Linux kernel";
+    homepage = https://github.com/pmem/ndctl;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix
index 888fe423b47c3..78304246f12b1 100644
--- a/pkgs/development/libraries/libndp/default.nix
+++ b/pkgs/development/libraries/libndp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libndp-1.6";
+  name = "libndp-1.7";
 
   src = fetchurl {
     url = "http://libndp.org/files/${name}.tar.gz";
-    sha256 = "03mczwrxqbp54msafxzzyhaazkvjdwm2kipjkrb5xg8kw22glz8c";
+    sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index fa94fa549e420..a680e009ab6a6 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.0";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2";
     sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
   };
 
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix
index 5395b5b2e99c8..fa6461d869195 100644
--- a/pkgs/development/libraries/libnfnetlink/default.nix
+++ b/pkgs/development/libraries/libnfnetlink/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libnfnetlink-1.0.1";
 
   src = fetchurl {
-    url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2";
     sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j";
   };
 
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index 2955aaebc0102..96bd983e64cdd 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libnfs-${version}";
-  version = "2.0.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "sahlberg";
     repo = "libnfs";
     rev = "libnfs-${version}";
-    sha256 = "1xd1xb09jxwmx7hblv0f9gxv7i1glk3nbj2vyq50zpi158lnf2mb";
+    sha256 = "115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index 6570d1eb3c0ed..0d4d6504142ad 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.1.1";
   name = "libnftnl-${version}";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "0v4gywcjvv2vg4zk632al1zv3ad0lx87nshynv110l8n3fhsq3pc";
+    sha256 = "1wmgjfcb35mscb2srzia5931srygywrs1aznxmg67v177x0nasjx";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index c7967c3fb6fc9..cdf93b0b2ff4b 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libnice-0.1.14";
 
   src = fetchurl {
-    url = "http://nice.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://nice.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my";
   };
 
diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix
index f34c421a120aa..8d97a13b0a088 100644
--- a/pkgs/development/libraries/libnxml/default.nix
+++ b/pkgs/development/libraries/libnxml/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libnxml-0.18.3";
 
   src = fetchurl {
-    url = "http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz";
+    url = "https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz";
     sha256 = "0ix5b9bxd7r517vhgcxwdviq4m0g0pq46s5g3h04gcqnpbin150g";
   };
 
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index 8a3e22ef31f7c..54f1d2617287e 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libodfgen";
-    version="0.1.6";
+    version="0.1.7";
     name="${baseName}-${version}";
-    hash="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3";
-    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.6/libodfgen-0.1.6.tar.xz";
-    sha256="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3";
+    hash="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij";
+    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz";
+    sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 945554386930a..f94f327ea02ef 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libpcap-1.8.1";
 
   src = fetchurl {
-    url = "http://www.tcpdump.org/release/${name}.tar.gz";
+    url = "https://www.tcpdump.org/release/${name}.tar.gz";
     sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7";
   };
 
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index a74d838e2eb6c..25e55e45d1e28 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.9.0";
+  version = "4.10.1";
   name = "libpfm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz";
-    sha256 = "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv";
+    sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766";
   };
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2;
     maintainers = [ maintainers.pierron ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index d8ebc2e83a61f..8da097c3d386c 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2";
     sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis";
   };
 
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index a74095bce297b..5c78689837084 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, mpfr, libxml2, intltool, pkgconfig, doxygen,
+{ stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkgconfig, doxygen,
   autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "2.5.0";
+  version = "2.6.0b";
 
-  src = fetchurl {
-    url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
-    sha256 = "0xs2qjr93k43p6j126xj20fgb1n2jv56rhgc211yv1l46crbqxfv";
+  src = fetchFromGitHub {
+    owner = "qalculate";
+    repo = "libqalculate";
+    rev = "v${version}";
+    sha256 = "1g0pmf33vrjabxmx6lyysgkxa6hg8qmwk0n5ncl4pr8sdkimswxw";
   };
 
   outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index 7d8ec42700c54..d1dae0cfee6e5 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "libqmatrixclient-${version}";
-  version = "0.2.1";
+  version = "0.3.0.2";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "libqmatrixclient";
     rev    = "v${version}";
-    sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv";
+    sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5";
   };
 
   buildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index d70a9fc29f533..9803e09610e65 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.11";
+  version = "0.18.12";
 
   src = fetchurl {
-    url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "07a7k83hx7icahh6jaxfbd7pw5jjm5i11xcqjj31b28d1aj29xvw";
+    url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
+    sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index b6328a7354cf5..464e702acabb7 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librealsense-${version}";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "1hmrp39x6c8i1l5d0hla0c8k6mf70sdyfjrlnwiqyi2p4s6phyd2";
+    sha256 = "0rs7ic95kix173kl1ijb1riigjxnp7yqvps35hfxbhjqbjc2wfgn";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 5b3beda1eb8ba..2f78222cebb13 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   sourceName = "librep_${version}";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz";
+    url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz";
     sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";
   };
 
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 5dfb61f172ff9..a29257af4c3cd 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -34,18 +34,13 @@ let
 
 in {
 
-  libressl_2_5 = generic {
-    version = "2.5.5";
-    sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5";
-  };
-
   libressl_2_6 = generic {
-    version = "2.6.4";
-    sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
+    version = "2.6.5";
+    sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5";
   };
 
   libressl_2_7 = generic {
-    version = "2.7.3";
-    sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn";
+    version = "2.7.4";
+    sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy";
   };
 }
diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index e6d2612fe626f..5be9a2de94e5f 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage    = http://rime.im/;
+    homepage    = https://rime.im/;
     description = "Rime Input Method Engine, the core library";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ sifmelcara ];
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index fae6dc82fcf66..c2f0da9100556 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
+{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
 
-stdenv.mkDerivation rec
-{
-  version = "3.0.7";
-  seafileVersion = "6.1.0";
+stdenv.mkDerivation rec {
+  version = "3.0.8";
   name = "libsearpc-${version}";
 
-  src = fetchurl
-  {
-    url = "https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz";
-    sha256 = "0fdrgksdwd4qxp7qvh75y39dy52h2f5wfjbqr00h3rwkbx4npvpg";
+  src = fetchFromGitHub {
+    owner = "haiwen";
+    repo = "libsearpc";
+    # Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9
+    rev = "12a01268825e9c7e17794c58c367e3b4db912ad9";
+    sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0";
   };
 
   patches = [ ./libsearpc.pc.patch ];
@@ -18,12 +18,13 @@ stdenv.mkDerivation rec
   buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ];
   propagatedBuildInputs = [ glib jansson ];
 
+  postPatch = "patchShebangs autogen.sh";
+
   preConfigure = "./autogen.sh";
 
   buildPhase = "make -j1";
 
-  meta =
-  {
+  meta = {
     homepage = https://github.com/haiwen/libsearpc;
     description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
     license = stdenv.lib.licenses.lgpl3;
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 78e7036bdccc7..82caacf93e6ab 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
   pname = "libsidplayfp";
   major = "1";
   minor = "8";
-  level = "6";
+  level = "7";
   version = "${major}.${minor}.${level}";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
-    sha256 = "0lzivfdq0crmfr01c6f5h883yr7wvagq198xkk3srdmvshhxmwnw";
+    sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da";
   };
 
   nativeBuildInputs = [ pkgconfig ]
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 9d4b62eb97abd..bad5e7c596222 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
-  version = "1.7.3";
+  version = "1.8.1";
   name = "libsixel-${version}";
 
   src = fetchFromGitHub {
     repo = "libsixel";
     rev = "v${version}";
     owner = "saitoha";
-    sha256 = "1hzmypzzigmxl07vgc52wp4dgxkhya3gfk4yzaaxc8s630r6ixs8";
+    sha256 = "0cbhvd1yk0q08nxva5bga7bpp8yxjfdfnqicvip4l6k28mzz7pmf";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index 521391b1bef82..48b0ed6d711c4 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "libskk-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "ueno";
     repo = "libskk";
     rev = version;
-    sha256 = "092bjir866f350s4prq9q0yg34s91vmr8wbgf2vh3kcax1yj1axm";
+    sha256 = "1yvyscr22rrh0jja1bz70jzwi5776jyw39pgbgrx00j79vsv7b51";
   };
 
   buildInputs = [ skk-dicts ];
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 2d5fa20c7cf8e..9db56aa3a9ec2 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
+{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
   rev  = "0.6.34";
@@ -11,9 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7";
   };
 
-  cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";
+  cmakeFlags = [
+    "-DENABLE_COMPLEX_DEPS=true"
+    "-DENABLE_RPMMD=true"
+    "-DENABLE_RPMDB=true"
+    "-DENABLE_PUBKEY=true"
+    "-DENABLE_RPMDB_BYRPMHEADER=true"
+  ];
 
-  buildInputs = [ cmake zlib expat rpm db ];
+  nativeBuildInputs = [ cmake ninja ];
+  buildInputs = [ zlib expat rpm db ];
 
   meta = with stdenv.lib; {
     description = "A free package dependency solver";
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 75898852a095a..f9ea73089f4c3 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "libsoup";
-  version = "2.62.0";
+  version = "2.62.2";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b";
+    sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
   };
 
   prePatch = ''
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
index aa3aaa1c59bca..8018b84a52bed 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "libspatialindex-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
+    url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
     sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw";
   };
 
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index 253c5365c8a31..b75baf149e1aa 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "libspatialite-4.3.0a";
 
   src = fetchurl {
-    url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
     sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448";
   };
 
diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix
index 647e6f16fdf83..f1e4169bd48e9 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/pkgs/development/libraries/libspectre/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libspectre-0.2.7";
 
   src = fetchurl {
-    url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://libspectre.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8";
   };
 
diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix
index 72d73e358485e..fb7b3be6b6988 100644
--- a/pkgs/development/libraries/libstatgrab/default.nix
+++ b/pkgs/development/libraries/libstatgrab/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libstatgrab-0.91";
 
   src = fetchurl {
-    url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz";
+    url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz";
     sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83";
   };
 
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index ab1bda9ed2992..c492a15bfa4e0 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -7,18 +7,18 @@ stdenv.mkDerivation rec {
   name = "libtiff-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
+    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
     sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
   };
 
   prePatch = let
       debian = fetchurl {
-        url = http://snapshot.debian.org/archive/debian-debug/20180128T155203Z//pool/main/t/tiff/tiff_4.0.9-3.debian.tar.xz;
-        sha256 = "0wya42y7kcq093g3h7ca10cm5sns1mgnkjmdd2qdi59v8arga4y4";
+        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-5.debian.tar.xz;
+        sha256 = "15lwcsd46gini27akms2ngyxnwi1hs2yskrv5x2wazs5fw5ii62w";
       };
     in ''
-      tar xf '${debian}'
-      patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
+      tar xf ${debian}
+      patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
     '';
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index e30f699f103dd..f9e7f9684bac5 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtomcrypt-${version}";
-  version = "1.18.1";
+  version = "1.18.2";
 
   src = fetchurl {
     url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz";
-    sha256 = "053z0jzyvf6c9929phlh2p0ybx289s34g7nii5hnjigxzcs3mhap";
+    sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn";
   };
 
   nativeBuildInputs = [ libtool ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.libtom.net/LibTomCrypt/;
+    homepage = https://www.libtom.net/LibTomCrypt/;
     description = "A fairly comprehensive, modular and portable cryptographic toolkit";
     license = with licenses; [ publicDomain wtfpl ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix
index cd13eef156d0b..8c88dd97ec411 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/pkgs/development/libraries/libtommath/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.libtom.net/LibTomMath/;
+    homepage = https://www.libtom.net/LibTomMath/;
     description = "A library for integer-based number-theoretic applications";
     license = with licenses; [ publicDomain wtfpl ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 335400b80efc0..1cc426138598e 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,36 +1,49 @@
-{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib
+, boost, openssl, libtool, python, libiconv, geoip }:
 
-stdenv.mkDerivation rec {
-  name = "libtorrent-rasterbar-${version}";
+let
   version = "1.1.7";
+  formattedVersion = lib.replaceChars ["."] ["_"] version;
 
-  src =
-    let formattedVersion = lib.replaceChars ["."] ["_"] version;
-    in fetchurl {
-      url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
-      sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
-    };
+  boostPython = boost.override { enablePython = true; };
 
-  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = [ boost openssl zlib python libiconv geoip ];
+in stdenv.mkDerivation {
+  name = "libtorrent-rasterbar-${version}";
+
+  src = fetchFromGitHub {
+    owner = "arvidn";
+    repo = "libtorrent";
+    rev = "libtorrent-${formattedVersion}";
+    sha256 = "073nb7yca5jg1i8z5h76qrmddl2hdy8fc1pnchkg574087an31r3";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch";
+      sha256 = "1bdv0icqzbg1il60sckcly4y22lkdbkkwdjadwdzxv7cdj586bzd";
+    })
+    (fetchpatch {
+      url = "https://github.com/arvidn/libtorrent/commit/9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81.patch";
+      sha256 = "1cscqpc6fq9iwspww930dsxf0yb01bgrghzf5hdhl09a87r6q2zg";
+    })
+  ];
 
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = [ boostPython openssl zlib python libiconv geoip ];
   preConfigure = "./autotool.sh";
 
   configureFlags = [
     "--enable-python-binding"
     "--with-libgeoip=system"
     "--with-libiconv=yes"
-    "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.out}/lib"
+    "--with-boost=${boostPython.dev}"
+    "--with-boost-libdir=${boostPython.out}/lib"
     "--with-libiconv=yes"
   ];
 
-  enableParallelBuilding = true;
-
-  doCheck = false; # fails to link
-
   meta = with stdenv.lib; {
-    homepage = http://www.rasterbar.com/products/libtorrent/;
+    homepage = "https://libtorrent.org/";
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
     license = licenses.bsd3;
     maintainers = [ maintainers.phreedom ];
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 6256702010f41..a005c8b374658 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -51,7 +51,7 @@ in rec {
   };
 
   libtoxcore_0_2 = generic {
-    version = "0.2.2";
-    sha256 = "1463grbbv009pj2g6dbnyk4lr871vw41962m63v21mmp6dkrr7r5";
+    version = "0.2.3";
+    sha256 = "1z8638cmxssc4jvbf64x549m84pz28729xbxc4c4ss1k792x30ya";
   };
 }
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index 58b052b8fae80..18ceb5302292a 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libtsm-3";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/kmscon/releases/${name}.tar.xz";
+    url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz";
     sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
   };
 
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index 9775700501584..21e3a15449c22 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "libtxc_dxtn-${version}";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+    url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
     sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
   };
 
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 356462e8a4afb..24da3a8e2c7d5 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libunistring-${version}";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/${name}.tar.gz";
-    sha256 = "0jm8pr469y7ybb90ll8k1585rciqm8ckzif0laipqhp5z440rsgm";
+    sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8";
   };
 
   outputs = [ "out" "dev" "info" "doc" ];
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index 3d15b698b4812..ae53178e88d92 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libusbmuxd-1.0.10";
   src = fetchurl {
-    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2";
     sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs";
   };
 
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index ed4397c88f0df..4dc601745a42b 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.20.2";
+  version = "1.20.3";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48";
+    sha256 = "1a8a679wni560z7x6w5i431vh2g0f34cznflcn52klx1vwcggrg7";
   };
 
   postPatch = let
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
index 04d621e29c842..097ac0e3e98e6 100644
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "1.7.3";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
     sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
   };
 
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 0dbe30251bdd6..2d83955de6962 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "http://libvirt.org/sources/glib/${name}.tar.gz";
+    url = "https://libvirt.org/sources/glib/${name}.tar.gz";
     sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
   };
 
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 8456e395f4680..b12ed9613510d 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -4,7 +4,9 @@
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, xen, zfs, parted, bridge-utils, dmidecode
+, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
+, enableXen ? false, xen ? null
+, enableIscsi ? false, openiscsi
 }:
 
 with stdenv.lib;
@@ -14,19 +16,19 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "1djaz3b5n4ksyw6z4n4qs82g5zyxdl2gm4rsb5181bv1rdiisqs6";
+        sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "0rhas7hbisfh0aib75nsh9wspxj8pvcqagds1mp2jgfls7hfna0r";
+        sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6";
         fetchSubmodules = true;
       };
 
@@ -39,8 +41,10 @@ in stdenv.mkDerivation rec {
   ] ++ optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
-  ] ++ optionals (stdenv.isLinux && stdenv.isx86_64) [
+  ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
+  ] ++ optionals enableIscsi [
+    openiscsi
   ] ++ optionals stdenv.isDarwin [
     libiconv gmp
   ];
@@ -48,7 +52,7 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
 
-    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH
+    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
 
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
@@ -78,6 +82,8 @@ in stdenv.mkDerivation rec {
     "--with-storage-disk"
   ] ++ optionals (stdenv.isLinux && zfs != null) [
     "--with-storage-zfs"
+  ] ++ optionals enableIscsi [
+    "--with-storage-iscsi"
   ] ++ optionals stdenv.isDarwin [
     "--with-init-script=none"
   ];
@@ -87,7 +93,10 @@ in stdenv.mkDerivation rec {
     "sysconfdir=$(out)/var/lib"
   ];
 
-  postInstall = ''
+
+  postInstall = let
+    binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
+  in ''
     substituteInPlace $out/libexec/libvirt-guests.sh \
       --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
       --replace "$out/bin"            '${gettext}/bin' \
@@ -100,7 +109,7 @@ in stdenv.mkDerivation rec {
     substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
     rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
     wrapProgram $out/sbin/libvirtd \
-      --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]}
+      --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
new file mode 100644
index 0000000000000..28cfe56d59b89
--- /dev/null
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -0,0 +1,43 @@
+{ stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  bison,
+  flex,
+  glib,
+  pkgconfig,
+  json_c,
+  xen,
+  libvirt,
+  xenSupport ? true }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "libvmi-${version}";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "libvmi";
+    repo = "libvmi";
+    rev = "v${version}";
+    sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv";
+  };
+
+  buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen);
+  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
+
+  configureFlags = optional (!xenSupport) "--disable-xen";
+
+  meta = with stdenv.lib; {
+    homepage = "http://libvmi.com/";
+    description = "A C library for virtual machine introspection";
+    longDescription = ''
+      LibVMI is a C library with Python bindings that makes it easy to monitor the low-level
+      details of a running virtual machine by viewing its memory, trapping on hardware events,
+      and accessing the vCPU registers.
+    '';
+    license = with licenses; [ gpl3 lgpl3 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ lschuermann ];
+  };
+}
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 2f9bca5ed95fc..5457b1075a3e5 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
       sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";
       name = "CVE-2017-14160";
     })
+    (fetchpatch {
+      url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff";
+      sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7";
+      name = "CVE-2018-10392.patch";
+    })
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index d73d67a39cf26..d56c20cb75afd 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libx86-${version}";
   version = "1.1";
   src = fetchurl {
-    url = "http://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz";
+    url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz";
     sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
   };
   patches = [./constants.patch ./non-x86.patch ];
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 67ec3b57fa770..1293b0af8ccef 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gfortran, perl }:
 
 let
-  version = "3.0.1";
+  version = "4.2.3";
 
 in stdenv.mkDerivation {
   name = "libxc-${version}";
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
-    sha256 = "1xyac89yx03vm86rvk07ps1d39xss3amw46a1k53mv30mgr94rl3";
+    sha256 = "0mj26jga0nj76blf2rp9cmgf0v0yhsp7xrg92zgih7fjlydrxr02";
   };
 
   buildInputs = [ gfortran ];
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index d225831f70240..b4ad501c2efe7 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2";
-    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
+    url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   buildInputs = [ libjpeg libpng libX11 zlib ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index be2f83cb498e0..8a3d7abdfa576 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -3,6 +3,7 @@
 , buildPlatform, hostPlatform
 , pythonSupport ? buildPlatform == hostPlatform
 , icuSupport ? false, icu ? null
+, enableStatic ? false
 }:
 
 let
@@ -18,7 +19,8 @@ in stdenv.mkDerivation rec {
   };
 
   outputs = [ "bin" "dev" "out" "man" "doc" ]
-    ++ lib.optional pythonSupport "py";
+    ++ lib.optional pythonSupport "py"
+    ++ lib.optional enableStatic "static";
   propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
 
   buildInputs = lib.optional pythonSupport python
@@ -32,7 +34,8 @@ in stdenv.mkDerivation rec {
   configureFlags =
        lib.optional pythonSupport "--with-python=${python}"
     ++ lib.optional icuSupport    "--with-icu"
-    ++ [ "--exec_prefix=$dev" ];
+    ++ [ "--exec_prefix=$dev" ]
+    ++ lib.optional enableStatic "--enable-static";
 
   enableParallelBuilding = true;
 
@@ -57,6 +60,8 @@ in stdenv.mkDerivation rec {
     moveToOutput bin/xml2-config "$dev"
     moveToOutput lib/xml2Conf.sh "$dev"
     moveToOutput share/man/man1 "$bin"
+  '' + lib.optionalString enableStatic ''
+    moveToOutput lib/libxml2.a "$static"
   '';
 
   passthru = { inherit version; pythonSupport = pythonSupport; };
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 20053190e3bc9..7178e64b6b6a0 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   name = "libyaml-${version}";
 
   src = fetchurl {
-    url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
+    url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
     sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240";
   };
 
   meta = with stdenv.lib; {
-    homepage = http://pyyaml.org/;
+    homepage = https://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index 4a5aa057a5cf8..f3cbddf1ec41d 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec
 
   src = fetchurl
   {
-    url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
+    url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
     sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g";
   };
 
diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix
new file mode 100644
index 0000000000000..410c60bff9f32
--- /dev/null
+++ b/pkgs/development/libraries/lief/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchzip }:
+
+fetchzip {
+  url = https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz;
+  sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6";
+
+  meta = with stdenv.lib; {
+    description = "Library to Instrument Executable Formats";
+    homepage = https://lief.quarkslab.com/;
+    license = [ licenses.asl20 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lassulus ];
+  };
+}
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index b4a33bbe7df2e..8e38b7b619270 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "lightning-${version}";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchurl {
     url = "mirror://gnu/lightning/${name}.tar.gz";
-    sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz";
+    sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v";
   };
 
   buildInputs = stdenv.lib.optional doCheck libopcodes;
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 0f5442bd63b6c..c4ff0e892a822 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -5,7 +5,6 @@
 , givaro
 , pkgconfig
 , openblas
-, liblapack
 , fflas-ffpack
 , gmpxx
 , optimize ? false # impure
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     givaro
-    (liblapack.override {shared = true;})
     openblas
     gmpxx
     fflas-ffpack
@@ -38,7 +36,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-blas-libs=-lopenblas"
-    "--with-lapack-libs=-llapack"
     "--disable-optimization"
   ] ++ stdenv.lib.optionals (!optimize) [
     # disable SIMD instructions (which are enabled *when available* by default)
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index 762d23e240a2d..e014e38c3f97a 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "loudmouth-${version}";
 
   src = fetchurl {
-    url = "http://mcabber.com/files/loudmouth/${name}.tar.bz2";
+    url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2";
     sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl";
   };
 
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index ed1052ce40a09..a1a096b096d71 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,56 +1,37 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ stdenv
+, fetchFromGitHub
+
+, cmake
+, ninja
+, perl # Project uses Perl for scripting and testing
+
+, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+}:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.10.0";
+  name = "mbedtls-${version}";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     rev = name;
-    sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk";
+    sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir";
   };
 
-  nativeBuildInputs = [ perl ];
-
-  postPatch = ''
-    patchShebangs .
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace library/Makefile --replace "-soname" "-install_name"
-    substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
-    # Necessary for install_name_tool below
-    echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile
-  '';
+  nativeBuildInputs = [ cmake ninja perl ];
 
-  makeFlags = [
-    "SHARED=1"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    "DLEXT=dylib"
-  ];
-
-  installFlags = [
-    "DESTDIR=\${out}"
-  ];
-
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib
-    install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib
-    install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib
-
-    for exe in $out/bin/*; do
-      if [[ $exe != *.sh ]]; then
-        install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe
-        install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe
-        install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe
-      fi
-    done
+  postConfigure = stdenv.lib.optionals enableThreading ''
+    perl scripts/config.pl set MBEDTLS_THREADING_C    # Threading abstraction layer
+    perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD    # POSIX thread wrapper layer for the threading layer.
   '';
 
-  doCheck = true;
+  cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
 
   meta = with stdenv.lib; {
     homepage = https://tls.mbed.org/;
-    description = "Portable cryptographic and SSL/TLS library, aka polarssl";
-    license = licenses.gpl3;
+    description = "Portable cryptographic and TLS library, formerly known as PolarSSL";
+    license = licenses.asl20;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington fpletz ];
   };
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
index 1c6134d0480b8..11bd437d377e2 100644
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "mdds-${version}";
 
   src = fetchurl {
-    url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
+    url = "https://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
     sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
   };
 
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 592b6d7a67796..90d86ea9165cc 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "mdds-${version}";
 
   src = fetchurl {
-    url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
+    url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
     sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w";
   };
 
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index fa4758d0877ad..6779268dbdc12 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {
 
   meta = with stdenv.lib; {
     description = "A small XML library";
-    homepage = http://www.minixml.org;
+    homepage = https://www.msweet.org/mxml/;
     license = licenses.lgpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 96b21601ccaeb..804c3f8ed2289 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.8.0";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
+    sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index d75d9d6b9d90e..afb44dd80f914 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.mpfr.org/;
+    homepage = https://www.mpfr.org/;
     description = "Library for multiple-precision floating-point arithmetic";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 4b8e2b651e454..6c5a0e5279ce9 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation  rec {
   version = "3.2.1";
 
   src = fetchurl {
-    url = "http://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
+    url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
     sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax";
   };
 
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 4950624a0b66f..f50b64fca3ed2 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,21 +1,21 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.3";
+  version = "1.1.4";
   name = "nanomsg-${version}";
 
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nanomsg";
     rev = version;
-    sha256 = "0mckz63rm0hpnln7mkg79bwiybydzbxyzyb39y2m1bjj8xwxkp2m";
+    sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl";
   };
 
   buildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     description= "Socket library that provides several common communication patterns";
-    homepage = http://nanomsg.org/;
+    homepage = https://nanomsg.org/;
     license = licenses.mit;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index a600938cdbb24..203be8b6907b9 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "npth-1.5";
 
   src = fetchurl {
-    url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
+    url = "mirror://gnupg/npth/${name}.tar.bz2";
     sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";
   };
 
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 29d6e9a5670a6..5387272a2f050 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -8,11 +8,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.36.1";
+  version = "3.38";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_36_1_RTM/src/${name}.tar.gz";
-    sha256 = "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz";
+    sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c";
   };
 
   buildInputs = [ perl zlib sqlite ]
diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix
index d26b15176aa6f..a70cba625a897 100644
--- a/pkgs/development/libraries/ntdb/default.nix
+++ b/pkgs/development/libraries/ntdb/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The not-so trivial database";
-    homepage = http://tdb.samba.org/;
+    homepage = https://tdb.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
new file mode 100644
index 0000000000000..94aba672887d0
--- /dev/null
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }:
+
+stdenv.mkDerivation rec {
+  name = "odpic-${version}";
+  version = "2.4.2";
+
+  src = fetchurl {
+    url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz";
+    sha256 = "0hw6b38vnh0cgm1iwpgkqa2am86baal6irp9bglacblwh8sshqdi";
+  };
+
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+
+  buildInputs = [ oracle-instantclient ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libaio ];
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ oracle-instantclient ];
+
+  dontPatchELF = true;
+  makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
+
+  postFixup = ''
+    ${stdenv.lib.optionalString (stdenv.isLinux) ''
+      patchelf --set-rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
+    ''}
+    ${stdenv.lib.optionalString (stdenv.isDarwin) ''
+      install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
+    ''}
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Oracle ODPI-C library";
+    homepage = "https://oracle.github.io/odpi/";
+    maintainers = with maintainers; [ mkazulak flokli ];
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 7b10db9245c53..05888ad60bb17 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,17 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "olm-${version}";
-  version = "2.2.1";
+  version = "2.3.0";
 
   meta = {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
     license = stdenv.lib.licenses.asl20;
     homepage = https://matrix.org/git/olm/about;
+    platforms = stdenv.lib.platforms.linux;
   };
 
   src = fetchurl {
     url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz";
-    sha256 = "1spgsjmsw8afm2hg1mrq9c7cli3p17wl0ns7qbzn0h6ksh193709";
+    sha256 = "1y2yasq94zjw3nadn1915j85xwc5j3pic3brhp0h83l6hkxi8dsk";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix
new file mode 100644
index 0000000000000..b60a53e55ca1b
--- /dev/null
+++ b/pkgs/development/libraries/opae/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, cmake
+, libuuid, json_c
+, doxygen, perl, python2, python2Packages
+}:
+
+stdenv.mkDerivation rec {
+  name    = "opae-${version}";
+  version = "1.0.0";
+
+  # the tag has a silly name for some reason. drop this in the future if
+  # possible
+  tver    = "${version}-5";
+
+  src = fetchFromGitHub {
+    owner  = "opae";
+    repo   = "opae-sdk";
+    rev    = "refs/tags/${tver}";
+    sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8";
+  };
+
+  doCheck = false;
+
+  nativeBuildInputs = [ cmake doxygen perl python2Packages.sphinx ];
+  buildInputs = [ libuuid json_c python2 ];
+
+  # Set the Epoch to 1980; otherwise the Python wheel/zip code
+  # gets very angry
+  preConfigure = ''
+    find . -type f | while read file; do
+      touch -d @315532800 $file;
+    done
+  '';
+
+  cmakeFlags = [ "-DBUILD_ASE=1" ];
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Open Programmable Acceleration Engine SDK";
+    homepage    = https://01.org/opae;
+    license     = licenses.bsd3;
+    platforms   = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index 48ec5141e34fc..20a62ef67f981 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
 
   src = fetchurl {
-    url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz";
+    url = "https://linuxnetworks.de/opendbx/download/${name}.tar.gz";
     sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2";
   };
 
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index 1ab6661db5bb8..05370ad4a0bd9 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "openfst";
-  version = "1.6.7";
+  version = "1.6.8";
 
   src = fetchurl {
     url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
-    sha256 = "1xqpc1qlvghprwih99immsjh3ba08lg754cf5icnmpkwh9nlh6p2";
+    sha256 = "1ngak7qwanf8n1gqghh7snjl4lsp6xhks4y00b16isrm4rk3cnms";
   };
   meta = {
     description = "Library for working with finite-state transducers";
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 93ba3f15a09c3..907f071d5c552 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "openldap-2.4.45";
 
   src = fetchurl {
-    url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
+    url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
     sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd";
   };
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 31e9d661a5881..0251de77d03eb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -12,7 +12,7 @@ let
     name = "openssl-${version}";
 
     src = fetchurl {
-      url = "http://www.openssl.org/source/${name}.tar.gz";
+      url = "https://www.openssl.org/source/${name}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 63c51996b2271..087a22dd61ba0 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -19,6 +19,8 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ systemd ];
 
+  hardeningDisable = [ "format" ];
+
   enableParallelBuilding = true;
 
   installPhase = ''
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 7e0f2e1cf9032..56f0cc084d144 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,49 +1,57 @@
-{ stdenv, requireFile, autoPatchelfHook, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
+{ stdenv, requireFile, autoPatchelfHook, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 
 let
-    baseVersion = "12.2";
-    requireSource = version: rel: part: hash: (requireFile rec {
-      name = "oracle-instantclient${baseVersion}-${part}-${version}-${rel}.x86_64.rpm";
-      message = ''
-        This Nix expression requires that ${name} already
-        be part of the store. Download the file
-        manually at
-
-        http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
-
-        and add it to the Nix store using either:
-          nix-store --add-fixed sha256 ${name}
-        or
-          nix-prefetch-url --type sha256 file:///path/to/${name}
-      '';
-      url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html";
-      sha256 = hash;
-    });
-in stdenv.mkDerivation rec {
+  baseVersion = "12.2";
   version = "${baseVersion}.0.1.0";
-  name = "oracle-instantclient-${version}";
 
-  buildInputs = [ libaio stdenv.cc.cc.lib ] ++ stdenv.lib.optional odbcSupport unixODBC;
-  nativeBuildInputs = [ autoPatchelfHook makeWrapper rpmextract ];
+  requireSource = component: arch: version: rel: hash: (requireFile rec {
+    name = "instantclient-${component}-${arch}-${version}" + (stdenv.lib.optionalString (rel != "") "-${rel}") + ".zip";
+    url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html";
+    sha256 = hash;
+  });
+
+  throwSystem = throw "Unsupported system: ${stdenv.system}";
+
+  arch = {
+    "x86_64-linux" = "linux.x64";
+    "x86_64-darwin" = "macos.x64";
+  }."${stdenv.system}" or throwSystem;
+
+  srcs = {
+    "x86_64-linux" = [
+      (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194")
+      (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb")
+      (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ]
+      ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d");
+    "x86_64-darwin" = [
+      (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9")
+      (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b")
+      (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ]
+      ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e");
+  }."${stdenv.system}" or throwSystem;
+
+in stdenv.mkDerivation rec {
+  inherit version srcs;
+  name = "oracle-instantclient-${version}";
 
-  srcs = [
-    (requireSource version "1" "basic" "43c4bfa938af741ae0f9964a656f36a0700849f5780a2887c8e9f1be14fe8b66")
-    (requireSource version "1" "devel" "4c7ad8d977f9f908e47c5e71ce56c2a40c7dc83cec8a5c106b9ff06d45bb3442")
-    (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552")
-  ] ++ stdenv.lib.optional odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1");
+  buildInputs = [ stdenv.cc.cc.lib ]
+    ++ stdenv.lib.optionals (stdenv.isLinux) [ libaio ]
+    ++ stdenv.lib.optional odbcSupport unixODBC;
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ];
 
-  unpackCmd = "rpmextract $curSrc";
+  unpackCmd = "unzip $curSrc";
 
   installPhase = ''
-    mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"}
+    mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"}
 
-    install -Dm755 lib/oracle/${baseVersion}/client64/bin/* $out/bin
+    install -Dm755 {sqlplus,adrci,genezi} $out/bin
     ln -s $out/bin/sqlplus $out/bin/sqlplus64
-    install -Dm644 lib/oracle/${baseVersion}/client64/lib/* $out/lib
-    install -Dm644 include/oracle/${baseVersion}/client64/* $out/include
-    install -Dm644 share/oracle/${baseVersion}/client64/demo/* $out/share/${name}/demo
+    install -Dm644 *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib
+    install -Dm644 *.jar $out/share/java
+    install -Dm644 sdk/include/* $out/include
+    install -Dm644 sdk/demo/* $out/share/${name}/demo
   '';
 
   meta = with stdenv.lib; {
@@ -54,7 +62,7 @@ in stdenv.mkDerivation rec {
       command line SQL client.
     '';
     license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ pesterhazy flokli ];
     hydraPlatforms = [];
   };
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index d880d41c70847..9a27901c862d5 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       Pango forms the core of text and font handling for GTK+-2.x.
     '';
 
-    homepage = http://www.pango.org/;
+    homepage = https://www.pango.org/;
     license = licenses.lgpl2Plus;
 
     maintainers = with maintainers; [ raskin ];
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index b5ec5198975eb..93c2501a62033 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
-    homepage    = http://www.pango.org/;
+    homepage    = https://www.pango.org/;
     license     = with licenses; [ lgpl2 lgpl21 ];
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix
index 8154fca29e843..2d6b678f6570f 100644
--- a/pkgs/development/libraries/pangox-compat/default.nix
+++ b/pkgs/development/libraries/pangox-compat/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A compatibility library for pango>1.30.*";
 
-    homepage = http://www.pango.org/;
+    homepage = https://www.pango.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix
new file mode 100644
index 0000000000000..4cc607345e8cd
--- /dev/null
+++ b/pkgs/development/libraries/phash/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "pHash";
+  version = "0.9.4";
+
+  buildInputs = [ cimg ];
+
+  # CImg.h calls to external binary `convert` from the `imagemagick` package
+  # at runtime
+  propagatedBuildInputs = [ imagemagick ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"];
+  postInstall = ''
+    cp ${cimg}/include/CImg.h $out/include/
+  '';
+
+  src = fetchFromGitHub {
+    owner = "clearscene";
+    repo = "pHash";
+    rev = version;
+    sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Compute the perceptual hash of an image";
+    license = licenses.gpl3;
+    maintainers = [maintainers.imalsogreg];
+    platforms = platforms.all;
+    homepage = http://www.phash.org;
+    downloadPage = "https://github.com/clearscene/pHash";
+    updateWalker = true;
+  };
+}
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 643e36ba6cd6c..0487886a89665 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
 , extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null
-, withQt5 ? false
+, withQt4 ? false
 , debug ? false
 }:
 
@@ -11,11 +11,12 @@ let
   pname = "phonon-backend-vlc";
 in
 
-assert withQt5 -> qtbase != null;
-assert withQt5 -> qtx11extras != null;
+assert withQt4 -> qt4 != null;
+assert !withQt4 -> qtbase != null;
+assert !withQt4 -> qtx11extras != null;
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
+  name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
 
   meta = with stdenv.lib; {
     homepage = https://phonon.kde.org/;
@@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ phonon vlc ]
-    ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
+    ++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]);
 
-  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
+  nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules;
 
   cmakeFlags =
     [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
-    ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+    ++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON";
 }
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 8e1ee8196c30e..82574864ec43e 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -6,7 +6,7 @@
 with lib;
 
 let
-  v = "4.9.1";
+  v = "4.10.1";
 
   soname = if withQt5 then "phonon4qt5" else "phonon";
   buildsystemdir = "share/cmake/${soname}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
-    sha256 = "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7";
+    sha256 = "1dwdw0hm6685psrp7v9frhkhqvsxrbdnm3gw794j5z7g3brqvag5";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index dad138c8433ac..f837d807219fe 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "cernlib-${version}";
 
   src = fetchurl {
-    url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
+    url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
     sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky";
   };
 
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index e568e1597972c..e3291907d31fc 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.3.1pre-2402";
 
   src = fetchurl {
-    url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
+    url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
     sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
   };
 
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index ce6ea4c56a89a..9993060eb728b 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "7.1.3";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
+    url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
     sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm";
   };
 
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 93e0fa99c347b..7f89c92772c39 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "6.2.1";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
+    url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
     sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd";
   };
 
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index aabe132e73b32..32a05d10d3a67 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.2";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
+    url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
     sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
   };
 
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 88fafaf3ae6e1..0c9d879fbd096 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.1.3";
 
   src = fetchurl {
-    url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz";
+    url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz";
     sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p";
   };
 
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index c13b659f792e1..8c4a9288a15bf 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.6.0";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
+    url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
     sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv";
   };
 
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 0a84fe20da723..feffa5c11d545 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.1.3";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
+    url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
     sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n";
   };
 
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 6cda6bd310be4..eb34b94118a97 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.7.0";
 
   src = fetchurl {
-    url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
+    url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
     sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk";
   };
 
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 0c5d5e22e6961..3e69bbde75a2d 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pkcs11-helper-${version}";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
     rev = "${name}";
-    sha256 = "1m3fp3v6c903cs36bvvg0h65p1sdamsmzy13ww0zyvplcycarz0n";
+    sha256 = "07ij6i76abf6bdhczsq1wkln3q0y0wkfbsi882vj3gl2wvxh0d1i";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index ef865529805f9..2b5f7cacd4b30 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -2,6 +2,7 @@
 , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl
 , docbook_xml_dtd_412, gtk-doc
 , useSystemd ? stdenv.isLinux, systemd
+, doCheck ? false
 }:
 
 let
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
   name = "polkit-0.113";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
+    url = "https://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
     sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71";
   };
 
@@ -37,15 +38,16 @@ stdenv.mkDerivation rec {
       url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
       sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh";
     })
-  ]
-  # Could be applied uncondtionally but don't want to trigger rebuild
-  # https://bugs.freedesktop.org/show_bug.cgi?id=50145
-  ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
-    name = "netgroup-optional.patch";
-    url = "https://bugs.freedesktop.org/attachment.cgi?id=118753";
-    sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038";
-  });
+    (fetchpatch {
+      name = "netgroup-optional.patch";
+      url = "https://bugs.freedesktop.org/attachment.cgi?id=118753";
+      sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038";
+    })
+  ];
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e "s/-Wl,--as-needed//" configure.ac
+  '';
 
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
@@ -83,22 +85,23 @@ stdenv.mkDerivation rec {
     "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
     "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
     "--enable-introspection"
-  ];
+  ] ++ stdenv.lib.optional (!doCheck) "--disable-test";
 
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
   # The following is required on grsecurity/PaX due to spidermonkey's JIT
-  postBuild = ''
+  postBuild = stdenv.lib.optionalString stdenv.isLinux ''
     paxmark mr src/polkitbackend/.libs/polkitd
+  '' + stdenv.lib.optionalString (stdenv.isLinux && doCheck) ''
     paxmark mr test/polkitbackend/.libs/polkitbackendjsauthoritytest
   '';
 
-  #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs
+  inherit doCheck;
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/polkit;
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index bfc94e1fac8a9..9b0593ceb6f86 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
+{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl, fetchpatch
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.65.0";
+  version = "0.66.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "01wgvpi1l7nqkvixnmhmlpld0fjryhl7rlwvba6agz9yz1rwzj49";
+    sha256 = "1rzar5f27xzkjih07yi8kxcinvk4ny4nhimyacpvqx7vmlqn829c";
   };
 
   outputs = [ "out" "dev" ];
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja pkgconfig ];
 
+  patches = lib.optional stdenv.isDarwin (fetchpatch {
+    url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=267228bb071016621c80fc8514927905164aaeea";
+    sha256 = "0i2sbxz1mrsnj75qgqaadayjgs48ay2mhrbkij95djy6am44m54k";
+  });
+
   # Not sure when and how to pass it.  It seems an upstream bug anyway.
   CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
 
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 9a72e03ef2c6e..aa9a3f9fdc0a7 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
   name = "postgis-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz";
+    url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index b92aa49a092ec..0ebf299a8bfb3 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "proj-4.9.3";
 
   src = fetchurl {
-    url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz;
+    url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz;
     sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
   };
 
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index fd738faf5074a..018a57ad0571b 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libupnp-${version}";
-  version = "1.6.21";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "mrjimenez";
     repo = "pupnp";
     rev = "release-${version}";
-    sha256 = "07ksfhadinaa20542gblrxi9pqz0v6y70a836hp3qr4037id4nm9";
+    sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 00ce513304875..0aa39532325d8 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchurl, libjpeg, zlib, perl }:
+{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }:
 
-let version = "8.0.2";
+let version = "8.1.0";
 in
 stdenv.mkDerivation rec {
   name = "qpdf-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "1hf8jfjar8p7v288d7ccmr8w171mv9kb86b6hq1nk58mnlq1g7mh";
+    sha256 = "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx";
   };
 
   nativeBuildInputs = [ perl ];
 
   buildInputs = [ zlib libjpeg ];
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-9918.patch";
+      url = "https://github.com/qpdf/qpdf/commit/b4d6cf6836ce025ba1811b7bbec52680c7204223";
+      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    })
+  ];
+
   postPatch = ''
     patchShebangs qpdf/fix-qdf
   '';
diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh
deleted file mode 100644
index 4770644ae4e90..0000000000000
--- a/pkgs/development/libraries/qt-5/5.10/fetch.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/ \
-            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch
deleted file mode 100644
index c78cb58f564b8..0000000000000
--- a/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
-index 69e4cd1f3..3f729a75e 100644
---- a/Source/WTF/WTF.pri
-+++ b/Source/WTF/WTF.pri
-@@ -12,7 +12,7 @@ mac {
-     # Mac OS does ship libicu but not the associated header files.
-     # Therefore WebKit provides adequate header files.
-     INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
--    LIBS += -licucore
-+    LIBS += /usr/lib/libicucore.dylib
- } else:!use?(wchar_unicode): {
-     win32 {
-         CONFIG(static, static|shared) {
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49aa..46772a4bb 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
-+#ifdef NIXPKGS_LIBGTK2
-+    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
-+#else
-     QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+#endif
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2fea..86fe39ef1 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,11 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-+#ifdef NIXPKGS_LIBGDK2
-+    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
-+#else
-     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+#endif
-     if (!library.load())
-         return 0;
- 
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de65216b..38f5c05e5 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
-+#ifdef NIXPKGS_LIBGTK2
-+    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
-+#else
-     QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+#endif
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff684..0f6ff63d1 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
-+#ifdef NIXPKGS_LIBGDK2
-+    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
-+#else
-     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+#endif
-     if (!library.load())
-         return 0;
- 
diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix
deleted file mode 100644
index 025c7aa44e139..0000000000000
--- a/pkgs/development/libraries/qt-5/5.10/srcs.nix
+++ /dev/null
@@ -1,341 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0fvb346xhiyc0csxcvs5ifwkzs9wnza54vvsw6dvyax76qjv87q4";
-      name = "qt3d-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtactiveqt-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1r4i72i1pl9xnmcx8rr8g48fmym8mxs28pkg1nl302xi6izan8ch";
-      name = "qtactiveqt-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtandroidextras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "03jmf7gw4abn5gj92b1ns0k75bbi4wycbc4bbb7c9mngzkv3nzkn";
-      name = "qtandroidextras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0sd9cn3ywkjfswddcxhbfplkwk8snqld752q5laaapdakhc0wrnq";
-      name = "qtbase-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1h5hpjwdyp824r2ajmaqjcshra06yfzz7dp991h4kf54da79m0ny";
-      name = "qtcanvas3d-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtcharts = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1j8y683ainri9ma44ky6q87pjs1d794znb2wfsrbplixyxxmf3ag";
-      name = "qtcharts-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1j9ydlkwz3039yslaizz923h0qbszm4z2sqspk28wr8rd3f22a35";
-      name = "qtconnectivity-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtdatavis3d = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdatavis3d-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0ny8j689jm2fghklzw894yc5hjqa23yf395yv17yvwi72kpiz0b3";
-      name = "qtdatavis3d-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0lwmg1qan886czzkzi4px36mqxlqiw0acrsa9kqcddg5pi8yvy9s";
-      name = "qtdeclarative-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdoc-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1gl62acr346jrcfxla8vxlczf706a3md52zc0zaqbjw9rf2bgnqq";
-      name = "qtdoc-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtgamepad = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgamepad-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1xs6adpnv5ymdmb7kcbvcc0vx2lp6wqz53pzr9amyzbgyl0jiiw5";
-      name = "qtgamepad-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0zw4n6s42w70r45gjg66ad0s9dpxil6wmwwrivshnqvrnlqhcfrz";
-      name = "qtgraphicaleffects-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz";
-      sha256 = "10x248s4a6ij18awkdskk3g7zfw6gwyj63l2jr803blyfyibl118";
-      name = "qtimageformats-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1jbjzl6gwxy4n43x6m55b86vkdpjvwyvw7xsxg4a40f72xaw0p2y";
-      name = "qtlocation-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmacextras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1jkzizsa8nr1dp5n9p81s6ylnqfh0vqwz8l72632fg68x229jfn7";
-      name = "qtmacextras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0j9nq8s2kzfc7zqs253pixqwd5xjv2cbqyik5lgvi9p5bq0riym1";
-      name = "qtmultimedia-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtnetworkauth = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtnetworkauth-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1p6wnma2nygqbjhrbiijjgkc8jq6lkdmq6xaxcgdh8ynkcqiq8wp";
-      name = "qtnetworkauth-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtpurchasing = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtpurchasing-everywhere-src-5.10.1.tar.xz";
-      sha256 = "090gmxy5bp44rirl5yrb1ryn97z37ri4fmmclh9z7c4dvnmr2d3j";
-      name = "qtpurchasing-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1dw22sk2x5bk2mix06w8dv1b05dyq0gx088aqvdz18y67ncs2cfj";
-      name = "qtquickcontrols-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0jk01vgzc78w45q8kys1hwri3jx0hzx5vxivzmv8nh8yj0dlmijx";
-      name = "qtquickcontrols2-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtremoteobjects = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtremoteobjects-everywhere-src-5.10.1.tar.xz";
-      sha256 = "052fa27rv4b9h6qbldrq013zxb69ysgmqnxbyv9c48s2ra50pnp9";
-      name = "qtremoteobjects-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0bakr5xcxc6j6l78fyazh7sgcz2hwf2g8k60jb9307qzrgvqlqg0";
-      name = "qtscript-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtscxml = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz";
-      sha256 = "00v1n86pyw9cm320qa2fpazvkfi6czd027x60k2g2sprwh0x4hhb";
-      name = "qtscxml-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz";
-      sha256 = "15jw2r6snhwi26b4ajp7m89l89kaf1j0kgqds4wjpksk1rngf3dv";
-      name = "qtsensors-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0mr2j86mk1fm9z5iba3kav651231j9jv0805q8716h7ia1ws2l06";
-      name = "qtserialbus-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz";
-      sha256 = "17ja368ggl9aak64r8sqzx34j2i8zv7z60bkhncynrgipc9wpr08";
-      name = "qtserialport-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtspeech = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtspeech-everywhere-src-5.10.1.tar.xz";
-      sha256 = "07clcy3bslq4fk7xb6cqlfsz5frhmy41hzpajdqjwj9h6dvmqxw5";
-      name = "qtspeech-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0nkz3kxclk7s95fnh8xgljahk131mwb8pjllgp7n70ycmc20rq00";
-      name = "qtsvg-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0lwa0i6zspcrii0ak1dyxacif1fkv2vhmdp3dmp7af71bwg49spi";
-      name = "qttools-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1za34rvn3bhzi4mxqm9lghdhaqcxpsi6xa61dfbhpc047l788v8z";
-      name = "qttranslations-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtvirtualkeyboard = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0bnmhy0kibvyra0i15qzwc9195s8wpfhg5gk0d6rfwd5d07gj6a3";
-      name = "qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0mk3p8pkfia3z7v7phk0qdyzd1zkfpk92c995g851p5wbqx699zm";
-      name = "qtwayland-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0r1p1ar4xh7g7lzi564hgw1ng5xkim4mkpgq29ymjlmhxjgl8b62";
-      name = "qtwebchannel-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1ph1pinxn0dp44zall9gihbgziira4zpynixacm4ldd85f6lyr0j";
-      name = "qtwebengine-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebglplugin = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebglplugin-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1hdzymwai5f6agkn4hz32aq5fjv2lqdac285fwrlk5gsff0j0yal";
-      name = "qtwebglplugin-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1sjkml5kqigvyxrkv5b7x1cy69d69dzma40yfg72vr7zal4pkkvf";
-      name = "qtwebsockets-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebview-everywhere-src-5.10.1.tar.xz";
-      sha256 = "110mwc423cq1bwdz0vv78cjprzy03xawxnxhfcs4138gssfj0n0b";
-      name = "qtwebview-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "05w9n8kry1mg3i14i4m98gm5hf20mlwxbagbk9xk11xykbm1wh0j";
-      name = "qtwinextras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1d4pvisxbcyb7ljl1lh2zg72kw44h9kk14l0xmvajb8bslgkg2n3";
-      name = "qtx11extras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1zp9smsfdqyfiarxs7r8kfr7yq68cdn7biddwl36cybax6fgbpiw";
-      name = "qtxmlpatterns-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebkit = {
-    version = "5.9.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz";
-      sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998";
-      name = "qtwebkit-opensource-src-5.9.1.tar.xz";
-    };
-  };
-  qtwebkit-examples = {
-    version = "5.9.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz";
-      sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4";
-      name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 3969e01a2b91c..5407a79cd7750 100644
--- a/pkgs/development/libraries/qt-5/5.10/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
 
@@ -31,13 +31,19 @@ with stdenv.lib;
 
 let
 
-  qtCompatVersion = "5.10";
+  qtCompatVersion = "5.11";
 
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
   patches = {
-    qtbase = [ ./qtbase.patch ./qtbase-darwin.patch ];
+    qtbase = [
+      ./qtbase.patch
+      ./qtbase-darwin.patch
+      ./qtbase-revert-no-macos10.10.patch
+    ] ++ optionals stdenv.isDarwin [
+      ./qtbase-darwin-nseventtype.patch
+    ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
@@ -96,7 +102,15 @@ let
       qtwayland = callPackage ../modules/qtwayland.nix {};
       qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
       qtwebengine = callPackage ../modules/qtwebengine.nix {};
-      qtwebkit = callPackage ../modules/qtwebkit.nix {};
+      qtwebkit = callPackage ../modules/qtwebkit.nix {
+        src = fetchFromGitHub {
+          owner = "annulen";
+          repo = "webkit";
+          rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
+          sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
+        };
+        version = "5.212-alpha-01-26-2018";
+      };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
       qtx11extras = callPackage ../modules/qtx11extras.nix {};
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh
new file mode 100644
index 0000000000000..ce82e243af77d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh
@@ -0,0 +1,2 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/ \
+            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch
new file mode 100644
index 0000000000000..9ef6e8ef06927
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch
@@ -0,0 +1,13 @@
+--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
+@@ -404,8 +404,8 @@ void QCocoaWindow::setVisible(bool visible)
+                         removeMonitor();
+                         monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSLeftMouseDownMask|NSRightMouseDownMask|NSOtherMouseDownMask|NSMouseMovedMask handler:^(NSEvent *e) {
+                             QPointF localPoint = QCocoaScreen::mapFromNative([NSEvent mouseLocation]);
+-                            const auto button = e.type == NSEventTypeMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]);
+-                            const auto eventType = e.type == NSEventTypeMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress;
++                            const auto button = e.type == NSMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]);
++                            const auto eventType = e.type == NSMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress;
+                             QWindowSystemInterface::handleMouseEvent(window(), window()->mapFromGlobal(localPoint.toPoint()), localPoint,
+                                                                      Qt::MouseButtons(uint(NSEvent.pressedMouseButtons & 0xFFFF)), button, eventType);
+                         }];
diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
index fa389fe55c2f9..f663517520544 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
@@ -1,16 +1,3 @@
-diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-index 66baf16..89794ef 100644
---- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
- 
- QFixed QCoreTextFontEngine::emSquareSize() const
- {
--    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
-+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
- }
- 
- QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
 diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
 index 341d3bccf2..3368234c26 100644
 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -33,12 +20,25 @@ index 341d3bccf2..3368234c26 100644
      for (NSString *ifName in wifiInterfaces) {
              scanThread->interfaceName = QString::fromNSString(ifName);
              scanThread->start();
+diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
+index a17a02b629..d76c42fa03 100644
+--- a/src/plugins/platforms/cocoa/qcocoascreen.mm
++++ b/src/plugins/platforms/cocoa/qcocoascreen.mm
+@@ -114,7 +114,7 @@ void QCocoaScreen::updateGeometry()
+         return;
+
+     // The reference screen for the geometry is always the primary screen
+-    QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame);
++    QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]);
+     m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect();
+     m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect();
+
 diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
-index d1f19f2..1ac2cf1 100644
+index 72f3bc0075..a9c058a850 100644
 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm
 +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
-@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
-
+@@ -1676,7 +1676,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
+ 
      if (!m_drawContentBorderGradient) {
          window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask;
 -        [window.contentView.superview setNeedsDisplay:YES];
@@ -47,10 +47,10 @@ index d1f19f2..1ac2cf1 100644
          return;
      }
 diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
-index e846fa0..4171cd4 100644
+index cb13b7d184..0159d68dca 100644
 --- a/src/plugins/platforms/cocoa/qnswindow.mm
 +++ b/src/plugins/platforms/cocoa/qnswindow.mm
-@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev)
+@@ -231,7 +231,7 @@ static bool isMouseEvent(NSEvent *ev)
      if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
          NSPoint loc = [theEvent locationInWindow];
          NSRect windowFrame = [self convertRectFromScreen:self.frame];
@@ -59,12 +59,12 @@ index e846fa0..4171cd4 100644
          if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO))
              [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent];
      }
-@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev)
+@@ -260,7 +260,7 @@ static bool isMouseEvent(NSEvent *ev)
  + (void)applicationActivationChanged:(NSNotification*)notification
  {
      const id sender = self;
 -    NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
 +    NSEnumerator *windowEnumerator = nullptr;
      NSApplication *application = [NSApplication sharedApplication];
-
+ 
  #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch
new file mode 100644
index 0000000000000..29776518379d2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch
@@ -0,0 +1,102 @@
+Revert "Remove code paths for macOS < 10.11"
+
+This reverts commit 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3.
+
+From 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3 Mon Sep 17 00:00:00 2001
+From: Jake Petroules <jake.petroules@qt.io>
+Date: Thu, 8 Feb 2018 11:05:42 -0800
+Subject: [PATCH] Remove code paths for macOS < 10.11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I5ae02d88aa3dcd97d1f2ebf6255a68643e5d6daa
+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
+Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
+Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
+---
+ .../fontdatabases/mac/qfontengine_coretext.mm            | 16 +++-------------
+ src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm    |  6 +-----
+ src/plugins/platforms/cocoa/qnswindowdelegate.mm         | 16 ----------------
+ 3 files changed, 4 insertions(+), 34 deletions(-)
+
+diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+index 98b753eff9..489d9cd031 100644
+--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+@@ -47,18 +47,28 @@
+ 
+ #include <cmath>
+ 
+-#if defined(Q_OS_MACOS)
++#if defined(Q_OS_OSX) && !QT_OSX_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
+ #import <AppKit/AppKit.h>
+ #endif
+ 
+-#if defined(QT_PLATFORM_UIKIT)
++#if defined(QT_PLATFORM_UIKIT) && !QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_8_2)
+ #import <UIKit/UIKit.h>
+ #endif
+ 
+ // These are available cross platform, exported as kCTFontWeightXXX from CoreText.framework,
+ // but they are not documented and are not in public headers so are private API and exposed
+ // only through the NSFontWeightXXX and UIFontWeightXXX aliases in AppKit and UIKit (rdar://26109857)
+-#if defined(Q_OS_MACOS)
++#if QT_MAC_DEPLOYMENT_TARGET_BELOW(__MAC_10_11, __IPHONE_8_2)
++#define kCTFontWeightUltraLight -0.8
++#define kCTFontWeightThin -0.6
++#define kCTFontWeightLight -0.4
++#define kCTFontWeightRegular 0
++#define kCTFontWeightMedium 0.23
++#define kCTFontWeightSemibold 0.3
++#define kCTFontWeightBold 0.4
++#define kCTFontWeightHeavy 0.56
++#define kCTFontWeightBlack 0.62
++#elif defined(Q_OS_OSX)
+ #define kCTFontWeightUltraLight NSFontWeightUltraLight
+ #define kCTFontWeightThin NSFontWeightThin
+ #define kCTFontWeightLight NSFontWeightLight
+diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+index 94f2125bad..272cd9f3dc 100644
+--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
++++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+@@ -162,7 +162,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
+     // resetting our mCurrentDir, set the delegate
+     // here to make sure it gets the correct value.
+     [mSavePanel setDelegate:self];
+-    mOpenPanel.accessoryViewDisclosed = YES;
++
++#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11)
++    if (__builtin_available(macOS 10.11, *))
++        mOpenPanel.accessoryViewDisclosed = YES;
++#endif
+ 
+     if (mOptions->isLabelExplicitlySet(QFileDialogOptions::Accept))
+         [mSavePanel setPrompt:[self strip:options->labelText(QFileDialogOptions::Accept)]];
+diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+index 057a4c2943..eb55e50622 100644
+--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm
++++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+@@ -103,6 +103,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*"));
+     return QCocoaScreen::mapToNative(maximizedFrame);
+ }
+ 
++#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
++/*
++    AppKit on OS X 10.10 wrongly calls windowWillUseStandardFrame:defaultFrame
++    from -[NSWindow _frameForFullScreenMode] when going into fullscreen, resulting
++    in black bars on top and bottom of the window. By implementing the following
++    method, AppKit will choose that instead, and resolve the right fullscreen
++    geometry.
++*/
++- (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize
++{
++    Q_UNUSED(proposedSize);
++    Q_ASSERT(window == m_cocoaWindow->nativeWindow());
++    return NSSizeFromCGSize(m_cocoaWindow->screen()->geometry().size().toCGSize());
++}
++#endif
++
+ - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
+ {
+     Q_UNUSED(window);
diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch
index 286dea2178b11..fa0b2c51c46e5 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase.patch
@@ -12,7 +12,7 @@ index 5208379f9a..92fe29a0ac 100644
  
  QMAKE_LFLAGS_REL_RPATH  =
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index bb5083c925..77034f9bb6 100644
+index 2ed708e085..05e60ff45f 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -21,7 +21,7 @@ load(cmake_functions)
@@ -24,7 +24,7 @@ index bb5083c925..77034f9bb6 100644
  contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
  
  CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-@@ -47,47 +47,22 @@ split_incpath {
+@@ -51,45 +51,20 @@ split_incpath {
          $$cmake_extra_source_includes.output
  }
  
@@ -36,8 +36,6 @@ index bb5083c925..77034f9bb6 100644
 +CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/
 +CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
  
- !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true
- 
 -CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
 -contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
 -    CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
@@ -48,25 +46,23 @@ index bb5083c925..77034f9bb6 100644
 -    # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
 -    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
 -}
-+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/
-+CMAKE_LIB_DIR_IS_ABSOLUTE = True
++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/
++CMAKE_BIN_DIR_IS_ABSOLUTE = True
  
 -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
 -contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
 -    CMAKE_BIN_DIR = $$[QT_HOST_BINS]/
 -    CMAKE_BIN_DIR_IS_ABSOLUTE = True
 -}
-+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/
-+CMAKE_BIN_DIR_IS_ABSOLUTE = True
++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/
++CMAKE_LIB_DIR_IS_ABSOLUTE = True
  
 -CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX])
 -contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") {
 -    CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
 -    CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
 -}
-+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
-+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
- 
+-
 -win32:!static:!staticlib {
 -    CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])
 -    contains(CMAKE_DLL_DIR, "^\\.\\./.*") {
@@ -77,12 +73,15 @@ index bb5083c925..77034f9bb6 100644
 -    CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
 -    CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
 -}
++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
++ 
 +CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/
 +CMAKE_DLL_DIR_IS_ABSOLUTE = True
  
  static|staticlib:CMAKE_STATIC_TYPE = true
  
-@@ -167,7 +142,7 @@ contains(CONFIG, plugin) {
+@@ -169,7 +144,7 @@ contains(CONFIG, plugin) {
        cmake_target_file
  
      cmake_qt5_plugin_file.files = $$cmake_target_file.output
@@ -91,7 +90,7 @@ index bb5083c925..77034f9bb6 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) {
+@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -101,12 +100,12 @@ index bb5083c925..77034f9bb6 100644
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 55c74aad66..0bbc8718eb 100644
+index 27f4c277d6..18b4813e25 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+     message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
  endif()
- !!ENDIF
  
 -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
 -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -135,7 +134,7 @@ index 55c74aad66..0bbc8718eb 100644
  !!IF !equals(TEMPLATE, aux)
  # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
  set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
-@@ -58,11 +34,7 @@ endmacro()
+@@ -52,11 +28,7 @@ endmacro()
  macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -147,7 +146,7 @@ index 55c74aad66..0bbc8718eb 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
      set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
          \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-@@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
      )
  
  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -159,7 +158,7 @@ index 55c74aad66..0bbc8718eb 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
      if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
          set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-@@ -95,24 +63,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -188,7 +187,7 @@ index 55c74aad66..0bbc8718eb 100644
      )
  !!ELSE
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +85,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
  !!ENDIF
  !!ENDIF
@@ -196,7 +195,7 @@ index 55c74aad66..0bbc8718eb 100644
  !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
      include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
  !!ENDIF
-@@ -280,25 +236,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -269,25 +225,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_DEBUG_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -222,7 +221,7 @@ index 55c74aad66..0bbc8718eb 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -317,25 +261,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -306,25 +250,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_RELEASE_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -248,7 +247,7 @@ index 55c74aad66..0bbc8718eb 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -354,11 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -343,11 +275,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -261,13 +260,14 @@ index 55c74aad66..0bbc8718eb 100644
          set_target_properties(Qt5::${Plugin} PROPERTIES
              \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
 diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 50a1ec6764..d6368b769e 100644
+index 21d487f1f9..a0e5c68b7e 100644
 --- a/mkspecs/features/mac/default_post.prf
 +++ b/mkspecs/features/mac/default_post.prf
-@@ -25,188 +25,3 @@ qt {
+@@ -24,196 +24,3 @@ qt {
+         }
      }
  }
- 
+-
 -# Add the same default rpaths as Xcode does for new projects.
 -# This is especially important for iOS/tvOS/watchOS where no other option is possible.
 -!no_default_rpath {
@@ -453,11 +453,18 @@ index 50a1ec6764..d6368b769e 100644
 -    cache(QMAKE_XCODE_VERSION, stash)
 -
 -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
+-
+-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER
+-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX
+-isEmpty(xcode_product_bundle_identifier_setting.value): \
+-    xcode_product_bundle_identifier_setting.value = "com.yourcompany"
+-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}"
+-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
 diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index f1a4ca77b2..3b01424e67 100644
+index e3534561a5..3b01424e67 100644
 --- a/mkspecs/features/mac/default_pre.prf
 +++ b/mkspecs/features/mac/default_pre.prf
-@@ -1,67 +1,2 @@
+@@ -1,60 +1,2 @@
  CONFIG = asset_catalogs rez $$CONFIG
  load(default_pre)
 -
@@ -518,19 +525,12 @@ index f1a4ca77b2..3b01424e67 100644
 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
 -xcode_copy_phase_strip_setting.value = NO
 -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
--
--xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER
--xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX
--isEmpty(xcode_product_bundle_identifier_setting.value): \
--    xcode_product_bundle_identifier_setting.value = "com.yourcompany"
--xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}"
--QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
 diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
-index 3f6dc076ca..e69de29bb2 100644
+index 8360dd8b38..8b13789179 100644
 --- a/mkspecs/features/mac/sdk.prf
 +++ b/mkspecs/features/mac/sdk.prf
-@@ -1,58 +0,0 @@
--
+@@ -1,58 +1 @@
+ 
 -isEmpty(QMAKE_MAC_SDK): \
 -    error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
 -
@@ -540,21 +540,21 @@ index 3f6dc076ca..e69de29bb2 100644
 -defineReplace(xcodeSDKInfo) {
 -    info = $$1
 -    equals(info, "Path"): \
--        info = --show-sdk-path
+-        infoarg = --show-sdk-path
 -    equals(info, "PlatformPath"): \
--        info = --show-sdk-platform-path
+-        infoarg = --show-sdk-platform-path
 -    equals(info, "SDKVersion"): \
--        info = --show-sdk-version
+-        infoarg = --show-sdk-version
 -    sdk = $$2
 -    isEmpty(sdk): \
 -        sdk = $$QMAKE_MAC_SDK
 -
 -    isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
--        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
+-        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
 -        # --show-sdk-platform-path won't work for Command Line Tools; this is fine
 -        # only used by the XCTest backend to testlib
--        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
--            error("Could not resolve SDK $$info for \'$$sdk\'")
+-        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
+-            error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
 -        cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
 -    }
 -
@@ -572,7 +572,7 @@ index 3f6dc076ca..e69de29bb2 100644
 -QMAKESPEC_NAME = $$basename(QMAKESPEC)
 -
 -# Resolve SDK version of various tools
--for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {
+-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
 -    tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
 -    !isEmpty($$tool_variable) {
 -        $$tool = $$eval($$tool_variable)
@@ -655,7 +655,7 @@ index 1848f00e90..2af93675c5 100644
 +    MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
  }
 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index f4ae5bde80..6d4c6d223f 100644
+index 415044bb64..7163ef56cd 100644
 --- a/mkspecs/features/qt_common.prf
 +++ b/mkspecs/features/qt_common.prf
 @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) {
@@ -670,7 +670,7 @@ index f4ae5bde80..6d4c6d223f 100644
      contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
          lib_replace.match = "[^ ']*$$rplbase/lib"
 diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
-index 72dde61a40..f891a2baed 100644
+index 3139c443c6..1b4f2fddd8 100644
 --- a/mkspecs/features/qt_docs.prf
 +++ b/mkspecs/features/qt_docs.prf
 @@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
@@ -709,7 +709,7 @@ index 72dde61a40..f891a2baed 100644
      INSTALLS += inst_qch_docs
  
 diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
-index c9ce926b1a..f00868a031 100644
+index 43b58817fe..e635b8f67a 100644
 --- a/mkspecs/features/qt_example_installs.prf
 +++ b/mkspecs/features/qt_example_installs.prf
 @@ -88,7 +88,7 @@ sourcefiles += \
@@ -735,7 +735,7 @@ index 1903e509c8..ae7b585989 100644
              $${1}_EXE = $${cmd}.pl
              cmd = perl -w $$system_path($${cmd}.pl)
 diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
-index 90d84cc535..387481bfc6 100644
+index 8f98987b99..21b3bb8b32 100644
 --- a/mkspecs/features/qt_installs.prf
 +++ b/mkspecs/features/qt_installs.prf
 @@ -12,16 +12,10 @@
@@ -760,10 +760,10 @@ index 90d84cc535..387481bfc6 100644
 @@ -29,33 +23,33 @@
  #headers
  qt_install_headers {
-     class_headers.files = $$SYNCQT.HEADER_CLASSES
--    class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
-+    class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
-     INSTALLS += class_headers
+     gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
+-    gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
++    gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
+     INSTALLS += gen_headers
  
      targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
 -    targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
@@ -798,7 +798,7 @@ index 90d84cc535..387481bfc6 100644
          INSTALLS += privpritarget
      }
 diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
-index 14fc5f9a94..2a0f2cd27f 100644
+index bf90adcf1e..b3de698ff7 100644
 --- a/mkspecs/features/qt_plugin.prf
 +++ b/mkspecs/features/qt_plugin.prf
 @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
@@ -811,7 +811,7 @@ index 14fc5f9a94..2a0f2cd27f 100644
  
  TARGET = $$qt5LibraryTarget($$TARGET)
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 545b9a3d1e..6ac0cdefe4 100644
+index e0652fdcf9..450b2a2d28 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
@@ -841,7 +841,7 @@ index 545b9a3d1e..6ac0cdefe4 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)
+@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain)
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
      set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -850,7 +850,7 @@ index 545b9a3d1e..6ac0cdefe4 100644
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
  !!ENDIF
-@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)
+@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain)
      set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -884,10 +884,10 @@ index 706304cf34..546420f6ad 100644
  set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
 diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index 3814894630..3c6468277c 100644
+index 4e32f90964..503aeffd0c 100644
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2601,6 +2601,15 @@ QStringList QCoreApplication::libraryPaths()
+@@ -2613,6 +2613,15 @@ QStringList QCoreApplication::libraryPaths()
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
@@ -1001,32 +1001,6 @@ index 07869efd7d..fb4183bada 100644
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp
-index ce1ec6442a..4f75655abe 100644
---- a/src/network/kernel/qdnslookup_unix.cpp
-+++ b/src/network/kernel/qdnslookup_unix.cpp
-@@ -95,7 +95,7 @@ static bool resolveLibraryInternal()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
-         if (!lib.load())
-             return false;
-     }
-diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
-index 8d2cffc304..9730fb33f2 100644
---- a/src/network/kernel/qhostinfo_unix.cpp
-+++ b/src/network/kernel/qhostinfo_unix.cpp
-@@ -98,7 +98,7 @@ static bool resolveLibraryInternal()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
-         if (!lib.load())
-             return false;
-     }
 diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 index b5a0a5bbeb..6c20305f4d 100644
 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -1046,15 +1020,17 @@ index b5a0a5bbeb..6c20305f4d 100644
  
  QString TableGenerator::findComposeFile()
 diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-index a59dc15b0e..a13ee89b5a 100644
+index cc982b3379..0c5005d3d7 100644
 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
 +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -584,7 +584,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
+@@ -648,9 +648,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
  #if QT_CONFIG(library)
                  extern const QString qt_gl_library_name();
  //                QLibrary lib(qt_gl_library_name());
 +                // Check system library paths first
                  QLibrary lib(QLatin1String("GL"));
+-                if (!lib.load())
+-                    lib.setFileNameAndVersion(QLatin1String("GL"), 1);
 +#ifdef NIXPKGS_MESA_GL
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
@@ -1065,10 +1041,10 @@ index a59dc15b0e..a13ee89b5a 100644
  #endif
              }
 diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index da63360333..95e34e2e50 100644
+index b401100dd4..b45a290065 100644
 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp
 +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
  #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
@@ -1082,7 +1058,7 @@ index da63360333..95e34e2e50 100644
          }
          if (xcursorFound) {
 diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
-index c4cd66c33b..b6f2691587 100644
+index fb1c425d8e..bb8bab9795 100644
 --- a/src/plugins/platformthemes/gtk3/main.cpp
 +++ b/src/plugins/platformthemes/gtk3/main.cpp
 @@ -39,6 +39,7 @@
diff --git a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
index 01a975c14ec7d..8f5b5d4790fb1 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
@@ -1,8 +1,8 @@
 diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
-index a7cafa1a9..e17ffd35b 100644
+index 005db4248..685c5b1b2 100644
 --- a/src/qml/qml/qqmlimport.cpp
 +++ b/src/qml/qml/qqmlimport.cpp
-@@ -1737,6 +1737,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
+@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
@@ -19,10 +19,10 @@ index a7cafa1a9..e17ffd35b 100644
      if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
          const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
 diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
-index 330da358b..cdf570205 100644
+index 537eaf62e..e21de58f6 100644
 --- a/tools/qmlcachegen/qmlcache.prf
 +++ b/tools/qmlcachegen/qmlcache.prf
-@@ -44,7 +44,7 @@ defineReplace(qmlCacheOutputFileName) {
+@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) {
  }
  
  qmlcacheinst.base = $$QMLCACHE_DESTDIR
diff --git a/pkgs/development/libraries/qt-5/5.10/qtscript.patch b/pkgs/development/libraries/qt-5/5.11/qtscript.patch
index 5508dec1280e3..5508dec1280e3 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtscript.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtscript.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qtserialport.patch b/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
index f25524e80bcfe..f25524e80bcfe 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtserialport.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qttools.patch b/pkgs/development/libraries/qt-5/5.11/qttools.patch
index fbba439ef7a5d..fbba439ef7a5d 100644
--- a/pkgs/development/libraries/qt-5/5.10/qttools.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qttools.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch
index e1621b005c618..e1621b005c618 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
new file mode 100644
index 0000000000000..b94a4b76cbaba
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
@@ -0,0 +1,12 @@
+diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake
+--- a/Source/WebKit2/PlatformQt.cmake
++++ b/Source/WebKit2/PlatformQt.cmake
+@@ -261,6 +261,7 @@
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+     ${GLIB_INCLUDE_DIRS}
+     ${GSTREAMER_INCLUDE_DIRS}
++    ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+     ${Qt5Quick_INCLUDE_DIRS}
+     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+     ${SQLITE_INCLUDE_DIR}
+
diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix
new file mode 100644
index 0000000000000..b6668a91606c4
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/srcs.nix
@@ -0,0 +1,325 @@
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+{ fetchurl, mirror }:
+
+{
+  qt3d = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz";
+      sha256 = "03fkbrghj40rp8pf5r5979pcvq7qjsj7db446r6fl6slwphmk1nb";
+      name = "qt3d-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtactiveqt-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1f9w3dc2wvhz7pqhrsb2p908kc2c6xrqsp82ny8akil4xx6nrvn6";
+      name = "qtactiveqt-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtandroidextras-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1qiggrz2hdb7vrkvsh71hqdipj3klak0jpn2nq8qpilqxgb9dx76";
+      name = "qtandroidextras-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50";
+      name = "qtbase-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcanvas3d-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g";
+      name = "qtcanvas3d-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtcharts = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2";
+      name = "qtcharts-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk";
+      name = "qtconnectivity-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtdatavis3d = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdatavis3d-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w";
+      name = "qtdatavis3d-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy";
+      name = "qtdeclarative-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdoc-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1z0sqmn0pw5g4ycdi8igsi89151cw6p3kv9g97pxl2qx3my1ppmc";
+      name = "qtdoc-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtgamepad = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgamepad-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma";
+      name = "qtgamepad-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr";
+      name = "qtgraphicaleffects-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz";
+      sha256 = "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b";
+      name = "qtimageformats-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz";
+      sha256 = "03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p";
+      name = "qtlocation-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmacextras-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1wf3n5n4gg8gmjnjq88lmymkssg8q5s3qkrpsxd1hb6pd3n32gpn";
+      name = "qtmacextras-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj";
+      name = "qtmultimedia-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtnetworkauth = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtnetworkauth-everywhere-src-5.11.1.tar.xz";
+      sha256 = "05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02";
+      name = "qtnetworkauth-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtpurchasing = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtpurchasing-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc";
+      name = "qtpurchasing-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms";
+      name = "qtquickcontrols-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x";
+      name = "qtquickcontrols2-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtremoteobjects = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtremoteobjects-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb";
+      name = "qtremoteobjects-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw";
+      name = "qtscript-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtscxml = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph";
+      name = "qtscxml-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb";
+      name = "qtsensors-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk";
+      name = "qtserialbus-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz";
+      sha256 = "18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn";
+      name = "qtserialport-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtspeech = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw";
+      name = "qtspeech-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx";
+      name = "qtsvg-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp";
+      name = "qttools-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz";
+      sha256 = "01kid5dc20jnzjmd4ycjmacrsmrw4hsh2s4y5k9y9p34z8m9pn0j";
+      name = "qttranslations-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtvirtualkeyboard = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz";
+      sha256 = "16xzpdqn07z8j6f8iywy3967djap5bbi2myqp37s4xh9fz60scsv";
+      name = "qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0";
+      name = "qtwayland-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz";
+      sha256 = "11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r";
+      name = "qtwebchannel-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz";
+      sha256 = "136lc2kw4af4bilgn7vn9hdckpk62xvyjb4kr0gc2firr919z79q";
+      name = "qtwebengine-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwebglplugin = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebglplugin-everywhere-src-5.11.1.tar.xz";
+      sha256 = "108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x";
+      name = "qtwebglplugin-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz";
+      sha256 = "1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks";
+      name = "qtwebsockets-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebview-everywhere-src-5.11.1.tar.xz";
+      sha256 = "18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp";
+      name = "qtwebview-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwinextras-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0qxwfhg962a456lb9b6y7xhi6fvvvb42z0li6v7695vfbckifbzz";
+      name = "qtwinextras-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw";
+      name = "qtx11extras-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.11.1";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz";
+      sha256 = "0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1";
+      name = "qtxmlpatterns-everywhere-src-5.11.1.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0c7af9e185dd4..15e19c77567a0 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation {
     [
       "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
-      ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
+      ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"''
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
     ]
 
@@ -243,10 +243,13 @@ stdenv.mkDerivation {
       "-gui"
       "-widgets"
       "-opengl desktop"
-      "-qml-debug"
       "-icu"
       "-pch"
     ]
+    ++ lib.optionals (compareVersion "5.11.0" < 0)
+    [
+      "-qml-debug"
+    ]
     ++ lib.optionals (compareVersion "5.9.0" < 0)
     [
       "-c++11"
@@ -387,7 +390,7 @@ stdenv.mkDerivation {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel periklis ];
+    maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
     platforms = platforms.unix;
   };
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
index fc0a751f48a0e..f9b8cdc8cf022 100644
--- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
@@ -10,6 +10,7 @@ qtModule {
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
   '';
+  configureFlags = lib.optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-qml-debug" ];
   devTools = [
     "bin/qml"
     "bin/qmlcachegen"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index d73bc370f9909..8691e20ec4521 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -1,23 +1,40 @@
-{ qtModule, stdenv, lib
-, qtbase, qtdeclarative, qtlocation, qtsensors
+{ qtModule, stdenv, lib, fetchurl
+, qtbase, qtdeclarative, qtlocation, qtsensors, qtwebchannel
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
-, sqlite, systemd, glib, gst_all_1
+, sqlite, systemd, glib, gst_all_1, cmake
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
 , darwin
 , substituteAll
 , flashplayerFix ? false
+, src ? null
+, version ? null
 }:
 
-let inherit (lib) optional optionals getLib; in
-
+let
+  inherit (lib) optional optionals getLib;
+  hyphen = stdenv.mkDerivation rec {
+    name = "hyphen-2.8.8";
+    src = fetchurl {
+      url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-${name}.tar.gz";
+      sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705";
+    };
+    buildInputs = [ perl ];
+  };
+in
 qtModule {
   name = "qtwebkit";
-  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ];
+  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ qtwebchannel ];
   buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
-    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]);
+    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ])
+    ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ];
   nativeBuildInputs = [
     bison2 flex gdb gperf perl pkgconfig python2 ruby
-  ];
+  ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ cmake ];
+
+  cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ];
+
+  inherit src;
+  inherit version;
 
   __impureHostDeps = optionals (stdenv.isDarwin) [
     "/usr/lib/libicucore.dylib"
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 11e4ae1c26c5e..e18564aaabe2f 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,7 +8,7 @@ args:
 
 let
   inherit (args) name;
-  version = args.version or srcs."${name}".version;
+  version = if (args.version or null) == null then srcs."${name}".version else args.version;
   src = args.src or srcs."${name}".src;
 in
 
@@ -53,7 +53,7 @@ mkDerivation (args // {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel periklis ];
+    maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
     platforms = platforms.unix;
   } // (args.meta or {});
 })
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index a1708ba59c35b..96a2347c50fa5 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "rabbitmq-java-client-3.3.4";
 
   src = fetchurl {
-    url = "http://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz";
+    url = "https://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz";
     sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh";
   };
 
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index bddda1dff552a..cd981f8947aa9 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "range-v3-${version}";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "ericniebler";
     repo = "range-v3";
     rev = version;
-    sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp";
+    sha256 = "050h9pa57kd57l73njxpjb331snybddl29x2vpy5ycygvqiw8kcp";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix
index 7faee7e69a2eb..5a4306a63a783 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/pkgs/development/libraries/readosm/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "readosm-1.1.0";
 
   src = fetchurl {
-    url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz";
     sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265";
   };
 
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index 5629164f160a1..681fc3a012fe2 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   sourceName = "rep-gtk_${version}";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz";
+    url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz";
     sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9";
   };
 
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index bb36d942a69b8..90389055a415a 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://rocksdb.org;
+    homepage = https://rocksdb.org;
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.bsd3;
     platforms = platforms.x86_64;
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index 364a4d4794a84..c9ba339ae0eab 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "High quality software library for audio time-stretching and pitch-shifting";
-    homepage = http://www.breakfastquay.com/rubberband/index.html;
+    homepage = https://www.breakfastquay.com/rubberband/index.html;
     # commercial license available as well, see homepage. You'll get some more optimized routines
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu maintainers.marcweber ];
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index 167fe41907641..25126edbc0f4e 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     urls = [
       http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
-      http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz
+      https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz
     ];
     sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
   };
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 0c0332f136628..38b77781867de 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.2.4";
   name = "brial-${version}";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
     rev = version;
-    sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
+    sha256 = "08skgmwz190mvpkh0ddx92ilva6bxidxwh1qg16ipi768x92193s";
   };
 
   # FIXME package boost-test and enable checks
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index f694f72f22b6f..4a6aabb447f3f 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipopt-${version}";
-  version = "3.12.9";
+  version = "3.12.10";
 
   src = fetchurl {
-    url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "1fqdjgxh6l1xjvw1ffma7lg92xqg0l8sj02y0zqvbfnx8i47qs9a";
+    url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
+    sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9";
   };
 
   CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 90393cff001c8..6bbd43b0c848d 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
     # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2";
+    url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2";
     sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43";
   };
 
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index 26ec501f1a7e5..8444d88809af2 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -7,7 +7,7 @@ let version = "2.0.2";
 in stdenv.mkDerivation {
   name = "magma-${version}";
   src = fetchurl {
-    url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
+    url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
     sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk";
     name = "magma-${version}.tar.gz";
   };
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 5ac0bcd1d7d75..fc8f11f2f11eb 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -76,14 +76,13 @@ let
     if blas64_ != null
       then blas64_
       else hasPrefix "x86_64" stdenv.system;
-
-  version = "0.2.20";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "openblas-${version}";
+  version = "0.3.1";
   src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
-    sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy";
+    sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz";
     name = "openblas-${version}.tar.gz";
   };
 
@@ -118,12 +117,7 @@ stdenv.mkDerivation {
     ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
     ++ mapAttrsToList (var: val: var + "=" + val) config;
 
-  patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc")
-    # https://github.com/xianyi/OpenBLAS/pull/1247
-    (fetchpatch {
-      url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch";
-      sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n";
-    });
+  patches = []; # TODO: Remove on next mass-rebuild
 
   doCheck = true;
   checkTarget = "tests";
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 195b90c86e1a2..3e8524b40140f 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "openlibm-${version}";
-  version = "0.5.5";
+  version = "0.6.0";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
-    sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07";
+    sha256 = "0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l";
   };
 
   makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index f38fce5831ee9..fda54fe44ab11 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/rw/rw-${version}.tar.gz";
+    url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
     sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
   };
 
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index fe448106b15d5..624885c501aae 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/rubiks/rubiks-${version}.tar.bz2";
+    url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
     sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq";
   };
 
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index c83b3d1737cf1..c34701e3f9136 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # Original website no longer reachable
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/sympow/sympow-${version}.tar.bz2";
+    url = "mirror://sageupstream/sympow/sympow-${version}.tar.bz2";
     sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -d datafiles "$out/share/sympow/datafiles"
+    install -D datafiles/* --target-directory "$out/share/sympow/datafiles/"
     install *.gp "$out/share/sympow/"
     install -Dm755 sympow "$out/share/sympow/sympow"
     install -D new_data "$out/bin/new_data"
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 96449a8ed9625..ac9183cffe9be 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.28.0";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx";
   };
 
diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix
index 3234d1bb89bfe..09d3efa64b2b5 100644
--- a/pkgs/development/libraries/shapelib/default.nix
+++ b/pkgs/development/libraries/shapelib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "shapelib-1.4.1";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/shapelib/${name}.tar.gz";
+    url = "https://download.osgeo.org/shapelib/${name}.tar.gz";
     sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4";
   };
 
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index bcce457e78e84..ec59ae0e819e5 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "slang-2.3.2";
   src = fetchurl {
-    url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2";
+    url = "https://www.jedsoft.org/releases/slang/${name}.tar.bz2";
     sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw";
   };
 
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 233ba91d299ab..665f025ffcf3c 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "slib-3b5";
 
   src = fetchurl {
-    url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
+    url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
     sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
   };
 
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 17195febe1335..1b5564dc15900 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "snack-2.2.10";
 
   src = fetchurl {
-    url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz;
+    url = https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz;
     sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
   };
 
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 995ac631580d3..207c6f2d30a18 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.16.0";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${name}.tar.bz2";
     sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x";
   };
 
diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix
index c338d6762a4d3..95a97f30b6e62 100644
--- a/pkgs/development/libraries/soundtouch/default.nix
+++ b/pkgs/development/libraries/soundtouch/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pName = "soundtouch";
   name = "${pName}-2.0.0";
   src = fetchurl {
-    url = "http://www.surina.net/soundtouch/${name}.tar.gz";
+    url = "https://www.surina.net/soundtouch/${name}.tar.gz";
     sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j";
   };
 
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index ea3013c78bcbe..be2fc503e3900 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   version = "0.0.6";
   name = "spandsp-${version}";
   src=fetchurl {
-    url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
+    url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
   buildInputs = [];
diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix
index ff461f1b8e643..9070423d8c76d 100644
--- a/pkgs/development/libraries/spatialite-tools/default.nix
+++ b/pkgs/development/libraries/spatialite-tools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "spatialite-tools-4.1.1";
 
   src = fetchurl {
-    url = "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz";
     sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv";
   };
 
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index a96e808a97e47..c7f8787c1fda9 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon";
 
   meta = with stdenv.lib; {
-    homepage = http://www.speex.org/;
+    homepage = https://www.speex.org/;
     description = "An Open Source/Free Software patent-free audio compression format designed for speech";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 21359c4f0d0ba..aeab43c889d61 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
+    url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2";
     sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
   };
 
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 56adea9ca82e0..fc337f22b56fb 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.13";
+  name = "spice-protocol-0.12.14";
 
   src = fetchurl {
-    url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9";
+    url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
+    sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90";
   };
 
   postInstall = ''
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index ee54ad5555373..0b815f9095f9c 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "spice-0.14.0";
 
   src = fetchurl {
-    url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
+    url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
     sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs";
   };
 
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index a0b1220b217d2..031dd8f4f9c87 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.23.1";
+  version = "3.24.0";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
+    sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 03f2f5c7199e1..ed25fcb5b8014 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
-  version = "3.23.1";
+  version = "3.24.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
+    sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr";
   };
 
   outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index ce4fca6da70dc..fc771a493b6d2 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation {
   name = "libstartup-notification-${version}";
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
+    url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
     sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
   };
 
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 362881a2f42bf..63060bf555331 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.7.8";
 
   src = fetchurl {
-    url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+    url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2";
     sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23";
   };
 
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index 272967fcb9969..1759258e6664f 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python, fetchurl, openssl, boost }:
 stdenv.mkDerivation rec {
   name    = "swiften-${version}";
-  version = "4.0";
+  version = "4.0.2";
 
   buildInputs           = [ python ];
   propagatedBuildInputs = [ openssl boost ];
 
   src = fetchurl {
-    url    = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
-    sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh";
+    url    = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
+    sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
   };
   
   buildPhase = ''
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 13497f7727f49..0c3bb3b130647 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.7.4";
 
   src = fetchurl {
-    url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
+    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
     sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
   };
 
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 53e48eb893179..0185bd2733b40 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
   arch = if stdenv.system == "x86_64-linux"   then "linux-64-thr"  else
          if stdenv.system == "i686-linux"     then "linux-thr"     else
          if stdenv.system == "aarch64-linux"  then "linux-arm-thr" else
+         if stdenv.system == "armv7l-linux"   then "linux-arm-thr" else
          if stdenv.system == "x86_64-darwin"  then "macosx-thr"    else
          if stdenv.system == "i686-darwin"    then "macosx-64-thr" else
          if stdenv.system == "i686-cygwin"    then "win32"         else
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 1d6818276eb88..30d9a38a35dfe 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.1.12";
+  name = "talloc-2.1.13";
 
   src = fetchurl {
     url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "0jv0ri9vj93fczzgl7rn7xvnfgl2kfx4x85cr8h8v52yh7v0qz4q";
+    sha256 = "0iv09iv385x69gfzvassq6m3y0rd8ncylls95dm015xdy3drkww4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Hierarchical pool based memory allocator with destructors";
-    homepage = http://tdb.samba.org/;
+    homepage = https://tdb.samba.org/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 59765adf7a872..a7b7f5243fb05 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -2,13 +2,13 @@
 
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "tbb-${version}";
-  version = "2018_U3";
+  version = "2018_U5";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "tbb";
     rev = version;
-    sha256 = "137hb03ms93v4svjq038z6clfh41y8iq7wcif8n92xz2wzaap006";
+    sha256 = "080df8h2whnly6n9pslpg07dc9vr0p45gqgy9qijpjvxkjwfkdkp";
   };
 
   makeFlags = concatStringsSep " " (
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index d372c61dbe28f..f6e4a04728288 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.3.15";
+  name = "tdb-1.3.16";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${name}.tar.gz";
-    sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl";
+    sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
          uses locking internally to keep writers from trampling on each
          other.  TDB is also extremely small.
       '';
-    homepage = http://tdb.samba.org/;
+    homepage = https://tdb.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index 41308a7ef4ecb..fae51aea477e8 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "telepathy-farstream";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
     sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g";
   };
 
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index df5c76abd7cdb..9ca2481c3b019 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   passthru.python = python2;
 
   meta = {
-    homepage = http://telepathy.freedesktop.org;
+    homepage = https://telepathy.freedesktop.org;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 90dd47c11e2f6..24dc3667d172a 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "telepathy-qt-0.9.7";
 
   src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
     sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1";
   };
 
diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
new file mode 100644
index 0000000000000..12f953b1aa8d6
--- /dev/null
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl
+, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
+let
+  version = "4.1.1";
+  pname = "tepl";
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "13kflywpc6iyfpc9baaa54in5vzn4p7i3dh9pr2ival2nkxfnkp2";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  buildInputs = [
+    amtk
+    libxml2
+    gtksourceview4
+    libuchardet
+    gnome3.gtk
+  ];
+
+  doCheck = false;
+  # TODO: one test fails because of
+  # (./test-file-metadata:20931): Tepl-WARNING **: 14:41:36.942: GVfs metadata
+  # is not supported. Fallback to TeplMetadataManager. Either GVfs is not
+  # correctly installed or GVfs metadata are not supported on this platform. In
+  # the latter case, you should configure Tepl with --disable-gvfs-metadata.
+
+  passthru.updateScript = gnome3.updateScript { packageName = pname; };
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Tepl;
+    description = "Text editor product line";
+    maintainers = [ maintainers.manveru ];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 154db61894fa5..e43c626842404 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tevent-0.9.36";
+  name = "tevent-0.9.37";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${name}.tar.gz";
-    sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx";
+    sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An event system based on the talloc memory management library";
-    homepage = http://tevent.samba.org/;
+    homepage = https://tevent.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 45e5174ed5734..cb200b82e2076 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.11.0";
 
   src = fetchurl {
-    url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
+    url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
     sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4";
   };
 
diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix
index 25d7849b1b4b7..12f7e4c765d22 100644
--- a/pkgs/development/libraries/tre/default.nix
+++ b/pkgs/development/libraries/tre/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "tre-0.8.0";
   src = fetchurl {
-    url = "http://laurikari.net/tre/${name}.tar.gz";
+    url = "https://laurikari.net/tre/${name}.tar.gz";
     sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my";
   };
 
diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix
index aa983b1394b1a..933a3afef35b5 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ucl-1.03";
   src = fetchurl {
-    url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz;
+    url = https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz;
     sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348";
   };
 
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index 604a1b7012af3..1aa5e67170214 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version="0.9.12";
 
   src = fetchurl {
-    url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz";
+    url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz";
     sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix
index bec6f2d0f4bcb..46eac0fb88bbe 100644
--- a/pkgs/development/libraries/uri/default.nix
+++ b/pkgs/development/libraries/uri/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "C++ URI library";
-    homepage = http://cpp-netlib.org;
+    homepage = https://cpp-netlib.org;
     license = stdenv.lib.licenses.boost;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 515c3b2ca3b98..25ddfb3552418 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.1";
 
   src = fetchurl {
-    url = "http://spice-space.org/download/usbredir/${name}.tar.bz2";
+    url = "https://spice-space.org/download/usbredir/${name}.tar.bz2";
     sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0";
   };
 
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index 013af68cb6c47..07ca9d2e62e17 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "libva-vdpau-driver-0.7.4";
   
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2";
     sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
   };
 
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index e45337c8cf5de..7344f3a7e2bb2 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     (optionalString (!imwriSupport) "--disable-imwri")
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A video processing framework with the future in mind";
     homepage    = http://www.vapoursynth.com/;
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix
index ba6e437ca3c38..9e4ac7e22ca9d 100644
--- a/pkgs/development/libraries/vo-amrwbenc/default.nix
+++ b/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = "http://sourceforge.net/projects/opencore-amr/";
+    homepage = https://sourceforge.net/projects/opencore-amr/;
     description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
     license = "stdenv.lib.licenses.apache";
     maintainers = [ stdenv.lib.maintainers.Esteth ];
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
new file mode 100644
index 0000000000000..53faf07623e9b
--- /dev/null
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2
+, swig, glib, utillinux, cryptsetup, nss, gpgme
+}:
+
+let
+  version = "0.3.10";
+in stdenv.mkDerivation rec {
+  name = "volume_key-${version}";
+
+  src = fetchgit {
+    url = https://pagure.io/volume_key.git;
+    rev = "ece1ce305234da454e330905c615ec474d9781c5";
+    sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva";
+  };
+
+  outputs = [ "out" "man" "dev" ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ];
+
+  buildInputs = [ glib cryptsetup nss utillinux gpgme ];
+
+  patches = [
+    # Use pkg-config for locating Python.h
+    # https://pagure.io/volume_key/pull-request/12
+    (fetchpatch {
+      url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch;
+      sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr";
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool";
+    homepage = https://pagure.io/volume_key/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index bfb07c2df3376..e706c730ddd36 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.3.13";
 
   src = fetchurl {
-    url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz";
+    url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz";
     sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237";
   };
 
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
new file mode 100644
index 0000000000000..797c64729ecf8
--- /dev/null
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation rec {
+  name = "vulkan-headers-${version}";
+  version = "1.1.77.0";
+
+  buildInputs = [ cmake ];
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-Headers";
+    rev = "sdk-${version}";
+    sha256 = "1k01y5cj154mw7853w5xh135b2jp6k83kzwknw0dbs5adj4dx0kf";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Vulkan Header files and API registry";
+    homepage    = "http://www.lunarg.com";
+    platforms   = platforms.linux;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.ralith ];
+  };
+}
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index b9b18dc791035..4b84f696eec69 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,70 +1,36 @@
-{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
-  python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr,
-  libXext, wayland, libGL_driver, makeWrapper }:
+{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
+  x11, libxcb, libXrandr, libXext, wayland, libGL_driver }:
+let version = "1.1.77.0"; in
+assert version == vulkan-headers.version;
+stdenv.mkDerivation rec {
+  name = "vulkan-loader-${version}";
+  inherit version;
 
-let
-  version = "1.1.70.0";
   src = fetchFromGitHub {
     owner = "KhronosGroup";
-    repo = "Vulkan-LoaderAndValidationLayers";
+    repo = "Vulkan-Loader";
     rev = "sdk-${version}";
-    sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp";
+    sha256 = "1nzzkqh0i3j1d3h7kgmaxzi748l338m2p31lxkwxm4y81xp56a94";
   };
-in
-
-stdenv.mkDerivation rec {
-  name = "vulkan-loader-${version}";
-  inherit version src;
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
-  buildInputs = [ cmake git python3 python3Packages.lxml
-                  glslang x11 libxcb libXrandr libXext wayland
-                ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DBUILD_WSI_MIR_SUPPORT=OFF"
     "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share"
+    "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
   ];
 
-  outputs = [ "out" "dev" "demos" ];
-  patches = [ ./rev-file.patch ];
-
-  postUnpack = ''
-    # Hack so a version header can be generated. Relies on ./rev-file.patch to work.
-    mkdir -p "$sourceRoot/external/glslang/External"
-    echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools"
-  '';
-
-  preConfigure = ''
-    checkRev() {
-      [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1)
-    }
-    checkRev glslang "${glslang.src.rev}"
-  '';
+  outputs = [ "out" "dev" ];
 
-  installPhase = ''
-    mkdir -p $out/lib $out/bin
-    cp -d loader/libvulkan.so* $out/lib
-    cp demos/vulkaninfo $out/bin
-    mkdir -p $out/lib $out/share/vulkan/explicit_layer.d
-    cp -L layers/*.so $out/lib/
-    cp -L layers/*.json $out/share/vulkan/explicit_layer.d/
-    sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json
-    mkdir -p $dev/include
-    cp -rv ../include $dev/
-    mkdir -p $demos/share/vulkan-demos
-    cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos
-    mkdir -p $demos/bin
-    find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \;
-    for p in cube cubepp; do
-      wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos"
-    done
+  postInstall = ''
+    cp -r "${vulkan-headers}/include" "$dev"
   '';
 
   meta = with stdenv.lib; {
     description = "LunarG Vulkan loader";
-    homepage    = "http://www.lunarg.com";
+    homepage    = https://www.lunarg.com;
     platforms   = platforms.linux;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];
diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch
deleted file mode 100644
index e8f9f92c8ead6..0000000000000
--- a/pkgs/development/libraries/vulkan-loader/rev-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c9f73ce96..d14ffeed9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output)
- endmacro()
- 
- # Define macro used for generating header files containing commit IDs for external dependencies
--macro(run_external_revision_generate source_dir symbol_name output)
-+macro(run_external_revision_generate rev_file symbol_name output)
-     add_custom_command(OUTPUT ${output}
-     # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of
-     # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the
-     # subsequent line (to ensure that the script is re-run when the revision file is modified).
--    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output}
--    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index
-+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output}
-+    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file}
-     )
- endmacro()
- 
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
index 4c6d95e67c0f4..d832becbed88f 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.9.0";
 
   src = fetchurl {
-    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
     sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Reference implementation of the wayland protocol";
-    homepage    = http://wayland.freedesktop.org/;
+    homepage    = https://wayland.freedesktop.org/;
     license     = lib.licenses.mit;
     platforms   = lib.platforms.linux;
     maintainers = with lib.maintainers; [ codyopel wkennington ];
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index c1065b20e6b49..33bce4d6216fd 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.14";
 
   src = fetchurl {
-    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
     sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Wayland protocol extensions";
-    homepage    = http://wayland.freedesktop.org/;
+    homepage    = https://wayland.freedesktop.org/;
     license     = lib.licenses.mit;
     platforms   = lib.platforms.linux;
     maintainers = with lib.maintainers; [ ];
diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 8b25a20d8eb98..e234e3e66ad94 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -15,20 +15,20 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.20.2";
+  version = "2.20.3";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
     homepage = https://webkitgtk.org/;
     license = licenses.bsd2;
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.linux;
     hydraPlatforms = [];
     maintainers = with maintainers; [ ];
   };
 
   src = fetchurl {
-    url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1qi6nnj4qidzija1am9xscwjxwfqwhiy7x39ndriqgzh86i97znz";
+    url = "https://webkitgtk.org/releases/${name}.tar.xz";
+    sha256 = "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp";
   };
 
   patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 39a76a74711f3..1a17ae53313b5 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://webkitgtk.org/releases/${name}.tar.xz";
+    url = "https://webkitgtk.org/releases/${name}.tar.xz";
     sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
   };
 
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
index 529091518eb68..056ab8c513877 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "webrtc-audio-processing-0.3";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz";
+    url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz";
     sha256 = "1yl0187xjh1j2zkb7v9cs9i868zcaj23pzn4a36qhzam9wfjjvkm";
   };
 
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 47686451eee67..2b69f6283d602 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.15.0";
+  version = "3.15.3";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}-stable";
-    sha256 = "1jqhq0dl2zxks7dm6g3dm1zvrl646ab073kgg8ypv19nkd5cvbdv";
+    sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index 82b72a0fc7b34..59f6af7eddb21 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
   name = "wxSVG-${version}";
   srcName = "wxsvg-${version}";
-  version = "1.5.13";
+  version = "1.5.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
-    sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j";
+    sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 06ed123c73561..276f509772c2f 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "x264-${version}";
 
   src = fetchurl {
-    url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
+    url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
     sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z";
   };
 
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 482c765dcda93..5dd81af2b1afb 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -7,7 +7,7 @@ let
     passthru = { inherit version; };
 
     src = fetchurl {
-      url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+      url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 09c2171945e44..1203f19d6c82a 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   inherit (xapian) version;
 
   src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
+    url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
     sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr";
   };
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Indexer and CGI search front-end built on Xapian library";
-    homepage = http://xapian.org/;
+    homepage = https://xapian.org/;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index bbbf9af29e58e..fec4bbe8efe2b 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.7.3";
 
   src = fetchurl {
-    url = "http://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
+    url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
     sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
   };
 
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index e17ac6d150753..94f1d187267e5 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "xmlsec-${version}";
 
   src = fetchurl {
-    url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
+    url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
     sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld";
   };
 
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
index bef2e46e07369..051a194af98e4 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "4.0.0";
 
   src = fetchurl {
-    url = "http://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2";
+    url = "https://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2";
     sha256 = "05wqhmd5cd4pdky8i8qysnh96d2h16ly8r73whmbxkajiyf2m9gc";
   };
 
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index de2e0b62f9e24..b8537896d791f 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls =
-      [ "http://www.zlib.net/fossils/${name}.tar.gz"  # stable archive path
+      [ "https://www.zlib.net/fossils/${name}.tar.gz"  # stable archive path
         "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
       ];
     sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index 84020a5ac2d55..7da0fc148d42a 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -26,7 +26,7 @@ let
     };
 
     "2.8" = {
-      url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz";
+      url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz";
       x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356";
       x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681";
 
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 1323466ea865e..0f43705c0d424 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -23,7 +23,7 @@ let
     "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
-      gccVer = "4.8";
+      gccVer = "4.9";
     };
     "aarch64-unknown-linux-android" = {
       arch = "arm64";
@@ -58,13 +58,19 @@ rec {
   binutils = wrapBintoolsWith {
     bintools = binaries;
     libc = targetAndroidndkPkgs.libraries;
+    extraBuildCommands = ''
+      echo "--build-id" >> $out/nix-support/libc-ldflags
+    '';
   };
 
   gcc = wrapCCWith {
     cc = binaries;
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
-    extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
+    extraBuildCommands = ''
+      echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
+    ''
+    + lib.optionalString targetPlatform.isAarch32 (let
         p =  targetPlatform.platform.gcc or {}
           // targetPlatform.parsed.abi;
         flags = lib.concatLists [
@@ -110,7 +116,8 @@ rec {
       mkdir -p $out
       cp -r ${includePath} $out/include
       chmod +w $out/include
-      ${lib.optionalString (lib.versionOlder buildAndroidndk.version "10e") "ln -s $out/include/${targetInfo.triple}/asm $out/include/asm"}
+      ${lib.optionalString (lib.versionOlder "10e" buildAndroidndk.version)
+        "ln -s $out/include/${hostInfo.triple}/asm $out/include/asm"}
       ln -s ${libPath} $out/lib
     '';
 }
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 6a647192e0919..1e8ea65c73d9a 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper
+{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
 , platformTools, python3, libcxx, version, sha256
+, fullNDK ? false # set to true if you want other parts of the NDK
+                  # that is not used by Nixpkgs like sources,
+                  # examples, docs, or LLVM toolchains
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
 
   phases = "buildPhase";
 
-  nativeBuildInputs = [ p7zip makeWrapper file ];
+  nativeBuildInputs = [ unzip makeWrapper file ];
 
   buildCommand = let
     bin_path = "$out/bin";
@@ -32,11 +35,8 @@ stdenv.mkDerivation rec {
     ]) + ":${platformTools}/platform-tools";
   in ''
     mkdir -pv $out/libexec
-    mkdir -pv $out/lib64
-    ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
-    ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5
     cd $out/libexec
-    7z x $src
+    unzip -qq $src
 
     patchShebangs ${pkg_path}
 
@@ -58,11 +58,19 @@ stdenv.mkDerivation rec {
     }
     cd ${pkg_path}
 
-    find $out \( \
+  '' + lib.optionalString (!fullNDK) ''
+    # Steps to reduce output size
+    rm -rf docs sources tests
+    # We only support cross compiling with gcc for now
+    rm -rf toolchains/*-clang* toolchains/llvm*
+  '' +
+
+  ''
+    find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \;
+                          --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
     do
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 3b5da19da9e1d..3c12e16277d91 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchurl, zlib, ncurses, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
 , platformTools
+, fullNDK ? false # set to true if you want other parts of the NDK
+                  # that is not used by Nixpkgs like sources,
+                  # examples, docs, or LLVM toolchains
 }:
 
 stdenv.mkDerivation rec {
@@ -49,7 +52,14 @@ stdenv.mkDerivation rec {
         -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
     cd ${pkg_path}
 
-    find $out \( \
+  '' + lib.optionalString (!fullNDK) ''
+    # Steps to reduce output size
+    rm -rf docs sources tests
+    # We only support cross compiling with gcc for now
+    rm -rf toolchains/*-clang* toolchains/llvm-*
+
+  '' + ''
+    find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 699af16cf0411..8d9f87b6d0799 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
+{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper
 , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources
 , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib
 , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus
@@ -8,7 +8,15 @@
 { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false
 , useGooglePlayServices ? false, useInstantApps ? false }:
 
-let inherit (stdenv.lib) makeLibraryPath; in
+let inherit (stdenv.lib) makeLibraryPath;
+
+    googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6";
+      in fetchzip rec {
+        url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip";
+        sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx";
+      };
+
+in
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
@@ -16,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip";
+      url = "https://dl.google.com/android/repository/tools_r${version}-linux.zip";
       sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
@@ -168,6 +176,8 @@ stdenv.mkDerivation rec {
     ${stdenv.lib.optionalString useInstantApps
        "ln -s ${addons.instant_apps}/whsdk instantapps"}
 
+    ln -s ${googleRepository} m2repository
+
     cd ../..
 
     # Symlink required sources
diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix
new file mode 100644
index 0000000000000..d6a391463246e
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/build-gradle-app.nix
@@ -0,0 +1,108 @@
+{ stdenv, androidsdk, jdk, androidndk, gnumake, gawk, file
+, which, gradle, fetchurl, buildEnv, runCommand }:
+
+args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false
+     , useExtraSupportLibs ? false, useGooglePlayServices ? false
+     , release ? false, keyStore ? null, keyAlias ? null
+     , keyStorePassword ? null, keyAliasPassword ? null
+     , useNDK ? false, buildInputs ? [], mavenDeps, gradleTask
+     , buildDirectory ? "./.", acceptAndroidSdkLicenses ? false }:
+
+assert release -> keyStore != null;
+assert release -> keyAlias != null;
+assert release -> keyStorePassword != null;
+assert release -> keyAliasPassword != null;
+assert acceptAndroidSdkLicenses;
+
+let
+  inherit (stdenv.lib) optionalString;
+
+  m2install = { repo, version, artifactId, groupId
+              , jarSha256, pomSha256, aarSha256, suffix ? "" }:
+    let m2Name = "${artifactId}-${version}";
+        m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
+    in runCommand m2Name {} (''
+         mkdir -p $out/m2/${m2Path}
+       '' + optionalString (jarSha256 != null) ''
+         install -D ${fetchurl {
+                        url = "${repo}${m2Path}/${m2Name}${suffix}.jar";
+                        sha256 = jarSha256;
+                      }} $out/m2/${m2Path}/${m2Name}${suffix}.jar
+       '' + optionalString (pomSha256 != null) ''
+         install -D ${fetchurl {
+                        url = "${repo}${m2Path}/${m2Name}${suffix}.pom";
+                        sha256 = pomSha256;
+                      }} $out/m2/${m2Path}/${m2Name}${suffix}.pom
+       '' + optionalString (aarSha256 != null) ''
+         install -D ${fetchurl {
+                        url = "${repo}${m2Path}/${m2Name}${suffix}.aar";
+                        sha256 = aarSha256;
+                      }} $out/m2/${m2Path}/${m2Name}${suffix}.aar
+       '');
+
+  androidsdkComposition = androidsdk {
+    inherit platformVersions useGoogleAPIs
+            useExtraSupportLibs useGooglePlayServices;
+    abiVersions = [ "armeabi-v7a" ];
+  };
+in
+stdenv.mkDerivation ({
+  name = stdenv.lib.replaceChars [" "] [""] name;
+
+  ANDROID_HOME = "${androidsdkComposition}/libexec";
+  ANDROID_NDK_HOME = "${androidndk}/libexec/${androidndk.name}";
+
+  buildInputs = [ jdk gradle ] ++
+    stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ] ++
+      buildInputs;
+
+  DEPENDENCIES = buildEnv { name = "${name}-maven-deps";
+                            paths = map m2install mavenDeps;
+                          };
+
+  buildPhase = ''
+    ${optionalString release ''
+      # Provide key signing attributes
+      ( echo "RELEASE_STORE_FILE=${keyStore}"
+        echo "RELEASE_KEY_ALIAS=${keyAlias}"
+        echo "RELEASE_STORE_PASSWORD=${keyStorePassword}"
+        echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}"
+      ) >> gradle.properties
+    ''}
+    buildDir=`pwd`
+    cp -r $ANDROID_HOME $buildDir/local_sdk
+    chmod -R 755 local_sdk
+    export ANDROID_HOME=$buildDir/local_sdk
+    # Key files cannot be stored in the user's home directory. This
+    # overrides it.
+    export ANDROID_SDK_HOME=`pwd`
+
+    mkdir -p "$ANDROID_HOME/licenses"
+    echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+    echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+
+    export APP_HOME=`pwd`
+
+    mkdir -p .m2/repository
+    if [ -d "$DEPENDENCIES/m2" ] ; then
+      cp -RL "$DEPENDENCIES"/m2/* .m2/repository/
+    fi
+    chmod -R 755 .m2
+    mkdir -p .m2/repository/com/android/support
+    cp -RL local_sdk/extras/android/m2repository/com/android/support/* .m2/repository/com/android/support/
+    cp -RL local_sdk/extras/google/m2repository/* .m2/repository/
+    gradle ${gradleTask} --offline --no-daemon -g ./tmp -Dmaven.repo.local=`pwd`/.m2/repository
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv ${buildDirectory}/build/outputs/apk/*.apk $out
+
+    mkdir -p $out/nix-support
+    echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
+  '';
+
+  meta = {
+    license = stdenv.lib.licenses.unfree;
+  };
+} // builtins.removeAttrs args ["name" "mavenDeps"])
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 5846e4fb6de0a..7d7c92cd0f570 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -2,6 +2,8 @@
 , includeSources ? true
 }:
 
+# TODO: use callPackage instead of import to avoid so many inherits
+
 rec {
   platformTools = import ./platform-tools.nix {
     inherit buildPackages pkgs;
@@ -46,11 +48,16 @@ rec {
   };
 
   androidsdk = import ./androidsdk.nix {
-    inherit (pkgs) stdenv fetchurl unzip makeWrapper;
-    inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk libGLU_combined file alsaLib jdk coreutils libpulseaudio dbus;
-    inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig;
+    inherit (pkgs) stdenv fetchurl unzip makeWrapper zlib
+                   glxinfo freetype fontconfig glib gtk2 atk
+                   libGLU_combined file alsaLib jdk coreutils
+                   libpulseaudio dbus fetchzip;
+    inherit (pkgs.xorg) libX11 libXext libXrender
+                        libxcb libXau libXdmcp libXtst xkeyboardconfig;
 
-    inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources;
+    inherit platformTools buildTools support
+            supportRepository platforms sysimages
+            addons sources includeSources;
 
     stdenv_32bit = pkgs_i686.stdenv;
   };
@@ -215,9 +222,11 @@ rec {
     useInstantApps = true;
   };
 
-  androidndk_10e = import ./androidndk.nix {
+  androidsdk_latest = androidsdk_8_0;
+
+  androidndk_10e = pkgs.callPackage ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+      unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -226,9 +235,9 @@ rec {
     sha256 = "032j3sgk93bjbkny84i17ph61dhjmsax9ddqng1zbi2p7dgl0pzf";
   };
 
-  androidndk_16b = import ./androidndk.nix {
+  androidndk_16b = pkgs.callPackage ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+       unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -237,9 +246,9 @@ rec {
     sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
   };
 
-  androidndk = import ./androidndk.nix {
+  androidndk_17 = pkgs.callPackage ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+      unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -247,6 +256,7 @@ rec {
     version = "17";
     sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds";
   };
+  androidndk = androidndk_17;
 
   androidndk_r8e = import ./androidndk_r8e.nix {
     inherit (buildPackages)
@@ -267,7 +277,7 @@ rec {
     inherit androidsdk;
   };
 
-  androidndkPkgs = import ./androidndk-pkgs.nix {
+  androidndkPkgs_17 = import ./androidndk-pkgs.nix {
     inherit (buildPackages)
       makeWrapper;
     inherit (pkgs)
@@ -277,10 +287,11 @@ rec {
     # but for splicing messing up on infinite recursion for the variants we
     # *dont't* use. Using this workaround, but also making a test to ensure
     # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk;
-    inherit androidndk;
-    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17;
+    androidndk = androidndk_17;
+    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17;
   };
+  androidndkPkgs = androidndkPkgs_17;
 
   androidndkPkgs_10e = import ./androidndk-pkgs.nix {
     inherit (buildPackages)
@@ -296,4 +307,10 @@ rec {
     androidndk = androidndk_10e;
     targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e;
   };
+
+  buildGradleApp = import ./build-gradle-app.nix {
+    inherit (pkgs) stdenv jdk gnumake gawk file runCommand
+                   which gradle fetchurl buildEnv;
+    inherit androidsdk androidndk;
+  };
 }
diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
new file mode 100644
index 0000000000000..9f723a6da4707
--- /dev/null
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+
+let
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages-v10.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 2252bab3a793e..ce42bfa7ba3de 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix
index 96266105942d3..7ca3e6b925a2d 100644
--- a/pkgs/development/node-packages/composition-v8.nix
+++ b/pkgs/development/node-packages/composition-v8.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
new file mode 100644
index 0000000000000..d7df19066bb33
--- /dev/null
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -0,0 +1,24 @@
+{pkgs, system, nodejs, stdenv}:
+
+let
+  nodePackages = import ./composition-v10.nix {
+    inherit pkgs system nodejs;
+  };
+in
+nodePackages // {
+
+  pnpm = nodePackages.pnpm.override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    postInstall = let
+      pnpmLibPath = stdenv.lib.makeBinPath [
+        nodejs.passthru.python
+        nodejs
+      ];
+    in ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
+      done
+    '';
+  };
+
+}
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 97f759ef0cbe8..6b508b6f0cce0 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -6,27 +6,27 @@ let
   };
 in
 nodePackages // {
-  dat = nodePackages.dat.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-  });
+  dat = nodePackages.dat.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
 
-  dnschain =  nodePackages.dnschain.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
+  dnschain = nodePackages.dnschain.override {
+    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
     postInstall = ''
       wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
     '';
-  });
+  };
 
-  node-inspector = nodePackages.node-inspector.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
-  });
+  node-inspector = nodePackages.node-inspector.override {
+    buildInputs = [ nodePackages.node-pre-gyp ];
+  };
 
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+  phantomjs = nodePackages.phantomjs.override {
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
+  webdrvr = nodePackages.webdrvr.override {
+    buildInputs = [ pkgs.phantomjs ];
 
     preRebuild = ''
       mkdir $TMPDIR/webdrvr
@@ -42,42 +42,42 @@ nodePackages // {
     '';
 
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
-  });
+  };
 
   npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
     postInstall = "npm run-script prepublish";
   };
 
-  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  bower2nix = nodePackages.bower2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
       for prog in bower2nix fetch-bower; do
         wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
-  });
+  };
 
-  ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
+  ios-deploy = nodePackages.ios-deploy.override {
     preRebuild = ''
       LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
     '';
-  });
+  };
 
-  fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
+  fast-cli = nodePackages."fast-cli-1.x".override {
     preRebuild = ''
       # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
       sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
     '';
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 
-  node2nix =  nodePackages.node2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  node2nix =  nodePackages.node2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
       wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
     '';
-  });
+  };
 }
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index eb87f13f56d33..561f43271ffc8 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -6,27 +6,27 @@ let
   };
 in
 nodePackages // {
-  dat = nodePackages.dat.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-  });
+  dat = nodePackages.dat.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
 
-  dnschain =  nodePackages.dnschain.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
+  dnschain =  nodePackages.dnschain.override {
+    buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
     postInstall = ''
       wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
     '';
-  });
+  };
 
-  node-inspector = nodePackages.node-inspector.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
-  });
+  node-inspector = nodePackages.node-inspector.override {
+    buildInputs = [ nodePackages.node-pre-gyp ];
+  };
 
-  phantomjs = nodePackages.phantomjs.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+  phantomjs = nodePackages.phantomjs.override {
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 
-  webdrvr = nodePackages.webdrvr.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
+  webdrvr = nodePackages.webdrvr.override {
+    buildInputs = [ pkgs.phantomjs ];
 
     preRebuild = ''
       mkdir $TMPDIR/webdrvr
@@ -42,32 +42,32 @@ nodePackages // {
     '';
 
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
-  });
+  };
 
   npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
     postInstall = "npm run-script prepublish";
   };
 
-  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  bower2nix = nodePackages.bower2nix.override {
+    buildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
       for prog in bower2nix fetch-bower; do
         wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
       done
     '';
-  });
+  };
 
-  ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
+  ios-deploy = nodePackages.ios-deploy.override {
     preRebuild = ''
       LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
     '';
-  });
+  };
 
-  pnpm = nodePackages.pnpm.override (oldAttrs: {
-    nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+  pnpm = nodePackages.pnpm.override {
+    nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = let
       pnpmLibPath = stdenv.lib.makeBinPath [
         nodejs.passthru.python
@@ -78,13 +78,13 @@ nodePackages // {
         wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
       done
     '';
-  });
+  };
 
-  fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
+  fast-cli = nodePackages."fast-cli-1.x".override {
     preRebuild = ''
       # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
       sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
     '';
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
-  });
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
 }
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index c3aa741ef8064..b34b024f6a2dc 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -4,3 +4,4 @@
 rm -f node-env.nix
 node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
 node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix
+node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index fc118a788ea7f..720e0cc08503c 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -27,7 +27,7 @@ let
       buildInputs = [ nodejs ];
       buildPhase = ''
         export HOME=$TMPDIR
-        tgzFile=$(npm pack)
+        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
       '';
       installPhase = ''
         mkdir -p $out/tarballs
@@ -309,31 +309,42 @@ let
   };
 
   # Builds and composes an NPM package including all its dependencies
-  buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args:
+  buildNodePackage =
+    { name
+    , packageName
+    , version
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , preRebuild ? ""
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
 
     let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
     in
-    stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
+    stdenv.mkDerivation ({
       name = "node-${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
         ++ stdenv.lib.optional (stdenv.isLinux) utillinux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-        ++ args.buildInputs or [];
-      dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
+        ++ buildInputs;
 
-      inherit dontNpmInstall preRebuild;
-
-      unpackPhase = args.unpackPhase or "true";
-
-      buildPhase = args.buildPhase or "true";
+      inherit dontStrip; # Stripping may fail a build for some package deployments
+      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
 
       compositionScript = composePackage args;
       pinpointDependenciesScript = pinpointDependenciesOfPackage args;
 
       passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
 
-      installPhase = args.installPhase or ''
+      installPhase = ''
         # Create and enter a root node_modules/ folder
         mkdir -p $out/lib/node_modules
         cd $out/lib/node_modules
@@ -406,27 +417,47 @@ let
         # Run post install hook, if provided
         runHook postInstall
       '';
-    });
+    } // extraArgs);
 
   # Builds a development shell
-  buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args:
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
     let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
 
-      nodeDependencies = stdenv.mkDerivation {
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+      nodeDependencies = stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
           ++ stdenv.lib.optional (stdenv.isLinux) utillinux
           ++ stdenv.lib.optional (stdenv.isDarwin) libtool
-          ++ args.buildInputs or [];
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
 
         includeScript = includeDependencies { inherit dependencies; };
         pinpointDependenciesScript = pinpointDependenciesOfPackage args;
 
         passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
 
-        buildCommand = ''
+        installPhase = ''
           mkdir -p $out/${packageName}
           cd $out/${packageName}
 
@@ -438,13 +469,15 @@ let
           ${stdenv.lib.optionalString bypassCache ''
             if [ -f ${src}/package-lock.json ]
             then
-              cp ${src}/package-lock.json .
+                cp ${src}/package-lock.json .
             fi
           ''}
 
           # Pinpoint the versions of all dependencies to the ones that are actually being used
           echo "pinpointing versions of dependencies..."
           cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
           source $pinpointDependenciesScriptPath
           cd ${packageName}
 
@@ -474,15 +507,17 @@ let
           ''}
 
           cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
           mv ${packageName} lib
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
-      };
+      } // extraArgs);
     in
-    stdenv.lib.makeOverridable stdenv.mkDerivation {
+    stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -500,4 +535,8 @@ let
       '';
     };
 in
-{ inherit buildNodeSourceDist buildNodePackage buildNodeShell; }
+{
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+}
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
new file mode 100644
index 0000000000000..50cc105e7fff6
--- /dev/null
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -0,0 +1,6 @@
+[
+  "bower"
+, "coffee-script"
+, "grunt-cli"
+, "pnpm"
+]
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
new file mode 100644
index 0000000000000..30b63e5ca4dae
--- /dev/null
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -0,0 +1,230 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "findup-sync-0.3.0" = {
+      name = "findup-sync";
+      packageName = "findup-sync";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz";
+        sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16";
+      };
+    };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
+    "grunt-known-options-1.1.0" = {
+      name = "grunt-known-options";
+      packageName = "grunt-known-options";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz";
+        sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "nopt-3.0.6" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+  };
+in
+{
+  bower = nodeEnv.buildNodePackage {
+    name = "bower";
+    packageName = "bower";
+    version = "1.8.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+      sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The browser package manager";
+      homepage = http://bower.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  coffee-script = nodeEnv.buildNodePackage {
+    name = "coffee-script";
+    packageName = "coffee-script";
+    version = "1.12.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+      sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Unfancy JavaScript";
+      homepage = http://coffeescript.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  grunt-cli = nodeEnv.buildNodePackage {
+    name = "grunt-cli";
+    packageName = "grunt-cli";
+    version = "1.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz";
+      sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      sources."findup-sync-0.3.0"
+      sources."glob-5.0.15"
+      sources."grunt-known-options-1.1.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."nopt-3.0.6"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."resolve-1.1.7"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The grunt command line interface";
+      homepage = "https://github.com/gruntjs/grunt-cli#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  pnpm = nodeEnv.buildNodePackage {
+    name = "pnpm";
+    packageName = "pnpm";
+    version = "2.9.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz";
+      sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Fast, disk space efficient package manager";
+      homepage = https://pnpm.js.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 33dbc22123a64..c1c181a3d390f 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -54,12 +54,13 @@
 , "js-yaml"
 , "karma"
 , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
+, "lcov-result-merger"
+, "leetcode-cli"
 , "lerna"
 , "less"
 , "less-plugin-clean-css"
-, "lcov-result-merger"
-, "livedown"
 , "live-server"
+, "livedown"
 , "meat"
 , "meguca"
 , "mocha"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index c49638910a4eb..e183feb99720b 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -10,7 +10,7 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@cliqz-oss/firefox-client/-/firefox-client-0.3.1.tgz";
-        sha512 = "0mzrszrx3b26v168dxy14mafp9dnczzl10yrdg203q46xcasi6a668yg2zf3nlzmf4klylfkbca3b3amd0646barp0nkh1zkfi97vs4";
+        sha512 = "RO+Tops/wGnBzWoZYkCraqyh2JqOejqJq5/a4b54HhmjTNSKdUPwAOK17EGg/zPb0nWqkuB7QyZsI9bo+ev8Kw==";
       };
     };
     "@cliqz-oss/node-firefox-connect-1.2.1" = {
@@ -19,16 +19,16 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@cliqz-oss/node-firefox-connect/-/node-firefox-connect-1.2.1.tgz";
-        sha512 = "2f8l9alm034f4mrp2shf3pgcvm1m9lvbw2n5jpjnnmk6mn36qmwz4hjnrky279z4wnphgr2wv1vksn57w6ncl3cfr13nzv93s435wiv";
+        sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
       };
     };
-    "@gulp-sourcemaps/identity-map-1.0.1" = {
+    "@gulp-sourcemaps/identity-map-1.0.2" = {
       name = "_at_gulp-sourcemaps_slash_identity-map";
       packageName = "@gulp-sourcemaps/identity-map";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz";
-        sha1 = "cfa23bc5840f9104ce32a65e74db7e7a974bbee1";
+        url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz";
+        sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==";
       };
     };
     "@gulp-sourcemaps/map-sources-1.0.0" = {
@@ -46,7 +46,7 @@ let
       version = "0.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.3.tgz";
-        sha512 = "0l4lpl9477wf6i2xzqqqv5lmrmnyf82n0rbww6ynaszyb6cl38m2dpbz4xv0ksy5mayjyfkq6nj7mjzh4cvak12zfwp4cgrrai6ybkg";
+        sha512 = "by5vosr5MXK5+yJMtRmBX9YjrcHTeelVLV5PsDv56zZR0aDMLP+1st5wvjKwAjlva660bIzx7yIax88hiV5KKA==";
       };
     };
     "@ionic/cli-utils-1.19.2" = {
@@ -55,7 +55,7 @@ let
       version = "1.19.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.2.tgz";
-        sha512 = "10fl86bf0p911b7w0dnz2q3b8092c50h6x8kf79lwg8bg3jnmnmvz0i868xhf7qnawyaikhqdf5nifpb42f9jr3x0mxgmp4ppdwadlx";
+        sha512 = "nTbF273k1tcr6CPL5ARZ10VbXMNwRuW5svg42JFBEfxdbbVyvIUep+m4ibqBoDCRAFoDi28b4GeFkC5wyyDqQA==";
       };
     };
     "@ionic/discover-0.4.0" = {
@@ -64,7 +64,7 @@ let
       version = "0.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz";
-        sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad";
+        sha512 = "TYls2aGguED/lFLRYP09Q275yQuVJ4PnN1K1lxq3bG3gFP99Txn4UZRaVuYGeezH1A3y2rbdBHjRZBMiUnVvOg==";
       };
     };
     "@mrmlnc/readdir-enhanced-2.2.1" = {
@@ -73,16 +73,16 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz";
-        sha512 = "3g9wzm6hszqh30x6hmwc9l4vw51c6a224cp2y9qzlj98vzbwbc4s7lfafi67v8401qagjsdxrndnnannzz6i71krmn8svxwk3lfkwbc";
+        sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
       };
     };
-    "@nodelib/fs.stat-1.0.2" = {
+    "@nodelib/fs.stat-1.1.0" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz";
-        sha512 = "37szl49qa9zv4jp9axp95i84m3iiqlip6lnkjc30rd7m8yzvcnlxkl7n1hqkwaq2nx8w560ldb01xhdz8cys7gmbqkdlwa3jbpmyamw";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz";
+        sha512 = "LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==";
       };
     };
     "@sindresorhus/is-0.7.0" = {
@@ -91,232 +91,214 @@ let
       version = "0.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz";
-        sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q";
+        sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
-    "@types/babel-types-7.0.2" = {
+    "@types/babel-types-7.0.4" = {
       name = "_at_types_slash_babel-types";
       packageName = "@types/babel-types";
-      version = "7.0.2";
+      version = "7.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.2.tgz";
-        sha512 = "0g0dnxwqc9x4x2y8230sdb056c0af5z3rx9ynfkw2cqsygx2kg2jk7nfn14m32fkcc62dccymw805d2bs15dqsdkbx19hzhq2xj0n6a";
+        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz";
+        sha512 = "WiZhq3SVJHFRgRYLXvpf65XnV6ipVHhnNaNvE8yCimejrGglkg38kEj0JcizqwSHxmPSjcTlig/6JouxLGEhGw==";
       };
     };
-    "@types/babylon-6.16.2" = {
+    "@types/babylon-6.16.3" = {
       name = "_at_types_slash_babylon";
       packageName = "@types/babylon";
-      version = "6.16.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz";
-        sha512 = "3nps6llkag9z58iv9mkg13c2b35ba57z1dmis7900x1dkd09svfn0haxwcgsp4v9xmnqb95v40h3ki4w3xnv68cajsnfscgm7ip56zq";
-      };
-    };
-    "@types/caseless-0.12.1" = {
-      name = "_at_types_slash_caseless";
-      packageName = "@types/caseless";
-      version = "0.12.1";
+      version = "6.16.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz";
-        sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n";
+        url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.3.tgz";
+        sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug==";
       };
     };
-    "@types/form-data-2.2.1" = {
-      name = "_at_types_slash_form-data";
-      packageName = "@types/form-data";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz";
-        sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4";
-      };
-    };
-    "@types/node-10.1.1" = {
+    "@types/node-10.5.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.1.1";
+      version = "10.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.1.1.tgz";
-        sha512 = "35nbbgd4qp35g3nfbrsc9ndmigc9gl31xdjhx0fakfms35c6jqxpdx7m9c3pi0h3b062p31al5vas36facjhs1nmxf3bdpnrb5k3g4z";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz";
+        sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==";
       };
     };
-    "@types/node-8.10.16" = {
+    "@types/node-8.10.20" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.16.tgz";
-        sha512 = "2plzhji5iq482aa7kscxvsxrwscvrlrg9mxkx02nbslq31q178qki4ghi27z2lagmmzcvgm9r7ligx20bky617zx828yjap4ribnlia";
-      };
-    };
-    "@types/node-9.6.17" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "9.6.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.17.tgz";
-        sha512 = "3czvpaxsivpv403rqgf4865q4nv81x0y1030r3xj697ik1hp65xdrqqpxvaafbwbf29gszsi2zxag68pblgi22mc1cmbg6yjm14xyib";
-      };
-    };
-    "@types/request-2.47.0" = {
-      name = "_at_types_slash_request";
-      packageName = "@types/request";
-      version = "2.47.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz";
-        sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw";
-      };
-    };
-    "@types/tough-cookie-2.3.3" = {
-      name = "_at_types_slash_tough-cookie";
-      packageName = "@types/tough-cookie";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz";
-        sha512 = "1hpxnn86rnm17kxbwp8r3ymx3qqmvq6vhswndr12cahvbarmm27mj2jj2r0pm0w9wvq9ixm55whl8q029ir29c59cmanbais720nd1h";
-      };
-    };
-    "@types/uuid-3.4.3" = {
-      name = "_at_types_slash_uuid";
-      packageName = "@types/uuid";
-      version = "3.4.3";
+      version = "8.10.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz";
-        sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz";
+        sha512 = "M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==";
       };
     };
-    "@webassemblyjs/ast-1.4.3" = {
+    "@webassemblyjs/ast-1.5.12" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz";
-        sha512 = "3spjwi3cp2y297lils8dyh4277ijwg40ak6033w18yb8rffrhwm81h1ikcq407pl83kymmwb348298bpnkb1rfrggc70k6w2difkaab";
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz";
+        sha512 = "bmTBEKuuhSU6dC95QIW250xO769cdYGx9rWn3uBLTw2pUpud0Z5kVuMw9m9fqbNzGeuOU2HpyuZa+yUt2CTEDA==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.4.3" = {
+    "@webassemblyjs/floating-point-hex-parser-1.5.12" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz";
-        sha512 = "13vsay3gcir9hbx3kznsymnw558as2mrvy8gfymy5wq4k76qwzrkfclxgk5wim8p4f56acyjj61pbin9vzr1wvr6j7r7h9hbd4f8d6z";
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz";
+        sha512 = "epTvkdwOIPpTE9edHS+V+shetYzpTbd91XOzUli1zAS0+NSgSe6ZsNggIqUNzhma1s4bN2f/m8c6B1NMdCERAg==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.4.3" = {
+    "@webassemblyjs/helper-api-error-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-api-error";
+      packageName = "@webassemblyjs/helper-api-error";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz";
+        sha512 = "Goxag86JvLq8ucHLXFNSLYzf9wrR+CJr37DsESTAzSnGoqDTgw5eqiXSQVd/D9Biih7+DIn8UIQCxMs8emRRwg==";
+      };
+    };
+    "@webassemblyjs/helper-buffer-1.5.12" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz";
-        sha512 = "29i4iwxw7bdqp5jpdvq7x2yvsiihzvhxngq7dcx8h29n3qxbpx5gb7bnpkfrf1wdipnyn3786r5ghfnjgdlc4psa865yibyg1j8mkvv";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz";
+        sha512 = "tJNUjttL5CxiiS/KLxT4/Zk0Nbl/poFhztFxktb46zoQEUWaGHR9ZJ0SnvE7DbFX5PY5JNJDMZ0Li4lm246fWw==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.4.3" = {
+    "@webassemblyjs/helper-code-frame-1.5.12" = {
       name = "_at_webassemblyjs_slash_helper-code-frame";
       packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz";
-        sha512 = "3rlq4pj6pnf5j1xhdpd2i6b8ajsgdv5hkmlzahr45yv4p6f6rlsi04ns0kcq3qprlmsim99qkisa660xk4bd0mi58d0crbcsc90fn7l";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz";
+        sha512 = "0FrJgiST+MQDMvPigzs+UIk1vslLIqGadkEWdn53Lr0NsUC2JbheG9QaO3Zf6ycK2JwsHiUpGaMFcHYXStTPMA==";
       };
     };
-    "@webassemblyjs/helper-fsm-1.4.3" = {
+    "@webassemblyjs/helper-fsm-1.5.12" = {
       name = "_at_webassemblyjs_slash_helper-fsm";
       packageName = "@webassemblyjs/helper-fsm";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz";
-        sha512 = "04nq8mpmb966xss2qhg9rzp046awfhx20kp8p6qp27fnhv65krbay68sfs5j7gp3r4ry7xd153znkdp1vlkxppy8n44vvrylppmi0r4";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz";
+        sha512 = "QBHZ45VPUJ7UyYKvUFoaxrSS9H5hbkC9U7tdWgFHmnTMutkXSEgDg2gZg3I/QTsiKOCIwx4qJUJwPd7J4D5CNQ==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.4.3" = {
+    "@webassemblyjs/helper-module-context-1.5.12" = {
+      name = "_at_webassemblyjs_slash_helper-module-context";
+      packageName = "@webassemblyjs/helper-module-context";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz";
+        sha512 = "SCXR8hPI4JOG3cdy9HAO8W5/VQ68YXG/Hfs7qDf1cd64zWuMNshyEour5NYnLMVkrrtc0XzfVS/MdeV94woFHA==";
+      };
+    };
+    "@webassemblyjs/helper-wasm-bytecode-1.5.12" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz";
-        sha512 = "1wm9mkc0qy5srk9q78842pl0vkn9nvwlh6bci2615vbyw625dnrry390i60w4h53fkbdfp9jj550ggvdw9algcg48xsvl4ffvwd5di3";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz";
+        sha512 = "0Gz5lQcyvElNVbOTKwjEmIxGwdWf+zpAW/WGzGo95B7IgMEzyyfZU+PrGHDwiSH9c0knol9G7smQnY0ljrSA6g==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.4.3" = {
+    "@webassemblyjs/helper-wasm-section-1.5.12" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz";
-        sha512 = "34nmg0qsq0wn6m9r9zjh3jpb0qwr4g7a234x0ws78q4n9dvv1q5ynp2c3ygqnmc1gixy99g6w87l92xf5zjbrr87zsbvnp1xxw9wk57";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz";
+        sha512 = "ge/CKVKBGpiJhFN9PIOQ7sPtGYJhxm/mW1Y3SpG1L6XBunfRz0YnLjW3TmhcOEFozIVyODPS1HZ9f7VR3GBGow==";
       };
     };
-    "@webassemblyjs/leb128-1.4.3" = {
+    "@webassemblyjs/ieee754-1.5.12" = {
+      name = "_at_webassemblyjs_slash_ieee754";
+      packageName = "@webassemblyjs/ieee754";
+      version = "1.5.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz";
+        sha512 = "F+PEv9QBzPi1ThLBouUJbuxhEr+Sy/oua1ftXFKHiaYYS5Z9tKPvK/hgCxlSdq+RY4MSG15jU2JYb/K5pkoybg==";
+      };
+    };
+    "@webassemblyjs/leb128-1.5.12" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz";
-        sha512 = "0lzzzxr5rk3qqg3ik3hm7yw0lgcvx334g75aphf2l3rsf8pxwycak36v5xsqkavvb4acmh5lddgx2c5sg5al7bwb11y9klgnhj0pvg2";
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz";
+        sha512 = "cCOx/LVGiWyCwVrVlvGmTdnwHzIP4+zflLjGkZxWpYCpdNax9krVIJh1Pm7O86Ox/c5PrJpbvZU1cZLxndlPEw==";
       };
     };
-    "@webassemblyjs/validation-1.4.3" = {
-      name = "_at_webassemblyjs_slash_validation";
-      packageName = "@webassemblyjs/validation";
-      version = "1.4.3";
+    "@webassemblyjs/utf8-1.5.12" = {
+      name = "_at_webassemblyjs_slash_utf8";
+      packageName = "@webassemblyjs/utf8";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz";
-        sha512 = "02y4zsfg7y963d4i63g51xackih6zvs8szy2qlki5xmkfq2ywl97dwbds4wycw6pjwhwivzd4ilmlq37larmxmqsamdjxz1lwqd3sj7";
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz";
+        sha512 = "FX8NYQMiTRU0TfK/tJVntsi9IEKsedSsna8qtsndWVE0x3zLndugiApxdNMIOoElBV9o4j0BUqR+iwU58QfPxQ==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.4.3" = {
+    "@webassemblyjs/wasm-edit-1.5.12" = {
       name = "_at_webassemblyjs_slash_wasm-edit";
       packageName = "@webassemblyjs/wasm-edit";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz";
-        sha512 = "2knsyvscajz7vi6pm96i1azjxc3d574hwbninxgr5w6lyw3pslnxv41piv565kjdn5g6qqyh0jk6jjbvi2sm9dqzixgbm7vgr9b0fxb";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz";
+        sha512 = "r/oZAyC4EZl0ToOYJgvj+b0X6gVEKQMLT34pNNbtvWBehQOnaSXvVUA5FIYlH8ubWjFNAFqYaVGgQTjR1yuJdQ==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.4.3" = {
+    "@webassemblyjs/wasm-gen-1.5.12" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz";
-        sha512 = "1lxp49ldr0dwh3ksan4vadvdrsx9sx92wz63h8qpg096x7k3hp777kk33cbzsg6258rgp7saabz2aqmd6ggvm4y5klrf78x7zhzs7br";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz";
+        sha512 = "LTu+cr1YRxGGiVIXWhei/35lXXEwTnQU18x4V/gE+qCSJN21QcVTMjJuasTUh8WtmBZtOlqJbOQIeN7fGnHWhg==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.4.3" = {
+    "@webassemblyjs/wasm-opt-1.5.12" = {
       name = "_at_webassemblyjs_slash_wasm-opt";
       packageName = "@webassemblyjs/wasm-opt";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz";
-        sha512 = "0mpd5ig3h708hb5ixdnjlwikbr71va6awfp1gfmff33g7a1g35avv6b4s0ibhl9qdbq32pi8s02ngazg1mcdx82p21sif11qyg7wspc";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz";
+        sha512 = "LBwG5KPA9u/uigZVyTsDpS3CVxx3AePCnTItVL+OPkRCp5LqmLsOp4a3/c5CQE0Lecm0Ss9hjUTDcbYFZkXlfQ==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.4.3" = {
+    "@webassemblyjs/wasm-parser-1.5.12" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz";
-        sha512 = "130bg13n9f63ihivbad61yw96k908g12ykw7mr8dhxswsck6rp1rbk9rr2dmgarxqd3v0jw605r4pqqpmq5iwhzj5p1bp00bjv66w19";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz";
+        sha512 = "xset3+1AtoFYEfMg30nzCGBnhKmTBzbIKvMyLhqJT06TvYV+kA884AOUpUvhSmP6XPF3G+HVZPm/PbCGxH4/VQ==";
       };
     };
-    "@webassemblyjs/wast-parser-1.4.3" = {
+    "@webassemblyjs/wast-parser-1.5.12" = {
       name = "_at_webassemblyjs_slash_wast-parser";
       packageName = "@webassemblyjs/wast-parser";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz";
-        sha512 = "3an2lfdbzn0y8c87qzdfwny0q5di5sr36pkxisp6jq3qdb9bbcbd91nqyqyadz8gxv3zrky8qsl4a8fs0ycjn2429n2ml4m791sq422";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz";
+        sha512 = "QWUtzhvfY7Ue9GlJ3HeOB6w5g9vNYUUnG+Y96TWPkFHJTxZlcvGfNrUoACCw6eDb9gKaHrjt77aPq41a7y8svg==";
       };
     };
-    "@webassemblyjs/wast-printer-1.4.3" = {
+    "@webassemblyjs/wast-printer-1.5.12" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
-      version = "1.4.3";
+      version = "1.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz";
-        sha512 = "2v460znblyp8svk9nm0k52kvhmgsk2cr6yw0cjgh9r22db3id8dd0inn2xgkbxvcrpi0hn4zbcz75nb58zshv4jp6k35wnzm7hy818j";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz";
+        sha512 = "XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA==";
+      };
+    };
+    "@zeit/schemas-1.2.0" = {
+      name = "_at_zeit_slash_schemas";
+      packageName = "@zeit/schemas";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.2.0.tgz";
+        sha512 = "iceEQm4zFjgAVUPAj8Wto62xUJxOxicXULWFD2q9Z2Rwi1pVnz1QlDMfNTuNZUULmV7/0xFpOthf8JK8xpTYZA==";
       };
     };
     "CSSselect-0.4.1" = {
@@ -364,13 +346,13 @@ let
         sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
       };
     };
-    "JSONStream-1.3.2" = {
+    "JSONStream-1.3.3" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz";
-        sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz";
+        sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==";
       };
     };
     "JSV-4.0.2" = {
@@ -382,6 +364,15 @@ let
         sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
       };
     };
+    "abab-1.0.4" = {
+      name = "abab";
+      packageName = "abab";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz";
+        sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e";
+      };
+    };
     "abbrev-1.0.9" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -397,7 +388,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
     "absolute-0.0.1" = {
@@ -460,7 +451,7 @@ let
       version = "0.28.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz";
-        sha512 = "22hbsgv0xpwylgn199fwqlwk5fffavi922x37zj1kbl1psx2ysyf67kqcgb0q9gk33rjkaxml813k170yf7z2mw9a10cyl71bi7gwdh";
+        sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ==";
       };
     };
     "acorn-1.2.2" = {
@@ -499,13 +490,13 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.5.3" = {
+    "acorn-5.7.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.5.3";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz";
-        sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
+        sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
       };
     };
     "acorn-dynamic-import-3.0.0" = {
@@ -514,7 +505,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz";
-        sha512 = "1d15axgran5kql29v8hk39yifs5zcg7rkffakv4nd3k49jpbzxh030nbsh9q31gnw8n3rfmwpmsq7rq9k9sk2p2l14wk2i5kzqramfd";
+        sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==";
       };
     };
     "acorn-globals-1.0.9" = {
@@ -544,13 +535,22 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "acorn-node-1.3.0" = {
+    "acorn-jsx-4.1.1" = {
+      name = "acorn-jsx";
+      packageName = "acorn-jsx";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz";
+        sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==";
+      };
+    };
+    "acorn-node-1.5.2" = {
       name = "acorn-node";
       packageName = "acorn-node";
-      version = "1.3.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz";
-        sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr";
+        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz";
+        sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==";
       };
     };
     "active-x-obfuscator-0.0.1" = {
@@ -562,15 +562,6 @@ let
         sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
       };
     };
-    "adal-node-0.1.21" = {
-      name = "adal-node";
-      packageName = "adal-node";
-      version = "0.1.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz";
-        sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8";
-      };
-    };
     "adal-node-0.1.28" = {
       name = "adal-node";
       packageName = "adal-node";
@@ -586,7 +577,7 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/adbkit/-/adbkit-2.11.0.tgz";
-        sha512 = "1yf29dq993f047nmbm3yv9qsla7z3s9xn61jh43lzlgbpcxw36p2jn1ahv53i8ik69fkb5l7mqi6r1xm6qfzagz0jm2i64r8y2d8swg";
+        sha512 = "j2vUhEeZmCiqBP+p77CpPWQTcT20rOmSmRHFUTZUwUpxzeCd3fXop4NAGYztSY9/FNU4bT/qqvYQ4EZKuCXhfA==";
       };
     };
     "adbkit-logcat-1.1.0" = {
@@ -616,13 +607,13 @@ let
         sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa";
       };
     };
-    "addons-linter-0.41.0" = {
+    "addons-linter-1.0.0" = {
       name = "addons-linter";
       packageName = "addons-linter";
-      version = "0.41.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.41.0.tgz";
-        sha512 = "1cdq1s3zaz5547yn12h23434f3g6jjchrjdwv7x0qbg38zilaix5x04ajy87pw94rs1mk6kkawa517whzjn0jd7kpx6nac75qw7rcwf";
+        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.0.0.tgz";
+        sha512 = "6cC0Jcf0vMVgE86TV4A1lfjx78Fp0JltA1UH2icz/cALWMMfDZrD7YpB4dMrpobclsbKFPHexNOYhS4efAc5ng==";
       };
     };
     "addr-to-ip-port-1.4.3" = {
@@ -631,16 +622,7 @@ let
       version = "1.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.3.tgz";
-        sha512 = "0cjsq4lq001pd9nr0j7lc41vxyrf0x9qpaq8d8989n1grjzzbv8vjdq9l607ab8pgfh1qkx0vhgva4wsnfndkb2c955f04jq8dx78gq";
-      };
-    };
-    "address-1.0.3" = {
-      name = "address";
-      packageName = "address";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz";
-        sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng";
+        sha512 = "+KHTG8KSAFdKYmLNZp3VnKj94AZ94gDdu2ipAwxNuMmN9vpf5hdsQgk1hNXFqQOXfd+BMHokyDa1GwDAlGAtGQ==";
       };
     };
     "addressparser-0.3.2" = {
@@ -667,7 +649,7 @@ let
       version = "0.4.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz";
-        sha512 = "26ddl3nnf87iz307rnz4ssnyb16imncpc8drvn2s9ykxhjckr6bigffcg821jpyfimn5yqkpx4jrc1p2i8rlvq1xxj84f626j6drjrg";
+        sha512 = "L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==";
       };
     };
     "adm-zip-0.4.7" = {
@@ -712,7 +694,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz";
-        sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k";
+        sha512 = "c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==";
       };
     };
     "aggregate-error-1.0.0" = {
@@ -778,22 +760,31 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ajv-6.3.0" = {
+    "ajv-6.5.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.3.0";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz";
-        sha1 = "1650a41114ef00574cac10b8032d8f4c14812da7";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz";
+        sha512 = "VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==";
       };
     };
-    "ajv-6.5.0" = {
+    "ajv-6.5.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.5.0";
+      version = "6.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz";
-        sha512 = "203gkx4d984vdbipzb5mz2x4ilymhrzg6vz5xarpfcixb8gl65xx34h0ppk8zjilxxxhgrlv2fwal1gzm0ci19ckbjsd3cshkb1fdal";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz";
+        sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==";
+      };
+    };
+    "ajv-6.5.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz";
+        sha512 = "hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -874,7 +865,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz";
-        sha512 = "0h54i1d01av3cd2z1hv2nkc5r8za54nmmi2j0678ly7m4w9rr6619b915lgpqapqgakscwpmrav3ni94h34gqhrm53xpjfvlarq5ncp";
+        sha512 = "l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==";
       };
     };
     "anchor-markdown-header-0.5.7" = {
@@ -919,7 +910,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz";
-        sha512 = "2cb3237y1374lwc0f3xxpc79bv59r2m18cw868dpdhvwmrxyh06pj5sdzafc7xrc69v5j8v9lwf7hxylyzxq3bz8waxlj5fnvmrflj8";
+        sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==";
       };
     };
     "ansi-cyan-0.1.1" = {
@@ -937,7 +928,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz";
-        sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix";
+        sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A==";
       };
     };
     "ansi-escapes-1.4.0" = {
@@ -955,7 +946,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz";
-        sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j";
+        sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==";
       };
     };
     "ansi-gray-0.1.1" = {
@@ -1039,13 +1030,22 @@ let
         sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
+    "ansi-styles-3.2.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
+        sha512 = "NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==";
+      };
+    };
     "ansi-styles-3.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
     "ansi-wrap-0.1.0" = {
@@ -1081,7 +1081,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
-        sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
+        sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==";
       };
     };
     "anymatch-2.0.0" = {
@@ -1090,7 +1090,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
-        sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6";
+        sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
       };
     };
     "ap-0.1.0" = {
@@ -1147,13 +1147,13 @@ let
         sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a";
       };
     };
-    "append-tree-2.4.1" = {
+    "append-tree-2.4.4" = {
       name = "append-tree";
       packageName = "append-tree";
-      version = "2.4.1";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz";
-        sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7";
+        url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.4.tgz";
+        sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg==";
       };
     };
     "appendable-cli-menu-2.0.0" = {
@@ -1180,16 +1180,16 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
-    "arch-2.1.0" = {
+    "arch-2.1.1" = {
       name = "arch";
       packageName = "arch";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz";
-        sha1 = "3613aa46149064b3c1f0607919bf1d4786e82889";
+        url = "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz";
+        sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==";
       };
     };
     "archiver-2.1.1" = {
@@ -1219,13 +1219,22 @@ let
         sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
       };
     };
-    "are-we-there-yet-1.1.4" = {
+    "are-we-there-yet-1.1.5" = {
       name = "are-we-there-yet";
       packageName = "are-we-there-yet";
-      version = "1.1.4";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "arg-2.0.0" = {
+      name = "arg";
+      packageName = "arg";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz";
-        sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
+        url = "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz";
+        sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==";
       };
     };
     "argparse-0.1.15" = {
@@ -1252,7 +1261,7 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
     "argparse-1.0.4" = {
@@ -1264,15 +1273,6 @@ let
         sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
       };
     };
-    "args-4.0.0" = {
-      name = "args";
-      packageName = "args";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/args/-/args-4.0.0.tgz";
-        sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1";
-      };
-    };
     "arr-diff-1.1.0" = {
       name = "arr-diff";
       packageName = "arr-diff";
@@ -1306,7 +1306,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
+        sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==";
       };
     };
     "arr-union-2.1.0" = {
@@ -1477,7 +1477,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz";
-        sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7";
+        sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==";
       };
     };
     "array-union-1.0.2" = {
@@ -1531,7 +1531,7 @@ let
       version = "0.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz";
-        sha512 = "2ifpj39fza01g4z9jhgl0shmh5f79czgfh7bf40n66v5p93nrf43kiqhsgic9az2jrwmj8n60dn7kav1rzvm41a9kwi4ypf0mahhrf0";
+        sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==";
       };
     };
     "arrify-1.0.1" = {
@@ -1594,7 +1594,7 @@ let
       version = "4.10.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
+        sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
     "assert-1.4.1" = {
@@ -1648,7 +1648,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz";
-        sha512 = "07swiwljqy13fyil4y9lp319zcqsgdkchaic1y4dlfi3flh5l4qlwv497g40bnspsl9h857a3ig5assmvjdwv913dppgymkvcsil2wf";
+        sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==";
       };
     };
     "assign-symbols-1.0.0" = {
@@ -1660,13 +1660,13 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
-    "ast-types-0.11.3" = {
+    "ast-types-0.11.5" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.11.3";
+      version = "0.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz";
-        sha512 = "2lga5vgh6bz1vii6kfdy2k1g99arw9cikxx8705p9v92rqn7ksdvbzjvhgfdf4s21nbfafrxjh3hrr5jz2yq43dr4hw7hqdvgjnh3jw";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz";
+        sha512 = "oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==";
       };
     };
     "ast-types-0.9.6" = {
@@ -1678,13 +1678,13 @@ let
         sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9";
       };
     };
-    "astw-2.2.0" = {
-      name = "astw";
-      packageName = "astw";
-      version = "2.2.0";
+    "astral-regex-1.0.0" = {
+      name = "astral-regex";
+      packageName = "astral-regex";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
-        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
+        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
     "async-0.1.22" = {
@@ -1792,7 +1792,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
-        sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv";
+        sha512 = "e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==";
       };
     };
     "async-2.6.0" = {
@@ -1801,7 +1801,16 @@ let
       version = "2.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz";
-        sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4";
+        sha512 = "xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==";
+      };
+    };
+    "async-2.6.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
       };
     };
     "async-each-1.0.1" = {
@@ -1819,7 +1828,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf";
+        sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
       };
     };
     "asynckit-0.4.0" = {
@@ -1849,13 +1858,13 @@ let
         sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4";
       };
     };
-    "auto-bind-1.2.0" = {
+    "auto-bind-1.2.1" = {
       name = "auto-bind";
       packageName = "auto-bind";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz";
-        sha512 = "0wamaj1k757h28fyrvfam4fz8ymz84pvfcyvm3k88bs8vxq36jn9kbiqqa3s0axwi6pcmwgmpjqfsh2721a1bb5kp5dpkpdkrkfj3k7";
+        url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz";
+        sha512 = "/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA==";
       };
     };
     "aws-sdk-1.18.0" = {
@@ -1867,13 +1876,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.241.1" = {
+    "aws-sdk-2.266.1" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.241.1";
+      version = "2.266.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.241.1.tgz";
-        sha1 = "ae4e1ba772cc17284df00c03b58dcf914d5c72f9";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.266.1.tgz";
+        sha512 = "b8lisloCETh0Fx0il540i+Hbgf3hyegQ6ezoJFggfc1HIbqzvIjVJYJhOsYl1fL1o+iMUaVU4ZH8cSyoMFR2Tw==";
       };
     };
     "aws-sign-0.2.0" = {
@@ -1909,7 +1918,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
-        sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
       };
     };
     "axios-0.15.3" = {
@@ -1939,31 +1948,31 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-batch-0.3.0" = {
+    "azure-arm-batch-3.1.0" = {
       name = "azure-arm-batch";
       packageName = "azure-arm-batch";
-      version = "0.3.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz";
-        sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7";
+        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.0.tgz";
+        sha512 = "AwRxOn/4718n3N4rlUsnFTavKsQoNHJzcfH9BWpUadiov9mMVxH3vXPhM1sb0KVO21GPqh4s3w9s1RUpJvstkA==";
       };
     };
-    "azure-arm-cdn-1.0.3" = {
+    "azure-arm-cdn-4.0.1" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.3";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz";
-        sha1 = "39db281679dcdd33cb6ce032383b192430476412";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.0.1.tgz";
+        sha512 = "mVX5cG/XxULhCGenPYOrq6lKFeUnuGB8rur+dQgxpmP/AtBVKWSfdl1zm7i3WrEQHelyjiAHUohKxAkWFO2RQw==";
       };
     };
-    "azure-arm-commerce-0.2.0" = {
+    "azure-arm-commerce-2.0.0" = {
       name = "azure-arm-commerce";
       packageName = "azure-arm-commerce";
-      version = "0.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz";
-        sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
+        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.0.0.tgz";
+        sha512 = "scKBmo3nZXbzXtox+SoEYf8Ij+c2y1r47Ga0MVxm1kUTs1UT8KaAiAlC269KKDNYpuXXuV7+CKUs52VCiM06JQ==";
       };
     };
     "azure-arm-compute-3.0.0-preview" = {
@@ -1993,22 +2002,22 @@ let
         sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763";
       };
     };
-    "azure-arm-devtestlabs-0.1.0" = {
+    "azure-arm-devtestlabs-2.1.1" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
-      version = "0.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz";
-        sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40";
+        url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-2.1.1.tgz";
+        sha512 = "S5dCYTMrqL+BJc699fIQtXwLFuv5m8jTDqPdXTFpn/CSkyBcOyJwuZH2zPExQjGNZTyjIR6GWi8oeg/IpYLBWw==";
       };
     };
-    "azure-arm-dns-2.0.0-preview" = {
+    "azure-arm-dns-2.1.0" = {
       name = "azure-arm-dns";
       packageName = "azure-arm-dns";
-      version = "2.0.0-preview";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.0.0-preview.tgz";
-        sha1 = "3dd0645c7f1767fe150e00a8ac33b4b55bce9b8c";
+        url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz";
+        sha512 = "/y0tOM9qNijPYqB381JFYiEyfF+L5B8z+F8JS1OMV1JXIb45vZKXeoe82ZNMZ5g38Vme3uAblxpvp5OtIcvW6Q==";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -2047,22 +2056,22 @@ let
         sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91";
       };
     };
-    "azure-arm-network-5.1.0" = {
+    "azure-arm-network-5.3.0" = {
       name = "azure-arm-network";
       packageName = "azure-arm-network";
-      version = "5.1.0";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.1.0.tgz";
-        sha1 = "b2be4bfc27173b1cb7fc54425cbee27824f65b52";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
+        sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig==";
       };
     };
-    "azure-arm-powerbiembedded-0.1.0" = {
+    "azure-arm-powerbiembedded-0.1.1" = {
       name = "azure-arm-powerbiembedded";
       packageName = "azure-arm-powerbiembedded";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz";
-        sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970";
+        url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.1.tgz";
+        sha1 = "7103c94e06b3ddf628293f60e02fd0ba8f9c3ca9";
       };
     };
     "azure-arm-rediscache-0.2.3" = {
@@ -2083,22 +2092,22 @@ let
         sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
-    "azure-arm-servermanagement-0.1.2" = {
+    "azure-arm-servermanagement-1.1.0" = {
       name = "azure-arm-servermanagement";
       packageName = "azure-arm-servermanagement";
-      version = "0.1.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz";
-        sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
+        url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-1.1.0.tgz";
+        sha512 = "GlPXPD5Up2U6Qxv40ScC/+7WRcVVYQf7EHUSomD385o/MuyJAjM6CxBS8fPKwkZR5MRSd60p6kBo5AQ+bwfpeA==";
       };
     };
-    "azure-arm-storage-0.15.0-preview" = {
+    "azure-arm-storage-5.0.0" = {
       name = "azure-arm-storage";
       packageName = "azure-arm-storage";
-      version = "0.15.0-preview";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz";
-        sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e";
+        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-5.0.0.tgz";
+        sha512 = "sqMjRAbzj9ARP4nEof71cupuHq/ajx+p9uNI9znkwHAP7CYtWEyTzHP0jrfgajccrgcH4sjCQPWt4K4s66NxiQ==";
       };
     };
     "azure-arm-trafficmanager-1.1.0-preview" = {
@@ -2110,13 +2119,13 @@ let
         sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50";
       };
     };
-    "azure-arm-website-0.11.4" = {
+    "azure-arm-website-0.11.5" = {
       name = "azure-arm-website";
       packageName = "azure-arm-website";
-      version = "0.11.4";
+      version = "0.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz";
-        sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
+        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz";
+        sha1 = "51942423e1238ec19e551926353a8e9f73bc534a";
       };
     };
     "azure-asm-compute-0.18.0" = {
@@ -2200,31 +2209,31 @@ let
         sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447";
       };
     };
-    "azure-asm-website-0.10.4" = {
+    "azure-asm-website-0.10.7" = {
       name = "azure-asm-website";
       packageName = "azure-asm-website";
-      version = "0.10.4";
+      version = "0.10.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz";
-        sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
+        url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.7.tgz";
+        sha512 = "h3OmXKKOLd4sbf4khrxqGTjspjqpKduKN9EWgEoIeNhMY+PVKrVEIMr3ZyKzmmy/8123MD+ip67wMqUKSTLtUA==";
       };
     };
-    "azure-batch-0.5.2" = {
+    "azure-batch-3.2.2" = {
       name = "azure-batch";
       packageName = "azure-batch";
-      version = "0.5.2";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz";
-        sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
+        url = "https://registry.npmjs.org/azure-batch/-/azure-batch-3.2.2.tgz";
+        sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw==";
       };
     };
-    "azure-common-0.9.18" = {
+    "azure-common-0.9.20" = {
       name = "azure-common";
       packageName = "azure-common";
-      version = "0.9.18";
+      version = "0.9.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz";
-        sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd";
+        url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz";
+        sha512 = "0gxFOLV12poak+raLYAU4z9JAZEafYSo9LrS+7WlToOawb2Ye2BfHYAGfLBkQrAZbo/NHpJ28/IaiUZVqiZ4fQ==";
       };
     };
     "azure-gallery-2.0.0-pre.18" = {
@@ -2236,31 +2245,31 @@ let
         sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
       };
     };
-    "azure-graph-2.1.0-preview" = {
+    "azure-graph-2.2.0" = {
       name = "azure-graph";
       packageName = "azure-graph";
-      version = "2.1.0-preview";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz";
-        sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f";
+        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.2.0.tgz";
+        sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw==";
       };
     };
-    "azure-keyvault-0.11.0" = {
+    "azure-keyvault-1.0.0" = {
       name = "azure-keyvault";
       packageName = "azure-keyvault";
-      version = "0.11.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz";
-        sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-1.0.0.tgz";
+        sha1 = "d630f98032aadbb5e72fb04d2da49b368e441c9e";
       };
     };
-    "azure-monitoring-0.10.2" = {
+    "azure-monitoring-0.10.6" = {
       name = "azure-monitoring";
       packageName = "azure-monitoring";
-      version = "0.10.2";
+      version = "0.10.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz";
-        sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57";
+        url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.6.tgz";
+        sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q==";
       };
     };
     "azure-servicefabric-0.1.5" = {
@@ -2272,13 +2281,13 @@ let
         sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
       };
     };
-    "azure-storage-2.1.0" = {
+    "azure-storage-2.10.0" = {
       name = "azure-storage";
       packageName = "azure-storage";
-      version = "2.1.0";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz";
-        sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01";
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.0.tgz";
+        sha1 = "020ac343262c5552ef86516cbb7679241e95e4de";
       };
     };
     "babel-code-frame-6.26.0" = {
@@ -2296,7 +2305,7 @@ let
       version = "6.26.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
-        sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a";
+        sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
       };
     };
     "babel-generator-6.26.1" = {
@@ -2305,16 +2314,7 @@ let
       version = "6.26.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz";
-        sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz";
-      };
-    };
-    "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = {
-      name = "babel-helper-builder-binary-assignment-operator-visitor";
-      packageName = "babel-helper-builder-binary-assignment-operator-visitor";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz";
-        sha1 = "cce4517ada356f4220bcae8a02c2b346f9a56664";
+        sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==";
       };
     };
     "babel-helper-builder-react-jsx-6.26.0" = {
@@ -2326,96 +2326,6 @@ let
         sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0";
       };
     };
-    "babel-helper-call-delegate-6.24.1" = {
-      name = "babel-helper-call-delegate";
-      packageName = "babel-helper-call-delegate";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz";
-        sha1 = "ece6aacddc76e41c3461f88bfc575bd0daa2df8d";
-      };
-    };
-    "babel-helper-define-map-6.26.0" = {
-      name = "babel-helper-define-map";
-      packageName = "babel-helper-define-map";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz";
-        sha1 = "a5f56dab41a25f97ecb498c7ebaca9819f95be5f";
-      };
-    };
-    "babel-helper-explode-assignable-expression-6.24.1" = {
-      name = "babel-helper-explode-assignable-expression";
-      packageName = "babel-helper-explode-assignable-expression";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz";
-        sha1 = "f25b82cf7dc10433c55f70592d5746400ac22caa";
-      };
-    };
-    "babel-helper-function-name-6.24.1" = {
-      name = "babel-helper-function-name";
-      packageName = "babel-helper-function-name";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz";
-        sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9";
-      };
-    };
-    "babel-helper-get-function-arity-6.24.1" = {
-      name = "babel-helper-get-function-arity";
-      packageName = "babel-helper-get-function-arity";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz";
-        sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d";
-      };
-    };
-    "babel-helper-hoist-variables-6.24.1" = {
-      name = "babel-helper-hoist-variables";
-      packageName = "babel-helper-hoist-variables";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz";
-        sha1 = "1ecb27689c9d25513eadbc9914a73f5408be7a76";
-      };
-    };
-    "babel-helper-optimise-call-expression-6.24.1" = {
-      name = "babel-helper-optimise-call-expression";
-      packageName = "babel-helper-optimise-call-expression";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz";
-        sha1 = "f7a13427ba9f73f8f4fa993c54a97882d1244257";
-      };
-    };
-    "babel-helper-regex-6.26.0" = {
-      name = "babel-helper-regex";
-      packageName = "babel-helper-regex";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz";
-        sha1 = "325c59f902f82f24b74faceed0363954f6495e72";
-      };
-    };
-    "babel-helper-remap-async-to-generator-6.24.1" = {
-      name = "babel-helper-remap-async-to-generator";
-      packageName = "babel-helper-remap-async-to-generator";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz";
-        sha1 = "5ec581827ad723fecdd381f1c928390676e4551b";
-      };
-    };
-    "babel-helper-replace-supers-6.24.1" = {
-      name = "babel-helper-replace-supers";
-      packageName = "babel-helper-replace-supers";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz";
-        sha1 = "bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a";
-      };
-    };
     "babel-helpers-6.24.1" = {
       name = "babel-helpers";
       packageName = "babel-helpers";
@@ -2434,33 +2344,6 @@ let
         sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
       };
     };
-    "babel-plugin-check-es2015-constants-6.22.0" = {
-      name = "babel-plugin-check-es2015-constants";
-      packageName = "babel-plugin-check-es2015-constants";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz";
-        sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a";
-      };
-    };
-    "babel-plugin-syntax-async-functions-6.13.0" = {
-      name = "babel-plugin-syntax-async-functions";
-      packageName = "babel-plugin-syntax-async-functions";
-      version = "6.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz";
-        sha1 = "cad9cad1191b5ad634bf30ae0872391e0647be95";
-      };
-    };
-    "babel-plugin-syntax-exponentiation-operator-6.13.0" = {
-      name = "babel-plugin-syntax-exponentiation-operator";
-      packageName = "babel-plugin-syntax-exponentiation-operator";
-      version = "6.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz";
-        sha1 = "9ee7e8337290da95288201a6a57f4170317830de";
-      };
-    };
     "babel-plugin-syntax-jsx-6.18.0" = {
       name = "babel-plugin-syntax-jsx";
       packageName = "babel-plugin-syntax-jsx";
@@ -2479,69 +2362,6 @@ let
         sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
       };
     };
-    "babel-plugin-syntax-trailing-function-commas-6.22.0" = {
-      name = "babel-plugin-syntax-trailing-function-commas";
-      packageName = "babel-plugin-syntax-trailing-function-commas";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz";
-        sha1 = "ba0360937f8d06e40180a43fe0d5616fff532cf3";
-      };
-    };
-    "babel-plugin-transform-async-to-generator-6.24.1" = {
-      name = "babel-plugin-transform-async-to-generator";
-      packageName = "babel-plugin-transform-async-to-generator";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz";
-        sha1 = "6536e378aff6cb1d5517ac0e40eb3e9fc8d08761";
-      };
-    };
-    "babel-plugin-transform-es2015-arrow-functions-6.22.0" = {
-      name = "babel-plugin-transform-es2015-arrow-functions";
-      packageName = "babel-plugin-transform-es2015-arrow-functions";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz";
-        sha1 = "452692cb711d5f79dc7f85e440ce41b9f244d221";
-      };
-    };
-    "babel-plugin-transform-es2015-block-scoped-functions-6.22.0" = {
-      name = "babel-plugin-transform-es2015-block-scoped-functions";
-      packageName = "babel-plugin-transform-es2015-block-scoped-functions";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz";
-        sha1 = "bbc51b49f964d70cb8d8e0b94e820246ce3a6141";
-      };
-    };
-    "babel-plugin-transform-es2015-block-scoping-6.26.0" = {
-      name = "babel-plugin-transform-es2015-block-scoping";
-      packageName = "babel-plugin-transform-es2015-block-scoping";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz";
-        sha1 = "d70f5299c1308d05c12f463813b0a09e73b1895f";
-      };
-    };
-    "babel-plugin-transform-es2015-classes-6.24.1" = {
-      name = "babel-plugin-transform-es2015-classes";
-      packageName = "babel-plugin-transform-es2015-classes";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz";
-        sha1 = "5a4c58a50c9c9461e564b4b2a3bfabc97a2584db";
-      };
-    };
-    "babel-plugin-transform-es2015-computed-properties-6.24.1" = {
-      name = "babel-plugin-transform-es2015-computed-properties";
-      packageName = "babel-plugin-transform-es2015-computed-properties";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz";
-        sha1 = "6fe2a8d16895d5634f4cd999b6d3480a308159b3";
-      };
-    };
     "babel-plugin-transform-es2015-destructuring-6.23.0" = {
       name = "babel-plugin-transform-es2015-destructuring";
       packageName = "babel-plugin-transform-es2015-destructuring";
@@ -2551,159 +2371,6 @@ let
         sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
       };
     };
-    "babel-plugin-transform-es2015-duplicate-keys-6.24.1" = {
-      name = "babel-plugin-transform-es2015-duplicate-keys";
-      packageName = "babel-plugin-transform-es2015-duplicate-keys";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz";
-        sha1 = "73eb3d310ca969e3ef9ec91c53741a6f1576423e";
-      };
-    };
-    "babel-plugin-transform-es2015-for-of-6.23.0" = {
-      name = "babel-plugin-transform-es2015-for-of";
-      packageName = "babel-plugin-transform-es2015-for-of";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz";
-        sha1 = "f47c95b2b613df1d3ecc2fdb7573623c75248691";
-      };
-    };
-    "babel-plugin-transform-es2015-function-name-6.24.1" = {
-      name = "babel-plugin-transform-es2015-function-name";
-      packageName = "babel-plugin-transform-es2015-function-name";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz";
-        sha1 = "834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b";
-      };
-    };
-    "babel-plugin-transform-es2015-literals-6.22.0" = {
-      name = "babel-plugin-transform-es2015-literals";
-      packageName = "babel-plugin-transform-es2015-literals";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz";
-        sha1 = "4f54a02d6cd66cf915280019a31d31925377ca2e";
-      };
-    };
-    "babel-plugin-transform-es2015-modules-amd-6.24.1" = {
-      name = "babel-plugin-transform-es2015-modules-amd";
-      packageName = "babel-plugin-transform-es2015-modules-amd";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz";
-        sha1 = "3b3e54017239842d6d19c3011c4bd2f00a00d154";
-      };
-    };
-    "babel-plugin-transform-es2015-modules-commonjs-6.26.2" = {
-      name = "babel-plugin-transform-es2015-modules-commonjs";
-      packageName = "babel-plugin-transform-es2015-modules-commonjs";
-      version = "6.26.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz";
-        sha512 = "3sy41x9jlzyzy6wzsj60asahzm6hg9gmr6r1cckdqhzmvckl7jbfb5zwr0nslndnhqgjwdmvxsah41h8v8286hjqbfbhxn4w4w52pq9";
-      };
-    };
-    "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = {
-      name = "babel-plugin-transform-es2015-modules-systemjs";
-      packageName = "babel-plugin-transform-es2015-modules-systemjs";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz";
-        sha1 = "ff89a142b9119a906195f5f106ecf305d9407d23";
-      };
-    };
-    "babel-plugin-transform-es2015-modules-umd-6.24.1" = {
-      name = "babel-plugin-transform-es2015-modules-umd";
-      packageName = "babel-plugin-transform-es2015-modules-umd";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz";
-        sha1 = "ac997e6285cd18ed6176adb607d602344ad38468";
-      };
-    };
-    "babel-plugin-transform-es2015-object-super-6.24.1" = {
-      name = "babel-plugin-transform-es2015-object-super";
-      packageName = "babel-plugin-transform-es2015-object-super";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz";
-        sha1 = "24cef69ae21cb83a7f8603dad021f572eb278f8d";
-      };
-    };
-    "babel-plugin-transform-es2015-parameters-6.24.1" = {
-      name = "babel-plugin-transform-es2015-parameters";
-      packageName = "babel-plugin-transform-es2015-parameters";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz";
-        sha1 = "57ac351ab49caf14a97cd13b09f66fdf0a625f2b";
-      };
-    };
-    "babel-plugin-transform-es2015-shorthand-properties-6.24.1" = {
-      name = "babel-plugin-transform-es2015-shorthand-properties";
-      packageName = "babel-plugin-transform-es2015-shorthand-properties";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz";
-        sha1 = "24f875d6721c87661bbd99a4622e51f14de38aa0";
-      };
-    };
-    "babel-plugin-transform-es2015-spread-6.22.0" = {
-      name = "babel-plugin-transform-es2015-spread";
-      packageName = "babel-plugin-transform-es2015-spread";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz";
-        sha1 = "d6d68a99f89aedc4536c81a542e8dd9f1746f8d1";
-      };
-    };
-    "babel-plugin-transform-es2015-sticky-regex-6.24.1" = {
-      name = "babel-plugin-transform-es2015-sticky-regex";
-      packageName = "babel-plugin-transform-es2015-sticky-regex";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz";
-        sha1 = "00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc";
-      };
-    };
-    "babel-plugin-transform-es2015-template-literals-6.22.0" = {
-      name = "babel-plugin-transform-es2015-template-literals";
-      packageName = "babel-plugin-transform-es2015-template-literals";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz";
-        sha1 = "a84b3450f7e9f8f1f6839d6d687da84bb1236d8d";
-      };
-    };
-    "babel-plugin-transform-es2015-typeof-symbol-6.23.0" = {
-      name = "babel-plugin-transform-es2015-typeof-symbol";
-      packageName = "babel-plugin-transform-es2015-typeof-symbol";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz";
-        sha1 = "dec09f1cddff94b52ac73d505c84df59dcceb372";
-      };
-    };
-    "babel-plugin-transform-es2015-unicode-regex-6.24.1" = {
-      name = "babel-plugin-transform-es2015-unicode-regex";
-      packageName = "babel-plugin-transform-es2015-unicode-regex";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz";
-        sha1 = "d38b12f42ea7323f729387f18a7c5ae1faeb35e9";
-      };
-    };
-    "babel-plugin-transform-exponentiation-operator-6.24.1" = {
-      name = "babel-plugin-transform-exponentiation-operator";
-      packageName = "babel-plugin-transform-exponentiation-operator";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz";
-        sha1 = "2ab0c9c7f3098fa48907772bb813fe41e8de3a0e";
-      };
-    };
     "babel-plugin-transform-object-rest-spread-6.26.0" = {
       name = "babel-plugin-transform-object-rest-spread";
       packageName = "babel-plugin-transform-object-rest-spread";
@@ -2722,24 +2389,6 @@ let
         sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3";
       };
     };
-    "babel-plugin-transform-regenerator-6.26.0" = {
-      name = "babel-plugin-transform-regenerator";
-      packageName = "babel-plugin-transform-regenerator";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz";
-        sha1 = "e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f";
-      };
-    };
-    "babel-plugin-transform-strict-mode-6.24.1" = {
-      name = "babel-plugin-transform-strict-mode";
-      packageName = "babel-plugin-transform-strict-mode";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz";
-        sha1 = "d5faf7aa578a65bbe591cf5edae04a0c67020758";
-      };
-    };
     "babel-polyfill-6.16.0" = {
       name = "babel-polyfill";
       packageName = "babel-polyfill";
@@ -2758,15 +2407,6 @@ let
         sha1 = "379937abc67d7895970adc621f284cd966cf2153";
       };
     };
-    "babel-preset-env-1.7.0" = {
-      name = "babel-preset-env";
-      packageName = "babel-preset-env";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz";
-        sha512 = "0g45grnsjds9va8zwb68gpm4ngzmnb351bbvphnmis7bifsh2ny2c00bwah57fn1yv87fs69hriimbysbm15dpsvfbpf3lazdlpdr7l";
-      };
-    };
     "babel-register-6.26.0" = {
       name = "babel-register";
       packageName = "babel-register";
@@ -2827,7 +2467,7 @@ let
       version = "6.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
-        sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb";
+        sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==";
       };
     };
     "babylon-7.0.0-beta.19" = {
@@ -2836,7 +2476,7 @@ let
       version = "7.0.0-beta.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz";
-        sha512 = "3y91819zra4jxfjqqdvbi44fr34m68vk7j76rkqkxvayhxmcmrvmxpk7rz16r2s3riql0xs322mkzm61asxzkc5b2zpw4firzv043an";
+        sha512 = "Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==";
       };
     };
     "backo2-1.0.2" = {
@@ -2863,7 +2503,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz";
-        sha512 = "1v31szd5dwn62xh8a9cy95yby0ibq9j9barzs03hxjr4vcjnwz1mgjdb9p4rqgymjm3f5zrxgrnqkjd9h9viykd56zfchsm66g04zym";
+        sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -2881,7 +2521,7 @@ let
       version = "0.11.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
-        sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5";
+        sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
       };
     };
     "base62-0.1.1" = {
@@ -2944,7 +2584,7 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";
-        sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j";
+        sha512 = "MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==";
       };
     };
     "base64-js-1.3.0" = {
@@ -2953,7 +2593,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
-        sha512 = "2bvd1ja1kbighx0vm4ia3gqv15m70pldsx2igl37ayq11715w3g0vfmfq1yb8w80hlzblvszig3fr4sdhn8rr800lsaz8dg47zsziki";
+        sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==";
       };
     };
     "base64-url-1.2.1" = {
@@ -3043,7 +2683,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz";
-        sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755";
+        sha512 = "pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==";
       };
     };
     "bcrypt-nodejs-0.0.3" = {
@@ -3055,13 +2695,13 @@ let
         sha1 = "c60917f26dc235661566c681061c303c2b28842b";
       };
     };
-    "bcrypt-pbkdf-1.0.1" = {
+    "bcrypt-pbkdf-1.0.2" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
     "bcryptjs-2.4.3" = {
@@ -3106,7 +2746,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz";
-        sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p";
+        sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw==";
       };
     };
     "bencode-2.0.0" = {
@@ -3115,7 +2755,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz";
-        sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2";
+        sha512 = "wr2HwwrUpfB5c68zmAudOltC7rZ1G0+lQOcnuEcfIM3AWAVnB3rHI3nlgd/2CWTfQ3w3zagKt89zni/M+VLZ8g==";
       };
     };
     "better-assert-1.0.2" = {
@@ -3145,13 +2785,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.28" = {
+    "big-integer-1.6.32" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.28";
+      version = "1.6.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.28.tgz";
-        sha512 = "3b56jaa0yvrl9p90c0phnhyh02sv9hxssl8y0nghv91ra8akrcdpxm55c1gf5w1is9991wm2g0wqcr4hm5ri9lmzwd8gc9d72pzg51q";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.32.tgz";
+        sha512 = "ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==";
       };
     };
     "big.js-3.2.0" = {
@@ -3160,25 +2800,25 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz";
-        sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs";
+        sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==";
       };
     };
-    "bin-version-1.0.4" = {
+    "bin-version-2.0.0" = {
       name = "bin-version";
       packageName = "bin-version";
-      version = "1.0.4";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz";
-        sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e";
+        url = "https://registry.npmjs.org/bin-version/-/bin-version-2.0.0.tgz";
+        sha1 = "2cc95d83b522bdef2e99978e76aeb5491c8114ff";
       };
     };
-    "bin-version-check-2.1.0" = {
+    "bin-version-check-3.0.0" = {
       name = "bin-version-check";
       packageName = "bin-version-check";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz";
-        sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0";
+        url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-3.0.0.tgz";
+        sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9";
       };
     };
     "binary-0.3.0" = {
@@ -3199,13 +2839,13 @@ let
         sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
       };
     };
-    "binary-search-1.3.3" = {
+    "binary-search-1.3.4" = {
       name = "binary-search";
       packageName = "binary-search";
-      version = "1.3.3";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.3.tgz";
-        sha512 = "38zf62278y5pi773rqfsjrn9iknwhx25v4jhjc2gv8yi8hs2k8bjqg52yc07az2ipl53iid2d39r827z4jb6854x0z95m7hgfkwmy2g";
+        url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.4.tgz";
+        sha512 = "dPxU/vZLnH0tEVjVPgi015oSwqu6oLfCeHywuFRhBE0yM0mYocvleTl8qsdM1YFhRzTRhM1+VzS8XLDVrHPopg==";
       };
     };
     "binaryheap-0.0.3" = {
@@ -3232,7 +2872,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz";
-        sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf";
+        sha512 = "DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==";
       };
     };
     "binstall-1.2.0" = {
@@ -3259,7 +2899,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz";
-        sha512 = "27y12y6a0jj5yrb5m8k7fp5czr6cj2x15rmd3d10q4s22i2fw23v5c731ciy9sndjic7hcgblkjc3ilayh7lpv0m4zp8f53hw6kh4z3";
+        sha512 = "4xM4DYejOHQ/qWBfeqBXNA4mJ12PwcOibFYnH1kYh5U9BHciCqEJBqGNVnMJXUhm8mflujNRLSv7IiVQxovgjw==";
       };
     };
     "bitfield-rle-2.1.0" = {
@@ -3295,16 +2935,16 @@ let
       version = "7.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz";
-        sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky";
+        sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
       };
     };
-    "bittorrent-dht-8.3.0" = {
+    "bittorrent-dht-8.4.0" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
-      version = "8.3.0";
+      version = "8.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.3.0.tgz";
-        sha512 = "2p2fxhvwin4xnjdmbhrlwivx4a8pjzfn6mc5qxnxzl1q40xxp56wd6xrcxfq9viqjkvpc7g0j3dvgmvcywhgw41nvjyxi8pgm5v43kp";
+        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz";
+        sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ==";
       };
     };
     "bittorrent-peerid-1.2.0" = {
@@ -3316,13 +2956,13 @@ let
         sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371";
       };
     };
-    "bittorrent-protocol-2.4.1" = {
+    "bittorrent-protocol-2.4.2" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.1.tgz";
-        sha512 = "0vx3k29q25mp4ind4745868n0hc7xcggwbj0hyqp0hfblfxpdwddv1gwdh0x0m9skja637bxvn2i1ssvqrc80qyjfy4asw63rpvg99m";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.2.tgz";
+        sha512 = "ZphU6H9B0Tf99P2noVmyKkT7Bf8FZG6T3VSurJva8ozvvCqSfLMnI7X4Khxn5qXXvw71/R9Vfq+aJvMgV9lquQ==";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -3340,7 +2980,7 @@ let
       version = "9.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz";
-        sha512 = "06yb4m1bbllq52hhm7cp5j35bd9my3rhlsgaycpv6g9iymxq0qr8bx9fmxr673i9m6nxvkbrjym7ykp9f8w674inpp3csplqf2apl1x";
+        sha512 = "PdCrhMP0ajbutZEcw5FLd/pTvcxr7m5NTXEck3t1qS+UMcC9+pie2Zd59TSFefia2ipDlstOhVAUTOlaoZLlDQ==";
       };
     };
     "bl-0.8.2" = {
@@ -3376,7 +3016,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz";
-        sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv";
+        sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
       };
     };
     "blake2b-2.1.2" = {
@@ -3394,7 +3034,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz";
-        sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0";
+        sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==";
       };
     };
     "blob-0.0.2" = {
@@ -3415,13 +3055,13 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "blob-to-buffer-1.2.7" = {
+    "blob-to-buffer-1.2.8" = {
       name = "blob-to-buffer";
       packageName = "blob-to-buffer";
-      version = "1.2.7";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.7.tgz";
-        sha512 = "3vjm0x8c1iv48p266p8s61kwfyvi089npgmwb8zf69yyqrwfixxis0rsgsfrzizl22wzmf0azbxsxqb132nx2q8fjjcgqf7bi2kl593";
+        url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.8.tgz";
+        sha512 = "re0AIxakF504MgeMtIyJkVcZ8T5aUxtp/QmTMlmjyb3P44E1BEv5x3LATBGApWAJATyXHtkXRD+gWTmeyYLiQA==";
       };
     };
     "block-stream-0.0.9" = {
@@ -3466,7 +3106,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
-        sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h";
+        sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==";
       };
     };
     "blueimp-md5-2.10.0" = {
@@ -3475,7 +3115,7 @@ let
       version = "2.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz";
-        sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj";
+        sha512 = "EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ==";
       };
     };
     "bn.js-4.11.8" = {
@@ -3484,7 +3124,7 @@ let
       version = "4.11.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
+        sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==";
       };
     };
     "bncode-0.2.3" = {
@@ -3601,7 +3241,7 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
+        sha512 = "Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==";
       };
     };
     "bops-0.1.1" = {
@@ -3673,7 +3313,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz";
-        sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc";
+        sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==";
       };
     };
     "bplist-creator-0.0.6" = {
@@ -3709,7 +3349,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "braces-0.1.5" = {
@@ -3736,7 +3376,7 @@ let
       version = "2.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
-        sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8";
+        sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
       };
     };
     "broadway-0.3.6" = {
@@ -3772,16 +3412,16 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz";
-        sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks";
+        sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
-    "browser-resolve-1.11.2" = {
+    "browser-resolve-1.11.3" = {
       name = "browser-resolve";
       packageName = "browser-resolve";
-      version = "1.11.2";
+      version = "1.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz";
-        sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
+        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
+        sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==";
       };
     };
     "browser-stdout-1.3.1" = {
@@ -3790,7 +3430,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
+        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
     "browserify-13.3.0" = {
@@ -3817,7 +3457,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
-        sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v";
+        sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
       };
     };
     "browserify-cache-api-3.0.1" = {
@@ -3835,7 +3475,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
-        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
+        sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
       };
     };
     "browserify-des-1.0.1" = {
@@ -3844,7 +3484,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz";
-        sha512 = "35rl28vzg80fa81b0a7rdaj71zf0ymxxhlmdpisps4dlgvkazbxz47q9fnl1n9wnbq7ilk6vnbxa399zcwdjdz3i0lii1mpnyhh4bfg";
+        sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==";
       };
     };
     "browserify-incremental-3.1.1" = {
@@ -3916,16 +3556,7 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
-        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
-      };
-    };
-    "browserslist-3.2.7" = {
-      name = "browserslist";
-      packageName = "browserslist";
-      version = "3.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.7.tgz";
-        sha512 = "0qzgn4n32d6hjm129k06ry17ppzywr77kwpxh2rj1i26j9x43rwx6lpjqf6nlrkf9b9mwcqidgq5gv4xl94120k69p7z9baap24p1d1";
+        sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
     "bson-0.1.8" = {
@@ -3961,34 +3592,25 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz";
-        sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2";
+        sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==";
       };
     };
-    "buffer-alloc-1.1.0" = {
+    "buffer-alloc-1.2.0" = {
       name = "buffer-alloc";
       packageName = "buffer-alloc";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz";
-        sha1 = "05514d33bf1656d3540c684f65b1202e90eca303";
-      };
-    };
-    "buffer-alloc-unsafe-0.1.1" = {
-      name = "buffer-alloc-unsafe";
-      packageName = "buffer-alloc-unsafe";
-      version = "0.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz";
-        sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a";
+        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz";
+        sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==";
       };
     };
-    "buffer-alloc-unsafe-1.0.0" = {
+    "buffer-alloc-unsafe-1.1.0" = {
       name = "buffer-alloc-unsafe";
       packageName = "buffer-alloc-unsafe";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz";
-        sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe";
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz";
+        sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==";
       };
     };
     "buffer-crc32-0.1.1" = {
@@ -4054,13 +3676,13 @@ let
         sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5";
       };
     };
-    "buffer-fill-0.1.1" = {
+    "buffer-fill-1.0.0" = {
       name = "buffer-fill";
       packageName = "buffer-fill";
-      version = "0.1.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz";
-        sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032";
+        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz";
+        sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c";
       };
     };
     "buffer-from-0.1.2" = {
@@ -4069,16 +3691,16 @@ let
       version = "0.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz";
-        sha512 = "2z3dp7smyppzg5yc63hvyfxgrw5d14splmxbknz4v8g6bnncca1acr4xd6l3z13lpp4vj4120pyvk87040ajbx7v24cj9mcgdx8h9a6";
+        sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==";
       };
     };
-    "buffer-from-1.0.0" = {
+    "buffer-from-1.1.0" = {
       name = "buffer-from";
       packageName = "buffer-from";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz";
-        sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk";
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz";
+        sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==";
       };
     };
     "buffer-indexof-1.1.1" = {
@@ -4087,7 +3709,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
-        sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
+        sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==";
       };
     };
     "buffer-more-ints-0.0.2" = {
@@ -4141,7 +3763,7 @@ let
       version = "3.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz";
-        sha512 = "2b5ha7z8v5gkanyakrbax9k9d00cv9gs2nfnk5g4d16ljmpv40jv3pljawxmnw2jj04z57cqlzbw1w8wr5kyblin8c2jz7a2av09xfi";
+        sha512 = "0fUEthLqfCkYspEuP0vmiAe+PsXslE+AlILb2rmS9I4tAdm3SmpCI69M66zQL20GQEszdbXyVN6q+cpG/yhYlg==";
       };
     };
     "bufferview-1.0.1" = {
@@ -4213,7 +3835,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz";
-        sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs";
+        sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng==";
       };
     };
     "bunyan-1.5.1" = {
@@ -4357,7 +3979,7 @@ let
       version = "10.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz";
-        sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f";
+        sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
       };
     };
     "cache-base-1.0.1" = {
@@ -4366,7 +3988,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
-        sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0";
+        sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
     "cacheable-request-2.1.4" = {
@@ -4522,15 +4144,6 @@ let
         sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
       };
     };
-    "camelcase-5.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz";
-        sha512 = "2q57983k3n95gzbhqhc0cv6krvq7nd37h837xg6favqywdda14ha7k2xbdaryni3xzzm55pvi0adrl1fbgxypaxz1kvrifnm5kb1akx";
-      };
-    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -4549,15 +4162,6 @@ let
         sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
       };
     };
-    "caniuse-lite-1.0.30000842" = {
-      name = "caniuse-lite";
-      packageName = "caniuse-lite";
-      version = "1.0.30000842";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000842.tgz";
-        sha512 = "16dhvprw63c1dcvcn58bgf667cqldqkmmzda661xrwi0yadfmlpab913a980h6kwfk1yl0r13z4qap9g9rxqd23nhlihhghf902kswf";
-      };
-    };
     "capture-stack-trace-1.0.0" = {
       name = "capture-stack-trace";
       packageName = "capture-stack-trace";
@@ -4618,7 +4222,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz";
-        sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa";
+        sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==";
       };
     };
     "ccount-1.0.3" = {
@@ -4627,7 +4231,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz";
-        sha512 = "2dqnm6wybhq4zcdf3x97zjibb5zvvcbq3p837sp61rk6wvbk3nqq4lpivvxgvgg4cgl346aqzkpwry1sl7l1yw7ab7d6wqi34h6vpr6";
+        sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==";
       };
     };
     "center-align-0.1.3" = {
@@ -4654,7 +4258,7 @@ let
       version = "7.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz";
-        sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb";
+        sha512 = "azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==";
       };
     };
     "chainsaw-0.1.0" = {
@@ -4708,16 +4312,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
-      };
-    };
-    "chalk-2.3.2" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz";
-        sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
+        sha512 = "LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==";
       };
     };
     "chalk-2.4.0" = {
@@ -4726,7 +4321,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz";
-        sha512 = "0bnfi1y6b0wl6wn93ykm3awxyjnsknai0hrnvvkxfvjrcsld722r3ljdac9zifvvg8vqd4pxlrhrc4r58yp0xxfxj2bpx18zv8z1gss";
+        sha512 = "Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==";
       };
     };
     "chalk-2.4.1" = {
@@ -4735,7 +4330,7 @@ let
       version = "2.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
-        sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr";
+        sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==";
       };
     };
     "character-entities-1.2.2" = {
@@ -4744,7 +4339,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz";
-        sha512 = "30y1wgwpay9yfcz4l3wj9yslp751hch7vhing2f748qn8clk0im3f32xn25k57s6q94mkq0gnk6ga8icz3yzhm752vjq1p7mxghgjmh";
+        sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==";
       };
     };
     "character-entities-html4-1.1.2" = {
@@ -4753,7 +4348,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
-        sha512 = "0ikbsydxv9ap7im4i2l4nv5gqgilwwbbpxf8xgyknz3cv2jgp4285f0kdl0qcv1xbh9946a9wkcyd4b7mg5nzg0s5dyxnys571xg2mh";
+        sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==";
       };
     };
     "character-entities-legacy-1.1.2" = {
@@ -4762,7 +4357,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
-        sha512 = "2ag1akl7wv9ysm4qkkrx8r59mj08xgnavah9hn79ggzknkb5hikn15fdgbcql4yln4a5kbi0b8xykwhy80vrarsbyfqapgdnmapdl7l";
+        sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==";
       };
     };
     "character-parser-1.2.1" = {
@@ -4789,7 +4384,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
-        sha512 = "1wm395ypw8d7xpq3jffx9m3j24simj28sf9symc9pa94s8l04maqagcy79j62yngip7rvcg4c7zvvxx7hygw9r0k44jaayzwmqz33zc";
+        sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==";
       };
     };
     "chardet-0.4.2" = {
@@ -4801,13 +4396,13 @@ let
         sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2";
       };
     };
-    "charenc-0.0.2" = {
-      name = "charenc";
-      packageName = "charenc";
-      version = "0.0.2";
+    "chardet-0.5.0" = {
+      name = "chardet";
+      packageName = "chardet";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz";
-        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+        url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz";
+        sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==";
       };
     };
     "check-error-1.0.2" = {
@@ -4828,6 +4423,15 @@ let
         sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea";
       };
     };
+    "cheerio-0.20.0" = {
+      name = "cheerio";
+      packageName = "cheerio";
+      version = "0.20.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz";
+        sha1 = "5c710f2bab95653272842ba01c6ea61b3545ec35";
+      };
+    };
     "cheerio-0.22.0" = {
       name = "cheerio";
       packageName = "cheerio";
@@ -4873,13 +4477,13 @@ let
         sha1 = "798e689778151c8076b4b360e5edd28cda2bb468";
       };
     };
-    "chokidar-2.0.3" = {
+    "chokidar-2.0.4" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz";
-        sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz";
+        sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==";
       };
     };
     "chownr-0.0.2" = {
@@ -4900,13 +4504,13 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
-    "chrome-trace-event-0.1.3" = {
+    "chrome-trace-event-1.0.0" = {
       name = "chrome-trace-event";
       packageName = "chrome-trace-event";
-      version = "0.1.3";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz";
-        sha512 = "3y9nwc7vk3r253x4yrz1ibinpd6xcfy75skh9i5s5gkh3c93sddvlp7dkr5fjs6aarr9n8cy0ck8zwfw10h4fqnw6p6ibgbj74xsfdj";
+        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz";
+        sha512 = "xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==";
       };
     };
     "chromecast-player-0.2.3" = {
@@ -4933,7 +4537,7 @@ let
       version = "1.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.9.1.tgz";
-        sha512 = "38g6qhcppxzh5fsrnvvfjnvzjiwdxsz0nsshi55prij4ifj6har7dqs6fzflqimdmkd24vgclkrgb8i96hrpm4hnfy91bp0wzpfzicy";
+        sha512 = "nsXv7ufgrpC8s5DUm6FJEa2XJ2VvE9FmbTVi6r4zGreTFTTSRSJjvqVEqLUFX/fGo/zbSre3zdoV+Pu9DGLz0A==";
       };
     };
     "chromium-pickle-js-0.2.0" = {
@@ -4951,7 +4555,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-2.1.0.tgz";
-        sha512 = "1c9rhwy0ac18jk67fwhgdavc4ax76i7q8qmidj2b3qqdvq9i6ir8w53ylnw7invy7msxzs0538smkvsp47hf30jh0q4xp6n6a95ymcr";
+        sha512 = "mVVfkjLW3E4wgBIMBw+5es+q0ShA/67r8dvGwy31o3CUo4kJ74bxWEK2WDHCJ5rTFWFbtQe5O2ZKFJgCnsOcWA==";
       };
     };
     "ci-info-1.1.3" = {
@@ -4960,7 +4564,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz";
-        sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8";
+        sha512 = "SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==";
       };
     };
     "cint-8.2.1" = {
@@ -4978,7 +4582,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
+        sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
       };
     };
     "circular-append-file-1.0.1" = {
@@ -4987,7 +4591,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz";
-        sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05";
+        sha512 = "BUDFvrBTCdeVhg9E05PX4XgMegk6xWB69uGwyuATEg7PMfa9lGU1mzFSK0xWNW2O0i9CAQHN0oIdXI/kI2hPkg==";
       };
     };
     "circular-json-0.3.3" = {
@@ -4996,7 +4600,7 @@ let
       version = "0.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
-        sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
+        sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
       };
     };
     "circular-json-0.5.4" = {
@@ -5005,7 +4609,7 @@ let
       version = "0.5.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz";
-        sha512 = "25fjig8rxf865x3cbsz0hdv839lbpw6awq4ybl5qw65x5d5ha9whz5krnshqcqqdypyhvj5dnmydja51d4i2678hsig61dllkq40wmy";
+        sha512 = "vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig==";
       };
     };
     "clarinet-0.11.0" = {
@@ -5023,7 +4627,7 @@ let
       version = "0.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
-        sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
+        sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
     "clean-css-3.4.28" = {
@@ -5122,7 +4726,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz";
-        sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm";
+        sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==";
       };
     };
     "cli-table-0.3.1" = {
@@ -5149,7 +4753,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz";
-        sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc";
+        sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==";
       };
     };
     "cli-width-1.1.1" = {
@@ -5203,7 +4807,7 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz";
-        sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr";
+        sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==";
       };
     };
     "cliui-2.1.0" = {
@@ -5230,7 +4834,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
-        sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0";
+        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
       };
     };
     "clivas-0.1.4" = {
@@ -5329,7 +4933,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz";
-        sha512 = "2dkam277bx7ajypbx3z8jrpigy0lqfflbj3ic5crhprjilxlfm8nh6xzpjm1p3n4ndx6pjw2pnm5shjirs2cj6lg7bnwnqiiksa7j0m";
+        sha512 = "Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw==";
       };
     };
     "clone-response-1.0.2" = {
@@ -5365,7 +4969,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz";
-        sha512 = "2kg2ysl15s9cxgj62p43gzagfqf3kk2zqj4i6g3ckxs2b0fvx71blw7qy7v7gmy2pi9z9jsrc81v43kz7khagrvhlpwyv55vzibxbh6";
+        sha512 = "Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==";
       };
     };
     "closest-to-2.0.0" = {
@@ -5446,7 +5050,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz";
-        sha512 = "2nxlq1p7l0446g1hnmpgv37c0m2jqnzfddgsa4ys4p5sapd43mx6p7yas925hjimzzx41jvxr36fvllsziwaliiwbdginq4xx6d61z7";
+        sha512 = "5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==";
       };
     };
     "code-point-at-1.1.0" = {
@@ -5464,7 +5068,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz";
-        sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8";
+        sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA==";
       };
     };
     "codepage-1.4.0" = {
@@ -5482,7 +5086,7 @@ let
       version = "1.12.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-        sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+        sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
       };
     };
     "coffee-script-1.6.3" = {
@@ -5500,7 +5104,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
-        sha512 = "0iifkywgm8zqn27w0maj5c1yarf294qm5qqcbsajafv8r5f9w02ss33qfngyp59mamv8h8yqx93xpsqnabzn0wnpssrx6qr0ns3bx31";
+        sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==";
       };
     };
     "collection-visit-1.0.0" = {
@@ -5518,25 +5122,25 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz";
-        sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc";
+        sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==";
       };
     };
-    "color-convert-1.9.1" = {
+    "color-convert-1.9.2" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz";
-        sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz";
+        sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==";
       };
     };
-    "color-name-1.1.3" = {
+    "color-name-1.1.1" = {
       name = "color-name";
       packageName = "color-name";
-      version = "1.1.3";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
-        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz";
+        sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
     "color-string-1.5.2" = {
@@ -5554,7 +5158,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz";
-        sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a";
+        sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
       };
     };
     "colors-0.5.1" = {
@@ -5593,13 +5197,13 @@ let
         sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
-    "colors-1.2.5" = {
+    "colors-1.3.0" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz";
-        sha512 = "2k2a7k096qcm5fghgcmybg96y3x5bpqb62j0zdlnxq7za4asb6vsy9i69nkg9wqfhkcbh6qzm8zzvq7q516p54awxpp2qrzm8nm3cvs";
+        url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz";
+        sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==";
       };
     };
     "colour-0.7.1" = {
@@ -5734,7 +5338,7 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
+        sha512 = "b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==";
       };
     };
     "commander-2.13.0" = {
@@ -5743,7 +5347,7 @@ let
       version = "2.13.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz";
-        sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri";
+        sha512 = "MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==";
       };
     };
     "commander-2.14.1" = {
@@ -5752,7 +5356,7 @@ let
       version = "2.14.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz";
-        sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r";
+        sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==";
       };
     };
     "commander-2.15.1" = {
@@ -5761,7 +5365,16 @@ let
       version = "2.15.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
-        sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn";
+        sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==";
+      };
+    };
+    "commander-2.16.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz";
+        sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==";
       };
     };
     "commander-2.6.0" = {
@@ -5806,7 +5419,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz";
-        sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f";
+        sha512 = "joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ==";
       };
     };
     "commondir-1.0.1" = {
@@ -5890,13 +5503,13 @@ let
         sha1 = "524a9f10903f3a813389b0225d27c48bb751890f";
       };
     };
-    "compressible-2.0.13" = {
+    "compressible-2.0.14" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.13";
+      version = "2.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz";
-        sha1 = "0d1020ab924b2fdb4d6279875c7d6daba6baa7a9";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz";
+        sha1 = "326c5f507fbb055f54116782b969a81b67a29da7";
       };
     };
     "compression-1.5.2" = {
@@ -5944,22 +5557,13 @@ let
         sha1 = "708978624d856af41a5a741defdd261da752c266";
       };
     };
-    "concat-stream-1.6.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
-      };
-    };
     "concat-stream-1.6.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
       };
     };
     "conf-1.4.0" = {
@@ -5968,7 +5572,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz";
-        sha512 = "07g80zfanxf96as7ikxbv6csskj2033zw2hj8jpii0s3wqxjyq1x73fk1bqnj833clsmmiz6khcvid668gji5vsnhgb67ck5mcmafbg";
+        sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
       };
     };
     "config-0.4.15" = {
@@ -6013,7 +5617,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz";
-        sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy";
+        sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==";
       };
     };
     "connect-1.9.2" = {
@@ -6097,13 +5701,13 @@ let
         sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
       };
     };
-    "connect-multiparty-2.1.0" = {
+    "connect-multiparty-2.1.1" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz";
-        sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c";
+        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.1.tgz";
+        sha1 = "6ee8212fdb2204d3f135f8c12e3afa495d181fd7";
       };
     };
     "connect-pause-0.1.1" = {
@@ -6193,7 +5797,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz";
-        sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9";
+        sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==";
       };
     };
     "constants-browserify-1.0.0" = {
@@ -6247,7 +5851,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
-        sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
+        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
       };
     };
     "content-type-git+https://github.com/wikimedia/content-type#master" = {
@@ -6284,7 +5888,7 @@ let
       version = "1.1.24";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz";
-        sha512 = "3ap10i691k1bd6kslyrxrlrcqzdgdv1mibnraknwvls1n1kcbw77w9d6sljjdan766bhx0md07gz6ihjwsk3s3vhiw7cqvqrd914ryr";
+        sha512 = "2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==";
       };
     };
     "conventional-changelog-angular-1.6.6" = {
@@ -6293,7 +5897,7 @@ let
       version = "1.6.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz";
-        sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j";
+        sha512 = "suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==";
       };
     };
     "conventional-changelog-atom-0.2.8" = {
@@ -6302,7 +5906,7 @@ let
       version = "0.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz";
-        sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj";
+        sha512 = "8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==";
       };
     };
     "conventional-changelog-cli-1.3.22" = {
@@ -6311,7 +5915,7 @@ let
       version = "1.3.22";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz";
-        sha512 = "1kb6qrs4myjknqg4cpl530gxzbainsvhrzg6hm6xhdjhprby9flw28y92cbimq9cqpc6qq2bldzbnlxf1yzq5yhamwld3pijqhdsy56";
+        sha512 = "pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg==";
       };
     };
     "conventional-changelog-codemirror-0.3.8" = {
@@ -6320,7 +5924,7 @@ let
       version = "0.3.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz";
-        sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw";
+        sha512 = "3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==";
       };
     };
     "conventional-changelog-core-2.0.11" = {
@@ -6329,7 +5933,7 @@ let
       version = "2.0.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz";
-        sha512 = "13c6y0mi0wqrx2rklaiqn2dxy9bsn53fb0w1r7072y8fp2cbnwdvijn8b42qidrmzcbbpcgn4pcx05h9ghl3vak6izlcy3a37lw9x0y";
+        sha512 = "HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==";
       };
     };
     "conventional-changelog-ember-0.3.12" = {
@@ -6338,7 +5942,7 @@ let
       version = "0.3.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz";
-        sha512 = "2hi3q231r8izwb8863rcmm3craji5glcr8icm0ijxa8jdlanshghdb5pnqrqay09kjkaiff9qxpnggb4b1p8gazg2mb6vmkpc1p6qls";
+        sha512 = "mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==";
       };
     };
     "conventional-changelog-eslint-1.0.9" = {
@@ -6347,7 +5951,7 @@ let
       version = "1.0.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz";
-        sha512 = "3nl1q7m2f7yf8fr40dpns2x6n9z3n8m4kd74fxn2z4d0v0dp2si3h2xbg339984wyfa1ina5w61n6q8n1pcybwjghyxjzbnb1yygkl7";
+        sha512 = "h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==";
       };
     };
     "conventional-changelog-express-0.3.6" = {
@@ -6356,7 +5960,7 @@ let
       version = "0.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz";
-        sha512 = "3qvnznizyjsb4nxznraiw24wydli7ky95905792az7mgm4dpc0hhxg6l9n5jlx5saglig9sm2gi3i0grqy39plvkp8ikxar2as9a9fy";
+        sha512 = "3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==";
       };
     };
     "conventional-changelog-jquery-0.1.0" = {
@@ -6383,7 +5987,7 @@ let
       version = "0.3.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz";
-        sha512 = "25274wd4xzrjinpfglybkna5wm74wnfqhyll32ixz8fnq43gg50b99ip2sj17nqd5x9a5l111d0922gqv9j93q2sdwrbzs8hr9m0zw6";
+        sha512 = "hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==";
       };
     };
     "conventional-changelog-preset-loader-1.1.8" = {
@@ -6392,7 +5996,7 @@ let
       version = "1.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz";
-        sha512 = "1rl5rdcffc9nr30wxf718hl5qkcnb5hi5d85rchw48v2gyjbw371910qcd9v7pwfc9isrg1xxg8npnq2lxnv31xjp6dlqdqh4rjqj9j";
+        sha512 = "MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==";
       };
     };
     "conventional-changelog-writer-3.0.9" = {
@@ -6401,7 +6005,7 @@ let
       version = "3.0.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz";
-        sha512 = "3ypk00r7ddkzx8ayyzdss65167c8h4qgn7f0m2p7zif0sw55ljpbx07zr0hmw8rkyzq0dv7ydr5l14wa60c1fkja8n19ia936rrpllz";
+        sha512 = "n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==";
       };
     };
     "conventional-commits-filter-1.1.6" = {
@@ -6410,7 +6014,7 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz";
-        sha512 = "38pzjvxmmjg6y92qyskzpxngphp9s5lxy89ldq9mwx4dcy4n8am2d57j1w4gb7h2fkggbfy5744xrj7ycz2v5afr8hj892a4jsf1h19";
+        sha512 = "KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==";
       };
     };
     "conventional-commits-parser-2.1.7" = {
@@ -6419,7 +6023,7 @@ let
       version = "2.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz";
-        sha512 = "0ahfqxbkswm1pnbj477wz7kl2588dbg8skjz7xzyykv4w2bw9aal3idvs8kjchlv140s64jcfa2clli93phw4jk85wa09q4s9sim0q6";
+        sha512 = "BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==";
       };
     };
     "conventional-recommended-bump-1.2.1" = {
@@ -6428,7 +6032,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz";
-        sha512 = "3irsgzxrhc2s4y4mlq7vmrvrhn74kpda34sn2ladm98q4gy88l7dpqxs8xf6lxm4sai5qqwzxk1gzlrfgvsrmfzzvmxk0hi77lcd650";
+        sha512 = "oJjG6DkRgtnr/t/VrPdzmf4XZv8c4xKVJrVT4zrSHd92KEL+EYxSbYoKq8lQ7U5yLMw7130wrcQTLRjM/T+d4w==";
       };
     };
     "convert-source-map-1.1.3" = {
@@ -6563,7 +6167,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.1.0.tgz";
-        sha512 = "3h44zl7m31c7zzyyc3lxzckqyz6rmg5xydp2clpnf2vm3928garan768x7pmh1n52xnpgwdlkz78cfsy9spg93wpbg4xav0spbyqnq2";
+        sha512 = "Alvs19Vgq07eunykd3Xy2jF0/qSNv2u7KDbAek9H5liV1UMijbqFs5cycZvv5dVsvseT/U4H8/7/w8Koh35C4A==";
       };
     };
     "cookiejar-2.0.1" = {
@@ -6575,13 +6179,13 @@ let
         sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
       };
     };
-    "cookiejar-2.1.1" = {
+    "cookiejar-2.1.2" = {
       name = "cookiejar";
       packageName = "cookiejar";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
-        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz";
+        sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==";
       };
     };
     "cookies-0.7.1" = {
@@ -6599,7 +6203,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
+        sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==";
       };
     };
     "copy-descriptor-0.1.1" = {
@@ -6620,13 +6224,13 @@ let
         sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f";
       };
     };
-    "cordova-common-2.2.1" = {
+    "cordova-common-2.2.4" = {
       name = "cordova-common";
       packageName = "cordova-common";
-      version = "2.2.1";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz";
-        sha1 = "7009bc591729caa7285a588cfd6a7b54cd834f0c";
+        url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.4.tgz";
+        sha512 = "tL6cfygm2EUU658Id4ROs/BFETvxFKX1gj8rxoXOWR1xxzPtXfgvjiqmMBsUIbBgIZomsq09Xj48qkU7xHBJ1Q==";
       };
     };
     "cordova-create-1.1.2" = {
@@ -6647,13 +6251,13 @@ let
         sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea";
       };
     };
-    "cordova-js-4.2.2" = {
+    "cordova-js-4.2.4" = {
       name = "cordova-js";
       packageName = "cordova-js";
-      version = "4.2.2";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz";
-        sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92";
+        url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.4.tgz";
+        sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw==";
       };
     };
     "cordova-lib-8.0.0" = {
@@ -6674,31 +6278,22 @@ let
         sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
       };
     };
-    "cordova-serve-2.0.0" = {
+    "cordova-serve-2.0.1" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz";
-        sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43";
-      };
-    };
-    "core-js-1.2.7" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "1.2.7";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz";
-        sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz";
+        sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g==";
       };
     };
-    "core-js-2.5.6" = {
+    "core-js-2.5.7" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.5.6";
+      version = "2.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz";
-        sha512 = "14myrl8hdl6z51ziv7l8326pyxfr51pil9s2glynqcj9vfpr37b9jkz9pshpb1jk7qg2wwg59hfxxqjr6x8wwhsvfqvhs5l11yia1cm";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
+        sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -6797,7 +6392,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
-        sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r";
+        sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==";
       };
     };
     "create-error-class-3.0.2" = {
@@ -6815,7 +6410,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
-        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
+        sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
       };
     };
     "create-hmac-1.1.7" = {
@@ -6824,16 +6419,16 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
-        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
+        sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
-    "create-torrent-3.31.0" = {
+    "create-torrent-3.32.0" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "3.31.0";
+      version = "3.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.31.0.tgz";
-        sha512 = "1na322prpyqfv81davvqya3rs9pv99rsh611kvqfaps96izmysyw7ppfm3n8qj94y4z6ib8mjs591f6vhdx501v0nqv27pn09qbsfnh";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.0.tgz";
+        sha512 = "l9chXj5LLyVFfPF6nFCWlm5/Wt+04d+mXUpG5LJAogeyRruWfjnUozfmQspAi6iW91ibp7qKBuFMPJViz5lp1Q==";
       };
     };
     "cron-1.3.0" = {
@@ -6842,7 +6437,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz";
-        sha512 = "3iq9zg5plipbybssrb38lhlqdp1p4mbrmvp92zc477z9ck9k90dnxwgssjzb2a572g801q3c75mwy5hmx1ccmiqf5in6ck0k7n8bx1b";
+        sha512 = "K/SF7JlgMmNjcThWxkKvsHhey2EDB4CeOEWJ9aXWj3fbQJppsvTPIeyLdHfNq5IbbsMUUjRW1nr5dSO95f2E4w==";
       };
     };
     "cross-spawn-4.0.0" = {
@@ -6878,7 +6473,7 @@ let
       version = "6.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
-        sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr";
+        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
     "cross-spawn-async-2.2.5" = {
@@ -6908,15 +6503,6 @@ let
         sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d";
       };
     };
-    "crypt-0.0.2" = {
-      name = "crypt";
-      packageName = "crypt";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz";
-        sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
-      };
-    };
     "crypt3-0.2.0" = {
       name = "crypt3";
       packageName = "crypt3";
@@ -6968,7 +6554,7 @@ let
       version = "3.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
-        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
+        sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
       };
     };
     "crypto-random-string-1.0.0" = {
@@ -7004,7 +6590,7 @@ let
       version = "2.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/css/-/css-2.2.3.tgz";
-        sha512 = "06kcn1y3dxxxi5xrc62aal04r56rrghjy3ipy54srxrqr9pg3q020i6yf2pfbcgzk758ln76g9yayfs4q78g2rj343380hwczapnvfi";
+        sha512 = "0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==";
       };
     };
     "css-parse-1.0.4" = {
@@ -7061,13 +6647,13 @@ let
         sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
       };
     };
-    "css-tree-1.0.0-alpha.27" = {
+    "css-tree-1.0.0-alpha.29" = {
       name = "css-tree";
       packageName = "css-tree";
-      version = "1.0.0-alpha.27";
+      version = "1.0.0-alpha.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.27.tgz";
-        sha512 = "08x63k8gxl9wgq7lljw7q5mlhwbcifkg7f6yakqcj8wfwv3xq5vj2glhrq826pbxi4az53akc76a6c4vhqablgvipbk5qldbks2j1h4";
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz";
+        sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==";
       };
     };
     "css-tree-1.0.0-alpha25" = {
@@ -7076,7 +6662,7 @@ let
       version = "1.0.0-alpha25";
       src = fetchurl {
         url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz";
-        sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw";
+        sha512 = "XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A==";
       };
     };
     "css-url-regex-1.1.0" = {
@@ -7106,13 +6692,31 @@ let
         sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805";
       };
     };
-    "csso-3.5.0" = {
+    "csso-3.5.1" = {
       name = "csso";
       packageName = "csso";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-3.5.0.tgz";
-        sha512 = "0rxlhy2ha4xjnw27ha5q8crvpqwydnhb4xnnsj2ba8i1r09n864ygl76lcjgnpnqp1qj5930qz8gnq76pwy6sr6hrb2gcfrzla67ljs";
+        url = "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz";
+        sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==";
+      };
+    };
+    "cssom-0.3.3" = {
+      name = "cssom";
+      packageName = "cssom";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.3.tgz";
+        sha512 = "pjE/I/NSp3iyeoxXN5QaoJpgzYUMj2dJHx9OSufoTliJLDx+kuOQaMCJW8OwvrKJswhXUHnHN6eUmUSETN0msg==";
+      };
+    };
+    "cssstyle-0.2.37" = {
+      name = "cssstyle";
+      packageName = "cssstyle";
+      version = "0.2.37";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz";
+        sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
       };
     };
     "csurf-1.8.3" = {
@@ -7205,13 +6809,13 @@ let
         sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
       };
     };
-    "cvss-1.0.2" = {
+    "cvss-1.0.3" = {
       name = "cvss";
       packageName = "cvss";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cvss/-/cvss-1.0.2.tgz";
-        sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6";
+        url = "https://registry.npmjs.org/cvss/-/cvss-1.0.3.tgz";
+        sha512 = "1FfNhEFVfeC+fgZpEr6oCOOTXifJicZS+Lq/mmUKI4Om+2O8zYspc/uhw51He+CTM5givI1dqIw5JUqyi1BWtA==";
       };
     };
     "cycle-1.0.3" = {
@@ -7295,13 +6899,13 @@ let
         sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf";
       };
     };
-    "dat-dns-1.3.2" = {
+    "dat-dns-3.0.1" = {
       name = "dat-dns";
       packageName = "dat-dns";
-      version = "1.3.2";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-dns/-/dat-dns-1.3.2.tgz";
-        sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad";
+        url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz";
+        sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA==";
       };
     };
     "dat-doctor-1.4.0" = {
@@ -7310,7 +6914,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz";
-        sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl";
+        sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q==";
       };
     };
     "dat-encoding-4.0.2" = {
@@ -7328,7 +6932,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz";
-        sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w";
+        sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA==";
       };
     };
     "dat-ignore-2.1.1" = {
@@ -7337,7 +6941,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz";
-        sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d";
+        sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q==";
       };
     };
     "dat-json-1.0.2" = {
@@ -7346,16 +6950,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz";
-        sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi";
+        sha512 = "EZq+VeE/tM7FGygMVZx3hsMVm7zW3qxhuUYCNtLONaZptqXz4laB5cIWHydmeEn6sl3RZatZqpIuWRu4xDYxIg==";
       };
     };
-    "dat-link-resolve-2.1.1" = {
+    "dat-link-resolve-2.2.0" = {
       name = "dat-link-resolve";
       packageName = "dat-link-resolve";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.1.tgz";
-        sha512 = "3rchn6ap0ma8ij6qcvf74csbhn41nn5xpyzkf9cabr8fmzbj406iz4vvf0hqq473nfpyrvs1ffw2k3bqp4lv1nb98n39m2f5g3f14zp";
+        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.2.0.tgz";
+        sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA==";
       };
     };
     "dat-log-1.1.1" = {
@@ -7367,13 +6971,13 @@ let
         sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8";
       };
     };
-    "dat-node-3.5.8" = {
+    "dat-node-3.5.9" = {
       name = "dat-node";
       packageName = "dat-node";
-      version = "3.5.8";
+      version = "3.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz";
-        sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc";
+        url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz";
+        sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA==";
       };
     };
     "dat-registry-4.0.0" = {
@@ -7382,7 +6986,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz";
-        sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988";
+        sha512 = "CKV7j8kwWNBW2Oacdbf5x0ihxMfPNN8wcKHHmx5UjE4iyaOnfnTwCqTGM5rFoMleXKOGWpB7uCKQa0qpvzmCIA==";
       };
     };
     "dat-secret-storage-4.0.1" = {
@@ -7391,7 +6995,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz";
-        sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05";
+        sha512 = "BUhemnKpXUhKNl/1DuUwfFUyjzomlNF940uHPsOa3okmYu9z6mrp/EGQsLO3lO0YQomDUqS0G0DmHTse9vTU1A==";
       };
     };
     "dat-storage-1.0.4" = {
@@ -7400,7 +7004,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz";
-        sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c";
+        sha512 = "THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg==";
       };
     };
     "dat-swarm-defaults-1.0.1" = {
@@ -7409,7 +7013,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz";
-        sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag";
+        sha512 = "T2WlO7BVmN9USchefsP8entQiByIlJLGuzHLL9qEqOBkyKB8p0Y7XPWxP8dcL43+SkeoxU5NVe7O0bsi3xL8Jg==";
       };
     };
     "data-uri-to-buffer-1.2.0" = {
@@ -7418,7 +7022,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz";
-        sha512 = "18vh45y1sdi44vwca9js1hpy9mjwb641dwnc0fm9y2x3pgivzjndjksrlpk65kp5g99lsy2z2m8a4907bj11118c95m2dqg6h6kv95w";
+        sha512 = "vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==";
       };
     };
     "date-format-1.2.0" = {
@@ -7472,7 +7076,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz";
-        sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g";
+        sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
       };
     };
     "debounce-1.1.0" = {
@@ -7481,7 +7085,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debounce/-/debounce-1.1.0.tgz";
-        sha512 = "10r1pg8azrc8k3sfc6kslhcnpjl0acgv0fvpmd6q01vxbi496hnxnjx1i7fs66f598g4qzy2h079kzh18qpf9wxsz1ighb52myll1b5";
+        sha512 = "ZQVKfRVlwRfD150ndzEK8M90ABT+Y/JQKs4Y7U4MXdpuoUkkrr4DwKbVux3YjylA5bUMUj0Nc3pMxPJX6N2QQQ==";
       };
     };
     "debounced-seeker-1.0.0" = {
@@ -7562,7 +7166,7 @@ let
       version = "2.6.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
-        sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
     "debug-3.1.0" = {
@@ -7571,7 +7175,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
     "debug-fabulous-1.1.0" = {
@@ -7580,7 +7184,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz";
-        sha512 = "0pf8q2xxbqj1a6pjkwfwsd9xz8aqihmmkdykdqb02zkh0ldshbhkfl3yvi0vjhw8150cxmpi0r4i4aiczm8bl233lkmadhai0caz6hr";
+        sha512 = "GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==";
       };
     };
     "decamelize-1.2.0" = {
@@ -7598,7 +7202,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz";
-        sha512 = "0zc3slyk7cc9xjfcnw3nk2d1vkq4kxrjalavqgp3zykbgnp5v12xcs47kr436k0izbzyxhkrdww94p5g1lcmzcdqncc9p0mqzk6jji2";
+        sha512 = "Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==";
       };
     };
     "decamelize-keys-1.1.0" = {
@@ -7610,13 +7214,13 @@ let
         sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9";
       };
     };
-    "decimal.js-10.0.0" = {
+    "decimal.js-10.0.1" = {
       name = "decimal.js";
       packageName = "decimal.js";
-      version = "10.0.0";
+      version = "10.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.0.tgz";
-        sha512 = "1zfwp3adsdq838zcpkpm59x7kdqny1lcdk04r7fw28zy3va4jpjkrkpyyz7ifnzazpks9ky9mjb2xdrkx07nzrh909nzasps0aplcm1";
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.1.tgz";
+        sha512 = "vklWB5C4Cj423xnaOtsUmAv0/7GqlXIgDv2ZKDyR64OV3OSzGHNx2mk4p/1EKnB5s70k73cIOOEcG9YzF0q4Lw==";
       };
     };
     "decode-uri-component-0.2.0" = {
@@ -7652,7 +7256,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz";
-        sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5";
+        sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==";
       };
     };
     "decompress-tarbz2-4.1.1" = {
@@ -7661,7 +7265,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz";
-        sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk";
+        sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==";
       };
     };
     "decompress-targz-4.1.1" = {
@@ -7670,7 +7274,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz";
-        sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3";
+        sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==";
       };
     };
     "decompress-unzip-4.0.1" = {
@@ -7706,7 +7310,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz";
-        sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr";
+        sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==";
       };
     };
     "deep-equal-0.1.2" = {
@@ -7754,13 +7358,13 @@ let
         sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
-    "deep-extend-0.5.1" = {
+    "deep-extend-0.6.0" = {
       name = "deep-extend";
       packageName = "deep-extend";
-      version = "0.5.1";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
-        sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
     "deep-is-0.1.3" = {
@@ -7787,7 +7391,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz";
-        sha512 = "2zs0sn06vr11mwi2xg2vns26s07gajx2s94hnpfab8g6fl7wmnwbg14fvi2ificasppcmy8g2dh1xiijxg6r8gilkjhsz40lbdmkks3";
+        sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw==";
       };
     };
     "default-browser-id-1.0.4" = {
@@ -7859,7 +7463,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
-        sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg";
+        sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
       };
     };
     "defined-0.0.0" = {
@@ -8060,22 +7664,13 @@ let
         sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
       };
     };
-    "detect-port-1.2.2" = {
-      name = "detect-port";
-      packageName = "detect-port";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz";
-        sha512 = "2q44vf4c9rqz21wc7a1pj1xz6pa2s7sp2fz9zxksmz679xh8sbfzyzhgkkbyznsgbnif013n0a6387dppcs370gdkc0dhh2jgsgv8fk";
-      };
-    };
     "detective-4.7.1" = {
       name = "detective";
       packageName = "detective";
       version = "4.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz";
-        sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz";
+        sha512 = "H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==";
       };
     };
     "detective-5.1.0" = {
@@ -8084,7 +7679,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz";
-        sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac";
+        sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==";
       };
     };
     "di-0.0.1" = {
@@ -8138,7 +7733,7 @@ let
       version = "3.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
-        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
+        sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
     "diff2html-2.3.3" = {
@@ -8156,7 +7751,7 @@ let
       version = "5.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
-        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
+        sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
     "difflib-0.2.4" = {
@@ -8174,7 +7769,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz";
-        sha512 = "1m705yfirf97v4w87gfvylhhq9jlwjsgfp5x0p0cp33mc180ldmvgbs06zmr7by48d7r01n3awx4xz3m3vzba99gqww1wgka2na5fnz";
+        sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==";
       };
     };
     "director-1.2.7" = {
@@ -8201,7 +7796,7 @@ let
       version = "5.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz";
-        sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h";
+        sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw==";
       };
     };
     "discovery-swarm-4.4.2" = {
@@ -8213,13 +7808,22 @@ let
         sha1 = "5d3160a46019e50e874195765df7d601ee55a813";
       };
     };
-    "dispensary-0.16.0" = {
+    "discovery-swarm-5.1.1" = {
+      name = "discovery-swarm";
+      packageName = "discovery-swarm";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz";
+        sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA==";
+      };
+    };
+    "dispensary-0.18.0" = {
       name = "dispensary";
       packageName = "dispensary";
-      version = "0.16.0";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.16.0.tgz";
-        sha1 = "7173f2828380135e3c8eb9f61719fa038c0cd133";
+        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.18.0.tgz";
+        sha512 = "ikVxjigcj4leoPgjqYcHV1YhmLEZ5eXMq30CIPTf1BniWrH1C0X35F5iVCa4U2/JXZYcQJyHWniSRSOpM+hiNw==";
       };
     };
     "diveSync-0.3.0" = {
@@ -8246,7 +7850,7 @@ let
       version = "0.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/dnd-page-scroll/-/dnd-page-scroll-0.0.4.tgz";
-        sha512 = "29fmw2g96bpgniybrcvpic1s5bwffgrckiasf479q7lrgca1b8726rr6kwymwsg7d702dgnvii6fjl48pvsfs4jp2svk5mjj15x9y3f";
+        sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg==";
       };
     };
     "dns-discovery-5.6.1" = {
@@ -8255,7 +7859,7 @@ let
       version = "5.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz";
-        sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg";
+        sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA==";
       };
     };
     "dns-discovery-6.1.0" = {
@@ -8264,7 +7868,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz";
-        sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a";
+        sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ==";
       };
     };
     "dns-equal-1.0.0" = {
@@ -8291,7 +7895,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";
-        sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i";
+        sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==";
       };
     };
     "dns-packet-4.2.0" = {
@@ -8300,7 +7904,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz";
-        sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf";
+        sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw==";
       };
     };
     "dns-socket-1.6.3" = {
@@ -8309,7 +7913,7 @@ let
       version = "1.6.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz";
-        sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy";
+        sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng==";
       };
     };
     "dns-socket-3.0.0" = {
@@ -8318,7 +7922,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz";
-        sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k";
+        sha512 = "M0WkByoJ/mTm+HtwBQLsRJPe5uGIC/lYVOp+s6ZzhbZ5iq4GxjFyxYPQhB85dgCLvVb43aJQXHDC9aUgyKGc/Q==";
       };
     };
     "dns-txt-2.0.2" = {
@@ -8363,7 +7967,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz";
-        sha512 = "0iz6zh5d0kqs0ndd1ydsj4vaf2x3k3p0k5a7b75gsbhkqaqqq93dgsa2bpifvw7svck2sndd21mv7mp60q111rbghpssp0rxs9956fz";
+        sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
       };
     };
     "doctypes-1.1.0" = {
@@ -8408,7 +8012,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz";
-        sha512 = "3ckwbdpfa94f4kv5vav65l1qm56bg54bs2wgz9x5nx64avazbg3p07w05mjbfw066clq69vmyfg1fcph5r99i74x18l95zkcp4nk943";
+        sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==";
       };
     };
     "dom-walk-0.1.1" = {
@@ -8420,13 +8024,13 @@ let
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
-    "dom4-2.0.1" = {
+    "dom4-2.1.0" = {
       name = "dom4";
       packageName = "dom4";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dom4/-/dom4-2.0.1.tgz";
-        sha512 = "2kb9x9kskncvbrz6gnz7fyh0kg6x6vicly1x209c2lsrpfa5ghfzfwqzn06fqshmbjcglbv6g97anw8jmc5firj094ikk8wc6ib9wx5";
+        url = "https://registry.npmjs.org/dom4/-/dom4-2.1.0.tgz";
+        sha512 = "18oT+LfQaOT46/HmdB+t8A3+ROaN/sY/P0C9i0PyasmeuDq+iThh09gpI8rmt2ZA5B6KuHpuW2qURAZMjNs+gg==";
       };
     };
     "domain-browser-1.1.7" = {
@@ -8444,7 +8048,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
-        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
+        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
     "domelementtype-1.1.3" = {
@@ -8489,7 +8093,7 @@ let
       version = "2.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
-        sha512 = "307i53zii3hv9zr3skxhp9pxa09ki0xwx9q1k7mxnq3hanjanlpr1mmavfzz68r2h6cl1bnv2836plrhk02rpa7yfzrpdq73pib88i6";
+        sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
     "domino-1.0.30" = {
@@ -8498,7 +8102,7 @@ let
       version = "1.0.30";
       src = fetchurl {
         url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz";
-        sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla";
+        sha512 = "ikq8WiDSkICdkElud317F2Sigc6A3EDpWsxWBwIZqOl95km4p/Vc9Rj98id7qKgsjDmExj0AVM7JOd4bb647Xg==";
       };
     };
     "domutils-1.4.3" = {
@@ -8525,7 +8129,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz";
-        sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf";
+        sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
       };
     };
     "dot-prop-3.0.0" = {
@@ -8543,7 +8147,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
+        sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==";
       };
     };
     "double-ended-queue-2.1.0-0" = {
@@ -8579,7 +8183,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz";
-        sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z";
+        sha512 = "PwAUr0/w74AGB7bukOycXyLnDlt9Lfb3JzsliAWyZCHa/TvbuMYQvH1er2DWXHE4EuI/NjAzRXw+89Waynapgw==";
       };
     };
     "dreamopt-0.6.0" = {
@@ -8600,13 +8204,13 @@ let
         sha1 = "0b078d5517937d873101452d9146737557b75e51";
       };
     };
-    "dtrace-provider-0.8.6" = {
+    "dtrace-provider-0.8.7" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.6";
+      version = "0.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz";
-        sha1 = "428a223afe03425d2cd6d6347fdf40c66903563d";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz";
+        sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04";
       };
     };
     "duplexer-0.1.1" = {
@@ -8651,7 +8255,7 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
-        sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw";
+        sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==";
       };
     };
     "each-async-1.1.1" = {
@@ -8705,7 +8309,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz";
-        sha512 = "2sjxkrzsvswqsxb6jrq3p75g53szmx1hwwd5yhpkkx4857avz4yr0dvfqkshhxnx88an2gw00j6crbkc39q48zlpmplyzcwzp3sb20s";
+        sha512 = "Goilx/2cfU9vvfQjgtNgc2VmJAD8CasQ6rZDqCd2u4Hsyd/qFET6nBf60jiHodevR3nl3IGzNKtrzPXWP88utQ==";
       };
     };
     "editions-1.3.4" = {
@@ -8714,7 +8318,7 @@ let
       version = "1.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz";
-        sha512 = "196fp42k8j9d8cmi0sqjj6wfqcr7y0c9zcrfv1bcs38ipkn78ivg3xl2f33x3hfiqnyp3gb5y7ndkgqpw433jn5rb43qq37dkxahdl3";
+        sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==";
       };
     };
     "editor-1.0.0" = {
@@ -8732,7 +8336,7 @@ let
       version = "0.13.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz";
-        sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s";
+        sha512 = "WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==";
       };
     };
     "ee-first-1.1.0" = {
@@ -8771,15 +8375,6 @@ let
         sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a";
       };
     };
-    "electron-to-chromium-1.3.47" = {
-      name = "electron-to-chromium";
-      packageName = "electron-to-chromium";
-      version = "1.3.47";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz";
-        sha1 = "764e887ca9104d01a0ac8eabee7dfc0e2ce14104";
-      };
-    };
     "elegant-spinner-1.0.1" = {
       name = "elegant-spinner";
       packageName = "elegant-spinner";
@@ -8816,13 +8411,13 @@ let
         sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
-    "email-validator-2.0.3" = {
+    "email-validator-2.0.4" = {
       name = "email-validator";
       packageName = "email-validator";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.3.tgz";
-        sha1 = "33e50d66f526b97cd72c17205aefaec79c8a2a1e";
+        url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz";
+        sha512 = "gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==";
       };
     };
     "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = {
@@ -8922,7 +8517,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
-        sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl";
+        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
       };
     };
     "ends-with-0.2.0" = {
@@ -8949,7 +8544,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz";
-        sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g";
+        sha512 = "j1DWIcktw4hRwrv6nWx++5nFH2X64x16MAG2P0Lmi5Dvdfi3I+Jhc7JKJIdAmDJa+5aZ/imHV7dWRPy2Cqjh3A==";
       };
     };
     "engine.io-3.1.5" = {
@@ -8958,7 +8553,7 @@ let
       version = "3.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz";
-        sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg";
+        sha512 = "D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==";
       };
     };
     "engine.io-3.2.0" = {
@@ -8967,7 +8562,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz";
-        sha512 = "0mizbh339hvwkla9vy96m7jg92120wqm9af12ks998hrp2a0fzr3w0gxssjwhp0s0f3kyii24z1sz2x5xq9x3qb5cjn1q2h1fcf05lr";
+        sha512 = "mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==";
       };
     };
     "engine.io-client-1.3.1" = {
@@ -8985,7 +8580,7 @@ let
       version = "1.8.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz";
-        sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101";
+        sha512 = "AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg==";
       };
     };
     "engine.io-client-3.1.6" = {
@@ -8994,7 +8589,7 @@ let
       version = "3.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz";
-        sha512 = "1zfr0lycsgvwkxc8i4qhg5rjr59ss7p66nz3j1y1awmvzgy9myn0rqrpv2hrnm76qv9kmiiss0jpxaaz9xy0lkp7857npkfb6q8fyw6";
+        sha512 = "hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==";
       };
     };
     "engine.io-client-3.2.1" = {
@@ -9003,7 +8598,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz";
-        sha512 = "37x70wgsxmbz24ypn1nprgrmqrbjf5ln7xjivpw5q6rw91kj2mhjq81ai8v7zs6am25h2sajk341kid215gxrmy88iwwy2n5f9ip46b";
+        sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==";
       };
     };
     "engine.io-parser-1.0.6" = {
@@ -9030,7 +8625,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz";
-        sha512 = "0rjbixsn5qvjwklnvvjdfz4wy85dk82zkvh6lk3znbd3p3isgr57a5kikgndr3xhhkv5zzvh4bfxbz7gqfsgijscyiiilgw78bwp2bl";
+        sha512 = "dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==";
       };
     };
     "enhanced-resolve-2.3.0" = {
@@ -9042,13 +8637,13 @@ let
         sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
       };
     };
-    "enhanced-resolve-4.0.0" = {
+    "enhanced-resolve-4.1.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz";
-        sha512 = "3r1f41kk9dzckpghscy0q2j6qzmzckbv4mc83y5d4kxg2r458wgsimljpr0ycx6pvg8sjwwdhh8750h1wrl3m54svaqf6pncvmpz34f";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
+        sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==";
       };
     };
     "ensure-posix-path-1.0.2" = {
@@ -9111,7 +8706,7 @@ let
       version = "3.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz";
-        sha512 = "3m2wjc7aa1y0in84b3gg6c2r5cyzhbbcil9i09l2yh1vaw7mw8piziw9fpri3x2bzfrpjksm0sz715ki08nkgz65rrqzwyhlzxab8na";
+        sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g==";
       };
     };
     "errno-0.1.7" = {
@@ -9120,7 +8715,7 @@ let
       version = "0.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
-        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
       };
     };
     "error-7.0.2" = {
@@ -9132,13 +8727,13 @@ let
         sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
       };
     };
-    "error-ex-1.3.1" = {
+    "error-ex-1.3.2" = {
       name = "error-ex";
       packageName = "error-ex";
-      version = "1.3.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz";
-        sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc";
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
     "errorhandler-1.4.3" = {
@@ -9159,13 +8754,13 @@ let
         sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4";
       };
     };
-    "es-abstract-1.11.0" = {
+    "es-abstract-1.12.0" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.11.0";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz";
-        sha512 = "2aaq6ivy5raj1a99db6gvw7qn2vs27h0pqvgpf2fqfm9avwqsirr8gs86yx7n36qysjw1vabz6mlc8dfpi6fmz9yqvk8kapz49jnx36";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz";
+        sha512 = "C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==";
       };
     };
     "es-to-primitive-1.1.1" = {
@@ -9177,13 +8772,13 @@ let
         sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
       };
     };
-    "es5-ext-0.10.42" = {
+    "es5-ext-0.10.45" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.42";
+      version = "0.10.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz";
-        sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz";
+        sha512 = "FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==";
       };
     };
     "es5-ext-0.8.2" = {
@@ -9219,7 +8814,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz";
-        sha512 = "1b98y4j9fy6c2wm7ys3csnyfg8cn40sy2g958i45fdh5bnx1lkl19d4508aldabga5rm1q5hzxq68yjdyb8n6qxb8925x1b2cbzwvsj";
+        sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==";
       };
     };
     "es6-iterator-2.0.3" = {
@@ -9264,7 +8859,7 @@ let
       version = "4.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
-        sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw";
+        sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -9357,22 +8952,22 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "escodegen-1.8.1" = {
+    "escodegen-1.10.0" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.8.1";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz";
-        sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz";
+        sha512 = "fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==";
       };
     };
-    "escodegen-1.9.1" = {
+    "escodegen-1.8.1" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.9.1";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz";
-        sha512 = "3nl4jbvigqc5ax1f35b601vlca4fa4ghr27wfglgrmv7h5pssnkh7px0vjh8wzrkjvx8bw7c71b0axc307akkjd1vkl2nj0acxy657a";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz";
+        sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
     "escope-3.6.0" = {
@@ -9393,22 +8988,22 @@ let
         sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
       };
     };
-    "eslint-4.19.0" = {
+    "eslint-4.19.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.19.0";
+      version = "4.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz";
-        sha512 = "29dc1z24n3c60hfac5afy7rk3mqdch8hnn07fnb9314dbyk5ih2l1284vl3nsgsm5ja5w144nsgmipbycva47gwpl1qfsma5gjcpkdg";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz";
+        sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==";
       };
     };
-    "eslint-4.19.1" = {
+    "eslint-5.0.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.19.1";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz";
-        sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd";
+        url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz";
+        sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -9429,13 +9024,22 @@ let
         sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
       };
     };
+    "eslint-scope-4.0.0" = {
+      name = "eslint-scope";
+      packageName = "eslint-scope";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz";
+        sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==";
+      };
+    };
     "eslint-visitor-keys-1.0.0" = {
       name = "eslint-visitor-keys";
       packageName = "eslint-visitor-keys";
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
-        sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb";
+        sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==";
       };
     };
     "espree-3.5.4" = {
@@ -9444,7 +9048,16 @@ let
       version = "3.5.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
-        sha512 = "3a07jjjp8g8mdayw3n9l0p0llw7cfipjifan2ccyn2vm1zyafrmv5cj11rc6qmk7ibbq1vc4xxc3sfr54qpgxmxiizj0ck63d1hh1y8";
+        sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
+      };
+    };
+    "espree-4.0.0" = {
+      name = "espree";
+      packageName = "espree";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz";
+        sha512 = "kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==";
       };
     };
     "esprima-1.0.4" = {
@@ -9480,7 +9093,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
-        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
+        sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==";
       };
     };
     "esprima-fb-13001.1001.0-dev-harmony-fb" = {
@@ -9498,7 +9111,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz";
-        sha512 = "0s9lxfan3qbvpprj71ldy70x9sz4xkpakhr3pymkm13bx40px4kp4xcgipscn8m21qigddin5mkr52bicbm34g46dapyn68kikv4s2a";
+        sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==";
       };
     };
     "esrecurse-4.2.1" = {
@@ -9507,7 +9120,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
-        sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b";
+        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
       };
     };
     "estraverse-1.9.3" = {
@@ -9669,7 +9282,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz";
-        sha512 = "1q3lcjzcm6cva1avw6qkzynnk6rlcp0pblgxxliwry2z52rz9fy82wh630clfv12i64ygywca69hfbj3ki71hy1in94nqxzka32zwla";
+        sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==";
       };
     };
     "events-1.1.1" = {
@@ -9681,13 +9294,13 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
-    "events-2.0.0" = {
+    "events-2.1.0" = {
       name = "events";
       packageName = "events";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz";
-        sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg";
+        url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz";
+        sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==";
       };
     };
     "events.node-0.4.9" = {
@@ -9714,7 +9327,16 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
-        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
+        sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
+      };
+    };
+    "execa-0.1.1" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.1.1.tgz";
+        sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd";
       };
     };
     "execa-0.4.0" = {
@@ -9768,7 +9390,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz";
-        sha512 = "0p56mwdi80mzj4q8yb6s1abff3dwpl1s887jarp0fx3x3gz92qahnn28yqn0r351wflqsw4cqa4383965pm0pbgxwhhgf7p23vkn87j";
+        sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==";
       };
     };
     "exit-0.1.2" = {
@@ -9795,7 +9417,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
-        sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47";
+        sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==";
       };
     };
     "expand-braces-0.1.2" = {
@@ -9849,7 +9471,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz";
-        sha512 = "119ih63dfbnmhn97ymf3h1b9lch1byl13mr8m05hap0zqf0vqabalm7ya3iyypwabr3pmj23k7mq6sv0lqz2225qdgyca3wslpfmrki";
+        sha512 = "cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg==";
       };
     };
     "expand-tilde-2.0.2" = {
@@ -9966,7 +9588,7 @@ let
       version = "1.15.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz";
-        sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg";
+        sha512 = "r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==";
       };
     };
     "express-urlrewrite-1.2.0" = {
@@ -9984,7 +9606,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz";
-        sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v";
+        sha512 = "u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==";
       };
     };
     "ext-name-3.0.0" = {
@@ -10056,7 +9678,16 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
-        sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd";
+        sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==";
+      };
+    };
+    "external-editor-3.0.0" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz";
+        sha512 = "mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==";
       };
     };
     "extglob-0.3.2" = {
@@ -10074,7 +9705,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
-        sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
+        sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
       };
     };
     "extract-opts-3.3.1" = {
@@ -10095,13 +9726,13 @@ let
         sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
       };
     };
-    "extract-zip-1.6.6" = {
+    "extract-zip-1.6.7" = {
       name = "extract-zip";
       packageName = "extract-zip";
-      version = "1.6.6";
+      version = "1.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz";
-        sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c";
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz";
+        sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
       };
     };
     "extsprintf-1.0.0" = {
@@ -10191,7 +9822,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz";
-        sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9";
+        sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==";
       };
     };
     "fast-glob-2.2.2" = {
@@ -10200,7 +9831,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz";
-        sha512 = "3d1g989yj1zkkpdpkfkapaix394mrc1ix2pwfqc48s94c4amykykjxcg6s0crqavh01zaqvz2mh663ljsq95vq3a0kk9d4z4b2b67jd";
+        sha512 = "TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==";
       };
     };
     "fast-json-parse-1.0.3" = {
@@ -10209,7 +9840,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz";
-        sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m";
+        sha512 = "FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==";
       };
     };
     "fast-json-patch-0.5.6" = {
@@ -10263,7 +9894,16 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz";
-        sha512 = "2bhxs6r2hxpjfxj7ycbs3blbwbmq9nmwar4swzvhbiwcbmn721l8wk0ndyw9n3i1508rlhhm70a8fn9bpy8mx8f0ncqhqhh5pz175j0";
+        sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==";
+      };
+    };
+    "fast-url-parser-1.1.3" = {
+      name = "fast-url-parser";
+      packageName = "fast-url-parser";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz";
+        sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -10284,15 +9924,6 @@ let
         sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38";
       };
     };
-    "fbjs-0.8.16" = {
-      name = "fbjs";
-      packageName = "fbjs";
-      version = "0.8.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz";
-        sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db";
-      };
-    };
     "fd-read-stream-1.1.0" = {
       name = "fd-read-stream";
       packageName = "fd-read-stream";
@@ -10311,6 +9942,15 @@ let
         sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
       };
     };
+    "fd-slicer-1.1.0" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz";
+        sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e";
+      };
+    };
     "feedparser-2.2.9" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -10398,7 +10038,7 @@ let
       version = "6.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz";
-        sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0";
+        sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==";
       };
     };
     "file-uri-to-path-1.0.0" = {
@@ -10407,7 +10047,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
-        sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi";
+        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
       };
     };
     "filename-regex-2.0.1" = {
@@ -10428,22 +10068,13 @@ let
         sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229";
       };
     };
-    "filenamify-2.0.0" = {
+    "filenamify-2.1.0" = {
       name = "filenamify";
       packageName = "filenamify";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz";
-        sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695";
-      };
-    };
-    "filesize-3.6.1" = {
-      name = "filesize";
-      packageName = "filesize";
-      version = "3.6.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz";
-        sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c";
+        url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz";
+        sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==";
       };
     };
     "filestream-4.1.3" = {
@@ -10461,7 +10092,7 @@ let
       version = "2.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz";
-        sha512 = "3jpxxzv8ji9xqk6xwbr20nsl31jjqr5asnv0ayixyc3r393yv4r44b7lifpk1pqaw8clzs0cy7dnw9yb5axpg9ih7vfimzlp04xqykj";
+        sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==";
       };
     };
     "fill-range-4.0.0" = {
@@ -10533,7 +10164,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
-        sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3";
+        sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
       };
     };
     "find-cache-dir-1.0.0" = {
@@ -10551,7 +10182,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-1.0.2.tgz";
-        sha512 = "2hpc7v115prqkr487hxh0gllwvf0xa90lsb3i1azmrpfclp37vahxvdsqkr9pwvbcr7znccvhfgp1xy26czrmdcxzfl250a63dywyw2";
+        sha512 = "gnvu2zAKFEHd76zV/JkRvof7HNyM2X8yW5vflCfWbXeo9hmXMndz/SrEsTQFSXXgNqf0AdjhQSRPnG8JYR92oQ==";
       };
     };
     "find-index-0.1.1" = {
@@ -10590,13 +10221,22 @@ let
         sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
       };
     };
-    "find-versions-1.2.1" = {
+    "find-up-3.0.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+      };
+    };
+    "find-versions-2.0.0" = {
       name = "find-versions";
       packageName = "find-versions";
-      version = "1.2.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz";
-        sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62";
+        url = "https://registry.npmjs.org/find-versions/-/find-versions-2.0.0.tgz";
+        sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c";
       };
     };
     "findit-1.2.0" = {
@@ -10650,7 +10290,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz";
-        sha512 = "2l8ynyw9d8c738q8m19qia09kaflqri5k8dx7z3rp3xv4aa338byrhqdmycxf4if11rr89zbssrib40jxlrks2nph3hm3w00zhh8hn1";
+        sha512 = "wUIE4QeAjwoHvFbomWmXgKyYtV4/oZxDcJG4znxtGGa/0BhKkd3HzeOf3tAsMWPq1ExARZxCRRiNw1BL3FuPqA==";
       };
     };
     "first-chunk-stream-1.0.0" = {
@@ -10725,13 +10365,13 @@ let
         sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
       };
     };
-    "flatstr-1.0.5" = {
+    "flatstr-1.0.8" = {
       name = "flatstr";
       packageName = "flatstr";
-      version = "1.0.5";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz";
-        sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3";
+        url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.8.tgz";
+        sha512 = "YXblbv/vc1zuVVUtnKl1hPqqk7TalZCppnKE7Pr8FI/Rp48vzckS/4SJ4Y9O9RNiI82Vcw/FydmtqdQOg1Dpqw==";
       };
     };
     "flatten-0.0.1" = {
@@ -10761,13 +10401,13 @@ let
         sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74";
       };
     };
-    "fluent-syntax-0.6.6" = {
+    "fluent-syntax-0.7.0" = {
       name = "fluent-syntax";
       packageName = "fluent-syntax";
-      version = "0.6.6";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.6.6.tgz";
-        sha512 = "18dv619kjzc3fdahfc242r7lb27a3pjxx5xd8shascb9xb8c1zncsrbnj0an8qjsg1pwf0az7h7gv5v0g50b3pixznr7wk7d8yqfazj";
+        url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.7.0.tgz";
+        sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg==";
       };
     };
     "flush-write-stream-1.0.3" = {
@@ -10776,7 +10416,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz";
-        sha512 = "0dycj5bh8djmx4lj5llrbg3cg0ynq32qn8pzk8zl9j8pm6nv5n1qzk4m7dq81q96ygzh8jl9chqh8826rrbl8maa9643fvl5lq5kabi";
+        sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==";
       };
     };
     "follow-redirects-0.0.3" = {
@@ -10803,16 +10443,25 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz";
-        sha512 = "2z7ai3f3g9j48z90kds4070nb8v2q02n7131c2zjplb0zfjxjrd1m2fm8ykg7psj8fiwc4iidn2g9rr2w09qijbssddr0p8acyiw5mv";
+        sha512 = "uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==";
       };
     };
-    "for-each-0.3.2" = {
+    "follow-redirects-1.5.0" = {
+      name = "follow-redirects";
+      packageName = "follow-redirects";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz";
+        sha512 = "fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==";
+      };
+    };
+    "for-each-0.3.3" = {
       name = "for-each";
       packageName = "for-each";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz";
-        sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4";
+        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz";
+        sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==";
       };
     };
     "for-in-0.1.8" = {
@@ -10983,7 +10632,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
-        sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn";
+        sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
       };
     };
     "forwarded-0.1.2" = {
@@ -11091,7 +10740,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.7.0.tgz";
-        sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a";
+        sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw==";
       };
     };
     "fs-constants-1.0.0" = {
@@ -11100,7 +10749,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
-        sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb";
+        sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==";
       };
     };
     "fs-ext-0.6.0" = {
@@ -11172,7 +10821,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
-        sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb";
+        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
       };
     };
     "fs-extra-5.0.0" = {
@@ -11181,7 +10830,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz";
-        sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb";
+        sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==";
       };
     };
     "fs-minipass-1.2.5" = {
@@ -11190,7 +10839,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";
-        sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416";
+        sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==";
       };
     };
     "fs-mkdirp-stream-1.0.0" = {
@@ -11244,7 +10893,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz";
-        sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
+        sha512 = "Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==";
       };
     };
     "fsevents-1.2.4" = {
@@ -11253,7 +10902,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
-        sha512 = "0vfzl6byj55zmi8xiqb9bqd5q0awlpgz4hsph9xzhzrd46did859d6fp5vydh7n4d0n1ph5q36smq6k3pjq6w5fxs0vx4xjv3yzrhfg";
+        sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==";
       };
     };
     "fstream-0.1.31" = {
@@ -11307,7 +10956,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
     "functional-red-black-tree-1.0.1" = {
@@ -11319,13 +10968,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "fx-runner-1.0.8" = {
+    "fx-runner-1.0.9" = {
       name = "fx-runner";
       packageName = "fx-runner";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz";
-        sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec";
+        url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.9.tgz";
+        sha1 = "7b23f3773dc76aacc42f11d9aff2769675cb63f0";
       };
     };
     "galaxy-0.1.12" = {
@@ -11409,6 +11058,15 @@ let
         sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e";
       };
     };
+    "get-assigned-identifiers-1.2.0" = {
+      name = "get-assigned-identifiers";
+      packageName = "get-assigned-identifiers";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz";
+        sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==";
+      };
+    };
     "get-browser-rtc-1.0.2" = {
       name = "get-browser-rtc";
       packageName = "get-browser-rtc";
@@ -11460,7 +11118,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz";
-        sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf";
+        sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==";
       };
     };
     "get-stdin-4.0.1" = {
@@ -11487,7 +11145,7 @@ let
       version = "6.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz";
-        sha512 = "3p9jcnfk7nqnw43xammn5v5z63nxrxgz675sn70q8sma9ick6wq2plbw8b9r5il5f8f9krdamp316rdxvwcm2j4jagvymrjmhfjv7lf";
+        sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==";
       };
     };
     "get-stream-2.3.1" = {
@@ -11514,7 +11172,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz";
-        sha512 = "05kycjr66hr3sj0q6y8qxsmav30vfr267m8n7dvj791n5r92svqykd1zzjly21lpsnavjqs60cqaz35mxgaqzx13amhffhrsgjzcgb4";
+        sha512 = "ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==";
       };
     };
     "get-value-2.0.6" = {
@@ -11526,13 +11184,13 @@ let
         sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
       };
     };
-    "getmac-1.4.1" = {
+    "getmac-1.4.3" = {
       name = "getmac";
       packageName = "getmac";
-      version = "1.4.1";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getmac/-/getmac-1.4.1.tgz";
-        sha512 = "0r7zqgvfiv3r6zy8fms9gdcf3a1r46kpf8pm5x7vwrc27vgv69ra244s89k73hb9rna6r3s9v20yzbwjmz2c13gh3s0bbd07zq7w2lr";
+        url = "https://registry.npmjs.org/getmac/-/getmac-1.4.3.tgz";
+        sha512 = "bOZafIX+19cCS5KUjHtlJPZW+4joMa5tISIk5CugjmlZE0zZtjwB59wm56JPXVy5ELivw7g4Z9TEI0EDa2CSwQ==";
       };
     };
     "getpass-0.1.7" = {
@@ -11568,7 +11226,7 @@ let
       version = "1.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz";
-        sha512 = "111718czypc8jr47xq3n5xvfwx6nib7y36bpb882id57sdhv49bfpdmkgxbrb524942rw3k6wq15128mlv4q8fbkh5g3wjhmgdhmyxj";
+        sha512 = "svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==";
       };
     };
     "git-remote-origin-url-2.0.0" = {
@@ -11595,7 +11253,7 @@ let
       version = "1.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz";
-        sha512 = "25114wyd4p8qn681l730d9s1wgh4kmvizin5361hx5qvpd82adi2fkjkvv289nk1vb6hx8q13ikhyc705hw8iag1b23zq37g4kfacfs";
+        sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==";
       };
     };
     "gitconfiglocal-1.0.0" = {
@@ -11631,7 +11289,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz";
-        sha512 = "3nya50972xq88vz4p5gqz63014dkwlp5f40cz1fgad4ifnhprpr4qlqvvi44qxs3arikyfm3ygmf3phyjq5lwkg7rr9ig9mk7prm1n0";
+        sha512 = "wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==";
       };
     };
     "glob-3.1.21" = {
@@ -11703,7 +11361,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
       };
     };
     "glob-base-0.3.0" = {
@@ -11733,6 +11391,24 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
+    "glob-slash-1.0.0" = {
+      name = "glob-slash";
+      packageName = "glob-slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz";
+        sha1 = "fe52efa433233f74a2fe64c7abb9bc848202ab95";
+      };
+    };
+    "glob-slasher-1.0.1" = {
+      name = "glob-slasher";
+      packageName = "glob-slasher";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz";
+        sha1 = "747a0e5bb222642ee10d3e05443e109493cb0f8e";
+      };
+    };
     "glob-stream-3.1.18" = {
       name = "glob-stream";
       packageName = "glob-stream";
@@ -11742,15 +11418,6 @@ let
         sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b";
       };
     };
-    "glob-stream-5.3.5" = {
-      name = "glob-stream";
-      packageName = "glob-stream";
-      version = "5.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz";
-        sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22";
-      };
-    };
     "glob-stream-6.1.0" = {
       name = "glob-stream";
       packageName = "glob-stream";
@@ -11830,7 +11497,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz";
-        sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h";
+        sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
       };
     };
     "global-paths-1.0.0" = {
@@ -11869,13 +11536,13 @@ let
         sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880";
       };
     };
-    "globals-11.5.0" = {
+    "globals-11.7.0" = {
       name = "globals";
       packageName = "globals";
-      version = "11.5.0";
+      version = "11.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz";
-        sha512 = "0lyc1vv873r8cgcxlnj32p6nhdbdsjash1kv2cb1chvawmbr0m83kl565iwhvjd3dyz4ba3d3mr80wa21sqj8hv77knsxiw8bx9z345";
+        url = "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz";
+        sha512 = "K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==";
       };
     };
     "globals-9.18.0" = {
@@ -11884,7 +11551,7 @@ let
       version = "9.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab";
+        sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
       };
     };
     "globby-5.0.0" = {
@@ -11911,7 +11578,7 @@ let
       version = "8.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz";
-        sha512 = "2kvb22azhxv632w6jbgssa2k29c3vwann1f7g3ra974lg41hcw4s7cbc8260y0kycv93nfvkxsc9wyycsl4xmfjbi5s170ij6ndijm0";
+        sha512 = "oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==";
       };
     };
     "globule-0.1.0" = {
@@ -11929,7 +11596,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz";
-        sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna";
+        sha512 = "ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==";
       };
     };
     "got-1.2.2" = {
@@ -11965,7 +11632,7 @@ let
       version = "7.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz";
-        sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
+        sha512 = "Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==";
       };
     };
     "got-8.3.1" = {
@@ -11974,7 +11641,7 @@ let
       version = "8.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz";
-        sha512 = "3by57aak00z7wr6h4sax941f2q8mmvcvy815wxm3lzzdkm8l6i6hxbapxxqzsl0mayv96mmlcqnzkx3axzzwk9yx4wr16yqp7wxf8mn";
+        sha512 = "tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w==";
       };
     };
     "graceful-fs-1.2.3" = {
@@ -12028,7 +11695,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz";
-        sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy";
+        sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==";
       };
     };
     "gray-matter-2.1.1" = {
@@ -12049,13 +11716,13 @@ let
         sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
       };
     };
-    "growl-1.10.3" = {
+    "growl-1.10.5" = {
       name = "growl";
       packageName = "growl";
-      version = "1.10.3";
+      version = "1.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz";
-        sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
+        url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz";
+        sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==";
       };
     };
     "growly-1.3.0" = {
@@ -12085,22 +11752,22 @@ let
         sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
       };
     };
-    "gulp-babel-6.1.3" = {
-      name = "gulp-babel";
-      packageName = "gulp-babel";
-      version = "6.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-babel/-/gulp-babel-6.1.3.tgz";
-        sha512 = "30pwc80sr470dxrjrikj17r3knnl8n4hdv8i07i8jwrq3siqvwnf5pbha23v3cxs2z9082mrwj1g13zy2mbmhk5ynwh7qpdg93pjvdn";
-      };
-    };
     "gulp-clean-css-3.9.4" = {
       name = "gulp-clean-css";
       packageName = "gulp-clean-css";
       version = "3.9.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.9.4.tgz";
-        sha512 = "1v2mrpipy2dh3fp6xc54dvzqyh7g0srsdi4fdj2icm309sg3lwpj8mdb7h7jlsiv39f3v5402a4w3dw92m3i19hsq3lycsnms7w1ilf";
+        sha512 = "jsbAj65WM08H1jCFOKpIvA1OlACk7OHS2FFTeeBZrSJ5OR1PJzAqi0I2R2LTWYN3oMd/N1JYN9cN2IS/8eYqdg==";
+      };
+    };
+    "gulp-jsonminify-1.1.0" = {
+      name = "gulp-jsonminify";
+      packageName = "gulp-jsonminify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-jsonminify/-/gulp-jsonminify-1.1.0.tgz";
+        sha512 = "nkqH5aRajfCGD8HB2yN+QSEQG0SMEpS7UyOp3HS966Og4DqUX0y8sPF5SU8uSsGLLLXbnHwyHbDkxauYO/pSpQ==";
       };
     };
     "gulp-less-3.5.0" = {
@@ -12109,25 +11776,7 @@ let
       version = "3.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz";
-        sha512 = "25zfq868z118rq2a1357zfzky1a4v4b5dp9ixny224v35vrbhylhbrn2a67viqf8hcw8k7byfh1c1q5bq69f8vdbk7d87fsx7pdh0hm";
-      };
-    };
-    "gulp-rename-1.2.3" = {
-      name = "gulp-rename";
-      packageName = "gulp-rename";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.3.tgz";
-        sha512 = "01v6g5dvnsxvzcwrw2m6kx3ghrpxmbwz4gwljm7qv9rhxhssssvy54llpib7b5i3iyjkb7mvy4a3lgcld7pxx9580wms9v380rlyrqa";
-      };
-    };
-    "gulp-sourcemaps-1.6.0" = {
-      name = "gulp-sourcemaps";
-      packageName = "gulp-sourcemaps";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz";
-        sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c";
+        sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw==";
       };
     };
     "gulp-sourcemaps-2.6.4" = {
@@ -12145,7 +11794,7 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz";
-        sha512 = "1a8d5paj4shqz5h8nirrkg61r3s33qh1577a78cw2fx70xfkbr0mq059ld9rxijr7dvvch4qsclj5790smjmx3rnvz795xn0vjff5hy";
+        sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA==";
       };
     };
     "gulp-uglify-3.0.0" = {
@@ -12238,13 +11887,13 @@ let
         sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
       };
     };
-    "has-1.0.1" = {
+    "has-1.0.3" = {
       name = "has";
       packageName = "has";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz";
-        sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28";
+        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
       };
     };
     "has-ansi-0.1.0" = {
@@ -12307,7 +11956,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz";
-        sha512 = "2gww5b6yd5yg2vl5wzdba3azfrfg5llbfppzw99j8jnx3yqz9zyjxr8ra8dm9cjnl9h0xq9dc3hxmx84ma3s9hg06g13gnj20mdclhv";
+        sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==";
       };
     };
     "has-color-0.1.7" = {
@@ -12388,7 +12037,7 @@ let
       version = "1.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz";
-        sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx";
+        sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
       };
     };
     "has-symbols-1.0.0" = {
@@ -12406,7 +12055,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz";
-        sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx";
+        sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==";
       };
     };
     "has-unicode-2.0.1" = {
@@ -12481,13 +12130,13 @@ let
         sha1 = "33b40777754c6432573c120cc3808bbd10d47f04";
       };
     };
-    "hash.js-1.1.3" = {
+    "hash.js-1.1.4" = {
       name = "hash.js";
       packageName = "hash.js";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
-        sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx";
+        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz";
+        sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==";
       };
     };
     "hasha-2.2.0" = {
@@ -12550,7 +12199,7 @@ let
       version = "6.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
-        sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als";
+        sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==";
       };
     };
     "he-1.1.1" = {
@@ -12649,7 +12298,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz";
-        sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
+        sha512 = "QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==";
       };
     };
     "hogan.js-3.0.2" = {
@@ -12688,13 +12337,13 @@ let
         sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
       };
     };
-    "hosted-git-info-2.6.0" = {
+    "hosted-git-info-2.6.1" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz";
-        sha512 = "1vi4baj130s7mladvb4rad9ka8nqzcwws9i1zaaplp0fdrmnfwjfbpq01cghha2c2frd2f900f07awglhbbyym0bpwmrph0hhhf11ll";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz";
+        sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==";
       };
     };
     "hot-shots-4.8.0" = {
@@ -12784,7 +12433,7 @@ let
       version = "3.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
-        sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75";
+        sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
     "http-errors-1.3.1" = {
@@ -12820,7 +12469,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz";
-        sha512 = "0xv0kpsablrjag5ci3qqwjf0hwvcp6yk0hgabv4im6ssanimgbr8yhzmyz4jd10sw5xhrimzhxp2xx34l8p6aryqxqqg0wnxlikbcgk";
+        sha512 = "87E1I+2Wg4dxxz4rcxElo3dxO/w1ZtgL1yA0Sb6vH3qU16vRKq1NjWQv9SCY3ly2OQROcoxHZOUpmelS+k6wOw==";
       };
     };
     "http-methods-0.1.0" = {
@@ -12832,13 +12481,13 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
-    "http-parser-js-0.4.12" = {
+    "http-parser-js-0.4.13" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.12";
+      version = "0.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz";
-        sha1 = "b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz";
+        sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137";
       };
     };
     "http-proxy-1.0.2" = {
@@ -12865,7 +12514,7 @@ let
       version = "1.17.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz";
-        sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd";
+        sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==";
       };
     };
     "http-proxy-agent-1.0.0" = {
@@ -12883,7 +12532,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
-        sha512 = "21cixh55jg0m41bhn1xh9pydf31jq4ip5j525hprkimg376jjxms69raxfbsryi0mzhmgw84g1nb3paqznb1l2ajy0zhnkvnl2dn0db";
+        sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
       };
     };
     "http-proxy-middleware-0.17.4" = {
@@ -12991,7 +12640,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz";
-        sha512 = "2arj581rpjpgky9cr5hh3asan2mh7825rwxy63mp02amw9w6vsi59bay0dwp72md28mmzrmahxc909v1r1ca6y6r3f5dryna95r7w0w";
+        sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==";
       };
     };
     "humanize-0.0.9" = {
@@ -13018,16 +12667,25 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz";
-        sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw";
+        sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==";
       };
     };
-    "hypercore-6.14.0" = {
+    "hypercore-6.17.1" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.14.0";
+      version = "6.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz";
-        sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz";
+        sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ==";
+      };
+    };
+    "hypercore-crypto-1.0.0" = {
+      name = "hypercore-crypto";
+      packageName = "hypercore-crypto";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-1.0.0.tgz";
+        sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw==";
       };
     };
     "hypercore-protocol-6.6.4" = {
@@ -13036,16 +12694,16 @@ let
       version = "6.6.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz";
-        sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm";
+        sha512 = "9TU7P+uve0e5v1ZiBx70DFhkpepW4iNSGYlZthK+Unm0EbZ+Yppc6clH7JTffPBNUMSnDrE552MfXMilpCHZMw==";
       };
     };
-    "hyperdrive-9.12.3" = {
+    "hyperdrive-9.14.0" = {
       name = "hyperdrive";
       packageName = "hyperdrive";
-      version = "9.12.3";
+      version = "9.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz";
-        sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3";
+        url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.0.tgz";
+        sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww==";
       };
     };
     "hyperdrive-http-4.2.2" = {
@@ -13054,7 +12712,7 @@ let
       version = "4.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz";
-        sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn";
+        sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw==";
       };
     };
     "hyperdrive-network-speed-2.1.0" = {
@@ -13063,7 +12721,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz";
-        sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296";
+        sha512 = "JolPS374h6oS1rmz1iebFfeDDvA2nAtiHbx9VJJGMgSDSx4Q77eeY09hDgZwY7KatSKUGWnnSyydSgVUb3+8Lw==";
       };
     };
     "hyperquest-2.1.3" = {
@@ -13072,7 +12730,7 @@ let
       version = "2.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/hyperquest/-/hyperquest-2.1.3.tgz";
-        sha512 = "2ppxy7nv5yzpc9bvycyd4k2znp9grxldqrpvjzkzssn62f6xx7rzcqgrq30iykm5j91l8xahr93bznynpj30h7h5f6zmv3qn0x86jvx";
+        sha512 = "fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw==";
       };
     };
     "i-0.3.6" = {
@@ -13135,7 +12793,7 @@ let
       version = "0.4.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
-        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
+        sha512 = "oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==";
       };
     };
     "iconv-lite-0.4.23" = {
@@ -13144,7 +12802,7 @@ let
       version = "0.4.23";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
-        sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x";
+        sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -13156,13 +12814,13 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "ieee754-1.1.11" = {
+    "ieee754-1.1.12" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.11";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz";
-        sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
+        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
       };
     };
     "ieee754-1.1.8" = {
@@ -13183,13 +12841,13 @@ let
         sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
       };
     };
-    "ignore-3.3.8" = {
+    "ignore-3.3.10" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.8";
+      version = "3.3.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz";
-        sha512 = "1pcaabfvizn9sa1m16vdnp2rn54fhkmaw4ayj2vb1amgsjn9w7yw64ac4km7avly142z4gzsgyv8g3im9d1qirlpvg0r18h8k2pwj55";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
+        sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
       };
     };
     "ignore-by-default-1.0.1" = {
@@ -13207,7 +12865,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
+        sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==";
       };
     };
     "image-size-0.5.5" = {
@@ -13243,7 +12901,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz";
-        sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1";
+        sha512 = "YQ1wdkSZeRhWNvlSyQGvn8d34tIChAYb/USZv08tHATBWOyfXIU7u2R/YieyCRZIVNUxB5G9Bq+aiyrep/zejQ==";
       };
     };
     "import-lazy-2.1.0" = {
@@ -13378,7 +13036,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "init-package-json-1.10.3" = {
@@ -13387,7 +13045,7 @@ let
       version = "1.10.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz";
-        sha512 = "0kkcy07hj1ck8xmwspn6x32k4j1c6j88wr7wq2kxb6cx9rml0b8ncglglkhcz0r7k417fshknm2vzrqm188yp18gdny7gahm1fa596c";
+        sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==";
       };
     };
     "ink-0.3.1" = {
@@ -13396,7 +13054,7 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz";
-        sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv";
+        sha512 = "e3JOOBLE6cDO2aWWkIYXXT7qhb9HN4mBHSiOj2Hv94VAMDiDb0J50koYtxY0tZBq9N117QENGoURmL+tunxQJw==";
       };
     };
     "ink-text-input-1.1.1" = {
@@ -13405,7 +13063,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.1.tgz";
-        sha512 = "3zdg79viy9vippnaj942c8scyk2nay9fqv3zbd681hfcvn082pxbhc7vszppd7k0fy74rd20s2ias98mi2qzhc6a6zm0p4vv6yybrkc";
+        sha512 = "bOblvdmbXFC/UYbBj0WsKGkVhQaiZXK8A/O0e7/eh8HVr0DAbuZgQKatPzZ2ySsrpmcaMUGSVPbeuJOPO53X/g==";
       };
     };
     "inline-source-map-0.6.2" = {
@@ -13423,7 +13081,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/innertext/-/innertext-1.0.3.tgz";
-        sha512 = "1ig0sy92zxyzynzi9d4g3wq1286sjs9xx6dpn10lmis6hpjh5266b0v8nzp2ry5x35ybfq9g60qjhy5pfyl26yzkbmv8vn8pv8kabk4";
+        sha512 = "ZC410b7IbrTrmt8bQb27xUOJgXkJu+XL6MVncb9FGyxjRIHyQqNjpSDY20zvSUttkAiYj0dait/67/sXyWvwYg==";
       };
     };
     "inquirer-0.10.1" = {
@@ -13468,7 +13126,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz";
-        sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47";
+        sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==";
       };
     };
     "inquirer-5.2.0" = {
@@ -13477,16 +13135,34 @@ let
       version = "5.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz";
-        sha512 = "18q95zmyca97iylvzibh193n81dp71yawcb56ib17inhq7g0nixmbx62j56bdv3d7lxsgwj8zw9zcmmhzjivx3wlb3b6a60jsf6dl0k";
+        sha512 = "E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==";
       };
     };
-    "insert-module-globals-7.1.0" = {
+    "inquirer-6.0.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz";
+        sha512 = "tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==";
+      };
+    };
+    "insert-module-globals-7.2.0" = {
       name = "insert-module-globals";
       packageName = "insert-module-globals";
-      version = "7.1.0";
+      version = "7.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz";
+        sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==";
+      };
+    };
+    "insight-0.10.1" = {
+      name = "insight";
+      packageName = "insight";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.1.0.tgz";
-        sha512 = "0b8s5vi57m46v468fw6gjdz1qhjlzid3kahhqnxsw3i8czv4xjn1bgcb6i56z1q8vs25lhzry0w4vfz85wx7sd2f3dkcapg4rvikdid";
+        url = "https://registry.npmjs.org/insight/-/insight-0.10.1.tgz";
+        sha512 = "kLGeYQkh18f8KuC68QKdi0iwUcIaayJVB/STpX7x452/7pAUm1yfG4giJwcxbrTh0zNYtc8kBR+6maLMOzglOQ==";
       };
     };
     "insight-0.8.4" = {
@@ -13498,6 +13174,15 @@ let
         sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
       };
     };
+    "inspect-custom-symbol-1.1.0" = {
+      name = "inspect-custom-symbol";
+      packageName = "inspect-custom-symbol";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inspect-custom-symbol/-/inspect-custom-symbol-1.1.0.tgz";
+        sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg==";
+      };
+    };
     "int64-buffer-0.1.10" = {
       name = "int64-buffer";
       packageName = "int64-buffer";
@@ -13549,7 +13234,7 @@ let
       version = "2.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz";
-        sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6";
+        sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
       };
     };
     "invert-kv-1.0.0" = {
@@ -13657,7 +13342,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz";
-        sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl";
+        sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==";
       };
     };
     "is-accessor-descriptor-0.1.6" = {
@@ -13675,7 +13360,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
-        sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
+        sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
       };
     };
     "is-alphabetical-1.0.2" = {
@@ -13684,7 +13369,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
-        sha512 = "33gw3lnhmg5snnpbjafj2dnv8f55g5wqmssczl998knajppvmp85gwz712jbk0wcj14np1zmghm3j8lsh0xb6r20pf33k0y2vh4sk2p";
+        sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==";
       };
     };
     "is-alphanumerical-1.0.2" = {
@@ -13693,7 +13378,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
-        sha512 = "2r2l14mwrzcvxayr6ib04k4apkpgcs7m41pnw51999y0nld0a8fjhwhvlw2arkda8hf9anc9ld3bxlxgn9psif9ha488x0797zx89x7";
+        sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==";
       };
     };
     "is-arguments-1.0.2" = {
@@ -13714,13 +13399,13 @@ let
         sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     };
-    "is-arrayish-0.3.1" = {
+    "is-arrayish-0.3.2" = {
       name = "is-arrayish";
       packageName = "is-arrayish";
-      version = "0.3.1";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
-        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz";
+        sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
       };
     };
     "is-ascii-1.0.0" = {
@@ -13747,7 +13432,7 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -13774,7 +13459,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz";
-        sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k";
+        sha512 = "c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -13792,7 +13477,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
-        sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d";
+        sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
     "is-date-object-1.0.1" = {
@@ -13810,7 +13495,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz";
-        sha512 = "1g028jya2ymjyzj2gwna1zpajbhhxh2xh2vsi8dp3zzn9a04sgs9vvbcb66gb439mzb95vfpyydhb2h09r7yzhkfbhijwl2cgpfa72d";
+        sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -13819,7 +13504,7 @@ let
       version = "0.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
-        sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a";
+        sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
       };
     };
     "is-descriptor-1.0.2" = {
@@ -13828,7 +13513,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
-        sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r";
+        sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
       };
     };
     "is-docker-1.1.0" = {
@@ -13882,7 +13567,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
-        sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba";
+        sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==";
       };
     };
     "is-extglob-1.0.0" = {
@@ -13981,7 +13666,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
-        sha512 = "3y2isd2s41r430x4v5hbln61sibalz4af6wp5alq3svvvsmnlg0bhyjjf8nzmcgvrc49hw8w3r32bisxc90r8ia6z65v98sgcdpzsvf";
+        sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==";
       };
     };
     "is-installed-globally-0.1.0" = {
@@ -13999,7 +13684,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.0.tgz";
-        sha512 = "03srgd19nl1p2b2ny8gamq5qvv4k124inq5fzkb1kqxdw9y45fr46g8awmpnx0hgwpfg0blysfms7r8n89sf5183hr2xd8x0l7q7z15";
+        sha512 = "JfyDDwUdtS4yHCgUpxOyKB9dnfZ0gecufxB0eytX6BmSXSE+8dbxDGt+V7CNRIRJ9sYFV/WQt2KJG6hNob2sBw==";
       };
     };
     "is-my-ip-valid-1.0.0" = {
@@ -14008,7 +13693,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz";
-        sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42";
+        sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==";
       };
     };
     "is-my-json-valid-2.17.2" = {
@@ -14017,7 +13702,7 @@ let
       version = "2.17.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz";
-        sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610";
+        sha512 = "IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==";
       };
     };
     "is-natural-number-4.0.1" = {
@@ -14080,7 +13765,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz";
-        sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd";
+        sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==";
       };
     };
     "is-obj-1.0.1" = {
@@ -14101,13 +13786,13 @@ let
         sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
       };
     };
-    "is-odd-2.0.0" = {
-      name = "is-odd";
-      packageName = "is-odd";
-      version = "2.0.0";
+    "is-options-1.0.1" = {
+      name = "is-options";
+      packageName = "is-options";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz";
-        sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r";
+        url = "https://registry.npmjs.org/is-options/-/is-options-1.0.1.tgz";
+        sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg==";
       };
     };
     "is-path-cwd-1.0.0" = {
@@ -14125,7 +13810,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz";
-        sha512 = "1lrmbdvciajn2smq4j80qvp3gpkkzqddiyay3xgbzni3gi4vljkawyyw68i6h8m1jfdg4jy8l8c16rlfvr17pnfb314xw5q6m2pad8n";
+        sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==";
       };
     };
     "is-path-inside-1.0.1" = {
@@ -14152,7 +13837,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+        sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
     "is-posix-bracket-0.1.1" = {
@@ -14251,7 +13936,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz";
-        sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb";
+        sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
     "is-resolvable-1.1.0" = {
@@ -14260,7 +13945,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz";
-        sha512 = "0r8v3dkj5qbfh2wlj4w1msyqsw6j5myvxi88wkw36isscb97yyc2yc1pwm64djrmh1css6jp9p08cx1zb479fg4gv26prciaifdh05a";
+        sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -14323,7 +14008,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz";
-        sha512 = "0lrp2yp3bjcq9v1sxn5451bmmnj129aws8g0ym3a2s4wkc2y6ym591pym51dgs2xg7cpid087hvmnvqjr36pp6gm419ibhlqmwhkxyy";
+        sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ==";
       };
     };
     "is-symbol-1.0.1" = {
@@ -14368,7 +14053,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz";
-        sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs";
+        sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==";
       };
     };
     "is-url-1.2.4" = {
@@ -14377,7 +14062,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz";
-        sha512 = "31qfylxnpb1y8vczgi2nh57ayl7s5ppn8iskp21607l6ka7jxq409pf2mvspwnx6pj29b63ldayjgljsbhyc442gfc1i185dy5ccfr1";
+        sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==";
       };
     };
     "is-utf8-0.2.1" = {
@@ -14389,15 +14074,6 @@ let
         sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
       };
     };
-    "is-valid-glob-0.3.0" = {
-      name = "is-valid-glob";
-      packageName = "is-valid-glob";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz";
-        sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe";
-      };
-    };
     "is-valid-glob-1.0.0" = {
       name = "is-valid-glob";
       packageName = "is-valid-glob";
@@ -14422,7 +14098,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
-        sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr";
+        sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==";
       };
     };
     "is-wsl-1.1.0" = {
@@ -14467,7 +14143,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz";
-        sha512 = "1l996rw6ql1ypf4jvy0yhl3d08zislzsxc0lgbc4hh3kb4qzlxqv29d9nblq9ai6lkiwvxfgynknk8j6j9qm49jqlsnib924lx5gk0q";
+        sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==";
       };
     };
     "isbinaryfile-3.0.2" = {
@@ -14479,15 +14155,6 @@ let
         sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
       };
     };
-    "isemail-1.2.0" = {
-      name = "isemail";
-      packageName = "isemail";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz";
-        sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a";
-      };
-    };
     "isexe-1.1.2" = {
       name = "isexe";
       packageName = "isexe";
@@ -14524,15 +14191,6 @@ let
         sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
       };
     };
-    "isomorphic-fetch-2.2.1" = {
-      name = "isomorphic-fetch";
-      packageName = "isomorphic-fetch";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz";
-        sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
-      };
-    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -14548,7 +14206,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
+        sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==";
       };
     };
     "iterare-0.0.8" = {
@@ -14641,31 +14299,22 @@ let
         sha1 = "06d4912255093419477d425633606e0e90782967";
       };
     };
-    "joi-6.10.1" = {
-      name = "joi";
-      packageName = "joi";
-      version = "6.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz";
-        sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06";
-      };
-    };
     "jquery-3.3.1" = {
       name = "jquery";
       packageName = "jquery";
       version = "3.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz";
-        sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai";
+        sha512 = "Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==";
       };
     };
-    "jquery-ui-1.12.1" = {
-      name = "jquery-ui";
-      packageName = "jquery-ui";
+    "jquery-ui-bundle-1.12.1" = {
+      name = "jquery-ui-bundle";
+      packageName = "jquery-ui-bundle";
       version = "1.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz";
-        sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
+        url = "https://registry.npmjs.org/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz";
+        sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4";
       };
     };
     "js-select-0.6.0" = {
@@ -14719,7 +14368,7 @@ let
       version = "3.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz";
-        sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv";
+        sha512 = "O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==";
       };
     };
     "js-yaml-3.11.0" = {
@@ -14728,7 +14377,16 @@ let
       version = "3.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
-        sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
+        sha512 = "saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==";
+      };
+    };
+    "js-yaml-3.12.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
+        sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
       };
     };
     "js2xmlparser-1.0.0" = {
@@ -14758,13 +14416,13 @@ let
         sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
-    "jsesc-0.5.0" = {
-      name = "jsesc";
-      packageName = "jsesc";
-      version = "0.5.0";
+    "jsdom-7.2.2" = {
+      name = "jsdom";
+      packageName = "jsdom";
+      version = "7.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
-        sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+        url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz";
+        sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e";
       };
     };
     "jsesc-1.3.0" = {
@@ -14818,7 +14476,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
-        sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls";
+        sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
       };
     };
     "json-parse-helpfulerror-1.0.3" = {
@@ -14875,6 +14533,15 @@ let
         sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
+    "json-schema-traverse-0.4.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+      };
+    };
     "json-stable-stringify-0.0.1" = {
       name = "json-stable-stringify";
       packageName = "json-stable-stringify";
@@ -14956,13 +14623,13 @@ let
         sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "jsonata-1.5.3" = {
+    "jsonata-1.5.4" = {
       name = "jsonata";
       packageName = "jsonata";
-      version = "1.5.3";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.3.tgz";
-        sha512 = "0lgmcfyrax8g07h2lhdlzw3i5dp28mdhg3azf2h7c1ig3nf3xv0dkrpdfsr155zhmbx2cyjr3w90hvkxc0vv2s4nj0zxdw15j6ywibn";
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.4.tgz";
+        sha512 = "F/p92UWYUn+kD3SE898jjlz1mkBzjtok9ZTtWT6+axS4Z2Wtc8p/md6xHkyCGWPdIEJBTSw0mlvKE+s+fAVSjg==";
       };
     };
     "jsonfile-1.0.1" = {
@@ -15010,6 +14677,15 @@ let
         sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
       };
     };
+    "jsonminify-0.2.3" = {
+      name = "jsonminify";
+      packageName = "jsonminify";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.2.3.tgz";
+        sha1 = "4b842c8a3fe5d6aa48b2f8f95a1cf9a80c019d8e";
+      };
+    };
     "jsonminify-0.4.1" = {
       name = "jsonminify";
       packageName = "jsonminify";
@@ -15064,13 +14740,13 @@ let
         sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
-    "jsonwebtoken-7.1.9" = {
+    "jsonwebtoken-8.2.1" = {
       name = "jsonwebtoken";
       packageName = "jsonwebtoken";
-      version = "7.1.9";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz";
-        sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a";
+        url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz";
+        sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw==";
       };
     };
     "jspm-config-0.3.4" = {
@@ -15169,7 +14845,7 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz";
-        sha512 = "1zwkw27arwkl75r6blgn935b2nrj3k7q9na65my3vw2w10caivrihdc4q8qq8qh509jh4nn04x0mfi6bd0gx9caj44ln1dyzxqvy4xl";
+        sha512 = "tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==";
       };
     };
     "jws-3.1.5" = {
@@ -15178,7 +14854,7 @@ let
       version = "3.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz";
-        sha512 = "2wvh8snqyvylbqq0f7i6gcr7v4cl42mr46d80k7076c6g1b2xr50rp1b9zc40dlni7j58qzyayf693bdzr1ryf4mwad832025xr5h0s";
+        sha512 = "GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==";
       };
     };
     "jwt-decode-2.2.0" = {
@@ -15214,7 +14890,7 @@ let
       version = "3.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz";
-        sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j";
+        sha512 = "kgwWqYT79rAahn4maIVTP8dIe+m1KulufWW+f1bB9DlZrRFiGpZ4iJOg2HUp4xJYBWONP3+rOPIWF/RXABU6mw==";
       };
     };
     "k-bucket-4.0.1" = {
@@ -15223,7 +14899,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.1.tgz";
-        sha512 = "1qyasv93yhjmmvsrxq5srbi1y6wj2vqpnnb1wafjxg1ffj01pyhx9jgqw0byrjm097ywrz0k9yki7dcnn2ncwqxyryqys7hincykw32";
+        sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ==";
       };
     };
     "k-rpc-3.7.0" = {
@@ -15241,7 +14917,7 @@ let
       version = "4.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz";
-        sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s";
+        sha512 = "mgAJZeFYbpP0xzJzmS0TQTYoFI0sjy3GnKFhg8wyboL+KvWg2WLaA2Oy9PthLPx2Rxz4WeBMk4y3MSOrDJ95FA==";
       };
     };
     "k-rpc-5.0.0" = {
@@ -15250,7 +14926,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz";
-        sha512 = "3frk0pf1y988y12m54vkfa2anc0mg6p4yiq5ca8pkvwb56g8n9n58j7f4gh3rnjgw8xb5ib8gc54nmgk8mlsbjm6azf8c2z0ynzc8dw";
+        sha512 = "vCH2rQdfMOS+MlUuTSuar1pS2EMrltURf9LmAR9xR6Jik0XPlMX3vEixgqMn17wKmFVCublJqSJ4hJIP7oKZ3Q==";
       };
     };
     "k-rpc-socket-1.8.0" = {
@@ -15259,7 +14935,7 @@ let
       version = "1.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz";
-        sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz";
+        sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg==";
       };
     };
     "kad-fs-0.0.4" = {
@@ -15305,7 +14981,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.5.tgz";
-        sha512 = "07k7qknfjqnlpkx0ib04dxrvaafxfr1pcl691zp4zfvkmyz52ssx9a35w3na2fllvl7h8b95cl2xzmi3b4yraiwndia9cibd2l8nysc";
+        sha512 = "THuLqGgrsqRiszyq7Mkasf4uKCtpIXjoptQJZQcvQ6WutSjf17ndJ/eHZCi7IbvulNq5NwJWBH1earF0duIzDw==";
       };
     };
     "keep-alive-agent-0.0.1" = {
@@ -15368,7 +15044,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz";
-        sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs";
+        sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==";
       };
     };
     "kind-of-1.1.0" = {
@@ -15413,7 +15089,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
-        sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l";
+        sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
     "kind-of-6.0.2" = {
@@ -15422,7 +15098,7 @@ let
       version = "6.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
-        sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk";
+        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
       };
     };
     "klaw-1.3.1" = {
@@ -15449,7 +15125,7 @@ let
       version = "3.5.0-rc";
       src = fetchurl {
         url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz";
-        sha512 = "2nys4zw0rwz0601pzq748gvs8x78n570f2j00ggwakyhbzpdgm90ivscnaym52hf226isgqfdjikxr0nig0hbb28d1xf3s1kpks24vr";
+        sha512 = "eROh551BD9dDQ2ItCF60IPcZZXP46WiEcFCU6pVlekeQ6mv3L+in4u8BIIUDp1h0OtL7IXLwvwEY8HkG/BPtrQ==";
       };
     };
     "kuduscript-1.0.16" = {
@@ -15458,7 +15134,7 @@ let
       version = "1.0.16";
       src = fetchurl {
         url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz";
-        sha512 = "2pws4jvqqdysxbqb5bw1m67wklk7lrxl293q5w9cd58drz6jzs4qzgiy6gg7dzx9m2pgn9kqxns8pw445d68ncqk2nxpdcimnnsbszv";
+        sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw==";
       };
     };
     "labeled-stream-splicer-2.0.1" = {
@@ -15467,7 +15143,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz";
-        sha512 = "0z3ssjaq1bx4j1dcysbbmsnq24zglv2gdsm3by6dr34w10jrlg06rrh3l7qa8a3ch7ag9gmkjfrw6m448sra299gz5rvg2ifsc7hbrh";
+        sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==";
       };
     };
     "last-one-wins-1.0.4" = {
@@ -15584,7 +15260,7 @@ let
       version = "2.7.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz";
-        sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8";
+        sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
       };
     };
     "less-middleware-2.2.1" = {
@@ -15593,7 +15269,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz";
-        sha512 = "059c8rz6wkzc3fwd62a6f3lfw3h9sxj2fr0jjyr1i9kwfvk3737xyzndyshklllx5gnfri9z2g9a28c2ccnd6ka6adn6i7h4z5frw6m";
+        sha512 = "1fDsyifwRGObMmqaZhkTDAmVnvgpZmdf6ZTSCbVv9vt+xhlzOz5TDNlLCbITsusEB3d0OKOEadwN9ic3PyOWCg==";
       };
     };
     "level-0.18.0" = {
@@ -15620,7 +15296,7 @@ let
       version = "1.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz";
-        sha512 = "1xwlwdkqryzw8bd0ywmjnlrcd85c88hrcf8r245377p52cwvgcrjsajg5w8zpx1d236v6043v4c3a29lcbyqmxqmh7apl9lhhdjlrix";
+        sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew==";
       };
     };
     "level-sublevel-6.6.2" = {
@@ -15629,7 +15305,7 @@ let
       version = "6.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.2.tgz";
-        sha512 = "1fy1czzr4d4w51bigbmwicz2maa7rm5ih8j5b0jcm6sa9y35n4f6zs6yc9zm8lbhnk2kb91g5jpgz3jmigf01nlpdis2g2qc6m6s6ps";
+        sha512 = "+hptqmFYPKFju9QG4F6scvx3ZXkhrSmmhYui+hPzRn/jiC3DJ6VNZRKsIhGMpeajVBWfRV7XiysUThrJ/7PgXQ==";
       };
     };
     "leveldown-0.10.6" = {
@@ -15668,15 +15344,6 @@ let
         sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
       };
     };
-    "leven-2.1.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
-        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
-      };
-    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -15686,15 +15353,6 @@ let
         sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
       };
     };
-    "lexical-scope-1.2.0" = {
-      name = "lexical-scope";
-      packageName = "lexical-scope";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz";
-        sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
-      };
-    };
     "lexicographic-integer-1.1.0" = {
       name = "lexicographic-integer";
       packageName = "lexicographic-integer";
@@ -15809,7 +15467,7 @@ let
       version = "2.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz";
-        sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g";
+        sha512 = "j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg==";
       };
     };
     "load-ip-set-1.3.1" = {
@@ -15875,13 +15533,22 @@ let
         sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
       };
     };
+    "locate-path-3.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+      };
+    };
     "lockfile-1.0.4" = {
       name = "lockfile";
       packageName = "lockfile";
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz";
-        sha512 = "1c3gz9fvn9lz8b2whpi7cifz94b28c4gglngjhlcsfgmgbv0093pdkb4865hv6f2dyypr32f7am9ajrhrbjzv3iw9hw2zni8k0d7xkj";
+        sha512 = "cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==";
       };
     };
     "locks-0.2.2" = {
@@ -15893,6 +15560,15 @@ let
         sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced";
       };
     };
+    "locutus-2.0.9" = {
+      name = "locutus";
+      packageName = "locutus";
+      version = "2.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locutus/-/locutus-2.0.9.tgz";
+        sha1 = "e265af1e85fd19173e74386373888560783a02fc";
+      };
+    };
     "lodash-1.0.2" = {
       name = "lodash";
       packageName = "lodash";
@@ -15962,7 +15638,7 @@ let
       version = "4.17.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
-        sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i";
+        sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
       };
     };
     "lodash-4.17.5" = {
@@ -15971,7 +15647,7 @@ let
       version = "4.17.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz";
-        sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
+        sha512 = "svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==";
       };
     };
     "lodash-4.2.1" = {
@@ -16073,6 +15749,15 @@ let
         sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c";
       };
     };
+    "lodash._objecttypes-2.4.1" = {
+      name = "lodash._objecttypes";
+      packageName = "lodash._objecttypes";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+      };
+    };
     "lodash._reescape-3.0.0" = {
       name = "lodash._reescape";
       packageName = "lodash._reescape";
@@ -16280,6 +15965,15 @@ let
         sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862";
       };
     };
+    "lodash.includes-4.3.0" = {
+      name = "lodash.includes";
+      packageName = "lodash.includes";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz";
+        sha1 = "60bb98a87cb923c68ca1e51325483314849f553f";
+      };
+    };
     "lodash.isarguments-3.1.0" = {
       name = "lodash.isarguments";
       packageName = "lodash.isarguments";
@@ -16298,6 +15992,15 @@ let
         sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55";
       };
     };
+    "lodash.isboolean-3.0.3" = {
+      name = "lodash.isboolean";
+      packageName = "lodash.isboolean";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz";
+        sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6";
+      };
+    };
     "lodash.isequal-4.5.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
@@ -16307,6 +16010,33 @@ let
         sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
+    "lodash.isinteger-4.0.4" = {
+      name = "lodash.isinteger";
+      packageName = "lodash.isinteger";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz";
+        sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343";
+      };
+    };
+    "lodash.isnumber-3.0.3" = {
+      name = "lodash.isnumber";
+      packageName = "lodash.isnumber";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz";
+        sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc";
+      };
+    };
+    "lodash.isobject-2.4.1" = {
+      name = "lodash.isobject";
+      packageName = "lodash.isobject";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+      };
+    };
     "lodash.isplainobject-4.0.6" = {
       name = "lodash.isplainobject";
       packageName = "lodash.isplainobject";
@@ -16358,7 +16088,7 @@ let
       version = "4.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz";
-        sha512 = "0lv358i7xyg1hn90fk3xzih5kmj1zlmr759g0hh9fa7npbik629q8h5jd2lvjnrm76ciz92k0yn5z6vcqdbgws1zzsrqzw7ixmk7rh0";
+        sha512 = "AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==";
       };
     };
     "lodash.mergewith-4.6.1" = {
@@ -16367,7 +16097,7 @@ let
       version = "4.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz";
-        sha512 = "1swsfrcjr7yv5bkxi47mfjyrl5c8d2c8s4m01qpnffgnjnl9mbri6i9ys9gvwq0drsqszzrmq0rlglmc6c17h8a0r22n86qwfpkjv3r";
+        sha512 = "eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==";
       };
     };
     "lodash.once-4.1.1" = {
@@ -16532,22 +16262,13 @@ let
         sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
       };
     };
-    "log-symbols-1.0.2" = {
-      name = "log-symbols";
-      packageName = "log-symbols";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
-        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
-      };
-    };
     "log-symbols-2.2.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
-        sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm";
+        sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
       };
     };
     "log-update-1.0.2" = {
@@ -16568,13 +16289,13 @@ let
         sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708";
       };
     };
-    "log4js-2.6.1" = {
+    "log4js-2.10.0" = {
       name = "log4js";
       packageName = "log4js";
-      version = "2.6.1";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log4js/-/log4js-2.6.1.tgz";
-        sha512 = "254l8in0izc772xvl9krch7nll86c1a3b1i9j1yb3sl1rialgynw6q2slza1vmmh49b375a3qfj4ir9pkzgsas48rbrzi10px71dsh4";
+        url = "https://registry.npmjs.org/log4js/-/log4js-2.10.0.tgz";
+        sha512 = "NnhN9PjFF9zhxinAjlmDYvkqqrIW+yA3LLJAoTJ3fs6d1zru86OqQHfsxiUcc1kRq3z+faGR4DeyXUfiNbVxKQ==";
       };
     };
     "loggly-1.1.1" = {
@@ -16673,7 +16394,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz";
-        sha512 = "2aa3jc0qwf051bd2qwy43qzyfhh8cnqd419qg8cscni65ancjabyrradx3m06r6k84b8r4fc58khm4n6bhk8bpmf282qln79kzpfvfp";
+        sha512 = "1213/0zHUiyQcPUuNOEyllQ4UWGOZLQImiYbUEdvKme/lGRWFRMt0ww9nAJp2DIEofMfD+I5Fm2FAhzHgMmhlA==";
       };
     };
     "loud-rejection-1.6.0" = {
@@ -16718,7 +16439,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
     "lru-2.0.1" = {
@@ -16790,7 +16511,7 @@ let
       version = "4.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
-        sha512 = "0j2ny2y61f70dbzarfa1xazv68dw7nb2r4p5sy46fw6dwr9y0yg003lb1yv7sdl77hcrpzn22mih799z657sz21al4qmf1kr2yj2lbw";
+        sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==";
       };
     };
     "lru-queue-0.1.0" = {
@@ -16844,7 +16565,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz";
-        sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls";
+        sha512 = "mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==";
       };
     };
     "magnet-uri-2.0.1" = {
@@ -16871,7 +16592,7 @@ let
       version = "5.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.8.tgz";
-        sha512 = "3qgdbgmbzxiq3df1vnr1d3r4gvlbrgzn1ga7hhpnqwk85kl01w7gd5l860xacnn5250g1jrnh4js55j99r77y4n5qp66nxpa3rqjw5c";
+        sha512 = "rHCJ81C3W2MuLpb4c3JKshQtCbRZhgeKKNYy1YFBtLR3eAB0FjQ5thfCo16w/+VF9yN5tJDtDq4NHPtf9a328A==";
       };
     };
     "mailcomposer-2.1.0" = {
@@ -16901,13 +16622,13 @@ let
         sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101";
       };
     };
-    "mailgun-js-0.18.0" = {
+    "mailgun-js-0.18.1" = {
       name = "mailgun-js";
       packageName = "mailgun-js";
-      version = "0.18.0";
+      version = "0.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.0.tgz";
-        sha512 = "3b2vvr69hb5ka91bcgv18fvaiwswkqpj9034xqbx687ihl1ab6sh6gbvknxg3zyxdhyxlsdlm727f2d0dcbvbaxiy891iv56s7glhx3";
+        url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.1.tgz";
+        sha512 = "lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==";
       };
     };
     "mailparser-0.6.2" = {
@@ -16925,7 +16646,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
-        sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv";
+        sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
     "make-error-1.3.4" = {
@@ -16934,7 +16655,7 @@ let
       version = "1.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz";
-        sha512 = "3m1bilfa38sjf09x439iz2050vhi5790qcxx11nwr51wygfiazbghxbaqznmhamij5vh6zv83s7kgjx0va77996dmighm2apgjrndnh";
+        sha512 = "0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==";
       };
     };
     "make-error-cause-1.2.2" = {
@@ -16952,7 +16673,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz";
-        sha512 = "2dhd467iqwi8rmdzm8m0921z2mmixbdbpp9hvk02f5z6k1k2324k5l971x6j46mlq8nbixf21znq376dj431jnfajxllm123mgaw657";
+        sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==";
+      };
+    };
+    "mamacro-0.0.3" = {
+      name = "mamacro";
+      packageName = "mamacro";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
+        sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==";
       };
     };
     "map-cache-0.2.2" = {
@@ -17015,7 +16745,7 @@ let
       version = "8.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz";
-        sha512 = "3w1l75fip7divhr6q8n1sf0af49ssf9kc4vh8gha0svw5q84c8s8csr0f50qz7n0smx1a8iwfnlj2kbnl9bwmpryqgia5b44d4ylg0b";
+        sha512 = "CzzqSSNkFRUf9vlWvhK1awpJreMRqdCrBvZ8DIoDWTOkESMIF741UPAhuAmbyWmdiFPA6WARNhnu2M6Nrhwa+A==";
       };
     };
     "markdown-it-emoji-1.4.0" = {
@@ -17033,7 +16763,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.1.tgz";
-        sha512 = "3cs9xbmjc64jh19ashy00z2hig9q9mvcvnqdm8hkysiidr3fl17zkhypvb5z7dqvklwyycah9s325vwj4gbwr214xc7hrddb2cn2jwc";
+        sha512 = "jEthmVitZXhYJ0Fkvh6RfBcxdIKKec/p3LidX9a+Hs5/AnUjtxi1nxDVhu1muyacXoTiA+ChVilASQyTdfWk2Q==";
       };
     };
     "markdown-it-task-checkbox-1.0.6" = {
@@ -17042,7 +16772,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz";
-        sha512 = "0knj35b20bkc34hpfv73p4m855ysgdshml07fhj18j62p09y2066l7nl28g9kr2rwqm9x8j0bw20d32vqrrhih5ifvynk7axcg6977f";
+        sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw==";
       };
     };
     "markdown-table-0.4.0" = {
@@ -17069,7 +16799,7 @@ let
       version = "0.3.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz";
-        sha512 = "2940np3jq9midbdw8mhfry1msy3572i2gj0y3z9c8z1dyrdhxg1rivcxhgihpqs6gihqnzgdhbgmgsabm2ch7gzbvf16dxacccrxbbr";
+        sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==";
       };
     };
     "matcher-collection-1.0.5" = {
@@ -17078,7 +16808,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz";
-        sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x";
+        sha512 = "nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==";
       };
     };
     "math-random-1.0.1" = {
@@ -17090,15 +16820,6 @@ let
         sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac";
       };
     };
-    "md5-2.2.1" = {
-      name = "md5";
-      packageName = "md5";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz";
-        sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
-      };
-    };
     "md5.js-1.3.4" = {
       name = "md5.js";
       packageName = "md5.js";
@@ -17108,13 +16829,13 @@ let
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
-    "mdn-data-1.1.3" = {
+    "mdn-data-1.1.4" = {
       name = "mdn-data";
       packageName = "mdn-data";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.3.tgz";
-        sha512 = "0ly3w028pxhm83a538dms6xm5rw84xy7pq16354kfpbd72ng0rykvbnfcs1c3ijdcr7xfxzva4pp10wqf6nxysj375vinqbki1zmgl7";
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz";
+        sha512 = "FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==";
       };
     };
     "mdns-js-0.5.0" = {
@@ -17132,7 +16853,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mdns-js/-/mdns-js-1.0.1.tgz";
-        sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp";
+        sha512 = "dwEtMzmoZCQcGlr004J4m2+W6dCMpCoGQ5kYIEY+7rMPdMM7ztT+1qD9ExmottvLGgbqAVsjllhwU8PyusecPg==";
       };
     };
     "mdns-js-packet-0.2.0" = {
@@ -17168,7 +16889,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.1.tgz";
-        sha512 = "2bzbkjhjcmg6cbq75b1glxr1q3csvsgp3yl2vr5dawp9r72q6xvb0ih56g64swq30mmxm199drpjyskk6qq5bw31zp5dv2nysh646sr";
+        sha512 = "WRtioPZW7FbuD4OvgrGZU3t5c0sp1F4rGJhrYp4pMIK1u8Hi5HS5aiVvQf24T2/NBg650xdWOXgx8yqTUM71lw==";
       };
     };
     "mediawiki-title-0.6.5" = {
@@ -17177,7 +16898,7 @@ let
       version = "0.6.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz";
-        sha512 = "3r94k4jgdj5ir5y2p0hvb860976fz2fnzjafjzmsf0pivsqgy0hgxsxg315zmzq69rv0lli8rfjwcjp097xya03aaa4s7xjppi0ixvw";
+        sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g==";
       };
     };
     "mem-1.1.0" = {
@@ -17213,7 +16934,7 @@ let
       version = "0.4.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz";
-        sha512 = "1z1dvgwbqjls9whb2692xq9rdnwsf7jwlhkbx3gnsq8kvkmh3qw9ngis5xnzvnjv5mnqbz5ca4amhbjlgyyd88kpj0ibi7hm6xw36mj";
+        sha512 = "sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg==";
       };
     };
     "memory-chunk-store-1.3.0" = {
@@ -17222,7 +16943,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz";
-        sha512 = "0sgs9s743559yps61abf9vnw58jgcig5rj15y47q4dsv7bjfj4i138ycgwd384nsqnbbri9p8xm4jq986bkirhi5qmid1wafaj0xfz8";
+        sha512 = "6LsOpHKKhxYrLhHmOJdBCUtSO7op5rUs1pag0fhjHo0QiXRyna0bwYf4EmQuL7InUeF2J7dUMPr6VMogRyf9NA==";
       };
     };
     "memory-fs-0.3.0" = {
@@ -17249,7 +16970,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz";
-        sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri";
+        sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg==";
       };
     };
     "memorystore-1.6.0" = {
@@ -17276,7 +16997,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz";
-        sha512 = "3y4j4aqwlphwsfw770c3x06m26vd7lx810g9q39qdg1gsl1hilx48qfig40d9h3i3nj4pc66w1qg6xsmd9g7fyg77darwsr7qf83i65";
+        sha512 = "xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==";
       };
     };
     "merge-1.2.0" = {
@@ -17315,22 +17036,13 @@ let
         sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
       };
     };
-    "merge-stream-1.0.1" = {
-      name = "merge-stream";
-      packageName = "merge-stream";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
-        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
-      };
-    };
     "merge2-1.2.2" = {
       name = "merge2";
       packageName = "merge2";
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz";
-        sha512 = "0d0aqj17hg50jnnnq6173f0znw873jyslm9y01wq1ip8bfxrh1db6ca90pml1kvbffsmhi62cqi08sqp8l8cvbdifkvbspw06vkq0vf";
+        sha512 = "bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==";
       };
     };
     "merkle-tree-stream-3.0.3" = {
@@ -17405,24 +17117,6 @@ let
         sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
       };
     };
-    "micro-9.1.4" = {
-      name = "micro";
-      packageName = "micro";
-      version = "9.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz";
-        sha512 = "0zajgsz4m4z0cbibs2vz4brzp6ihq647id9zq67lrcy6nkc9fzjc8fx4g1bsf6nnbjha22fi5sz7lmfq46qixcz807v1p5pjd13kr6r";
-      };
-    };
-    "micro-compress-1.0.0" = {
-      name = "micro-compress";
-      packageName = "micro-compress";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz";
-        sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f";
-      };
-    };
     "microee-0.0.6" = {
       name = "microee";
       packageName = "microee";
@@ -17447,7 +17141,7 @@ let
       version = "3.1.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
-        sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i";
+        sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
       };
     };
     "miller-rabin-4.0.1" = {
@@ -17456,7 +17150,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
-        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
+        sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
       };
     };
     "mime-1.2.11" = {
@@ -17501,7 +17195,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
-        sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398";
+        sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
       };
     };
     "mime-1.6.0" = {
@@ -17510,7 +17204,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
     "mime-2.3.1" = {
@@ -17519,7 +17213,7 @@ let
       version = "2.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz";
-        sha512 = "1xa7b4k7mp4apq8mvj7912m38gzbcbbddaa92lmbb9cbs08z0b2a4x3kds1sr86br6x6r19kygscf20ky6g6wyx313x1jb8qnajai9q";
+        sha512 = "OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==";
       };
     };
     "mime-db-1.12.0" = {
@@ -17537,7 +17231,16 @@ let
       version = "1.33.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
-        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+        sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
+      };
+    };
+    "mime-db-1.34.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.34.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz";
+        sha1 = "452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a";
       };
     };
     "mime-types-2.0.14" = {
@@ -17555,7 +17258,7 @@ let
       version = "2.1.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
-        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+        sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
       };
     };
     "mimelib-0.3.1" = {
@@ -17573,7 +17276,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
       };
     };
     "mimic-response-1.0.0" = {
@@ -17609,7 +17312,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
-        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
+        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -17663,7 +17366,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-0.0.10" = {
@@ -17717,16 +17420,16 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz";
-        sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p";
+        sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==";
       };
     };
-    "minipass-2.3.0" = {
+    "minipass-2.3.3" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.3.0";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz";
-        sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
+        sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
       };
     };
     "minizlib-1.1.0" = {
@@ -17735,16 +17438,16 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
-        sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
+        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
       };
     };
-    "mirror-folder-2.2.0" = {
+    "mirror-folder-3.0.0" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
-      version = "2.2.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz";
-        sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r";
+        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz";
+        sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g==";
       };
     };
     "mississippi-2.0.0" = {
@@ -17753,7 +17456,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz";
-        sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync";
+        sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -17762,7 +17465,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz";
-        sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi";
+        sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==";
       };
     };
     "mixin-object-2.0.1" = {
@@ -17852,7 +17555,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz";
-        sha512 = "15hcc3355684n37j7979fs72xj57d71cpl1vbqf3n0nkj3mdairyl91q80xhrhrzlpbxc1yccvqqbh31zv7p4wmilcbl5vswg2rnpf5";
+        sha512 = "xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==";
       };
     };
     "module-deps-4.1.1" = {
@@ -17870,7 +17573,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz";
-        sha512 = "2wqrwpfiyxwawrz1wisdh8njmshb9y8glv1xxwjkp38cfz7k03bp335dvfmphxc0kc0492v2i583f7w50mqaqjjmmmksm3mklvkkyrl";
+        sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ==";
       };
     };
     "mold-source-map-0.4.0" = {
@@ -17891,15 +17594,6 @@ let
         sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
       };
     };
-    "moment-2.14.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz";
-        sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c";
-      };
-    };
     "moment-2.16.0" = {
       name = "moment";
       packageName = "moment";
@@ -17915,25 +17609,16 @@ let
       version = "2.20.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz";
-        sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2";
-      };
-    };
-    "moment-2.22.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.22.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz";
-        sha512 = "1hzs2jf69lrw76a4diywsl4451qpm3iavk8f324hgb6x3njb64bd77375kwv4ydllzc5cy1v1mabgciln7yhfd9avn7nvcy6i2n84mj";
+        sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==";
       };
     };
-    "moment-2.6.0" = {
+    "moment-2.22.2" = {
       name = "moment";
       packageName = "moment";
-      version = "2.6.0";
+      version = "2.22.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz";
-        sha1 = "0765b72b841dd213fa91914c0f6765122719f061";
+        url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
+        sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
       };
     };
     "moment-2.7.0" = {
@@ -17945,13 +17630,13 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
-    "moment-timezone-0.5.17" = {
+    "moment-timezone-0.5.21" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.17";
+      version = "0.5.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.17.tgz";
-        sha512 = "1ffjwjpgny3zjccmx9gdakpjg0v120yckblsqy0m2zwl2xagf1wlm37djn53r5slslpr2w754abaxaf9ig3nbwfhr30yf488ma6kwk3";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz";
+        sha512 = "j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A==";
       };
     };
     "mongodb-1.2.14" = {
@@ -18014,7 +17699,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz";
-        sha512 = "2i0lx4lji8zy0xwa6bzhqp1wdsigp38jlm3k7h7k6k013j8bp5z0nwyvwkr79ax2f1cw2gp7i2vwx99w5swmwy95l8a6188rvq0v857";
+        sha512 = "p6AN8M4IBaMQLcnzynXhKXW+RTz3Cc6CE12lkyffnlvwy11IjgCmmQeeOSqVaNwXdePhYviXUbwD/1GUlHQKog==";
       };
     };
     "mp4-stream-2.0.3" = {
@@ -18023,7 +17708,7 @@ let
       version = "2.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-2.0.3.tgz";
-        sha512 = "3d7vh2ks36h25fkh19jfzvw8flk9f0lz8brnpj57wlwfcwx8hsw5fdr2dxr2brpxvcdv4mhfyd7g82y1n1229scchlaj6cv9wiy1p74";
+        sha512 = "5NzgI0+bGakoZEwnIYINXqB3mnewkt3Y7jcvkXsTubnCNUSdM8cpP0Vemxf6FLg0qUN8fydTgNMVAc3QU8B92g==";
       };
     };
     "mpath-0.1.1" = {
@@ -18044,13 +17729,13 @@ let
         sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
       };
     };
-    "mqtt-2.17.0" = {
+    "mqtt-2.18.0" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "2.17.0";
+      version = "2.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.17.0.tgz";
-        sha512 = "1mqfnz7s0gnga7gdh29qj4lfybm3fzsc6w3x610sr50h9dhbi3m5isfri63d87rdlyp5dspy11gpdah2h1ikaq3zi7wfhf6dzj8m1vr";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.0.tgz";
+        sha512 = "d4hXWziT6tLMjaQs5TVh8uHWS072GBfmBIABezbWZ8W0nNzgMUm6iEmXDLvxkj5YVgl8qDdM0pWQ2NwRwhU7nA==";
       };
     };
     "mqtt-packet-5.6.0" = {
@@ -18059,16 +17744,7 @@ let
       version = "5.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.6.0.tgz";
-        sha512 = "1gvb90a13pd8xx7mkx6nxfs8cc2ysf58vwccvm1jh5myhwjyvsamj5f9fi398vgk9haxmg25l00lwbs4cdnvs638r5iswga5gd9wh20";
-      };
-    };
-    "mri-1.1.0" = {
-      name = "mri";
-      packageName = "mri";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz";
-        sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a";
+        sha512 = "QECe2ivqcR1LRsPobRsjenEKAC3i1a5gmm+jNKJLrsiq9PaSQ18LlKFuxvhGxWkvGEPadWv6rKd31O4ICqS1Xw==";
       };
     };
     "mri-1.1.1" = {
@@ -18140,7 +17816,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn";
+        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
       };
     };
     "ms-rest-1.15.7" = {
@@ -18152,13 +17828,13 @@ let
         sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
       };
     };
-    "ms-rest-2.3.3" = {
+    "ms-rest-2.3.6" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.3.3";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.3.tgz";
-        sha512 = "2qrwz9q47d6988i8kf97zl0974msgia3qzcah3rl6gld0n99pzdnlbz2cnqbhcj7yql2jbfm682qalzfazphxl90liyl82mzvz7z3jb";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.6.tgz";
+        sha512 = "M+Lx9P7Wy4TeAk7jqPLwGS1QS1gvxF6Xo+OHv5j1g3Kcb44T/GTUuSjxTKarF6aKyeacZH1ZD++Nt7pcql7dDA==";
       };
     };
     "ms-rest-azure-1.15.7" = {
@@ -18170,13 +17846,13 @@ let
         sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
       };
     };
-    "ms-rest-azure-2.5.5" = {
+    "ms-rest-azure-2.5.7" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.5.5";
+      version = "2.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.5.tgz";
-        sha512 = "37sgjm2jqs7fnlzbxihq6sdxxd4w7m5nnkmvp5rrnq9ghsfbbk9pr1z4lm6my3yg06hhqgdyg7rnnzvds26yxjwic7d1g1ab1igjwrf";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.7.tgz";
+        sha512 = "e4lgB0z29Dx4ufu/c+PmEAYY1WXq98GYUBkE+iRx7WsxsN04lrM3B1vj8y+B8rKt7clPUE0niqB9VovVL8zvag==";
       };
     };
     "msgpack-1.0.2" = {
@@ -18194,7 +17870,7 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz";
-        sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8";
+        sha512 = "6HuCZHA57WtNUzrKIvjJ8OMxigzveJ6D5i13y6TsgGu3X3zxABpuBvChpppOoGdB9SyWZcmqUs1fwUV/PpSQ7Q==";
       };
     };
     "multer-1.3.0" = {
@@ -18230,7 +17906,7 @@ let
       version = "6.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz";
-        sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf";
+        sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
       };
     };
     "multicast-dns-7.0.0" = {
@@ -18239,7 +17915,7 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz";
-        sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806";
+        sha512 = "BqB5TtIXHo+8gN33N1CA1clsvPsAJlnc6D49SzfQA0xq75cxj15g2y9NaRdf4x2u4v1P66PBC+Wg6YgPO5Bc/g==";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -18257,7 +17933,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz";
-        sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx";
+        sha512 = "PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ==";
       };
     };
     "multimatch-2.1.0" = {
@@ -18305,13 +17981,13 @@ let
         sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
       };
     };
-    "multistream-2.1.0" = {
+    "multistream-2.1.1" = {
       name = "multistream";
       packageName = "multistream";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz";
-        sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d";
+        url = "https://registry.npmjs.org/multistream/-/multistream-2.1.1.tgz";
+        sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ==";
       };
     };
     "muri-0.3.1" = {
@@ -18401,7 +18077,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz";
-        sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2";
+        sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ==";
       };
     };
     "mv-2.1.1" = {
@@ -18428,7 +18104,7 @@ let
       version = "2.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz";
-        sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg";
+        sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
     "nan-0.3.2" = {
@@ -18464,7 +18140,7 @@ let
       version = "2.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
-        sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc";
+        sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==";
       };
     };
     "nan-2.5.1" = {
@@ -18503,13 +18179,13 @@ let
         sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86";
       };
     };
-    "nanoid-1.0.2" = {
+    "nanoid-1.0.4" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.2.tgz";
-        sha512 = "2bzl500sgpk3i3ird4iviglsj0gj9a0qhmj4hnky3xmxbl4ahamjhi96rslr8k65j77glmw771m3jm7r5sr5akw6ip5glmxvqkg095h";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.4.tgz";
+        sha512 = "zWPAK2WibMbVda1DvhYbahj7DAXLMvSI4Ik7553nPyJ2p8I5qJr4/j/6kgHJalrOx4FRbbme2Oa6utdzr6I/tA==";
       };
     };
     "nanolru-1.0.0" = {
@@ -18518,16 +18194,16 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nanolru/-/nanolru-1.0.0.tgz";
-        sha512 = "1d2d6k4vxnxgs5621zpccl6hk5nk0knsmjmhfmfv30sfgzca6qc59xb3xz05gi141s4y0m5yrn0iamd7554lfq9hl5rbnipqc9j890v";
+        sha512 = "GyQkE8M32pULhQk7Sko5raoIbPalAk90ICG+An4fq6fCsFHsP6fB2K46WGXVdoJpy4SGMnZ/EKbo123fZJomWg==";
       };
     };
-    "nanomatch-1.2.9" = {
+    "nanomatch-1.2.13" = {
       name = "nanomatch";
       packageName = "nanomatch";
-      version = "1.2.9";
+      version = "1.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz";
-        sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z";
+        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz";
+        sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
     "nanotiming-1.0.1" = {
@@ -18597,13 +18273,13 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
-    "natives-1.1.3" = {
+    "natives-1.1.4" = {
       name = "natives";
       packageName = "natives";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz";
-        sha512 = "3pbpfnk3183j5mwxprr19bzahf7lxarcka2bad0mhcywnjlj63i55phbxyk0pn4l4v7nj3wv4gjrzdk7xfxxfrjl5rvqf0qbrhr5485";
+        url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz";
+        sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==";
       };
     };
     "natural-compare-1.4.0" = {
@@ -18630,7 +18306,7 @@ let
       version = "0.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz";
-        sha512 = "3sx74c63qv1f3qy4gg717mvjyxc0zf66w8n5d156zs30vq256h4akw8d723ggf1qprb0q5yda14zn67rx1jlcwlb2cb0gz918qrga3w";
+        sha512 = "fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==";
       };
     };
     "nconf-0.6.9" = {
@@ -18693,7 +18369,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz";
-        sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d";
+        sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg==";
       };
     };
     "needle-0.10.0" = {
@@ -18720,7 +18396,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
-        sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp";
+        sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==";
       };
     };
     "negotiator-0.3.0" = {
@@ -18766,7 +18442,7 @@ let
       version = "2.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz";
-        sha512 = "3256b78wjq1hf7ycvh6ll1wr0kxpqb01lgj1fdirkrx5lpzz12c4ygifw09c2bag30njm8sfjkwkg3gxpy32kl1w3n9x4cizdzgg8nw";
+        sha512 = "3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==";
       };
     };
     "nested-error-stacks-1.0.2" = {
@@ -18865,7 +18541,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz";
-        sha512 = "1q1ilnr4a3k89z4v5lipni43drh0nxzzmf51nr50rx6g0xlkx3w4647dic11xcilxzqicn1fqpmg45jnkqd27jrrjzvrww2g8a65nnq";
+        sha512 = "2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==";
       };
     };
     "nijs-0.0.25" = {
@@ -18883,16 +18559,16 @@ let
       version = "2.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz";
-        sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f";
+        sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
       };
     };
-    "node-abi-2.4.1" = {
+    "node-abi-2.4.3" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.4.1";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz";
-        sha512 = "3mhfjq1a2ahvkjijw39q6wg6hdiqhz9nf02wjmn61sc0fc7fn0631wxafvny4gjnljin7yv808lhcswg0v1lrcg7k3bqhs7mb16qjd5";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz";
+        sha512 = "b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==";
       };
     };
     "node-alias-1.0.4" = {
@@ -18910,7 +18586,7 @@ let
       version = "0.2.44";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.44.tgz";
-        sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh";
+        sha512 = "8D+uqpr4OMXLmWblJBuFaph/wvLKDqgQFOCAmk4JlkE9PoJ6DW9VI2nVb+UZCRIge+Kfe3/upRD9haOjHBOiAg==";
       };
     };
     "node-cache-4.2.0" = {
@@ -18919,7 +18595,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz";
-        sha512 = "0xw45nif5bibga7jbx0n2fv7h0jz3l4lp6ra8gfri1f7kzq0kc31q9i5zpvhi6j63785gynl2m02h8l30x04pn8raw4sjzvyzmnxd51";
+        sha512 = "obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==";
       };
     };
     "node-elm-compiler-4.3.3" = {
@@ -18928,16 +18604,7 @@ let
       version = "4.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz";
-        sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd";
-      };
-    };
-    "node-fetch-1.7.3" = {
-      name = "node-fetch";
-      packageName = "node-fetch";
-      version = "1.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz";
-        sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in";
+        sha512 = "DUqXaoEFcx0xqZnMyYniyEzTKcdBhAC5GAcNsRS4tiG3VR8tidwth73cr5/rc4NzbjXIk+Jje8P4VJI+fWXHuw==";
       };
     };
     "node-forge-0.6.23" = {
@@ -18955,16 +18622,16 @@ let
       version = "0.7.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz";
-        sha512 = "0aq9ajngp210n97kmgnqyhil492amwhcn3b8bwxgsli9hq5qy4lh7qmncwbb1j0llrc4zalr0haj0fphrygz8kinzij848kcckx0rij";
+        sha512 = "MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==";
       };
     };
-    "node-gyp-build-3.3.0" = {
+    "node-gyp-build-3.4.0" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
-        sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
+        sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
       };
     };
     "node-int64-0.4.0" = {
@@ -18982,7 +18649,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz";
-        sha512 = "05d8rzfa0aihb9s1i3fm0dmdvlspfrxf4pxnsd3nms75mviv86llgg2r30l7b38a9l93yb00k7dy1vs8h4nd30ihhyvyc88vb6wa374";
+        sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==";
       };
     };
     "node-notifier-5.2.1" = {
@@ -18991,7 +18658,7 @@ let
       version = "5.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz";
-        sha512 = "179bqs5pz252zanr7mca970h5748xj0fa6inw23x5g5fb0nk64wyh8d34jzah0x5s6wdw2lb0hnad2h257nqns999vd5s8x03w6r01h";
+        sha512 = "MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==";
       };
     };
     "node-phantom-simple-2.2.4" = {
@@ -19018,7 +18685,7 @@ let
       version = "0.6.39";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
-        sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
+        sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==";
       };
     };
     "node-red-node-email-0.1.29" = {
@@ -19027,7 +18694,7 @@ let
       version = "0.1.29";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz";
-        sha512 = "0xrn1958dc81s10r3ynp4v7697py7bdhawvk71cgca1wi6ysj9w8r1dbfc29znpzz0kpmqy07v0y98nxasy6ing7hsc0kyd8rmrvnps";
+        sha512 = "+tqda0bNT8A0PM9G47XqFiUP9gEe1zvB/9f+JJhbLWTEk9TeRB4UeyycubmCbR1/TzJnk2v9yCDogFhDJQWbOw==";
       };
     };
     "node-red-node-feedparser-0.1.12" = {
@@ -19036,7 +18703,7 @@ let
       version = "0.1.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz";
-        sha512 = "2ymvmw9wh0rq14fbxg44p3wm1r34lmr7wvh8z40g4cssrpcmb43cc3wr94z9blxpnjmf9795b3slmd3s4283snm01q5z1jppa9kn2lk";
+        sha512 = "kwo7k7pXhl9wANXqgQTRo1WqxyrpJFelvZ2u9EnKfDA2yKrsZq0ZeYB8BDc/uVIycqh8XEJeX44EnAHkidddvQ==";
       };
     };
     "node-red-node-rbe-0.2.3" = {
@@ -19045,16 +18712,16 @@ let
       version = "0.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.3.tgz";
-        sha512 = "06is8ig0mlp85dl5hjp86gp7hwahssfls65gbwcql3awygilv9zlgxngm4yrl54vmkyjk2dk5gbf78r6bm4jgm3qf07xdbwvcgjvqz7";
+        sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ==";
       };
     };
-    "node-red-node-twitter-0.1.13" = {
+    "node-red-node-twitter-1.0.1" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "0.1.13";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.13.tgz";
-        sha512 = "0wfkdalwxzyyivqxiwiba5j8pyis83lhipiwck2xrbks3w0x1ldf12fgnzx61kq64sdmzpczqwb7588ggh5drj64ymj88vwdbca0bd9";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz";
+        sha512 = "NAM6mlAiZk1EwHtdPNnP/E8P5EIijnqSag1vzE/Ya+ggywTiELt9HtYX26evyB/MrnVS+FIJg+M8S5HobklERg==";
       };
     };
     "node-ssdp-2.9.1" = {
@@ -19072,7 +18739,7 @@ let
       version = "0.7.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz";
-        sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd";
+        sha512 = "bd7zO5hvCWzdglgwz9t82T4mYTEUzEG5pXnSqEzitvmEacusbhl8/VwuCbMaYR9g2PNK5191yBtAEQLJEmQh1A==";
       };
     };
     "node-swt-0.1.1" = {
@@ -19093,15 +18760,6 @@ let
         sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
       };
     };
-    "node-uuid-1.4.7" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
-      };
-    };
     "node-uuid-1.4.8" = {
       name = "node-uuid";
       packageName = "node-uuid";
@@ -19111,15 +18769,6 @@ let
         sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
-    "node-version-1.1.3" = {
-      name = "node-version";
-      packageName = "node-version";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz";
-        sha512 = "0zdxwcfi3gca8d1jdg3m1gh6b3xxsc7sxpdrnvabc5j5fdgmhcdqaxv3q28rl95ibb7qjcvw7c7k5wzhrvhayb9vn6lr7snabkh8k5c";
-      };
-    };
     "node-wsfederation-0.1.1" = {
       name = "node-wsfederation";
       packageName = "node-wsfederation";
@@ -19261,7 +18910,7 @@ let
       version = "6.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nodesecurity-npm-utils/-/nodesecurity-npm-utils-6.0.0.tgz";
-        sha512 = "0v36pqap4xw0z9h00v73nhxv2llz5gi0y6vww0yjyqb2qyfkgb7cjpjgzscc6bviw4xi4nk223s9nlcnvkpwymllbva8d98bixnbd1l";
+        sha512 = "NLRle1woNaT2orR6fue2jNqkhxDTktgJj3sZxvR/8kp21pvOY7Gwlx5wvo0H8ZVPqdgd2nE2ADB9wDu5Cl8zNg==";
       };
     };
     "nomnom-1.8.1" = {
@@ -19342,7 +18991,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
+        sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
       };
     };
     "normalize-path-2.1.1" = {
@@ -19360,7 +19009,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz";
-        sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg";
+        sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==";
       };
     };
     "now-and-later-2.0.0" = {
@@ -19381,13 +19030,13 @@ let
         sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
-    "npm-6.0.1" = {
+    "npm-6.1.0" = {
       name = "npm";
       packageName = "npm";
-      version = "6.0.1";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz";
-        sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp";
+        url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz";
+        sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w==";
       };
     };
     "npm-bundled-1.0.3" = {
@@ -19396,7 +19045,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
-        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
+        sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==";
       };
     };
     "npm-conf-1.1.3" = {
@@ -19405,7 +19054,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz";
-        sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2";
+        sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==";
       };
     };
     "npm-keyword-5.0.0" = {
@@ -19423,7 +19072,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
-        sha512 = "14dqycy588sf0k73livvvpmp1dqmbhacc97pq3ksxk1wrm9j82r7hhlrxigj0nb58gz4cbvbh3isj1x3sjiqxs60dhv439xd4zy31nd";
+        sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
       };
     };
     "npm-packlist-1.1.10" = {
@@ -19432,7 +19081,7 @@ let
       version = "1.1.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
-        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
+        sha512 = "AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==";
       };
     };
     "npm-registry-client-0.2.27" = {
@@ -19450,7 +19099,7 @@ let
       version = "8.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz";
-        sha512 = "0g7abpykfqb1x17pajm1ndsh61n3ydyimv5npsjrn9hd1s72csxh7fzdn28gldz30n00wgb8rg9y8jfhxli3cnii61i5vl0cwbwdf7f";
+        sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==";
       };
     };
     "npm-run-path-1.0.0" = {
@@ -19495,7 +19144,7 @@ let
       version = "2.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz";
-        sha512 = "22f6r0rdspn2cra19jdxblr3qrqk786z3c50h0q4581i49pgzfi9hnprzih7g11hff2zvf86y43aagyi44031v3l21cf6dwiqfbwcl9";
+        sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA==";
       };
     };
     "npmi-2.0.1" = {
@@ -19522,7 +19171,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
     "nprogress-0.2.0" = {
@@ -19570,6 +19219,24 @@ let
         sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
+    "numeral-2.0.6" = {
+      name = "numeral";
+      packageName = "numeral";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz";
+        sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506";
+      };
+    };
+    "nwmatcher-1.4.4" = {
+      name = "nwmatcher";
+      packageName = "nwmatcher";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz";
+        sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==";
+      };
+    };
     "oauth-0.9.14" = {
       name = "oauth";
       packageName = "oauth";
@@ -19685,16 +19352,16 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz";
-        sha512 = "2qnadlb3xqg732666500m9gssayfvlzrhipcl3hyw3qm1yhmvnz72slbmzlbfi8kgzl95a32a896f1lf175ql4jmn9f2j95pm1v74nk";
+        sha512 = "05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==";
       };
     };
-    "object-keys-1.0.11" = {
+    "object-keys-1.0.12" = {
       name = "object-keys";
       packageName = "object-keys";
-      version = "1.0.11";
+      version = "1.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz";
-        sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d";
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz";
+        sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==";
       };
     };
     "object-values-1.0.0" = {
@@ -19721,7 +19388,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv";
+        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
     "object.defaults-1.1.0" = {
@@ -19922,22 +19589,13 @@ let
         sha1 = "707375e59ab9f73025899727679b20328171c9aa";
       };
     };
-    "openssl-self-signed-certificate-1.1.6" = {
-      name = "openssl-self-signed-certificate";
-      packageName = "openssl-self-signed-certificate";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz";
-        sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4";
-      };
-    };
-    "openssl-wrapper-0.2.1" = {
+    "openssl-wrapper-0.3.4" = {
       name = "openssl-wrapper";
       packageName = "openssl-wrapper";
-      version = "0.2.1";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz";
-        sha1 = "ff2d6552c83bb14437edc0371784704c75289473";
+        url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.3.4.tgz";
+        sha1 = "c01ec98e4dcd2b5dfe0b693f31827200e3b81b07";
       };
     };
     "opentracing-0.13.0" = {
@@ -19958,22 +19616,13 @@ let
         sha1 = "23e3ad029fa66a653926adbe57e834469f8550aa";
       };
     };
-    "opn-4.0.2" = {
-      name = "opn";
-      packageName = "opn";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz";
-        sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95";
-      };
-    };
     "opn-5.3.0" = {
       name = "opn";
       packageName = "opn";
       version = "5.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
-        sha512 = "3d5s5y22sx4wfswzs8fmhr7sarmjigs8qhmmyrkiplfda6kkfk3kv67fs8npdklf8zbc9hmx76zsxqfv4bn5qlpzbfq96nfyailg0kd";
+        sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==";
       };
     };
     "optimist-0.2.8" = {
@@ -20054,7 +19703,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz";
-        sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8";
+        sha512 = "iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==";
       };
     };
     "orchestrator-0.3.8" = {
@@ -20075,15 +19724,6 @@ let
         sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126";
       };
     };
-    "ordered-read-streams-0.3.0" = {
-      name = "ordered-read-streams";
-      packageName = "ordered-read-streams";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz";
-        sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b";
-      };
-    };
     "ordered-read-streams-1.0.1" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -20135,7 +19775,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
+        sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
       };
     };
     "os-name-1.0.3" = {
@@ -20189,7 +19829,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
     "osx-release-1.1.0" = {
@@ -20207,7 +19847,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
-        sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i";
+        sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==";
       };
     };
     "p-cancelable-0.3.0" = {
@@ -20216,7 +19856,7 @@ let
       version = "0.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz";
-        sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5";
+        sha512 = "RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==";
       };
     };
     "p-cancelable-0.4.1" = {
@@ -20225,7 +19865,7 @@ let
       version = "0.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
-        sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw";
+        sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
       };
     };
     "p-finally-1.0.0" = {
@@ -20246,13 +19886,22 @@ let
         sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
       };
     };
-    "p-limit-1.2.0" = {
+    "p-limit-1.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "1.2.0";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+      };
+    };
+    "p-limit-2.0.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz";
-        sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz";
+        sha512 = "fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==";
       };
     };
     "p-locate-2.0.0" = {
@@ -20264,6 +19913,15 @@ let
         sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
       };
     };
+    "p-locate-3.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+      };
+    };
     "p-some-2.0.1" = {
       name = "p-some";
       packageName = "p-some";
@@ -20288,7 +19946,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz";
-        sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk";
+        sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
       };
     };
     "p-try-1.0.0" = {
@@ -20300,13 +19958,22 @@ let
         sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
       };
     };
+    "p-try-2.0.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz";
+        sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==";
+      };
+    };
     "pac-proxy-agent-2.0.2" = {
       name = "pac-proxy-agent";
       packageName = "pac-proxy-agent";
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz";
-        sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh";
+        sha512 = "cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA==";
       };
     };
     "pac-resolver-3.0.0" = {
@@ -20315,7 +19982,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz";
-        sha512 = "1w6mzypllad7wy658kd56fqih6i8x0f841a2pnnn97dhkk810nw3r9f73kpxqa6llkrgy6p1ax4xy1rgbzvrf4zczblvf13pgqkgixm";
+        sha512 = "tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==";
       };
     };
     "package-json-1.2.0" = {
@@ -20336,6 +20003,15 @@ let
         sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
       };
     };
+    "package-json-5.0.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz";
+        sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg==";
+      };
+    };
     "package-json-versionify-1.0.4" = {
       name = "package-json-versionify";
       packageName = "package-json-versionify";
@@ -20378,7 +20054,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz";
-        sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm";
+        sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==";
       };
     };
     "parallel-transform-1.1.0" = {
@@ -20414,7 +20090,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
-        sha512 = "1vq07bq1c0b5v82mknyg2y4lrdy1qmqkzw432f406rx9v2hni3040z270kpsvi2vf4ikq6x0k9g8p16n7aafrwsrpwvx0wpa9z7pz18";
+        sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
       };
     };
     "parse-entities-1.1.2" = {
@@ -20423,7 +20099,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
-        sha512 = "192kwdas18b36rdffjp98qvq4ssnmnndryvcz2lzz6g8dnn5pfglabpjcj4p9bngkyp5z0fwvpb0vj4i9zdskp8gzbig6zd1scnbpz4";
+        sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -20462,13 +20138,13 @@ let
         sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536";
       };
     };
-    "parse-help-0.1.1" = {
+    "parse-help-1.0.0" = {
       name = "parse-help";
       packageName = "parse-help";
-      version = "0.1.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz";
-        sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda";
+        url = "https://registry.npmjs.org/parse-help/-/parse-help-1.0.0.tgz";
+        sha512 = "dlOrbBba6Rrw/nrJ+V7/vkGZdiimWJQzMHZZrYsUq03JE8AV3fAv6kOYX7dP/w2h67lIdmRf8ES8mU44xAgE/Q==";
       };
     };
     "parse-json-2.2.0" = {
@@ -20489,6 +20165,15 @@ let
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     };
+    "parse-numeric-range-0.0.2" = {
+      name = "parse-numeric-range";
+      packageName = "parse-numeric-range";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-0.0.2.tgz";
+        sha1 = "b4f09d413c7adbcd987f6e9233c7b4b210c938e4";
+      };
+    };
     "parse-passwd-1.0.0" = {
       name = "parse-passwd";
       packageName = "parse-passwd";
@@ -20513,16 +20198,16 @@ let
       version = "5.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz";
-        sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb";
+        sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww==";
       };
     };
-    "parse-torrent-6.0.0" = {
+    "parse-torrent-6.0.1" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.0.tgz";
-        sha512 = "1yr12djspi83lybgycwsaz5wbikbsazwhk2w4xf3niri1lx0p3965br1xbsjw1m0xrzc71q6mw5xz44w0hd3ic5wmb2v62abl7kld16";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.1.tgz";
+        sha512 = "triz3PBolkV8kvyV2GEvVn3wne5HayJc+C1Px3L0o1UaNBO2qlv2u6seXDrbRicmL/qL2msZap+SuzMuzNb/Kg==";
       };
     };
     "parse-torrent-file-2.1.4" = {
@@ -20534,13 +20219,22 @@ let
         sha1 = "32d4b6afde631420e5f415919a222b774b575707";
       };
     };
+    "parse5-1.5.1" = {
+      name = "parse5";
+      packageName = "parse5";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
+        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
+      };
+    };
     "parse5-3.0.3" = {
       name = "parse5";
       packageName = "parse5";
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz";
-        sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf";
+        sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==";
       };
     };
     "parsejson-0.0.1" = {
@@ -20750,6 +20444,15 @@ let
         sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
       };
     };
+    "path-browserify-0.0.1" = {
+      name = "path-browserify";
+      packageName = "path-browserify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
+        sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==";
+      };
+    };
     "path-dirname-1.0.2" = {
       name = "path-dirname";
       packageName = "path-dirname";
@@ -20819,7 +20522,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz";
-        sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk";
+        sha512 = "k/IPo9OWyofATP5gwIehHHQoFShS37zsSIsejKe6fjI+tqK+FnRpiSg4ZfWUpxb0g2PfCreWPqBD4ayjqjqkdQ==";
       };
     };
     "path-parse-1.0.5" = {
@@ -20894,6 +20597,15 @@ let
         sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
       };
     };
+    "path-to-regexp-2.2.1" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz";
+        sha512 = "gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==";
+      };
+    };
     "path-type-1.1.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -20918,7 +20630,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz";
-        sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg";
+        sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
       };
     };
     "pathval-1.1.0" = {
@@ -20963,7 +20675,7 @@ let
       version = "3.0.16";
       src = fetchurl {
         url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz";
-        sha512 = "1q07jjlhbbn9fd1aqyrqqxlv184k8ppbafavwvb19lvgbzvp8fnrx7qd9lkbfzb6g4592czp178wizmgvhrhandxngiljv1gczrg06b";
+        sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==";
       };
     };
     "peer-wire-protocol-0.7.1" = {
@@ -20972,7 +20684,7 @@ let
       version = "0.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.1.tgz";
-        sha512 = "2dzhv7b379pzls7q7kd168h4ckh3gnfxcizknb8bvqrpxrm847vjc8c0vpn1b490k94sgl5yxndfiw30rply4phymrx6z2wyrmi7njp";
+        sha512 = "V9oTa/ZcfNNz9fAST28Gg0fXbPeFPk3SBImsYO8GDDG5D0E195vxXmjZ+SPrzr4BJyMQmdDmwUfTf9MZ62z4mw==";
       };
     };
     "peer-wire-swarm-0.12.2" = {
@@ -20981,7 +20693,7 @@ let
       version = "0.12.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.2.tgz";
-        sha512 = "3bchr23xpdvjf588f8qx52ylri5kcqnqi4lf4mgh3i0j8sk1cljvsikd47l09jk4v3drg500q3p5q01nm2z4xfj4fk5xxnbfkb9k1dh";
+        sha512 = "sIWZ1nTL9l6mI9J18kW1AeByBwagvNzGJlMmQA9pM+otKQtTIwnigK8SR0nEFrNZYqZelI6RQ6g4udvtQ2TI1g==";
       };
     };
     "peerflix-0.34.0" = {
@@ -21102,22 +20814,22 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pino-4.14.0" = {
+    "pino-4.16.1" = {
       name = "pino";
       packageName = "pino";
-      version = "4.14.0";
+      version = "4.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-4.14.0.tgz";
-        sha512 = "1x3dsg8pg321khfaf3dd91ykkwhdn60wk169l3b2kp8wkbw242ld99qiv7cmbn76ccba75wdydv8mb2v4fg58lrfnn7jf5pvk2x7qwy";
+        url = "https://registry.npmjs.org/pino/-/pino-4.16.1.tgz";
+        sha512 = "ST/IC5RMyqrOZL+Hq6LDwz5h4fGKABXzx2/5Ze7rz5TjuPvE8uI72dzj409xkq9JjyWsKoOOApgXn8kEjJ73yg==";
       };
     };
-    "pino-std-serializers-1.2.0" = {
+    "pino-std-serializers-2.1.0" = {
       name = "pino-std-serializers";
       packageName = "pino-std-serializers";
-      version = "1.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-1.2.0.tgz";
-        sha512 = "0h8xndhy3qwgkycbmypfp7a2dvk875prgnfg46zj9vz14i24xqqdw1xp748hkv2xl2phwhyaa82yr1ym6jn6r61527kz5f7f8qird78";
+        url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.1.0.tgz";
+        sha512 = "NqWvrQD/GpY78ybiNBzi/dg8ylERhDo6nB33j5sfCKpUmWLc3lYzeoBjyRoCMvEpDpL9lmH6ufRd0jw6rcd1pQ==";
       };
     };
     "pkg-dir-2.0.0" = {
@@ -21180,7 +20892,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz";
-        sha512 = "2x54acxamqkr98gwnwf5h8bajcrcsv8b4156laym47ibf2093kbnki8v4dlk7zs8q5dclqnhqdr6p183phna67v0wdwb4mywm4mzjbf";
+        sha512 = "bslfSeW+ksUbB/sYZeEdKFyTG4YWU9YKRvqfSRvZKE675khAuBUPqV5RUwJZaGuWmVQLweK45Q+lPHFVnSlSug==";
       };
     };
     "plist-1.2.0" = {
@@ -21207,7 +20919,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz";
-        sha512 = "12n868myk28as4ivyihfw9ai50y0vc1jrr77r55drlidyi7qpwlm23aj9n05qqlzhs544yah6p535b5hiayh6xykf81q68wg8f2z60s";
+        sha512 = "GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==";
       };
     };
     "plist-with-patches-0.5.1" = {
@@ -21234,7 +20946,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz";
-        sha512 = "32d7a6iycndvgqcm7crxl59cfqlsz01iz6q7f4a4jgzwmp68myw0sl8315c0lyx2wvj4xmblhvd8jva3vhqndn1chg6rg1vv78wyp1g";
+        sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==";
       };
     };
     "pluralize-1.2.1" = {
@@ -21252,7 +20964,7 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz";
-        sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601";
+        sha512 = "ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==";
       };
     };
     "po2json-0.4.5" = {
@@ -21297,7 +21009,7 @@ let
       version = "9.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/popsicle/-/popsicle-9.2.0.tgz";
-        sha512 = "23p3a888k27q99lj4904nbcs8r51nlm4qdzs3m0xp9y4ci1rxzymzzckrblrmlmbzrlxx4i9zx7s56gcrhvi2jm3ypr3lvhgy7m3sx5";
+        sha512 = "petRj39w05GvH1WKuGFmzxR9+k+R9E7zX5XWTFee7P/qf88hMuLT7aAO/RsmldpQMtJsWQISkTQlfMRECKlxhw==";
       };
     };
     "popsicle-proxy-agent-3.0.0" = {
@@ -21351,16 +21063,16 @@ let
       version = "6.0.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz";
-        sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz";
+        sha512 = "f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg==";
       };
     };
-    "postcss-6.0.22" = {
+    "postcss-6.0.23" = {
       name = "postcss";
       packageName = "postcss";
-      version = "6.0.22";
+      version = "6.0.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz";
-        sha512 = "0fdfvn2pq9hvw40s9l174v5rv4d5x3i9xmd8p3mln6bhzrny3v1h0y1324ghq30jnbrvyfam0725r3hsmj28lhhmc32q08lpaa3v1sf";
+        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz";
+        sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==";
       };
     };
     "prebuild-install-2.1.2" = {
@@ -21378,7 +21090,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz";
-        sha512 = "2ffx8smnrj269a2r9lsiv4s71rvzhanb3a3hqg1i8daznmhl0w9lfsylh9hw5si1agsmbsn0j2syp8sn9r7cwxm8ps9b80vwv2v5mpf";
+        sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA==";
       };
     };
     "precond-0.2.3" = {
@@ -21468,7 +21180,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz";
-        sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h";
+        sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug==";
       };
     };
     "printf-0.2.5" = {
@@ -21486,7 +21198,7 @@ let
       version = "0.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
-        sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n";
+        sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
       };
     };
     "probe-image-size-4.0.0" = {
@@ -21495,7 +21207,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-4.0.0.tgz";
-        sha512 = "1qwy2hmhw201igjdk90dpky6b1qpc9b2jm7nxrsshcagf0ln73s62mwfd2j0mkfx29bhsndjmm8v2fk3nwk8jinzavcz9iicnyx2vly";
+        sha512 = "nm7RvWUxps+2+jZKNLkd04mNapXNariS6G5WIEVzvAqjx7EUuKcY1Dp3e6oUK7GLwzJ+3gbSbPLFAASHFQrPcQ==";
       };
     };
     "process-0.11.10" = {
@@ -21531,7 +21243,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
-        sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
       };
     };
     "progress-1.1.8" = {
@@ -21558,7 +21270,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz";
-        sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97";
+        sha512 = "JymvIR4IJ0qTyma7ExefBeJGp2IGaXYGWv8Z//Jq+AhrCd0uKlMPK9IWJ0LL6zbXbAN8fhLe1TL1hl1ZKOljDw==";
       };
     };
     "promiscuous-0.6.0" = {
@@ -21594,7 +21306,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
+        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
     "promise-finally-3.0.0" = {
@@ -21624,15 +21336,6 @@ let
         sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
       };
     };
-    "promise-timeout-1.3.0" = {
-      name = "promise-timeout";
-      packageName = "promise-timeout";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-timeout/-/promise-timeout-1.3.0.tgz";
-        sha512 = "2m6ixvg01qqcrywfm8jv1phv3irv63qbk901nq6wg3vhvs4wg5c8qz45fs8rzw8yr1h0p6f7dyb0ndll2irpcpkz1z2x6id9m60s877";
-      };
-    };
     "promised-temp-0.1.0" = {
       name = "promised-temp";
       packageName = "promised-temp";
@@ -21678,13 +21381,13 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
-    "prop-types-15.6.1" = {
+    "prop-types-15.6.2" = {
       name = "prop-types";
       packageName = "prop-types";
-      version = "15.6.1";
+      version = "15.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz";
-        sha512 = "28vp2j7wpa97ygi4clflilfs8wj8qsz1x3fismsqx293a9cvpyc20k4pbrppyn7y6hks0dp3mn0wmj5q3y1y3i5k7ra5ssqimnkprz1";
+        url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz";
+        sha512 = "3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==";
       };
     };
     "properties-1.2.1" = {
@@ -21738,7 +21441,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz";
-        sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a";
+        sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ==";
       };
     };
     "proxy-addr-1.0.10" = {
@@ -21765,7 +21468,7 @@ let
       version = "2.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz";
-        sha512 = "1fjf093wrxz3nm9njw491r9rvqwrcv8d8h0mnmyakpijnbff7lllysr7aq9h9w7jdvxjvaf9r055ywd7sghcqxwa2nfpdc9423c414d";
+        sha512 = "jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==";
       };
     };
     "proxy-agent-3.0.0" = {
@@ -21774,7 +21477,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz";
-        sha512 = "1krp2s6sjv452zj0xhmknrm0769jx2v21bfas1aw2kvg2zhdxcq32w7i6kg87fd9ajyynss694bylaw8khkg8clsgxifz9wg6zgmac3";
+        sha512 = "g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw==";
       };
     };
     "proxy-from-env-1.0.0" = {
@@ -21795,15 +21498,6 @@ let
         sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56";
       };
     };
-    "proxy-polyfill-0.2.0" = {
-      name = "proxy-polyfill";
-      packageName = "proxy-polyfill";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-polyfill/-/proxy-polyfill-0.2.0.tgz";
-        sha512 = "2a3g6pp92js3qwb034f8bh8ngc9da11d281brljvs7n59q7xj6hsk0d83s3n9k84z9dhq2f7fpnp8kwg8yh7d8qr7kw78l7r5ndxv4y";
-      };
-    };
     "prr-0.0.0" = {
       name = "prr";
       packageName = "prr";
@@ -21849,13 +21543,22 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
+    "psl-1.1.28" = {
+      name = "psl";
+      packageName = "psl";
+      version = "1.1.28";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz";
+        sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw==";
+      };
+    };
     "pstree.remy-1.1.0" = {
       name = "pstree.remy";
       packageName = "pstree.remy";
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz";
-        sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb";
+        sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q==";
       };
     };
     "public-encrypt-4.0.2" = {
@@ -21864,7 +21567,7 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
-        sha512 = "38qgcvnxnp4lva9c0x6xhq05hb811n8q5s8dxchm5mg04rv64693a1w2hrhy8lcgbvs36kv003ar1xsh312c866hzvwb0qwr897jhp2";
+        sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==";
       };
     };
     "pug-2.0.3" = {
@@ -21999,7 +21702,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz";
-        sha512 = "1k9a17my3m2zkz7g8hynxswrqks679vih7vd97qz5ky16x4kkms4ysxxzs5744kfzwwxg9p14xgnx8vs6kc15wjmdlkhlfy62bajvkx";
+        sha512 = "fW6pljDeUThpq5KXwKbRG3X7Ogk3vc75d5OQU/TvXXui65ykm+Bn+fiktg+MOx2jJ85cd+sheufPL+rw9QSVZg==";
       };
     };
     "pull-live-1.0.1" = {
@@ -22026,7 +21729,7 @@ let
       version = "3.6.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.8.tgz";
-        sha512 = "3w8xs22qp9cqpvgy1zgnajk9jw25g4x2x5xlak657g3rb59whqf4gp1kk747kddav3d83ppgr9fyg9r560nc8f52qmwsw01sjk0h1f1";
+        sha512 = "wQUIptQBcM0rFsUhZoEpOT3vUn73DtTGVq3NQ86c4T7iMOSprDzeKWYq2ksXnbwiuExTKvt+8G9fzNLFQuiO+A==";
       };
     };
     "pull-window-2.1.4" = {
@@ -22053,7 +21756,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz";
-        sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj";
+        sha512 = "8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==";
       };
     };
     "pump-2.0.1" = {
@@ -22062,7 +21765,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz";
-        sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf";
+        sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==";
       };
     };
     "pump-3.0.0" = {
@@ -22071,7 +21774,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
+        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
       };
     };
     "pumpify-1.5.1" = {
@@ -22080,7 +21783,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz";
-        sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0";
+        sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==";
       };
     };
     "punycode-1.3.2" = {
@@ -22101,22 +21804,13 @@ let
         sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     };
-    "punycode-2.1.0" = {
+    "punycode-2.1.1" = {
       name = "punycode";
       packageName = "punycode";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz";
-        sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d";
-      };
-    };
-    "q-0.9.7" = {
-      name = "q";
-      packageName = "q";
-      version = "0.9.7";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz";
-        sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
     "q-1.0.1" = {
@@ -22170,7 +21864,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz";
-        sha512 = "0g8mmxjq1gn92mf9gzpf2469xwrisbg2vdlxg3bnq18gqlviy2s7l7wi99wmbz5kvbb9yn0wxbi9r83f4jchhzivn0299vigc88k0zi";
+        sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==";
       };
     };
     "qs-0.4.2" = {
@@ -22287,7 +21981,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
+        sha512 = "fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==";
       };
     };
     "qs-6.5.1" = {
@@ -22296,7 +21990,7 @@ let
       version = "6.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
+        sha512 = "eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==";
       };
     };
     "qs-6.5.2" = {
@@ -22305,7 +21999,7 @@ let
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
     "qtdatastream-0.7.1" = {
@@ -22332,7 +22026,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
-        sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2";
+        sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
       };
     };
     "querystring-0.2.0" = {
@@ -22386,7 +22080,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz";
-        sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx";
+        sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg==";
       };
     };
     "random-access-memory-2.4.0" = {
@@ -22398,13 +22092,22 @@ let
         sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2";
       };
     };
-    "random-access-storage-1.2.0" = {
+    "random-access-memory-3.0.0" = {
+      name = "random-access-memory";
+      packageName = "random-access-memory";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz";
+        sha512 = "O/d5C/kTOs/aDix1CD+N7z4SgNVGPx+xpFKXGfrC0TFpqYVrsJEUmQCl3ITTg7FVMoCmLBo5rdkA5FcFg00NTA==";
+      };
+    };
+    "random-access-storage-1.3.0" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz";
-        sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz";
+        sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA==";
       };
     };
     "random-bytes-1.0.0" = {
@@ -22431,7 +22134,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz";
-        sha512 = "142g2k8ipzpkp1sv5zsbk8qy39r5isc1s9q2x910dh6zqwdksd6mkq16apdrfw6ssv14hpg64j4zy3v4m4lclpvwi767phqh4w4bp2m";
+        sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==";
       };
     };
     "randombytes-2.0.6" = {
@@ -22440,7 +22143,7 @@ let
       version = "2.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
-        sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108";
+        sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==";
       };
     };
     "randomfill-1.0.4" = {
@@ -22449,7 +22152,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
-        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
+        sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
       };
     };
     "range-parser-0.0.4" = {
@@ -22488,13 +22191,13 @@ let
         sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f";
       };
     };
-    "raven-2.4.2" = {
-      name = "raven";
-      packageName = "raven";
-      version = "2.4.2";
+    "raven-js-3.26.3" = {
+      name = "raven-js";
+      packageName = "raven-js";
+      version = "3.26.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-2.4.2.tgz";
-        sha1 = "0129e2adc30788646fd530b67d08a8ce25d4f6dc";
+        url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.3.tgz";
+        sha512 = "VPAsPfK73A9VPcJx5X/kt0GxOqUGpGDM8vdzsYNQXMhYemyZGiW1JX1AI+f4jxm37Apijj6VVtCyJcYFz3ocSQ==";
       };
     };
     "raw-body-0.0.3" = {
@@ -22548,16 +22251,16 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz";
-        sha512 = "27ygzjzpajjmz2bl1f7y1bla7wdw65w912r4i29x9p1r0pa5jivip658vwlkqq77n1nc619w1p52818mvihxhks4dlbc1pmbc925szm";
+        sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
       };
     };
-    "raw-socket-1.6.0" = {
+    "raw-socket-1.6.2" = {
       name = "raw-socket";
       packageName = "raw-socket";
-      version = "1.6.0";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.0.tgz";
-        sha512 = "2268lfw8q4mz0v988by3y0hbad848sx7kmmqm3rk7nbj7xc3sy045adcdbnh3c8vrhk57ljk61wshphgr69y8pw3987f1if369ny7pr";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz";
+        sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw==";
       };
     };
     "rc-0.4.0" = {
@@ -22569,13 +22272,13 @@ let
         sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
       };
     };
-    "rc-1.2.7" = {
+    "rc-1.2.8" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.7";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz";
-        sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
     "rc-config-loader-2.0.1" = {
@@ -22584,7 +22287,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.1.tgz";
-        sha512 = "2sp3cd5mzpc91g5c8k7xwdm9gnax4pf6wvg09scksc81bs5p0qpzjf6s7xi36b0lxfhs76jmm48jv23biy4b4q3d6ldx77vjvhgcyiq";
+        sha512 = "OHr24Jb7nN6oaQOTRXxcQ2yJSK3SHA1dp2CZEfvRxsl/MbhFr4CYnkwn8DY37pKu7Eu18X4mYuWFxO6vpbFxtQ==";
       };
     };
     "re-emitter-1.1.3" = {
@@ -22647,7 +22350,7 @@ let
       version = "2.0.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz";
-        sha512 = "2d6gl0kam8r9s4akgqi1pjbfqa6iszwsi1v87kw354b68s7dck4w8flnjp38b9dsj9cldbch0czj1m9gbrh252dm3c6mg2r6knmjmzz";
+        sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==";
       };
     };
     "read-pkg-1.1.0" = {
@@ -22704,6 +22407,15 @@ let
         sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07";
       };
     };
+    "read-pkg-up-4.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
+        sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
+      };
+    };
     "read-torrent-1.3.0" = {
       name = "read-torrent";
       packageName = "read-torrent";
@@ -22755,7 +22467,7 @@ let
       version = "2.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
     "readdirp-2.1.0" = {
@@ -22803,13 +22515,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "record-cache-1.0.2" = {
+    "record-cache-1.1.0" = {
       name = "record-cache";
       packageName = "record-cache";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.2.tgz";
-        sha512 = "2iykkjgwmmcma3306cjzsq34dg6rxfvwr4r11fyq56dfsybp9qwnvhc4fbi3l854zfj71fbw887bgab78ykr6b3m9gdw2lpf5sa53c0";
+        url = "https://registry.npmjs.org/record-cache/-/record-cache-1.1.0.tgz";
+        sha512 = "u8rbtLEJV7HRacl/ZYwSBFD8NFyB3PfTTfGLP37IW3hftQCwu6z4Q2RLyxo1YJUNRTEzJfpLpGwVuEYdaIkG9Q==";
       };
     };
     "recursive-readdir-2.2.2" = {
@@ -22818,7 +22530,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz";
-        sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x";
+        sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==";
       };
     };
     "recursive-watch-1.1.4" = {
@@ -22827,7 +22539,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz";
-        sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx";
+        sha512 = "fWejAmdLi7B/jipBUjTLnqId+PK+573fbGNbdaNA/AiAnQAx6OYOLCGWRs0W5+PyM1rLzZSWK2f40QpHSR49PQ==";
       };
     };
     "redent-1.0.0" = {
@@ -22881,7 +22593,7 @@ let
       version = "2.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-        sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
+        sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
       };
     };
     "redis-commands-1.3.5" = {
@@ -22890,7 +22602,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz";
-        sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by";
+        sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==";
       };
     };
     "redis-parser-2.6.0" = {
@@ -22911,15 +22623,6 @@ let
         sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
       };
     };
-    "regenerate-1.4.0" = {
-      name = "regenerate";
-      packageName = "regenerate";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
-        sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl";
-      };
-    };
     "regenerator-runtime-0.10.5" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
@@ -22935,7 +22638,7 @@ let
       version = "0.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
-        sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj";
+        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
       };
     };
     "regenerator-runtime-0.9.6" = {
@@ -22947,22 +22650,13 @@ let
         sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
       };
     };
-    "regenerator-transform-0.10.1" = {
-      name = "regenerator-transform";
-      packageName = "regenerator-transform";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz";
-        sha512 = "3lxj64s9v2jksipiz0pphfy6m12cf7j96w64bqlzjwnasbpqhc5ws5bjzv3x9ld625v1z4f15l30izpv3p6l9w8h1qsvf6vy1pak5rw";
-      };
-    };
     "regex-cache-0.4.4" = {
       name = "regex-cache";
       packageName = "regex-cache";
       version = "0.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz";
-        sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx";
+        sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==";
       };
     };
     "regex-not-1.0.2" = {
@@ -22971,7 +22665,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
-        sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917";
+        sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
+      };
+    };
+    "regexp.prototype.flags-1.2.0" = {
+      name = "regexp.prototype.flags";
+      packageName = "regexp.prototype.flags";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz";
+        sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==";
       };
     };
     "regexpp-1.1.0" = {
@@ -22980,16 +22683,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz";
-        sha512 = "21xg69jgy5r7mffh5gjaqsv6izqvqh466q3fanmnzsgk33xhxp68nnszw4jcxk2w8lnc92phy26sr7xqq3ni36mg9yh2xb0bbqg1qrc";
-      };
-    };
-    "regexpu-core-2.0.0" = {
-      name = "regexpu-core";
-      packageName = "regexpu-core";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz";
-        sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240";
+        sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -22998,7 +22692,7 @@ let
       version = "3.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
-        sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94";
+        sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==";
       };
     };
     "registry-url-3.1.0" = {
@@ -23010,24 +22704,6 @@ let
         sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
-    "regjsgen-0.2.0" = {
-      name = "regjsgen";
-      packageName = "regjsgen";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz";
-        sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
-      };
-    };
-    "regjsparser-0.1.5" = {
-      name = "regjsparser";
-      packageName = "regjsparser";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz";
-        sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
-      };
-    };
     "reinterval-1.1.0" = {
       name = "reinterval";
       packageName = "reinterval";
@@ -23097,7 +22773,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz";
-        sha512 = "1frr714kg9xk84fp4r74zg044g4lhf996lw9gzd19mlij47jkbnb44xmmas7wqv5604r77n68qx77wrnrc7mkfbm5ygv4ls2rdapzgj";
+        sha512 = "8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==";
       };
     };
     "remove-bom-stream-1.2.0" = {
@@ -23124,7 +22800,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/render-media/-/render-media-3.1.0.tgz";
-        sha512 = "1bn4ydc33jwgczi5xicf07v4vn067m4jaz85iqssigdzhq09p1cdqjfqy9xm2dvs5qs64iv1za5iw4my0s6synzdv8cmz69q605qcxd";
+        sha512 = "rTNcgMHJ/MrQbt96bTTwlfBY1A87EqNx0buJ2pPHTuLGwk0Aw99e1BrHgr6SpB4D7Cb7AMdiL/Gzx+UYrHliVw==";
       };
     };
     "render-readme-1.3.1" = {
@@ -23253,22 +22929,31 @@ let
         sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
+    "request-2.83.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.83.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
+        sha512 = "lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==";
+      };
+    };
     "request-2.85.0" = {
       name = "request";
       packageName = "request";
       version = "2.85.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
-        sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
+        sha512 = "8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==";
       };
     };
-    "request-2.86.0" = {
+    "request-2.87.0" = {
       name = "request";
       packageName = "request";
-      version = "2.86.0";
+      version = "2.87.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.86.0.tgz";
-        sha512 = "37xa5i4dk3fkcl9gxrzxkjjy6vcqn6bcc61bwq6kjpqrg5i01yc6xn0iq3zy68vqqav93k1kgr2xdabp22p0bfynfcbzxp8ms3n41h5";
+        url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
+        sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
       };
     };
     "request-2.9.203" = {
@@ -23295,7 +22980,7 @@ let
       version = "1.13.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz";
-        sha512 = "2d6rk1gry4jlbd4i3ghm6vn9vjcjwsyb02w9f4jc5ximih9niq4javazp9hbm658zp2fz2zm8xy1dp2rxqv2c84301p0hg7rfl7ss1f";
+        sha512 = "Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==";
       };
     };
     "require-directory-2.1.1" = {
@@ -23322,7 +23007,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz";
-        sha512 = "09yzgr8s5p0rb2ic71zylyy7dcxk9xskcmkgh7bddq4h383nn34g47wry2yvw7flxzjzsbak6d1n9cabfgh5gnb2kifrccixrcjgzax";
+        sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==";
       };
     };
     "require-main-filename-1.0.1" = {
@@ -23370,13 +23055,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.7.1" = {
+    "resolve-1.8.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.7.1";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
-        sha512 = "1zhdyfbs9gfd5iswb8dbra3gljv9mglapgcirci1zsfs78rfn557rp6z81drxxsz0m4w4imm2n9qf7yrchkfjhxz9a0vwp9hwpg1fkk";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz";
+        sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==";
       };
     };
     "resolve-dir-1.0.1" = {
@@ -23493,7 +23178,7 @@ let
       version = "0.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
-        sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad";
+        sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
     "retry-0.10.1" = {
@@ -23583,7 +23268,7 @@ let
       version = "2.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
-        sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
+        sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==";
       };
     };
     "ripemd160-2.0.2" = {
@@ -23592,7 +23277,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
-        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
+        sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
       };
     };
     "rndm-1.2.0" = {
@@ -23646,7 +23331,7 @@ let
       version = "3.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz";
-        sha512 = "2bjwzsigk7685syp50amryj0sx08l155azg1z4ldx95gadlwfm07y0iyv0vfwgfchbripn2a5r04qhv546djh0biw8prgpx6r0qdx9r";
+        sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==";
       };
     };
     "run-async-0.1.0" = {
@@ -23673,7 +23358,7 @@ let
       version = "1.1.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
-        sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc";
+        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
       };
     };
     "run-parallel-limit-1.0.5" = {
@@ -23682,7 +23367,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz";
-        sha512 = "2b87xk6x0fxs3bls9zzprvxiy2ldgvjxckkfv3ccg23j6f8qv58379pmylkkiv61w6b8qcsmsciwch7lg41nxx0qk6bpgp076h3xiin";
+        sha512 = "NsY+oDngvrvMxKB3G8ijBzIema6aYbQMD2bHOamvN52BysbIGTnEY2xsNyfrcr9GhY995/t/0nQN3R3oZvaDlg==";
       };
     };
     "run-queue-1.0.3" = {
@@ -23700,7 +23385,7 @@ let
       version = "1.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz";
-        sha512 = "1gg6q66zyhqr3ylp9zx79v9qyxns1j643p9gkk2kqkijihpvp27ilhzg0qb8kiqxcsw2m0y5rbmdkq6qdhnkar4l088p96i8dhfsv7q";
+        sha512 = "+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg==";
       };
     };
     "rusha-0.8.13" = {
@@ -23757,13 +23442,22 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "rxjs-5.5.10" = {
+    "rxjs-5.5.11" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "5.5.10";
+      version = "5.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz";
-        sha512 = "3lc28jznaclc3qcipvf29dnfa11m4xdzyr4gkas29pgp0s4c44f8cyzsxyfwkqzqa8k06q7j7hl5wwyy671d8gdkwl9j76lh2cf4629";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz";
+        sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==";
+      };
+    };
+    "rxjs-6.2.1" = {
+      name = "rxjs";
+      packageName = "rxjs";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz";
+        sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g==";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -23781,7 +23475,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -23790,7 +23484,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
     "safe-json-parse-1.0.1" = {
@@ -23802,13 +23496,13 @@ let
         sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57";
       };
     };
-    "safe-json-stringify-1.1.0" = {
+    "safe-json-stringify-1.2.0" = {
       name = "safe-json-stringify";
       packageName = "safe-json-stringify";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz";
-        sha512 = "30fqwpa7qn9rsk4va9ih61jqhm0x59s3wa2n5kff1ygdwpi9hxmpig24y1vhdv1di2pfd6gy0iwkryix6lc5gff7pcb3xa7l58nsc0k";
+        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz";
+        sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==";
       };
     };
     "safe-regex-1.1.0" = {
@@ -23826,7 +23520,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "sander-0.5.1" = {
@@ -23844,7 +23538,7 @@ let
       version = "1.18.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz";
-        sha512 = "2kbz3x78dradp1xaddz60iakax4cj1rqgdxhjj5ljfgwm17kjc5pvr1kh2lyqrbxxmcx9kbfv8pa68af126v5clprks11vvwq1y2r77";
+        sha512 = "52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==";
       };
     };
     "sax-0.3.5" = {
@@ -23898,7 +23592,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
     "schema-utils-0.4.5" = {
@@ -23907,7 +23601,7 @@ let
       version = "0.4.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz";
-        sha512 = "1y97jl7qm7xvd867cghrgfzrlyf5z05rvwpigvi4ijzy4c8ckqr0bl76ym5nh6akiyc2qb19kbnmmk1r8nkfm4fsp4lznnpsipy72n9";
+        sha512 = "yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==";
       };
     };
     "scoped-regex-1.0.0" = {
@@ -24015,7 +23709,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
-        sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
+        sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
       };
     };
     "semver-compare-1.0.0" = {
@@ -24060,7 +23754,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz";
-        sha512 = "09ryf3nvrfjqr93b8fj691lh48pvqhrpah5a5fm87szs42xcnl33sss49piv1grb9h2i7icdvz0i0m5yak5ccxa6xbv4x294rsfs6zr";
+        sha512 = "+RvtdCZJdLJXN6ozVqbypYII/m4snihgWvmFHW8iWusxqGVdEP31QdUVVaC6GeJ9EYE0JCMdWiNlLF3edjifEw==";
       };
     };
     "send-0.0.3" = {
@@ -24132,7 +23826,7 @@ let
       version = "0.16.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
-        sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk";
+        sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==";
       };
     };
     "sentiment-2.1.0" = {
@@ -24168,7 +23862,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz";
-        sha512 = "2hiydb59y0q07hp3qfs8g9qjhgmhmajps769wpw2f5ghxwy3ibr7y7lnx7q23snmc3asgzhik0444jvfs3d4gmy0qx9w0n0v3q1rbqr";
+        sha512 = "Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==";
       };
     };
     "serve-favicon-2.3.2" = {
@@ -24189,6 +23883,15 @@ let
         sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0";
       };
     };
+    "serve-handler-3.2.1" = {
+      name = "serve-handler";
+      packageName = "serve-handler";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz";
+        sha512 = "4UYBO6zH61m5YUD54lJ1A8POOPmOOhBdNXJgy5/plzoOBcIluUJgmsayeI4af+QeUNPa5G5e609ycWTpJmKo2Q==";
+      };
+    };
     "serve-index-1.7.3" = {
       name = "serve-index";
       packageName = "serve-index";
@@ -24231,7 +23934,7 @@ let
       version = "1.13.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
-        sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7";
+        sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==";
       };
     };
     "serve-static-1.8.1" = {
@@ -24294,7 +23997,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz";
-        sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7";
+        sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==";
       };
     };
     "setimmediate-1.0.5" = {
@@ -24321,7 +24024,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
-        sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86";
+        sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
       };
     };
     "sha.js-2.4.11" = {
@@ -24330,7 +24033,7 @@ let
       version = "2.4.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
-        sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0";
+        sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
     "shallow-clone-0.1.2" = {
@@ -24420,7 +24123,7 @@ let
       version = "0.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz";
-        sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0";
+        sha512 = "YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==";
       };
     };
     "shellwords-0.1.1" = {
@@ -24429,7 +24132,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
-        sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w";
+        sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
       };
     };
     "shush-1.0.0" = {
@@ -24450,13 +24153,13 @@ let
         sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
       };
     };
-    "sign-addon-0.3.0" = {
+    "sign-addon-0.3.1" = {
       name = "sign-addon";
       packageName = "sign-addon";
-      version = "0.3.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.0.tgz";
-        sha512 = "2czjlarf0pa0svlhbdb9i6hrk429za0gsialmxbmgwgbhyjx7mxkgf5mww4rkmsbncdi2va8p64rxjxf7gv8b0jd2a87cvm7rw5pky5";
+        url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.1.tgz";
+        sha512 = "feaoG7+8IXr9SymOEd8VTZCSlVZArWcBDZ33IIdfXlU5NWWzXdCxCjPDqAkLQplFa7RRZr1S4lSmgMPn80Ze1A==";
       };
     };
     "signal-exit-3.0.2" = {
@@ -24510,7 +24213,7 @@ let
       version = "2.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz";
-        sha512 = "13j7pz8kfspyi25dkkvb6wm5r95yf7adskwf7z46g02vv27clgq9lgpbxx2hy1s5qip45dim625sby77fm4c67h31a0769p5i2qf94m";
+        sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==";
       };
     };
     "simple-get-3.0.2" = {
@@ -24519,16 +24222,16 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz";
-        sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm";
+        sha512 = "dU3TBVIGkP5Hzw6o74hJx+VzTBTX2rqIiLfugs0HdmdVQCQp76XGg2jlBCqfRJfW/n6/mUKTi+s3rnzX7SgbBA==";
       };
     };
-    "simple-git-1.92.0" = {
+    "simple-git-1.96.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.92.0";
+      version = "1.96.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.92.0.tgz";
-        sha1 = "6061468eb7d19f0141078fc742e62457e910f547";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
+        sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -24549,13 +24252,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.1.1" = {
+    "simple-peer-9.1.2" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.1.1";
+      version = "9.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.1.tgz";
-        sha512 = "27d9j7ah5ync1cndpinw966zb81lc9z6pc38y8dkc1l5rxdkv3fmf5ilhf0jq94m3qvb2ipldjmvbs1sza5ccvazwlr4pjgfr07ym23";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.2.tgz";
+        sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q==";
       };
     };
     "simple-plist-0.2.1" = {
@@ -24573,7 +24276,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz";
-        sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4";
+        sha512 = "pFMPd+I/lQkpf4wFUeS/sED5IqdIG1lUlrQviBMV4u4mz8BRAcB5fvUx5Ckfg3kBigEglAjHg7E9k/yy2KlCqA==";
       };
     };
     "simple-swizzle-0.2.2" = {
@@ -24600,7 +24303,7 @@ let
       version = "7.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.2.tgz";
-        sha512 = "2x42bhq5w7k053k2jdhvhd2p7lmr407fkb7fwi0k7glaggf6hb452704yh1zvx83mrhdvyscmpyp971p2slmisiffmfvd6cl5md423h";
+        sha512 = "cAjSaqHMtO2qc1HHSrW44aTrb2Xa7wZzHajvH6An4IhCFjTuPUXfmSByd9Z0B5Bc6bmiwQ2bFHMUMA8vGC5Bug==";
       };
     };
     "simplediff-0.1.1" = {
@@ -24648,13 +24351,13 @@ let
         sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
       };
     };
-    "siphash24-1.1.0" = {
+    "siphash24-1.1.1" = {
       name = "siphash24";
       packageName = "siphash24";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz";
-        sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w";
+        url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz";
+        sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA==";
       };
     };
     "skin-tone-1.0.0" = {
@@ -24726,7 +24429,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz";
-        sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
+        sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==";
       };
     };
     "sliced-0.0.3" = {
@@ -24798,7 +24501,7 @@ let
       version = "0.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
-        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
+        sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==";
       };
     };
     "snapdragon-node-2.1.1" = {
@@ -24807,7 +24510,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
-        sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv";
+        sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==";
       };
     };
     "snapdragon-util-3.0.1" = {
@@ -24816,7 +24519,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
-        sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr";
+        sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
       };
     };
     "snapsvg-0.5.1" = {
@@ -24852,16 +24555,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
-        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
+        sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==";
       };
     };
-    "snyk-1.80.1" = {
+    "snyk-1.88.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.80.1";
+      version = "1.88.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.80.1.tgz";
-        sha1 = "f92d1fea82833a39a607598f847e2699f033be5c";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.88.0.tgz";
+        sha1 = "10d171427de94f6474d64fdc524d6f87c0ab069e";
       };
     };
     "snyk-config-2.1.0" = {
@@ -24870,16 +24573,25 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz";
-        sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g";
+        sha512 = "D1Xz1pZa9lwA9AHogmAigyJGo/iuEGH+rcPB77mFsneVfnuiK9c6IjnsHbEBUf1cePtZvWdGBjs6e75Cvc2AMg==";
+      };
+    };
+    "snyk-docker-plugin-1.10.3" = {
+      name = "snyk-docker-plugin";
+      packageName = "snyk-docker-plugin";
+      version = "1.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.3.tgz";
+        sha512 = "nIw6zS705SiQLEhBwoO2qsJ3lVN1DZ48tyMgqhlr5f5GuOrwUJ0ivUK5HQUI79xA6pF7tU18495OlbsKuEHUOw==";
       };
     };
-    "snyk-go-plugin-1.5.0" = {
+    "snyk-go-plugin-1.5.1" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.0.tgz";
-        sha512 = "20i967dg1n1pir2j0ivpd72i5j3y9xa3826jvl8jspmg9wfnpfq6x0isp3irw42zrcvflshi0nhk3sckcj3lqgjaw82g14wda28g80z";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.1.tgz";
+        sha512 = "8OPJOT05Z/UL5fFSXV6b/A6KjlS1Ahr2gpup1bhXtAGXlUUPyWidqkCIER9fexDXqYWgAoDAdn9YHIvmL/5bfw==";
       };
     };
     "snyk-gradle-plugin-1.3.0" = {
@@ -24888,7 +24600,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz";
-        sha512 = "22av46k72s8cgigsj0ppir7cd1150079mg1hhb8qgkg9a4asdw3wn48ahwra08rai0rd4z4jhwhmhpc7d63np4ivvjdqcy30qzmr9mc";
+        sha512 = "rKZcPwbDM9zk3pFcO0w77MIKOZTkk5ZBVBkBlTlUiFg+eNOKqPTmw2hBGF5NB4ASQmMnx3uB1C8+hrQ405CthA==";
       };
     };
     "snyk-module-1.8.2" = {
@@ -24897,7 +24609,7 @@ let
       version = "1.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz";
-        sha512 = "03372r6cvic19gajy5sa3q11sjal4499svhv50bglywf9jfi2555lpnvsshh08kr6krwcmnm7vb3fm4va3pb616h5wy4ln2kxnmva2y";
+        sha512 = "XqhdbZ/CUuJ5gSaYdYfapLqx9qm2Mp6nyRMBCLXe9tJSiohOJsc9fQuUDbdOiRCqpA4BD6WLl+qlwOJmJoszBg==";
       };
     };
     "snyk-mvn-plugin-1.2.0" = {
@@ -24906,7 +24618,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz";
-        sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49";
+        sha512 = "ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w==";
       };
     };
     "snyk-nuget-plugin-1.6.2" = {
@@ -24915,7 +24627,7 @@ let
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.2.tgz";
-        sha512 = "1najpr4zi3zkmnwps7dsdlw3bk4gxqs7y4ynziz9n3dyg8y8fjj9i5231n5yhgpwl3agn1q7ghzsr4wf1bm0q1ig6q7rcayrr5j2pzj";
+        sha512 = "8l8hS85esXyweTFgUFdwnGT94Ts42KcG5fdBX2wYosQkpUMePd+GTT9+64k/GvdH5hqcNt2OvtzW+Uf8JF+pbA==";
       };
     };
     "snyk-php-plugin-1.5.1" = {
@@ -24924,7 +24636,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz";
-        sha512 = "0bwffvgwcqgmw4m8zpnm3y6p651fg6nbv1kwacjd6k5cwvbnraggxc4wa6rl1h8x7cbwhx04iid02avwn60njnwf2w669qi3cf15543";
+        sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw==";
       };
     };
     "snyk-policy-1.12.0" = {
@@ -24933,16 +24645,16 @@ let
       version = "1.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz";
-        sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08";
+        sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w==";
       };
     };
-    "snyk-python-plugin-1.6.0" = {
+    "snyk-python-plugin-1.6.1" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.0.tgz";
-        sha512 = "06n8zx8az0afp7b2gnav664hzmjxg5dp96a5vmy5a58dhr278x6fl7pgsd332ykxanphrm59dsm0hyka2s8wibam2v8wjbgm4xxrlzz";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.1.tgz";
+        sha512 = "6zr5jAB3p/bwMZQxZpdj+aPmioTgHB4DI6JMLInhZupss0x8Ome5YqzVzBbOvUKNrc3KaLtjGrJWcAuxDL6M/g==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -24951,7 +24663,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz";
-        sha512 = "2kh7wgl3yjw4am7ay4ag5d6qynbj06jzqf6wph17lhwx9ichwl6adqaf8nbsksib1y65kmvmvqm90j5zqdxfx6qj97qs1kdp0nbxs7g";
+        sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==";
       };
     };
     "snyk-resolve-deps-3.1.0" = {
@@ -24960,7 +24672,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz";
-        sha512 = "3qk3349lw5q1spqk4q1arw496hbp4d8qlj576whfl710kf7ajwpv4kcak5wprzhvwmqs656q7w71sc0jvz9afprh65rlklx3yaiwl31";
+        sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q==";
       };
     };
     "snyk-sbt-plugin-1.3.0" = {
@@ -24969,7 +24681,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz";
-        sha512 = "03bdn4g3836nyv06flg4g6jnr9j297z8ay67jg0k7zfanwg7glaaqbkxzas1bl36jj1snyb8ifb8xvhshbxjbvl6xpngxxpbq3ly729";
+        sha512 = "SRxPB16392dvN3Qv2RfUcHe0XETLWx2kNIOuoNXvc2Gl6DuPW+X+meDJY7xC/yQhU7bSPPKoM2B7awYaj9i2Bg==";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -24981,13 +24693,13 @@ let
         sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
       };
     };
-    "snyk-try-require-1.3.0" = {
+    "snyk-try-require-1.3.1" = {
       name = "snyk-try-require";
       packageName = "snyk-try-require";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.0.tgz";
-        sha1 = "f35706acf91c8af788d58e1f1ad6bf0fcf6c5493";
+        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz";
+        sha1 = "6e026f92e64af7fcccea1ee53d524841e418a212";
       };
     };
     "socket.io-0.9.14" = {
@@ -25026,13 +24738,13 @@ let
         sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014";
       };
     };
-    "socket.io-2.1.0" = {
+    "socket.io-2.1.1" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz";
-        sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz";
+        sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==";
       };
     };
     "socket.io-adapter-0.2.0" = {
@@ -25098,13 +24810,13 @@ let
         sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e";
       };
     };
-    "socket.io-client-2.1.0" = {
+    "socket.io-client-2.1.1" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.0.tgz";
-        sha512 = "1xkd66603gshd7s080j107ms405z18mljc7gbmnkllph1zfg82sz5mgvsyhi1zs3bbv5lgvv29gxfn624gpv46v5mwy610wpnj8zwjf";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz";
+        sha512 = "jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==";
       };
     };
     "socket.io-parser-2.1.2" = {
@@ -25140,7 +24852,7 @@ let
       version = "3.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz";
-        sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3";
+        sha512 = "g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==";
       };
     };
     "socket.io-parser-3.2.0" = {
@@ -25149,7 +24861,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz";
-        sha512 = "10calkdapaxrn8pjqghqxl9h2s6bm76wdd7rp3fd468zz43xcyx6qvywfdivrb2r1dsddig2byv2mbymiyb2q4r628s7z6wpb3q320m";
+        sha512 = "FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==";
       };
     };
     "socks-1.1.10" = {
@@ -25176,7 +24888,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz";
-        sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7";
+        sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==";
       };
     };
     "sodium-javascript-0.5.5" = {
@@ -25185,7 +24897,7 @@ let
       version = "0.5.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz";
-        sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
+        sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==";
       };
     };
     "sodium-native-2.1.6" = {
@@ -25194,7 +24906,7 @@ let
       version = "2.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz";
-        sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx";
+        sha512 = "vfovcNlU8C93SbeNoGSAdW5zVOTlrh1sTy+TzdC2FhDTE/IUK6j4ML5gdr/qziLz4XRT4EQWJvbFzql6CAAH/A==";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -25203,7 +24915,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz";
-        sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj";
+        sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
       };
     };
     "sorcery-0.10.0" = {
@@ -25242,22 +24954,22 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
-    "sort-on-2.0.0" = {
+    "sort-on-3.0.0" = {
       name = "sort-on";
       packageName = "sort-on";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sort-on/-/sort-on-2.0.0.tgz";
-        sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc";
+        url = "https://registry.npmjs.org/sort-on/-/sort-on-3.0.0.tgz";
+        sha512 = "e2RHeY1iM6dT9od3RoqeJSyz3O7naNFsGy34+EFEcwghjAncuOXC2/Xwq87S4FbypqLVp6PcizYEsGEGsGIDXA==";
       };
     };
-    "sorted-array-functions-1.1.0" = {
+    "sorted-array-functions-1.2.0" = {
       name = "sorted-array-functions";
       packageName = "sorted-array-functions";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz";
-        sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf";
+        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz";
+        sha512 = "sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg==";
       };
     };
     "sorted-indexof-1.0.0" = {
@@ -25284,7 +24996,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
-        sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93";
+        sha512 = "I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==";
       };
     };
     "source-map-0.1.31" = {
@@ -25347,7 +25059,7 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
     "source-map-resolve-0.5.2" = {
@@ -25356,7 +25068,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "14dmrwi7wa13wr1mrygjmb49mzsycpj8h5r41y7qvdf98lz9qzaww7vis6cvgqgfx0ly1sx4vsmw45xzlzs6indjcs5pkrjvjyaqfij";
+        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
       };
     };
     "source-map-support-0.3.2" = {
@@ -25374,7 +25086,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz";
-        sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n";
+        sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
       };
     };
     "source-map-support-0.4.6" = {
@@ -25392,16 +25104,16 @@ let
       version = "0.5.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz";
-        sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq";
+        sha512 = "eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==";
       };
     };
-    "source-map-support-0.5.4" = {
+    "source-map-support-0.5.6" = {
       name = "source-map-support";
       packageName = "source-map-support";
-      version = "0.5.4";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz";
-        sha512 = "1vfdnbvldylljhm89hfxwsr3pd108my5z1l9gx8ld1j2v2bfpranqc7kc8i9mj24lbq6c4xxs181anrsa5ypbfd3r08v3c1dqyd4i1w";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz";
+        sha512 = "N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==";
       };
     };
     "source-map-url-0.4.0" = {
@@ -25419,7 +25131,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz";
-        sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5";
+        sha512 = "hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==";
       };
     };
     "sparkles-1.0.1" = {
@@ -25428,7 +25140,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz";
-        sha512 = "1vr1iicrmldp4avsqz22x493dh0hzvck1scwd29kphm4gbp1qs9wpk0l5lwmma1cyfmp3l967jjclnx5kr0zsagzwniashl6q6b88vm";
+        sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==";
       };
     };
     "sparse-bitfield-3.0.3" = {
@@ -25464,7 +25176,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
-        sha512 = "3xgkqk4hsm4nzvy68icv1rlv4s0qgb7mwpi9s4z2mp1a5fwny6kc6m4nqa7zzx2k7mrjlh7psci9lb7892bl3q4r4y2f4sw7vvnhprp";
+        sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
       };
     };
     "spdx-exceptions-2.1.0" = {
@@ -25473,7 +25185,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
-        sha512 = "057m2ab3y8j38xb89w7d191hfaa693vbf7wnwkf302zicsgi2v5ayvcc4f03vyj4yyycqasqp3ryp2d3q0vcaq54r4ls2g5dar4vbg0";
+        sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
       };
     };
     "spdx-expression-parse-3.0.0" = {
@@ -25482,7 +25194,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
-        sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
       };
     };
     "spdx-license-ids-3.0.0" = {
@@ -25491,7 +25203,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
-        sha512 = "066gb8vcffv2mf3lbmxvxp5b60jviw32x52n50l3zgl9z4cgwg74ca4kr4y5c3mss736bmg9nxl1lvprishbikqy0jy56770v10zqfv";
+        sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
       };
     };
     "spdy-1.32.5" = {
@@ -25512,13 +25224,13 @@ let
         sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d";
       };
     };
-    "speedometer-1.0.0" = {
+    "speedometer-1.1.0" = {
       name = "speedometer";
       packageName = "speedometer";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz";
-        sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2";
+        url = "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz";
+        sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==";
       };
     };
     "split-0.2.10" = {
@@ -25545,7 +25257,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
       };
     };
     "split-string-3.1.0" = {
@@ -25554,7 +25266,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
-        sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp";
+        sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
       };
     };
     "split2-0.2.1" = {
@@ -25572,7 +25284,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz";
-        sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4";
+        sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==";
       };
     };
     "sprintf-0.1.5" = {
@@ -25593,6 +25305,15 @@ let
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
+    "sprintf-js-1.1.1" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz";
+        sha1 = "36be78320afe5801f6cea3ee78b6e5aab940ea0c";
+      };
+    };
     "srcset-1.0.0" = {
       name = "srcset";
       packageName = "srcset";
@@ -25629,13 +25350,13 @@ let
         sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
       };
     };
-    "sshpk-1.14.1" = {
+    "sshpk-1.14.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.1";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
-        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
       };
     };
     "sshpk-1.7.1" = {
@@ -25662,7 +25383,7 @@ let
       version = "5.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
-        sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x";
+        sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
       };
     };
     "stable-0.1.8" = {
@@ -25671,7 +25392,7 @@ let
       version = "0.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz";
-        sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf";
+        sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==";
       };
     };
     "stack-trace-0.0.10" = {
@@ -25683,15 +25404,6 @@ let
         sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
-    "stack-trace-0.0.9" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
-        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
-      };
-    };
     "stat-mode-0.2.2" = {
       name = "stat-mode";
       packageName = "stat-mode";
@@ -25725,7 +25437,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz";
-        sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl";
+        sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA==";
       };
     };
     "statuses-1.2.1" = {
@@ -25752,7 +25464,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
-        sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f";
+        sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==";
       };
     };
     "statuses-1.5.0" = {
@@ -25824,7 +25536,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz";
-        sha512 = "3553srgw60szs493rx8nyy09lcjkw3bh16c2b5z30jcf9h95r4hdiqjk31r9190w47av8dg4zx60fnnvqanv95hbpxl7314723vgmml";
+        sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==";
       };
     };
     "stream-counter-0.2.0" = {
@@ -25842,16 +25554,16 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz";
-        sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
+        sha512 = "mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==";
       };
     };
-    "stream-http-2.8.2" = {
+    "stream-http-2.8.3" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.8.2";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz";
-        sha512 = "2acp8k8lfjmh87zlzmx7ah9wwxsbjdff6mmms6c24kkrjqvgh0iv6mzbaakmspnx8kc9ysw3ba378xkjc95nfiyfg7m05va32n5yna2";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
+        sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
     "stream-parser-0.3.1" = {
@@ -25890,22 +25602,22 @@ let
         sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353";
       };
     };
-    "stream-to-blob-1.0.0" = {
+    "stream-to-blob-1.0.1" = {
       name = "stream-to-blob";
       packageName = "stream-to-blob";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.0.tgz";
-        sha1 = "9f7a1ada39e16ea282ebb7e4cda307edabde658d";
+        url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.1.tgz";
+        sha512 = "aRy4neA4rf+qMtLT9fCRLPGWdrsIKtCx4kUdNTIPgPQ2hkHkdxbViVAvABMx9oRM6yCWfngHx6pwXfbYkVuPuw==";
       };
     };
-    "stream-to-blob-url-2.1.0" = {
+    "stream-to-blob-url-2.1.1" = {
       name = "stream-to-blob-url";
       packageName = "stream-to-blob-url";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.0.tgz";
-        sha1 = "c341d10502ec51250607327258ec2f586b07d626";
+        url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.1.tgz";
+        sha512 = "DKJPEmCmIZoBfGVle9IhSfERiWaN5cuOtmfPxP2dZbLDRZxkBWZ4QbYxEJOSALk1Kf+WjBgedAMO6qkkf7Lmrg==";
       };
     };
     "stream-to-promise-2.2.0" = {
@@ -25944,13 +25656,13 @@ let
         sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
       };
     };
-    "stream-with-known-length-to-buffer-1.0.1" = {
+    "stream-with-known-length-to-buffer-1.0.2" = {
       name = "stream-with-known-length-to-buffer";
       packageName = "stream-with-known-length-to-buffer";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.1.tgz";
-        sha512 = "07gzjgqphsbkfbc3f594kfja4kwr0sa8ss7arj47znz5wy5m2sw3qkfzgfxpaaijiliwbr3wny331q83kj55j72jsgm0jbsad5m8mdf";
+        url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.2.tgz";
+        sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg==";
       };
     };
     "streamline-0.10.17" = {
@@ -25986,7 +25698,7 @@ let
       version = "0.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz";
-        sha512 = "26pp7m15rrddwfr1w83nhrws5k82ld1l8njiqvhm43vckr0zszhhb8jwps2bhzylfp7xmb8p2kr86y1g97knikrlwm3blrb5mzk64ar";
+        sha512 = "WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==";
       };
     };
     "streamsearch-0.1.2" = {
@@ -26043,6 +25755,15 @@ let
         sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
       };
     };
+    "string-length-2.0.0" = {
+      name = "string-length";
+      packageName = "string-length";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz";
+        sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
+      };
+    };
     "string-similarity-1.2.0" = {
       name = "string-similarity";
       packageName = "string-similarity";
@@ -26094,7 +25815,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
     "string.prototype.codepointat-0.2.1" = {
@@ -26103,7 +25824,16 @@ let
       version = "0.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz";
-        sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r";
+        sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==";
+      };
+    };
+    "string.prototype.matchall-2.0.0" = {
+      name = "string.prototype.matchall";
+      packageName = "string.prototype.matchall";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz";
+        sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==";
       };
     };
     "string2compact-1.2.5" = {
@@ -26112,7 +25842,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.5.tgz";
-        sha512 = "1dl2j8192c98amhirw5xspz35vzhmhnrjj5migyp29b9s1hvjrgrpgb3axd889z23k5hvw2a3z35mqaghs5w57xfxlhhnf0gnbcbs2s";
+        sha512 = "WujFln3AWQhpd/0UXjR8Ctcy/lCCb1jmED8h1Loa6938stww6LSSuP7FWqTMFlb4dxn/6l54jrAqlJhIAUlBWw==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -26130,7 +25860,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
+        sha512 = "4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -26139,7 +25869,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
     "stringify-entities-1.3.2" = {
@@ -26148,7 +25878,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz";
-        sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y";
+        sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==";
       };
     };
     "stringstream-0.0.6" = {
@@ -26157,7 +25887,7 @@ let
       version = "0.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
-        sha512 = "22fa8nryyacyx538az1iir54hqsfb46m6jycmqvfpylmg025xdn1wng94ay1rg69m4s3lv0cf2qnxvzffvm5s74q5fb108y14289cgk";
+        sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==";
       };
     };
     "strip-ansi-0.1.1" = {
@@ -26241,15 +25971,6 @@ let
         sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
       };
     };
-    "strip-bom-stream-1.0.0" = {
-      name = "strip-bom-stream";
-      packageName = "strip-bom-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz";
-        sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee";
-      };
-    };
     "strip-bom-stream-2.0.0" = {
       name = "strip-bom-stream";
       packageName = "strip-bom-stream";
@@ -26283,7 +26004,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz";
-        sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14";
+        sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==";
       };
     };
     "strip-eof-1.0.0" = {
@@ -26346,16 +26067,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz";
-        sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk";
+        sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==";
       };
     };
-    "strong-data-uri-1.0.5" = {
+    "strong-data-uri-1.0.6" = {
       name = "strong-data-uri";
       packageName = "strong-data-uri";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.5.tgz";
-        sha512 = "2mwdm0k873sdi2bramixwg6fafqyi2313scq32fsnq2qa5hqbpdln34rc9a67wd15mi05v3c6bfiw6r4h7dy4aac1q3ac8b2ig6j96n";
+        url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.6.tgz";
+        sha512 = "zhzBZev0uhT2IrFUerenXhfaE0vFUYwAZsnG0gIKGpfM/Gi6jOUQ3cmcvyTsXeDLIPiTubHESeO7EbD6FoPmzw==";
       };
     };
     "strong-log-transformer-1.0.6" = {
@@ -26418,7 +26139,7 @@ let
       version = "3.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
-        sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q";
+        sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
       };
     };
     "supports-color-0.2.0" = {
@@ -26463,16 +26184,16 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz";
-        sha512 = "158ng0v99ac7csif7v6153bp63nxmlz2a613z8y09sk8jsj2rpalscgg0lfzdlpfdd5612jqsnkvrz0137inka2qjcmcjrmy2xhrkaf";
+        sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==";
       };
     };
-    "supports-color-4.4.0" = {
+    "supports-color-5.1.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.4.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
-        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz";
+        sha512 = "Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==";
       };
     };
     "supports-color-5.4.0" = {
@@ -26481,7 +26202,7 @@ let
       version = "5.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
-        sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf";
+        sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==";
       };
     };
     "symbol-observable-1.0.1" = {
@@ -26493,6 +26214,15 @@ let
         sha1 = "8340fc4702c3122df5d22288f88283f513d3fdd4";
       };
     };
+    "symbol-tree-3.2.2" = {
+      name = "symbol-tree";
+      packageName = "symbol-tree";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz";
+        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
+      };
+    };
     "sync-request-3.0.0" = {
       name = "sync-request";
       packageName = "sync-request";
@@ -26508,7 +26238,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
-        sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0";
+        sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
     "table-3.8.3" = {
@@ -26526,7 +26256,16 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz";
-        sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai";
+        sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==";
+      };
+    };
+    "table-4.0.3" = {
+      name = "table";
+      packageName = "table";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz";
+        sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==";
       };
     };
     "tabtab-1.3.2" = {
@@ -26581,7 +26320,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz";
-        sha512 = "2r08r7ymr8jvw7f1vamajcm9na9fscx6qiby1l3c99ndk1x50v0k3x6lhqmysk9bwczdl8kr2908lfvi6j5mfz0dam7cii4sin6213m";
+        sha512 = "dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==";
       };
     };
     "tape-2.3.3" = {
@@ -26617,25 +26356,25 @@ let
       version = "3.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
-        sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5";
+        sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw==";
       };
     };
-    "tar-4.4.2" = {
+    "tar-4.4.4" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.2";
+      version = "4.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz";
-        sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz";
+        sha512 = "mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w==";
       };
     };
-    "tar-fs-1.16.2" = {
+    "tar-fs-1.16.3" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "1.16.2";
+      version = "1.16.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz";
-        sha512 = "0ywy8jh175q90rbr38yxx8dzhiyj8ch0jjxxidvjwmkh4s6hi1cp56ibq3aydlqflybssn9cc2cjdq717yqcw70kjsr12f46dd2gn9d";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz";
+        sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==";
       };
     };
     "tar-pack-3.4.1" = {
@@ -26644,7 +26383,7 @@ let
       version = "3.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz";
-        sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
+        sha512 = "PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg==";
       };
     };
     "tar-stream-1.6.1" = {
@@ -26653,7 +26392,7 @@ let
       version = "1.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz";
-        sha512 = "2j2zhpi3nkxdny3qh1rm3xzx5kvdc4f83cqnqbq8yasqyxj6bpvbvff20rbqp6wl8zicx4dndkcjwm3xnprnkq11m7b4hkp1bkwqli0";
+        sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==";
       };
     };
     "temp-0.6.0" = {
@@ -26725,7 +26464,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz";
-        sha512 = "015f82dnl58mcjf4c86lxlf2j66nhvnif56475x720bl73pkx3pvds7g2njz19ksbmbqag25rl4wij1xb6yd3in9cd4bpxn79wdk980";
+        sha512 = "AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==";
       };
     };
     "text-table-0.2.0" = {
@@ -26797,7 +26536,7 @@ let
       version = "3.11.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz";
-        sha512 = "2cll36ns03xrjz6y3116ca9hgnqsi384k6mcyk8xpl81znx0lkwkz7iwyhprc0rm1ry6mrlwpdrnh38sfqvm95hd7ila270a71ah86y";
+        sha512 = "3iCowlHgCEXjabCkurHTaECb2+U0V+NzqBmwfKHn8fzJJwXd/oDo7Wh6Vs0kaESN7YNJMRPC8ObL3AfQ1gxKmQ==";
       };
     };
     "throat-3.2.0" = {
@@ -26806,7 +26545,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz";
-        sha512 = "3rnpjw8qfw0qbydd9s4pbp0qzahz1f4phbj4cc9mvz6851nrq9h1whwslsjjfrzl0qgsnjf0n8ppygh3kl7ikyj2sn9za75kdb3qipw";
+        sha512 = "/EY8VpvlqJ+sFtLPeOgc8Pl7kQVOWv0woD87KTXVHPIAE842FGT+rokxIhe8xIUP1cfgrkt0as0vDLjDiMtr8w==";
       };
     };
     "throttle-1.0.3" = {
@@ -26977,7 +26716,7 @@ let
       version = "2.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz";
-        sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32";
+        sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
       };
     };
     "timers-ext-0.1.5" = {
@@ -26986,7 +26725,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz";
-        sha512 = "33arzdhdl95l79kirfayh8w3dvzxfc35zw7v8qammshps4shfib40qx7cyn86sl6ir9qrc6zzrmzhkgn7v50v6q223h1674vssi5hdn";
+        sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==";
       };
     };
     "timespan-2.3.0" = {
@@ -27004,7 +26743,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz";
-        sha512 = "2w2806fq55jn2vd74qn5ryir4j6nbfycd8c2w030fckrwvlif6iiy5ranmsdlyqgcrs87x4zxwnlmwrz6dzn41l7861lsbcgc1s3373";
+        sha512 = "44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==";
       };
     };
     "tinycolor-0.0.1" = {
@@ -27022,7 +26761,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz";
-        sha512 = "1xp43r14ynva5c21rihxm625x47109zj7k3j0cpdmm74lc4fwml3vags077221gz2gf7vafwnskncmag4wnsisiz0bmiawapc70ck5d";
+        sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew==";
       };
     };
     "tmp-0.0.28" = {
@@ -27058,16 +26797,7 @@ let
       version = "0.0.33";
       src = fetchurl {
         url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
-      };
-    };
-    "to-absolute-glob-0.1.1" = {
-      name = "to-absolute-glob";
-      packageName = "to-absolute-glob";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz";
-        sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f";
+        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     };
     "to-absolute-glob-2.0.2" = {
@@ -27112,7 +26842,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
-        sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp";
+        sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==";
       };
     };
     "to-fast-properties-1.0.3" = {
@@ -27139,7 +26869,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
-        sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm";
+        sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
       };
     };
     "to-regex-range-2.1.1" = {
@@ -27175,7 +26905,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.1.tgz";
-        sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l";
+        sha512 = "FOinMMjECHmDt6PZkSmcbM8ir41kGwYCbVW7NczWkWNNeuX9/mQHz31oNSJKZrkvgfas692ZoZ+G1jdM43qVGA==";
       };
     };
     "token-stream-0.0.1" = {
@@ -27193,16 +26923,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz";
-        sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv";
-      };
-    };
-    "topo-1.1.0" = {
-      name = "topo";
-      packageName = "topo";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz";
-        sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5";
+        sha512 = "O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==";
       };
     };
     "torrent-discovery-5.4.0" = {
@@ -27220,16 +26941,16 @@ let
       version = "8.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz";
-        sha512 = "39wg1cq3w31h0yhwjl9aacpl9654psnwigdfbxli93xqvfm9w403gppc2r295ikc9rvglirzcyqiafpd6f8jpf65d6119xnwhgvyz1w";
+        sha512 = "PHy/H+S2pxBMK8ZdiZxp16mIPfs50rdzYjOWJLJg974BCE/VbdxHirQv117kVl9STKKXKZWo5NADGAYfmIXH0w==";
       };
     };
-    "torrent-piece-1.1.1" = {
+    "torrent-piece-1.1.2" = {
       name = "torrent-piece";
       packageName = "torrent-piece";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz";
-        sha1 = "50346e42a43b35daf2a86f414afb153629a854be";
+        url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.2.tgz";
+        sha512 = "ElXPyXKKG73o+uziHJ8qlYE9EuyDVxnK2zWL+pW/2bma7RsLpSwFFIJAb8Qui7/tel2hsHQW1z3zBnfQNREpWA==";
       };
     };
     "torrent-stream-1.0.4" = {
@@ -27238,7 +26959,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz";
-        sha512 = "3ka40l845bfjydjk9jbiz27x4cqd8birv5zfzvdm7ciij7r53ydz6y7pwmk0628qwdnkchgh10z4kdc3408zi8a8pimq7506qrji010";
+        sha512 = "IIAoMzagHFzjRQrFjwAZrE3yQYAPsmkbx0gYMCu/x5vf/Cj5yBjZqW1/98vOcaGGGelH/LhkmrJ56VYhiAKi5g==";
       };
     };
     "tosource-1.0.0" = {
@@ -27274,7 +26995,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz";
-        sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q";
+        sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==";
       };
     };
     "tough-cookie-2.2.2" = {
@@ -27292,7 +27013,16 @@ let
       version = "2.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
-        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
+      };
+    };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
       };
     };
     "township-client-1.3.2" = {
@@ -27301,7 +27031,25 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz";
-        sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78";
+        sha512 = "6Di70O1dWm45SJ5xrGzlE805z3gYn4ZUmNKomIrI4OojzRA4zyQzJ/4lAxQbJlq0ihG/mUE2xbP4q85Q68ig2g==";
+      };
+    };
+    "toxic-1.0.1" = {
+      name = "toxic";
+      packageName = "toxic";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toxic/-/toxic-1.0.1.tgz";
+        sha512 = "WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg==";
+      };
+    };
+    "tr46-0.0.3" = {
+      name = "tr46";
+      packageName = "tr46";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz";
+        sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a";
       };
     };
     "tr46-1.0.1" = {
@@ -27355,7 +27103,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz";
-        sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f";
+        sha512 = "DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==";
       };
     };
     "trim-0.0.1" = {
@@ -27418,7 +27166,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
-        sha512 = "2d7isckw2m4zqhp0qd4d8d272j8jp09qvqnp1fj3igzqkl7mx75l3fcnr8x1kh64xgf5afr9zyw6wk221mb7ajsk9xvfvfn2vsfyqkd";
+        sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==";
       };
     };
     "trough-1.0.2" = {
@@ -27427,7 +27175,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz";
-        sha512 = "2qhjpmwnyz01jcf1yqjq00my48a3imn5z2z0ha4alfcr3imfpvrcbnv893cw71s7rh9h5icjga9nk180qk07nfmpwmlis66kd8jhy8l";
+        sha512 = "FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==";
       };
     };
     "truncate-2.0.1" = {
@@ -27439,13 +27187,13 @@ let
         sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b";
       };
     };
-    "tslib-1.9.1" = {
+    "tslib-1.9.3" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.9.1";
+      version = "1.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.1.tgz";
-        sha512 = "115mr4g9y5y6k797nyyxwca0rhx5ax7bqdf3i3kw14dh5n64h27f3v3pnc0asccwllfdyq7azc2lhnq3ibplf3afg5n5607dx5wzxva";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz";
+        sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
       };
     };
     "tsscmp-1.0.5" = {
@@ -27463,7 +27211,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz";
-        sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr";
+        sha512 = "+bGy9iDAqg3WSfc2ZrprToSPJhZjqy7vUv9wupQzsiv+BVPVx1T2a6G4T0290SpQj+56Toaw9BiLO5j5Bd7QzA==";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -27481,7 +27229,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz";
-        sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b";
+        sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
       };
     };
     "tunnel-0.0.2" = {
@@ -27508,7 +27256,7 @@ let
       version = "0.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz";
-        sha512 = "1n2p6ca2m26hbf9gxlww91fp653cyqdbfnvxjc8jn91ybvbwbhsqg3cm4da8rrxzgfr9nsa6zpi20bv5w708753chaixbsym1v6qgl2";
+        sha512 = "gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA==";
       };
     };
     "tunnel-agent-0.2.0" = {
@@ -27547,13 +27295,13 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "twig-0.8.9" = {
+    "twig-1.12.0" = {
       name = "twig";
       packageName = "twig";
-      version = "0.8.9";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz";
-        sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2";
+        url = "https://registry.npmjs.org/twig/-/twig-1.12.0.tgz";
+        sha512 = "zm5OQXb8bQDGQUPytFgjqMKHhqcz/s6pU6Nwsy+rKPhsoOOVwYeHnziiDGFzeTDiFd28M8EVkEO8we6ikcrGjQ==";
       };
     };
     "twitter-ng-0.6.2" = {
@@ -27580,7 +27328,7 @@ let
       version = "4.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz";
-        sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni";
+        sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
       };
     };
     "type-is-1.5.7" = {
@@ -27598,7 +27346,7 @@ let
       version = "1.6.16";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz";
-        sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x";
+        sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==";
       };
     };
     "typechecker-4.5.0" = {
@@ -27607,7 +27355,7 @@ let
       version = "4.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz";
-        sha512 = "3izx27ms2gldkwjyllsg41zpgd7x57v7zrkgrxlrfhs3gc6csg91m6dk23kvcralq9rd5pn7njz4yj8raj31q7ybhd54v9pr7yw98vf";
+        sha512 = "bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w==";
       };
     };
     "typedarray-0.0.6" = {
@@ -27625,7 +27373,7 @@ let
       version = "3.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz";
-        sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd";
+        sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
     "typescript-2.7.2" = {
@@ -27634,7 +27382,7 @@ let
       version = "2.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz";
-        sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557";
+        sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==";
       };
     };
     "typescript-2.8.3" = {
@@ -27643,7 +27391,16 @@ let
       version = "2.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
-        sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b";
+        sha512 = "K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw==";
+      };
+    };
+    "typescript-2.9.2" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "2.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz";
+        sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==";
       };
     };
     "typewise-1.0.3" = {
@@ -27682,22 +27439,13 @@ let
         sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad";
       };
     };
-    "ua-parser-js-0.7.18" = {
-      name = "ua-parser-js";
-      packageName = "ua-parser-js";
-      version = "0.7.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz";
-        sha512 = "2fa0nkj7g5jpslp45h1icl5hsw01qmm64x4s6vlxw07v2b80b3myi38r8b2s06h0chbva92bi9dd7hync3lmkfpls9m3h27algg1p1f";
-      };
-    };
     "uc.micro-1.0.5" = {
       name = "uc.micro";
       packageName = "uc.micro";
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz";
-        sha512 = "0pb6n8f5qpdf3x1bgxlcvimha0n4xx3mgr1mj6nx6yksgg9ij62ai3nzhyy8806gfkklfk8blhlhimw0237yg9xr66rmgvk1vici0i6";
+        sha512 = "JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==";
       };
     };
     "uglify-es-3.3.10" = {
@@ -27706,7 +27454,7 @@ let
       version = "3.3.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz";
-        sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c";
+        sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww==";
       };
     };
     "uglify-js-1.2.5" = {
@@ -27754,22 +27502,22 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.3.24" = {
+    "uglify-js-3.3.25" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.24";
+      version = "3.3.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.24.tgz";
-        sha512 = "05g7wl6mnfcv2f8qhfh82m743qd8p5hvd99ky9gifcx5zblrbiqcp0qp1jlcayijzr8l9rkf4rfc309kcf2k76097ban8ma716gwbl5";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz";
+        sha512 = "hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA==";
       };
     };
-    "uglify-js-3.3.25" = {
+    "uglify-js-3.4.2" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.25";
+      version = "3.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz";
-        sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz";
+        sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -27781,13 +27529,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "uglifyjs-webpack-plugin-1.2.5" = {
+    "uglifyjs-webpack-plugin-1.2.7" = {
       name = "uglifyjs-webpack-plugin";
       packageName = "uglifyjs-webpack-plugin";
-      version = "1.2.5";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz";
-        sha512 = "15z1mr0hms0qbrip49l6c03ljb7243ag7smh13l8xfd0lgmky3b5pa1c1q4r4cdfwvl4m3yr9adj9grdfqqpgr5vc012gj05kbhk144";
+        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz";
+        sha512 = "1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==";
       };
     };
     "uid-0.0.2" = {
@@ -27841,7 +27589,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz";
-        sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98";
+        sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==";
       };
     };
     "uid2-0.0.3" = {
@@ -27868,7 +27616,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz";
-        sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm";
+        sha512 = "9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ==";
       };
     };
     "ultron-1.0.2" = {
@@ -27886,7 +27634,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz";
-        sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah";
+        sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==";
       };
     };
     "umd-3.0.3" = {
@@ -27895,7 +27643,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz";
-        sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0";
+        sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
     "unbzip2-stream-1.2.5" = {
@@ -27904,7 +27652,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz";
-        sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b";
+        sha512 = "izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -27916,6 +27664,15 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
+    "undeclared-identifiers-1.1.2" = {
+      name = "undeclared-identifiers";
+      packageName = "undeclared-identifiers";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz";
+        sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==";
+      };
+    };
     "undefsafe-2.0.2" = {
       name = "undefsafe";
       packageName = "undefsafe";
@@ -27979,13 +27736,13 @@ let
         sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     };
-    "underscore-1.9.0" = {
+    "underscore-1.9.1" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz";
-        sha512 = "3w8byp6gw4jzam7sl3g72zy9k8qb67jc9h4fhlhd6xj3zn07rnnm812g9jc6ygfxqi4yv54l800ijnl9b8kizf8wc5582xi4h6pb1g0";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
+        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
       };
     };
     "underscore-contrib-0.3.0" = {
@@ -28021,7 +27778,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz";
-        sha512 = "3k40pnw86jz2238r4fv4sp5sdykrva5gl4azq3yxnhk1mw8biy17b5c71hrzq0sfd48dp0kpq3k04f0k11bxd623qrpw2kmmxbnwxpr";
+        sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==";
       };
     };
     "unicode-emoji-modifier-base-1.0.0" = {
@@ -28111,7 +27868,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz";
-        sha512 = "1bk26f0rhka8jhrbjg0jhfc4cqxz7g5k7z8qxqw0353mfx7nvaq9dqj73s9vr3a0jd1yx4lv64cm6ajji7p55xj3cka1bgxy4mw2ib2";
+        sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==";
       };
     };
     "unist-util-remove-position-1.1.2" = {
@@ -28120,7 +27877,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz";
-        sha512 = "3nrir95gy69ywsf99s11xmdk5dwjkaf1d7jriasr0nljg57cj4i5jxjh70f2hzazfwqfikb6blpn8dl3ck9sq3w578nbmga3cw0s6jz";
+        sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==";
       };
     };
     "unist-util-visit-1.3.1" = {
@@ -28129,16 +27886,16 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz";
-        sha512 = "1lbrqw43r1ckx1i8zqjpyfbvdh3dngb9c6qsk5hcflqkryxzc8icc5vn50xf6vxsgcj4bznzfj10c17rrfd2jlvldhlnlq98ks43xyi";
+        sha512 = "0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==";
       };
     };
-    "universalify-0.1.1" = {
+    "universalify-0.1.2" = {
       name = "universalify";
       packageName = "universalify";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz";
-        sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7";
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
     "unix-crypt-td-js-1.0.0" = {
@@ -28177,13 +27934,13 @@ let
         sha1 = "2ba7ef316edd0b9590cc547c74f76a2f164fecca";
       };
     };
-    "unordered-set-2.0.0" = {
+    "unordered-set-2.0.1" = {
       name = "unordered-set";
       packageName = "unordered-set";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.0.tgz";
-        sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec";
+        url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz";
+        sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg==";
       };
     };
     "unorm-1.4.1" = {
@@ -28231,13 +27988,13 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "untildify-3.0.2" = {
+    "untildify-3.0.3" = {
       name = "untildify";
       packageName = "untildify";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz";
-        sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1";
+        url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz";
+        sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==";
       };
     };
     "unyield-0.0.1" = {
@@ -28267,13 +28024,13 @@ let
         sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
-    "upath-1.0.4" = {
+    "upath-1.0.5" = {
       name = "upath";
       packageName = "upath";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz";
-        sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
+        sha512 = "qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww==";
       };
     };
     "upath-1.1.0" = {
@@ -28282,16 +28039,16 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz";
-        sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg";
+        sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==";
       };
     };
-    "update-check-1.5.0" = {
+    "update-check-1.5.2" = {
       name = "update-check";
       packageName = "update-check";
-      version = "1.5.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-check/-/update-check-1.5.0.tgz";
-        sha512 = "3prydk2hhjbg29waf3dvx4097qs7vx5xfp4ibl8ic8nwr01vkd2nwz5lzj1ga02hfyz6cpzcwv3h1q18fxdz6w6z542hwnkjrky2b3d";
+        url = "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz";
+        sha512 = "1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ==";
       };
     };
     "update-notifier-0.5.0" = {
@@ -28318,7 +28075,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz";
-        sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3";
+        sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==";
       };
     };
     "update-section-0.3.3" = {
@@ -28366,13 +28123,13 @@ let
         sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
       };
     };
-    "uri-js-4.2.1" = {
+    "uri-js-4.2.2" = {
       name = "uri-js";
       packageName = "uri-js";
-      version = "4.2.1";
+      version = "4.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz";
-        sha512 = "3s1r9yqdqw9bwiyvkq7gd4ylivchfabhk59s1w1wxq6q8gpysw82340fx3hmsmkwzm2cgf2fz48s065q08ca8711k91gc73f41q54lf";
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
       };
     };
     "urix-0.1.0" = {
@@ -28444,7 +28201,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz";
-        sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9";
+        sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==";
       };
     };
     "user-home-1.1.1" = {
@@ -28474,13 +28231,13 @@ let
         sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
       };
     };
-    "ut_metadata-3.2.1" = {
+    "ut_metadata-3.2.2" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.1.tgz";
-        sha512 = "0d0wdjn4cdn5jqsdma0624pvsxv2zakshxlcx2hm9vrxnr1pvm5al0lzwchkpri3nmsdimf3liv6rr7g5c9z79gphdijzrz19lg7ydn";
+        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz";
+        sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA==";
       };
     };
     "ut_pex-1.2.1" = {
@@ -28489,7 +28246,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.1.tgz";
-        sha512 = "0w6sqvl80drmc6x9hkhshhh29vkcbrq9dw2cfbh2vyjvzbxfpfbxa7m2yja4ir97xwpfgkd3w4bcwh5ckgi1ldb1r8dqqnznw4lrg36";
+        sha512 = "ZrxMCbffYtxQDqvREN9kBXK2CB9tPnd5PylHoqQX9ai+3HV9/S39FnA5JnhLOC82dxIQQg0nTN2wmhtAdGNtOA==";
       };
     };
     "utf7-1.0.2" = {
@@ -28528,6 +28285,15 @@ let
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
+    "util-0.10.4" = {
+      name = "util";
+      packageName = "util";
+      version = "0.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
+        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+      };
+    };
     "util-0.4.9" = {
       name = "util";
       packageName = "util";
@@ -28552,7 +28318,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
-        sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb";
+        sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
       };
     };
     "utile-0.2.1" = {
@@ -28606,7 +28372,7 @@ let
       version = "1.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz";
-        sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm";
+        sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg==";
       };
     };
     "uue-3.1.2" = {
@@ -28615,7 +28381,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz";
-        sha512 = "0pcj6km8jmr85nr0xvnq9nmicnz9a2ysy8bj7s9qxin8c0hzd992bwx8bsnxlmbw02iynqyp0l7a9c7zi2ipqrsfczx5ddhb9fqn4kb";
+        sha512 = "axKLXVqwtdI/czrjG0X8hyV1KLgeWx8F4KvSbvVCnS+RUvsQMGRjx0kfuZDXXqj0LYvVJmx3B9kWlKtEdRrJLg==";
       };
     };
     "uuid-2.0.3" = {
@@ -28627,15 +28393,6 @@ let
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
-      };
-    };
     "uuid-3.0.1" = {
       name = "uuid";
       packageName = "uuid";
@@ -28651,16 +28408,16 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
+        sha512 = "DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==";
       };
     };
-    "uuid-3.2.1" = {
+    "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.2.1";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
-        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
       };
     };
     "uws-9.14.0" = {
@@ -28669,7 +28426,7 @@ let
       version = "9.14.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz";
-        sha512 = "2m9vgbpgm39qsl9dk1zzqglr29qwy1hxn3cgj0rwrr05c4hyfij3sib08i1ck21y1136ljvvr0l2nixh6g7arjip455n0zryfs37lqw";
+        sha512 = "HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==";
       };
     };
     "v8-debug-1.0.1" = {
@@ -28699,15 +28456,6 @@ let
         sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4";
       };
     };
-    "vali-date-1.0.0" = {
-      name = "vali-date";
-      packageName = "vali-date";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz";
-        sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
-      };
-    };
     "valid-identifier-0.0.1" = {
       name = "valid-identifier";
       packageName = "valid-identifier";
@@ -28723,7 +28471,7 @@ let
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
-        sha512 = "39caf21ga6s2gvpka90wdngdijarwmkix5fpgh9r94bw14fx1zfnf7j5mprgsdlh8dv0wpwxn65qn9gfwa8n3dxw3iqaj7qf994wxpb";
+        sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
       };
     };
     "validate-npm-package-name-3.0.0" = {
@@ -28735,22 +28483,22 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "validator-3.22.2" = {
+    "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
-      version = "3.22.2";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz";
-        sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0";
+        url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
+        sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
       };
     };
-    "validator-5.2.0" = {
+    "validator-9.4.1" = {
       name = "validator";
       packageName = "validator";
-      version = "5.2.0";
+      version = "9.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
-        sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
+        url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+        sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==";
       };
     };
     "value-or-function-3.0.0" = {
@@ -28885,7 +28633,7 @@ let
       version = "2.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz";
-        sha512 = "3l6rl79knh2zld6jvcxwjk17697nijqykbma3wxj5gcdixc8i4vjj92ad5372yf00x9j7h760s53km1n4ljcxzwl20m1hszi6bpzknc";
+        sha512 = "zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==";
       };
     };
     "vhost-3.0.2" = {
@@ -28897,13 +28645,13 @@ let
         sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
       };
     };
-    "videostream-2.4.2" = {
+    "videostream-2.4.3" = {
       name = "videostream";
       packageName = "videostream";
-      version = "2.4.2";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz";
-        sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115";
+        url = "https://registry.npmjs.org/videostream/-/videostream-2.4.3.tgz";
+        sha512 = "8AkDc1SBg3kw8+hHImYKtSamjKfJxMHuCXIcXvCFOAWGU7IcW41hxx7K7bU/tC6zWEck/tgB1rXLxf6o5Pn79Q==";
       };
     };
     "vinyl-0.4.6" = {
@@ -28933,13 +28681,13 @@ let
         sha1 = "5c88036cf565e5df05558bfc911f8656df218884";
       };
     };
-    "vinyl-2.1.0" = {
+    "vinyl-2.2.0" = {
       name = "vinyl";
       packageName = "vinyl";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz";
-        sha1 = "021f9c2cf951d6b939943c89eb5ee5add4fd924c";
+        url = "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz";
+        sha512 = "MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==";
       };
     };
     "vinyl-file-2.0.0" = {
@@ -28960,22 +28708,13 @@ let
         sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6";
       };
     };
-    "vinyl-fs-2.4.4" = {
-      name = "vinyl-fs";
-      packageName = "vinyl-fs";
-      version = "2.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz";
-        sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239";
-      };
-    };
     "vinyl-fs-3.0.3" = {
       name = "vinyl-fs";
       packageName = "vinyl-fs";
       version = "3.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz";
-        sha512 = "2g60av6jpj5jf9rx5v3gzvvvki2ni25jdinhkppzxng91k55z1cxykqsxbsjrm4kyp1lnnm3s1b452qfg1v28zxk1qj4drj97hbg2xw";
+        sha512 = "vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==";
       };
     };
     "vinyl-sourcemap-1.1.0" = {
@@ -29014,13 +28753,13 @@ let
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
-    "vm-browserify-1.0.1" = {
+    "vm-browserify-1.1.0" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.0.1.tgz";
-        sha512 = "2cfjhw3c398d3nlbi0z1f6jlmjymyk13clnsnvwpa6cgcpbhh0zsghs7zi1fz6ydnbg6ignbbhvzrk44k0mcaps8iiv0q0c29rcpb0j";
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
+        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
       };
     };
     "voc-1.1.0" = {
@@ -29029,7 +28768,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/voc/-/voc-1.1.0.tgz";
-        sha512 = "185v1xryljbds9hw4mc8r5grclrassdi8nq30ckz4sshn4lkivjlx0jm9k25bknf6j9ggxpcybmr94kad4qq2zppjyalbl9qdvn1n3y";
+        sha512 = "fthgd8OJLqq8vPcLjElTk6Rcl2e3v5ekcXauImaqEnQqd5yUWKg1+ZOBgS2KTWuVKcuvZMQq4TDptiT1uYddUA==";
       };
     };
     "void-elements-2.0.1" = {
@@ -29050,22 +28789,13 @@ let
         sha1 = "691f79ab26ccde80ba726dde9fec8e73d6bcf2eb";
       };
     };
-    "vscode-jsonrpc-3.5.0" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz";
-        sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa";
-      };
-    };
     "vscode-jsonrpc-3.6.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz";
-        sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y";
+        sha512 = "PqHHjuTlz3ks0vyZv3IkdduJReA/lqe6OP5zRl5nXn2ptMLW++fBotNyayyZEQLIF6nNrx/Rn6WhMSHElf02Yw==";
       };
     };
     "vscode-jsonrpc-3.6.2" = {
@@ -29074,7 +28804,7 @@ let
       version = "3.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz";
-        sha512 = "202w8rihrk7lri0y5akai44xbx1nj7rvvh33x594miycr5vrbxk7khg46dni2h7kfi06ppbsqigszk74xrm2ql9h4ayxwbqjmphjvjg";
+        sha512 = "T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA==";
       };
     };
     "vscode-languageclient-4.0.1" = {
@@ -29083,16 +28813,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz";
-        sha512 = "28c35r5m72hcg1g7lbrilwj29403sl9mq13w5zkl97cqx8hg2p1pw6gxjnysqjwg2rdy9hs2mb925krhvs24cp3y24lfck97xk83yyi";
-      };
-    };
-    "vscode-languageserver-3.5.1" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz";
-        sha512 = "20rg3b1dymhvnkkxjg481ygy13zg0lg35n5bs4fhwl8f8g3lwy53vnfsxcarjnn6zfjbanq0mllqcqaimbf24n99df327g082ghm1a5";
+        sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA==";
       };
     };
     "vscode-languageserver-4.0.0" = {
@@ -29101,16 +28822,16 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz";
-        sha512 = "1g2q6pp97pn1vw1qsxw22487iv64qc8vpr3pjjdmb6j6h6r08l2jb8mv1x8zrv42zsy62c9cvjq1qkb74q7xgsigpc4adlx2sfzs63g";
+        sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg==";
       };
     };
-    "vscode-languageserver-protocol-3.5.1" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.5.1";
+    "vscode-languageserver-4.2.1" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz";
-        sha512 = "1hajzildw9njhvj7psprgaw4kipjfsi0dw6fw1r1a8nk04plns64f5f2rvzxsj1knm9ad55f2x0d4dcivbg2zi5gii5ggq01ciw7wym";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.2.1.tgz";
+        sha512 = "5WAxaK1nEpe52ZaWNMqmd6rO5CIE72J/7UkGKPUTdGa0l0haWHS69tpRz+LetBlgTpP7PYacl4xhDaLZv82a+g==";
       };
     };
     "vscode-languageserver-protocol-3.6.0" = {
@@ -29119,25 +28840,25 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz";
-        sha512 = "0qcx36adi340y26hb4smwifvand4xkysgxm7mr5m4ycxbfnx8vd0g2sin9j4p9v2lnrgx47zpshiam95lmm0z4l953vpihh0ian3piw";
+        sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA==";
       };
     };
-    "vscode-languageserver-types-3.5.0" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.5.0";
+    "vscode-languageserver-protocol-3.8.1" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz";
-        sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.8.1.tgz";
+        sha512 = "KdeetvQ2JavRiuE9afNrV5+xJZocj7NGPQwH4kpSFw5cp+0wijv87qgXfSEvmwPUaknhMBoSuSrSIG/LRrzWJQ==";
       };
     };
-    "vscode-languageserver-types-3.7.2" = {
+    "vscode-languageserver-types-3.8.2" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.7.2";
+      version = "3.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz";
-        sha512 = "3n581a9795k5a0qvbz28rfqjp0dmyjm1rq0djpjvbqrairl7p30d24qpaj3wgfbdc3wx3gjym3b5sdcb6742jr8if12s3cg1x2gdl1g";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.2.tgz";
+        sha512 = "2RMkyt1O1czGPCnkjKZWSio2D8oh3XlQ4zi4W2xL8q2Dvi4hB3/DEt+wYyzo4hmE2ZFP0RB8PXyzHyed7p1hbw==";
       };
     };
     "vscode-uri-1.0.3" = {
@@ -29149,13 +28870,22 @@ let
         sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52";
       };
     };
+    "vscode-uri-1.0.5" = {
+      name = "vscode-uri";
+      packageName = "vscode-uri";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.5.tgz";
+        sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d";
+      };
+    };
     "walk-2.3.13" = {
       name = "walk";
       packageName = "walk";
       version = "2.3.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz";
-        sha512 = "2g4ayyccqgq4fx68dhds9pwhvj2344n9p0lhb4z1hnsi882apm64s434lqz57rx4b0r1x9w1njfqrywd1la0ljqm7j4xxg8nixqri7g";
+        sha512 = "78SMe7To9U7kqVhSoGho3GfspA089ZDBIj2f8jElg2hi6lUCoagtDJ8sSMFNlpAh5Ib8Jt1gQ6Y7gh9mzHtFng==";
       };
     };
     "walk-sync-0.3.2" = {
@@ -29164,7 +28894,7 @@ let
       version = "0.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz";
-        sha512 = "2cycfx3lc52h2684s54pd81wz42f9lbggff4yva194nzr5x8nxp4fl437scd2dayyvxk68v8jmk1k8m364zdh5wmaff1a2bm9b7kh0l";
+        sha512 = "FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==";
       };
     };
     "ware-1.3.0" = {
@@ -29182,7 +28912,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz";
-        sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5";
+        sha512 = "RSlipNQB1u48cq0wH/BNfCu1tD/cJ8ydFIkNYhp9o+3d+8unClkIovpW5qpFPgmL9OE48wfAnlZydXByWP82AA==";
       };
     };
     "watchpack-1.6.0" = {
@@ -29191,7 +28921,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
-        sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb";
+        sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==";
       };
     };
     "wcwidth-1.0.1" = {
@@ -29212,13 +28942,13 @@ let
         sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       };
     };
-    "webassemblyjs-1.4.3" = {
-      name = "webassemblyjs";
-      packageName = "webassemblyjs";
-      version = "1.4.3";
+    "webidl-conversions-2.0.1" = {
+      name = "webidl-conversions";
+      packageName = "webidl-conversions";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz";
-        sha512 = "2786k2y7kvcmjs50g35vaxik7kjr475fdhynq35yi7vayfjd7zkpn6gydh8vqhmx3g8xmr7j2ddwqgk540ij0wr7ks5r8pspga9alz2";
+        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz";
+        sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506";
       };
     };
     "webidl-conversions-4.0.2" = {
@@ -29227,7 +28957,7 @@ let
       version = "4.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
-        sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1";
+        sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
     "webpack-sources-1.1.0" = {
@@ -29236,7 +28966,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz";
-        sha512 = "19rska638yxsrpxavydnjckcljiy6ylh63b802hylac396p3mm6j9bj85rhyvi81jk48c33sq580ixwjkbghgwp7cl1i9hgr7bjk9ka";
+        sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==";
       };
     };
     "websocket-driver-0.7.0" = {
@@ -29254,7 +28984,7 @@ let
       version = "0.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
-        sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy";
+        sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==";
       };
     };
     "websocket-stream-5.1.2" = {
@@ -29263,16 +28993,16 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz";
-        sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m";
+        sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw==";
       };
     };
-    "webtorrent-0.99.4" = {
+    "webtorrent-0.100.0" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.99.4";
+      version = "0.100.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.99.4.tgz";
-        sha512 = "1d0rpdlr8flkbipr3qhr59qknfc3mlmz8ka9w6mnkbxhdflwky2l1f3z244xzgis509c8r1qyyjskv99ccrmc10rz93l52f4bb7m0kj";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.100.0.tgz";
+        sha512 = "b3NhfSC1luFj5lU0Q19V9e69tBnQ2KjDHEEOHz1YRDKTTemVveqjEDUHoL1ZDkRw0WpidbQtr2XZnHmG83vOCg==";
       };
     };
     "whatwg-fetch-2.0.4" = {
@@ -29281,16 +29011,25 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz";
-        sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m";
+        sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==";
       };
     };
-    "whatwg-url-6.3.0" = {
+    "whatwg-url-6.4.1" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
-      version = "6.3.0";
+      version = "6.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz";
+        sha512 = "FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw==";
+      };
+    };
+    "whatwg-url-compat-0.6.5" = {
+      name = "whatwg-url-compat";
+      packageName = "whatwg-url-compat";
+      version = "0.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz";
-        sha512 = "01m395qx0wag7d63id97v2d86ifpw677f42lys2k6bipw4n9kmwngghsb7la19impgkrg3n4ihyk3j7963rhfgd7b066a4qk09s3kxc";
+        url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz";
+        sha1 = "00898111af689bb097541cd5a45ca6c8798445bf";
       };
     };
     "when-3.4.6" = {
@@ -29338,13 +29077,13 @@ let
         sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722";
       };
     };
-    "which-1.3.0" = {
+    "which-1.3.1" = {
       name = "which";
       packageName = "which";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
       };
     };
     "which-module-1.0.0" = {
@@ -29374,13 +29113,13 @@ let
         sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb";
       };
     };
-    "wide-align-1.1.2" = {
+    "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
     "widest-line-2.0.0" = {
@@ -29455,15 +29194,6 @@ let
         sha1 = "07105554ba1a9d08979251d129475bffae3006b7";
       };
     };
-    "winreg-1.2.3" = {
-      name = "winreg";
-      packageName = "winreg";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz";
-        sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5";
-      };
-    };
     "winreg-1.2.4" = {
       name = "winreg";
       packageName = "winreg";
@@ -29527,13 +29257,13 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "winston-2.4.2" = {
+    "winston-2.4.3" = {
       name = "winston";
       packageName = "winston";
-      version = "2.4.2";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz";
-        sha512 = "1n2jk29vqjj4v60j3553gyy1lz5mnm90bf999p4nz6chnmh0izg8c9kf4chy1j68fx8d3mnr5ci5llqr4cjy0n775ydjj2zhrvw0bz1";
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
+        sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
       };
     };
     "with-4.0.3" = {
@@ -29596,7 +29326,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz";
-        sha512 = "1yxyar4li6hnvj884kxg0agx61wsrmqnbqc06r7wy8is6iyhf2czrdgnxx4055c5hwlhhg1y8j72sh35wak9i3996kvbwycfssbf3zb";
+        sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==";
       };
     };
     "wrap-ansi-2.1.0" = {
@@ -29641,7 +29371,7 @@ let
       version = "12.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/wreck/-/wreck-12.5.1.tgz";
-        sha512 = "3s89p8x1i16wg1prbm40z7l00611hzk2s7kkvph6fw4cx049p3gpviqmhbgqxxi9pfjz32mx3aj7qsygmfcnvasgs43rj1ynwdd944p";
+        sha512 = "l5DUGrc+yDyIflpty1x9XuMj1ehVjC/dTbF3/BasOO77xk0EdEa4M/DuOY8W88MQDAD0fEDqyjc8bkIMHd2E9A==";
       };
     };
     "write-0.2.1" = {
@@ -29668,7 +29398,7 @@ let
       version = "2.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
-        sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
+        sha512 = "xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==";
       };
     };
     "write-json-file-2.3.0" = {
@@ -29680,13 +29410,13 @@ let
         sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f";
       };
     };
-    "write-pkg-3.1.0" = {
+    "write-pkg-3.2.0" = {
       name = "write-pkg";
       packageName = "write-pkg";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz";
-        sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9";
+        url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz";
+        sha512 = "tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==";
       };
     };
     "ws-0.4.31" = {
@@ -29713,7 +29443,7 @@ let
       version = "1.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz";
-        sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3";
+        sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==";
       };
     };
     "ws-2.3.1" = {
@@ -29731,7 +29461,7 @@ let
       version = "3.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz";
-        sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy";
+        sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==";
       };
     };
     "ws-4.1.0" = {
@@ -29740,16 +29470,16 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz";
-        sha512 = "1ldy8hddsvy7lb045cx4jrnx09962j98zp7y16f64gkw8z99ww61w91mjhrm85bqpsf3b158yhfh6yf01g1a2zrgm6v9bkx87r7ys34";
+        sha512 = "ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==";
       };
     };
-    "ws-5.1.1" = {
+    "ws-5.2.1" = {
       name = "ws";
       packageName = "ws";
-      version = "5.1.1";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz";
-        sha512 = "01whkym8fx8qjmx8s548zzw3ba05x8canb59v5yzidbwxdm7w1kfcfqhzzrxni1r9idqgla5ll5d3kp6fmk1sdn0k7d9lwvj2zarsvc";
+        url = "https://registry.npmjs.org/ws/-/ws-5.2.1.tgz";
+        sha512 = "2NkHdPKjDBj3CHdnAGNpmlliryKqF+n9MYXX7/wsVC4yqYocKreKNjydPDvT3wShAZnndlM0RytEfTALCDvz7A==";
       };
     };
     "wtf-8-1.0.0" = {
@@ -29806,13 +29536,13 @@ let
         sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9";
       };
     };
-    "xhr-2.4.1" = {
+    "xhr-2.5.0" = {
       name = "xhr";
       packageName = "xhr";
-      version = "2.4.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz";
-        sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4";
+        url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz";
+        sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==";
       };
     };
     "xml-1.0.0" = {
@@ -29824,6 +29554,15 @@ let
         sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe";
       };
     };
+    "xml-name-validator-2.0.1" = {
+      name = "xml-name-validator";
+      packageName = "xml-name-validator";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz";
+        sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635";
+      };
+    };
     "xml2js-0.1.14" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -29875,7 +29614,7 @@ let
       version = "0.4.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz";
-        sha512 = "3skianymbfq4rg2v5c1vwsz2kmxfik60qa892wh6a3rydd1wrv3l4vgyr8v4wd8krdf42jbmq7blp0ksbmwm332q5yr922fj8jngiks";
+        sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==";
       };
     };
     "xml2tss-0.0.5" = {
@@ -30023,22 +29762,13 @@ let
         sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a";
       };
     };
-    "xpath.js-1.0.7" = {
-      name = "xpath.js";
-      packageName = "xpath.js";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz";
-        sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4";
-      };
-    };
     "xpath.js-1.1.0" = {
       name = "xpath.js";
       packageName = "xpath.js";
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz";
-        sha512 = "1ymd8ry54702m8plqvqq4450hhsn7z4p7af48z13dx2bf928hakggd6gi6q13gk36cpavwag20nfr7j4njsjv5fywxw2axqyj8sl3wf";
+        sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==";
       };
     };
     "xregexp-2.0.0" = {
@@ -30056,7 +29786,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz";
-        sha512 = "0b2p3pxs6fa0knpdw3qhcpqh47ci9w9r4lfhav4nsg7p7l73izpig0b3knkrsl72nq5ll4pk79is30vwm1c044lnbqyxfi8qkx8qz1w";
+        sha512 = "PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==";
       };
     };
     "xsalsa20-1.0.2" = {
@@ -30065,7 +29795,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz";
-        sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43";
+        sha512 = "g1DFmZ5JJ9Qzvt4dMw6m9IydqoCSP381ucU5zm46Owbk3bwmqAr8eEJirOPc7PrXRn45drzOpAyDp8jsnoyXyw==";
       };
     };
     "xspfr-0.3.1" = {
@@ -30110,7 +29840,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
-        sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
     "yallist-2.1.2" = {
@@ -30149,13 +29879,22 @@ let
         sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
       };
     };
+    "yargs-10.0.3" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "10.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz";
+        sha512 = "DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==";
+      };
+    };
     "yargs-10.1.2" = {
       name = "yargs";
       packageName = "yargs";
       version = "10.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz";
-        sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a";
+        sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==";
       };
     };
     "yargs-11.0.0" = {
@@ -30164,16 +29903,16 @@ let
       version = "11.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz";
-        sha512 = "03n9lfnyx1dfj5sm811f3d96djsr6fixd5qi6cl6wj8xf0y01sgn7w3ynv5gn2vl30dwq5mz2hw5f522v8xbwc8m9h6nf8hqsa7wfj6";
+        sha512 = "Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==";
       };
     };
-    "yargs-11.1.0" = {
+    "yargs-12.0.1" = {
       name = "yargs";
       packageName = "yargs";
-      version = "11.1.0";
+      version = "12.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz";
-        sha512 = "3j5awbfcbh8ik0kz01mycydpi1bz9fg70xc66lk1r1qvrs5x41i2w8nvgj0aip7z9vypcsxks76z75sz4lr6z3ida9c04inkvsbl19p";
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz";
+        sha512 = "B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==";
       };
     };
     "yargs-3.10.0" = {
@@ -30230,6 +29969,15 @@ let
         sha1 = "52acc23feecac34042078ee78c0c007f5085db4c";
       };
     };
+    "yargs-parser-10.1.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "10.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz";
+        sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
+      };
+    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -30263,7 +30011,7 @@ let
       version = "8.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz";
-        sha512 = "0jyff04yy5xlrgvccky4f7phgp99lk2r1n7dk67hkb0picdjpa2ap27g4jrm94cw1d31vw8sh2b5cvnvga2w838bgh6l1kwld1bmzy8";
+        sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==";
       };
     };
     "yargs-parser-9.0.2" = {
@@ -30293,6 +30041,15 @@ let
         sha1 = "a81981ea70a57946133883f029c5821a89359a7f";
       };
     };
+    "yauzl-2.9.2" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz";
+        sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77";
+      };
+    };
     "yeast-0.1.2" = {
       name = "yeast";
       packageName = "yeast";
@@ -30311,22 +30068,22 @@ let
         sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7";
       };
     };
-    "yeoman-doctor-2.1.0" = {
+    "yeoman-doctor-3.0.1" = {
       name = "yeoman-doctor";
       packageName = "yeoman-doctor";
-      version = "2.1.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz";
-        sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
+        url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-3.0.1.tgz";
+        sha512 = "ccV0Yf7nL9dTCIY+H+7gp/qtRegf8C6CGcUIr95FEc+UBR1Y17CxPvrvH72FQ4zmDv0VM/egiMavamtVIkhEgw==";
       };
     };
-    "yeoman-environment-2.1.1" = {
+    "yeoman-environment-2.3.0" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.1.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.1.1.tgz";
-        sha512 = "0sy09nlr3nq9mmxlglxwf3crzy5krv9hn9pbd6xfpnglg23mz3kmd9s237fnlmisb8rabkn4kycwpdqf1nn47gcc90krb69984z04i0";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.3.0.tgz";
+        sha512 = "PHSAkVOqYdcR+C+Uht1SGC4eVD/9OhygYFkYaI66xF8vKIeS1RNYay+umj2ZrQeJ50tF5Q/RSO6qGDz9y3Ifug==";
       };
     };
     "yosay-2.0.2" = {
@@ -30335,7 +30092,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz";
-        sha512 = "1n24pfz9fc1pd1p1cc2bl3jy6nb9xxbqadmzx3grims5xmk9r64xy98ybnim6wwz4kj3z91qc391v785s4876ki6749xcly7ngzmxba";
+        sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA==";
       };
     };
     "zen-observable-0.5.2" = {
@@ -30344,7 +30101,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
-        sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
+        sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q==";
       };
     };
     "zeparser-0.0.5" = {
@@ -30410,14 +30167,14 @@ in
     version = "1.13.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz";
-      sha512 = "30a11iiiihsrqj8dc11n5m57im2300l46cygfh4r1q121m2l0vhzaqkg6p65kd7law25xkviw92zwmkd926n674hkv9gr6vsxrskimh";
+      sha512 = "sMapc9fb5Jf2hOQYa0Rqs/IvEo979iK4oqfNYq55E6sPN6CiBhFwyAS655khFIAhajylFhsCa0jirGGMMYagwA==";
     };
     dependencies = [
       sources."JSV-4.0.2"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."array-unique-0.3.2"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."babel-code-frame-6.26.0"
       (sources."babel-core-6.26.3" // {
         dependencies = [
@@ -30441,11 +30198,11 @@ in
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
       sources."chmodr-1.0.2"
-      sources."colors-1.2.5"
-      sources."commander-2.15.1"
+      sources."colors-1.3.0"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
-      sources."core-js-2.5.6"
+      sources."core-js-2.5.7"
       sources."debug-2.6.9"
       sources."detect-indent-4.0.0"
       sources."ejs-2.5.7"
@@ -30459,7 +30216,11 @@ in
         ];
       })
       sources."global-paths-1.0.0"
-      sources."global-prefix-0.1.5"
+      (sources."global-prefix-0.1.5" // {
+        dependencies = [
+          sources."is-windows-0.2.0"
+        ];
+      })
       sources."globals-9.18.0"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
@@ -30476,13 +30237,7 @@ in
       sources."jsesc-1.3.0"
       sources."json5-0.5.1"
       sources."jsonfile-4.0.0"
-      (sources."jsonlint-1.6.2" // {
-        dependencies = [
-          sources."ansi-styles-1.0.0"
-          sources."chalk-0.4.0"
-          sources."strip-ansi-0.1.1"
-        ];
-      })
+      sources."jsonlint-1.6.2"
       sources."lodash-4.17.10"
       sources."loose-envify-1.3.1"
       sources."matcher-collection-1.0.5"
@@ -30492,7 +30247,13 @@ in
       sources."moment-2.20.1"
       sources."ms-2.0.0"
       sources."node.extend-2.0.0"
-      sources."nomnom-1.8.1"
+      (sources."nomnom-1.8.1" // {
+        dependencies = [
+          sources."ansi-styles-1.0.0"
+          sources."chalk-0.4.0"
+          sources."strip-ansi-0.1.1"
+        ];
+      })
       sources."number-is-nan-1.0.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -30503,19 +30264,23 @@ in
       sources."private-0.1.8"
       sources."regenerator-runtime-0.11.1"
       sources."repeating-2.0.1"
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."sax-0.5.8"
       sources."slash-1.0.0"
       sources."source-map-0.6.1"
-      sources."source-map-support-0.4.18"
+      (sources."source-map-support-0.4.18" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."to-fast-properties-1.0.3"
       sources."trim-right-1.0.1"
       sources."underscore-1.6.0"
-      sources."universalify-0.1.1"
+      sources."universalify-0.1.2"
       sources."walk-sync-0.3.2"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."xml2js-0.2.8"
       sources."xml2tss-0.0.5"
       sources."xmldom-0.1.27"
@@ -30535,7 +30300,7 @@ in
     version = "0.14.3";
     src = fetchurl {
       url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz";
-      sha512 = "1p102lrikvbx1rrp8b1d47fif3qwz2487q4djgnf6288hjk8gf2nxcinwzixkfh0dw0zy7mbv1przwg4zcnpgv7wpsbnqg6a1anf4zs";
+      sha512 = "+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -30546,9 +30311,8 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffers-0.1.1"
       sources."caseless-0.12.0"
@@ -30556,14 +30320,9 @@ in
       sources."chromium-pickle-js-0.2.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."cuint-0.2.2"
       sources."dashdash-1.14.1"
       sources."decompress-zip-0.3.0"
@@ -30582,8 +30341,6 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -30603,11 +30360,7 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."mkpath-0.1.0"
-      (sources."mksnapshot-0.3.1" // {
-        dependencies = [
-          sources."glob-7.1.2"
-        ];
-      })
+      sources."mksnapshot-0.3.1"
       sources."nopt-3.0.6"
       sources."oauth-sign-0.8.2"
       sources."once-1.4.0"
@@ -30618,11 +30371,15 @@ in
       sources."q-1.5.1"
       sources."qs-6.5.2"
       sources."readable-stream-1.1.14"
-      sources."request-2.86.0"
-      sources."rimraf-2.6.2"
+      sources."request-2.87.0"
+      (sources."rimraf-2.6.2" // {
+        dependencies = [
+          sources."glob-7.1.2"
+        ];
+      })
       sources."safe-buffer-5.1.2"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
+      sources."safer-buffer-2.1.2"
+      sources."sshpk-1.14.2"
       sources."string_decoder-0.10.31"
       sources."tmp-0.0.28"
       (sources."touch-0.0.3" // {
@@ -30634,7 +30391,7 @@ in
       sources."traverse-0.3.9"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."verror-1.10.0"
       sources."wrappy-1.0.2"
     ];
@@ -30650,60 +30407,38 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.18";
+    version = "0.10.19";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.18.tgz";
-      sha512 = "05k876g0s9ac53vrqqcn5h2l6s9ccawihr29gxvj8fib49qg2mhf1v52277r2wgcjxibj7vq2b3zp2jkp0vwd6d1pkv8alwf84ri6wc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.19.tgz";
+      sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
     };
     dependencies = [
-      sources."@types/caseless-0.12.1"
-      sources."@types/form-data-2.2.1"
-      sources."@types/node-8.10.16"
-      sources."@types/request-2.47.0"
-      sources."@types/tough-cookie-2.3.3"
-      sources."@types/uuid-3.4.3"
+      sources."@types/node-8.10.20"
       sources."JSV-4.0.2"
-      sources."adal-node-0.1.21"
+      sources."adal-node-0.1.28"
       sources."ajv-5.5.2"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-1.0.0"
+      sources."ansi-styles-2.2.1"
       sources."applicationinsights-0.16.0"
       sources."asap-2.0.6"
       sources."asn1-0.2.3"
-      sources."assert-plus-1.0.0"
+      sources."assert-plus-0.2.0"
       sources."async-1.4.2"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
       sources."azure-arm-authorization-2.0.0"
-      (sources."azure-arm-batch-0.3.0" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-        ];
-      })
-      (sources."azure-arm-cdn-1.0.3" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-        ];
-      })
-      (sources."azure-arm-commerce-0.2.0" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-        ];
-      })
+      sources."azure-arm-batch-3.1.0"
+      sources."azure-arm-cdn-4.0.1"
+      sources."azure-arm-commerce-2.0.0"
       sources."azure-arm-compute-3.0.0-preview"
       (sources."azure-arm-datalake-analytics-1.0.2-preview" // {
         dependencies = [
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
       (sources."azure-arm-datalake-store-1.0.2-preview" // {
@@ -30711,26 +30446,22 @@ in
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
-      (sources."azure-arm-devtestlabs-0.1.0" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-        ];
-      })
-      sources."azure-arm-dns-2.0.0-preview"
+      sources."azure-arm-devtestlabs-2.1.1"
+      sources."azure-arm-dns-2.1.0"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
       sources."azure-arm-iothub-1.0.1-preview"
-      sources."azure-arm-network-5.1.0"
-      (sources."azure-arm-powerbiembedded-0.1.0" // {
+      sources."azure-arm-network-5.3.0"
+      (sources."azure-arm-powerbiembedded-0.1.1" // {
         dependencies = [
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
       (sources."azure-arm-rediscache-0.2.3" // {
@@ -30738,6 +30469,7 @@ in
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
       (sources."azure-arm-resource-1.6.1-preview" // {
@@ -30745,28 +30477,18 @@ in
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
-      (sources."azure-arm-servermanagement-0.1.2" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-        ];
-      })
-      (sources."azure-arm-storage-0.15.0-preview" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-        ];
-      })
+      sources."azure-arm-servermanagement-1.1.0"
+      sources."azure-arm-storage-5.0.0"
       sources."azure-arm-trafficmanager-1.1.0-preview"
-      (sources."azure-arm-website-0.11.4" // {
+      (sources."azure-arm-website-0.11.5" // {
         dependencies = [
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
       sources."azure-asm-compute-0.18.0"
@@ -30778,36 +30500,35 @@ in
       sources."azure-asm-storage-0.12.0"
       sources."azure-asm-subscription-0.10.1"
       sources."azure-asm-trafficmanager-0.10.3"
-      (sources."azure-asm-website-0.10.4" // {
+      (sources."azure-asm-website-0.10.7" // {
         dependencies = [
-          sources."moment-2.14.1"
+          sources."underscore-1.9.1"
         ];
       })
-      (sources."azure-batch-0.5.2" // {
+      (sources."azure-batch-3.2.2" // {
         dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
+          sources."underscore-1.9.1"
         ];
       })
-      (sources."azure-common-0.9.18" // {
+      (sources."azure-common-0.9.20" // {
         dependencies = [
-          sources."validator-3.22.2"
+          sources."validator-9.4.1"
           sources."xml2js-0.2.7"
         ];
       })
       sources."azure-gallery-2.0.0-pre.18"
-      sources."azure-graph-2.1.0-preview"
-      (sources."azure-keyvault-0.11.0" // {
+      sources."azure-graph-2.2.0"
+      (sources."azure-keyvault-1.0.0" // {
         dependencies = [
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
-      (sources."azure-monitoring-0.10.2" // {
+      (sources."azure-monitoring-0.10.6" // {
         dependencies = [
-          sources."moment-2.6.0"
+          sources."underscore-1.9.1"
         ];
       })
       (sources."azure-servicefabric-0.1.5" // {
@@ -30815,45 +30536,57 @@ in
           sources."async-0.2.7"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
+          sources."request-2.74.0"
         ];
       })
-      (sources."azure-storage-2.1.0" // {
+      (sources."azure-storage-2.10.0" // {
         dependencies = [
+          sources."extend-1.2.1"
           sources."readable-stream-2.0.6"
-          sources."validator-3.22.2"
-          sources."xml2js-0.2.7"
+          sources."underscore-1.8.3"
+          sources."validator-9.4.1"
+          sources."xml2js-0.2.8"
         ];
       })
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."bl-1.1.2"
-      sources."boom-4.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
+      (sources."bl-1.1.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       sources."browserify-mime-1.2.9"
       sources."buffer-equal-constant-time-1.0.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."caller-id-0.1.0"
-      sources."caseless-0.12.0"
-      sources."chalk-0.4.0"
+      sources."caseless-0.11.0"
+      sources."chalk-1.1.3"
       sources."clone-1.0.4"
       sources."co-4.6.0"
       sources."colors-1.1.2"
       sources."combined-stream-1.0.6"
       sources."commander-1.0.4"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
+      (sources."concat-stream-1.6.2" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."process-nextick-args-2.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
+      sources."core-util-is-1.0.2"
+      sources."cryptiles-2.0.5"
       sources."ctype-0.5.2"
       sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."date-utils-1.2.21"
       sources."dateformat-1.0.2-1.2.3"
-      sources."debug-0.7.4"
       sources."deep-equal-1.0.1"
       sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
@@ -30864,7 +30597,7 @@ in
       sources."envconf-0.0.4"
       sources."escape-string-regexp-1.0.5"
       sources."event-stream-3.1.5"
-      sources."extend-1.2.1"
+      sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
       sources."eyes-0.1.8"
       sources."fast-deep-equal-1.1.0"
@@ -30872,25 +30605,37 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."fibers-1.0.15"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-1.0.1" // {
+        dependencies = [
+          sources."async-2.6.1"
+        ];
+      })
       sources."from-0.1.7"
       sources."fs.realpath-1.0.0"
       sources."galaxy-0.1.12"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."github-0.1.6"
       sources."glob-7.1.2"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
+      (sources."har-validator-2.0.6" // {
+        dependencies = [
+          sources."commander-2.16.0"
+        ];
+      })
       sources."has-ansi-2.0.0"
       sources."has-color-0.1.7"
       sources."hash-base-3.0.4"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
       sources."http-basic-2.5.1"
       sources."http-response-object-1.1.0"
-      sources."http-signature-1.2.0"
+      sources."http-signature-1.1.1"
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -30908,15 +30653,15 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      (sources."jsonlint-1.6.2" // {
-        dependencies = [
-          sources."underscore-1.6.0"
-        ];
-      })
+      sources."jsonlint-1.6.2"
       sources."jsonminify-0.4.1"
       sources."jsonparse-1.2.0"
       sources."jsonpointer-4.0.1"
-      sources."jsprim-1.4.1"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."jsrsasign-4.8.2"
       sources."jwa-1.1.6"
       sources."jws-3.1.5"
@@ -30936,36 +30681,34 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.1"
-      (sources."ms-rest-2.3.3" // {
+      sources."moment-2.22.2"
+      (sources."ms-rest-2.3.6" // {
         dependencies = [
-          sources."extend-3.0.1"
-          sources."request-2.86.0"
           sources."through-2.3.8"
           sources."tunnel-0.0.5"
         ];
       })
-      (sources."ms-rest-azure-2.5.5" // {
+      (sources."ms-rest-azure-2.5.7" // {
         dependencies = [
-          sources."@types/node-9.6.17"
-          (sources."adal-node-0.1.28" // {
-            dependencies = [
-              sources."@types/node-8.10.16"
-            ];
-          })
           sources."async-2.6.0"
-          sources."xpath.js-1.1.0"
         ];
       })
       sources."mute-stream-0.0.7"
       sources."ncp-0.4.2"
       sources."node-forge-0.6.23"
-      sources."node-uuid-1.4.7"
-      sources."nomnom-1.8.1"
+      sources."node-uuid-1.4.8"
+      (sources."nomnom-1.8.1" // {
+        dependencies = [
+          sources."ansi-styles-1.0.0"
+          sources."chalk-0.4.0"
+          sources."strip-ansi-0.1.1"
+          sources."underscore-1.6.0"
+        ];
+      })
       sources."oauth-sign-0.8.2"
       sources."omelette-0.3.2"
       sources."once-1.4.0"
-      sources."openssl-wrapper-0.2.1"
+      sources."openssl-wrapper-0.3.4"
       sources."os-homedir-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."pause-stream-0.0.11"
@@ -30988,43 +30731,31 @@ in
         ];
       })
       sources."punycode-1.4.1"
-      sources."q-0.9.7"
-      sources."qs-6.5.2"
+      sources."qs-6.2.3"
       sources."read-1.0.7"
       (sources."readable-stream-1.0.34" // {
         dependencies = [
           sources."isarray-0.0.1"
         ];
       })
-      (sources."request-2.74.0" // {
+      (sources."request-2.87.0" // {
         dependencies = [
-          sources."ansi-styles-2.2.1"
-          sources."assert-plus-0.2.0"
-          sources."async-2.6.0"
-          sources."aws-sign2-0.6.0"
-          sources."boom-2.10.1"
-          sources."caseless-0.11.0"
-          sources."chalk-1.1.3"
-          sources."commander-2.15.1"
-          sources."cryptiles-2.0.5"
-          sources."extend-3.0.1"
-          sources."form-data-1.0.1"
-          sources."har-validator-2.0.6"
-          sources."hawk-3.1.3"
-          sources."hoek-2.16.3"
-          sources."http-signature-1.1.1"
-          sources."qs-6.2.3"
-          sources."readable-stream-2.0.6"
-          sources."sntp-1.0.9"
-          sources."strip-ansi-3.0.1"
-          sources."tunnel-agent-0.4.3"
+          sources."assert-plus-1.0.0"
+          sources."aws-sign2-0.7.0"
+          sources."caseless-0.12.0"
+          sources."form-data-2.3.2"
+          sources."har-validator-5.0.3"
+          sources."http-signature-1.2.0"
+          sources."qs-6.5.2"
+          sources."tunnel-agent-0.6.0"
         ];
       })
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."sax-0.5.2"
-      sources."sntp-2.1.0"
+      sources."sntp-1.0.9"
       sources."source-map-0.1.43"
       sources."split-0.2.10"
       (sources."ssh-key-to-pem-0.11.0" // {
@@ -31032,37 +30763,42 @@ in
           sources."asn1-0.1.11"
         ];
       })
-      sources."sshpk-1.14.1"
+      (sources."sshpk-1.14.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."stack-trace-0.0.10"
       sources."stream-combiner-0.0.4"
       sources."streamline-0.10.17"
       sources."streamline-streams-0.1.5"
       sources."string_decoder-0.10.31"
       sources."stringstream-0.0.6"
-      sources."strip-ansi-0.1.1"
+      sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      (sources."sync-request-3.0.0" // {
-        dependencies = [
-          sources."caseless-0.11.0"
-          sources."process-nextick-args-2.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."sync-request-3.0.0"
       sources."then-request-2.2.0"
       sources."through-2.3.4"
       sources."tough-cookie-2.3.4"
       sources."tunnel-0.0.2"
-      sources."tunnel-agent-0.6.0"
+      sources."tunnel-agent-0.4.3"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
       sources."underscore-1.4.4"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."utile-0.2.1"
-      sources."uuid-3.2.1"
+      (sources."utile-0.2.1" // {
+        dependencies = [
+          sources."async-0.2.10"
+        ];
+      })
+      sources."uuid-3.3.2"
       sources."validator-5.2.0"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."wcwidth-1.0.1"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -31076,7 +30812,7 @@ in
       sources."xml2js-0.1.14"
       sources."xmlbuilder-0.4.3"
       sources."xmldom-0.1.27"
-      sources."xpath.js-1.0.7"
+      sources."xpath.js-1.1.0"
       sources."xtend-4.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -31131,17 +30867,12 @@ in
       sources."decamelize-1.2.0"
       sources."deep-extend-0.4.2"
       sources."ends-with-0.2.0"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."ext-list-2.2.2"
-      (sources."ext-name-3.0.0" // {
-        dependencies = [
-          sources."graceful-fs-4.1.11"
-        ];
-      })
+      sources."ext-name-3.0.0"
       sources."find-up-1.1.2"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."glob-7.1.2"
           sources."graceful-fs-4.1.11"
         ];
       })
@@ -31149,7 +30880,7 @@ in
       sources."get-stdin-4.0.1"
       sources."glob-6.0.4"
       sources."graceful-fs-3.0.11"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -31159,19 +30890,35 @@ in
       sources."is-finite-1.0.2"
       sources."is-plain-obj-1.1.0"
       sources."is-utf8-0.2.1"
-      sources."jsonfile-2.4.0"
-      sources."klaw-1.3.1"
-      sources."load-json-file-1.1.0"
+      (sources."jsonfile-2.4.0" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
+      (sources."klaw-1.3.1" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
       sources."lodash-4.2.1"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-db-1.33.0"
+      sources."mime-db-1.34.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
-      sources."natives-1.1.3"
+      sources."natives-1.1.4"
       sources."normalize-package-data-2.4.0"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
@@ -31180,21 +30927,25 @@ in
       sources."parse-json-2.2.0"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-type-1.1.0"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      (sources."promised-temp-0.1.0" // {
+      (sources."path-type-1.1.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."graceful-fs-4.1.11"
         ];
       })
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."promised-temp-0.1.0"
       sources."q-1.5.1"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."rimraf-2.6.2"
+      (sources."rimraf-2.6.2" // {
+        dependencies = [
+          sources."glob-7.1.2"
+        ];
+      })
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
       sources."sort-keys-1.1.2"
@@ -31230,25 +30981,30 @@ in
     version = "16.2.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz";
-      sha512 = "3ycb2arffvn5xg0dgk03zyvpg6pizz17wix457vg1cx166h59lz0vhyr2sw3224ny8brs3lg8f1acyr2ijv196fnsjfpm1akk9i5hbw";
+      sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A==";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
-      sources."acorn-4.0.13"
-      sources."acorn-node-1.3.0"
+      sources."JSONStream-1.3.3"
+      sources."acorn-5.7.1"
+      sources."acorn-dynamic-import-3.0.0"
+      sources."acorn-node-1.5.2"
       sources."array-filter-0.0.1"
       sources."array-map-0.0.0"
       sources."array-reduce-0.0.0"
       sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
-      sources."astw-2.2.0"
+      (sources."assert-1.4.1" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+          sources."util-0.10.3"
+        ];
+      })
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
       sources."browser-pack-6.1.0"
-      (sources."browser-resolve-1.11.2" // {
+      (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
         ];
@@ -31260,7 +31016,7 @@ in
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
       sources."buffer-5.1.0"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.1"
@@ -31280,34 +31036,38 @@ in
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
-      sources."detective-5.1.0"
+      (sources."detective-5.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.4.0"
-      sources."events-2.0.0"
+      sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-assigned-identifiers-1.2.0"
       sources."glob-7.1.2"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
+      sources."hash.js-1.1.4"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.11"
+      sources."ieee754-1.1.12"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      sources."insert-module-globals-7.1.0"
+      sources."insert-module-globals-7.2.0"
       sources."is-buffer-1.1.6"
       sources."isarray-2.0.4"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
       sources."labeled-stream-splicer-2.0.1"
-      sources."lexical-scope-1.2.0"
       sources."lodash.memoize-3.0.4"
       sources."md5.js-1.3.4"
       sources."miller-rabin-4.0.1"
@@ -31316,18 +31076,13 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      (sources."module-deps-6.1.0" // {
-        dependencies = [
-          sources."acorn-5.5.3"
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."module-deps-6.1.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
       sources."pako-1.0.6"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.1"
-      sources."path-browserify-0.0.0"
+      sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
@@ -31346,16 +31101,17 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.1.2"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
+      sources."simple-concat-1.0.0"
       sources."source-map-0.5.7"
       sources."stream-browserify-2.0.1"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.2"
+      sources."stream-http-2.8.3"
       sources."stream-splicer-2.0.0"
       sources."string_decoder-1.1.1"
       (sources."subarg-1.0.0" // {
@@ -31371,18 +31127,15 @@ in
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
+      sources."undeclared-identifiers-1.1.2"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
-      sources."vm-browserify-1.0.1"
+      sources."vm-browserify-1.1.0"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -31401,7 +31154,7 @@ in
     version = "0.6.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/castnow/-/castnow-0.6.0.tgz";
-      sha512 = "01z326dk78dypwf9wyjrcr81bimbkh77cgzp54qv9230j7r7jxvd4xbsd36prrssl66ggixzwxhh6wzfqnj44ygnx3j49rf0vqxj9jp";
+      sha512 = "VybZ8QYuJyJHt88TIi12nxsIO/89vmcM1Trna0bTq5O2uzz5SDBE2piU+x87B85V4woosyw9T45f39CZzYjxAw==";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -31420,19 +31173,27 @@ in
       sources."base64-js-1.3.0"
       sources."bencode-2.0.0"
       sources."bitfield-0.1.0"
-      sources."bittorrent-dht-6.4.2"
-      sources."bittorrent-tracker-7.7.0"
-      sources."blob-to-buffer-1.2.7"
+      (sources."bittorrent-dht-6.4.2" // {
+        dependencies = [
+          sources."bencode-0.7.0"
+        ];
+      })
+      (sources."bittorrent-tracker-7.7.0" // {
+        dependencies = [
+          sources."bencode-0.8.0"
+        ];
+      })
+      sources."blob-to-buffer-1.2.8"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
       sources."boom-0.3.8"
       sources."brace-expansion-1.1.11"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-equal-0.0.1"
       sources."buffer-equals-1.0.4"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."bufferview-1.0.1"
       sources."builtin-modules-1.1.1"
       sources."bytebuffer-3.5.5"
@@ -31449,10 +31210,16 @@ in
       sources."codepage-1.4.0"
       sources."colour-0.7.1"
       sources."combined-stream-0.0.7"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
+      (sources."concat-stream-1.6.2" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."cookie-jar-0.2.0"
       sources."core-util-is-1.0.2"
       sources."cryptiles-0.1.3"
@@ -31465,28 +31232,34 @@ in
       sources."deep-extend-0.2.11"
       sources."delayed-stream-0.0.5"
       sources."diveSync-0.3.0"
-      (sources."dns-js-0.2.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."dns-js-0.2.1"
       (sources."end-of-stream-1.0.0" // {
         dependencies = [
           sources."once-1.3.3"
         ];
       })
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."exit-on-epipe-1.0.1"
       sources."fifo-0.1.4"
-      sources."figures-1.7.0"
+      (sources."figures-1.7.0" // {
+        dependencies = [
+          sources."object-assign-4.1.1"
+        ];
+      })
       sources."find-up-1.1.2"
       sources."flatten-0.0.1"
       sources."forever-agent-0.2.0"
-      sources."form-data-0.0.10"
+      (sources."form-data-0.0.10" // {
+        dependencies = [
+          sources."mime-1.2.11"
+        ];
+      })
       (sources."fs-chunk-store-1.7.0" // {
         dependencies = [
+          sources."minimist-0.0.8"
           sources."mkdirp-0.5.1"
+          sources."thunky-1.0.2"
         ];
       })
       sources."fs.realpath-1.0.0"
@@ -31499,18 +31272,14 @@ in
       sources."hat-0.0.3"
       sources."hawk-0.10.2"
       sources."hoek-0.7.6"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.1.0"
       sources."inquirer-0.8.5"
-      (sources."internal-ip-1.2.0" // {
-        dependencies = [
-          sources."object-assign-4.1.1"
-        ];
-      })
+      sources."internal-ip-1.2.0"
       sources."ip-1.1.5"
       sources."ip-set-1.0.1"
       sources."ipaddr.js-1.7.0"
@@ -31523,7 +31292,6 @@ in
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
-          sources."bencode-2.0.0"
           sources."k-bucket-2.0.1"
         ];
       })
@@ -31536,8 +31304,16 @@ in
       sources."lru-2.0.1"
       sources."magnet-uri-5.1.8"
       sources."map-obj-1.0.1"
-      sources."mdns-js-1.0.1"
-      sources."meow-3.7.0"
+      (sources."mdns-js-1.0.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."object-assign-4.1.1"
+        ];
+      })
       sources."mime-1.6.0"
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
@@ -31556,41 +31332,35 @@ in
       sources."object-assign-1.0.0"
       sources."once-1.4.0"
       sources."open-0.0.5"
-      sources."optimist-0.6.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
       sources."options-0.0.6"
       sources."optjs-3.2.2"
       sources."pad-0.0.5"
       sources."parse-json-2.2.0"
-      sources."parse-torrent-5.9.1"
-      sources."parse-torrent-file-2.1.4"
-      sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-type-1.1.0"
-      sources."peer-wire-protocol-0.7.1"
-      (sources."peer-wire-swarm-0.12.2" // {
+      (sources."parse-torrent-5.9.1" // {
         dependencies = [
-          sources."bncode-0.2.3"
+          sources."get-stdin-6.0.0"
         ];
       })
-      (sources."peerflix-0.34.0" // {
+      (sources."parse-torrent-file-2.1.4" // {
         dependencies = [
           sources."bencode-0.7.0"
-          sources."debug-3.1.0"
-          sources."end-of-stream-0.1.5"
-          sources."get-stdin-6.0.0"
-          sources."isarray-1.0.0"
-          sources."magnet-uri-4.2.3"
-          sources."minimist-0.0.10"
-          sources."object-assign-4.1.1"
-          sources."once-1.2.0"
-          sources."readable-stream-2.3.6"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.1.1"
-          sources."thirty-two-0.0.2"
-          sources."thunky-1.0.2"
-          sources."ultron-1.0.2"
         ];
       })
+      sources."path-exists-2.1.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-type-1.1.0"
+      (sources."peer-wire-protocol-0.7.1" // {
+        dependencies = [
+          sources."bncode-0.2.3"
+        ];
+      })
+      sources."peer-wire-swarm-0.12.2"
+      sources."peerflix-0.34.0"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -31608,23 +31378,35 @@ in
       sources."process-nextick-args-2.0.0"
       sources."promiscuous-0.6.0"
       sources."protobufjs-3.8.2"
-      sources."pump-0.3.5"
+      (sources."pump-0.3.5" // {
+        dependencies = [
+          sources."once-1.2.0"
+        ];
+      })
       sources."qap-3.3.1"
       sources."qs-0.5.6"
       sources."query-string-1.0.1"
-      sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.2.0"
+      (sources."random-access-file-2.0.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
+        ];
+      })
+      sources."random-access-storage-1.3.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
-      sources."rc-0.4.0"
+      (sources."rc-0.4.0" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
       sources."re-emitter-1.1.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       (sources."read-torrent-1.3.0" // {
         dependencies = [
           sources."magnet-uri-2.0.1"
-          sources."mime-1.2.11"
           (sources."parse-torrent-4.1.0" // {
             dependencies = [
               sources."magnet-uri-4.2.3"
@@ -31637,7 +31419,11 @@ in
       sources."readline2-0.1.1"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.16.6"
+      (sources."request-2.16.6" // {
+        dependencies = [
+          sources."mime-1.2.11"
+        ];
+      })
       sources."rimraf-2.6.2"
       sources."router-0.6.2"
       sources."run-parallel-1.1.9"
@@ -31650,10 +31436,20 @@ in
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
-      sources."simple-peer-6.4.4"
+      (sources."simple-peer-6.4.4" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.1.1"
           sources."ws-2.3.1"
         ];
       })
@@ -31664,13 +31460,7 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
       sources."speedometer-0.1.4"
-      (sources."srt2vtt-1.3.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."srt2vtt-1.3.1"
       sources."stream-transcoder-0.0.5"
       sources."string2compact-1.2.5"
       sources."string_decoder-0.10.31"
@@ -31683,19 +31473,15 @@ in
       sources."through-2.3.8"
       sources."thunky-0.1.0"
       sources."time-line-1.0.1"
-      (sources."torrent-discovery-5.4.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."torrent-piece-1.1.1"
+      sources."torrent-discovery-5.4.0"
+      sources."torrent-piece-1.1.2"
       (sources."torrent-stream-1.0.4" // {
         dependencies = [
-          sources."bencode-0.8.0"
-          sources."debug-2.6.9"
-          sources."minimist-0.0.8"
+          sources."end-of-stream-0.1.5"
+          sources."magnet-uri-4.2.3"
           sources."once-1.3.3"
           sources."parse-torrent-4.1.0"
+          sources."thirty-two-0.0.2"
         ];
       })
       sources."trim-newlines-1.0.0"
@@ -31714,7 +31500,11 @@ in
       sources."wordwrap-0.0.3"
       sources."wrap-fn-0.1.5"
       sources."wrappy-1.0.2"
-      sources."ws-1.1.5"
+      (sources."ws-1.1.5" // {
+        dependencies = [
+          sources."ultron-1.0.2"
+        ];
+      })
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
@@ -31756,7 +31546,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+      sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -31773,7 +31563,7 @@ in
     version = "0.0.22";
     src = fetchurl {
       url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.22.tgz";
-      sha512 = "3m2wqxac3lyi8f7hyfq4cp402194lv8mx6izc2qjvabi7s2yxhiwsj8dnam628hpbbgrjixfi37biv7g5wrykc5vha9x7dcp1nzj8i2";
+      sha512 = "IiL5bbisnZ4U3IVNn3l5Z8d1RnQ9yvzWuhAJU5VtSGoeYfdCn7jUlliwH02vaFOSggDkMoKdh8eh6OlgqmMu6g==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -31784,13 +31574,13 @@ in
       sources."cli-spinners-1.3.1"
       sources."cli-table2-0.2.0"
       sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."colors-1.2.5"
-      sources."commander-2.15.1"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."colors-1.3.0"
+      sources."commander-2.16.0"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."follow-redirects-1.4.1"
+      sources."follow-redirects-1.5.0"
       sources."has-flag-3.0.0"
       sources."humanize-plus-1.8.2"
       sources."is-buffer-1.1.6"
@@ -31823,7 +31613,7 @@ in
     version = "3.1.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-3.1.1.tgz";
-      sha512 = "13wdwd1dgc2laqsv0mjz91pz1mmfy0c0ihbgvmd4lqi6v5gas17cp85885nkdz2y5w87yizqlb2w4l04bbxwvcw6spaq2aw5q3z3rvv";
+      sha512 = "e+fxBy5cCayuNpxt3tcigBIuFsU/+oN48eK3aQtCBV12glavbBMxJa3ut2AEDHhXa/g3pC8r2BorKthrofHGRw==";
     };
     dependencies = [
       sources."async-1.0.0"
@@ -31840,7 +31630,7 @@ in
       sources."stack-trace-0.0.10"
       sources."statsd-parser-0.0.4"
       sources."strftime-0.10.0"
-      sources."winston-2.4.2"
+      sources."winston-2.4.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31860,11 +31650,12 @@ in
       sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
+      sources."JSONStream-1.3.3"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
-      sources."acorn-5.5.3"
-      sources."acorn-node-1.3.0"
+      sources."acorn-5.7.1"
+      sources."acorn-dynamic-import-3.0.0"
+      sources."acorn-node-1.5.2"
       sources."aliasify-2.1.0"
       sources."ansi-0.3.1"
       sources."ansi-escapes-1.4.0"
@@ -31876,38 +31667,38 @@ in
       sources."array-reduce-0.0.0"
       sources."asn1-0.2.3"
       sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
+      (sources."assert-1.4.1" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+          sources."util-0.10.3"
+        ];
+      })
       sources."assert-plus-0.2.0"
-      sources."astw-2.2.0"
       sources."async-1.5.2"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-0.0.8"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."big-integer-1.6.28"
+      sources."base64-js-1.3.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."big-integer-1.6.32"
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.2"
       sources."boom-2.10.1"
       sources."bplist-creator-0.0.7"
       sources."bplist-parser-0.1.1"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
       sources."browser-pack-6.1.0"
-      (sources."browser-resolve-1.11.2" // {
+      (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
         ];
       })
       (sources."browserify-14.4.0" // {
         dependencies = [
-          sources."isarray-1.0.0"
+          sources."glob-7.1.2"
         ];
       })
       sources."browserify-aes-1.2.0"
@@ -31918,7 +31709,7 @@ in
       sources."browserify-transform-tools-1.7.0"
       sources."browserify-zlib-0.1.4"
       sources."buffer-5.1.0"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-modules-1.1.1"
       sources."builtin-status-codes-3.0.0"
@@ -31933,12 +31724,21 @@ in
       sources."code-point-at-1.1.0"
       sources."combine-source-map-0.8.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
-      sources."compressible-2.0.13"
-      sources."compression-1.7.2"
+      sources."commander-2.16.0"
+      (sources."compressible-2.0.14" // {
+        dependencies = [
+          sources."mime-db-1.34.0"
+        ];
+      })
+      (sources."compression-1.7.2" // {
+        dependencies = [
+          sources."safe-buffer-5.1.1"
+        ];
+      })
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
+          sources."isarray-1.0.0"
           sources."readable-stream-2.0.6"
           sources."string_decoder-0.10.31"
         ];
@@ -31952,59 +31752,48 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."cordova-app-hello-world-3.12.0"
-      sources."cordova-common-2.2.1"
-      sources."cordova-create-1.1.2"
-      (sources."cordova-fetch-1.3.0" // {
+      sources."cordova-common-2.2.4"
+      (sources."cordova-create-1.1.2" // {
         dependencies = [
-          sources."q-1.5.1"
-          sources."shelljs-0.7.8"
+          sources."q-1.0.1"
+          sources."shelljs-0.3.0"
         ];
       })
-      (sources."cordova-js-4.2.2" // {
+      (sources."cordova-fetch-1.3.0" // {
         dependencies = [
-          sources."acorn-5.5.3"
-          sources."isarray-2.0.4"
+          sources."glob-7.1.2"
+          sources."shelljs-0.7.8"
         ];
       })
+      sources."cordova-js-4.2.4"
       (sources."cordova-lib-8.0.0" // {
         dependencies = [
-          sources."acorn-4.0.13"
-          sources."base64-js-1.3.0"
+          sources."base64-js-1.1.2"
           sources."glob-7.1.1"
-          sources."isarray-1.0.0"
-          sources."minimist-1.2.0"
           sources."nopt-4.0.1"
-          (sources."plist-2.0.1" // {
-            dependencies = [
-              sources."base64-js-1.1.2"
-            ];
-          })
-          sources."process-nextick-args-2.0.0"
+          sources."plist-2.0.1"
           sources."q-1.0.1"
-          sources."qs-6.3.2"
-          sources."safe-buffer-5.1.1"
           sources."shelljs-0.3.0"
           sources."underscore-1.8.3"
-          sources."uuid-3.2.1"
           sources."xmlbuilder-8.2.2"
         ];
       })
       sources."cordova-registry-mapper-1.1.15"
-      (sources."cordova-serve-2.0.0" // {
-        dependencies = [
-          sources."shelljs-0.5.3"
-        ];
-      })
+      sources."cordova-serve-2.0.1"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."cryptiles-2.0.5"
       sources."crypto-browserify-3.12.0"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."defined-1.0.0"
       sources."delayed-stream-1.0.0"
       (sources."dep-graph-1.1.0" // {
@@ -32041,7 +31830,11 @@ in
       sources."events-1.1.1"
       sources."evp_bytestokey-1.0.3"
       sources."exit-hook-1.1.1"
-      sources."express-4.16.3"
+      (sources."express-4.16.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.1"
+        ];
+      })
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
       sources."falafel-2.1.0"
@@ -32057,35 +31850,48 @@ in
       sources."function-bind-1.1.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."getpass-0.1.7"
+      sources."get-assigned-identifiers-1.2.0"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-5.0.15"
-      sources."got-3.3.1"
+      (sources."got-3.3.1" // {
+        dependencies = [
+          sources."object-assign-3.0.0"
+        ];
+      })
       sources."graceful-fs-4.1.11"
       sources."har-validator-2.0.6"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
+      sources."hash.js-1.1.4"
       sources."hawk-3.1.3"
       sources."hmac-drbg-1.0.1"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."htmlescape-1.1.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.1.1"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.19"
-      sources."ieee754-1.1.11"
+      sources."ieee754-1.1.12"
       sources."imurmurhash-0.1.4"
       sources."indexof-0.0.1"
       sources."infinity-agent-2.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."init-package-json-1.10.3"
+      (sources."init-package-json-1.10.3" // {
+        dependencies = [
+          sources."glob-7.1.2"
+        ];
+      })
       sources."inline-source-map-0.6.2"
       sources."inquirer-0.10.1"
-      (sources."insert-module-globals-7.1.0" // {
+      (sources."insert-module-globals-7.2.0" // {
         dependencies = [
           sources."concat-stream-1.6.2"
         ];
@@ -32097,9 +31903,7 @@ in
               sources."uuid-2.0.3"
             ];
           })
-          sources."minimist-1.2.0"
-          sources."mute-stream-0.0.5"
-          sources."uuid-3.2.1"
+          sources."uuid-3.3.2"
         ];
       })
       sources."interpret-1.1.0"
@@ -32117,6 +31921,7 @@ in
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
+      sources."is-wsl-1.1.0"
       sources."isarray-0.0.1"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
@@ -32132,9 +31937,12 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."labeled-stream-splicer-2.0.1"
+      (sources."labeled-stream-splicer-2.0.1" // {
+        dependencies = [
+          sources."isarray-2.0.4"
+        ];
+      })
       sources."latest-version-1.0.1"
-      sources."lexical-scope-1.2.0"
       sources."lodash-3.10.1"
       sources."lodash._getnative-3.9.1"
       sources."lodash.debounce-3.1.1"
@@ -32164,25 +31972,29 @@ in
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
-      sources."object-keys-1.0.11"
+      sources."object-keys-1.0.12"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."once-1.4.0"
       sources."onetime-1.1.0"
-      sources."open-0.0.5"
       sources."opener-1.4.2"
+      sources."opn-5.3.0"
       sources."os-browserify-0.1.2"
       sources."os-homedir-1.0.2"
       sources."os-name-1.0.3"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      sources."osx-release-1.1.0"
+      (sources."osx-release-1.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."package-json-1.2.0"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.1"
       sources."parseurl-1.3.2"
-      sources."path-browserify-0.0.0"
+      sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
@@ -32191,7 +32003,7 @@ in
       sources."pegjs-0.10.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      sources."plist-1.2.0"
+      sources."plist-3.0.1"
       sources."prepend-http-1.0.4"
       sources."process-0.11.10"
       sources."process-nextick-args-1.0.7"
@@ -32211,30 +32023,55 @@ in
         dependencies = [
           sources."depd-1.1.1"
           sources."http-errors-1.6.2"
+          sources."setprototypeof-1.0.3"
+        ];
+      })
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.0"
         ];
       })
-      sources."rc-1.2.7"
       sources."read-1.0.7"
       sources."read-all-stream-3.1.0"
       sources."read-only-stream-2.0.0"
-      sources."read-package-json-2.0.13"
+      (sources."read-package-json-2.0.13" // {
+        dependencies = [
+          sources."glob-7.1.2"
+        ];
+      })
       (sources."readable-stream-2.3.6" // {
         dependencies = [
+          sources."isarray-1.0.0"
+          sources."process-nextick-args-2.0.0"
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."readline2-1.0.1"
+      (sources."readline2-1.0.1" // {
+        dependencies = [
+          sources."mute-stream-0.0.5"
+        ];
+      })
       sources."rechoir-0.6.2"
       sources."registry-url-3.1.0"
       sources."repeating-1.1.3"
-      sources."request-2.79.0"
-      sources."resolve-1.7.1"
+      (sources."request-2.79.0" // {
+        dependencies = [
+          sources."qs-6.3.2"
+          sources."uuid-3.3.2"
+        ];
+      })
+      sources."resolve-1.8.1"
       sources."restore-cursor-1.0.1"
-      sources."rimraf-2.6.2"
+      (sources."rimraf-2.6.2" // {
+        dependencies = [
+          sources."glob-7.1.2"
+        ];
+      })
       sources."ripemd160-2.0.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."sax-0.3.5"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
@@ -32245,7 +32082,14 @@ in
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."shelljs-0.5.3"
-      sources."simple-plist-0.2.1"
+      sources."simple-concat-1.0.0"
+      (sources."simple-plist-0.2.1" // {
+        dependencies = [
+          sources."base64-js-1.1.2"
+          sources."plist-2.0.1"
+          sources."xmlbuilder-8.2.2"
+        ];
+      })
       sources."slash-1.0.0"
       sources."slide-1.1.6"
       sources."sntp-1.0.9"
@@ -32254,7 +32098,7 @@ in
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -32263,7 +32107,7 @@ in
       sources."stream-browserify-2.0.1"
       sources."stream-buffers-2.2.0"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.2"
+      sources."stream-http-2.8.3"
       sources."stream-shift-1.0.0"
       sources."stream-splicer-2.0.0"
       sources."string-length-1.0.1"
@@ -32272,7 +32116,11 @@ in
       sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."subarg-1.0.0"
+      (sources."subarg-1.0.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."supports-color-2.0.0"
       sources."syntax-error-1.4.0"
       sources."tar-2.2.1"
@@ -32288,14 +32136,13 @@ in
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
-      sources."underscore-1.9.0"
+      sources."undeclared-identifiers-1.1.2"
+      sources."underscore-1.9.1"
       sources."unorm-1.4.1"
       sources."unpipe-1.0.0"
       (sources."update-notifier-0.5.0" // {
         dependencies = [
           sources."configstore-1.4.0"
-          sources."minimist-1.2.0"
-          sources."object-assign-3.0.0"
         ];
       })
       (sources."url-0.11.0" // {
@@ -32303,11 +32150,7 @@ in
           sources."punycode-1.3.2"
         ];
       })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-2.0.3"
@@ -32315,7 +32158,11 @@ in
       sources."validate-npm-package-license-3.0.3"
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."vm-browserify-0.0.4"
       sources."win-release-1.1.1"
       sources."wrappy-1.0.2"
@@ -32326,7 +32173,7 @@ in
         ];
       })
       sources."xdg-basedir-2.0.0"
-      sources."xmlbuilder-4.0.0"
+      sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
       sources."xtend-4.0.1"
     ];
@@ -32345,7 +32192,7 @@ in
     version = "1.5.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz";
-      sha512 = "20yr02pv4sg07navr76mzp7fkna2n0ja4k08glrka1x021xm9fykay2gbyrjjkclavb12pkfs01j6y6mpd3yfsxvaiacsnkqz70hxmy";
+      sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -32356,7 +32203,7 @@ in
       sources."buffer-from-0.1.2"
       sources."builtins-1.0.3"
       sources."chalk-1.1.3"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.2"
@@ -32371,11 +32218,7 @@ in
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
-      (sources."hyperquest-2.1.3" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-        ];
-      })
+      sources."hyperquest-2.1.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."isarray-0.0.1"
@@ -32386,7 +32229,11 @@ in
       sources."macos-release-1.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."once-1.4.0"
       sources."os-name-2.0.1"
@@ -32405,17 +32252,20 @@ in
       (sources."tar-pack-3.4.1" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."minimist-0.0.8"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."through2-0.6.5"
+      (sources."through2-0.6.5" // {
+        dependencies = [
+          sources."readable-stream-1.0.34"
+        ];
+      })
       sources."tmp-0.0.31"
       sources."uid-number-0.0.6"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-name-3.0.0"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."win-release-1.1.1"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
@@ -32442,9 +32292,9 @@ in
       sources."ansi-styles-3.2.1"
       sources."babel-runtime-6.26.0"
       sources."chalk-2.4.1"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."core-js-2.5.6"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."core-js-2.5.7"
       sources."cross-spawn-5.1.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs-extra-4.0.3"
@@ -32463,8 +32313,8 @@ in
       sources."source-map-0.5.7"
       sources."source-map-support-0.4.18"
       sources."supports-color-5.4.0"
-      sources."universalify-0.1.1"
-      sources."which-1.3.0"
+      sources."universalify-0.1.2"
+      sources."which-1.3.1"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -32503,17 +32353,26 @@ in
     version = "13.10.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz";
-      sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z";
+      sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw==";
     };
     dependencies = [
       sources."abstract-random-access-1.1.2"
       sources."ajv-5.5.2"
-      sources."ansi-diff-stream-1.2.1"
+      (sources."ansi-diff-stream-1.2.1" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
       sources."ap-0.1.0"
-      sources."append-tree-2.4.1"
+      (sources."append-tree-2.4.4" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+          sources."varint-5.0.0"
+        ];
+      })
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
       sources."array-lru-1.1.1"
@@ -32526,29 +32385,24 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-1.0.0"
-      sources."bitfield-rle-2.1.0"
-      (sources."bittorrent-dht-7.10.0" // {
+      (sources."bitfield-rle-2.1.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."varint-4.0.1"
         ];
       })
+      sources."bittorrent-dht-7.10.0"
       sources."blake2b-2.1.2"
       sources."blake2b-wasm-1.1.7"
       sources."body-0.1.0"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-1.0.0"
+      sources."braces-1.8.5"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-equals-1.0.4"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-indexof-1.1.1"
       sources."bulk-write-stream-1.1.4"
       sources."bytes-3.0.0"
@@ -32560,9 +32414,9 @@ in
       sources."cliclopts-1.1.1"
       sources."co-4.6.0"
       sources."codecs-1.2.1"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."colors-1.2.5"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."colors-1.3.0"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -32570,21 +32424,16 @@ in
       sources."content-types-0.1.0"
       sources."core-util-is-1.0.2"
       sources."corsify-2.1.0"
-      (sources."cryptiles-3.1.2" // {
+      sources."cycle-1.0.3"
+      sources."dashdash-1.14.1"
+      (sources."dat-dns-3.0.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."debug-2.6.9"
         ];
       })
-      sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
-      sources."dat-dns-1.3.2"
       (sources."dat-doctor-1.4.0" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."dns-packet-1.3.1"
-          sources."dns-socket-1.6.3"
-          sources."lru-2.0.1"
-          sources."multicast-dns-6.2.3"
           sources."pump-1.0.3"
         ];
       })
@@ -32593,27 +32442,19 @@ in
       (sources."dat-json-1.0.2" // {
         dependencies = [
           sources."dat-encoding-4.0.2"
-          sources."debug-2.6.9"
-        ];
-      })
-      (sources."dat-link-resolve-2.1.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
         ];
       })
-      (sources."dat-log-1.1.1" // {
+      sources."dat-link-resolve-2.2.0"
+      sources."dat-log-1.1.1"
+      (sources."dat-node-3.5.9" // {
         dependencies = [
-          sources."process-nextick-args-1.0.7"
-        ];
-      })
-      (sources."dat-node-3.5.8" // {
-        dependencies = [
-          sources."buffer-alloc-unsafe-0.1.1"
-          sources."minimist-0.0.8"
-          sources."process-nextick-args-1.0.7"
+          (sources."discovery-swarm-5.1.1" // {
+            dependencies = [
+              sources."debug-2.6.9"
+            ];
+          })
           sources."pump-1.0.3"
-          sources."unordered-set-2.0.0"
-          sources."varint-5.0.0"
+          sources."random-access-memory-3.0.0"
         ];
       })
       sources."dat-registry-4.0.0"
@@ -32626,20 +32467,28 @@ in
       sources."directory-index-html-2.1.0"
       (sources."discovery-channel-5.5.1" // {
         dependencies = [
+          sources."debug-2.6.9"
+          sources."dns-discovery-6.1.0"
+          sources."lru-2.0.1"
           sources."pump-3.0.0"
+          sources."thunky-0.1.0"
         ];
       })
       (sources."discovery-swarm-4.4.2" // {
         dependencies = [
-          (sources."dns-discovery-6.1.0" // {
-            dependencies = [
-              sources."thunky-1.0.2"
-            ];
-          })
-          sources."thunky-0.1.0"
+          sources."debug-2.6.9"
+          sources."pump-1.0.3"
+        ];
+      })
+      (sources."dns-discovery-5.6.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."dns-packet-1.3.1"
+          sources."dns-socket-1.6.3"
+          sources."lru-2.0.1"
+          sources."multicast-dns-6.2.3"
         ];
       })
-      sources."dns-discovery-5.6.1"
       sources."dns-packet-4.2.0"
       sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
@@ -32660,7 +32509,7 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
       sources."flat-tree-1.6.0"
-      sources."for-each-0.3.2"
+      sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
@@ -32675,29 +32524,35 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-flag-3.0.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.14.0" // {
+      (sources."hypercore-6.17.1" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+          sources."unordered-set-2.0.1"
+        ];
+      })
+      sources."hypercore-crypto-1.0.0"
+      (sources."hypercore-protocol-6.6.4" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
       })
-      sources."hypercore-protocol-6.6.4"
-      (sources."hyperdrive-9.12.3" // {
+      sources."hyperdrive-9.14.0"
+      (sources."hyperdrive-http-4.2.2" // {
         dependencies = [
-          sources."varint-4.0.1"
+          sources."pump-1.0.3"
         ];
       })
-      sources."hyperdrive-http-4.2.2"
       sources."hyperdrive-network-speed-2.1.0"
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
+      sources."inspect-custom-symbol-1.1.0"
       sources."ip-1.1.5"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.3"
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
@@ -32706,6 +32561,7 @@ in
       sources."is-function-1.0.1"
       sources."is-glob-2.0.1"
       sources."is-number-2.1.0"
+      sources."is-options-1.0.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-string-1.0.4"
@@ -32722,11 +32578,14 @@ in
       sources."k-bucket-3.3.1"
       (sources."k-rpc-4.3.1" // {
         dependencies = [
-          sources."bencode-2.0.0"
           sources."k-bucket-4.0.1"
         ];
       })
-      sources."k-rpc-socket-1.8.0"
+      (sources."k-rpc-socket-1.8.0" // {
+        dependencies = [
+          sources."bencode-2.0.0"
+        ];
+      })
       sources."kind-of-3.2.2"
       sources."last-one-wins-1.0.4"
       sources."length-prefixed-message-3.0.3"
@@ -32743,13 +32602,17 @@ in
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mirror-folder-2.2.0"
-      sources."mkdirp-0.5.1"
+      sources."mirror-folder-3.0.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
       sources."multicast-dns-7.0.0"
       sources."multicb-1.2.2"
-      sources."multistream-2.1.0"
+      sources."multistream-2.1.1"
       sources."mute-stream-0.0.7"
       sources."mutexify-1.2.0"
       sources."nan-2.10.0"
@@ -32757,14 +32620,10 @@ in
       sources."nanobus-3.3.0"
       sources."nanotiming-1.0.1"
       sources."ncp-1.0.1"
-      (sources."neat-log-1.1.2" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."neat-log-1.1.2"
       sources."nets-3.2.0"
       sources."network-address-1.1.2"
-      sources."node-gyp-build-3.3.0"
+      sources."node-gyp-build-3.4.0"
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.8.2"
       sources."object.omit-2.0.1"
@@ -32781,21 +32640,26 @@ in
       sources."process-0.5.2"
       sources."process-nextick-args-2.0.0"
       sources."progress-string-1.2.2"
-      (sources."prompt-1.0.0" // {
+      sources."prompt-1.0.0"
+      (sources."protocol-buffers-encodings-1.1.0" // {
         dependencies = [
-          sources."async-1.0.0"
+          sources."varint-5.0.0"
         ];
       })
-      sources."protocol-buffers-encodings-1.1.0"
       sources."pump-2.0.1"
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
-      sources."random-access-memory-2.4.0"
-      sources."random-access-storage-1.2.0"
+      (sources."random-access-memory-2.4.0" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+        ];
+      })
+      sources."random-access-storage-1.3.0"
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."randombytes-2.0.6"
@@ -32807,29 +32671,37 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
-      sources."signed-varint-2.0.1"
+      sources."safer-buffer-2.1.2"
+      (sources."signed-varint-2.0.1" // {
+        dependencies = [
+          sources."varint-5.0.0"
+        ];
+      })
       sources."simple-sha1-2.1.1"
-      sources."siphash24-1.1.0"
+      sources."siphash24-1.1.1"
       sources."slice-ansi-1.0.0"
-      sources."sntp-2.1.0"
       sources."sodium-javascript-0.5.5"
       sources."sodium-native-2.1.6"
       sources."sodium-universal-2.0.0"
-      sources."sorted-array-functions-1.1.0"
+      sources."sorted-array-functions-1.2.0"
       sources."sorted-indexof-1.0.0"
       sources."sparse-bitfield-3.0.3"
-      sources."speedometer-1.0.0"
-      sources."sshpk-1.14.1"
+      sources."speedometer-1.1.0"
+      sources."sshpk-1.14.2"
       sources."stack-trace-0.0.10"
       sources."status-logger-3.1.1"
       sources."stream-collector-1.0.1"
       sources."stream-each-1.2.2"
-      sources."stream-parser-0.3.1"
+      (sources."stream-parser-0.3.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."stream-shift-1.0.0"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
@@ -32840,15 +32712,15 @@ in
         ];
       })
       sources."supports-color-5.4.0"
-      (sources."throttle-1.0.3" // {
+      sources."throttle-1.0.3"
+      sources."through2-2.0.3"
+      sources."thunky-1.0.2"
+      sources."to-buffer-1.1.1"
+      (sources."toiletdb-1.4.1" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
-      sources."through2-2.0.3"
-      sources."thunky-1.0.2"
-      sources."to-buffer-1.1.1"
-      sources."toiletdb-1.4.1"
       sources."tough-cookie-2.3.4"
       sources."township-client-1.3.2"
       sources."trim-0.0.1"
@@ -32860,22 +32732,23 @@ in
       sources."unixify-1.0.0"
       sources."unordered-array-remove-1.0.2"
       sources."unordered-set-1.1.0"
-      sources."untildify-3.0.2"
+      sources."untildify-3.0.3"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
       sources."utp-native-1.7.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
       (sources."winston-2.1.1" // {
         dependencies = [
+          sources."async-1.0.0"
           sources."colors-1.0.3"
           sources."pkginfo-0.3.1"
         ];
       })
       sources."wrap-ansi-3.0.1"
       sources."wrappy-1.0.2"
-      sources."xhr-2.4.1"
+      sources."xhr-2.5.0"
       sources."xsalsa20-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -32891,10 +32764,10 @@ in
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
-    version = "0.2.13";
+    version = "0.2.15";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.13.tgz";
-      sha512 = "38j71wr4hhxw452rkkgjd0l438gaal55jnags32lfssq74w3z341whfdhjlmssxrnaczr3li4h4qr8scbd4xvqb860bchjg12i8pnjj";
+      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.15.tgz";
+      sha512 = "oIuRtSWj6UEU6zNEddKyE4P+fFrbZOMIaTWF8VS76hqzAln1myOtaG5zvTwF0UiD+bCmlJVFh8kcWf/kq7pksg==";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -32947,12 +32820,7 @@ in
       sources."etag-1.5.1"
       sources."event-stream-3.2.2"
       sources."eventemitter3-0.1.6"
-      (sources."express-4.11.2" // {
-        dependencies = [
-          sources."mime-db-1.12.0"
-          sources."mime-types-2.0.14"
-        ];
-      })
+      sources."express-4.11.2"
       sources."extend-1.2.1"
       sources."extsprintf-1.4.0"
       sources."eyes-0.1.8"
@@ -32964,7 +32832,7 @@ in
       sources."fresh-0.2.4"
       sources."from-0.1.7"
       sources."hiredis-0.4.1"
-      sources."http-parser-js-0.4.12"
+      sources."http-parser-js-0.4.13"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."ipaddr.js-1.0.5"
@@ -33028,7 +32896,12 @@ in
         ];
       })
       sources."through-2.3.8"
-      sources."type-is-1.5.7"
+      (sources."type-is-1.5.7" // {
+        dependencies = [
+          sources."mime-db-1.12.0"
+          sources."mime-types-2.0.14"
+        ];
+      })
       sources."utils-merge-1.0.0"
       sources."vary-1.0.1"
       sources."verror-1.10.0"
@@ -33060,13 +32933,21 @@ in
     };
     dependencies = [
       sources."JSONStream-0.8.4"
-      sources."abstract-leveldown-0.12.4"
+      (sources."abstract-leveldown-0.12.4" // {
+        dependencies = [
+          sources."xtend-3.0.0"
+        ];
+      })
       sources."basic-auth-1.1.0"
       sources."bindings-1.2.1"
-      sources."bl-0.8.2"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
-      sources."buffer-fill-0.1.1"
+      (sources."bl-0.8.2" // {
+        dependencies = [
+          sources."readable-stream-1.0.34"
+        ];
+      })
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-fill-1.0.0"
       sources."bytewise-1.1.0"
       sources."bytewise-core-1.2.3"
       sources."cookie-signature-1.1.0"
@@ -33074,7 +32955,13 @@ in
       sources."cors-2.8.4"
       sources."deferred-leveldown-0.2.0"
       sources."docker-parse-image-3.0.1"
-      sources."duplexify-3.6.0"
+      (sources."duplexify-3.6.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."end-of-stream-1.4.1"
       (sources."errno-0.1.7" // {
         dependencies = [
@@ -33082,13 +32969,7 @@ in
         ];
       })
       sources."from2-1.3.0"
-      (sources."fs-blob-store-5.2.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."fs-blob-store-5.2.1"
       sources."fs-constants-1.0.0"
       sources."inherits-2.0.3"
       sources."isarray-0.0.1"
@@ -33104,7 +32985,6 @@ in
               sources."xtend-3.0.0"
             ];
           })
-          sources."looper-3.0.0"
           sources."readable-stream-1.0.34"
         ];
       })
@@ -33171,7 +33051,11 @@ in
       sources."split2-0.2.1"
       sources."stream-collector-1.0.1"
       sources."stream-shift-1.0.0"
-      sources."stream-to-pull-stream-1.7.2"
+      (sources."stream-to-pull-stream-1.7.2" // {
+        dependencies = [
+          sources."looper-3.0.0"
+        ];
+      })
       sources."string_decoder-0.10.31"
       (sources."tar-stream-1.6.1" // {
         dependencies = [
@@ -33209,36 +33093,30 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.14";
+    version = "3.3.18";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.14.tgz";
-      sha512 = "1bvfy3zh4ir1griyp1af3c2vc11wrkxyi4h8bfsdlgwwgq9azp1l8l1v03b88x69fqr3llr6kgacjr1cykd64p10dr5438zjlw1vcr4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.18.tgz";
+      sha512 = "bfdM9Dy7PeZQnNTEOt8JQCDv+nOQxQJgijLbP7LRg/bAYt6JcKNyGzUp+25iXhoZLd+X3RmLD55yh3hSIsKfAw==";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
+      sources."JSONStream-1.3.3"
       sources."ajv-5.5.2"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.241.1"
+      sources."aws-sdk-2.266.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."base64-js-1.3.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."buffer-4.9.1"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
-      sources."decimal.js-10.0.0"
+      sources."decimal.js-10.0.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."events-1.1.1"
@@ -33251,8 +33129,6 @@ in
       sources."getpass-0.1.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."ieee754-1.1.8"
       sources."ini-1.3.5"
@@ -33277,17 +33153,17 @@ in
       sources."punycode-1.3.2"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
-      (sources."request-2.86.0" // {
+      sources."request-2.87.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.1"
+      sources."sshpk-1.14.2"
+      sources."through-2.3.8"
+      (sources."tough-cookie-2.3.4" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
       })
-      sources."safe-buffer-5.1.2"
-      sources."sax-1.2.1"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
-      sources."through-2.3.8"
-      sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."url-0.10.3"
@@ -33329,7 +33205,7 @@ in
     version = "0.18.12";
     src = fetchurl {
       url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz";
-      sha512 = "1rcghwzkjcs25iz7dvfjxkwkn35jd7vyfs9idwncz2zvasyy1nkkpg6rcgilciwppccd29j2yrdzp95nddnh8lpqz41aiw2z0v6wzg6";
+      sha512 = "5n1uNviCRxXIx5ciaFuzJd3fshcyicbYvTwyGh/L5t05bfBeq/3FZ5a3mLTz+zRZhp18dul2Oz8WoZmcn8PHcg==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -33345,23 +33221,13 @@ in
       sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-1.11.0"
-      (sources."binstall-1.2.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."minimist-0.0.8"
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."binstall-1.2.0"
       sources."block-stream-0.0.9"
       sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."braces-1.8.5"
       sources."caseless-0.11.0"
       (sources."chalk-2.1.0" // {
         dependencies = [
@@ -33369,15 +33235,19 @@ in
         ];
       })
       sources."chokidar-1.6.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.0"
       sources."cryptiles-2.0.5"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -33388,7 +33258,12 @@ in
       sources."extsprintf-1.3.0"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
-      sources."find-elm-dependencies-1.0.2"
+      (sources."find-elm-dependencies-1.0.2" // {
+        dependencies = [
+          sources."firstline-1.2.0"
+          sources."lodash-4.14.2"
+        ];
+      })
       sources."find-parent-dir-0.3.0"
       sources."firstline-1.2.1"
       sources."for-in-1.0.2"
@@ -33401,12 +33276,21 @@ in
       sources."fstream-1.0.11"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
-      sources."har-validator-2.0.6"
+      (sources."har-validator-2.0.6" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."has-ansi-2.0.0"
       sources."has-flag-2.0.0"
       sources."hawk-3.1.3"
@@ -33452,14 +33336,16 @@ in
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."murmur-hash-js-1.0.0"
       sources."nan-2.10.0"
       (sources."node-elm-compiler-4.3.3" // {
         dependencies = [
-          sources."firstline-1.2.0"
           sources."lodash-4.14.2"
-          sources."rimraf-2.2.8"
         ];
       })
       sources."normalize-path-2.1.1"
@@ -33479,6 +33365,7 @@ in
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."readable-stream-2.3.6"
@@ -33490,10 +33377,11 @@ in
       sources."request-2.79.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."sntp-1.0.9"
       sources."split-1.0.1"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -33503,15 +33391,23 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-4.2.0"
       sources."tar-2.2.1"
-      sources."temp-0.8.3"
+      (sources."temp-0.8.3" // {
+        dependencies = [
+          sources."rimraf-2.2.8"
+        ];
+      })
       sources."through-2.3.8"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.4.3"
       sources."tweetnacl-0.14.5"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."verror-1.10.0"
-      sources."which-1.3.0"
+      sources."uuid-3.3.2"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."which-1.3.1"
       sources."wrappy-1.0.2"
       sources."xmlbuilder-8.2.2"
       sources."xtend-4.0.1"
@@ -33532,17 +33428,16 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz";
-      sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z";
+      sha512 = "f+jc5ZC+EAqRK84plziuC4sfKspUcnnxwZzxLFSFsH0MZn9VbU0iQh5qTONewYXsoRaacNioMOLxYV637MLBDQ==";
     };
     dependencies = [
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-2.2.1"
-      sources."arch-2.1.0"
+      sources."arch-2.1.1"
       sources."array-find-index-1.0.2"
       sources."arrify-1.0.1"
-      sources."asap-2.0.6"
-      sources."auto-bind-1.2.0"
+      sources."auto-bind-1.2.1"
       sources."babel-code-frame-6.26.0"
       sources."babel-core-6.26.3"
       sources."babel-generator-6.26.1"
@@ -33568,15 +33463,20 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."has-ansi-2.0.0"
+        ];
+      })
       sources."cli-cursor-2.1.0"
       sources."clipboardy-1.2.3"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."concat-map-0.0.1"
       sources."conf-1.4.0"
       sources."convert-source-map-1.5.1"
-      sources."core-js-2.5.6"
+      sources."core-js-2.5.7"
       sources."cross-spawn-5.1.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-2.6.9"
@@ -33585,13 +33485,11 @@ in
       sources."detect-indent-4.0.0"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
-      sources."encoding-0.1.12"
       sources."env-paths-1.0.0"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."esutils-2.0.2"
       sources."execa-0.8.0"
-      sources."fbjs-0.8.16"
       sources."find-up-2.1.0"
       sources."get-stdin-4.0.1"
       sources."get-stream-3.0.0"
@@ -33603,22 +33501,14 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
-      sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.23"
-      (sources."import-jsx-1.3.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."has-ansi-2.0.0"
-        ];
-      })
+      sources."hosted-git-info-2.6.1"
+      sources."import-jsx-1.3.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
       (sources."ink-0.3.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
-          sources."core-js-1.2.7"
-          sources."strip-ansi-4.0.0"
           sources."supports-color-5.4.0"
         ];
       })
@@ -33635,12 +33525,15 @@ in
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."isexe-2.0.0"
-      sources."isomorphic-fetch-2.2.1"
       sources."isurl-1.0.0"
       sources."js-tokens-3.0.2"
       sources."jsesc-1.3.0"
       sources."json5-0.5.1"
-      sources."load-json-file-1.1.0"
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."locate-path-2.0.0"
       sources."lodash-4.17.10"
       sources."lodash.debounce-4.0.8"
@@ -33656,11 +33549,7 @@ in
       sources."mem-1.1.0"
       (sources."meow-3.7.0" // {
         dependencies = [
-          sources."find-up-1.1.2"
-          sources."indent-string-2.1.0"
           sources."minimist-1.2.0"
-          sources."path-exists-2.1.0"
-          sources."pify-2.3.0"
         ];
       })
       sources."mimic-fn-1.2.0"
@@ -33669,7 +33558,6 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."node-fetch-1.7.3"
       sources."normalize-package-data-2.4.0"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -33679,7 +33567,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-0.3.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-timeout-1.2.1"
       sources."p-try-1.0.0"
@@ -33687,28 +33575,38 @@ in
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
-      sources."path-type-1.1.0"
+      (sources."path-type-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."pkg-up-2.0.0"
       sources."prepend-http-1.0.4"
       sources."private-0.1.8"
-      sources."promise-7.3.1"
-      sources."prop-types-15.6.1"
+      sources."prop-types-15.6.2"
       sources."pseudomap-1.0.2"
       sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."redent-1.0.0"
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
+      (sources."redent-1.0.0" // {
+        dependencies = [
+          sources."indent-string-2.1.0"
+        ];
+      })
       sources."regenerator-runtime-0.11.1"
       sources."repeating-2.0.1"
       sources."require-from-string-1.2.1"
       sources."resolve-from-3.0.0"
       sources."restore-cursor-2.0.0"
       sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
-      sources."setimmediate-1.0.5"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -33720,8 +33618,16 @@ in
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      sources."string-width-2.1.1"
-      sources."strip-ansi-3.0.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      (sources."strip-ansi-3.0.1" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."strip-bom-2.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-indent-1.0.1"
@@ -33730,14 +33636,16 @@ in
       sources."to-fast-properties-1.0.3"
       sources."trim-newlines-1.0.0"
       sources."trim-right-1.0.1"
-      sources."ua-parser-js-0.7.18"
       sources."unicode-emoji-modifier-base-1.0.0"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
       sources."validate-npm-package-license-3.0.3"
-      sources."whatwg-fetch-2.0.4"
-      sources."which-1.3.0"
-      sources."wrap-ansi-3.0.1"
+      sources."which-1.3.1"
+      (sources."wrap-ansi-3.0.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."write-file-atomic-2.3.0"
       sources."yallist-2.1.2"
     ];
@@ -33753,20 +33661,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.19.1";
+    version = "5.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz";
-      sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd";
+      url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz";
+      sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
     };
     dependencies = [
-      sources."acorn-5.5.3"
-      (sources."acorn-jsx-3.0.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
-      sources."ajv-5.5.2"
-      sources."ajv-keywords-2.1.1"
+      sources."acorn-5.7.1"
+      sources."acorn-jsx-4.1.1"
+      sources."ajv-6.5.2"
+      sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -33782,7 +33686,6 @@ in
       })
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.0.0"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
       (sources."chalk-2.4.1" // {
@@ -33795,62 +33698,68 @@ in
       sources."circular-json-0.3.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."co-4.6.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."core-util-is-1.0.2"
-      sources."cross-spawn-5.1.0"
+      sources."cross-spawn-6.0.5"
       sources."debug-3.1.0"
       sources."deep-is-0.1.3"
+      sources."define-properties-1.1.2"
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
+      sources."es-abstract-1.12.0"
+      sources."es-to-primitive-1.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-3.7.1"
+      sources."eslint-scope-4.0.0"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-3.5.4"
+      sources."espree-4.0.0"
       sources."esprima-4.0.0"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."external-editor-2.2.0"
-      sources."fast-deep-equal-1.1.0"
+      sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."figures-2.0.0"
       sources."file-entry-cache-2.0.0"
       sources."flat-cache-1.3.0"
+      sources."foreach-2.0.5"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."globals-11.5.0"
+      sources."globals-11.7.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.0"
       sources."iconv-lite-0.4.23"
-      sources."ignore-3.3.8"
+      sources."ignore-3.3.10"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inquirer-3.3.0"
+      sources."inquirer-5.2.0"
+      sources."is-callable-1.1.3"
+      sources."is-date-object-1.0.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-path-cwd-1.0.0"
       sources."is-path-in-cwd-1.0.1"
       sources."is-path-inside-1.0.1"
       sources."is-promise-2.1.0"
+      sources."is-regex-1.0.4"
       sources."is-resolvable-1.1.0"
-      sources."isarray-1.0.0"
+      sources."is-symbol-1.0.1"
       sources."isexe-2.0.0"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.11.0"
-      sources."json-schema-traverse-0.3.1"
+      sources."js-yaml-3.12.0"
+      sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.10"
-      sources."lru-cache-4.1.3"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -33858,31 +33767,31 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."natural-compare-1.4.0"
+      sources."nice-try-1.0.4"
       sources."object-assign-4.1.1"
+      sources."object-keys-1.0.12"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."optionator-0.8.2"
       sources."os-tmpdir-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."pluralize-7.0.0"
       sources."prelude-ls-1.1.2"
-      sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
-      sources."pseudomap-1.0.2"
-      sources."readable-stream-2.3.6"
+      sources."punycode-2.1.1"
+      sources."regexp.prototype.flags-1.2.0"
       sources."regexpp-1.1.0"
       sources."require-uncached-1.0.3"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.2"
+      sources."rxjs-5.5.11"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."shebang-command-1.2.0"
@@ -33891,7 +33800,7 @@ in
       sources."slice-ansi-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
-      sources."string_decoder-1.1.1"
+      sources."string.prototype.matchall-2.0.0"
       (sources."strip-ansi-4.0.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -33899,18 +33808,17 @@ in
       })
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
-      sources."table-4.0.2"
+      sources."symbol-observable-1.0.1"
+      sources."table-4.0.3"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."type-check-0.3.2"
-      sources."typedarray-0.0.6"
-      sources."util-deprecate-1.0.2"
-      sources."which-1.3.0"
+      sources."uri-js-4.2.2"
+      sources."which-1.3.1"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
       sources."write-0.2.1"
-      sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -33924,20 +33832,16 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "5.3.1";
+    version = "6.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.1.tgz";
-      sha512 = "0xcqrxpj24cns2rq91k2k2khr96129p7ncyjx4bda77dy0nkwn53lv6dhjbr0nq1bm6f13p0as4jkqcf3j4lygd7z1l2mbi829xyglw";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.0.tgz";
+      sha512 = "NRn6C7G0HzA2hEFlLzD+M/m1eIeTtmxxO45n7Pp+Nk/gBp8mfIXlE8wSLdePt/g0Sl7BhuU/hY/E+kD/8P5LeQ==";
     };
     dependencies = [
-      sources."acorn-5.5.3"
-      (sources."acorn-jsx-3.0.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
-      sources."ajv-5.5.2"
-      sources."ajv-keywords-2.1.1"
+      sources."acorn-5.7.1"
+      sources."acorn-jsx-4.1.1"
+      sources."ajv-6.5.2"
+      sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -33945,15 +33849,9 @@ in
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."arrify-1.0.1"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."babel-code-frame-6.26.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.0.0"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
       (sources."chalk-1.1.3" // {
@@ -33965,75 +33863,85 @@ in
       sources."circular-json-0.3.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."co-4.6.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."core-util-is-1.0.2"
-      sources."cross-spawn-5.1.0"
+      sources."cross-spawn-6.0.5"
       sources."debug-3.1.0"
       sources."deep-is-0.1.3"
+      sources."define-properties-1.1.2"
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
+      sources."es-abstract-1.12.0"
+      sources."es-to-primitive-1.1.1"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-4.19.1" // {
+      (sources."eslint-5.0.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          (sources."chalk-2.4.1" // {
-            dependencies = [
-              sources."supports-color-5.4.0"
-            ];
-          })
+          sources."chalk-2.4.1"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-2.0.0"
+          sources."supports-color-5.4.0"
         ];
       })
-      sources."eslint-scope-3.7.1"
+      sources."eslint-scope-4.0.0"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-3.5.4"
+      sources."espree-4.0.0"
       sources."esprima-4.0.0"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."external-editor-2.2.0"
-      sources."fast-deep-equal-1.1.0"
+      sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."figures-2.0.0"
       sources."file-entry-cache-2.0.0"
       sources."flat-cache-1.3.0"
+      sources."foreach-2.0.5"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."globals-11.5.0"
+      sources."globals-11.7.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.0"
       sources."iconv-lite-0.4.23"
-      sources."ignore-3.3.8"
+      sources."ignore-3.3.10"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inquirer-3.3.0"
+      (sources."inquirer-5.2.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."strip-ansi-4.0.0"
+          sources."supports-color-5.4.0"
+        ];
+      })
+      sources."is-callable-1.1.3"
+      sources."is-date-object-1.0.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-path-cwd-1.0.0"
       sources."is-path-in-cwd-1.0.1"
       sources."is-path-inside-1.0.1"
       sources."is-promise-2.1.0"
+      sources."is-regex-1.0.4"
       sources."is-resolvable-1.1.0"
-      sources."isarray-1.0.0"
+      sources."is-symbol-1.0.1"
       sources."isexe-2.0.0"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.11.0"
-      sources."json-schema-traverse-0.3.1"
+      sources."js-yaml-3.12.0"
+      sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.10"
-      sources."lru-cache-4.1.3"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -34042,33 +33950,33 @@ in
       sources."mute-stream-0.0.7"
       sources."nanolru-1.0.0"
       sources."natural-compare-1.4.0"
+      sources."nice-try-1.0.4"
       sources."object-assign-4.1.1"
+      sources."object-keys-1.0.12"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."optionator-0.8.2"
       sources."os-tmpdir-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
       sources."path-parse-1.0.5"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."pluralize-7.0.0"
       sources."prelude-ls-1.1.2"
-      sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
-      sources."pseudomap-1.0.2"
-      sources."readable-stream-2.3.6"
+      sources."punycode-2.1.1"
+      sources."regexp.prototype.flags-1.2.0"
       sources."regexpp-1.1.0"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.2"
+      sources."rxjs-5.5.11"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."shebang-command-1.2.0"
@@ -34076,8 +33984,13 @@ in
       sources."signal-exit-3.0.2"
       sources."slice-ansi-1.0.0"
       sources."sprintf-js-1.0.3"
-      sources."string-width-2.1.1"
-      sources."string_decoder-1.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."string.prototype.matchall-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       (sources."supports-color-3.2.3" // {
@@ -34085,18 +33998,23 @@ in
           sources."has-flag-1.0.0"
         ];
       })
-      sources."table-4.0.2"
+      sources."symbol-observable-1.0.1"
+      (sources."table-4.0.3" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."type-check-0.3.2"
-      sources."typedarray-0.0.6"
-      sources."util-deprecate-1.0.2"
-      sources."which-1.3.0"
+      sources."uri-js-4.2.2"
+      sources."which-1.3.1"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
       sources."write-0.2.1"
-      sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -34110,10 +34028,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "3.1.4";
+    version = "3.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.4.tgz";
-      sha1 = "828767fbbe2ffd4fa75ebeeba9873e83643d6664";
+      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.6.tgz";
+      sha1 = "ab09c530c3a5165986b7db1909f349a4a6106b50";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -34142,8 +34060,8 @@ in
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."buffer-from-1.1.0"
       sources."builtin-modules-1.1.1"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
@@ -34152,28 +34070,23 @@ in
       sources."cli-cursor-1.0.2"
       sources."cli-spinners-1.3.1"
       sources."co-4.6.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.2"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."currently-unhandled-0.4.1"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."es6-promise-4.2.4"
       sources."escape-string-regexp-1.0.5"
       sources."exit-hook-1.1.1"
       sources."extend-3.0.1"
-      sources."extract-zip-1.6.6"
+      sources."extract-zip-1.6.7"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
@@ -34190,9 +34103,7 @@ in
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hasha-2.2.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."http-signature-1.2.0"
       sources."indent-string-2.1.0"
       sources."inherits-2.0.3"
@@ -34214,7 +34125,13 @@ in
       sources."kew-0.7.0"
       sources."klaw-1.3.1"
       sources."load-json-file-1.1.0"
-      sources."log-symbols-2.2.0"
+      (sources."log-symbols-2.2.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
       sources."log-update-1.0.2"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
@@ -34223,7 +34140,11 @@ in
       sources."mime-types-2.1.18"
       sources."mimic-fn-1.2.0"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."mkpath-1.0.0"
       sources."ms-2.0.0"
       sources."node-phantom-simple-2.2.4"
@@ -34248,11 +34169,7 @@ in
       sources."path-type-1.1.0"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
-      (sources."phantomjs-prebuilt-2.1.16" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."phantomjs-prebuilt-2.1.16"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -34266,18 +34183,18 @@ in
       sources."readable-stream-2.3.6"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."request-progress-2.0.1"
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
       sources."spdx-correct-3.0.0"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -34291,10 +34208,10 @@ in
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.3"
       sources."verror-1.10.0"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."yauzl-2.4.1"
       sources."zen-observable-0.5.2"
     ];
@@ -34351,12 +34268,13 @@ in
       sources."balanced-match-1.0.0"
       sources."binary-extensions-1.11.0"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
+      sources."braces-1.8.5"
+      (sources."broadway-0.3.6" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."cliff-0.1.9"
+          sources."winston-0.8.0"
         ];
       })
-      sources."broadway-0.3.6"
       sources."caller-0.0.1"
       sources."chokidar-1.7.0"
       (sources."cliff-0.1.10" // {
@@ -34372,7 +34290,11 @@ in
       sources."deep-equal-0.1.2"
       sources."defined-0.0.0"
       sources."director-1.2.7"
-      sources."event-stream-0.5.3"
+      (sources."event-stream-0.5.3" // {
+        dependencies = [
+          sources."optimist-0.2.8"
+        ];
+      })
       sources."eventemitter2-0.4.14"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
@@ -34382,18 +34304,12 @@ in
       sources."fill-range-2.2.4"
       (sources."flatiron-0.4.3" // {
         dependencies = [
-          sources."cliff-0.1.9"
           sources."optimist-0.6.0"
-          sources."winston-0.8.0"
         ];
       })
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
-      (sources."forever-monitor-1.7.1" // {
-        dependencies = [
-          sources."optimist-0.2.8"
-        ];
-      })
+      sources."forever-monitor-1.7.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       sources."glob-7.1.2"
@@ -34424,7 +34340,11 @@ in
       sources."micromatch-2.3.11"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."mute-stream-0.0.7"
       sources."nan-2.10.0"
       (sources."nconf-0.6.9" // {
@@ -34446,7 +34366,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.2.5"
+          sources."colors-1.3.0"
           sources."minimist-1.2.0"
         ];
       })
@@ -34456,6 +34376,7 @@ in
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."read-1.0.7"
@@ -34478,11 +34399,7 @@ in
       sources."through-2.3.8"
       sources."timespan-2.3.0"
       sources."util-deprecate-1.0.2"
-      (sources."utile-0.2.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."utile-0.2.1"
       sources."winston-0.8.3"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
@@ -34502,17 +34419,17 @@ in
     version = "0.5.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz";
-      sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g";
+      sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA==";
     };
     dependencies = [
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."debug-3.1.0"
       sources."lodash-4.17.10"
       sources."lodash.groupby-4.6.0"
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.0.0"
-      sources."simple-git-1.92.0"
+      sources."simple-git-1.96.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -34530,7 +34447,7 @@ in
     version = "2.1.9";
     src = fetchurl {
       url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz";
-      sha512 = "3w5bg88z2wm9b01s7s1yy16dd1qhm44n7dg7anh0w6rigl6r81xmb9vl95imf6lnakwkrsnlw7rqr98c079m6kgribjvzfv9kbzax7r";
+      sha512 = "+XT110zb/S1XzG+amg5gKGWcD6dW58mnstS4GkuiO63aA8qGvpgNB9Cq89qxhFSIQ2smeB/00QGsVLn4CL1V+A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -34586,11 +34503,7 @@ in
     };
     dependencies = [
       sources."acorn-2.7.0"
-      (sources."acorn-globals-1.0.9" // {
-        dependencies = [
-          sources."acorn-2.7.0"
-        ];
-      })
+      sources."acorn-globals-1.0.9"
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
       sources."asap-1.0.0"
@@ -34602,7 +34515,11 @@ in
           sources."commander-2.8.1"
         ];
       })
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."coffee-script-1.12.7"
       sources."commander-2.6.0"
       sources."constantinople-3.0.2"
@@ -34613,15 +34530,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-promise-2.1.0"
-      (sources."jade-1.11.0" // {
-        dependencies = [
-          sources."acorn-1.2.2"
-          sources."is-promise-1.0.1"
-          sources."promise-2.0.0"
-          sources."source-map-0.1.43"
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."jade-1.11.0"
       sources."jstransformer-0.0.2"
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
@@ -34644,6 +34553,9 @@ in
       sources."source-map-0.4.4"
       (sources."transformers-2.1.0" // {
         dependencies = [
+          sources."is-promise-1.0.1"
+          sources."promise-2.0.0"
+          sources."source-map-0.1.43"
           sources."uglify-js-2.2.5"
         ];
       })
@@ -34656,7 +34568,11 @@ in
       sources."void-elements-2.0.1"
       sources."weak-map-1.0.5"
       sources."window-size-0.1.0"
-      sources."with-4.0.3"
+      (sources."with-4.0.3" // {
+        dependencies = [
+          sources."acorn-1.2.2"
+        ];
+      })
       sources."wordwrap-0.0.3"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
@@ -34697,21 +34613,14 @@ in
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
       sources."beeper-1.1.1"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
-          sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-3.2.2"
         ];
       })
       sources."cache-base-1.0.1"
@@ -34719,6 +34628,18 @@ in
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."clone-1.0.4"
@@ -34742,34 +34663,42 @@ in
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."expand-tilde-2.0.2"
       sources."extend-3.0.1"
-      sources."extend-shallow-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
         ];
       })
       sources."fancy-log-1.3.2"
-      sources."fill-range-4.0.0"
-      sources."find-index-0.1.1"
-      (sources."findup-sync-2.0.0" // {
+      (sources."fill-range-4.0.0" // {
         dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-0.1.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."extend-shallow-2.0.1"
         ];
       })
+      sources."find-index-0.1.1"
+      sources."findup-sync-2.0.0"
       sources."fined-1.1.0"
       sources."first-chunk-stream-1.0.0"
       sources."flagged-respawn-1.0.0"
@@ -34779,30 +34708,36 @@ in
       sources."gaze-0.5.2"
       sources."get-value-2.0.6"
       sources."glob-4.5.3"
-      sources."glob-stream-3.1.18"
-      (sources."glob-watcher-0.0.6" // {
+      (sources."glob-stream-3.1.18" // {
         dependencies = [
-          sources."graceful-fs-1.2.3"
+          sources."readable-stream-1.0.34"
+          sources."through2-0.6.5"
         ];
       })
+      sources."glob-watcher-0.0.6"
       sources."glob2base-0.0.12"
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
-      sources."globule-0.1.0"
-      sources."glogg-1.0.1"
-      sources."graceful-fs-3.0.11"
-      (sources."gulp-util-3.0.8" // {
+      (sources."globule-0.1.0" // {
         dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          sources."glob-3.1.21"
+          sources."graceful-fs-1.2.3"
+          sources."inherits-1.0.2"
+          sources."minimatch-0.2.14"
         ];
       })
+      sources."glogg-1.0.1"
+      sources."graceful-fs-3.0.11"
+      sources."gulp-util-3.0.8"
       sources."gulplog-1.0.0"
       sources."has-ansi-2.0.0"
       sources."has-gulplog-0.1.0"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."homedir-polyfill-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -34816,8 +34751,11 @@ in
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-glob-3.1.0"
-      sources."is-number-3.0.0"
-      sources."is-odd-2.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-plain-object-2.0.4"
       sources."is-relative-1.0.0"
       sources."is-unc-path-1.0.0"
@@ -34827,25 +34765,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."kind-of-6.0.2"
-      (sources."liftoff-2.5.0" // {
-        dependencies = [
-          sources."has-values-0.1.4"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-1.0.1"
-          sources."is-number-4.0.0"
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."liftoff-2.5.0"
       sources."lodash-1.0.2"
       sources."lodash._basecopy-3.0.1"
       sources."lodash._basetostring-3.0.1"
@@ -34867,32 +34787,37 @@ in
       sources."make-iterator-1.0.1"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
-      (sources."micromatch-3.1.10" // {
+      sources."micromatch-3.1.10"
+      sources."minimatch-2.0.10"
+      sources."minimist-1.2.0"
+      (sources."mixin-deep-1.3.1" // {
         dependencies = [
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."minimatch-2.0.10"
-      sources."minimist-1.2.0"
-      sources."mixin-deep-1.3.1"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
-      sources."nanomatch-1.2.9"
-      sources."natives-1.1.3"
+      sources."nanomatch-1.2.13"
+      sources."natives-1.1.4"
       sources."object-assign-3.0.0"
-      sources."object-copy-0.1.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."object-visit-1.0.1"
       sources."object.defaults-1.1.0"
       sources."object.map-1.0.1"
@@ -34916,7 +34841,7 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."replace-ext-0.0.1"
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -34924,23 +34849,33 @@ in
       sources."safe-regex-1.1.0"
       sources."semver-4.3.6"
       sources."sequencify-0.0.7"
-      sources."set-value-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."sigmund-1.0.1"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."is-extendable-0.1.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."define-property-1.0.0"
         ];
       })
       (sources."snapdragon-util-3.0.1" // {
@@ -34952,26 +34887,49 @@ in
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."sparkles-1.0.1"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."static-extend-0.1.2"
       sources."stream-consume-0.1.1"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-1.0.0"
       sources."supports-color-2.0.0"
-      sources."through2-2.0.3"
+      (sources."through2-2.0.3" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."tildify-1.2.0"
       sources."time-stamp-1.1.0"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."unc-path-regex-0.1.2"
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -34983,14 +34941,12 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
+          sources."isarray-1.0.0"
         ];
       })
       sources."urix-0.1.0"
-      (sources."use-3.1.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."use-3.1.0"
       sources."user-home-1.1.1"
       sources."util-deprecate-1.0.2"
       sources."v8flags-2.1.1"
@@ -34998,20 +34954,12 @@ in
       (sources."vinyl-fs-0.3.14" // {
         dependencies = [
           sources."clone-0.2.0"
-          sources."glob-3.1.21"
-          sources."inherits-1.0.2"
-          sources."minimatch-0.2.14"
-          sources."minimist-0.0.8"
           sources."readable-stream-1.0.34"
-          (sources."through2-0.6.5" // {
-            dependencies = [
-              sources."inherits-2.0.3"
-            ];
-          })
+          sources."through2-0.6.5"
           sources."vinyl-0.4.6"
         ];
       })
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -35062,6 +35010,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."cli-0.6.6" // {
         dependencies = [
+          sources."glob-3.2.11"
           sources."minimatch-0.3.0"
         ];
       })
@@ -35075,15 +35024,12 @@ in
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
         ];
       })
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      (sources."domutils-1.5.1" // {
-        dependencies = [
-          sources."entities-1.1.1"
-        ];
-      })
+      sources."domutils-1.5.1"
       sources."entities-1.0.0"
       sources."exit-0.1.2"
       sources."glob-5.0.15"
@@ -35098,7 +35044,6 @@ in
       sources."isarray-0.0.1"
       (sources."jshint-2.8.0" // {
         dependencies = [
-          sources."glob-3.2.11"
           sources."minimatch-2.0.10"
         ];
       })
@@ -35129,10 +35074,10 @@ in
   html-minifier = nodeEnv.buildNodePackage {
     name = "html-minifier";
     packageName = "html-minifier";
-    version = "3.5.15";
+    version = "3.5.17";
     src = fetchurl {
-      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz";
-      sha512 = "01ni8s31nr1rb70wqi980nyfwir4z2z5mjvs454rgylns4nfyqvci581b40s1b67hgd95anq46j4yf5r947y5wzvncr7dgsysnvi5ir";
+      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.17.tgz";
+      sha512 = "O+StuKL0UWfwX5Zv4rFxd60DPcT5DVjGq1AlnP6VQ8wzudft/W4hx5Wl98aSYNwFBHY6XWJreRw/BehX4l+diQ==";
     };
     dependencies = [
       sources."camel-case-3.0.0"
@@ -35144,7 +35089,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.5.7"
-      (sources."uglify-js-3.3.25" // {
+      (sources."uglify-js-3.4.2" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -35166,31 +35111,11 @@ in
     version = "3.20.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/ionic/-/ionic-3.20.0.tgz";
-      sha512 = "2a051r5s0p9ihcahqysmbjklhivms8rlv5zxxi7bqrxa3x8sqqpyhbjpl7z5k4263vmfkqj3qmzciz6kbyivgk3arz22jqfqsxczqn9";
+      sha512 = "yeLPusYOSyF+VmO+Hf2a5kf2Kx4ST1f3MILM8g+9ckF/MdaoD9UzXif2/sumGem6I6RTrqo9horBmC7QJYcClA==";
     };
     dependencies = [
       sources."@ionic/cli-framework-0.1.3"
-      (sources."@ionic/cli-utils-1.19.2" // {
-        dependencies = [
-          sources."bytes-1.0.0"
-          sources."debug-2.6.9"
-          sources."iconv-lite-0.4.19"
-          sources."is-extglob-2.1.1"
-          sources."is-glob-3.1.0"
-          sources."mime-1.4.1"
-          sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
-          sources."safe-buffer-5.1.1"
-          sources."statuses-1.4.0"
-          sources."string_decoder-0.10.31"
-          sources."yallist-3.0.2"
-        ];
-      })
+      sources."@ionic/cli-utils-1.19.2"
       sources."@ionic/discover-0.4.0"
       sources."accepts-1.3.5"
       sources."ansi-escapes-3.1.0"
@@ -35203,7 +35128,7 @@ in
       sources."arr-flatten-1.1.0"
       sources."array-flatten-1.1.1"
       sources."array-unique-0.2.1"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."async-each-1.0.1"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
@@ -35211,18 +35136,24 @@ in
       sources."basic-auth-1.1.0"
       sources."binary-extensions-1.11.0"
       sources."bl-1.2.2"
-      sources."body-5.1.0"
-      sources."body-parser-1.18.3"
-      sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
+      (sources."body-5.1.0" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."bytes-1.0.0"
+          sources."raw-body-1.1.7"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      (sources."body-parser-1.18.3" // {
+        dependencies = [
+          sources."debug-2.6.9"
         ];
       })
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
-      sources."buffer-fill-0.1.1"
+      sources."buffer-fill-1.0.0"
       sources."bytes-3.0.0"
       sources."chalk-2.4.1"
       sources."chardet-0.4.2"
@@ -35231,8 +35162,8 @@ in
       sources."ci-info-1.1.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
       sources."component-emitter-1.2.1"
       sources."compress-commons-1.2.2"
@@ -35242,7 +35173,7 @@ in
       sources."continuable-cache-0.3.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."cookiejar-2.1.1"
+      sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
       sources."crc-3.5.0"
       sources."crc32-stream-2.0.0"
@@ -35266,11 +35197,19 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
         dependencies = [
-          (sources."body-parser-1.18.2" // {
+          sources."body-parser-1.18.2"
+          sources."debug-2.6.9"
+          (sources."http-errors-1.6.2" // {
             dependencies = [
+              sources."depd-1.1.1"
               sources."setprototypeof-1.0.3"
             ];
           })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          sources."raw-body-2.3.2"
+          sources."safe-buffer-5.1.1"
+          sources."statuses-1.4.0"
         ];
       })
       sources."extend-3.0.1"
@@ -35280,8 +35219,13 @@ in
       sources."figures-2.0.0"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
-      sources."finalhandler-1.1.1"
-      sources."follow-redirects-1.4.1"
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."statuses-1.4.0"
+        ];
+      })
+      sources."follow-redirects-1.5.0"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."form-data-2.3.2"
@@ -35298,11 +35242,12 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."http-errors-1.6.3"
-      sources."http-parser-js-0.4.12"
+      sources."http-parser-js-0.4.13"
       sources."http-proxy-1.17.0"
       (sources."http-proxy-middleware-0.17.4" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."is-extglob-2.1.1"
+          sources."is-glob-3.1.0"
         ];
       })
       sources."iconv-lite-0.4.23"
@@ -35328,7 +35273,11 @@ in
       sources."isobject-2.1.0"
       sources."kind-of-3.2.2"
       sources."lazystream-1.0.0"
-      sources."leek-0.0.24"
+      (sources."leek-0.0.24" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."livereload-js-2.3.0"
       sources."lodash-4.17.10"
       sources."lodash._baseassign-3.2.0"
@@ -35355,9 +35304,17 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.3.0"
+      (sources."minipass-2.3.3" // {
+        dependencies = [
+          sources."yallist-3.0.2"
+        ];
+      })
       sources."minizlib-1.1.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.10.0"
@@ -35385,6 +35342,7 @@ in
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."range-parser-1.2.0"
@@ -35407,7 +35365,13 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
-      sources."send-0.16.2"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."mime-1.4.1"
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.1.0"
@@ -35423,34 +35387,28 @@ in
       sources."strip-ansi-4.0.0"
       sources."superagent-3.8.3"
       sources."supports-color-5.4.0"
-      (sources."tar-4.4.2" // {
+      (sources."tar-4.4.4" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."safe-buffer-5.1.2"
+          sources."yallist-3.0.2"
         ];
       })
       sources."tar-stream-1.6.1"
       sources."through-2.3.8"
-      (sources."tiny-lr-1.1.1" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."raw-body-1.1.7"
-        ];
-      })
+      sources."tiny-lr-1.1.1"
       sources."tmp-0.0.33"
       sources."to-buffer-1.1.1"
-      sources."tslib-1.9.1"
+      sources."tslib-1.9.3"
       sources."type-is-1.6.16"
       sources."ultron-1.1.1"
       sources."unpipe-1.0.0"
-      sources."untildify-3.0.2"
+      sources."untildify-3.0.3"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."websocket-driver-0.7.0"
       sources."websocket-extensions-0.1.3"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."win-release-1.1.1"
       sources."wrap-ansi-3.0.1"
       sources."wrappy-1.0.2"
@@ -35503,7 +35461,11 @@ in
       sources."brace-expansion-1.1.11"
       sources."camelcase-1.2.1"
       sources."center-align-0.1.3"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."concat-map-0.0.1"
       sources."decamelize-1.2.0"
       sources."deep-is-0.1.3"
@@ -35516,7 +35478,6 @@ in
       (sources."handlebars-4.0.11" // {
         dependencies = [
           sources."source-map-0.4.4"
-          sources."wordwrap-0.0.3"
         ];
       })
       sources."has-flag-1.0.0"
@@ -35524,7 +35485,7 @@ in
       sources."inherits-2.0.3"
       sources."is-buffer-1.1.6"
       sources."isexe-2.0.0"
-      (sources."js-yaml-3.11.0" // {
+      (sources."js-yaml-3.12.0" // {
         dependencies = [
           sources."esprima-4.0.0"
         ];
@@ -35542,7 +35503,11 @@ in
       })
       sources."nopt-3.0.6"
       sources."once-1.4.0"
-      sources."optimist-0.6.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."wordwrap-0.0.3"
+        ];
+      })
       sources."optionator-0.8.2"
       sources."path-is-absolute-1.0.1"
       sources."prelude-ls-1.1.2"
@@ -35556,11 +35521,10 @@ in
       (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."source-map-0.5.7"
-          sources."wordwrap-0.0.2"
         ];
       })
       sources."uglify-to-browserify-1.0.2"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."window-size-0.1.0"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
@@ -35581,7 +35545,7 @@ in
     version = "0.4.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/imapnotify/-/imapnotify-0.4.1.tgz";
-      sha512 = "0fn58ydrck0mwpq48pj2in6aql522avzyabrddq4ixykr1h29ha3cvh1v0mga8ghg1v9zpkii81qqac74qwm9ikr1kll616fcz0cc0s";
+      sha512 = "GjAGPnMmGEpnyDOmyjE5TGEcUIzz/rTDgw+pV8EOcLOhYBIw5Ol7JLi1vJT/WwlRKFbGRiEvIvjyCibLzaNiHQ==";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -35592,7 +35556,7 @@ in
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
-      sources."dtrace-provider-0.8.6"
+      sources."dtrace-provider-0.8.7"
       sources."eyes-0.1.8"
       sources."glob-6.0.4"
       sources."imap-0.8.19"
@@ -35607,7 +35571,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.22.1"
+      sources."moment-2.22.2"
       sources."mv-2.1.1"
       sources."nan-2.10.0"
       sources."ncp-2.0.0"
@@ -35618,7 +35582,7 @@ in
       sources."printf-0.2.5"
       sources."readable-stream-1.1.14"
       sources."rimraf-2.4.5"
-      sources."safe-json-stringify-1.1.0"
+      sources."safe-json-stringify-1.2.0"
       sources."semver-5.3.0"
       sources."stack-trace-0.0.10"
       sources."string_decoder-0.10.31"
@@ -35640,10 +35604,10 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.9.0";
+    version = "2.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.0.tgz";
-      sha512 = "2j3dppwmpx29w1xxj6pmi1ddyc0v9y6dlw42nr1in2c7qddalh3axqx7b6p21qy5j0gf43wdaxfknk7klr5zyr0flcx552g5asxx7dk";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz";
+      sha512 = "y8IOlo8Ml/CFuvr8pFdaMpNV43W5eZhTl5UZuRxKGxX08PSi3OZsYjr5gMYsKT5ZzMNk/U+MqZXJNh6Ccm30hQ==";
     };
     dependencies = [
       sources."ansi-color-0.2.1"
@@ -35657,9 +35621,9 @@ in
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.4.1"
       sources."check-error-1.0.2"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."commander-2.15.1"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."deep-eql-3.0.1"
       sources."deep-equal-1.0.1"
@@ -35689,7 +35653,7 @@ in
       sources."opentracing-0.14.3"
       sources."path-is-absolute-1.0.1"
       sources."pathval-1.1.0"
-      sources."rxjs-5.5.10"
+      sources."rxjs-5.5.11"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."string-template-0.2.1"
@@ -35701,15 +35665,10 @@ in
       sources."type-detect-4.0.8"
       sources."typescript-2.8.3"
       sources."vscode-jsonrpc-3.6.2"
-      (sources."vscode-languageserver-3.5.1" // {
-        dependencies = [
-          sources."vscode-jsonrpc-3.5.0"
-          sources."vscode-languageserver-types-3.5.0"
-        ];
-      })
-      sources."vscode-languageserver-protocol-3.5.1"
-      sources."vscode-languageserver-types-3.7.2"
-      sources."vscode-uri-1.0.3"
+      sources."vscode-languageserver-4.2.1"
+      sources."vscode-languageserver-protocol-3.8.1"
+      sources."vscode-languageserver-types-3.8.2"
+      sources."vscode-uri-1.0.5"
       sources."wrappy-1.0.2"
       sources."xorshift-0.2.1"
       sources."xtend-4.0.1"
@@ -35729,7 +35688,7 @@ in
     version = "0.3.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz";
-      sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh";
+      sha512 = "UHLk2ya7ItaLjmMVJWGE9b5t7jD3DZfmURdmz+rOVSiSYnrCtgcxvNXuQavcK7bhUBlXFmrXwRAPXkCMDxxANg==";
     };
     dependencies = [
       sources."when-3.4.6"
@@ -35749,16 +35708,12 @@ in
     version = "3.5.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz";
-      sha512 = "29bn095czjx533yyfcdg0ah2wfm3iyz4sckld2yzqfimzzq2h3jlgaax0mab6wjgrc4bl75yni4c6b27zzazwkcs678aly0jkml3z78";
+      sha512 = "6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==";
     };
     dependencies = [
       sources."babylon-7.0.0-beta.19"
       sources."bluebird-3.5.1"
-      (sources."catharsis-0.8.9" // {
-        dependencies = [
-          sources."underscore-1.6.0"
-        ];
-      })
+      sources."catharsis-0.8.9"
       sources."escape-string-regexp-1.0.5"
       sources."graceful-fs-4.1.11"
       sources."js2xmlparser-3.0.0"
@@ -35774,7 +35729,11 @@ in
       sources."strip-json-comments-2.0.1"
       sources."taffydb-2.6.2"
       sources."underscore-1.8.3"
-      sources."underscore-contrib-0.3.0"
+      (sources."underscore-contrib-0.3.0" // {
+        dependencies = [
+          sources."underscore-1.6.0"
+        ];
+      })
       sources."xmlcreate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -35805,15 +35764,12 @@ in
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
         ];
       })
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      (sources."domutils-1.5.1" // {
-        dependencies = [
-          sources."entities-1.1.1"
-        ];
-      })
+      sources."domutils-1.5.1"
       sources."entities-1.0.0"
       sources."exit-0.1.2"
       sources."fs.realpath-1.0.0"
@@ -35863,12 +35819,12 @@ in
     version = "1.7.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz";
-      sha512 = "0x3s0bbw8f5d2i5jb08bd2dsxnf7w38fp7fj652cvp558b45mxyvy42zmghrmlyrmbk5d84d8maw4pqq3228jq0l7hkxb4fl415zs7l";
+      sha512 = "9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
       sources."bluebird-3.5.1"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."config-chain-1.1.11"
       sources."editorconfig-0.13.3"
       sources."ini-1.3.5"
@@ -35896,7 +35852,7 @@ in
     version = "1.6.3";
     src = fetchurl {
       url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz";
-      sha512 = "3f6z8yv4rp9mhcdbmvrmlvk8gdf05qbvn5fk60yq1cvjn00wsvs5i2k7p1bik8kvidsx44kv7r195asnbr8dfi04czhbvpy6crm7icc";
+      sha512 = "jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==";
     };
     dependencies = [
       sources."JSV-4.0.2"
@@ -35937,7 +35893,7 @@ in
     version = "0.5.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz";
-      sha512 = "03nqzpjpb0422fm5k7prlfcyb7wbs7dq7arwzq0za8zq3jy4wvbjjsbm25vr8ar5y6y87k9y1iqyc018zfysh2b675ql3qx6jjimfip";
+      sha512 = "N7oapTQdD4rLMUtA7d1HATCPY/BpHuSNL1mhvIuoS0u5NideDvyR+gB/ntXB7ejFz/LM0XzPLNUJQcC68n5sBw==";
     };
     dependencies = [
       sources."cli-color-0.1.7"
@@ -35961,7 +35917,7 @@ in
     version = "3.0.4";
     src = fetchurl {
       url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz";
-      sha512 = "1mbi99gcdrhmkr4nfhfdhwbk2ag55gajxdvzb6m1bddwdwnwn167xx12nypvbs6l0r90k9qrnwmbcbswdm18982b7a7mva27pkc2nah";
+      sha512 = "UFnB5j1C7XrUWQIlFGrjerFVuc04TZAyoEavfb0VofdjguWWN97aCtWsv1uX6pXylJiLw+agsyTPCnNjL6W4ag==";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -35969,7 +35925,7 @@ in
       sources."combined-stream-1.0.6"
       sources."commander-2.11.0"
       sources."component-emitter-1.2.1"
-      sources."cookiejar-2.1.1"
+      sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
       sources."debug-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -35980,7 +35936,7 @@ in
       sources."graphlib-2.1.5"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."lodash-4.17.10"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
@@ -35990,7 +35946,7 @@ in
       sources."native-promise-only-0.8.1"
       sources."path-loader-1.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."punycode-2.1.0"
+      sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
@@ -36013,10 +35969,10 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.12.2";
+    version = "0.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.2.tgz";
-      sha512 = "3dqw05mkw5k42zdpjhg3cjiq7bfh8x1zxllrwyz0jgwmd4p79079fhsiifazqa5is659lzdnmiyiabxy62jjjk55xa296rdhyajc2vm";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz";
+      sha512 = "8RVRAb1TO6LlCny6+8GC+sXDsESYv7gv7fSLdVANklVt866I416/7Z5fdqrtzSru92nyreddgavbEk8pjqcWoA==";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -36031,9 +35987,8 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."basic-auth-2.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."body-parser-1.18.3"
-      sources."boom-4.3.1"
       sources."boxen-1.3.0"
       sources."bytes-3.0.0"
       sources."camelcase-4.1.0"
@@ -36045,10 +36000,14 @@ in
       sources."cliui-4.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."compressible-2.0.13"
+      (sources."compressible-2.0.14" // {
+        dependencies = [
+          sources."mime-db-1.34.0"
+        ];
+      })
       sources."compression-1.7.2"
       sources."configstore-3.1.2"
       sources."connect-pause-0.1.1"
@@ -36060,16 +36019,11 @@ in
       sources."cors-2.8.4"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."crypto-random-string-1.0.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
@@ -36085,19 +36039,16 @@ in
       sources."execa-0.7.0"
       (sources."express-4.16.3" // {
         dependencies = [
-          (sources."body-parser-1.18.2" // {
+          sources."body-parser-1.18.2"
+          (sources."http-errors-1.6.2" // {
             dependencies = [
+              sources."depd-1.1.1"
               sources."setprototypeof-1.0.3"
             ];
           })
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
+          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
@@ -36110,7 +36061,11 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."finalhandler-1.1.1"
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."find-up-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
@@ -36125,8 +36080,6 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-flag-3.0.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.23"
@@ -36178,7 +36131,7 @@ in
       sources."minimist-1.2.0"
       sources."morgan-1.9.0"
       sources."ms-2.0.0"
-      sources."nanoid-1.0.2"
+      sources."nanoid-1.0.4"
       sources."negotiator-0.6.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -36188,7 +36141,7 @@ in
       sources."on-headers-1.0.1"
       sources."os-locale-2.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
       sources."package-json-4.0.1"
@@ -36208,10 +36161,10 @@ in
       sources."qs-6.5.2"
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.3"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."safe-buffer-5.1.1"
@@ -36219,7 +36172,11 @@ in
       sources."semver-5.5.0"
       sources."semver-compare-1.0.0"
       sources."semver-diff-2.1.0"
-      sources."send-0.16.2"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."serve-static-1.13.2"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
@@ -36227,8 +36184,7 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.5.0"
       sources."steno-0.4.4"
       sources."string-width-2.1.1"
@@ -36248,14 +36204,16 @@ in
       sources."update-notifier-2.5.0"
       sources."url-parse-lax-1.0.0"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."widest-line-2.0.0"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
           sources."string-width-1.0.2"
           sources."strip-ansi-3.0.1"
         ];
@@ -36264,12 +36222,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."y18n-3.2.1"
       sources."yallist-2.1.2"
-      (sources."yargs-10.1.2" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
+      sources."yargs-10.1.2"
       sources."yargs-parser-8.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -36284,10 +36237,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.11.0";
+    version = "3.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
-      sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
+      sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -36306,10 +36259,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "2.0.2";
+    version = "2.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz";
-      sha1 = "4d2db9402850a66551fa784b0164fb0824ed8c4b";
+      url = "https://registry.npmjs.org/karma/-/karma-2.0.4.tgz";
+      sha512 = "32yhTwoi6BZgJZhR78GwhzyFABbYG/1WwQqYgY7Vh96Demvua2jM3+FyRltIMTUH/Kd5xaQvDw2L7jTvkYFeXg==";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -36319,87 +36272,118 @@ in
       sources."ajv-5.5.2"
       (sources."amqplib-0.5.2" // {
         dependencies = [
+          sources."isarray-0.0.1"
           sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
-      sources."anymatch-1.3.2"
-      sources."arr-diff-2.0.0"
+      sources."anymatch-2.0.0"
+      sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-slice-0.2.3"
-      sources."array-unique-0.2.1"
+      sources."array-unique-0.3.2"
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
-      sources."ast-types-0.11.3"
-      sources."async-2.6.0"
+      sources."assign-symbols-1.0.0"
+      sources."ast-types-0.11.5"
+      sources."async-2.6.1"
       sources."async-each-1.0.1"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
+      sources."atob-2.1.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       (sources."axios-0.15.3" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."follow-redirects-1.0.0"
         ];
       })
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
       sources."base64-arraybuffer-0.1.5"
       sources."base64id-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.11.0"
       sources."bitsyntax-0.0.4"
-      sources."bl-1.1.2"
+      (sources."bl-1.1.2" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+          sources."readable-stream-2.0.6"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."blob-0.0.4"
       sources."bluebird-3.5.1"
       sources."body-parser-1.18.3"
-      sources."boom-4.3.1"
+      sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
+      (sources."braces-2.3.2" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
       sources."buffer-more-ints-0.0.2"
       sources."buildmail-4.0.1"
       sources."bytes-3.0.0"
+      sources."cache-base-1.0.1"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-1.1.3"
-      sources."chokidar-1.7.0"
+      sources."chokidar-2.0.4"
       sources."circular-json-0.5.4"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."co-4.6.0"
-      sources."colors-1.2.5"
+      sources."collection-visit-1.0.0"
+      sources."colors-1.3.0"
       sources."combine-lists-1.0.1"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      (sources."connect-3.6.6" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."connect-3.6.6"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
-      sources."core-js-2.5.6"
+      sources."copy-descriptor-0.1.1"
+      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
+      sources."cryptiles-2.0.5"
       sources."custom-event-1.0.1"
       sources."dashdash-1.14.1"
       sources."data-uri-to-buffer-1.2.0"
       sources."date-format-1.2.0"
       sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
       sources."deep-is-0.1.3"
+      sources."define-property-2.0.2"
       sources."degenerator-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
@@ -36425,98 +36409,159 @@ in
       sources."es6-promisify-5.0.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.9.1"
+      sources."escodegen-1.10.0"
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."eventemitter3-3.1.0"
       (sources."expand-braces-0.1.2" // {
         dependencies = [
+          sources."array-unique-0.2.1"
           sources."braces-0.1.5"
-          sources."expand-range-0.1.1"
+        ];
+      })
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."expand-range-0.1.1" // {
+        dependencies = [
           sources."is-number-0.1.1"
           sources."repeat-string-0.2.2"
         ];
       })
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
       sources."extend-3.0.1"
-      sources."extglob-0.3.2"
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."file-uri-to-path-1.0.0"
-      sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.4"
-      sources."finalhandler-1.1.0"
-      sources."follow-redirects-1.4.1"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      (sources."finalhandler-1.1.0" // {
+        dependencies = [
+          sources."statuses-1.3.1"
+        ];
+      })
+      (sources."follow-redirects-1.5.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
+      sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       (sources."ftp-0.3.10" // {
         dependencies = [
+          sources."isarray-0.0.1"
           sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      (sources."get-uri-2.0.2" // {
+      sources."get-uri-2.0.2"
+      sources."get-value-2.0.6"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.2"
+      (sources."glob-parent-3.1.0" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."is-glob-3.1.0"
         ];
       })
-      sources."getpass-0.1.7"
-      sources."glob-7.1.2"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-ansi-2.0.0"
-      sources."has-binary2-1.0.3"
+      (sources."has-binary2-1.0.3" // {
+        dependencies = [
+          sources."isarray-2.0.1"
+        ];
+      })
       sources."has-cors-1.1.0"
-      sources."hawk-6.0.2"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."hawk-3.1.3"
       sources."hipchat-notifier-1.1.0"
-      sources."hoek-4.2.1"
+      sources."hoek-2.16.3"
       sources."http-errors-1.6.3"
-      (sources."http-proxy-1.17.0" // {
+      sources."http-proxy-1.17.0"
+      (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
       })
-      sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
       sources."httpntlm-1.6.1"
       sources."httpreq-0.4.24"
-      sources."https-proxy-agent-2.2.1"
+      (sources."https-proxy-agent-2.2.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."iconv-lite-0.4.23"
       sources."indexof-0.0.1"
       sources."inflection-1.12.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ip-1.1.5"
+      sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-glob-2.0.1"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.0"
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.17.2"
-      sources."is-number-2.1.0"
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-plain-object-2.0.4"
       sources."is-property-1.0.2"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isbinaryfile-3.0.2"
-      sources."isobject-2.1.0"
+      sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
@@ -36524,61 +36569,64 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonpointer-4.0.1"
       sources."jsprim-1.4.1"
-      sources."kind-of-3.2.2"
+      sources."kind-of-6.0.2"
       sources."levn-0.3.0"
       sources."libbase64-0.1.0"
-      sources."libmime-3.0.0"
+      (sources."libmime-3.0.0" // {
+        dependencies = [
+          sources."iconv-lite-0.4.15"
+        ];
+      })
       sources."libqp-1.1.0"
       sources."lodash-4.17.10"
-      (sources."log4js-2.6.1" // {
+      sources."lodash.debounce-4.0.8"
+      (sources."log4js-2.10.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."loggly-1.1.1" // {
         dependencies = [
           sources."assert-plus-0.2.0"
           sources."aws-sign2-0.6.0"
-          sources."boom-2.10.1"
           sources."caseless-0.11.0"
-          sources."cryptiles-2.0.5"
-          sources."debug-3.1.0"
-          sources."follow-redirects-1.0.0"
           sources."form-data-2.0.0"
           sources."har-validator-2.0.6"
-          sources."hawk-3.1.3"
-          sources."hoek-2.16.3"
           sources."http-signature-1.1.1"
-          sources."iconv-lite-0.4.15"
-          sources."isarray-0.0.1"
-          sources."process-nextick-args-1.0.7"
           sources."qs-6.2.3"
-          sources."readable-stream-2.0.6"
           sources."request-2.75.0"
-          sources."sntp-1.0.9"
-          sources."socks-1.1.9"
-          sources."string_decoder-0.10.31"
           sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."loggly-1.1.1"
       sources."lru-cache-4.1.3"
       sources."mailcomposer-4.0.1"
-      (sources."mailgun-js-0.18.0" // {
+      (sources."mailgun-js-0.18.1" // {
         dependencies = [
-          sources."form-data-2.3.2"
+          sources."debug-3.1.0"
         ];
       })
-      sources."math-random-1.0.1"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
       sources."media-typer-0.3.0"
-      sources."micromatch-2.3.11"
+      sources."micromatch-3.1.10"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
+      sources."mixin-deep-1.3.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."nan-2.10.0"
+      sources."nanomatch-1.2.13"
       sources."negotiator-0.6.1"
       sources."netmask-1.0.6"
       sources."node-uuid-1.4.8"
-      sources."nodemailer-2.7.2"
+      (sources."nodemailer-2.7.2" // {
+        dependencies = [
+          sources."socks-1.1.9"
+        ];
+      })
       sources."nodemailer-direct-transport-3.3.2"
       sources."nodemailer-fetch-1.6.0"
       sources."nodemailer-shared-1.1.0"
@@ -36588,7 +36636,21 @@ in
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.8.2"
       sources."object-component-0.0.3"
-      sources."object.omit-2.0.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       (sources."optimist-0.6.1" // {
@@ -36598,12 +36660,17 @@ in
       })
       sources."optionator-0.8.2"
       sources."os-tmpdir-1.0.2"
-      sources."pac-proxy-agent-2.0.2"
+      (sources."pac-proxy-agent-2.0.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."pac-resolver-3.0.0"
-      sources."parse-glob-3.0.4"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.2"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       (sources."path-proxy-1.0.0" // {
         dependencies = [
@@ -36613,21 +36680,20 @@ in
       sources."performance-now-2.1.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
+      sources."posix-character-classes-0.1.1"
       sources."prelude-ls-1.1.2"
-      sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."promisify-call-2.0.4"
-      sources."proxy-agent-3.0.0"
+      (sources."proxy-agent-3.0.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
       sources."qjobs-1.2.0"
       sources."qs-6.5.2"
-      (sources."randomatic-3.0.0" // {
-        dependencies = [
-          sources."is-number-4.0.0"
-        ];
-      })
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.3"
       sources."readable-stream-2.3.6"
@@ -36635,41 +36701,101 @@ in
       sources."redis-2.8.0"
       sources."redis-commands-1.3.5"
       sources."redis-parser-2.6.0"
-      sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."requestretry-1.13.0"
       sources."requires-port-1.0.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
       sources."setprototypeof-1.1.0"
       sources."slack-node-0.2.0"
       sources."smart-buffer-1.1.15"
       sources."smtp-connection-2.12.0"
-      sources."sntp-2.1.0"
-      (sources."socket.io-2.0.4" // {
+      (sources."snapdragon-0.8.2" // {
         dependencies = [
-          sources."isarray-2.0.1"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+          sources."source-map-0.5.7"
         ];
       })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."sntp-1.0.9"
+      sources."socket.io-2.0.4"
       sources."socket.io-adapter-1.1.1"
       sources."socket.io-client-2.0.4"
       (sources."socket.io-parser-3.1.3" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."isarray-2.0.1"
         ];
       })
       sources."socks-1.1.10"
       sources."socks-proxy-agent-3.0.1"
       sources."source-map-0.6.1"
-      sources."sshpk-1.14.1"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."split-string-3.1.0"
+      sources."sshpk-1.14.2"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."statuses-1.5.0"
-      sources."streamroller-0.7.0"
+      (sources."streamroller-0.7.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
@@ -36678,6 +36804,13 @@ in
       sources."timespan-2.3.0"
       sources."tmp-0.0.33"
       sources."to-array-0.1.4"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
       sources."tough-cookie-2.3.4"
       sources."tsscmp-1.0.5"
       sources."tunnel-agent-0.6.0"
@@ -36686,7 +36819,27 @@ in
       sources."type-is-1.6.16"
       sources."ultron-1.1.1"
       sources."underscore-1.7.0"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+          sources."set-value-0.4.3"
+        ];
+      })
       sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."upath-1.1.0"
+      sources."urix-0.1.0"
+      sources."use-3.1.0"
       (sources."useragent-2.2.1" // {
         dependencies = [
           sources."lru-cache-2.2.4"
@@ -36694,7 +36847,7 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."uws-9.14.0"
       sources."verror-1.10.0"
       sources."void-elements-2.0.1"
@@ -36736,18 +36889,13 @@ in
       sources."body-parser-1.13.3"
       sources."bytes-2.1.0"
       sources."commander-2.6.0"
-      sources."compressible-2.0.13"
-      sources."compression-1.5.2"
-      (sources."connect-2.30.2" // {
+      (sources."compressible-2.0.14" // {
         dependencies = [
-          sources."accepts-1.2.13"
-          sources."escape-html-1.0.3"
-          sources."ms-0.7.2"
-          sources."negotiator-0.5.3"
-          sources."send-0.13.2"
-          sources."vary-1.1.2"
+          sources."mime-db-1.34.0"
         ];
       })
+      sources."compression-1.5.2"
+      sources."connect-2.30.2"
       sources."connect-restreamer-1.0.3"
       sources."connect-timeout-1.6.2"
       sources."content-disposition-0.5.0"
@@ -36759,33 +36907,26 @@ in
       sources."crc-3.3.0"
       sources."csrf-3.0.6"
       sources."csurf-1.8.3"
-      (sources."debug-2.2.0" // {
-        dependencies = [
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."debug-2.2.0"
       sources."depd-1.0.1"
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
-      sources."errorhandler-1.4.3"
-      sources."escape-html-1.0.2"
-      sources."etag-1.7.0"
-      (sources."express-3.21.2" // {
+      (sources."errorhandler-1.4.3" // {
         dependencies = [
           sources."accepts-1.3.5"
-          sources."destroy-1.0.3"
-          sources."ms-2.0.0"
+          sources."escape-html-1.0.3"
           sources."negotiator-0.6.1"
-          sources."statuses-1.2.1"
-          sources."uid-safe-2.0.0"
         ];
       })
-      sources."express-session-1.11.3"
-      (sources."finalhandler-0.4.0" // {
+      sources."escape-html-1.0.2"
+      sources."etag-1.7.0"
+      sources."express-3.21.2"
+      (sources."express-session-1.11.3" // {
         dependencies = [
-          sources."escape-html-1.0.2"
+          sources."uid-safe-2.0.0"
         ];
       })
+      sources."finalhandler-0.4.0"
       sources."forwarded-0.1.2"
       sources."fresh-0.3.0"
       sources."http-errors-1.3.1"
@@ -36798,6 +36939,8 @@ in
       (sources."method-override-2.3.10" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."ms-2.0.0"
+          sources."vary-1.1.2"
         ];
       })
       sources."methods-1.1.2"
@@ -36846,15 +36989,26 @@ in
       sources."sax-1.2.4"
       (sources."send-0.13.0" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."destroy-1.0.3"
+          sources."statuses-1.2.1"
+        ];
+      })
+      (sources."serve-favicon-2.3.2" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."serve-index-1.7.3" // {
+        dependencies = [
+          sources."escape-html-1.0.3"
         ];
       })
-      sources."serve-favicon-2.3.2"
-      sources."serve-index-1.7.3"
       (sources."serve-static-1.10.3" // {
         dependencies = [
           sources."depd-1.1.2"
-          sources."ms-0.7.1"
+          sources."escape-html-1.0.3"
+          sources."send-0.13.2"
+          sources."statuses-1.2.1"
         ];
       })
       sources."statuses-1.5.0"
@@ -36879,16 +37033,370 @@ in
     production = true;
     bypassCache = false;
   };
+  lcov-result-merger = nodeEnv.buildNodePackage {
+    name = "lcov-result-merger";
+    packageName = "lcov-result-merger";
+    version = "3.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz";
+      sha512 = "6Yb98XarLXKNjGvVX9LNdZNeE22VsTCUZixtAqrO5WLjM9Mtyybn6fSI2m3A4drSMvSh8WYALuT6S5c/XnBbqA==";
+    };
+    dependencies = [
+      sources."append-buffer-1.0.2"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-equal-1.0.0"
+      sources."clone-2.1.2"
+      sources."clone-buffer-1.0.0"
+      sources."clone-stats-1.0.0"
+      sources."cloneable-readable-1.1.2"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.5.1"
+      sources."core-util-is-1.0.2"
+      sources."define-properties-1.1.2"
+      sources."duplexify-3.6.0"
+      sources."end-of-stream-1.4.1"
+      sources."extend-3.0.1"
+      sources."flush-write-stream-1.0.3"
+      sources."foreach-2.0.5"
+      sources."fs-mkdirp-stream-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."glob-7.1.2"
+      sources."glob-parent-3.1.0"
+      sources."glob-stream-6.1.0"
+      sources."graceful-fs-4.1.11"
+      sources."has-symbols-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-absolute-1.0.0"
+      sources."is-buffer-1.1.6"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-3.1.0"
+      sources."is-negated-glob-1.0.0"
+      sources."is-relative-1.0.0"
+      sources."is-unc-path-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."is-valid-glob-1.0.0"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."lazystream-1.0.0"
+      sources."lead-1.0.0"
+      sources."minimatch-3.0.4"
+      sources."normalize-path-2.1.1"
+      sources."now-and-later-2.0.0"
+      sources."object-keys-1.0.12"
+      sources."object.assign-4.1.0"
+      sources."once-1.4.0"
+      sources."ordered-read-streams-1.0.1"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."pump-2.0.1"
+      sources."pumpify-1.5.1"
+      sources."readable-stream-2.3.6"
+      sources."remove-bom-buffer-3.0.0"
+      sources."remove-bom-stream-1.2.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."replace-ext-1.0.0"
+      sources."resolve-options-1.1.0"
+      sources."safe-buffer-5.1.2"
+      sources."stream-shift-1.0.0"
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.3"
+      sources."through2-filter-2.0.0"
+      sources."to-absolute-glob-2.0.2"
+      sources."to-through-2.0.0"
+      sources."unc-path-regex-0.1.2"
+      sources."unique-stream-2.2.1"
+      sources."util-deprecate-1.0.2"
+      sources."value-or-function-3.0.0"
+      sources."vinyl-2.2.0"
+      sources."vinyl-fs-3.0.3"
+      sources."vinyl-sourcemap-1.1.0"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Merges multiple lcov results into one";
+      homepage = https://github.com/mweibel/lcov-result-merger;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  leetcode-cli = nodeEnv.buildNodePackage {
+    name = "leetcode-cli";
+    packageName = "leetcode-cli";
+    version = "2.5.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.5.2.tgz";
+      sha512 = "KneaqL2/SAfJQpxR1yheLrnB10f8vwJJbVBA4vxtRl6aENbO+JKsJSgE1cZvO/4isD+MPI7C5HPjJbL5+MOmnw==";
+    };
+    dependencies = [
+      sources."abab-1.0.4"
+      sources."acorn-2.7.0"
+      sources."acorn-globals-1.0.9"
+      sources."ajv-5.5.2"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-3.2.0"
+      sources."asn1-0.2.3"
+      sources."assert-plus-1.0.0"
+      sources."async-1.5.2"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."boolbase-1.0.0"
+      sources."boom-4.3.1"
+      sources."brace-expansion-1.1.11"
+      sources."camelcase-2.1.1"
+      sources."caseless-0.12.0"
+      (sources."chalk-2.4.1" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
+      sources."cheerio-0.20.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-spinners-1.3.1"
+      sources."cliui-3.2.0"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."colors-1.3.0"
+      sources."combined-stream-1.0.6"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-5.1.0"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
+      sources."css-select-1.2.0"
+      sources."css-what-2.1.0"
+      sources."cssom-0.3.3"
+      sources."cssstyle-0.2.37"
+      sources."cycle-1.0.3"
+      sources."dashdash-1.14.1"
+      sources."decamelize-1.2.0"
+      sources."deep-equal-0.2.2"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.3.0"
+      sources."domutils-1.5.1"
+      sources."ecc-jsbn-0.1.1"
+      sources."entities-1.1.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.10.0"
+      sources."esprima-3.1.3"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      sources."execa-0.7.0"
+      sources."extend-3.0.1"
+      sources."extsprintf-1.3.0"
+      sources."eyes-0.1.8"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."find-up-2.1.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs.realpath-1.0.0"
+      sources."get-caller-file-1.0.2"
+      sources."get-stream-3.0.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."has-flag-3.0.0"
+      sources."hawk-6.0.2"
+      sources."he-1.1.1"
+      sources."hoek-4.2.1"
+      (sources."htmlparser2-3.8.3" // {
+        dependencies = [
+          sources."entities-1.0.0"
+        ];
+      })
+      sources."http-signature-1.2.0"
+      sources."i-0.3.6"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."invert-kv-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-0.0.1"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."jsdom-7.2.2"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.10"
+      sources."log-symbols-2.2.0"
+      sources."lru-cache-4.1.3"
+      sources."mem-1.1.0"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."moment-2.22.2"
+      sources."mute-stream-0.0.7"
+      (sources."nconf-0.10.0" // {
+        dependencies = [
+          sources."yargs-3.32.0"
+        ];
+      })
+      sources."ncp-1.0.1"
+      sources."npm-run-path-2.0.2"
+      sources."nth-check-1.0.1"
+      sources."number-is-nan-1.0.1"
+      sources."nwmatcher-1.4.4"
+      sources."oauth-sign-0.8.2"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.2"
+      sources."ora-1.4.0"
+      sources."os-locale-1.4.0"
+      sources."p-finally-1.0.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse5-1.5.1"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."performance-now-2.1.0"
+      sources."pkginfo-0.4.1"
+      sources."prelude-ls-1.1.2"
+      sources."prompt-1.0.0"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.1.28"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."read-1.0.7"
+      sources."readable-stream-1.1.14"
+      (sources."request-2.83.0" // {
+        dependencies = [
+          sources."tough-cookie-2.3.4"
+        ];
+      })
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."restore-cursor-2.0.0"
+      sources."revalidator-0.1.8"
+      sources."rimraf-2.6.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."secure-keys-1.0.0"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."sntp-2.1.0"
+      sources."source-map-0.6.1"
+      sources."sprintf-js-1.1.1"
+      sources."sshpk-1.14.2"
+      sources."stack-trace-0.0.10"
+      sources."string-width-1.0.2"
+      sources."string_decoder-0.10.31"
+      sources."stringstream-0.0.6"
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      (sources."supports-color-5.1.0" // {
+        dependencies = [
+          sources."has-flag-2.0.0"
+        ];
+      })
+      sources."symbol-tree-3.2.2"
+      sources."tough-cookie-2.4.3"
+      sources."tr46-0.0.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."underscore-1.8.3"
+      (sources."utile-0.3.0" // {
+        dependencies = [
+          sources."async-0.9.2"
+        ];
+      })
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."webidl-conversions-2.0.1"
+      sources."whatwg-url-compat-0.6.5"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."window-size-0.1.4"
+      (sources."winston-2.1.1" // {
+        dependencies = [
+          sources."async-1.0.0"
+          sources."colors-1.0.3"
+          sources."pkginfo-0.3.1"
+        ];
+      })
+      sources."wordwrap-1.0.0"
+      sources."wrap-ansi-2.1.0"
+      sources."wrappy-1.0.2"
+      sources."xml-name-validator-2.0.1"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-10.0.3" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."os-locale-2.1.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      (sources."yargs-parser-8.1.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A cli tool to enjoy leetcode!";
+      homepage = "https://github.com/skygragon/leetcode-cli#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
     version = "2.11.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz";
-      sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj";
+      sha512 = "kgM6zwe2P2tR30MYvgiLLW+9buFCm6E7o8HnRlhTgm70WVBvXVhydqv+q/MF2HrVZkCawfVtCfetyQmtd4oHhQ==";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
+      sources."JSONStream-1.3.3"
       sources."add-stream-1.0.0"
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
@@ -36896,7 +37404,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."array-find-index-1.0.2"
       sources."array-ify-1.0.0"
       sources."array-union-1.0.2"
@@ -36905,11 +37413,15 @@ in
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."builtin-modules-1.1.1"
       sources."byline-5.0.0"
       sources."camelcase-1.2.1"
-      sources."camelcase-keys-2.1.0"
+      (sources."camelcase-keys-2.1.0" // {
+        dependencies = [
+          sources."camelcase-2.1.1"
+        ];
+      })
       sources."capture-stack-trace-1.0.0"
       sources."center-align-0.1.3"
       sources."chalk-2.4.1"
@@ -36917,54 +37429,31 @@ in
       sources."ci-info-1.1.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."clone-1.0.4"
       sources."cmd-shim-2.0.2"
       sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."columnify-1.5.4"
       sources."command-join-2.0.0"
       sources."compare-func-1.3.2"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
-      (sources."conventional-changelog-1.1.24" // {
-        dependencies = [
-          sources."camelcase-4.1.0"
-          sources."map-obj-1.0.1"
-          sources."meow-3.7.0"
-        ];
-      })
+      sources."conventional-changelog-1.1.24"
       sources."conventional-changelog-angular-1.6.6"
       sources."conventional-changelog-atom-0.2.8"
-      (sources."conventional-changelog-cli-1.3.22" // {
-        dependencies = [
-          sources."camelcase-2.1.1"
-          sources."camelcase-keys-4.2.0"
-          sources."find-up-1.1.2"
-          sources."indent-string-3.2.0"
-          sources."load-json-file-1.1.0"
-          sources."map-obj-2.0.0"
-          sources."minimist-1.2.0"
-          sources."parse-json-4.0.0"
-          sources."path-exists-2.1.0"
-          sources."path-type-1.1.0"
-          sources."pify-2.3.0"
-          sources."read-pkg-1.1.0"
-          sources."read-pkg-up-3.0.0"
-          sources."redent-2.0.0"
-          sources."strip-bom-3.0.0"
-          sources."strip-indent-2.0.0"
-          sources."trim-newlines-2.0.0"
-          sources."wordwrap-0.0.2"
-          sources."yargs-3.10.0"
-        ];
-      })
+      sources."conventional-changelog-cli-1.3.22"
       sources."conventional-changelog-codemirror-0.3.8"
       (sources."conventional-changelog-core-2.0.11" // {
         dependencies = [
-          sources."meow-4.0.1"
+          sources."load-json-file-1.1.0"
+          sources."read-pkg-1.1.0"
         ];
       })
       sources."conventional-changelog-ember-0.3.12"
@@ -36992,14 +37481,14 @@ in
       sources."decamelize-1.2.0"
       sources."decamelize-keys-1.1.0"
       sources."dedent-0.7.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."defaults-1.0.3"
       sources."delegates-1.0.0"
       sources."detect-indent-5.0.0"
       sources."dot-prop-3.0.0"
       sources."duplexer-0.1.1"
       sources."duplexer3-0.1.4"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."execa-0.8.0"
       sources."external-editor-2.2.0"
@@ -37007,34 +37496,35 @@ in
       sources."find-up-2.1.0"
       sources."fs-extra-4.0.3"
       sources."fs.realpath-1.0.0"
-      sources."gauge-2.7.4"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."get-caller-file-1.0.2"
-      sources."get-pkg-repo-1.4.0"
-      sources."get-port-3.2.0"
-      sources."get-stdin-4.0.1"
-      sources."get-stream-3.0.0"
-      (sources."git-raw-commits-1.3.6" // {
+      (sources."get-pkg-repo-1.4.0" // {
         dependencies = [
-          sources."read-pkg-3.0.0"
-          sources."read-pkg-up-3.0.0"
+          sources."meow-3.7.0"
+          sources."minimist-1.2.0"
         ];
       })
+      sources."get-port-3.2.0"
+      sources."get-stdin-4.0.1"
+      sources."get-stream-3.0.0"
+      sources."git-raw-commits-1.3.6"
       sources."git-remote-origin-url-2.0.0"
       sources."git-semver-tags-1.3.6"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.2"
       sources."glob-parent-3.1.0"
-      (sources."globby-6.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."globby-6.1.0"
       sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
       sources."handlebars-4.0.11"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."iconv-lite-0.4.23"
       sources."imurmurhash-0.1.4"
       sources."indent-string-2.1.0"
@@ -37077,6 +37567,7 @@ in
       (sources."load-json-file-4.0.0" // {
         dependencies = [
           sources."parse-json-4.0.0"
+          sources."pify-3.0.0"
           sources."strip-bom-3.0.0"
         ];
       })
@@ -37089,17 +37580,24 @@ in
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
-      sources."make-dir-1.3.0"
+      (sources."make-dir-1.3.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
       (sources."meow-4.0.1" // {
         dependencies = [
-          sources."find-up-2.1.0"
-          sources."load-json-file-4.0.0"
-          sources."path-exists-3.0.0"
-          sources."path-type-3.0.0"
-          sources."pify-3.0.0"
-          sources."read-pkg-3.0.0"
+          sources."camelcase-4.1.0"
+          sources."camelcase-keys-4.2.0"
+          sources."indent-string-3.2.0"
+          sources."map-obj-2.0.0"
+          sources."minimist-1.2.0"
+          sources."read-pkg-up-3.0.0"
+          sources."redent-2.0.0"
+          sources."strip-indent-2.0.0"
+          sources."trim-newlines-2.0.0"
         ];
       })
       sources."mimic-fn-1.2.0"
@@ -37108,40 +37606,35 @@ in
       sources."minimist-options-3.0.2"
       sources."mkdirp-0.5.1"
       sources."modify-values-1.0.1"
-      sources."moment-2.22.1"
+      sources."moment-2.22.2"
       sources."mute-stream-0.0.7"
       sources."normalize-package-data-2.4.0"
       sources."npm-run-path-2.0.2"
-      (sources."npmlog-4.1.2" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-        ];
-      })
+      sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."optimist-0.6.1"
-      sources."os-locale-2.1.0"
+      (sources."os-locale-2.1.0" // {
+        dependencies = [
+          sources."execa-0.7.0"
+        ];
+      })
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      (sources."package-json-4.0.1" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."package-json-4.0.1"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-json-2.2.0"
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
-      sources."path-type-3.0.0"
-      sources."pify-3.0.0"
+      sources."path-type-1.1.0"
+      sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prepend-http-1.0.4"
@@ -37149,10 +37642,26 @@ in
       sources."pseudomap-1.0.2"
       sources."q-1.5.1"
       sources."quick-lru-1.1.0"
-      sources."rc-1.2.7"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."read-cmd-shim-1.0.1"
-      sources."read-pkg-3.0.0"
-      sources."read-pkg-up-1.0.1"
+      (sources."read-pkg-3.0.0" // {
+        dependencies = [
+          sources."path-type-3.0.0"
+          sources."pify-3.0.0"
+        ];
+      })
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."load-json-file-1.1.0"
+          sources."path-exists-2.1.0"
+          sources."read-pkg-1.1.0"
+        ];
+      })
       sources."readable-stream-2.3.6"
       sources."redent-1.0.0"
       sources."registry-auth-token-3.3.2"
@@ -37183,7 +37692,12 @@ in
       sources."spdx-license-ids-3.0.0"
       sources."split-1.0.1"
       sources."split2-2.2.0"
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -37199,7 +37713,8 @@ in
       sources."temp-dir-1.0.0"
       (sources."temp-write-3.4.0" // {
         dependencies = [
-          sources."uuid-3.2.1"
+          sources."pify-3.0.0"
+          sources."uuid-3.3.2"
         ];
       })
       sources."tempfile-1.1.1"
@@ -37214,26 +37729,36 @@ in
       (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."source-map-0.5.7"
+          sources."yargs-3.10.0"
         ];
       })
       sources."uglify-to-browserify-1.0.2"
-      sources."universalify-0.1.1"
+      sources."universalify-0.1.2"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-2.0.3"
       sources."validate-npm-package-license-3.0.3"
       sources."wcwidth-1.0.1"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."window-size-0.1.0"
       sources."wordwrap-0.0.3"
-      sources."wrap-ansi-2.1.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.3.0"
-      sources."write-json-file-2.3.0"
-      sources."write-pkg-3.1.0"
+      (sources."write-json-file-2.3.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."write-pkg-3.2.0"
       sources."xtend-4.0.1"
       sources."y18n-3.2.1"
       sources."yallist-2.1.2"
@@ -37245,17 +37770,19 @@ in
               sources."string-width-1.0.2"
             ];
           })
-          sources."execa-0.7.0"
           sources."is-fullwidth-code-point-1.0.0"
           sources."load-json-file-2.0.0"
           sources."path-type-2.0.0"
-          sources."pify-2.3.0"
           sources."read-pkg-2.0.0"
           sources."read-pkg-up-2.0.0"
           sources."strip-bom-3.0.0"
         ];
       })
-      sources."yargs-parser-7.0.0"
+      (sources."yargs-parser-7.0.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -37272,7 +37799,7 @@ in
     version = "3.0.4";
     src = fetchurl {
       url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz";
-      sha512 = "1qmi7lbjfq3w5ygilwf5sagk463c0j6kj2wsidzh6100v02bpfi05c8kbycf395hrdmmy5ffb5f0rsvkvqyhxw9hxrlyvnafc9b4x5b";
+      sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ==";
     };
     dependencies = [
       sources."ajv-5.5.2"
@@ -37282,17 +37809,11 @@ in
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
@@ -37307,8 +37828,6 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."image-size-0.5.5"
       sources."is-typedarray-1.0.0"
@@ -37329,15 +37848,15 @@ in
       sources."prr-1.0.1"
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."safe-buffer-5.1.2"
-      sources."sntp-2.1.0"
+      sources."safer-buffer-2.1.2"
       sources."source-map-0.6.1"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -37372,138 +37891,162 @@ in
     production = true;
     bypassCache = false;
   };
-  lcov-result-merger = nodeEnv.buildNodePackage {
-    name = "lcov-result-merger";
-    packageName = "lcov-result-merger";
-    version = "2.0.0";
+  live-server = nodeEnv.buildNodePackage {
+    name = "live-server";
+    packageName = "live-server";
+    version = "1.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-2.0.0.tgz";
-      sha512 = "1y38jkc5m8kb1ll4wcc12yikqdb2l19acc3rdjl0bhs4vjh834mz53hhgyc4jm4gya1gnmzrj3g5337xn05kkxs92vl35zdqcwxij08";
+      url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz";
+      sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3";
     };
     dependencies = [
+      sources."accepts-1.3.5"
+      sources."anymatch-1.3.2"
+      sources."apache-crypt-1.2.1"
+      sources."apache-md5-1.1.2"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
       sources."array-unique-0.2.1"
+      sources."async-each-1.0.1"
       sources."balanced-match-1.0.0"
-      sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
+      (sources."basic-auth-2.0.0" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."safe-buffer-5.1.1"
         ];
       })
-      sources."clone-2.1.2"
-      sources."clone-buffer-1.0.0"
-      sources."clone-stats-1.0.0"
-      sources."cloneable-readable-1.1.2"
+      sources."batch-0.6.1"
+      sources."bcryptjs-2.4.3"
+      sources."binary-extensions-1.11.0"
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."chokidar-1.7.0"
+      sources."colors-1.3.0"
       sources."concat-map-0.0.1"
-      sources."convert-source-map-1.5.1"
+      sources."connect-3.5.1"
       sources."core-util-is-1.0.2"
-      sources."duplexify-3.6.0"
-      sources."end-of-stream-1.4.1"
+      sources."cors-2.8.4"
+      sources."debug-2.2.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."duplexer-0.1.1"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      sources."event-stream-3.3.4"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
-      sources."extend-3.0.1"
-      sources."extend-shallow-2.0.1"
       sources."extglob-0.3.2"
+      sources."faye-websocket-0.11.1"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
-      sources."first-chunk-stream-1.0.0"
+      sources."finalhandler-0.5.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
-      sources."glob-5.0.15"
+      sources."fresh-0.5.2"
+      sources."from-0.1.7"
+      sources."fsevents-1.2.4"
       sources."glob-base-0.3.0"
-      sources."glob-parent-3.1.0"
-      (sources."glob-stream-5.3.5" // {
+      sources."glob-parent-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."http-auth-3.1.3"
+      (sources."http-errors-1.6.3" // {
         dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."through2-0.6.5"
+          sources."statuses-1.5.0"
         ];
       })
-      sources."graceful-fs-4.1.11"
-      sources."gulp-sourcemaps-1.6.0"
-      sources."inflight-1.0.6"
+      sources."http-parser-js-0.4.13"
       sources."inherits-2.0.3"
+      sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-3.1.0"
+      sources."is-extglob-1.0.0"
+      sources."is-glob-2.0.1"
       sources."is-number-2.1.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
-      sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
-      sources."is-valid-glob-0.3.0"
+      sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isobject-2.1.0"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
       sources."kind-of-3.2.2"
-      sources."lazystream-1.0.0"
-      sources."lodash.isequal-4.5.0"
+      sources."map-stream-0.1.0"
       sources."math-random-1.0.1"
-      sources."merge-stream-1.0.1"
-      (sources."micromatch-2.3.11" // {
+      sources."micromatch-2.3.11"
+      sources."mime-1.4.1"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."minimatch-3.0.4"
+      (sources."morgan-1.9.0" // {
         dependencies = [
-          sources."glob-parent-2.0.0"
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
         ];
       })
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."ms-0.7.1"
+      sources."nan-2.10.0"
+      sources."negotiator-0.6.1"
       sources."normalize-path-2.1.1"
       sources."object-assign-4.1.1"
       sources."object.omit-2.0.1"
-      sources."once-1.4.0"
-      sources."ordered-read-streams-0.3.0"
+      sources."on-finished-2.3.0"
+      sources."on-headers-1.0.1"
+      sources."opn-5.3.0"
       sources."parse-glob-3.0.4"
-      sources."path-dirname-1.0.2"
+      sources."parseurl-1.3.2"
       sources."path-is-absolute-1.0.1"
+      sources."pause-stream-0.0.11"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
+      sources."proxy-middleware-0.15.0"
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
+      sources."range-parser-1.2.0"
       sources."readable-stream-2.3.6"
+      sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."replace-ext-1.0.0"
       sources."safe-buffer-5.1.2"
-      sources."stream-shift-1.0.0"
-      sources."string_decoder-1.1.1"
-      sources."strip-bom-2.0.0"
-      sources."strip-bom-stream-1.0.0"
-      sources."through2-2.0.3"
-      sources."through2-filter-2.0.0"
-      sources."to-absolute-glob-0.1.1"
-      sources."unique-stream-2.2.1"
-      sources."util-deprecate-1.0.2"
-      sources."vali-date-1.0.0"
-      sources."vinyl-2.1.0"
-      (sources."vinyl-fs-2.4.4" // {
+      (sources."send-0.16.2" // {
         dependencies = [
-          sources."clone-1.0.4"
-          sources."clone-stats-0.0.1"
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-          sources."isarray-0.0.1"
-          sources."replace-ext-0.0.1"
-          sources."string_decoder-0.10.31"
-          sources."vinyl-1.2.0"
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+          sources."statuses-1.4.0"
         ];
       })
-      sources."wrappy-1.0.2"
-      sources."xtend-4.0.1"
+      (sources."serve-index-1.9.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."set-immediate-shim-1.0.1"
+      sources."setprototypeof-1.1.0"
+      sources."split-0.3.3"
+      sources."statuses-1.3.1"
+      sources."stream-combiner-0.0.4"
+      sources."string_decoder-1.1.1"
+      sources."through-2.3.8"
+      sources."unix-crypt-td-js-1.0.0"
+      sources."unpipe-1.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.0"
+      sources."uuid-3.3.2"
+      sources."vary-1.1.2"
+      sources."websocket-driver-0.7.0"
+      sources."websocket-extensions-0.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Merges multiple lcov results into one";
-      homepage = https://github.com/mweibel/lcov-result-merger;
+      description = "simple development http server with live reload capability";
+      homepage = "https://github.com/tapio/live-server#readme";
       license = "MIT";
     };
     production = true;
@@ -37515,7 +38058,7 @@ in
     version = "2.1.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz";
-      sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b";
+      sha512 = "C5x12+bwk7m2Sx3U27VZ7h5KP7vIlKfZGCabMi73nBGp0zPHtCaxQTPXDRoX5479EZUvycYJI0aD4h1d4+ds7w==";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -37539,18 +38082,13 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64id-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.11.0"
       sources."blob-0.0.4"
       sources."body-parser-1.18.3"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."braces-1.8.5"
       sources."bytes-3.0.0"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
@@ -37566,11 +38104,6 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."delayed-stream-1.0.0"
@@ -37580,8 +38113,16 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-6.1.1"
       sources."encodeurl-1.0.2"
-      sources."engine.io-3.2.0"
-      sources."engine.io-client-3.2.1"
+      (sources."engine.io-3.2.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."engine.io-client-3.2.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."engine.io-parser-2.1.2"
       sources."entities-1.1.1"
       sources."escape-html-1.0.3"
@@ -37590,19 +38131,16 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
         dependencies = [
-          (sources."body-parser-1.18.2" // {
+          sources."body-parser-1.18.2"
+          (sources."http-errors-1.6.2" // {
             dependencies = [
+              sources."depd-1.1.1"
               sources."setprototypeof-1.0.3"
             ];
           })
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
+          sources."raw-body-2.3.2"
           sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
@@ -37614,7 +38152,11 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
-      sources."finalhandler-1.1.1"
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
@@ -37629,10 +38171,12 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-binary2-1.0.3"
+      (sources."has-binary2-1.0.3" // {
+        dependencies = [
+          sources."isarray-2.0.1"
+        ];
+      })
       sources."has-cors-1.1.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."html-entities-1.2.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
@@ -37702,6 +38246,7 @@ in
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."range-parser-1.2.0"
@@ -37712,25 +38257,36 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."send-0.16.2"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.1.0"
-      sources."sntp-2.1.0"
-      (sources."socket.io-2.1.0" // {
+      (sources."socket.io-2.1.1" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."isarray-2.0.1"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      sources."socket.io-client-2.1.0"
-      sources."socket.io-parser-3.2.0"
+      (sources."socket.io-client-2.1.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."socket.io-parser-3.2.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."isarray-2.0.1"
+        ];
+      })
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.5.0"
       sources."string_decoder-1.1.1"
       sources."to-array-0.1.4"
@@ -37743,7 +38299,7 @@ in
       sources."unpipe-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."ws-3.3.3"
@@ -37759,163 +38315,6 @@ in
     production = true;
     bypassCache = false;
   };
-  live-server = nodeEnv.buildNodePackage {
-    name = "live-server";
-    packageName = "live-server";
-    version = "1.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz";
-      sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3";
-    };
-    dependencies = [
-      sources."accepts-1.3.5"
-      sources."anymatch-1.3.2"
-      sources."apache-crypt-1.2.1"
-      sources."apache-md5-1.1.2"
-      sources."arr-diff-2.0.0"
-      sources."arr-flatten-1.1.0"
-      sources."array-unique-0.2.1"
-      sources."async-each-1.0.1"
-      sources."balanced-match-1.0.0"
-      sources."basic-auth-2.0.0"
-      sources."batch-0.6.1"
-      sources."bcryptjs-2.4.3"
-      sources."binary-extensions-1.11.0"
-      sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."chokidar-1.7.0"
-      sources."colors-1.2.5"
-      sources."concat-map-0.0.1"
-      sources."connect-3.5.1"
-      sources."core-util-is-1.0.2"
-      sources."cors-2.8.4"
-      sources."debug-2.2.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
-      sources."duplexer-0.1.1"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-1.0.2"
-      sources."escape-html-1.0.3"
-      sources."etag-1.8.1"
-      sources."event-stream-3.3.4"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
-      sources."extglob-0.3.2"
-      sources."faye-websocket-0.11.1"
-      sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.4"
-      sources."finalhandler-0.5.1"
-      sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
-      sources."fresh-0.5.2"
-      sources."from-0.1.7"
-      sources."fsevents-1.2.4"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
-      sources."graceful-fs-4.1.11"
-      sources."http-auth-3.1.3"
-      sources."http-errors-1.6.3"
-      sources."http-parser-js-0.4.12"
-      sources."inherits-2.0.3"
-      sources."is-binary-path-1.0.1"
-      sources."is-buffer-1.1.6"
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-glob-2.0.1"
-      sources."is-number-2.1.0"
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
-      sources."is-wsl-1.1.0"
-      sources."isarray-1.0.0"
-      sources."isobject-2.1.0"
-      sources."kind-of-3.2.2"
-      sources."map-stream-0.1.0"
-      sources."math-random-1.0.1"
-      sources."micromatch-2.3.11"
-      sources."mime-1.4.1"
-      sources."mime-db-1.33.0"
-      sources."mime-types-2.1.18"
-      sources."minimatch-3.0.4"
-      (sources."morgan-1.9.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."safe-buffer-5.1.1"
-        ];
-      })
-      sources."ms-0.7.1"
-      sources."nan-2.10.0"
-      sources."negotiator-0.6.1"
-      sources."normalize-path-2.1.1"
-      sources."object-assign-4.1.1"
-      sources."object.omit-2.0.1"
-      sources."on-finished-2.3.0"
-      sources."on-headers-1.0.1"
-      sources."opn-5.3.0"
-      sources."parse-glob-3.0.4"
-      sources."parseurl-1.3.2"
-      sources."path-is-absolute-1.0.1"
-      sources."pause-stream-0.0.11"
-      sources."preserve-0.2.0"
-      sources."process-nextick-args-2.0.0"
-      sources."proxy-middleware-0.15.0"
-      (sources."randomatic-3.0.0" // {
-        dependencies = [
-          sources."is-number-4.0.0"
-        ];
-      })
-      sources."range-parser-1.2.0"
-      sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
-      sources."regex-cache-0.4.4"
-      sources."remove-trailing-separator-1.1.0"
-      sources."repeat-element-1.1.2"
-      sources."repeat-string-1.6.1"
-      sources."safe-buffer-5.1.2"
-      (sources."send-0.16.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."statuses-1.4.0"
-        ];
-      })
-      (sources."serve-index-1.9.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."set-immediate-shim-1.0.1"
-      sources."setprototypeof-1.1.0"
-      sources."split-0.3.3"
-      sources."statuses-1.3.1"
-      sources."stream-combiner-0.0.4"
-      sources."string_decoder-1.1.1"
-      sources."through-2.3.8"
-      sources."unix-crypt-td-js-1.0.0"
-      sources."unpipe-1.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.0"
-      sources."uuid-3.2.1"
-      sources."vary-1.1.2"
-      sources."websocket-driver-0.7.0"
-      sources."websocket-extensions-0.1.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "simple development http server with live reload capability";
-      homepage = "https://github.com/tapio/live-server#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = false;
-  };
   meat = nodeEnv.buildNodePackage {
     name = "meat";
     packageName = "meat";
@@ -37955,22 +38354,42 @@ in
   meguca = nodeEnv.buildNodePackage {
     name = "meguca";
     packageName = "meguca";
-    version = "1.0.4";
+    version = "1.0.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/meguca/-/meguca-1.0.4.tgz";
-      sha1 = "c2d9c78dbf53f7d0de585a87765dd9391846e9a2";
+      url = "https://registry.npmjs.org/meguca/-/meguca-1.0.8.tgz";
+      sha512 = "6hEfEe5385DL95w4YPo68Y/DzSGo7vyw9/ckHsAMk/qO+GBcbI1pGRVkx0oJQtTdJ7mGSVc+gcVj09sj9auTQg==";
     };
     dependencies = [
-      (sources."@gulp-sourcemaps/identity-map-1.0.1" // {
+      (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
-          sources."source-map-0.5.7"
+          sources."readable-stream-2.3.6"
+          sources."source-map-0.6.1"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
         ];
       })
-      sources."@gulp-sourcemaps/map-sources-1.0.0"
-      sources."accord-0.28.0"
-      sources."acorn-5.5.3"
+      (sources."@gulp-sourcemaps/map-sources-1.0.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
+      (sources."accord-0.28.0" // {
+        dependencies = [
+          sources."glob-7.1.2"
+          sources."minimatch-3.0.4"
+          sources."semver-5.5.0"
+          sources."uglify-js-2.8.29"
+        ];
+      })
+      sources."acorn-5.7.1"
       sources."ajv-4.11.8"
-      sources."align-text-0.1.4"
+      (sources."align-text-0.1.4" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."almond-0.3.3"
       sources."amdefine-1.0.1"
       sources."ansi-colors-1.1.0"
@@ -37998,97 +38417,42 @@ in
       sources."atob-2.1.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
-      sources."babel-code-frame-6.26.0"
-      sources."babel-core-6.26.3"
-      sources."babel-generator-6.26.1"
-      sources."babel-helper-builder-binary-assignment-operator-visitor-6.24.1"
-      sources."babel-helper-call-delegate-6.24.1"
-      sources."babel-helper-define-map-6.26.0"
-      sources."babel-helper-explode-assignable-expression-6.24.1"
-      sources."babel-helper-function-name-6.24.1"
-      sources."babel-helper-get-function-arity-6.24.1"
-      sources."babel-helper-hoist-variables-6.24.1"
-      sources."babel-helper-optimise-call-expression-6.24.1"
-      sources."babel-helper-regex-6.26.0"
-      sources."babel-helper-remap-async-to-generator-6.24.1"
-      sources."babel-helper-replace-supers-6.24.1"
-      sources."babel-helpers-6.24.1"
-      sources."babel-messages-6.23.0"
-      sources."babel-plugin-check-es2015-constants-6.22.0"
-      sources."babel-plugin-syntax-async-functions-6.13.0"
-      sources."babel-plugin-syntax-exponentiation-operator-6.13.0"
-      sources."babel-plugin-syntax-trailing-function-commas-6.22.0"
-      sources."babel-plugin-transform-async-to-generator-6.24.1"
-      sources."babel-plugin-transform-es2015-arrow-functions-6.22.0"
-      sources."babel-plugin-transform-es2015-block-scoped-functions-6.22.0"
-      sources."babel-plugin-transform-es2015-block-scoping-6.26.0"
-      sources."babel-plugin-transform-es2015-classes-6.24.1"
-      sources."babel-plugin-transform-es2015-computed-properties-6.24.1"
-      sources."babel-plugin-transform-es2015-destructuring-6.23.0"
-      sources."babel-plugin-transform-es2015-duplicate-keys-6.24.1"
-      sources."babel-plugin-transform-es2015-for-of-6.23.0"
-      sources."babel-plugin-transform-es2015-function-name-6.24.1"
-      sources."babel-plugin-transform-es2015-literals-6.22.0"
-      sources."babel-plugin-transform-es2015-modules-amd-6.24.1"
-      sources."babel-plugin-transform-es2015-modules-commonjs-6.26.2"
-      sources."babel-plugin-transform-es2015-modules-systemjs-6.24.1"
-      sources."babel-plugin-transform-es2015-modules-umd-6.24.1"
-      sources."babel-plugin-transform-es2015-object-super-6.24.1"
-      sources."babel-plugin-transform-es2015-parameters-6.24.1"
-      sources."babel-plugin-transform-es2015-shorthand-properties-6.24.1"
-      sources."babel-plugin-transform-es2015-spread-6.22.0"
-      sources."babel-plugin-transform-es2015-sticky-regex-6.24.1"
-      sources."babel-plugin-transform-es2015-template-literals-6.22.0"
-      sources."babel-plugin-transform-es2015-typeof-symbol-6.23.0"
-      sources."babel-plugin-transform-es2015-unicode-regex-6.24.1"
-      sources."babel-plugin-transform-exponentiation-operator-6.24.1"
-      sources."babel-plugin-transform-regenerator-6.26.0"
-      sources."babel-plugin-transform-strict-mode-6.24.1"
-      sources."babel-polyfill-6.26.0"
-      sources."babel-preset-env-1.7.0"
-      sources."babel-register-6.26.0"
-      (sources."babel-runtime-6.26.0" // {
-        dependencies = [
-          sources."regenerator-runtime-0.11.1"
-        ];
-      })
-      sources."babel-template-6.26.0"
-      sources."babel-traverse-6.26.0"
-      sources."babel-types-6.26.0"
-      sources."babylon-6.18.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."beeper-1.1.1"
       sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
-          sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-3.2.2"
         ];
       })
-      sources."browserslist-3.2.7"
       sources."buffer-equal-1.0.0"
       sources."cache-base-1.0.1"
       sources."camelcase-1.2.1"
-      sources."caniuse-lite-1.0.30000842"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."clean-css-4.1.11"
@@ -38096,7 +38460,12 @@ in
       sources."clone-1.0.4"
       sources."clone-buffer-1.0.0"
       sources."clone-stats-0.0.1"
-      sources."cloneable-readable-1.1.2"
+      (sources."cloneable-readable-1.1.2" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."co-4.6.0"
       sources."collection-visit-1.0.0"
       sources."color-support-1.1.3"
@@ -38106,7 +38475,7 @@ in
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.6"
+      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       (sources."css-2.2.3" // {
@@ -38115,10 +38484,18 @@ in
         ];
       })
       sources."d-1.0.0"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."dateformat-2.2.0"
       sources."debug-2.6.9"
-      sources."debug-fabulous-1.1.0"
+      (sources."debug-fabulous-1.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."defaults-1.0.3"
@@ -38127,43 +38504,35 @@ in
       sources."delayed-stream-1.0.0"
       sources."deprecated-0.0.1"
       sources."detect-file-1.0.0"
-      sources."detect-indent-4.0.0"
       sources."detect-newline-2.1.0"
-      sources."dom4-2.0.1"
-      sources."duplexer2-0.0.2"
-      sources."duplexify-3.6.0"
+      sources."dom4-2.1.0"
+      (sources."duplexer2-0.0.2" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+        ];
+      })
+      (sources."duplexify-3.6.0" // {
+        dependencies = [
+          sources."end-of-stream-1.4.1"
+          sources."once-1.4.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."ecc-jsbn-0.1.1"
-      sources."electron-to-chromium-1.3.47"
       sources."end-of-stream-0.1.5"
       sources."errno-0.1.7"
-      sources."es5-ext-0.10.42"
+      sources."es5-ext-0.10.45"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.1"
       sources."es6-weak-map-2.0.2"
       sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.2"
       sources."event-emitter-0.3.5"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
-        ];
-      })
-      sources."expand-tilde-2.0.2"
-      sources."extend-3.0.1"
-      sources."extend-shallow-3.0.2"
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."fancy-log-1.3.2"
-      sources."fill-range-4.0.0"
-      sources."find-index-0.1.1"
-      (sources."findup-sync-2.0.0" // {
-        dependencies = [
           (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -38175,79 +38544,96 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."expand-tilde-2.0.2"
+      sources."extend-3.0.1"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
           sources."is-extendable-1.0.1"
         ];
       })
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."fancy-log-1.3.2"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."find-index-0.1.1"
+      sources."findup-sync-2.0.0"
       sources."fined-1.1.0"
       sources."first-chunk-stream-1.0.0"
       sources."flagged-respawn-1.0.0"
-      sources."flush-write-stream-1.0.3"
+      (sources."flush-write-stream-1.0.3" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."foreach-2.0.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
       sources."fragment-cache-0.2.1"
-      sources."fs-mkdirp-stream-1.0.0"
+      (sources."fs-mkdirp-stream-1.0.0" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-value-2.0.6"
-      sources."getpass-0.1.7"
-      sources."glob-4.5.3"
-      sources."glob-parent-3.1.0"
-      sources."glob-stream-3.1.18"
-      (sources."glob-watcher-0.0.6" // {
+      (sources."getpass-0.1.7" // {
         dependencies = [
-          sources."graceful-fs-1.2.3"
+          sources."assert-plus-1.0.0"
         ];
       })
+      sources."glob-4.5.3"
+      sources."glob-parent-3.1.0"
+      sources."glob-stream-3.1.18"
+      sources."glob-watcher-0.0.6"
       sources."glob2base-0.0.12"
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
-      sources."globals-9.18.0"
-      sources."globule-0.1.0"
-      sources."glogg-1.0.1"
-      sources."graceful-fs-3.0.11"
-      (sources."gulp-3.9.1" // {
+      (sources."globule-0.1.0" // {
         dependencies = [
-          sources."clone-0.2.0"
           sources."glob-3.1.21"
-          sources."has-values-0.1.4"
+          sources."graceful-fs-1.2.3"
           sources."inherits-1.0.2"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-1.0.1"
-          sources."is-number-4.0.0"
-          sources."isarray-0.0.1"
-          sources."lodash-1.0.2"
           sources."minimatch-0.2.14"
-          sources."semver-4.3.6"
         ];
       })
-      (sources."gulp-babel-6.1.3" // {
+      sources."glogg-1.0.1"
+      sources."graceful-fs-3.0.11"
+      sources."gulp-3.9.1"
+      (sources."gulp-clean-css-3.9.4" // {
         dependencies = [
-          sources."jsesc-1.3.0"
-          sources."minimatch-3.0.4"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.3"
         ];
       })
-      (sources."gulp-clean-css-3.9.4" // {
+      (sources."gulp-jsonminify-1.1.0" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-          sources."through2-2.0.3"
+          sources."arr-diff-1.1.0"
+          sources."arr-union-2.1.0"
+          sources."array-slice-0.2.3"
+          sources."extend-shallow-1.1.4"
+          sources."kind-of-1.1.0"
+          sources."plugin-error-0.1.2"
         ];
       })
       (sources."gulp-less-3.5.0" // {
@@ -38256,25 +38642,15 @@ in
           sources."arr-union-2.1.0"
           sources."array-slice-0.2.3"
           sources."extend-shallow-1.1.4"
-          sources."glob-7.1.2"
-          sources."graceful-fs-4.1.11"
-          sources."kind-of-3.2.2"
-          sources."minimatch-3.0.4"
-          (sources."plugin-error-0.1.2" // {
-            dependencies = [
-              sources."kind-of-1.1.0"
-            ];
-          })
+          sources."kind-of-1.1.0"
+          sources."plugin-error-0.1.2"
           sources."readable-stream-2.3.6"
-          sources."replace-ext-1.0.0"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.3"
         ];
       })
-      sources."gulp-rename-1.2.3"
       (sources."gulp-sourcemaps-2.6.4" // {
         dependencies = [
-          sources."debug-3.1.0"
           sources."graceful-fs-4.1.11"
           sources."readable-stream-2.3.6"
           sources."source-map-0.6.1"
@@ -38289,47 +38665,38 @@ in
           sources."array-slice-0.2.3"
           sources."clone-2.1.2"
           sources."clone-stats-1.0.0"
-          sources."end-of-stream-1.4.1"
           sources."extend-shallow-1.1.4"
           sources."glob-7.1.2"
           sources."glob-stream-6.1.0"
           sources."graceful-fs-4.1.11"
           sources."kind-of-1.1.0"
           sources."minimatch-3.0.4"
-          sources."once-1.4.0"
           sources."ordered-read-streams-1.0.1"
           sources."plugin-error-0.1.2"
           sources."readable-stream-2.3.6"
-          sources."replace-ext-1.0.0"
           sources."source-map-0.6.1"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.3"
           sources."unique-stream-2.2.1"
-          sources."vinyl-2.1.0"
+          sources."vinyl-2.2.0"
           sources."vinyl-fs-3.0.3"
         ];
       })
       (sources."gulp-uglify-3.0.0" // {
         dependencies = [
+          sources."lodash-4.17.10"
           sources."readable-stream-2.3.6"
-          sources."source-map-0.6.1"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.3"
-          sources."uglify-js-3.3.25"
         ];
       })
       (sources."gulp-util-3.0.8" // {
         dependencies = [
-          sources."isarray-0.0.1"
           sources."object-assign-3.0.0"
-          sources."readable-stream-1.1.14"
+          sources."readable-stream-2.3.6"
+          sources."replace-ext-0.0.1"
           sources."string_decoder-1.1.1"
-          (sources."through2-2.0.3" // {
-            dependencies = [
-              sources."isarray-1.0.0"
-              sources."readable-stream-2.3.6"
-            ];
-          })
+          sources."through2-2.0.3"
           sources."vinyl-0.5.3"
         ];
       })
@@ -38340,10 +38707,13 @@ in
       sources."has-gulplog-0.1.0"
       sources."has-symbols-1.0.0"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."hawk-3.1.3"
       sources."hoek-2.16.3"
-      sources."home-or-tmp-2.0.0"
       sources."homedir-polyfill-1.0.1"
       sources."http-signature-1.1.1"
       sources."image-size-0.5.5"
@@ -38352,7 +38722,6 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."interpret-1.1.0"
-      sources."invariant-2.2.4"
       sources."is-absolute-1.0.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-buffer-1.1.6"
@@ -38360,11 +38729,13 @@ in
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-finite-1.0.2"
       sources."is-glob-3.1.0"
       sources."is-negated-glob-1.0.0"
-      sources."is-number-3.0.0"
-      sources."is-odd-2.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
       sources."is-relative-1.0.0"
@@ -38377,14 +38748,12 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
-      sources."js-tokens-3.0.2"
       sources."jsbn-0.1.1"
-      sources."jsesc-0.5.0"
       sources."json-schema-0.2.3"
       sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."json5-0.5.1"
       sources."jsonify-0.0.0"
+      sources."jsonminify-0.2.3"
       (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -38392,23 +38761,20 @@ in
       })
       sources."kind-of-6.0.2"
       sources."lazy-cache-1.0.4"
-      sources."lazystream-1.0.0"
+      (sources."lazystream-1.0.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."lead-1.0.0"
-      sources."less-2.7.3"
-      (sources."liftoff-2.5.0" // {
+      (sources."less-2.7.3" // {
         dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-0.1.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."graceful-fs-4.1.11"
         ];
       })
-      sources."lodash-4.17.10"
+      sources."liftoff-2.5.0"
+      sources."lodash-1.0.2"
       sources."lodash._basecopy-3.0.1"
       sources."lodash._basetostring-3.0.1"
       sources."lodash._basevalues-3.0.0"
@@ -38433,7 +38799,6 @@ in
       sources."lodash.templatesettings-3.1.1"
       sources."lodash.uniq-4.5.0"
       sources."longest-1.0.1"
-      sources."loose-envify-1.3.1"
       sources."lru-cache-2.7.3"
       sources."lru-queue-0.1.0"
       sources."make-error-1.3.4"
@@ -38442,30 +38807,45 @@ in
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."memoizee-0.4.12"
-      (sources."micromatch-3.1.10" // {
-        dependencies = [
-          sources."is-extendable-0.1.1"
-        ];
-      })
+      sources."micromatch-3.1.10"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-2.0.10"
       sources."minimist-1.2.0"
-      sources."mixin-deep-1.3.1"
-      sources."mkdirp-0.5.1"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
-      sources."nanomatch-1.2.9"
-      sources."natives-1.1.3"
+      sources."nanomatch-1.2.13"
+      sources."natives-1.1.4"
       sources."next-tick-1.0.0"
       sources."normalize-path-2.1.1"
       sources."now-and-later-2.0.0"
-      sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
-      sources."object-copy-0.1.0"
-      sources."object-keys-1.0.11"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-keys-1.0.12"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.0"
       sources."object.defaults-1.1.0"
@@ -38475,7 +38855,6 @@ in
       sources."orchestrator-0.3.8"
       sources."ordered-read-streams-0.1.0"
       sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
       sources."parse-filepath-1.0.2"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
@@ -38488,33 +38867,42 @@ in
       sources."plugin-error-1.0.1"
       sources."posix-character-classes-0.1.1"
       sources."pretty-hrtime-1.0.3"
-      sources."private-0.1.8"
       sources."process-nextick-args-2.0.0"
       sources."promise-7.3.1"
-      sources."proxy-polyfill-0.2.0"
       sources."prr-1.0.1"
-      sources."pump-2.0.1"
+      (sources."pump-2.0.1" // {
+        dependencies = [
+          (sources."end-of-stream-1.4.1" // {
+            dependencies = [
+              sources."once-1.4.0"
+            ];
+          })
+        ];
+      })
       sources."pumpify-1.5.1"
       sources."punycode-1.4.1"
       sources."qs-6.4.0"
-      sources."readable-stream-1.0.34"
+      (sources."readable-stream-1.0.34" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."rechoir-0.6.2"
-      sources."regenerate-1.4.0"
-      sources."regenerator-runtime-0.10.5"
-      sources."regenerator-transform-0.10.1"
       sources."regex-not-1.0.2"
-      sources."regexpu-core-2.0.0"
-      sources."regjsgen-0.2.0"
-      sources."regjsparser-0.1.5"
       sources."remove-bom-buffer-3.0.0"
-      sources."remove-bom-stream-1.2.0"
+      (sources."remove-bom-stream-1.2.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."repeating-2.0.1"
-      sources."replace-ext-0.0.1"
+      sources."replace-ext-1.0.0"
       sources."request-2.81.0"
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
       sources."resolve-url-0.2.1"
@@ -38522,25 +38910,36 @@ in
       sources."right-align-0.1.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.5.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-4.3.6"
       sources."sequencify-0.0.7"
-      sources."set-value-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."sigmund-1.0.1"
-      sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."define-property-1.0.0"
         ];
       })
       (sources."snapdragon-util-3.0.1" // {
@@ -38551,20 +38950,31 @@ in
       sources."sntp-1.0.9"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
-      sources."source-map-support-0.4.18"
       sources."source-map-url-0.4.0"
       sources."sparkles-1.0.1"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      (sources."sshpk-1.14.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
+          sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.14.1" // {
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."assert-plus-1.0.0"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."static-extend-0.1.2"
       sources."stream-consume-0.1.1"
       sources."stream-shift-1.0.0"
       sources."string_decoder-0.10.31"
@@ -38574,32 +38984,45 @@ in
       sources."strip-bom-string-1.0.0"
       sources."supports-color-2.0.0"
       sources."through2-0.6.5"
-      sources."through2-filter-2.0.0"
+      (sources."through2-filter-2.0.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
       sources."tildify-1.2.0"
       sources."time-stamp-1.1.0"
       sources."timers-ext-0.1.5"
       sources."to-absolute-glob-2.0.2"
-      sources."to-fast-properties-1.0.3"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."to-through-2.0.0"
+      (sources."to-through-2.0.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
       sources."tough-cookie-2.3.4"
-      sources."trim-right-1.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typescript-2.7.2"
-      (sources."uglify-es-3.3.10" // {
+      (sources."uglify-js-3.4.2" // {
         dependencies = [
-          sources."commander-2.14.1"
           sources."source-map-0.6.1"
         ];
       })
-      sources."uglify-js-2.8.29"
       sources."uglify-to-browserify-1.0.2"
       sources."unc-path-regex-0.1.2"
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -38611,32 +39034,39 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
       sources."urix-0.1.0"
-      (sources."use-3.1.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."use-3.1.0"
       sources."user-home-1.1.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."v8flags-2.1.1"
       sources."value-or-function-3.0.0"
-      sources."verror-1.10.0"
-      sources."vinyl-0.4.6"
-      (sources."vinyl-fs-0.3.14" // {
+      (sources."verror-1.10.0" // {
         dependencies = [
-          sources."inherits-2.0.3"
-          sources."minimist-0.0.8"
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."vinyl-0.4.6" // {
+        dependencies = [
+          sources."clone-0.2.0"
+        ];
+      })
+      sources."vinyl-fs-0.3.14"
+      (sources."vinyl-sourcemap-1.1.0" // {
+        dependencies = [
+          sources."clone-2.1.2"
+          sources."clone-stats-1.0.0"
+          sources."graceful-fs-4.1.11"
+          sources."vinyl-2.2.0"
         ];
       })
-      sources."vinyl-sourcemap-1.1.0"
       sources."vinyl-sourcemaps-apply-0.2.1"
       sources."whatwg-fetch-2.0.4"
       sources."when-3.7.8"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."window-size-0.1.0"
       sources."wordwrap-0.0.2"
       sources."wrappy-1.0.2"
@@ -38655,24 +39085,24 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.1.1";
+    version = "5.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz";
-      sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz";
+      sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."browser-stdout-1.3.1"
-      sources."commander-2.11.0"
+      sources."commander-2.15.1"
       sources."concat-map-0.0.1"
       sources."debug-3.1.0"
       sources."diff-3.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.2"
-      sources."growl-1.10.3"
-      sources."has-flag-2.0.0"
+      sources."growl-1.10.5"
+      sources."has-flag-3.0.0"
       sources."he-1.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -38682,7 +39112,7 @@ in
       sources."ms-2.0.0"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."supports-color-4.4.0"
+      sources."supports-color-5.4.0"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -38706,9 +39136,9 @@ in
       sources."argparse-1.0.10"
       sources."asynckit-0.4.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."component-emitter-1.2.1"
-      sources."cookiejar-2.1.1"
+      sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
       sources."debug-3.1.0"
       sources."delayed-stream-1.0.0"
@@ -38719,7 +39149,7 @@ in
       sources."graphlib-2.1.5"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."json-refs-2.1.7"
       sources."lodash-4.17.10"
       sources."methods-1.1.2"
@@ -38730,7 +39160,7 @@ in
       sources."native-promise-only-0.8.1"
       sources."path-loader-1.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."punycode-2.1.0"
+      sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
@@ -38773,26 +39203,25 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.5.3";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.3.tgz";
-      sha512 = "1nwm3hvx3ybg10mzn5sysdgxii42975v6gyrzjb79s46lhk67ndf1fcrlrxcfaiyj9a997hz2zk9ysm0qclxsd5nziwm01myv95z262";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.6.0.tgz";
+      sha512 = "MJY6SsQH3pN59R9N3nMz/L8BsbQ0DlvSF38mgg1fwfwgnaJ+y600s3Nd0vZ+cnETUH+4OPETc4QohflccjPUYw==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
       sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."base64-js-1.2.3"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
-      sources."buffer-from-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."buffer-from-1.1.0"
       sources."builtin-modules-1.1.1"
       sources."builtins-1.0.3"
       sources."caseless-0.12.0"
@@ -38803,11 +39232,6 @@ in
       sources."config-chain-1.1.11"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -38820,7 +39244,11 @@ in
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
-      sources."fs-extra-0.6.4"
+      (sources."fs-extra-0.6.4" // {
+        dependencies = [
+          sources."mkdirp-0.3.5"
+        ];
+      })
       (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -38832,9 +39260,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."http-signature-1.2.0"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -38852,7 +39278,7 @@ in
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.0"
+      sources."minipass-2.3.3"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -38882,21 +39308,21 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."retry-0.10.1"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
       sources."slide-1.1.6"
-      sources."sntp-2.1.0"
       sources."spdx-correct-3.0.0"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."ssri-5.3.0"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
@@ -38909,12 +39335,12 @@ in
       sources."typedarray-0.0.6"
       sources."uid-number-0.0.5"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.3"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
       sources."walk-2.3.13"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
       sources."yallist-3.0.2"
     ];
@@ -38930,26 +39356,26 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.6.2";
+    version = "3.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
-      sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz";
+      sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-5.5.2"
+      sources."ajv-4.11.8"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."asn1-0.2.3"
-      sources."assert-plus-1.0.0"
+      sources."assert-plus-0.2.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."block-stream-0.0.9"
-      sources."boom-4.3.1"
+      sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
@@ -38958,33 +39384,35 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
+      sources."cryptiles-2.0.5"
+      (sources."dashdash-1.14.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-1.1.0"
-      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      sources."form-data-2.1.4"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
       sources."has-unicode-2.0.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."http-signature-1.2.0"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."http-signature-1.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."is-fullwidth-code-point-1.0.0"
@@ -38994,9 +39422,14 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.3.1"
+      sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
@@ -39012,37 +39445,47 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
-      sources."performance-now-2.1.0"
+      sources."performance-now-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.2"
+      sources."qs-6.4.0"
       sources."readable-stream-2.3.6"
-      sources."request-2.86.0"
+      sources."request-2.81.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
+      sources."sntp-1.0.9"
+      (sources."sshpk-1.14.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."verror-1.10.0"
-      sources."which-1.3.0"
-      sources."wide-align-1.1.2"
+      sources."uuid-3.3.2"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."which-1.3.1"
+      sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Node.js native addon build tool";
-      homepage = "https://github.com/nodejs/node-gyp#readme";
+      homepage = https://github.com/nodejs/node-gyp;
       license = "MIT";
     };
     production = true;
@@ -39051,10 +39494,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.3.0";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
-      sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
+      sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -39080,7 +39523,7 @@ in
       sources."ajv-4.11.8"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."array-find-index-1.0.2"
       sources."array-flatten-1.1.1"
       sources."asn1-0.2.3"
@@ -39091,27 +39534,15 @@ in
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
-      sources."bcrypt-pbkdf-1.0.1"
-      (sources."biased-opener-0.2.8" // {
-        dependencies = [
-          sources."yargs-1.3.3"
-        ];
-      })
-      sources."big-integer-1.6.28"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."biased-opener-0.2.8"
+      sources."big-integer-1.6.32"
       sources."block-stream-0.0.9"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.2"
       sources."boom-2.10.1"
       sources."bplist-parser-0.1.1"
       sources."brace-expansion-1.1.11"
-      (sources."browser-launcher2-0.4.6" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."browser-launcher2-0.4.6"
       sources."builtin-modules-1.1.1"
       sources."bytes-3.0.0"
       sources."camelcase-2.1.1"
@@ -39130,10 +39561,14 @@ in
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       sources."currently-unhandled-0.4.1"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."default-browser-id-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -39143,7 +39578,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."express-4.16.3"
@@ -39160,7 +39595,11 @@ in
       sources."fstream-ignore-1.0.5"
       sources."gauge-2.7.4"
       sources."get-stdin-4.0.1"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
       sources."har-schema-1.0.5"
@@ -39169,7 +39608,7 @@ in
       sources."hawk-3.1.3"
       sources."headless-0.1.7"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.1.1"
       sources."iconv-lite-0.4.19"
@@ -39212,11 +39651,21 @@ in
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."nan-2.10.0"
       sources."negotiator-0.6.1"
-      sources."node-pre-gyp-0.6.39"
+      (sources."node-pre-gyp-0.6.39" // {
+        dependencies = [
+          sources."glob-7.1.2"
+          sources."rimraf-2.6.2"
+          sources."semver-5.5.0"
+        ];
+      })
       sources."nopt-4.0.1"
       sources."normalize-package-data-2.4.0"
       sources."npmlog-4.1.2"
@@ -39240,11 +39689,7 @@ in
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      (sources."plist-1.2.0" // {
-        dependencies = [
-          sources."lodash-3.10.1"
-        ];
-      })
+      sources."plist-1.2.0"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.3"
       sources."punycode-1.4.1"
@@ -39254,17 +39699,23 @@ in
         dependencies = [
           sources."depd-1.1.1"
           sources."http-errors-1.6.2"
+          sources."setprototypeof-1.0.3"
         ];
       })
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.81.0"
+      (sources."request-2.81.0" // {
+        dependencies = [
+          sources."qs-6.4.0"
+        ];
+      })
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
       sources."semver-4.3.6"
       sources."send-0.16.2"
       (sources."serve-favicon-2.5.0" // {
@@ -39281,7 +39732,7 @@ in
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -39294,9 +39745,14 @@ in
       sources."strip-bom-2.0.0"
       sources."strip-indent-1.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."strong-data-uri-1.0.5"
+      sources."strong-data-uri-1.0.6"
       sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
+      (sources."tar-pack-3.4.1" // {
+        dependencies = [
+          sources."glob-7.1.2"
+          sources."rimraf-2.6.2"
+        ];
+      })
       sources."tough-cookie-2.3.4"
       sources."trim-newlines-1.0.0"
       sources."truncate-2.0.1"
@@ -39310,28 +39766,33 @@ in
       sources."untildify-2.1.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
-      (sources."v8-debug-1.0.1" // {
-        dependencies = [
-          sources."glob-7.1.2"
-          sources."qs-6.4.0"
-          sources."rimraf-2.6.2"
-          sources."semver-5.5.0"
-        ];
-      })
+      sources."uuid-3.3.2"
+      sources."v8-debug-1.0.1"
       sources."v8-profiler-5.7.0"
       sources."validate-npm-package-license-3.0.3"
       sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      sources."which-1.3.0"
-      sources."wide-align-1.1.2"
-      sources."win-detect-browsers-1.0.2"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."which-1.3.1"
+      sources."wide-align-1.1.3"
+      (sources."win-detect-browsers-1.0.2" // {
+        dependencies = [
+          sources."yargs-1.3.3"
+        ];
+      })
       sources."window-size-0.1.4"
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."ws-1.1.5"
       sources."x-default-browser-0.3.1"
-      sources."xmlbuilder-4.0.0"
+      (sources."xmlbuilder-4.0.0" // {
+        dependencies = [
+          sources."lodash-3.10.1"
+        ];
+      })
       sources."xmldom-0.1.27"
       sources."xtend-4.0.1"
       sources."y18n-3.2.1"
@@ -39348,16 +39809,16 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.10.0";
+    version = "0.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz";
-      sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz";
+      sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chownr-1.0.1"
@@ -39366,7 +39827,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
       sources."fs-minipass-1.2.5"
@@ -39383,7 +39844,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.0"
+      sources."minipass-2.3.3"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -39400,7 +39861,7 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      (sources."rc-1.2.7" // {
+      (sources."rc-1.2.8" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -39417,9 +39878,9 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.2"
+      sources."tar-4.4.4"
       sources."util-deprecate-1.0.2"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
       sources."yallist-3.0.2"
     ];
@@ -39435,24 +39896,17 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.17.4";
+    version = "1.17.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz";
-      sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz";
+      sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      (sources."anymatch-2.0.0" // {
-        dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-1.0.1"
-        ];
-      })
+      sources."anymatch-2.0.0"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -39463,12 +39917,7 @@ in
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
       sources."binary-extensions-1.11.0"
@@ -39476,21 +39925,19 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."chalk-2.4.1"
-      (sources."chokidar-2.0.3" // {
+      sources."chokidar-2.0.4"
+      sources."ci-info-1.1.3"
+      (sources."class-utils-0.3.6" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-          sources."has-values-0.1.4"
+          sources."define-property-0.2.5"
           (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -39502,25 +39949,13 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
-          sources."is-extendable-0.1.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."ci-info-1.1.3"
-      (sources."class-utils-0.3.6" // {
-        dependencies = [
-          sources."define-property-0.2.5"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."cli-boxes-1.0.0"
       sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."configstore-3.1.2"
@@ -39531,7 +39966,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."define-property-2.0.2"
       sources."dot-prop-4.2.0"
       sources."duplexer-0.1.1"
@@ -39541,7 +39976,22 @@ in
       sources."execa-0.7.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."extend-shallow-3.0.2"
@@ -39549,10 +39999,15 @@ in
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
-      sources."fill-range-4.0.0"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
@@ -39569,7 +40024,11 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."ignore-by-default-1.0.1"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -39587,9 +40046,12 @@ in
       sources."is-glob-4.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
-      sources."is-number-4.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-obj-1.0.1"
-      sources."is-odd-2.0.0"
       sources."is-path-inside-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-redirect-1.0.0"
@@ -39601,38 +40063,36 @@ in
       sources."isobject-3.0.1"
       sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
+      sources."lodash.debounce-4.0.8"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-stream-0.1.0"
       sources."map-visit-1.0.0"
-      (sources."micromatch-3.1.10" // {
-        dependencies = [
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-0.1.1"
-        ];
-      })
+      sources."micromatch-3.1.10"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mixin-deep-1.3.1"
       sources."ms-2.0.0"
       sources."nan-2.10.0"
-      sources."nanomatch-1.2.9"
+      sources."nanomatch-1.2.13"
       sources."nopt-1.0.10"
       sources."normalize-path-2.1.1"
       sources."npm-run-path-2.0.2"
-      sources."object-copy-0.1.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."p-finally-1.0.0"
@@ -39650,7 +40110,7 @@ in
       sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
       sources."pstree.remy-1.1.0"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."regex-not-1.0.2"
@@ -39666,34 +40126,67 @@ in
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."set-immediate-shim-1.0.1"
-      sources."set-value-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."snapdragon-node-2.1.1"
-      sources."snapdragon-util-3.0.1"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."split-0.3.3"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
-          sources."is-extendable-1.0.1"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."static-extend-0.1.2"
       sources."stream-combiner-0.0.4"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
@@ -39704,7 +40197,11 @@ in
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."touch-3.1.0"
@@ -39715,6 +40212,8 @@ in
       })
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -39726,6 +40225,7 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
       sources."unzip-response-2.0.1"
@@ -39733,13 +40233,9 @@ in
       sources."update-notifier-2.5.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
-      (sources."use-3.1.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."use-3.1.0"
       sources."util-deprecate-1.0.2"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."widest-line-2.0.0"
       sources."write-file-atomic-2.3.0"
       sources."xdg-basedir-3.0.0"
@@ -39757,10 +40253,10 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.18.5";
+    version = "0.18.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.18.5.tgz";
-      sha512 = "39pg9g9hqnalz1dl4zhs3g53lz92syqxbdxpfa89psxxdiz9xg6sa4arf35gw0fi46r3bn5vgwrf9w4ks6s822mq42n1bq85jfq1jqs";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.18.7.tgz";
+      sha512 = "c88H51qK2chQNITdN3tDzk4TgPWHzBxEGE2jQwHihjeneGnJEihDnoncsGB7CA2s9aU1tlh2lbifdObFhQr8gA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -39770,7 +40266,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."append-field-0.1.0"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."argparse-1.0.10"
       sources."array-flatten-1.1.1"
       sources."array-indexofobject-0.0.1"
@@ -39784,35 +40280,30 @@ in
       sources."balanced-match-1.0.0"
       sources."basic-auth-2.0.0"
       sources."bcrypt-1.0.3"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bcryptjs-2.4.3"
       sources."bl-1.2.2"
       sources."block-stream-0.0.9"
-      (sources."body-parser-1.18.2" // {
+      sources."body-parser-1.18.3"
+      sources."boolbase-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.0"
+      (sources."buildmail-2.0.0" // {
         dependencies = [
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
-          sources."setprototypeof-1.0.3"
+          sources."needle-0.10.0"
         ];
       })
-      sources."boolbase-1.0.0"
-      sources."boom-4.3.1"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.0.0"
-      sources."buildmail-2.0.0"
-      sources."busboy-0.2.14"
-      sources."bytes-3.0.0"
-      sources."callback-stream-1.1.0"
-      sources."caseless-0.12.0"
-      (sources."cheerio-0.22.0" // {
+      (sources."busboy-0.2.14" // {
         dependencies = [
-          sources."domelementtype-1.1.3"
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
         ];
       })
+      sources."bytes-3.0.0"
+      sources."callback-stream-1.1.0"
+      sources."caseless-0.12.0"
+      sources."cheerio-0.22.0"
       sources."clone-2.1.1"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
@@ -39832,22 +40323,27 @@ in
       sources."cors-2.8.4"
       sources."crc-3.4.4"
       sources."cron-1.3.0"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."css-select-1.2.0"
       sources."css-what-2.1.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."dicer-0.2.5"
-      sources."dom-serializer-0.1.0"
+      (sources."dicer-0.2.5" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
@@ -39864,6 +40360,16 @@ in
       sources."etag-1.8.1"
       (sources."express-4.16.3" // {
         dependencies = [
+          sources."body-parser-1.18.2"
+          (sources."http-errors-1.6.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
@@ -39872,8 +40378,16 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."feedparser-2.2.9"
-      sources."finalhandler-1.1.1"
+      (sources."feedparser-2.2.9" // {
+        dependencies = [
+          sources."addressparser-1.0.1"
+        ];
+      })
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       (sources."follow-redirects-1.4.1" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -39898,24 +40412,20 @@ in
       sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
       sources."hash-sum-1.0.2"
-      sources."hawk-6.0.2"
-      (sources."help-me-1.1.0" // {
-        dependencies = [
-          sources."pump-2.0.1"
-        ];
-      })
-      sources."hoek-4.2.1"
-      (sources."htmlparser2-3.9.2" // {
-        dependencies = [
-          sources."domelementtype-1.3.0"
-        ];
-      })
+      sources."help-me-1.1.0"
+      sources."htmlparser2-3.9.2"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."i18next-1.10.6"
       sources."i18next-client-1.10.3"
-      sources."iconv-lite-0.4.19"
-      sources."imap-0.8.19"
+      sources."iconv-lite-0.4.23"
+      (sources."imap-0.8.19" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -39939,7 +40449,7 @@ in
       sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."json5-0.2.0"
-      sources."jsonata-1.5.3"
+      sources."jsonata-1.5.4"
       sources."jsonfile-4.0.0"
       sources."jsonify-0.0.0"
       sources."jsprim-1.4.1"
@@ -39965,11 +40475,7 @@ in
       sources."lodash.some-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lru-cache-4.1.3"
-      (sources."mailcomposer-2.1.0" // {
-        dependencies = [
-          sources."needle-0.10.0"
-        ];
-      })
+      sources."mailcomposer-2.1.0"
       sources."mailparser-0.6.2"
       sources."media-typer-0.3.0"
       (sources."memorystore-1.6.0" // {
@@ -39982,27 +40488,27 @@ in
       sources."mime-1.4.1"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
-      sources."mimelib-0.3.1"
+      (sources."mimelib-0.3.1" // {
+        dependencies = [
+          sources."addressparser-1.0.1"
+        ];
+      })
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
-      sources."moment-2.22.1"
-      sources."moment-timezone-0.5.17"
-      (sources."mqtt-2.17.0" // {
+      (sources."mkdirp-0.5.1" // {
         dependencies = [
-          sources."ws-3.3.3"
+          sources."minimist-0.0.8"
         ];
       })
+      sources."moment-2.22.2"
+      sources."moment-timezone-0.5.21"
+      sources."mqtt-2.18.0"
       sources."mqtt-packet-5.6.0"
       sources."mri-1.1.1"
       sources."ms-2.0.0"
       (sources."multer-1.3.0" // {
         dependencies = [
-          sources."isarray-0.0.1"
-          sources."minimist-0.0.8"
           sources."object-assign-3.0.0"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
         ];
       })
       sources."mustache-2.3.0"
@@ -40010,27 +40516,17 @@ in
       sources."needle-0.11.0"
       sources."negotiator-0.6.1"
       sources."node-pre-gyp-0.6.36"
-      (sources."node-red-node-email-0.1.29" // {
+      sources."node-red-node-email-0.1.29"
+      sources."node-red-node-feedparser-0.1.12"
+      sources."node-red-node-rbe-0.2.3"
+      sources."node-red-node-twitter-1.0.1"
+      sources."nodemailer-1.11.0"
+      sources."nodemailer-direct-transport-1.1.0"
+      (sources."nodemailer-smtp-transport-1.1.0" // {
         dependencies = [
-          sources."addressparser-1.0.1"
           sources."clone-1.0.4"
-          sources."isarray-0.0.1"
-          sources."minimist-0.0.10"
-          sources."readable-stream-1.1.14"
-          sources."semver-5.3.0"
-          sources."string_decoder-0.10.31"
-        ];
-      })
-      (sources."node-red-node-feedparser-0.1.12" // {
-        dependencies = [
-          sources."addressparser-1.0.1"
         ];
       })
-      sources."node-red-node-rbe-0.2.3"
-      sources."node-red-node-twitter-0.1.13"
-      sources."nodemailer-1.11.0"
-      sources."nodemailer-direct-transport-1.1.0"
-      sources."nodemailer-smtp-transport-1.1.0"
       sources."nodemailer-wellknown-0.1.10"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
@@ -40043,7 +40539,11 @@ in
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."once-1.4.0"
-      sources."optimist-0.6.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
       sources."options-0.0.6"
       sources."ordered-read-streams-1.0.1"
       sources."os-homedir-1.0.2"
@@ -40064,39 +40564,42 @@ in
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
-      sources."pumpify-1.5.1"
-      sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      sources."random-bytes-1.0.0"
-      sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.3" // {
+      (sources."pumpify-1.5.1" // {
         dependencies = [
-          sources."iconv-lite-0.4.23"
+          sources."pump-2.0.1"
         ];
       })
-      sources."rc-1.2.7"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."random-bytes-1.0.0"
+      sources."range-parser-1.2.0"
+      sources."raw-body-2.3.3"
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."retry-0.6.1"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
-      sources."send-0.16.2"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."sentiment-2.1.0"
       sources."serve-static-1.13.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.0"
       sources."signal-exit-3.0.2"
       sources."smtp-connection-1.3.8"
-      sources."sntp-2.1.0"
       sources."source-map-0.6.1"
       sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.0"
       sources."streamsearch-0.1.2"
@@ -40115,25 +40618,33 @@ in
       sources."twitter-ng-0.6.2"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.3.24"
+      sources."uglify-js-3.3.25"
       sources."uid-number-0.0.6"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."ultron-1.1.1"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.2.1"
-      sources."universalify-0.1.1"
+      sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
-      sources."utf7-1.0.2"
+      (sources."utf7-1.0.2" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uue-3.1.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."websocket-stream-5.1.2"
+      (sources."websocket-stream-5.1.2" // {
+        dependencies = [
+          sources."ws-3.3.3"
+        ];
+      })
       sources."when-3.7.8"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
       (sources."ws-1.1.5" // {
@@ -40192,15 +40703,15 @@ in
       sources."connect-flash-0.1.0"
       sources."cookie-0.0.5"
       sources."cookie-signature-1.0.1"
-      sources."debug-3.1.0"
-      sources."diff-1.0.8"
-      sources."ejs-0.8.3"
-      sources."esprima-1.0.4"
-      (sources."express-3.2.0" // {
+      (sources."debug-3.1.0" // {
         dependencies = [
           sources."ms-2.0.0"
         ];
       })
+      sources."diff-1.0.8"
+      sources."ejs-0.8.3"
+      sources."esprima-1.0.4"
+      sources."express-3.2.0"
       sources."express-partials-0.0.6"
       sources."eyes-0.1.8"
       sources."formidable-1.0.11"
@@ -40234,11 +40745,7 @@ in
       sources."ms-0.1.0"
       sources."muri-0.3.1"
       sources."nan-1.0.0"
-      (sources."net-ping-1.1.7" // {
-        dependencies = [
-          sources."nan-2.10.0"
-        ];
-      })
+      sources."net-ping-1.1.7"
       sources."nodemailer-0.3.35"
       sources."nodemailer-fetch-1.6.0"
       sources."nodemailer-shared-1.1.0"
@@ -40252,17 +40759,17 @@ in
       sources."qs-0.5.1"
       sources."rai-0.1.12"
       sources."range-parser-0.0.4"
-      sources."raw-socket-1.6.0"
+      (sources."raw-socket-1.6.2" // {
+        dependencies = [
+          sources."nan-2.10.0"
+        ];
+      })
       sources."redis-0.7.3"
       sources."semver-1.1.0"
       sources."send-0.1.0"
       sources."simplesmtp-0.3.35"
       sources."sliced-0.0.3"
-      (sources."socket.io-0.9.14" // {
-        dependencies = [
-          sources."commander-2.1.0"
-        ];
-      })
+      sources."socket.io-0.9.14"
       sources."socket.io-client-0.9.11"
       sources."tinycolor-0.0.1"
       sources."uglify-js-1.2.5"
@@ -40271,7 +40778,11 @@ in
       sources."vows-0.8.2"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
-      sources."ws-0.4.32"
+      (sources."ws-0.4.32" // {
+        dependencies = [
+          sources."commander-2.1.0"
+        ];
+      })
       sources."xmlhttprequest-1.4.2"
       sources."xoauth2-0.1.8"
       sources."zeparser-0.0.5"
@@ -40287,10 +40798,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.0.1";
+    version = "6.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz";
-      sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp";
+      url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz";
+      sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -40315,7 +40826,7 @@ in
       sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."argparse-0.1.15"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
@@ -40323,13 +40834,8 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      (sources."block-stream-0.0.9" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
-      sources."boom-4.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."block-stream-0.0.9"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
       sources."chownr-0.0.2"
@@ -40346,11 +40852,6 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."couch-login-0.1.20"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -40363,16 +40864,17 @@ in
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
-      sources."fs-extra-0.6.4"
-      (sources."fs.extra-1.3.2" // {
+      (sources."fs-extra-0.6.4" // {
         dependencies = [
           sources."rimraf-2.2.8"
         ];
       })
+      sources."fs.extra-1.3.2"
       sources."fs.realpath-1.0.0"
       (sources."fstream-0.1.31" // {
         dependencies = [
-          sources."inherits-2.0.3"
+          sources."graceful-fs-3.0.11"
+          sources."mkdirp-0.5.1"
         ];
       })
       sources."gauge-2.7.4"
@@ -40382,8 +40884,6 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -40403,7 +40903,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.3.5"
-      sources."natives-1.1.3"
+      sources."natives-1.1.4"
       sources."ncp-0.4.2"
       sources."nopt-2.2.1"
       (sources."npm-registry-client-0.2.27" // {
@@ -40431,24 +40931,22 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."retry-0.6.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-4.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slide-1.1.6"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       (sources."tar-0.1.17" // {
         dependencies = [
-          sources."graceful-fs-3.0.11"
           sources."inherits-1.0.2"
-          sources."mkdirp-0.5.1"
         ];
       })
       (sources."temp-0.6.0" // {
@@ -40463,10 +40961,10 @@ in
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."verror-1.10.0"
       sources."walk-2.3.13"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -40483,7 +40981,7 @@ in
     version = "2.14.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.2.tgz";
-      sha512 = "20p92czrssb8mfn5lmaswrzv0wy5va0r7xlmh5f6sd7zj46iydqkhfmfy9lv3d6zf7x42zdbkdrj4mk420gzlmgb3wgd608cafcnalk";
+      sha512 = "kyrLnGIImPb4WK/S/4AgsxKZ21ztC9KP+6aNTZN31cGJm4+GyH+aNq7ASvvJQO3iOdg/c60qLdZVtLTOn4l0gQ==";
     };
     dependencies = [
       sources."ansi-align-2.0.0"
@@ -40491,7 +40989,13 @@ in
       sources."ansi-styles-2.2.1"
       sources."argparse-1.0.10"
       sources."bluebird-3.5.1"
-      sources."boxen-1.3.0"
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."chalk-1.1.3"
@@ -40499,16 +41003,16 @@ in
       sources."cint-8.2.1"
       sources."cli-boxes-1.0.0"
       sources."cli-table-0.3.1"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."colors-1.0.3"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."configstore-3.1.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
       sources."escape-string-regexp-1.0.5"
@@ -40537,7 +41041,7 @@ in
       sources."is-stream-1.1.0"
       sources."isexe-2.0.0"
       sources."jju-1.3.0"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."json-parse-helpfulerror-1.0.3"
       sources."json5-0.5.1"
       sources."latest-version-3.1.0"
@@ -40556,7 +41060,7 @@ in
         ];
       })
       sources."object-assign-4.1.1"
-      sources."object-keys-1.0.11"
+      sources."object-keys-1.0.12"
       sources."p-finally-1.0.0"
       sources."package-json-4.0.1"
       sources."path-exists-2.1.0"
@@ -40567,7 +41071,7 @@ in
       sources."pinkie-promise-2.0.1"
       sources."prepend-http-1.0.4"
       sources."pseudomap-1.0.2"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."rc-config-loader-2.0.1"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
@@ -40581,7 +41085,12 @@ in
       sources."signal-exit-3.0.2"
       sources."spawn-please-0.3.0"
       sources."sprintf-js-1.0.3"
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -40592,15 +41101,13 @@ in
       sources."unzip-response-2.0.1"
       (sources."update-notifier-2.5.0" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
-          sources."strip-ansi-4.0.0"
           sources."supports-color-5.4.0"
         ];
       })
       sources."url-parse-lax-1.0.0"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."widest-line-2.0.0"
       sources."write-file-atomic-2.3.0"
       sources."xdg-basedir-3.0.0"
@@ -40621,7 +41128,7 @@ in
     version = "3.2.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/nsp/-/nsp-3.2.1.tgz";
-      sha512 = "06qrykgjpr3m7sl9g2axaraxh3mndmffgjxf45nqw5jblqa9zsnkvgmds8s29avp4qhmk084ri0rbg30yr15bd73i2152q6na5qdfbl";
+      sha512 = "dLmGi7IGixJEHKetErIH460MYiYIzAoxuVsloZFu9e1p9U8K0yULx7YQ1+VzrjZbB+wqq67ES1SfOvKVb/qMDQ==";
     };
     dependencies = [
       sources."agent-base-4.2.0"
@@ -40636,20 +41143,16 @@ in
       sources."cli-cursor-2.1.0"
       sources."cli-table2-0.2.0"
       sources."cli-width-2.2.0"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-        ];
-      })
+      sources."cliui-3.2.0"
       sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."colors-1.2.5"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."colors-1.3.0"
       sources."cross-spawn-5.1.0"
-      sources."cvss-1.0.2"
+      sources."cvss-1.0.3"
       sources."debug-3.1.0"
       sources."decamelize-1.2.0"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."es6-promise-4.2.4"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
@@ -40662,7 +41165,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."hoek-4.2.1"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.23"
       (sources."inquirer-3.3.0" // {
@@ -40698,7 +41201,7 @@ in
       sources."os-locale-2.1.0"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
       sources."parse-json-2.2.0"
@@ -40733,7 +41236,7 @@ in
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."validate-npm-package-license-3.0.3"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."wrap-ansi-2.1.0"
       sources."wreck-12.5.1"
@@ -40761,10 +41264,10 @@ in
   ocaml-language-server = nodeEnv.buildNodePackage {
     name = "ocaml-language-server";
     packageName = "ocaml-language-server";
-    version = "1.0.34";
+    version = "1.0.35";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.34.tgz";
-      sha512 = "216lq2hh4mmk0lzkn381p0l4lgr84xmv6jdjc42yry1yb695zy7bs36n40dmvc81afgsnc51b1rcbn51438ysk59w0drrxd8x43zykr";
+      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.35.tgz";
+      sha512 = "9RS7+KyrmFFL2BZLjIBjLToqbDTKDTAoCGrQDm8eYgKie/ep6UnodGuvZgRaM9HOQ8RDzBh4rE3CfGdNsggD4g==";
     };
     dependencies = [
       sources."async-2.6.0"
@@ -40786,7 +41289,7 @@ in
       sources."vscode-languageclient-4.0.1"
       sources."vscode-languageserver-4.0.0"
       sources."vscode-languageserver-protocol-3.6.0"
-      sources."vscode-languageserver-types-3.7.2"
+      sources."vscode-languageserver-types-3.8.2"
       sources."vscode-uri-1.0.3"
       sources."wrappy-1.0.2"
     ];
@@ -40825,15 +41328,20 @@ in
       sources."aws4-1.7.0"
       sources."babybird-0.0.1"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."bl-1.2.2"
+      sources."bcrypt-pbkdf-1.0.2"
+      (sources."bl-1.2.2" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."bluebird-3.5.1"
       (sources."body-parser-1.18.3" // {
         dependencies = [
           sources."content-type-1.0.4"
         ];
       })
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."builtin-modules-1.1.1"
       sources."bunyan-1.8.12"
@@ -40844,12 +41352,20 @@ in
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."clarinet-0.11.0"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."colors-1.2.5"
+      sources."colors-1.3.0"
       sources."combined-stream-1.0.6"
-      sources."compressible-2.0.13"
+      (sources."compressible-2.0.14" // {
+        dependencies = [
+          sources."mime-db-1.34.0"
+        ];
+      })
       sources."compression-1.7.2"
       sources."concat-map-0.0.1"
       sources."connect-busboy-0.0.2"
@@ -40857,13 +41373,8 @@ in
       sources."content-type-git+https://github.com/wikimedia/content-type#master"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.5.6"
+      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
@@ -40876,41 +41387,32 @@ in
       sources."dnscache-1.0.1"
       sources."dom-storage-2.1.0"
       sources."domino-1.0.30"
-      sources."dtrace-provider-0.8.6"
+      sources."dtrace-provider-0.8.7"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.1"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-html-1.0.3"
       sources."esprima-4.0.0"
       sources."etag-1.8.1"
       (sources."express-4.16.3" // {
         dependencies = [
-          (sources."body-parser-1.18.2" // {
+          sources."body-parser-1.18.2"
+          sources."content-type-1.0.4"
+          (sources."http-errors-1.6.2" // {
             dependencies = [
+              sources."depd-1.1.1"
               sources."setprototypeof-1.0.3"
             ];
           })
-          sources."content-type-1.0.4"
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
+          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
-      (sources."express-handlebars-3.0.0" // {
-        dependencies = [
-          sources."async-1.5.2"
-          sources."wordwrap-0.0.2"
-          sources."yargs-3.10.0"
-        ];
-      })
+      sources."express-handlebars-3.0.0"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
@@ -40933,14 +41435,16 @@ in
       sources."getpass-0.1.7"
       sources."glob-6.0.4"
       sources."graceful-fs-4.1.11"
-      sources."handlebars-4.0.11"
+      (sources."handlebars-4.0.11" // {
+        dependencies = [
+          sources."async-1.5.2"
+        ];
+      })
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-symbols-1.0.0"
       sources."hat-0.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."hot-shots-4.8.0"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
@@ -40958,20 +41462,42 @@ in
       sources."is-utf8-0.2.1"
       sources."isarray-0.0.1"
       sources."isstream-0.1.2"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
-      sources."kad-git+https://github.com/gwicke/kad.git#master"
-      sources."kad-fs-0.0.4"
+      (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
+        dependencies = [
+          sources."ms-0.7.3"
+        ];
+      })
+      (sources."kad-fs-0.0.4" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."kad-localstorage-0.0.7"
-      sources."kad-memstore-0.0.1"
+      (sources."kad-memstore-0.0.1" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
       sources."lcid-1.0.0"
-      sources."limitation-0.2.0"
+      (sources."limitation-0.2.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."load-json-file-1.1.0"
       sources."lodash-3.10.1"
       sources."lodash._baseclone-4.5.7"
@@ -40987,10 +41513,20 @@ in
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
-      sources."mkdirp-0.5.1"
-      sources."moment-2.22.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.22.2"
       sources."ms-2.0.0"
-      sources."msgpack5-3.6.0"
+      (sources."msgpack5-3.6.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."mv-2.1.1"
       sources."nan-2.10.0"
       sources."ncp-2.0.0"
@@ -40998,7 +41534,7 @@ in
       sources."normalize-package-data-2.4.0"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
-      sources."object-keys-1.0.11"
+      sources."object-keys-1.0.12"
       sources."object.assign-4.1.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
@@ -41028,42 +41564,37 @@ in
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-1.1.14"
       sources."repeat-string-1.6.1"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."right-align-0.1.3"
       sources."rimraf-2.4.5"
       sources."safe-buffer-5.1.1"
-      sources."safe-json-stringify-1.1.0"
+      sources."safe-json-stringify-1.2.0"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
-      sources."send-0.16.2"
-      (sources."serve-favicon-2.5.0" // {
+      (sources."send-0.16.2" // {
         dependencies = [
-          sources."ms-2.1.1"
+          sources."statuses-1.4.0"
         ];
       })
-      sources."serve-static-1.13.2"
-      (sources."service-runner-2.3.0" // {
+      (sources."serve-favicon-2.5.0" // {
         dependencies = [
-          sources."isarray-1.0.0"
-          sources."minimist-0.0.8"
-          sources."ms-0.7.3"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          sources."ms-2.1.1"
         ];
       })
+      sources."serve-static-1.13.2"
+      sources."service-runner-2.3.0"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.0"
       sources."simplediff-0.1.1"
-      sources."sntp-2.1.0"
       sources."source-map-0.4.4"
       sources."spdx-correct-3.0.0"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.5.0"
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
@@ -41077,13 +41608,14 @@ in
       (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."source-map-0.5.7"
+          sources."yargs-3.10.0"
         ];
       })
       sources."uglify-to-browserify-1.0.2"
       sources."unpipe-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
@@ -41099,7 +41631,11 @@ in
           sources."cliui-3.2.0"
         ];
       })
-      sources."yargs-parser-5.0.0"
+      (sources."yargs-parser-5.0.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -41112,16 +41648,20 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.38.0";
+    version = "0.39.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.38.0.tgz";
-      sha512 = "0jy97ypdv4a36cdcszfcj0qmv1z1k896h17xb7n2jzj26r4bz8kpj0dcnx255mj5bpxv3074gmabdk2da9jmp2awryyxj7f6l31p2bi";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.39.0.tgz";
+      sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA==";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
       sources."airplay-protocol-2.0.2"
-      sources."airplayer-2.0.0"
-      sources."ansi-escapes-1.4.0"
+      (sources."airplayer-2.0.0" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
+      sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."appendable-cli-menu-2.0.0"
@@ -41130,32 +41670,43 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
-      sources."big-integer-1.6.28"
+      sources."big-integer-1.6.32"
       sources."bitfield-0.1.0"
-      sources."bittorrent-dht-6.4.2"
-      sources."bittorrent-tracker-7.7.0"
-      sources."blob-to-buffer-1.2.7"
+      (sources."bittorrent-dht-6.4.2" // {
+        dependencies = [
+          sources."bencode-0.7.0"
+        ];
+      })
+      (sources."bittorrent-tracker-7.7.0" // {
+        dependencies = [
+          sources."bencode-0.8.0"
+        ];
+      })
+      sources."blob-to-buffer-1.2.8"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
       sources."bonjour-3.5.0"
       sources."bplist-creator-0.0.6"
       sources."bplist-parser-0.1.1"
       sources."brace-expansion-1.1.11"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-equal-0.0.1"
       sources."buffer-equals-1.0.4"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-indexof-1.1.1"
       sources."builtin-modules-1.1.1"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."chalk-1.1.3"
-      sources."cli-cursor-1.0.2"
+      sources."chardet-0.4.2"
+      sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       sources."clivas-0.2.0"
       sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -41168,22 +41719,21 @@ in
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."dns-equal-1.0.0"
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
       sources."end-of-stream-1.4.1"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
-      sources."exit-hook-1.1.1"
-      sources."extend-3.0.1"
-      sources."external-editor-1.1.1"
+      sources."external-editor-2.2.0"
       sources."fifo-0.1.4"
-      sources."figures-1.7.0"
+      sources."figures-2.0.0"
       sources."find-up-1.1.2"
       sources."flatten-0.0.1"
       (sources."fs-chunk-store-1.7.0" // {
         dependencies = [
+          sources."minimist-0.0.8"
           sources."mkdirp-0.5.1"
         ];
       })
@@ -41193,17 +41743,26 @@ in
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
+      sources."has-flag-3.0.0"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."http-headers-3.0.2"
+      sources."iconv-lite-0.4.23"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      (sources."inquirer-1.2.3" // {
+      (sources."inquirer-5.2.0" // {
         dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."is-fullwidth-code-point-2.0.0"
           sources."lodash-4.17.10"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."internal-ip-1.2.0"
@@ -41220,7 +41779,6 @@ in
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
-          sources."bencode-2.0.0"
           sources."k-bucket-2.0.1"
         ];
       })
@@ -41233,7 +41791,8 @@ in
       sources."magnet-uri-5.1.8"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-1.6.0"
+      sources."mime-2.3.1"
+      sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -41241,15 +41800,15 @@ in
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
       sources."multicast-dns-service-types-1.1.0"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."network-address-1.1.2"
       sources."next-line-1.1.0"
       sources."normalize-package-data-2.4.0"
       sources."number-is-nan-1.0.1"
-      sources."numeral-1.5.6"
+      sources."numeral-2.0.6"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
-      sources."onetime-1.1.0"
+      sources."onetime-2.0.1"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -41257,7 +41816,6 @@ in
         ];
       })
       sources."options-0.0.6"
-      sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
       sources."parse-json-2.2.0"
       (sources."parse-torrent-5.9.1" // {
@@ -41265,43 +41823,56 @@ in
           sources."get-stdin-6.0.0"
         ];
       })
-      sources."parse-torrent-file-2.1.4"
+      (sources."parse-torrent-file-2.1.4" // {
+        dependencies = [
+          sources."bencode-0.7.0"
+        ];
+      })
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
-      sources."peer-wire-protocol-0.7.1"
-      (sources."peer-wire-swarm-0.12.2" // {
+      (sources."peer-wire-protocol-0.7.1" // {
         dependencies = [
           sources."bncode-0.2.3"
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
         ];
       })
+      sources."peer-wire-swarm-0.12.2"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."plist-1.2.0"
       sources."process-nextick-args-2.0.0"
-      sources."pump-1.0.3"
-      sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.2.0"
+      sources."pump-2.0.1"
+      (sources."random-access-file-2.0.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
+        ];
+      })
+      sources."random-access-storage-1.3.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."re-emitter-1.1.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."restore-cursor-1.0.1"
+      sources."restore-cursor-2.0.0"
       sources."reverse-http-1.3.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."run-parallel-1.1.9"
       sources."run-series-1.1.8"
       sources."rusha-0.8.13"
-      sources."rx-4.1.0"
+      sources."rxjs-5.5.11"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."server-destroy-1.0.1"
       sources."signal-exit-3.0.2"
@@ -41311,11 +41882,11 @@ in
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
+          sources."safe-buffer-5.0.1"
           sources."ws-2.3.1"
         ];
       })
       sources."single-line-log-1.1.2"
-      sources."spawn-sync-1.0.15"
       sources."spdx-correct-3.0.0"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
@@ -41330,34 +41901,20 @@ in
       sources."strip-indent-1.0.1"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
+      sources."symbol-observable-1.0.1"
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."thunky-1.0.2"
-      sources."tmp-0.0.29"
-      (sources."torrent-discovery-5.4.0" // {
-        dependencies = [
-          sources."bencode-0.8.0"
-          sources."isarray-1.0.0"
-          sources."minimist-1.2.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."torrent-piece-1.1.1"
+      sources."tmp-0.0.33"
+      sources."torrent-discovery-5.4.0"
+      sources."torrent-piece-1.1.2"
       (sources."torrent-stream-1.0.4" // {
         dependencies = [
-          sources."bencode-0.7.0"
           sources."end-of-stream-0.1.5"
-          sources."isarray-0.0.1"
           sources."magnet-uri-4.2.3"
-          sources."minimist-0.0.8"
           sources."once-1.3.3"
           sources."parse-torrent-4.1.0"
-          sources."readable-stream-1.1.14"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-0.10.31"
           sources."thirty-two-0.0.2"
-          sources."ultron-1.0.2"
         ];
       })
       sources."trim-newlines-1.0.0"
@@ -41367,10 +41924,14 @@ in
       sources."util-deprecate-1.0.2"
       sources."utp-0.0.7"
       sources."validate-npm-package-license-3.0.3"
-      sources."winreg-1.2.3"
+      sources."winreg-1.2.4"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
-      sources."ws-1.1.5"
+      (sources."ws-1.1.5" // {
+        dependencies = [
+          sources."ultron-1.0.2"
+        ];
+      })
       sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.27"
       sources."xtend-4.0.1"
@@ -41411,19 +41972,28 @@ in
       sources."better-assert-1.0.2"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
-      sources."bittorrent-tracker-7.7.0"
+      (sources."bittorrent-tracker-7.7.0" // {
+        dependencies = [
+          sources."bencode-0.8.0"
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."blob-0.0.4"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
-      sources."body-parser-1.13.3"
+      (sources."body-parser-1.13.3" // {
+        dependencies = [
+          sources."qs-4.0.0"
+        ];
+      })
       sources."boom-0.3.8"
       sources."brace-expansion-1.1.11"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-equal-0.0.1"
       sources."buffer-equals-1.0.4"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."bytes-2.1.0"
       sources."callsite-1.0.0"
       sources."combined-stream-0.0.7"
@@ -41432,20 +42002,20 @@ in
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
-      sources."compressible-2.0.13"
+      (sources."compressible-2.0.14" // {
+        dependencies = [
+          sources."mime-db-1.34.0"
+        ];
+      })
       sources."compression-1.5.2"
       sources."concat-map-0.0.1"
       (sources."connect-2.30.2" // {
         dependencies = [
-          sources."accepts-1.2.13"
-          sources."escape-html-1.0.3"
-          sources."ms-0.7.2"
-          sources."negotiator-0.5.3"
-          sources."send-0.13.2"
-          sources."vary-1.1.2"
+          sources."multiparty-3.3.2"
+          sources."qs-4.0.0"
         ];
       })
-      sources."connect-multiparty-2.1.0"
+      sources."connect-multiparty-2.1.1"
       sources."connect-timeout-1.6.2"
       sources."content-disposition-0.5.0"
       sources."content-type-1.0.4"
@@ -41459,55 +42029,62 @@ in
       sources."csrf-3.0.6"
       sources."csurf-1.8.3"
       sources."cyclist-0.1.1"
-      (sources."debug-2.2.0" // {
-        dependencies = [
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."debug-2.2.0"
       sources."decompress-response-3.3.0"
       sources."delayed-stream-0.0.5"
       sources."depd-1.0.1"
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
       sources."end-of-stream-1.4.1"
-      sources."engine.io-1.8.5"
-      sources."engine.io-client-1.8.5"
+      (sources."engine.io-1.8.5" // {
+        dependencies = [
+          sources."accepts-1.3.3"
+          sources."cookie-0.3.1"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+          sources."negotiator-0.6.1"
+        ];
+      })
+      (sources."engine.io-client-1.8.5" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."engine.io-parser-1.3.2"
-      sources."errorhandler-1.4.3"
+      (sources."errorhandler-1.4.3" // {
+        dependencies = [
+          sources."accepts-1.3.5"
+          sources."escape-html-1.0.3"
+          sources."negotiator-0.6.1"
+        ];
+      })
       sources."escape-html-1.0.2"
       sources."etag-1.7.0"
       (sources."express-3.21.2" // {
         dependencies = [
-          sources."accepts-1.3.5"
-          sources."destroy-1.0.3"
-          sources."ms-2.0.0"
-          sources."multiparty-3.3.2"
-          sources."negotiator-0.6.1"
-          sources."qs-4.0.0"
           sources."range-parser-1.0.3"
-          sources."statuses-1.2.1"
-          sources."uid-safe-2.0.0"
         ];
       })
-      sources."express-session-1.11.3"
-      sources."fd-slicer-1.0.1"
-      sources."fifo-0.1.4"
-      (sources."finalhandler-0.4.0" // {
+      (sources."express-session-1.11.3" // {
         dependencies = [
-          sources."escape-html-1.0.2"
+          sources."uid-safe-2.0.0"
         ];
       })
+      sources."fd-slicer-1.0.1"
+      sources."fifo-0.1.4"
+      sources."finalhandler-0.4.0"
       sources."flatten-0.0.1"
       sources."fluent-ffmpeg-2.1.2"
       sources."forever-agent-0.2.0"
-      sources."form-data-0.0.10"
-      sources."forwarded-0.1.2"
-      sources."fresh-0.3.0"
-      (sources."fs-chunk-store-1.7.0" // {
+      (sources."form-data-0.0.10" // {
         dependencies = [
-          sources."mkdirp-0.5.1"
+          sources."mime-1.2.11"
         ];
       })
+      sources."forwarded-0.1.2"
+      sources."fresh-0.3.0"
+      sources."fs-chunk-store-1.7.0"
       sources."fs.realpath-1.0.0"
       sources."get-browser-rtc-1.0.2"
       sources."glob-7.1.2"
@@ -41532,11 +42109,14 @@ in
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
-          sources."bencode-2.0.0"
           sources."k-bucket-2.0.1"
         ];
       })
-      sources."k-rpc-socket-1.8.0"
+      (sources."k-rpc-socket-1.8.0" // {
+        dependencies = [
+          sources."bencode-2.0.0"
+        ];
+      })
       sources."lodash-2.4.2"
       sources."lru-2.0.1"
       sources."magnet-uri-2.0.1"
@@ -41545,6 +42125,8 @@ in
       (sources."method-override-2.3.10" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."ms-2.0.0"
+          sources."vary-1.1.2"
         ];
       })
       sources."methods-1.1.2"
@@ -41579,19 +42161,19 @@ in
       sources."parseurl-1.3.2"
       sources."path-is-absolute-1.0.1"
       sources."pause-0.1.0"
-      sources."peer-wire-protocol-0.7.1"
-      (sources."peer-wire-swarm-0.12.2" // {
+      (sources."peer-wire-protocol-0.7.1" // {
         dependencies = [
           sources."bncode-0.2.3"
         ];
       })
+      sources."peer-wire-swarm-0.12.2"
       sources."pend-1.2.0"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.0.10"
       sources."pump-1.0.3"
       sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.2.0"
+      sources."random-access-storage-1.3.0"
       sources."random-bytes-1.0.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
@@ -41603,14 +42185,14 @@ in
         ];
       })
       sources."re-emitter-1.1.3"
-      (sources."read-torrent-1.3.0" // {
+      sources."read-torrent-1.3.0"
+      sources."readable-stream-1.1.14"
+      (sources."request-2.16.6" // {
         dependencies = [
           sources."mime-1.2.11"
           sources."qs-0.5.6"
         ];
       })
-      sources."readable-stream-1.1.14"
-      sources."request-2.16.6"
       (sources."response-time-2.3.2" // {
         dependencies = [
           sources."depd-1.1.2"
@@ -41624,43 +42206,72 @@ in
       sources."safe-buffer-5.1.2"
       (sources."send-0.13.0" // {
         dependencies = [
-          sources."ms-0.7.1"
+          sources."destroy-1.0.3"
+          sources."range-parser-1.0.3"
+          sources."statuses-1.2.1"
+        ];
+      })
+      (sources."serve-favicon-2.3.2" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."serve-index-1.7.3" // {
+        dependencies = [
+          sources."escape-html-1.0.3"
         ];
       })
-      sources."serve-favicon-2.3.2"
-      sources."serve-index-1.7.3"
       (sources."serve-static-1.10.3" // {
         dependencies = [
           sources."depd-1.1.2"
-          sources."ms-0.7.1"
+          sources."escape-html-1.0.3"
+          sources."range-parser-1.0.3"
+          sources."send-0.13.2"
+          sources."statuses-1.2.1"
         ];
       })
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
-      sources."simple-peer-6.4.4"
+      (sources."simple-peer-6.4.4" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.1.1"
+          sources."ultron-1.1.1"
           sources."ws-2.3.1"
         ];
       })
       sources."sntp-0.1.4"
       (sources."socket.io-1.7.4" // {
         dependencies = [
-          sources."accepts-1.3.3"
-          sources."component-emitter-1.1.2"
-          sources."cookie-0.3.1"
           sources."debug-2.3.3"
           sources."ms-0.7.2"
-          sources."negotiator-0.6.1"
         ];
       })
-      sources."socket.io-adapter-0.5.0"
-      sources."socket.io-client-1.7.4"
+      (sources."socket.io-adapter-0.5.0" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-client-1.7.4" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
       (sources."socket.io-parser-2.3.1" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."component-emitter-1.1.2"
         ];
       })
       sources."speedometer-0.1.4"
@@ -41672,19 +42283,12 @@ in
       sources."thunky-1.0.2"
       sources."to-array-0.1.4"
       sources."torrent-discovery-5.4.0"
-      sources."torrent-piece-1.1.1"
+      sources."torrent-piece-1.1.2"
       (sources."torrent-stream-1.0.4" // {
         dependencies = [
-          sources."bencode-0.8.0"
           sources."end-of-stream-0.1.5"
-          sources."isarray-1.0.0"
-          sources."minimist-1.2.0"
           sources."mkdirp-0.3.5"
           sources."once-1.3.3"
-          sources."readable-stream-2.3.6"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.1.1"
-          sources."ultron-1.1.1"
         ];
       })
       sources."tsscmp-1.0.5"
@@ -41699,7 +42303,7 @@ in
       sources."utp-0.0.7"
       sources."vary-1.0.1"
       sources."vhost-3.0.2"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."wrappy-1.0.2"
       sources."ws-1.1.5"
       sources."wtf-8-1.0.0"
@@ -41729,22 +42333,26 @@ in
       sources."ansi-styles-2.2.1"
       sources."asn1-0.2.3"
       sources."assert-plus-0.2.0"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."aws-sign2-0.6.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.0.3"
       sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."debug-0.7.4"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
@@ -41759,7 +42367,11 @@ in
       sources."fs.realpath-1.0.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."har-validator-2.0.6"
@@ -41810,8 +42422,9 @@ in
       sources."request-2.67.0"
       sources."request-progress-2.0.1"
       sources."rimraf-2.6.2"
+      sources."safer-buffer-2.1.2"
       sources."sntp-1.0.9"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -41826,7 +42439,11 @@ in
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
       sources."util-deprecate-1.0.2"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."which-1.2.14"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
@@ -41844,10 +42461,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.12.1";
+    version = "1.13.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz";
-      sha1 = "c1ad20e803e7749faf905a409d2367e06bbe7325";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz";
+      sha512 = "KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -41861,31 +42478,17 @@ in
   pulp = nodeEnv.buildNodePackage {
     name = "pulp";
     packageName = "pulp";
-    version = "12.2.0";
+    version = "12.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pulp/-/pulp-12.2.0.tgz";
-      sha512 = "1kgjvji88fvdi6vazqq6gx32zqgkg9qp639952cz2v2g5izl7yblgawy1xra5dypv5c1a43wk4ch4iskr1kxxpfmn7pnql92q1nvxgg";
+      url = "https://registry.npmjs.org/pulp/-/pulp-12.3.0.tgz";
+      sha512 = "Sm1XQg2h2JBVHWK3bxSHnmMdMoM0hEi5cbGfBBLpM6E2qU1vjJhDJsO/8bEkxC2RvNAAEOWROKMI3tTzmVxLbQ==";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
-      sources."acorn-4.0.13"
-      sources."acorn-node-1.3.0"
-      (sources."anymatch-2.0.0" // {
-        dependencies = [
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-0.1.1"
-        ];
-      })
+      sources."JSONStream-1.3.3"
+      sources."acorn-5.7.1"
+      sources."acorn-dynamic-import-3.0.0"
+      sources."acorn-node-1.5.2"
+      sources."anymatch-2.0.0"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -41894,21 +42497,20 @@ in
       sources."array-reduce-0.0.0"
       sources."array-unique-0.3.2"
       sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
+      (sources."assert-1.4.1" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+          sources."util-0.10.3"
+        ];
+      })
       sources."assign-symbols-1.0.0"
-      sources."astw-2.2.0"
       sources."async-1.5.2"
       sources."async-each-1.0.1"
       sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
       sources."base64-js-1.3.0"
@@ -41917,26 +42519,24 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."is-extendable-0.1.1"
         ];
       })
       sources."brorand-1.1.0"
       sources."browser-pack-6.1.0"
-      (sources."browser-resolve-1.11.2" // {
+      (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
         ];
       })
       (sources."browserify-13.3.0" // {
         dependencies = [
-          sources."acorn-5.5.3"
           (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."readable-stream-2.0.6"
             ];
           })
-          sources."isarray-2.0.4"
-          sources."process-nextick-args-2.0.0"
         ];
       })
       sources."browserify-aes-1.2.0"
@@ -41954,27 +42554,32 @@ in
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."buffer-crc32-0.2.13"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.1"
-      (sources."chokidar-2.0.3" // {
-        dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-1.0.1"
-        ];
-      })
+      sources."chokidar-2.0.4"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.2.5"
+      sources."colors-1.3.0"
       sources."combine-source-map-0.8.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -42006,6 +42611,20 @@ in
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."extend-shallow-3.0.2"
@@ -42013,15 +42632,21 @@ in
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
-      sources."fill-range-4.0.0"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       sources."function-bind-1.1.1"
+      sources."get-assigned-identifiers-1.2.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
       (sources."glob-parent-3.1.0" // {
@@ -42030,24 +42655,24 @@ in
         ];
       })
       sources."graceful-fs-4.1.11"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
+      sources."hash.js-1.1.4"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
-      sources."ieee754-1.1.11"
+      sources."ieee754-1.1.12"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      (sources."insert-module-globals-7.1.0" // {
-        dependencies = [
-          sources."concat-stream-1.6.2"
-        ];
-      })
+      sources."insert-module-globals-7.2.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -42056,8 +42681,11 @@ in
       sources."is-extendable-1.0.1"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.0"
-      sources."is-number-4.0.0"
-      sources."is-odd-2.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-plain-object-2.0.4"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
@@ -42067,8 +42695,12 @@ in
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
       sources."kind-of-6.0.2"
-      sources."labeled-stream-splicer-2.0.1"
-      sources."lexical-scope-1.2.0"
+      (sources."labeled-stream-splicer-2.0.1" // {
+        dependencies = [
+          sources."isarray-2.0.4"
+        ];
+      })
+      sources."lodash.debounce-4.0.8"
       sources."lodash.memoize-3.0.4"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -42081,8 +42713,20 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mixin-deep-1.3.1"
-      sources."mkdirp-0.5.1"
-      sources."module-deps-4.1.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."module-deps-4.1.1" // {
+        dependencies = [
+          (sources."concat-stream-1.5.2" // {
+            dependencies = [
+              sources."readable-stream-2.0.6"
+            ];
+          })
+        ];
+      })
       (sources."mold-source-map-0.4.0" // {
         dependencies = [
           sources."through-2.2.7"
@@ -42091,27 +42735,39 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.10.0"
-      sources."nanomatch-1.2.9"
+      sources."nanomatch-1.2.13"
       sources."neo-async-2.5.1"
-      (sources."node-static-0.7.10" // {
+      sources."node-static-0.7.10"
+      sources."normalize-path-2.1.1"
+      (sources."object-copy-0.1.0" // {
         dependencies = [
-          sources."minimist-0.0.10"
-          sources."wordwrap-0.0.3"
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."normalize-path-2.1.1"
-      sources."object-copy-0.1.0"
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."optimist-0.6.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+          sources."wordwrap-0.0.3"
+        ];
+      })
       sources."os-browserify-0.1.2"
       sources."os-tmpdir-1.0.2"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.1"
       sources."pascalcase-0.1.1"
-      sources."path-browserify-0.0.0"
+      sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
@@ -42130,7 +42786,7 @@ in
       sources."read-only-stream-2.0.0"
       (sources."readable-stream-2.3.6" // {
         dependencies = [
-          sources."isarray-1.0.0"
+          sources."process-nextick-args-2.0.0"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -42139,51 +42795,80 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."rimraf-2.6.2"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      (sources."sander-0.5.1" // {
+      sources."sander-0.5.1"
+      sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
-      sources."set-immediate-shim-1.0.1"
-      sources."set-value-2.0.0"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
+      sources."simple-concat-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."snapdragon-node-2.1.1"
-      sources."snapdragon-util-3.0.1"
       sources."sorcery-0.10.0"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."sourcemap-codec-1.4.1"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
-          sources."is-extendable-1.0.1"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."static-extend-0.1.2"
       sources."stream-browserify-2.0.1"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.2"
+      sources."stream-http-2.8.3"
       sources."stream-splicer-2.0.0"
       sources."string-stream-0.0.7"
       sources."string_decoder-0.10.31"
@@ -42198,15 +42883,22 @@ in
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."to-arraybuffer-1.0.1"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."tree-kill-1.2.0"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
+      sources."undeclared-identifiers-1.1.2"
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -42217,6 +42909,7 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
       sources."upath-1.1.0"
@@ -42226,44 +42919,12 @@ in
           sources."punycode-1.3.2"
         ];
       })
-      (sources."use-3.1.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."use-3.1.0"
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      (sources."watchpack-1.6.0" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-          sources."has-values-0.1.4"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-0.1.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."which-1.3.0"
+      sources."watchpack-1.6.0"
+      sources."which-1.3.1"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
@@ -42286,8 +42947,8 @@ in
       sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa";
     };
     dependencies = [
-      sources."@types/babel-types-7.0.2"
-      sources."@types/babylon-6.16.2"
+      sources."@types/babel-types-7.0.4"
+      sources."@types/babylon-6.16.3"
       sources."accepts-1.3.5"
       sources."acorn-3.3.0"
       (sources."acorn-globals-3.1.0" // {
@@ -42299,7 +42960,7 @@ in
       sources."align-text-0.1.4"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."array-flatten-1.1.1"
       sources."asap-2.0.6"
       sources."asn1-0.2.3"
@@ -42311,14 +42972,14 @@ in
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
       sources."basic-auth-2.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bindings-1.2.1"
       sources."bl-1.2.2"
       sources."body-parser-1.18.3"
       sources."boom-2.10.1"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
-      sources."buffer-fill-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-fill-1.0.0"
       sources."bufferutil-2.0.1"
       sources."bytes-3.0.0"
       sources."camelcase-1.2.1"
@@ -42331,7 +42992,7 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."console-control-strings-1.1.0"
       sources."constantinople-3.1.2"
       sources."content-disposition-0.5.2"
@@ -42339,13 +43000,17 @@ in
       sources."cookie-0.3.1"
       sources."cookie-parser-1.4.3"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.5.6"
+      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -42363,25 +43028,26 @@ in
       sources."expand-template-1.1.1"
       (sources."express-4.16.3" // {
         dependencies = [
-          (sources."body-parser-1.18.2" // {
+          sources."body-parser-1.18.2"
+          (sources."http-errors-1.6.2" // {
             dependencies = [
+              sources."depd-1.1.1"
               sources."setprototypeof-1.0.3"
             ];
           })
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
+          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
-      sources."finalhandler-1.1.1"
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
       sources."forwarded-0.1.2"
@@ -42389,12 +43055,16 @@ in
       sources."fs-constants-1.0.0"
       sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."github-from-package-0.0.0"
       sources."graceful-fs-4.1.11"
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."has-unicode-2.0.1"
       sources."hawk-3.1.3"
       sources."hoek-2.16.3"
@@ -42409,7 +43079,11 @@ in
       sources."ipaddr.js-1.6.0"
       sources."is-3.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-expression-3.0.0"
+      (sources."is-expression-3.0.0" // {
+        dependencies = [
+          sources."acorn-4.0.13"
+        ];
+      })
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-promise-2.1.0"
       sources."is-regex-1.0.4"
@@ -42430,11 +43104,7 @@ in
       sources."jstransformer-1.0.0"
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
-      (sources."less-2.7.3" // {
-        dependencies = [
-          sources."qs-6.4.0"
-        ];
-      })
+      sources."less-2.7.3"
       sources."less-middleware-2.2.1"
       sources."libquassel-2.1.9"
       sources."lodash-4.17.10"
@@ -42451,14 +43121,8 @@ in
       sources."ms-2.0.0"
       sources."nan-2.5.1"
       sources."negotiator-0.6.1"
-      (sources."net-browserify-alt-1.1.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-          sources."safe-buffer-5.0.1"
-          sources."tunnel-agent-0.4.3"
-        ];
-      })
-      sources."node-abi-2.4.1"
+      sources."net-browserify-alt-1.1.0"
+      sources."node-abi-2.4.3"
       sources."node.extend-2.0.0"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
@@ -42473,16 +43137,17 @@ in
       sources."path-parse-1.0.5"
       sources."path-to-regexp-0.1.7"
       sources."performance-now-0.2.0"
-      sources."prebuild-install-2.1.2"
+      (sources."prebuild-install-2.1.2" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+          sources."tunnel-agent-0.4.3"
+        ];
+      })
       sources."process-nextick-args-2.0.0"
       sources."promise-7.3.1"
       sources."proxy-addr-2.0.3"
       sources."prr-1.0.1"
-      (sources."pug-2.0.3" // {
-        dependencies = [
-          sources."acorn-4.0.13"
-        ];
-      })
+      sources."pug-2.0.3"
       sources."pug-attrs-2.0.3"
       sources."pug-code-gen-2.0.1"
       sources."pug-error-1.3.2"
@@ -42500,17 +43165,29 @@ in
       sources."qtdatastream-0.7.1"
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.3"
-      sources."rc-1.2.7"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."readable-stream-2.3.6"
       sources."regenerator-runtime-0.11.1"
       sources."repeat-string-1.6.1"
-      sources."request-2.81.0"
-      sources."resolve-1.7.1"
+      (sources."request-2.81.0" // {
+        dependencies = [
+          sources."qs-6.4.0"
+        ];
+      })
+      sources."resolve-1.8.1"
       sources."right-align-0.1.3"
       sources."safe-buffer-5.1.1"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
-      sources."send-0.16.2"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       (sources."serve-favicon-2.3.2" // {
         dependencies = [
           sources."etag-1.7.0"
@@ -42525,7 +43202,7 @@ in
       sources."simple-get-1.4.3"
       sources."sntp-1.0.9"
       sources."source-map-0.5.7"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -42536,7 +43213,7 @@ in
       sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-fs-1.16.2"
+      sources."tar-fs-1.16.3"
       sources."tar-stream-1.6.1"
       sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
@@ -42552,16 +43229,24 @@ in
       sources."unzip-response-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."void-elements-2.0.1"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."window-size-0.1.0"
       sources."with-5.1.1"
       sources."wordwrap-0.0.2"
       sources."wrappy-1.0.2"
-      sources."ws-2.3.1"
+      (sources."ws-2.3.1" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."xtend-4.0.1"
       sources."yargs-3.10.0"
     ];
@@ -42583,13 +43268,13 @@ in
       sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
     };
     dependencies = [
-      sources."acorn-5.5.3"
+      sources."acorn-5.7.1"
       sources."amdefine-1.0.1"
       sources."ast-types-0.9.6"
       sources."balanced-match-1.0.0"
       sources."base62-0.1.1"
       sources."brace-expansion-1.1.11"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."commoner-0.10.8"
       sources."concat-map-0.0.1"
       sources."defined-1.0.0"
@@ -42657,17 +43342,17 @@ in
       sources."isstream-0.1.2"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."mute-stream-0.0.7"
       sources."ncp-0.4.2"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."pkginfo-0.4.1"
-      (sources."prompt-0.2.14" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."prompt-0.2.14"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
@@ -42708,8 +43393,7 @@ in
       sources."aws-sdk-1.18.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."buffer-crc32-0.2.1"
       sources."bytes-0.2.1"
       sources."caseless-0.12.0"
@@ -42726,11 +43410,6 @@ in
       sources."cookie-signature-1.0.1"
       sources."core-util-is-1.0.2"
       sources."crc-0.2.0"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."crypto-0.0.3"
       sources."dashdash-1.14.1"
       sources."debug-3.1.0"
@@ -42765,8 +43444,6 @@ in
       sources."getpass-0.1.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-auth-2.0.7"
       sources."http-signature-1.2.0"
       sources."inherits-2.0.3"
@@ -42795,7 +43472,7 @@ in
       (sources."openid-2.0.6" // {
         dependencies = [
           sources."qs-6.5.2"
-          sources."request-2.86.0"
+          sources."request-2.87.0"
         ];
       })
       sources."pause-0.0.1"
@@ -42807,10 +43484,10 @@ in
       sources."readable-stream-1.1.14"
       sources."request-2.9.203"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."send-0.1.4"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."stream-counter-0.2.0"
       sources."string-1.6.1"
       sources."string_decoder-0.10.31"
@@ -42819,7 +43496,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."uid2-0.0.3"
       sources."util-0.4.9"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."verror-1.10.0"
       sources."xml2js-0.2.4"
       sources."xmlbuilder-0.4.2"
@@ -42836,7 +43513,7 @@ in
     version = "5.5.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
-      sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
+      sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -42850,160 +43527,90 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.5.7";
+    version = "9.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.5.7.tgz";
-      sha512 = "1kn5wi04mvlkl4p56wihpgkh9va0vxy2a6rsfpy62ra53iri5w0dq8aipp62m8a23hl1s4g2bcfxyxlxmlyzkv9mvqi0455afbpn2nw";
+      url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz";
+      sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw==";
     };
     dependencies = [
-      sources."accepts-1.3.5"
-      sources."address-1.0.3"
-      sources."align-text-0.1.4"
-      sources."amdefine-1.0.1"
+      sources."@zeit/schemas-1.2.0"
+      sources."ajv-6.5.1"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      sources."arch-2.1.0"
-      (sources."args-4.0.0" // {
-        dependencies = [
-          sources."chalk-2.3.2"
-        ];
-      })
-      sources."async-1.5.2"
-      sources."basic-auth-2.0.0"
-      sources."bluebird-3.5.1"
-      (sources."boxen-1.3.0" // {
-        dependencies = [
-          sources."camelcase-4.1.0"
-        ];
-      })
+      sources."arch-2.1.1"
+      sources."arg-2.0.0"
+      sources."balanced-match-1.0.0"
+      sources."boxen-1.3.0"
+      sources."brace-expansion-1.1.11"
       sources."bytes-3.0.0"
-      sources."camelcase-5.0.0"
-      sources."center-align-0.1.3"
-      sources."chalk-2.4.0"
+      sources."camelcase-4.1.0"
+      sources."chalk-2.4.1"
       sources."cli-boxes-1.0.0"
       (sources."clipboardy-1.2.3" // {
         dependencies = [
           sources."execa-0.8.0"
         ];
       })
-      sources."cliui-2.1.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."compressible-2.0.13"
-      sources."compression-1.7.2"
-      sources."content-type-1.0.4"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."concat-map-0.0.1"
+      sources."content-disposition-0.5.2"
       sources."cross-spawn-5.1.0"
-      sources."dargs-5.1.0"
-      sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.5.1"
-      sources."depd-1.1.1"
-      sources."destroy-1.0.4"
-      sources."detect-port-1.2.2"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-1.0.2"
-      sources."escape-html-1.0.3"
+      sources."deep-extend-0.6.0"
       sources."escape-string-regexp-1.0.5"
-      sources."etag-1.8.1"
       sources."execa-0.7.0"
-      sources."filesize-3.6.1"
-      sources."fresh-0.5.2"
-      sources."fs-extra-5.0.0"
-      sources."get-stream-3.0.0"
-      sources."graceful-fs-4.1.11"
-      (sources."handlebars-4.0.11" // {
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      (sources."fast-url-parser-1.1.3" // {
         dependencies = [
-          sources."camelcase-1.2.1"
-          sources."wordwrap-0.0.2"
+          sources."punycode-1.4.1"
         ];
       })
+      sources."get-stream-3.0.0"
+      sources."glob-slash-1.0.0"
+      sources."glob-slasher-1.0.1"
       sources."has-flag-3.0.0"
-      sources."http-errors-1.6.2"
-      sources."iconv-lite-0.4.19"
-      sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."ip-1.1.5"
-      sources."is-buffer-1.1.6"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-stream-1.1.0"
-      sources."is-wsl-1.1.0"
       sources."isexe-2.0.0"
-      sources."jsonfile-4.0.0"
-      sources."kind-of-3.2.2"
-      sources."lazy-cache-1.0.4"
-      sources."leven-2.1.0"
-      sources."longest-1.0.1"
+      sources."json-schema-traverse-0.4.1"
+      sources."lodash-4.17.10"
+      sources."lodash._objecttypes-2.4.1"
+      sources."lodash.isobject-2.4.1"
       sources."lru-cache-4.1.3"
-      sources."micro-9.1.4"
-      sources."micro-compress-1.0.0"
-      sources."mime-1.4.1"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
-      sources."minimist-0.0.10"
-      sources."mri-1.1.0"
-      sources."ms-2.0.0"
-      sources."negotiator-0.6.1"
-      sources."node-version-1.1.3"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
       sources."npm-run-path-2.0.2"
-      sources."on-finished-2.3.0"
-      sources."on-headers-1.0.1"
-      sources."openssl-self-signed-certificate-1.1.6"
-      sources."opn-5.3.0"
-      sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."path-type-3.0.0"
-      sources."pify-3.0.0"
-      sources."promise-timeout-1.3.0"
+      sources."path-to-regexp-2.2.1"
       sources."pseudomap-1.0.2"
-      sources."range-parser-1.2.0"
-      sources."raw-body-2.3.2"
-      sources."rc-1.2.7"
+      sources."punycode-2.1.1"
+      sources."rc-1.2.8"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."repeat-string-1.6.1"
-      sources."right-align-0.1.3"
-      sources."safe-buffer-5.1.1"
-      (sources."send-0.16.2" // {
-        dependencies = [
-          sources."depd-1.1.2"
-          sources."statuses-1.4.0"
-        ];
-      })
-      sources."setprototypeof-1.0.3"
+      sources."safe-buffer-5.1.2"
+      sources."serve-handler-3.2.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."source-map-0.4.4"
-      sources."statuses-1.5.0"
       sources."string-width-2.1.1"
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-        ];
-      })
-      sources."uglify-to-browserify-1.0.2"
-      sources."universalify-0.1.1"
-      sources."unpipe-1.0.0"
-      (sources."update-check-1.5.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."vary-1.1.2"
-      sources."which-1.3.0"
+      sources."toxic-1.0.1"
+      sources."update-check-1.5.2"
+      sources."uri-js-4.2.2"
+      sources."which-1.3.1"
       sources."widest-line-2.0.0"
-      sources."window-size-0.1.0"
-      sources."wordwrap-0.0.3"
       sources."yallist-2.1.2"
-      sources."yargs-3.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -43038,27 +43645,17 @@ in
       sources."base64-arraybuffer-0.1.2"
       sources."base64id-0.1.0"
       sources."bcrypt-nodejs-0.0.3"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."blob-0.0.2"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
-      sources."boom-4.3.1"
+      sources."body-parser-1.18.2"
       sources."bytes-3.0.0"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
-      (sources."cheerio-0.17.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
-          sources."domutils-1.5.1"
-        ];
-      })
+      sources."cheerio-0.17.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.1.2"
       sources."component-inherit-0.0.3"
@@ -43067,17 +43664,16 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."dom-serializer-0.0.1"
+      (sources."dom-serializer-0.0.1" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
       sources."domelementtype-1.3.0"
       sources."domhandler-2.2.1"
       sources."domutils-1.4.3"
@@ -43091,7 +43687,11 @@ in
           sources."debug-0.6.0"
         ];
       })
-      sources."engine.io-client-1.3.1"
+      (sources."engine.io-client-1.3.1" // {
+        dependencies = [
+          sources."debug-0.7.4"
+        ];
+      })
       sources."engine.io-parser-1.0.6"
       sources."entities-1.1.1"
       sources."escape-html-1.0.3"
@@ -43114,10 +43714,9 @@ in
       sources."har-validator-5.0.3"
       sources."has-binary-data-0.1.1"
       sources."has-cors-1.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       (sources."htmlparser2-3.7.3" // {
         dependencies = [
+          sources."domutils-1.5.1"
           sources."entities-1.0.0"
         ];
       })
@@ -43172,12 +43771,14 @@ in
         dependencies = [
           sources."depd-1.1.1"
           sources."http-errors-1.6.2"
+          sources."setprototypeof-1.0.3"
         ];
       })
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
       sources."setprototypeof-1.1.0"
@@ -43187,23 +43788,30 @@ in
           sources."debug-0.7.4"
         ];
       })
-      sources."sntp-2.1.0"
       (sources."socket.io-1.0.6" // {
         dependencies = [
-          sources."commander-0.6.1"
           sources."debug-0.7.4"
-          sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz"
         ];
       })
       (sources."socket.io-adapter-0.2.0" // {
         dependencies = [
+          sources."debug-0.7.4"
+          sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz"
           sources."socket.io-parser-2.1.2"
         ];
       })
-      sources."socket.io-client-1.0.6"
-      sources."socket.io-parser-2.2.0"
+      (sources."socket.io-client-1.0.6" // {
+        dependencies = [
+          sources."debug-0.7.4"
+        ];
+      })
+      (sources."socket.io-parser-2.2.0" // {
+        dependencies = [
+          sources."debug-0.7.4"
+        ];
+      })
       sources."split-0.3.3"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.4.0"
       sources."stream-combiner-0.0.4"
       sources."string_decoder-0.10.31"
@@ -43217,10 +43825,14 @@ in
       sources."unpipe-1.0.0"
       sources."utf8-2.0.0"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-0.4.31"
+      (sources."ws-0.4.31" // {
+        dependencies = [
+          sources."commander-0.6.1"
+        ];
+      })
       sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz"
     ];
     buildInputs = globalBuildInputs;
@@ -43241,7 +43853,7 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
+      sources."JSONStream-1.3.3"
       sources."accepts-1.3.5"
       sources."ajv-5.5.2"
       sources."amdefine-1.0.1"
@@ -43256,7 +43868,7 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       (sources."body-parser-1.18.3" // {
         dependencies = [
           sources."bytes-3.0.0"
@@ -43265,22 +43877,21 @@ in
           sources."raw-body-2.3.3"
         ];
       })
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      (sources."bunyan-1.8.12" // {
-        dependencies = [
-          sources."minimatch-3.0.4"
-        ];
-      })
+      sources."bunyan-1.8.12"
       sources."bytes-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."co-4.6.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
-      sources."compressible-2.0.13"
+      sources."commander-2.16.0"
+      (sources."compressible-2.0.14" // {
+        dependencies = [
+          sources."mime-db-1.34.0"
+        ];
+      })
       (sources."compression-1.7.2" // {
         dependencies = [
           sources."bytes-3.0.0"
@@ -43294,11 +43905,6 @@ in
       sources."cookies-0.7.1"
       sources."core-util-is-1.0.2"
       sources."crypt3-0.2.0"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."delayed-stream-1.0.0"
@@ -43312,7 +43918,7 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."dtrace-provider-0.8.6"
+      sources."dtrace-provider-0.8.7"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -43335,19 +43941,21 @@ in
       sources."fresh-0.5.2"
       sources."fs-ext-0.6.0"
       sources."getpass-0.1.7"
-      sources."glob-6.0.4"
-      (sources."handlebars-2.0.0" // {
+      (sources."glob-6.0.4" // {
         dependencies = [
-          sources."async-0.2.10"
+          sources."minimatch-3.0.4"
         ];
       })
+      sources."handlebars-2.0.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-flag-3.0.0"
-      sources."hawk-6.0.2"
       sources."highlight.js-8.9.1"
-      sources."hoek-4.2.1"
-      sources."htmlparser2-3.9.2"
+      (sources."htmlparser2-3.9.2" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       (sources."http-errors-1.6.3" // {
         dependencies = [
           sources."setprototypeof-1.1.0"
@@ -43363,7 +43971,7 @@ in
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
       sources."jju-1.3.0"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -43390,7 +43998,7 @@ in
       sources."minimatch-1.0.0"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.1"
+      sources."moment-2.22.2"
       sources."ms-2.0.0"
       sources."mv-2.1.1"
       sources."nan-2.10.0"
@@ -43406,7 +44014,11 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
-      sources."postcss-6.0.22"
+      (sources."postcss-6.0.23" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.1.5"
       sources."punycode-1.4.1"
@@ -43419,13 +44031,8 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      (sources."render-readme-1.3.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.6"
-          sources."source-map-0.6.1"
-        ];
-      })
-      (sources."request-2.86.0" // {
+      sources."render-readme-1.3.1"
+      (sources."request-2.87.0" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -43438,7 +44045,7 @@ in
         ];
       })
       sources."safe-buffer-5.1.1"
-      sources."safe-json-stringify-1.1.0"
+      sources."safe-json-stringify-1.2.0"
       sources."safer-buffer-2.1.2"
       sources."sanitize-html-1.18.2"
       sources."semver-4.3.6"
@@ -43447,11 +44054,10 @@ in
       sources."setprototypeof-1.0.3"
       sources."sigmund-1.0.1"
       sources."sinopia-htpasswd-0.4.5"
-      sources."sntp-2.1.0"
       sources."source-map-0.1.43"
       sources."sprintf-js-1.0.3"
       sources."srcset-1.0.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.3.1"
       sources."string_decoder-1.1.1"
       sources."supports-color-5.4.0"
@@ -43461,11 +44067,15 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
       sources."uc.micro-1.0.5"
-      sources."uglify-js-2.3.6"
+      (sources."uglify-js-2.3.6" // {
+        dependencies = [
+          sources."async-0.2.10"
+        ];
+      })
       sources."unpipe-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.0"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."wordwrap-0.0.3"
@@ -43563,7 +44173,12 @@ in
       sources."jodid25519-1.0.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."jsprim-1.4.1"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+          sources."extsprintf-1.3.0"
+        ];
+      })
       sources."keep-alive-agent-0.0.1"
       sources."lru-cache-2.2.0"
       sources."mime-1.6.0"
@@ -43594,30 +44209,28 @@ in
       })
       sources."rimraf-2.4.5"
       sources."safe-buffer-5.1.2"
-      sources."safe-json-stringify-1.1.0"
+      sources."safe-json-stringify-1.2.0"
       sources."semver-4.3.6"
       (sources."smartdc-auth-2.3.1" // {
         dependencies = [
-          sources."asn1-0.2.3"
           sources."assert-plus-0.1.2"
           sources."clone-0.1.5"
           sources."dashdash-1.10.1"
-          sources."extsprintf-1.3.0"
+          sources."extsprintf-1.0.0"
           (sources."http-signature-1.2.0" // {
             dependencies = [
               sources."assert-plus-1.0.0"
             ];
           })
           sources."json-schema-0.2.2"
-          (sources."jsprim-0.3.0" // {
-            dependencies = [
-              sources."verror-1.3.3"
-            ];
-          })
           sources."once-1.3.0"
           (sources."vasync-1.4.3" // {
             dependencies = [
-              sources."extsprintf-1.0.0"
+              (sources."jsprim-0.3.0" // {
+                dependencies = [
+                  sources."verror-1.3.3"
+                ];
+              })
             ];
           })
           sources."verror-1.1.0"
@@ -43626,14 +44239,16 @@ in
       sources."spdy-1.32.5"
       (sources."sshpk-1.7.1" // {
         dependencies = [
+          sources."asn1-0.2.3"
           sources."assert-plus-0.2.0"
+          (sources."dashdash-1.14.1" // {
+            dependencies = [
+              sources."assert-plus-1.0.0"
+            ];
+          })
         ];
       })
-      (sources."sshpk-agent-1.2.1" // {
-        dependencies = [
-          sources."assert-plus-0.1.5"
-        ];
-      })
+      sources."sshpk-agent-1.2.1"
       sources."stream-transform-0.1.2"
       sources."string_decoder-1.1.1"
       sources."tunnel-agent-0.4.3"
@@ -43663,10 +44278,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "2.1.0";
+    version = "2.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz";
-      sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz";
+      sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -43700,7 +44315,7 @@ in
       sources."parseuri-0.0.5"
       sources."safe-buffer-5.1.2"
       sources."socket.io-adapter-1.1.1"
-      sources."socket.io-client-2.1.0"
+      sources."socket.io-client-2.1.1"
       sources."socket.io-parser-3.2.0"
       sources."to-array-0.1.4"
       sources."ultron-1.1.1"
@@ -43844,7 +44459,7 @@ in
     version = "1.0.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz";
-      sha512 = "0z83qdi781ax865bpw8ywmp5dyljjwnan5f9lgja0zcyr8niycd0x35yqw7chwmh3wpps4ai1lkswybk8mjnjik526vdvw1z1zf52lx";
+      sha512 = "nYrifviB77aNKDNKKyuay3M9aYiK6Hv5gJVDdjj2ZXTQmI8WZc8+UPLR5IpVlktJfSu3co/4XcWgrgI6seGBPg==";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -43856,9 +44471,9 @@ in
       sources."css-tree-1.0.0-alpha25"
       sources."css-url-regex-1.1.0"
       sources."css-what-2.1.0"
-      (sources."csso-3.5.0" // {
+      (sources."csso-3.5.1" // {
         dependencies = [
-          sources."css-tree-1.0.0-alpha.27"
+          sources."css-tree-1.0.0-alpha.29"
         ];
       })
       sources."define-properties-1.1.2"
@@ -43870,22 +44485,22 @@ in
       sources."domelementtype-1.3.0"
       sources."domutils-1.5.1"
       sources."entities-1.1.1"
-      sources."es-abstract-1.11.0"
+      sources."es-abstract-1.12.0"
       sources."es-to-primitive-1.1.1"
       sources."esprima-4.0.0"
       sources."foreach-2.0.5"
       sources."function-bind-1.1.1"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."is-callable-1.1.3"
       sources."is-date-object-1.0.1"
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.1"
       sources."js-yaml-3.10.0"
-      sources."mdn-data-1.1.3"
+      sources."mdn-data-1.1.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nth-check-1.0.1"
-      sources."object-keys-1.0.11"
+      sources."object-keys-1.0.12"
       sources."object.getownpropertydescriptors-2.0.3"
       sources."object.values-1.0.4"
       sources."q-1.5.1"
@@ -43954,10 +44569,10 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.1.0";
+    version = "5.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.1.0.tgz";
-      sha1 = "68597b6d324a65c7cf070c40a2a156b219ca06dd";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.1.1.tgz";
+      sha1 = "69b0032628178bafc3f0d09a1c9c16437413db5b";
     };
     dependencies = [
       sources."adm-zip-0.4.7"
@@ -43972,21 +44587,29 @@ in
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."boom-2.10.1"
       sources."camelcase-1.2.1"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-1.1.3"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."co-4.6.0"
       sources."colors-1.1.2"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."decamelize-1.2.0"
       sources."delayed-stream-1.0.0"
       sources."diff-3.2.0"
@@ -44005,7 +44628,11 @@ in
       sources."fs-extra-2.1.2"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."graceful-fs-4.1.11"
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
@@ -44047,8 +44674,6 @@ in
           sources."async-2.3.0"
           sources."fs-extra-2.0.0"
           sources."request-2.81.0"
-          sources."source-map-0.5.7"
-          sources."wordwrap-0.0.2"
         ];
       })
       sources."oauth-sign-0.8.2"
@@ -44072,12 +44697,13 @@ in
       sources."right-align-0.1.3"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.3.0"
       sources."sntp-1.0.9"
       sources."source-map-0.1.32"
       sources."source-map-support-0.3.2"
       sources."sprintf-0.1.5"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -44090,10 +44716,18 @@ in
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-2.8.21"
+      (sources."uglify-js-2.8.21" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
       sources."uglify-to-browserify-1.0.2"
       sources."uuid-3.0.1"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."window-size-0.1.0"
       (sources."winston-1.1.2" // {
         dependencies = [
@@ -44118,10 +44752,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.8.3";
+    version = "2.9.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
-      sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz";
+      sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -44153,24 +44787,25 @@ in
       sources."asynckit-0.4.0"
       sources."balanced-match-1.0.0"
       sources."bluebird-3.5.1"
-      sources."boxen-1.3.0"
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."chalk-1.1.3"
       sources."ci-info-1.1.3"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-1.0.2"
-      (sources."cli-truncate-1.1.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."cli-truncate-1.1.0"
       sources."clone-1.0.4"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
@@ -44181,14 +44816,14 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
       sources."detect-indent-5.0.0"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
       sources."elegant-spinner-1.0.1"
-      sources."error-ex-1.3.1"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."execa-0.7.0"
       sources."exit-hook-1.1.1"
@@ -44201,7 +44836,7 @@ in
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
@@ -44247,7 +44882,11 @@ in
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."nopt-1.0.10"
       sources."npm-run-path-2.0.2"
@@ -44255,7 +44894,11 @@ in
       sources."once-1.4.0"
       sources."onetime-1.1.0"
       sources."p-finally-1.0.0"
-      sources."package-json-4.0.1"
+      (sources."package-json-4.0.1" // {
+        dependencies = [
+          sources."semver-5.5.0"
+        ];
+      })
       sources."parse-json-2.2.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -44270,12 +44913,9 @@ in
       sources."process-nextick-args-2.0.0"
       sources."promise-finally-3.0.0"
       sources."pseudomap-1.0.2"
+      sources."psl-1.1.28"
       sources."punycode-1.4.1"
-      (sources."rc-1.2.7" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
@@ -44290,7 +44930,12 @@ in
       sources."slice-ansi-1.0.0"
       sources."sort-keys-1.1.2"
       sources."string-template-1.0.0"
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
@@ -44302,14 +44947,10 @@ in
       sources."throat-3.2.0"
       sources."timed-out-4.0.1"
       sources."touch-1.0.0"
-      sources."tough-cookie-2.3.4"
+      sources."tough-cookie-2.4.3"
       sources."typedarray-0.0.6"
-      sources."typescript-2.8.3"
-      (sources."typings-core-2.3.3" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."typescript-2.9.2"
+      sources."typings-core-2.3.3"
       sources."unc-path-regex-0.1.2"
       sources."unique-string-1.0.0"
       sources."unzip-response-2.0.1"
@@ -44317,14 +44958,13 @@ in
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
-          sources."semver-5.5.0"
           sources."supports-color-5.4.0"
         ];
       })
       sources."url-parse-lax-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."wcwidth-1.0.1"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."widest-line-2.0.0"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
@@ -44346,10 +44986,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.3.25";
+    version = "3.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz";
-      sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz";
+      sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw==";
     };
     dependencies = [
       sources."commander-2.15.1"
@@ -44367,10 +45007,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.4.22";
+    version = "1.4.28";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.22.tgz";
-      sha512 = "22lf4pk1mn1vn8rgakj6z2dllv4xr7nybymkgrpvkfkglrlh6s9ch5cbbqsdy7mgrhgkmqwrygyb5xypwil4rrfw4a2x1q15jpg229w";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.28.tgz";
+      sha512 = "rXb0l9jqiIWeKvrlUnK0/SYOmOKHe3nw1AV/VWqJERMkaoI5XJ1Pfu4pDnqWEtbSLVLE9dvffeleqISO6qK4BQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -44379,7 +45019,13 @@ in
       sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      (sources."are-we-there-yet-1.1.5" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."array-flatten-1.1.1"
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.3"
@@ -44393,33 +45039,34 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64id-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."blob-0.0.4"
       sources."bluebird-3.5.1"
       sources."blueimp-md5-2.10.0"
       sources."body-parser-1.18.3"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."builtin-modules-1.1.1"
       sources."builtins-1.0.3"
       sources."bytes-3.0.0"
       sources."callsite-1.0.0"
       sources."camelcase-4.1.0"
       sources."caseless-0.12.0"
-      sources."charenc-0.0.2"
       (sources."cliui-4.1.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
         ];
       })
       sources."clone-2.1.2"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."color-3.0.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."color-string-1.5.2"
       sources."colors-1.0.3"
       sources."combined-stream-0.0.7"
@@ -44427,7 +45074,13 @@ in
       sources."component-emitter-1.1.2"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
+      (sources."concat-stream-1.6.2" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
@@ -44439,35 +45092,34 @@ in
       sources."crc-3.4.4"
       sources."cross-spawn-5.1.0"
       sources."crossroads-0.12.2"
-      sources."crypt-0.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.5.1"
+      sources."decamelize-2.0.0"
+      sources."deep-extend-0.6.0"
       sources."delayed-stream-0.0.5"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."diff-3.5.0"
-      (sources."diff2html-2.3.3" // {
-        dependencies = [
-          sources."mkdirp-0.3.0"
-        ];
-      })
+      sources."diff2html-2.3.3"
       sources."dnd-page-scroll-0.0.4"
       sources."eachr-3.2.0"
       sources."ecc-jsbn-0.1.1"
       sources."editions-1.3.4"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      sources."engine.io-3.2.0"
-      sources."engine.io-client-3.2.1"
+      (sources."engine.io-3.2.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."engine.io-client-3.2.1" // {
+        dependencies = [
+          sources."component-emitter-1.2.1"
+          sources."debug-3.1.0"
+        ];
+      })
       sources."engine.io-parser-2.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -44475,19 +45127,16 @@ in
       sources."execa-0.7.0"
       (sources."express-4.16.3" // {
         dependencies = [
-          (sources."body-parser-1.18.2" // {
+          sources."body-parser-1.18.2"
+          (sources."http-errors-1.6.2" // {
             dependencies = [
+              sources."depd-1.1.1"
               sources."setprototypeof-1.0.3"
             ];
           })
           sources."iconv-lite-0.4.19"
           sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
+          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
@@ -44498,10 +45147,18 @@ in
       sources."eyes-0.1.8"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."finalhandler-1.1.1"
-      sources."find-up-2.1.0"
+      (sources."finalhandler-1.1.1" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
+      sources."find-up-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-0.1.3"
+      (sources."form-data-0.1.3" // {
+        dependencies = [
+          sources."mime-1.2.11"
+        ];
+      })
       sources."formidable-1.0.14"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
@@ -44509,41 +45166,47 @@ in
       sources."gauge-2.7.4"
       sources."get-caller-file-1.0.2"
       sources."get-stream-3.0.0"
-      sources."getmac-1.4.1"
+      sources."getmac-1.4.3"
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-binary2-1.0.3"
+      (sources."has-binary2-1.0.3" // {
+        dependencies = [
+          sources."isarray-2.0.1"
+        ];
+      })
       sources."has-cors-1.1.0"
       sources."has-unicode-2.0.1"
       sources."hasher-1.2.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."hogan.js-3.0.2"
-      sources."hosted-git-info-2.6.0"
+      (sources."hogan.js-3.0.2" // {
+        dependencies = [
+          sources."mkdirp-0.3.0"
+        ];
+      })
+      sources."hosted-git-info-2.6.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.23"
-      sources."ignore-3.3.8"
+      sources."ignore-3.3.10"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."invert-kv-1.0.0"
       sources."ipaddr.js-1.6.0"
-      sources."is-arrayish-0.3.1"
-      sources."is-buffer-1.1.6"
+      sources."is-arrayish-0.3.2"
       sources."is-builtin-module-1.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
+      sources."is-wsl-1.1.0"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jquery-3.3.1"
-      sources."jquery-ui-1.12.1"
+      sources."jquery-ui-bundle-1.12.1"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -44560,11 +45223,10 @@ in
       })
       sources."knockout-3.5.0-rc"
       sources."lcid-1.0.0"
-      sources."locate-path-2.0.0"
+      sources."locate-path-3.0.0"
       sources."locks-0.2.2"
       sources."lodash-4.17.10"
       sources."lru-cache-4.1.3"
-      sources."md5-2.2.1"
       sources."media-typer-0.3.0"
       sources."mem-1.1.0"
       (sources."memorystore-1.6.0" // {
@@ -44581,25 +45243,15 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.1"
+      sources."moment-2.22.2"
       sources."ms-2.0.0"
       sources."negotiator-0.6.1"
       sources."node-cache-4.2.0"
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
-      sources."npm-6.0.1"
+      sources."npm-6.1.0"
       sources."npm-package-arg-6.1.0"
-      (sources."npm-registry-client-8.5.1" // {
-        dependencies = [
-          sources."combined-stream-1.0.6"
-          sources."delayed-stream-1.0.0"
-          sources."extend-3.0.1"
-          sources."form-data-2.3.2"
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."npm-registry-client-8.5.1"
       sources."npm-run-path-2.0.2"
       sources."npmlog-4.1.2"
       sources."nprogress-0.2.0"
@@ -44611,15 +45263,15 @@ in
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."once-1.4.0"
-      sources."open-0.0.5"
+      sources."opn-5.3.0"
       sources."os-homedir-1.0.2"
       sources."os-locale-2.1.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.2.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
+      sources."p-limit-2.0.0"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.0.0"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.2"
@@ -44639,20 +45291,23 @@ in
       sources."qs-6.5.2"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.0"
-      (sources."raven-2.4.2" // {
-        dependencies = [
-          sources."uuid-3.0.0"
-        ];
-      })
+      sources."raven-js-3.26.3"
       sources."raw-body-2.3.3"
-      (sources."rc-1.2.7" // {
+      (sources."rc-1.2.8" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-1.0.27-1"
       sources."reduce-component-1.0.1"
-      sources."request-2.86.0"
+      (sources."request-2.87.0" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+          sources."delayed-stream-1.0.0"
+          sources."extend-3.0.1"
+          sources."form-data-2.3.2"
+        ];
+      })
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."retry-0.10.1"
@@ -44660,7 +45315,11 @@ in
       sources."safe-buffer-5.1.1"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
-      sources."send-0.16.2"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
       sources."serve-static-1.13.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.0"
@@ -44671,24 +45330,32 @@ in
       sources."simple-swizzle-0.2.2"
       sources."slide-1.1.6"
       sources."snapsvg-0.5.1"
-      sources."sntp-2.1.0"
-      (sources."socket.io-2.1.0" // {
+      (sources."socket.io-2.1.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."socket.io-adapter-1.1.1"
+      (sources."socket.io-client-2.1.1" // {
+        dependencies = [
+          sources."component-emitter-1.2.1"
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."socket.io-parser-3.2.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
         ];
       })
-      sources."socket.io-adapter-1.1.1"
-      sources."socket.io-client-2.1.0"
-      sources."socket.io-parser-3.2.0"
       sources."spdx-correct-3.0.0"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."ssri-5.3.0"
-      sources."stack-trace-0.0.9"
+      sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."string-width-1.0.2"
       sources."string_decoder-0.10.31"
@@ -44699,7 +45366,7 @@ in
         dependencies = [
           sources."combined-stream-1.0.6"
           sources."component-emitter-1.2.1"
-          sources."cookiejar-2.1.1"
+          sources."cookiejar-2.1.2"
           sources."debug-3.1.0"
           sources."delayed-stream-1.0.0"
           sources."extend-3.0.1"
@@ -44715,7 +45382,6 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      sources."timed-out-4.0.1"
       sources."to-array-0.1.4"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -44729,32 +45395,28 @@ in
       sources."unpipe-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.3"
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."whatwg-fetch-2.0.4"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
-      sources."wide-align-1.1.2"
-      (sources."winston-2.4.2" // {
+      sources."wide-align-1.1.3"
+      (sources."winston-2.4.3" // {
         dependencies = [
           sources."async-1.0.0"
         ];
       })
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
+      sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."ws-3.3.3"
       sources."xmlhttprequest-ssl-1.5.5"
-      sources."y18n-3.2.1"
+      sources."xregexp-4.0.0"
+      sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-11.1.0" // {
+      (sources."yargs-12.0.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."is-fullwidth-code-point-2.0.0"
@@ -44762,7 +45424,7 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."yargs-parser-9.0.2"
+      sources."yargs-parser-10.1.0"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -44777,14 +45439,18 @@ in
   vue-cli = nodeEnv.buildNodePackage {
     name = "vue-cli";
     packageName = "vue-cli";
-    version = "2.9.3";
+    version = "2.9.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz";
-      sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki";
+      url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz";
+      sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ==";
     };
     dependencies = [
       sources."absolute-0.0.1"
-      sources."ajv-5.5.2"
+      (sources."ajv-5.5.2" // {
+        dependencies = [
+          sources."co-4.6.0"
+        ];
+      })
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
       sources."ansi-escapes-3.1.0"
@@ -44799,82 +45465,71 @@ in
       sources."arrify-1.0.1"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.2.2"
       sources."bluebird-3.5.1"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
-      sources."buffer-fill-0.1.1"
+      sources."buffer-fill-1.0.0"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      (sources."caw-2.0.1" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."caw-2.0.1"
       sources."center-align-0.1.3"
       sources."chalk-2.4.1"
-      sources."chardet-0.4.2"
+      sources."chardet-0.5.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cli-width-2.2.0"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."clone-1.0.4"
       sources."co-3.1.0"
       sources."co-from-stream-0.0.0"
       sources."co-fs-extra-1.2.1"
       sources."co-read-0.0.1"
       sources."coffee-script-1.12.7"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."config-chain-1.1.11"
       sources."consolidate-0.14.5"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."decamelize-1.2.0"
-      (sources."decompress-4.2.0" // {
-        dependencies = [
-          sources."file-type-3.9.0"
-          sources."get-stream-2.3.1"
-        ];
-      })
+      sources."decompress-4.2.0"
       sources."decompress-tar-4.1.1"
-      sources."decompress-tarbz2-4.1.1"
-      sources."decompress-targz-4.1.1"
-      sources."decompress-unzip-4.0.1"
-      sources."delayed-stream-1.0.0"
-      (sources."download-5.0.3" // {
+      (sources."decompress-tarbz2-4.1.1" // {
         dependencies = [
-          sources."file-type-5.2.0"
+          sources."file-type-6.2.0"
         ];
       })
-      (sources."download-git-repo-1.0.2" // {
+      sources."decompress-targz-4.1.1"
+      (sources."decompress-unzip-4.0.1" // {
         dependencies = [
-          sources."commander-2.8.1"
-          sources."file-type-6.2.0"
+          sources."file-type-3.9.0"
+          sources."get-stream-2.3.1"
         ];
       })
+      sources."delayed-stream-1.0.0"
+      sources."download-5.0.3"
+      sources."download-git-repo-1.0.2"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.1"
       sources."enable-1.3.2"
@@ -44883,15 +45538,15 @@ in
       sources."esprima-4.0.0"
       sources."extend-3.0.1"
       sources."extend-shallow-2.0.1"
-      sources."external-editor-2.2.0"
+      sources."external-editor-3.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."fd-slicer-1.0.1"
+      sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
       sources."file-type-5.2.0"
       sources."filename-reserved-regex-2.0.0"
-      sources."filenamify-2.0.0"
+      sources."filenamify-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fs-constants-1.0.0"
@@ -44909,25 +45564,26 @@ in
       (sources."handlebars-4.0.11" // {
         dependencies = [
           sources."async-1.5.2"
-          sources."wordwrap-0.0.2"
         ];
       })
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-ansi-2.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."has-flag-3.0.0"
       sources."has-generators-1.0.1"
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.23"
-      sources."ieee754-1.1.11"
+      sources."ieee754-1.1.12"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-3.3.0"
+      sources."inquirer-6.0.0"
       sources."is-3.2.1"
       sources."is-buffer-1.1.6"
       sources."is-extendable-0.1.1"
@@ -44943,7 +45599,7 @@ in
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
       sources."isurl-1.0.0"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -44979,7 +45635,11 @@ in
       sources."mkdirp-0.5.1"
       sources."multimatch-2.1.0"
       sources."mute-stream-0.0.7"
-      sources."npm-conf-1.1.3"
+      (sources."npm-conf-1.1.3" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
@@ -45003,26 +45663,24 @@ in
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
       sources."repeat-string-1.6.1"
-      (sources."request-2.86.0" // {
-        dependencies = [
-          sources."co-4.6.0"
-        ];
-      })
+      sources."request-2.87.0"
       sources."restore-cursor-2.0.0"
       sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
+      sources."rxjs-6.2.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."seek-bzip-1.0.5"
+      (sources."seek-bzip-1.0.5" // {
+        dependencies = [
+          sources."commander-2.8.1"
+        ];
+      })
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
       sources."source-map-0.4.4"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."stat-mode-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
@@ -45041,6 +45699,7 @@ in
       sources."toml-2.3.3"
       sources."tough-cookie-2.3.4"
       sources."trim-repeated-1.0.0"
+      sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       (sources."uglify-js-2.8.29" // {
@@ -45057,7 +45716,7 @@ in
       sources."url-to-options-1.0.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
       sources."ware-1.3.0"
@@ -45069,7 +45728,7 @@ in
       sources."xtend-4.0.1"
       sources."yaml-js-0.0.8"
       sources."yargs-3.10.0"
-      sources."yauzl-2.9.1"
+      sources."yauzl-2.9.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -45095,17 +45754,17 @@ in
       sources."ansi-styles-2.2.1"
       sources."asn1-0.2.3"
       sources."assert-plus-0.2.0"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."aws-sign2-0.6.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.0.3"
       sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       (sources."config-chain-1.1.11" // {
@@ -45115,13 +45774,21 @@ in
       })
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
-      sources."dashdash-1.14.1"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."debug-0.7.4"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."extend-3.0.1"
-      sources."extract-zip-1.5.0"
+      (sources."extract-zip-1.5.0" // {
+        dependencies = [
+          sources."mkdirp-0.5.0"
+        ];
+      })
       sources."extsprintf-1.3.0"
       sources."fd-slicer-1.0.1"
       sources."follow-redirects-0.0.3"
@@ -45131,7 +45798,11 @@ in
       sources."fs.realpath-1.0.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."har-validator-2.0.6"
@@ -45181,7 +45852,6 @@ in
       (sources."phantomjs-1.9.20" // {
         dependencies = [
           sources."kew-0.7.0"
-          sources."mkdirp-0.5.0"
         ];
       })
       sources."pinkie-2.0.4"
@@ -45194,9 +45864,10 @@ in
       sources."request-2.67.0"
       sources."request-progress-2.0.1"
       sources."rimraf-2.6.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-2.3.2"
       sources."sntp-1.0.9"
-      (sources."sshpk-1.14.1" // {
+      (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -45211,9 +45882,13 @@ in
       sources."tunnel-agent-0.4.3"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."underscore-1.9.0"
+      sources."underscore-1.9.1"
       sources."util-deprecate-1.0.2"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."which-1.2.14"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
@@ -45231,30 +45906,33 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.8.3";
+    version = "4.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.8.3.tgz";
-      sha512 = "2rkj1v8fvs1hqpgiikpfnbv29yf1fmyqxfsmgkk3rwhbxbg35ca932ysiamxdq0cgn56lw8sknmfh98cgiw9rfywx5cgj8j2a6c05zy";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz";
+      sha512 = "CgZPUwobJbQlZqpylDNtEazZLfNnGuyFmpk1dHIP2kFchtyMWB+W2wBKPImSnSQ2rbX/WZMKiQax+SZmlUXuQQ==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.4.3"
-      sources."@webassemblyjs/floating-point-hex-parser-1.4.3"
-      sources."@webassemblyjs/helper-buffer-1.4.3"
-      sources."@webassemblyjs/helper-code-frame-1.4.3"
-      sources."@webassemblyjs/helper-fsm-1.4.3"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.4.3"
-      sources."@webassemblyjs/helper-wasm-section-1.4.3"
-      sources."@webassemblyjs/leb128-1.4.3"
-      sources."@webassemblyjs/validation-1.4.3"
-      sources."@webassemblyjs/wasm-edit-1.4.3"
-      sources."@webassemblyjs/wasm-gen-1.4.3"
-      sources."@webassemblyjs/wasm-opt-1.4.3"
-      sources."@webassemblyjs/wasm-parser-1.4.3"
-      sources."@webassemblyjs/wast-parser-1.4.3"
-      sources."@webassemblyjs/wast-printer-1.4.3"
-      sources."acorn-5.5.3"
+      sources."@webassemblyjs/ast-1.5.12"
+      sources."@webassemblyjs/floating-point-hex-parser-1.5.12"
+      sources."@webassemblyjs/helper-api-error-1.5.12"
+      sources."@webassemblyjs/helper-buffer-1.5.12"
+      sources."@webassemblyjs/helper-code-frame-1.5.12"
+      sources."@webassemblyjs/helper-fsm-1.5.12"
+      sources."@webassemblyjs/helper-module-context-1.5.12"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.5.12"
+      sources."@webassemblyjs/helper-wasm-section-1.5.12"
+      sources."@webassemblyjs/ieee754-1.5.12"
+      sources."@webassemblyjs/leb128-1.5.12"
+      sources."@webassemblyjs/utf8-1.5.12"
+      sources."@webassemblyjs/wasm-edit-1.5.12"
+      sources."@webassemblyjs/wasm-gen-1.5.12"
+      sources."@webassemblyjs/wasm-opt-1.5.12"
+      sources."@webassemblyjs/wasm-parser-1.5.12"
+      sources."@webassemblyjs/wast-parser-1.5.12"
+      sources."@webassemblyjs/wast-printer-1.5.12"
+      sources."acorn-5.7.1"
       sources."acorn-dynamic-import-3.0.0"
-      sources."ajv-6.5.0"
+      sources."ajv-6.5.2"
       sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
@@ -45263,20 +45941,19 @@ in
       sources."arr-union-3.1.0"
       sources."array-unique-0.3.2"
       sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
+      (sources."assert-1.4.1" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+          sources."util-0.10.3"
+        ];
+      })
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
       sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."is-extendable-1.0.1"
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
       sources."base64-js-1.3.0"
@@ -45287,9 +45964,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
-          sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-3.2.2"
         ];
       })
       sources."brorand-1.1.0"
@@ -45300,18 +45975,30 @@ in
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
       sources."buffer-4.9.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cacache-10.0.4"
       sources."cache-base-1.0.1"
-      sources."chokidar-2.0.3"
+      sources."chokidar-2.0.4"
       sources."chownr-1.0.1"
-      sources."chrome-trace-event-0.1.3"
+      sources."chrome-trace-event-1.0.0"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."collection-visit-1.0.0"
@@ -45341,7 +46028,7 @@ in
       sources."elliptic-6.4.0"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
-      sources."enhanced-resolve-4.0.0"
+      sources."enhanced-resolve-4.1.0"
       sources."errno-0.1.7"
       sources."eslint-scope-3.7.1"
       sources."esrecurse-4.2.1"
@@ -45350,21 +46037,41 @@ in
       sources."evp_bytestokey-1.0.3"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
         ];
       })
-      sources."extend-shallow-3.0.2"
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."is-extendable-0.1.1"
-          sources."kind-of-5.1.0"
         ];
       })
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."fill-range-4.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."find-cache-dir-1.0.0"
       sources."find-up-2.1.0"
       sources."flush-write-stream-1.0.3"
@@ -45383,12 +46090,16 @@ in
       })
       sources."graceful-fs-4.1.11"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
+      sources."hash.js-1.1.4"
       sources."hmac-drbg-1.0.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.11"
+      sources."ieee754-1.1.12"
       sources."iferr-0.1.5"
       sources."imurmurhash-0.1.4"
       sources."indexof-0.0.1"
@@ -45402,71 +46113,74 @@ in
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.0"
-      sources."is-number-3.0.0"
-      sources."is-odd-2.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-plain-object-2.0.4"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isobject-3.0.1"
-      sources."json-schema-traverse-0.3.1"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-traverse-0.4.1"
       sources."json5-0.5.1"
       sources."kind-of-6.0.2"
       sources."leb-0.3.0"
       sources."loader-runner-2.3.0"
       sources."loader-utils-1.1.0"
       sources."locate-path-2.0.0"
+      sources."lodash.debounce-4.0.8"
       sources."long-3.2.0"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
+      sources."mamacro-0.0.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.4"
       sources."memory-fs-0.4.1"
-      (sources."micromatch-3.1.10" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."has-values-0.1.4"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-1.0.1"
-          sources."is-number-4.0.0"
-        ];
-      })
+      sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mississippi-2.0.0"
-      sources."mixin-deep-1.3.1"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."nan-2.10.0"
-      sources."nanomatch-1.2.9"
+      sources."nanomatch-1.2.13"
       sources."neo-async-2.5.1"
       (sources."node-libs-browser-2.1.0" // {
         dependencies = [
-          sources."inherits-2.0.1"
           sources."punycode-1.4.1"
         ];
       })
       sources."normalize-path-2.1.1"
-      sources."object-copy-0.1.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
       sources."pako-1.0.6"
@@ -45489,7 +46203,7 @@ in
       sources."public-encrypt-4.0.2"
       sources."pump-2.0.1"
       sources."pumpify-1.5.1"
-      sources."punycode-2.1.0"
+      sources."punycode-2.1.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.0.6"
@@ -45510,43 +46224,35 @@ in
       sources."schema-utils-0.4.5"
       sources."serialize-javascript-1.5.0"
       sources."set-immediate-shim-1.0.1"
-      sources."set-value-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."setimmediate-1.0.5"
       sources."sha.js-2.4.11"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              (sources."is-accessor-descriptor-0.1.6" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              (sources."is-data-descriptor-0.1.4" // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              })
-              sources."is-descriptor-0.1.6"
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-0.1.1"
-          (sources."is-number-3.0.0" // {
+          (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
             ];
           })
-          sources."kind-of-4.0.0"
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."define-property-1.0.0"
         ];
       })
       (sources."snapdragon-util-3.0.1" // {
@@ -45558,35 +46264,57 @@ in
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      sources."ssri-5.3.0"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."ssri-5.3.0"
-      sources."static-extend-0.1.2"
       sources."stream-browserify-2.0.1"
       sources."stream-each-1.2.2"
-      sources."stream-http-2.8.2"
+      sources."stream-http-2.8.3"
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
       sources."tapable-1.0.0"
       sources."through2-2.0.3"
       sources."timers-browserify-2.0.10"
       sources."to-arraybuffer-1.0.1"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
+      sources."tslib-1.9.3"
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
-      sources."uglify-es-3.3.10"
-      (sources."uglifyjs-webpack-plugin-1.2.5" // {
+      (sources."uglify-es-3.3.10" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      (sources."uglifyjs-webpack-plugin-1.2.7" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -45599,26 +46327,22 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
       sources."upath-1.1.0"
-      sources."uri-js-4.2.1"
+      sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
-      (sources."use-3.1.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."util-0.10.3"
+      sources."use-3.1.0"
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
       sources."watchpack-1.6.0"
-      sources."webassemblyjs-1.4.3"
       (sources."webpack-sources-1.1.0" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -45642,50 +46366,54 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "1.12.2";
+    version = "1.12.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.2.tgz";
-      sha512 = "2d26sgvj167729px1gv5n5yjbvkv05x858i5r9vxprglh6gvl29s5gaipxh9fnz0ql6i1mxvxs2pjmk8l9hdj9bhn9cxq7gsmvw2cw0";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.3.tgz";
+      sha512 = "NnBAGkD64CRsl9edM9q0QU+ku6nCX32nM0U+YC8Gs/36c8y+5m9Tya3mWIux3oZKZ54yGiVtnok4tUpqDE5tMA==";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
-      (sources."airplay-js-0.3.0" // {
-        dependencies = [
-          sources."semver-5.1.1"
-          sources."xmlbuilder-0.4.3"
-        ];
-      })
+      sources."airplay-js-0.3.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."ascli-0.3.0"
       sources."async-limiter-1.0.0"
       sources."balanced-match-1.0.0"
       sources."bencode-2.0.0"
-      sources."binary-search-1.3.3"
+      sources."binary-search-1.3.4"
       sources."bindings-1.3.0"
       sources."bitfield-2.0.0"
-      sources."bittorrent-dht-8.3.0"
+      (sources."bittorrent-dht-8.4.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."bittorrent-peerid-1.2.0"
-      sources."bittorrent-protocol-2.4.1"
-      sources."bittorrent-tracker-9.9.1"
+      (sources."bittorrent-protocol-2.4.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."bittorrent-tracker-9.9.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."simple-get-3.0.2"
+        ];
+      })
       sources."bl-1.2.2"
-      sources."blob-to-buffer-1.2.7"
+      sources."blob-to-buffer-1.2.8"
       sources."block-stream2-1.1.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."browserify-package-json-1.0.1"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-equals-1.0.4"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-indexof-1.1.1"
-      (sources."bufferutil-3.0.5" // {
-        dependencies = [
-          sources."simple-get-2.8.1"
-        ];
-      })
+      sources."bufferutil-3.0.5"
       sources."bufferview-1.0.1"
       sources."bytebuffer-3.5.5"
       sources."castv2-0.1.9"
@@ -45706,10 +46434,10 @@ in
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."create-torrent-3.31.0"
+      sources."create-torrent-3.32.0"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."defined-1.0.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
@@ -45731,7 +46459,11 @@ in
       sources."expand-template-1.1.1"
       sources."filestream-4.1.3"
       sources."flatten-1.0.2"
-      sources."fs-chunk-store-1.7.0"
+      (sources."fs-chunk-store-1.7.0" // {
+        dependencies = [
+          sources."thunky-1.0.2"
+        ];
+      })
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
@@ -45758,15 +46490,15 @@ in
       sources."k-rpc-5.0.0"
       sources."k-rpc-socket-1.8.0"
       sources."last-one-wins-1.0.4"
-      (sources."load-ip-set-1.3.1" // {
-        dependencies = [
-          sources."simple-get-2.8.1"
-        ];
-      })
+      sources."load-ip-set-1.3.1"
       sources."long-2.4.0"
       sources."lru-3.1.0"
       sources."magnet-uri-5.1.8"
-      sources."mdns-js-0.5.0"
+      (sources."mdns-js-0.5.0" // {
+        dependencies = [
+          sources."semver-5.1.1"
+        ];
+      })
       sources."mdns-js-packet-0.2.0"
       sources."mediasource-2.2.1"
       sources."memory-chunk-store-1.3.0"
@@ -45774,8 +46506,12 @@ in
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mkdirp-0.5.1"
-      sources."moment-2.22.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.22.2"
       sources."mp4-box-encoding-1.1.4"
       sources."mp4-stream-2.0.3"
       sources."ms-2.0.0"
@@ -45784,12 +46520,12 @@ in
           sources."thunky-1.0.2"
         ];
       })
-      sources."multistream-2.1.0"
+      sources."multistream-2.1.1"
       sources."nan-2.10.0"
       sources."netmask-1.0.6"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
-      sources."node-abi-2.4.1"
+      sources."node-abi-2.4.3"
       sources."node-ssdp-2.9.1"
       sources."nodebmc-0.0.7"
       sources."noop-logger-0.1.1"
@@ -45801,7 +46537,8 @@ in
       sources."optjs-3.2.2"
       sources."os-homedir-1.0.2"
       sources."package-json-versionify-1.0.4"
-      (sources."parse-torrent-6.0.0" // {
+      sources."parse-numeric-range-0.0.2"
+      (sources."parse-torrent-6.0.1" // {
         dependencies = [
           sources."simple-get-3.0.2"
         ];
@@ -45809,25 +46546,33 @@ in
       sources."path-is-absolute-1.0.1"
       sources."piece-length-1.0.0"
       sources."pify-2.3.0"
-      sources."plist-with-patches-0.5.1"
-      sources."prebuild-install-4.0.0"
+      (sources."plist-with-patches-0.5.1" // {
+        dependencies = [
+          sources."xmlbuilder-0.4.3"
+        ];
+      })
+      (sources."prebuild-install-4.0.0" // {
+        dependencies = [
+          sources."pump-2.0.1"
+        ];
+      })
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."protobufjs-3.8.2"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.2.0"
+      sources."random-access-storage-1.3.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
       sources."range-slice-stream-1.2.0"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
-      sources."record-cache-1.0.2"
+      sources."record-cache-1.1.0"
       (sources."render-media-3.1.0" // {
         dependencies = [
-          sources."pump-1.0.3"
+          sources."debug-3.1.0"
         ];
       })
       sources."rimraf-2.6.2"
@@ -45842,24 +46587,29 @@ in
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
-      sources."simple-peer-9.1.1"
+      (sources."simple-peer-9.1.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-7.0.2" // {
         dependencies = [
+          sources."debug-3.1.0"
           sources."ws-4.1.0"
         ];
       })
-      sources."speedometer-1.0.0"
+      sources."speedometer-1.1.0"
       sources."split-1.0.1"
-      sources."stream-to-blob-1.0.0"
-      sources."stream-to-blob-url-2.1.0"
-      sources."stream-with-known-length-to-buffer-1.0.1"
+      sources."stream-to-blob-1.0.1"
+      sources."stream-to-blob-url-2.1.1"
+      sources."stream-with-known-length-to-buffer-1.0.2"
       sources."string-width-1.0.2"
       sources."string2compact-1.2.5"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      (sources."tar-fs-1.16.2" // {
+      (sources."tar-fs-1.16.3" // {
         dependencies = [
           sources."pump-1.0.3"
         ];
@@ -45872,11 +46622,10 @@ in
       sources."to-buffer-1.1.1"
       (sources."torrent-discovery-8.4.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
-          sources."pump-2.0.1"
+          sources."debug-3.1.0"
         ];
       })
-      sources."torrent-piece-1.1.1"
+      sources."torrent-piece-1.1.2"
       sources."tunnel-agent-0.6.0"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
@@ -45886,24 +46635,30 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-2.0.5"
-      sources."ut_metadata-3.2.1"
+      (sources."ut_metadata-3.2.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."ut_pex-1.2.1"
       sources."util-deprecate-1.0.2"
-      sources."videostream-2.4.2"
+      (sources."videostream-2.4.3" // {
+        dependencies = [
+          sources."pump-1.0.3"
+        ];
+      })
       sources."vlc-command-1.1.1"
-      (sources."webtorrent-0.99.4" // {
+      (sources."webtorrent-0.100.0" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."minimist-0.0.8"
           sources."simple-get-3.0.2"
-          sources."thunky-1.0.2"
         ];
       })
       sources."which-pm-runs-1.0.0"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."winreg-1.2.4"
       sources."wrappy-1.0.2"
-      sources."ws-5.1.1"
+      sources."ws-5.2.1"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
@@ -45922,18 +46677,18 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "2.6.0";
+    version = "2.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-2.6.0.tgz";
-      sha1 = "52c074123e6376a4fb673e565c33dd027714e9b0";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-2.7.0.tgz";
+      sha512 = "hXj/MV/x6G0oxplOirV4/j7BJ5MZJ2yZHml0gulBr7mH2BMNyTJHdRi+qzVBNPFdBMLV0/PS05YGZ7xr2YmwVA==";
     };
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.1.1"
+      sources."@types/node-10.5.1"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
-      sources."acorn-5.5.3"
+      sources."acorn-5.7.1"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -45942,58 +46697,17 @@ in
       sources."adbkit-2.11.0"
       sources."adbkit-logcat-1.1.0"
       sources."adbkit-monkey-1.0.1"
-      (sources."addons-linter-0.41.0" // {
+      (sources."addons-linter-1.0.0" // {
         dependencies = [
-          sources."ajv-keywords-1.5.1"
-          sources."ansi-escapes-1.4.0"
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."async-2.6.0"
-          sources."camelcase-2.1.1"
-          sources."cli-cursor-1.0.2"
-          sources."cliui-4.1.0"
-          sources."debug-3.1.0"
           sources."decamelize-1.2.0"
-          sources."domelementtype-1.1.3"
-          sources."es6-promise-4.2.4"
-          sources."figures-1.7.0"
-          sources."for-in-0.1.8"
-          sources."globals-11.5.0"
-          sources."inherits-2.0.1"
-          sources."inquirer-0.12.0"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."isarray-0.0.1"
-          sources."mute-stream-0.0.5"
-          sources."onetime-1.1.0"
-          sources."pify-3.0.0"
-          sources."pluralize-1.2.1"
-          sources."progress-1.1.8"
-          sources."punycode-2.1.0"
-          sources."restore-cursor-1.0.1"
-          sources."run-async-0.1.0"
-          sources."rx-lite-3.1.2"
-          sources."slice-ansi-0.0.4"
           sources."source-map-0.6.1"
-          sources."source-map-support-0.5.4"
-          sources."string-width-1.0.2"
-          sources."string_decoder-0.10.31"
-          sources."strip-ansi-4.0.0"
-          sources."supports-color-5.4.0"
-          sources."table-3.8.3"
-          sources."traverse-0.6.6"
-          sources."underscore-1.6.0"
-          (sources."yargs-11.0.0" // {
-            dependencies = [
-              sources."camelcase-4.1.0"
-              sources."is-fullwidth-code-point-2.0.0"
-              sources."string-width-2.1.1"
-            ];
-          })
+          sources."source-map-support-0.5.6"
+          sources."yargs-11.0.0"
         ];
       })
       sources."adm-zip-0.4.11"
       sources."agent-base-4.2.0"
-      sources."ajv-6.3.0"
+      sources."ajv-6.5.0"
       sources."ajv-keywords-2.1.1"
       sources."ajv-merge-patch-3.0.0"
       sources."anchor-markdown-header-0.5.7"
@@ -46003,23 +46717,12 @@ in
       sources."ansi-styles-2.2.1"
       sources."ansicolors-0.3.2"
       sources."any-promise-1.3.0"
-      (sources."anymatch-2.0.0" // {
+      sources."anymatch-2.0.0"
+      (sources."archiver-2.1.1" // {
         dependencies = [
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-1.0.1"
+          sources."async-2.6.1"
         ];
       })
-      sources."archiver-2.1.1"
       sources."archiver-utils-1.3.0"
       sources."archy-1.0.0"
       sources."argparse-1.0.10"
@@ -46038,14 +46741,18 @@ in
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."ast-types-0.11.3"
+      sources."ast-types-0.11.5"
       sources."async-0.2.10"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
-      sources."babel-code-frame-6.26.0"
+      (sources."babel-code-frame-6.26.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+        ];
+      })
       sources."babel-core-6.26.3"
       sources."babel-generator-6.26.1"
       sources."babel-helpers-6.24.1"
@@ -46057,7 +46764,6 @@ in
       })
       (sources."babel-register-6.26.0" // {
         dependencies = [
-          sources."chalk-1.1.3"
           sources."source-map-support-0.4.18"
         ];
       })
@@ -46070,16 +46776,11 @@ in
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
       sources."base64-js-0.0.2"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-1.11.0"
       sources."bl-1.2.2"
       sources."bluebird-2.9.34"
@@ -46089,20 +46790,19 @@ in
       sources."boundary-1.0.1"
       sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
-      sources."braces-2.3.2"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
-      sources."buffer-crc32-0.2.13"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
-      sources."builtin-modules-1.1.1"
-      (sources."bunyan-1.8.12" // {
+      (sources."braces-2.3.2" // {
         dependencies = [
-          sources."glob-6.0.4"
-          sources."rimraf-2.4.5"
+          sources."extend-shallow-2.0.1"
         ];
       })
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-crc32-0.2.13"
+      sources."buffer-equal-constant-time-1.0.1"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
+      sources."builtin-modules-1.1.1"
+      sources."bunyan-1.8.12"
       sources."bytes-3.0.0"
       sources."cache-base-1.0.1"
       sources."caller-path-0.1.0"
@@ -46111,48 +46811,58 @@ in
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
       sources."ccount-1.0.3"
-      sources."chalk-2.3.2"
+      (sources."chalk-2.4.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
       sources."character-entities-1.2.2"
       sources."character-entities-html4-1.1.2"
       sources."character-entities-legacy-1.1.2"
       sources."character-reference-invalid-1.1.2"
       sources."chardet-0.4.2"
-      (sources."cheerio-1.0.0-rc.2" // {
-        dependencies = [
-          sources."domelementtype-1.3.0"
-        ];
-      })
-      (sources."chokidar-2.0.3" // {
-        dependencies = [
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-0.1.1"
-          sources."kind-of-3.2.2"
-        ];
-      })
+      sources."cheerio-1.0.0-rc.2"
+      sources."chokidar-2.0.4"
       sources."circular-json-0.3.3"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."cliui-3.2.0"
+      (sources."cliui-4.1.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."clone-1.0.4"
       sources."clone-deep-0.3.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."collapse-white-space-1.0.4"
       sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."colors-0.5.1"
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."common-tags-1.7.2"
       sources."component-emitter-1.2.1"
       sources."compress-commons-1.2.2"
@@ -46161,7 +46871,7 @@ in
       sources."configstore-3.1.2"
       sources."convert-source-map-1.5.1"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.6"
+      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
       sources."crc-3.5.0"
       sources."crc32-stream-2.0.0"
@@ -46188,7 +46898,7 @@ in
       })
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepcopy-0.6.3"
       sources."deepmerge-2.1.0"
@@ -46199,29 +46909,37 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."detect-indent-4.0.0"
-      (sources."dispensary-0.16.0" // {
+      (sources."dispensary-0.18.0" // {
         dependencies = [
-          sources."ajv-5.5.2"
+          sources."async-2.6.1"
+          sources."decamelize-1.2.0"
+          sources."source-map-0.6.1"
+          sources."source-map-support-0.5.6"
+          sources."yargs-11.0.0"
         ];
       })
       sources."doctoc-1.3.1"
       sources."doctrine-2.1.0"
-      sources."dom-serializer-0.1.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       sources."dot-prop-4.2.0"
-      sources."dtrace-provider-0.8.6"
+      sources."dtrace-provider-0.8.7"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.1"
       sources."ecdsa-sig-formatter-1.0.10"
-      sources."email-validator-2.0.3"
+      sources."email-validator-2.0.4"
       sources."emoji-regex-6.1.3"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.1"
-      sources."error-ex-1.3.1"
-      sources."es5-ext-0.10.42"
+      sources."error-ex-1.3.2"
+      sources."es5-ext-0.10.45"
       sources."es6-error-4.1.1"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
@@ -46235,33 +46953,49 @@ in
       sources."es6-symbol-3.1.1"
       sources."es6-weak-map-2.0.2"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.9.1"
+      (sources."escodegen-1.10.0" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."escope-3.6.0"
-      (sources."eslint-4.19.0" // {
+      (sources."eslint-4.19.1" // {
         dependencies = [
           sources."ajv-5.5.2"
-          sources."esprima-4.0.0"
+          sources."ansi-regex-3.0.0"
+          sources."debug-3.1.0"
+          sources."fast-deep-equal-1.1.0"
+          sources."globals-11.7.0"
+          sources."strip-ansi-4.0.0"
         ];
       })
       (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
         dependencies = [
           sources."ajv-4.11.8"
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
+          sources."ajv-keywords-1.5.1"
+          sources."ansi-escapes-1.4.0"
+          sources."ansi-regex-3.0.0"
           sources."chalk-1.1.3"
-          sources."debug-2.6.9"
-          (sources."eslint-3.19.0" // {
+          sources."cli-cursor-1.0.2"
+          sources."eslint-3.19.0"
+          sources."figures-1.7.0"
+          sources."inquirer-0.12.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."onetime-1.1.0"
+          sources."pluralize-1.2.1"
+          sources."progress-1.1.8"
+          sources."restore-cursor-1.0.1"
+          sources."run-async-0.1.0"
+          sources."rx-lite-3.1.2"
+          sources."shelljs-0.7.8"
+          sources."slice-ansi-0.0.4"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-4.0.0"
+          (sources."table-3.8.3" // {
             dependencies = [
-              sources."ansi-regex-3.0.0"
-              sources."strip-ansi-4.0.0"
+              sources."string-width-2.1.1"
             ];
           })
-          sources."globals-9.18.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."shelljs-0.7.8"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
         ];
       })
       sources."eslint-scope-3.7.1"
@@ -46279,20 +47013,36 @@ in
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."extend-3.0.1"
-      sources."extend-shallow-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."external-editor-2.2.0"
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-1.1.0"
+      sources."fast-deep-equal-2.0.1"
       sources."fast-json-parse-1.0.3"
       sources."fast-json-patch-1.2.2"
       sources."fast-json-stable-stringify-2.0.0"
@@ -46302,38 +47052,44 @@ in
       sources."figures-2.0.0"
       sources."file-entry-cache-2.0.0"
       sources."file-uri-to-path-1.0.0"
-      sources."fill-range-4.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."find-up-2.1.0"
       (sources."firefox-profile-1.1.0" // {
         dependencies = [
           sources."async-2.5.0"
+          sources."fs-extra-4.0.3"
         ];
       })
       sources."first-chunk-stream-2.0.0"
       sources."flat-cache-1.3.0"
-      sources."flatstr-1.0.5"
-      sources."fluent-syntax-0.6.6"
+      sources."flatstr-1.0.8"
+      sources."fluent-syntax-0.7.0"
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fragment-cache-0.2.1"
       sources."fs-constants-1.0.0"
-      sources."fs-extra-4.0.3"
+      sources."fs-extra-5.0.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       (sources."ftp-0.3.10" // {
         dependencies = [
+          sources."isarray-0.0.1"
           sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
-      (sources."fx-runner-1.0.8" // {
+      (sources."fx-runner-1.0.9" // {
         dependencies = [
           sources."commander-2.9.0"
           sources."isexe-1.1.2"
-          sources."lodash-3.10.1"
           sources."which-1.2.4"
         ];
       })
@@ -46341,11 +47097,7 @@ in
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-1.0.2"
       sources."get-stream-3.0.0"
-      (sources."get-uri-2.0.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."get-uri-2.0.2"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."gettext-parser-1.1.0"
@@ -46369,50 +47121,88 @@ in
       sources."graphlib-2.1.5"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
-      sources."has-1.0.1"
+      (sources."har-validator-5.0.3" // {
+        dependencies = [
+          sources."ajv-5.5.2"
+          sources."fast-deep-equal-1.1.0"
+        ];
+      })
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-color-0.1.7"
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
-      sources."hasbin-1.2.3"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."hasbin-1.2.3" // {
+        dependencies = [
+          sources."async-1.5.2"
+        ];
+      })
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."home-or-tmp-2.0.0"
-      sources."hosted-git-info-2.6.0"
+      sources."hosted-git-info-2.6.1"
       sources."htmlparser2-3.9.2"
       sources."http-errors-1.6.3"
-      sources."http-proxy-agent-2.1.0"
+      (sources."http-proxy-agent-2.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."http-signature-1.2.0"
-      sources."https-proxy-agent-2.2.1"
+      (sources."https-proxy-agent-2.2.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."iconv-lite-0.4.23"
-      sources."ignore-3.3.8"
+      sources."ignore-3.3.10"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-3.3.0"
+      (sources."inquirer-3.3.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."interpret-1.1.0"
       sources."invariant-2.2.4"
       sources."invert-kv-1.0.0"
       sources."ip-1.1.5"
       sources."is-absolute-0.1.7"
-      sources."is-accessor-descriptor-1.0.0"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-alphabetical-1.0.2"
       sources."is-alphanumerical-1.0.2"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
-      sources."is-data-descriptor-1.0.0"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-decimal-1.0.2"
-      sources."is-descriptor-1.0.2"
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-finite-1.0.2"
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-4.0.0"
       sources."is-hexadecimal-1.0.2"
       sources."is-installed-globally-0.1.0"
@@ -46420,9 +47210,8 @@ in
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.17.2"
       sources."is-npm-1.0.0"
-      sources."is-number-4.0.0"
+      sources."is-number-3.0.0"
       sources."is-obj-1.0.1"
-      sources."is-odd-2.0.0"
       sources."is-path-cwd-1.0.0"
       sources."is-path-in-cwd-1.0.1"
       sources."is-path-inside-1.0.1"
@@ -46439,16 +47228,18 @@ in
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
-      sources."isemail-1.2.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jed-1.1.1"
       sources."jetpack-id-1.0.0"
-      sources."joi-6.10.1"
       sources."js-select-0.6.0"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.11.0"
+      (sources."js-yaml-3.12.0" // {
+        dependencies = [
+          sources."esprima-4.0.0"
+        ];
+      })
       sources."jsbn-0.1.1"
       sources."jsesc-1.3.0"
       sources."json-merge-patch-0.2.3"
@@ -46462,7 +47253,11 @@ in
       sources."jsonfile-4.0.0"
       sources."jsonify-0.0.0"
       sources."jsonpointer-4.0.1"
-      sources."jsonwebtoken-7.1.9"
+      (sources."jsonwebtoken-8.2.1" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
       sources."jsprim-1.4.1"
       sources."jszip-2.6.1"
       sources."jwa-1.1.6"
@@ -46473,14 +47268,26 @@ in
       sources."lazystream-1.0.0"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
-      sources."load-json-file-1.1.0"
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."parse-json-2.2.0"
+          sources."strip-bom-2.0.0"
+        ];
+      })
       sources."locate-path-2.0.0"
       sources."lodash-4.17.10"
       sources."lodash.assign-4.2.0"
       sources."lodash.assignin-4.2.0"
       sources."lodash.clonedeep-4.5.0"
+      sources."lodash.debounce-4.0.8"
       sources."lodash.flatten-4.4.0"
       sources."lodash.get-4.4.2"
+      sources."lodash.includes-4.3.0"
+      sources."lodash.isboolean-3.0.3"
+      sources."lodash.isinteger-4.0.4"
+      sources."lodash.isnumber-3.0.3"
+      sources."lodash.isplainobject-4.0.6"
+      sources."lodash.isstring-4.0.1"
       sources."lodash.once-4.1.1"
       sources."lodash.set-4.3.2"
       sources."lodash.sortby-4.7.0"
@@ -46489,15 +47296,23 @@ in
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
       sources."macos-release-1.1.0"
-      sources."make-dir-1.3.0"
+      (sources."make-dir-1.3.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."markdown-table-0.4.0"
-      sources."markdown-to-ast-3.4.0"
+      (sources."markdown-to-ast-3.4.0" // {
+        dependencies = [
+          sources."traverse-0.6.6"
+        ];
+      })
       sources."mem-1.1.0"
       (sources."micromatch-3.1.10" // {
         dependencies = [
-          sources."is-extendable-0.1.1"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."mime-db-1.33.0"
@@ -46505,35 +47320,65 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mixin-deep-1.3.1"
-      sources."mixin-object-2.0.1"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."mixin-object-2.0.1" // {
+        dependencies = [
+          sources."for-in-0.1.8"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.22.1"
+      sources."moment-2.22.2"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."mv-2.1.1"
+      (sources."mv-2.1.1" // {
+        dependencies = [
+          sources."glob-6.0.4"
+          sources."rimraf-2.4.5"
+        ];
+      })
       sources."mz-2.7.0"
       sources."nan-2.10.0"
-      sources."nanomatch-1.2.9"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
-      sources."nconf-0.10.0"
-      sources."ncp-2.0.0"
-      (sources."needle-2.2.1" // {
+      (sources."nconf-0.10.0" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."async-1.5.2"
+          sources."camelcase-2.1.1"
+          sources."cliui-3.2.0"
+          sources."decamelize-1.2.0"
+          sources."os-locale-1.4.0"
+          sources."string-width-1.0.2"
+          sources."yargs-3.32.0"
         ];
       })
+      sources."ncp-2.0.0"
+      sources."needle-2.2.1"
       sources."neo-async-2.5.1"
       sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
       sources."node-forge-0.7.5"
       sources."node-notifier-5.2.1"
-      sources."nomnom-1.8.1"
+      (sources."nomnom-1.8.1" // {
+        dependencies = [
+          sources."ansi-styles-1.0.0"
+          sources."chalk-0.4.0"
+          sources."strip-ansi-0.1.1"
+          sources."underscore-1.6.0"
+        ];
+      })
       sources."normalize-package-data-2.4.0"
       sources."normalize-path-2.1.1"
       sources."npm-run-path-2.0.2"
@@ -46541,12 +47386,22 @@ in
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
-      sources."object-copy-0.1.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."open-0.0.5"
       sources."opn-5.3.0"
       sources."optionator-0.8.2"
       sources."os-homedir-1.0.2"
@@ -46555,10 +47410,14 @@ in
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."pac-proxy-agent-2.0.2"
+      (sources."pac-proxy-agent-2.0.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."pac-resolver-3.0.0"
       sources."package-json-4.0.1"
       sources."pako-1.0.6"
@@ -46579,44 +47438,53 @@ in
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      sources."pino-4.14.0"
-      sources."pino-std-serializers-1.2.0"
+      sources."pino-4.16.1"
+      sources."pino-std-serializers-2.1.0"
+      sources."pkginfo-0.4.1"
       sources."pluralize-7.0.0"
-      (sources."po2json-0.4.5" // {
+      sources."po2json-0.4.5"
+      sources."posix-character-classes-0.1.1"
+      (sources."postcss-6.0.19" // {
         dependencies = [
-          sources."ansi-styles-1.0.0"
-          sources."chalk-0.4.0"
-          sources."strip-ansi-0.1.1"
+          sources."source-map-0.6.1"
+          sources."supports-color-5.4.0"
         ];
       })
-      sources."posix-character-classes-0.1.1"
-      sources."postcss-6.0.19"
       sources."prelude-ls-1.1.2"
       sources."prepend-http-1.0.4"
       sources."private-0.1.8"
-      (sources."probe-image-size-4.0.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."probe-image-size-4.0.0"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
       sources."promise-7.3.1"
-      sources."proxy-agent-3.0.0"
+      (sources."proxy-agent-3.0.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
-      sources."punycode-1.4.1"
+      sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."quick-format-unescaped-1.1.2"
       sources."raw-body-2.3.3"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
-      sources."readline2-1.0.1"
+      (sources."readline2-1.0.1" // {
+        dependencies = [
+          sources."mute-stream-0.0.5"
+        ];
+      })
       sources."rechoir-0.6.2"
       sources."recursive-readdir-2.2.2"
       sources."regenerator-runtime-0.11.1"
@@ -46626,11 +47494,7 @@ in
       sources."registry-url-3.1.0"
       (sources."relaxed-json-1.0.1" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
           sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
         ];
       })
       sources."remark-5.1.0"
@@ -46644,7 +47508,7 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.7.1"
+      sources."resolve-1.8.1"
       sources."resolve-from-1.0.1"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
@@ -46654,7 +47518,7 @@ in
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
       sources."safe-buffer-5.1.2"
-      sources."safe-json-stringify-1.1.0"
+      sources."safe-json-stringify-1.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
@@ -46663,7 +47527,11 @@ in
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
       sources."set-immediate-shim-1.0.1"
-      sources."set-value-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."setprototypeof-1.1.0"
       sources."sha.js-2.4.11"
       (sources."shallow-clone-0.1.2" // {
@@ -46676,93 +47544,110 @@ in
       sources."shell-quote-1.6.1"
       sources."shelljs-0.8.1"
       sources."shellwords-0.1.1"
-      (sources."sign-addon-0.3.0" // {
+      (sources."sign-addon-0.3.1" // {
         dependencies = [
-          sources."assert-plus-0.2.0"
-          sources."aws-sign2-0.6.0"
           sources."babel-polyfill-6.16.0"
-          sources."boom-2.10.1"
-          sources."caseless-0.11.0"
-          sources."chalk-1.1.3"
-          sources."cryptiles-2.0.5"
           sources."es6-error-4.0.0"
-          sources."form-data-2.1.4"
-          sources."har-validator-2.0.6"
-          sources."hawk-3.1.3"
-          sources."hoek-2.16.3"
-          sources."http-signature-1.1.1"
-          sources."ms-0.7.3"
           sources."mz-2.5.0"
-          sources."qs-6.3.2"
           sources."regenerator-runtime-0.9.6"
-          sources."request-2.79.0"
-          sources."sntp-1.0.9"
+          sources."request-2.87.0"
           sources."source-map-support-0.4.6"
-          sources."tunnel-agent-0.4.3"
         ];
       })
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
-      sources."slice-ansi-1.0.0"
+      (sources."slice-ansi-1.0.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
       sources."smart-buffer-1.1.15"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
         ];
       })
-      sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
       sources."sntp-2.1.0"
-      (sources."snyk-1.80.1" // {
+      (sources."snyk-1.88.0" // {
         dependencies = [
-          sources."ansi-escapes-3.1.0"
-          sources."ansi-regex-2.1.1"
-          sources."async-1.5.2"
+          sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
-          sources."cli-cursor-2.1.0"
-          sources."figures-2.0.0"
-          sources."inquirer-3.3.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."mute-stream-0.0.7"
-          sources."onetime-2.0.1"
-          sources."os-locale-1.4.0"
-          sources."restore-cursor-2.0.0"
-          sources."run-async-2.3.0"
-          sources."rx-lite-4.0.8"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-3.0.1"
-          sources."yargs-3.32.0"
+          sources."debug-3.1.0"
+          sources."supports-color-5.4.0"
         ];
       })
       (sources."snyk-config-2.1.0" // {
         dependencies = [
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
+          sources."debug-3.1.0"
         ];
       })
-      sources."snyk-go-plugin-1.5.0"
+      (sources."snyk-docker-plugin-1.10.3" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."request-2.87.0"
+        ];
+      })
+      sources."snyk-go-plugin-1.5.1"
       sources."snyk-gradle-plugin-1.3.0"
-      sources."snyk-module-1.8.2"
+      (sources."snyk-module-1.8.2" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."snyk-mvn-plugin-1.2.0"
-      sources."snyk-nuget-plugin-1.6.2"
-      sources."snyk-php-plugin-1.5.1"
-      sources."snyk-policy-1.12.0"
-      sources."snyk-python-plugin-1.6.0"
-      sources."snyk-resolve-1.0.1"
-      sources."snyk-resolve-deps-3.1.0"
-      (sources."snyk-sbt-plugin-1.3.0" // {
+      (sources."snyk-nuget-plugin-1.6.2" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."debug-3.1.0"
+          sources."es6-promise-4.2.4"
         ];
       })
+      (sources."snyk-php-plugin-1.5.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."snyk-policy-1.12.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."snyk-python-plugin-1.6.1"
+      (sources."snyk-resolve-1.0.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."snyk-resolve-deps-3.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."snyk-sbt-plugin-1.3.0"
       sources."snyk-tree-1.0.0"
-      sources."snyk-try-require-1.3.0"
+      (sources."snyk-try-require-1.3.1" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."socks-1.1.10"
       sources."socks-proxy-agent-3.0.1"
       sources."source-map-0.5.7"
@@ -46779,16 +47664,27 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
       sources."split-0.3.3"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      sources."split2-2.2.0"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.14.2"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
-          sources."is-extendable-1.0.1"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."split2-2.2.0"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.1"
-      sources."static-extend-0.1.2"
       sources."statuses-1.5.0"
       sources."stream-parser-0.3.1"
       sources."stream-to-array-2.3.0"
@@ -46798,7 +47694,13 @@ in
           sources."once-1.3.3"
         ];
       })
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."stringify-entities-1.3.2"
       sources."stringstream-0.0.6"
@@ -46810,7 +47712,12 @@ in
       sources."strip-json-comments-2.0.1"
       sources."structured-source-3.0.2"
       sources."supports-color-2.0.0"
-      sources."table-4.0.2"
+      (sources."table-4.0.2" // {
+        dependencies = [
+          sources."ajv-5.5.2"
+          sources."fast-deep-equal-1.1.0"
+        ];
+      })
       sources."tar-stream-1.6.1"
       sources."temp-dir-1.0.0"
       sources."tempfile-2.0.0"
@@ -46831,9 +47738,12 @@ in
       sources."to-regex-range-2.1.1"
       sources."to-utf8-0.0.1"
       sources."toml-2.3.3"
-      sources."topo-1.1.0"
       sources."tosource-1.0.0"
-      sources."tough-cookie-2.3.4"
+      (sources."tough-cookie-2.3.4" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
       sources."tr46-1.0.1"
       sources."traverse-0.4.6"
       sources."trim-0.0.1"
@@ -46844,16 +47754,13 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      (sources."undefsafe-2.0.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."undefsafe-2.0.2"
       sources."underscore-1.8.3"
       sources."unherit-1.1.1"
       sources."unified-4.2.1"
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -46861,7 +47768,7 @@ in
       sources."unist-util-is-2.1.2"
       sources."unist-util-remove-position-1.1.2"
       sources."unist-util-visit-1.3.1"
-      sources."universalify-0.1.1"
+      sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -46870,12 +47777,14 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.4"
+      sources."upath-1.0.5"
       sources."update-notifier-2.3.0"
       sources."update-section-0.3.3"
+      sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       (sources."use-3.1.0" // {
@@ -46884,50 +47793,30 @@ in
         ];
       })
       sources."user-home-2.0.0"
-      sources."util-0.10.3"
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.3"
       sources."verror-1.10.0"
       sources."vfile-1.4.0"
       sources."vfile-location-2.0.3"
-      (sources."watchpack-1.5.0" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-          sources."has-values-0.1.4"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-1.0.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."watchpack-1.5.0"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      sources."whatwg-url-6.3.0"
+      sources."whatwg-url-6.4.1"
       sources."when-3.7.7"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       sources."window-size-0.1.4"
       sources."winreg-0.0.12"
       sources."wordwrap-1.0.0"
-      sources."wrap-ansi-2.1.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-0.2.1"
       sources."write-file-atomic-2.3.0"
@@ -46942,14 +47831,10 @@ in
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
+          sources."cliui-3.2.0"
           sources."decamelize-1.2.0"
-          sources."find-up-1.1.2"
-          sources."is-fullwidth-code-point-1.0.0"
           sources."os-locale-1.4.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-2.1.0"
           sources."string-width-1.0.2"
-          sources."strip-bom-2.0.0"
           sources."which-module-1.0.0"
           sources."yargs-parser-4.2.1"
         ];
@@ -46993,10 +47878,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "1.6.0";
+    version = "1.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.6.0.tgz";
-      sha1 = "9cec6f7986dc237d39ec705ce74d95155fe55d4b";
+      url = "https://registry.npmjs.org/yarn/-/yarn-1.7.0.tgz";
+      sha1 = "0076b9fde6010e01950526a609bc53bc175ef925";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -47010,23 +47895,23 @@ in
   yo = nodeEnv.buildNodePackage {
     name = "yo";
     packageName = "yo";
-    version = "2.0.2";
+    version = "2.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yo/-/yo-2.0.2.tgz";
-      sha512 = "13z42dkmgbs67a3i6wfzf1h3lp54r6xj9p063kyx2nq0v132lqnkss2srl2kayfljcdprr7pw7dfm6h08kqnkhzrlzi1ls7h7cz2qgy";
+      url = "https://registry.npmjs.org/yo/-/yo-2.0.3.tgz";
+      sha512 = "v1z5HW9oZF82ntIx9janKzn/6KS+YXe+dYwCtA/TVCWafr+bTVE914uDkmcJTMbqS1enzoZ3Dy7mveRYQUZ3dg==";
     };
     dependencies = [
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      sources."@nodelib/fs.stat-1.0.2"
+      sources."@nodelib/fs.stat-1.1.0"
       sources."@sindresorhus/is-0.7.0"
       sources."aggregate-error-1.0.0"
       sources."ajv-5.5.2"
       sources."ansi-0.3.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."are-we-there-yet-1.1.4"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."are-we-there-yet-1.1.5"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -47038,7 +47923,8 @@ in
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."async-2.6.0"
+      sources."astral-regex-1.0.0"
+      sources."async-2.6.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.1"
       sources."aws-sign2-0.7.0"
@@ -47046,32 +47932,28 @@ in
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."bin-version-1.0.4"
-      (sources."bin-version-check-2.1.0" // {
+      sources."bcrypt-pbkdf-1.0.2"
+      (sources."bin-version-2.0.0" // {
         dependencies = [
-          sources."semver-4.3.6"
+          sources."execa-0.1.1"
+        ];
+      })
+      sources."bin-version-check-3.0.0"
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
         ];
       })
-      sources."boom-4.3.1"
-      sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
-          sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-3.2.2"
         ];
       })
-      sources."buffer-from-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."builtin-modules-1.1.1"
       sources."cache-base-1.0.1"
       (sources."cacheable-request-2.1.4" // {
@@ -47084,12 +47966,24 @@ in
       sources."camelcase-keys-2.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-1.1.3"
-      sources."chardet-0.4.2"
+      sources."chalk-2.4.1"
+      sources."chardet-0.5.0"
       sources."ci-info-1.1.3"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."clean-stack-1.3.0"
@@ -47104,23 +47998,19 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
+      sources."conf-1.4.0"
       sources."configstore-3.1.2"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      sources."cross-spawn-5.1.0"
+      sources."cross-spawn-6.0.5"
       sources."cross-spawn-async-2.2.5"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."crypto-random-string-1.0.0"
       sources."currently-unhandled-0.4.1"
       sources."dashdash-1.14.1"
@@ -47128,42 +48018,40 @@ in
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."default-uid-1.0.0"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."diff-3.5.0"
-      sources."dir-glob-2.0.0"
+      (sources."dir-glob-2.0.0" // {
+        dependencies = [
+          sources."path-type-3.0.0"
+        ];
+      })
       sources."dot-prop-4.2.0"
       sources."downgrade-root-1.2.2"
       sources."duplexer3-0.1.4"
-      sources."each-async-1.1.1"
+      (sources."each-async-1.1.1" // {
+        dependencies = [
+          sources."onetime-1.1.0"
+        ];
+      })
       sources."ecc-jsbn-0.1.1"
-      sources."error-ex-1.3.1"
+      sources."env-paths-1.0.0"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
-      sources."execa-0.6.3"
+      (sources."execa-0.6.3" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
       sources."execall-1.0.0"
       sources."exit-hook-1.1.1"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
-        ];
-      })
-      sources."extend-3.0.1"
-      sources."extend-shallow-3.0.2"
-      sources."external-editor-2.2.0"
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
-        ];
-      })
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-1.1.0"
-      (sources."fast-glob-2.2.2" // {
-        dependencies = [
           (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -47175,15 +48063,35 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."extend-3.0.1"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
           sources."is-extendable-1.0.1"
         ];
       })
+      sources."external-editor-3.0.0"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-glob-2.2.2"
       sources."fast-json-stable-stringify-2.0.0"
       sources."figures-2.0.0"
-      sources."fill-range-4.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."filter-obj-1.1.0"
-      sources."find-up-1.1.2"
-      sources."find-versions-1.2.1"
+      sources."find-up-2.1.0"
+      sources."find-versions-2.0.0"
       sources."first-chunk-stream-2.0.0"
       sources."for-in-1.0.2"
       sources."foreachasync-3.0.0"
@@ -47192,13 +48100,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
-      (sources."fullname-3.3.0" // {
-        dependencies = [
-          sources."npm-run-path-1.0.0"
-          sources."path-key-1.0.0"
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."fullname-3.3.0"
       sources."gauge-1.2.7"
       sources."get-stdin-4.0.1"
       sources."get-stream-3.0.0"
@@ -47213,78 +48115,46 @@ in
       sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
       sources."global-tunnel-ng-2.1.1"
-      (sources."globby-8.0.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-0.1.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-        ];
-      })
+      sources."globby-8.0.1"
       sources."got-8.3.1"
       sources."graceful-fs-4.1.11"
       sources."grouped-queue-0.3.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-ansi-2.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."has-flag-3.0.0"
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."has-unicode-2.0.1"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."hosted-git-info-2.6.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."hosted-git-info-2.6.1"
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
       sources."iconv-lite-0.4.23"
-      sources."ignore-3.3.8"
+      sources."ignore-3.3.10"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      (sources."inquirer-3.3.0" // {
+      sources."inquirer-6.0.0"
+      (sources."insight-0.10.1" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.1"
-          sources."strip-ansi-4.0.0"
-          sources."supports-color-5.4.0"
-        ];
-      })
-      (sources."insight-0.8.4" // {
-        dependencies = [
-          sources."ansi-escapes-1.4.0"
-          sources."async-1.5.2"
-          sources."cli-cursor-1.0.2"
-          sources."cli-width-1.1.1"
-          (sources."configstore-1.4.0" // {
-            dependencies = [
-              sources."uuid-2.0.3"
-            ];
-          })
-          sources."figures-1.7.0"
-          sources."inquirer-0.10.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."lodash-3.10.1"
-          sources."minimist-0.0.8"
-          sources."mute-stream-0.0.5"
-          sources."onetime-1.1.0"
-          sources."restore-cursor-1.0.1"
-          sources."run-async-0.1.0"
-          sources."rx-lite-3.1.2"
-          sources."write-file-atomic-1.3.4"
-          sources."xdg-basedir-2.0.0"
+          sources."chardet-0.4.2"
+          sources."external-editor-2.2.0"
+          sources."inquirer-5.2.0"
+          sources."rxjs-5.5.11"
         ];
       })
       sources."into-stream-3.1.0"
@@ -47303,10 +48173,13 @@ in
       sources."is-glob-4.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
-      sources."is-number-3.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-obj-1.0.1"
       sources."is-object-1.0.1"
-      sources."is-odd-2.0.0"
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
@@ -47321,6 +48194,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
+      sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
@@ -47328,25 +48202,38 @@ in
       sources."isurl-1.0.0"
       sources."jsbn-0.1.1"
       sources."json-buffer-3.0.0"
+      sources."json-parse-better-errors-1.0.2"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."keyv-3.0.0"
       sources."kind-of-6.0.2"
-      sources."latest-version-3.1.0"
-      sources."load-json-file-1.1.0"
+      (sources."latest-version-3.1.0" // {
+        dependencies = [
+          sources."got-6.7.1"
+          sources."package-json-4.0.1"
+          sources."prepend-http-1.0.4"
+          sources."url-parse-lax-1.0.0"
+        ];
+      })
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."locate-path-2.0.0"
+      sources."locutus-2.0.9"
       sources."lodash-4.17.10"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash.debounce-3.1.1"
+      sources."lodash.debounce-4.0.8"
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      sources."log-symbols-1.0.2"
+      sources."log-symbols-2.2.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
+      sources."macos-release-1.1.0"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-obj-1.0.1"
@@ -47355,28 +48242,32 @@ in
       sources."mem-fs-1.1.3"
       (sources."meow-3.7.0" // {
         dependencies = [
-          sources."indent-string-2.1.0"
-          sources."pify-2.3.0"
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
           sources."read-pkg-up-1.0.1"
         ];
       })
       sources."merge2-1.2.2"
-      (sources."micromatch-3.1.10" // {
-        dependencies = [
-          sources."is-extendable-0.1.1"
-        ];
-      })
+      sources."micromatch-3.1.10"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mixin-deep-1.3.1"
-      sources."mkdirp-0.5.1"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."nanomatch-1.2.9"
+      sources."nanomatch-1.2.13"
       sources."nice-try-1.0.4"
       sources."normalize-package-data-2.4.0"
       sources."normalize-url-2.0.1"
@@ -47394,81 +48285,96 @@ in
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
-      sources."object-copy-0.1.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."object-values-1.0.0"
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."opn-4.0.2"
+      sources."opn-5.3.0"
       sources."os-homedir-1.0.2"
-      (sources."os-name-1.0.3" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."os-name-2.0.1"
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."osx-release-1.1.0"
       sources."p-any-1.1.0"
       sources."p-cancelable-0.4.1"
       sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
-      sources."p-limit-1.2.0"
+      sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-some-2.0.1"
       sources."p-timeout-2.0.1"
       sources."p-try-1.0.0"
-      (sources."package-json-4.0.1" // {
-        dependencies = [
-          sources."got-6.7.1"
-          sources."prepend-http-1.0.4"
-          sources."url-parse-lax-1.0.0"
-        ];
-      })
+      sources."package-json-5.0.0"
       sources."pad-component-0.0.1"
-      sources."parse-help-0.1.1"
+      sources."parse-help-1.0.0"
       sources."parse-json-2.2.0"
       sources."pascalcase-0.1.1"
       (sources."passwd-user-2.1.0" // {
         dependencies = [
           sources."execa-0.4.0"
+          sources."npm-run-path-1.0.0"
+          sources."path-key-1.0.0"
+          sources."pify-2.3.0"
         ];
       })
       sources."path-dirname-1.0.2"
-      sources."path-exists-2.1.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."path-type-1.1.0"
+      (sources."path-type-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
+      sources."pkg-up-2.0.0"
       sources."posix-character-classes-0.1.1"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
+      sources."psl-1.1.28"
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."query-string-5.1.1"
-      sources."rc-1.2.7"
+      sources."rc-1.2.8"
       sources."read-pkg-1.1.0"
-      (sources."read-pkg-up-2.0.0" // {
+      (sources."read-pkg-up-4.0.0" // {
         dependencies = [
-          sources."find-up-2.1.0"
-          sources."load-json-file-2.0.0"
-          sources."path-exists-3.0.0"
-          sources."path-type-2.0.0"
-          sources."pify-2.3.0"
-          sources."read-pkg-2.0.0"
+          sources."find-up-3.0.0"
+          sources."load-json-file-4.0.0"
+          sources."locate-path-3.0.0"
+          sources."p-limit-2.0.0"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.0.0"
+          sources."parse-json-4.0.0"
+          sources."path-type-3.0.0"
+          sources."read-pkg-3.0.0"
           sources."strip-bom-3.0.0"
         ];
       })
       sources."readable-stream-2.3.6"
-      sources."readline2-1.0.1"
-      sources."redent-1.0.0"
+      (sources."redent-1.0.0" // {
+        dependencies = [
+          sources."indent-string-2.1.0"
+        ];
+      })
       sources."regex-not-1.0.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
@@ -47476,7 +48382,11 @@ in
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
       sources."replace-ext-0.0.1"
-      sources."request-2.86.0"
+      (sources."request-2.87.0" // {
+        dependencies = [
+          sources."tough-cookie-2.3.4"
+        ];
+      })
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
@@ -47484,9 +48394,7 @@ in
       sources."root-check-1.0.0"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
-      sources."rxjs-5.5.10"
+      sources."rxjs-6.2.1"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -47494,32 +48402,38 @@ in
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."semver-regex-1.0.0"
-      (sources."semver-truncate-1.1.2" // {
+      sources."semver-truncate-1.1.2"
+      sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.0" // {
         dependencies = [
-          sources."semver-5.5.0"
+          sources."extend-shallow-2.0.1"
         ];
       })
-      sources."set-immediate-shim-1.0.1"
-      sources."set-value-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
-      sources."slide-1.1.6"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."define-property-1.0.0"
         ];
       })
       (sources."snapdragon-util-3.0.1" // {
@@ -47527,9 +48441,8 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."sntp-2.1.0"
       sources."sort-keys-2.0.0"
-      sources."sort-on-2.0.0"
+      sources."sort-on-3.0.0"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
@@ -47538,29 +48451,52 @@ in
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      sources."sshpk-1.14.2"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."sshpk-1.14.1"
-      sources."static-extend-0.1.2"
       sources."strict-uri-encode-1.1.0"
-      sources."string-length-1.0.1"
+      sources."string-length-2.0.0"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
+      sources."strip-ansi-4.0.0"
       sources."strip-bom-2.0.0"
       sources."strip-bom-stream-2.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-indent-1.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."sudo-block-1.2.0"
-      sources."supports-color-2.0.0"
+      (sources."sudo-block-1.2.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."supports-color-5.4.0"
       sources."symbol-observable-1.0.1"
       (sources."tabtab-1.3.2" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
           sources."cli-cursor-1.0.2"
           sources."external-editor-1.1.1"
           sources."figures-1.7.0"
@@ -47570,29 +48506,42 @@ in
           sources."onetime-1.1.0"
           sources."restore-cursor-1.0.1"
           sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
           sources."tmp-0.0.29"
         ];
       })
       sources."taketalk-1.0.0"
-      sources."term-size-1.2.0"
+      (sources."term-size-1.2.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+          sources."execa-0.7.0"
+        ];
+      })
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."timed-out-4.0.1"
       sources."titleize-1.0.1"
       sources."tmp-0.0.33"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."tough-cookie-2.3.4"
+      sources."tough-cookie-2.4.3"
       sources."trim-newlines-1.0.0"
+      sources."tslib-1.9.3"
       sources."tunnel-0.0.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."twig-0.8.9"
+      sources."twig-1.12.0"
       sources."typedarray-0.0.6"
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -47604,41 +48553,37 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
-      sources."untildify-3.0.2"
+      sources."untildify-3.0.3"
       sources."unzip-response-2.0.1"
-      (sources."update-notifier-2.5.0" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."camelcase-4.1.0"
-          sources."chalk-2.4.1"
-          sources."execa-0.7.0"
-          sources."supports-color-5.4.0"
-        ];
-      })
+      sources."update-notifier-2.5.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."url-to-options-1.0.1"
-      (sources."use-3.1.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
+      sources."use-3.1.0"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.3"
       sources."verror-1.10.0"
       sources."vinyl-1.2.0"
-      sources."vinyl-file-2.0.0"
+      (sources."vinyl-file-2.0.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
       sources."walk-2.3.13"
-      sources."which-1.3.0"
+      sources."which-1.3.1"
       sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
           sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
         ];
       })
       sources."wrappy-1.0.2"
@@ -47652,44 +48597,26 @@ in
           sources."supports-color-3.2.3"
         ];
       })
-      (sources."yeoman-doctor-2.1.0" // {
+      sources."yeoman-doctor-3.0.1"
+      (sources."yeoman-environment-2.3.0" // {
         dependencies = [
-          sources."onetime-1.1.0"
-        ];
-      })
-      (sources."yeoman-environment-2.1.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.1"
-          sources."cross-spawn-6.0.5"
+          sources."chardet-0.4.2"
           sources."debug-3.1.0"
-          sources."has-values-0.1.4"
+          sources."external-editor-2.2.0"
           sources."inquirer-5.2.0"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-1.0.1"
-          sources."is-number-4.0.0"
-          sources."log-symbols-2.2.0"
-          sources."path-type-3.0.0"
-          sources."pify-2.3.0"
-          sources."strip-ansi-4.0.0"
-          sources."supports-color-5.4.0"
+          sources."rxjs-5.5.11"
         ];
       })
       (sources."yosay-2.0.2" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."is-fullwidth-code-point-1.0.0"
+          sources."ansi-regex-2.1.1"
+          (sources."chalk-1.1.3" // {
+            dependencies = [
+              sources."ansi-styles-2.2.1"
+            ];
+          })
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
         ];
       })
     ];
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 40eabbd6e6627..bcd5d2fa86e71 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -19,7 +19,7 @@ let
       version = "14.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@cycle/http/-/http-14.9.0.tgz";
-        sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0";
+        sha512 = "wOLMflfsszUXej5wSNxo06VgFqeWZ/GQFz/OzcrHv4r3oXvBsFh9KyyvIV6kOLpaZ+8bkOwBWbpGbJZWK00NFQ==";
       };
     };
     "@cycle/isolate-3.3.0" = {
@@ -28,7 +28,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz";
-        sha512 = "0406glnab9c4579lfqikh8w67xjd7fvll3sysxy80sxjv3iaks6w08bgjl8418pk2x0iid8shd3ad7xqiw1lvdjarxnrydmnj3c8mjq";
+        sha512 = "WFbEhrS1+Wx7VrJtGnjE/TQ1GtSoxQi6mBcFgqh8CwFu9FRxbNk1QL5rrwel250m+zEcwRmxo+kUwtJSlj4DCA==";
       };
     };
     "@cycle/run-3.4.0" = {
@@ -37,7 +37,7 @@ let
       version = "3.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz";
-        sha512 = "2ir1dz9dh2ajf6yaks8nznfm89m0jh09hgadzwfml7xw3d49hks008sz3fq5rp9ax2d7r87y6hcq5hv9xz2qrkx1c1qc2r7xlz74ik1";
+        sha512 = "YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow==";
       };
     };
     "@cycle/time-0.10.1" = {
@@ -49,13 +49,13 @@ let
         sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7";
       };
     };
-    "@types/node-10.1.1" = {
+    "@types/node-10.5.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.1.1";
+      version = "10.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.1.1.tgz";
-        sha512 = "35nbbgd4qp35g3nfbrsc9ndmigc9gl31xdjhx0fakfms35c6jqxpdx7m9c3pi0h3b062p31al5vas36facjhs1nmxf3bdpnrb5k3g4z";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz";
+        sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==";
       };
     };
     "@types/superagent-3.5.6" = {
@@ -64,7 +64,7 @@ let
       version = "3.5.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.5.6.tgz";
-        sha512 = "31mxn8niw3v1nam9lh29lrq867gjkbv2q6fs0w07miff4mz73066cn5n24f1vmnqpvyv6hbh83b6xll66911a8hj54apmn12s8ras68";
+        sha512 = "yGiVkRbB1qtIkRCpEJIxlHazBoILmu33xbbu4IiwxTJjwDi/EudiPYAD7QwWe035jkE40yQgTVXZsAePFtleww==";
       };
     };
     "URIjs-1.16.1" = {
@@ -82,7 +82,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
     "absolute-0.0.1" = {
@@ -103,6 +103,15 @@ let
         sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda";
       };
     };
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+      };
+    };
     "ajv-5.5.2" = {
       name = "ajv";
       packageName = "ajv";
@@ -145,7 +154,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz";
-        sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix";
+        sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A==";
       };
     };
     "ansi-escapes-1.4.0" = {
@@ -163,7 +172,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz";
-        sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j";
+        sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==";
       };
     };
     "ansi-red-0.1.1" = {
@@ -208,7 +217,7 @@ let
       version = "3.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
-        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
     "ansi-wrap-0.1.0" = {
@@ -226,7 +235,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
-        sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
+        sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==";
       };
     };
     "anymatch-2.0.0" = {
@@ -235,7 +244,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
-        sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6";
+        sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
       };
     };
     "ap-0.1.0" = {
@@ -256,13 +265,13 @@ let
         sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a";
       };
     };
-    "append-tree-2.4.1" = {
+    "append-tree-2.4.4" = {
       name = "append-tree";
       packageName = "append-tree";
-      version = "2.4.1";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz";
-        sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7";
+        url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.4.tgz";
+        sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg==";
       };
     };
     "aproba-1.2.0" = {
@@ -271,16 +280,16 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
-    "are-we-there-yet-1.1.4" = {
+    "are-we-there-yet-1.1.5" = {
       name = "are-we-there-yet";
       packageName = "are-we-there-yet";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz";
-        sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
       };
     };
     "argparse-1.0.10" = {
@@ -289,7 +298,7 @@ let
       version = "1.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
     "arr-diff-2.0.0" = {
@@ -316,7 +325,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
+        sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==";
       };
     };
     "arr-union-3.1.0" = {
@@ -400,6 +409,15 @@ let
         sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
     "assert-plus-1.0.0" = {
       name = "assert-plus";
       packageName = "assert-plus";
@@ -454,13 +472,13 @@ let
         sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
-    "async-2.6.0" = {
+    "async-2.6.1" = {
       name = "async";
       packageName = "async";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz";
-        sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4";
+        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
       };
     };
     "async-each-1.0.1" = {
@@ -499,6 +517,15 @@ let
         sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4";
       };
     };
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+      };
+    };
     "aws-sign2-0.7.0" = {
       name = "aws-sign2";
       packageName = "aws-sign2";
@@ -514,7 +541,7 @@ let
       version = "1.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
-        sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -532,7 +559,7 @@ let
       version = "0.11.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
-        sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5";
+        sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
       };
     };
     "base64-js-0.0.8" = {
@@ -544,13 +571,13 @@ let
         sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
       };
     };
-    "bcrypt-pbkdf-1.0.1" = {
+    "bcrypt-pbkdf-1.0.2" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
     "bencode-1.0.0" = {
@@ -559,7 +586,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz";
-        sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p";
+        sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw==";
       };
     };
     "bencode-2.0.0" = {
@@ -568,7 +595,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz";
-        sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2";
+        sha512 = "wr2HwwrUpfB5c68zmAudOltC7rZ1G0+lQOcnuEcfIM3AWAVnB3rHI3nlgd/2CWTfQ3w3zagKt89zni/M+VLZ8g==";
       };
     };
     "binary-extensions-1.11.0" = {
@@ -595,7 +622,7 @@ let
       version = "7.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz";
-        sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky";
+        sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
       };
     };
     "bl-1.2.2" = {
@@ -604,7 +631,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz";
-        sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv";
+        sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
       };
     };
     "blake2b-2.1.2" = {
@@ -622,7 +649,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz";
-        sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0";
+        sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==";
       };
     };
     "block-stream-0.0.9" = {
@@ -640,7 +667,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
-        sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h";
+        sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==";
       };
     };
     "body-0.1.0" = {
@@ -661,22 +688,13 @@ let
         sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
       };
     };
-    "boom-4.3.1" = {
+    "boom-2.10.1" = {
       name = "boom";
       packageName = "boom";
-      version = "4.3.1";
+      version = "2.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
       };
     };
     "boxen-1.3.0" = {
@@ -685,7 +703,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz";
-        sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc";
+        sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==";
       };
     };
     "brace-expansion-1.1.11" = {
@@ -694,7 +712,7 @@ let
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "braces-1.8.5" = {
@@ -712,7 +730,7 @@ let
       version = "2.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
-        sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8";
+        sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
       };
     };
     "browser-stdout-1.3.1" = {
@@ -721,7 +739,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
+        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
     "buffer-3.6.0" = {
@@ -733,31 +751,22 @@ let
         sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb";
       };
     };
-    "buffer-alloc-1.1.0" = {
+    "buffer-alloc-1.2.0" = {
       name = "buffer-alloc";
       packageName = "buffer-alloc";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz";
-        sha1 = "05514d33bf1656d3540c684f65b1202e90eca303";
-      };
-    };
-    "buffer-alloc-unsafe-0.1.1" = {
-      name = "buffer-alloc-unsafe";
-      packageName = "buffer-alloc-unsafe";
-      version = "0.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz";
-        sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a";
+        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz";
+        sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==";
       };
     };
-    "buffer-alloc-unsafe-1.0.0" = {
+    "buffer-alloc-unsafe-1.1.0" = {
       name = "buffer-alloc-unsafe";
       packageName = "buffer-alloc-unsafe";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz";
-        sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe";
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz";
+        sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==";
       };
     };
     "buffer-crc32-0.2.13" = {
@@ -778,22 +787,22 @@ let
         sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5";
       };
     };
-    "buffer-fill-0.1.1" = {
+    "buffer-fill-1.0.0" = {
       name = "buffer-fill";
       packageName = "buffer-fill";
-      version = "0.1.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz";
-        sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032";
+        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz";
+        sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c";
       };
     };
-    "buffer-from-1.0.0" = {
+    "buffer-from-1.1.0" = {
       name = "buffer-from";
       packageName = "buffer-from";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz";
-        sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk";
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz";
+        sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==";
       };
     };
     "buffer-indexof-1.1.1" = {
@@ -802,7 +811,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
-        sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
+        sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==";
       };
     };
     "builtins-1.0.3" = {
@@ -820,7 +829,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz";
-        sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs";
+        sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng==";
       };
     };
     "busboy-0.2.14" = {
@@ -865,7 +874,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
-        sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0";
+        sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
     "call-me-maybe-1.0.1" = {
@@ -919,7 +928,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz";
-        sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa";
+        sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==";
       };
     };
     "center-align-0.1.3" = {
@@ -946,7 +955,7 @@ let
       version = "2.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
-        sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr";
+        sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==";
       };
     };
     "chardet-0.4.2" = {
@@ -958,6 +967,15 @@ let
         sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2";
       };
     };
+    "chardet-0.5.0" = {
+      name = "chardet";
+      packageName = "chardet";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz";
+        sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==";
+      };
+    };
     "charenc-0.0.2" = {
       name = "charenc";
       packageName = "charenc";
@@ -967,13 +985,13 @@ let
         sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
       };
     };
-    "chokidar-2.0.3" = {
+    "chokidar-2.0.4" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz";
-        sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz";
+        sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==";
       };
     };
     "chownr-1.0.1" = {
@@ -991,7 +1009,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz";
-        sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8";
+        sha512 = "SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==";
       };
     };
     "circular-append-file-1.0.1" = {
@@ -1000,7 +1018,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz";
-        sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05";
+        sha512 = "BUDFvrBTCdeVhg9E05PX4XgMegk6xWB69uGwyuATEg7PMfa9lGU1mzFSK0xWNW2O0i9CAQHN0oIdXI/kI2hPkg==";
       };
     };
     "class-utils-0.3.6" = {
@@ -1009,7 +1027,7 @@ let
       version = "0.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
-        sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
+        sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -1045,7 +1063,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz";
-        sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm";
+        sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==";
       };
     };
     "cli-table-0.3.1" = {
@@ -1063,7 +1081,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz";
-        sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc";
+        sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==";
       };
     };
     "cli-width-1.1.1" = {
@@ -1180,7 +1198,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz";
-        sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8";
+        sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA==";
       };
     };
     "coffee-script-1.12.7" = {
@@ -1189,7 +1207,7 @@ let
       version = "1.12.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-        sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+        sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
       };
     };
     "collection-visit-1.0.0" = {
@@ -1201,22 +1219,22 @@ let
         sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
       };
     };
-    "color-convert-1.9.1" = {
+    "color-convert-1.9.2" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz";
-        sha512 = "32rj1090g95xcvm0d2ya6jbqdhiy9w2wv3picdy33fzrm455v0gi7g4n8lw0n31g37wwbdnz7lxjsisgbsaqz1d10j9nh5hi2f9lccs";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz";
+        sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==";
       };
     };
-    "color-name-1.1.3" = {
+    "color-name-1.1.1" = {
       name = "color-name";
       packageName = "color-name";
-      version = "1.1.3";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
-        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz";
+        sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
     "colors-1.0.3" = {
@@ -1228,13 +1246,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "colors-1.2.5" = {
+    "colors-1.3.0" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz";
-        sha512 = "2k2a7k096qcm5fghgcmybg96y3x5bpqb62j0zdlnxq7za4asb6vsy9i69nkg9wqfhkcbh6qzm8zzvq7q516p54awxpp2qrzm8nm3cvs";
+        url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz";
+        sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==";
       };
     };
     "combine-errors-3.0.3" = {
@@ -1264,22 +1282,22 @@ let
         sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
       };
     };
-    "commander-2.11.0" = {
+    "commander-2.15.1" = {
       name = "commander";
       packageName = "commander";
-      version = "2.11.0";
+      version = "2.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
+        url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
+        sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==";
       };
     };
-    "commander-2.15.1" = {
+    "commander-2.16.0" = {
       name = "commander";
       packageName = "commander";
-      version = "2.15.1";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
-        sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn";
+        url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz";
+        sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==";
       };
     };
     "commander-2.3.0" = {
@@ -1333,7 +1351,7 @@ let
       version = "1.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
       };
     };
     "config-chain-1.1.11" = {
@@ -1351,7 +1369,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz";
-        sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy";
+        sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==";
       };
     };
     "connect-3.6.6" = {
@@ -1396,7 +1414,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
-        sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
+        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
       };
     };
     "content-types-0.1.0" = {
@@ -1417,13 +1435,13 @@ let
         sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe";
       };
     };
-    "cookiejar-2.1.1" = {
+    "cookiejar-2.1.2" = {
       name = "cookiejar";
       packageName = "cookiejar";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
-        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz";
+        sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==";
       };
     };
     "copy-descriptor-0.1.1" = {
@@ -1480,13 +1498,13 @@ let
         sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
       };
     };
-    "cryptiles-3.1.2" = {
+    "cryptiles-2.0.5" = {
       name = "cryptiles";
       packageName = "cryptiles";
-      version = "3.1.2";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
-        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
       };
     };
     "crypto-random-string-1.0.0" = {
@@ -1561,13 +1579,13 @@ let
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
-    "dat-dns-1.3.2" = {
+    "dat-dns-3.0.1" = {
       name = "dat-dns";
       packageName = "dat-dns";
-      version = "1.3.2";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-dns/-/dat-dns-1.3.2.tgz";
-        sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad";
+        url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz";
+        sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA==";
       };
     };
     "dat-doctor-1.4.0" = {
@@ -1576,7 +1594,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz";
-        sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl";
+        sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q==";
       };
     };
     "dat-encoding-4.0.2" = {
@@ -1594,7 +1612,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz";
-        sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w";
+        sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA==";
       };
     };
     "dat-ignore-2.1.1" = {
@@ -1603,7 +1621,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz";
-        sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d";
+        sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q==";
       };
     };
     "dat-json-1.0.2" = {
@@ -1612,16 +1630,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz";
-        sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi";
+        sha512 = "EZq+VeE/tM7FGygMVZx3hsMVm7zW3qxhuUYCNtLONaZptqXz4laB5cIWHydmeEn6sl3RZatZqpIuWRu4xDYxIg==";
       };
     };
-    "dat-link-resolve-2.1.1" = {
+    "dat-link-resolve-2.2.0" = {
       name = "dat-link-resolve";
       packageName = "dat-link-resolve";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.1.tgz";
-        sha512 = "3rchn6ap0ma8ij6qcvf74csbhn41nn5xpyzkf9cabr8fmzbj406iz4vvf0hqq473nfpyrvs1ffw2k3bqp4lv1nb98n39m2f5g3f14zp";
+        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.2.0.tgz";
+        sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA==";
       };
     };
     "dat-log-1.1.1" = {
@@ -1633,13 +1651,13 @@ let
         sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8";
       };
     };
-    "dat-node-3.5.8" = {
+    "dat-node-3.5.9" = {
       name = "dat-node";
       packageName = "dat-node";
-      version = "3.5.8";
+      version = "3.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz";
-        sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc";
+        url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz";
+        sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA==";
       };
     };
     "dat-registry-4.0.0" = {
@@ -1648,7 +1666,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz";
-        sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988";
+        sha512 = "CKV7j8kwWNBW2Oacdbf5x0ihxMfPNN8wcKHHmx5UjE4iyaOnfnTwCqTGM5rFoMleXKOGWpB7uCKQa0qpvzmCIA==";
       };
     };
     "dat-secret-storage-4.0.1" = {
@@ -1657,7 +1675,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz";
-        sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05";
+        sha512 = "BUhemnKpXUhKNl/1DuUwfFUyjzomlNF940uHPsOa3okmYu9z6mrp/EGQsLO3lO0YQomDUqS0G0DmHTse9vTU1A==";
       };
     };
     "dat-storage-1.0.4" = {
@@ -1666,7 +1684,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz";
-        sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c";
+        sha512 = "THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg==";
       };
     };
     "dat-swarm-defaults-1.0.1" = {
@@ -1675,7 +1693,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz";
-        sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag";
+        sha512 = "T2WlO7BVmN9USchefsP8entQiByIlJLGuzHLL9qEqOBkyKB8p0Y7XPWxP8dcL43+SkeoxU5NVe7O0bsi3xL8Jg==";
       };
     };
     "debug-2.2.0" = {
@@ -1693,7 +1711,7 @@ let
       version = "2.6.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
-        sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
       };
     };
     "debug-3.1.0" = {
@@ -1702,7 +1720,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
     "decamelize-1.2.0" = {
@@ -1738,7 +1756,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz";
-        sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5";
+        sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==";
       };
     };
     "decompress-tarbz2-4.1.1" = {
@@ -1747,7 +1765,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz";
-        sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk";
+        sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==";
       };
     };
     "decompress-targz-4.1.1" = {
@@ -1756,7 +1774,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz";
-        sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3";
+        sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==";
       };
     };
     "decompress-unzip-4.0.1" = {
@@ -1777,13 +1795,13 @@ let
         sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d";
       };
     };
-    "deep-extend-0.5.1" = {
+    "deep-extend-0.6.0" = {
       name = "deep-extend";
       packageName = "deep-extend";
-      version = "0.5.1";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
-        sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
     "define-property-0.2.5" = {
@@ -1810,7 +1828,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
-        sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg";
+        sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -1891,7 +1909,7 @@ let
       version = "3.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
-        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
+        sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
     "directory-index-html-2.1.0" = {
@@ -1909,7 +1927,7 @@ let
       version = "5.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz";
-        sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h";
+        sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw==";
       };
     };
     "discovery-swarm-4.4.2" = {
@@ -1921,13 +1939,22 @@ let
         sha1 = "5d3160a46019e50e874195765df7d601ee55a813";
       };
     };
+    "discovery-swarm-5.1.1" = {
+      name = "discovery-swarm";
+      packageName = "discovery-swarm";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz";
+        sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA==";
+      };
+    };
     "dns-discovery-5.6.1" = {
       name = "dns-discovery";
       packageName = "dns-discovery";
       version = "5.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz";
-        sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg";
+        sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA==";
       };
     };
     "dns-discovery-6.1.0" = {
@@ -1936,7 +1963,7 @@ let
       version = "6.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz";
-        sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a";
+        sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ==";
       };
     };
     "dns-packet-1.3.1" = {
@@ -1945,7 +1972,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";
-        sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i";
+        sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==";
       };
     };
     "dns-packet-4.2.0" = {
@@ -1954,7 +1981,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz";
-        sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf";
+        sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw==";
       };
     };
     "dns-socket-1.6.3" = {
@@ -1963,7 +1990,7 @@ let
       version = "1.6.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz";
-        sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy";
+        sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng==";
       };
     };
     "dns-socket-3.0.0" = {
@@ -1972,7 +1999,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz";
-        sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k";
+        sha512 = "M0WkByoJ/mTm+HtwBQLsRJPe5uGIC/lYVOp+s6ZzhbZ5iq4GxjFyxYPQhB85dgCLvVb43aJQXHDC9aUgyKGc/Q==";
       };
     };
     "dns-txt-2.0.2" = {
@@ -1999,7 +2026,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
+        sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==";
       };
     };
     "download-5.0.3" = {
@@ -2017,7 +2044,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz";
-        sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z";
+        sha512 = "PwAUr0/w74AGB7bukOycXyLnDlt9Lfb3JzsliAWyZCHa/TvbuMYQvH1er2DWXHE4EuI/NjAzRXw+89Waynapgw==";
       };
     };
     "duplexer-0.1.1" = {
@@ -2044,7 +2071,7 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
-        sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw";
+        sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==";
       };
     };
     "ecc-jsbn-0.1.1" = {
@@ -2098,16 +2125,16 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
-        sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl";
+        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
       };
     };
-    "es5-ext-0.10.42" = {
+    "es5-ext-0.10.45" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.42";
+      version = "0.10.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz";
-        sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz";
+        sha512 = "FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==";
       };
     };
     "es6-iterator-2.0.3" = {
@@ -2179,7 +2206,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
-        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
+        sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==";
       };
     };
     "etag-1.8.1" = {
@@ -2296,7 +2323,16 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
-        sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd";
+        sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==";
+      };
+    };
+    "external-editor-3.0.0" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz";
+        sha512 = "mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==";
       };
     };
     "extglob-0.3.2" = {
@@ -2314,7 +2350,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
-        sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
+        sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
       };
     };
     "extsprintf-1.3.0" = {
@@ -2362,13 +2398,13 @@ let
         sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1";
       };
     };
-    "fd-slicer-1.0.1" = {
+    "fd-slicer-1.1.0" = {
       name = "fd-slicer";
       packageName = "fd-slicer";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
-        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz";
+        sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e";
       };
     };
     "figures-1.7.0" = {
@@ -2413,7 +2449,7 @@ let
       version = "6.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz";
-        sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0";
+        sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==";
       };
     };
     "filename-regex-2.0.1" = {
@@ -2434,13 +2470,13 @@ let
         sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229";
       };
     };
-    "filenamify-2.0.0" = {
+    "filenamify-2.1.0" = {
       name = "filenamify";
       packageName = "filenamify";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz";
-        sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695";
+        url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz";
+        sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==";
       };
     };
     "fill-range-2.2.4" = {
@@ -2449,7 +2485,7 @@ let
       version = "2.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz";
-        sha512 = "3jpxxzv8ji9xqk6xwbr20nsl31jjqr5asnv0ayixyc3r393yv4r44b7lifpk1pqaw8clzs0cy7dnw9yb5axpg9ih7vfimzlp04xqykj";
+        sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==";
       };
     };
     "fill-range-4.0.0" = {
@@ -2488,13 +2524,13 @@ let
         sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed";
       };
     };
-    "for-each-0.3.2" = {
+    "for-each-0.3.3" = {
       name = "for-each";
       packageName = "for-each";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz";
-        sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4";
+        url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz";
+        sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==";
       };
     };
     "for-in-1.0.2" = {
@@ -2533,6 +2569,15 @@ let
         sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
       };
     };
+    "form-data-2.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
+      };
+    };
     "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -2557,7 +2602,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
-        sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn";
+        sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
       };
     };
     "fragment-cache-0.2.1" = {
@@ -2602,7 +2647,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
-        sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb";
+        sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==";
       };
     };
     "fs-extra-0.24.0" = {
@@ -2629,7 +2674,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";
-        sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416";
+        sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -2647,7 +2692,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
-        sha512 = "0vfzl6byj55zmi8xiqb9bqd5q0awlpgz4hsph9xzhzrd46did859d6fp5vydh7n4d0n1ph5q36smq6k3pjq6w5fxs0vx4xjv3yzrhfg";
+        sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==";
       };
     };
     "fstream-1.0.11" = {
@@ -2674,7 +2719,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz";
-        sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf";
+        sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==";
       };
     };
     "get-stream-2.3.1" = {
@@ -2746,7 +2791,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
       };
     };
     "glob-base-0.3.0" = {
@@ -2827,7 +2872,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz";
-        sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy";
+        sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==";
       };
     };
     "gray-matter-2.1.1" = {
@@ -2839,13 +2884,13 @@ let
         sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e";
       };
     };
-    "growl-1.10.3" = {
+    "growl-1.10.5" = {
       name = "growl";
       packageName = "growl";
-      version = "1.10.3";
+      version = "1.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz";
-        sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
+        url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz";
+        sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==";
       };
     };
     "growl-1.9.2" = {
@@ -2875,6 +2920,15 @@ let
         sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc";
       };
     };
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
     "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
@@ -2884,6 +2938,15 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
     "har-validator-5.0.3" = {
       name = "har-validator";
       packageName = "har-validator";
@@ -2902,15 +2965,6 @@ let
         sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
-    "has-flag-2.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
-        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
-      };
-    };
     "has-flag-3.0.0" = {
       name = "has-flag";
       packageName = "has-flag";
@@ -2935,7 +2989,7 @@ let
       version = "1.4.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz";
-        sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx";
+        sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
       };
     };
     "has-to-string-tag-x-1.4.1" = {
@@ -2944,7 +2998,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz";
-        sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx";
+        sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==";
       };
     };
     "has-unicode-2.0.1" = {
@@ -2992,13 +3046,13 @@ let
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     };
-    "hawk-6.0.2" = {
+    "hawk-3.1.3" = {
       name = "hawk";
       packageName = "hawk";
-      version = "6.0.2";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
-        sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als";
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
       };
     };
     "he-1.1.1" = {
@@ -3010,13 +3064,13 @@ let
         sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
       };
     };
-    "hoek-4.2.1" = {
+    "hoek-2.16.3" = {
       name = "hoek";
       packageName = "hoek";
-      version = "4.2.1";
+      version = "2.16.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz";
-        sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
       };
     };
     "http-errors-1.6.3" = {
@@ -3037,6 +3091,15 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+      };
+    };
     "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -3046,13 +3109,22 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "hypercore-6.14.0" = {
+    "hypercore-6.17.1" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.14.0";
+      version = "6.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz";
-        sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz";
+        sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ==";
+      };
+    };
+    "hypercore-crypto-1.0.0" = {
+      name = "hypercore-crypto";
+      packageName = "hypercore-crypto";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-1.0.0.tgz";
+        sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw==";
       };
     };
     "hypercore-protocol-6.6.4" = {
@@ -3061,16 +3133,16 @@ let
       version = "6.6.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz";
-        sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm";
+        sha512 = "9TU7P+uve0e5v1ZiBx70DFhkpepW4iNSGYlZthK+Unm0EbZ+Yppc6clH7JTffPBNUMSnDrE552MfXMilpCHZMw==";
       };
     };
-    "hyperdrive-9.12.3" = {
+    "hyperdrive-9.14.0" = {
       name = "hyperdrive";
       packageName = "hyperdrive";
-      version = "9.12.3";
+      version = "9.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz";
-        sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3";
+        url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.0.tgz";
+        sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww==";
       };
     };
     "hyperdrive-http-4.2.2" = {
@@ -3079,7 +3151,7 @@ let
       version = "4.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz";
-        sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn";
+        sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw==";
       };
     };
     "hyperdrive-network-speed-2.1.0" = {
@@ -3088,7 +3160,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz";
-        sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296";
+        sha512 = "JolPS374h6oS1rmz1iebFfeDDvA2nAtiHbx9VJJGMgSDSx4Q77eeY09hDgZwY7KatSKUGWnnSyydSgVUb3+8Lw==";
       };
     };
     "i-0.3.6" = {
@@ -3106,7 +3178,7 @@ let
       version = "0.4.23";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
-        sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x";
+        sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -3118,13 +3190,13 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "ieee754-1.1.11" = {
+    "ieee754-1.1.12" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.11";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz";
-        sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
+        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
       };
     };
     "ignore-by-default-1.0.1" = {
@@ -3142,7 +3214,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
+        sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==";
       };
     };
     "import-lazy-2.1.0" = {
@@ -3187,7 +3259,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "inquirer-0.10.1" = {
@@ -3205,7 +3277,25 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz";
-        sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47";
+        sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==";
+      };
+    };
+    "inquirer-6.0.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz";
+        sha512 = "tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==";
+      };
+    };
+    "inspect-custom-symbol-1.1.0" = {
+      name = "inspect-custom-symbol";
+      packageName = "inspect-custom-symbol";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inspect-custom-symbol/-/inspect-custom-symbol-1.1.0.tgz";
+        sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg==";
       };
     };
     "ip-1.1.5" = {
@@ -3241,7 +3331,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
-        sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
+        sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
       };
     };
     "is-binary-path-1.0.1" = {
@@ -3259,7 +3349,16 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
+      };
+    };
+    "is-callable-1.1.3" = {
+      name = "is-callable";
+      packageName = "is-callable";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz";
+        sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2";
       };
     };
     "is-ci-1.1.0" = {
@@ -3268,7 +3367,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz";
-        sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k";
+        sha512 = "c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -3286,7 +3385,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
-        sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d";
+        sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -3295,7 +3394,7 @@ let
       version = "0.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
-        sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a";
+        sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
       };
     };
     "is-descriptor-1.0.2" = {
@@ -3304,7 +3403,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
-        sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r";
+        sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
       };
     };
     "is-dotfile-1.0.3" = {
@@ -3340,7 +3439,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
-        sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba";
+        sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==";
       };
     };
     "is-extglob-1.0.0" = {
@@ -3475,7 +3574,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz";
-        sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd";
+        sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==";
       };
     };
     "is-obj-1.0.1" = {
@@ -3496,13 +3595,13 @@ let
         sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
       };
     };
-    "is-odd-2.0.0" = {
-      name = "is-odd";
-      packageName = "is-odd";
-      version = "2.0.0";
+    "is-options-1.0.1" = {
+      name = "is-options";
+      packageName = "is-options";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz";
-        sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r";
+        url = "https://registry.npmjs.org/is-options/-/is-options-1.0.1.tgz";
+        sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg==";
       };
     };
     "is-path-inside-1.0.1" = {
@@ -3520,7 +3619,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+        sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
     "is-posix-bracket-0.1.1" = {
@@ -3619,7 +3718,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
-        sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr";
+        sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==";
       };
     };
     "isarray-0.0.1" = {
@@ -3682,7 +3781,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
+        sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==";
       };
     };
     "iterators-0.1.0" = {
@@ -3703,13 +3802,13 @@ let
         sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
       };
     };
-    "js-yaml-3.11.0" = {
+    "js-yaml-3.12.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.11.0";
+      version = "3.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
-        sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
+        sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
       };
     };
     "jsbn-0.1.1" = {
@@ -3745,7 +3844,7 @@ let
       version = "0.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz";
-        sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1";
+        sha512 = "4Ssj+1UGDJAzPIdTL1QW/rvHwWeuwC28gjbA0EjStLxVsalc+UPciKXxs3rhtr4gaGdIBojW/VmvC8B8bCQwcA==";
       };
     };
     "json-schema-traverse-0.3.1" = {
@@ -3757,6 +3856,15 @@ let
         sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -3775,6 +3883,15 @@ let
         sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
+    "jsonify-0.0.0" = {
+      name = "jsonify";
+      packageName = "jsonify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      };
+    };
     "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -3790,7 +3907,7 @@ let
       version = "3.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz";
-        sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j";
+        sha512 = "kgwWqYT79rAahn4maIVTP8dIe+m1KulufWW+f1bB9DlZrRFiGpZ4iJOg2HUp4xJYBWONP3+rOPIWF/RXABU6mw==";
       };
     };
     "k-bucket-4.0.1" = {
@@ -3799,7 +3916,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.1.tgz";
-        sha512 = "1qyasv93yhjmmvsrxq5srbi1y6wj2vqpnnb1wafjxg1ffj01pyhx9jgqw0byrjm097ywrz0k9yki7dcnn2ncwqxyryqys7hincykw32";
+        sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ==";
       };
     };
     "k-rpc-4.3.1" = {
@@ -3808,7 +3925,7 @@ let
       version = "4.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz";
-        sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s";
+        sha512 = "mgAJZeFYbpP0xzJzmS0TQTYoFI0sjy3GnKFhg8wyboL+KvWg2WLaA2Oy9PthLPx2Rxz4WeBMk4y3MSOrDJ95FA==";
       };
     };
     "k-rpc-socket-1.8.0" = {
@@ -3817,7 +3934,7 @@ let
       version = "1.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz";
-        sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz";
+        sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg==";
       };
     };
     "kind-of-3.2.2" = {
@@ -3844,7 +3961,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
-        sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l";
+        sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
     "kind-of-6.0.2" = {
@@ -3853,7 +3970,7 @@ let
       version = "6.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
-        sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk";
+        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
       };
     };
     "klaw-1.3.1" = {
@@ -3916,7 +4033,7 @@ let
       version = "4.17.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
-        sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i";
+        sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
       };
     };
     "lodash-compat-3.10.2" = {
@@ -4144,6 +4261,15 @@ let
         sha1 = "f29203b40b12fee0a45d3631648259bebabc7868";
       };
     };
+    "lodash.debounce-4.0.8" = {
+      name = "lodash.debounce";
+      packageName = "lodash.debounce";
+      version = "4.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz";
+        sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af";
+      };
+    };
     "lodash.flattendeep-4.4.0" = {
       name = "lodash.flattendeep";
       packageName = "lodash.flattendeep";
@@ -4276,7 +4402,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
-        sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm";
+        sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
       };
     };
     "longest-1.0.1" = {
@@ -4294,7 +4420,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
     "lru-2.0.1" = {
@@ -4330,7 +4456,7 @@ let
       version = "4.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
-        sha512 = "0j2ny2y61f70dbzarfa1xazv68dw7nb2r4p5sy46fw6dwr9y0yg003lb1yv7sdl77hcrpzn22mih799z657sz21al4qmf1kr2yj2lbw";
+        sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==";
       };
     };
     "make-dir-1.3.0" = {
@@ -4339,7 +4465,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
-        sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv";
+        sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
     "map-cache-0.2.2" = {
@@ -4411,7 +4537,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz";
-        sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri";
+        sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg==";
       };
     };
     "merkle-tree-stream-3.0.3" = {
@@ -4456,7 +4582,7 @@ let
       version = "3.1.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
-        sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i";
+        sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
       };
     };
     "mime-1.3.4" = {
@@ -4474,7 +4600,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
-        sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398";
+        sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
       };
     };
     "mime-1.6.0" = {
@@ -4483,7 +4609,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
     "mime-db-1.33.0" = {
@@ -4492,7 +4618,7 @@ let
       version = "1.33.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
-        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+        sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
       };
     };
     "mime-types-2.1.18" = {
@@ -4501,7 +4627,7 @@ let
       version = "2.1.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
-        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+        sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -4510,7 +4636,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
       };
     };
     "min-document-2.19.0" = {
@@ -4537,7 +4663,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-0.0.8" = {
@@ -4558,13 +4684,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.3.0" = {
+    "minipass-2.3.3" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.3.0";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz";
-        sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
+        sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
       };
     };
     "minizlib-1.1.0" = {
@@ -4573,16 +4699,16 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
-        sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
+        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
       };
     };
-    "mirror-folder-2.2.0" = {
+    "mirror-folder-3.0.0" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
-      version = "2.2.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz";
-        sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r";
+        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz";
+        sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g==";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -4591,7 +4717,7 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz";
-        sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi";
+        sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==";
       };
     };
     "mkdirp-0.3.0" = {
@@ -4648,13 +4774,13 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
-    "multer-1.3.0" = {
+    "multer-1.3.1" = {
       name = "multer";
       packageName = "multer";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz";
-        sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2";
+        url = "https://registry.npmjs.org/multer/-/multer-1.3.1.tgz";
+        sha512 = "JHdEoxkA/5NgZRo91RNn4UT+HdcJV9XUo01DTkKC7vo1erNIngtuaw9Y0WI8RdTlyi+wMIbunflhghzVLuGJyw==";
       };
     };
     "multi-random-access-2.1.1" = {
@@ -4672,7 +4798,7 @@ let
       version = "6.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz";
-        sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf";
+        sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
       };
     };
     "multicast-dns-7.0.0" = {
@@ -4681,7 +4807,7 @@ let
       version = "7.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz";
-        sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806";
+        sha512 = "BqB5TtIXHo+8gN33N1CA1clsvPsAJlnc6D49SzfQA0xq75cxj15g2y9NaRdf4x2u4v1P66PBC+Wg6YgPO5Bc/g==";
       };
     };
     "multicb-1.2.2" = {
@@ -4690,7 +4816,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz";
-        sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx";
+        sha512 = "PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ==";
       };
     };
     "multimatch-2.1.0" = {
@@ -4702,13 +4828,13 @@ let
         sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b";
       };
     };
-    "multistream-2.1.0" = {
+    "multistream-2.1.1" = {
       name = "multistream";
       packageName = "multistream";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz";
-        sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d";
+        url = "https://registry.npmjs.org/multistream/-/multistream-2.1.1.tgz";
+        sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ==";
       };
     };
     "mute-stream-0.0.5" = {
@@ -4735,7 +4861,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz";
-        sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2";
+        sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ==";
       };
     };
     "nan-2.10.0" = {
@@ -4744,7 +4870,7 @@ let
       version = "2.10.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
-        sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc";
+        sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==";
       };
     };
     "nanoassert-1.1.0" = {
@@ -4765,13 +4891,13 @@ let
         sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86";
       };
     };
-    "nanomatch-1.2.9" = {
+    "nanomatch-1.2.13" = {
       name = "nanomatch";
       packageName = "nanomatch";
-      version = "1.2.9";
+      version = "1.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz";
-        sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z";
+        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz";
+        sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
     "nanotiming-1.0.1" = {
@@ -4807,7 +4933,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz";
-        sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d";
+        sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg==";
       };
     };
     "needle-2.2.1" = {
@@ -4816,7 +4942,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
-        sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp";
+        sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==";
       };
     };
     "nets-3.2.0" = {
@@ -4846,22 +4972,22 @@ let
         sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
       };
     };
-    "node-gyp-build-3.3.0" = {
+    "node-gyp-build-3.4.0" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
-        sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
+        sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
       };
     };
-    "nodemon-1.17.4" = {
+    "nodemon-1.17.5" = {
       name = "nodemon";
       packageName = "nodemon";
-      version = "1.17.4";
+      version = "1.17.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz";
-        sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5";
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz";
+        sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw==";
       };
     };
     "nopt-1.0.10" = {
@@ -4906,7 +5032,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
-        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
+        sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==";
       };
     };
     "npm-conf-1.1.3" = {
@@ -4915,7 +5041,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz";
-        sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2";
+        sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==";
       };
     };
     "npm-packlist-1.1.10" = {
@@ -4924,7 +5050,7 @@ let
       version = "1.1.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
-        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
+        sha512 = "AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -4942,7 +5068,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -5086,7 +5212,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz";
-        sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8";
+        sha512 = "iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==";
       };
     };
     "os-homedir-1.0.2" = {
@@ -5113,7 +5239,7 @@ let
       version = "0.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
     "p-finally-1.0.0" = {
@@ -5212,7 +5338,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz";
-        sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk";
+        sha512 = "k/IPo9OWyofATP5gwIehHHQoFShS37zsSIsejKe6fjI+tqK+FnRpiSg4ZfWUpxb0g2PfCreWPqBD4ayjqjqkdQ==";
       };
     };
     "path-to-regexp-1.7.0" = {
@@ -5242,6 +5368,15 @@ let
         sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
     "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
@@ -5374,7 +5509,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
-        sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
       };
     };
     "progress-string-1.2.2" = {
@@ -5383,7 +5518,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz";
-        sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97";
+        sha512 = "JymvIR4IJ0qTyma7ExefBeJGp2IGaXYGWv8Z//Jq+AhrCd0uKlMPK9IWJ0LL6zbXbAN8fhLe1TL1hl1ZKOljDw==";
       };
     };
     "prompt-1.0.0" = {
@@ -5410,7 +5545,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz";
-        sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a";
+        sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ==";
       };
     };
     "ps-tree-1.1.0" = {
@@ -5437,7 +5572,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz";
-        sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb";
+        sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q==";
       };
     };
     "pump-1.0.3" = {
@@ -5446,7 +5581,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz";
-        sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj";
+        sha512 = "8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==";
       };
     };
     "pump-2.0.1" = {
@@ -5455,7 +5590,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz";
-        sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf";
+        sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==";
       };
     };
     "pump-3.0.0" = {
@@ -5464,7 +5599,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
+        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
       };
     };
     "punycode-1.4.1" = {
@@ -5476,13 +5611,13 @@ let
         sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     };
-    "punycode-2.1.0" = {
+    "punycode-2.1.1" = {
       name = "punycode";
       packageName = "punycode";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz";
-        sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d";
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
     "qs-2.3.3" = {
@@ -5512,13 +5647,22 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+      };
+    };
     "qs-6.5.2" = {
       name = "qs";
       packageName = "qs";
       version = "6.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
-        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
     "raf-3.3.2" = {
@@ -5536,7 +5680,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz";
-        sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx";
+        sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg==";
       };
     };
     "random-access-memory-2.4.0" = {
@@ -5548,13 +5692,22 @@ let
         sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2";
       };
     };
-    "random-access-storage-1.2.0" = {
+    "random-access-memory-3.0.0" = {
+      name = "random-access-memory";
+      packageName = "random-access-memory";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz";
+        sha512 = "O/d5C/kTOs/aDix1CD+N7z4SgNVGPx+xpFKXGfrC0TFpqYVrsJEUmQCl3ITTg7FVMoCmLBo5rdkA5FcFg00NTA==";
+      };
+    };
+    "random-access-storage-1.3.0" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz";
-        sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz";
+        sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA==";
       };
     };
     "randomatic-3.0.0" = {
@@ -5563,7 +5716,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz";
-        sha512 = "142g2k8ipzpkp1sv5zsbk8qy39r5isc1s9q2x910dh6zqwdksd6mkq16apdrfw6ssv14hpg64j4zy3v4m4lclpvwi767phqh4w4bp2m";
+        sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==";
       };
     };
     "randombytes-2.0.6" = {
@@ -5572,7 +5725,7 @@ let
       version = "2.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
-        sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108";
+        sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==";
       };
     };
     "range-parser-1.2.0" = {
@@ -5593,13 +5746,13 @@ let
         sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
       };
     };
-    "rc-1.2.7" = {
+    "rc-1.2.8" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.7";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz";
-        sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
     "read-1.0.7" = {
@@ -5644,7 +5797,7 @@ let
       version = "2.3.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
     "readdirp-2.1.0" = {
@@ -5671,7 +5824,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz";
-        sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x";
+        sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==";
       };
     };
     "recursive-watch-1.1.4" = {
@@ -5680,7 +5833,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz";
-        sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx";
+        sha512 = "fWejAmdLi7B/jipBUjTLnqId+PK+573fbGNbdaNA/AiAnQAx6OYOLCGWRs0W5+PyM1rLzZSWK2f40QpHSR49PQ==";
       };
     };
     "reduce-component-1.0.1" = {
@@ -5698,7 +5851,7 @@ let
       version = "0.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz";
-        sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx";
+        sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==";
       };
     };
     "regex-not-1.0.2" = {
@@ -5707,7 +5860,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
-        sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917";
+        sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -5716,7 +5869,7 @@ let
       version = "3.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
-        sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94";
+        sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==";
       };
     };
     "registry-url-3.1.0" = {
@@ -5755,13 +5908,22 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "request-2.86.0" = {
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "request-2.87.0" = {
       name = "request";
       packageName = "request";
-      version = "2.86.0";
+      version = "2.87.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.86.0.tgz";
-        sha512 = "37xa5i4dk3fkcl9gxrzxkjjy6vcqn6bcc61bwq6kjpqrg5i01yc6xn0iq3zy68vqqav93k1kgr2xdabp22p0bfynfcbzxp8ms3n41h5";
+        url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
+        sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
       };
     };
     "resolve-1.1.7" = {
@@ -5806,7 +5968,7 @@ let
       version = "0.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
-        sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad";
+        sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
       };
     };
     "revalidator-0.1.8" = {
@@ -5833,7 +5995,7 @@ let
       version = "2.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
-        sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
+        sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==";
       };
     };
     "run-async-0.1.0" = {
@@ -5890,13 +6052,22 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
+    "rxjs-6.2.1" = {
+      name = "rxjs";
+      packageName = "rxjs";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz";
+        sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g==";
+      };
+    };
     "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
     "safe-regex-1.1.0" = {
@@ -5914,7 +6085,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "sanitize-filename-1.6.1" = {
@@ -5932,7 +6103,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
       };
     };
     "seek-bzip-1.0.5" = {
@@ -5959,7 +6130,7 @@ let
       version = "5.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
-        sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
+        sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
       };
     };
     "semver-diff-2.1.0" = {
@@ -5977,7 +6148,7 @@ let
       version = "0.16.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
-        sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk";
+        sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==";
       };
     };
     "serve-static-1.13.2" = {
@@ -5986,7 +6157,7 @@ let
       version = "1.13.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
-        sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7";
+        sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -6022,7 +6193,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz";
-        sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7";
+        sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==";
       };
     };
     "setimmediate-1.0.5" = {
@@ -6040,7 +6211,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
-        sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86";
+        sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
       };
     };
     "shebang-command-1.2.0" = {
@@ -6094,16 +6265,16 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz";
-        sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4";
+        sha512 = "pFMPd+I/lQkpf4wFUeS/sED5IqdIG1lUlrQviBMV4u4mz8BRAcB5fvUx5Ckfg3kBigEglAjHg7E9k/yy2KlCqA==";
       };
     };
-    "siphash24-1.1.0" = {
+    "siphash24-1.1.1" = {
       name = "siphash24";
       packageName = "siphash24";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz";
-        sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w";
+        url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz";
+        sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA==";
       };
     };
     "slash-1.0.0" = {
@@ -6130,7 +6301,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz";
-        sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
+        sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==";
       };
     };
     "snabbdom-0.7.0" = {
@@ -6139,7 +6310,7 @@ let
       version = "0.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz";
-        sha512 = "3bh1m1ymhqqcm0mlxy5ja4xhcrryczvjda6jf8k6km9fx655x1wn7gx85i9rqds6wr1nwzccrdq72d5wn1274lxkzwy1n39gya3la1c";
+        sha512 = "LCg6lH9p2OD5n52SI4LlpYmDW2bscxsyN7rhnGJB/R3LQy/FdJfqNBM5aVST+zOfM4OdKFl8pxVUhjGsPtQA1w==";
       };
     };
     "snabbdom-selector-1.2.1" = {
@@ -6148,7 +6319,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz";
-        sha512 = "3d51vgryfsxmpva2m93ca6z130m6vh4aiii2r9w7wkibrqy6z5zjyr2p26lmghn8msdfi1yvg9hfjq573q45vazzy2my9hivqb3ck43";
+        sha512 = "g0w2Ft4RJl+F/1/tQvA4BUsH09s+RNd0RRa+So24Inv5yzce5xUnPzxlEWNUBG5TwQjfKDZSFWrf2rXz+e1Q2g==";
       };
     };
     "snapdragon-0.8.2" = {
@@ -6157,7 +6328,7 @@ let
       version = "0.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
-        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
+        sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==";
       };
     };
     "snapdragon-node-2.1.1" = {
@@ -6166,7 +6337,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
-        sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv";
+        sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==";
       };
     };
     "snapdragon-util-3.0.1" = {
@@ -6175,16 +6346,16 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
-        sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr";
+        sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
       };
     };
-    "sntp-2.1.0" = {
+    "sntp-1.0.9" = {
       name = "sntp";
       packageName = "sntp";
-      version = "2.1.0";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
-        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
     "sodium-javascript-0.5.5" = {
@@ -6193,7 +6364,7 @@ let
       version = "0.5.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz";
-        sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
+        sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==";
       };
     };
     "sodium-native-2.1.6" = {
@@ -6202,7 +6373,7 @@ let
       version = "2.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz";
-        sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx";
+        sha512 = "vfovcNlU8C93SbeNoGSAdW5zVOTlrh1sTy+TzdC2FhDTE/IUK6j4ML5gdr/qziLz4XRT4EQWJvbFzql6CAAH/A==";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -6211,16 +6382,16 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz";
-        sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj";
+        sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
       };
     };
-    "sorted-array-functions-1.1.0" = {
+    "sorted-array-functions-1.2.0" = {
       name = "sorted-array-functions";
       packageName = "sorted-array-functions";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz";
-        sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf";
+        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz";
+        sha512 = "sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg==";
       };
     };
     "sorted-immutable-list-1.1.0" = {
@@ -6265,7 +6436,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "14dmrwi7wa13wr1mrygjmb49mzsycpj8h5r41y7qvdf98lz9qzaww7vis6cvgqgfx0ly1sx4vsmw45xzlzs6indjcs5pkrjvjyaqfij";
+        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
       };
     };
     "source-map-url-0.4.0" = {
@@ -6295,13 +6466,13 @@ let
         sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11";
       };
     };
-    "speedometer-1.0.0" = {
+    "speedometer-1.1.0" = {
       name = "speedometer";
       packageName = "speedometer";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz";
-        sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2";
+        url = "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz";
+        sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==";
       };
     };
     "split-0.3.3" = {
@@ -6319,7 +6490,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
-        sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp";
+        sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
       };
     };
     "sprintf-js-1.0.3" = {
@@ -6331,13 +6502,13 @@ let
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "sshpk-1.14.1" = {
+    "sshpk-1.14.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.1";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
-        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
       };
     };
     "stack-trace-0.0.10" = {
@@ -6373,7 +6544,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz";
-        sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl";
+        sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA==";
       };
     };
     "statuses-1.3.1" = {
@@ -6391,7 +6562,16 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
-        sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f";
+        sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==";
+      };
+    };
+    "statuses-1.5.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";
+        sha1 = "161c7dac177659fd9811f43771fa99381478628c";
       };
     };
     "stream-collector-1.0.1" = {
@@ -6418,7 +6598,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz";
-        sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
+        sha512 = "mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==";
       };
     };
     "stream-parser-0.3.1" = {
@@ -6472,7 +6652,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -6490,7 +6670,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "stringstream-0.0.6" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
+        sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==";
       };
     };
     "strip-ansi-3.0.1" = {
@@ -6517,7 +6706,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz";
-        sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14";
+        sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==";
       };
     };
     "strip-eof-1.0.0" = {
@@ -6544,7 +6733,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz";
-        sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk";
+        sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==";
       };
     };
     "subcommand-2.1.0" = {
@@ -6571,7 +6760,7 @@ let
       version = "3.8.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz";
-        sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
+        sha512 = "gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==";
       };
     };
     "superagent-3.8.3" = {
@@ -6580,7 +6769,7 @@ let
       version = "3.8.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
-        sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q";
+        sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
       };
     };
     "supports-color-1.2.0" = {
@@ -6601,22 +6790,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "supports-color-4.4.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
-        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
-      };
-    };
     "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
       version = "5.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
-        sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf";
+        sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==";
       };
     };
     "swagger-converter-0.1.7" = {
@@ -6652,7 +6832,7 @@ let
       version = "1.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz";
-        sha512 = "0jmilcls10zf18f7nlcdn29qdf21bl4xsk1kzzayp5h92ljkwx3c9jyy3a3p2yrd6pjnzh0k5c4yih3kbv6nxcd2rpf5vlfm44lg06l";
+        sha512 = "1IBHCamO7uJuFo11a/aaA0ZPWJkAfiuvadmLO9TwXiY2Op+SigTL9er/GabuhK4gXMNJ2MaoPQ4F90HQlNFYJQ==";
       };
     };
     "swagger-tools-0.9.16" = {
@@ -6670,7 +6850,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz";
-        sha512 = "1fxqjwdn747lxzkxrwhbw8arc9czdig47izx5hnzk22z8k7rnw00q8vcpy8v7a3xyamavwgg4mvjkpn2ihjiyjxjnhx2ihiryf39pbv";
+        sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==";
       };
     };
     "tar-2.2.1" = {
@@ -6682,13 +6862,13 @@ let
         sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
       };
     };
-    "tar-4.4.2" = {
+    "tar-4.4.4" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.2";
+      version = "4.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz";
-        sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz";
+        sha512 = "mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w==";
       };
     };
     "tar-stream-1.6.1" = {
@@ -6697,7 +6877,7 @@ let
       version = "1.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz";
-        sha512 = "2j2zhpi3nkxdny3qh1rm3xzx5kvdc4f83cqnqbq8yasqyxj6bpvbvff20rbqp6wl8zicx4dndkcjwm3xnprnkq11m7b4hkp1bkwqli0";
+        sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==";
       };
     };
     "term-size-1.2.0" = {
@@ -6796,7 +6976,7 @@ let
       version = "0.0.33";
       src = fetchurl {
         url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
+        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     };
     "to-buffer-1.1.1" = {
@@ -6805,7 +6985,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
-        sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp";
+        sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==";
       };
     };
     "to-iso-string-0.0.2" = {
@@ -6832,7 +7012,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
-        sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm";
+        sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
       };
     };
     "to-regex-range-2.1.1" = {
@@ -6850,7 +7030,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.1.tgz";
-        sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l";
+        sha512 = "FOinMMjECHmDt6PZkSmcbM8ir41kGwYCbVW7NczWkWNNeuX9/mQHz31oNSJKZrkvgfas692ZoZ+G1jdM43qVGA==";
       };
     };
     "toml-2.3.3" = {
@@ -6859,7 +7039,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz";
-        sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv";
+        sha512 = "O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==";
       };
     };
     "touch-3.1.0" = {
@@ -6868,7 +7048,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz";
-        sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q";
+        sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==";
       };
     };
     "tough-cookie-2.3.4" = {
@@ -6877,7 +7057,7 @@ let
       version = "2.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
-        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
       };
     };
     "township-client-1.3.2" = {
@@ -6886,7 +7066,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz";
-        sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78";
+        sha512 = "6Di70O1dWm45SJ5xrGzlE805z3gYn4ZUmNKomIrI4OojzRA4zyQzJ/4lAxQbJlq0ihG/mUE2xbP4q85Q68ig2g==";
       };
     };
     "traverse-0.6.6" = {
@@ -6925,13 +7105,22 @@ let
         sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
       };
     };
+    "tslib-1.9.3" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz";
+        sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz";
-        sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr";
+        sha512 = "+bGy9iDAqg3WSfc2ZrprToSPJhZjqy7vUv9wupQzsiv+BVPVx1T2a6G4T0290SpQj+56Toaw9BiLO5j5Bd7QzA==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -6958,7 +7147,7 @@ let
       version = "1.6.16";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz";
-        sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x";
+        sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==";
       };
     };
     "typedarray-0.0.6" = {
@@ -7003,7 +7192,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz";
-        sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm";
+        sha512 = "9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ==";
       };
     };
     "unbzip2-stream-1.2.5" = {
@@ -7012,7 +7201,7 @@ let
       version = "1.2.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz";
-        sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b";
+        sha512 = "izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==";
       };
     };
     "undefsafe-2.0.2" = {
@@ -7069,13 +7258,13 @@ let
         sha1 = "2ba7ef316edd0b9590cc547c74f76a2f164fecca";
       };
     };
-    "unordered-set-2.0.0" = {
+    "unordered-set-2.0.1" = {
       name = "unordered-set";
       packageName = "unordered-set";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.0.tgz";
-        sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec";
+        url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz";
+        sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg==";
       };
     };
     "unpipe-1.0.0" = {
@@ -7096,13 +7285,13 @@ let
         sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
       };
     };
-    "untildify-3.0.2" = {
+    "untildify-3.0.3" = {
       name = "untildify";
       packageName = "untildify";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz";
-        sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1";
+        url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz";
+        sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==";
       };
     };
     "unyield-0.0.1" = {
@@ -7129,7 +7318,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz";
-        sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg";
+        sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==";
       };
     };
     "update-notifier-2.5.0" = {
@@ -7138,7 +7327,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz";
-        sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3";
+        sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==";
       };
     };
     "uri-js-3.0.2" = {
@@ -7183,7 +7372,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz";
-        sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9";
+        sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==";
       };
     };
     "user-home-2.0.0" = {
@@ -7237,16 +7426,16 @@ let
       version = "1.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz";
-        sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm";
+        sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg==";
       };
     };
-    "uuid-3.2.1" = {
+    "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.2.1";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
-        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
       };
     };
     "valid-url-1.0.9" = {
@@ -7267,13 +7456,13 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "validator-10.2.0" = {
+    "validator-10.4.0" = {
       name = "validator";
       packageName = "validator";
-      version = "10.2.0";
+      version = "10.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-10.2.0.tgz";
-        sha512 = "2v8ipjc5jdlwdhj1bcggxm98q2cigj2016rjqyzj0wq4kvjqghi3k66d6j17bpvqix0dqy01s4sh4qg0wv56jshix9zcdddfn9fwgw3";
+        url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz";
+        sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg==";
       };
     };
     "variable-diff-1.1.0" = {
@@ -7330,22 +7519,22 @@ let
         sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4";
       };
     };
-    "which-1.3.0" = {
+    "which-1.3.1" = {
       name = "which";
       packageName = "which";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
       };
     };
-    "wide-align-1.1.2" = {
+    "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
     "widest-line-2.0.0" = {
@@ -7435,7 +7624,7 @@ let
       version = "2.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
-        sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
+        sha512 = "xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==";
       };
     };
     "xdg-basedir-3.0.0" = {
@@ -7447,13 +7636,13 @@ let
         sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
       };
     };
-    "xhr-2.4.1" = {
+    "xhr-2.5.0" = {
       name = "xhr";
       packageName = "xhr";
-      version = "2.4.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz";
-        sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4";
+        url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz";
+        sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==";
       };
     };
     "xsalsa20-1.0.2" = {
@@ -7462,16 +7651,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz";
-        sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43";
+        sha512 = "g1DFmZ5JJ9Qzvt4dMw6m9IydqoCSP381ucU5zm46Owbk3bwmqAr8eEJirOPc7PrXRn45drzOpAyDp8jsnoyXyw==";
       };
     };
-    "xstream-11.2.0" = {
+    "xstream-11.7.0" = {
       name = "xstream";
       packageName = "xstream";
-      version = "11.2.0";
+      version = "11.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xstream/-/xstream-11.2.0.tgz";
-        sha512 = "2jnrf16561zx9hsvlb8d48ca9qwdh9wxcbkwhkjvp5r88b8pcfjlx2g58k9w5kjs0kw660rw6hj2zhvdsznyf0ic9mj682xz6hf7kfh";
+        url = "https://registry.npmjs.org/xstream/-/xstream-11.7.0.tgz";
+        sha512 = "wO3TXiQd2/1UZNVsixDIcQgAN6TU4sGH7qIXvs1CRp1kgtkpU8YTfyKt/z/Z1psqcGnR0cJJxHaCnBxtktLx9w==";
       };
     };
     "xtend-4.0.1" = {
@@ -7519,13 +7708,13 @@ let
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "yauzl-2.9.1" = {
+    "yauzl-2.9.2" = {
       name = "yauzl";
       packageName = "yauzl";
-      version = "2.9.1";
+      version = "2.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz";
-        sha1 = "a81981ea70a57946133883f029c5821a89359a7f";
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz";
+        sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77";
       };
     };
     "z-schema-3.22.0" = {
@@ -7534,7 +7723,7 @@ let
       version = "3.22.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/z-schema/-/z-schema-3.22.0.tgz";
-        sha512 = "24ad8ip4l1k4kvga0yxhx08b3yvzhp1abk94031ar9vcsb1xqr7hafivsxbadf4dm1cw1ndjc9wgh4jki8q1xad4zfg9n2pgjx3dbrs";
+        sha512 = "Oq82unxX2PTcJ031gFGcksDHE5PNBs5CbcQ1tbre0Sl4Mu5habZTVmEAkuZS4cK//VgIdNg9UG9PMgMlN6KmiA==";
       };
     };
   };
@@ -7563,7 +7752,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+      sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -7580,19 +7769,15 @@ in
     version = "4.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz";
-      sha512 = "28v46s87z1qgi46mn0kdhw77dnra3pkhr7nlf4d6dxl46l9aba1hm1wqz2dxhr0g3pwqav8pg5c1qdxkr18ybvlkmhbkyyz0pp13y51";
+      sha512 = "ofgR7gXf+7lgnXQvj0KeveHAyrtoK8zveCDD3sTHPFQY1FKJGkJ7M404ak+G8w6VbTuHwzaBrYbEh8M/SBuykQ==";
     };
     dependencies = [
       sources."@cycle/dom-18.3.0"
       sources."@cycle/http-14.9.0"
       sources."@cycle/isolate-3.3.0"
       sources."@cycle/run-3.4.0"
-      (sources."@cycle/time-0.10.1" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-        ];
-      })
-      sources."@types/node-10.1.1"
+      sources."@cycle/time-0.10.1"
+      sources."@types/node-10.5.1"
       sources."@types/superagent-3.5.6"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -7607,12 +7792,12 @@ in
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combine-errors-3.0.3"
       sources."combined-stream-1.0.6"
       sources."component-emitter-1.2.1"
-      sources."cookiejar-2.1.1"
+      sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."cssauron-1.4.0"
@@ -7621,7 +7806,7 @@ in
       sources."d-1.0.0"
       sources."debug-3.1.0"
       sources."delayed-stream-1.0.0"
-      sources."es5-ext-0.10.42"
+      sources."es5-ext-0.10.45"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
       sources."es6-set-0.1.5"
@@ -7687,7 +7872,12 @@ in
       sources."snabbdom-0.7.0"
       sources."snabbdom-selector-1.2.1"
       sources."sorted-immutable-list-1.1.0"
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."superagent-3.8.2"
@@ -7696,9 +7886,13 @@ in
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."util-deprecate-1.0.2"
-      sources."variable-diff-1.1.0"
-      sources."which-1.3.0"
-      sources."xstream-11.2.0"
+      (sources."variable-diff-1.1.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+        ];
+      })
+      sources."which-1.3.1"
+      sources."xstream-11.7.0"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -7716,17 +7910,26 @@ in
     version = "13.10.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz";
-      sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z";
+      sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw==";
     };
     dependencies = [
       sources."abstract-random-access-1.1.2"
       sources."ajv-5.5.2"
-      sources."ansi-diff-stream-1.2.1"
+      (sources."ansi-diff-stream-1.2.1" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
       sources."ap-0.1.0"
-      sources."append-tree-2.4.1"
+      (sources."append-tree-2.4.4" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+          sources."varint-5.0.0"
+        ];
+      })
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
       sources."array-lru-1.1.1"
@@ -7739,29 +7942,24 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-1.0.0"
-      sources."bitfield-rle-2.1.0"
-      (sources."bittorrent-dht-7.10.0" // {
+      (sources."bitfield-rle-2.1.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."varint-4.0.1"
         ];
       })
+      sources."bittorrent-dht-7.10.0"
       sources."blake2b-2.1.2"
       sources."blake2b-wasm-1.1.7"
       sources."body-0.1.0"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-1.0.0"
+      sources."braces-1.8.5"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-equals-1.0.4"
-      sources."buffer-fill-0.1.1"
-      sources."buffer-from-1.0.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-indexof-1.1.1"
       sources."bulk-write-stream-1.1.4"
       sources."bytes-3.0.0"
@@ -7773,9 +7971,9 @@ in
       sources."cliclopts-1.1.1"
       sources."co-4.6.0"
       sources."codecs-1.2.1"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
-      sources."colors-1.2.5"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."colors-1.3.0"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -7783,21 +7981,16 @@ in
       sources."content-types-0.1.0"
       sources."core-util-is-1.0.2"
       sources."corsify-2.1.0"
-      (sources."cryptiles-3.1.2" // {
+      sources."cycle-1.0.3"
+      sources."dashdash-1.14.1"
+      (sources."dat-dns-3.0.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."debug-2.6.9"
         ];
       })
-      sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
-      sources."dat-dns-1.3.2"
       (sources."dat-doctor-1.4.0" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."dns-packet-1.3.1"
-          sources."dns-socket-1.6.3"
-          sources."lru-2.0.1"
-          sources."multicast-dns-6.2.3"
           sources."pump-1.0.3"
         ];
       })
@@ -7806,27 +7999,19 @@ in
       (sources."dat-json-1.0.2" // {
         dependencies = [
           sources."dat-encoding-4.0.2"
-          sources."debug-2.6.9"
         ];
       })
-      (sources."dat-link-resolve-2.1.1" // {
+      sources."dat-link-resolve-2.2.0"
+      sources."dat-log-1.1.1"
+      (sources."dat-node-3.5.9" // {
         dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      (sources."dat-log-1.1.1" // {
-        dependencies = [
-          sources."process-nextick-args-1.0.7"
-        ];
-      })
-      (sources."dat-node-3.5.8" // {
-        dependencies = [
-          sources."buffer-alloc-unsafe-0.1.1"
-          sources."minimist-0.0.8"
-          sources."process-nextick-args-1.0.7"
+          (sources."discovery-swarm-5.1.1" // {
+            dependencies = [
+              sources."debug-2.6.9"
+            ];
+          })
           sources."pump-1.0.3"
-          sources."unordered-set-2.0.0"
-          sources."varint-5.0.0"
+          sources."random-access-memory-3.0.0"
         ];
       })
       sources."dat-registry-4.0.0"
@@ -7839,20 +8024,28 @@ in
       sources."directory-index-html-2.1.0"
       (sources."discovery-channel-5.5.1" // {
         dependencies = [
+          sources."debug-2.6.9"
+          sources."dns-discovery-6.1.0"
+          sources."lru-2.0.1"
           sources."pump-3.0.0"
+          sources."thunky-0.1.0"
         ];
       })
       (sources."discovery-swarm-4.4.2" // {
         dependencies = [
-          (sources."dns-discovery-6.1.0" // {
-            dependencies = [
-              sources."thunky-1.0.2"
-            ];
-          })
-          sources."thunky-0.1.0"
+          sources."debug-2.6.9"
+          sources."pump-1.0.3"
+        ];
+      })
+      (sources."dns-discovery-5.6.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."dns-packet-1.3.1"
+          sources."dns-socket-1.6.3"
+          sources."lru-2.0.1"
+          sources."multicast-dns-6.2.3"
         ];
       })
-      sources."dns-discovery-5.6.1"
       sources."dns-packet-4.2.0"
       sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
@@ -7873,7 +8066,7 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
       sources."flat-tree-1.6.0"
-      sources."for-each-0.3.2"
+      sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
@@ -7888,29 +8081,35 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-flag-3.0.0"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.14.0" // {
+      (sources."hypercore-6.17.1" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+          sources."unordered-set-2.0.1"
+        ];
+      })
+      sources."hypercore-crypto-1.0.0"
+      (sources."hypercore-protocol-6.6.4" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
       })
-      sources."hypercore-protocol-6.6.4"
-      (sources."hyperdrive-9.12.3" // {
+      sources."hyperdrive-9.14.0"
+      (sources."hyperdrive-http-4.2.2" // {
         dependencies = [
-          sources."varint-4.0.1"
+          sources."pump-1.0.3"
         ];
       })
-      sources."hyperdrive-http-4.2.2"
       sources."hyperdrive-network-speed-2.1.0"
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
+      sources."inspect-custom-symbol-1.1.0"
       sources."ip-1.1.5"
       sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.3"
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
@@ -7919,6 +8118,7 @@ in
       sources."is-function-1.0.1"
       sources."is-glob-2.0.1"
       sources."is-number-2.1.0"
+      sources."is-options-1.0.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-string-1.0.4"
@@ -7935,11 +8135,14 @@ in
       sources."k-bucket-3.3.1"
       (sources."k-rpc-4.3.1" // {
         dependencies = [
-          sources."bencode-2.0.0"
           sources."k-bucket-4.0.1"
         ];
       })
-      sources."k-rpc-socket-1.8.0"
+      (sources."k-rpc-socket-1.8.0" // {
+        dependencies = [
+          sources."bencode-2.0.0"
+        ];
+      })
       sources."kind-of-3.2.2"
       sources."last-one-wins-1.0.4"
       sources."length-prefixed-message-3.0.3"
@@ -7956,13 +8159,17 @@ in
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mirror-folder-2.2.0"
-      sources."mkdirp-0.5.1"
+      sources."mirror-folder-3.0.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
       sources."multicast-dns-7.0.0"
       sources."multicb-1.2.2"
-      sources."multistream-2.1.0"
+      sources."multistream-2.1.1"
       sources."mute-stream-0.0.7"
       sources."mutexify-1.2.0"
       sources."nan-2.10.0"
@@ -7970,14 +8177,10 @@ in
       sources."nanobus-3.3.0"
       sources."nanotiming-1.0.1"
       sources."ncp-1.0.1"
-      (sources."neat-log-1.1.2" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."neat-log-1.1.2"
       sources."nets-3.2.0"
       sources."network-address-1.1.2"
-      sources."node-gyp-build-3.3.0"
+      sources."node-gyp-build-3.4.0"
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.8.2"
       sources."object.omit-2.0.1"
@@ -7994,21 +8197,26 @@ in
       sources."process-0.5.2"
       sources."process-nextick-args-2.0.0"
       sources."progress-string-1.2.2"
-      (sources."prompt-1.0.0" // {
+      sources."prompt-1.0.0"
+      (sources."protocol-buffers-encodings-1.1.0" // {
         dependencies = [
-          sources."async-1.0.0"
+          sources."varint-5.0.0"
         ];
       })
-      sources."protocol-buffers-encodings-1.1.0"
       sources."pump-2.0.1"
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
-      sources."random-access-memory-2.4.0"
-      sources."random-access-storage-1.2.0"
+      (sources."random-access-memory-2.4.0" // {
+        dependencies = [
+          sources."process-nextick-args-1.0.7"
+        ];
+      })
+      sources."random-access-storage-1.3.0"
       (sources."randomatic-3.0.0" // {
         dependencies = [
           sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."randombytes-2.0.6"
@@ -8020,29 +8228,37 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.86.0"
+      sources."request-2.87.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
-      sources."signed-varint-2.0.1"
+      sources."safer-buffer-2.1.2"
+      (sources."signed-varint-2.0.1" // {
+        dependencies = [
+          sources."varint-5.0.0"
+        ];
+      })
       sources."simple-sha1-2.1.1"
-      sources."siphash24-1.1.0"
+      sources."siphash24-1.1.1"
       sources."slice-ansi-1.0.0"
-      sources."sntp-2.1.0"
       sources."sodium-javascript-0.5.5"
       sources."sodium-native-2.1.6"
       sources."sodium-universal-2.0.0"
-      sources."sorted-array-functions-1.1.0"
+      sources."sorted-array-functions-1.2.0"
       sources."sorted-indexof-1.0.0"
       sources."sparse-bitfield-3.0.3"
-      sources."speedometer-1.0.0"
-      sources."sshpk-1.14.1"
+      sources."speedometer-1.1.0"
+      sources."sshpk-1.14.2"
       sources."stack-trace-0.0.10"
       sources."status-logger-3.1.1"
       sources."stream-collector-1.0.1"
       sources."stream-each-1.2.2"
-      sources."stream-parser-0.3.1"
+      (sources."stream-parser-0.3.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."stream-shift-1.0.0"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
@@ -8053,15 +8269,15 @@ in
         ];
       })
       sources."supports-color-5.4.0"
-      (sources."throttle-1.0.3" // {
+      sources."throttle-1.0.3"
+      sources."through2-2.0.3"
+      sources."thunky-1.0.2"
+      sources."to-buffer-1.1.1"
+      (sources."toiletdb-1.4.1" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
-      sources."through2-2.0.3"
-      sources."thunky-1.0.2"
-      sources."to-buffer-1.1.1"
-      sources."toiletdb-1.4.1"
       sources."tough-cookie-2.3.4"
       sources."township-client-1.3.2"
       sources."trim-0.0.1"
@@ -8073,22 +8289,23 @@ in
       sources."unixify-1.0.0"
       sources."unordered-array-remove-1.0.2"
       sources."unordered-set-1.1.0"
-      sources."untildify-3.0.2"
+      sources."untildify-3.0.3"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
       sources."utp-native-1.7.1"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
       (sources."winston-2.1.1" // {
         dependencies = [
+          sources."async-1.0.0"
           sources."colors-1.0.3"
           sources."pkginfo-0.3.1"
         ];
       })
       sources."wrap-ansi-3.0.1"
       sources."wrappy-1.0.2"
-      sources."xhr-2.4.1"
+      sources."xhr-2.5.0"
       sources."xsalsa20-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -8138,24 +8355,24 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.1.1";
+    version = "5.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz";
-      sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz";
+      sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."browser-stdout-1.3.1"
-      sources."commander-2.11.0"
+      sources."commander-2.15.1"
       sources."concat-map-0.0.1"
       sources."debug-3.1.0"
       sources."diff-3.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.2"
-      sources."growl-1.10.3"
-      sources."has-flag-2.0.0"
+      sources."growl-1.10.5"
+      sources."has-flag-3.0.0"
       sources."he-1.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -8165,7 +8382,7 @@ in
       sources."ms-2.0.0"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."supports-color-4.4.0"
+      sources."supports-color-5.4.0"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -8201,26 +8418,26 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.6.2";
+    version = "3.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
-      sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz";
+      sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-5.5.2"
+      sources."ajv-4.11.8"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."asn1-0.2.3"
-      sources."assert-plus-1.0.0"
+      sources."assert-plus-0.2.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
+      sources."aws-sign2-0.6.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."block-stream-0.0.9"
-      sources."boom-4.3.1"
+      sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
@@ -8229,33 +8446,35 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
+      sources."cryptiles-2.0.5"
+      (sources."dashdash-1.14.1" // {
         dependencies = [
-          sources."boom-5.2.0"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-1.1.0"
-      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      sources."form-data-2.1.4"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
       sources."has-unicode-2.0.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."http-signature-1.2.0"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."http-signature-1.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."is-fullwidth-code-point-1.0.0"
@@ -8265,9 +8484,14 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.3.1"
+      sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
@@ -8283,37 +8507,47 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
-      sources."performance-now-2.1.0"
+      sources."performance-now-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.2"
+      sources."qs-6.4.0"
       sources."readable-stream-2.3.6"
-      sources."request-2.86.0"
+      sources."request-2.81.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
+      sources."sntp-1.0.9"
+      (sources."sshpk-1.14.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."verror-1.10.0"
-      sources."which-1.3.0"
-      sources."wide-align-1.1.2"
+      sources."uuid-3.3.2"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."which-1.3.1"
+      sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Node.js native addon build tool";
-      homepage = "https://github.com/nodejs/node-gyp#readme";
+      homepage = https://github.com/nodejs/node-gyp;
       license = "MIT";
     };
     production = true;
@@ -8322,10 +8556,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.3.0";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
-      sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
+      sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -8339,16 +8573,16 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.10.0";
+    version = "0.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz";
-      sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz";
+      sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.4"
+      sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chownr-1.0.1"
@@ -8357,7 +8591,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
       sources."fs-minipass-1.2.5"
@@ -8374,7 +8608,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.3.0"
+      sources."minipass-2.3.3"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -8391,7 +8625,7 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      (sources."rc-1.2.7" // {
+      (sources."rc-1.2.8" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -8408,9 +8642,9 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.2"
+      sources."tar-4.4.4"
       sources."util-deprecate-1.0.2"
-      sources."wide-align-1.1.2"
+      sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
       sources."yallist-3.0.2"
     ];
@@ -8426,10 +8660,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.43.1";
+    version = "2.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.43.1.tgz";
-      sha1 = "0766354192aa2d843bcf1ddb277627e5cbc9c1e9";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz";
+      sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -8446,7 +8680,7 @@ in
     version = "5.5.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
-      sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
+      sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -8500,14 +8734,18 @@ in
   vue-cli = nodeEnv.buildNodePackage {
     name = "vue-cli";
     packageName = "vue-cli";
-    version = "2.9.3";
+    version = "2.9.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz";
-      sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki";
+      url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz";
+      sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ==";
     };
     dependencies = [
       sources."absolute-0.0.1"
-      sources."ajv-5.5.2"
+      (sources."ajv-5.5.2" // {
+        dependencies = [
+          sources."co-4.6.0"
+        ];
+      })
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
       sources."ansi-escapes-3.1.0"
@@ -8522,82 +8760,71 @@ in
       sources."arrify-1.0.1"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
-      sources."async-2.6.0"
+      sources."async-2.6.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
-      sources."bcrypt-pbkdf-1.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.2.2"
       sources."bluebird-3.5.1"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
-      sources."buffer-alloc-1.1.0"
-      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
-      sources."buffer-fill-0.1.1"
+      sources."buffer-fill-1.0.0"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      (sources."caw-2.0.1" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."caw-2.0.1"
       sources."center-align-0.1.3"
       sources."chalk-2.4.1"
-      sources."chardet-0.4.2"
+      sources."chardet-0.5.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cli-width-2.2.0"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."clone-1.0.4"
       sources."co-3.1.0"
       sources."co-from-stream-0.0.0"
       sources."co-fs-extra-1.2.1"
       sources."co-read-0.0.1"
       sources."coffee-script-1.12.7"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."concat-map-0.0.1"
       sources."config-chain-1.1.11"
       sources."consolidate-0.14.5"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."decamelize-1.2.0"
-      (sources."decompress-4.2.0" // {
-        dependencies = [
-          sources."file-type-3.9.0"
-          sources."get-stream-2.3.1"
-        ];
-      })
+      sources."decompress-4.2.0"
       sources."decompress-tar-4.1.1"
-      sources."decompress-tarbz2-4.1.1"
-      sources."decompress-targz-4.1.1"
-      sources."decompress-unzip-4.0.1"
-      sources."delayed-stream-1.0.0"
-      (sources."download-5.0.3" // {
+      (sources."decompress-tarbz2-4.1.1" // {
         dependencies = [
-          sources."file-type-5.2.0"
+          sources."file-type-6.2.0"
         ];
       })
-      (sources."download-git-repo-1.0.2" // {
+      sources."decompress-targz-4.1.1"
+      (sources."decompress-unzip-4.0.1" // {
         dependencies = [
-          sources."commander-2.8.1"
-          sources."file-type-6.2.0"
+          sources."file-type-3.9.0"
+          sources."get-stream-2.3.1"
         ];
       })
+      sources."delayed-stream-1.0.0"
+      sources."download-5.0.3"
+      sources."download-git-repo-1.0.2"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.1"
       sources."enable-1.3.2"
@@ -8606,15 +8833,15 @@ in
       sources."esprima-4.0.0"
       sources."extend-3.0.1"
       sources."extend-shallow-2.0.1"
-      sources."external-editor-2.2.0"
+      sources."external-editor-3.0.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."fd-slicer-1.0.1"
+      sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
       sources."file-type-5.2.0"
       sources."filename-reserved-regex-2.0.0"
-      sources."filenamify-2.0.0"
+      sources."filenamify-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fs-constants-1.0.0"
@@ -8632,25 +8859,26 @@ in
       (sources."handlebars-4.0.11" // {
         dependencies = [
           sources."async-1.5.2"
-          sources."wordwrap-0.0.2"
         ];
       })
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-ansi-2.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."has-flag-3.0.0"
       sources."has-generators-1.0.1"
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.23"
-      sources."ieee754-1.1.11"
+      sources."ieee754-1.1.12"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-3.3.0"
+      sources."inquirer-6.0.0"
       sources."is-3.2.1"
       sources."is-buffer-1.1.6"
       sources."is-extendable-0.1.1"
@@ -8666,7 +8894,7 @@ in
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
       sources."isurl-1.0.0"
-      sources."js-yaml-3.11.0"
+      sources."js-yaml-3.12.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -8702,7 +8930,11 @@ in
       sources."mkdirp-0.5.1"
       sources."multimatch-2.1.0"
       sources."mute-stream-0.0.7"
-      sources."npm-conf-1.1.3"
+      (sources."npm-conf-1.1.3" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
@@ -8726,26 +8958,24 @@ in
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
       sources."repeat-string-1.6.1"
-      (sources."request-2.86.0" // {
-        dependencies = [
-          sources."co-4.6.0"
-        ];
-      })
+      sources."request-2.87.0"
       sources."restore-cursor-2.0.0"
       sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
+      sources."rxjs-6.2.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."seek-bzip-1.0.5"
+      (sources."seek-bzip-1.0.5" // {
+        dependencies = [
+          sources."commander-2.8.1"
+        ];
+      })
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
       sources."source-map-0.4.4"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.1"
+      sources."sshpk-1.14.2"
       sources."stat-mode-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
@@ -8764,6 +8994,7 @@ in
       sources."toml-2.3.3"
       sources."tough-cookie-2.3.4"
       sources."trim-repeated-1.0.0"
+      sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       (sources."uglify-js-2.8.29" // {
@@ -8780,7 +9011,7 @@ in
       sources."url-to-options-1.0.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.2"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
       sources."ware-1.3.0"
@@ -8792,7 +9023,7 @@ in
       sources."xtend-4.0.1"
       sources."yaml-js-0.0.8"
       sources."yargs-3.10.0"
-      sources."yauzl-2.9.1"
+      sources."yauzl-2.9.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -8814,28 +9045,17 @@ in
     dependencies = [
       sources."URIjs-1.16.1"
       sources."abbrev-1.1.1"
-      sources."align-text-0.1.4"
+      (sources."align-text-0.1.4" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."amdefine-1.0.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
-      (sources."anymatch-2.0.0" // {
-        dependencies = [
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-0.1.1"
-        ];
-      })
+      sources."anymatch-2.0.0"
       sources."append-field-0.1.0"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
@@ -8850,30 +9070,42 @@ in
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
-          (sources."define-property-1.0.0" // {
-            dependencies = [
-              sources."kind-of-6.0.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
+          sources."define-property-1.0.0"
         ];
       })
       sources."binary-extensions-1.11.0"
       (sources."body-parser-1.12.4" // {
         dependencies = [
           sources."debug-2.2.0"
+          sources."depd-1.0.1"
+          sources."ee-first-1.1.0"
+          sources."ms-0.7.1"
+          sources."on-finished-2.2.1"
           sources."qs-2.4.2"
         ];
       })
-      sources."boxen-1.3.0"
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
           sources."is-extendable-0.1.1"
         ];
       })
-      sources."buffer-from-1.0.0"
-      sources."busboy-0.2.14"
+      sources."buffer-from-1.1.0"
+      (sources."busboy-0.2.14" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."bytes-1.0.0"
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
@@ -8881,55 +9113,73 @@ in
       sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
-      (sources."chokidar-2.0.3" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."is-accessor-descriptor-1.0.0"
-          sources."is-data-descriptor-1.0.0"
-          sources."is-descriptor-1.0.2"
-          sources."is-extendable-1.0.1"
-        ];
-      })
+      sources."chokidar-2.0.4"
       sources."ci-info-1.1.3"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-1.0.2"
       sources."cli-width-1.1.1"
-      sources."cliui-2.1.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
       sources."clone-2.0.0"
       sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.1"
-      sources."color-name-1.1.3"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
       sources."combined-stream-1.0.6"
-      sources."commander-2.15.1"
+      sources."commander-2.16.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."configstore-3.1.2"
       sources."connect-3.6.6"
       sources."content-type-1.0.4"
-      sources."cookiejar-2.1.1"
+      sources."cookiejar-2.1.2"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
-      sources."cross-spawn-5.1.0"
+      (sources."cross-spawn-5.1.0" // {
+        dependencies = [
+          sources."lru-cache-4.1.3"
+        ];
+      })
       sources."crypt-0.0.2"
       sources."crypto-random-string-1.0.0"
       sources."dag-map-1.0.2"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      sources."deep-extend-0.5.1"
+      sources."deep-extend-0.6.0"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."dicer-0.2.5"
+      (sources."dicer-0.2.5" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."diff-1.4.0"
       sources."dot-prop-4.2.0"
       sources."duplexer-0.1.1"
@@ -8946,6 +9196,20 @@ in
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
         ];
       })
       sources."extend-3.0.1"
@@ -8954,11 +9218,16 @@ in
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
-          sources."kind-of-5.1.0"
+          sources."is-extendable-0.1.1"
         ];
       })
       sources."figures-1.7.0"
-      sources."fill-range-4.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
       sources."finalhandler-1.1.0"
       sources."for-in-1.0.2"
       sources."form-data-2.3.2"
@@ -8980,14 +9249,30 @@ in
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
-      sources."graphlib-2.1.5"
+      (sources."graphlib-2.1.5" // {
+        dependencies = [
+          sources."lodash-4.17.10"
+        ];
+      })
       sources."growl-1.9.2"
-      sources."handlebars-4.0.11"
+      (sources."handlebars-4.0.11" // {
+        dependencies = [
+          sources."source-map-0.4.4"
+        ];
+      })
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
-      sources."has-values-1.0.0"
-      sources."http-errors-1.6.3"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."http-errors-1.6.3" // {
+        dependencies = [
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."iconv-lite-0.4.8"
       sources."ignore-by-default-1.0.1"
       sources."import-lazy-2.1.0"
@@ -9007,11 +9292,19 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-4.0.0"
       sources."is-installed-globally-0.1.0"
-      sources."is-invalid-path-0.1.0"
+      (sources."is-invalid-path-0.1.0" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
       sources."is-npm-1.0.0"
-      sources."is-number-4.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-obj-1.0.1"
-      sources."is-odd-2.0.0"
       sources."is-path-inside-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-redirect-1.0.0"
@@ -9028,15 +9321,8 @@ in
           sources."mkdirp-0.3.0"
         ];
       })
-      sources."js-yaml-3.11.0"
-      (sources."json-refs-2.1.7" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-          sources."qs-6.5.2"
-          sources."superagent-3.8.3"
-        ];
-      })
+      sources."js-yaml-3.12.0"
+      sources."json-refs-2.1.7"
       (sources."json-schema-deref-sync-0.3.4" // {
         dependencies = [
           sources."lodash-4.17.10"
@@ -9066,6 +9352,7 @@ in
       sources."lodash.assign-2.4.1"
       sources."lodash.bind-2.4.1"
       sources."lodash.clonedeep-2.4.1"
+      sources."lodash.debounce-4.0.8"
       sources."lodash.foreach-2.4.1"
       sources."lodash.forown-2.4.1"
       sources."lodash.get-4.4.2"
@@ -9109,50 +9396,18 @@ in
       })
       sources."mpath-0.2.1"
       sources."ms-2.0.0"
-      (sources."multer-1.3.0" // {
+      (sources."multer-1.3.1" // {
         dependencies = [
-          sources."ee-first-1.1.1"
-          sources."isarray-1.0.0"
-          sources."on-finished-2.3.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          sources."object-assign-3.0.0"
         ];
       })
       sources."mute-stream-0.0.5"
       sources."nan-2.10.0"
-      sources."nanomatch-1.2.9"
+      sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
-      (sources."nodemon-1.17.4" // {
+      (sources."nodemon-1.17.5" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.1"
           sources."debug-3.1.0"
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-          sources."has-values-0.1.4"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."is-extendable-0.1.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-3.2.2"
-          sources."lru-cache-4.1.3"
-          sources."minimist-1.2.0"
-          sources."strip-ansi-4.0.0"
           sources."supports-color-5.4.0"
         ];
       })
@@ -9161,7 +9416,19 @@ in
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
-      sources."object-copy-0.1.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
@@ -9176,8 +9443,18 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."path-loader-1.0.4"
-      sources."path-to-regexp-1.7.0"
+      (sources."path-loader-1.0.4" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."qs-6.5.2"
+          sources."superagent-3.8.3"
+        ];
+      })
+      (sources."path-to-regexp-1.7.0" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."pause-stream-0.0.11"
       sources."pify-3.0.0"
       sources."posix-character-classes-0.1.1"
@@ -9186,7 +9463,7 @@ in
       sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
       sources."pstree.remy-1.1.0"
-      sources."punycode-2.1.0"
+      sources."punycode-2.1.1"
       sources."qs-4.0.0"
       sources."range-parser-1.2.0"
       (sources."raw-body-2.0.2" // {
@@ -9194,7 +9471,11 @@ in
           sources."bytes-2.1.0"
         ];
       })
-      sources."rc-1.2.7"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."readline2-1.0.1"
@@ -9217,14 +9498,19 @@ in
       sources."sanitize-filename-1.6.1"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
-      sources."send-0.16.2"
-      (sources."serve-static-1.13.2" // {
+      (sources."send-0.16.2" // {
         dependencies = [
           sources."statuses-1.4.0"
         ];
       })
+      sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
-      sources."set-value-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
       sources."setprototypeof-1.1.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -9233,74 +9519,91 @@ in
       sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          (sources."define-property-0.2.5" // {
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
-              sources."kind-of-5.1.0"
+              sources."kind-of-3.2.2"
             ];
           })
-          sources."extend-shallow-2.0.1"
-          sources."kind-of-4.0.0"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."snapdragon-node-2.1.1"
-      sources."snapdragon-util-3.0.1"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."spark-md5-1.0.1"
       sources."split-0.3.3"
-      (sources."split-string-3.1.0" // {
+      sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
+      (sources."static-extend-0.1.2" // {
         dependencies = [
-          sources."extend-shallow-3.0.2"
-          sources."is-extendable-1.0.1"
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
         ];
       })
-      sources."sprintf-js-1.0.3"
-      sources."static-extend-0.1.2"
       sources."statuses-1.3.1"
       sources."stream-combiner-0.0.4"
       sources."streamsearch-0.1.2"
       sources."string-3.3.3"
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       (sources."superagent-1.8.5" // {
         dependencies = [
+          sources."cookiejar-2.0.6"
+          sources."extend-3.0.0"
+          sources."form-data-1.0.0-rc3"
+          sources."formidable-1.0.17"
+          sources."isarray-0.0.1"
+          sources."mime-1.3.4"
           sources."qs-2.3.3"
           sources."readable-stream-1.0.27-1"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."supports-color-2.0.0"
       sources."swagger-converter-0.2.0"
       sources."swagger-editor-2.10.5"
-      (sources."swagger-test-templates-1.5.0" // {
-        dependencies = [
-          sources."camelcase-1.2.1"
-          sources."is-extglob-1.0.0"
-          sources."is-glob-2.0.1"
-          sources."kind-of-3.2.2"
-          sources."source-map-0.4.4"
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."swagger-test-templates-1.5.0"
       (sources."swagger-tools-0.9.16" // {
         dependencies = [
-          sources."cookiejar-2.0.6"
-          sources."depd-1.0.1"
-          sources."ee-first-1.1.0"
-          sources."extend-3.0.0"
-          sources."form-data-1.0.0-rc3"
-          sources."formidable-1.0.17"
-          sources."isarray-0.0.1"
-          sources."lodash-4.17.10"
-          sources."mime-1.3.4"
-          sources."ms-0.7.1"
-          sources."object-assign-3.0.0"
-          sources."on-finished-2.2.1"
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
           sources."swagger-converter-0.1.7"
         ];
       })
@@ -9308,7 +9611,11 @@ in
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
       sources."to-iso-string-0.0.2"
-      sources."to-object-path-0.3.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."touch-3.1.0"
@@ -9316,19 +9623,13 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-        ];
-      })
+      sources."uglify-js-2.8.29"
       sources."uglify-to-browserify-1.0.2"
-      (sources."undefsafe-2.0.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."undefsafe-2.0.2"
       (sources."union-value-1.0.0" // {
         dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -9341,25 +9642,28 @@ in
               sources."isobject-2.1.0"
             ];
           })
+          sources."has-values-0.1.4"
         ];
       })
       sources."unzip-response-2.0.1"
       sources."upath-1.1.0"
-      sources."update-notifier-2.5.0"
-      sources."uri-js-3.0.2"
-      sources."urix-0.1.0"
-      sources."url-parse-lax-1.0.0"
-      (sources."use-3.1.0" // {
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.4.0"
         ];
       })
+      sources."uri-js-3.0.2"
+      sources."urix-0.1.0"
+      sources."url-parse-lax-1.0.0"
+      sources."use-3.1.0"
       sources."utf8-byte-length-1.0.4"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."valid-url-1.0.9"
-      sources."validator-10.2.0"
-      sources."which-1.3.0"
+      sources."validator-10.4.0"
+      sources."which-1.3.1"
       sources."widest-line-2.0.0"
       sources."window-size-0.1.0"
       sources."wordwrap-0.0.3"
@@ -9368,7 +9672,11 @@ in
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
-      sources."yargs-3.10.0"
+      (sources."yargs-3.10.0" // {
+        dependencies = [
+          sources."camelcase-1.2.1"
+        ];
+      })
       sources."z-schema-3.22.0"
     ];
     buildInputs = globalBuildInputs;
@@ -9383,10 +9691,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.0.1";
+    version = "6.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz";
-      sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp";
+      url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz";
+      sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -9400,10 +9708,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.92.0";
+    version = "0.94.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.92.0.tgz";
-      sha1 = "8d3d1f5af890e62da7f4cb45d20c09fa51057dcd";
+      url = "https://registry.npmjs.org/three/-/three-0.94.0.tgz";
+      sha1 = "4ce6db7f2bfbf79c2d73444aa6e3cfc08a32d762";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -9420,7 +9728,7 @@ in
     version = "2.7.4";
     src = fetchurl {
       url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz";
-      sha512 = "37hnj84ls531nqjxr4r6k4bjbqz4zqpb9adg7k6klah8dlj3rh38j4p8mbjh4h0v7r575kkc528rspincfabpm4j8y5v68kh6v8p907";
+      sha512 = "B6SLtoETmV08kqTepRyz8eqMRGFzllPy2QASKFdFl0g0YB6SNgQVnWae11RaF3/y8ZKLTJNJ7hLbMIqmBEkLzw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 8c42783c97804..8882bbf66474b 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -1,10 +1,12 @@
-{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis,
+{ stdenv, fetchFromGitHub, fetchurl, fetchpatch
+, ocaml, findlib, ocamlbuild, ocaml_oasis,
  bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp,
  utop,
- which, makeWrapper, writeText, ocaml}:
+ which, makeWrapper, writeText
+}:
 
-buildOcaml rec {
-  name = "bap";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-bap-${version}";
   version = "1.4.0";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
@@ -18,6 +20,11 @@ buildOcaml rec {
      sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19";
   };
 
+  patches = [(fetchpatch {
+    url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch";
+    sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk";
+  })];
+
   createFindlibDestdir = true;
 
   setupHook = writeText "setupHook.sh" ''
@@ -27,7 +34,7 @@ buildOcaml rec {
 
   nativeBuildInputs = [ which makeWrapper ];
 
-  buildInputs = [ ocaml_oasis
+  buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
                   llvm_38
                   utop ];
 
diff --git a/pkgs/development/ocaml-modules/cmdliner/0.9.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix
deleted file mode 100644
index 345d56d217076..0000000000000
--- a/pkgs/development/ocaml-modules/cmdliner/0.9.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
-
-let
-  pname = "cmdliner";
-in
-
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-
-stdenv.mkDerivation rec {
-
-  name = "ocaml-${pname}-${version}";
-  version = "0.9.8";
-
-  src = fetchurl {
-    url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
-  };
-
-  unpackCmd = "tar xjf $src";
-  nativeBuildInputs = [ ocamlbuild opaline ];
-  buildInputs = [ ocaml findlib ];
-
-  configurePhase = "ocaml pkg/git.ml";
-  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase   = "opaline -libdir $OCAMLFIND_DESTDIR";
-
-  meta = with stdenv.lib; {
-    homepage = http://erratique.ch/software/cmdliner;
-    description = "An OCaml module for the declarative definition of command line interfaces";
-    license = licenses.bsd3;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [ maintainers.vbgl ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index dc6cf491eb448..bcbb96c2c0cbe 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -24,10 +24,11 @@ stdenv.mkDerivation {
     cp cpdfmanual.pdf $out/share/doc/cpdf/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.coherentpdf.com/;
     platforms = ocaml.meta.platforms or [];
     description = "PDF Command Line Tools";
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = licenses.unfree;
+    maintainers = [ maintainers.vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
index aec6851e12bc4..1dcafe4c6a48c 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, jsonm, hex, sexplib, lwt }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, jsonm, hex, sexplib }:
 
-let version = "0.4.3"; in
+let version = "0.6.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-ezjsonm-${version}";
+  name = "ocaml${ocaml.version}-ezjsonm-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz";
-    sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls";
+    sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild lwt ];
+  buildInputs = [ ocaml findlib jbuilder ];
   propagatedBuildInputs = [ jsonm hex sexplib ];
-  createFindlibDestdir = true;
 
-  configureFlags = "--enable-lwt";
+  buildPhase = "jbuilder build -p ezjsonm";
+
+  inherit (jbuilder) installPhase;
 
   meta = {
     description = "An easy interface on top of the Jsonm library";
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index 14cbae6c6f8b9..20d558e37c1a5 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,5 +1,6 @@
 { stdenv, buildOcaml, fetchurl, ocamlbuild, findlib
-, jbuilder, sexplib, ppx_sexp_conv, ppx_deriving }:
+, jbuilder, sexplib, ppx_sexp_conv
+}:
 
 buildOcaml rec {
   name = "ipaddr";
@@ -10,8 +11,8 @@ buildOcaml rec {
     sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
   };
 
-  buildInputs = [ findlib ocamlbuild jbuilder ppx_sexp_conv ];
-  propagatedBuildInputs = [ ppx_deriving sexplib ];
+  buildInputs = [ findlib ocamlbuild jbuilder ];
+  propagatedBuildInputs = [ ppx_sexp_conv sexplib ];
 
   inherit (jbuilder) installPhase;
 
diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix
new file mode 100644
index 0000000000000..15f3a5613b55a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/iri/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitLab, ocaml, findlib
+, sedlex, uunf, uutf
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "iri is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "0.4.0";
+  name = "ocaml${ocaml.version}-iri-${version}";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "zoggy";
+    repo = "ocaml-iri";
+    rev = version;
+    sha256 = "0fsmfmzmyggm0h77a7mb0n41vqi6q4ln1xzsv72zbvysa7l8w84q";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  propagatedBuildInputs = [ sedlex uunf uutf ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "IRI (RFC3987) native OCaml implementation";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 9e3c6622e87a1..a4c3c15160d1a 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,605 +1,618 @@
 { stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes,
   magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re,
-  zarith, num, openssl }:
+  zarith, num, openssl
+, ppxlib
+}:
 
 rec {
 
-  # Jane Street packages, up to ppx_core
-
-  sexplib = janePackage {
-    name = "sexplib";
-    meta.description = "Automated S-expression conversion";
-    hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2";
-    propagatedBuildInputs = [ num ];
-  };
-
-  base = janePackage {
-    name = "base";
-    hash = "13brvkkj76syh8ws1k3lnvk88jvc6jxx16nsq5ysh558db91v5x7";
-    propagatedBuildInputs = [ sexplib ];
-    meta.description = "Full standard library replacement for OCaml";
-  };
-
   ocaml-compiler-libs = janePackage {
     name = "ocaml-compiler-libs";
-    hash = "0dg9jgwwir99y28bki17cqf3v30apd7cf0qdi8hfwb5pkgp9zdng";
+    hash = "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s";
     meta.description = "OCaml compiler libraries repackaged";
   };
 
-  ppx_ast = janePackage {
-    name = "ppx_ast";
-    hash = "02jsi9b200071i4x0w358by09xabw9v13q7xrx6cdshqxw0q97kf";
-    propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
-    meta.description = "OCaml AST used by Jane Street ppx rewriters";
-  };
-
-  ppx_traverse_builtins = janePackage {
-    name = "ppx_traverse_builtins";
-    hash = "0hhw565cwjlr1cwpgkfj0v2kc0lqxyjcrmi9q3hx3344biql8q17";
-    meta.description = "Builtins for Ppx_traverse";
+  sexplib0 = janePackage {
+    name = "sexplib0";
+    meta.description = "Library containing the definition of S-expressions and some base converters";
+    hash = "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi";
   };
 
-  stdio = janePackage {
-    name = "stdio";
-    hash = "0ydhy4f89f00n0pfgk8fanj6chzx433qnlcrxnddzg4d3dhb4254";
-    propagatedBuildInputs = [ base sexplib ];
-    meta.description = "Standard IO library for OCaml";
-  };
-
-  ppx_core = janePackage {
-    name = "ppx_core";
-    hash = "0fm26bgf10gk8xl6j4xvwa5s7nmns8rlx7iblb7haj4dxc0qsjhd";
-    propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ];
-    meta.description = "Jane Street's standard library for ppx rewriters";
-  };
-
-  # Jane Street packages, up to ppx_base
-
-  ppx_optcomp = janePackage {
-    name = "ppx_optcomp";
-    hash = "134anhlh32s5yjjbiqsrmjw51i08pyghzccmrwg1bipl64q55m6n";
-    propagatedBuildInputs = [ ppx_core ];
-    meta.description = "Optional compilation for OCaml";
+  parsexp = janePackage {
+    name = "parsexp";
+    hash = "1nyq23s5igd8cf3n4qxprjvhbmb6ighb3fy5mw7hxl0mdgsw5fvz";
+    propagatedBuildInputs = [ sexplib0 ];
+    meta.description = "S-expression parsing library";
   };
 
-  ppx_driver = janePackage {
-    name = "ppx_driver";
-    hash = "0kzijcsq32wf33f4spgja3w5jb9s8wnzmr6lpm8lahw05g80q8nj";
-    buildInputs = [ ocamlbuild ];
-    propagatedBuildInputs = [ ppx_optcomp ];
-    meta.description = "Feature-full driver for OCaml AST transformers";
+  sexplib = janePackage {
+    name = "sexplib";
+    meta.description = "Library for serializing OCaml values to and from S-expressions";
+    hash = "1qfl0m04rpcjvc4yw1hzh6r16jpwmap0sa9ax6zjji67dz4szpyb";
+    propagatedBuildInputs = [ num parsexp ];
   };
 
-  ppx_metaquot = janePackage {
-    name = "ppx_metaquot";
-    hash = "1wb8pl5v57yy1g0g61mvgnxgn2ix2r5skiz33g8hdjvx91pbgmv4";
-    propagatedBuildInputs = [ ppx_driver ];
-    meta.description = "Metaquotations for ppx_ast";
+  base = janePackage {
+    name = "base";
+    hash = "0ad5xcyds2lwy9dk7gqwygxk5y769ckrgrjcykdalwdh8qfbi6nf";
+    propagatedBuildInputs = [ sexplib0 ];
+    meta.description = "Full standard library replacement for OCaml";
   };
 
-  ppx_type_conv = janePackage {
-    name = "ppx_type_conv";
-    hash = "0xvn00fzj8lb41slkl91p9z62byg0rlnygdxf4xvrqglg04wa9cz";
-    propagatedBuildInputs = [ ppx_metaquot ppx_deriving ];
-    meta.description = "Support Library for type-driven code generators";
+  stdio = janePackage {
+    name = "stdio";
+    hash = "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn";
+    propagatedBuildInputs = [ base ];
+    meta.description = "Standard IO library for OCaml";
   };
 
-  ppx_sexp_conv = janePackage {
-    name = "ppx_sexp_conv";
-    hash = "0kvbm34wbxrcpvrrbh5wq4kzx4yb67iidzcq5x1d4bygvp8x2lzd";
-    propagatedBuildInputs = [ ppx_type_conv sexplib ];
-    meta.description = "Generation of S-expression conversion functions from type definitions";
+  configurator = janePackage {
+    name = "configurator";
+    hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk";
+    propagatedBuildInputs = [ stdio ];
+    meta.description = "Helper library for gathering system configuration";
   };
 
   ppx_compare = janePackage {
     name = "ppx_compare";
-    hash = "1fjrb7bz7wrykf4pm7s4s32030jdw65hi7kzd22ibd1afnkz3xw1";
-    propagatedBuildInputs = [ ppx_type_conv ];
+    version = "0.11.1";
+    hash = "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ base ppx_deriving ];
     meta.description = "Generation of comparison functions from types";
   };
 
-  ppx_enumerate = janePackage {
-    name = "ppx_enumerate";
-    hash = "1b4q1h19bh2xdxgqwdmn5kv95lyvpyf6mfh2fswagf2ajyfshksx";
-    propagatedBuildInputs = [ ppx_type_conv ];
-    meta.description = "Generate a list containing all values of a finite type";
-  };
-
-  ppx_hash = janePackage {
-    name = "ppx_hash";
-    hash = "12yln0gpf21ifr205qxk7dn83bsj07zhmak2xsjap7xkq4k8g9gc";
-    propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
-    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
-  };
-
-  ppx_js_style = janePackage {
-    name = "ppx_js_style";
-    hash = "11i2cwavbbplhsl5n4zmgpr8gjc4ixa5016vc72y8h78g71jj18n";
-    propagatedBuildInputs = [ ppx_metaquot octavius ];
-    meta.description = "Code style checker for Jane Street Packages";
-  };
-
-  ppx_base = janePackage {
-    name = "ppx_base";
-    hash = "1rk7dlnhl30prda9q34ic0xv375i52j47bkr664ry3ghklxx6d8y";
-    propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
-    meta.description = "Base set of ppx rewriters";
-  };
-
-  # Jane Street packages, up to ppx_bin_prot
-
-  fieldslib = janePackage {
-    name = "fieldslib";
-    hash = "19l05d7hhc74zg48hj0m7sips8z3vpara1f0lvd8h7n46wpbs608";
-    propagatedBuildInputs = [ ppx_driver ];
-    meta.description = "OCaml record fields as first class values";
+  ppx_sexp_conv = janePackage {
+    name = "ppx_sexp_conv";
+    version = "0.11.2";
+    hash = "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9";
+    propagatedBuildInputs = [ sexplib0 ppxlib ppx_deriving ];
+    meta.description = "Generation of S-expression conversion functions from type definitions";
   };
 
   variantslib = janePackage {
     name = "variantslib";
-    hash = "0j1qlz7g8ny1qf3a7d38v2a7sxiis1nwcxkvz0myfsc3dkn716an";
-    propagatedBuildInputs = [ ppx_driver ];
+    hash = "0hbsk34ghc28h8pzbma923ma2bgnz8lzrgcqqx9bzg161jl4s4r3";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ base ];
     meta.description = "OCaml variants as first class values";
   };
 
-  ppx_traverse = janePackage {
-    name = "ppx_traverse";
-    hash = "1ps7s4vwvzik9wvmwd0i3a1sjgm0xx32yivc2r8ix9qqwylvjllq";
-    propagatedBuildInputs = [ ppx_type_conv ];
-    meta.description = "Automatic generation of open recursion classes";
+  ppx_variants_conv = janePackage {
+    name = "ppx_variants_conv";
+    version = "0.11.1";
+    hash = "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ ppx_deriving variantslib ];
+    meta.description = "Generation of accessor and iteration functions for OCaml variant types";
   };
 
-  ppx_custom_printf = janePackage {
-    name = "ppx_custom_printf";
-    hash = "113dvmiy07lb6mf0f88avf4cfkix4q029xqi2w0h26xngp88s31p";
-    propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ];
-    meta.description = "Printf-style format-strings for user-defined string conversion";
+  fieldslib = janePackage {
+    name = "fieldslib";
+    hash = "1yvjvfax56lmn2lxbykcmhgmxypws1vp9lhnyb8bhbavsv8yc6da";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "OCaml record fields as first class values";
   };
 
   ppx_fields_conv = janePackage {
     name = "ppx_fields_conv";
-    hash = "1df095qczkzclmdcs1nrm89wswnxivn9kvn6sw65jpvryfkf5v5k";
-    propagatedBuildInputs = [ fieldslib ppx_type_conv ];
+    hash = "1bb9cmn4js7p3qh8skzyik1pcz6sj1k4xkhf12fg1bjmb5fd0jx1";
+    propagatedBuildInputs = [ fieldslib ];
     meta.description = "Generation of accessor and iteration functions for OCaml records";
   };
 
-  ppx_variants_conv = janePackage {
-    name = "ppx_variants_conv";
-    hash = "1l19rkclf65f8snw2v0yibkvk28by241dkp6jb0076dyghbln451";
-    propagatedBuildInputs = [ ppx_type_conv variantslib ];
-    meta.description = "Generation of accessor and iteration functions for OCaml variant types";
+  ppx_custom_printf = janePackage {
+    name = "ppx_custom_printf";
+    hash = "1dvjzvaxhx53jqwrrlxdckwl1azrhs9kvwb48mhgd0jnz65ny726";
+    propagatedBuildInputs = [ ppx_sexp_conv ];
+    meta.description = "Printf-style format-strings for user-defined string conversion";
   };
 
   bin_prot = janePackage {
     name = "bin_prot";
-    hash = "1yyjpwr2s5l8sm9j77a4cmr92rdx73iy3fwqyxf7dr8hfrmd938v";
+    hash = "1mgbyzsr8h0y4s4j9dv7hsdrxyzhhjww5khwg2spi2my7ia95m0l";
     propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
     meta.description = "Binary protocol generator";
   };
 
+  jane-street-headers = janePackage {
+    name = "jane-street-headers";
+    hash = "0kij4c7qxrja787f3sm3z6mzr322486h2djrlyhnl66vp8hrv8si";
+    meta.description = "Jane Street header files";
+  };
+
   ppx_here = janePackage {
     name = "ppx_here";
-    hash = "0ysx25ai7mpzxfpbswd9k38hpxhjm12bj0iw5ghvhdjnnn07kwcv";
-    propagatedBuildInputs = [ ppx_driver ];
+    hash = "04njv8s4n54x9rg0012ymd6y6lrnqprnh0f0f6s0jcp79q7mv43i";
+    buildInputs = [ ppxlib ];
     meta.description = "Expands [%here] into its location";
   };
 
-  ppx_bin_prot = janePackage {
-    name = "ppx_bin_prot";
-    hash = "06n7gs51847p75baay9ar8n15ynqzhdbnwd8xvp8vxs6krr6wpfd";
-    propagatedBuildInputs = [ ppx_here bin_prot ];
-    meta.description = "Generation of bin_prot readers and writers from types";
-  };
-
-  # Jane Street packages, up to ppx_jane
-
   ppx_assert = janePackage {
     name = "ppx_assert";
-    hash = "09xrcs2sk1a9vjn16bd1cpz3b52kbck7fhc7zrz24lv121wspiaj";
-    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ];
+    hash = "0qbdrl0rj0midnb6sdyaz00s0d4nb8zrrdf565lcdsi1rbnyrzan";
+    buildInputs = [ ppx_here ];
+    propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
     meta.description = "Assert-like extension nodes that raise useful errors on failure";
   };
 
+  ppx_hash = janePackage {
+    version = "0.11.1";
+    name = "ppx_hash";
+    hash = "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p";
+    propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
+    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+  };
+
   ppx_inline_test = janePackage {
     name = "ppx_inline_test";
-    hash = "0ar4lpl3zwb7k1f4clqsw1hyzwa104gf118a2i89c4hvj2721jwf";
-    propagatedBuildInputs = [ ppx_metaquot ];
+    hash = "11n94fz1asjf5vqdgriv0pvsa5lbfpqcyk525c7816w23vskcvq6";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ base ];
     meta.description = "Syntax extension for writing in-line tests in OCaml code";
   };
 
+  ppx_sexp_message = janePackage {
+    name = "ppx_sexp_message";
+    hash = "0d94pf0mrmyp905ncgj4w6cc6zpm4nlib6nclslhgs89pxpzg6a0";
+    buildInputs = [ ppx_here ];
+    propagatedBuildInputs = [ ppx_sexp_conv ];
+    meta.description = "A ppx rewriter for easy construction of s-expressions";
+  };
+
   typerep = janePackage {
     name = "typerep";
-    hash = "11na0kag6aggckx7326zq8hh9pzymkwqfxsd25fswskk5lpnvwqv";
+    hash = "00j4by75fl9niqvlpiyw6ymlmlmgfzysm8w25cj5wsfsh4yrgr74";
     propagatedBuildInputs = [ base ];
     meta.description = "Runtime types for OCaml";
   };
 
+  ppx_typerep_conv = janePackage {
+    version = "0.11.1";
+    name = "ppx_typerep_conv";
+    hash = "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ ppx_deriving typerep ];
+    meta.description = "Generation of runtime types from type declarations";
+  };
+
+  ppx_js_style = janePackage {
+    name = "ppx_js_style";
+    hash = "1cwqyrkykc8wi60grbid1w072fcvf7k0hd387jz7mxfw44qyb85g";
+    propagatedBuildInputs = [ ppxlib octavius ];
+    meta.description = "Code style checker for Jane Street Packages";
+  };
+
+  ppx_enumerate = janePackage {
+    version = "0.11.1";
+    name = "ppx_enumerate";
+    hash = "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ ppx_deriving ];
+    meta.description = "Generate a list containing all values of a finite type";
+  };
+
+  ppx_base = janePackage {
+    name = "ppx_base";
+    hash = "079caqjbxk1d33hy69017n3dwslqy52alvzjddwpdjb04vjadlk6";
+    propagatedBuildInputs = [ ppx_compare ppx_enumerate ppx_hash ppx_js_style ];
+    meta.description = "Base set of ppx rewriters";
+  };
+
   ppx_bench = janePackage {
     name = "ppx_bench";
-    hash = "17l5shhi613l02yfipyr4hna3lj94kn6zy746rvsgcibyc7nybq6";
-    propagatedBuildInputs = [ ppx_inline_test ];
+    hash = "0z98r6y4lpj6dy265m771ylx126hq3v1zjsk74yqvpwwd63gx3jz";
+    buildInputs = [ ppxlib ppx_inline_test ];
     meta.description = "Syntax extension for writing in-line benchmarks in OCaml code";
   };
 
+  ppx_bin_prot = janePackage {
+    version = "0.11.1";
+    name = "ppx_bin_prot";
+    hash = "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz";
+    buildInputs = [ ppxlib ppx_here ];
+    propagatedBuildInputs = [ bin_prot ];
+    meta.description = "Generation of bin_prot readers and writers from types";
+  };
+
   ppx_expect = janePackage {
     name = "ppx_expect";
-    hash = "0qq07iqfsbksklwn7rr1wdz79kji0iyq5qkyfwxrxm0ci9fz0h1w";
-    propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ];
+    hash = "1g0r67vfw9jr75pybiw4ysfiswlzyfpbj0gl91rx62gqdhjh1pga";
+    buildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_here ppx_variants_conv re ];
+    propagatedBuildInputs = [ fieldslib ppx_compare ppx_inline_test ppx_sexp_conv ];
     meta.description = "Cram like framework for OCaml";
   };
 
   ppx_fail = janePackage {
     name = "ppx_fail";
-    hash = "0cwz16xy5s0ijm9y98lh9089ic7wd161njpdncgsxy6lgsjawap2";
-    propagatedBuildInputs = [ ppx_here ppx_metaquot ];
+    hash = "0d0xadcl7mhp81kspcd2b0nh75h34w5a6s6j9qskjjbjif87wiix";
+    buildInputs = [ ppxlib ppx_here ];
     meta.description = "Add location to calls to failwiths";
   };
 
   ppx_let = janePackage {
     name = "ppx_let";
-    hash = "0smdxkjh4nxrf3mwzfvkjbymvwbz04v70k2gwxsaz5f6wvnhyvmm";
-    propagatedBuildInputs = [ ppx_driver ];
+    hash = "1ckzwljlb78cdf6xxd24nddnmsihvjrnq75r1b255aj3xgkzsygx";
+    buildInputs = [ ppxlib ];
     meta.description = "Monadic let-bindings";
   };
 
+  ppx_optcomp = janePackage {
+    name = "ppx_optcomp";
+    hash = "1rahkjq6vpffs7wdz1crgbxkdnlfkj1i3j12c2andy4fhj49glcm";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ ppx_deriving ];
+    meta.description = "Optional compilation for OCaml";
+  };
+
   ppx_optional = janePackage {
     name = "ppx_optional";
-    hash = "1qmc0yzp9jab8yndxs0ca3qx35wyhfwiknqk0gfjmar2ji87zlzn";
-    propagatedBuildInputs = [ ppx_metaquot ];
+    hash = "0aw3hvrsdjpw4ik7rf15ghak31vhdr1lgpphr18mj76rnlrhirmx";
+    propagatedBuildInputs = [ ppxlib ];
     meta.description = "Pattern matching on flat options";
   };
 
   ppx_pipebang = janePackage {
     name = "ppx_pipebang";
-    hash = "0lzw6qc9f9g7zkbhhp4603b3mj3jvca4phx40f95d49y370325qx";
-    propagatedBuildInputs = [ ppx_metaquot ];
+    hash = "0smgq587amlr3hivbbg153p83dj37w30cssp9cffc0v8kg84lfhr";
+    buildInputs = [ ppxlib ];
     meta.description = "A ppx rewriter that inlines reverse application operators |> and |!";
   };
 
-  ppx_sexp_message = janePackage {
-    name = "ppx_sexp_message";
-    hash = "1gddia4ry2pmnh4qj5855a044lqs23g5h038bkny73xg7w06jhrk";
-    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
-    meta.description = "A ppx rewriter for easy construction of s-expressions";
-  };
-
   ppx_sexp_value = janePackage {
     name = "ppx_sexp_value";
-    hash = "1xd5ln997wka8x4dba58yh525a5f36sklngg2z7iyiss7xi4yg7i";
-    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+    hash = "107zwb580nrmc0l03dl3y3hf12s3c1vv8b8mz6sa4k5afp3s9nkl";
+    buildInputs = [ ppx_here ];
+    propagatedBuildInputs = [ ppx_sexp_conv ];
     meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values";
   };
 
-  ppx_typerep_conv = janePackage {
-    name = "ppx_typerep_conv";
-    hash = "1bk8zgagf6q5lb7icsrbzs05c8dz1gij0clzk39am40l83zs3ain";
-    propagatedBuildInputs = [ ppx_type_conv typerep ];
-    meta.description = "Generation of runtime types from type declarations";
-  };
-
   ppx_jane = janePackage {
     name = "ppx_jane";
-    hash = "1lhzcfh129dc54bkg16rnldi97682nlzdr8a47ham3hg2kkab8kr";
-    propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
+    hash = "0l1p6llaa60mrc5p9400cqv9yy6h76x5wfq3z1cx5xawy0yz4vlb";
+    buildInputs = [ ppxlib ];
+    propagatedBuildInputs = [ ppx_assert ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_here ppx_let ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
     meta.description = "Standard Jane Street ppx rewriters";
   };
 
-  # Jane Street packages, up to core
-
-  configurator = janePackage {
-    name = "configurator";
-    hash = "0lydjj4r21ipmc91hyf91mjjvcibk4r7ipan8bqfzb5l490r95rp";
-    propagatedBuildInputs = [ base stdio ];
-    meta.description = "Helper library for gathering system configuration";
-  };
-
-  jane-street-headers = janePackage {
-    name = "jane-street-headers";
-    hash = "1sqyqzhgi52vq33i8ha2pmjg026qiqmpaqmibs3pfj4jsscwl842";
-    meta.description = "Jane Street header files";
+  splittable_random = janePackage {
+    name = "splittable_random";
+    hash = "1yrvpm6g62f8k6ihccxhfxpvmxbqxhi7p790a8jkdmyfdd1l6z73";
+    propagatedBuildInputs = [ ppx_jane ];
+    meta.description = "PRNG that can be split into independent streams";
   };
 
   core_kernel = janePackage {
     name = "core_kernel";
-    hash = "00iqd9wcana2blgdih1lq9zqd31agr6az912bhsklyarvvcn9hcb";
-    propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ];
+    hash = "0xaw8189i9z72fvzbxfv1qrf4wvj8v45bl7g3z7ynsqkvh6smr7d";
+    propagatedBuildInputs = [ configurator jane-street-headers sexplib splittable_random ];
     meta.description = "Jane Street's standard library overlay (kernel)";
   };
 
   spawn = janePackage {
+    version = "0.12.0";
     name = "spawn";
-    hash = "1av1pjkiqq3nz0rjmykiylhf0iv6d1ssvqqj6wcc3c0bzvgyih0p";
+    hash = "0amgj7g9sjlbjivn1mg7yjdmxd21hgp4a0ak2zrm95dmm4gi846i";
     meta.description = "Spawning sub-processes";
   };
 
   core = janePackage {
+    version = "0.11.1";
     name = "core";
-    hash = "06cra34rlqpmxh4f3v1vps9fs7hy90jjnipdvcf9z8cn925mdj46";
+    hash = "0wa2dsfk5m5wlhz915664y9h08idijj5s41hyg8n54dhihvxw2ci";
     propagatedBuildInputs = [ core_kernel spawn ];
     meta.description = "Jane Street's standard library overlay";
   };
 
-  # Jane Street packages, up to core_extended
-
-  re2 = janePackage {
-    name = "re2";
-    version = "0.10.1";
-    hash = "1d39brryfaj5fqp1kzw67n1bvfxv28xi058mk5il14wj40y5ldh1";
+  textutils_kernel = janePackage {
+    name = "textutils_kernel";
+    hash = "0s1ps7h54vgl76pll3y5qa1bw8f4h8wxc8mg8jq6bz8vxvl0dfv4";
     propagatedBuildInputs = [ core_kernel ];
-    meta = {
-      description = "OCaml bindings for RE2";
-      broken = stdenv.isDarwin;
-    };
+    meta.description = "The subset of textutils using only core_kernel and working in javascript";
   };
 
   textutils = janePackage {
     name = "textutils";
-    hash = "0mnmrp8kd443qx9gahrwr04a8q4hskcad2i1k9amiypbwy566s37";
+    hash = "1jmhpaihnndf4pr8xsk7ws70n4mvv34ry0ggqqpfs3wb2vkcdg6j";
     propagatedBuildInputs = [ core textutils_kernel ];
     meta.description = "Text output utilities";
   };
 
-  textutils_kernel = janePackage {
-    name = "textutils_kernel";
-    hash = "0w7nf7sycffff318fxr42ss1fxa3bsy9kj7y27dl1whrajip9mb7";
-    propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ];
-    meta.description = "The subset of textutils using only core_kernel and working in javascript";
+  re2 = janePackage {
+    name = "re2";
+    hash = "0bl65d0nmvr7k1mkkcc4aai86l5qzgn1xxwmszshpwhaz87cqghd";
+    propagatedBuildInputs = [ core_kernel ];
+    meta = {
+      description = "OCaml bindings for RE2";
+      broken = stdenv.isDarwin;
+    };
   };
 
   core_extended = janePackage {
     name = "core_extended";
-    hash = "0g9adnr68l4ggayilmvz9nnf2slvnp0jzknjrxk10cab72l97rv4";
-    propagatedBuildInputs = [ core re2 textutils ];
+    hash = "1fvnr6zkpbl48dl7nn3j1dpsrr6bi00iqh282wg5lgdhcsjbc0dy";
+    propagatedBuildInputs = [ core re re2 textutils ];
     postPatch = ''
       patchShebangs src/discover.sh
     '';
-    meta = {
-      description = "Jane Street Capital's standard library overlay";
-    };
+    meta.description = "Jane Street Capital's standard library overlay";
   };
 
-  # Jane Street async packages
-
   async_kernel = janePackage {
     name = "async_kernel";
-    hash = "09dzfyfmjf9894yimf1fpnc2l1v342f51a2wjr3d23pw6xnbcrl0";
+    hash = "1drxawih7vhhb1mhd291698ly7yb38qzif82jk1adqcvwdb547af";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Jane Street Capital's asynchronous execution library (core)";
   };
 
+  protocol_version_header = janePackage {
+    name = "protocol_version_header";
+    hash = "159qmkb0dsfmr1lv2ly50aqszpm24bvrm3sw07n2zhkxgy6q613z";
+    propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ];
+    meta.description = "Protocol aware version negotiation";
+  };
+
   async_rpc_kernel = janePackage {
     name = "async_rpc_kernel";
-    hash = "1ardfr4vwbzc41qa2ccmzp15m9w3nbdl9cy4crvm87fi0ngkhixy";
+    hash = "0wl7kp30qxkalk91q5pja9agsvvmdjvb2q7s3m79dlvwwi11l33y";
     propagatedBuildInputs = [ core_kernel async_kernel protocol_version_header ];
     meta.description = "Platform-independent core of Async RPC library";
   };
 
   async_unix = janePackage {
     name = "async_unix";
-    hash = "151pn0543fwvi5gkdkbd05v8y9gjbxi1n69r4jxzc0bh842xx4xz";
+    hash = "1y5za5fdh0x82zdjigxci9zm9jnpfd2lfgpjcq4rih3s28f16sf7";
     propagatedBuildInputs = [ core async_kernel ];
     meta.description = "Jane Street Capital's asynchronous execution library (unix)";
   };
 
   async_extra = janePackage {
     name = "async_extra";
-    hash = "0vf3nfj8h7vnigs8l8m1bsg6w3szgaylaps6mbl4dsaihxdc732n";
+    hash = "1qac95zlvq34fh2wbwbw0vdzxnba6si8lkal7n09y2lzpwvsifx3";
     propagatedBuildInputs = [ async_rpc_kernel async_unix ];
     meta.description = "Jane Street's asynchronous execution library (extra)";
   };
 
   async = janePackage {
     name = "async";
-    hash = "05ldvyw75648qrjx7q794m9llmlnqklh97lc09fv8biw515dby3d";
+    hash = "1i05hzk4mhzj1mw98b2bdbxhnq03jvhkkkw4d948i6265jzrrbv5";
     propagatedBuildInputs = [ async_extra ];
     meta.description = "Jane Street Capital's asynchronous execution library";
   };
 
   async_find = janePackage {
     name = "async_find";
-    hash = "05cpnz1m09h276cq6v3bh7da4iai14gmlh4cnh64v41f8hssw63s";
+    hash = "0s0qafx74ri1vr2vv3iy1j7s3p6gp7vyg0mw5g17iafk0w6lv2iq";
     propagatedBuildInputs = [ async ];
     meta.description = "Directory traversal with Async";
   };
 
   async_interactive = janePackage {
     name = "async_interactive";
-    hash = "1h2419l6nlqph3ipp5zdwyq55d3s602i4bv4jhsridmzy6cxxdxs";
+    hash = "01rlfcylpiak6a2n6q3chp73cvkhvb65n906dj0flmxmagn7dxd1";
     propagatedBuildInputs = [ async ];
     meta.description = "Utilities for building simple command-line based user interfaces";
   };
 
   async_parallel = janePackage {
     name = "async_parallel";
-    hash = "0r8q73v26w3grj9n9wyrf65cq9w6pfzrmg9iswsy4jjb5r02bpr5";
+    hash = "0hak8ba3rfzqhz5hz2annqmsv5bkqzdihhafp0f58ryrlskafwag";
     propagatedBuildInputs = [ async ];
     meta.description = "Distributed computing library";
   };
 
   async_shell = janePackage {
     name = "async_shell";
-    hash = "1snkr944l3a627k23yh8f0lr900dpg2aym2l59fpp75s29pyk5md";
+    hash = "1jb01ygfnhabsy72xlcg11vp7rr37sg555sm0k3yxl4r5az3y2ay";
     propagatedBuildInputs = [ core_extended async ];
-    meta = {
-      description = "Shell helpers for Async";
-    };
+    meta.description = "Shell helpers for Async";
   };
 
   async_ssl = janePackage {
     name = "async_ssl";
-    hash = "1cb9wpmgifa5vj9gadbav6bq6vxcm3g0jc6wxnkj3hgvnj35j2vy";
+    hash = "1p83fzfla4rb820irdrz3f2hp8kq5zrhw47rqmfv6qydlca1bq64";
     propagatedBuildInputs = [ async ctypes openssl ];
     meta.description = "Async wrappers for SSL";
   };
 
-  # Jane Street packages, up to expect_test_helpers
-
   sexp_pretty = janePackage {
     name = "sexp_pretty";
-    hash = "106r91ahzdr8yvphs1s3ck8r89c4qhpcl9q6j5rbxrbihgb71i8d";
-    propagatedBuildInputs = [ ppx_base re ];
+    hash = "0xskahjggbwvvb82fn0jp1didxbgpmgks76xhwp9s3vqkhgz6918";
+    propagatedBuildInputs = [ ppx_base re sexplib ];
     meta.description = "S-expression pretty-printer";
   };
 
   expect_test_helpers_kernel = janePackage {
     name = "expect_test_helpers_kernel";
-    hash = "027pwfkdnz8rzgg9dqa4x2ir0zn8lav7gh64cih35r455xbfnvpr";
+    hash = "0m113vq4m1xm3wmwa08r6qjc7p5f0y3ss8s4i2z591ycgs2fxzlj";
     propagatedBuildInputs = [ core_kernel sexp_pretty ];
     meta.description = "Helpers for writing expectation tests";
   };
 
   expect_test_helpers = janePackage {
     name = "expect_test_helpers";
-    hash = "0rzsgj8h73gx18sz1a1d3pbrjkb0vd6shl1h71n4xl05njcfb73r";
+    hash = "13n6h7mimwkbsjdix96ghfrmxjd036m4h4zgl8qag00aacqclvpi";
     propagatedBuildInputs = [ async expect_test_helpers_kernel ];
     meta.description = "Async helpers for writing expectation tests";
   };
 
-  # Miscellaneous Jane Street packages
-
   bignum = janePackage {
     name = "bignum";
-    hash = "0vs52aqq7pwazgv35zdd66c5v5ha1wrgrcmzc17c2qbswy8wcc37";
+    hash = "0hqd88fb90rsj1wjj4k79gigcf31c6a45msasw99zzifzppr3w3f";
     propagatedBuildInputs = [ core_kernel zarith num ];
     meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
   };
 
   cinaps = janePackage {
     name = "cinaps";
-    hash = "1mwllcakvsirxpbwcqlglwqkiz8cks7vbjf1jvngs9703mx1xdcy";
+    hash = "0f8cx4xkkk4wqpcbvva8kxdndbgawljp17dwppc6zpjpkjl8s84j";
     propagatedBuildInputs = [ re ];
     meta.description = "Trivial Metaprogramming tool using the OCaml toplevel";
   };
 
   command_rpc = janePackage {
     name = "command_rpc";
-    hash = "0lq1vcz8qyyqabrz9isw2pw50663lwmq4w3187jp99ygar9lk5n2";
+    hash = "111v4km0ds8ixmpmwg9ck36ap97400mqzhijf57kj6wfwgzcmr2g";
     propagatedBuildInputs = [ async ];
     meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout";
   };
 
+  # Deprecated libraries
+
+  ppx_ast = janePackage {
+    name = "ppx_ast";
+    hash = "125bzswcwr3nb26ss8ydh8z4218c8fi3s2kvgqp1j1fhc5wwzqgj";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  ppx_core = janePackage {
+    name = "ppx_core";
+    hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  ppx_driver = janePackage {
+    name = "ppx_driver";
+    hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  ppx_metaquot = janePackage {
+    name = "ppx_metaquot";
+    hash = "1vz8bi56jsz8w0894vgbfsfvmdyh5k1dgv45l8vhkks0s7d3ldji";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  ppx_traverse = janePackage {
+    name = "ppx_traverse";
+    hash = "1p2n5da4mxh9fk4gvxlibc706bs5xwkbppxd1x0ip1vln5pabbq5";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  ppx_traverse_builtins = janePackage {
+    name = "ppx_traverse_builtins";
+    hash = "0qlf7i8h8k3a9h8nhb0ki3y1knr6wgbm24f1qaqni53fpvzv0pfb";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  ppx_type_conv = janePackage {
+    name = "ppx_type_conv";
+    hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf";
+    propagatedBuildInputs = [ ppxlib ];
+    meta.description = "Deprecated (see ppxlib)";
+  };
+
+  # Miscellaneous Jane Street packages
+
   core_bench = janePackage {
     name = "core_bench";
-    hash = "1py68z848gj5wdmknqmzdb6zg65k5zchv6i6vzygi5nszn3zzwgc";
+    hash = "10i28ssfdqxxhq0rvnlp581lr1cq2apkhmm8j83fksjkmbxcrasc";
     propagatedBuildInputs = [ core_extended ];
-    meta = {
-      description = "Micro-benchmarking library for OCaml";
-    };
+    meta.description = "Micro-benchmarking library for OCaml";
   };
 
   core_profiler = janePackage {
     name = "core_profiler";
-    hash = "1vqkb8fzhs0k94k78whjnsznj85qa18kp0bq73mdkffz9562hdyr";
+    hash = "1kaaw3jp3qarbd9rgpjfb9md0dqblf2bxiqb245sqmx4c1346v1c";
     propagatedBuildInputs = [ core_extended ];
-    meta = {
-      description = "Profiling library";
-    };
+    meta.description = "Profiling library";
   };
 
   csvfields = janePackage {
     name = "csvfields";
-    hash = "1qvcm2xkpw5ca5za2dfvz154h6kzm565wvynh7fffvrj2q719flm";
+    hash = "10zw4fjlniivfdzzz79lnbvcjnhk5y16m1p8mn4xbs23n6mbix0f";
     propagatedBuildInputs = [ core expect_test_helpers ];
     meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
   };
 
   ecaml = janePackage {
     name = "ecaml";
-    hash = "1h8m8nznsyc8md8f5rx3845lpl37ijqpxkpd52w92xy5hlc9bk1k";
+    hash = "1is5156q59s427x3q5nh9wsi8h1x77670bmyilqxasy39yway7g8";
     propagatedBuildInputs = [ async expect_test_helpers_kernel ];
     meta.description = "Writing Emacs plugin in OCaml";
   };
 
   email_message = janePackage {
     name = "email_message";
-    hash = "0p56lak1ynqmimapsz529ankgdyd5yk90c0193q8fzv7fvvrzkzd";
+    hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg";
     propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ];
-    meta = {
-      description = "E-mail message parser";
-    };
+    meta.description = "E-mail message parser";
   };
 
   incremental_kernel = janePackage {
     name = "incremental_kernel";
-    hash = "15xw3l07fdqk5sla37fdvfnwykvq6fyrj9b2lwhc29rq0444m1yz";
+    hash = "02arw8blpmnzlw5jlvavyvpgh3s9q0j9mhi2byz0x8cxknqvvasg";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Library for incremental computations depending only on core_kernel";
   };
 
   incremental = janePackage {
     name = "incremental";
-    hash = "14hh7kxj70bpgylnx1fj3s5c40d12sgcb11cnh1xh7nwm190a9c2";
+    hash = "1xchd3v4kj56wixjrsnj7m7l0374cgkzybihs2b62mn65xf6n7ki";
     propagatedBuildInputs = [ core incremental_kernel ];
     meta.description = "Library for incremental computations";
   };
 
   incr_map = janePackage {
     name = "incr_map";
-    hash = "0s6c7f8a80s7bnjxcs7mdgm45i24d1j0vw4i2j884z1ssjrk33hw";
+    hash = "01vx9aldxpigz5ah9h337xcw73a7r8449v8l2xbralljhs0zglx9";
     propagatedBuildInputs = [ incremental_kernel ];
     meta.description = "Helpers for incremental operations on map like data structures";
   };
 
   ocaml_plugin = janePackage {
     name = "ocaml_plugin";
-    hash = "0b63ciajc9hcjs3pl0chlj475y60i3l5mjzaiqmyz1pryfqpri7r";
+    hash = "0fal5j59qkbksg6ak1ngn92pcgg3f9gwfaglpxb7l6bck20kaigp";
     buildInputs = [ ocamlbuild ];
     propagatedBuildInputs = [ async ];
     meta.description = "Automatically build and dynlink ocaml source files";
   };
 
-  parsexp = janePackage {
-    name = "parsexp";
-    hash = "1k1z6kyp7c53l0wspz6qpvbb46bbr6aimnr06y6y1prxrpazm62w";
-    propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ];
-    meta.description = "S-expression parsing library";
-  };
-
   parsexp_io = janePackage {
     name = "parsexp_io";
-    hash = "0l9jrfm1zz0y6bfxla2s0fwjlvs9361ky83z3xwdlc48fgzks3a5";
-    propagatedBuildInputs = [ parsexp ];
+    hash = "0rhdl40jiirvv6fhgjk50n8wzs3jly5d8dyyyfgpjgl39mwkjjnb";
+    propagatedBuildInputs = [ parsexp ppx_js_style ];
     meta.description = "S-expression parsing library (IO functions)";
   };
 
   patience_diff = janePackage {
     name = "patience_diff";
-    hash = "11ws6hsalmq7zc7wp37mj7zs3qaqkq4zlnwr06ybryv6vz62xj1l";
+    hash = "0q7a64fgg97qcd6d8c45gyz63x5vq004axxqvvfg92b8f3x2plx4";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Tool and library implementing patience diff";
   };
 
   posixat = janePackage {
     name = "posixat";
-    hash = "0dmjzbpbmzl94h4c1gk6k75wglnvk1kqcm4zs4nb9hy2ja8ldl9x";
-    propagatedBuildInputs = [ ppx_sexp_conv ];
+    hash = "04rs4sl0r4rg9m6l9kkqkmc4n87sv4a4w9ibq4zsjk9j4n6r2df8";
+    propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv sexplib ];
     meta.description = "Binding to the posix *at functions";
   };
 
-  protocol_version_header = janePackage {
-    name = "protocol_version_header";
-    hash = "1vl1kfn8n1zdm3vh7228c58vprac4v7mpqks60k8rnzjj4w2mj1n";
-    propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ];
-    meta.description = "Protocol aware version negotiation";
-  };
-
   rpc_parallel = janePackage {
     name = "rpc_parallel";
-    hash = "01nyjqgdj351ykdaqqpaljwzac48x824lzfpma64lbp6plqmjlbf";
+    hash = "13dx59x73i8mkwv2qkh8gx6kk8arlvghj57k1jdscdmzmyqc9gvn";
     propagatedBuildInputs = [ async ];
     meta.description = "Type-safe library for building parallel applications";
   };
 
   shexp = janePackage {
+    version = "0.11.1";
     name = "shexp";
-    hash = "1ck5gcsdp93194bw6d1i116zplyaqrz1r36h6mvrw5x7i2549n9p";
+    hash = "06yssp7bsmabaxvw9bqxyrsji1gkvl7if5adba3v6h4kilqy7rqg";
     propagatedBuildInputs = [ posixat spawn ];
     meta.description = "Process library and s-expression based shell";
   };
 
   topological_sort = janePackage {
     name = "topological_sort";
-    hash = "08w1dx30frj2bxxk8djl23cd43sassjkrmissyhagn9fmq2l904m";
+    hash = "1qnz5b1rs45lsl1ycxd1lglpmh8444gy5khhdp5fvxy987zkzklz";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Topological sort algorithm";
   };
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index 5cf22341b88c9..d17e595199e1a 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, defaultVersion ? "0.10.0" }:
+{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, defaultVersion ? "0.11.0" }:
 
 { name, version ? defaultVersion, buildInputs ? [], hash, meta, ...}@args:
 
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index fdd30d28ed89d..c1e268f686b0b 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }:
+{ stdenv, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
-buildOcaml rec {
+stdenv.mkDerivation rec {
   version = "1.12.0";
-  name = "lambda-term";
+  name = "ocaml${ocaml.version}-lambda-term-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 37bcff375ea96..345ca037fec9a 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
-, ocaml, findlib, camlp4, cppo
+, ocaml, findlib, cppo
 , ocaml-migrate-parsetree, ppx_tools_versioned, result
+, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, camlp4 ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -13,12 +15,13 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    ocaml src/util/configure.ml -use-libev true -use-camlp4 true
+    ocaml src/util/configure.ml -use-libev true -use-camlp4 ${if withP4 then "true" else "false"}
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ncurses ocaml findlib jbuilder camlp4 cppo
-    ocaml-migrate-parsetree ppx_tools_versioned ];
+  buildInputs = [ ncurses ocaml findlib jbuilder cppo
+    ocaml-migrate-parsetree ppx_tools_versioned ]
+  ++ stdenv.lib.optional withP4 camlp4;
   propagatedBuildInputs = [ libev result ];
 
   installPhase = ''
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix
new file mode 100644
index 0000000000000..bdabe677a858a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, ocaml, findlib, jbuilder, lwt }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.0";
+  name = "ocaml${ocaml.version}-lwt_log-${version}";
+
+  inherit (lwt) src;
+
+  buildInputs = [ ocaml findlib jbuilder ];
+
+  propagatedBuildInputs = [ lwt ];
+
+  buildPhase = "jbuilder build -p lwt_log";
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    description = "Lwt logging library (deprecated)";
+    homepage = "https://github.com/aantron/lwt_log";
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index 6e68c87b5ff06..67de1863e004a 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
 , cpuid, ocb-stubblr
-, cstruct, zarith, ppx_sexp_conv, sexplib
+, cstruct, zarith, ppx_sexp_conv
 , cstruct-lwt ? null
 }:
 
@@ -11,16 +11,34 @@ stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-nocrypto-${version}";
   version = "0.5.4";
 
-  src = fetchFromGitHub {
-    owner  = "mirleft";
-    repo   = "ocaml-nocrypto";
-    rev    = "v${version}";
-    sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p";
+  src = fetchurl {
+    url = "https://github.com/mirleft/ocaml-nocrypto/releases/download/v${version}/nocrypto-${version}.tbz";
+    sha256 = "0zshi9hlhcz61n5z1k6fx6rsi0pl4xgahsyl2jp0crqkaf3hqwlg";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr
-    ppx_sexp_conv ];
-  propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt;
+  unpackCmd = "tar xjf $curSrc";
+
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0001-add-missing-runtime-dependencies-in-_tags.patch";
+      sha256 = "1asybwj3rl07b4q4cxwy80a7j17j0i5vzz77p38hymilhc2ky7xn";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0002-add-ppx_sexp_conv-as-a-runtime-dependency-in-the-pac.patch";
+      sha256 = "0zmp64n5fgkawpkyw0vv0bg0i2c3xbsxqy17vwy92nf5rbardi1r";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0003-Auto-detect-ppx_sexp_conv-runtime-library.patch";
+      sha256 = "0lngbg5gyd5gs56lbjh6g86cps1y8x1xsqzi0vi1v28al1gn5dhw";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch";
+      sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9";
+    })
+  ];
+
+  buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ];
+  propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt;
 
   buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
   inherit (topkg) installPhase;
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index b88000eeb32ab..9a2af140e3123 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -6,24 +6,19 @@ else
 
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
-   version = "1.0.7";
+   version = "1.0.11";
 
    src = fetchFromGitHub {
-     owner = "let-def";
+     owner = "ocaml-ppx";
      repo = "ocaml-migrate-parsetree";
      rev = "v${version}";
-     sha256 = "0v1h943xv5bd8qy5mr8pvyjbgamhs59nkgr94j3vznabrcfqzkh7";
+     sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n";
    };
 
    buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
    propagatedBuildInputs = [ result ];
 
-   installPhase = ''
-     for p in *.install
-     do
-       ${jbuilder.installPhase} $p
-     done
-   '';
+   inherit (jbuilder) installPhase;
 
    meta = {
      description = "Convert OCaml parsetrees between different major versions";
diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 5d27dc35396c2..363b774aaebab 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml-migrate-parsetree }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }:
 
-buildOcaml rec {
-  name = "ppx_tools_versioned";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}";
   version = "5.1";
 
-  minimumSupportedOcamlVersion = "4.02";
-
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "ppx_tools_versioned";
@@ -13,6 +11,8 @@ buildOcaml rec {
     sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624";
   };
 
+  buildInputs = [ ocaml findlib ];
+
   propagatedBuildInputs = [ ocaml-migrate-parsetree ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
new file mode 100644
index 0000000000000..889e4acd2b50b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.3.0";
+  name = "ocaml${ocaml.version}-ppxlib-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-ppx";
+    repo = "ppxlib";
+    rev = version;
+    sha256 = "0csp49jh7zgjnqh46mxbf322whlbmgy7v1a12nvxh97qg6i5fvsy";
+  };
+
+  buildInputs = [ ocaml findlib jbuilder ];
+
+  propagatedBuildInputs = [
+    ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
+  ];
+
+  buildPhase = "jbuilder build";
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    description = "Comprehensive ppx tool set";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+
+}
diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
new file mode 100644
index 0000000000000..c09cf5a77c1e6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "psmt2-frontend is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "0.1";
+  name = "ocaml${ocaml.version}-psmt2-frontend-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Coquera";
+    repo = "psmt2-frontend";
+    rev = version;
+    sha256 = "0k7jlsbkdyg7hafmvynp0ik8xk7mfr00wz27vxn4ncnmp20yz4vn";
+  };
+
+  prefixKey = "-prefix ";
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ ocaml findlib menhir ];
+
+  createFindlibDestdir = true;
+
+  installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)";
+
+  meta = {
+    description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+
+}
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index 861ac8b3bc81d..c6f1b6d175815 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "re is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation rec {
-  name = "ocaml-re-${version}";
-  version = "1.7.1";
+  name = "ocaml${ocaml.version}-re-${version}";
+  version = "1.7.3";
 
   src = fetchzip {
     url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz";
-    sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw";
+    sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ounit ];
+  buildInputs = [ ocaml findlib jbuilder ounit ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out"
-  + stdenv.lib.optionalString doCheck " --enable-tests";
-  buildPhase = "ocaml setup.ml -build";
-  doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06";
-  checkPhase = "ocaml setup.ml -test";
-  installPhase = "ocaml setup.ml -install";
+  doCheck = true;
+  checkPhase = "jbuilder runtest";
 
-  createFindlibDestdir = true;
+  inherit (jbuilder) installPhase;
 
   meta = {
     homepage = https://github.com/ocaml/ocaml-re;
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 39f82772ffce1..1e031b135d29e 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -6,6 +6,10 @@ with stdenv.lib;
 
 let withLwt = lwt != null; in
 
+if !versionAtLeast ocaml.version "4.04"
+then throw "tls is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
   version = "0.9.0";
   name = "ocaml${ocaml.version}-tls-${version}";
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index 5059ef24aa325..c846cca1282f4 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ocaml, findlib, jbuilder, ppx_sexp_conv, ounit
-, ppx_deriving, re, sexplib, stringext
+, re, sexplib, stringext
 }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar -xjf $curSrc";
 
-  buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ounit ];
-  propagatedBuildInputs = [ ppx_deriving re sexplib stringext ];
+  buildInputs = [ ocaml findlib jbuilder ounit ];
+  propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ];
 
   buildPhase = "jbuilder build";
 
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 0d25b3785fc82..4c5d1edcb09fa 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -1,29 +1,30 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml
-, js_of_ocaml-camlp4, camlp4, re }:
+{ stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml
+, js_of_ocaml-ppx, re }:
 
 if stdenv.lib.versionOlder ocaml.version "4.03"
 then throw "xtmpl not supported for ocaml ${ocaml.version}"
 else
 stdenv.mkDerivation rec {
-  name = "xtmpl-${version}";
-  version = "0.16.0";
-  src = fetchFromGitHub {
+  name = "ocaml${ocaml.version}-xtmpl-${version}";
+  version = "0.17.0";
+  src = fetchFromGitLab {
+    domain = "framagit.org";
     owner = "zoggy";
     repo = "xtmpl";
     rev = version;
-    sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k";
+    sha256 = "1hq6y4rhz958q40145k4av8hx8jyvspg78xf741samd7vc3jd221";
   };
 
-  buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-camlp4 camlp4 ];
-  propagatedBuildInputs = [ sedlex uutf re ];
+  buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ];
+  propagatedBuildInputs = [ iri re ];
 
   createFindlibDestdir = true;
 
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    description = "Xml template library for OCaml";
-    homepage = https://zoggy.github.io/xtmpl/;
+    description = "XML templating library for OCaml";
+    homepage = "https://www.good-eris.net/xtmpl/";
     license = licenses.lgpl3;
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index 5dc6a9056ada4..e5d9549705892 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -5,9 +5,9 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12.1";
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02"
   then {
-    version = "1.4.1";
-    url = http://forge.ocamlcore.org/frs/download.php/1574/zarith-1.4.1.tgz;
-    sha256 = "0l36hzmfbvdai2kcgynh13vfdim5x2grnaw61fxqalyjm90c3di3";
+    version = "1.7";
+    url = https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz;
+    sha256 = "0fmblap5nsbqq0dab63d6b7lsxpc3snkgz7jfldi2qa4s1kbnhfn";
   } else {
     version = "1.3";
     url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
diff --git a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
index 5a1c6746e6035..af7dc0db7e513 100644
--- a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
+++ b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
@@ -2,21 +2,10 @@ diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Serve
 index 670bd74..7b3bd2e 100644
 --- a/lib/CatalystX/Script/Server/Starman.pm
 +++ b/lib/CatalystX/Script/Server/Starman.pm
-@@ -9,7 +9,7 @@ our $VERSION = '0.02';
+@@ -9,5 +9,5 @@ our $VERSION = '0.02';
  
  extends 'Catalyst::Script::Server';
  
 -has '+fork' => ( default => 1, init_arg => undef );
 +has '+fork' => ( default => 1 );
  
- has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' );
- 
-@@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman
- 
-        -d --debug           force debug mode
-        -f --fork            handle each request in a new process
--                            (defaults to false)
-+                            (defaults to true)
-        -? --help            display this help and exits
-        -h --host            host (defaults to all)
-        -p --port            port (defaults to 3000)
diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
index 119c8b61da364..e9b501c29e265 100644
--- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
+++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
@@ -1,15 +1,31 @@
-diff -ru -x '*~' LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm
---- LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm	2013-04-29 23:16:18.000000000 +0200
-+++ LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm	2016-03-02 14:59:01.639844511 +0100
-@@ -24,6 +24,11 @@
+From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001
+From: Tyson Whitehead <twhitehead@gmail.com>
+Date: Fri, 29 Jun 2018 15:47:00 -0400
+Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order)
+
+---
+ lib/LWP/Protocol/https.pm | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm
+index f7230e2..c78b9ce 100644
+--- a/lib/LWP/Protocol/https.pm
++++ b/lib/LWP/Protocol/https.pm
+@@ -23,6 +23,14 @@ sub _extra_sock_opts
+ 	$ssl_opts{SSL_verify_mode} = 0;
      }
      if ($ssl_opts{SSL_verify_mode}) {
- 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-+	    $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'};
++	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
++	    $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'}
++                if !defined $ssl_opts{SSL_ca_file};
++	    $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}
++                if !defined $ssl_opts{SSL_ca_file};
 +	    $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt"
 +		if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt";
 +	}
-+	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
  	    eval {
  		require Mozilla::CA;
- 	    };
+-- 
+2.14.0
+
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index e6269503a4c4f..b995e0e2540af 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs:
+{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs:
 
 let
-  i686    = callPackage_i686 ./vms.nix {};
+  i686    = pkgsi686Linux.callPackage ./vms.nix {};
   native  = callPackage ./vms.nix {};
 in
 
@@ -11,5 +11,3 @@ rec {
   spur64 = if stdenv.is64bit then native.spur else "none";
   multi-vm-wrapper  = callPackage ../wrapper { inherit cog32 spur32 spur64; };
 }
-
-
diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
index 9efcbbfa7d312..4e6c0f9214c2d 100644
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "3to2";
   version = "1.1.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 8af07ece6873c..5e108cd7dcf7f 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -21,7 +21,6 @@
 buildPythonPackage rec {
   pname = "APScheduler";
   version = "3.5.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix
index e9dda44997fb6..23af3a672337d 100644
--- a/pkgs/development/python-modules/Babel/default.nix
+++ b/pkgs/development/python-modules/Babel/default.nix
@@ -1,17 +1,21 @@
-{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun }:
+{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "Babel";
-  version = "2.5.3";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14";
+    sha256 = "8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23";
   };
 
   propagatedBuildInputs = [ pytz ];
 
-  checkInputs = [ pytest freezegun ];
+  checkInputs = [ pytest freezegun glibcLocales ];
+
+  preCheck = ''
+    export LC_ALL="en_US.UTF-8"
+  '';
 
   meta = with lib; {
     homepage = http://babel.edgewall.org;
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 88709949aee4c..124e8b80ba024 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -9,6 +9,7 @@
 , gdb
 , numpy
 , ncurses
+, fetchpatch
 }:
 
 let
@@ -25,11 +26,11 @@ let
 
 in buildPythonPackage rec {
   pname = "Cython";
-  version = "0.28.2";
+  version = "0.28.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a";
+    sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526";
   };
 
   nativeBuildInputs = [
@@ -43,11 +44,20 @@ in buildPythonPackage rec {
 
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP"
-    ${python.interpreter} runtests.py \
+    ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \
       ${stdenv.lib.optionalString (builtins.length excludedTests != 0)
         ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';
 
+  patches = [
+    # The following is in GitHub in 0.28.3 but not in the `sdist`.
+    # https://github.com/cython/cython/issues/2319
+    (fetchpatch {
+      url = https://github.com/cython/cython/commit/c485b1b77264c3c75d090a3c526de24966830d42.patch;
+      sha256 = "1p6jj9rb097kqvhs5j5127sj5zy18l7x9v0p478cjyzh41khh9r0";
+    })
+  ];
+
   meta = {
     description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
     homepage = http://cython.org;
diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 5518dc382a8b9..55b059cd7fa29 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -8,12 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-PyMongo";
-  name = "${pname}-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d";
+    sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix
index cd9d8ee46d8af..72086a3487f34 100644
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "FormEncode";
   version = "1.3.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix
index 0bacd8edb312a..4f0a7d4aebc26 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/GeoIP/default.nix
@@ -3,7 +3,6 @@
 , geoip, nose}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "GeoIP";
   version = "1.3.2";
 
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index c2f3706923a3f..89b941c34fc22 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, gitdb2, mock, nose, ddt }:
+{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }:
 
 buildPythonPackage rec {
   version = "2.1.9";
@@ -12,6 +12,10 @@ buildPythonPackage rec {
   checkInputs = [ mock nose ddt ];
   propagatedBuildInputs = [ gitdb2 ];
 
+  postPatch = ''
+    sed -i "s|^refresh()$|refresh(path='${git}/bin/git')|" git/__init__.py
+  '';
+
   # Tests require a git repo
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix
index f9ce1fa026fe2..a666cad1fc6db 100644
--- a/pkgs/development/python-modules/Pmw/default.nix
+++ b/pkgs/development/python-modules/Pmw/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "Pmw";
   version = "2.0.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index 61964eb7b0603..29a792000e995 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -21,7 +21,6 @@ in
 buildPythonPackage rec {
   pname = "PyLD";
   version = "0.7.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "digitalbazaar";
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
index 8ab846986f06f..d05bd081e0dbf 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "Pygments";
   version = "2.2.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix
index 41b92683b07a4..ac19a7e7063c8 100644
--- a/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/pkgs/development/python-modules/ROPGadget/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "ROPGadget";
   version = "5.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 9eb04782d6f89..30c820ec6c19d 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -40,15 +40,14 @@ let
   libgpuarray_ = libgpuarray.override { inherit cudaSupport; };
 
 in buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Theano";
-  version = "1.0.1";
+  version = "1.0.2";
 
   disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662";
+    sha256 = "6768e003d328a17011e6fca9126fbb8a6ffd3bb13cb21c450f3e724cca29abde";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index bc0472bc00533..0c4197f3b3d85 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -16,7 +16,6 @@ let
 in buildPythonPackage rec {
   pname = "Wand";
   version = "0.4.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index d8209b2339773..be5ad2a5c1c57 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -1,13 +1,12 @@
 {lib, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "XlsxWriter";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ad947fd9e8edfb64f25e0ccfb161e109f279e5a5520b3dd22ddc03b7f8220887";
+    sha256 = "bd4661c04a68621cb2ebc07c38b8b2e98e30bf213a16e1cf3675b61e26ca9bf2";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix
index 120d17e6709b1..0ee617a1be6d5 100644
--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "aafigure";
   version = "0.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 8e3f3939b363c..1cb5275a6c326 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.1.13";
+  version = "0.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d160f7dc39f2f05ddc0bbf3a7bea4cc659fedc45fd9042e87346b24fe1cd00bb";
+    sha256 = "e0eb8358b549552b1cc5972350bc3e41dd0a926c15b3ff95ce60f3c78c80824c";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix
index 9558febec735d..759ed2086fce4 100644
--- a/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/pkgs/development/python-modules/acme-tiny/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "acme-tiny";
   version = "2016-03-26";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";
diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index ccf56c208f238..cd81a7facc227 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -18,7 +18,6 @@ buildPythonPackage rec {
   inherit (certbot) src version;
 
   pname = "acme";
-  name = "${pname}-${version}";
 
   propagatedBuildInputs = [
     cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
index 9d7b1148146cf..114414e9c3457 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "acoustics";
   version = "0.1.2";
-  name = "${pname}-${version}";
 
   buildInputs = [ cython pytest ];
   propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];
diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix
index 36d49ad29af90..2172aa1165a6e 100644
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "actdiag";
   version = "0.5.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 0ba846bb0f6e6..2f4c020eb9748 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,12 +3,11 @@
 
 buildPythonPackage rec {
   pname = "adal";
-  version = "0.5.1";
-  name = "${pname}-${version}";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dd3ecb2dfb2de9393320d0ed4e6115ed07a6984a28e18adf46499b91d3c3a494";
+    sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393";
   };
 
   propagatedBuildInputs =  [ requests pyjwt dateutil ];
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 63db18e844e0d..5962b309ee5c1 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "aenum";
   version = "2.1.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
index 11409a11778fa..ea3f26cd3155b 100644
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "agate-dbf";
     version = "0.2.0";
 
diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix
index b39df3959fae9..24287039abdce 100644
--- a/pkgs/development/python-modules/agate-excel/default.nix
+++ b/pkgs/development/python-modules/agate-excel/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "agate-excel";
     version = "0.2.2";
 
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index 34de9ea06e9c6..9d89433f1b90c 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "agate-sql";
     version = "0.5.3";
 
diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
index 8e480d4a3dfdc..b0992141faa06 100644
--- a/pkgs/development/python-modules/agate/default.nix
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -1,27 +1,37 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k,
-  discid, six, parsedatetime, isodate, Babel, pytimeparse,
-  leather, python-slugify }:
+{ lib, fetchFromGitHub, buildPythonPackage, isPy3k
+, six, pytimeparse, parsedatetime, Babel
+, isodate, python-slugify, leather
+, glibcLocales, nose, lxml, cssselect, unittest2 }:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "agate";
-    version = "1.6.1";
+  pname = "agate";
+  version = "1.6.1";
 
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3";
-    };
+  # PyPI tarball does not include all test files
+  # https://github.com/wireservice/agate/pull/716
+  src = fetchFromGitHub {
+    owner = "wireservice";
+    repo = pname;
+    rev = version;
+    sha256 = "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl";
+  };
 
-    propagatedBuildInputs = [ discid six parsedatetime
-         isodate Babel pytimeparse leather python-slugify ];
+  propagatedBuildInputs = [
+    six pytimeparse parsedatetime Babel
+    isodate python-slugify leather
+  ];
 
-    doCheck = !isPy3k;
-    # (only) on python3 unittest loader (loadTestsFromModule) fails
+  checkInputs = [ glibcLocales nose lxml cssselect ]
+    ++ lib.optional (!isPy3k) unittest2;
 
-    meta = with stdenv.lib; {
-      description = "A Python data analysis library that is optimized for humans instead of machines";
-      homepage    = https://github.com/wireservice/agate;
-      license     = with licenses; [ mit ];
-      maintainers = with maintainers; [ vrthra ];
-    };
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests tests
+  '';
+
+  meta = with lib; {
+    description = "A Python data analysis library that is optimized for humans instead of machines";
+    homepage    = https://github.com/wireservice/agate;
+    license     = with licenses; [ mit ];
+    maintainers = with maintainers; [ vrthra ];
+  };
 }
diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix
index 10a1d8991576b..e1130ccd6935f 100644
--- a/pkgs/development/python-modules/aioamqp/default.nix
+++ b/pkgs/development/python-modules/aioamqp/default.nix
@@ -4,8 +4,7 @@
 
 buildPythonPackage rec {
   pname = "aioamqp";
-  name = "${pname}-${version}";
-  version = "0.10.0";
+  version = "0.11.0";
 
   meta = {
     homepage = https://github.com/polyconseil/aioamqp;
@@ -15,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0132921yy31ijb8w439zcz1gla4hiws4hx8zf6la4hjr01nsy666";
+    sha256 = "7f1eb9e0f1b7c7e21a3a6ca498c3daafdfc3e95b4a1a0633fd8d6ba2dfcab777";
   };
 
   buildInputs = lib.optionals isPy33 [ asyncio ];
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index b865b5654964a..49d0bc6c63774 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,11 +10,11 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y";
+    sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 37d75fd45c0fe..50e70d87f9f59 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "aiodns";
   version = "1.1.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
index d0808a1cc3105..572c18171d137 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "aiofiles";
   version = "0.3.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 4865901713a32..f0756e1572e72 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-jinja2";
-  version = "0.17.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8139c63fe989e140dceae378440680258dfb72f3301c79173945245299d795e6";
+    sha256 = "df1ba60b8779d232a23e5e38589b85f6430e9ace5adce546353155349bdea023";
   };
 
   propagatedBuildInputs = [ aiohttp jinja2 ];
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 947f4341e6df3..ec76d840a56ba 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -12,24 +12,30 @@
 , gunicorn
 , pytest-mock
 , async_generator
+, pytestrunner
+, pytest-timeout
 }:
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.1.3";
+  version = "3.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad";
+    sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12";
   };
 
   disabled = pythonOlder "3.5";
 
-  checkInputs = [ pytest gunicorn pytest-mock async_generator ];
+  checkInputs = [ pytest gunicorn pytest-mock async_generator pytestrunner pytest-timeout ];
 
   propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optional (pythonOlder "3.7") idna-ssl;
 
+
+  # Several test failures. Need to be looked into.
+  doCheck = false;
+
   meta = with lib; {
     description = "Asynchronous HTTP Client/Server for Python and asyncio";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 0211fef16060e..2ad260f5d4069 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "aiohue";
-  version = "1.3.1";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05b2fj8pzbij8hglx6p5ckfx0h1b7wcfpys306l853vp56d882yh";
+    sha256 = "87f0f86865e88ea715ab358b1e5f2838b79ee7cdc0bdf762e9ed60aaf4c8bd4a";
   };
 
   propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix
index d335cbc556cb8..5940126939366 100644
--- a/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/pkgs/development/python-modules/aioimaplib/default.nix
@@ -1,21 +1,24 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils }:
+, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }:
 
 buildPythonPackage rec {
   pname = "aioimaplib";
-  version = "0.7.13";
+  version = "0.7.14";
 
   # PyPI tarball doesn't ship tests
   src = fetchFromGitHub {
     owner = "bamthomas";
     repo = pname;
     rev = version;
-    sha256 = "19yhk4ixfw46d0bvx6a40r23nvia5a83dzn5rzwaq1wdjr186bbn";
+    sha256 = "150v3czh53sqakfqgjyj1w39mdfcxmpnrk2pbmq63jkq7r6njl0l";
   };
 
-  disbaled = pythonOlder "3.4";
+  disabled = pythonOlder "3.4";
 
-  checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils ];
+  checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ];
+
+  # https://github.com/bamthomas/aioimaplib/issues/35
+  doCheck = false;
 
   meta = with lib; {
     description = "Python asyncio IMAP4rev1 client library";
diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix
index fcd9a09780059..a2a35f852a3d6 100644
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -3,12 +3,11 @@
 
 buildPythonPackage rec {
   pname = "alabaster";
-  version = "0.7.10";
-  name = "${pname}-${version}";
+  version = "0.7.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0";
+    sha256 = "b63b1f4dc77c074d386752ec4a8a7517600f6c0db8cd42980cae17ab7b3275d7";
   };
 
   propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 503ce5da4b522..7becf1cffc413 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -4,13 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "85bd3ea7633024e4930900bc64fb58f9742dedbc6ebb6ecf25be2ea9a3c1b32e";
+    sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index d98eba693d23a..274fa0fbbf273 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "1.2.1";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7";
+    sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index fa5b27a4ced89..fc984d40cc617 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine, pytest-sugar }:
 
 buildPythonPackage rec {
   pname = "amqp";
-  version = "2.2.2";
+  version = "2.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cba1ace9d4ff6049b190d8b7991f9c1006b443a5238021aca96dd6ad2ac9da22";
+    sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb";
   };
 
-  buildInputs = [ pytest case ];
+  checkInputs = [ pytest case pytest-sugar ];
   propagatedBuildInputs = [ vine ];
 
+  # Disable because pytest-sugar requires an old version of pytest
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/celery/py-amqp;
     description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
index 1f539ef6d3955..37f1e395d8dee 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "amqplib";
   version = "0.6.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz;
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index 6e596172d9e78..b8ee673e66bb9 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -3,8 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "3.0.0";
-  name = "${pname}-${version}";
+  version = "3.0.2";
 
   meta = with stdenv.lib; {
     description = "Parses ISO 8601 strings.";
@@ -16,6 +15,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7cf068e7aec00edeb21879c2bbda048656c34d281e133a77425be03b352122d8";
+    sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802";
   };
 }
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
index 26b182dfc08a0..5960e7b41334c 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "ansicolor";
   version = "0.2.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix
new file mode 100644
index 0000000000000..08f93134b325b
--- /dev/null
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
+
+buildPythonPackage rec {
+  pname = "ansiconv";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
+  };  
+
+  checkInputs = [ pytest ];
+
+  meta = with stdenv.lib; {
+    description = "A module for converting ANSI coded text and converts it to either plain text or HTML";
+    homepage = https://github.com/ansible/ansiconv;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+
+}
+
diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 84f2859d50c03..8f46a6f0b0f0b 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
+  pname = "antlr4-python3-runtime";
   version = "4.7.1";
-  name = "antlr4-python3-runtime-${version}";
   disabled = !isPy3k;
 
-  src = fetchurl {
-    url = "mirror://pypi/a/antlr4-python3-runtime/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv";
   };
 
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index f2e07eba0c461..213bc4f1eb917 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "apipkg";
   version = "1.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix
index 866c91f7c684c..8716f007b87a1 100644
--- a/pkgs/development/python-modules/appdirs/default.nix
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "appdirs";
   version = "1.4.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
index 1f0b95d878539..808ddc57096d2 100644
--- a/pkgs/development/python-modules/area53/default.nix
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "Area53";
   version = "0.94";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index b13470b4c45b8..28b88d3b46a0e 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -2,7 +2,6 @@
   coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
 }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "argcomplete";
   version = "1.9.4";
 
diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
index cf7dea6cca751..943f129031e9e 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "args";
   version = "0.1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 62b176fb59c68..fd89457ed310b 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "asana";
   version = "0.7.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "asana";
diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix
index 5f512fcd6f8bb..2b627fe80ff1a 100644
--- a/pkgs/development/python-modules/asn1crypto/default.nix
+++ b/pkgs/development/python-modules/asn1crypto/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "asn1crypto";
   version = "0.24.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
index 9fb92b860a158..381a4a7331461 100644
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "astor";
   version = "0.6.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 91b98d8b6ac06..a7e7931d9d928 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -4,13 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "astroid";
-  version = "1.6.3";
+  version = "1.6.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2";
+    sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
   };
 
   propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 0dcd5dfca3642..4901b798955f3 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "3.0.2";
+  version = "3.0.3";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22e682904a3b8884595addfb743cf1a3ecf2b539c6616d98f8426208d822d84a";
+    sha256 = "6af07abe5e263820a3dec93832a6ad74005013071490e125afbc6514411721da";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
new file mode 100644
index 0000000000000..4c46f93b547c8
--- /dev/null
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname = "astunparse";
+  version =  "1.5.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kc9lm2jvfcip3z8snj04dar5a9jh857a704m6lvcv4xclm3rpsm";
+  };
+  propagatedBuildInputs = [ six ];
+  doCheck = false; # no tests
+  meta = with stdenv.lib; {
+    description = "This is a factored out version of unparse found in the Python source distribution";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jyp ];
+  };
+}
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index 5f9318aa5c213..bc8e375271d6a 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "async-timeout";
-  version = "2.0.1";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0";
+    sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287";
   };
 
   # Circular dependency on aiohttp
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index d5ab50dc9046b..6308b1a170fbf 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "1.13.0";
+  version = "1.13.2";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n75z4dvhzymd4n610dpwlq7wl8cyz1gxx9m7iq92pzhss5vgpfd";
+    sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb";
   };
 
   propagatedBuildInputs = [ 
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index a0f408764a0d8..0004badd6f402 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -2,16 +2,13 @@
 
 buildPythonPackage rec {
   pname = "asynctest";
-  version = "0.12.0";
+  version = "0.12.2";
 
   disabled = pythonOlder "3.4";
 
-  # PyPI tarball doesn't ship test/__init__.py
-  src = fetchFromGitHub {
-    owner = "Martiusweb";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0rcb3kz2m0iwvgxpx2avfz9cqsd9xbaq93zykr2fki3ikmnp3vyg";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "77520850ae21620ec31738f4a7b467acaa44de6d3752d8ac7a9f4dcf55d77853";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index 8ef2b5989f450..c443d17e06672 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "attrs";
-  version = "17.4.0";
+  version = "18.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9";
+    sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b";
   };
 
   # macOS needs clang for testing
diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
index 88fdcbbeba178..d4c485e909ca3 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -5,12 +5,11 @@
 
 buildPythonPackage rec {
   pname = "audioread";
-  name = "${pname}-${version}";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "36c3b118f097c58ba073b7d040c4319eff200756f094295677567e256282d0d7";
+    sha256 = "b0b9270c20833a75ce0d167fb2fdad52ddcd8e8f300be8afad3ac9715850bc50";
   };
 
   # No tests, need to disable or py3k breaks
diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix
new file mode 100644
index 0000000000000..b5aad787dfbf4
--- /dev/null
+++ b/pkgs/development/python-modules/authres/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage, python }:
+
+buildPythonPackage rec {
+  pname = "authres";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mcllhrwr23hwa2jn3m15k29ks1205ymwafjzchh8ma664hnzv6v";
+  };
+
+  checkPhase = ''
+    # run doctests
+    ${python.interpreter} -m authres
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Email Authentication-Results Headers generation and parsing for Python/Python3";
+    longDescription = ''
+      Python module that implements various internet RFC's: 5451/7001/7601
+      Authentication-Results Headers generation and parsing for
+      Python/Python3.
+    '';
+    homepage = https://launchpad.net/authres;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index a48ab10474ed4..30479ce8266a1 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy3k, isPy33,
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
   unittest2, mock, pytest, trollius, asyncio,
   pytest-asyncio, futures,
   six, twisted, txaio, zope_interface
 }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "autobahn";
-  version = "18.3.1";
+  version = "18.6.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "fc1d38227bb44a453b54cffa48de8b2e6ce48ddc5e97fb5950b0faa27576f385";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which
@@ -22,7 +21,7 @@ buildPythonPackage rec {
     (stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
 
   checkPhase = ''
-    py.test $out
+    USE_TWISTED=true py.test $out
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index e4f3e061dd4e3..808eba12bb6fb 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   m2r, setuptools_scm, six, attrs }:
+
 buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.7.0";
   pname = "Automat";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/A/Automat/${name}.tar.gz";
-    sha256 = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e";
   };
 
   buildInputs = [ m2r setuptools_scm ];
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 90d57b6c89d77..2af098692988e 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "autopep8";
   version = "1.3.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
new file mode 100644
index 0000000000000..d7bdd143b6972
--- /dev/null
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, boto3
+, enum34
+, jsonschema
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "aws-sam-translator";
+  version = "1.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb";
+  };
+
+  # Tests are not included in the PyPI package
+  doCheck = false;
+
+  disabled = isPy3k;
+
+  propagatedBuildInputs = [
+    boto3
+    enum34
+    jsonschema
+    six
+  ];
+
+  meta = {
+    homepage = https://github.com/awslabs/serverless-application-model;
+    description = "Python library to transform SAM templates into AWS CloudFormation templates";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.andreabedini ];
+  };
+}
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 972b8f847bf27..9dbd20cd6eef7 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "aws-xray-sdk";
-  version = "0.97";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "43eca57bb48b718ea58968608cfd22f4b9c62c2d904bb08aa2f8afe56eeb9de4";
+    sha256 = "13470b95a2f55036a5d7b6642250d8f3a519a6c454cd91f55778b1bb4bf5b89d";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix
index 479792a7ca593..322f9c6d793f8 100644
--- a/pkgs/development/python-modules/backports_csv/default.nix
+++ b/pkgs/development/python-modules/backports_csv/default.nix
@@ -3,12 +3,11 @@
 buildPythonPackage rec {
 
   pname = "backports.csv";
-  version = "1.0.5";
-  name = "${pname}-${version}";
+  version = "1.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc";
+    sha256 = "bed884eeb967c8d6f517dfcf672914324180f1e9ceeb0376fde2c4c32fd7008d";
   };
 
   propagatedBuildInputs = [ future ];
diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 7f4faa8a8b471..3cd37617a3935 100644
--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -1,26 +1,35 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , pythonOlder
 }:
 
 if !(pythonOlder "3.3") then null else buildPythonPackage rec {
   pname = "backports.shutil_get_terminal_size";
-  version = "1.0.0";
+  version = "unstable-2016-02-21";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80";
+  # there have been numerous fixes commited since the initial release.
+  # Most notably fixing a problem where the backport would always return
+  # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5.
+  # Unfortunately the maintainer seems inactive and has not responded to
+  # a request for a new release since 2016:
+  # https://github.com/chrippa/backports.shutil_get_terminal_size/issues/7
+  src = fetchFromGitHub {
+    owner = "chrippa";
+    repo = "backports.shutil_get_terminal_size";
+    rev = "159e269450dbf37c3a837f6ea7e628d59acbb96a";
+    sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg";
   };
 
   checkInputs = [
     pytest
   ];
 
-  meta = {
+  meta = with lib; {
     description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
     homepage = https://github.com/chrippa/backports.shutil_get_terminal_size;
-    license = with lib.licenses; [ mit ];
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ timokau ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix
index 5a04b6afd678a..c2dbb0e6fa808 100644
--- a/pkgs/development/python-modules/backports_tempfile/default.nix
+++ b/pkgs/development/python-modules/backports_tempfile/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "backports.tempfile";
   version = "1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix
index e64f51fe7ca1b..2125390d6715c 100644
--- a/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "backports.unittest_mock";
   version = "1.3";
 
diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix
index 6ad69b80b6d1d..8b818398ec9eb 100644
--- a/pkgs/development/python-modules/backports_weakref/default.nix
+++ b/pkgs/development/python-modules/backports_weakref/default.nix
@@ -7,7 +7,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "backports.weakref";
   version = "1.0.post1";
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index 2e85a1017b6e6..d14bf02cabf34 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "bap";
   version = "1.3.1";
-  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix
index 99c3346a4fbe9..191f034267460 100644
--- a/pkgs/development/python-modules/bash_kernel/default.nix
+++ b/pkgs/development/python-modules/bash_kernel/default.nix
@@ -11,7 +11,6 @@
 buildPythonPackage rec {
   pname = "bash_kernel";
   version = "0.7.1";
-  name = "${pname}-${version}";
   format = "flit";
   disabled = isPy27;
 
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index 83bb106319585..ff4b7fcb5317b 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "bayespy";
   version = "0.5.17";
-  name = "${pname}-${version}";
 
   # Python 2 not supported and not some old Python 3 because MPL doesn't support
   # them properly.
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index 72800d2f6c29a..ca22fab575cad 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchurl
+{ stdenv, buildPythonPackage, isPyPy, fetchPypi
 , cffi, pycparser, mock, pytest, py, six }:
 
 with stdenv.lib;
@@ -6,10 +6,9 @@ with stdenv.lib;
 buildPythonPackage rec {
   version = "3.1.4";
   pname = "bcrypt";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d";
   };
   buildInputs = [ pycparser mock pytest py ];
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 2991ae9be82f4..195a1ccad766b 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, bottle, chardet, dateutil
 , google_api_python_client, lxml, ply, python_magic
-, nose }:
+, nose, requests }:
 
 buildPythonPackage rec {
-  version = "2.0.0";
+  version = "2.1.2";
   pname = "beancount";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42";
+    sha256 = "d0d5f7088cb6b699cc4d030dad42d20b8228232cdb445bb1330d4ef5e3581f52";
   };
 
   checkInputs = [ nose ];
@@ -31,6 +31,7 @@ buildPythonPackage rec {
     lxml
     ply
     python_magic
+    requests
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index fd8bddee14b65..6ae838265b18c 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "beautifulsoup4";
   version = "4.6.0";
 
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 722117ba6e835..a4a7b63b8a3f0 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -7,7 +7,6 @@
 buildPythonApplication rec {
   pname = "behave";
   version = "1.2.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index 8f99c0d75d34c..8229c1edce8a4 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/pkgs/development/python-modules/biopython/default.nix
@@ -25,8 +25,8 @@ buildPythonPackage rec {
       applications which address the needs of current and future work in
       bioinformatics.
     '';
-    homepage = http://biopython.org/wiki/Documentation;
+    homepage = https://biopython.org/wiki/Documentation;
     maintainers = with lib.maintainers; [ luispedro ];
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix
index 9226fa1c5bf09..d9ddc84264263 100644
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "bitcoin-price-api";
   version = "0.0.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix
index b012fd24aa012..dd85789c59e04 100644
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/bitcoinlib/default.nix
@@ -4,7 +4,6 @@ let ext = if stdenv.isDarwin then "dylib" else "so";
 in buildPythonPackage rec {
   pname = "bitcoinlib";
   version = "0.9.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "petertodd";
diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix
index f6c56646dcb90..8e54e3bbde725 100644
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "bitstring";
   version = "3.1.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix
index f09a271faad15..270015a423ba3 100644
--- a/pkgs/development/python-modules/bkcharts/default.nix
+++ b/pkgs/development/python-modules/bkcharts/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "bkcharts";
   version = "0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit version pname;
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index d3ea1f151d34f..784de33e7ade1 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -2,13 +2,12 @@
 , glibcLocales }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "blessed";
-  version = "1.14.2";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fv9f0074kxy1849h0kwwxw12sifpq3bv63pcz900zzjsigi4hi3";
+    sha256 = "777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21";
   };
 
   checkInputs = [ pytest mock glibcLocales ];
diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix
index 5dd9d10961bb0..d1eef11869a8a 100644
--- a/pkgs/development/python-modules/blinker/default.nix
+++ b/pkgs/development/python-modules/blinker/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://pythonhosted.org/blinker/;
+    homepage = https://pythonhosted.org/blinker/;
     description = "Fast, simple object-to-object and broadcast signaling";
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index b73bcfe8185dd..9d2485711d0cc 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -8,13 +8,12 @@ let
   cryptsetupWithPython = cryptsetup.override pyenable;
 in buildPythonPackage rec {
   pname = "blivet";
-  name = "${pname}-${version}";
   version = "0.67";
 
   src = fetchFromGitHub {
     owner = "dwlehman";
     repo = "blivet";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky";
   };
 
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 85653daaa40a1..4855a07a479b5 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "0.12.15";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2891b883b30107dc610a7e963a21222f1fd096844d157c09db115179cfab6513";
+    sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6";
   };
 
   disabled = isPyPy;
@@ -75,7 +75,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Statistical and novel interactive HTML plots for Python";
-    homepage = "http://github.com/bokeh/bokeh";
+    homepage = https://github.com/bokeh/bokeh;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ orivej ];
   };
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 250703cbc53b6..240dd5513e85c 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -3,15 +3,15 @@
 let
   wheel_source = fetchPypi {
     pname = "wheel";
-    version = "0.31.0";
+    version = "0.31.1";
     format = "wheel";
-    sha256 = "9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107";
+    sha256 = "80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f";
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";
-    version = "39.0.1";
+    version = "39.2.0";
     format = "wheel";
-    sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8";
+    sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926";
   };
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 042ad9cf79323..dca7844dec9c5 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.7.9";
+  version = "1.7.57";
 
   src = fetchFromGitHub {
     owner = "boto";
     repo  = "boto3";
     rev   = version;
-    sha256 = "0yqym19nlayjm1qlh6vvinmk5xw0zskil971n2v9s65ray7sn5lv";
+    sha256 = "0rp3vclx7mvfl6isa47m7dzlrf33qb9vj53p0gj4cw3mgl14cnbl";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index cd9c5729611ca..70a5af97fdaa4 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -10,13 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.10.9";
+  version = "1.10.57";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19vlf2w05h9818hrhx8al4r9ngfhvhf2pxcwka9s7bc51qnhx4xh";
+    sha256 = "0mif7c12643hac6zxq89gv0wjf4r3vqlmm01bm68psljaj40jnpi";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index 886433a358ae9..fc8dc784d029b 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -8,12 +8,11 @@
 
 buildPythonPackage rec {
   pname = "branca";
-  version = "0.2.0";
-  name = "${pname}-${version}";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "327b0bae73a519f25dc2f320d8d9f1885aad2e8e5105add1496269d5391b8ea4";
+    sha256 = "bea38396cf58fd7173ac942277fe4138127eb1546622684206cb34d344b03fb4";
   };
 
   checkInputs = [ pytest selenium ];
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 1397dc6876fad..a76b7b2611bdd 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,12 @@
-{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
+{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.7.3";
+  version = "4.9.1";
   pname = "breathe";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/b/breathe/${name}.tar.gz";
-    sha256 = "d0b0e029daba6c3889d15d6c2dd4b0e9d468dc631d41021d0576c1b0dabee302";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
index cd419039f3396..5a9bae58bd6d4 100644
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "browsermob-proxy";
   version = "0.8.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 8af103cb999d2..c031c872da35c 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }:
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, persistent
+, zope_interface
+, transaction
+, zope_testrunner
+}:
 
 buildPythonPackage rec {
   pname = "BTrees";
-  version = "4.4.1";
-  name = "${pname}-${version}";
+  version = "4.5.0";
 
   buildInputs = [ transaction ];
   propagatedBuildInputs = [ persistent zope_interface ];
+  checkInputs = [ zope_testrunner ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a2738b71693971c1f7502888d649bef270c65f026db731e03d53f1ec4edfe8a3";
+    sha256 = "46b02cb69b26a5238db771ea1955b503df73ecf254bb8063af4c61999fc75b5c";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 95b0f8dddc55a..91b310a217903 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,13 +1,12 @@
-{ fetchurl, stdenv, buildPythonPackage }:
+{ fetchPypi, stdenv, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.11.3";
-  name = "${pname}-nix-${version}";
+  version = "2.11.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "f7fde2cde7b937f67e52a3e94b76f9294b73c1e9bb698430e96778f3f735544c";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 51d3d9e6833e6..3f6b2ed3ccd09 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "bumps";
-  version = "0.7.6";
+  version = "0.7.8";
 
   propagatedBuildInputs = [six];
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k";
+    sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix
index 7abbc6cdbb0f0..3bc9882585f63 100644
--- a/pkgs/development/python-modules/bz2file/default.nix
+++ b/pkgs/development/python-modules/bz2file/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "bz2file";
   version = "0.98";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix
index 6daa735cfaed2..05f3afe758a68 100644
--- a/pkgs/development/python-modules/cachetools/1.nix
+++ b/pkgs/development/python-modules/cachetools/1.nix
@@ -1,14 +1,13 @@
 { stdenv, buildPythonPackage, fetchPypi, isPyPy }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "cachetools";
-  version = "2.0.1";
+  version = "2.1.0";
   disabled = isPyPy;  # a test fails
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d";
+    sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index fe69768c976a1..de15ffaabc693 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -1,13 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, isPyPy }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "cachetools";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pdw2fr29pxlyn1g5fhdrrqbpn0iw062nv716ngdqvdx7hnizq7d";
+    sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix
index b7fd01472aabc..7457002929aa3 100644
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "canonicaljson";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6";
+    sha256 = "45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
index c5d643da79d54..9751dcd2f3ed5 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "CCColUtils";
   version = "1.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 7f3fb46d1e106..71911da08f43b 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -1,14 +1,21 @@
-{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect,
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, iana-etc, libredirect,
   pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
 }:
 
 buildPythonPackage rec {
   pname = "celery";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp";
+    sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f";
+  };
+
+  # Skip test_RedisBackend.test_timeouts_in_url_coerced
+  # See https://github.com/celery/celery/pull/4847
+  patches = fetchpatch {
+    url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch;
+    sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq";
   };
 
   # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix
index 12536584f0517..4c34217502181 100644
--- a/pkgs/development/python-modules/cerberus/default.nix
+++ b/pkgs/development/python-modules/cerberus/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Cerberus";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a5b39090fde3ec3294c9d7030b8eda935b42222160a66a922e0c8aea34cabfdf";
+    sha256 = "f5c2e048fb15ecb3c088d192164316093fcfa602a74b3386eefb2983aa7e800a";
   };
 
   checkInputs = [ pytestrunner pytest ];
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index d36f0f308d331..3bc686121cf05 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,12 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2018.1.18";
-  name = "${pname}-${version}";
+  version = "2018.4.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d";
+    sha256 = "13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index cd643806c3a71..7247694227615 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -3,7 +3,6 @@
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
   version = "1.11.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
new file mode 100644
index 0000000000000..0e355723604e4
--- /dev/null
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, coveralls
+, pytestcov
+, cython
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "cftime";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f62fe79ed2ad38f4211477e59f6f045c91278351f4ce7578e33ddf52fb121ea8";
+  };
+
+  checkInputs = [ pytest coveralls pytestcov ];
+  buildInputs = [ cython ];
+  propagatedBuildInputs = [ numpy ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Time-handling functionality from netcdf4-python";
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
index aa4e5e47e728f..16166d2db80ee 100644
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "chai";
   version = "1.1.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index fe1f84aa1bbab..b07a205ba2158 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "chainer";
-  version = "3.5.0";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d72c1f5ff5f4743b141900d5e50aeb8337a213e553a28012dad4a4d2335bbabb";
+    sha256 = "49a4a691708626f742cc6fc949fce6b313e3379bd64886eb19e002b1122cc329";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
index 017088d2e330b..c2815d876e344 100644
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "chainmap";
   version = "1.0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index 46692999a4989..c63fe87dedcd0 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -3,12 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "channels";
-  name = "${pname}-${version}";
-  version = "2.0.2";
+  version = "2.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5d41e0f2aa40f9755f36c2c1dd83748b6793732190d577922e06294a3b37fd92";
+    sha256 = "173441ccf2ac3a93c3b4f86135db301cbe95be58f5815c1e071f2e7154c192a2";
   };
 
   # Files are missing in the distribution
diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix
index c44989ab5b7e6..f004e6d541c5e 100644
--- a/pkgs/development/python-modules/characteristic/default.nix
+++ b/pkgs/development/python-modules/characteristic/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "characteristic";
   version = "14.3.0";
-  name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
     sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380";
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 56c6c551ee7c9..1feec7ed828df 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "check-manifest";
-  version = "0.36";
+  version = "0.37";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2bb906a736a0f026cc5fd6c0dab5a481793b3d7a7d70106cca6e238da5f52d84";
+    sha256 = "44e3cf4b0833a55460046bf7a3600eaadbcae5e9d13baf0c9d9789dd5c2c6452";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 7aa01623b0857..7a7d44339ba4a 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -1,22 +1,30 @@
 { stdenv, fetchPypi, buildPythonPackage
 , more-itertools, six
 , pytest, pytestcov, portend
-, backports_unittest-mock, setuptools_scm }:
+, backports_unittest-mock
+, backports_functools_lru_cache }:
 
 buildPythonPackage rec {
   pname = "cheroot";
-  version = "6.0.0";
+  version = "6.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10s67wxymk4xg45l7ca59n4l6m6rnj8b9l52pg1angxh958lwixs";
+    sha256 = "52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f";
   };
 
   propagatedBuildInputs = [ more-itertools six ];
 
-  buildInputs = [ setuptools_scm ];
+  checkInputs = [ pytest pytestcov portend backports_unittest-mock backports_functools_lru_cache ];
 
-  checkInputs = [ pytest pytestcov portend backports_unittest-mock ];
+# Disable testmon, it needs pytest-testmon, which we do not currently have in nikpkgs,
+# and is only used to skip some tests that are already known to work.
+  postPatch = ''
+    substituteInPlace "./pytest.ini" --replace "--testmon" ""
+    substituteInPlace setup.py --replace "use_scm_version=True" "version=\"${version}\"" \
+  --replace "'setuptools_scm>=1.15.0'," "" \
+  --replace "'setuptools_scm_git_archive>=1.0'," "" \
+  '';
 
   checkPhase = ''
     py.test cheroot
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index bb97a3a7e678e..47aca123998fd 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -2,22 +2,23 @@
 , cheroot, portend, routes, six
 , setuptools_scm
 , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
+, backports_functools_lru_cache, requests_toolbelt
 }:
 
 buildPythonPackage rec {
   pname = "CherryPy";
-  version = "14.0.1";
+  version = "16.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "721d09bbeedaf5b3493e9e644ae9285d776ea7f16b1d4a0a5aaec7c0d22e5074";
+    sha256 = "858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3";
   };
 
   propagatedBuildInputs = [ cheroot portend routes six ];
 
   buildInputs = [ setuptools_scm ];
 
-  checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ];
+  checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ];
 
   checkPhase = ''
     LANG=en_US.UTF-8 pytest
diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix
index b703bce2cc7a1..7e6cc206cdc0b 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/pkgs/development/python-modules/circus/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "circus";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062";
+    sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b";
   };
 
   doCheck = false; # weird error
diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix
index fd5b27d00e4d5..c54b962a8f6cc 100644
--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/pkgs/development/python-modules/cld2-cffi/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "cld2-cffi";
   version = "0.1.4";
 
diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix
index 3ae8537c6c09a..74d64d8390cf7 100644
--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "click-plugins";
   version = "1.0.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index d5dfba61010c4..68a4662d2820b 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }:
 
 buildPythonPackage rec {
   pname = "click";
@@ -9,6 +9,11 @@ buildPythonPackage rec {
     sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
   };
 
+  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll {
+    src = ./fix-paths.patch;
+    locale = "${locale}/bin/locale";
+  });
+
   buildInputs = [ pytest ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/click/fix-paths.patch b/pkgs/development/python-modules/click/fix-paths.patch
new file mode 100644
index 0000000000000..04719871b76c7
--- /dev/null
+++ b/pkgs/development/python-modules/click/fix-paths.patch
@@ -0,0 +1,11 @@
+--- a/click/_unicodefun.py	2018-06-11 15:08:59.369358278 +0200
++++ b/click/_unicodefun.py	2018-06-11 15:09:09.342325998 +0200
+@@ -60,7 +60,7 @@
+     extra = ''
+     if os.name == 'posix':
+         import subprocess
+-        rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE,
++        rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE).communicate()[0]
+         good_locales = set()
+         has_c_utf8 = False
diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix
index 91b289e2ede72..c47a15d64bbc9 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "cligj";
   version = "0.4.0";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "mapbox";
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index ec5f8bcba3b2c..acae5d73b2cf4 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cloudpickle";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b0e63dd89ed5285171a570186751bc9b84493675e99e12789e9a5dc5490ef554";
+    sha256 = "54858c7b7dc763ed894ff91059c1d0b017d593fe23850d3d8d75f47d98398197";
   };
 
   buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix
new file mode 100644
index 0000000000000..617b0ea101fc9
--- /dev/null
+++ b/pkgs/development/python-modules/clustershell/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh
+, nose, bc, hostname, coreutils, bash, gnused
+}:
+
+buildPythonPackage rec {
+  pname = "ClusterShell";
+  version = "1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bm0pq8w2rql9q9i2bhs865rqvb6zck3h3gkb1d0mh59arrr7p4m";
+  };
+
+  propagatedBuildInputs = [ pyyaml ];
+
+  postPatch = ''
+    substituteInPlace lib/ClusterShell/Worker/Ssh.py \
+      --replace '"ssh"' '"${openssh}/bin/ssh"' \
+      --replace '"scp"' '"${openssh}/bin/scp"'
+
+    substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \
+      --replace '"/bin/sh"' '"${bash}/bin/sh"'
+  '';
+
+  checkInputs = [ nose bc hostname coreutils gnused ];
+
+  # Many tests want to open network connections
+  # https://github.com/cea-hpc/clustershell#test-suite
+  #
+  # Several tests fail on Darwin
+  checkPhase = ''
+    for f in tests/*; do
+      substituteInPlace $f \
+        --replace '/bin/hostname'   '${hostname}/bin/hostname' \
+        --replace '/bin/sleep'      '${coreutils}/bin/sleep' \
+        --replace '"sleep'          '"${coreutils}/bin/sleep' \
+        --replace '/bin/echo'       '${coreutils}/bin/echo' \
+        --replace '/bin/uname'      '${coreutils}/bin/uname' \
+        --replace '/bin/false'      '${coreutils}/bin/false' \
+        --replace '/bin/true'       '${coreutils}/bin/true' \
+        --replace '/usr/bin/printf' '${coreutils}/bin/printf' \
+        --replace '"sed'            '"${gnused}/bin/sed' \
+        --replace ' sed '           ' ${gnused}/bin/sed '
+    done
+
+    rm tests/CLIClushTest.py
+    rm tests/TreeWorkerTest.py
+    rm tests/TaskDistantMixin.py
+    rm tests/TaskDistantTest.py
+    rm tests/TaskDistantPdshMixin.py
+    rm tests/TaskDistantPdshTest.py
+    rm tests/TaskRLimitsTest.py
+
+    nosetests -v \
+      -e test_channel_ctl_shell_remote1 \
+      -e test_channel_ctl_shell_remote2 \
+      -e test_fromall_grouplist \
+      -e test_rank_placeholder \
+      -e test_engine_on_the_fly_launch \
+      -e test_ev_pickup_fanout \
+      -e test_ev_pickup_fanout_legacy \
+      -e test_timeout \
+      -e test_008_broken_pipe_on_write \
+      -e testLocalBufferRCGathering \
+      -e testLocalBuffers \
+      -e testLocalErrorBuffers \
+      -e testLocalFanout \
+      -e testLocalRetcodes \
+      -e testLocalRCBufferGathering \
+      -e testLocalSingleLineBuffers \
+      -e testLocalWorkerFanout \
+      -e testSimpleMultipleCommands \
+      -e testClushConfigSetRlimit  \
+      -e testTimerInvalidateInHandler \
+      -e testTimerSetNextFireInHandler \
+      -e test_channel_ctl_shell_mlocal1 \
+      -e test_channel_ctl_shell_mlocal2 \
+      -e test_channel_ctl_shell_mlocal3 \
+      -e test_node_placeholder \
+    tests/*.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Scalable Python framework for cluster administration";
+    homepage = https://cea-hpc.github.io/clustershell;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.alexvorobiev ];
+  };
+}
diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix
index 52afdee46ab7f..cfd6389ce5fb4 100644
--- a/pkgs/development/python-modules/coinmarketcap/default.nix
+++ b/pkgs/development/python-modules/coinmarketcap/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "coinmarketcap";
-  version = "4.2.1";
+  version = "5.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bk530cmfqri84m9386ydn3f89gq23nxylvnl523gr5589vw54bj";
+    sha256 = "1cfee31bf330a17cedf188e4e99588e6a4c6c969c93da71f55a9f4ec6a6c216f";
   };
 
   propagatedBuildInputs = [ requests-cache ];
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 7c2147a6431a2..1ccb31d5120a7 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "colorlover";
   version = "0.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index c8ef038ec504b..bcf67ab222d46 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "0.11.4";
   pname = "confluent-kafka";
 
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 50216c7ae1f19..4766a1285acda 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 }:
 buildPythonPackage rec {
   pname = "constantly";
-  name = "${pname}-${version}";
   version = "15.1.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/c/constantly/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq";
   };
 
diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix
index 5722893a85377..888e7a922528c 100644
--- a/pkgs/development/python-modules/consul/default.nix
+++ b/pkgs/development/python-modules/consul/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "python-consul";
-  version = "0.7.2";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef0b7c8a2d8efba5f9602f45aadbe5035e22a511d245624ed732af81223a6571";
+    sha256 = "0feb7a14b6869bbfa9eb4868e823f040e3642b84e80c39ffdff3a8b7fd7017c4";
   };
 
   buildInputs = [ requests six pytest ];
diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix
index a056ba450a880..a3ef5bce4d81b 100644
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "contextlib2";
   version = "0.5.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi rec {
     inherit pname version;
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 8b85a0d94c5ab..4d2a168f79cc0 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "coverage";
   version = "4.5.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 8be1780aa9922..e19850be8ceef 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,19 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }:
 
 buildPythonPackage rec {
   pname = "credstash";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d";
+    sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb";
   };
 
-  patches = fetchpatch {
-    url = https://github.com/fugue/credstash/pull/178.patch;
-    sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc";
-    excludes = [ ".travis.yml" ];
-  };
+  nativeBuildInputs = [ nose ];
 
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
 
diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix
index 8d0e7a58e76a6..a6c294456fa36 100644
--- a/pkgs/development/python-modules/csscompressor/default.nix
+++ b/pkgs/development/python-modules/csscompressor/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "csscompressor";
   version = "0.9.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index 6ecad9a160e2f..885b31d716c25 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -3,12 +3,11 @@
 
 buildPythonPackage rec {
   pname = "cufflinks";
-  version = "0.12.1";
-  name = "${pname}-${version}";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f11e4b6326cc5b2a18011c09fb64f178ba21002f337fd305f64818012a6c679";
+    sha256 = "59f1bae67aaa5042c8f9f94caba44b9b8e6e530ce9e81f6e06b643aca253d2f4";
   };
 
   propagatedBuildInputs = [ pandas plotly colorlover ];
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 44d258a3de55f..3a3aeb7b22670 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "2.5.0";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "60e36add95b0bc15f0863e7b4a425c00111dab0985075a96ede689510a9c56be";
+    sha256 = "3e714fa21401ab1d278b648543fae56fbce97e389076ebf03b4189f88c2d61e0";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index be6f688f50326..e17bd38da02b5 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "cvxopt";
-  version = "1.1.9";
+  version = "1.2.0";
 
   disabled = isPyPy; # hangs at [translation:info]
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gcqq8ymjxv8qa5ss2pdhsj5bahvdxa6h2rlpp51520mjxrpw5cg";
+    sha256 = "3296c9d49b7dcb894b20db5d7d1c1a443912b4d82358e03f836575e8398e0d60";
   };
 
   # similar to Gsl, glpk, fftw there is also a dsdp interface
diff --git a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
deleted file mode 100644
index a2de7b248531b..0000000000000
--- a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 355b9d812efdfbd041e14b365258b69c81689981 Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Thu, 17 May 2018 18:37:40 +0200
-Subject: [PATCH] odpi/src/dpiOci.c: nixify libclntsh.so dlopen
-
----
- odpi/src/dpiOci.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/odpi/src/dpiOci.c b/odpi/src/dpiOci.c
-index 76b9867..22c2987 100644
---- a/odpi/src/dpiOci.c
-+++ b/odpi/src/dpiOci.c
-@@ -1575,6 +1575,10 @@ static int dpiOci__loadLib(dpiError *error)
-             }
-         }
-     }
-+    if(!dpiOciLibHandle) {
-+        dpiOciLibHandle = dlopen("@libclntsh@", RTLD_LAZY);
-+    }
-+
- #endif
- 
-     if (!dpiOciLibHandle) {
--- 
-2.16.3
-
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index 717faf1128f0d..7c0fa32eb99f1 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }:
+{ stdenv, buildPythonPackage, fetchPypi, odpic }:
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
   version = "6.3.1";
 
-  buildInputs = [
-    oracle-instantclient
-  ];
+  buildInputs = [ odpic ];
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
   };
 
-  patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
-
-  postPatch = ''
-    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ "${oracle-instantclient}/lib/libclntsh.so";
+  preConfigure = ''
+    export ODPIC_INC_DIR="${odpic}/include"
+    export ODPIC_LIB_DIR="${odpic}/lib"
   '';
 
   # Check need an Oracle database to run
diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix
index 7326f2cf3b4b6..3d22053540445 100644
--- a/pkgs/development/python-modules/cycler/default.nix
+++ b/pkgs/development/python-modules/cycler/default.nix
@@ -9,7 +9,6 @@
 
 buildPythonPackage rec {
   pname = "cycler";
-  name = "${pname}-${version}";
   version = "0.10.0";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index fc3c311a5061a..6df19e4c94bec 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -7,16 +7,15 @@
 , gmp
 , cython
 , cysignals
-, six
 }:
 
 buildPythonPackage rec {
   pname = "cypari2";
-  version = "1.1.4"; # remove six dependency on upgrade to >1.1.4
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n0mp8qmvvzmfaawg39d3mkyzf65q2zkz7bnqyk4sfjbz4xwc6mb";
+    sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs
@@ -39,7 +38,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cysignals
     cython
-    six # after 1.1.4: will not be needed
   ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 56d997c6b325c..8908f6ea9d5e0 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -2,23 +2,28 @@
 , fetchPypi
 , buildPythonPackage
 , cython
-, sphinx
+, pariSupport ? true, pari # for interfacing with the PARI/GP signal handler
 }:
 
+assert pariSupport -> pari != null;
+
 buildPythonPackage rec {
   pname = "cysignals";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15nky8siwlc7s8v23vv4m0mnxa1z6jcs2qfr26m2mkw9j9g2na2j";
+    sha256 = "0rzwd9bjw6bj01xcmimqfim1g0njjyyyal0f93frm1la4hcmq96v";
   };
 
+  # explicit check:
+  # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
   hardeningDisable = [
     "fortify"
   ];
 
   # currently fails, probably because of formatting changes in gdb 8.0
+  # https://trac.sagemath.org/ticket/24692
   doCheck = false;
 
   preCheck = ''
@@ -26,6 +31,10 @@ buildPythonPackage rec {
     export PATH="$out/bin:$PATH"
   '';
 
+  buildInputs = lib.optionals pariSupport [
+    pari
+  ];
+
   propagatedBuildInputs = [
     cython
   ];
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 9bbf1da7a65e9..0d69edcf9cea8 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,12 +12,11 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.17.4";
-  name = "${pname}-${version}";
+  version = "0.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d";
+    sha256 = "ebaa0f144b43a00e7b9b3b9cb557e8ebada5fcbb982cdaba1802cd8c4c5720f0";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix
index 083ea6d6347be..44d4d3b576940 100644
--- a/pkgs/development/python-modules/dataclasses/default.nix
+++ b/pkgs/development/python-modules/dataclasses/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "dataclasses";
-  version = "0.5";
+  version = "0.6";
 
   # backport only works on Python 3.6, and is in the standard library in Python 3.7
   disabled = !isPy36;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07lgn1k56sqpw7yfzv5a6mwshsgaipjawflgyr6lrkryjl64481z";
+    sha256 = "6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix
index 6580b0e10070a..0808cf4f20110 100644
--- a/pkgs/development/python-modules/dateutil/1_5.nix
+++ b/pkgs/development/python-modules/dateutil/1_5.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "python-dateutil";
-  version = "1.5";
+  version = "2.7.3";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg";
+    sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index 32514f86226d2..ab078c656e7e2 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "python-dateutil";
-  version = "2.6.1";
+  version = "2.7.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749";
+    sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [ six setuptools_scm ];
 
   meta = with stdenv.lib; {
     description = "Powerful extensions to the standard datetime module";
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index cdcc313ed82d9..4ebb9a3369088 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
     pname = "dbf";
-    version = "0.97.2";
+    version = "0.97.7";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "b4c5165d29f6ca893797974aa9f228d2ad39aa864c166ce5bcb89c636489c8e6";
+      sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0";
     };
 
     propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
index facdd00edace2..3f310a49a37e0 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "dbfread";
     version = "2.0.7";
 
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index a0724c9ada59b..f207683d2b0b0 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -4,11 +4,10 @@
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   pname = "dbus-python";
   version = "1.2.4";
-  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
-    url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
+    url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz";
     sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2";
   };
 
diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix
new file mode 100644
index 0000000000000..fbc915c8eb044
--- /dev/null
+++ b/pkgs/development/python-modules/deap/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib }:
+
+buildPythonPackage rec {
+  pname = "deap";
+  version = "1.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "95c63e66d755ec206c80fdb2908851c0bef420ee8651ad7be4f0578e9e909bcf";
+  };
+
+  propagatedBuildInputs = [ numpy matplotlib ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py nosetests --verbosity=3
+  '';
+
+  meta = with stdenv.lib; {
+    description = "DEAP is a novel evolutionary computation framework for rapid prototyping and testing of ideas.";
+    homepage = https://github.com/DEAP/deap;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+
+}
+
diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index e852ac0385ca1..e3b1bebcccb23 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "decorator";
-  version = "4.2.1";
+  version = "4.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e";
+    sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
index cc991c7aeb4d9..6e79119b6a8f7 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "deluge-client";
-  version = "1.4.0";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "86979ebcb9f1f991554308e88c7a57469cbf339958b44c71cbdcba128291b043";
+    sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb";
   };
 
   # it will try to connect to a running instance
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 4f5d7a11bd8f7..853beaf34a1c5 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "demjson";
   version = "2.2.4";
-  name = "${pname}-${version}";
   disabled = isPy36;
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index a455db96c22b9..6220a1e15f0ce 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname   = "DendroPy";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510";
+    sha256 = "f0a0e2ce78b3ed213d6c1791332d57778b7f63d602430c1548a5d822acf2799c";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index 63c3fcd74cac8..d1ec792109908 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "deprecation";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e8d0dc5a17d7d551730e5f23ff3a53fc9e438364b9efb47d41c3e9b05522eabe";
+    sha256 = "2c259bfc0237f16bbe36cb32b6d81addd919b8f4bc7253738576816e82841b96";
   };
 
   propagatedBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix
index 1407dd3d204df..996cd22e2633e 100644
--- a/pkgs/development/python-modules/descartes/default.nix
+++ b/pkgs/development/python-modules/descartes/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "descartes";
   version = "1.1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index bf2808745ecd6..4fe8756c961be 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, requests, py, pytest }:
 
-with pythonPackages;buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "devpi-common";
   version = "3.2.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -17,7 +16,7 @@ with pythonPackages;buildPythonPackage rec {
     py.test
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/devpi/devpi;
     description = "Utilities jointly used by devpi-server and devpi-client";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix
index 7907f1ffac0be..062fb00e48b48 100644
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "diff-match-patch";
-  name = "${pname}-${version}";
   version = "20121119";
 
   meta = {
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index 79c87772ffe70..5473d85b5765f 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "dill";
-  version = "0.2.7.1";
-  name = "${pname}-${version}";
+  version = "0.2.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97fd758f5fe742d42b11ec8318ecfcff8776bccacbfcec05dfd6276f5d450f73";
+    sha256 = "53a6d7bf74f737a514cb89f72d0cb8b80dbd44a9cbbffaa14bffb57f4d7c3822";
   };
 
   # Messy test suite. Even when running the tests like tox does, it fails
diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix
index f3d403d9f2c3a..37d5fec85911b 100644
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "discid";
   version = "1.1.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix
index ae56fd5f7e59f..ce414a09806ae 100644
--- a/pkgs/development/python-modules/discogs_client/default.nix
+++ b/pkgs/development/python-modules/discogs_client/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "discogs-client";
   version = "2.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix
index db781af2a5ded..e21e6270b91a0 100644
--- a/pkgs/development/python-modules/distorm3/default.nix
+++ b/pkgs/development/python-modules/distorm3/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchurl }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "distorm3";
   version = "3.3.4";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/${pname}/${name}.zip";
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
     sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4";
   };
 
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index da6984c9be9e4..4029eb891395d 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "distro";
-  version = "1.2.0";
+  version = "1.3.0";
 
   buildInputs = [ pytest pytestcov tox];
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76";
+    sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index a1968550afcc0..775660b8304c4 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -1,9 +1,8 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
-, django, python-openid, mock, coverage }:
+, django, python3-openid, mock, coverage }:
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  name = "${pname}-${version}";
   version = "0.36.0";
 
   # no tests on PyPI
@@ -14,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan";
   };
 
-  propagatedBuildInputs = [ requests requests_oauthlib django python-openid ];
+  propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
 
   checkInputs = [ coverage mock ];
 
diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index 591031912854c..d575c1b674b09 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -3,7 +3,6 @@
 }:
 buildPythonPackage rec {
   pname = "django-compat";
-  name = "${pname}-${version}";
   version = "1.0.14";
 
   # the pypi packages don't include everything required for the tests
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 9d1161fca3b65..3548e930ab3d4 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -1,25 +1,36 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid
-, django, six
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+, six, typing
+, django, shortuuid, python-dateutil, pytest
+, pytest-django, pytestcov, mock, vobject
+, werkzeug, glibcLocales
 }:
 
 buildPythonPackage rec {
   pname = "django-extensions";
-  version = "1.8.1";
-  name = "${pname}-${version}";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
-    owner = "${pname}";
-    repo = "${pname}";
-    rev = "${version}";
-    sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h";
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a";
   };
 
-  buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ];
+  postPatch = ''
+    substituteInPlace setup.py --replace "'tox'," ""
+  '';
 
-  propagatedBuildInputs = [ django six ];
+  propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing;
 
-  meta = with stdenv.lib; {
+  checkInputs = [
+    django shortuuid python-dateutil pytest
+    pytest-django pytestcov mock vobject
+    werkzeug glibcLocales
+  ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  meta = with lib; {
     description = "A collection of custom extensions for the Django Framework";
     homepage = https://github.com/django-extensions/django-extensions;
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
index 5712ed4193fe9..be153feb2a7c4 100644
--- a/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "django-gravatar2";
-  name = "${pname}-${version}";
   version = "1.4.2";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
new file mode 100644
index 0000000000000..905ce92e51774
--- /dev/null
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildPythonPackage, fetchPypi
+, setuptools_scm, django, dateutil, whoosh, pysolr
+, coverage, mock, nose, geopy, requests }:
+
+buildPythonPackage rec {
+  pname = "django-haystack";
+  version = "2.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c";
+  };
+
+  checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ];
+  propagatedBuildInputs = [ django ];
+  nativeBuildInputs = [ setuptools_scm ];
+
+  postPatch = ''
+    sed -i 's/geopy==/geopy>=/' setup.py
+  '';
+
+  # ImportError: cannot import name django.contrib.gis.geos.prototypes
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Modular search for Django";
+    homepage = "http://haystacksearch.org/";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix
index b2d28229d94b9..e6cd5a3482fea 100644
--- a/pkgs/development/python-modules/django-hijack-admin/default.nix
+++ b/pkgs/development/python-modules/django-hijack-admin/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "django-hijack-admin";
   version = "2.1.5";
-  name = "${pname}-${version}";
 
   # the pypi packages don't include everything required for the tests
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix
index 5deccb34d894d..89147db63a88b 100644
--- a/pkgs/development/python-modules/django-ipware/default.nix
+++ b/pkgs/development/python-modules/django-ipware/default.nix
@@ -2,8 +2,7 @@
 
 buildPythonPackage rec {
   pname = "django-ipware";
-  name = "${pname}-${version}";
-  version = "2.0.2";
+  version = "2.1.0";
 
   meta = {
     description = "A Django application to retrieve user's IP address";
@@ -13,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "abf2bfbf0ec6c04679372a55c25889c9b08f55ec404bca3dfc08f3cf6c832a11";
+    sha256 = "a7c7a8fd019dbdc9c357e6e582f65034e897572fc79a7e467674efa8aef9d00b";
   };
 
   propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix
index b8b632e1a1821..338af16b2e961 100644
--- a/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/pkgs/development/python-modules/django-jinja2/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "django-jinja";
-  name = "${pname}-${version}";
   version = "2.4.1";
 
   meta = {
diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix
index af7af221b9b67..e2db26fe26bb5 100644
--- a/pkgs/development/python-modules/django-multiselectfield/default.nix
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@@ -6,7 +6,6 @@
 
 buildPythonPackage rec {
   pname = "django-multiselectfield";
-  name = "${pname}-${version}";
   version = "0.1.8";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix
index 2207aa348ab08..b2ee7b6f6442f 100644
--- a/pkgs/development/python-modules/django-pglocks/default.nix
+++ b/pkgs/development/python-modules/django-pglocks/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "django-pglocks";
-  name = "${pname}-${version}";
   version = "1.0.2";
 
   meta = {
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index 1b54213e2af75..7037f23b071c9 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "django-picklefield";
-  name = "${pname}-${version}";
   version = "1.0.0";
 
   meta = {
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index fbdc7282c1b68..19ef783fe7596 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   numpy, django_colorful, pillow, psycopg2,
   pyparsing, django, celery
 }:
 buildPythonPackage rec {
-  version = "0.5";
+  version = "0.6";
   pname = "django-raster";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/django-raster/${name}.tar.gz";
-    sha256 = "0v1jldb13s4dqq1vaq8ghfv3743jpi9a9n05bqgjm8szlkq8s7ah";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8";
   };
 
   # Tests require a postgresql + postgis server
diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix
index 5bc0dc379dc29..e08c296e80766 100644
--- a/pkgs/development/python-modules/django-sampledatahelper/default.nix
+++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "django-sampledatahelper";
-  name = "${pname}-${version}";
   version = "0.4.1";
 
   meta = {
diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix
index 41b532ea184fb..831dbbc4a6c9e 100644
--- a/pkgs/development/python-modules/django-sites/default.nix
+++ b/pkgs/development/python-modules/django-sites/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "django-sites";
-  name = "${pname}-${version}";
   version = "0.9";
 
   meta = {
diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix
index 1f8f9f17d3d57..b8924b37bfd02 100644
--- a/pkgs/development/python-modules/django-sr/default.nix
+++ b/pkgs/development/python-modules/django-sr/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "django-sr";
-  name = "${pname}-${version}";
   version = "0.0.4";
 
   meta = {
diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
index 9c8cde3a0d8a4..545eba8360a71 100644
--- a/pkgs/development/python-modules/django/2_0.nix
+++ b/pkgs/development/python-modules/django/2_0.nix
@@ -6,14 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  name = "${pname}-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "71d1a584bb4ad2b4f933d07d02c716755c1394feaac1ce61ce37843ac5401092";
+    sha256 = "3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8";
   };
 
   patches = stdenv.lib.optionals withGdal [
diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix
index 77fc708a50b47..35ac57062c751 100644
--- a/pkgs/development/python-modules/django_appconf/default.nix
+++ b/pkgs/development/python-modules/django_appconf/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "django-appconf";
   version = "1.0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
index 1fbb4dbafe68a..84d0404eb6d23 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
     pname = "django_compressor";
     version = "2.2";
-    name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix
index d2f8361bc7d69..4e256a38c86e0 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/pkgs/development/python-modules/django_guardian/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, buildPythonPackage, python, fetchurl
+{ stdenv, buildPythonPackage, python, fetchPypi
 , django_environ, mock, django, six
 , pytest, pytestrunner, pytest-django, setuptools_scm
 }:
 buildPythonPackage rec {
   pname = "django-guardian";
-  name = "${pname}-${version}";
   version = "1.4.9";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/django-guardian/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191";
   };
 
-  buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ];
+  checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
+  buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ django six ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix
index 3cbf6d2ce7132..3a362029c1ac8 100644
--- a/pkgs/development/python-modules/django_redis/default.nix
+++ b/pkgs/development/python-modules/django_redis/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "django-redis";
   version = "4.9.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix
index b6fcddd528f23..6b048db90e308 100644
--- a/pkgs/development/python-modules/django_tagging/default.nix
+++ b/pkgs/development/python-modules/django_tagging/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "django-tagging";
   version = "0.4.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 81f406c9ef2e8..18372fc113aac 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, buildPythonPackage, fetchurl, django }:
+{ stdenv, buildPythonPackage, fetchPypi, django }:
 buildPythonPackage rec {
   version = "3.8.2";
   pname = "djangorestframework";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9";
   };
 
diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix
index c8e6e2fa03d68..1659d46abbc52 100644
--- a/pkgs/development/python-modules/djmail/default.nix
+++ b/pkgs/development/python-modules/djmail/default.nix
@@ -1,23 +1,27 @@
-{ lib, buildPythonPackage, fetchPypi,
-  celery, django, psycopg2
+{ lib, buildPythonPackage, fetchPypi
+, glibcLocales
+, celery, django, psycopg2
 }:
 
 buildPythonPackage rec {
   pname = "djmail";
-  name = "${pname}-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
 
   meta = {
-    description = "Simple, powerfull and nonobstructive django email middleware.";
+    description = "Simple, powerfull and nonobstructive django email middleware";
     homepage = https://github.com/bameda/djmail;
     license = lib.licenses.bsd3;
   };
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1827i9qcn1ki09i5pg0lmar7cxjv18avh76x1n20947p1cimf3rp";
+    sha256 = "87d2a8b4bdf67ae9b312e127ccc873a53116cf297ec786460d782ce82eaa76b5";
   };
 
+  nativeBuildInputs = [ glibcLocales ];
+
+  LC_ALL = "en_US.UTF-8";
+
   propagatedBuildInputs = [ celery django psycopg2 ];
 
   # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index 177e697aab9f7..dabc3244592af 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -1,38 +1,25 @@
-{ stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication
-, pytest, dnspython }:
+{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage
+, pytest, dnspython, pynacl, authres, python }:
 
-buildPythonApplication rec {
-  name = "${pname}-${version}";
+buildPythonPackage rec {
   pname = "dkimpy";
-  majorversion = "0.6";
-  minorversion = "2";
-  version = "${majorversion}.${minorversion}";
+  version = "0.8.1";
 
-  src = fetchurl {
-    url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz";
-    sha256 = "1hagz8qk0v4ijfbcdq4z28bpgr2mkpr498z76i1vam2d50chmakl";
-  };
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "125xakqg2j5jp4k5kafpnpazh9d97ysgayrsgpvm3nkdj4g8hw1j";
+};
 
-  buildInputs = [ pytest ];
-  propagatedBuildInputs =  [ openssl dnspython ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs =  [ openssl dnspython pynacl authres ];
 
   patchPhase = ''
-    substituteInPlace dknewkey.py --replace \
+    substituteInPlace dkim/dknewkey.py --replace \
       /usr/bin/openssl ${openssl}/bin/openssl
   '';
 
   checkPhase = ''
-    python ./test.py
-  '';
-
-  postInstall = ''
-    mkdir -p $out/bin $out/libexec
-    mv $out/bin/*.py $out/libexec
-    makeWrapper "$out/libexec/dkimverify.py" $out/bin/dkimverify
-    makeWrapper "$out/libexec/dkimsign.py" $out/bin/dkimsign
-    makeWrapper "$out/libexec/arcverify.py" $out/bin/arcverify
-    makeWrapper "$out/libexec/arcsign.py" $out/bin/arcsign
-    makeWrapper "$out/libexec/dknewkey.py" $out/bin/dknewkey
+    ${python.interpreter} ./test.py
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/dlib/build-cores.patch b/pkgs/development/python-modules/dlib/build-cores.patch
new file mode 100644
index 0000000000000..eebc69a330fa0
--- /dev/null
+++ b/pkgs/development/python-modules/dlib/build-cores.patch
@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index 0c8d8f16..565ef8ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -172,21 +172,7 @@ class CMakeBuild(build_ext):
+         subprocess.check_call(cmake_build, cwd=build_folder)
+ 
+ def num_available_cpu_cores(ram_per_build_process_in_gb):
+-    if 'TRAVIS' in os.environ and os.environ['TRAVIS']=='true':
+-        # When building on travis-ci, just use 2 cores since travis-ci limits
+-        # you to that regardless of what the hardware might suggest.
+-        return 2 
+-    try:
+-        mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')  
+-        mem_gib = mem_bytes/(1024.**3)
+-        num_cores = multiprocessing.cpu_count() 
+-        # make sure we have enough ram for each build process.
+-        mem_cores = int(floor(mem_gib/float(ram_per_build_process_in_gb)+0.5));
+-        # We are limited either by RAM or CPU cores.  So pick the limiting amount
+-        # and return that.
+-        return max(min(num_cores, mem_cores), 1)
+-    except ValueError:
+-        return 2 # just assume 2 if we can't get the os to tell us the right answer.
++    return os.getenv("NIX_BUILD_CORES", 1)
+ 
+ 
+ from setuptools.command.test import test as TestCommand
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index 0548c5a1098ef..cf37c9de4e09f 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "dnspython";
   version = "1.15.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix
index cb91014d6ef28..307496cc65ce2 100644
--- a/pkgs/development/python-modules/doc8/default.nix
+++ b/pkgs/development/python-modules/doc8/default.nix
@@ -12,7 +12,6 @@
 buildPythonPackage rec {
   pname = "doc8";
   version = "0.8.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index dd20400ea4f48..491ab814e3b88 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "docker-pycreds";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d";
+    sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff";
   };
 
   # require docker-credential-helpers binaries
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 2ae56b7dc5a7e..0eedf4f01a6ed 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -3,12 +3,12 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "3.3.0";
+  version = "3.4.0";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a";
+    sha256 = "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix
index a739c341b62d7..80a3a6d949c6d 100644
--- a/pkgs/development/python-modules/docker_compose/default.nix
+++ b/pkgs/development/python-modules/docker_compose/default.nix
@@ -6,12 +6,12 @@
 , enum34, functools32,
 }:
 buildPythonApplication rec {
-  version = "1.20.1";
+  version = "1.21.2";
   pname = "docker-compose";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66";
+    sha256 = "0b0wihlyk89y6n0mly2vbljzqai1hhs6yzplskwdah2lfn9p3c38";
   };
 
   # lots of networking and other fails
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index bb9bc62d94052..88dc6b0fc7508 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "dogpile.cache";
   version = "0.6.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
new file mode 100644
index 0000000000000..2d193616e5f6b
--- /dev/null
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, buildPythonPackage
+, python
+, pygobject3
+, pyatspi
+, pycairo
+, at-spi2-core
+, gobjectIntrospection
+, gtk3
+, gsettings-desktop-schemas
+, fetchurl
+, dbus
+, xvfb_run
+# , fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "dogtail";
+  version = "0.9.10";
+
+  # https://gitlab.com/dogtail/dogtail/issues/1
+  # src = fetchPypi {
+  #   inherit pname version;
+  #   sha256 = "0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x";
+  # };
+  src = fetchurl {
+    url = https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz;
+    sha256 = "14sycidl8ahj3fwlhpwlpnyd43c302yqr7nqg2hj39pyj7kgk15b";
+  };
+
+  patches = [
+    ./nix-support.patch
+  ];
+
+  nativeBuildInputs = [ gobjectIntrospection dbus xvfb_run ]; # for setup hooks
+  propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
+
+  checkPhase = ''
+    runHook preCheck
+    export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS
+    # export NO_AT_BRIDGE=1
+    gsettings set org.gnome.desktop.interface toolkit-accessibility true
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      ${python.interpreter} nix_run_setup test
+    runHook postCheck
+  '';
+
+  # TODO: Tests require accessibility
+  doCheck = false;
+
+  meta = {
+    description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications";
+    homepage = https://gitlab.com/dogtail/dogtail;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ jtojnar ];
+  };
+}
diff --git a/pkgs/development/python-modules/dogtail/nix-support.patch b/pkgs/development/python-modules/dogtail/nix-support.patch
new file mode 100644
index 0000000000000..e8a65bbc87bef
--- /dev/null
+++ b/pkgs/development/python-modules/dogtail/nix-support.patch
@@ -0,0 +1,35 @@
+--- a/dogtail/distro.py
++++ b/dogtail/distro.py
+@@ -233,6 +233,11 @@
+         PackageDb.__init__(self)
+ 
+ 
++class _NixPackageDb(PackageDb):  # pragma: no cover
++    def __init__(self):
++        PackageDb.__init__(self)
++
++
+ class JhBuildPackageDb(PackageDb):  # pragma: no cover
+     def __init__(self):
+         PackageDb.__init__(self)
+@@ -324,6 +329,11 @@
+         self.packageDb = _SolarisPackageDb()
+ 
+ 
++class Nix(Distro):  # pragma: no cover
++    def __init__(self):
++        self.packageDb = _NixPackageDb()
++
++
+ class JHBuild(Distro):  # pragma: no cover
+     def __init__(self):
+         self.packageDb = JhBuildPackageDb()
+@@ -358,6 +368,8 @@
+     elif os.path.exists("/etc/release") and \
+             re.match(".*Solaris", open("/etc/release").readline()):  # pragma: no cover
+         distro = Solaris()  # pragma: no cover
++    elif os.path.exists("/nix/store"):  # pragma: no cover
++        distro = Nix()  # pragma: no cover
+     elif os.path.exists("/etc/os-release") and \
+             re.match(".*GNOME-Continuous", open("/etc/os-release").readline()):  # pragma: no cover
+         distro = GnomeContinuous()  # pragma: no cover
diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index 43c318fc7c3e7..e45d651f3245a 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "dpkt";
   version = "1.9.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 1be9e34ec18fc..8a5f23de89988 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "8.7.1";
+  version = "8.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "019f1529631d335f2b57ffd65a4545406bd3d139d0a9611cb6ca8c66c4ae7309";
+    sha256 = "e7eeac47f35e73b34023b7a3089380e74bacd0cce4b57e1e347539dfb53681d2";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.
diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix
index d2de9f9f15bc4..ccc5c574689c1 100644
--- a/pkgs/development/python-modules/ds4drv/default.nix
+++ b/pkgs/development/python-modules/ds4drv/default.nix
@@ -5,7 +5,6 @@
 
 buildPythonPackage rec {
   pname = "ds4drv";
-  name = "${pname}-${version}";
   version = "0.5.1";
 
   # PyPi only carries py3 wheel
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 80a42ac30fd52..61b1d0d1cd98d 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.19.2";
+  version = "0.19.3";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c51e10c260543240e0806052af046e1a78b98cbe1ac1ef3880a78d2269e09da4";
+    sha256 = "0d1ab6adf5e8e9bc30cce6e2f924ca06e50241fb1bb17a585fc8d98e3c09c4a4";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Simple Python implementation of the Git file formats and protocols";
-    homepage = http://samba.org/~jelmer/dulwich/;
+    homepage = https://samba.org/~jelmer/dulwich/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ koral ];
   };
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index fbe5c02771db8..83b35dc8c89ab 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "easy-thumbnails";
-  name = "${pname}-${version}";
   version = "2.5";
 
   meta = {
diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
index 12e0f6934d9a8..eb98cd18ef296 100644
--- a/pkgs/development/python-modules/easydict/default.nix
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "easydict";
   version = "1.7";
 
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 9cb09e8f72081..b1026e8d446af 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ed25519";
   version = "1.4";
 
diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix
index cf87bc66885da..4b0aba45cd7a6 100644
--- a/pkgs/development/python-modules/elasticsearch-curator/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname   = "elasticsearch-curator";
-  version = "5.5.1";
+  version = "5.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2d2762fa55613855b0a04f22e1c6c2c5b53d60301b437205d0e2533e4185671a";
+    sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0";
   };
 
   # The integration tests require a running elasticsearch cluster.
diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 502da4b1b604f..087ca3910c55a 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage (rec {
   pname = "elasticsearch";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b106fa3e01750376a42f8a9882bd84d630fda58c7aba38b4fec797d11c0bd0a2";
+    sha256 = "80ff7a1a56920535a9987da333c7e385b2ded27595b6de33860707dab758efbe";
   };
 
   # Check is disabled because running them destroy the content of the local cluster!
diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix
index cf03a02129d44..a0a619a39c848 100644
--- a/pkgs/development/python-modules/email-validator/default.nix
+++ b/pkgs/development/python-modules/email-validator/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "email_validator";
   version = "1.0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index 2afcb2b2de5ad..382dd50891537 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "emcee";
   version = "2.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index d7cce7b906b0a..2c3b7cc05523c 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  name = "${pname}-${version}";
   version = "0.5.0";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix
index 6b1d2af357a4c..29c8184bd4e86 100644
--- a/pkgs/development/python-modules/enum-compat/default.nix
+++ b/pkgs/development/python-modules/enum-compat/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "enum-compat";
   version = "0.0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix
index 60c92fe76fb25..d776bfd62aaca 100644
--- a/pkgs/development/python-modules/enzyme/default.nix
+++ b/pkgs/development/python-modules/enzyme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "enzyme";
   version = "0.4.1";
 
diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix
index 231a52c9d7a7f..742fdb83b72e6 100644
--- a/pkgs/development/python-modules/ephem/default.nix
+++ b/pkgs/development/python-modules/ephem/default.nix
@@ -3,7 +3,6 @@
 
 buildPythonPackage rec {
   pname = "ephem";
-  name = "${pname}-${version}";
   version = "3.7.6.0";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix
index 472a630549b26..2deb16924d207 100644
--- a/pkgs/development/python-modules/evdev/default.nix
+++ b/pkgs/development/python-modules/evdev/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "evdev";
-  version = "0.8.1";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff";
+    sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a";
   };
 
   buildInputs = [ linuxHeaders ];
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index 664322362b25d..b8daa5304c772 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -3,18 +3,13 @@
 
 buildPythonPackage rec {
   pname = "Eve";
-  version = "0.7.8";
-  name  = "${pname}-${version}";
+  version = "0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af373ab7b9611990d39b090eed372a0860d4e12a1c8a6ef49fdee29e4626053f";
+    sha256 = "9f926c715f88c7a92dc2b950ccc09cccd91f72fe0e93cde806b85d25b947df2f";
   };
 
-  patches = [
-    ./setup.patch
-  ];
-
   propagatedBuildInputs = [
     cerberus
     events
diff --git a/pkgs/development/python-modules/eve/setup.patch b/pkgs/development/python-modules/eve/setup.patch
deleted file mode 100644
index 8e5ca27757e12..0000000000000
--- a/pkgs/development/python-modules/eve/setup.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git i/setup.py w/setup.py
-index 0176467..2b74988 100755
---- i/setup.py
-+++ w/setup.py
-@@ -9,11 +9,11 @@ install_requires = [
-     'cerberus>=0.9.2,<0.10',
-     'events>=0.2.1,<0.3',
-     'simplejson>=3.3.0,<4.0',
--    'werkzeug>=0.9.4,<=0.11.15',
--    'markupsafe>=0.23,<1.0',
--    'jinja2>=2.8,<3.0',
--    'itsdangerous>=0.24,<1.0',
--    'flask>=0.10.1,<=0.12',
-+    'werkzeug>=0.9.4',
-+    'markupsafe>=0.23',
-+    'jinja2>=2.8',
-+    'itsdangerous>=0.24',
-+    'flask>=0.10.1',
-     'pymongo>=3.4',
-     'flask-pymongo>=0.4',
- ]
diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix
new file mode 100644
index 0000000000000..28e7726a829b5
--- /dev/null
+++ b/pkgs/development/python-modules/events/default.nix
@@ -0,0 +1,17 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "Events";
+  version = "0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f4d9c41a5c160ce504278f219fe56f44242ca63794a0ad638b52d1e087ac2a41";
+  };
+
+  meta = with lib; {
+    homepage = http://events.readthedocs.org;
+    description = "Bringing the elegance of C# EventHanlder to Python";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 1f457235b6a35..814cac3c9e6e9 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "0.8.1";
   pname = "ezdxf";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "mozman";
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 9fd37f86f7405..6441db945d7fd 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.8.13";
+  version = "0.8.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48fed4b4a191e2b42ad20c14115f1c6d36d338b80192075d7573f0f42d7fb321";
+    sha256 = "04645d946256b835c675c1cef7c03817a164b0c4e452018fd50b212ddff08c22";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index e8bdb78f73174..c5ac67106a2fe 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "feedgen";
-  version = "0.6.1";
-  name = "${pname}-${version}";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e5a1f2a8aaed06dae325e6024aa7083e90655c6cbddeb3671249b3895c135762";
+    sha256 = "82c9e29884e137c3e3e7959a02f142d1f7a46cd387d572e9e40150112a27604f";
   };
 
   propagatedBuildInputs = [ dateutil lxml ];
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index d5ce8f8afc2e1..e20087e43ca03 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }:
+{ stdenv, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }:
 
 buildPythonPackage rec {
   pname = "feedgenerator";
   version = "1.9";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s";
   };
 
diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
new file mode 100644
index 0000000000000..3642d4e55b904
--- /dev/null
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, six, cryptography }:
+
+buildPythonPackage rec {
+  pname = "fido2";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j";
+  };
+
+  # The pypi package does not include tests
+  # Check https://github.com/Yubico/python-fido2/pull/8
+  doCheck = false;
+
+  propagatedBuildInputs = [ six cryptography ];
+
+  meta = with lib; {
+    description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
+    homepage = https://github.com/Yubico/python-fido2;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 7e9e2e1da64c7..642111680b375 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,12 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.7.11.post2";
-  name = "${pname}-${version}";
+  version = "1.7.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5804c6f5f7e02cf1f95ca404c22653dd47d64e4496a0ba7af5a2d6b2051b872a";
+    sha256 = "8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index 62741a7870991..35bf7cb90df96 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "fixtures";
   version = "3.0.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
index a657c25eed7c9..f999bab89324c 100644
--- a/pkgs/development/python-modules/flake8-blind-except/default.nix
+++ b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -1,11 +1,10 @@
-{ lib, fetchurl, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "flake8-blind-except";
-  name = "${pname}-${version}";
   version = "0.1.1";
-  src = fetchurl {
-    url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc";
   };
   meta = {
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index 0a006b77793bc..944c7f7e1fd82 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -4,7 +4,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "flake8";
   version = "3.5.0";
 
diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index 27d8f9c40c656..7f3b6367b6ee2 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }:
+{ lib, buildPythonPackage, fetchPypi, flask, webassets, flask_script, nose }:
 
 buildPythonPackage rec {
-  name = "Flask-Assets-${version}";
+  pname = "Flask-Assets";
   version = "0.12";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0";
   };
 
diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index 397d1e03ee82b..0c353a34c3852 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , buildPythonPackage
-, fetchpatch
 , fetchPypi
 , flask
 , flask-silk
@@ -9,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-AutoIndex";
-  version = "0.6";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19b10mb1nrqfjyafki6wnrbn8mqi30bbyyiyvp5xssc74pciyfqs";
+    sha256 = "0v87sa073hmj64f47sazbiw08kyxsxay100bd5084jwq7c1y92d7";
   };
 
   propagatedBuildInputs = [
@@ -22,15 +21,6 @@ buildPythonPackage rec {
     future
   ];
 
-  patches = [
-    # fix generated binary, see https://github.com/sublee/flask-autoindex/pull/32
-    (fetchpatch {
-      name = "fix_binary.patch";
-      url = "https://github.com/sublee/flask-autoindex/pull/32.patch";
-      sha256 = "1v2r0wvi7prhipjq89774svv6aqj0a13mdfj07pdlkpzfbf029dn";
-    })
-  ];
-
   meta = with stdenv.lib; {
     description = "The mod_autoindex for Flask";
     longDescription = ''
@@ -39,6 +29,6 @@ buildPythonPackage rec {
     '';
     license = licenses.bsd2;
     maintainers = with maintainers; [ timokau ];
-    homepage = http://pythonhosted.org/Flask-AutoIndex/;
+    homepage = https://pythonhosted.org/Flask-AutoIndex/;
   };
 }
diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix
new file mode 100644
index 0000000000000..84f549231ce61
--- /dev/null
+++ b/pkgs/development/python-modules/flask-caching/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov }:
+
+buildPythonPackage rec {
+  pname = "Flask-Caching";
+  version = "1.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e34f24631ba240e09fe6241e1bf652863e0cff06a1a94598e23be526bc2e4985";
+  };
+
+  propagatedBuildInputs = [ flask ];
+
+  checkInputs = [ pytest pytestcov ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  # https://github.com/sh4nks/flask-caching/pull/74
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Adds caching support to your Flask application";
+    homepage = https://github.com/sh4nks/flask-caching;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix
index 31fe2a677c39f..05385e08d05e2 100644
--- a/pkgs/development/python-modules/flask-common/default.nix
+++ b/pkgs/development/python-modules/flask-common/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchPypi, buildPythonPackage
-, crayons, flask, flask_cache, gunicorn, maya, meinheld, whitenoise }:
+, crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }:
 
 buildPythonPackage rec {
   pname = "Flask-Common";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f6ibvkxpxgczxs4qcbh5bj8rf9ggggbagi2dkaphx5w29xbbys4";
+    sha256 = "13d99f2dbc0a332b8bc4b2cc394d3e48f89672c266868e372cd9d7b433d921a9";
   };
 
-  propagatedBuildInputs = [ crayons flask flask_cache gunicorn maya meinheld whitenoise ];
+  propagatedBuildInputs = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ];
 
   meta = with stdenv.lib; {
     description = "Flask extension with lots of common time-savers";
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index c46fce2fe7576..b602fcfd49477 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, flask }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "1.4.0";
   pname = "Flask-Compress";
 
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index 491ee22b0212e..e78fa2141b992 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -2,13 +2,12 @@
 , nose, flask, six }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Flask-Cors";
-  version = "3.0.4";
+  version = "3.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bec996f0603a0693c0ea63c8126e5f8e966bb679cf82e6104b254e9c7f3a7d08";
+    sha256 = "ecc016c5b32fa5da813ec8d272941cfddf5f6bba9060c405a70285415cbf24c9";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix
index 4181d96478769..466bfb4412190 100644
--- a/pkgs/development/python-modules/flask-elastic/default.nix
+++ b/pkgs/development/python-modules/flask-elastic/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , flask, elasticsearch }:
 
 buildPythonPackage rec {
   pname = "Flask-Elastic";
-  name = "${pname}-${version}";
   version = "0.2";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Elastic/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0hqkwff6z78aspkf1cf815qwp02g3ch1y9dhm5v2ap8vakyac0az";
   };
 
diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index cdc7cefff9544..b95e694a232f4 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , flask, flask_wtf, flask_testing, ldap
 , mock, nose }:
 
 buildPythonPackage rec {
   pname = "flask-ldap-login";
   version = "0.3.0";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq";
   };
 
-  buildInputs = [ nose mock flask_testing ];
+  checkInputs = [ nose mock flask_testing ];
   propagatedBuildInputs = [ flask flask_wtf ldap ];
 
   checkPhase = "nosetests -d";
diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index e2585262e58e9..1a01666d799d9 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -3,7 +3,6 @@
 
 buildPythonPackage rec {
   pname = "Flask-Login";
-  name = "${pname}-${version}";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix
index 99545a55ba392..a1732d3ccbfec 100644
--- a/pkgs/development/python-modules/flask-mail/default.nix
+++ b/pkgs/development/python-modules/flask-mail/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "Flask-Mail";
-  name = "${pname}-${version}";
   version = "0.9.1";
 
   meta = {
diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
index 078b23869756d..c523d7b963c8c 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -4,8 +4,7 @@
 
 buildPythonPackage rec {
   pname = "flask-marshmallow";
-  name = "${pname}-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/flask-marshmallow";
@@ -15,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fa6xgxrn9bbc2pazbg46iw3ykvpcwib5b5s46qn59ndwj77lifi";
+    sha256 = "db7aff4130eb99fd05ab78fd2e2c58843ba0f208899aeb1c14aff9cd98ae8c80";
   };
 
   propagatedBuildInputs = [ flask marshmallow ];
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 1a4bd11a1fa39..f4fc3cf3fa242 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -5,12 +5,11 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.1.1";
-  name = "${pname}-${version}";
+  version = "2.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed";
+    sha256 = "cd1b4e6cb829eeb41c02ad9202d83bef5f4b7a036dd9fad72ce96ad1e22efb07";
   };
 
   checkInputs = optional isPy3k glibcLocales;
diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix
index cacb16cb7bb79..2d34ce8583e63 100644
--- a/pkgs/development/python-modules/flask-oauthlib/default.nix
+++ b/pkgs/development/python-modules/flask-oauthlib/default.nix
@@ -3,7 +3,6 @@
 , mock, nose}:
 buildPythonPackage rec {
   pname = "Flask-OAuthlib";
-  name = "${pname}-${version}";
   version = "0.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix
index 1f41f79876312..cbdbd9892115e 100644
--- a/pkgs/development/python-modules/flask-principal/default.nix
+++ b/pkgs/development/python-modules/flask-principal/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }:
+{ lib, buildPythonPackage, fetchPypi, flask, blinker, nose }:
 
 buildPythonPackage rec {
-  name = "Flask-Principal-${version}";
+  pname = "Flask-Principal";
   version = "0.4.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm";
   };
 
diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index c54c015af1239..41735c4d1c6eb 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k
 , nose, mock, blinker
 , flask, six, pytz, aniso8601, pycrypto
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Flask-RESTful";
   version = "0.3.6";
 
@@ -13,15 +12,27 @@ buildPythonPackage rec {
     sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap";
   };
 
-# TypeError: Only byte strings can be passed to C code
-  patchPhase = if isPy3k then ''
+  patches = [
+    (fetchpatch {
+      url = https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch;
+      sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5";
+    })
+    (fetchpatch {
+      url = https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch;
+      sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl";
+    })
+  ];
+
+  postPatch = lib.optionalString isPy3k ''
+    # TypeError: Only byte strings can be passed to C code
     rm tests/test_crypto.py tests/test_paging.py
-    '' else null;
-  buildInputs = [ nose mock blinker ];
+  '';
+
+  checkInputs = [ nose mock blinker ];
+
   propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ];
-  PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://flask-restful.readthedocs.io/";
     description = "REST API building blocks for Flask";
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index a89f9979003b4..d5028bca56cf7 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -17,7 +17,6 @@
 buildPythonPackage rec {
   pname = "flask-restplus";
   version = "0.10.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index e494f22a4762c..edc873458a11c 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -1,16 +1,20 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 }:
 
 buildPythonPackage rec {
   pname = "Flask-Silk";
-  version = "0.2";
+  version = "2018-06-28";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1gjzighx4f0w39sq9xvzr1kwb4y7yv9qrgzvli1p89gy16piz8l0";
+  # master fixes flask import syntax and has no major changes
+  # new release requested: https://github.com/sublee/flask-silk/pull/6
+  src = fetchFromGitHub {
+    owner = "sublee";
+    repo = "flask-silk";
+    rev = "3a8166550f9a0ec52edae7bf31d9818c4c15c531";
+    sha256 = "0mplziqw52jfspas6vsm210lmxqqzgj0dxm8y0i3gpbyyykwcmh0";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix
index 5f843138eae01..04c083a32638a 100644
--- a/pkgs/development/python-modules/flask-testing/default.nix
+++ b/pkgs/development/python-modules/flask-testing/default.nix
@@ -4,7 +4,6 @@
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Flask-Testing";
   version = "0.7.1";
 
diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix
index a0b623c6b6ab0..96828dcdce25d 100644
--- a/pkgs/development/python-modules/flask-wtf/default.nix
+++ b/pkgs/development/python-modules/flask-wtf/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }:
+{ stdenv, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
 
 buildPythonPackage rec {
   pname = "Flask-WTF";
   version = "0.14.2";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x";
   };
 
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 1a2c6417167b7..67cd9aa457e9d 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -2,13 +2,12 @@
 , itsdangerous, click, werkzeug, jinja2, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
-  version = "0.12.4";
+  version = "1.0.2";
   pname = "Flask";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
+    sha256 = "2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix
index d286459b13779..550c4a7110130 100644
--- a/pkgs/development/python-modules/fn/default.nix
+++ b/pkgs/development/python-modules/fn/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "fn";
-  name = "${pname}-${version}";
   version = "0.4.3";
 
   meta = {
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 1381fc45c2287..4874fbba3c6f0 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.25.0";
+  version = "3.28.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c1b7eb0469d4e684bb8995906c327109beac870a33900090d64f85d79d646360";
+    sha256 = "ebf2ee25a6060e8551880a3b05d6ecadcdcfbd1b32fc272ff7b3acdb22945b6f";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index 5c188dc5a9fdf..155f866412e58 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "funcsigs";
   version = "1.0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix
index c368913caae92..ba84d80dd0bef 100644
--- a/pkgs/development/python-modules/future/default.nix
+++ b/pkgs/development/python-modules/future/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "future";
   version = "0.16.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
new file mode 100644
index 0000000000000..036bed9dd7920
--- /dev/null
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchPypi, buildPythonPackage, astunparse }:
+
+buildPythonPackage rec {
+  pname = "gast";
+  version =  "0.2.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c296xm1vz9x4w4inmdl0k8mnc0i9arw94si2i7pglpc461r0s3h";
+  };
+  checkInputs = [ astunparse ] ;
+  meta = with stdenv.lib; {
+    description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jyp ];
+  };
+}
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 5186f7b25ea51..3faa6d914d257 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -12,7 +12,6 @@
 
 buildPythonPackage rec {
   pname = "gensim";
-  name = "${pname}-${version}";
   version = "3.4.0";
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
index 902d1b2665346..faf5577353992 100644
--- a/pkgs/development/python-modules/geojson/default.nix
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -2,11 +2,13 @@
 
 buildPythonPackage rec {
   pname = "geojson";
-  version = "2.3.0";
+  version = "2.4.0";
+
+  format = "wheel";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "06ihcb8839zzgk5jcv18kc6nqld4hhj3nk4f3drzcr8n8893v1y8";
+    inherit pname version format;
+    sha256 = "0r9pc8hgnc5hf5rq98vinbrncn08v4kgzdfmfs14rfypvacsmfpj";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 6b94652402e39..1169dd3a4a475 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }:
+{ stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet }:
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "1.2.2";
-  name = pname + "-" + version;
+  version = "1.3.4";
 
-  src = fetchurl {
-    url = "mirror://pypi/g/gevent/${name}.tar.gz";
-    sha256 = "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "53c4dc705886d028f5d81e698b1d1479994a421498cd6529cb9711b5e2a84f74";
   };
 
   buildInputs = [ libev ];
diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix
index 5dfd399ac7de8..3a5fbe8433cef 100644
--- a/pkgs/development/python-modules/ghdiff/default.nix
+++ b/pkgs/development/python-modules/ghdiff/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , zope_testrunner, six, chardet}:
 
 buildPythonPackage rec {
   pname = "ghdiff";
   version = "0.4";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/g/ghdiff/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk";
   };
 
-  buildInputs = [ zope_testrunner ];
+  checkInputs = [ zope_testrunner ];
   propagatedBuildInputs = [ six chardet ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 04fae0db1b7ae..6cb6e626f279f 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl
-, utillinux, pygit2, gitMinimal, git-annex }:
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
+, utillinux, pygit2, gitMinimal, git-annex
+}:
 
 buildPythonPackage rec {
   pname = "git-annex-adapter";
@@ -22,10 +23,13 @@ buildPythonPackage rec {
   '';
 
   # TODO: Remove for next version
-  patches = fetchurl {
-    url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
-    sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp";
-  };
+  patches = [
+    ./not-a-git-repo-testcase.patch
+    (fetchpatch {
+      url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
+      sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir";
+    })
+  ];
 
   checkInputs = [
     utillinux # `rev` is needed in tests/test_process.py
@@ -43,6 +47,6 @@ buildPythonPackage rec {
     homepage = https://github.com/alpernebbi/git-annex-adapter;
     description = "Call git-annex commands from Python";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [ dotlambda ma27 ];
   };
 }
diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch
new file mode 100644
index 0000000000000..2a386ee3f2f91
--- /dev/null
+++ b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_process.py b/tests/test_process.py
+index 493fc8f..feb1833 100644
+--- a/tests/test_process.py
++++ b/tests/test_process.py
+@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase):
+         with self.assertRaises(subprocess.CalledProcessError) as cm:
+             runner('status', '-sb')
+         self.assertIn(
+-            "fatal: Not a git repository",
++            "fatal: not a git repository",
+             cm.exception.stderr,
+         )
+ 
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 74fe88be44755..7f71a4ed3ef27 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -1,19 +1,19 @@
 { lib, buildPythonPackage, fetchPypi
-, httplib2, six, oauth2client, uritemplate }:
+, httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }:
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.6.7";
+  version = "1.7.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05583a386e323f428552419253765314a4b29828c3cee15be735f9ebfa5aebf2";
+    sha256 = "e32d30563b90c4f88ff042d4d891b5e8ed1f6cdca0adab95e9c2ce2603087436";
   };
 
   # No tests included in archive
   doCheck = false;
 
-  propagatedBuildInputs = [ httplib2 six oauth2client uritemplate ];
+  propagatedBuildInputs = [ httplib2 google_auth google-auth-httplib2 six uritemplate oauth2client ];
 
   meta = with lib; {
     description = "The core Python library for accessing Google APIs";
diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix
new file mode 100644
index 0000000000000..c76f5c572e40b
--- /dev/null
+++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, mock
+, six
+, pytest
+, pytest-localserver
+, google_auth
+, httplib2
+
+}:
+
+buildPythonPackage rec {
+  pname = "google-auth-httplib2";
+  version = "0.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "098fade613c25b4527b2c08fa42d11f3c2037dda8995d86de0745228e965d445";
+  };
+
+  checkInputs = [
+    flask mock six pytest pytest-localserver
+  ];
+
+  propagatedBuildInputs = [
+    google_auth httplib2
+  ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Google Authentication Library: httplib2 transport";
+    homepage = https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2;
+    license = lib.licenses.asl20;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 9e1a0c3080470..2273b48b5b31d 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.1.2";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2000963305e95410a66e6ef6cfcc9f4627a4a95cb1c10abc98268814f2a6cd80";
+    sha256 = "e24e391054ed6e925ff6d03f225d9f66f3da97d0ab6f61e59274fb918fbe3ef1";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index ef101077eaaba..d908bb041510c 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9051802d3dae256036cca9e34633a32c0ed1427730d4ebc513dff91ec8b6dd45";
+    sha256 = "1745c9066f698eac3da99cef082914495fb71bc09597ba7626efbbb64c4acc57";
   };
 
   checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index 75c14ff62ebcf..8cf3fe5753eea 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -1,16 +1,16 @@
 { stdenv, buildPythonPackage, fetchPypi
-, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }:
+, google_api_core, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "0.32.1";
+  version = "0.34.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4f9a8ab3eb6630d0c0ca6ac15230dceba7d55d6707d162a84f255139ff780ee9";
+    sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631";
   };
 
-  propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];
+  propagatedBuildInputs = [ google_api_core ];
   checkInputs = [ pytest mock ];
 
   # needs credentials
diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix
deleted file mode 100644
index daabba6c390a1..0000000000000
--- a/pkgs/development/python-modules/google_gax/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, google_auth, ply, protobuf, grpcio, requests
-, googleapis_common_protos, dill, future, pytest, mock, unittest2 }:
-
-buildPythonPackage rec {
-  pname = "google-gax";
-  version = "0.16.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929";
-  };
-
-  propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ];
-  checkInputs = [ pytest mock unittest2 ];
-
-  # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where
-  # that file would be is unclear to me so I just remove the test.
-  postPatch = ''rm tests/test__grpc_google_auth.py'';
-
-  checkPhase = ''
-    py.test
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions.";
-    homepage = "http://gax-python.readthedocs.io/en/latest/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ vanschelven ];
-  };
-}
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index 01827fc87f590..0a88269340892 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -3,8 +3,8 @@
 }:
 
 buildPythonPackage rec {
+  pname = "gplaycli";
   version = "3.21";
-  name = "gplaycli-${version}";
 
   src = fetchFromGitHub {
     owner = "matlink";
diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix
index 485c5b5ef0730..67f2e0bb18520 100644
--- a/pkgs/development/python-modules/grammalecte/default.nix
+++ b/pkgs/development/python-modules/grammalecte/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "grammalecte";
   version = "0.6.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip";
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 57567a203ea72..7f2c7a582290d 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -4,15 +4,14 @@ gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
 buildPythonPackage }:
 
 buildPythonPackage rec {
+  pname = "graph-tool";
   format = "other";
   version = "2.26";
-  name = "${python.libPrefix}-graph-tool-${version}";
 
   meta = with stdenv.lib; {
     description = "Python module for manipulation and statistical analysis of graphs";
     homepage    = https://graph-tool.skewed.de/;
     license     = licenses.gpl3;
-    platforms   = platforms.all;
     maintainers = [ stdenv.lib.maintainers.joelmo ];
   };
 
diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
new file mode 100644
index 0000000000000..91b0751630185
--- /dev/null
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, isPyPy
+}:
+
+
+buildPythonPackage rec {
+  pname = "greenlet";
+  version = "0.4.13";
+  disabled = isPyPy;  # builtin for pypy
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  # see https://github.com/python-greenlet/greenlet/issues/85
+  preCheck = ''
+    rm tests/test_leaks.py
+  '';
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/greenlet;
+    description = "Module for lightweight in-process concurrent programming";
+    license = lib.licenses.lgpl2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
new file mode 100644
index 0000000000000..8d4c925acf874
--- /dev/null
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, lib, grpc, grpcio}:
+
+buildPythonPackage rec {
+  pname = "grpcio-tools";
+  version = "1.13.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ck6818kb4nb6skm9lqg492brqs7kfk65f4hh2c7h7c8pkbrpcw1";
+  };
+
+  enableParallelBuilding = true;
+
+  propagatedBuildInputs = [ grpc grpcio ];
+
+  # no tests in the package
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Protobuf code generator for gRPC";
+    license = lib.licenses.asl20;
+    homepage = "https://grpc.io/grpc/python/";
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index d1f0903238c7f..e53989bcbcfd1 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.9.1";
+  version = "1.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d";
+    sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426";
   };
 
   propagatedBuildInputs = [ six protobuf ]
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "HTTP/2-based RPC framework";
-    license = lib.licenses.bsd3;
+    license = lib.licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
     maintainers = with maintainers; [ vanschelven ];
   };
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index bab965b5a9c1a..5ceadcc0f91b0 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -3,12 +3,11 @@ nose, shouldbe, gss, krb5Full, which, darwin }:
 
 buildPythonPackage rec {
   pname = "gssapi";
-  version = "1.4.1";
-  name = "${pname}-${version}";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "be8f37dd9da726db375b9c693e0a63b391d381d903516e79ecc2a2cc965580e4";
+    sha256 = "be715cb74ac56db2dd888b016097aaa29ab7d7d34c1f8c706ff63f76b3553f71";
   };
 
   # It's used to locate headers
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index b1d19e9f5091b..bc855b5bc1cfb 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -1,11 +1,14 @@
-{ fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3
+{ buildPythonPackage, fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3
 , gst-plugins-base, ncurses
 }:
 
-stdenv.mkDerivation rec {
+let
   pname = "gst-python";
   version = "1.14.0";
   name = "${pname}-${version}";
+in buildPythonPackage rec {
+  inherit pname version;
+  format = "other";
 
   src = fetchurl {
     urls = [
@@ -33,9 +36,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
-  # Needed for python.buildEnv
-  passthru.pythonPath = [];
-
   meta = {
     homepage = https://gstreamer.freedesktop.org;
 
diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix
deleted file mode 100644
index c8f30746310a8..0000000000000
--- a/pkgs/development/python-modules/guessit/2.0.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytestrunner
-, dateutil
-, babelfish
-, rebulk
-}:
-
-buildPythonPackage rec {
-  pname = "guessit";
-  version = "2.1.4";
-  name = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
-  };
-
-  # Tests require more packages.
-  doCheck = false;
-  buildInputs = [ pytestrunner ];
-  propagatedBuildInputs = [
-    dateutil babelfish rebulk
-  ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/guessit;
-    license = lib.licenses.lgpl3;
-    description = "A library for guessing information from video files";
-  };
-}
diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index 77c45d12335bb..90395b3b2a924 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -9,12 +9,11 @@
 
 buildPythonPackage rec {
   pname = "guessit";
-  version = "2.1.4";
-  name = "${pname}-${version}";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
+    sha256 = "bf17e78783cf13bf903750770de4c3bb6c9ca89baafedb1612794660b6ebe32b";
   };
 
   # Tests require more packages.
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 89af8596edbcd..efc42dedc6553 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , pytest, mock, pytestcov, coverage }:
 
 buildPythonPackage rec {
   pname = "gunicorn";
-  version = "19.7.1";
-  name = "${pname}-${version}";
+  version = "19.8.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
-    sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10";
   };
 
-  buildInputs = [ pytest mock pytestcov coverage ];
+  checkInputs = [ pytest mock pytestcov coverage ];
 
   prePatch = ''
-    substituteInPlace requirements_test.txt --replace "==" ">="
+    substituteInPlace requirements_test.txt --replace "==" ">=" \
+      --replace "coverage>=4.0,<4.4" "coverage"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/pkgs/development/python-modules/gurobipy/darwin.nix
index 65bec7d8b12e3..3bd3b3b2a3298 100644
--- a/pkgs/development/python-modules/gurobipy/darwin.nix
+++ b/pkgs/development/python-modules/gurobipy/darwin.nix
@@ -1,7 +1,8 @@
 { fetchurl, python, xar, cpio, cctools, insert_dylib }:
 assert python.pkgs.isPy27 && python.ucsEncoding == 2;
 python.pkgs.buildPythonPackage
-  { name = "gurobipy-7.5.2";
+  { pname = "gurobipy";
+    version = "7.5.2";
     src = fetchurl
       { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_mac64.pkg";
         sha256 = "10zgn8741x48xjdiknj59x66mwj1azhihi1j5a1ajxi2n5fsak2h";
diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix
index d78eff0b47a01..8afe6379dc7c8 100644
--- a/pkgs/development/python-modules/gurobipy/linux.nix
+++ b/pkgs/development/python-modules/gurobipy/linux.nix
@@ -5,7 +5,8 @@ let utf =
   else if python.ucsEncoding == 4 then "32"
   else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
 in python.pkgs.buildPythonPackage
-  { name = "gurobipy-7.5.2";
+  { pname = "gurobipy";
+    version = "7.5.2";
     src = fetchurl
       { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz";
         sha256 = "13i1dl22lnmg7z9mb48zl3hy1qnpwdpr0zl2aizda0qnb7my5rnj";
diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 08cd1943eff6e..015ad38d0c147 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -2,7 +2,6 @@
 , enum34, hpack, hyperframe }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "h2";
   version = "3.0.1";
 
diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index ade4111c5a3b4..3899be92b1e9c 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k
 , transitions, websockets, passlib, docopt, pyyaml, nose }:
 
 buildPythonPackage rec {
@@ -12,6 +12,13 @@ buildPythonPackage rec {
     sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/beerfactory/hbmqtt/commit/75a85d1ea4cb41f2a15f2681d3114da7158942ae.patch";
+      sha256 = "0bl4v5zxp4kz2w7riwrx48f7yqmp7pxg79g9qavkda0i85lxswnp";
+    })
+  ];
+
   propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index e75b04e979232..94b9861daa97b 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
-    homepage =  http://github.com/scikit-learn-contrib/hdbscan;
+    homepage =  https://github.com/scikit-learn-contrib/hdbscan;
     license = licenses.bsd3;
     maintainers = with maintainers; [ ixxie ];
   };
diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix
index 8acaf9f063763..aa8c051aed3c2 100644
--- a/pkgs/development/python-modules/hglib/default.nix
+++ b/pkgs/development/python-modules/hglib/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-hglib";
-  version = "2.5";
-  name = "${pname}-${version}";
+  version = "2.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fee180bb6796e5d2d25158b2d3c9f048648e427dd28b23a58d369adb14dd67cb";
+    sha256 = "7c1fa0cb4d332dd6ec8409b04787ceba4623e97fb378656f7cab0b996c6ca3b2";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index 212fd5c957df5..d06cc89ff1f67 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -1,7 +1,6 @@
 { stdenv, libusb1, udev, fetchPypi, buildPythonPackage, cython }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "hidapi";
   version = "0.7.99.post21";
 
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
index 27d4b8a15b81f..9fa28126452a3 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -1,12 +1,11 @@
-{ stdenv , fetchurl , buildPythonPackage , sphinx }:
+{ stdenv, fetchPypi, buildPythonPackage, sphinx }:
 
 buildPythonPackage rec {
   pname = "hieroglyph";
   version = "1.0.0";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c";
   };
 
@@ -21,7 +20,6 @@ buildPythonPackage rec {
     homepage = https://github.com/nyergler/hieroglyph/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ juliendehos ];
-    platforms = platforms.unix;
   };
 }
 
diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix
index 0289c008e7e81..b2633e6c9d242 100644
--- a/pkgs/development/python-modules/hiro/default.nix
+++ b/pkgs/development/python-modules/hiro/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, six, mock }:
 buildPythonPackage rec {
   pname = "hiro";
-  version = "0.1.4";
+  version = "0.5";
   src = fetchPypi {
     inherit pname version;
 
-    sha256 = "1340lhg7k522bqpz5iakl51qb47mjw804mfwwzm77i7qcm5cwiz8";
+    sha256 = "57d9dac63077f24c3d0132c02ac5c71e4bd1d79bdac30dccad4c83fadd49fa1c";
   };
 
   propagatedBuildInputs = [ six mock ];
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index ae036d33f9ed8..63c7188f03ac6 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "html5-parser";
   version = "0.4.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix
index 8df4b3813c41b..538b75c3dd02c 100644
--- a/pkgs/development/python-modules/htmlmin/default.nix
+++ b/pkgs/development/python-modules/htmlmin/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "htmlmin";
   version = "0.1.12";
-  name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
     sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178";
diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
index 0e4ae14acd760..3bd61ec8afae3 100644
--- a/pkgs/development/python-modules/httpserver/default.nix
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -1,7 +1,6 @@
 { lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "httpserver";
   version = "1.1.0";
 
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index 9bcb61751de43..bbd4760bdf893 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -4,12 +4,11 @@
 
 buildPythonPackage rec {
   pname = "hupper";
-  version = "1.1";
-  name = "${pname}-${version}";
+  version = "1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e18037fa43fb4af7c00bd262ca6f5d7bcd22debd5d71e43b0fb1437f56e78035";
+    sha256 = "20387760e4d32bd4813c2cabc8e51d92b2c22c546102a0af182c33c152cd7ede";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index 8bc54e9226cff..862d7af91f0a3 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hvac";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c9308334301daee3b5c6d56a032ca2c81eeb97d2777b73d795e201e8d037687";
+    sha256 = "e7b8425ce36894cda8b8ed3387a47119edc517302e6a72942602df54a96ee453";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix
index 6574de1be63f6..b72544611833b 100644
--- a/pkgs/development/python-modules/hypchat/default.nix
+++ b/pkgs/development/python-modules/hypchat/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "hypchat";
   version = "0.21";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix
index 91e00a7a1461a..70c50c1f6637d 100644
--- a/pkgs/development/python-modules/hyperframe/default.nix
+++ b/pkgs/development/python-modules/hyperframe/default.nix
@@ -1,6 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "hyperframe";
   version = "5.1.0";
 
diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
new file mode 100644
index 0000000000000..eb4b859c2f64e
--- /dev/null
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, requests_ntlm
+}:
+
+buildPythonPackage rec {
+  pname = "IBMQuantumExperience";
+  version = "1.9.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "83baa3c88979df67e7be929b147d253cffe45a7f7f5657f87fbe945819e9ce24";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    requests_ntlm
+  ];
+
+  # test requires an API token
+  doCheck = false;
+
+  meta = {
+    description = "A Python library for the Quantum Experience API";
+    homepage    = https://github.com/QISKit/qiskit-api-py;
+    license     = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      pandaman
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index e66700d87ee0a..9ce3ba3f66802 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "idna";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f";
+    sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index f70cc9d69452c..149b07d63e3b7 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ijson";
   version = "2.3";
 
diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index 975353406ca9d..64fc707b8fd85 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "immutables";
-  version = "0.5";
+  version = "0.6";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hba0vkqanwfnb5b3rs14bs7schsmczhan5nd93c1i6fzi17glap";
+    sha256 = "63023fa0cceedc62e0d1535cd4ca7a1f6df3120a6d8e5c34e89037402a6fd809";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index a5d7b2b711eba..a97a98b207a5b 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, buildPythonPackage, fetchurl }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "incremental";
   version = "17.5.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/twisted/treq;
     description = "Incremental is a small library that versions your Python projects";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix
index d6ddadea9ca0f..82b5880f46585 100644
--- a/pkgs/development/python-modules/intelhex/default.nix
+++ b/pkgs/development/python-modules/intelhex/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "intelhex";
   version = "2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index ff077bd1b01e5..a8e270bd1c094 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -5,7 +5,6 @@ buildPythonPackage rec {
 
   pname = "internetarchive";
   version = "1.7.2";
-  name = "${pname}-${version}";
 
   # Can't use pypi, data files for tests missing
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix
index 5cf3c9e9db069..ee81c40febc8c 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/pkgs/development/python-modules/interruptingcow/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "interruptingcow";
   version = "0.8";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index feccdff683e7e..47cb354a7fe90 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   version = "2.1.0";
   pname = "intervaltree";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 3f09975d66be6..9d4392583be52 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -14,7 +14,6 @@
 buildPythonPackage rec {
   pname = "ipykernel";
   version = "4.8.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index e4765a29e835b..665d08980dca6 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -16,12 +16,11 @@
 
 buildPythonPackage rec {
   pname = "ipyparallel";
-  version = "6.1.1";
-  name = "${pname}-${version}";
+  version = "6.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f1e03ebb8d17f67f03bafa5d85f220883462f7bd7a97fe904c7d56ffba8534a3";
+    sha256 = "9afb0001d6fa2eca9340e9daab5da021db05211987868f47ab5b305d701cb12d";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index d44a708befb22..2c0e4aaf4db6c 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "6.3.1";
+  version = "6.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a6ac981381b3f5f604b37a293369963485200e3639fb0404fa76092383c10c41";
+    sha256 = "eca537aa61592aca2fef4adea12af8e42f5c335004dfa80c78caf80e8b525e5c";
   };
 
   prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix
index 503ccb37d57e8..0f3504780c2b6 100644
--- a/pkgs/development/python-modules/ipython_genutils/default.nix
+++ b/pkgs/development/python-modules/ipython_genutils/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "ipython_genutils";
   version = "0.2.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index 67d7d551522da..e65de4ee3ad01 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -15,7 +15,6 @@
 buildPythonPackage rec {
   pname = "ipywidgets";
   version = "7.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix
index f44bb7caf3d5d..fe6382f6fb635 100644
--- a/pkgs/development/python-modules/iso-639/default.nix
+++ b/pkgs/development/python-modules/iso-639/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "iso-639";
   version = "0.4.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/noumar/iso639;
     description = "ISO 639 library for Python";
     license = licenses.agpl3;
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index 4d9792ebbb820..21d098eb31b4f 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "iso3166";
   version = "0.8";
 
diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix
index 9161f3f6f0b86..6c04e6945de1c 100644
--- a/pkgs/development/python-modules/jabberbot/default.nix
+++ b/pkgs/development/python-modules/jabberbot/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }:
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi, xmpppy }:
 
 buildPythonPackage rec {
   pname = "jabberbot";
   version = "0.16";
-  name = "${pname}-${version}";
 
   disabled = isPy3k;
-  src = fetchurl {
-    url = "mirror://pypi/j/jabberbot/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d";
   };
 
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix
index a43dbf737167b..eed6a8b979b4a 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jdatetime";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7facd437d27365e217787e1013ecdc402aa77af7248e16128f6a753920000905";
+    sha256 = "ac5646460defa5bf3d062504d870954c77d6234536365baf52433fb845b620d0";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix
index d3ed32c0882f3..7b235b4463917 100644
--- a/pkgs/development/python-modules/jdcal/default.nix
+++ b/pkgs/development/python-modules/jdcal/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "jdcal";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e";
+    sha256 = "ea0a5067c5f0f50ad4c7bdc80abad3d976604f6fb026b0b3a17a9d84bb9046c9";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 7d652b2943a97..9522d2099f8b5 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "jedi";
   version = "0.12.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix
index db83e6cb29911..c18b6c5cac47e 100644
--- a/pkgs/development/python-modules/jellyfish/default.nix
+++ b/pkgs/development/python-modules/jellyfish/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jellyfish";
-  version = "0.5.6";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9";
+    sha256 = "5104e45a2b804b48a46a92a5e6d6e86830fe60ae83b1da32c867402c8f4c2094";
   };
 
   checkInputs = [ pytest unicodecsv ];
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index eedbed250a12b..65d1f4f682202 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -12,7 +12,6 @@
 
 buildPythonPackage rec {
   pname = "joblib";
-  name = "${pname}-${version}";
   version = "0.11";
   src = fetchPypi {
     inherit pname version;
@@ -27,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Lightweight pipelining: using Python functions as pipeline jobs";
-    homepage = http://pythonhosted.org/joblib/;
+    homepage = https://pythonhosted.org/joblib/;
     license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix
index 541455642ef53..f968b9fbd9f52 100644
--- a/pkgs/development/python-modules/josepy/default.nix
+++ b/pkgs/development/python-modules/josepy/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "josepy";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z";
+    sha256 = "fb5c62c77d26e04df29cb5ecd01b9ce69b6fcc9e521eb1ca193b7faa2afa7086";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index 19b1eeefa5340..bb3e8cf17f618 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }:
+{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }:
 
 buildPythonApplication rec {
   pname = "jsbeautifier";
   version = "1.7.5";
-  name = "${pname}-${version}";
 
   propagatedBuildInputs = [ six ];
 
   buildInputs = [ EditorConfig pytest ];
 
-  src = fetchurl {
-    url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = "http://jsbeautifier.org";
     description = "JavaScript unobfuscator and beautifier.";
     license     = licenses.mit;
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix
index 16be096f2bae8..3a6d69cc829fb 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/pkgs/development/python-modules/jsmin/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "jsmin";
   version = "2.2.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix
index 9d4331c8ea802..fd31dc93fbfab 100644
--- a/pkgs/development/python-modules/jsondiff/default.nix
+++ b/pkgs/development/python-modules/jsondiff/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "jsondiff";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893";
+    sha256 = "7e18138aecaa4a8f3b7ac7525b8466234e6378dd6cae702b982c9ed851d2ae21";
   };
 
   # No tests
diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix
index ceb697adcaf82..52fc3bd5e043f 100644
--- a/pkgs/development/python-modules/jsonpatch/default.nix
+++ b/pkgs/development/python-modules/jsonpatch/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "jsonpatch";
   version = "1.23";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index 6209c2593a7a9..17a1102bda8e7 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "jsonref";
   version = "0.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index b331279042c04..bd3b6b6f769f3 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -4,7 +4,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "jsonrpclib-pelix";
   version = "0.3.1";
 
diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index cd29d7b5d310f..1d8eab79688a5 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -2,7 +2,6 @@
 , nose, mock, vcversioner, functools32 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "jsonschema";
   version = "2.6.0";
 
diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index 4b0444e40d447..6a350d59be6d4 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -4,7 +4,6 @@
 , zlib }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Jug";
   version = "1.6.7";
   buildInputs = [ nose numpy ];
diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index 992780ef33d3e..f72bec57e90b9 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "junos-eznc";
-  version = "2.1.7";
+  version = "2.1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95a037cdd05618a189517357e46a06886909a18c7923b628c6ac43d5f54b2912";
+    sha256 = "daa62e5abfc66ef12e4fb43a1c264673e662e6f2d937cd10666c1c6dcf2ac6ac";
   };
 
 
diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix
index b0bb887229eb1..26b52c41c23ae 100644
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@@ -12,7 +12,6 @@
 buildPythonPackage rec {
   pname = "jupyter_console";
   version = "5.2.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index 403f7c047d561..c934d24dab7b2 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -12,7 +12,6 @@
 buildPythonPackage rec {
   pname = "jupyter_core";
   version = "4.4.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
index 02348c68e07ae..8a228bebb0b07 100644
--- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub-ldapauthenticator";
-  version = "1.1";
+  version = "1.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz";
+    sha256 = "5bba2ee246834130c9f86c13d39585b1af21563b814fa03aacb26b6696dd7e20";
   };
 
   # No tests implemented
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 4cf69a1114e7a..64485085d1a8a 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }:
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "0.31.12";
+  version = "0.32.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hp6p9bsr863glildgs2iy1a4l99m7rxj2sy9fmkxp5zhyhqvsrz";
+    sha256 = "88290656a2db2e38ef913a257ec283f3b5bd99144ed3d52899c9af7030077554";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index eef9dc493f600..db0fda6584c63 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -1,13 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
-  version = "1.4.2";
+  version = "1.4.3";
   pname = "kafka-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6a5c516f540f4b13b78c64a85dd42dc38fe29257e2fae6393fc5daff9106389b";
+    sha256 = "078acdcd1fc6eddacc46d437c664998b4cf7613b7e79ced66a460965f2648f88";
   };
 
   checkInputs = [ pytest six mock ];
diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
index 0863cd79f46e5..19169e88b125a 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -1,7 +1,6 @@
 { stdenv, kaitaistruct, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "kaitaistruct";
   version = "0.8";
 
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index 9ea6840c4d2ce..540542da10ebd 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -2,7 +2,6 @@
 , ecdsa , mnemonic, protobuf, hidapi, trezor }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "keepkey";
   version = "4.0.0";
 
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index f5590e11120b7..be59a112be746 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.1.6";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c14af1081242c25617ade7eb62121d58d01f16e1e744bae9fc4f1f95a417716e";
+    sha256 = "5b8499d157af217f1a5ee33589e774127ebc3e266c833c22cb5afbb0ed1734bf";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix
index 04b9e9235750f..907af4d250b34 100644
--- a/pkgs/development/python-modules/keyutils/default.nix
+++ b/pkgs/development/python-modules/keyutils/default.nix
@@ -1,18 +1,19 @@
-{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }:
+{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }:
 
 buildPythonPackage rec {
   pname = "keyutils";
   version = "0.5";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/k/${pname}/${name}.tar.gz";
-    sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10";
+  # github version comes bundled with tests
+  src = fetchFromGitHub {
+    owner = "sassoftware";
+    repo = "python-keyutils";
+    rev = "v${version}";
+    sha256 = "1gga60w8sb3r5bxa0bfp7d7wzg6s3db5y7aizr14p2pvp92d8bdi";
   };
 
-  buildInputs = [ pkgs.keyutils pytestrunner ];
-
-  doCheck = false;
+  buildInputs = [ keyutils ];
+  checkInputs = [ pytest pytestrunner ];
 
   meta = {
     description = "A set of python bindings for keyutils";
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
index b4b6c48201bdd..2e8abf0da525c 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "kitchen";
   version = "1.2.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index 6ee732a06cb1f..c0c3b09e7b4bd 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, stdenv
+, libcxx
 }:
 
 buildPythonPackage rec {
@@ -11,7 +13,9 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278";
   };
-
+  
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  
   # Does not include tests
   doCheck = false;
 
@@ -21,4 +25,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index 81d1e57e7a04e..1629c55a439e8 100644
--- a/pkgs/servers/web-apps/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -1,14 +1,14 @@
 { lib, python, fetchFromGitHub }:
 
-python.pkgs.buildPythonApplication rec {
+python.pkgs.buildPythonPackage rec {
   pname = "klaus";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
     rev = version;
-    sha256 = "0hkl1ycyd5ccijmknr3yfp3ga43y01m7390xnibqqgaisfvcm9wp";
+    sha256 = "04zjvrpx66x2c0v74nvmq8x7s7c8994cv1zwd5hfn9alq82hqcgr";
   };
 
   prePatch = ''
@@ -35,6 +35,6 @@ python.pkgs.buildPythonApplication rec {
     description = "The first Git web viewer that Just Works";
     homepage    = https://github.com/jonashaag/klaus;
     license     = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index f2073a48c589a..86e677a03374f 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -3,11 +3,10 @@
 buildPythonPackage rec {
   pname = "koji";
   version = "1.13.0";
-  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/koji/${name}.tar.bz2";
+    url = "https://releases.pagure.org/koji/${pname}-${version}.tar.bz2";
     sha256 = "18b18rcbdqqw33g7h20hf5bpbci2ixdi05yda1fvpv30c1kkzd8w";
   };
 
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
new file mode 100644
index 0000000000000..7620ee9444174
--- /dev/null
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }:
+
+buildPythonPackage rec {
+    pname = "kombu";
+    version = "4.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "86adec6c60f63124e2082ea8481bbe4ebe04fde8ebed32c177c7f0cd2c1c9082";
+  };
+
+  postPatch = ''
+    substituteInPlace requirements/test.txt --replace "pytest-sugar" ""
+  '';
+
+  checkInputs = [ pytest case pytz ];
+
+  propagatedBuildInputs = [ amqp ];
+
+  meta = with lib; {
+    description = "Messaging library for Python";
+    homepage    = https://github.com/celery/kombu;
+    license     = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 5566eea64eb85..9d91fdc9679d8 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "5.0.0";
+  version = "6.0.0";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1z8rrlq73bzli9rg57kj8ivz09vhsydyjq1ksbcis6j7h9c187zq";
+    sha256 = "b370ab4abd925309db69a14a4723487948e9a83de60ca92782ec14992b741c89";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix
index d1d25f5407c2e..d73940e56a6d4 100644
--- a/pkgs/development/python-modules/langcodes/default.nix
+++ b/pkgs/development/python-modules/langcodes/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish";
-    homepage =  http://github.com/LuminosoInsight/langcodes;
+    homepage =  https://github.com/LuminosoInsight/langcodes;
     license = licenses.mit;
     maintainers = with maintainers; [ ixxie ];
   };
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix
index c039bcc043a23..95672600a30ae 100644
--- a/pkgs/development/python-modules/ldap/default.nix
+++ b/pkgs/development/python-modules/ldap/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1";
+    sha256 = "41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5";
   };
 
   propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
index a58090680cd9d..24690d9d5302a 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
 
 buildPythonPackage rec {
-  version = "2.4.1";
+  version = "2.5";
   pname = "ldap3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a66pc00az0nx9kvhzidbg099pvk52ngycf891bp5jyfm1ahvzp8";
+    sha256 = "55078bbc981f715a8867b4c040402627fdfccf5664e0277a621416559748e384";
   };
 
   buildInputs = [ gssapi ];
diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix
index f6b12cae001ce..98cc3a42074cc 100644
--- a/pkgs/development/python-modules/leather/default.nix
+++ b/pkgs/development/python-modules/leather/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "leather";
   version = "0.3.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index dfd5d5dfde9f1..47eea033f6e73 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -3,7 +3,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ledgerblue";
   version = "0.1.17";
 
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 757a171d83812..e606d84ede4fa 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -3,7 +3,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "libagent";
   version = "0.9.8";
 
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index d9cc5fb0d9e5c..4a937ac94f098 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, lib, fetchFromGitHub, python, cmake, sip, protobuf }:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub
+, python, cmake, sip, protobuf, pythonOlder }:
 
-if lib.versionOlder python.version "3.4.0"
-then throw "libArcus not supported for interpreter ${python.executable}"
-else
-
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   pname = "libarcus";
-  name = "${pname}-${version}";
-  version = "3.2.1";
-  
+  version = "3.3.0";
+
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
     sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk";
   };
-  
+
+  disabled = pythonOlder "3.4.0";
+
   propagatedBuildInputs = [ sip protobuf ];
   nativeBuildInputs = [ cmake ];
 
@@ -26,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Communication library between internal components for Ultimaker software";
-    homepage = "https://github.com/Ultimaker/libArcus";
+    homepage = https://github.com/Ultimaker/libArcus;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix
index b27dbc2935af1..aed76728d7e41 100644
--- a/pkgs/development/python-modules/libasyncns/default.nix
+++ b/pkgs/development/python-modules/libasyncns/default.nix
@@ -3,7 +3,6 @@
 
 buildPythonPackage rec {
   pname = "libasyncns-python";
-  name = "${pname}-${version}";
   version = "0.7.1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 06bc294a9d7e0..a8acb4dc9696f 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "libnacl";
   version = "1.6.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "saltstack";
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index a88a609761101..e5a03f783551b 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "libsexy";
-  name = "${pname}-${version}";
   version = "0.1.9";
   format = "other";
 
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 65e8f3c7ba6c1..a99d4542ba5aa 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "01kwwwacbq7kbsslb2ac3wwfs4r8nsv7jhn0df2mmff30izbhq34";
+    sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix
index 26dfda613f75d..256cf107c86b4 100644
--- a/pkgs/development/python-modules/line_profiler/default.nix
+++ b/pkgs/development/python-modules/line_profiler/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "line_profiler";
   version = "2.1.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix
index 16a397136726d..e5b8fe6f34c43 100644
--- a/pkgs/development/python-modules/linuxfd/default.nix
+++ b/pkgs/development/python-modules/linuxfd/default.nix
@@ -7,7 +7,6 @@ buildPythonPackage rec {
   pname = "linuxfd";
   version = "1.4.4";
 
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix
index fa9067fa0fee7..5c7c7e970c320 100644
--- a/pkgs/development/python-modules/livereload/default.nix
+++ b/pkgs/development/python-modules/livereload/default.nix
@@ -11,7 +11,6 @@
 buildPythonPackage rec {
   pname = "livereload";
   version = "2.5.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "lepture";
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index b420e7149d751..4d702f1661147 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "llvmlite";
-  version = "0.22.0";
+  version = "0.23.2";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a0a875f3d502f41f4a24444aa98fbf076a6bf36e2a0b3b4481b22e1c4a3acdc2";
+    sha256 = "1e63f317b8fb3679d3a397920b1e8bade2d5f471f6c60c7e9bf97746f616f79e";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix
index 9ad9ddb433f01..c9b9b4896139f 100644
--- a/pkgs/development/python-modules/lmtpd/default.nix
+++ b/pkgs/development/python-modules/lmtpd/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "lmtpd";
   version = "6.0.0";
 
diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix
index d9ce51eed1ee1..a52f194b8bead 100644
--- a/pkgs/development/python-modules/logfury/default.nix
+++ b/pkgs/development/python-modules/logfury/default.nix
@@ -7,7 +7,6 @@
 
 buildPythonPackage rec {
   pname = "logfury";
-  name = "${pname}-${version}";
   version = "0.1.2";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index f64c309cc35b9..6d3b81488b954 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "logilab-common";
   version = "1.4.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix
index 8f7229a4c0f04..aa26f21820b75 100644
--- a/pkgs/development/python-modules/logilab/constraint.nix
+++ b/pkgs/development/python-modules/logilab/constraint.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "logilab-constraint";
   version = "0.6.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index dc40101284c0b..f2fb4d3614a11 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "luftdaten";
-  version = "0.1.4";
+  version = "0.2.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3e3af830ad2b731c36af223bbb5d47d68aa3786b2965411216917a7381e1179";
+    sha256 = "75fb177f61904dd1a7f93c1fa6c7cd468fd4a2e04ca45a87d37c802d290d17ad";
   };
 
   propagatedBuildInputs = [ aiohttp async-timeout ];
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 9fd050ac35ed3..8b321b911ccd9 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -20,8 +20,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Pythonic binding for the libxml2 and libxslt libraries";
-    homepage = http://lxml.de;
+    homepage = https://lxml.de;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ sjourdois ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 9ec291439cef9..823c868187386 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -2,7 +2,6 @@
   mistune, docutils } :
 buildPythonPackage rec {
   pname = "m2r";
-  name = "${pname}-${version}";
   version = "0.1.14";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
index f909974db6b34..4a96ce8ad0513 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -14,13 +14,12 @@
 
 buildPythonPackage rec {
   pname = "marionette-harness";
-  version = "4.3.0";
-  name = "${pname}-${version}";
+  version = "4.5.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a98bb65a0c63f60d9e3d7ef21dabc9c29676917dc2ec0d46851a3ed694c820cc";
+    sha256 = "241c7f6032d01b0d78f5c0d13ea691935ddce9f8fce991319cc4fe860d61a7c4";
   };
 
   propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest 
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index 766e419e514c9..5d52b52ac7f2f 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "manifestparser";
   version = "1.1";
-  name = "${pname}-${version}";
 
   disabled = isPy3k;
 
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
index 4315b08e016f6..d27637874af8e 100644
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@@ -9,13 +9,12 @@
 
 buildPythonPackage rec {
   pname = "marionette_driver";
-  version = "2.5.0";
-  name = "${pname}-${version}";
+  version = "2.7.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0axhdin9ys3i9lnwqqqw87wap9000bk6cdgrzpd2gqricc7l3v65";
+    sha256 = "15c77ba548847dc05ce1b663a22c3324623f217dce5a859c3aaced31fd16707b";
   };
 
   propagatedBuildInputs = [ mozversion mozrunner ]; 
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
index 0e404f69caa5f..ccd0eb6cc9f89 100644
--- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "mozcrash";
   version = "1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index af26c8d071d69..8569d9287ac82 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -8,12 +8,11 @@
 
 buildPythonPackage rec {
   pname = "mozdevice";
-  version = "0.52";
-  name = "${pname}-${version}";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b6fcbc7179c0f09bd99f7f7c42b614bce5f39543fb18b190e408488f987d6b5";
+    sha256 = "c3c50219127e36c171f84b2427e8fcf3a85457f336559aead9770b2a27fbc4b6";
   };
 
   propagatedBuildInputs = [ moznetwork mozprocess ];
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
index d32733036918f..7bd14f2d10cab 100644
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "mozfile";
   version = "1.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
index ca489929d3a11..1d1be733f9985 100644
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "mozhttpd";
   version = "0.7";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index 0e24ab09de67f..1515c050a3f06 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "mozinfo";
   version = "0.9";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
index 45fba9761e5d6..a6561d3e07ace 100644
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "moznetwork";
   version = "0.27";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index 80b13d94a2d96..c1e5344326077 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "mozprocess";
   version = "0.26";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index a783c125af3a3..c94acdd3ba5a8 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -9,12 +9,11 @@
 
 buildPythonPackage rec {
   pname = "mozprofile";
-  version = "0.29";
-  name = "${pname}-${version}";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "92af4b9f527a18997dccb60e846e1844b2428668dadf3ccb1a8cd30c706b25c1";
+    sha256 = "aa7fe7248719a224dd63cdc0498c9971d07cfc62fee7a69f51d593316b6bc1d8";
   };
 
   propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; 
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index 51344a8a95a5a..e9f6177cfa1bb 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -13,12 +13,11 @@
 
 buildPythonPackage rec {
   pname = "mozrunner";
-  version = "6.15";
-  name = "${pname}-${version}";
+  version = "7.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "985d4d4cf7597f09ed1b42165997d966fa35b0130a7a6bbcb2c71ecd5f4c453f";
+    sha256 = "a4e3d532d1d7eb34b6332e0568612ebac3f56da849894005b3dbe68968e5d292";
   };
 
   propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix
index ad2be9b1923b3..d1c799c95dee5 100644
--- a/pkgs/development/python-modules/marionette-harness/moztest.nix
+++ b/pkgs/development/python-modules/marionette-harness/moztest.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "moztest";
   version = "0.8";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
index 729f110858c8c..c9eb12bd52b46 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "mozversion";
   version = "1.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index 2b576cd3b056a..f49b2630b6c75 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchurl }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "markdown2";
   version = "2.3.5";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/markdown2/${name}.zip";
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
     sha256 = "8bb9a24eb2aa02f1427aabe46483f0f0215ab18c8a345315ae8e2ee3c3a09c03";
   };
 
diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix
index 2e05ee621e2aa..9f0ce1b21534f 100644
--- a/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/pkgs/development/python-modules/markdownsuperscript/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "MarkdownSuperscript";
   version = "2.0.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 656f7f44f965f..f7efeb725928f 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,8 +4,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow-sqlalchemy";
-  name = "${pname}-${version}";
-  version = "0.13.2";
+  version = "0.14.0";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -15,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9804ef2829f781f469a06528d107c2a763f109c687266ab8b1f000f9684184ae";
+    sha256 = "32ff19350a8892b3e8dc954eeeac796576bb89356512f9e1ccd33da63f856930";
   };
 
   propagatedBuildInputs = [ marshmallow sqlalchemy ];
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 71cc0cddf1b9c..242244726e52a 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -4,8 +4,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow";
-  name = "${pname}-${version}";
-  version = "2.15.1";
+  version = "2.15.3";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -18,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b73361eab812af97eaf8e8691333a1096787968450051d132c8b9fb90aa1db5a";
+    sha256 = "171f409d48b44786b7df2793cbd7f1a9062f0fe2c14d547da536b5010f671ade";
   };
 
   propagatedBuildInputs = [ dateutil simplejson ];
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 46f85b654c725..794124ef3bfa9 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache
+{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
 , enableGhostscript ? false, ghostscript ? null, gtk3
@@ -23,10 +23,9 @@ assert enableQt -> pyqt4 != null;
 buildPythonPackage rec {
   version = "2.2.2";
   pname = "matplotlib";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "4dc7ef528aad21f22be85e95725234c5178c0f938e2228ca76640e5e84d8cde8";
   };
 
diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index 20af252f58f6b..19c4baca8b290 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -2,27 +2,22 @@
 , buildPythonPackage
 , fetchPypi
 , requests
-, tox, pytest, flake8, responses
+, pytest, pytestrunner, responses
 }:
 
 buildPythonPackage rec {
-  pname = "matrix-client";
-  version = "0.0.6";
-  name = "${pname}-${version}";
+  pname = "matrix_client";
+  version = "0.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
+    sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw";
   };
 
-  checkInputs = [ tox pytest flake8 responses ];
+  checkInputs = [ pytest pytestrunner responses ];
 
   propagatedBuildInputs = [ requests ];
 
-  checkPhase = ''
-    pytest
-  '';
-
   meta = with stdenv.lib; {
     description = "Matrix Client-Server SDK";
     homepage = https://github.com/matrix-org/matrix-python-sdk;
diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix
index 63625b3e3b4ae..ee615a035a8c3 100644
--- a/pkgs/development/python-modules/mccabe/default.nix
+++ b/pkgs/development/python-modules/mccabe/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "mccabe";
   version = "0.6.1";
 
diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
index 5a348e5288c4a..b0cdbd60c3e23 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/pkgs/development/python-modules/meliae/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "meliae";
   version = "0.4.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname;
diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix
index 7ab4a18426342..04a0f99314b1f 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/pkgs/development/python-modules/mistune/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "mistune";
   version = "0.8.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix
index ad14430241781..182bbf3f07583 100644
--- a/pkgs/development/python-modules/mnemonic/default.nix
+++ b/pkgs/development/python-modules/mnemonic/default.nix
@@ -1,12 +1,11 @@
-{ lib, fetchurl, buildPythonPackage, pbkdf2 }:
+{ lib, fetchPypi, buildPythonPackage, pbkdf2 }:
 
 buildPythonPackage rec {
   pname = "mnemonic";
   version = "0.18";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d";
   };
 
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
new file mode 100644
index 0000000000000..e53098f6f2326
--- /dev/null
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }:
+
+buildPythonPackage rec {
+  pname = "monty";
+  version = "1.0.2";
+
+  # No tests in Pypi
+  src = fetchFromGitHub {
+    owner = "materialsvirtuallab";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg";
+  };
+
+  propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ];
+  
+  preCheck = ''
+    substituteInPlace tests/test_os.py \
+      --replace 'def test_which(self):' '#' \
+      --replace 'py = which("python")' '#' \
+      --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \
+      --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \
+      --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
+    longDescription = "
+      Monty implements supplementary useful functions for Python that are not part of the 
+      standard library. Examples include useful utilities like transparent support for zipped files, useful design 
+      patterns such as singleton and cached_class, and many more.
+    ";
+    homepage = https://github.com/materialsvirtuallab/monty;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index e618f039ebdff..6a58a6a8a2810 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "more-itertools";
-  version = "4.0.1";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax";
+    sha256 = "2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix
index 83fa05d4b1cb7..b5f5c1379bcf8 100644
--- a/pkgs/development/python-modules/moretools/default.nix
+++ b/pkgs/development/python-modules/moretools/default.nix
@@ -3,7 +3,6 @@
 , decorator }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "moretools";
   version = "0.1.8";
 
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index e268e92cc42e8..e4b2bdefad206 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -17,7 +17,8 @@ buildPythonPackage rec {
     # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16
     substituteInPlace setup.py \
       --replace "python-dateutil<2.7.0" "python-dateutil<3.0.0" \
-      --replace "aws-xray-sdk<0.96," "aws-xray-sdk"
+      --replace "aws-xray-sdk<0.96," "aws-xray-sdk" \
+      --replace "jsondiff==1.1.1" "jsondiff>=1.1.1"
   '';
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index d4750f252ad0c..1b4ad50c781f5 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "mpi4py";
   version = "3.0.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix
index 85a5d1f362227..62c5282b335b3 100644
--- a/pkgs/development/python-modules/mplleaflet/default.nix
+++ b/pkgs/development/python-modules/mplleaflet/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "mplleaflet";
   version = "0.0.5";
-  name = "${pname}-${version}";
 
   propagatedBuildInputs = [ jinja2 six ];
 
diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix
index 2be1c34c01c8f..5660e1b0dc5c9 100644
--- a/pkgs/development/python-modules/mpyq/default.nix
+++ b/pkgs/development/python-modules/mpyq/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "mpyq";
   version = "0.2.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index bab7cc052b9dd..9b1a2df48bbb9 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
-    homepage = "http://pythonhosted.org/mt-940/";
+    homepage = https://pythonhosted.org/mt-940/;
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 38facc9665891..f850e58570e79 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "4.1.0";
+  version = "4.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v";
+    sha256 = "5ba766433c30d703f6b2c17eb0b6826c6f898e5f58d89373e235f07764952314";
   };
 
   checkInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix
index 8edd8429d0d4e..f568e53c57301 100644
--- a/pkgs/development/python-modules/multipledispatch/default.nix
+++ b/pkgs/development/python-modules/multipledispatch/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "multipledispatch";
   version = "0.5.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
index 097898a2d84f7..5f30316eb711e 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/pkgs/development/python-modules/mygpoclient/default.nix
@@ -17,6 +17,8 @@ buildPythonPackage rec {
     nosetests
   '';
 
+  doCheck = (!stdenv.isDarwin);
+
   meta = with stdenv.lib; {
     description = "A gpodder.net client library";
     longDescription = ''
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 5ce05b7938f57..65cdf79059df8 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.600";
+  version = "0.610";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw";
+    sha256 = "0fc7h7hf9042nlqczdvj2ngz2hc7rcnd35qz5pb840j38x9n8wpl";
   };
 
   disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 3e4b0d1368b7b..e32c712560a5d 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "natsort";
-  version = "5.2.0";
+  version = "5.3.2";
 
   checkInputs = [
     hypothesis
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c960082d2145b04723041c4b85092546560538e29664dd197a1344d5b090bc91";
+    sha256 = "94056276c41be501d9fad3ade61d4eb4edf3b37fea53829b3294b75dc1d23708";
   };
 
   # testing based on project's tox.ini
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index c0b8b90bd089f..dfa87c843ff25 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -23,7 +23,6 @@
 buildPythonPackage rec {
   pname = "nbconvert";
   version = "5.3.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 71a140e53255d..adfb3da7c6839 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -13,7 +13,6 @@
 buildPythonPackage rec {
   pname = "nbformat";
   version = "4.4.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix
index df6c774bfbe14..c0485eef4d3d7 100644
--- a/pkgs/development/python-modules/nbmerge/default.nix
+++ b/pkgs/development/python-modules/nbmerge/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "nbmerge";
   version = "unstable-2017-10-23";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jbn";
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index e45c69aa39544..696796740f8bc 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, buildPythonPackage, fetchzip, pyopenssl }:
+{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }:
 
-buildPythonPackage rec {
+let
   pname = "nbxmpp";
   version = "0.6.6";
   name = "${pname}-${version}";
-
+in buildPythonPackage rec {
+  inherit pname version;
   # Tests aren't included in PyPI tarball.
   src = fetchzip {
     name = "${name}.tar.bz2";
@@ -18,7 +19,7 @@ buildPythonPackage rec {
   checkPhase = ''
     # Disable tests requiring networking
     echo "" > test/unit/test_xmpp_transports_nb2.py
-    python test/runtests.py
+    ${python.executable} test/runtests.py
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 67df4403f9803..0baa323d53c29 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, buildPythonPackage, fetchurl, isPyPy
-, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest
+, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime
 }:
 buildPythonPackage rec {
   pname = "netCDF4";
-  name = "${pname}-${version}";
-  version = "1.3.1";
+  version = "1.4.0";
 
   disabled = isPyPy;
 
-  src = fetchurl {
-    url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-    sha256 = "570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388";
   };
 
+  checkInputs = [ pytest ];
+
   buildInputs = [
     cython
   ];
 
   propagatedBuildInputs = [
+    cftime
     numpy
     zlib
     netcdf
@@ -26,6 +28,13 @@ buildPythonPackage rec {
     libjpeg
   ];
 
+  checkPhase = ''
+    py.test test/tst_*.py
+  '';
+
+  # Tests need fixing.
+  doCheck = false;
+
   # Variables used to configure the build process
   USE_NCCONFIG="0";
   HDF5_DIR="${hdf5}";
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index 412d42bafdddc..af7e4dde59e3b 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "netdisco";
-  version = "1.4.0";
+  version = "1.5.0";
 
   disabled = !isPy3k;
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = pname;
     rev = version;
-    sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1";
+    sha256 = "1lr0zpzdjkhcaihyxq8wv7c1wjm7xgx2sl8xmwp1kyivkgybk6n9";
   };
 
   propagatedBuildInputs = [ requests zeroconf netifaces ];
diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
index ccbb59c44dc2c..1adfe13dd13b3 100644
--- a/pkgs/development/python-modules/nevow/default.nix
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "Nevow";
-  version = "0.14.3";
+  version = "0.14.4";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb";
+    sha256 = "2299a0d2a0c1312040705599d5d571acfea74df82b968c0b9264f6f45266cf6e";
   };
 
   propagatedBuildInputs = [ twisted ];
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 7db4378a6e636..11770fa8461c0 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "nibabel";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h6nhi1s2ab7sdyyl3qjnvlw0kggcnam7vn4b3z56ay20596kvhw";
+    sha256 = "bf34aeb0f7ca52dc528ae4f842607cea307b334163857ff1d64d43068f637ada";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index ef4473e4066f2..93871d9a9a7e1 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "nilearn";
-  version = "0.4.1";
+  version = "0.4.2";
   name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2ef16d357d24699abced07e89a50d465c8fbaa8537f1a9d4d5cb8a612926dbc";
+    sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4";
   };
 
   checkPhase = "nosetests --exclude with_expand_user nilearn/tests";
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 372eeeec94a2f..ccfd35dc646be 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -33,11 +33,11 @@ assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17850c2a34f10f93d12c994101ce86b5a0b7e939e5b854e9f9920c9513cc8e76";
+    sha256 = "4c3c1eb15fc016457525d1f7eb701d1bbe595eb48a036ae8dc2d21b843f9e525";
   };
 
   # see https://github.com/nipy/nipype/issues/2240
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index d30e030a04989..9645e54f7ec1d 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "3.2.5";
   pname = "nltk";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix
index d9ec2f85fa251..7eb6b6cc04747 100644
--- a/pkgs/development/python-modules/nose-exclude/default.nix
+++ b/pkgs/development/python-modules/nose-exclude/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "nose-exclude";
   version = "0.5.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix
index db53a34a57f3e..34aed962eaed4 100644
--- a/pkgs/development/python-modules/nose_warnings_filters/default.nix
+++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "nose_warnings_filters";
   version = "0.1.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 37c5774bba257..15f93878ab71e 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "5.4.1";
+  version = "5.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01l6yp78sp27vns4cxh8ybr7x0pixxn97cp0i3w6s0lv1v8l6qbx";
+    sha256 = "fa915c231e64a30d19cc2c70ccab6444cbaa93e44e92b5f8233dd9147ad0e664";
   };
 
   LC_ALL = "en_US.utf8";
@@ -46,6 +46,12 @@ buildPythonPackage rec {
     echo "" > setup.cfg
   '';
 
+  postPatch = ''
+    # Remove selenium tests
+    rm -rf notebook/tests/selenium
+
+  '';
+
   checkPhase = ''
     runHook preCheck
     mkdir tmp
diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix
index 03890f712afcc..e4bbe0fb4302b 100644
--- a/pkgs/development/python-modules/ntlm-auth/default.nix
+++ b/pkgs/development/python-modules/ntlm-auth/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "ntlm-auth";
   version = "1.0.3";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jborean93";
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index e62fff7bca35e..33d044c41aa04 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.37.0";
+  version = "0.38.1";
   pname = "numba";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c62121b2d384d8b4d244ef26c1cf8bb5cb819278a80b893bf41918ad6d391258";
+    sha256 = "48fb76b8dcde868d6426c7c7836b76a0b2b20861547770c27b6307f712c09bc5";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index d05284b62dd45..2ec5066e5fc40 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "numpy-stl";
-  name = "${pname}-${version}";
   version = "2.4.1";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 3d64863c30d93..d6531eda2ef12 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.14.3";
+  version = "1.14.5";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "9016692c7d390f9d378fc88b7a799dc9caa7eb938163dda5276d3f3d6f75debf";
+    sha256 = "a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac";
   };
 
   disabled = isPyPy;
diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix
index 858b5ae594aec..a0262c7759541 100644
--- a/pkgs/development/python-modules/numtraits/default.nix
+++ b/pkgs/development/python-modules/numtraits/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "numtraits";
   version = "0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix
index 37790b6eaf8a6..161272ce1a73e 100644
--- a/pkgs/development/python-modules/odfpy/default.nix
+++ b/pkgs/development/python-modules/odfpy/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "odfpy";
   version = "1.3.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix
index 3b5fa1f531a2b..2bde7b174d33f 100644
--- a/pkgs/development/python-modules/ofxclient/default.nix
+++ b/pkgs/development/python-modules/ofxclient/default.nix
@@ -3,7 +3,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "2.0.3";
   pname = "ofxclient";
 
diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix
index 3d412e1409c80..518c34951fce8 100644
--- a/pkgs/development/python-modules/ofxhome/default.nix
+++ b/pkgs/development/python-modules/ofxhome/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, nose }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "0.3.3";
   pname = "ofxhome";
 
diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix
index 23b470ed90ff6..e85ac88d0d589 100644
--- a/pkgs/development/python-modules/olefile/default.nix
+++ b/pkgs/development/python-modules/olefile/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "olefile";
   version = "0.45.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix
index a4adc1f2a6f67..7b5622cfeefbf 100644
--- a/pkgs/development/python-modules/onkyo-eiscp/default.nix
+++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "onkyo-eiscp";
   version = "1.2.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix
index d1aaebee5c0c1..e0eb1ac8d796e 100644
--- a/pkgs/development/python-modules/openidc-client/default.nix
+++ b/pkgs/development/python-modules/openidc-client/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "openidc-client";
-  version = "0.5.0";
-  name = "${pname}-${version}";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "59d59d6fbfd26c5b57c53e582bdf2379274602f96133a163e7ff1ef39c363353";
+    sha256 = "680e969cae18c30adbddd6a087ed09f6a296b4937b4c8bc69be813bdbbfa9847";
   };
   propagatedBuildInputs = [ requests ];
 
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 09e3bde6f8af1..7b8f460214085 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,12 +9,11 @@
 
 buildPythonPackage rec {
   pname = "openpyxl";
-  version = "2.5.3";
-  name = "${pname}-${version}";
+  version = "2.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0046fca88d6731875a385bf7edd689d7c4133f829203ea615a81291de3fa48b6";
+    sha256 = "9239b74faf175dc4276a5fc277655fc53c2f704ded39e680d35e6a39e1913f69";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix
index 370378f097a4f..01f5595fea100 100644
--- a/pkgs/development/python-modules/opentimestamps/default.nix
+++ b/pkgs/development/python-modules/opentimestamps/default.nix
@@ -1,9 +1,9 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, bitcoinlib, GitPython, pysha3 }:
+, bitcoinlib, GitPython, pysha3, git }:
 
 buildPythonPackage rec {
   pname = "opentimestamps";
-  version = "0.3.0";
+  version = "0.4.0";
   disabled = (!isPy3k);
 
   # We can't use the pypi source because it doesn't include README.md which is
@@ -12,15 +12,16 @@ buildPythonPackage rec {
     owner = "opentimestamps";
     repo = "python-opentimestamps";
     rev = "python-opentimestamps-v${version}";
-    sha256 = "1i843mbz4h9vqc3y2x09ix6bv9wc0gzq36zhbnmf5by08iaiydks";
+    sha256 = "165rj08hwmbn44ra9n0cj5vfn6p49dqfn5lz2mks962mx19c7l0m";
   };
 
   # Remove a failing test which expects the test source file to reside in the
   # project's Git repo
-  patchPhase = ''
+  postPatch = ''
     rm opentimestamps/tests/core/test_git.py
   '';
 
+  checkInputs = [ git ];
   propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix
index a1b5c77b2d106..75a16f5c53bed 100644
--- a/pkgs/development/python-modules/pafy/default.nix
+++ b/pkgs/development/python-modules/pafy/default.nix
@@ -1,6 +1,5 @@
 { lib, buildPythonPackage, youtube-dl, fetchPypi }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pafy";
   version = "0.5.4";
 
diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix
index 274cf1b28343c..2c0a2c44f6eb2 100644
--- a/pkgs/development/python-modules/pandas/0.17.1.nix
+++ b/pkgs/development/python-modules/pandas/0.17.1.nix
@@ -27,12 +27,11 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.22.0";
-  name = "${pname}-${version}";
+  version = "0.17.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c";
+    sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index cb497742e47a2..08fdddb73467e 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -24,20 +24,23 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionalString concatStringsSep;
+  inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
   inherit (stdenv) isDarwin;
+
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.22.0";
-  name = "${pname}-${version}";
+  version = "0.23.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c";
+    sha256 = "50b52af2af2e15f4aeb2fe196da073a8c131fa02e433e105d95ce40016df5690";
   };
 
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx;
+
+  checkInputs = [ pytest glibcLocales moto ];
+
+  buildInputs = [] ++ optional isDarwin libcxx;
   propagatedBuildInputs = [
     cython
     dateutil
@@ -55,8 +58,6 @@ in buildPythonPackage rec {
     xlwt
   ];
 
-  patches = [ ./pandas-0.22.0-pytest-3.5.1.patch ];
-
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
   postPatch = optionalString isDarwin ''
@@ -67,7 +68,24 @@ in buildPythonPackage rec {
                 "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
   '';
 
-  checkInputs = [ moto ];
+
+  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+    # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
+    # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
+    "test_fallback_plural"
+    "test_ambiguous_flags"
+    "test_ambiguous_compat"
+    # Locale-related
+    "test_names"
+    "test_dt_accessor_datetime_name_accessors"
+    "test_datetime_name_accessors"
+    # Can't import from test folder
+    "test_oo_optimizable"
+  ] ++ optionals isDarwin [
+    "test_locale"
+    "test_clipboard"
+  ]);
+
   checkPhase = ''
     runHook preCheck
   ''
@@ -80,13 +98,7 @@ in buildPythonPackage rec {
     chmod a+x pbcopy pbpaste
     export PATH=$(pwd):$PATH
   '' + ''
-    # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
-    # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
-    py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \
-      -k "not test_fallback_plural and \
-          not test_ambiguous_flags and \
-          not test_ambiguous_compat \
-          ${optionalString isDarwin "and not test_locale and not test_clipboard"}"
+    py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch b/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch
deleted file mode 100644
index cba71b91316ad..0000000000000
--- a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/pandas/tests/io/test_pytables.py
-+++ b/pandas/tests/io/test_pytables.py
-@@ -5028,8 +5028,8 @@ class TestHDFStore(Base):
-             with ensure_clean_path(self.path) as path:
-                 with catch_warnings(record=True):
-                     with pytest.raises(
--                        ValueError, msg=("cannot have non-object label "
--                                         "DataIndexableCol")):
-+                        ValueError, message=("cannot have non-object label "
-+                                             "DataIndexableCol")):
-                         df.to_hdf(path, 'df', format='table',
-                                   data_columns=True)
- 
diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
new file mode 100644
index 0000000000000..b6cec2150a9eb
--- /dev/null
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, boto3, requests
+}:
+
+buildPythonPackage rec {
+  pname = "paperspace";
+  version = "0.0.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0z19arikcjpfvp3bgssnlhplm1qzgw95s3r5fnsyf7nwmc4pvvpa";
+  };
+
+  propagatedBuildInputs = [ boto3 requests ];
+
+  # tries to use /homeless-shelter to mimic container usage, etc
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python API for Paperspace Cloud";
+    homepage    = https://paperspace.com;
+    license     = licenses.isc;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
index 36153c1022903..18cc23338bf69 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -3,12 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "parse";
-  version = "1.8.2";
-  name = "${pname}-${version}";
+  version = "1.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40";
+    sha256 = "c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index f47a2acf200c2..7f3bc9cf4821c 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "parso";
-  version = "0.2.0";
-  name = "${pname}-${version}";
+  version = "0.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2";
+    sha256 = "f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 9b249f0a2b6f6..764319a1a0d71 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "4.0.2";
-  name = "${pname}-${version}";
+  version = "4.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f";
+    sha256 = "a9c27eb8f0e24e786e544b2dbaedb729c9d8546342b5a6818d8eda098ad4340d";
   };
 
   # circular dependencies with fixtures
diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
new file mode 100644
index 0000000000000..07e477b11d7b0
--- /dev/null
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, pillow, poppler_utils }:
+
+buildPythonPackage rec {
+  pname = "pdf2image";
+  version = "0.1.14";
+
+  buildInputs = [ pillow poppler_utils ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2926ebbf327e909d594619e520a1986c18d0cf60ae62acc7ebc503ccdef21f0f";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object";
+    homepage = https://github.com/Belval/pdf2image;
+    license = licenses.mit;
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix
new file mode 100644
index 0000000000000..d2397fb5c82bd
--- /dev/null
+++ b/pkgs/development/python-modules/pdfx/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
+
+buildPythonPackage rec {
+  pname = "pdfx";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "metachris";
+    repo = "pdfx";
+    rev = "v${version}";
+    sha256 = "1183k4h5qdf8y0imbir9ja3yzzsvdmqgbv3bi6dnkgr1wy2xfr0v";
+  };
+
+  # Remove after https://github.com/metachris/pdfx/pull/28
+  prePatch = ''
+    sed -i -e "s|pdfminer2|pdfminer.six|" setup.py
+  '';
+
+  propagatedBuildInputs = [ pdfminer chardet ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ marsam ];
+  };
+}
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index c13be981f0958..3b15e7a30279f 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -6,7 +6,6 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  name = "${pname}-${version}";
   version = "3.7.1";
   disabled = isPy26;
 
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index f603c98e6d870..5368a4f878e00 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchPypi, buildPythonPackage, dateutil, pytzdata, tzlocal }:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder
+, dateutil, pytzdata, typing }:
 
 buildPythonPackage rec {
   pname = "pendulum";
-  version = "1.4.4";
+  version = "2.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "601e52cb0425e94b1784b6613a9085e0066ae1fa1915d18771884b67e93cac5c";
+    sha256 = "544e44d8a92954e5ef4db4fa8b662d3282f2ac7b7c2cbf4227dc193ba78b9e1e";
   };
 
-  propagatedBuildInputs = [ dateutil pytzdata tzlocal ];
+  propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing;
 
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python datetimes made easy";
     homepage = https://github.com/sdispater/pendulum;
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix
index 9f61619e12bc2..2c1250f34a3e7 100644
--- a/pkgs/development/python-modules/pep257/default.nix
+++ b/pkgs/development/python-modules/pep257/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchurl, pytest, mock }:
 buildPythonPackage rec {
   pname = "pep257";
-  name = "${pname}-${version}";
   version = "0.7.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 4940a8b2e046d..b861797c4a8f2 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "persistent";
   version = "4.2.4.2";
-  name = "${pname}-${version}";
 
   propagatedBuildInputs = [ zope_interface ];
 
diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix
index b064b9037e901..0116212ad9eaa 100644
--- a/pkgs/development/python-modules/pexpect/default.nix
+++ b/pkgs/development/python-modules/pexpect/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pexpect";
-  version = "4.4.0";
-  name = "${pname}-${version}";
+  version = "4.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "67b85a1565968e3d5b5e7c9283caddc90c3947a2625bed1905be27bd5a03e47d";
+    sha256 = "2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba";
   };
 
   # Wants to run pythonin a subprocess
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 5f1c1b7670403..b797e6e76a0ba 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.9.5";
-  name = "${pname}-${version}";
+  version = "8.9.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x";
+    sha256 = "7813a9d45f0d1386a23552072af20a3ef34fa34f76eeb9033743ff083f9551e1";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix
index 48ea9bd6980f1..0ddeb99f10b1f 100644
--- a/pkgs/development/python-modules/phpserialize/default.nix
+++ b/pkgs/development/python-modules/phpserialize/default.nix
@@ -1,7 +1,6 @@
 {lib, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "phpserialize";
   version = "1.3";
 
diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index c4aa8dcf16c92..b5460e8b60804 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, pillow }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "piexif";
   version = "1.0.13";
 
diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix
index 219ae4d70079d..5cb1e9027a908 100644
--- a/pkgs/development/python-modules/pika-pool/default.nix
+++ b/pkgs/development/python-modules/pika-pool/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "pika-pool";
   version = "0.1.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index e9a0acac1cbad..44399f34bda1f 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "Pillow";
   version = "5.1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 926b625f7006a..89b0d56a4016c 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -28,16 +28,12 @@ buildPythonPackage rec {
     "test_editable_package"
     "test_input_file_without_extension"
     "test_locally_available_editable_package_is_not_archived_in_cache_dir"
+    "test_no_candidates"
+    "test_no_candidates_pre"
   ];
 
   checkPhase = ''
     export HOME=$(mktemp -d) VIRTUAL_ENV=1
-    tests_without_network_access="
-      not test_realistic_complex_sub_dependencies
-      and not test_editable_package_vcs
-      and not test_generate_hashes_all_platforms
-      and not test_generate_hashes_without_interfering_with_each_other
-    "
     py.test -k "${disabledTests}"
   '';
 
diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix
new file mode 100644
index 0000000000000..b810213cce92c
--- /dev/null
+++ b/pkgs/development/python-modules/pkgconfig/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }:
+
+buildPythonPackage rec {
+  pname = "pkgconfig";
+  version = "1.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "107x2wmchlch8saixb488cgjz9n6inl38wi7nxkb942rbaapxiqb";
+  };
+
+  checkInputs = [ nose ];
+
+  propagatedBuildInputs = [ pkgconfig ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with lib; {
+    description = "Interface Python with pkg-config";
+    homepage = https://github.com/matze/pkgconfig;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index 4ca6d0e08d106..c16c8d3f75095 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -4,7 +4,6 @@
 , python
 }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "plac";
   version = "0.9.6";
 
diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
new file mode 100644
index 0000000000000..3676c676cc60e
--- /dev/null
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, requests, pytest }:
+
+buildPythonPackage rec {
+  version = "2.3.0";
+  pname = "plaid-python";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97";
+  };
+
+  checkInputs = [ pytest ];
+  # Integration tests require API keys and internet access
+  checkPhase = "py.test -rxs ./tests/unit";
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = {
+    description = "Python client library for the Plaid API and Link";
+    homepage = https://github.com/plaid/plaid-python;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bhipple ];
+  };
+}
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 336a098c3a363..3f90e6b2da7d4 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "plaster_pastedeploy";
   version = "0.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix
index 75c0bdc00f168..8c3de8bd0351b 100644
--- a/pkgs/development/python-modules/plaster/default.nix
+++ b/pkgs/development/python-modules/plaster/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   pname = "plaster";
   version = "1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 09a465b96d7c3..6a1993e1fd178 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.5.1";
-  name = "${pname}-${version}";
+  version = "2.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9dd816c36271cf81d82c854fba866c743cbd8cc71f1c95384195307def859a69";
+    sha256 = "f7305816a423fd899da20919282445703118aeece19a54fb97be4cbf302341f8";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix
index 9d90c617fc165..c4b884e1d3dcc 100644
--- a/pkgs/development/python-modules/pluginbase/default.nix
+++ b/pkgs/development/python-modules/pluginbase/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
-  version = "0.5";
+  version = "0.7";
   pname = "pluginbase";
 
   buildInputs = [ pytest tox ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l";
+    sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index cd4a79104eb85..5269ecd5d8b40 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "plumbum";
   version = "1.6.6";
-  name = "${pname}-${version}";
 
   checkInputs = [ pytest ];
 
diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix
index bfe5d2f202df3..1ac8afc8cfb16 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/pkgs/development/python-modules/plyfile/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "plyfile";
   version = "0.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix
index b45c8d96fc473..bb8e0ed8ce58c 100644
--- a/pkgs/development/python-modules/podcastparser/default.nix
+++ b/pkgs/development/python-modules/podcastparser/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "podcastparser";
   version = "0.6.2";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "gpodder";
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index 3559053481e15..c7c888f6a00e0 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -1,20 +1,20 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, setuptools_scm, tempora }:
+, pytest, setuptools_scm, tempora, pytest-flake8 }:
 
 buildPythonPackage rec {
   pname = "portend";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586";
+    sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
 
   propagatedBuildInputs = [ tempora ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest pytest-flake8 ];
 
   checkPhase = ''
     py.test
diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix
index 3e753ab7e06b1..a4538b260fde9 100644
--- a/pkgs/development/python-modules/portpicker/default.nix
+++ b/pkgs/development/python-modules/portpicker/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "portpicker";
   version = "1.2.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
index 006b99518a88e..5e169306b2f12 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -4,8 +4,7 @@
 
 buildPythonPackage rec {
   pname = "premailer";
-  name = "${pname}-${version}";
-  version = "3.1.1";
+  version = "3.2.0";
 
   meta = {
     description = "Turns CSS blocks into style attributes ";
@@ -15,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fd07dadc47345f7d44a0587bd65a37c45886f19c44b3ec94904761e4b2d39124";
+    sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735";
   };
 
   buildInputs = [ mock nose ];
diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
index d82408e620ea2..ba1537a02c879 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -7,7 +7,6 @@
 , python
 }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "preshed";
   version = "1.0.0";
 
diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix
index f2373e4702f95..3d99d9530f38d 100644
--- a/pkgs/development/python-modules/proboscis/default.nix
+++ b/pkgs/development/python-modules/proboscis/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "proboscis";
   version = "1.2.6.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix
index 59aec94ff90e1..69a2f47d05ff1 100644
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -10,7 +10,6 @@
 
 buildPythonPackage rec {
   pname = "prompt_toolkit";
-  name = "${pname}-${version}";
   version = "1.0.15";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix
index 801936d906c85..5f6c23beb0289 100644
--- a/pkgs/development/python-modules/psd-tools/default.nix
+++ b/pkgs/development/python-modules/psd-tools/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "psd-tools";
-  name = "${pname}-${version}";
   version = "1.4";
 
   meta = {
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index f357aec914a41..7fbdfb7c33eb3 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -7,12 +7,11 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.4.5";
-  name = "${pname}-${version}";
+  version = "5.4.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ebe293be36bb24b95cdefc5131635496e88b17fabbcf1e4bc9b5c01f5e489cfe";
+    sha256 = "686e5a35fe4c0acc25f3466c32e716f2d498aaae7b7edc03e2305b682226bcf6";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
index f5d1a9568c3e6..3ff449037ea72 100644
--- a/pkgs/development/python-modules/pushover/default.nix
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "python-pushover";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xlghiqd9rsgn7jdhc8v1xh3xspssihrw1vyy85gvjzxa1ah19sk";
+    sha256 = "dee1b1344fb8a5874365fc9f886d9cbc7775536629999be54dfa60177cf80810";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index efe4e9df67248..564946c579a9e 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "py";
   version = "1.5.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index 4656b99df0a06..ab83e54fd824e 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -2,13 +2,12 @@
 
 buildPythonPackage rec {
   pname = "py3exiv2";
-  version = "0.2.1";
-  name = "${pname}-${version}";
+  version = "0.3.0";
   disabled = !(isPy3k);
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06q7mlqy05c3jr61nmz93fxb6ilizfyggbh5sg0krwjap2sw1fr8";
+    sha256 = "14626aaa83cae4cd3d54f51646a0fd048e8ee0e3caf205522b33020226da8c0e";
   };
 
   buildInputs = [ exiv2 boost ];
diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix
index 9cf9828635fbb..48a14399e898e 100644
--- a/pkgs/development/python-modules/py4j/default.nix
+++ b/pkgs/development/python-modules/py4j/default.nix
@@ -3,15 +3,16 @@
 buildPythonPackage rec {
   pname = "py4j";
 
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchPypi {
     inherit pname version;
     extension= "zip";
-    sha256 = "10shayghsmcdr03w12a7sdm6vsxpjm8alw3ym3mr1hki45yarryk";
+    sha256 = "721189616b3a7d28212dfb2e7c6a1dd5147b03105f1fc37ff2432acd0e863fa5";
   };
 
-  propagatedBuildInputs = [  ];
+  # No tests in archive
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects.";
diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix
index 1b1f758d94131..11fe98c664ee4 100644
--- a/pkgs/development/python-modules/py_scrypt/default.nix
+++ b/pkgs/development/python-modules/py_scrypt/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "scrypt";
   version = "0.8.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyaes/default.nix b/pkgs/development/python-modules/pyaes/default.nix
index 6104e72a37bc8..5ca837cdee48e 100644
--- a/pkgs/development/python-modules/pyaes/default.nix
+++ b/pkgs/development/python-modules/pyaes/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pyaes";
   version = "1.6.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix
index b8dcae16da858..35c0d52330056 100644
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyasn1-modules";
   version = "0.2.1";
   disabled = isPyPy;
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index 8037796713ec2..c1b133a0ab7de 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -1,13 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyasn1";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15";
+    sha256 = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index be82cc7bf026e..483ad84eb6644 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,12 +1,12 @@
 { buildPythonPackage, stdenv, lxml, click, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.3.7";
+  version = "0.3.9";
   pname = "pyaxmlparser";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1spwr28sc6fc3cqdx2j2zq38qx889hixl4ahhf1nphpmrl39ypxr";
+    sha256 = "af714d8adafcea776dd14cbd6d09f5d6d278f7ba333f540dde3b4c34f5f04784";
   };
 
   propagatedBuildInputs = [ lxml click ];
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 0547a5d3ba046..60ab64655551e 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pybase64";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c974bff394e16817596fab686a0c7deb4995a468b035b02a788b6dbfd1e6bdeb";
+    sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix
index 09cb4c2cdf98e..9b5991a424c98 100644
--- a/pkgs/development/python-modules/pybindgen/default.nix
+++ b/pkgs/development/python-modules/pybindgen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }:
 buildPythonPackage rec {
   pname = "PyBindGen";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sl4jn8rildv6f62cab66w791cixhaaxl7gwg9labs099rl74yl6";
+    sha256 = "23f2b760e352729208cd4fbadbc618bd00f95a0a24db21a4182833afcc3b5208";
   };
 
   buildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix
index 2de46c0d1ed13..e106ee3f3f187 100644
--- a/pkgs/development/python-modules/pyblake2/default.nix
+++ b/pkgs/development/python-modules/pyblake2/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "pyblake2";
   version = "1.1.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix
new file mode 100644
index 0000000000000..946fb1a054fe8
--- /dev/null
+++ b/pkgs/development/python-modules/pybrowserid/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests, mock }:
+
+buildPythonPackage rec {
+  pname = "PyBrowserID";
+  version = "0.14.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ mock ];
+
+  meta = with stdenv.lib; {
+    description = "Python library for the BrowserID Protocol";
+    homepage    = https://github.com/mozilla/PyBrowserID;
+    license     = licenses.mpl20;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
index b1ee59a5cd4a0..3791efc0e2e4d 100644
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pycassa";
   version = "1.11.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index e90fc4b263665..d818df8882267 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "PyChromecast";
-  version = "2.1.0";
+  version = "2.2.0";
   name = pname + "-" + version;
 
   src = fetchurl {
     url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
-    sha256 = "a18fee9bf32f62fcb539783c3888e811015c1f6377bcdb383b13d6537691f336";
+    sha256 = "7c3773c0e134e762fd65a3407e680ab4c5c656fe7c5665b2f8f5ef445c7605a4";
   };
 
   propagatedBuildInputs = [ requests six zeroconf protobuf ];
diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
index e6c7a85aaf28d..32ef1d547b0b2 100644
--- a/pkgs/development/python-modules/pycodestyle/default.nix
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pycodestyle";
   version = "2.3.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index 35b10421f2c09..b074f9f4934ea 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }:
+{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }:
 
 buildPythonPackage rec {
   pname = "pycollada";
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 1ecf0bf6b339b..af975e333f0f2 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   version = pycryptodome.version;
   pname = "pycrypto";
-  name = "${pname}-${version}";
 
   # Cannot build wheel otherwise (zip 1980 issue)
   SOURCE_DATE_EPOCH=315532800;
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 85024baa26e45..b4ef42cb22abb 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+{ stdenv, fetchPypi, python, buildPythonPackage, gmp }:
 
 buildPythonPackage rec {
-  version = "3.5.1";
+  version = "3.6.2";
   pname = "pycryptodome";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
-    sha256 = "b7957736f5e868416b06ff033f8525e64630c99a8880b531836605190b0cac96";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix
index c5af0c91317e7..aa838bc928ead 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,8 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pycryptodomex";
-  name = "${pname}-${version}";
-  version = "3.5.1";
+  version = "3.6.2";
 
   meta = {
     description = "A self-contained cryptographic library for Python";
@@ -13,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb60d38111ebc383a5a1c909545562926c66c846d03fc65ba7b8a3487cb23078";
+    sha256 = "8ed51799f6c060b4f62459e1bd9f3b3855bec6fa68202e76639d628001fdf3b7";
   };
 }
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index eb7459b077925..2774a363f85ec 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -23,7 +23,6 @@ in
 buildPythonPackage rec {
   pname = "pycuda";
   version = "2017.1.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 27a9790dce0ed..c437df9cd99cd 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pycurl";
-  version = "7.43.0.1";
+  version = "7.43.0.2";
   disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
+    sha256 = "0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4";
   };
 
   buildInputs = [ curl openssl.out ];
diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix
index 058f8b6b88735..27b2d237cfcdc 100644
--- a/pkgs/development/python-modules/pydbus/default.nix
+++ b/pkgs/development/python-modules/pydbus/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pydbus";
   version = "0.6.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix
index 98d4b33939a2c..e21b876be04e5 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/pkgs/development/python-modules/pydot/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "pydot";
   version = "1.2.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 6450cb7c70eb0..28a76da4bd961 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -1,12 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, scipy, ffmpeg-full }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pydub";
-  version = "0.21.0";
+  version = "0.22.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "27acc5977b0f5220682175d44fda737bbf818143b0832c0c3863b5dde38e197a";
+    sha256 = "20beff39e9959a3b2cb4392802aecb9b2417837fff635d2b00b5ef5f5326d313";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index a7430c94b480e..28c74487c9664 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, numpy, cython }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyemd";
   version = "0.5.1";
 
diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix
index 5d11b716a2f80..3384e981ff07a 100644
--- a/pkgs/development/python-modules/pyexiv2/default.nix
+++ b/pkgs/development/python-modules/pyexiv2/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, python, exiv2, scons, boost }:
+{ stdenv, buildPythonPackage, fetchurl, python, exiv2, scons, boost }:
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   pname = "pyexiv2";
   version = "0.3.2";
-  name = "${pname}-${version}";
-  
+  format = "other";
+
   src = fetchurl {
-    url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2";
+    url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${pname}-${version}.tar.bz2";
     sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a";
   };
 
@@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    # Likely needs an older boost which does not have `boost_pythonXY` but `boost_python`.
+    broken = true; # 2018-06-23
   };
 }
diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix
index 973a2e84ffa7f..fdc76493da8c0 100644
--- a/pkgs/development/python-modules/pyfftw/default.nix
+++ b/pkgs/development/python-modules/pyfftw/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   version = "0.10.4";
   pname = "pyFFTW";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix
index 9308a7467366e..ede8e965db94d 100644
--- a/pkgs/development/python-modules/pyfiglet/default.nix
+++ b/pkgs/development/python-modules/pyfiglet/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "0.7.5";
   pname = "pyfiglet";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index b1f1619d91005..06b027dd59a83 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pyflakes";
   version = "1.6.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index a33eefa48ec4d..5a4a81f13accc 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "pygame";
-  name = "${pname}-${version}";
   version = "1.9.3";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix
index a0a92ffc287e7..0b0e8f55fa7f4 100644
--- a/pkgs/development/python-modules/pygeoip/default.nix
+++ b/pkgs/development/python-modules/pygeoip/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "pygeoip";
   version = "0.3.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 3f05aa7b7896f..72e09bf98f928 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -1,7 +1,6 @@
 { stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pygit2";
   version = "0.26.4";
 
diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix
index 85bf262837f7b..3571e89bd3336 100644
--- a/pkgs/development/python-modules/pygpgme/default.nix
+++ b/pkgs/development/python-modules/pygpgme/default.nix
@@ -4,11 +4,10 @@
 buildPythonPackage rec {
   version = "0.3";
   pname = "pygpgme";
-  name = "${pname}-${version}";
   disabled = isPyPy;
 
   src = fetchurl {
-    url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz";
+    url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1";
   };
 
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index e6ab3512797dd..7ba62c4f2eb4a 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -2,7 +2,6 @@
 , pkgconfig, doctest-ignore-unicode, mock, nose }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pygraphviz";
   version = "1.3.1";
 
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index 6b1eebd95c448..f452d05993621 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -5,7 +5,6 @@
 buildPythonApplication rec {
   pname = "PyHamcrest";
   version = "1.9.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index ea364c09b807c..a8946857d88f6 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.43";
+  version = "0.1.44";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b6f4f5c8ddca15e0a1df367bafdffb2f08f1e42f17c78b9470573287e5b20bc";
+    sha256 = "09f928d33fefd1ef5d18325877d73d01c6811b6177fc97fc1190c20acc5e12a9";
   };
 
   # PyPI tarball does not include tests/ directory
diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix
index 563c0a092843e..4460105f61747 100644
--- a/pkgs/development/python-modules/pyjwkest/default.nix
+++ b/pkgs/development/python-modules/pyjwkest/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "pyjwkest";
-  name = "${pname}-${version}";
   version = "1.4.0";
 
   meta = {
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index e9b4db49dbd9b..89ae2f37d10f8 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pylast";
-  version = "2.1.0";
-  name = "${pname}-${version}";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b9b51dc40a7d3ac3eee17ab5b462b8efb7f2c2ff195261ea846ae4e1168e1c5b";
+    sha256 = "f1e8615bac27386712ab74338e6dbd01ff7adbf6648a3debf921cef6bad80014";
   };
 
   propagatedBuildInputs = [ certifi six ];
diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index 7f57f17efeb1a..4f286cc5c419a 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,15 +1,16 @@
-{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }:
+{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:
+
 buildPythonPackage rec {
   version = "1.5.2";
   pname = "pylibmc";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
   };
 
-  buildInputs = [ libmemcached zlib ];
+  buildInputs = [ libmemcached zlib cyrus_sasl ];
+  setupPyBuildFlags = [ "--with-sasl2" ];
 
   # requires an external memcached server running
   doCheck = false;
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 5e053891164ea..cd112f7c4e9ad 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -2,13 +2,12 @@
   pytest, pytestrunner,  mccabe, configparser, backports_functools_lru_cache }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pylint";
-  version = "1.8.4";
+  version = "1.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9";
+    sha256 = "fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3";
   };
 
   buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
@@ -33,7 +32,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.logilab.org/project/pylint;
+    homepage = https://www.logilab.org/project/pylint;
     description = "A bug and style checker for Python";
     platforms = platforms.all;
     license = licenses.gpl1Plus;
diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix
index db8584c4f9e54..79bb6dbd9a2b9 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/pkgs/development/python-modules/pylru/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "pylru-${version}";
+  pname = "pylru";
   version = "1.0.9";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pylru/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi";
   };
 
diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
index 8d61c2bf9e989..600d6406405d0 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "PyLTI";
-  version = "0.5.1";
+  version = "0.6.0";
 
   disabled = !isPy27;
 
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32093d961bf95e508bf27667289155da1e082ed9989bb84a76c54c6974c941e1";
+    sha256 = "b3203c5d0d8a527c092518d82d312757c036055ff628023985ab615ef471e602";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix
index 308958abb6d09..a0dd6113b750c 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/pkgs/development/python-modules/pymc3/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "pymc3";
-  version = "3.2";
+  version = "3.4.1";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hpzhkpv7sbwkcva7x914yvzcf1d1a952ynbcx6mvlgv5lqghc39";
+    sha256 = "b8fe2a1ca142674f1b5cbed05a0a54ce9dade5998370005ddcea349472e7fe2d";
   };
 
   # No need for coverage stats in Nix builds
@@ -57,7 +57,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
-    homepage = http://github.com/pymc-devs/pymc3;
+    homepage = https://github.com/pymc-devs/pymc3;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ilya-kolpakov ];
   };
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 038b12b3a9e71..838adeac8a8e8 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/mongodb/mongo-python-driver";
+    homepage = https://github.com/mongodb/mongo-python-driver;
     license = licenses.asl20;
     description = "Python driver for MongoDB ";
   };
diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix
new file mode 100644
index 0000000000000..f389bee215869
--- /dev/null
+++ b/pkgs/development/python-modules/pynisher/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, psutil, docutils }:
+
+buildPythonPackage rec {
+  pname = "pynisher";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sqa3zzqcr4vl5yhnafw1y187z62m4alajggc7dm2riw2ihd9kxl";
+  };
+
+  propagatedBuildInputs = [ psutil docutils ];
+
+  # no tests in the Pypi archive
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "The pynisher is a little module intended to limit a functions resources.";
+    homepage = https://github.com/sfalkner/pynisher;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+
+}
+
diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix
index ea557938d20fb..ad1f656eb145c 100644
--- a/pkgs/development/python-modules/pyobjc/default.nix
+++ b/pkgs/development/python-modules/pyobjc/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchPypi, isPy3k, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyobjc";
-  version = "4.2.1";
+  version = "4.2.2";
 
   # Gives "No matching distribution found for
   # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"
@@ -11,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b156abab60da3f3c4bc65a919eabb2c98539a94163a277efba5828358396d23e";
+    sha256 = "24be63e394e8e66c1131e2b8e67e44f6c28ceb4329af01e9c10824044be8adbc";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index d8d61c56c3576..ae1133fc0beda 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pyodbc";
   version = "4.0.23";
-  name = "${pname}-${version}";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index f3054e3e4dd43..035c70f3995a0 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "pyOpenSSL";
-  version = "17.5.0";
+  version = "18.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773";
+    sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index 26606a580a4d8..8175ef2b1725b 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -11,6 +11,14 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
+  # This may actually break the package.
+  postPatch = ''
+    substituteInPlace setup.py --replace "requests>=2.18.2,<2.19" "requests"
+  '';
+
+  # No tests in archive
+  doCheck = false;
+
   meta = with lib; {
     description = "A Python wrapper around the OpenWeatherMap web API";
     homepage = https://pyowm.readthedocs.io/;
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index f751a8bfbb2d7..51500281abb64 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
     pname = "pyparsing";
-    name = "${pname}-${version}";
     version = "2.2.0";
 
     src = fetchPypi {
diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 282f9b65cb696..0a972d4864bbe 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "1.6.0";
+  version = "1.6.2";
   pname = "pyperclip";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce829433a9af640e08ee89b20f7c62132714bcc5d77df114044d0fccb8c3b3b8";
+    sha256 = "43496f0a1f363a5ecfc4cda5eba6a2a3d5056fe6c7ffb9a99fbb1c5a3c7dea05";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix
index 0e134f9d84a28..4cc7f1493f8b1 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/pkgs/development/python-modules/pyphen/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Pyphen";
   version = "0.9.4";
 
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 30dbbdba5a576..a16819cab348d 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage (rec {
   pname = "pyproj";
   version = "1.9.5.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 331366e379dda..b669c14564160 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
-{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake
-, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
+{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
+, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
 }:
@@ -64,6 +64,27 @@ in buildPythonPackage {
     runHook postConfigure
   '';
 
+  patches = [
+    # This patch from Arch Linux fixes Cura segfaulting on startup
+    # https://github.com/Ultimaker/Cura/issues/3438
+    # It can probably removed on 5.10.3
+    (fetchpatch {
+      name = "pyqt5-cura-crash.patch";
+      url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f;
+      sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck";
+    })
+    (fetchpatch {
+      name = "pyqt-qt5.11.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-qt5.11.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
+      sha256 = "0qa7w1agjg9da99lvnqwwxnm3pp7qd683h7zggq4c269y2km812h";
+    })
+    (fetchpatch {
+      name = "pyqt-support-new-qt.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-support-new-qt.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
+      sha256 = "1nkl96f4bki37zw6iwvd4vq8z8gg45q5m1cbkbaw72395i0m7p5j";
+    })
+  ];
+
   postInstall = ''
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix
index a95c67b96d29a..299fba098d9d9 100644
--- a/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyramid_beaker";
   version = "0.8";
 
diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix
index 3e2f90aa9d300..3a74a1fe6fa74 100644
--- a/pkgs/development/python-modules/pyro/default.nix
+++ b/pkgs/development/python-modules/pyro/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Distributed object middleware for Python (IPC/RPC)";
-    homepage = http://pythonhosted.org/Pyro/;
+    homepage = https://pythonhosted.org/Pyro/;
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ bjornfor ];
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 6e2d923f80c4b..e9c48cbb8b40c 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -1,13 +1,12 @@
-{stdenv, buildPythonPackage, fetchurl}:
+{stdenv, buildPythonPackage, fetchPypi}:
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.5.0";
-  name = "${pname}-${version}";
+  version = "0.5.2";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "bb02fe5a02fb4e8baad4d7ccf7ba5e748044ee0a1ad7d2fa4927f68f396863c4";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "42bf74495d95a0196a74dd171357f660175aba2bfc23f9b5f63e3830ccbef9ac";
   };
 
   # requires root priviledges
diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix
index fba7a0b27dd90..ab9c93b9b0108 100644
--- a/pkgs/development/python-modules/pyrr/default.nix
+++ b/pkgs/development/python-modules/pyrr/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   version = "0.7.2";
   pname = "pyrr";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 0a98ee02e5819..3290fb74fa182 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite, PCSC }:
+{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
 
 buildPythonPackage rec {
-  version = "1.9.6";
+  version = "1.9.7";
   pname = "pyscard";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pyscard/${name}.tar.gz";
-    sha256 = "6e28143c623e2b34200d2fa9178dbc80a39b9c068b693b2e6527cdae784c6c12";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "412c74c83e7401566e9d3d7b8b5ca965e74582a1f33179b3c1fabf1da73ebf80";
   };
 
-  patchPhase = ''
+  postPatch = ''
     sed -e 's!"libpcsclite\.so\.1"!"${pcsclite}/lib/libpcsclite.so.1"!' \
         -i smartcard/scard/winscarddll.c
   '';
diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix
index 95ab0f339b067..508104d331298 100644
--- a/pkgs/development/python-modules/pyserial/default.nix
+++ b/pkgs/development/python-modules/pyserial/default.nix
@@ -1,9 +1,8 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage, hostPlatform }:
 
 buildPythonPackage rec {
   pname = "pyserial";
   version="3.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -11,6 +10,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = "python -m unittest discover -s test";
+  doInstallCheck = !hostPlatform.isDarwin; # broken on darwin
 
   meta = with lib; {
     homepage = "https://github.com/pyserial/pyserial";
diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix
index 4df98623e118a..d459be25a86e9 100644
--- a/pkgs/development/python-modules/pysha3/default.nix
+++ b/pkgs/development/python-modules/pysha3/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pysha3";
   version = "1.0.2";
-  name = "${pname}-${version}";
   disabled = pythonOlder "2.7";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index ea38c096ee1bd..f03cab5c1938c 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   version = "1.2.12";
   pname = "pyshp";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 226108ad5a5be..288b141d32e82 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -3,7 +3,6 @@
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 buildPythonPackage rec {
   pname = "pyside";
-  name = "${pname}-${version}";
   version = "1.2.4";
   format = "other";
 
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index a6e0ce47f1120..9ad65dc76e0f6 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -3,9 +3,9 @@
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
   pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
-in stdenv.mkDerivation rec {
   pname = "pyside-generatorrunner";
   version = "0.6.16";
+in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index c588bac69ccf9..43ae52338af76 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -3,7 +3,6 @@
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyside-shiboken";
   version = "1.2.4";
 
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index 5acd33d07d2d9..a56899f8d0b3a 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "pyside-tools";
   version = "0.2.15";
-  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 1bc08d634189b..9057c3970e154 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,18 +2,21 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "20180427";
+  version = "20180604";
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7";
-    sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls";
+    rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc";
+    sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj";
   };
 
   buildInputs = [ cython slurm ];
   setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];
 
+  # Test cases need /etc/slurm/slurm.conf and require a working slurm installation
+  doCheck = false;
+
   meta = with lib; {
     homepage = https://github.com/PySlurm/pyslurm;
     description = "Python bindings to Slurm";
diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix
index b2d204e9b9b45..0f915d9a25237 100644
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/pkgs/development/python-modules/pysmbc/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
   version = "1.0.15.8";
   pname = "pysmbc";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix
new file mode 100644
index 0000000000000..9e5097bafad8c
--- /dev/null
+++ b/pkgs/development/python-modules/pysolr/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, setuptools_scm, requests, mock }:
+
+buildPythonPackage rec {
+  pname = "pysolr";
+  version = "3.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b2c5f920d1cabaff8b465447ee152c6985f120b5895f091cf7bf15ff71ade1dc";
+  };
+
+  nativeBuildInputs = [ setuptools_scm ];
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ mock ];
+
+  doCheck = false; # requires network access
+
+  meta = with lib; {
+    description = "Lightweight Python wrapper for Apache Solr";
+    homepage = "http://github.com/toastdriven/pysolr/";
+    license = licenses.bsd3;
+  };
+}
+
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index 3447c64cf6b86..b333ca27143cc 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vlq07yqy6c7ayg401i0qynnliqz405bmw1r8alkck0m1s8kcd8b";
+    sha256 = "52d77a7ef43088b0235742cfcafc83435d0d98c5fdded1d8c600f1887e9e0213";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.
diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix
index 6903b6c7a0c04..c4ebaf160fa65 100644
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/pkgs/development/python-modules/pyspf/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, pydns }:
+{ lib, buildPythonPackage, fetchPypi, pydns }:
 
 buildPythonPackage rec {
-  name = "pyspf-${version}";
+  pname = "pyspf";
   version = "2.0.12";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
   };
 
diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix
index 7fbda048ca335..a5a0104490aaf 100644
--- a/pkgs/development/python-modules/pyspread/default.nix
+++ b/pkgs/development/python-modules/pyspread/default.nix
@@ -17,13 +17,12 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pyspread";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b90edb92c7fce3b8332cdddd3dd1c72ba14440ab39a10ca89c9888ad973a8862";
+    sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83";
   };
 
   propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 147e9773fbf7b..882aed18c591b 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -7,7 +7,6 @@
 
 buildPythonApplication rec {
   pname = "pysrt";
-  name = "${pname}-${version}";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
index ed408feec811b..675bd47481ebd 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -2,10 +2,10 @@
 
 buildPythonPackage rec {
   pname = "pyte";
-  version = "0.7.0";
+  version = "0.8.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7";
+    sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5";
   };
 
   propagatedBuildInputs = [ wcwidth ];
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 0918b5db1db2a..e1ff0998396b9 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, buildPythonPackage, fetchurl, pytest, isPy3k }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pytest-asyncio";
   version = "0.8.0";
 
   disabled = !isPy3k;
 
-  src = fetchurl {
-    url = "mirror://pypi/p/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "f32804bb58a66e13a3eda11f8942a71b1b6a30466b0d2ffe9214787aab0e172e";
   };
 
   buildInputs = [ pytest ];
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "library for testing asyncio code with pytest";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
index c31cd2ab6f631..70a6546189b37 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, py, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pytest-datafiles";
   version = "1.0";
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 0bd59bc85acda..db17d60b62808 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -4,7 +4,6 @@
 }:
 buildPythonPackage rec {
   pname = "pytest-django";
-  name = "${pname}-${version}";
   version = "3.1.2";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix
index b23ae051ad8d7..557446b5adcc8 100644
--- a/pkgs/development/python-modules/pytest-expect/default.nix
+++ b/pkgs/development/python-modules/pytest-expect/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , lib
-, fetchurl
+, fetchPypi
 , pytest
 , u-msgpack-python
 , six
@@ -9,10 +9,9 @@
 buildPythonPackage rec {
   pname = "pytest-expect";
   version = "1.1.0";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847";
   };
 
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index 83fcdaf1b7768..c8ae9882a1e76 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-flakes";
-  version = "2.0.0";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3e880927fd2a77d31715eaab3876196e76d779726c9c24fe32ee5bab23281f82";
+    sha256 = "763ec290b89e2dc8f25f49d71cb9b869b8df843697b730233f61c78f847f2e57";
   };
 
   buildInputs = [ pytestpep8 pytest ];
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index 4d04fa61f232f..14eb3a74d5774 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "pytest-forked";
   version = "0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index cfa24fdfe528b..e0be487e86d31 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -28,6 +28,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # https://github.com/kevin1024/pytest-httpbin/pull/51
+  doCheck = false;
+
   meta = {
     description = "Easily test your HTTP library against a local copy of httpbin.org";
     homepage = https://github.com/kevin1024/pytest-httpbin;
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix
index c1866f174ea25..758a2f194b250 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/pkgs/development/python-modules/pytest-isort/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-isort";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe";
+    sha256 = "d4d195ecfe33d81e258d251b2679b32216bad84131fb41984da22d9d0328a6fe";
   };
 
   propagatedBuildInputs = [ pytestcache pytest isort ];
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index c98370ed9389f..3db802e6e3d93 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -9,7 +9,6 @@
 
 buildPythonPackage rec {
   pname = "pytest-localserver";
-  name = "${pname}-${version}";
   version = "0.4.1";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 88b6a662d4715..c12d4b8add03d 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-mock";
-  version = "1.8.0";
+  version = "1.10.0";
  
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2dd545496af6a0559432b11de79f1fd4fa4a541ae2e01892d5ba6041f85f0994";
+    sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0";
   };
 
   propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock;
diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix
index 1509d80feb1aa..0ff8890a6fbd0 100644
--- a/pkgs/development/python-modules/pytest-pep257/default.nix
+++ b/pkgs/development/python-modules/pytest-pep257/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, buildPythonPackage, fetchurl, pytest, pep257 }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pep257 }:
 
 buildPythonPackage rec {
   pname = "pytest-pep257";
-  name = "${pname}-${version}";
   version = "0.0.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w";
   };
 
diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 6e8742ec2b8ee..1decbeb643d67 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "pytest-quickcheck";
   version = "0.8.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 9c906fe2fa4a3..5931afa37e207 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18lpy6d9b4ck8j3jwh4vmxj54is0fwanpmpg70qg4y0fycdqzwks";
+    sha256 = "be6bf93ed618c8899aeb6721c24f8009c769879a3b4931e05650f3c173ec17c5";
   };
 
   checkInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index d3a4e375ec3a8..cca3279482b8e 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -7,12 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-timeout";
-  version = "1.2.1";
-  name = "${pname}-${version}";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
+    sha256 = "08b550b498b9251901a3747f02aa2624ed53a9c8285ca482551346c85b47d641";
   };
   buildInputs = [ pytest ];
   checkInputs = [ pytest pexpect ];
@@ -20,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with lib;{
     description = "py.test plugin to abort hanging tests";
-    homepage = http://bitbucket.org/pytest-dev/pytest-timeout/;
+    homepage = https://bitbucket.org/pytest-dev/pytest-timeout/;
     license = licenses.mit;
     maintainers = with maintainers; [ makefu ];
   };
diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix
index 596bae68ed076..ccb9ae782aa9a 100644
--- a/pkgs/development/python-modules/pytest-tornado/default.nix
+++ b/pkgs/development/python-modules/pytest-tornado/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-tornado";
-  version = "0.4.5";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b1r5im7qmbpmxhfvq13a6rp78sjjrrpysfnjkd9hggavgc75dr8";
+    sha256 = "214fc59d06fb81696fce3028b56dff522168ac1cfc784cfc0077b7b1e425b4cd";
   };
 
   # package has no tests
diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix
index 753250315a36b..78cd02897f9ae 100644
--- a/pkgs/development/python-modules/pytest-warnings/default.nix
+++ b/pkgs/development/python-modules/pytest-warnings/default.nix
@@ -1,7 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pytest-warnings";
   version = "0.3.0";
 
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 8e6b73b9c5e1c..d8d22ced974ec 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,8 +1,9 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
+, atomicwrites, mock
 }:
 buildPythonPackage rec {
-  version = "3.5.1";
+  version = "3.6.2";
   pname = "pytest";
 
   preCheck = ''
@@ -12,15 +13,21 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8";
+    sha256 = "8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c";
   };
 
-  checkInputs = [ hypothesis ];
+  checkInputs = [ hypothesis mock ];
   buildInputs = [ setuptools_scm ];
-  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ]
+  propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
     ++ (stdenv.lib.optional (!isPy3k) funcsigs)
     ++ (stdenv.lib.optional isPy26 argparse);
 
+  checkPhase = ''
+    runHook preCheck
+    $out/bin/py.test -x testing/
+    runHook postCheck
+  '';
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
     platforms = platforms.unix;
diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index d90b7fa740dc2..91def55c5e440 100644
--- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "python-axolotl-curve25519-${version}";
+  pname = "python-axolotl-curve25519";
   version = "0.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5";
   };
 
diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix
index 71c456875bcf0..1fff6bb760861 100644
--- a/pkgs/development/python-modules/python-axolotl/default.nix
+++ b/pkgs/development/python-modules/python-axolotl/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }:
+{ lib, buildPythonPackage, fetchPypi, python-axolotl-curve25519, protobuf, pycrypto }:
 
 buildPythonPackage rec {
-  name = "python-axolotl-${version}";
+  pname = "python-axolotl";
   version = "0.1.39";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/python-axolotl/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs";
   };
 
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index d2941e4c572bb..94cdd8029baab 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "1.0.3";
   pname = "python-editor";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix
index a8faadffc1129..872fffb7576a6 100644
--- a/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/pkgs/development/python-modules/python-fontconfig/default.nix
@@ -7,7 +7,6 @@ let
 in buildPythonPackage rec {
   pname = "Python-fontconfig";
   version = "0.5.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix
new file mode 100644
index 0000000000000..68f9ad16977b4
--- /dev/null
+++ b/pkgs/development/python-modules/python-forecastio/default.nix
@@ -0,0 +1,31 @@
+{ buildPythonPackage, stdenv, fetchPypi
+, requests
+, nose
+, responses
+}:
+
+buildPythonPackage rec {
+  pname = "python-forecastio";
+  version = "1.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0m6lf4a46pnwm5xg9dnmwslwzrpnj6d9agw570grciivbvb1ji0l";
+
+  };
+
+  checkInputs = [ nose ];
+
+  propagatedBuildInputs = [ requests responses ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://zeevgilovitz.com/python-forecast.io/;
+    description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ makefu ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
index 12b6bf9291874..86e58d489a616 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name    = "${pname}-${version}";
   pname   = "python-gnupg";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wzvx8y4ii1y1vch28a0m6f2y4px9r7qd8fpimsx6y5z4pfscm2s";
+    sha256 = "2d158dfc6b54927752b945ebe57e6a0c45da27747fa3b9ae66eccc0d2147ac0d";
   };
 
   propagatedBuildInputs = [ gnupg1 ];
diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
new file mode 100644
index 0000000000000..08c617d750c30
--- /dev/null
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }:
+
+buildPythonPackage rec {
+  pname = "python-hosts";
+  version = "0.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4a169a4669bddb720c032ef0132203ff8a7b6646266f7e6ab349177bab02b3ba";
+  };
+
+  # win_inet_pton is required for windows support
+  prePatch = ''
+    substituteInPlace setup.py --replace "install_requires=['win_inet_pton']," ""
+    substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" ""
+  '';
+
+  checkInputs = [ pyyaml pytest pytestcov ];
+
+  # Removing 1 test file (it requires internet connection) and keeping the other two
+  checkPhase = ''
+    pytest tests/test_hosts_entry.py
+    pytest tests/test_utils.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library for managing a hosts file. It enables adding and removing entries, or importing them from a file or URL";
+    homepage = https://github.com/jonhadfield/python-hosts;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix
deleted file mode 100644
index f25a89c65d444..0000000000000
--- a/pkgs/development/python-modules/python-openid/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "python-openid";
-  name = "${pname}-${version}";
-  version = "2.2.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
-  };
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "OpenID support for modern servers and consumers";
-    homepage = http://github.com/openid/python-openid;
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix
new file mode 100644
index 0000000000000..b2b103858ccea
--- /dev/null
+++ b/pkgs/development/python-modules/python-periphery/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "python-periphery";
+  version = "1.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f";
+  };
+
+  # Some tests require physical probing and additional physical setup
+  doCheck = false;
+
+  meta = {
+    homepage = https://github.com/vsergeev/python-periphery;
+    description = "Linux Peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) with Python 2 & 3";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bandresen ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix
new file mode 100644
index 0000000000000..5d092f5e6eab7
--- /dev/null
+++ b/pkgs/development/python-modules/python-prctl/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, libcap
+}:
+
+buildPythonPackage rec {
+  pname = "python-prctl";
+  version = "1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1njgixnavmwq45r3gpkhn1y760sax204clagg4gzwvvdc5bdbssp";
+  };
+
+  patches = [ ./skip_bad_tests.patch ];
+  buildInputs = [ libcap ];
+
+  meta = {
+    description = "Python(ic) interface to the linux prctl syscall";
+    homepage = https://github.com/seveas/python-prctl;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
new file mode 100644
index 0000000000000..19d70f234a992
--- /dev/null
+++ b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
@@ -0,0 +1,34 @@
+--- ./test_prctl.py	2018-01-26 16:02:52.000000000 -0500
++++ ./test_prctl.py	2018-06-21 18:26:43.370065009 -0400
+@@ -154,6 +154,7 @@
+         prctl.set_keepcaps(False)
+         self.assertEqual(prctl.get_keepcaps(), False)
+ 
++    @unittest.skip("No access to /proc in the Nix build sandbox")
+     @require('set_mce_kill')
+     def test_mce_kill(self):
+         """Test the MCE_KILL setting"""
+@@ -173,6 +174,7 @@
+         prctl.set_name(name)
+         self.assertEqual(prctl.get_name(), name[:15])
+ 
++    @unittest.skip("The Nix build sandbox has no_new_privs already enabled")
+     @require('get_no_new_privs')
+     def test_no_new_privs(self):
+         """Test the no_new_privs function"""
+@@ -189,6 +191,7 @@
+                 self.assertNotEqual(sp.returncode, 0)
+             os._exit(0)
+ 
++    @unittest.skip("No access to /proc in the Nix build sandbox")
+     def test_proctitle(self):
+         """Test setting the process title, including too long titles"""
+         title = "This is a test!"
+@@ -225,6 +228,7 @@
+             os._exit(0)
+         self.assertRaises(OSError, prctl.set_ptracer, new_pid)
+ 
++    @unittest.skip("The Nix build sandbox has seccomp already enabled")
+     @require('get_seccomp')
+     def test_seccomp(self):
+         """Test manipulation of the seccomp setting"""
diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix
index 1e3f627ab0b9f..24a21959b8c91 100644
--- a/pkgs/development/python-modules/python-simple-hipchat/default.nix
+++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix
@@ -2,7 +2,6 @@
 , unzip }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "python-simple-hipchat";
   version = "0.4.0";
 
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index c0a398a3399dc..9c8cc68af3d06 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, unidecode, regex, isPy3k }:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "python-slugify";
     version = "1.2.5";
 
diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
index f5ce3a156266b..88a2dd2abbf12 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -1,11 +1,10 @@
-{ lib, fetchurl, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "python-sql";
-  name = "${pname}-${version}";
   version = "0.9";
-  src = fetchurl {
-    url = "mirror://pypi/p/python-sql/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c";
   };
   meta = {
diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 44a6b522a4ee5..381ecec996d1e 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -1,17 +1,16 @@
-{ lib, fetchurl, buildPythonPackage, isPy3k }:
+{ lib, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
-  version = "1.8.1";
+  version = "1.9";
   pname = "python-stdnum";
-  name = "${pname}-${version}";
   # Failing tests and dependency issue on Py3k
   disabled = isPy3k;
-  src = fetchurl {
-    url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
-    sha256 = "d7162fdb29337aebed65700cc7297016f6cd32cae4ad7aed8f7e7531f0217943";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3";
   };
   meta = {
-    homepage = http://arthurdejong.org/python-stdnum/;
+    homepage = https://arthurdejong.org/python-stdnum/;
     description = "Python module to handle standardized numbers and codes";
     maintainers = with lib.maintainers; [ johbo ];
     license = lib.licenses.lgpl2Plus;
diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix
index 326151a4843ff..ba5a527fdb082 100644
--- a/pkgs/development/python-modules/python-uinput/default.nix
+++ b/pkgs/development/python-modules/python-uinput/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "python-uinput";
   version = "0.11.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix
index 2365918c7e48c..d0b10c42d0191 100644
--- a/pkgs/development/python-modules/python3-openid/default.nix
+++ b/pkgs/development/python-modules/python3-openid/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, buildPythonPackage, fetchPypi, defusedxml }:
+{ stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
 
 buildPythonPackage rec {
   pname = "python3-openid";
-  name = "${pname}-${version}";
   version = "3.1.0";
 
   src = fetchPypi {
@@ -14,9 +13,11 @@ buildPythonPackage rec {
 
   doCheck = false;
 
+  disabled = !isPy3k;
+
   meta = with stdenv.lib; {
     description = "OpenID support for modern servers and consumers";
-    homepage = http://github.com/necaris/python3-openid;
+    homepage = https://github.com/necaris/python3-openid;
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix
index 6248ed7bf66a6..fd8012a24d32f 100644
--- a/pkgs/development/python-modules/pythonix/default.nix
+++ b/pkgs/development/python-modules/pythonix/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }:
 
-assert isPy3k;
-
-stdenv.mkDerivation rec {
-  name = "pythonix-${version}";
-  version = "0.1.0";
+buildPythonPackage rec {
+  pname = "pythonix";
+  version = "0.1.4";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "pythonix";
     rev = "v${version}";
-    sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj";
+    sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk";
   };
 
-  nativeBuildInputs = [ meson pkgconfig ninja ];
+  disabled = !isPy3k;
+
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+
+  buildInputs = [ nix boost ];
 
-  buildInputs = [ nixUnstable ];
+  checkPhase = ''
+    ninja test
+  '';
 
   meta = with stdenv.lib; {
     description = ''
@@ -23,6 +28,5 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.mic92 ];
     license = licenses.mit;
-    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix
index 374263c2b70ea..ac48fe1c240fe 100644
--- a/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/pkgs/development/python-modules/pytimeparse/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
     pname = "pytimeparse";
-    version = "1.1.7";
-    name = "${pname}-${version}";
+    version = "1.1.8";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "51b641bcd435e0cb6b9701ed79cf7ee97fa6bf2dbb5d41baa16e5486e5d9b17a";
+      sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a";
     };
 
     propagatedBuildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index a34924374819b..31092705d0ff0 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2018.3";
+  version = "2018.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "26143e4ce415919272a5a8d05727bf5e026faa6536fe0ba85302e5b88ebae9f5";
+    sha256 = "f9746ef763ce4d7d59ee8506ee83dd684884e4b520244b67f253095decc8a876";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index b0ac4e0709356..18162d105acfa 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -27,7 +27,6 @@ let
 in buildPythonPackage rec {
   version = "0.4.0";
   pname = "pytorch";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner  = "pytorch";
@@ -62,7 +61,7 @@ in buildPythonPackage rec {
 
   meta = {
     description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
-    homepage = http://pytorch.org/;
+    homepage = https://pytorch.org/;
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ teh ];
diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix
index 65f3d80bdaa7b..734fbbba7179b 100644
--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytz";
-  version = "2018.3";
+  version = "2018.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0";
+    sha256 = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix
index a7c6b6db6b25b..091b42115bf30 100644
--- a/pkgs/development/python-modules/pytzdata/default.nix
+++ b/pkgs/development/python-modules/pytzdata/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytzdata";
-  version = "2018.3";
+  version = "2018.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4e2cceb54335cd6c28caea46b15cd592e2aec5e8b05b0241cbccfb1b23c02ae7";
+    sha256 = "e4ef42e82b0b493c5849eed98b5ab49d6767caf982127e9a33167f1153b36cc5";
   };
 
   # No tests
diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix
index 046424af608ee..b0a4505555a5c 100644
--- a/pkgs/development/python-modules/pyudev/default.nix
+++ b/pkgs/development/python-modules/pyudev/default.nix
@@ -1,14 +1,13 @@
-{ lib, fetchurl, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage
 , six, systemd, pytest, mock, hypothesis, docutils
 }:
 
 buildPythonPackage rec {
   pname = "pyudev";
-  name = "${pname}-${version}";
   version = "0.21.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pyudev/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9";
   };
 
diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix
index 6ba6794bfd13c..c54711bb6c846 100644
--- a/pkgs/development/python-modules/pyusb/default.nix
+++ b/pkgs/development/python-modules/pyusb/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pyusb";
   version = "1.0.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
index c228e44f893f4..15cb474f5fe9e 100644
--- a/pkgs/development/python-modules/pywebdav/default.nix
+++ b/pkgs/development/python-modules/pywebdav/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "PyWebDAV";
   version = "0.9.8";
-  name = "${pname}-${version}";
   disabled = isPy3k;
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
index 10150259ef5c1..3bdc5efaaa53a 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -12,7 +12,6 @@
 buildPythonPackage rec {
   pname = "pywinrm";
   version = "0.3.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix
index d22ba51fc3b88..20666010f9aad 100644
--- a/pkgs/development/python-modules/pyzufall/default.nix
+++ b/pkgs/development/python-modules/pyzufall/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl, python, buildPythonPackage, nose, future, coverage }:
+{ stdenv, fetchPypi, python, buildPythonPackage, nose, future, coverage }:
 
 buildPythonPackage rec {
   pname = "PyZufall";
   version = "0.13.2";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5";
   };
 
@@ -14,7 +13,7 @@ buildPythonPackage rec {
   # https://github.com/nose-devs/nose/issues/1037
   doCheck = false;
 
-  buildInputs = [ nose coverage ];
+  checkInputs = [ nose coverage ];
   propagatedBuildInputs = [ future ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
new file mode 100644
index 0000000000000..174e0871ca2f0
--- /dev/null
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cairocffi
+, cairosvg
+, cffi
+, qiskit
+, svgwrite
+, colorama
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "qasm2image";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "nelimeee";
+    repo = "qasm2image";
+    rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa";
+    sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3";
+  };
+
+  propagatedBuildInputs = [
+    cairocffi
+    cairosvg
+    cffi
+    qiskit
+    svgwrite
+  ];
+
+  checkInputs = [
+    colorama
+  ];
+  checkPhase = ''
+    ${python.interpreter} tests/launch_tests.py
+  '';
+
+  meta = {
+    description = "A Python module to visualise quantum circuit";
+    homepage    = https://github.com/nelimeee/qasm2image;
+    license     = lib.licenses.cecill-b;
+    maintainers = with lib.maintainers; [
+      pandaman
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
new file mode 100644
index 0000000000000..1eda590a864fe
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -0,0 +1,65 @@
+{ stdenv
+, isPy3k
+, buildPythonPackage
+, fetchPypi
+, fetchurl
+, python
+, numpy
+, scipy
+, sympy
+, matplotlib
+, networkx
+, ply
+, pillow
+, cffi
+, requests
+, requests_ntlm
+, IBMQuantumExperience
+, cmake
+, llvmPackages 
+}:
+
+buildPythonPackage rec {
+  pname = "qiskit";
+  version = "0.5.4";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf";
+  };
+
+  buildInputs = [ cmake ]
+    ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp;
+
+  propagatedBuildInputs = [
+    numpy
+    matplotlib
+    networkx
+    ply
+    scipy
+    sympy
+    pillow
+    cffi
+    requests
+    requests_ntlm
+    IBMQuantumExperience
+  ];
+
+  # Pypi's tarball doesn't contain tests
+  doCheck = false;
+
+  patches = [
+    ./setup.py.patch
+  ];
+
+  meta = {
+    description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications";
+    homepage    = https://github.com/QISKit/qiskit-sdk-py;
+    license     = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [
+      pandaman
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch
new file mode 100644
index 0000000000000..9c4224ce64c68
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit/setup.py.patch
@@ -0,0 +1,21 @@
+--- a/setup.py
++++ b/setup.py
+@@ -18,13 +18,13 @@ from setuptools.dist import Distribution
+ 
+ requirements = [
+     "IBMQuantumExperience>=1.9.2",
+-    "matplotlib>=2.1,<2.2",
+-    "networkx>=2.0,<2.1",
+-    "numpy>=1.13,<1.15",
+-    "ply==3.10",
+-    "scipy>=0.19,<1.2",
+-    "sympy>=1.0,<1.2",
+-    "pillow>=4.2.1,<5.2"
++    "matplotlib>=2.1",
++    "networkx>=2.0",
++    "numpy>=1.13",
++    "ply>=3.10",
++    "scipy>=0.19",
++    "sympy>=1.0",
++    "pillow>=4.2.1"
+ ]
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 16d66a6db2177..5b35acc0404e5 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -15,7 +15,6 @@
 buildPythonPackage rec {
   pname = "qtconsole";
   version = "4.3.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix
index afa1895e5404c..4d80a40756467 100644
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "radicale_infcloud";
-  name = "${pname}-${version}";
   version = "2017-07-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix
index 1042b8de98ede..0f870a5ab7a1b 100644
--- a/pkgs/development/python-modules/ramlfications/default.nix
+++ b/pkgs/development/python-modules/ramlfications/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
   pname = "ramlfications";
   version = "0.1.9";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index c2c8c926432a4..83edfa4f1d277 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -8,7 +8,6 @@ assert !useUnrar -> libarchive != null;
 
 buildPythonPackage rec {
   pname = "rarfile";
-  name = "${pname}-${version}";
   version = "3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix
index 9347cd55cf38a..53a8e046b55b6 100644
--- a/pkgs/development/python-modules/rcssmin/default.nix
+++ b/pkgs/development/python-modules/rcssmin/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "rcssmin";
   version = "1.0.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index aa3928db89114..4690dcc89bc8b 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "readme_renderer";
-  version = "18.1";
+  version = "21.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e18cab7f1b07412990df1b59e1be04e1538f514a5bba53ec8777bfc5aac27563";
+    sha256 = "422404013378f0267ee128956021a47457db8eb487908b70b8a7de5fa935781a";
   };
 
   checkInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index cf15d8dbc1fcd..565e6ef5bbf4b 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "rebulk";
   version = "0.9.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix
index e03bd35362714..2078a04be0636 100644
--- a/pkgs/development/python-modules/recommonmark/default.nix
+++ b/pkgs/development/python-modules/recommonmark/default.nix
@@ -9,7 +9,6 @@
 
 buildPythonPackage rec {
   pname = "recommonmark";
-  name = "${pname}-${version}";
   version = "0.4.0";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 87700d8edc437..de2683595e5f2 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "redis";
   version = "2.10.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 234088d1f5196..660f56e1660e1 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2018.02.21";
+  version = "2018.06.21";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29";
+    sha256 = "b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283";
   };
 
   postCheck = ''
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index 7899f86a8cb83..e8e18face0795 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , sphinx
 , pytestcov
@@ -13,15 +13,14 @@
 
 buildPythonPackage rec {
   pname = "reikna";
-  name = "${pname}-${version}";
   version = "0.6.8";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c";
   };
 
-  buildInputs = [ sphinx pytestcov pytest ];
+  checkInputs = [ sphinx pytestcov pytest ];
 
   propagatedBuildInputs = [ Mako numpy funcsigs ]
     ++ stdenv.lib.optional withCuda pycuda
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index 5c5f2578fbf1a..dbc28263b06d5 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -1,11 +1,10 @@
-{ lib, fetchurl, buildPythonPackage, genshi, lxml, python_magic }:
+{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }:
 
 buildPythonPackage rec {
   pname = "relatorio";
-  name = "${pname}-${version}";
   version = "0.8.0";
-  src = fetchurl {
-    url = "mirror://pypi/r/relatorio/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9";
   };
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix
index ef87c4f101957..6bd294671dee9 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/pkgs/development/python-modules/requests-mock/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "requests-mock";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b";
+    sha256 = "a029fe6c5244963ef042c6224ff787049bfc5bab958a1b7e5b632ef0bbb05de4";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
index 8674a05af38c1..d2fcef3e169d9 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -2,13 +2,12 @@
 , oauthlib, requests }:
 
 buildPythonPackage rec {
-  version = "0.8.0";
+  version = "1.0.0";
   pname = "requests-oauthlib";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s7lh5q661gjza1czlmibkrwf8dcj9qfqm3hs39sdbbyflbc8fl8";
+    sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f";
   };
 
   doCheck = false;        # Internet tests fail when building in chroot
diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix
index 809c8d3c96df2..f865f6b8aed9d 100644
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "requests-toolbelt";
   version = "0.8.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index aeca2abf17cf2..99d4b56b2b199 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "requests";
-  version = "2.18.4";
+  version = "2.19.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w";
+    sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix
index 91ab82a7a30e4..6d1264dee67e5 100644
--- a/pkgs/development/python-modules/requests_download/default.nix
+++ b/pkgs/development/python-modules/requests_download/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "requests_download";
   version = "0.1.1";
-  name = "${pname}-${version}";
 
   format = "wheel";
 
diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix
index 51f194a79cf80..12cbae543ce21 100644
--- a/pkgs/development/python-modules/requests_ntlm/default.nix
+++ b/pkgs/development/python-modules/requests_ntlm/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "requests_ntlm";
   version = "1.1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix
index 87af0e78b1836..55b3209553510 100644
--- a/pkgs/development/python-modules/requestsexceptions/default.nix
+++ b/pkgs/development/python-modules/requestsexceptions/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "requestsexceptions";
   version = "1.4.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix
index af1f28d6d72db..b8626524b54f5 100644
--- a/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -12,7 +12,6 @@
 buildPythonPackage rec {
   pname = "restructuredtext_lint";
   version = "1.1.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index a13df64cd03e9..e8a8b9dd637db 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -9,12 +9,11 @@
 
 buildPythonPackage rec {
   pname = "restview";
-  name = "${pname}-${version}";
-  version = "2.8.1";
+  version = "2.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "45320b4e52945d23b3f1aeacc7ff97a3b798204fe625f8b81ed5322326d5bcd1";
+    sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84";
   };
 
   propagatedBuildInputs = [ docutils readme_renderer pygments ];
@@ -27,8 +26,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "ReStructuredText viewer";
-    homepage = http://mg.pov.lt/restview/;
+    homepage = https://mg.pov.lt/restview/;
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ koral ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index e95699360e940..11792f4296af8 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "rfc3986";
   version = "1.1.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index d502ad75566c8..d9c8791817655 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}:
+{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   pname = "rhpl";
   version = "0.218";
-  name = "${pname}-${version}";
+  format = "other";
 
   src = fetchurl {
     url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm;
diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix
index 24adf830699ce..0ec53528df2e4 100644
--- a/pkgs/development/python-modules/rjsmin/default.nix
+++ b/pkgs/development/python-modules/rjsmin/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "rjsmin";
   version = "1.0.12";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 6443a4e2bbfe8..87a59cf73975a 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -1,7 +1,6 @@
 { lib, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "rlp";
   version = "0.6.0";
 
@@ -10,7 +9,8 @@ buildPythonPackage rec {
     sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ ];
 
   meta = {
     description = "A package for encoding and decoding data in and from Recursive Length Prefix notation";
diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix
index 582a4f6138af9..9fcced49b925c 100644
--- a/pkgs/development/python-modules/robotsuite/default.nix
+++ b/pkgs/development/python-modules/robotsuite/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "robotsuite";
   version = "2.0.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix
index fac0780982dbe..616927531a56b 100644
--- a/pkgs/development/python-modules/rocket-errbot/default.nix
+++ b/pkgs/development/python-modules/rocket-errbot/default.nix
@@ -1,11 +1,11 @@
-{ lib, fetchurl, fetchpatch, buildPythonPackage }:
+{ lib, fetchPypi, fetchpatch, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "rocket-errbot-${version}";
+  pname = "rocket-errbot";
   version = "1.2.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/r/rocket-errbot/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "181y1wqjvlry5xdzbliajvrxvswzh3myh795jnj1pm92r5grqzda";
   };
 
diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix
index 1051195222870..3f36eb730ce35 100644
--- a/pkgs/development/python-modules/root_numpy/default.nix
+++ b/pkgs/development/python-modules/root_numpy/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "root_numpy";
   version = "4.7.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix
index e9061b0a6a33a..8384510468a4f 100644
--- a/pkgs/development/python-modules/rootpy/default.nix
+++ b/pkgs/development/python-modules/rootpy/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "rootpy";
   version = "1.0.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index 912b3fd6ab062..b0a761567f2d0 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "rply";
-  name = "${pname}-${version}";
   version = "0.7.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index c689bd4824046..f907f72ff244e 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPyPy
+, isPy27
 , readline
 , R
 , pcre
@@ -16,12 +17,18 @@
 }:
 
 buildPythonPackage rec {
-    version = "2.8.6";
+    version = if isPy27 then
+      "2.8.6" # python2 support dropped in 2.9.x
+    else
+      "2.9.3";
     pname = "rpy2";
     disabled = isPyPy;
     src = fetchPypi {
       inherit version pname;
-      sha256 = "004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98";
+      sha256 = if isPy27 then
+        "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x
+      else
+        "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; # 2.9.x
     };
     buildInputs = [
       readline
diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix
index 3c24a7e522d02..5fbf4b6fab2cc 100644
--- a/pkgs/development/python-modules/s2clientprotocol/default.nix
+++ b/pkgs/development/python-modules/s2clientprotocol/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "s2clientprotocol";
   version = "3.19.1.58600.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index c605d43888c13..0053b125bcb14 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3.";
-    homepage = http://github.com/dask/s3fs/;
+    homepage = https://github.com/dask/s3fs/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ teh ];
   };
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index 37c7b157ea583..ed358213492e4 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -2,18 +2,23 @@
 ,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "salmon-mail";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18";
+    sha256 = "452557172901d6227a325bbc72fcf61002a53c2342d935457b729303dce71f7e";
   };
 
   checkInputs = [ nose jinja2 mock ];
   propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
 
+  # The tests use salmon executable installed by salmon itself so we need to add
+  # that to PATH
+  checkPhase = ''
+    PATH=$out/bin:$PATH nosetests .
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://salmon-mail.readthedocs.org/;
     description = "Pythonic mail application server";
diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix
index b6beb3ec8875a..fcc27e3c4dbe3 100644
--- a/pkgs/development/python-modules/sampledata/default.nix
+++ b/pkgs/development/python-modules/sampledata/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "sampledata";
-  name = "${pname}-${version}";
   version = "0.3.7";
 
   meta = {
diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix
index 340c8d002b72b..bbdc4d90b2884 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "sarge-${version}";
+  pname = "sarge";
   version = "0.1.4";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/sarge/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar";
   };
 
diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix
index 521f68db1cc6b..9aa2269c95759 100644
--- a/pkgs/development/python-modules/scandir/default.nix
+++ b/pkgs/development/python-modules/scandir/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "scandir-${version}";
+  pname = "scandir";
   version = "1.7";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/scandir/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj";
   };
 
diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix
index 2c8e63e5ed2f0..d68f38aa4bb54 100644
--- a/pkgs/development/python-modules/schema/default.nix
+++ b/pkgs/development/python-modules/schema/default.nix
@@ -3,12 +3,11 @@
 buildPythonPackage rec {
 
   pname = "schema";
-  version = "0.6.7";
-  name = "${pname}-${version}";
+  version = "0.6.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "410f44cb025384959d20deef00b4e1595397fa30959947a4f0d92e9c84616f35";
+    sha256 = "fa1a53fe5f3b6929725a4e81688c250f46838e25d8c1885a10a590c8c01a7b74";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 00bdcae1b9a83..edaf7cd90cc5f 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   pname = "scikit-learn";
   version = "0.19.1";
-  name = "${pname}-${version}";
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
@@ -15,6 +14,10 @@ buildPythonPackage rec {
     sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0";
   };
 
+  # basically https://github.com/scikit-learn/scikit-learn/pull/10723,
+  # but rebased onto 0.19.1
+  patches = [ ./n_iter-should-be-less-than-max_iter-using-lbgfs.patch ];
+
   buildInputs = [ nose pillow gfortran glibcLocales ];
   propagatedBuildInputs = [ numpy scipy numpy.blas ];
 
diff --git a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch
new file mode 100644
index 0000000000000..67309a673d080
--- /dev/null
+++ b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch
@@ -0,0 +1,73 @@
+diff --git a/sklearn/linear_model/huber.py b/sklearn/linear_model/huber.py
+index e17dc1e..665654d 100644
+--- a/sklearn/linear_model/huber.py
++++ b/sklearn/linear_model/huber.py
+@@ -181,7 +181,11 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator):
+ 
+     n_iter_ : int
+         Number of iterations that fmin_l_bfgs_b has run for.
+-        Not available if SciPy version is 0.9 and below.
++
++        .. versionchanged:: 0.20
++
++            In SciPy <= 1.0.0 the number of lbfgs iterations may exceed
++            ``max_iter``. ``n_iter_`` will now report at most ``max_iter``.
+ 
+     outliers_ : array, shape (n_samples,)
+         A boolean mask which is set to True where the samples are identified
+@@ -272,7 +276,9 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator):
+             raise ValueError("HuberRegressor convergence failed:"
+                              " l-BFGS-b solver terminated with %s"
+                              % dict_['task'].decode('ascii'))
+-        self.n_iter_ = dict_.get('nit', None)
++        # In scipy <= 1.0.0, nit may exceed maxiter.
++        # See https://github.com/scipy/scipy/issues/7854.
++        self.n_iter_ = min(dict_.get('nit', None), self.max_iter)
+         self.scale_ = parameters[-1]
+         if self.fit_intercept:
+             self.intercept_ = parameters[-2]
+diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py
+index 8646c9a..c72a7d9 100644
+--- a/sklearn/linear_model/logistic.py
++++ b/sklearn/linear_model/logistic.py
+@@ -718,7 +718,9 @@ def logistic_regression_path(X, y, pos_class=None, Cs=10, fit_intercept=True,
+                 warnings.warn("lbfgs failed to converge. Increase the number "
+                               "of iterations.")
+             try:
+-                n_iter_i = info['nit'] - 1
++                # In scipy <= 1.0.0, nit may exceed maxiter.
++                # See https://github.com/scipy/scipy/issues/7854.
++                n_iter_i = min(info['nit'], max_iter)
+             except:
+                 n_iter_i = info['funcalls'] - 1
+         elif solver == 'newton-cg':
+@@ -1115,6 +1117,11 @@ class LogisticRegression(BaseEstimator, LinearClassifierMixin,
+         it returns only 1 element. For liblinear solver, only the maximum
+         number of iteration across all classes is given.
+ 
++        .. versionchanged:: 0.20
++
++            In SciPy <= 1.0.0 the number of lbfgs iterations may exceed
++            ``max_iter``. ``n_iter_`` will now report at most ``max_iter``.
++
+     See also
+     --------
+     SGDClassifier : incrementally trained logistic regression (when given
+diff --git a/sklearn/linear_model/tests/test_huber.py b/sklearn/linear_model/tests/test_huber.py
+index 08f4fdf..ca1092f 100644
+--- a/sklearn/linear_model/tests/test_huber.py
++++ b/sklearn/linear_model/tests/test_huber.py
+@@ -42,6 +42,13 @@ def test_huber_equals_lr_for_high_epsilon():
+     assert_almost_equal(huber.intercept_, lr.intercept_, 2)
+ 
+ 
++def test_huber_max_iter():
++    X, y = make_regression_with_outliers()
++    huber = HuberRegressor(max_iter=1)
++    huber.fit(X, y)
++    assert huber.n_iter_ == huber.max_iter
++
++
+ def test_huber_gradient():
+     # Test that the gradient calculated by _huber_loss_and_gradient is correct
+     rng = np.random.RandomState(1)
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 9adac49bdcc8c..5e57dd3f093da 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8739c67842ed9a1c34c62d6cca6301d0ade40d50ef14ba292bd331f0d6c940ba";
+    sha256 = "878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1";
   };
 
   checkInputs = [ nose pytest ];
@@ -50,7 +50,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
-    homepage = http://www.scipy.org/;
+    homepage = https://www.scipy.org/;
     maintainers = with lib.maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix
index a612528d47ab4..45db62db8e553 100644
--- a/pkgs/development/python-modules/scp/default.nix
+++ b/pkgs/development/python-modules/scp/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "scp";
-  version = "0.10.2";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18f59e48df67fac0b069591609a0f4d50d781a101ddb8ec705f0c2e3501a8386";
+    sha256 = "ea095dd1d0e131874bc9930c3965bce3d1d70be5adb2a30d811fcaea4708a9ee";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index f33acc79a2bb0..1c03e381bdca7 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -1,40 +1,39 @@
-{ stdenv, buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
+{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore,
   testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
   service-identity, parsel, pydispatcher, cssselect, lib }:
 buildPythonPackage rec {
-    version = "1.5.0";
-    pname = "Scrapy";
-    name = "${pname}-${version}";
+  version = "1.5.0";
+  pname = "Scrapy";
 
-    buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
-    propagatedBuildInputs = [
-      six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
-    ];
+  checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
+  propagatedBuildInputs = [
+    six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
+  ];
 
-    # Scrapy is usually installed via pip where copying all
-    # permissions makes sense. In Nix the files copied are owned by
-    # root and readonly. As a consequence scrapy can't edit the
-    # project templates.
-    patches = [ ./permissions-fix.patch ];
+  # Scrapy is usually installed via pip where copying all
+  # permissions makes sense. In Nix the files copied are owned by
+  # root and readonly. As a consequence scrapy can't edit the
+  # project templates.
+  patches = [ ./permissions-fix.patch ];
 
-    LC_ALL="en_US.UTF-8";
+  LC_ALL="en_US.UTF-8";
 
-    checkPhase = ''
-      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"}
-      # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
-      # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396
-    '';
+  checkPhase = ''
+    py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"}
+    # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
+    # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396
+  '';
 
-    src = fetchurl {
-      url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
-      sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755";
-    };
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755";
+  };
 
-    meta = with lib; {
-      description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
-      homepage = http://scrapy.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ drewkett ];
-      platforms = platforms.unix;
-    };
+  meta = with lib; {
+    description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
+    homepage = https://scrapy.org/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ drewkett ];
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index 20ad32b326130..cc6fed43a42a4 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "seaborn";
   version = "0.8.1";
-  name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
     sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae";
diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
index 9b64ce811ef7f..98bbef174ae78 100644
--- a/pkgs/development/python-modules/secretstorage/default.nix
+++ b/pkgs/development/python-modules/secretstorage/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "secretstorage";
   version = "2.3.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "mitya57";
diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix
new file mode 100644
index 0000000000000..de17e65d2bfb5
--- /dev/null
+++ b/pkgs/development/python-modules/seekpath/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, future, spglib, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "seekpath";
+  version = "1.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bdc0400c96952525b1165894807e4bec90aaedb11cfeb27a57414e6091eb026";
+  };  
+
+  LC_ALL = "en_US.utf-8";
+
+  propagatedBuildInputs = [ numpy spglib future ];
+
+  nativeBuildInputs = [ glibcLocales ];
+
+  meta = with stdenv.lib; {
+    description = "A module to obtain and visualize band paths in the Brillouin zone of crystal structures.";
+    homepage = https://github.com/giovannipizzi/seekpath;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 21aa41d800537..f92362ff8afbd 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "semver";
   version = "2.7.9";
 
diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix
index 610a75fa3176c..b627322307dcc 100644
--- a/pkgs/development/python-modules/serpy/default.nix
+++ b/pkgs/development/python-modules/serpy/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "serpy";
-  name = "${pname}-${version}";
   version = "0.3.1";
 
   meta = {
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix
index 1d9274610dade..1cef1510ccf52 100644
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/pkgs/development/python-modules/serversyncstorage/default.nix
@@ -20,7 +20,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "serversyncstorage-${version}";
+  pname = "serversyncstorage";
   version = "1.6.11";
   disabled = !isPy27;
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0";
   };
 
-  buildInputs = [ testfixtures unittest2 webtest ];
+  checkInputs = [ testfixtures unittest2 webtest ];
   propagatedBuildInputs = [
     pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql
     pymysqlsa umemcache WSGIProxy requests pybrowserid
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 972d8e90bf63b..ea4781097220e 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "39.0.1";
+  version = "39.2.0";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "bec7badf0f60e7fc8153fac47836edc41b74e5d541d7692e614e635720d6a7c7";
+    sha256 = "f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2";
   };
 
   nativeBuildInputs = [ unzip wrapPython ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = https://pypi.python.org/pypi/setuptools;
     license = with licenses; [ psfl zpl20 ];
-    platforms = platforms.all;
+    platforms = python.meta.platforms;
     priority = 10;
   };
 }
diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
index 3e78c9b45bf6c..1420428e97366 100644
--- a/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -1,12 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, pip }:
 buildPythonPackage rec {
   pname = "setuptools_scm";
-  name = "${pname}-${version}";
-  version = "1.17.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "70a4cf5584e966ae92f54a764e6437af992ba42ac4bca7eb37cc5d02b98ec40a";
+    sha256 = "a767141fecdab1c0b3c8e4c788ac912d7c94a0d6c452d40777ba84f918316379";
   };
 
   buildInputs = [ pip ];
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 6f10cfdf3ba38..52101b3482f9c 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -4,7 +4,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Shapely";
   version = "1.6.4.post1";
 
diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix
index e3f65b6660c25..d059d720f8bdf 100644
--- a/pkgs/development/python-modules/simanneal/default.nix
+++ b/pkgs/development/python-modules/simanneal/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "simanneal";
   version = "0.4.1";
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "perrygeo";
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index 8e637a673b1f0..b3377e75f67b4 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -1,11 +1,10 @@
-{ lib, fetchurl, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "simpleeval";
-  name = "${pname}-${version}";
   version = "0.9.5";
-  src = fetchurl {
-    url = "mirror://pypi/s/simpleeval/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3";
   };
   meta = {
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 25dbecac9497c..b42be465a3b48 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -6,13 +6,12 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.13.2";
-  name = "${pname}-${version}";
+  version = "3.15.0";
   doCheck = !stdenv.isDarwin;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a32d4f0a";
+    sha256 = "ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 77857df0764f6..0503e2ef04fe4 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -3,11 +3,10 @@
 if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   pname = "sip";
   version = "4.19.6";
-  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx";
   };
 
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
new file mode 100644
index 0000000000000..190692c43627c
--- /dev/null
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python }:
+
+buildPythonPackage rec {
+  pname = "sklearn-deap";
+  version = "0.2.2";
+
+  # No tests in Pypi
+  src = fetchFromGitHub {
+    owner = "rsteca";
+    repo = pname;
+    rev = "${version}";
+    sha256 = "01ynmzxg181xhv2d7bs53zjvk9x2qpxix32sspq54mpigxh13ava";
+  };
+
+  propagatedBuildInputs = [ numpy scipy deap scikitlearn ];
+
+  checkPhase = ''
+    ${python.interpreter} test.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Use evolutionary algorithms instead of gridsearch in scikit-learn";
+    homepage = https://github.com/rsteca/sklearn-deap;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
index c6444224104fe..7f437ec59c112 100644
--- a/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, buildPythonPackage, dns, pyasn1 }:
+{ stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }:
 
 buildPythonPackage rec {
-  name = "sleekxmpp-${version}";
+  pname = "sleekxmpp";
   version = "1.3.1";
 
   propagatedBuildInputs = [ dns pyasn1 ];
@@ -10,8 +10,8 @@ buildPythonPackage rec {
     ./dnspython-ip6.patch
   ];
 
-  src = fetchurl {
-    url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr";
   };
 
diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
index c4992eb9d9bb6..006f52f1d38b7 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -13,7 +13,6 @@
 
 buildPythonPackage rec {
   pname = "smart_open";
-  name = "${pname}-${version}";
   version = "1.5.7";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index 64c6831475363..9a3afc3fb4b82 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, tornado }:
+{ stdenv, fetchPypi, buildPythonPackage, tornado }:
 
 buildPythonPackage rec {
   pname = "snakeviz";
-  name = "${pname}-${version}";
   version = "0.4.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/snakeviz/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "18vsaw1wmf903fg21zkk6a9b49gj47g52jm5h52g4iygngjhpx79";
   };
 
diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix
index eff799e0d014a..b8b67f708e6d8 100644
--- a/pkgs/development/python-modules/sockjs-tornado/default.nix
+++ b/pkgs/development/python-modules/sockjs-tornado/default.nix
@@ -1,18 +1,18 @@
-{ lib, buildPythonPackage, fetchurl, tornado }:
+{ lib, buildPythonPackage, fetchPypi, tornado }:
 
 buildPythonPackage rec {
-  name = "sockjs-tornado-${version}";
+  pname = "sockjs-tornado";
   version = "1.0.3";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
   };
 
   propagatedBuildInputs = [ tornado ];
 
   meta = with lib; {
-    homepage = http://github.com/mrjoes/sockjs-tornado/;
+    homepage = https://github.com/mrjoes/sockjs-tornado/;
     description = "SockJS python server implementation on top of Tornado framework";
     license = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
new file mode 100644
index 0000000000000..152a61bbf1d4d
--- /dev/null
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
+
+# Test dependencies
+, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
+, sphinx_rtd_theme
+}:
+
+buildPythonPackage rec {
+  pname = "soco";
+  version = "0.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18bxpbd7l9gns0jpvx09z023kbbz7b6i4f99i8silsb1jv682kg0";
+  };
+
+  propagatedBuildInputs = [ xmltodict requests ];
+  checkInputs = [
+    pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
+    sphinx_rtd_theme
+  ];
+
+  meta = {
+    homepage = http://python-soco.com/;
+    description = "A CLI and library to control Sonos speakers";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 050a59c6e926b..5b8c4a46b2be1 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -4,16 +4,16 @@
 , cffi
 , numpy
 , portaudio
+, substituteAll
 }:
 
 buildPythonPackage rec {
   pname = "sounddevice";
-  name = "${pname}-${version}";
-  version = "0.3.9";
+  version = "0.3.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c9e833f8c8ccc67c0291c3448b29e9acc548fe56d15ee6f7fdd7037e00319f8";
+    sha256 = "0pfcbgbl77nggchxb2i5rb78m7hpgn65aqpz99yfx1fgfbmy9yg1";
   };
 
   propagatedBuildInputs = [ cffi numpy portaudio ];
@@ -21,9 +21,12 @@ buildPythonPackage rec {
   # No tests included nor upstream available.
   doCheck = false;
 
-  prePatch = ''
-    substituteInPlace src/sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'"
-  '';
+  patches = [
+    (substituteAll {
+      src = ./fix-portaudio-library-path.patch;
+      portaudio = "${portaudio}/lib/libportaudio.so.2";
+    })
+  ];
 
   meta = {
     description = "Play and Record Sound with Python";
diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
new file mode 100644
index 0000000000000..5be786ee0f5cd
--- /dev/null
+++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
@@ -0,0 +1,34 @@
+diff --git a/sounddevice.py b/sounddevice.py
+index f03476c..5745b6e 100644
+--- a/sounddevice.py
++++ b/sounddevice.py
+@@ -58,28 +58,7 @@ from ctypes.util import find_library as _find_library
+ from _sounddevice import ffi as _ffi
+
+
+-try:
+-    for _libname in (
+-            'portaudio',  # Default name on POSIX systems
+-            'bin\\libportaudio-2.dll',  # DLL from conda-forge
+-            ):
+-        _libname = _find_library(_libname)
+-        if _libname is not None:
+-            break
+-    else:
+-        raise OSError('PortAudio library not found')
+-    _lib = _ffi.dlopen(_libname)
+-except OSError:
+-    if _platform.system() == 'Darwin':
+-        _libname = 'libportaudio.dylib'
+-    elif _platform.system() == 'Windows':
+-        _libname = 'libportaudio' + _platform.architecture()[0] + '.dll'
+-    else:
+-        raise
+-    import _sounddevice_data
+-    _libname = _os.path.join(
+-        next(iter(_sounddevice_data.__path__)), 'portaudio-binaries', _libname)
+-    _lib = _ffi.dlopen(_libname)
++_lib = _ffi.dlopen('@portaudio@')
+
+ _sampleformats = {
+     'float32': _lib.paFloat32,
diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index 2d591eef72330..d9a67454fe6a1 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/pkgs/development/python-modules/spacy/models.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchurl, spacy }:
 let
   buildModelPackage = { pname, version, sha256, license }: buildPythonPackage {
-    name = "${pname}-${version}";
     inherit pname version;
 
     src = fetchurl {
diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix
index 08500aeb4ad1f..2d2f066eaedc1 100644
--- a/pkgs/development/python-modules/spake2/default.nix
+++ b/pkgs/development/python-modules/spake2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "SPAKE2 password-authenticated key exchange library";
-    homepage = "http://github.com/warner/python-spake2";
+    homepage = https://github.com/warner/python-spake2;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix
index 3386fdd1e2a36..19d5cb1549315 100644
--- a/pkgs/development/python-modules/spambayes/default.nix
+++ b/pkgs/development/python-modules/spambayes/default.nix
@@ -1,7 +1,6 @@
 { buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "spambayes";
   version = "1.1b2";
 
diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix
new file mode 100644
index 0000000000000..07273d0fa0d4f
--- /dev/null
+++ b/pkgs/development/python-modules/spglib/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, python }:
+
+buildPythonPackage rec {
+  pname = "spglib";
+  version = "1.10.3.65";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "55b49227835396b2bcd6afe724e9f37202ad0f61e273bedebd5bf740bad2e8e3";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  checkPhase = ''
+    cd test
+    ${python.interpreter} -m unittest discover -bv
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for C library for finding and handling crystal symmetries";
+    homepage = https://atztogo.github.io/spglib;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+
+}
+
diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix
index 2efb23c80864b..3ddfdab50aa28 100644
--- a/pkgs/development/python-modules/sphinx-testing/default.nix
+++ b/pkgs/development/python-modules/sphinx-testing/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
   pname = "sphinx-testing";
   version = "0.7.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 3ccccdbf77d83..0c45592fc219c 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -25,12 +25,11 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.7.4";
+  version = "1.7.5";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10";
+    sha256 = "d45480a229edf70d84ca9fae3784162b1bc75ee47e480ffe04a4b7f21a95d76d";
   };
   LC_ALL = "en_US.UTF-8";
 
@@ -70,4 +69,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nand0p ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 4911c982cd067..8f3724e97cabc 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -3,12 +3,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.3.6";
+  version = "0.4.0";
   pname = "sphinxcontrib-bibtex";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mfl3k6axq6rzqwq62fj8y9gabim2zcvydjpqmjj27f8v1qw0kpc";
+    sha256 = "cb9fb4526642fc080204fccd5cd8f41e9e95387278e17b1d6969b1e27c2d3e0c";
   };
 
   propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
index fa308dc37bb0d..cb3d76e6a7414 100644
--- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-websupport";
-  version = "1.0.1";
-  name = "${pname}-${version}";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9";
+    sha256 = "9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix
index abd9bd230d403..91a94a6e84195 100644
--- a/pkgs/development/python-modules/splinter/default.nix
+++ b/pkgs/development/python-modules/splinter/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "splinter";
-  version = "0.7.7";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f97119f84d339067169451d56043f37f6b0a504a17a7ac6e48c91c012be72af6";
+    sha256 = "463e98135a85ff98f6c0084cb34cea1fe07827444958d224c087a84093a65281";
   };
 
   propagatedBuildInputs = [ selenium ];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 882574aa675a8..211419f86b1bf 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -10,12 +10,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  name = "${pname}-${version}";
-  version = "1.2.7";
+  version = "1.2.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6cda03b0187d6ed796ff70e87c9a7dce2c2c9650a7bc3c022cd331416853c31";
+    sha256 = "2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c";
   };
 
   checkInputs = [
@@ -26,7 +25,7 @@ buildPythonPackage rec {
   ] ++ lib.optional (!isPy3k) pysqlite;
 
   checkPhase = ''
-    py.test
+    py.test -k "not test_round_trip_direct_type_affinity"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 9a2aaeaa5538c..bc2218f7deec4 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,12 +5,11 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.2.5";
-  name = "${pname}-${version}";
+  version = "1.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93fe37e535f4aabd05a7456295f39c0af73cbcd0511750663fc7a718c5915919";
+    sha256 = "a3649f9b5219b7336b82d3a1bf6e91c8d649171b96747b927a92ac075947d619";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index f4c74cfccf81e..ba26ba5e651cf 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,12 +13,11 @@
 
 buildPythonPackage rec {
   pname = "statsmodels";
-  version = "0.8.0";
-  name = "${pname}-${version}";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048";
+    sha256 = "6461f93a842c649922c2c9a9bc9d9c4834110b89de8c4af196a791ab8f42ba3b";
   };
 
   checkInputs = with self; [ nose ];
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 9639ce9619480..e7745cf862526 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "stevedore";
   version = "1.28.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index 1d3438032af74..3d2b2337be4c3 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -2,11 +2,10 @@
 
 buildPythonPackage rec {
   pname = "PyStringTemplate";
-  name = "${pname}-${version}";
   version = "3.2b1";
 
   src = fetchurl {
-    url = "http://www.stringtemplate.org/download/${name}.tar.gz";
+    url = "http://www.stringtemplate.org/download/${pname}-${version}.tar.gz";
     sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
   };
 
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 95da0ec9b4f8e..07849b0f30c17 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.79.1";
+  version = "1.82.2";
 
   # Tests require network connectivity and there's no easy way to disable
   # them. ~ C.
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ec19bf8ad588ec04b36c35f359196fa1991f9ad911b1686ac2a12651a154947";
+    sha256 = "9d0443d772d176faba8c8e8a2ddc3a507861dd7d882b4a88cf6062b20fa5f224";
   };
 
   checkInputs = [ unittest2 mock ];
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 0788ddaeec622..0da11909de9d7 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchPypi
 , buildPythonApplication
 , guessit
 , babelfish
@@ -20,11 +20,10 @@
 
 buildPythonApplication rec {
   pname = "subliminal";
-  name = "${pname}-${version}";
   version = "2.0.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/subliminal/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl";
   };
 
diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix
index cb7a6fe2e868c..c6fe0975c3aac 100644
--- a/pkgs/development/python-modules/subprocess32/default.nix
+++ b/pkgs/development/python-modules/subprocess32/default.nix
@@ -9,13 +9,12 @@
 
 buildPythonPackage rec {
   pname = "subprocess32";
-  version = "3.2.7";
-  name = "${pname}-${version}";
+  version = "3.5.2";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e450a4a4c53bf197ad6402c564b9f7a53539385918ef8f12bdf430a61036590";
+    sha256 = "eb2b989cf03ffc7166339eb34f1aa26c5ace255243337b1e22dab7caa1166687";
   };
 
   buildInputs = [ bash ];
diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix
index 35600357d2cc2..e647696c02b77 100644
--- a/pkgs/development/python-modules/supervise_api/default.nix
+++ b/pkgs/development/python-modules/supervise_api/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "supervise_api";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dakc1h2ih1bw67y137wp0vph8d3y2lx5d70b8dgggy1zbpqxl1m";
+    sha256 = "1230f42294910e83421b7d3b08a968d27d510a4a709e966507ed70db5da1b9de";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index 67c799e554ebd..f41f2e7b4fa1f 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , glibcLocales
 , mpmath
 }:
@@ -25,10 +26,26 @@ buildPythonPackage rec {
     export LANG="en_US.UTF-8"
   '';
 
+  patches = [
+    # see https://trac.sagemath.org/ticket/20204 and https://github.com/sympy/sympy/issues/12825
+    # There is also an upstream patch for this, included in the next release (PR #128826).
+    # However that doesn't quite fix the issue yet. Apparently some changes by sage are required.
+    # TODO re-evaluate the change once a new sympy version is released (open a sage trac ticket about
+    # it).
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
+    })
+    (fetchpatch {
+      url = "https://github.com/sympy/sympy/pull/13276.patch";
+      sha256 = "1rz74b5c74vwh3pj9axxgh610i02l3555vvsvr4a15ya7siw7zxh";
+    })
+  ];
+
   meta = {
     description = "A Python library for symbolic mathematics";
     homepage    = http://www.sympy.org/;
     license     = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lovek323 ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix
index e050bcf540434..3c650bd60ddac 100644
--- a/pkgs/development/python-modules/syncserver/default.nix
+++ b/pkgs/development/python-modules/syncserver/default.nix
@@ -16,7 +16,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "syncserver-${version}";
+  pname = "syncserver";
   version = "1.6.0";
   disabled = ! isPy27;
 
@@ -31,9 +31,4 @@ buildPythonPackage rec {
     cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver
     serversyncstorage configparser
   ];
-
-  meta = {
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
-  };
 }
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index d2346b7addbd0..b042108d088ec 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, fetchurl, python, buildPythonPackage
+{ stdenv, fetchPypi, python, buildPythonPackage
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }:
 
 buildPythonPackage rec {
-  version = "3.4.3";
+  version = "3.4.4";
   pname = "tables";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/t/tables/${name}.tar.gz";
-    sha256 = "b6aafe47154e2140c0a91bb38ebdb6ba67a24dd86263f1c294af8c11cb7deed4";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bdc5c073712af2a43babd139c4855fc99496bb2c3f3f5d1b4770a985e6f9ce29";
   };
 
   buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
@@ -31,7 +30,7 @@ buildPythonPackage rec {
   # github issue:
   #     https://github.com/PyTables/PyTables/issues/269
   checkPhase = ''
-    ${python}/bin/${python.executable} <<EOF
+    ${python.interpreter} <<EOF
     import sysconfig
     import sys
     import os
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 1ac6c4a54d072..c56a5d7889f63 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -3,7 +3,6 @@
 , six, pytz}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "tempora";
   version = "1.9";
 
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index f0b4e6f341d4a..0d80853957362 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -3,33 +3,33 @@
 , numpy
 , werkzeug
 , protobuf
+, grpcio
 , markdown
 , futures
 }:
 
-# tensorflow is built from a downloaded wheel, because
-# https://github.com/tensorflow/tensorboard/issues/719
-# blocks buildBazelPackage.
+# tensorflow/tensorboard is built from a downloaded wheel, because
+# https://github.com/tensorflow/tensorboard/issues/719 blocks
+# buildBazelPackage.
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "1.5.1";
-  name = "${pname}-${version}";
+  version = "1.7.0";
   format = "wheel";
 
   src = fetchPypi ({
-    pname = "tensorflow_tensorboard";
+    pname = "tensorboard";
     inherit version;
     format = "wheel";
   } // (if isPy3k then {
     python = "py3";
-    sha256 = "1cydgvrr0s05xqz1v9z2wdiv60gzbs8wv9wvbflw5700a2llb63l";
+    sha256 = "1aa42rl3fkpllqch09d311gk1j281qry6nn07ywgbs6j0kwr6isc";
   } else {
     python = "py2";
-    sha256 = "0dhljddlirq6nr84zg4yrk5k69gj3x2abb6wg3crgrparb6qbya7";
+    sha256 = "1vcdkyvw22kpljmj4gxb8m1q54ry02iwvw54w8v8hmdigvc77a7k";
   }));
 
-  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ] ++ lib.optional (!isPy3k) futures;
+  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures;
 
   meta = with stdenv.lib; {
     description = "TensorFlow's Visualization Toolkit";
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 9c6b84e8c7ac1..21b21f174d0be 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -3,8 +3,11 @@
 , fetchurl
 , buildPythonPackage
 , isPy3k, isPy35, isPy36, pythonOlder
+, astor
+, gast
 , numpy
 , six
+, termcolor
 , protobuf
 , absl-py
 , mock
@@ -47,7 +50,7 @@ in buildPythonPackage rec {
     dls = import ./tf1.7.1-hashes.nix;
   in fetchurl dls.${key};
 
-  propagatedBuildInputs = [ numpy six protobuf absl-py ]
+  propagatedBuildInputs = [ numpy six protobuf absl-py astor gast termcolor ]
                  ++ lib.optional (!isPy3k) mock
                  ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ]
                  ++ lib.optional (pythonOlder "3.6") tensorflow-tensorboard;
@@ -68,7 +71,7 @@ in buildPythonPackage rec {
   lib.optionalString (stdenv.isLinux) ''
     rrPath="$out/${python.sitePackages}/tensorflow/:${rpath}"
     internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
-    find $out -name '*.${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \;
+    find $out -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \;
   '';
 
 
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 8d2d6fa9c14c1..8163243eb0a44 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -124,7 +124,6 @@ let
 in buildPythonPackage rec {
   pname = "tensorflow";
   inherit version;
-  name = "${pname}-${version}";
 
   src = pkg;
 
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 2b9ef2e24a16f..628be2e946af6 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "testfixtures";
-  version = "6.0.2";
+  version = "6.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f8827cfc91e5cc9ac669727fdd48a85880f391b935a0a212b5cedb807879feec";
+    sha256 = "7e4df89a8bf8b8905464160f08aff131a36f0b33654fe4f9e4387afe546eae25";
   };
 
   checkInputs = [ mock manuel pytest sybil zope_component ];
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 4ffe8ec735c66..d42430248216f 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -23,7 +23,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "textacy";
   version = "0.6.1";
 
diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix
index fc97297c0106b..277d70cba6a46 100644
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/pkgs/development/python-modules/texttable/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "texttable";
-  version = "1.2.1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c89dc0148ae29645917aab7e970a30d1af565b3ca276cef8ab1a60469f0d8100";
+    sha256 = "0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index e4ed824d2302c..0ffaf315d54b4 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "3.9.2";
   pname = "thespian";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 62e0d28959a22..b581282002380 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -27,11 +27,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "6.10.2";
+  version = "6.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs";
+    sha256 = "028a014192e1914c151222794781d14e1c9fddf47a859aa36077f07871d0c30a";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 94261b10e3d05..37d8f3a513434 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -1,26 +1,19 @@
 { buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
 , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
-, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib
+, piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib
 }:
 
 buildPythonPackage rec {
   pname = "thumbor";
-  version = "6.4.2";
+  version = "6.5.1";
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
+    sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
-      sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix
index 6161b0492be68..b55c42cfa561e 100644
--- a/pkgs/development/python-modules/tiros/default.nix
+++ b/pkgs/development/python-modules/tiros/default.nix
@@ -4,7 +4,6 @@
 
 buildPythonPackage rec {
   pname = "tiros";
-  name = "${pname}-${version}";
   version = "1.0.44";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix
index d6929caf2bd3f..e25d871f978dd 100644
--- a/pkgs/development/python-modules/titlecase/default.nix
+++ b/pkgs/development/python-modules/titlecase/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "titlecase";
-  name = "${pname}-${version}";
   version = "0.12.0";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix
index 86dfe5d7f8937..829d7bcfcb2b6 100644
--- a/pkgs/development/python-modules/todoist/default.nix
+++ b/pkgs/development/python-modules/todoist/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, python, buildPythonPackage
+{ stdenv, fetchPypi, python, buildPythonPackage
 , requests }:
 
 buildPythonPackage rec {
   pname = "todoist-python";
   version = "7.0.17";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0gs4vlvvmkz627ybswj0l6m3c8dyrqgfqjlawbc8d9rkx88srkr2";
   };
 
diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix
index af7acbc0218e7..c6efe5ba2397e 100644
--- a/pkgs/development/python-modules/tokenserver/default.nix
+++ b/pkgs/development/python-modules/tokenserver/default.nix
@@ -16,7 +16,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "tokenserver-${version}";
+  pname = "tokenserver";
   version = "1.2.27";
 
   src = fetchgit {
@@ -26,11 +26,8 @@ buildPythonPackage rec {
   };
 
   doCheck = false;
-  buildInputs = [ testfixtures ];
+  checkInputs = [ testfixtures ];
   propagatedBuildInputs = [ cornice mozsvc pybrowserid tokenlib
     pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.all;
-  };
 }
diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
index 0fc14024903e9..0fea8f1ab7510 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec{
   pname = "toolz";
   version = "0.9.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -23,9 +22,9 @@ buildPythonPackage rec{
   '';
 
   meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
+    homepage = https://github.com/pytoolz/toolz/;
     description = "List processing tools and functional utilities";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 5dace76c9b2c7..0915bc300c54a 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "PyTorch vision library";
-    homepage    = http://pytorch.org/;
+    homepage    = https://pytorch.org/;
     license     = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ericsagnes ];
   };
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 23ad1bc2624dd..87fa393ce5e33 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -11,12 +11,11 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.21.0";
-  name = "${pname}-${version}";
+  version = "4.23.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b94af236084ceaad93a6ada00bd9976900b172ec9b821828ed0d4b53f7431170";
+    sha256 = "77b8424d41b31e68f437c6dd9cd567aebc9a860507cb42fbd880a5f822d966fe";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];
diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
index 8cc1332b473f7..0f18c6693869d 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -14,7 +14,6 @@
 buildPythonPackage rec {
   pname = "traitlets";
   version = "4.3.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
index afb35b579731b..f42a4a02be805 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -7,7 +7,6 @@
 
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "transaction";
   version = "2.2.1";
 
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 3144e8e4de985..90d8003bb346d 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -3,7 +3,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "treq";
   version = "17.8.0";
 
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 3a6b5f62e4f57..9a6a3c39eec1f 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -3,7 +3,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "trezor";
   version = "0.9.1";
 
diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
index 8f0fbbd6dfbfe..097e691f7c182 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }:
 buildPythonPackage rec {
   pname = "twill";
   version = "1.8.0";
-  name = "${pname}-${version}";
 
   disabled = isPy3k;
 
-  src = fetchurl {
-    url    = "mirror://pypi/t/twill/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ nose ];
+  checkInputs = [ nose ];
 
   doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://twill.idyll.org/;
-    description = "a simple scripting language for Web browsing";
+    description = "A simple scripting language for Web browsing";
     license     = licenses.mit;
-    platforms = platforms.all;
     maintainers = with maintainers; [ mic92 ];
   };
 }
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 9cb3a09d363e8..dfcce835e658a 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -11,7 +11,6 @@
 buildPythonPackage rec {
   pname = "twine";
   version = "1.11.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index a064a7c98b417..14ccac5690bc2 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
+, fetchPypi
 , python
 , zope_interface
 , incremental
@@ -13,12 +13,12 @@
 }:
 buildPythonPackage rec {
   pname = "Twisted";
-  name = "${pname}-${version}";
-  version = "17.9.0";
+  version = "18.4.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c";
+  src = fetchPypi {
+    inherit pname version;
+    extension = "tar.bz2";
+    sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9";
   };
 
   propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://twistedmatrix.com/;
+    homepage = https://twistedmatrix.com/;
     description = "Twisted, an event-driven networking engine written in Python";
     longDescription = ''
       Twisted is an event-driven networking engine written in Python
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 4abd97d24362f..5558a7e339ada 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "txaio";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0";
+    sha256 = "4797f9f6a9866fe887c96abc0110a226dd5744c894dc3630870542597ad30853";
   };
 
   checkInputs = [ pytest mock ];
@@ -22,6 +22,5 @@ buildPythonPackage rec {
     homepage    = "https://github.com/crossbario/txaio";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
-    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 09004e9337a0e..e369e13cb9571 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "txtorcon";
-  version = "0.20.0";
+  version = "18.0.0";
 
   checkInputs = [ pytest mock lsof GeoIP ];
   propagatedBuildInputs = [
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e";
+    sha256 = "0z2gsyp9msxrzsm7vq2vq8231a678g4g563xni6cnq4xdb4nx3w1";
   };
 
   # Skip a failing test until fixed upstream:
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 0a073cca0c514..0cfc8c3e14a93 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
   pname = "typed-ast";
   version = "1.1.0";
-  name = "${pname}-${version}";
   src = fetchPypi{
     inherit pname version;
     sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa";
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 0af8c47e35cb6..611eeba8ae039 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -7,7 +7,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "typeguard";
   version = "2.1.4";
 
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index 1c61d0afab3b8..3bb75fb2ac291 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -2,7 +2,6 @@
 , tzlocal, pytz }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "tzlocal";
   version = "1.5.1";
 
diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix
index cbb3f9bfa8f88..aed68f3ad59d9 100644
--- a/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , lib
-, fetchurl
+, fetchPypi
 , glibcLocales
 , python
 }:
@@ -8,10 +8,9 @@
 buildPythonPackage rec {
   pname = "u-msgpack-python";
   version = "2.5.0";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702";
   };
 
diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix
index 1b397f6c73797..cd004c59d4a45 100644
--- a/pkgs/development/python-modules/ua-parser/default.nix
+++ b/pkgs/development/python-modules/ua-parser/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ua-parser";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p8siba0rnb5nsl354fd5fc4751d5ybw7hgnd56yn8dncxdb1bqa";
+    sha256 = "97bbcfc9321a3151d96bb5d62e54270247b0e3be0590a6f2ff12329851718dcb";
   };
 
   buildInputs = [ pyyaml ];
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
index c0748b6b53b2c..235f33da59944 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "UkPostcodeParser";
   version = "1.1.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index d90ada6063216..38c46bd11fa8f 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, nose, numpy }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "uncertainties";
   version = "3.0.2";
 
@@ -16,7 +15,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://pythonhosted.org/uncertainties/;
+    homepage = https://pythonhosted.org/uncertainties/;
     description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
     maintainers = with maintainers; [ rnhmjoj ];
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index 3cffe38049001..1b98b8adf7329 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, glibcLocales }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Unidecode";
   version = "1.0.22";
 
diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix
index 89496e00e5685..d7a8e6eaf04d4 100644
--- a/pkgs/development/python-modules/unifi/default.nix
+++ b/pkgs/development/python-modules/unifi/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "unifi";
   version = "1.2.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix
index 129ad0ded6c7d..e7e559234f661 100644
--- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix
+++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix
@@ -1,9 +1,8 @@
 {lib, fetchPypi, buildPythonPackage, six}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "unittest-xml-reporting";
-  version = "2.1.1";
+  version = "2.2.0";
 
   propagatedBuildInputs = [six];
 
@@ -12,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6";
+    sha256 = "3ba27af788bddb4403ee72561bfd3df2deb27a926a5426aa9beeb354c59b9c44";
   };
   meta = with lib; {
     homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/;
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index e58bbde1353fa..45c1428c60649 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "2.8.23";
+  version = "2.8.33";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7";
+    sha256 = "42b6482d085b699a534f0a3ec352e96d4653e31c8839855c8a852618f54e27d8";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 0917c5ab6eef8..7be8f01f23c86 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,13 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake
+, pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }:
 
-if lib.versionOlder python.version "3.5.0"
-then throw "Uranium not supported for interpreter ${python.executable}"
-else
-
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   version = "3.3.0";
   pname = "uranium";
-  name = "${pname}-${version}";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
@@ -16,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb";
   };
 
+  disabled = pythonOlder "3.5.0";
+
   buildInputs = [ python gettext ];
   propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
   nativeBuildInputs = [ cmake doxygen ];
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index 108a7cf5bb0be..6835f8c48e0a7 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "uritools";
-  version = "2.1.0";
+  version = "2.2.0";
   name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7b58a249a851ef5fff1bc513b940653f0d4841a6668e02431c1297f05efeec3";
+    sha256 = "80e8e23cafad54fd85811b5d9ba0fc595d933f5727c61c3937945eec09f99e2b";
   };
 
   propagatedBuildInputs = [ ipaddress ];
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 10021e14f126d..a575a86d1f6be 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -4,12 +4,11 @@
 
 buildPythonPackage rec {
   pname = "urllib3";
-  version = "1.22";
-  name = "${pname}-${version}";
+  version = "1.23";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c";
+    sha256 = "a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf";
   };
 
   NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index b76a1475bbfb4..c49b82f6ca02c 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage (rec {
   pname = "urwid";
   version = "1.3.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix
index 6b14eebb310fb..07cbdc57ef9e4 100644
--- a/pkgs/development/python-modules/user-agents/default.nix
+++ b/pkgs/development/python-modules/user-agents/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ua-parser ];
 
+  doCheck = false; # some tests fail due to ua-parser bump to 0.8.0
+
   meta = with stdenv.lib; {
     description = "A Python library to identify devices by parsing user agent strings";
     homepage = https://github.com/selwin/python-user-agents;
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 9387c7de792be..ab4ce1be2b1a6 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -16,12 +16,11 @@
 
 buildPythonPackage rec {
   pname = "vcrpy";
-  version = "1.11.1";
-  name = "${pname}-${version}";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320";
+    sha256 = "13c6a835a6dc1ac96d7e6cae03587525eb260d7a46c6e5dd7a25416655eecb3a";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix
index 4274abf3b3298..ffe184e263ab9 100644
--- a/pkgs/development/python-modules/vcversioner/default.nix
+++ b/pkgs/development/python-modules/vcversioner/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "vcversioner";
   version = "2.16.0.0";
 
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index beed654491481..1813ae587c1af 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -3,12 +3,11 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "0.5.0";
-  name = "${pname}-${version}";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9871bce3a00bb775d9f7f8212aa237f99f11ca7cfe6ecf246773f5559f20c38c";
+    sha256 = "2c5561238fbd4a0669aea457decb47c5155e9741b47a41f23cc030387f725edc";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
index bf5a09a241875..0e0a169d5523f 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "vine";
   version = "1.1.4";
-  name = "${pname}-${version}";
 
   disable = pythonOlder "2.7";
 
diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix
index e18e9f87acd36..6fc50b81803f2 100644
--- a/pkgs/development/python-modules/virtkey/default.nix
+++ b/pkgs/development/python-modules/virtkey/default.nix
@@ -1,9 +1,11 @@
 { lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }:
 
-buildPythonPackage rec {
-  name = "virtkey-${version}";
+let
   majorVersion = "0.63";
-  version = "${majorVersion}.0";
+  minorVersion = "0";
+in buildPythonPackage rec {
+  pname = "virtkey";
+  version = "${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index ffb2bb7619002..75557cf895a5f 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "15.2.0";
-  name = "${pname}-${version}";
+  version = "16.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54";
+    sha256 = "ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752";
   };
 
   # Doubt this is needed - FRidh 2017-07-07
diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix
index 8d52f65d498e5..3c0b8a1f59324 100644
--- a/pkgs/development/python-modules/vobject/default.nix
+++ b/pkgs/development/python-modules/vobject/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }:
 
 buildPythonPackage rec {
-  version = "0.9.5";
+  version = "0.9.6";
   pname = "vobject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243";
+    sha256 = "cd9ede4363f83c06ba8d8f1541c736efa5c46f9a431430002b2f84f4f4e674d8";
   };
 
   disabled = isPyPy;
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 589f8de99ee5c..a8661fd3a9851 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -1,12 +1,12 @@
-{ fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }:
+{ lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang, ncurses
+, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
 
-pythonPackages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "vowpalwabbit";
-  name = "${pname}-${version}";
   version = "8.5.0";
 
-  src = fetchurl{
-    url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
+  src = fetchPypi{
+    inherit pname version;
     sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304";
   };
   # vw tries to write some explicit things to home
@@ -15,13 +15,13 @@ pythonPackages.buildPythonPackage rec {
     export HOME=$PWD
   '';
 
-  buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
-  propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
+  buildInputs = [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
+  propagatedBuildInputs = [ numpy scipy scikitlearn ];
 
   checkPhase = ''
     # check-manifest requires a git clone, not a tarball
     # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
-    python setup.py check -mrs
+    ${python.interpreter} setup.py check -mrs
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix
index ac83430fbae20..c152271af3359 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, fetchpatch
 , mock
 , boto3, envs, python-jose, requests }:
 
@@ -14,6 +14,14 @@ buildPythonPackage rec {
     sha256 = "0gw3crg64p1zx3k5js0wh0x5bldgs7viy4g8hld9xbka8q0374hi";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-pip10-compat.patch";
+      url = " https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch";
+      sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c";
+    })
+  ];
+
   # this needs to go when 0.6.2 or later is released
   postPatch = ''
     substituteInPlace requirements.txt \
diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix
index a5a7957e8ec1d..a8a4e474f5388 100644
--- a/pkgs/development/python-modules/webassets/default.nix
+++ b/pkgs/development/python-modules/webassets/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml, nose, jinja2, mock, pytest }:
 
 buildPythonPackage rec {
-  name = "webassets-${version}";
+  pname = "webassets";
   version = "0.12.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/w/webassets/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7";
   };
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Media asset management for Python, with glue code for various web frameworks";
-    homepage = http://github.com/miracle2k/webassets/;
+    homepage = https://github.com/miracle2k/webassets/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix
index edd0a364ea147..c4ab0dd59cad4 100644
--- a/pkgs/development/python-modules/webencodings/default.nix
+++ b/pkgs/development/python-modules/webencodings/default.nix
@@ -1,20 +1,19 @@
 { buildPythonPackage
 , lib
-, fetchurl
+, fetchPypi
 , pytest
 }:
 
 buildPythonPackage rec {
   pname = "webencodings";
   version = "0.5.1";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
 
   checkPhase = ''
     py.test webencodings/tests.py
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index f24f10675f809..8b2584a16d320 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -1,18 +1,16 @@
 { lib
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , pythonOlder
 }:
 
-let
+buildPythonPackage rec {
   pname = "websockets";
-  version = "4.0.1";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
+  version = "5.0.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674";
   };
 
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix
index dd6e9200db520..846e9a2a0f533 100644
--- a/pkgs/development/python-modules/websockets_client/default.nix
+++ b/pkgs/development/python-modules/websockets_client/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, six }:
 buildPythonPackage rec {
   pname = "websocket_client";
-  version = "0.47.0";
+  version = "0.48.0";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0jb1446053ryp5p25wsr1hjfdzwfm04a6f3pzpcb63bfz96xqlx4";
+    sha256 = "18f1170e6a1b5463986739d9fd45c4308b0d025c1b2f9b88788d8f69e8a5eb4a";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index 58be98f183b64..9496d51bfc1e6 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -3,7 +3,6 @@
 , pytest, requests, glibcLocales }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Werkzeug";
   version = "0.14.1";
 
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 6db21baf7509f..f8868f02c2c2e 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -9,12 +9,11 @@
 
 buildPythonPackage rec {
   pname = "wheel";
-  version = "0.31.0";
-  name = "${pname}-${version}";
+  version = "0.31.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce";
+    sha256 = "0a2e54558a0628f2145d2fc822137e322412115173e8a2ddbe1c9024338ae83c";
   };
 
   checkInputs = [ pytest pytestcov coverage ];
diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix
index 7e2a571b1bbab..cf3fce18c14c6 100644
--- a/pkgs/development/python-modules/whoosh/default.nix
+++ b/pkgs/development/python-modules/whoosh/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Whoosh";
   version = "2.7.4";
   src = fetchPypi {
@@ -22,7 +21,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Fast, pure-Python full text indexing, search, and spell
 checking library.";
-    homepage    = "http://bitbucket.org/mchaput/whoosh";
+    homepage    = https://bitbucket.org/mchaput/whoosh;
     license     = licenses.bsd2;
     maintainers = with maintainers; [ nand0p ];
     platforms   = platforms.all;
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index cae05c74268fb..5af9119508a4c 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,7 +7,6 @@
 
 buildPythonPackage rec {
   pname = "widgetsnbextension";
-  name = "${pname}-${version}";
   version = "3.2.1";
 
   src = fetchPypi {
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index d468955e27da4..b2ce75c43c3a5 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
   pname = "wptserve";
   version = "1.4.0";
-  name = "${pname}-${version}";
 
   disabled = isPy3k;
 
diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix
index f5a83a7bc0293..3d81fe532aba8 100644
--- a/pkgs/development/python-modules/ws4py/default.nix
+++ b/pkgs/development/python-modules/ws4py/default.nix
@@ -2,7 +2,6 @@
 , cherrypy, gevent, tornado }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ws4py";
   version = "0.5.1";
 
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 4035575915f08..039a751a5e14d 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.10.3";
+  version = "0.10.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "72fafe29ba00633483aed39e405442226ef66d2ddc1021a39527ae1522b7067a";
+    sha256 = "d87241580e3eccb961dfc16e804e1b92b3d6a8000ffee82ceb076767934342cc";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index 217c823afe576..9b53c180397df 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -1,6 +1,4 @@
 { stdenv
-, lib
-, pkgs
 , buildPythonPackage
 , nose
 , scipy
@@ -8,15 +6,14 @@
 }:
 
 buildPythonPackage rec {
-  name = "xgboost-${version}";
-
+  pname = "xgboost";
   inherit (xgboost) version src meta;
 
   propagatedBuildInputs = [ scipy ];
   checkInputs = [ nose ];
 
   postPatch = let
-    libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so";
+    libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}";
 
   in ''
     cd python-package
diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
index 82364ee1d1c48..5de0348e00e90 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -1,21 +1,19 @@
 { buildPythonPackage
-, fetchurl
-, fetchpatch
+, fetchPypi
 , nose
 , lib
 }:
 
 buildPythonPackage rec {
   pname = "xlwt";
-  name = "${pname}-${version}";
   version = "1.3.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88";
   };
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
   checkPhase = ''
     nosetests -v
   '';
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
new file mode 100644
index 0000000000000..29830adb5ede2
--- /dev/null
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml }:
+
+buildPythonPackage rec {
+  pname = "xml2rfc";
+  version = "2.9.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m";
+  };
+
+  propagatedBuildInputs = [ intervaltree pyflakes requests lxml ];
+
+  meta = with lib; {
+    description = "Tool generating IETF RFCs and drafts from XML sources";
+    homepage = https://tools.ietf.org/tools/xml2rfc/trac/;
+    # Well, parts might be considered unfree, if being strict; see:
+    # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vcunat ];
+  };
+}
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 944118870b674..ec725564f2b2a 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchurl, isPy3k }:
 buildPythonPackage rec {
   pname = "xmpp.py";
-  name = "${pname}-${version}";
   version = "0.5.0rc1";
 
   patches = [ ./ssl.patch ];
diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix
index c414e0a070ae5..d884f12bdbf15 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib;{
-    homepage =  http://jquery.org;
+    homepage =  https://jquery.org;
     description = "jquery packaged static files for python";
     license = licenses.mit;
     maintainers = with maintainers; [ makefu ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 859bd62f998ce..e27abba413d11 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "yamllint";
   version = "1.9.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index c1914a0345867..3ed7fa640500f 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.21.0";
-  name = "${pname}-${version}";
+  version = "0.22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d8ae3567f3fb2d288f127d35e4decb3348c96cd091001e02e818465da618f90";
+    sha256 = "a98a6eacca64d2b920558f4a2f78150db9474de821227e60deaa29f186121c63";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 1953b1610ceb4..3425d915f45a0 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.1.1";
+  version = "1.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a69dd7e262cdb265ac7d5e929d55f2f3d07baaadd158c8f19caebf8dde08dfe8";
+    sha256 = "c8cbc21bbfa1dd7d5386d48cc814fe3d35b80f60299cdde9279046f399c3b0d8";
   };
 
   checkInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix
index 7f9f3b6467afd..3c51d00ec1488 100644
--- a/pkgs/development/python-modules/yenc/default.nix
+++ b/pkgs/development/python-modules/yenc/default.nix
@@ -6,12 +6,9 @@
 , isPy3k
 }:
 
-let
+buildPythonPackage rec{
   pname = "yenc";
   version = "0.4.0";
-in buildPythonPackage {
-  name = "${pname}-${version}";
-
   src = fetchurl {
     url = "https://bitbucket.org/dual75/yenc/get/${version}.tar.gz";
     sha256 = "0zkyzxgq30mbrzpnqam4md0cb09d5falh06m0npc81nnlhcghkp7";
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index 6e05b6ced0434..fe7f0cf466e11 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -4,7 +4,6 @@ with lib;
 
 buildPythonApplication rec {
   pname = "yolk";
-  name = "${pname}-${version}";
   version = "0.4.3";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix
index 4ffd0e94c6116..c51f5ebf04978 100644
--- a/pkgs/development/python-modules/zc_lockfile/default.nix
+++ b/pkgs/development/python-modules/zc_lockfile/default.nix
@@ -7,12 +7,11 @@
 
 buildPythonPackage rec {
   pname = "zc.lockfile";
-  version = "1.2.1";
-  name = "${pname}-${version}";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e";
+    sha256 = "96cb13769e042988ea25d23d44cf09342ea0f887083d0f9736968f3617665853";
   };
 
   buildInputs = [ mock ];
@@ -20,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Inter-process locks";
-    homepage =  http://www.python.org/pypi/zc.lockfile;
+    homepage =  https://www.python.org/pypi/zc.lockfile;
     license = licenses.zpl20;
     maintainers = with maintainers; [ goibhniu ];
   };
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 6923f876ff21c..f8f933b96abb1 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "ZConfig";
   version = "3.2.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 64b2874ef6277..418fcebaefd52 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -23,15 +23,13 @@
 , tornado
 }:
 
-let
+buildPythonPackage rec {
   pname = "zeep";
-  version = "2.5.0";
-in buildPythonPackage {
-  name = "${pname}-${version}";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4f9db52c7d269813fc6251da4cb050869158858aeea75a055b4550f19e52ac84";
+    sha256 = "faab59d57275ce35845f42371cca83b3957982cdca9621228153fb99c770c4fc";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index f3dbf70eecfc9..06c5fe3a1be0c 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "zeroconf";
   version = "0.20.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index d72752a598840..8fc15c5da6fa4 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -3,7 +3,6 @@
 , pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "zetup";
   version = "0.2.43";
 
diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix
index 2929afed1cd3d..2148dcc4b8025 100644
--- a/pkgs/development/python-modules/zipfile36/default.nix
+++ b/pkgs/development/python-modules/zipfile36/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
   pname = "zipfile36";
   version = "0.1.3";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix
index aac2bceeb15d2..4d5fabe7fca0c 100644
--- a/pkgs/development/python-modules/zipstream/default.nix
+++ b/pkgs/development/python-modules/zipstream/default.nix
@@ -1,17 +1,15 @@
-{ lib, buildPythonPackage, fetchurl, nose }:
+{ lib, buildPythonPackage, fetchPypi, nose }:
 
-let
+buildPythonPackage rec {
   pname = "zipstream";
   version = "1.1.4";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/z/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif";
   };
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
   meta = {
     description = "A zip archive generator";
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 25ab7dcd31ada..9aab2ba9e8441 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -18,7 +18,6 @@
 buildPythonPackage rec {
     pname = "ZODB";
     version = "5.4.0";
-    name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index 108f5395ece43..c3f41d281c660 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -5,13 +5,12 @@
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "1.0";
-  name = "${pname}-${version}";
+  version = "1.0.1";
   disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3af9169fb1d5901cf6693ab356b0dfda20ad2cacc5673fad59b4449ed50d5399";
+    sha256 = "5fdfa84f05b25511a4e1190ec98728aa487e2eb6db016a951fdbb79bcc7307e0";
   };
 
   # fails..
diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index 32f756a3cdd65..77075c36b2228 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.interface";
-  version = "4.4.3";
-  name = "${pname}-${version}";
+  version = "4.5.0";
   
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce";
+    sha256 = "57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c";
   };
 
   propagatedBuildInputs = [ zope_event ];
diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix
index 4f34d7d028834..8287c05f743b3 100644
--- a/pkgs/development/python-modules/zxcvbn-python/default.nix
+++ b/pkgs/development/python-modules/zxcvbn-python/default.nix
@@ -7,7 +7,6 @@ buildPythonPackage rec {
   pname = "zxcvbn-python";
   version = "4.4.24";
 
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix
index c4d6897b9989e..54c4968607dff 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/pkgs/development/r-modules/bioc-annotation-packages.nix
@@ -4,10 +4,10 @@
 # Rscript generate-r-packages.R bioc-annotation >new && mv new bioc-annotation-packages.nix
 
 { self, derive }:
-let derive2 = derive { biocVersion = "3.6"; };
+let derive2 = derive { biocVersion = "3.8"; };
 in with self; {
   AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.0"; sha256="0g92nz33rx14zl5can7s701bipdgz7rxqygvvc22c4a0qj52ijnq"; depends=[]; };
-  AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.4"; sha256="0wchfmz3fl0vx7mmddh9s6sy04xvjh6nkw61yx1ddcdhzrwa45i7"; depends=[AnnotationHubData ensembldb]; };
+  AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.6"; sha256="1sdxj2rxhc2cj2rgfif2flnic57zkdrhdvhr3y64amcmrp57xgj4"; depends=[AnnotationHubData ensembldb]; };
   BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; };
   BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; };
   BSgenome_Amellifera_UCSC_apiMel2 = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2"; version="1.4.0"; sha256="1967w7aly7qydykk7rar712kvgsav3zjr4kirybkj17nwiynd74g"; depends=[BSgenome]; };
@@ -86,6 +86,7 @@ in with self; {
   BSgenome_Scerevisiae_UCSC_sacCer1 = derive2 { name="BSgenome.Scerevisiae.UCSC.sacCer1"; version="1.4.0"; sha256="1smx3zdmllrx5f1a7hv1w3jc59jwvkd2n37hz6hgb80da7lajn2b"; depends=[BSgenome]; };
   BSgenome_Scerevisiae_UCSC_sacCer2 = derive2 { name="BSgenome.Scerevisiae.UCSC.sacCer2"; version="1.4.0"; sha256="1ilz326qx1ikapmsz00hg5g6i637qm9kwc21z93q890h7sgaz4k0"; depends=[BSgenome]; };
   BSgenome_Scerevisiae_UCSC_sacCer3 = derive2 { name="BSgenome.Scerevisiae.UCSC.sacCer3"; version="1.4.0"; sha256="1pnd394xfy413nvxq3hrlv33girj8f9kzdzi9gx232lm12av6hxm"; depends=[BSgenome]; };
+  BSgenome_Sscrofa_UCSC_susScr11 = derive2 { name="BSgenome.Sscrofa.UCSC.susScr11"; version="1.4.2"; sha256="0m7c2r74qp3rjnkxxyz18gd8xjk2f3cp1cr07bwd8v60mvgdn8cq"; depends=[BSgenome]; };
   BSgenome_Sscrofa_UCSC_susScr3 = derive2 { name="BSgenome.Sscrofa.UCSC.susScr3"; version="1.4.0"; sha256="0l70arnpshiviq3xj61fw87dhf8sggq6k1yryagbhdb40d5cq8lq"; depends=[BSgenome]; };
   BSgenome_Sscrofa_UCSC_susScr3_masked = derive2 { name="BSgenome.Sscrofa.UCSC.susScr3.masked"; version="1.3.99"; sha256="0ym82vysn131anp8zmmkgyx6zmyh44am5i1m3j9kj5lvq874ycha"; depends=[BSgenome BSgenome_Sscrofa_UCSC_susScr3]; };
   BSgenome_Tgondii_ToxoDB_7_0 = derive2 { name="BSgenome.Tgondii.ToxoDB.7.0"; version="0.99.0"; sha256="1ilpfd66hn0qh1dkj9l8wkddym9d320blwj5hx0x7dq92bnzs98v"; depends=[BSgenome]; };
@@ -111,8 +112,8 @@ in with self; {
   FDb_UCSC_snp137common_hg19 = derive2 { name="FDb.UCSC.snp137common.hg19"; version="1.0.0"; sha256="1q1r7rk29q0zlzxz6fvfy1kjfli6wxzvhvhhfnf3z4ksy5332q63"; depends=[AnnotationDbi GenomicFeatures]; };
   FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; };
   GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; };
-  GO_db = derive2 { name="GO.db"; version="3.5.0"; sha256="02d1mn1al3q7qvhx1ylrr3ar4w4iw0qyi5d89v2336rzwk9maq35"; depends=[AnnotationDbi]; };
-  GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.0.0"; sha256="0xp8hyc4r3lz76i0x8r9lp74h2j8p7fcrn7nqmjhx5kn9bdp7fyp"; depends=[]; };
+  GO_db = derive2 { name="GO.db"; version="3.6.0"; sha256="0fi2qywr9apg5lwfqfq9qq6bgrnv4rdhxx25656qn4bsy62i838j"; depends=[AnnotationDbi]; };
+  GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.1.0"; sha256="0k1hsjx6n2i1sf14hyrgdhxqxm5mxk0bgnivhiax944whcicmzbf"; depends=[]; };
   Homo_sapiens = derive2 { name="Homo.sapiens"; version="1.3.1"; sha256="151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01"; depends=[AnnotationDbi GenomicFeatures GO_db org_Hs_eg_db OrganismDbi TxDb_Hsapiens_UCSC_hg19_knownGene]; };
   Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.3"; sha256="034aady3hy8j9bm7pbl8l8h0gcfnzmpyxg9l9s1ky0pj7ryzr93a"; depends=[AnnotationDbi org_Hs_eg_db]; };
   HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.3"; sha256="0x6nxvzmc8k4qp382ca32y58awkxpg0b3kc7m1mz9iag6sq7c5vx"; depends=[AnnotationDbi org_Hs_eg_db]; };
@@ -131,99 +132,102 @@ in with self; {
   IlluminaHumanMethylationEPICanno_ilm10b3_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b3.hg19"; version="0.6.0"; sha256="1rdkvbpbz8a8bd9ipycfmgn8a3x519abhwywka21ii9ziv3s6ah6"; depends=[minfi]; };
   IlluminaHumanMethylationEPICanno_ilm10b4_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b4.hg19"; version="0.6.0"; sha256="0687b4k8hwfc18qgdd9ypv1skp37jd204fszba0gmrv3dc92i09c"; depends=[minfi]; };
   IlluminaHumanMethylationEPICmanifest = derive2 { name="IlluminaHumanMethylationEPICmanifest"; version="0.3.0"; sha256="0alhjda5g186z8b1nsmnpfswrlj7prdz8mkwx60wkkl6hkcnk6p3"; depends=[minfi]; };
-  JASPAR2018 = derive2 { name="JASPAR2018"; version="1.0.0"; sha256="1j82wsayzn6zn7irihpc8jivvwfsdrckik0ypajsv3pgrb5b3naa"; depends=[]; };
+  JASPAR2018 = derive2 { name="JASPAR2018"; version="1.1.1"; sha256="1iq5b51ryah2ccdx16yyigfa2jiapcpm94l6vgvd4v7b94jjp8l7"; depends=[]; };
   JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.3"; sha256="04lvcmm4ybxkfwgbiwcnpyj6kpbd0gd7jz6ijlbbvv6zdgdmvykb"; depends=[AnnotationDbi org_Hs_eg_db]; };
   KEGG_db = derive2 { name="KEGG.db"; version="3.2.3"; sha256="0qv9in1nmnqcbjxh0y45x33xyw9zdp4jf5hmlvcsh1pclcq4dsh2"; depends=[AnnotationDbi]; };
   LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.3"; sha256="0960gy5p4ybs5zs6251cgc3nk5a9gsh1nh23gkbkr3gc8jddinfm"; depends=[AnnotationDbi org_Hs_eg_db]; };
   LowMACAAnnotation = derive2 { name="LowMACAAnnotation"; version="0.99.3"; sha256="0ri301ci54s8wwkah1jccy5h44xg8yjk08j5b15qmdsm25hli4wm"; depends=[]; };
   LymphoSeqDB = derive2 { name="LymphoSeqDB"; version="0.99.2"; sha256="1cdyn2imjh4zr23szndc4vwyiacxs1jsp14gil2dyq9aifa25qr7"; depends=[]; };
-  MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.6.0"; sha256="19y1w2nk3xj4xkg46vhmfk045j8cg81x9a27irmgl2ym3pmcpn92"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.6.0"; sha256="02bwgqh4mx9yfsyr6cxglncdybkxq9rc0gir3919sjs2my3pa0yq"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_ESP6500SI_V2_SSA137_GRCh38 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.GRCh38"; version="3.6.0"; sha256="07spwx7akc7i82s8il6mjkmyll07v2slkv6h6fy1rrsa0hrdrw8w"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_ESP6500SI_V2_SSA137_hs37d5 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.hs37d5"; version="3.6.0"; sha256="1gr9gh355h1n426rwsr44wk4fgy0bvjfyaai2jj0qnp9zb94kr42"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_ExAC_r1_0_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.hs37d5"; version="3.6.0"; sha256="1a2x86cdl6q3s9phb6dzblld4y43r10gh7323c5jnwiyirhs4hlc"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_ExAC_r1_0_nonTCGA_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.nonTCGA.hs37d5"; version="3.6.0"; sha256="1zyp1hsqdcspnvlnqm3wp9xly8r6kjbglbdqsc8fxllivdzxs15f"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_TOPMed_freeze5_hg38 = derive2 { name="MafDb.TOPMed.freeze5.hg38"; version="3.6.0"; sha256="02hq5agpbqcc5cva6xa37kniwi0fi7h5d4cbpmlwfc502n0ahlx0"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_gnomAD_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomAD.r2.0.1.hs37d5"; version="3.6.0"; sha256="0fjpm1lf8qz5vfd4k2sd50a0nkxx8jlf31c1xp87a2d5v7gyx9d4"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_gnomADex_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomADex.r2.0.1.hs37d5"; version="3.6.0"; sha256="1jrzj9mw8xqxmw4qq9djs1f5slvd5l7151pcg9bqzj0162zcz8jb"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.9.0"; sha256="0vlvfwr9bi229xwdjymclj0z2spxx8q96hpkgvqyndfpqchapl5q"; depends=[MeSHDbi]; };
-  MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.9.0"; sha256="1cx2yzx67fgqi0kmf1mk3ykvmqmprilxrjg6l51srjhi40p9q1wg"; depends=[MeSHDbi]; };
-  MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.9.0"; sha256="1gy4l1p0980blf91f57sxnn38gfyq99lmy3sfc141nm435abdh2l"; depends=[MeSHDbi]; };
-  MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.9.0"; sha256="1z2y8mdjyjclf0lqlhi9dq9gq8cqrm8m2m0rnyqgbadsxviwg447"; depends=[MeSHDbi]; };
-  MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.9.0"; sha256="15393b8pyh8xclbi43q3iv6lvza7az7zyc2zcmj2wnqx8x9nn50p"; depends=[MeSHDbi]; };
-  MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.9.0"; sha256="0r1q383f5p92f238m7w0gxalfr8w638ij4dj8zm1b20qakwb8bk6"; depends=[MeSHDbi]; };
-  MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.9.0"; sha256="1fv6hfqx562qiy87h7bjym72ffygfgdfx0miwbnwd1wblbrs4m23"; depends=[MeSHDbi]; };
-  MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.9.0"; sha256="0m78hqfcpnfbq7dm28l24ckhz91sbq3mgi0qdkn6l69rg19l5xwr"; depends=[MeSHDbi]; };
-  MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.9.0"; sha256="1s180b36nz4g7w2c49c4dddz4362ps45fjbs8q07s8d5r826wil0"; depends=[MeSHDbi]; };
-  MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.9.0"; sha256="0s0bskw9y5gbf80xf7sh43csa8mwi0h4ka2dai6jm763jdal645s"; depends=[MeSHDbi]; };
-  MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.9.0"; sha256="1nfy0fa7jnlsq823jq1im6zimnanqx6hc4z9sa2mhpn8yw3hrzcy"; depends=[MeSHDbi]; };
-  MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.9.0"; sha256="111q80xyfnz9p8230wnm0xkam2p25drbcb2nyr68lpz3l02m9c72"; depends=[MeSHDbi]; };
-  MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.9.0"; sha256="0xpm52xshhjw0lazfz9zhk3wiqas88aabin58iqykbyivnaxgiw8"; depends=[MeSHDbi]; };
-  MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.9.0"; sha256="1ni1w608mr28fapxhxj5icf1yjq6wrnqfhxc8bf5q5qqpnb34k16"; depends=[MeSHDbi]; };
-  MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.9.0"; sha256="0c1rxpsavj4j9sndr2bigyxsdg7hm3ckbk2rai2gz125vwlfy9ll"; depends=[MeSHDbi]; };
-  MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.9.0"; sha256="10zxx8hpd72dad1ais9qr1ahkrqygmrzj2zph8n7zwvcys3mqqqg"; depends=[MeSHDbi]; };
-  MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.9.0"; sha256="0g8dafmjls4lafbg3a484iym0df173szvnzfqz272sh32a69ikgb"; depends=[MeSHDbi]; };
-  MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.9.0"; sha256="0r4yrxflppzf21zfiyq1hxsjjgm7a3akj18qly8576nl94py0h16"; depends=[MeSHDbi]; };
-  MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.9.0"; sha256="1aicx7f7mpawq9mbrdkpach2n8yz2isqfqxcqx355js8csdnai6y"; depends=[MeSHDbi]; };
-  MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.9.0"; sha256="1d829frcmx9h0yn4dk2ddhqjjf4kz6n0c8nag31n5viaj0jrxhz9"; depends=[MeSHDbi]; };
-  MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.9.0"; sha256="0zx7s0xbqxl2xs1xhv5q3ppr33zfyjs4c5cmfp904k21fp1gyxk0"; depends=[MeSHDbi]; };
-  MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.9.0"; sha256="1sahvwvh29m2icqi3l4ain817cmlajklmc6w32ay5ydbxdl2k2aq"; depends=[MeSHDbi]; };
-  MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.9.0"; sha256="0g8z6cdz5wad9fhzd0f7p7961kjv1icfwxfskgimrb0dqn0vwngz"; depends=[MeSHDbi]; };
-  MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.9.0"; sha256="1g68dv597h62kidkaxmyj67jpz49aklr77hf0zy0n556whb0gjw0"; depends=[MeSHDbi]; };
-  MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.9.0"; sha256="18r1mfmszsypp6iwdfcdlxzbz2ym53q160y5740d20nf18jwdkyl"; depends=[MeSHDbi]; };
-  MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.9.0"; sha256="09r83x7c3ascv5k10izbsybbchng578f88cqcc34a71h01ccvbgl"; depends=[MeSHDbi]; };
-  MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.9.0"; sha256="0c6yi84drl1kp270ifhkha6s5555pmx122r3zsh5lqip4pf36ik0"; depends=[MeSHDbi]; };
-  MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.9.0"; sha256="0za05dgsy67sl1rg827mn4iir2fcwqgnmmifppdkmg5bcqvh3sli"; depends=[MeSHDbi]; };
-  MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.9.0"; sha256="1m8vszsdql5vnbavrdazrf0d88nq8c08bz9fggr1799fmh9ivppi"; depends=[MeSHDbi]; };
-  MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.9.0"; sha256="1sjm22yl4a9lwv6j5hhs16zs39fv9xvaga2bgb55rv6i1zbw514v"; depends=[MeSHDbi]; };
-  MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.9.0"; sha256="0lll6xsxccxg04nnbchkq3rskzqj70czky27yhn99dpnb7cl2gpk"; depends=[MeSHDbi]; };
-  MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.9.0"; sha256="0fny3nxwpihh505h54b82bf22p74xhf89xns9n7wgsg6j7zr1q49"; depends=[MeSHDbi]; };
-  MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.9.0"; sha256="0jklkvqwajnprs951ws5fxjxkx1dqmi7nldb854wciyanya7srbz"; depends=[MeSHDbi]; };
-  MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.9.0"; sha256="0gmjpbqcrg700fi4qgg9cxny8rwclpg9sbrg2yqpnpiwfp3m1xp9"; depends=[MeSHDbi]; };
-  MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.9.0"; sha256="126xn0dgw08xdjw0sqm80v3pwqlmjzarifq1s3s81qkd814pij2y"; depends=[MeSHDbi]; };
-  MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.9.0"; sha256="1zfq3h886x9kyislnl4mj6ksfmr4slmayw2f63wp3vhlqc8xlp6m"; depends=[MeSHDbi]; };
-  MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.9.0"; sha256="18n2aajv2m1s3y13w88jnxiwzmmqiplmp2la1fh6f34ywsc8vcf2"; depends=[MeSHDbi]; };
-  MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.9.0"; sha256="1qhw2zbldsxr9mii73n5l2l3xgnnmfcdm5zlnj8q6maz0rg8npvc"; depends=[MeSHDbi]; };
-  MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.9.0"; sha256="0siyszvzgy61f44mk6hgg215jin92i1bpyld932f3ydkb2cg1vii"; depends=[MeSHDbi]; };
-  MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.9.0"; sha256="1r5ighzpbw3rbi9pv75xgdxz34yl7d4nimc3423fva6m25bl14f1"; depends=[MeSHDbi]; };
-  MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.9.0"; sha256="0m3f9vkl97drciv68qvb6b1zxg4376sgrxd5fn7r8v6jnk3764h6"; depends=[MeSHDbi]; };
-  MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.9.0"; sha256="0kbf04jgy9sdq99x7c3j6fk1d1p746sm5h0wgcc496hmj9f3d7xq"; depends=[MeSHDbi]; };
-  MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.9.0"; sha256="1s96nh30gg3q6agvd75h8wkmsna753wlhh79fb563plkhynila3j"; depends=[MeSHDbi]; };
-  MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.9.0"; sha256="0f49mvvrigq06m6wsf2bn5b2k06c5azfnzks8z8h91h7p1cdn239"; depends=[MeSHDbi]; };
-  MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.9.0"; sha256="1nlqqgwcaic49lr7qknm4fnr28iy5a5g8pln9ay5c94d82ihaanj"; depends=[MeSHDbi]; };
-  MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.9.0"; sha256="0s8hfixk8axy155rhv9frnvdannm7fwv8xbnn4yqrqz97s0w3l8x"; depends=[MeSHDbi]; };
-  MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.9.0"; sha256="0kc1zv1rlw6sg72z5if2ljyyb99nn9jj67z0x77zpjil15igjq0f"; depends=[MeSHDbi]; };
-  MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.9.0"; sha256="07n81wg4g7r554xs4ziv637mz22ycmn5h03v2a1bl4gfagmp2wga"; depends=[MeSHDbi]; };
-  MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.9.0"; sha256="1sss6f5c039vic2kbxf5zchxx6qqdpysbwfb04xqn7vb0h5xs9aa"; depends=[MeSHDbi]; };
-  MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.9.0"; sha256="1lmy5rqpsxrmcc1zshj2dygdyrw5i95bmp9d31686h2pf7rxjxa7"; depends=[MeSHDbi]; };
-  MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.9.0"; sha256="1j892b88xpf1lcz6lv7n0b2lmqda3j6na6lm18qrmnydvihsrglz"; depends=[MeSHDbi]; };
-  MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.9.0"; sha256="0mnyhj6cfzgar0rsfzza9vydh3kiimyix732zm80gsj7xq844hs4"; depends=[MeSHDbi]; };
-  MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.9.0"; sha256="1gmlg22jdspcv6056iax16hk6vry739s7px1c0vpgmsblj8blzjv"; depends=[MeSHDbi]; };
-  MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.9.0"; sha256="05qsamqm7dimvghka10z03shchx08gxaf7bv488djia9msw04l3w"; depends=[MeSHDbi]; };
-  MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.9.0"; sha256="0h0027wgxm5ngk7087hcw1n2xx04q0sgfcpgmv2wn3f88mh42r9l"; depends=[MeSHDbi]; };
-  MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.9.0"; sha256="1cgbalyamgf1aj48ndhby8x3mzdwn8aiv9nrh8mpyz9zssl0ywdm"; depends=[MeSHDbi]; };
-  MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.9.0"; sha256="0wwnjqc0rvymh9fzh8l9hnlmaymchp54v9fqavxl3cwr2jjyyxis"; depends=[MeSHDbi]; };
-  MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.9.0"; sha256="0s869r4pz02d9k4dcg7qxy75h44x6lli8hxm3f9fjmmvv6cv18zs"; depends=[MeSHDbi]; };
-  MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.9.0"; sha256="07krh3k6d1q9dadphs07sapyv3dfmlhdmgcfrrramixx7paqqd1a"; depends=[MeSHDbi]; };
-  MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.9.0"; sha256="03bs083cvgd5gwy0n2hqq08r8fzw426a4fjx7yg9ypp6316bp03b"; depends=[MeSHDbi]; };
-  MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.9.0"; sha256="0snydy5c7y0437qndc7ki3nswbr3jfj2fssdiqa3yfrbd4dgl8fs"; depends=[MeSHDbi]; };
-  MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.9.0"; sha256="1g6q20hk4v2kwjj9shrwyrf068qv8zrz4dlv58id1im0h6kzi1bq"; depends=[MeSHDbi]; };
-  MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.9.0"; sha256="0wdwy7jqy47flyk25fv51l2acg7lisf240sli9snf0hl4rg2m8sh"; depends=[MeSHDbi]; };
-  MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.9.0"; sha256="193amf74qwglzdpgc4b9f2g0jxs2s5ilfwzk5gpzzsyr6z19m8sx"; depends=[MeSHDbi]; };
-  MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.9.0"; sha256="1wpl49hsz2la272mp836cgqnncyddknrfbfalikwrbydcpdflmqj"; depends=[MeSHDbi]; };
-  MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.9.0"; sha256="0x1s4qs17sy7pz1bhlgfzgvixf50h4wcpa885600f5jv80piz10w"; depends=[MeSHDbi]; };
-  MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.9.0"; sha256="0959hmphr884az46y6zvsmi28vsz66y3jf09f2hki6cwg7gp28l2"; depends=[MeSHDbi]; };
-  MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.9.0"; sha256="1fdwj5dpfpm8cbq5i1wk3n5qq0ygw876shpxiqlj7i7a8yrnikqg"; depends=[MeSHDbi]; };
-  MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.9.0"; sha256="1mrmxpi4zkj77qnr5gsx7nnmhz3h7w07mji0khahd1cnkdqb455g"; depends=[MeSHDbi]; };
-  MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.9.0"; sha256="04wrimmnwhzqhk88jp059h5wpj0wh35ilgzfmn7m66igbiywsyiq"; depends=[MeSHDbi]; };
-  MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.9.0"; sha256="1wida7bmggiamd8bw7sx3sc84rjhpa6c7kgbz7ppf5z5zzabxwj8"; depends=[MeSHDbi]; };
-  MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.9.0"; sha256="0s7792dcgh5ilanr4nnkfcf95j4yndsncr63ybw8g5kp14qw3b6i"; depends=[MeSHDbi]; };
-  MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.9.0"; sha256="19g80bjw7h0f4w3mlrj56xmsdf46bjvs2bykf7hbz911qblkmd08"; depends=[MeSHDbi]; };
-  MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.9.0"; sha256="0x5amvf092r97zkzivsks99q4iaw9cnwpk2mjq8qjfrj2fg9mghc"; depends=[MeSHDbi]; };
-  MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.9.0"; sha256="0h2kndx4xva57hhapzkwnk4by05vpcrgqakc5cpil11in9wwm4gw"; depends=[MeSHDbi]; };
-  MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.9.0"; sha256="11gssp2rm9jln3bhallxhscn1vlp62yv1dqsshswzhda230pwsk8"; depends=[MeSHDbi]; };
-  MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.9.0"; sha256="1pn4v8hp2g9i6d0wn7yj28fg6nfrlxi2zw7svmqlqf0n15sj4g91"; depends=[MeSHDbi]; };
-  MeSH_db = derive2 { name="MeSH.db"; version="1.9.0"; sha256="1vljxgv6x7417sash10mjmwdqs6xmqhwxdsf5n8nn3bw283k0jkv"; depends=[MeSHDbi]; };
+  MafDb_1Kgenomes_phase1_GRCh38 = derive2 { name="MafDb.1Kgenomes.phase1.GRCh38"; version="3.7.0"; sha256="160whyhwjspqji6ys19qgi4y3k7z1qqzr75nhpw0yl8h1rc6rfg0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.7.1"; sha256="1yxhb3kysgj95wdp7v5kq3bvn9xj09ywkfm2fdrkqxmzpan7q9q5"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_1Kgenomes_phase3_GRCh38 = derive2 { name="MafDb.1Kgenomes.phase3.GRCh38"; version="3.7.0"; sha256="0z0v2kld7xqk2plrwb594q3al2kxi64k5phyknnpb0hhgddl688z"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.7.0"; sha256="0rg4vzk3ik2ikdr57fp1za37kfpci6ha0qn8wpnyf8qyc3h9q5xf"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_ESP6500SI_V2_SSA137_GRCh38 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.GRCh38"; version="3.7.0"; sha256="1iybhk64lqar1b8qv1rjxzf53mci9bq684m4l7zqrz8g91jx7myq"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_ESP6500SI_V2_SSA137_hs37d5 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.hs37d5"; version="3.7.0"; sha256="1nfcnlwcx1sr2z4icg893zv3j9c9gnhd0nbgnjrl1fh2nrl25wsd"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_ExAC_r1_0_GRCh38 = derive2 { name="MafDb.ExAC.r1.0.GRCh38"; version="3.7.0"; sha256="1xs52xivxjzg14d0fr3ifb29shysxvw062c3wzb1nfmnydixcqmf"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_ExAC_r1_0_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.hs37d5"; version="3.7.0"; sha256="00b022hzwr0l6m9wzw76iirdq5szvi5z8a9yi2i44sydhwqsb4cy"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_ExAC_r1_0_nonTCGA_GRCh38 = derive2 { name="MafDb.ExAC.r1.0.nonTCGA.GRCh38"; version="3.7.0"; sha256="1dvzzwj9dhrls8caabdcgddsk64a6q9jqcya424h8n48fkx6fpjn"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_ExAC_r1_0_nonTCGA_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.nonTCGA.hs37d5"; version="3.7.0"; sha256="10rn7nqrnhmhdqcygi8l3cwf1385jyy56qzqjgqyhvmi4g8dnjsn"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_TOPMed_freeze5_hg38 = derive2 { name="MafDb.TOPMed.freeze5.hg38"; version="3.7.1"; sha256="1kxk3qqw1igkygqmj8yjl4cp99fan1w84gilh6q35nsaja0fapa8"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_gnomADex_r2_0_1_GRCh38 = derive2 { name="MafDb.gnomADex.r2.0.1.GRCh38"; version="3.7.0"; sha256="0hwyyqa4g3hp85hk4b6qfzm10yk6h20sh0f2mf09yr0hpmkjyl59"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_gnomADex_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomADex.r2.0.1.hs37d5"; version="3.7.0"; sha256="1y1kzbs37h804c81rll64kz83rpzmzl1z410frabyyblpxm275j5"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.10.0"; sha256="0dc2j64v93j7gj28yl9lpbxdqlqszr8sn3p7jbkcwixgpczhqzbj"; depends=[MeSHDbi]; };
+  MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.10.0"; sha256="1p0495kyg2vcbf98scfxb1iidn4xvv1r1jwxx40g1fjwl1s0rm4k"; depends=[MeSHDbi]; };
+  MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.10.0"; sha256="0ipnzigw2791fgzr6s2a8m4idpicwlk46pplq9q3ql9ss0nw4swi"; depends=[MeSHDbi]; };
+  MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.10.0"; sha256="1kpr0li13kwn2ynnghaj775ln7zxim8jdasbrmnyrq8b61v1784s"; depends=[MeSHDbi]; };
+  MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.10.0"; sha256="0aa6qgk9vwdkwykkml10j0vcjp53ypa2p3p8za9qgfk0r19831wi"; depends=[MeSHDbi]; };
+  MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.10.0"; sha256="1v81wccvd2kgx05h2lffbdjkl8xsdb0f5h2i12csfnlhfgvgasdf"; depends=[MeSHDbi]; };
+  MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.10.0"; sha256="0caii8lq500rc5kaqq354zldrb2b0zapypqzr6kfh4swa6fa90x5"; depends=[MeSHDbi]; };
+  MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.10.0"; sha256="1x33f3g8951kawq3j1p1aic9jlx10dbf8qb1g0yrcrq1nvxnywlq"; depends=[MeSHDbi]; };
+  MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.10.0"; sha256="1inpqz39ingljyjsp9v7mfvx8jcmmmkc3p3k4ffcw9xfd17iiw9s"; depends=[MeSHDbi]; };
+  MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.10.0"; sha256="1bwmy42s7rvnng5p1lqcbjhxvw42pr9gbyp7r1951n69f1311n45"; depends=[MeSHDbi]; };
+  MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.10.0"; sha256="1fw30l682sfcpdqqg8r5vyk0slxx00k1agxgli1syhvhh1hrbnxx"; depends=[MeSHDbi]; };
+  MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.10.0"; sha256="0xgzsvqr62g8gipz1i73mxrbg8784axc6hj82v034i03zh0kz2rp"; depends=[MeSHDbi]; };
+  MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.10.0"; sha256="136cg8nmwhc6iplzj2wxmgy4nggi3532xv3kff0hx85g5nbj6k6g"; depends=[MeSHDbi]; };
+  MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.10.0"; sha256="05wj3ib1xjiy2asz41h32r29371qyd8dc3xrx78wwfj2a7760b4y"; depends=[MeSHDbi]; };
+  MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.10.0"; sha256="1b8jc8gc62knhkl0g6isx6d0kb2b33mydb0wpp3v0xlmzpv3f4qn"; depends=[MeSHDbi]; };
+  MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.10.0"; sha256="0qiwjxrjz7np4ml2hxdqfqmjaql5hgnzv2919rcxfikp5cxq7b51"; depends=[MeSHDbi]; };
+  MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.10.0"; sha256="06vk6imry285qcmgcrjqlxj0ihxqasg94ap18xcxiwwps1dbha89"; depends=[MeSHDbi]; };
+  MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.10.0"; sha256="1xv54fhn44l3kjgbmrga3lfqjjf3zgwprm0j518qlvycxvr41znr"; depends=[MeSHDbi]; };
+  MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.10.0"; sha256="0582xmkwmpr3hjsh9qzv6q60bypdmrk34rcp0jzzqjnfrn9mxasb"; depends=[MeSHDbi]; };
+  MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.10.0"; sha256="1cjzilbbw6r5sayy8bifx9rrbj3y95yzm8vdpxg5y1kvsa8047y1"; depends=[MeSHDbi]; };
+  MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.10.0"; sha256="099s4v5rr0jpzh8x60cjb7rxz8c4f8m2s3r09cgzi1fxpmmlzspm"; depends=[MeSHDbi]; };
+  MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.10.0"; sha256="0apr6i080wkhb5s5h6v64b40wdx6fygn422vllwicjkqxllbaa4x"; depends=[MeSHDbi]; };
+  MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.10.0"; sha256="1ln50lqba33vsvbk6wydgm2akpnvv92305zxcpbl6d2px0xbjldz"; depends=[MeSHDbi]; };
+  MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.10.0"; sha256="0nwag2828j1hqx6biihnpprzbrimc7as3nn3p4kkhs067bz457ny"; depends=[MeSHDbi]; };
+  MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.10.0"; sha256="1bcqyrcff510l5my5wha0yrl76wznm7xljlbv24q1i2mjb00x087"; depends=[MeSHDbi]; };
+  MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.10.0"; sha256="1zsq4fkr2bqcfdf1v5w3gn5x29f1q9y4b4qx7nhiipfwiybnjdpd"; depends=[MeSHDbi]; };
+  MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.10.0"; sha256="1xr4h3d3fs20cfwzaj1jjipfnbbvgmx7rlmxfvv8q8hxpfzp7vsp"; depends=[MeSHDbi]; };
+  MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.10.0"; sha256="1hjywgbgbpgsk8hhwlfz9phx3hwi14j9yxa8zmbas3w9cf9hg35a"; depends=[MeSHDbi]; };
+  MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.10.0"; sha256="05mhyfjj2m1mx575nyc53lrwhj0lip4bcv5xa37swz7n1x821bnq"; depends=[MeSHDbi]; };
+  MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.10.0"; sha256="03vrcnfcpj1ayrfawwqgvdvb7mymkwng36pr8p491l8vmk4yhsgs"; depends=[MeSHDbi]; };
+  MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.10.0"; sha256="113zcn037fx15g5xipz9bczw0b913yd8sp4l3yg8zffai8qmhwcj"; depends=[MeSHDbi]; };
+  MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.10.0"; sha256="00i6r7fhqrnbyxmkcpvsyhm1wzmskmrqnfsvd7ls0xcw3h6lpp7v"; depends=[MeSHDbi]; };
+  MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.10.0"; sha256="1azyzg3ak01mbgdw8l7csgiwpzd5fwk6h3x8n261xxm1yd5f1g9l"; depends=[MeSHDbi]; };
+  MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.10.0"; sha256="0j7rga9n6gl6k1gh5ppz742gy4swriwwnfavrjam6k6inl40as57"; depends=[MeSHDbi]; };
+  MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.10.0"; sha256="0cibmy5hyg7aw960cb9zbqdaabbh9f5mwlxdv9gynghkxrqppcaq"; depends=[MeSHDbi]; };
+  MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.10.0"; sha256="1yw0kamb6j25cv3fz7649n43slaxah0f6yzwhglsa4fjffam1ycm"; depends=[MeSHDbi]; };
+  MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.10.0"; sha256="129yw8yrm89rv999va8pn7513c0dl1r1xffsdc01i4wadhq3rrx0"; depends=[MeSHDbi]; };
+  MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.10.0"; sha256="17faizllk30rcw66arfr2nkcx4a70vkjzsca1zf7wpl9myad1r3q"; depends=[MeSHDbi]; };
+  MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.10.0"; sha256="1hqm92vmrg5s07dkr1xa7a2jwspx90v969piba3cf6gdmjw81p5j"; depends=[MeSHDbi]; };
+  MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.10.0"; sha256="06cvyg8ib4dkcn92br7wkx9bj36dji9lsn53aliyj6h5sq6ssvfn"; depends=[MeSHDbi]; };
+  MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.10.0"; sha256="11q2gv8c5cv7ll22f6w34pqr7r8jzgkx1bhwl4fj49s8n7rfh0cg"; depends=[MeSHDbi]; };
+  MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.10.0"; sha256="1gw20014wcf67n574p6r7cwcchyk3c915bbkqcwkj25bvvk4cmga"; depends=[MeSHDbi]; };
+  MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.10.0"; sha256="1hh81rhr3iq8a98w7lvbz6cwjq0hfcxrazv7sdy0pjggd12l991r"; depends=[MeSHDbi]; };
+  MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.10.0"; sha256="0p6zhf5fjh5bn1ibmmmjmnpfp2vplx84fa1zbs7djg96vpvz8flp"; depends=[MeSHDbi]; };
+  MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.10.0"; sha256="1f497wkvbgw11887gsbcygi38xj2fb4vxg34k3jf668yq1x25jcm"; depends=[MeSHDbi]; };
+  MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.10.0"; sha256="1mfg8vbqgqbb573ddv7pp3k2nl4gq27jc472rp4y3x4g8b2ci5hv"; depends=[MeSHDbi]; };
+  MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.10.0"; sha256="1l27hl4cl1h02k9al51485f61qlwwqmsgyp46dcvvdg1l8hlckmq"; depends=[MeSHDbi]; };
+  MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.10.0"; sha256="0vvkgbvg6kzl4w8jbvlvaawkxc2j3x1pipqf6q4niy0yk951r30r"; depends=[MeSHDbi]; };
+  MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.10.0"; sha256="02mp7q0g7by8ihjpjwc39d6kwnwpxkn6xhx9v6fzdfy4q558qpnk"; depends=[MeSHDbi]; };
+  MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.10.0"; sha256="1248y32km28aaj92caar8c97bmkml7853l8xp643vxawgwlmc7a6"; depends=[MeSHDbi]; };
+  MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.10.0"; sha256="09576k1m19mjsdm17iw78djn9pb21g5i237rqrdk709rifar6nny"; depends=[MeSHDbi]; };
+  MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.10.0"; sha256="0azrd1jmyyk6n9whgc3jdaqmalqal3vw6sx5cr84m9cbv9b9c9s1"; depends=[MeSHDbi]; };
+  MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.10.0"; sha256="0cgq3caxikrv22y19fg4gpphz4cf3xb2w0s0rsnmwb1bkj57y2x2"; depends=[MeSHDbi]; };
+  MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.10.0"; sha256="1w118c82694wplqr5q7wvzgcdhf9cm2cbyhajlvh9iad089m4cam"; depends=[MeSHDbi]; };
+  MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.10.0"; sha256="0ka2fsmznlaxn24sqg5fvfy7y9plwqywr75hxfxls3dcykhvsn4r"; depends=[MeSHDbi]; };
+  MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.10.0"; sha256="0cqwnjz77r5faf0gi39hg802hxwswzab56m8l55w9paxq4p5n1jx"; depends=[MeSHDbi]; };
+  MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.10.0"; sha256="0gjnbah7ik8sarx05y6hzl94s669j4c8gxi5n6fa6pb9b4kilqfw"; depends=[MeSHDbi]; };
+  MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.10.0"; sha256="11gfdh385vcyzwwszj8fjfbw06ksra677fhmj99f4nrbnvbdjlc8"; depends=[MeSHDbi]; };
+  MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.10.0"; sha256="0yb0qg11fwpk47kb06w4ck518jff9x2j4kkfi254lbn7asawlgv3"; depends=[MeSHDbi]; };
+  MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.10.0"; sha256="0fzcg6m73qa1fzzbq0kqir69axxcgilr0r3kgajrh8hfdrqvxhx2"; depends=[MeSHDbi]; };
+  MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.10.0"; sha256="0kmsmdpvjnfa2wqdpka70wl5cbpf7bc0bvnf2lj559sdg18glr0d"; depends=[MeSHDbi]; };
+  MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.10.0"; sha256="106wa8vv3v13yn3c3dfbqsp5gm8g2bh1r5yc6kynp3pyxxwnmmpi"; depends=[MeSHDbi]; };
+  MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.10.0"; sha256="000p0jvdwxjkkzh94llzxbhdp5q76d3n8wbgk7iblxwm7aq48q4l"; depends=[MeSHDbi]; };
+  MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.10.0"; sha256="04mn9gihl6zdv7d05f7q2jvr9xh6f2276p38rxq13xyh1y797lsf"; depends=[MeSHDbi]; };
+  MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.10.0"; sha256="1h8x4jwcn0dra927nb5s0dq2w4rv8vdmf82vd17xpj46f051k10m"; depends=[MeSHDbi]; };
+  MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.10.0"; sha256="09s2q794zylkv7ac73dja8cm3i33dv334dzyppw4d3hjdc7fbb8h"; depends=[MeSHDbi]; };
+  MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.10.0"; sha256="1dbhnyppwq1hhs71a123c0l3zlvmgzys71wlihvfp9cbz65cav6p"; depends=[MeSHDbi]; };
+  MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.10.0"; sha256="0m3pa3nap2z0sdw0fcx74jly8rkpvrqjzjhjqbck86zirzw48r82"; depends=[MeSHDbi]; };
+  MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.10.0"; sha256="000d65ba942dqk73jbp7hf8jkq5jhvy5b3xqqbmqjp0a3m1pm6ln"; depends=[MeSHDbi]; };
+  MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.10.0"; sha256="16294ss0i9vpsxapn0m6awf7bl8nglh6ir2i0z47985vaclzx86x"; depends=[MeSHDbi]; };
+  MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.10.0"; sha256="050lv051549bcx1n7hlbgh76wxwmz9yrdn0582ixmc240jvgg8xs"; depends=[MeSHDbi]; };
+  MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.10.0"; sha256="1nhnqljin6ia8ra6ma3hkabsnm7vqad411a6bb16yfn9c384c0x9"; depends=[MeSHDbi]; };
+  MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.10.0"; sha256="0zg433hj5f0l7lls4172lv3f3vnr90gc5fxiifpviam2ibv1r114"; depends=[MeSHDbi]; };
+  MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.10.0"; sha256="08yzw25ahckffy6sqwp0qbsp79jr00dk2qgs0g7k3yv7j86yfla9"; depends=[MeSHDbi]; };
+  MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.10.0"; sha256="0bkd4skxdv3ffhq21j74ghg1ksgd0666rbj89d3c01dyn0dhb1lv"; depends=[MeSHDbi]; };
+  MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.10.0"; sha256="0zhkq8skl4ahbqims1s72m5mf59lvjvzz1x6fg9kwbskfv4y3i93"; depends=[MeSHDbi]; };
+  MeSH_db = derive2 { name="MeSH.db"; version="1.10.0"; sha256="1vh7r2din6746z2v4z42inhyyhywi9lahwszm6z42rirzxhcg3xz"; depends=[MeSHDbi]; };
   MmAgilentDesign026655_db = derive2 { name="MmAgilentDesign026655.db"; version="3.2.3"; sha256="00d0yjcb5id7zacx4bzdwy4q6f4qvnnx8ph4d4xz1fmcbspz2qiz"; depends=[AnnotationDbi org_Mm_eg_db]; };
   MoExExonProbesetLocation = derive2 { name="MoExExonProbesetLocation"; version="1.15.0"; sha256="0bvj3bji4bwwmxjz4b57n1aqypdibdmry30rfwmlxss1hav96sl7"; depends=[AnnotationDbi]; };
   Mu15v1_db = derive2 { name="Mu15v1.db"; version="3.2.3"; sha256="0qchqkbx6ybijab8qhflxj33kwksfll1d3d3917vydjac9fzw1lz"; depends=[AnnotationDbi org_Mm_eg_db]; };
@@ -232,7 +236,7 @@ in with self; {
   Norway981_db = derive2 { name="Norway981.db"; version="3.2.3"; sha256="04ngc2hilqi9m7933mnm7jcvkxlz68vqqh5b628db575vcxql9b9"; depends=[AnnotationDbi org_Hs_eg_db]; };
   OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.3"; sha256="082gff88cwk2p50q8g9bixggacaclgqcvk6w5dc11h9fkgvd160i"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.4"; sha256="1vl8anixkhcb9axlszk479yaw48bz1hhgmff41nqk8k8w4jkyn1y"; depends=[AnnotationDbi RSQLite]; };
-  PFAM_db = derive2 { name="PFAM.db"; version="3.5.0"; sha256="14c85j6ms6cqfifpsihn6ajk6b317gw2b904skv4dqclbgcg6ymx"; depends=[AnnotationDbi]; };
+  PFAM_db = derive2 { name="PFAM.db"; version="3.6.0"; sha256="1zlrwps1kwl2h0cmvh0qqmn93n2md6yrkm47nz2vy080dry0q0ix"; depends=[AnnotationDbi]; };
   POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.3"; sha256="0ybvs4hrxpivdkhm0fxpib11vlxqqdk8prlyj78vj5qzyb3iy89d"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.3"; sha256="0d37c5b7s3fgkkvg7sj7gl9ksrjk5pyyv54vkys8w3qwgsm8yrdz"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PolyPhen_Hsapiens_dbSNP131 = derive2 { name="PolyPhen.Hsapiens.dbSNP131"; version="1.0.2"; sha256="1kikygkli41sn3rqihz0924prmqg2264ifj29vmg1a7qccm0kf7c"; depends=[AnnotationDbi RSQLite VariantAnnotation]; };
@@ -256,33 +260,35 @@ in with self; {
   TxDb_Athaliana_BioMart_plantsmart22 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart22"; version="3.0.1"; sha256="0j2zr4cddad7z1lxx9m9kfgyy7jajjnblpk9j8igd39ia3ixrpzc"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Athaliana_BioMart_plantsmart25 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart25"; version="3.1.3"; sha256="0a6v0l6p13zmiysi3k8dxzdlxng552qqj9rnlbdavdiidla0pvm3"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Athaliana_BioMart_plantsmart28 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart28"; version="3.2.2"; sha256="1yjyvrbx55y024lqg3b2rlf8pngqw5xi3p83j5ipan05wf0aq6ir"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.4.2"; sha256="1p7yhxdlmr4fbp4mxakdwp2xf609ws6pyrjl8xq3ilzhf6fyypim"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.4.2"; sha256="0g4l5r6mqvjsvq3q6kzlvi0w75hm2bxdq0p0pbdpdm8lf9d5aca3"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.4.3"; sha256="1i4r6gmw2kv67hiwc5k2f0jzh87nx2l8q8ksxqy9hdn1q5wpsrxl"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.4.3"; sha256="1q68ds8j7m4a1sagn1ypc6p7qqdkdvmhjg7z57ksdl3w4rhkk1w9"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Celegans_UCSC_ce6_ensGene = derive2 { name="TxDb.Celegans.UCSC.ce6.ensGene"; version="3.2.2"; sha256="1sgppva33cdy4isj2is8mfalj5gmmkpbkq9w1d83a4agcq31mi90"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.4.2"; sha256="19vr9wi2hspsij7gwq7wnlg94zlcqvn639z3jr8s3yngr89d9mnj"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.4.3"; sha256="1yh4cp509rfw5xj0la49gyxy26l8fasap7dhianhhfnsdqkayzrs"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Dmelanogaster_UCSC_dm3_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm3.ensGene"; version="3.2.2"; sha256="1337x23rdmiiza83ms225kri37h16q5hw1lw0m577abcgip3d7c7"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Dmelanogaster_UCSC_dm6_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm6.ensGene"; version="3.4.1"; sha256="0sdw0gbk84lfjmiyy2x4q01zh1vbjq3vfziwxkb4h0v6nab63k01"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.4.2"; sha256="1cqc7vlv2jrznh9s0yb70nwy0a2pa7iswr4m253zx6p197igf33l"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.4.2"; sha256="0d7wqrg69kj65rga9m473ji1s9251gvz6l071ibqmga31imrgb9l"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ggallus_UCSC_galGal5_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal5.refGene"; version="3.4.2"; sha256="1j68yqfbnas21za7y63p1kpi85jbxb7l3m6i50ig9mp6mmvy7i26"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.4.3"; sha256="03awii2bq91glqwklr0m48p6qlxq4rij39ncq2f6sbzw5iqqjjbr"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.4.3"; sha256="1a17401a8lfkv7acxxsh02yrmrmw7mj3207jgrcxjmbd6sicymy8"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ggallus_UCSC_galGal5_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal5.refGene"; version="3.4.3"; sha256="124hdrj3n77pw7jkxfga8b4flp5xlzynn50fpfjh163jkdb6r9ij"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_BioMart_igis = derive2 { name="TxDb.Hsapiens.BioMart.igis"; version="2.3.2"; sha256="0590a2hkrpm33hmjg5g0gm6sig3xvc09m0q6lwmafgaajf90h6ky"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg18_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg18.knownGene"; version="3.2.2"; sha256="1yk9ggclkqqfzrdp8gcqyplvif824pa7df54ck5gb1xb9q5s975w"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg19_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg19.knownGene"; version="3.2.2"; sha256="1sajhcqqwazgz2lqbik7rd935i7kpnh08zxbp2ra10j72yqy4g86"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg19_lincRNAsTranscripts = derive2 { name="TxDb.Hsapiens.UCSC.hg19.lincRNAsTranscripts"; version="3.2.2"; sha256="0bmbp7kydvviczw8axgxq2wdlwq6fdas90jk9bg56avjq5syws2g"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.4.0"; sha256="0i0xw0mcn403r911ijqdnrwg9k5bspdnjibfjvnhxq4h8vcfprn5"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.4.2"; sha256="1k2kaik3zvnx3giia1dps06073xkbvd4dva6npskkvzhvqpfxq41"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Mmulatta_UCSC_rheMac8_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac8.refGene"; version="3.4.2"; sha256="1wma6pm5v9qv29h76p7aj7kwq0l857as0wgya3ryj3mynhsf9j9j"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.4.3"; sha256="0g14rkxk44bzrhgl5xyfdb8lpq7m5iv95yk92inljz02qxinp9j4"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Mmulatta_UCSC_rheMac8_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac8.refGene"; version="3.4.3"; sha256="16cmwrij91hj10q3alcxpv0qrfah25z5x23m7lmzrgchsjd84rmw"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm10_ensGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.ensGene"; version="3.4.0"; sha256="0saxi1fdiwd38sfvy1rynd3v44rbp158jv6sjqcivvaqnd84zg9s"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.4.0"; sha256="08gava9wsvpcqz51k2sni3pj03n5155v32d9riqbf305nbirqbkb"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm9_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm9.knownGene"; version="3.2.2"; sha256="16bjxy00363hf91ik2mqlqls86i07gia72qh92xc3l1ncch61mx2"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.4.2"; sha256="0gqrv5n1c63p5cdl1c0l866x9qgfqf6w23p6m12zaxn8riacdnyi"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.4.3"; sha256="0yi7lxvf6aq634nhdpyg0hxj8hab93fs9z8iw6janasb2b5any14"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ptroglodytes_UCSC_panTro5_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro5.refGene"; version="3.4.3"; sha256="1ra1kjmqza1y6i018j8q46s4qa5hxnk1w2a0szip9sckxbj8xlab"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Rnorvegicus_BioMart_igis = derive2 { name="TxDb.Rnorvegicus.BioMart.igis"; version="2.3.2"; sha256="1099vkk8g3lxbgjxsm1p1m3mjj08nsw282mqxgzpnrxf7m6jll76"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Rnorvegicus_UCSC_rn4_ensGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn4.ensGene"; version="3.2.2"; sha256="0gv8bynfxxa471ap069mjvfrb1d7a0c4w5k8hxkr4hnsm44mschm"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.4.2"; sha256="11yxvr20dmjjxw4pyxfnxy8znlxr48xqq9hb6k95y9dyqnir0vik"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.4.1"; sha256="08w4279c5aq5pazbbdji344lxz113n763q8j2mlagcwfs9r5k9sk"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.4.3"; sha256="0jpkg9s3ghb61xn3i8x50h7wa0x2ixhzj09n6qk1y661ary5kac2"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.4.3"; sha256="15h2fgxjn92xfyj5yvm460ap7j6ayhkm6i5fgvqyhvgyarmss9a3"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Scerevisiae_UCSC_sacCer2_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer2.sgdGene"; version="3.2.2"; sha256="0l5gcwhbvzx60p9hjhd31angamb0hkgdg2avga7341j77rd5pwza"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Scerevisiae_UCSC_sacCer3_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer3.sgdGene"; version="3.2.2"; sha256="1sjwl7fb3l3zxxbk8gkvzxwdsind0xjj7kmh7dachm6fi17hpb3d"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.4.0"; sha256="0jpvb3phw0967my7afk8scsjzpq1x0i2za534ndizzql3cp45yh7"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Sscrofa_UCSC_susScr11_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr11.refGene"; version="3.4.3"; sha256="1lwr8yza22q2wqxdbcg37rn3aml5m96hp2m6rkxvs3g08q7wngis"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.4.3"; sha256="0agd0vn7fb658srqkr3gzk2y8x86xrcsn4hxbyfp2jhiypx60zzx"; depends=[AnnotationDbi GenomicFeatures]; };
   XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="0a27y0ngg760y5wwcja4dpd7cjd8h5zg1s2b3a1r54s21k65zny3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
@@ -290,23 +296,24 @@ in with self; {
   ag_db = derive2 { name="ag.db"; version="3.2.3"; sha256="1h0nb5z742pbh7hc8bwqkk9vh16kac8m3h3bh4v5flqfqw6rn8d0"; depends=[AnnotationDbi org_At_tair_db]; };
   agcdf = derive2 { name="agcdf"; version="2.18.0"; sha256="07hq41dwqs7yy2sck8p7zl3v9x4bgl35kkycpazz5ql2g5zy6b7j"; depends=[AnnotationDbi]; };
   agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; depends=[AnnotationDbi]; };
-  alternativeSplicingEvents_hg19 = derive2 { name="alternativeSplicingEvents.hg19"; version="1.0.0"; sha256="1bcqn20a963l49ah3j59nmd5qd15qad56p7k3880q4cp7qza2xsw"; depends=[AnnotationHub]; };
-  anopheles_db0 = derive2 { name="anopheles.db0"; version="3.5.0"; sha256="0ycprvhry525p4hmxng2swcf92m9fsyqcj8na13q9i5p6s1sl5b2"; depends=[AnnotationDbi]; };
-  arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.5.0"; sha256="0xpa7d15av8pa2l5ksx8mcabhyfdxyk1hw2sd1gdyhyfcn7mjxky"; depends=[AnnotationDbi]; };
+  alternativeSplicingEvents_hg19 = derive2 { name="alternativeSplicingEvents.hg19"; version="1.0.1"; sha256="1v714abdpzhwa450zr66s1yjpxl6lkwi3wjbwn8phn87cgf8rj7q"; depends=[AnnotationHub]; };
+  alternativeSplicingEvents_hg38 = derive2 { name="alternativeSplicingEvents.hg38"; version="1.0.1"; sha256="0im87mrh1n6kv84q6lm4y15lb93rih88zdpa0jms5az91lyvsf25"; depends=[AnnotationHub]; };
+  anopheles_db0 = derive2 { name="anopheles.db0"; version="3.6.0"; sha256="04dgk9q3hsrh4fncf9w4hx8l7qjwcbhbh1cnnfny5y7cpfliib6m"; depends=[AnnotationDbi]; };
+  arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.6.0"; sha256="10xvx3vfj10xcx4w6jvm2c09p6diqjwaspgvwl5lvcm1xxaghsmf"; depends=[AnnotationDbi]; };
   ath1121501_db = derive2 { name="ath1121501.db"; version="3.2.3"; sha256="1zrf26cfhlmrb5pyfawwk4v8l1mflx8c43zsxrwkbmxzc1jnc7dv"; depends=[AnnotationDbi org_At_tair_db]; };
   ath1121501cdf = derive2 { name="ath1121501cdf"; version="2.18.0"; sha256="1naq8f8dwgbmndx178nm2pw6hjx5ljx0w1wb4dfjifnl4bs5rqcc"; depends=[AnnotationDbi]; };
   ath1121501probe = derive2 { name="ath1121501probe"; version="2.18.0"; sha256="0a2nd8zhp3ybis780l3rrmwcxskbl3a111g8w6m8qfwsw5vnlqg1"; depends=[AnnotationDbi]; };
   barley1cdf = derive2 { name="barley1cdf"; version="2.18.0"; sha256="0rbij5cqr2sz33y5waybv85nrcgf70iwj5gk13g0xn9p1l1zxyn2"; depends=[AnnotationDbi]; };
   barley1probe = derive2 { name="barley1probe"; version="2.18.0"; sha256="1kh5r748b4vkmvlfaclmrh07ypbrzgxn90liqfz1rwkabh6rfk71"; depends=[AnnotationDbi]; };
   bovine_db = derive2 { name="bovine.db"; version="3.2.3"; sha256="1i8mgk60hlmvngb4c727wajix9mca9gfg0pzxrnfcjwi87rpw7fy"; depends=[AnnotationDbi org_Bt_eg_db]; };
-  bovine_db0 = derive2 { name="bovine.db0"; version="3.5.0"; sha256="0h02wrj18c24rgkbdnva5qc3znn30i5357c9rzww7y4brhhww8ma"; depends=[AnnotationDbi]; };
+  bovine_db0 = derive2 { name="bovine.db0"; version="3.6.0"; sha256="0183qqj03r2wd6s527403zyd9r0jd0yapffp9881xsd3pcn2n310"; depends=[AnnotationDbi]; };
   bovinecdf = derive2 { name="bovinecdf"; version="2.18.0"; sha256="13mf0yy0dypkm5n2ghl04xm6ayb9bn9qijqhgynksghi7s2k34mb"; depends=[AnnotationDbi]; };
   bovineprobe = derive2 { name="bovineprobe"; version="2.18.0"; sha256="0i4afa5dksnir2nfrfh2cynjm59sm6vfaqa9wyag8cxg7c2nlm1i"; depends=[AnnotationDbi]; };
   bsubtiliscdf = derive2 { name="bsubtiliscdf"; version="2.18.0"; sha256="1rihrjim37b49rhqr4nxga8sp67qri9xqlqc141mhbngh6cw3iyl"; depends=[AnnotationDbi]; };
   bsubtilisprobe = derive2 { name="bsubtilisprobe"; version="2.18.0"; sha256="0k99hvgaswn96x4yanvr9cy8bdy69sd5q7yp6dj9synxj7s1fcw9"; depends=[AnnotationDbi]; };
   cMAP = derive2 { name="cMAP"; version="1.15.1"; sha256="0pzizm27rgcaic7wsh52z30v1jwarmz4cwh1mksbygp63k54mwiv"; depends=[]; };
   canine_db = derive2 { name="canine.db"; version="3.2.3"; sha256="0wbyzhk827l49yxzimvznx9z6yag5nd4djm2hddysf5nk1ndapqs"; depends=[AnnotationDbi org_Cf_eg_db]; };
-  canine_db0 = derive2 { name="canine.db0"; version="3.5.0"; sha256="1a7qn0jg1yw8222k72058ymbws14fs0y6m4girxzs3v8xbyxji7v"; depends=[AnnotationDbi]; };
+  canine_db0 = derive2 { name="canine.db0"; version="3.6.0"; sha256="1cn3s23h8g3a0h0i97v33qh6yz94bw9i8kzd6xwvgwkj0yinw1ib"; depends=[AnnotationDbi]; };
   canine2_db = derive2 { name="canine2.db"; version="3.2.3"; sha256="1gzd2x23dkfiwnwqz9pdn5lp4l8aby525mhscn3xakw633si4dvz"; depends=[AnnotationDbi org_Cf_eg_db]; };
   canine2cdf = derive2 { name="canine2cdf"; version="2.18.0"; sha256="077cmmnhjdk0vxjzm1kqf3q5kgx6chwkm59dr4s5dy019rqb6sqr"; depends=[AnnotationDbi]; };
   canine2probe = derive2 { name="canine2probe"; version="2.18.0"; sha256="1l849a1dqy4kpcsxs0lvb48ag81i0f0ys0w4757rw4kp8ry59z4b"; depends=[AnnotationDbi]; };
@@ -316,10 +323,10 @@ in with self; {
   celeganscdf = derive2 { name="celeganscdf"; version="2.18.0"; sha256="0a6w0a48azg0i21j3aqb7fnxck3ff9w3gsi89bnlfh0zx6pknx7p"; depends=[AnnotationDbi]; };
   celegansprobe = derive2 { name="celegansprobe"; version="2.18.0"; sha256="05k7si3f8pzkyb8jv0r2vkavbrqxsn4nawl92gcphfsylrwcddqb"; depends=[AnnotationDbi]; };
   chicken_db = derive2 { name="chicken.db"; version="3.2.3"; sha256="1rq9afkpcpv8qi75shvnsw8di3ycai4ylv7jq9zwj51zlwlw9cpq"; depends=[AnnotationDbi org_Gg_eg_db]; };
-  chicken_db0 = derive2 { name="chicken.db0"; version="3.5.0"; sha256="134ch8bgzjdra9pycs49lmak380qgx71dbmr1s276pyf3h67fzxp"; depends=[AnnotationDbi]; };
+  chicken_db0 = derive2 { name="chicken.db0"; version="3.6.0"; sha256="1rkqdlnimxnvb8lwlw11w6iwsn42g11nbihj0v78rx9m0n7s6ik1"; depends=[AnnotationDbi]; };
   chickencdf = derive2 { name="chickencdf"; version="2.18.0"; sha256="09hhim5s9xj7n2b5rhn1svf5qly2mn0rr2v2ls25hfzyrqcbxlz1"; depends=[AnnotationDbi]; };
   chickenprobe = derive2 { name="chickenprobe"; version="2.18.0"; sha256="1fdsiwfyg7fwslrr7xs3gny7sw24bzg5k1fvlyzb1477sgj0pid3"; depends=[AnnotationDbi]; };
-  chimp_db0 = derive2 { name="chimp.db0"; version="3.5.0"; sha256="12smymvq4l7aw454lah9gd0rywgi3bcbd3vf8h6a93y2mnhdxz9q"; depends=[AnnotationDbi]; };
+  chimp_db0 = derive2 { name="chimp.db0"; version="3.6.0"; sha256="121hzz3s816xhbv6rh87i9qas02j2k89cb6my22n9jhyf74r7nfi"; depends=[AnnotationDbi]; };
   citruscdf = derive2 { name="citruscdf"; version="2.18.0"; sha256="1326mj1xf3k4v5iyyn46whx24qfng0x3cv6rvckdr1ycc1v887dn"; depends=[AnnotationDbi]; };
   citrusprobe = derive2 { name="citrusprobe"; version="2.18.0"; sha256="0bf1wic136cxwgs4j13wsyqasnyvr0jw1hzg6qizndmy7g8hrb87"; depends=[AnnotationDbi]; };
   clariomdhumanprobeset_db = derive2 { name="clariomdhumanprobeset.db"; version="8.7.0"; sha256="039bsywnim0nr8b3w6vkj4m20j0pggnm6ajjz24bnlikm9zzrs6l"; depends=[AnnotationDbi org_Hs_eg_db]; };
@@ -342,19 +349,20 @@ in with self; {
   ecoli2_db = derive2 { name="ecoli2.db"; version="3.2.3"; sha256="07vc5fl2zq2f65ndcldyzvwfpl65snp6ygvw658j4036lbb7cpjl"; depends=[AnnotationDbi org_EcK12_eg_db]; };
   ecoli2cdf = derive2 { name="ecoli2cdf"; version="2.18.0"; sha256="1rkxrwadq9kg9685z9pg6rgc4bblkx5p3c6snsl4gv2k188dva9r"; depends=[AnnotationDbi]; };
   ecoli2probe = derive2 { name="ecoli2probe"; version="2.18.0"; sha256="11q4ka0ncjapahic49xdl9919vm9frrwlqgj101krgkg262lfm8n"; depends=[AnnotationDbi]; };
-  ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.5.0"; sha256="0g11rjb0373dc3a5m4padk43p4l204yw4lmvasnvk0p6cl0c4zlw"; depends=[AnnotationDbi]; };
-  ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.5.0"; sha256="1cwafxgai0lfwv7fdicrla3lj6k5lv7wz3vz6a0vqzhna3wb3ajz"; depends=[AnnotationDbi]; };
+  ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.6.0"; sha256="0l64cb1zqhz9wbm4chbapv9mzm9k0h9v7xzga3syydalzaqlln5l"; depends=[AnnotationDbi]; };
+  ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.6.0"; sha256="129w24f8k7kg7h99jh6jgrvriy1avblz20dk13linhf9bk466vaw"; depends=[AnnotationDbi]; };
   ecoliasv2cdf = derive2 { name="ecoliasv2cdf"; version="2.18.0"; sha256="16i6has9qgmzakcy24racc1h9j331wndv5c87qp5r1zrai61zyav"; depends=[AnnotationDbi]; };
   ecoliasv2probe = derive2 { name="ecoliasv2probe"; version="2.18.0"; sha256="1hfrnal170cdigc2fmnynb75jjsiq77p4x6ws9gah558hvx87nk3"; depends=[AnnotationDbi]; };
   ecolicdf = derive2 { name="ecolicdf"; version="2.18.0"; sha256="18g5prjykn356k35m131ifn128k5mhij2x26balqav0azigzjqsn"; depends=[AnnotationDbi]; };
   ecoliprobe = derive2 { name="ecoliprobe"; version="2.18.0"; sha256="17g5zxfzsak7a0w51irc0w1w2i5ngdkx9db6rhv1fyp8mfjgaphd"; depends=[AnnotationDbi]; };
-  fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.6.0"; sha256="08wfrcmbpgbgfzfr9gpg25073905fhz14s8jz2wckdmhwjlgavky"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  fly_db0 = derive2 { name="fly.db0"; version="3.5.0"; sha256="18r1m5b6v4km9cdyd0pkxvargh2bcz876y8iwqhbxkf16b9d70qj"; depends=[AnnotationDbi]; };
+  fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.7.1"; sha256="19isa4x8js0pdb4k8a11bw3bzmzv6jc4jphzrvav7piqkvrgykzx"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  fly_db0 = derive2 { name="fly.db0"; version="3.6.0"; sha256="15kwa0yl7n0nc579xi3il7yyk4dpijsls34gyd17v8mi4v1a1kwm"; depends=[AnnotationDbi]; };
+  geneplast_data_string_v91 = derive2 { name="geneplast.data.string.v91"; version="0.99.6"; sha256="0mc26d0sgmpmfmqsqinqv5k6vhg0hlc8hsjkcnvf369yav224nq1"; depends=[]; };
   genomewidesnp5Crlmm = derive2 { name="genomewidesnp5Crlmm"; version="1.0.6"; sha256="06dmwnjy3gb53y6nr02dmp22qzfl5d63wppazrabcqbzwimhnvp8"; depends=[]; };
   genomewidesnp6Crlmm = derive2 { name="genomewidesnp6Crlmm"; version="1.0.7"; sha256="16qcxa32fmbdcv5dck0grsnqyfcqql7wpxa1l6andv9hrvabv2jx"; depends=[]; };
   gp53cdf = derive2 { name="gp53cdf"; version="2.18.0"; sha256="11p69rxia8bqajix3jg34vnhczyxgpq50k5kdh878h7bn0mpg6bj"; depends=[AnnotationDbi]; };
   grasp2db = derive2 { name="grasp2db"; version="1.1.0"; sha256="1aq19myhcl9kdmzy8f4c3ilf0s0ng99rl58jja2xlmqsm2hik7ya"; depends=[AnnotationHub dbplyr digest dplyr GenomeInfoDb RSQLite]; };
-  greengenes13_5MgDb = derive2 { name="greengenes13.5MgDb"; version="1.0.0"; sha256="0y9570c7cchwv9d5rgwhfz6k5qmi11g2smqq8q23z66iv333kii1"; depends=[metagenomeFeatures]; };
+  greengenes13_5MgDb = derive2 { name="greengenes13.5MgDb"; version="2.0.0"; sha256="0j4pd653vlfpd9gq6gi459lra8xhyknjrzadkx9d3zjy0hcwpj7r"; depends=[metagenomeFeatures]; };
   h10kcod_db = derive2 { name="h10kcod.db"; version="3.4.0"; sha256="0f30n339ib8q478a7axjdh8hzrqws762m680ha0sxm3a0nxwapgg"; depends=[AnnotationDbi org_Hs_eg_db]; };
   h20kcod_db = derive2 { name="h20kcod.db"; version="3.4.0"; sha256="0csh59bgpn5xyaw6bfg7nvi9vcvjd4f66f0dr3xh7c6316835mnx"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hapmap370k = derive2 { name="hapmap370k"; version="1.0.1"; sha256="0n6rmrqcbl665a1l6jxk1gn6518x4gxadzy5dc9k9v01cbh3qzmw"; depends=[]; };
@@ -479,7 +487,7 @@ in with self; {
   hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.7.0"; sha256="0ba3yvizj9ya61rr9ik2hdxhy0q67908x16n58jjjfq8wf96h7sp"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.7.0"; sha256="0chkxxpfl696qqiai3i30ylpsihyicbs0hbcni6nmnhfz9k5800g"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.7.0"; sha256="0wk2lg74zkgxh6frmikhk4bxndiyvc1j7mhvz65w8fxfqiwfyf5i"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  human_db0 = derive2 { name="human.db0"; version="3.5.0"; sha256="0n1qrah9h7n4cjpvhqrimcl42p413i2wmkw6iglqg1gcbkbrihvh"; depends=[AnnotationDbi]; };
+  human_db0 = derive2 { name="human.db0"; version="3.6.0"; sha256="050cwz99yz27gyrnfhkv474vqz5rfqbv2f7wdjnaphd9xxq8xjr4"; depends=[AnnotationDbi]; };
   human1mduov3bCrlmm = derive2 { name="human1mduov3bCrlmm"; version="1.0.4"; sha256="1p7qpzk6svafgdafljhh4k0z7pcs78qmwwfd80r0a1yhkssmp0v9"; depends=[]; };
   human1mv1cCrlmm = derive2 { name="human1mv1cCrlmm"; version="1.0.3"; sha256="1qlph3qrjv52ddzlj8pwa93zzh70x4mbdrdr7q9pan427lpck9gx"; depends=[]; };
   human370quadv3cCrlmm = derive2 { name="human370quadv3cCrlmm"; version="1.0.3"; sha256="1chjx9vsmqz2whslw1l7jn7nfn7zx6pcjfmqqm9mh81i74rzrdik"; depends=[]; };
@@ -517,7 +525,7 @@ in with self; {
   m20kcod_db = derive2 { name="m20kcod.db"; version="3.4.0"; sha256="1p2sm5j4b50iqzwcb984qrh74c3hf6yml7b8mvxlhhhvxz4iy1np"; depends=[AnnotationDbi org_Mm_eg_db]; };
   maizecdf = derive2 { name="maizecdf"; version="2.18.0"; sha256="0yfz5gjhsq4wz6j63s1b1hxjz03gsmrlfs2cdc8smq6azp3zdid4"; depends=[AnnotationDbi]; };
   maizeprobe = derive2 { name="maizeprobe"; version="2.18.0"; sha256="01h5dv5i0zaqlphkii9ipxy9wswv1srgprrpr5vmi01c9d98qsk0"; depends=[AnnotationDbi]; };
-  malaria_db0 = derive2 { name="malaria.db0"; version="3.5.0"; sha256="1q6m85ck84qg3fksmfmcrqd0s2yll9n6c3rcknh5ndmy30wdn9pl"; depends=[AnnotationDbi]; };
+  malaria_db0 = derive2 { name="malaria.db0"; version="3.6.0"; sha256="0874knxhybbi6idfb9rig3dhwb65xr7imkgqg1yl3scikyvpn37m"; depends=[AnnotationDbi]; };
   medicagocdf = derive2 { name="medicagocdf"; version="2.18.0"; sha256="1clz679cc887x98c6jk93cphijkbg5r2nd9idrj5901yvh6p9n5q"; depends=[AnnotationDbi]; };
   medicagoprobe = derive2 { name="medicagoprobe"; version="2.18.0"; sha256="0w6j1pfkvb3npc8srpjifq2ywnqxhc9q090jqzmkx22x36cw9cl5"; depends=[AnnotationDbi]; };
   mgu74a_db = derive2 { name="mgu74a.db"; version="3.2.3"; sha256="0xd2gbvry061409kiwq99i13641g8x6m9kbgg4yr0x6m9dh7hxa8"; depends=[AnnotationDbi org_Mm_eg_db]; };
@@ -544,7 +552,7 @@ in with self; {
   mgug4121a_db = derive2 { name="mgug4121a.db"; version="3.2.3"; sha256="0947crjk8nj4bzgwz7anran7y2qhd1v8bp9f59ja3628rgjx6cz5"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgug4122a_db = derive2 { name="mgug4122a.db"; version="3.2.3"; sha256="0x4mrjqd9wnppkp757f3azllbjiilxfds3cpbcrfsi07l8lf4mxx"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mi16cod_db = derive2 { name="mi16cod.db"; version="3.4.0"; sha256="1v64plvn173hdvjyy491qh2wd4mgbpwr27iq7lab9b3w1g3b1a82"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  miRBaseVersions_db = derive2 { name="miRBaseVersions.db"; version="0.99.5"; sha256="0cxkxy42ybnls6396m4svm4iiw0x29fgg98dfwpgwfv5np85m0vh"; depends=[AnnotationDbi DBI gtools RSQLite]; };
+  miRBaseVersions_db = derive2 { name="miRBaseVersions.db"; version="1.1.0"; sha256="09n0309glsj53g6wainl5m0vwnlx71ija5zmlqd0cpbhdis5zihw"; depends=[AnnotationDbi DBI gtools RSQLite]; };
   miRNAtap_db = derive2 { name="miRNAtap.db"; version="0.99.10"; sha256="1j4igmyb9f4fa0a72hkmq3f7xgvyv38wai3mds5sd6mfgfc3brs3"; depends=[AnnotationDbi DBI miRNAtap RSQLite]; };
   mirbase_db = derive2 { name="mirbase.db"; version="1.2.0"; sha256="0l7ah1ia7q1h16av2v1qa9nqpr0604z5dlrq37kd0aiz8dcxyddk"; depends=[AnnotationDbi]; };
   mirna102xgaincdf = derive2 { name="mirna102xgaincdf"; version="2.18.0"; sha256="03q71dq6b0plivj5bgpgx0pnqdwfgplakyk5ggj4w7kqwmr5k17i"; depends=[AnnotationDbi]; };
@@ -571,7 +579,7 @@ in with self; {
   mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.7.0"; sha256="1s7cdjglrc9qqf3gsmhsyycfa0h5qrbk28i4z3z4mb9g6242r1r4"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.7.0"; sha256="0l8y2zbhykzqs9hbjhj1cys1mzdjhmi4rjv4l3v0sv5969h6sl96"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.7.0"; sha256="1mkw3997mqr7ssa60zpwhlyajda51smcrnlnxwif78g99yj0nrxb"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mouse_db0 = derive2 { name="mouse.db0"; version="3.5.0"; sha256="1plw9bjk75qyn5lb2ybvwbq2hrq67fvx0mf2m4dhr88wlncfynl3"; depends=[AnnotationDbi]; };
+  mouse_db0 = derive2 { name="mouse.db0"; version="3.6.0"; sha256="0dxx2853blbsbxn65md4zlp59pdqj7wraiq39spxlbkail76yggp"; depends=[AnnotationDbi]; };
   mouse4302_db = derive2 { name="mouse4302.db"; version="3.2.3"; sha256="1wdgqawqzkr39xwl32cap4ksr59p7r7i83g82h1ss4q3lm58gxpm"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mouse4302cdf = derive2 { name="mouse4302cdf"; version="2.18.0"; sha256="1mpyma4x8zfs2fmmx57xw4cfs2cf9lhw71nc3icl72d7vmwidswc"; depends=[AnnotationDbi]; };
   mouse4302frmavecs = derive2 { name="mouse4302frmavecs"; version="1.5.0"; sha256="04clwkfz1gqqwrnqbavkka3hv480w6vi6c4q947qqnhw8j5jjp7s"; depends=[]; };
@@ -608,25 +616,25 @@ in with self; {
   nugomm1a520177cdf = derive2 { name="nugomm1a520177cdf"; version="3.4.0"; sha256="0skd5b76si0vydzk5qhg4f1a1j655alxflm9sqci8fi8safwj96a"; depends=[AnnotationDbi]; };
   nugomm1a520177probe = derive2 { name="nugomm1a520177probe"; version="3.4.0"; sha256="1n70k0mhv146983myjgk1cgkr9rmmcpqdv8wpkcr320qcvgf9bn7"; depends=[AnnotationDbi]; };
   oligoData = derive2 { name="oligoData"; version="1.8.0"; sha256="1d1yfms3jv2c4s255xnh8yxwijrj35skw3nxds7l46y88lg3qn8y"; depends=[oligo]; };
-  org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.5.0"; sha256="0dzd281yi2vikzr4civf38wy8gpsdr9k2ks9j6sa2rnsnpf1hnh9"; depends=[AnnotationDbi]; };
-  org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.5.0"; sha256="1vpzciar4lwq5r8faz1mh9y085i71q0gcxz5c2gn9469qbi5ymmp"; depends=[AnnotationDbi]; };
-  org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.5.0"; sha256="1qcl4px85qhim5nndj4j1ajyvby8ldbr0g0pml2q54wnjs9f8a8f"; depends=[AnnotationDbi]; };
-  org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.5.0"; sha256="02ggchixlmzywhsbr0h2ms4dravv7m5964cjxqcjxqs16vjwlbk9"; depends=[AnnotationDbi]; };
-  org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.5.0"; sha256="0rdiffd9v6g6cwrd23jspj0bxyds9l977pv27azagw1f7bkdqgbk"; depends=[AnnotationDbi]; };
-  org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.5.0"; sha256="033qak1d3wwz17va0bh8z8p8arx0aw2va6gm1qfwsvdkj9cd9d7d"; depends=[AnnotationDbi]; };
-  org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.5.0"; sha256="0854rqanjzscvlq7rj6bvlxcfyhwiqwi4lnw7abzvv0zcwvf07i0"; depends=[AnnotationDbi]; };
-  org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.5.0"; sha256="0cydh8rj9r2g6wzs42sh6cf77fs0nrgww4jsy3x61aa0b8lngjxj"; depends=[AnnotationDbi]; };
-  org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.5.0"; sha256="00s7p7wrjd57wvwxyhb2m603kms2pm67rr3m83dp2s0pa4ffggmr"; depends=[AnnotationDbi]; };
-  org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.5.0"; sha256="1q5g9ka4fxjq5jp0mg6x8j44995y2r9hvs91qaan8xcmsa900q3q"; depends=[AnnotationDbi]; };
-  org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.5.0"; sha256="1v6wa5613cjq59xd7x1qz8lr9nb2abm9abl2cci1khrnrlpla927"; depends=[AnnotationDbi]; };
-  org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.5.0"; sha256="11q21p3ki4bn4hb3aix0g775l45l66jmas6m94nfhqqnpjhv4d6g"; depends=[AnnotationDbi]; };
-  org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.5.0"; sha256="13ia5ipyif6cxj4gmw4jl0j84iwj4289k69qgfm6qsw4xdc8amln"; depends=[AnnotationDbi]; };
-  org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.5.0"; sha256="08pldh0j1z9csbyzxn89xk9ir1av1dd4jbh79l04g4s34x13m8l8"; depends=[AnnotationDbi]; };
-  org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.5.0"; sha256="1sbimln1v575pxzsgx4sw5712nwfy8n188limrnhwg7brj893wrl"; depends=[AnnotationDbi]; };
-  org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.5.0"; sha256="11vnia08kblh3v4jypl6sw94p1n6702zskxj0gv4ijygaq61m5x4"; depends=[AnnotationDbi]; };
-  org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.5.0"; sha256="1h3wa5g65hg9fdg722w520gb6c16zgccg62vxgd37gj9bdnywg5w"; depends=[AnnotationDbi]; };
-  org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.5.0"; sha256="1wizm4dx6an2pfi322aykis41a6skhgv8yjyfl2pdi0kizlvw26c"; depends=[AnnotationDbi]; };
-  org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.5.0"; sha256="1rhz86d0ly7z79pbaf7s8kw1sx9ys8bawfrcgs33km2dd2cgzzi0"; depends=[AnnotationDbi]; };
+  org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.6.0"; sha256="1bqwvg6shkx9764yz8qzy08yhqjajhzgbjmk9cn3fxjipk9v523k"; depends=[AnnotationDbi]; };
+  org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.6.0"; sha256="0vfnfg0cn5iprrsyqn4gjsq9p5fz7imrl16v220497af9k9zg88b"; depends=[AnnotationDbi]; };
+  org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.6.0"; sha256="1lixfs1w5bnaxc9fyrvwgz9ldp4kxslgv7lm4icvcn517q3knsi4"; depends=[AnnotationDbi]; };
+  org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.6.0"; sha256="0jvmpm2yk4lr6cjdzqjq6dl4gjfgzb12v8xxws6a1gjbkwyirxd2"; depends=[AnnotationDbi]; };
+  org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.6.0"; sha256="1xzwi14l2ia5701rzfxl3qmf6nzdlg1a6k4p2q75fxw7c43nkp53"; depends=[AnnotationDbi]; };
+  org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.6.0"; sha256="0zljw8f7b1c1xlb0rpb3m9p1dj63q7m4ai5dp5qm26wjlhqyk0zx"; depends=[AnnotationDbi]; };
+  org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.6.0"; sha256="0hj1zxgxxn7ljl1apmlnf2niyb5gjqjv8y0mb8961y8b2iq7wflf"; depends=[AnnotationDbi]; };
+  org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.6.0"; sha256="0pqxbnry2k621szw7zpfg6yn1m3icz3l7l80xh5q4gc2vqri59i8"; depends=[AnnotationDbi]; };
+  org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.6.0"; sha256="04gscsr3mrqdprn8jc2ns1mf3h9nm19zh68fayjf0kb1j91k8hdd"; depends=[AnnotationDbi]; };
+  org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.6.0"; sha256="0jm7k4l8bxrbkhhn1bbc0l9622mszk6c2galrgc3bc091frz1w56"; depends=[AnnotationDbi]; };
+  org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.6.0"; sha256="0jav4c8av85380lbra41m33ymqy0kx4czni0kn3cpsa3sfk3ij17"; depends=[AnnotationDbi]; };
+  org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.6.0"; sha256="0l54hi68y6j5jjk88rgy7jhdcjbz6pg474kbpcj6x9z77i0mcfgr"; depends=[AnnotationDbi]; };
+  org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.6.0"; sha256="1y60cvnw5a7nnxryyw97fzrpsic4napsidhrd61qpp6nkbc3aa73"; depends=[AnnotationDbi]; };
+  org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.6.0"; sha256="08kfwsyi0bbmkfqyjgj4m04dmav9nzx6kskaw90ayrj2jv70ci77"; depends=[AnnotationDbi]; };
+  org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.6.0"; sha256="198w077sifyzsrx2vcb8vbrlk6ln6q74lrgkh81sbwshik7nmy4f"; depends=[AnnotationDbi]; };
+  org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.6.0"; sha256="0v2qx1hghlwsgf4lzax6wf3snc17ll4rrhq6za1cf1a0bgvjf28f"; depends=[AnnotationDbi]; };
+  org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.6.0"; sha256="0pprpk91j95ycr7hnd6a1n0aflbn3ibaizl2n2gsfwyjs2vyzq52"; depends=[AnnotationDbi]; };
+  org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.6.0"; sha256="02mldrxqmfwlf4fjlc6i9qv786zgr9cggwrfpkn5inj28hh6s29j"; depends=[AnnotationDbi]; };
+  org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.6.0"; sha256="0p76dj2l9r1rsxq0yh9fsqp22z7jg7i9sq43v5kc32pfgn4nizas"; depends=[AnnotationDbi]; };
   paeg1acdf = derive2 { name="paeg1acdf"; version="2.18.0"; sha256="127pgxxp5wp3hgmafbzdzsk4gqnllq1m1gcsfyzkvpkvmbn4aa9n"; depends=[AnnotationDbi]; };
   paeg1aprobe = derive2 { name="paeg1aprobe"; version="2.18.0"; sha256="0hbyd402wf9nzy2g93nhnf2zsi9jvhgfk0llxlyfk0kqxs0y4byy"; depends=[AnnotationDbi]; };
   pd_081229_hg18_promoter_medip_hx1 = derive2 { name="pd.081229.hg18.promoter.medip.hx1"; version="0.99.4"; sha256="1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; };
@@ -800,10 +808,10 @@ in with self; {
   pd_zebrafish = derive2 { name="pd.zebrafish"; version="3.12.0"; sha256="0gg7y7w51pv0vf39qzyaf09wl3vxy222nr69zgxg7cylwxmaky7v"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
   pedbarrayv10_db = derive2 { name="pedbarrayv10.db"; version="3.2.3"; sha256="01sn7qh5r2c2ph7gqirlzlplxscsmczf7ajffd9rsx59932f71kx"; depends=[AnnotationDbi org_Hs_eg_db]; };
   pedbarrayv9_db = derive2 { name="pedbarrayv9.db"; version="3.2.3"; sha256="0x9m9m4nmdhc0j5244avmlfwljcpw0sh44l1b00cx05swi3vmjlp"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.6.0"; sha256="09gnsrv37pzpbyx98vjcsi1kavazz4hkf7r48dggdad9lqg0fqnm"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.6.0"; sha256="1g0yd623sb73h3nf1mszchiyw5mk4dlz2h7mqix9d8xdsqmrc81l"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.6.0"; sha256="1p2kx6zrgc9yzkvmizzrlhhc75mnxpjgslpxm3kcmvsg12qd4zmz"; depends=[BSgenome GenomicRanges GenomicScores IRanges S4Vectors]; };
-  pig_db0 = derive2 { name="pig.db0"; version="3.5.0"; sha256="0xga9i0bicxbbc9rypwjw376qqg401smwwqjgkdgf4i5lrds0xi7"; depends=[AnnotationDbi]; };
+  phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.7.2"; sha256="1jmc4k4zgkx5vr2plnidnd9bidlwlb0kr7mjg60cqjw7dq7jl1fa"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.7.1"; sha256="0dka39rvx4d3wbcjypcgvc19s6cnxkkfywa4irv23kpibq1sjyv0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.7.1"; sha256="105isdrb3nsy30wd8yy9vrrv8b7c8izc11xqqixg6rcriacd0rl0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  pig_db0 = derive2 { name="pig.db0"; version="3.6.0"; sha256="0qiym7v0z6rr68191lj5hnkzdjc4k61cbjvzj59x5aygba6clm8y"; depends=[AnnotationDbi]; };
   plasmodiumanophelescdf = derive2 { name="plasmodiumanophelescdf"; version="2.18.0"; sha256="1vs36091djinn3g6rjhmy9xfdyi58365zbcjc9mf50adnp2i5fq9"; depends=[AnnotationDbi]; };
   plasmodiumanophelesprobe = derive2 { name="plasmodiumanophelesprobe"; version="2.18.0"; sha256="03hfq51nrpmx8ihc48jiih6bk99irrgal9x7i7mgcv8xd508gcsy"; depends=[AnnotationDbi]; };
   poplarcdf = derive2 { name="poplarcdf"; version="2.18.0"; sha256="0j28czs936j2wgwp63qbwl1mjcflcrx7ir88jzxkkw7411ch1gl1"; depends=[AnnotationDbi]; };
@@ -832,14 +840,14 @@ in with self; {
   ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.7.0"; sha256="135cgn92raa6f9yiw4k25rn04rpg5mdnf969l66x4s1jcc0rwscq"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.7.0"; sha256="0lp4prymrm3cp8yq1hba9bylw22hcvlx7piqpvjx51hj79yrwdig"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.7.0"; sha256="1b7s2r4w1yy2v3srs6n931zc64qf58nq4apmq2ag5nx50wspima1"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rat_db0 = derive2 { name="rat.db0"; version="3.5.0"; sha256="09kbsaksmas6avcdlvbg6kvdw6cf156i7qip9l0mhv6qyqhl0p36"; depends=[AnnotationDbi]; };
+  rat_db0 = derive2 { name="rat.db0"; version="3.6.0"; sha256="1dxmdc4pvr3bl5vc6pw10ddqknxs5ggmr1zvmxgrk8girgkpja1h"; depends=[AnnotationDbi]; };
   rat2302_db = derive2 { name="rat2302.db"; version="3.2.3"; sha256="0vj4vkx091m34xqjh6gv6m2iqszvn5rq3kvnpyq3fin5v42wrsr1"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rat2302cdf = derive2 { name="rat2302cdf"; version="2.18.0"; sha256="1748rc6yypd7y8wgr1qg632pcsxx0fkxjz6b3z4fhblgdllhy9wk"; depends=[AnnotationDbi]; };
   rat2302probe = derive2 { name="rat2302probe"; version="2.18.0"; sha256="1zwjgbcb9d4ib6z1iyjz8x11lq0b5gqs08y6j3idb5wf3i2p521v"; depends=[AnnotationDbi]; };
   ratCHRLOC = derive2 { name="ratCHRLOC"; version="2.1.6"; sha256="0mgk6lwvvdwjzjh4r1q1q6nfnx4vqx9iy6gmbrb9f31jf30hqnsb"; depends=[]; };
   rattoxfxcdf = derive2 { name="rattoxfxcdf"; version="2.18.0"; sha256="0q84lfaxnnj2zbm5q8xswa1md15fjj4i0djnqr835ixzn7px4yqn"; depends=[AnnotationDbi]; };
   rattoxfxprobe = derive2 { name="rattoxfxprobe"; version="2.18.0"; sha256="1kp159553rkcn9yh6x3yph3yjz2ja21wi9j5ax03qnhwlsl1x8ik"; depends=[AnnotationDbi]; };
-  reactome_db = derive2 { name="reactome.db"; version="1.62.0"; sha256="097na9ms80lxpc4qaagaqlxs7kjsjpkq649f2jqbav0mkph52bdh"; depends=[AnnotationDbi]; };
+  reactome_db = derive2 { name="reactome.db"; version="1.64.0"; sha256="1wwgi5wr8ax0wns32zkz92wzh8ivq3q19m4pxvs8rrgwnlbyp81d"; depends=[AnnotationDbi]; };
   rgu34a_db = derive2 { name="rgu34a.db"; version="3.2.3"; sha256="1s2sd5bqlj4qhamhrnb9byxn8nc7z265mqy7zzkgxcd6a2k472vp"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgu34acdf = derive2 { name="rgu34acdf"; version="2.18.0"; sha256="08z9f16xp1m2mwl9vlmbffxl4zyyl8cgzf6wp66rrm32lvl0nbwq"; depends=[AnnotationDbi]; };
   rgu34aprobe = derive2 { name="rgu34aprobe"; version="2.18.0"; sha256="1gjxyq9128jgv3ic386f84rajgf3wz7yi2dja80y0ff4m0a48dlh"; depends=[AnnotationDbi]; };
@@ -853,7 +861,7 @@ in with self; {
   rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.3"; sha256="0lq8k95qm0q7j65nf16p3f09dn9zs87n3k561wxrgi2lb0pf6j40"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.3"; sha256="0zlcn9spw23bj3px9z1l2f5afn09zbr6rv0nbd2h6dd12wrvy1zk"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.3"; sha256="1r272jf9cflf1yf4bznp4d59h7bd7adh1i3rf890h5ffc0xzf5cq"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rhesus_db0 = derive2 { name="rhesus.db0"; version="3.5.0"; sha256="09i0f2ddss092awdmhshnndniyy3pzfj56nfbkgrj0y22lgfw875"; depends=[AnnotationDbi]; };
+  rhesus_db0 = derive2 { name="rhesus.db0"; version="3.6.0"; sha256="1vlqd4qk0wph3vmd125dw9iipgljf2s3i46kr7bjswj0k9k4385h"; depends=[AnnotationDbi]; };
   rhesuscdf = derive2 { name="rhesuscdf"; version="2.18.0"; sha256="0q2alkxm80wkzaf0q80df27q30qkswybavz05x6ywsihbs9h0nb8"; depends=[AnnotationDbi]; };
   rhesusprobe = derive2 { name="rhesusprobe"; version="2.18.0"; sha256="0fd8pvwvpcmx41k80nbccjxllh39fvjf7l9dr8facisl1x7gsfil"; depends=[AnnotationDbi]; };
   ri16cod_db = derive2 { name="ri16cod.db"; version="3.4.0"; sha256="1xz533vxjdyxx1wkks0kgk6b90sxs44iqcsvyds0xcm573bx8c6q"; depends=[AnnotationDbi org_Rn_eg_db]; };
@@ -890,8 +898,8 @@ in with self; {
   vitisviniferaprobe = derive2 { name="vitisviniferaprobe"; version="2.18.0"; sha256="1ggz1s37dwvrkhj4vx2civyhap7bgqsshy33lk14z4fjsayfi39a"; depends=[AnnotationDbi]; };
   wheatcdf = derive2 { name="wheatcdf"; version="2.18.0"; sha256="1gmbrdilqvm54h6nkb1cm01ki8aipiywd4qj8gpwlm2hqrimr8kr"; depends=[AnnotationDbi]; };
   wheatprobe = derive2 { name="wheatprobe"; version="2.18.0"; sha256="1fifi3pvzdrg356idwz0kx7qlf5mssdxlyvwpn3cjgw0z7n7cnw8"; depends=[AnnotationDbi]; };
-  worm_db0 = derive2 { name="worm.db0"; version="3.5.0"; sha256="05r29cqswz3ph3adymdigayv5ci19cd02y26kjbgwrh38xha5cg0"; depends=[AnnotationDbi]; };
-  xenopus_db0 = derive2 { name="xenopus.db0"; version="3.5.0"; sha256="136yrk7qlbzy717xy1abpn5l42j0qzal72y0p20wwxw60xhpx1rv"; depends=[AnnotationDbi]; };
+  worm_db0 = derive2 { name="worm.db0"; version="3.6.0"; sha256="0k99b64gkzmvmrypd5r96k0y2i4ph0kr70kkfnhmmxgwgd8wg0db"; depends=[AnnotationDbi]; };
+  xenopus_db0 = derive2 { name="xenopus.db0"; version="3.6.0"; sha256="1jgdidzpka00w21358rj2lrz1chh518iyqlrj3c5rsamrisdyj2c"; depends=[AnnotationDbi]; };
   xenopuslaeviscdf = derive2 { name="xenopuslaeviscdf"; version="2.18.0"; sha256="1bcz1hr7gxw6ac4qvw0giph6hfcf5i9b11s274ypq512qc1d32iq"; depends=[AnnotationDbi]; };
   xenopuslaevisprobe = derive2 { name="xenopuslaevisprobe"; version="2.18.0"; sha256="0prb14zn2gvgxq8w0y21x1ng51cn3bgjhkppf7zkmnq1xkzvq0pw"; depends=[AnnotationDbi]; };
   xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.3"; sha256="0cdi71c8pflb8n4yfxc0wmfi51w6z0dlz7nw5hv0hkx547v79d53"; depends=[AnnotationDbi org_Xl_eg_db]; };
@@ -903,7 +911,7 @@ in with self; {
   ye6100subbcdf = derive2 { name="ye6100subbcdf"; version="2.18.0"; sha256="1169hv56981b915rlr5w5sn6ppyjd8as7f4k1hbjzadrdrl3glwp"; depends=[AnnotationDbi]; };
   ye6100subccdf = derive2 { name="ye6100subccdf"; version="2.18.0"; sha256="0mhr4zd33gfvvivc17k7fb6nvmhq6h3q0xbx2zl09zd6qk09kizm"; depends=[AnnotationDbi]; };
   ye6100subdcdf = derive2 { name="ye6100subdcdf"; version="2.18.0"; sha256="11b1fflgc34lrj4yf1p7way5n83cm9c7znsbxpzlwddwyy8qib30"; depends=[AnnotationDbi]; };
-  yeast_db0 = derive2 { name="yeast.db0"; version="3.5.0"; sha256="00rp099g5302hy4g4h6j11nslc2j6p58ax80mnswhzvfr37sb99f"; depends=[AnnotationDbi]; };
+  yeast_db0 = derive2 { name="yeast.db0"; version="3.6.0"; sha256="0xv4v1ybcgz5ha7g98zkfmi6mw0ywrdfspzb39rj13np9bwrqfcp"; depends=[AnnotationDbi]; };
   yeast2_db = derive2 { name="yeast2.db"; version="3.2.3"; sha256="1xns0129ifklipbardybkjyxfwnlklavq0k6s15wk2iwk7vxa33s"; depends=[AnnotationDbi org_Sc_sgd_db]; };
   yeast2cdf = derive2 { name="yeast2cdf"; version="2.18.0"; sha256="0c68val9x8bfnv4xx0vag9dxwsx5q8dzbj0dpha3nshh12jw48w9"; depends=[AnnotationDbi]; };
   yeast2probe = derive2 { name="yeast2probe"; version="2.18.0"; sha256="125nif693qcmxc0nnnz917f9avggcdr8g9rfvx2qdc54a2l7vdb7"; depends=[AnnotationDbi]; };
@@ -912,7 +920,7 @@ in with self; {
   ygs98frmavecs = derive2 { name="ygs98frmavecs"; version="1.3.0"; sha256="1xrm1209xnknwvad7nvg1a0mbxz15z12yd4x5bia3cq03zcmzf9m"; depends=[]; };
   ygs98probe = derive2 { name="ygs98probe"; version="2.18.0"; sha256="0awf6z4j2vb2jk9a9j2r512yd3m31660y68pasa9mp488m270a3q"; depends=[AnnotationDbi]; };
   zebrafish_db = derive2 { name="zebrafish.db"; version="3.2.3"; sha256="1n6p04hlm5c32fnficx294s7n7izy5460avagw8hx1g5xryhdzqk"; depends=[AnnotationDbi org_Dr_eg_db]; };
-  zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.5.0"; sha256="1mkyhf1vz0n98zs941v5f7nl0cg0s873ny3m6vdpj5c9nyqc8hxs"; depends=[AnnotationDbi]; };
+  zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.6.0"; sha256="1c7m109yrpvzhj330n8rj1ppvwxr96nlhhwc48rj687qd1fnbj48"; depends=[AnnotationDbi]; };
   zebrafishcdf = derive2 { name="zebrafishcdf"; version="2.18.0"; sha256="0sq1xqhblbilvaiabhqyl9gxdj3jg576vgq8v0cls1zvvx0isrx0"; depends=[AnnotationDbi]; };
   zebrafishprobe = derive2 { name="zebrafishprobe"; version="2.18.0"; sha256="1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0"; depends=[AnnotationDbi]; };
 }
diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix
index f323532ad7d90..fbf8b26f0ea16 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/pkgs/development/r-modules/bioc-experiment-packages.nix
@@ -4,332 +4,343 @@
 # Rscript generate-r-packages.R bioc-experiment >new && mv new bioc-experiment-packages.nix
 
 { self, derive }:
-let derive2 = derive { biocVersion = "3.6"; };
+let derive2 = derive { biocVersion = "3.8"; };
 in with self; {
-  ABAData = derive2 { name="ABAData"; version="1.8.0"; sha256="035h4yrna11d2g3iqnn52sv07ydgpa2my4bwcs4a9di0pf9rbm06"; depends=[]; };
-  ALL = derive2 { name="ALL"; version="1.20.0"; sha256="1kz3k99dxam9zqpf1hg4z049f7dliyw3kg9cms1sma2yl5l7nj2y"; depends=[Biobase]; };
-  ALLMLL = derive2 { name="ALLMLL"; version="1.18.0"; sha256="051hhfrz4fx28hbi7fycqqbnij9lxh6spj2xqj37nmqc8wx2qfs1"; depends=[affy]; };
-  ARRmData = derive2 { name="ARRmData"; version="1.14.0"; sha256="0pxwvghyvd3c717lqixkadh79jrv0r0dl80ds688gxgw2pfcwr6y"; depends=[]; };
-  Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.14.0"; sha256="1ynwl9rfc0hdacvdmfdm97ya14jqf8q8w93m2vd58nh62p1jmprp"; depends=[]; };
-  Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.12.0"; sha256="0bbslhfipz0s5ill8p8wfr47ikx2lg1vi9h71rn0wx1v76q5sgpf"; depends=[]; };
-  Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.16.0"; sha256="06q8ixh2zwk4143ppnrdcvgaagzy33swsrlp8l3lqp943fnn2hil"; depends=[]; };
-  AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.16.0"; sha256="1nqdxp33xl2lwcf5lq1v1k2qnid5pf7wxbxldmr0rl6jxlm1r5va"; depends=[]; };
-  Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.16.0"; sha256="1j4czciqiaj2fqf7v5yd41ln31gl6sqs6s07i9pwyclhw66f3y56"; depends=[]; };
-  AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.18.0"; sha256="0bc2cdqvqdalq5hqhnnzayh2klnzqaw6micgsk35mai0lak34rpd"; depends=[affy]; };
-  AneuFinderData = derive2 { name="AneuFinderData"; version="1.6.0"; sha256="0cbgmfciy9v81jfn60mw98csxxdmm3hfqdwyaigbagj949alnbcm"; depends=[]; };
-  AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.8.0"; sha256="1z7kcl25hpl7r7pshz14cm5j635qj451df1pfd9giygn7y9kpf93"; depends=[]; };
-  BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.16.0"; sha256="1yslwgw504xbplq16xnf610rs994p23xm9qcyaa9f0lzhqgkksap"; depends=[beadarray GEOquery limma]; };
-  CCl4 = derive2 { name="CCl4"; version="1.16.0"; sha256="0w1mxf7w1yk7kjqam7xdb11aj16pddk9wyfd1ps0nqagzvjsn1qv"; depends=[Biobase limma]; };
-  CLL = derive2 { name="CLL"; version="1.18.0"; sha256="1zhkf75bhx8z0s4wpjyc0xdv9aifng25gpb8fkvncpd8lmmdg6gd"; depends=[affy Biobase]; };
-  COHCAPanno = derive2 { name="COHCAPanno"; version="1.14.0"; sha256="082cwdyzq3h1sl39pn2c3ix5cp6mjczbvvdh6gii54181qkg8r2h"; depends=[]; };
-  CONFESSdata = derive2 { name="CONFESSdata"; version="1.6.0"; sha256="1ln3s3zk4yi7qjjqnvxg12x7qlnz77k29nbjv5zbpdxdjyisnq4g"; depends=[]; };
-  COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.14.0"; sha256="1qi0l4rf62gzqg14zalcrisklfgbzahhzahyyd5q898r57xgif7b"; depends=[]; };
-  COSMIC_67 = derive2 { name="COSMIC.67"; version="1.14.0"; sha256="11ir7v1xlxwjxjj1dz3i7j1fmq9xnhd3qc7cxippr0w4867cw8pc"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; };
-  CRCL18 = derive2 { name="CRCL18"; version="0.112.0"; sha256="1c6lvzjddm2sxxjz452nmaadhvaz684i3gyvmlibhqaxc9vr09mx"; depends=[Biobase]; };
-  CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.10.0"; sha256="0jlikfjgmjiizm28srbws7sq1b7h45gb22m4q19il13rdpn6rfls"; depends=[Cardinal]; };
-  CellMapperData = derive2 { name="CellMapperData"; version="1.4.0"; sha256="064hbkwxfl2sb4vvvmm44skd34g87vgw6nv0ml8vyhba5mmszf84"; depends=[CellMapper ExperimentHub]; };
-  ChAMPdata = derive2 { name="ChAMPdata"; version="2.10.0"; sha256="0cjwyapqv4d6mncg4jy1x5qfz7sim9vqv6m007d0n05ly02qn4vd"; depends=[BiocGenerics GenomicRanges]; };
-  ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.16.0"; sha256="0bj7j6qzqq6zy87r1sxdnlfqvl5r6rwjm5pd09jf9b27r6bf1r44"; depends=[bigmemory]; };
-  ChIPexoQualExample = derive2 { name="ChIPexoQualExample"; version="1.2.0"; sha256="1f1dwqylch21kch88y96h41ma949y1xvfhj5ldqkn4fidb2f90kp"; depends=[]; };
-  ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.16.0"; sha256="1ppybav3ag2x75i1w58prnxvrmjp754ywwgm38kfw3vs55l0ijv4"; depends=[affy hexbin limma qvalue statmod]; };
-  ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.14.0"; sha256="02xffm790lchv78qwxgi0rfmk496hdc2970mm1maa7agy9wk56f8"; depends=[]; };
-  CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.10.0"; sha256="1gbvk32kcax4w143ry8w376gfglqm128sas0pnim4nc1ikd7b7j7"; depends=[]; };
-  DAPARdata = derive2 { name="DAPARdata"; version="1.8.0"; sha256="0rkf6gwcvccci7hal5cxb04b7g8cx46ivvzplgfn5sn4idzj187f"; depends=[knitr MSnbase]; };
-  DLBCL = derive2 { name="DLBCL"; version="1.18.0"; sha256="19bxaapggfx148qvi1jp82026psiv669iga370bqva4dhawgmc8a"; depends=[Biobase]; };
-  DMRcatedata = derive2 { name="DMRcatedata"; version="1.14.0"; sha256="1i1cf4avmq6rrcvskj17gmplfa647fvmml86wkr8skhsj03z5s63"; depends=[GenomicRanges]; };
-  DREAM4 = derive2 { name="DREAM4"; version="1.14.0"; sha256="1z1cddkk8jspnm3h1d4fdc6v14sqflzryqzvvzd0z3fp4lr46vkb"; depends=[SummarizedExperiment]; };
-  DeSousa2013 = derive2 { name="DeSousa2013"; version="1.14.0"; sha256="0jwddzfqfiimcfmz9jwari493dppyxnyf0fp2k2s1bp98d50bnfb"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; };
-  DmelSGI = derive2 { name="DmelSGI"; version="1.10.0"; sha256="066davl2ga9pjl12zcgchmsprx3hz6zsb2zpnrpbijd0yqv8fjih"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; };
-  DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.16.0"; sha256="1za9anbfb36c1js2qhgqgxsjmkxfhkzyfyizzvqn1v31r101hsq7"; depends=[EBImage]; };
-  DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.14.0"; sha256="0315kbc8fsn95325jlr2b83094f4mnk4pc5sihw0n0637nfpy7ks"; depends=[]; };
-  DvDdata = derive2 { name="DvDdata"; version="1.14.0"; sha256="0chiajirlaf8b28nhr315429hp2x7mfff7fkax9kqrfz308xbcv1"; depends=[]; };
-  EGSEAdata = derive2 { name="EGSEAdata"; version="1.6.0"; sha256="1fvfs8bnf41fz2skahj4gxczqkgspnga84rlsrgd0shhrkmns9hx"; depends=[]; };
-  ELMER_data = derive2 { name="ELMER.data"; version="2.2.2"; sha256="1w1zs37bsj1c6ywvdbjqilg5wndnmysb0w6sbaashd39z6w9iwpa"; depends=[GenomicRanges]; };
-  EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.16.0"; sha256="19id2z2mzjjnxa956ppjhjq1a4gk916cd7k9cqs39lsbxvknp7nr"; depends=[GenomicRanges rtracklayer ShortRead]; };
-  FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.14.0"; sha256="1bkgj1czb6ap7xx53bzwrd4azbfkpxcznmdvl4q7jgd34l1ms78a"; depends=[]; };
-  FIs = derive2 { name="FIs"; version="1.6.0"; sha256="1b6cvzljgcpq9vzs92yjnnxm741ypjw13c9lnzh3qjv73nfgp5l9"; depends=[]; };
-  Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.14.0"; sha256="1c0zdhk81g30v7yq6xvhanmb550xdaann6f4sskbvy5fa6kb04gz"; depends=[Biobase gplots limma VennDiagram]; };
-  Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.14.0"; sha256="081ki0yjdqngsdibpjnjs8lk10wfvgr9i5i99c837hl9wgfwd9v4"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; };
-  FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.16.0"; sha256="09sb67dnv97ijljayiny3p45ddd2c01pd8pjj15sjjk8717lf65v"; depends=[minfi]; };
-  FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.6.0"; sha256="16wvbfym2mz9ypmym2j3j5f36vdj100anc5hpwvpzh9ing62b00r"; depends=[minfi]; };
-  FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.4.0"; sha256="06f2zmkqzkrhwdx58pxzcvkqbckzg9k6qjlngbmgnnb9mi0hx8l3"; depends=[minfi]; };
-  FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.14.0"; sha256="19h4xvlsl61bpkdqqfrqw4iz9v0pnfxp1q8z9nn9m9wqf9cc3rkc"; depends=[minfi]; };
-  FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.14.0"; sha256="0zsffyhd9nxsg3a34sd2mycbvs8dsw96pqn1jj7zw5whldjihjwh"; depends=[IRanges rtracklayer]; };
-  GGdata = derive2 { name="GGdata"; version="1.16.0"; sha256="0s5wh3nxynxx4skgyxvbm4l7lk6rphcgwh71nr24a0a4jid0jisp"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; };
-  GSBenchMark = derive2 { name="GSBenchMark"; version="0.112.0"; sha256="10f5g78mqlzm3ygix8h08134k41c7k9l3j39q656jpdwmf3plkh0"; depends=[]; };
-  GSE62944 = derive2 { name="GSE62944"; version="1.6.0"; sha256="031x9w6xcgk30ihmgxxlxrn0xjm076s34cfyhw5pap6f3f0x8hi6"; depends=[Biobase GEOquery]; };
-  GSVAdata = derive2 { name="GSVAdata"; version="1.14.0"; sha256="1zqm9g1vib9r6rsj7wim2pkv17pl1136k3k5rxmyvgx7rl1sb5li"; depends=[Biobase GSEABase hgu95a_db]; };
-  GWASdata = derive2 { name="GWASdata"; version="1.16.0"; sha256="15zki8i7mv59xr6rgfmf0x33mkvf8fv6h5ya35iydx5409lyaxm8"; depends=[GWASTools]; };
-  GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.6.0"; sha256="02vwxdb4dsmx3iw3p8hfvigw67hrggycdxkqpkr1n03z6g50vbcv"; depends=[]; };
-  HD2013SGI = derive2 { name="HD2013SGI"; version="1.18.0"; sha256="102hv9ivrmdjfrqnyg9g3qi4y2i9kdby9xswlq5l7l14vbgqxn6b"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; };
-  HEEBOdata = derive2 { name="HEEBOdata"; version="1.16.0"; sha256="1spmx6lc0cpcwcna2sm5mn27n66rxpzw30biq11ca2j7ax0phh8v"; depends=[]; };
-  HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.18.0"; sha256="12gi6idn1vgl13ir93ig60mmgfak5l35bgzc75paa167iqvfswff"; depends=[]; };
-  HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.112.0"; sha256="0wz7kfj2mkrg4q53w3ddj2l4didlmckkck5a80vk51pflfvxrdhi"; depends=[]; };
-  HarmanData = derive2 { name="HarmanData"; version="1.6.0"; sha256="104ws2bpy865m2hjfgj1bha4ix6kk96ml085lksz9vszkxhi7al9"; depends=[]; };
-  HarmonizedTCGAData = derive2 { name="HarmonizedTCGAData"; version="1.0.0"; sha256="03czwi1ps7lpjppn5mpfa013rna0z3ywb783a31yv7g93r97gqna"; depends=[ExperimentHub]; };
-  HelloRangesData = derive2 { name="HelloRangesData"; version="1.4.0"; sha256="1c7gfhwr9g6hv0p3s4yd8v9rhjp3jmrnzsqsqq4ysc2i24nf7drr"; depends=[]; };
-  HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.112.0"; sha256="1qxg7650lbfbjl9p75clrybsdbzd0yzpi8pi2biv83jgqkkjrd0b"; depends=[]; };
-  HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.14.0"; sha256="0708xgm495a330h70yi2qd494h6gf0n46j016mw9bc4gzbb7aq9p"; depends=[]; };
-  Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.14.1"; sha256="0b47hi6di0gy4f8bzhsjm5ag5jhqqsgh5h19h4lwr5jcg2710ang"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
-  HumanAffyData = derive2 { name="HumanAffyData"; version="1.4.0"; sha256="0xgb3rrvgrx6sdwbb8gb1q8mgf0s2giih8l8d3hzvnxazh80qs8b"; depends=[Biobase ExperimentHub]; };
-  IHWpaper = derive2 { name="IHWpaper"; version="1.6.0"; sha256="08gkdi1lra9mn1cbsqddqn3pwj3pfy2yfgzay5igr7n1akfmgh7k"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; };
-  ITALICSData = derive2 { name="ITALICSData"; version="2.16.0"; sha256="1rrfxc3hzlq2i0z5j432w3s33ln56i91a06q49piisz06vviz6yv"; depends=[]; };
-  Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.14.0"; sha256="12mdy4rb8gzhgdqdwvf96lcxmi37wysyanpw1dym03vq6fxmcfrq"; depends=[]; };
-  IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.16.0"; sha256="149ip8wvbiz2k94rj6n1ims4iq7zkgicrxrkn059bvxgj5gm6pvq"; depends=[]; };
-  Iyer517 = derive2 { name="Iyer517"; version="1.20.0"; sha256="1s4ya32pfmz3fil7v3r8zm13f80cx5zny0ywvh6ln27a7hr10ida"; depends=[Biobase]; };
-  JASPAR2014 = derive2 { name="JASPAR2014"; version="1.14.0"; sha256="03mrbgyx3jf4ccapyj04akf40aqbmky03fgicgcaff724kwda8rl"; depends=[Biostrings]; };
-  JASPAR2016 = derive2 { name="JASPAR2016"; version="1.6.0"; sha256="0ki62mfjk7a6nsk0079xf3w8c8an3syy5rhlqcmyynwab344mqm6"; depends=[]; };
-  JctSeqData = derive2 { name="JctSeqData"; version="1.8.0"; sha256="1zd270pxiy1d5jr9akgvf77jbllw82flrhx3q1z1m0kds7xlb398"; depends=[]; };
-  KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.112.0"; sha256="0w1x4ab9i40y8jp3yhwcv0lyh83g926cwav77m179mg7n9l6c3lv"; depends=[Biobase BiocGenerics]; };
-  KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.16.0"; sha256="034j38cd81fkay7h7fjjk56ywhvbq6pdc0ldxizrfw3z8hhacy85"; depends=[Biobase BiocGenerics]; };
-  KOdata = derive2 { name="KOdata"; version="1.4.0"; sha256="1difb3nsalc5rl9bbaj0g99d5sl3sjlmcy4qq0mddaagw4b5lyrr"; depends=[]; };
-  LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.16.0"; sha256="1z86ll0kpmd9jq5nq7fi2yhvp3ifqfmjk7gfpgd2mq28zw8rwn47"; depends=[IRanges KernSmooth]; };
-  ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.10.0"; sha256="18k3m8k0jdry8qih7nrd7sxlvpcv1yfjj1a6y6a2ifmjq23ymcsl"; depends=[methylPipe]; };
-  LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.14.0"; sha256="0x0rl6iibspl9w82kbbv7bf9mfhs60j8ly7cxm908x5xfzwmms05"; depends=[]; };
-  LungCancerLines = derive2 { name="LungCancerLines"; version="0.16.0"; sha256="12k305wv38grgdkypr7bvhxd1ca1vsxmyz7487yfv1nl72sla36a"; depends=[Rsamtools]; };
-  M3DExampleData = derive2 { name="M3DExampleData"; version="1.4.0"; sha256="0wq5vmk8p3ng8snljrlkwx6vl38fnwq8fn5flymfnq1snvci22h2"; depends=[]; };
-  MAQCsubset = derive2 { name="MAQCsubset"; version="1.16.0"; sha256="06vmzicndnyb4banfjv2mgy77cqqbdrx0y7pxyvvpfy5xl1kk3ii"; depends=[affy Biobase lumi]; };
-  MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.16.0"; sha256="0jfq8pc2arpp5kcdhsgvz08nm7sjambh7sx1n204glqm61mv5rqw"; depends=[affy Biobase]; };
-  MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.16.0"; sha256="14p1ifaadmkpykgh675gk03aspc1159k8s9ksz17p6bxkwy2sb6v"; depends=[Biobase lumi]; };
-  MEALData = derive2 { name="MEALData"; version="1.8.0"; sha256="0r4c7vx2cpix5ryjv7314zf30ifivad7yj1wi7a0pck6rjbny81j"; depends=[]; };
-  MEDIPSData = derive2 { name="MEDIPSData"; version="1.14.0"; sha256="175bzk0yrwhkwagpkvi8y87l8zfhgr44xkpkw4jii3whpyxgaiyx"; depends=[]; };
-  MEEBOdata = derive2 { name="MEEBOdata"; version="1.16.0"; sha256="1110sgklk2lmvjggvcm3wzfipij6nj8brq7bdc9dbjwhiiqdv0m1"; depends=[]; };
-  MIGSAdata = derive2 { name="MIGSAdata"; version="1.2.0"; sha256="0vx8p949sxsfp9ajs4dwh2yf01l9lclngr7ync3r962knmd74yc6"; depends=[]; };
-  MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.14.0"; sha256="1s0fraym521bv35q2ms1v6jv23bvfypwkhcy8ffhf6k1lcr4q7gj"; depends=[]; };
-  MSBdata = derive2 { name="MSBdata"; version="0.16.0"; sha256="0lygk817f55agf4rvb85k50ns0cy8wckbqvwqb3w22z4plixyjjf"; depends=[]; };
-  MSstatsBioData = derive2 { name="MSstatsBioData"; version="1.0.0"; sha256="1hgwcd4r8x489hyz747psyw4jfbia6yw5mjrm745z1yl8y445mq9"; depends=[]; };
-  MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.112.0"; sha256="05gjfd4vvkp4mdrimsxjwa3mgps1cwdwr03w1il77awa23fvqp52"; depends=[]; };
-  MethylAidData = derive2 { name="MethylAidData"; version="1.10.0"; sha256="1rklalmjckm5ysvfjy4arqafabjp8w4495v385mgwrlv6rqa5yv7"; depends=[MethylAid]; };
-  Mulder2012 = derive2 { name="Mulder2012"; version="0.18.0"; sha256="1bpc74xiyh1az8nkgqpwk3pa2313r7qcxdzdqa7sr8drwhgj7hbi"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; };
-  NCIgraphData = derive2 { name="NCIgraphData"; version="1.14.0"; sha256="0764l9lxc64fjflzqqxyjckxrsjxk89k73g3kpdfmkvxdn7nchh7"; depends=[]; };
-  NGScopyData = derive2 { name="NGScopyData"; version="0.112.0"; sha256="073g9krsmhdh3fygqd3rfxnakxn45nvxs0zr7k6xylq06yfy3gza"; depends=[]; };
-  Neve2006 = derive2 { name="Neve2006"; version="0.16.0"; sha256="0dvdq54jp5q59iwny008m1qyj9s6gb4blmzjlsnz3505ivai2mgs"; depends=[annotate Biobase hgu133a_db]; };
-  OnassisJavaLibs = derive2 { name="OnassisJavaLibs"; version="1.0.0"; sha256="1wffaljwgl0r051bj5vf0wjch2vg5y8pkwgbhdg6k6c97pf9gyd7"; depends=[rJava]; };
-  PCHiCdata = derive2 { name="PCHiCdata"; version="1.6.0"; sha256="1dqhwz6jqgmnvias2hjlnj10c0chsvhj904rgvk0ch9y47v0f4yx"; depends=[Chicago]; };
-  PGPC = derive2 { name="PGPC"; version="1.6.0"; sha256="1nfkj3ipl52xscz8qpmaspydvfzsjacrw89alhxpgsb71d59nbkj"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; };
-  PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.18.0"; sha256="19528l0f53nfnq1sdsbp3y6z5zx933csz5f72mh43408a6d384rk"; depends=[affy annotate Biobase PREDA]; };
-  PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.12.0"; sha256="0s3dqm1yiy4svkb6cj6xf6i81cc0mai0xjlbl3jvqdpy7npl0a08"; depends=[PWMEnrich]; };
-  PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.12.0"; sha256="14wqs4lxq1zav24znvqmkzbbqfapplg7xib9kbcxnqxkr509x4fz"; depends=[PWMEnrich]; };
-  PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.12.0"; sha256="1zmrv53944s7a6cm96m2wgj6j9cfg5kjwgdfalkmii3vm400f6lr"; depends=[PWMEnrich]; };
-  PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.6.0"; sha256="0wxf6p5r7h9zaxkzg1bf294d837klwscbd0gcxms26hgdj7pv2d1"; depends=[]; };
-  PathNetData = derive2 { name="PathNetData"; version="1.14.0"; sha256="1k5npvxijzf3f7fxkmljajmjmfpkd36q8a2zpn24c4v19vglnmzx"; depends=[]; };
-  ProData = derive2 { name="ProData"; version="1.16.0"; sha256="0vgs9xnwrqfn8px4c4q0y3kxfwk5zldwpykdhkjn63ycamlfmq25"; depends=[Biobase]; };
-  PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.4.0"; sha256="1qilqzfmhb4fq2rkafy200s94gaj9ln6c0j8gw3q5ql6kzclkq2i"; depends=[CAMERA LOBSTAHS xcms]; };
-  QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.8.0"; sha256="13b72z76z5nqb2snga4rn0jrsd12c13x4b1q9i15j2lxnklcw11w"; depends=[QDNAseq]; };
-  QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.8.0"; sha256="17azrrn9fkiq1z4xxcg2afwh25iyvi93lq9p13zcpzg75fx5ccvc"; depends=[QDNAseq]; };
-  QUBICdata = derive2 { name="QUBICdata"; version="1.6.0"; sha256="01i0n2sbi3l5gmkrvnc5r1c3fv57xli1fav7yal1x6vckqgma2ba"; depends=[]; };
-  RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.14.0"; sha256="0znhpk57bivhn94vd1czcrhcigi8wcascx9ycvbvfnbnibpwcsac"; depends=[RIPSeeker]; };
-  RITANdata = derive2 { name="RITANdata"; version="1.2.0"; sha256="0jl1grvgmrvvv5f4p0s6ypcpfbdlrc1s0pqqib7fw1qi1hmik5rj"; depends=[]; };
-  RMassBankData = derive2 { name="RMassBankData"; version="1.16.0"; sha256="15i1yy7vhwbz3vjkcdgybqaiwr3x7w9fplscachb3xpw6d5g52n0"; depends=[]; };
-  RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.16.0"; sha256="0z3ijyvkajpa08d6i1lb1bfkfwhqkjizwn17hrinps3k9bzymni6"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; };
-  RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.16.0"; sha256="06ja4rm3f310vj1sa473njsgaagmr3zz04pj3qp5cpq1pdcgsmfi"; depends=[]; };
-  RRBSdata = derive2 { name="RRBSdata"; version="0.112.0"; sha256="1vjh1x652ll33sjahair95n1l98z847ks2907g84sbkwhvfzhkrm"; depends=[BiSeq]; };
-  RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.6.0"; sha256="0grqjfiwi9i6whgiz73xz2havcwzjf3r23rg5wvxhk1bapxidxgv"; depends=[RTCGA]; };
-  RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.6.0"; sha256="02mr0kn5hf2nqi2s7lk440c6a3n34a8apb1j7rpi8nxp4lp757if"; depends=[RTCGA]; };
-  RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.6.0"; sha256="1mjxpdwziv0xy00hn0n7r0bvgh1gagrw77b5jnla3pz0nzhqwwhy"; depends=[RTCGA]; };
-  RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.8.0"; sha256="03m4rzzwmjzj1ijg10ir1d5nmix04l0mi2jkddiqgq8ryl231dk2"; depends=[RTCGA]; };
-  RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.6.0"; sha256="0v4z9hi9n8fxlk1gph7xapz2sgrakzm32xvl4qyjvqcfzmrvsjzy"; depends=[RTCGA]; };
-  RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.6.0"; sha256="1dcqjfkjncxa32j2dp1dlhfl7cjlr5gpzsxvbals420sqn6pbh0b"; depends=[RTCGA]; };
-  RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.6.0"; sha256="0iydym4bggbdwcnb916wqx9d8xxdm3aqbilknf31fvn7gyx76n5x"; depends=[RTCGA]; };
-  RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.8.0"; sha256="1jyg1h1g6bkz0rvpsb0y2ksx2k8s1lm6i9jrkj5b9p9sv28fdiz9"; depends=[RTCGA]; };
-  RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.8.0"; sha256="01s06w9aavgr19jf3kswxb2bg4v5r3j5md17j4qf698l82pjkigq"; depends=[RTCGA]; };
-  RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.112.0"; sha256="1sf4fbrgcmq4jy3g4kh8xlbmvvs6ww9s8p0z8cba2ga0v440nzk4"; depends=[Biobase]; };
-  RforProteomics = derive2 { name="RforProteomics"; version="1.15.0"; sha256="1jjc0hs6nmx56l5gl5rgqkrpv3shdwl4qjvn25ayv6dbvxajifw3"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; };
-  RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.10.0"; sha256="0ixc2vhfm8y51p7iycr1mv98dacazj6f7bn5naffy607d9ryylb2"; depends=[GenomicRanges]; };
-  RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.10.0"; sha256="14h4lqx8jymla7immhiisxkcch5pki26yk9ywgh2mwwkz5b3lmlr"; depends=[GenomicRanges]; };
-  RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.10.0"; sha256="0adds1l1hp4cv98jzf4jp6rhwfyv63dnzcp7gzb91wq9wmmhh81w"; depends=[GenomicRanges]; };
-  RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.10.0"; sha256="1a4389ds0kpq8q1brf7r7f368x7077qf1x53amixi4s15z3sqxzl"; depends=[GenomicRanges]; };
-  RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.10.0"; sha256="1q7gqs3n9cv6fn95n79ir6p2jxccdx133az4f3ab198kxbdkn5bc"; depends=[GenomicRanges]; };
-  RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.10.0"; sha256="0mimmfhssjr1h2fb8h0m7gjaw5z80vsnzjlckx9cmirn9112z3iz"; depends=[edgeR]; };
-  RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.16.0"; sha256="0p11ykzr0ypxsn3y0dwpggm826dszl3jzplvpzs60xgplj178m20"; depends=[easyRNASeq]; };
-  SCLCBam = derive2 { name="SCLCBam"; version="1.10.0"; sha256="1ivxp3pi9dskh2q331dfpc9vz8g3x82sickmhk86mnhr8zwbkx6w"; depends=[]; };
-  SNAData = derive2 { name="SNAData"; version="1.24.0"; sha256="1384y6jj8w380qppd9n80s41vz2g7lrlmckjszga0csc1qxx8dd7"; depends=[graph]; };
-  SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.14.0"; sha256="08myr18h36rczaqvrg2ckhrkivayspcr8p6p4400ynmafk8ihkkz"; depends=[]; };
-  SNPhoodData = derive2 { name="SNPhoodData"; version="1.8.0"; sha256="1v4cp21h05yi6n26by8nnwajk0kl7qjlh4n9c9r81g7m35qyz7ny"; depends=[]; };
-  SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.10.0"; sha256="1hf6lz6k6xvlda7pbp4k3y15a9bid5k3r1fv64slj2d7ahpcqzph"; depends=[]; };
-  Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.6.0"; sha256="01rm6rhi7izycsbf4qmpn8bnkklh6r7c19dnb3p4mrw14ykcxsf0"; depends=[]; };
-  SomatiCAData = derive2 { name="SomatiCAData"; version="1.16.0"; sha256="118cdjbaydibr8vi7jgf3jys0izph8d7986gwnq9fawbswdbhpp8"; depends=[]; };
-  SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.14.0"; sha256="0nzvc808lr3yp1gs60ifyq6ig52fqp1wy1pxazjcdsrxajpm8hl4"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; };
-  SpikeIn = derive2 { name="SpikeIn"; version="1.20.0"; sha256="1i38m224mdak52cd469nnm7q7f7llmwym9h03ldcs2i9azxp5dix"; depends=[affy]; };
-  SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.18.0"; sha256="0byb8gh2s7wlfdcnq9fkr92w7lxwrz48nlzprxd5b4kj91j1fdq0"; depends=[affy Biobase]; };
-  TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.14.0"; sha256="1vdk2z4jljwy4kpiy0bkf5ymx0hrc16ardh5rg1xvkra58z79p2j"; depends=[Rsamtools xtable]; };
-  TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.14.0"; sha256="0nw9q0gkna2qja720hf766ppilxpi8m2plz68laxhzbc8bgq4g8v"; depends=[]; };
-  TCGAWorkflowData = derive2 { name="TCGAWorkflowData"; version="1.2.1"; sha256="1ipl2lxwcp5ybzxw5hpa00c2syb5l8nnmdbdwchnbwj6j8gm97ly"; depends=[SummarizedExperiment]; };
-  TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.112.0"; sha256="1jpqpnyv3sc6pwh88gfpgc0dyypyi5fy1fim7ybggkc4zv2q69cf"; depends=[Biobase]; };
-  TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.112.0"; sha256="19965mwk4020xhs206n3gf8v85flf5qf2lnv6hsjfdsmi9clma4j"; depends=[Biobase]; };
-  TargetScoreData = derive2 { name="TargetScoreData"; version="1.14.0"; sha256="1y39vdd7h90yw3rz68cbdv55hkw6a7d73ld0l8ihpy3l6ppqa2vz"; depends=[]; };
-  TargetSearchData = derive2 { name="TargetSearchData"; version="1.16.0"; sha256="1zhwnpd2n5wydv7xi9ny8zx1riff3caj3lxr40g1fr1ps35vjdww"; depends=[TargetSearch]; };
-  TimerQuant = derive2 { name="TimerQuant"; version="1.8.0"; sha256="0cryfc9qm6mnp0hnznqna372qi00cgjvc1793hrmnx9qkcyiszdf"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
-  VariantToolsData = derive2 { name="VariantToolsData"; version="1.2.0"; sha256="0gp2ij4jbwmqhi76a2cnn7wrg227vzvdkwczcsdhawxdjkys8q7h"; depends=[BiocGenerics GenomicRanges VariantAnnotation]; };
-  WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.10.0"; sha256="0d3zixbpchvgzrrslsqgp784w3wswqlp50462ry8b871qaqvh16j"; depends=[]; };
-  XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.16.0"; sha256="0z9rfxr3w0rgd6hqp36i24590scng6hcs9k82am7hvnp54jd3zif"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; };
-  affycompData = derive2 { name="affycompData"; version="1.16.0"; sha256="1l9mp2l41y1gbpv3yszq8bk5lrnbar8ga03ga14fsj1a4a3hzng9"; depends=[affycomp Biobase]; };
-  affydata = derive2 { name="affydata"; version="1.26.0"; sha256="0ridqhk63d49wnsydf0iy5krnymgrjn3nxq7rnlzb85ryvcawqrx"; depends=[affy]; };
-  airway = derive2 { name="airway"; version="0.112.0"; sha256="0b155g62xy39vr58ni6snskyssll8fv0zvn9jln41xacil7f5pmq"; depends=[SummarizedExperiment]; };
-  alpineData = derive2 { name="alpineData"; version="1.4.0"; sha256="02fjs7liwh8m0n5hc0x51c7s718x3pv5a15qrf195bxsrx6qva47"; depends=[AnnotationHub ExperimentHub]; };
-  antiProfilesData = derive2 { name="antiProfilesData"; version="1.14.0"; sha256="1255z9f75hbkzf6sbanck9rfm65z3vzg6kdjyyablh8wxbimjy2j"; depends=[Biobase]; };
-  aracne_networks = derive2 { name="aracne.networks"; version="1.4.0"; sha256="1ahdk71ys4zf426swkyzmkaraz3lsjvn5dp4sdhxkxi5fmsx70mg"; depends=[viper]; };
-  bcellViper = derive2 { name="bcellViper"; version="1.14.0"; sha256="1jw4lfh9p9m9q636jxq69lvjj859b6977k3jrdpjbr0nvr6phwkw"; depends=[Biobase]; };
-  beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.16.0"; sha256="0nbfxln9g8kl18ddzjsmcda1myymyk01ljm9x78cbjcnz6f4w3f5"; depends=[beadarray Biobase]; };
-  beta7 = derive2 { name="beta7"; version="1.16.0"; sha256="0isvwy72d1764fq92h4315dxirvlp2crsgif9amcq13nv4rn40q6"; depends=[marray]; };
-  biotmleData = derive2 { name="biotmleData"; version="1.2.0"; sha256="09vcahw61zz1pbydfl42c28da3y7002956vdb7nbssj6qnp62pqs"; depends=[]; };
-  bladderbatch = derive2 { name="bladderbatch"; version="1.16.0"; sha256="0rmvlvhih00vvcjss8z31cfq5mqv7s7f2ysra7n9jrkb1hinzpmz"; depends=[Biobase]; };
-  blimaTestingData = derive2 { name="blimaTestingData"; version="0.112.0"; sha256="1qqyv21bn5nf876f9l6xjmpx0jz1vrkk5swpp8wjkgsymcvni9fl"; depends=[]; };
-  breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.16.0"; sha256="0k5aqaiqzhxksfiwk2kzzwi7y0c07q8hm7fybn8i1zixvjd8iwfy"; depends=[]; };
-  breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.16.0"; sha256="1iw7apcpvivrqsircvxch1kh1xwqwf797d7psyz8iyckkd9kjwy0"; depends=[]; };
-  breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.16.0"; sha256="15l3x34xj07ja5xvwy9fsbsyccyfgqpxmghbcjvjl2j3lwfhfdb6"; depends=[]; };
-  breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.16.0"; sha256="098rjmq04ycfaj1yw116vgbll5656j5qk3xackidn4y0qkgqg9xy"; depends=[]; };
-  breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.16.0"; sha256="126w884byzkbafn1d1qjp7m27d6mck7d6l23daw41vlrcssxz236"; depends=[]; };
-  breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.16.0"; sha256="0pvn08jhfmnl530la1ldsks9681xci5ivrdawcq7ggh7bxld56q2"; depends=[]; };
-  brgedata = derive2 { name="brgedata"; version="1.1.6"; sha256="0l2g7iwgm1jipz0vsik9dxsqslj7cv49y4mrxs4g9xsr2l9prm8i"; depends=[Biobase SummarizedExperiment]; };
-  bronchialIL13 = derive2 { name="bronchialIL13"; version="1.16.0"; sha256="0v0k80zhjkilnj7f567zq6b994csyhqmmd1xbs3006jmnkbnf2ms"; depends=[affy]; };
-  bsseqData = derive2 { name="bsseqData"; version="0.16.0"; sha256="11drh9nwk7af04nqgm4gn7lpsfxprg9z158l032jiclfv0dhkqgl"; depends=[bsseq]; };
-  cMap2data = derive2 { name="cMap2data"; version="1.14.0"; sha256="002l5isc234cg6hs35rvl2iyql6azjvr7dc3rsp0z9nzh9gmzjrz"; depends=[]; };
-  cancerdata = derive2 { name="cancerdata"; version="1.16.0"; sha256="15w2zy6cz4ivyw2j973x6alianqci1rqk2x3jzsjaadsij5bn6yd"; depends=[Biobase]; };
-  ccTutorial = derive2 { name="ccTutorial"; version="1.16.0"; sha256="1k6f47hf18fwlmjk9k2rkym328q7kwam0yq7mlcavj3w59avydan"; depends=[affy Biobase Ringo topGO]; };
-  ccdata = derive2 { name="ccdata"; version="1.4.0"; sha256="0srpibvjf89b8n8gf01njwg8gbi7a174y3fdcmxilfrfjqc9n2ib"; depends=[]; };
-  ceu1kg = derive2 { name="ceu1kg"; version="0.16.0"; sha256="0dfbm2zyp140n57b9jn05li0bb3dz5cyilmdap2c28fjbyxrqdva"; depends=[Biobase GGBase GGtools]; };
-  ceu1kgv = derive2 { name="ceu1kgv"; version="0.20.0"; sha256="1bl7b9ys59p9mk54vvsxravmq4xy9fxw3xadkbfdapyj79356r4p"; depends=[Biobase GGBase]; };
-  ceuhm3 = derive2 { name="ceuhm3"; version="0.16.0"; sha256="0f8lcws55zixrpwi9m1cqcz0g9k2bvx67h09sxhswswaalqq83xv"; depends=[Biobase GGBase GGtools]; };
-  cgdv17 = derive2 { name="cgdv17"; version="0.16.0"; sha256="1rq6dm0c1d395p7qixrnl7m3a7kzgih5bibxg65rngcs3fpjw3zh"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; };
-  charmData = derive2 { name="charmData"; version="1.14.0"; sha256="1y3lrmc8pqdnn1kqzy7r1flqlhj8yjj74hlrj3m49bi9isbv1yip"; depends=[charm pd_charm_hg18_example]; };
-  cheung2010 = derive2 { name="cheung2010"; version="0.16.1"; sha256="0xhv2zrzlhy4k828kq9rjw3slx1z30g0gwrnz2b9fgrnbd4f8fjd"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; };
-  chipenrich_data = derive2 { name="chipenrich.data"; version="2.2.0"; sha256="0iw4c60fpsixn6r5102s3422dlh1vxy4bdfnf8mf8l3893fgj0zc"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicRanges IRanges readr rtracklayer S4Vectors]; };
-  chromstaRData = derive2 { name="chromstaRData"; version="1.4.0"; sha256="10ldrshic91rrjvrc7gi1lhqdnw9g3j00pz6vwhp6qnksr6lxdpi"; depends=[]; };
-  cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.14.0"; sha256="0j9jgjcsjr5vc0k0h7bjlvrln57zbl7pibdk7sxb1p56p49pngq4"; depends=[cnvGSA]; };
-  colonCA = derive2 { name="colonCA"; version="1.20.0"; sha256="1b8kfpr2m5r286ah01jha8js4bvqxw0kk64k1gll96ydi1j6nx7d"; depends=[Biobase]; };
-  curatedBladderData = derive2 { name="curatedBladderData"; version="1.14.0"; sha256="1xwg0m4iijvilhzc7sxspj06pm1ysldasv89yi2vskpilm5y1gci"; depends=[affy]; };
-  curatedBreastData = derive2 { name="curatedBreastData"; version="2.6.0"; sha256="1x3wqxhafhbns7bngbbqzmjxw3rrb0a4xa2z7pdnlhxxij10mycd"; depends=[Biobase BiocStyle ggplot2 impute XML]; };
-  curatedCRCData = derive2 { name="curatedCRCData"; version="2.10.0"; sha256="1h0wys79wr3csq93yvz6rzy964ydjyzfciwjp8099mxrbxsw538s"; depends=[BiocGenerics nlme]; };
-  curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.8.1"; sha256="1ip9v0v6lr7xg1j3zww99n0d5ar8l4d3c74mfhl9jg9c27vqcq95"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; };
-  curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.16.0"; sha256="15d3g7snphvqh8cgry52lqz7v2l6icxznwcplvp73chkr8skqi38"; depends=[affy BiocGenerics]; };
-  curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.0.3"; sha256="19mm3psjmd6rzr34hcz1h5di8smqppnh73jqnqk6mnhgfy1i39ga"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment S4Vectors]; };
-  davidTiling = derive2 { name="davidTiling"; version="1.18.0"; sha256="1n7axspfh4ph911pj4x2r2dz1xmf6yk9hlnynx7pfmqlgzzcqcvy"; depends=[Biobase GO_db tilingArray]; };
-  derfinderData = derive2 { name="derfinderData"; version="0.112.0"; sha256="0nv2n5417yp8bwdrswbpvni3fg58wl40425f58rdljm4rndk51if"; depends=[]; };
-  diffloopdata = derive2 { name="diffloopdata"; version="1.6.0"; sha256="1ww6raiwr7ymjr4psrgf7q3f59vx32fcc0id9d414z5n8lr4krlr"; depends=[]; };
-  diggitdata = derive2 { name="diggitdata"; version="1.10.0"; sha256="1w275zk4q5hfmjagdpmfa6xls82zkk34wz795lfnccg1bhvhvpj2"; depends=[Biobase viper]; };
-  dressCheck = derive2 { name="dressCheck"; version="0.16.0"; sha256="0x5h4d0hpx1cdlbs2pmylvkhjl46j2vbw8m6za48iv5ksjaxh099"; depends=[Biobase]; };
-  dsQTL = derive2 { name="dsQTL"; version="0.16.0"; sha256="02ha43xn2z085cyjq57d0n7919lj15bpy40kd0j9zwijyfrldz3s"; depends=[Biobase GGBase SummarizedExperiment]; };
-  dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.18.0"; sha256="07ggqj5bz8bna913ryb8wrb9jyr931nlpr5fggil35ms39xqf84f"; depends=[GEOquery marray]; };
-  ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.18.0"; sha256="0pk6livrn8wan6w44kxvhx2s5yjqf5x9gv5pj0mcldirr5fwkyh6"; depends=[affy ecolicdf]; };
-  estrogen = derive2 { name="estrogen"; version="1.24.0"; sha256="0rjf95skgpznzwynfzc4mm5rs518x3ilqavz4250yp6g2yk81gdn"; depends=[]; };
-  etec16s = derive2 { name="etec16s"; version="1.6.0"; sha256="0ms9f8925icf7ylrjz4akf147hii44qq9x3ddj0sy971a6ra8m1v"; depends=[Biobase metagenomeSeq]; };
-  faahKO = derive2 { name="faahKO"; version="1.18.0"; sha256="0a43w7v0sn8z5qyjw0bdkn1jiwzsbxjhpjn9xr5lq1gba4wc15rh"; depends=[xcms]; };
-  fabiaData = derive2 { name="fabiaData"; version="1.16.0"; sha256="0hrn14nwz7xvrd7v0s4b29s22kczj24jklc2yyvij5icjlnr436j"; depends=[Biobase]; };
-  facopy_annot = derive2 { name="facopy.annot"; version="0.112.0"; sha256="0zd7li5yf6bl9vhpaj0sx8ilv7pqyaavscdrr1lw8y980qiggicm"; depends=[]; };
-  facsDorit = derive2 { name="facsDorit"; version="1.20.0"; sha256="1ppmfkrsdcmd47vakd4kxr5y78387wjpyanlhv9pp741x1jiyf5m"; depends=[prada]; };
-  ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.16.0"; sha256="0jla2cblvkahm1qkszx14dmhsjbk5ywz7sbg14s4x5xf0rv537gk"; depends=[lumi]; };
-  fibroEset = derive2 { name="fibroEset"; version="1.20.0"; sha256="1k32m49bhk30rbjryg77jhicjzga970p12wcy5bwzm0qxyj6wvqj"; depends=[Biobase]; };
-  fission = derive2 { name="fission"; version="0.112.0"; sha256="0wgfb85pbs2q4wy59dqpnvvgw63kc9xr0smbjkp482nqv437vg15"; depends=[SummarizedExperiment]; };
-  flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.14.0"; sha256="02cziq2jskrz17s05myqj8w1dfd49crnsga9l19xi67n2gl0dl5k"; depends=[flowCore]; };
-  flowPloidyData = derive2 { name="flowPloidyData"; version="1.4.0"; sha256="09gcy0qv1crz8vfk4s58x054sbhnnfv9mvh1k5vcmlckppimywwq"; depends=[]; };
-  flowQBData = derive2 { name="flowQBData"; version="1.4.0"; sha256="1gvbykmmgl94vmd0g1fccdlshjycll5jvv8vg3h94kx7r3vq8ymi"; depends=[]; };
-  flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.14.0"; sha256="10q3nhcbmq75vk1z5zlqsp03d734qmkicsrc25nas2gnbzqmbhwx"; depends=[]; };
-  frmaExampleData = derive2 { name="frmaExampleData"; version="1.14.0"; sha256="11h9hwif6hcc3jaipgf5dvjj3j2rcp61phhvxz45r563m494s83z"; depends=[]; };
-  furrowSeg = derive2 { name="furrowSeg"; version="1.6.0"; sha256="0ds6x0a5qpp3c8776wbq1zbz17i5ymwxphf9zkxgsnrmjw3cpvvf"; depends=[abind dplyr EBImage locfit tiff]; };
-  gageData = derive2 { name="gageData"; version="2.16.0"; sha256="18w5wdaq1j2mndyjfiflawf411zwh1hhjwcxaxrwqnl48p25vg5c"; depends=[]; };
-  gaschYHS = derive2 { name="gaschYHS"; version="1.16.0"; sha256="1c9pq8b2mllpsvwyb7w0gwh66kkabrdfadsqd6hagszbyy9sw2v8"; depends=[Biobase]; };
-  gatingMLData = derive2 { name="gatingMLData"; version="2.18.0"; sha256="1zlxzy9wzzqfm9brd70kdvki5d9r6lsqc22y0m469ybcxypzvan4"; depends=[]; };
-  gcspikelite = derive2 { name="gcspikelite"; version="1.16.0"; sha256="0p0yxm9i4ynhcvshxywxf6d9lhcr32xp7677ywc6q0ikvr6733zp"; depends=[]; };
-  geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.14.0"; sha256="063ivzxw02j854ivv5yxdw7a637svadf9n2zwvc3783y4clkfqb6"; depends=[GenomicFeatures rtracklayer]; };
-  genomationData = derive2 { name="genomationData"; version="1.10.0"; sha256="0h7g5x3kyb50qlblz5hc85lfm6n6f5nb68i146way3ggs04sqvla"; depends=[]; };
-  geuvPack = derive2 { name="geuvPack"; version="1.10.0"; sha256="0lin7wz9xp7rx34wykpmsd5w7hf0jzzfbmnb4klrvlys1c5r9xr2"; depends=[SummarizedExperiment]; };
-  geuvStore2 = derive2 { name="geuvStore2"; version="1.8.0"; sha256="1fhq0r3hnv6k4mfrdhjsaylfi96vwv7j74dkaad92li4pizcz04q"; depends=[BatchJobs GenomicRanges gQTLBase]; };
-  golubEsets = derive2 { name="golubEsets"; version="1.20.0"; sha256="0zsylgc1ml9ddnd5r4magmhn7k3glz50aw9aqvf251zjycasncz5"; depends=[Biobase]; };
-  grndata = derive2 { name="grndata"; version="1.10.0"; sha256="0gqxvngjbxjd40z855vcrc4lqhx9q3b4bgicc371dkglsls4rpgs"; depends=[]; };
-  gskb = derive2 { name="gskb"; version="1.10.0"; sha256="0j36kbyxrrp5h2m7747kprdvhidpcmm14lmqkd1c97ykx5wnzhpr"; depends=[]; };
-  h5vcData = derive2 { name="h5vcData"; version="1.112.0"; sha256="169sg12li7nzd2zv6rj28qc6xfh1l7l9ipybrqa8xyqlcjhpq85f"; depends=[]; };
-  hapmap100khind = derive2 { name="hapmap100khind"; version="1.20.0"; sha256="02pyrd8i1agx31ww4sw6xcwmncibvhqbys072w80rlx3vbjymn3c"; depends=[]; };
-  hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.20.0"; sha256="0vp1wkbz4l9cxld9iazdi59mkrpvinjz6abf34rl7qzbqnckgygf"; depends=[]; };
-  hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.20.0"; sha256="1ddxp4adf5nlr96n89hqjv9f0jvm0zknmwpibp757ic6zrk262da"; depends=[]; };
-  hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.20.0"; sha256="07cmawlx9wdbyzjjj5wh2h1a32d3ascr9h8rpyg6z1pdriq8cahq"; depends=[]; };
-  hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.20.0"; sha256="19wpwai8h0ix4cv17rgz4pz74b0qwby4jc5ry539fb8ls9rzvx1q"; depends=[]; };
-  hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.20.0"; sha256="0qjfmjww0rdma3q2nh6ax64zl7adx4n9j0xhc9s19rz5drsdnifl"; depends=[]; };
-  harbChIP = derive2 { name="harbChIP"; version="1.16.0"; sha256="1hzlxha4nlvqw8ml6pylcmb7y986718yg7ff8hn344yfcigpsqkb"; depends=[Biobase Biostrings IRanges]; };
-  healthyFlowData = derive2 { name="healthyFlowData"; version="1.16.0"; sha256="00mjbla9cwj656s174xbfcdmi8gr1xs7vksazrx25m9yn3dw23jb"; depends=[flowCore]; };
-  hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.16.0"; sha256="1ffamwyl5fax5n6x4nc01gx4kazs73jsm239w943jkx2bwy5j2zf"; depends=[]; };
-  hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.16.0"; sha256="1blm93a5ll7pn1yhbrl8y6wb1yvfvfnc1zq96kr6id9wxi7bl9hl"; depends=[]; };
-  hgu2beta7 = derive2 { name="hgu2beta7"; version="1.18.0"; sha256="15g6lmq6zfg2vkqliadqrmwivw2mldxlrf52myspmfl83scq973a"; depends=[]; };
-  hmyriB36 = derive2 { name="hmyriB36"; version="1.14.0"; sha256="0g642694w0qsf27chdlw1g6924pm20kbgza4w57szcdnschabh52"; depends=[Biobase GGBase]; };
-  humanStemCell = derive2 { name="humanStemCell"; version="0.18.0"; sha256="1nff23qa684xzy35d78sympkns7qa82c8cg21bgff3yhlw2ww2ws"; depends=[Biobase hgu133plus2_db]; };
-  iontreeData = derive2 { name="iontreeData"; version="1.14.0"; sha256="1xj8psicl3yp17i7r6cg9v7rf1wvpz2kck7pbnhwppm7cshqang1"; depends=[]; };
-  kidpack = derive2 { name="kidpack"; version="1.20.0"; sha256="007jlvpcwin2q09v4z79mnplz2176crgngana4mfpmx4sp4sh1lx"; depends=[Biobase]; };
-  leeBamViews = derive2 { name="leeBamViews"; version="1.14.0"; sha256="1dvrfn3zwi5zl8fjp6kyqankqpzi2dhgzyj1dlp1bijy2y09lg7p"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; };
-  leukemiasEset = derive2 { name="leukemiasEset"; version="1.14.0"; sha256="1pya637a8yww5cm108w5l1ij2js9mx9mpq7d1miwqdqv2mi0liz6"; depends=[Biobase]; };
-  lumiBarnes = derive2 { name="lumiBarnes"; version="1.18.0"; sha256="1jxk7abi7lkv8627vn9ydnmx6i4ycgicnl91j6r5gi0q3kffmmkq"; depends=[Biobase lumi]; };
-  lungExpression = derive2 { name="lungExpression"; version="0.16.0"; sha256="09v9r6rmfcqprqd1rx53sa4dhjjmg6d9649vlhfhzkyc73yknwmb"; depends=[Biobase]; };
-  lydata = derive2 { name="lydata"; version="1.4.0"; sha256="0dflfp14gdjgy7qf3my0vas5zbg77l16li7xgv1924cry11w2dxx"; depends=[]; };
-  mAPKLData = derive2 { name="mAPKLData"; version="1.10.0"; sha256="1bfx4imb5yg17n0g1ag436zlks4jcp8ga0xj9wyh9bhx4miwyay4"; depends=[]; };
-  mammaPrintData = derive2 { name="mammaPrintData"; version="1.14.2"; sha256="04ymimgj8ng5qgvq0cglmhcxv7a3jqx9a2zyg8lwiwzpyip18inx"; depends=[]; };
-  maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.22.0"; sha256="0hn20i11vl9x23mx283aki097r1a8rspagac821kmlwghyab1mxq"; depends=[]; };
-  metaMSdata = derive2 { name="metaMSdata"; version="1.14.0"; sha256="1iygqxymvb98cm325bmdqb34n9b4k1vdzdyzcq8a0gh1dvs2m0iw"; depends=[]; };
-  methyvimData = derive2 { name="methyvimData"; version="1.0.0"; sha256="1b2mvcawafkr15py8h9j10w5givifi99h9clbdmkgfyixbbh0m94"; depends=[minfi]; };
-  miRNATarget = derive2 { name="miRNATarget"; version="1.16.0"; sha256="1ym4wg3g29z7yqmxfxq95yxwc5n048fw3m4bp7dwcq1agnjn5qa7"; depends=[Biobase]; };
-  miRcompData = derive2 { name="miRcompData"; version="1.8.0"; sha256="0h4a3vwzbpzs7rnkn3qgpmfp08a8x8vyy78zb2zl0pgnni7yrdks"; depends=[]; };
-  microRNAome = derive2 { name="microRNAome"; version="1.0.0"; sha256="13fwzf91hdy4vvxg47xkl78qk4jfgn9whj41gl3pqbgxkp7b3d2n"; depends=[SummarizedExperiment]; };
-  minfiData = derive2 { name="minfiData"; version="0.24.0"; sha256="0j5f69k9s0mppb62cffj3kscvvmrrwhf6x3xsw3bc6qdk0f3sv67"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; };
-  minfiDataEPIC = derive2 { name="minfiDataEPIC"; version="1.4.0"; sha256="12vxglizdyxk4hmj684cwfax4k1rwrz9lmm7khbqzhckzrgiqbny"; depends=[IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest minfi]; };
-  minionSummaryData = derive2 { name="minionSummaryData"; version="1.8.0"; sha256="1dyr99wi3syzrr6vdxfcp7fjnx9p4gd6raj2r7x83r11g2rndpyn"; depends=[]; };
-  mitoODEdata = derive2 { name="mitoODEdata"; version="1.14.0"; sha256="0vgmalrsnm616la3251p1fvcjpfg0wpv5zaxg20ikdc982zfk4sa"; depends=[]; };
-  mosaicsExample = derive2 { name="mosaicsExample"; version="1.16.0"; sha256="0m2az0wv2lmdwa8c465cnfwmnmxmjz33ras984xbcvkh5a8i3gmw"; depends=[]; };
-  mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.16.0"; sha256="119z7vxd4yrfgjsd286iswklg0n07gzyckib3ivmm285hxphl79d"; depends=[]; };
-  msPurityData = derive2 { name="msPurityData"; version="1.6.0"; sha256="1fpxy34gyngsz7rpr2ng77xb1bylj8s5i500mpbi765cva47lk11"; depends=[]; };
-  msd16s = derive2 { name="msd16s"; version="0.112.0"; sha256="0ii7c6ynif55izkysw12vjphpkxyx3lvw0akfl18ypbiash3qf6h"; depends=[Biobase metagenomeSeq]; };
-  msdata = derive2 { name="msdata"; version="0.18.0"; sha256="16wygr7g7vr3jsw9l6fzajid1cxffdww9pik5m4x55chdliq4f25"; depends=[]; };
-  msqc1 = derive2 { name="msqc1"; version="1.6.0"; sha256="0csm35vzk9dp3gc8yfzli1rwanrah42yxsqssjfbvw5zcijs9npm"; depends=[lattice]; };
-  mtbls2 = derive2 { name="mtbls2"; version="1.8.0"; sha256="1miqc8apjm8pvb9p4man688qnxpg04fqgidy7g9vr654hfc90gja"; depends=[]; };
-  mvoutData = derive2 { name="mvoutData"; version="1.14.0"; sha256="0lwzsv8pmyyadnky9m0c3xf5dvm2qs8igkvrfaglsgl1wmymw86a"; depends=[affy Biobase lumi]; };
-  pRolocdata = derive2 { name="pRolocdata"; version="1.16.0"; sha256="1pmz9vyvl3r8s6mfbd7k7vrz7qk1sv9136aykykvl139rsq7vwnz"; depends=[Biobase MSnbase]; };
-  parathyroidSE = derive2 { name="parathyroidSE"; version="1.16.0"; sha256="1jd3fwri705b4i1wwnzx41idc2lvwai6mr7k78666wl6a8275hcn"; depends=[SummarizedExperiment]; };
-  pasilla = derive2 { name="pasilla"; version="1.6.0"; sha256="0h6ll2csja5vnmylazb1qklz7ybk5hn0nxgkvxhhsmyqk9w7gk6m"; depends=[]; };
-  pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.16.0"; sha256="1rchf41zh44kzvim8iwvyfvgcfwv587p5p1yipgwf65hyc9sd0fv"; depends=[]; };
-  pathprintGEOData = derive2 { name="pathprintGEOData"; version="1.4.0"; sha256="143an0hs22dbglmdc408mfch53zcskbf3a4jfgiajz3dml81flzl"; depends=[]; };
-  pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.14.0"; sha256="137lj4j0hlz3mkwyf334xr3bpm9j2jg1cd2sw9203kx6hvk92i2z"; depends=[]; };
-  pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.14.0"; sha256="0kb62bm1a8m88g59v6553qg69rmv0gh0wy4yfkqvn2sgz51zk4r4"; depends=[]; };
-  pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.14.0"; sha256="0b3cak7nzd6qxr7gnly4246gjdhxyp8h0w5dr1xsgwd9zy1k0psw"; depends=[]; };
-  pcxnData = derive2 { name="pcxnData"; version="2.0.0"; sha256="10qhw7v1nzf4y9xhd34jiimcyi6lgjy6y9zc6kzk80hm6qiry8j2"; depends=[]; };
-  pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.16.0"; sha256="1ilwm4nx232dll01xqqvagq3qi6qa060v84y20ihxhfwdm46z0ci"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pepDat = derive2 { name="pepDat"; version="0.112.0"; sha256="15v4yk9cpnz2k16ka4iyc61ji5ck9mlkabgzxalwfnz77ri23mk0"; depends=[GenomicRanges]; };
-  plasFIA = derive2 { name="plasFIA"; version="1.6.0"; sha256="0p3pbjm5ww24ax7h72m38l0rcm01w5a4h8j5rsgynczvfv9jlwjq"; depends=[proFIA]; };
-  ppiData = derive2 { name="ppiData"; version="0.16.0"; sha256="00wjgaihavx99qbcrx1sai2v35pm7kmkvybwdn7ndngvkzqixph5"; depends=[AnnotationDbi graph]; };
-  prebsdata = derive2 { name="prebsdata"; version="1.14.0"; sha256="0rq90wrprj8xy60597dwq8ialjfyfcs8c2fgbskcm7ypba92brmp"; depends=[]; };
-  prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.6.0"; sha256="0f08mbwsac1nxvf4mwyjnwxd662rdibnzgrn8a0hcl1jmlsrkmg0"; depends=[Biobase]; };
-  prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.6.0"; sha256="0rk822avnfg3lydq9z995ki9zh7ch8ycg6nslxp8w5c3z4p447mk"; depends=[Biobase]; };
-  prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.6.0"; sha256="03min0za1paivvi45fl6nyksvhahpxlnqnkisj9312pb1x1gfm54"; depends=[Biobase]; };
-  prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.6.0"; sha256="01c519rp5jdphc9kqsdqcxsxkg00nhv3s82xlms6s0qdpibscx8m"; depends=[Biobase]; };
-  prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.6.0"; sha256="10qqsijkjwsw64am50vcjykxghgw51psq608yp9qj85l5d33kkmp"; depends=[Biobase]; };
-  pumadata = derive2 { name="pumadata"; version="2.14.0"; sha256="0fsg1qcvfm2s7mpmwqih4pkgwphb4d1k8fah6gwvgc13q519ir2x"; depends=[affy Biobase oligo puma]; };
-  rRDPData = derive2 { name="rRDPData"; version="0.112.0"; sha256="0305x1kkm5wbxcnw7kazrlhdjp91xrbxcvyypn6n0ga09ypk071l"; depends=[rRDP]; };
-  rcellminerData = derive2 { name="rcellminerData"; version="2.0.0"; sha256="03j715sdprmdn1kazcyfy33nymz8kj52hxbv85a8bj3r2r1w6fzm"; depends=[Biobase]; };
-  restfulSEData = derive2 { name="restfulSEData"; version="1.0.0"; sha256="1v7fvyabb8zjhzwpi1yamp0ch8zm32s820bfr366ir69dib66sa4"; depends=[ExperimentHub SummarizedExperiment]; };
-  rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.16.0"; sha256="06mfgsvzn2s30skrrqm4m76kb1bzp6aa52jfkz94gfam8ps1h1vf"; depends=[]; };
-  sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.2.0"; sha256="0bb4pjiljjixxvz9p59knwxmwr7g0334rs58r0j9w84v1g5prgwv"; depends=[SummarizedExperiment]; };
-  scRNAseq = derive2 { name="scRNAseq"; version="1.4.0"; sha256="0jlcgna92mrcjz95r788falyhdpbfa75z2j7dy4jxdr0kd0gjrb6"; depends=[SummarizedExperiment]; };
-  seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.10.0"; sha256="01h6xhap2gbwgv3jwrzzciwd697x1vy6gaxmn0jlhvryy9qw9q05"; depends=[]; };
-  seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.14.0"; sha256="1g1lgzsrnf0j5yv2hlgilij1mzbz86pl3p3vd8pbkd61pdf4gxz2"; depends=[]; };
-  seqc = derive2 { name="seqc"; version="1.12.0"; sha256="0dzfxx75lnrqh2ag9x7351c8xkkfrbvz8fqnigfslgrx01ydxs9y"; depends=[]; };
-  serumStimulation = derive2 { name="serumStimulation"; version="1.14.0"; sha256="10pg5vp1np7n0n7maiizgx2kskm02ikfqvz6pxlz9mglhi1vss1l"; depends=[]; };
-  seventyGeneData = derive2 { name="seventyGeneData"; version="1.14.0"; sha256="0643h4wlqmpsygawlh9mh1f889wp79adhlx9s1cqm2b5gggpsrli"; depends=[]; };
-  shinyMethylData = derive2 { name="shinyMethylData"; version="0.112.0"; sha256="03y637yxglvy3jxydslwl9ivdc5r8ndph7anbzrmprzp6i481gj4"; depends=[]; };
-  simpIntLists = derive2 { name="simpIntLists"; version="1.14.0"; sha256="1sdmcbx3yvgwhw8kilx3xa6ip0klyvia00plv1pyfwsl6ldnymvl"; depends=[]; };
-  stemHypoxia = derive2 { name="stemHypoxia"; version="1.14.0"; sha256="0l6nfx1b97grxgq618zvb9ymysrl52r1ahr5ivav3znsnych0gl8"; depends=[]; };
-  stjudem = derive2 { name="stjudem"; version="1.18.0"; sha256="1bxc1qzs6jcdfh87f6mzn9d1ih790i461267czzhsm9niha4q604"; depends=[]; };
-  synapterdata = derive2 { name="synapterdata"; version="1.16.0"; sha256="1r1ldji1wnfsk772c00cwmx13xms90v9diqrqjilxbam9p30wr98"; depends=[synapter]; };
-  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.6.0"; sha256="1j2kwczhqz26rf0ra34am32lbwp7rk13in1saf0kxd88m8qljksa"; depends=[BiocGenerics]; };
-  tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.16.0"; sha256="0a71k64y6yw4pxnbay478d27pfshnw96rslphvpkqaf48903b2fy"; depends=[]; };
-  tinesath1probe = derive2 { name="tinesath1probe"; version="1.16.0"; sha256="088hrs6b65rxvw4d153fbk83w9p88mv5xfkwj4xziygibqy7lmpi"; depends=[AnnotationDbi]; };
-  tofsimsData = derive2 { name="tofsimsData"; version="1.6.0"; sha256="030x882c38apa3n4vs9qj5a83sa8m183ifym60zqyms432k4xc70"; depends=[]; };
-  topdownrdata = derive2 { name="topdownrdata"; version="1.0.0"; sha256="157vv89cidpcnliksfy4inds52j176724xydk0smykc6ny9wmas7"; depends=[topdownr]; };
-  tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.16.0"; sha256="17v27ir0a38y1h73nr8nib18bj8s2l6rbz5y15ly7pp2wkp5w0cm"; depends=[Biobase]; };
-  tximportData = derive2 { name="tximportData"; version="1.6.0"; sha256="0l86z9nryhqzdqh6vn5krlkdhanhybr86z75l7lwg07k34nm8qcb"; depends=[]; };
-  vulcandata = derive2 { name="vulcandata"; version="1.0.0"; sha256="0nka5sw9gp7nv09zdi4cq10k7k400padadq80xzxfzss91nwz23l"; depends=[]; };
-  waveTilingData = derive2 { name="waveTilingData"; version="1.14.0"; sha256="0ndskrk78c8596gymcffdr5mbxi1x5046w8m83baa3vrd8csn282"; depends=[]; };
-  yeastCC = derive2 { name="yeastCC"; version="1.18.0"; sha256="1qm0knin24bwpjsi4g9s6vdfydrjqvv19a2kjx1k51l2j46g0rni"; depends=[Biobase]; };
-  yeastExpData = derive2 { name="yeastExpData"; version="0.24.0"; sha256="19v901c67kp8kfb6i2hv8mczf9kcy0pvr8y4w5brjp4lj6djcvid"; depends=[graph]; };
-  yeastGSData = derive2 { name="yeastGSData"; version="0.16.0"; sha256="19c4293lzrw8d8az1bzfw5ipxyrzgh8kxi3km82nqzfcnxlq0b89"; depends=[]; };
-  yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.14.0"; sha256="0f7amg423236scpzxqi2jy2w4ppa0zqwn9m4mqjksk2klig9nx3g"; depends=[]; };
-  yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.16.0"; sha256="05pi5s91wivlc1nfnsnzgx8kdibi7a3k5dgqh0a0x98wiqynin41"; depends=[]; };
-  yri1kgv = derive2 { name="yri1kgv"; version="0.20.0"; sha256="0hl53rl5yhmd3yxdjd2q0wj8mlcgdckiln0dym83b1249lnhwp9z"; depends=[Biobase GGBase]; };
-  yriMulti = derive2 { name="yriMulti"; version="0.8.0"; sha256="0b48phy3jndplmi9yxbd0i5bn7jqf6fpb7qlqxvzibm1q50l9yx3"; depends=[dsQTL GenomeInfoDb GenomicFiles GenomicRanges geuvPack gQTLBase Homo_sapiens MultiAssayExperiment SummarizedExperiment VariantAnnotation]; };
-  zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.112.0"; sha256="1zpn3d4xmzq18hji93g5br1snw0d9wmvpjmbxnmiaqwr8mrx5zbn"; depends=[]; };
+  ABAData = derive2 { name="ABAData"; version="1.11.0"; sha256="0ihr0av55kfg36igb1dn5q132q4gnyaf041xqi4rw7n67525qdap"; depends=[]; };
+  ALL = derive2 { name="ALL"; version="1.23.0"; sha256="1m3bx001qngwx0h64kv187q7bsxm22prfm1npbjrfzhg4vjn8rnf"; depends=[Biobase]; };
+  ALLMLL = derive2 { name="ALLMLL"; version="1.21.0"; sha256="14pwfwndrapk1h824hw6dyxlkicxqylx56kky9zg8q0qfm5w1ygf"; depends=[affy]; };
+  ARRmData = derive2 { name="ARRmData"; version="1.17.0"; sha256="1y6lld8ijxw2g1qxs1bzvjppwfax6yv1ww18axn9553ibjznis7b"; depends=[]; };
+  ASICSdata = derive2 { name="ASICSdata"; version="1.1.0"; sha256="050ihbi20chjd5gvyf5jcmjhb1kvdvz80nh5aw1yp8ydfgdnqqwg"; depends=[]; };
+  Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.17.0"; sha256="1zcai5p4vgpmdv4zdnrqkdszg6wiq6ajj4vbas4hcyp5yglfby3h"; depends=[]; };
+  Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.15.0"; sha256="144wb8sniifglqdryfvpnxx7hv1v2c6djqzbk4mq4lkrp64a251n"; depends=[]; };
+  Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.19.0"; sha256="0glp22hqblylqc9n8jcx19k2p7ld9ykdnvqgr7nbipsvm4zgnkn1"; depends=[]; };
+  AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.19.0"; sha256="0nf3260aqz4831q8i83nqlcf5hq9b988ly5rhrwyb8mv2ncs0z9k"; depends=[]; };
+  Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.19.0"; sha256="05w1w7fqvhf2xi2d0d5rzigv3sriwy5jxak7j8bvmbwnx31inv5k"; depends=[]; };
+  AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.21.0"; sha256="1k1qzxakbavm10bd0ybs1gk97w1y825iqvwimn0cr128qw2xxkyj"; depends=[affy]; };
+  AneuFinderData = derive2 { name="AneuFinderData"; version="1.9.0"; sha256="0m3pvsdd2y1947zl582791bsip95j41fc6g9gbin3cg51y7lb6xr"; depends=[]; };
+  AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.11.0"; sha256="08r5430gqsmkbh4n49ac2fl0m24zmqjnc9yxppw5mr0d4n5l26y5"; depends=[]; };
+  BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.19.0"; sha256="177zapqbf8ipavs1sp1gby99dbbzsyzgxyjhr258r7849b388k1v"; depends=[beadarray GEOquery limma]; };
+  BloodCancerMultiOmics2017 = derive2 { name="BloodCancerMultiOmics2017"; version="1.1.1"; sha256="1x1cdq226gr69wlnl543ynvwrxd7fr7znvvh6x1ka8iw357sfglf"; depends=[beeswarm Biobase DESeq2 devtools dplyr ggdendro ggplot2 glmnet gtable ipflasso RColorBrewer reshape2 scales SummarizedExperiment survival tibble]; };
+  CCl4 = derive2 { name="CCl4"; version="1.19.0"; sha256="1j4q7mm4lwi3rcf0y6zj36xc6n7c8y6l8iv9ac4avbgvr1rvlxaq"; depends=[Biobase limma]; };
+  CLL = derive2 { name="CLL"; version="1.21.0"; sha256="103lmn87zw73sx30ln6g4382ydpi97b1zsm7www8bwlnw6zx7k7g"; depends=[affy Biobase]; };
+  CLLmethylation = derive2 { name="CLLmethylation"; version="1.1.0"; sha256="1rwnc84plgkzlz78gawjhjf4lf6gbdzgdhjp6ap49bqzgpp3c10a"; depends=[ExperimentHub SummarizedExperiment]; };
+  COHCAPanno = derive2 { name="COHCAPanno"; version="1.17.0"; sha256="199xz5qwp06kr3smr25vx2w25hmzf7qbpaw18aj7bvccsdsyvky9"; depends=[]; };
+  CONFESSdata = derive2 { name="CONFESSdata"; version="1.9.0"; sha256="091ydgxqldrcr3b73pqyk6555yyclnnr4yizi0kknqasx33sb802"; depends=[]; };
+  COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.17.0"; sha256="1pgfqrp6cx94marm96swqq8c9nr00xdmlf62hvmacqwspsajbnya"; depends=[]; };
+  COSMIC_67 = derive2 { name="COSMIC.67"; version="1.17.0"; sha256="0qd0xbc8hy25hyy8bilim2w5inhwz88rypbqc8vjlg54r2yl12nh"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; };
+  CRCL18 = derive2 { name="CRCL18"; version="0.115.0"; sha256="0y2v5fmlfj7hzkvw1l116vnczjnmhxd77gvdqjjynl9cgvlx0smq"; depends=[Biobase]; };
+  CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.13.0"; sha256="1rjp3ybc0yx8sjqp4ahadgymlld2l2hn3dxxvpng06qpp5jch0zq"; depends=[Cardinal]; };
+  CellMapperData = derive2 { name="CellMapperData"; version="1.7.0"; sha256="0zjssdm2z7i6bcp781x9lz09dmh5krvvxg5a0la79dj5vvs72cjp"; depends=[CellMapper ExperimentHub]; };
+  ChIC_data = derive2 { name="ChIC.data"; version="1.1.0"; sha256="07gyyv7bjfxa978c40lkh65m0x2zi855mapvwgpazqgq5qhxyfya"; depends=[caret]; };
+  ChIPexoQualExample = derive2 { name="ChIPexoQualExample"; version="1.5.0"; sha256="0y2s4hw7hbfspy1hjsqkaw72pm26k911699k6sw4jhvjh7mkvjbf"; depends=[]; };
+  ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.19.0"; sha256="1i2aj1vxak6b53mpcd36q2xwgpddllqpqz3wii7rrsa9mg2gaaza"; depends=[affy hexbin limma qvalue statmod]; };
+  ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.17.0"; sha256="1zz0vq192jfnp494mp61xmkxyd94bbh9xs268jd7ynnlpjp9phsx"; depends=[]; };
+  CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.13.0"; sha256="131yanjrw3zsp3ly9i3s2fla7v97wdrrcajsqw38fi8nrln24qbf"; depends=[]; };
+  DAPARdata = derive2 { name="DAPARdata"; version="1.11.0"; sha256="0hf2ijncpsjyyvdwnpfb8agsz3w6ph8ga844cdf5q18l51iyprb4"; depends=[knitr MSnbase]; };
+  DLBCL = derive2 { name="DLBCL"; version="1.21.0"; sha256="0advvjkd6skynjjnz4s9mdnh0l9l2zhn4n9x0kg23dmsg4r8vqm7"; depends=[Biobase]; };
+  DMRcatedata = derive2 { name="DMRcatedata"; version="1.17.0"; sha256="1a669jjvkjjklbh2kxrv3y2clfps067w6w19y1yr2a8wc7crbl4a"; depends=[GenomicRanges]; };
+  DREAM4 = derive2 { name="DREAM4"; version="1.17.0"; sha256="0s3y3wgg487p5fswbin4237mrm9kzbq12a84jiixhql1j2ysbhcs"; depends=[SummarizedExperiment]; };
+  DeSousa2013 = derive2 { name="DeSousa2013"; version="1.17.0"; sha256="0ahldh3d6phm20ljnyx0hz7q0zk8r3i7i39wy1arqz0rqgmgzfql"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; };
+  DmelSGI = derive2 { name="DmelSGI"; version="1.13.0"; sha256="1drs5gp2vh7m61wj6ypa9bpyn8igmzsql0ddyzpgp8sa99w0w7kd"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; };
+  DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.19.0"; sha256="04gphwyic256x2wzapr9kqzq1z10yl9a2s64m4dn3bwy4613b6rv"; depends=[EBImage]; };
+  DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.17.0"; sha256="05xykgmiakw6n8f1b86wbyjzs9v6b7qz8119pwvbfjgncgwqmcx9"; depends=[]; };
+  DvDdata = derive2 { name="DvDdata"; version="1.17.0"; sha256="0x5crrym68rw2r9nmb33j1n1f5rxpj5rzn8b5j403ikxywfwxblh"; depends=[]; };
+  EGSEAdata = derive2 { name="EGSEAdata"; version="1.9.0"; sha256="1bmxm535h9ilnpbm196rf40543kh1yf5ldqxilhiyx5k0qaaihmz"; depends=[]; };
+  ELMER_data = derive2 { name="ELMER.data"; version="2.5.5"; sha256="192jdmxl17m8s1r95c2lizh2r5zpazvx0az8xj22dva0mrazql9c"; depends=[GenomicRanges]; };
+  EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.19.0"; sha256="0w3bcssqpbzgb03ld9j9jv57bvn8yfpkglhb4minbkqbhslv4j52"; depends=[GenomicRanges rtracklayer ShortRead]; };
+  FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.17.0"; sha256="0iz0f467d2wh5cly3cf2y7kkrv8pwihsccf6zsdrqpq4a1ijiml7"; depends=[]; };
+  FIs = derive2 { name="FIs"; version="1.9.0"; sha256="135r3vc8rdjrhl0a6s85052mzranlxd5jkiwxbymsjg6mglsjyvh"; depends=[]; };
+  Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.17.0"; sha256="05kvsbr46yjpkdnn7rwxhj3wnlrgz92fgg35b8i781131vpy4lzh"; depends=[Biobase gplots limma VennDiagram]; };
+  Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.17.0"; sha256="1rfsb49fcn127nzykwndzp7gapd36j3r01dvvhn87w6ryy9yc98c"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; };
+  FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.19.0"; sha256="0ngh5zwikm83rzv9aykhxijf7nj345nnak2207jn4frdq8qahh3l"; depends=[minfi]; };
+  FlowSorted_Blood_EPIC = derive2 { name="FlowSorted.Blood.EPIC"; version="0.99.36"; sha256="1yyrcg1zzq9mv6zx9an4bpszh7r9vacwrbcpdza5ihi8w4pcfw9y"; depends=[ExperimentHub genefilter IlluminaHumanMethylationEPICanno_ilm10b4_hg19 minfi nlme quadprog S4Vectors SummarizedExperiment]; };
+  FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.9.0"; sha256="1ib9g4zy3zwk7m6hl9ggi030qwrjch9jnip6d7a4b27cjzlf0sdq"; depends=[minfi]; };
+  FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.7.0"; sha256="04i701nl8w8sdc85z1y8gzg076n3znnd9fkp35a7pq7sczkfih90"; depends=[minfi]; };
+  FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.17.0"; sha256="1d9xq8ha0p1injk8l16vggfkzk7xlsgaqb227gvl6xc49q8dmh5m"; depends=[minfi]; };
+  FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.17.0"; sha256="1vp55zd2ifamxm248jskvf2y29cgjyx98jw41h2pbly31qxq4h49"; depends=[IRanges rtracklayer]; };
+  GGdata = derive2 { name="GGdata"; version="1.19.0"; sha256="0mr6l11bgg8ncga9ivwdps6jp6zbcjs5jxvcpf834qaj92h63mrg"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; };
+  GSBenchMark = derive2 { name="GSBenchMark"; version="0.115.0"; sha256="1kpkn05a0r6wf1cv1q9gprgzgjaj8b2ig3apkaydjilcjykbr3vg"; depends=[]; };
+  GSE62944 = derive2 { name="GSE62944"; version="1.9.0"; sha256="1s28rkr5nm91vnl6cx0gifib4nw70gs8bhmv003f9kbpiq420i8k"; depends=[Biobase GEOquery]; };
+  GSVAdata = derive2 { name="GSVAdata"; version="1.17.0"; sha256="1gjc9psmx0i25bwki6l74d8jg3mrvfzjdnxs5bhbqnzab6fzdfh0"; depends=[Biobase GSEABase hgu95a_db]; };
+  GWASdata = derive2 { name="GWASdata"; version="1.19.0"; sha256="0i09njrq0fzwvzj6lqsa7kdnwi35lm7z0akywh0mr87i6dlqj8sq"; depends=[GWASTools]; };
+  GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.9.0"; sha256="1h6ghr75h1i87lbarsganiw6mgjyiha4zv4hbjdjljc464s11b0d"; depends=[]; };
+  HDCytoData = derive2 { name="HDCytoData"; version="1.1.0"; sha256="1nlalaccb5y6vsl5k63qz2mcjr6k6syciv95l18962acgnlqbpq1"; depends=[ExperimentHub flowCore SummarizedExperiment]; };
+  HEEBOdata = derive2 { name="HEEBOdata"; version="1.19.0"; sha256="1z8qb5xrzadg6fxg8cx04dpad3qiab5m8vhgdqw4xs8xdaqd4g1m"; depends=[]; };
+  HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.21.0"; sha256="0pgb0r6zp6v0wq16c5zjxzjjwb6cjjp3cn8jnh4p91rwf43za4rh"; depends=[]; };
+  HMP16SData = derive2 { name="HMP16SData"; version="1.1.0"; sha256="1a5plpx6fcdn924gpfqnw6ykqrc9m62rdkzwwgwfmzj1pl4585qn"; depends=[AnnotationHub assertthat dplyr ExperimentHub kableExtra knitr magrittr readr S4Vectors SummarizedExperiment tibble]; };
+  HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.115.0"; sha256="0v5ks29280bybzhi5sfsrbrdajh8a29jkrr2c44ld2qchs9qhgmm"; depends=[]; };
+  HarmanData = derive2 { name="HarmanData"; version="1.9.0"; sha256="1c6avjny0fasj99q0a2dm8p3h68jalcglx51b90fnyjgvqgx3h2g"; depends=[]; };
+  HarmonizedTCGAData = derive2 { name="HarmonizedTCGAData"; version="1.3.0"; sha256="07fvdf6kzipa42r5dmmld7p2chbi074d248da0xmlm8lm1i0wkc9"; depends=[ExperimentHub]; };
+  HelloRangesData = derive2 { name="HelloRangesData"; version="1.7.0"; sha256="05yr2mklxwfij6yzmhpk83mlrq7zfcn8finf2m4lrvdbdzl1bkki"; depends=[]; };
+  HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.115.0"; sha256="1498q13fd190cnn6rh1m796zpalfwxfw275r33k8dnjfqiw5c4mc"; depends=[]; };
+  HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.17.0"; sha256="0hjhlq7vx71lwv37vidwlb819hm617dx7g39hgf20ggccmp310rh"; depends=[]; };
+  Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.17.0"; sha256="17mnwnpsam62mc8bqdwjfh9fiayasbkx1gd3bbp0k82w3az9yzbf"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
+  HumanAffyData = derive2 { name="HumanAffyData"; version="1.7.0"; sha256="02hp2a7h0ivzdfql3vsrvxrn4answlr7hrhw5azdjw8jh895dd1j"; depends=[Biobase ExperimentHub]; };
+  IHWpaper = derive2 { name="IHWpaper"; version="1.9.2"; sha256="1ah85aim6mfjiv08pxr11d9x84ymki2kvnncx1iidkqd81h97ifk"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; };
+  ITALICSData = derive2 { name="ITALICSData"; version="2.19.0"; sha256="0i09g3dj3rz0yr4n35g9fhc5df957i928vbinsx2bl3jsj7xrf6f"; depends=[]; };
+  Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.17.0"; sha256="1y219yqipskv3mzf7g75rmzwsp5sq2r9cqacbpyc2gk28z6dfnix"; depends=[]; };
+  IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.19.0"; sha256="0b6zhvkhpjhz9wr3cfcvyy16l1kvd6aq9p58y78ql9rgpbhz7dcz"; depends=[]; };
+  Iyer517 = derive2 { name="Iyer517"; version="1.23.0"; sha256="0986lrh1w5c1y3rlc0rx06046h0nw8cdqp1mbsddllpibnbj4ii3"; depends=[Biobase]; };
+  JASPAR2014 = derive2 { name="JASPAR2014"; version="1.17.0"; sha256="13hrxj4q2r9bdzwnl0qm5ap92051483876rwq73bz6hy5xg73abx"; depends=[Biostrings]; };
+  JASPAR2016 = derive2 { name="JASPAR2016"; version="1.9.0"; sha256="1gx14sjv9v5705h1763p5js37jrvvlkiqdm7nrawjs4n6y4cpsdf"; depends=[]; };
+  JctSeqData = derive2 { name="JctSeqData"; version="1.11.0"; sha256="1zrnmvs1mmg07s5fi8m5yqb975kb1nkx98j0shpk9xi5jdbf7x0d"; depends=[]; };
+  KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.115.0"; sha256="1y7nnqxaqv9khgy58wq4mflgl0nmk589bcc76chjx7cijq88v09r"; depends=[Biobase BiocGenerics]; };
+  KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.19.0"; sha256="0w2a3yjp5xhbxq0vhzyka8sx17a095ddnpm4jhac65s6zmndgqr3"; depends=[Biobase BiocGenerics]; };
+  KOdata = derive2 { name="KOdata"; version="1.7.0"; sha256="0grvn2pc38zv133v60hvjh1jx9dsbrwxrz9c6fb977z1rznrkzz8"; depends=[]; };
+  LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.19.0"; sha256="1i6rl8mziv8apxxa2hlmsg6ramq4aasbg9nxj963lsk9b6gnrzlf"; depends=[IRanges KernSmooth]; };
+  ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.13.0"; sha256="1p3f67zdihy5prbgqm27bdpnz3gmag3jnya0y7gxaqn3lkdd1vns"; depends=[methylPipe]; };
+  LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.17.0"; sha256="0rgbx36c4hdjc67jsmhrbzyhk3ib8vgmif2g131rly2057zs43f2"; depends=[]; };
+  LungCancerLines = derive2 { name="LungCancerLines"; version="0.19.0"; sha256="11yycm8l0ykkb22h9rppaqrkvyyphz7q8k5zgha06c4h0lcf9zqi"; depends=[Rsamtools]; };
+  M3DExampleData = derive2 { name="M3DExampleData"; version="1.7.0"; sha256="0iaaxz3k7kw2qfaq5c7nx8jbyy4lg3csvsgnci7aknm4iqdgzc7v"; depends=[]; };
+  MAQCsubset = derive2 { name="MAQCsubset"; version="1.19.0"; sha256="1c9gng9mr56h0pqc6xsr489d8m6xixg1iyw6ivdjdm38yg9l5q8h"; depends=[affy Biobase lumi]; };
+  MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.19.0"; sha256="1901vmaq8k8ip508w3s37bdvrhzbd1f36zgz4z7i2f93464yh188"; depends=[affy Biobase]; };
+  MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.19.0"; sha256="1qknpl7k22rbn3v5m4jqs0xiiw2n8wz32qbqsdy13300ynwlvvkn"; depends=[Biobase lumi]; };
+  MEDIPSData = derive2 { name="MEDIPSData"; version="1.17.0"; sha256="0pazyx7xsvxsv36yhhxjbiyfdmd19ifrbbbfj685hgdx0mpiz8qa"; depends=[]; };
+  MEEBOdata = derive2 { name="MEEBOdata"; version="1.19.0"; sha256="1naapb5mskfr482lfs5z1ya2bbsz3jwcpm3mm15dhrxl7rrd7z98"; depends=[]; };
+  MIGSAdata = derive2 { name="MIGSAdata"; version="1.5.0"; sha256="15v3gva9xprr24fv3p49lvwgnh56g9x3nj2qqdd410i1avwn6j8n"; depends=[]; };
+  MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.17.0"; sha256="1bjkdyf0knkdbzdmlas81dhnm5k7yslq6km3yzffrvn1kssml47i"; depends=[]; };
+  MSBdata = derive2 { name="MSBdata"; version="0.99.1"; sha256="1bgzzrynb4066xps7wagawb2pjd64qab7n9il2znsidfprm03bxj"; depends=[]; };
+  MSstatsBioData = derive2 { name="MSstatsBioData"; version="1.3.0"; sha256="10i3gg9fbhcj6fz4fz1jzmqmabdf9c39ys8yp40qs60glv9gj3qa"; depends=[]; };
+  MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.115.0"; sha256="1ls2rhjx9ksdlz28dw3rm59rh6k17xyilda92ib48p7898njgf1c"; depends=[]; };
+  MetaGxBreast = derive2 { name="MetaGxBreast"; version="1.1.0"; sha256="03k4ddgjvrpgg9xikjhy1ayampr8v18ncm57jpnn9wrijvyinpfj"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
+  MetaGxOvarian = derive2 { name="MetaGxOvarian"; version="1.1.0"; sha256="0d7kpm9cqxkwnnickk0hcc2y0x4ah3mh8ajpdrhrylvffbmx4r38"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
+  MetaGxPancreas = derive2 { name="MetaGxPancreas"; version="1.1.0"; sha256="0mpspppz8bmq90aq9jvvqs5700n0dkiqcd5pdrsija8ycp2gbxc9"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
+  MethylAidData = derive2 { name="MethylAidData"; version="1.13.0"; sha256="157qvzvw8hhw25qnzv7xax3vzmq38bw4fp0k34jfwgq944srv0h5"; depends=[MethylAid]; };
+  Mulder2012 = derive2 { name="Mulder2012"; version="0.21.0"; sha256="10mciqb0vh32hx1590r99zyr0pbx84hrssdpjz6i8g9hzlp69wvm"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; };
+  NCIgraphData = derive2 { name="NCIgraphData"; version="1.17.0"; sha256="090s04iwbnhdbgprcy15hl596vmgq8x97v34w2xvmsdld5b8z58d"; depends=[]; };
+  NGScopyData = derive2 { name="NGScopyData"; version="0.115.0"; sha256="1l949sqfywpa5rqxh8h6wq5i8cqmf9ly1ghcrb0gmxv2rcazbn87"; depends=[]; };
+  Neve2006 = derive2 { name="Neve2006"; version="0.19.0"; sha256="0fn77ic133wfdjrnh5vdk95rwx51nigfmznb7i94n8h5hddmpnbc"; depends=[annotate Biobase hgu133a_db]; };
+  OnassisJavaLibs = derive2 { name="OnassisJavaLibs"; version="1.3.0"; sha256="0ih472qrzx183pyk0k8agwybn5bycx3hx1j2amjkp42p7hml4iqj"; depends=[rJava]; };
+  PCHiCdata = derive2 { name="PCHiCdata"; version="1.9.0"; sha256="19cmbyhsi84pi89fy623f7r5yld7qifnqfpvwcb3n7ads5idq1qm"; depends=[Chicago]; };
+  PGPC = derive2 { name="PGPC"; version="1.9.0"; sha256="10z8r98lp92dh14wpf2hs5n3jzw9y3dw6mf5ssx469368hhaypma"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; };
+  PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.21.0"; sha256="1h7x57vvplxbmsxwalgnkbxwnl91qnfyrn1j6cwyak9pzh58aqh0"; depends=[affy annotate Biobase PREDA]; };
+  PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.15.0"; sha256="1gq65gl4dkas9nl3k31k7xjwdry5c2bgj841w1llbb48wy9w06d8"; depends=[PWMEnrich]; };
+  PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.15.0"; sha256="1ryrrw0fdi7bmw8h7pdi02yq9y39dkl0vppyf4ycasnbyn14ddrv"; depends=[PWMEnrich]; };
+  PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.15.0"; sha256="1py3rsnd4s9x7r2mhzsp7hqaflg3ip2fgq3cf10f136fdrfcbf1k"; depends=[PWMEnrich]; };
+  PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.9.0"; sha256="1lkqz0kp1jfsi1bvkqhvlqapp658qfm7b1p9kiwk9qakfl0nm7x6"; depends=[]; };
+  PathNetData = derive2 { name="PathNetData"; version="1.17.0"; sha256="02wdp23y583p9sinhaqkv6lxp836m6kh7na8b2wv6qajanibzhl1"; depends=[]; };
+  ProData = derive2 { name="ProData"; version="1.19.0"; sha256="0idv9icfzr52k96gij5mlyqyd48mjwka7jg1nhawiaj7g4c005yc"; depends=[Biobase]; };
+  PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.7.0"; sha256="1dql2jfvsqn2r1cq1bfg7nfs7gimim6jgsvz7b9pqk1zdh02jhkm"; depends=[CAMERA LOBSTAHS xcms]; };
+  QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.11.0"; sha256="134mzg2r3bpzcpag5vf2fq8g0xczb5qxyvqqcjzqw654mbafgczr"; depends=[QDNAseq]; };
+  QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.11.0"; sha256="1j5qzwbc7a9h9hlda6c6f53pm6vqm4kdja4z144j4snyac88xclm"; depends=[QDNAseq]; };
+  QUBICdata = derive2 { name="QUBICdata"; version="1.9.0"; sha256="1r1wcmd7s17gm5q682siy8ld65w6ylch9jamqjlbp8qiqqvfmzdd"; depends=[]; };
+  RGMQLlib = derive2 { name="RGMQLlib"; version="1.1.0"; sha256="0ijyjgqnap1zmfh6jf4gz9xjiwyzzhyyghvydh6rwkyys46ci8zl"; depends=[]; };
+  RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.17.0"; sha256="11hrk3cf86jgc7vf14wlyarar2vsnjs0i9wyzvmk76draq9frg30"; depends=[RIPSeeker]; };
+  RITANdata = derive2 { name="RITANdata"; version="1.5.0"; sha256="0yn8nfvni9h4k9ngzccsqgbjrjvql5gp3haqyg9x334sjsi212c8"; depends=[]; };
+  RMassBankData = derive2 { name="RMassBankData"; version="1.19.0"; sha256="172x6x7fnzjczi76ibmscbb51l8185lqgiypyyvlisp145mxssdn"; depends=[]; };
+  RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.19.0"; sha256="01sf7pbcsibdm5dhh9zv2gg2g58z6vswhdz227qfd6cvbpnpqr7b"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; };
+  RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.19.0"; sha256="0z1b986jvinzh3c1yl9q8wa66wgq8hp8rjbs23glxna77znvkp87"; depends=[]; };
+  RRBSdata = derive2 { name="RRBSdata"; version="0.115.0"; sha256="0i33fm60lcjczzc4xx6y1gg5jsxlq0v9bz46hym7aq59zlpbqh6p"; depends=[BiSeq]; };
+  RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.9.0"; sha256="0an39dgcapfn7i5h1inbjihl224l945g0rax5h33bmpnzlry1a8a"; depends=[RTCGA]; };
+  RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.9.0"; sha256="1lh2ij6x796rn39j1awn461jc0snswp14x6z338gqz58dahjfr1x"; depends=[RTCGA]; };
+  RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.9.0"; sha256="0micdaglaqfbg2pg9b0jpnvfi91adms8lg7sq7k9srgyjx2dsdid"; depends=[RTCGA]; };
+  RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.11.0"; sha256="1y63vnj59sv73zcrnwqd4ikdjx45y9sqb2pj1lnsrhvfbmjazi5z"; depends=[RTCGA]; };
+  RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.9.0"; sha256="094yh17af0x4zb97dcmrfxqviylqmr3zii3jya6iwwr2jay5a8wh"; depends=[RTCGA]; };
+  RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.9.0"; sha256="0m3i7srvdjjkynnizh7jq8d70rm7cq0wi6182iafdgyaxip2qxgk"; depends=[RTCGA]; };
+  RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.9.0"; sha256="1nw57daaf3z5k2m52rw72ncxj68bkjmpq158z59v8zm5cpm8z33f"; depends=[RTCGA]; };
+  RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.11.0"; sha256="1wyiz22rw400hiqqnw41mqpvy8bbj1vxwx3v4vnz6x81drv2sc1n"; depends=[RTCGA]; };
+  RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.11.0"; sha256="0z2k651pd0m9lxl3n62xf41xhk65n33cgf7d5zfwd03hbc07d0gq"; depends=[RTCGA]; };
+  RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.115.0"; sha256="0vyy1sarkb64vjq1c3mrd0d04hnfy4aigi7zgvaniv31ab6hpb05"; depends=[Biobase]; };
+  RcisTarget_hg19_motifDBs_cisbpOnly_500bp = derive2 { name="RcisTarget.hg19.motifDBs.cisbpOnly.500bp"; version="1.1.1"; sha256="08p1r5vpz92i7nmgdjsp0i5wzypb46lsdnlykci21nzf9ip12mc9"; depends=[data_table]; };
+  RforProteomics = derive2 { name="RforProteomics"; version="1.19.1"; sha256="1dy4d1wyf8ifdhy8psy533yy8liwgb26gbwqv1rdzjxgzai8f3jr"; depends=[AnnotationDbi Biobase BiocInstaller biocViews DT interactiveDisplay MSnbase R_utils rpx shiny]; };
+  RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.13.0"; sha256="1p3b97f8kmilpwgf61p4kwkizdn8a07ai9a2x3hy4igzw21fcgz5"; depends=[GenomicRanges]; };
+  RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.13.0"; sha256="1wyy4m3p40i12hlwvz9ixqps8i4d5703gl0pcgl4i2485d78yv9v"; depends=[GenomicRanges]; };
+  RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.13.0"; sha256="1kjvy1v0dbdm959cmsf2d5mnrbnisjpff12wl5gn44n2cg7bb65g"; depends=[GenomicRanges]; };
+  RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.13.0"; sha256="1s1iy8x1x53ny1pyfgwwkiwc3jpjhdkcd9vpwyv2ix5g22jf8ag7"; depends=[GenomicRanges]; };
+  RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.13.0"; sha256="1pp9y94rdk5wwapc4jbvs35x1z2agv4xvzxy3fl3h7hp22gaqr9p"; depends=[GenomicRanges]; };
+  RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.13.1"; sha256="1cqannbgpr0s9qr1cx4d23rwjy6k63x25khdr7qx5939chz0r21a"; depends=[edgeR]; };
+  SCLCBam = derive2 { name="SCLCBam"; version="1.13.0"; sha256="1ynibzjlyfscg5b1lxa5nvfznp106vb4h7ia6n847h3n5s6ndasv"; depends=[]; };
+  SNAData = derive2 { name="SNAData"; version="1.27.0"; sha256="182pramjd14g1p0aawcjrv51xlyqkp9mhm84v3gnd9gnmkb69b31"; depends=[graph]; };
+  SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.17.0"; sha256="15l23gw5ckxgr6pscl07jqwb1lz58g5893wnlzz4zpk3sd46d2p6"; depends=[]; };
+  SNPhoodData = derive2 { name="SNPhoodData"; version="1.11.0"; sha256="1zm0zhf2987hls15b47jv6krn1cc8kp6jm64k4wqhp4dsjxwbaqd"; depends=[]; };
+  SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.13.0"; sha256="0qhkhnxrcy5i7cs4cl5axc8y9dbzhzfl00c17qp9r4bf8292xf1d"; depends=[]; };
+  Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.9.0"; sha256="1xnsilyjls3s048kl1jwqcs6sb4r33khga0z2zipsgk6aqnx81cc"; depends=[]; };
+  SomatiCAData = derive2 { name="SomatiCAData"; version="1.19.0"; sha256="0aj84aljp7ih849qnyhmsibnsvg7cshj7xah67xhn5grzwk7v9hi"; depends=[]; };
+  SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.17.0"; sha256="0bprp4cddjf9zlhv38q5y08zrzizqaxj4338wbzjq1ypnjyip2qj"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; };
+  SpikeIn = derive2 { name="SpikeIn"; version="1.23.0"; sha256="1yjlljcy1wnxkxrcxaw26f96vkyvhqh9zq52l9s8d7gnrsfj44ak"; depends=[affy]; };
+  SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.21.0"; sha256="1z6fbq2z2ry2v3sv48n20c07bi96gb1nfg81g5ylh4q7w79g8lvf"; depends=[affy Biobase]; };
+  TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.17.0"; sha256="15521vpi6h1ydl8vw43h0plrgy7baj5bprzg8rs50yxgkphh9nns"; depends=[Rsamtools xtable]; };
+  TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.17.0"; sha256="090y4vyipnlxxg78yxva7q5y81gawfpmkgjrsqiqr1smfalvx9yw"; depends=[]; };
+  TCGAWorkflowData = derive2 { name="TCGAWorkflowData"; version="1.5.0"; sha256="0kbab7fjy7waq5r6k2w0c8x811xd62v39p17acd5gk8gbw9gy919"; depends=[SummarizedExperiment]; };
+  TCGAbiolinksGUI_data = derive2 { name="TCGAbiolinksGUI.data"; version="1.1.0"; sha256="0l65f933xxngfm6z5576disj60xasm386x8balsrymcvjkpksr7q"; depends=[]; };
+  TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.115.0"; sha256="1bmn0r5bx2vc4cpv48mbhr57gpidr42mgaxliwmkyj0dqbjnzmqd"; depends=[Biobase]; };
+  TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.115.0"; sha256="1n7qq2gc3mcfh4c1y2myrb1pj6bq8l7m7nwhlk0ps90zlj064isp"; depends=[Biobase]; };
+  TENxBrainData = derive2 { name="TENxBrainData"; version="1.1.0"; sha256="032z307qh7idxkzqc8b5gngysmw8iy1s3z1r8747n495dy85ippz"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; };
+  TargetScoreData = derive2 { name="TargetScoreData"; version="1.17.0"; sha256="12bmw3qmkw9blmr5ikgx0qyfv1x6hda8d41fiy8gsb74fa4nifsv"; depends=[]; };
+  TargetSearchData = derive2 { name="TargetSearchData"; version="1.19.0"; sha256="024av13qimrl55dwkw46rfx9gr6kdghnf1n5qcr4q7h5i9frdfxg"; depends=[]; };
+  TimerQuant = derive2 { name="TimerQuant"; version="1.11.0"; sha256="1a49jaxgjhwl756a7wijswa90z03fz61ffp6w5h00v9qfzgnyf79"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
+  VariantToolsData = derive2 { name="VariantToolsData"; version="1.5.0"; sha256="1kkz3zvba4mc237pxwj6z0c2jvbrgfaz3n5vm55bz6j47aas3i4j"; depends=[BiocGenerics GenomicRanges VariantAnnotation]; };
+  WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.13.0"; sha256="0f3llqwkc5d4av47871d45lfqghmncww9g5rgf58pydrnw7n93xv"; depends=[]; };
+  XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.19.0"; sha256="1kac43fvng1pwa8hlbivd8pxan7agp9csp0nmh062x4kwamny3hm"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; };
+  affycompData = derive2 { name="affycompData"; version="1.19.0"; sha256="14ss2b854dj36rzhx1z854r5hkxy0yqzlm5k0690gn5bwlah6rk6"; depends=[affycomp Biobase]; };
+  affydata = derive2 { name="affydata"; version="1.29.0"; sha256="0sv5q59xfvlyk97ihki5sqdzy9nldjccxiscx3ii1xpp4xk44i3c"; depends=[affy]; };
+  airway = derive2 { name="airway"; version="0.115.0"; sha256="1h823q96za4jrzf680bp651blh5giqwx660nhp7xhl3drxpzf1ir"; depends=[SummarizedExperiment]; };
+  allenpvc = derive2 { name="allenpvc"; version="0.99.1"; sha256="1g0bk3v2gmhr2ck4kdc2pb6xj8abk9kgk0h5f0hdfbaxjdrhwpx3"; depends=[AnnotationHub ExperimentHub SingleCellExperiment]; };
+  alpineData = derive2 { name="alpineData"; version="1.7.0"; sha256="18llr6pssxmrvw3qzxw4f77bpv8g3akz3kbsn9xsdsij364q33am"; depends=[AnnotationHub ExperimentHub]; };
+  antiProfilesData = derive2 { name="antiProfilesData"; version="1.17.0"; sha256="0wyjfc02wm5x5d61fs6cs7g3s0j4aibpqkdiwx0d8cbbkl38ih3f"; depends=[Biobase]; };
+  aracne_networks = derive2 { name="aracne.networks"; version="1.7.0"; sha256="1acngnqvg7vl402yfcw65rqs27a7sncl1xfz2893abfli2ccpbzx"; depends=[viper]; };
+  bcellViper = derive2 { name="bcellViper"; version="1.17.0"; sha256="0rzzj4pla57z9825jcs2kx177xrcqfnh7jai41m8dwfxln6ccz25"; depends=[Biobase]; };
+  beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.19.0"; sha256="13g7p6jrg9qa43zv8nhkgfz2pq7b3v6chgqmydyyz25q6jy28iqp"; depends=[beadarray Biobase]; };
+  beta7 = derive2 { name="beta7"; version="1.19.0"; sha256="1gd1l8rh73k27sm1cjfy9rmsplrkji3zhzrzcldjmaaixl5nfjql"; depends=[marray]; };
+  biotmleData = derive2 { name="biotmleData"; version="1.5.0"; sha256="0ccx398761qdnnsrjwrrg6qjrq01fv88999f2llyq9gpd3f43lgs"; depends=[]; };
+  bladderbatch = derive2 { name="bladderbatch"; version="1.19.0"; sha256="0n9vwbj8cii67rhxvb1ps72k99rv251zcdr4w3r1jkbvcd61nvh0"; depends=[Biobase]; };
+  blimaTestingData = derive2 { name="blimaTestingData"; version="0.115.0"; sha256="1hzmwjmyi6qnkqnq2x6ml8yvzn1sr33lwc6nhz2k2mx6s2l4ajbb"; depends=[]; };
+  breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.19.0"; sha256="0pn48n81vx2wq425q5wnga6n32apgajk0bwq78ri983plh7ik2b1"; depends=[]; };
+  breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.19.0"; sha256="0b6z16m6kqkd8rfrdvjp6p4fbqs78s25fbiswnw0k8jzvz5yw5x7"; depends=[]; };
+  breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.19.0"; sha256="0slagz3x2q1qykvjcfnh7k3ggpn2g34j4iqvnv7j3mdcc085hn1d"; depends=[]; };
+  breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.19.0"; sha256="0470r0i59phz2rcnmi0sb2hvw87nvm5dq6s4dj6s6z5mn85g8hd4"; depends=[]; };
+  breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.19.0"; sha256="0qgz0dsds0xd8d6assqd0715zfyk2y92251m3zq108ndqh5gn4bm"; depends=[]; };
+  breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.19.0"; sha256="0ma62g72md7is365pbnqbdskacxqvvcnc65jzv8b7g1dwvayswp6"; depends=[]; };
+  brgedata = derive2 { name="brgedata"; version="1.3.0"; sha256="0w9h12ns984h6k5zhz2x9ria4fa1wxp3k04f6qg5k1zw20v4q2d6"; depends=[Biobase SummarizedExperiment]; };
+  bronchialIL13 = derive2 { name="bronchialIL13"; version="1.19.0"; sha256="1jg9jz03ab3fki6g293c0jclk8cfpj9qb6yzzskdpcz99xmhs2xv"; depends=[affy]; };
+  bsseqData = derive2 { name="bsseqData"; version="0.19.1"; sha256="0gqwyx0l0xmd2aa46shq4kr11nfi1imj2pwfjc9026r47af5b84h"; depends=[bsseq]; };
+  cMap2data = derive2 { name="cMap2data"; version="1.17.0"; sha256="11973w3gjz0qayxacx41mlbf4ji345js8jgjkn2aba0ahnyzb6vw"; depends=[]; };
+  cancerdata = derive2 { name="cancerdata"; version="1.19.0"; sha256="02zi60lh6jsg6hlyyq6wzg9lzxjr8m9418kywlk3x3c6kkgkrh69"; depends=[Biobase]; };
+  ccTutorial = derive2 { name="ccTutorial"; version="1.19.0"; sha256="0xd3zrcia312h947nvah3ksx9kxzhqzc9c2nm5q6ssvx15s6f6d6"; depends=[affy Biobase Ringo topGO]; };
+  ceu1kg = derive2 { name="ceu1kg"; version="0.19.0"; sha256="0vs60mflfc1pnc7s725wsyq2jrj44jrvxwzpw4bhlj0qbs602s8l"; depends=[Biobase GGBase GGtools]; };
+  ceu1kgv = derive2 { name="ceu1kgv"; version="0.23.0"; sha256="10jnbc8y386racq3ac1hf1dp76wvzlfm8p66c94pk3f2m0w45psv"; depends=[Biobase GGBase]; };
+  ceuhm3 = derive2 { name="ceuhm3"; version="0.19.0"; sha256="1qdp85ps5xrlx1pl769j91aig2rgxcix4pdzrsa249nyyq1avdym"; depends=[Biobase GGBase GGtools]; };
+  cgdv17 = derive2 { name="cgdv17"; version="0.19.0"; sha256="1n67nx1har6mswv5p2cb1xfrawkkhzrzxy7fpc6091yy3ypw1s5w"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+  charmData = derive2 { name="charmData"; version="1.17.0"; sha256="0hgac6z9k3frw648479jf8m6n2wlljhln7n8y13lbsdv5wakln87"; depends=[charm pd_charm_hg18_example]; };
+  chipenrich_data = derive2 { name="chipenrich.data"; version="2.5.0"; sha256="0j9zdc0xrxi7vjyl3dzkvr8g24cxc1kcvw52vplrd5njyyka5vw1"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicRanges IRanges readr rtracklayer S4Vectors]; };
+  chromstaRData = derive2 { name="chromstaRData"; version="1.7.0"; sha256="0arxcqr1yrs00i7a8xncprixzm8lc8ljrbh371ckjdr7641g63gq"; depends=[]; };
+  cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.17.0"; sha256="1inxvj6sfl7n3cxzswkllbjbjwz0rm803hkycy4wxcsq7416sj21"; depends=[cnvGSA]; };
+  colonCA = derive2 { name="colonCA"; version="1.23.0"; sha256="1mm0zb003izia6j502n4m91vad6iz3ymf8nn4f9wlj20di66fvx6"; depends=[Biobase]; };
+  curatedBladderData = derive2 { name="curatedBladderData"; version="1.17.0"; sha256="14xwq55g83pvwyxm7kl6hq9c4j2bd6vp63afir619d5binl6i7ln"; depends=[affy]; };
+  curatedBreastData = derive2 { name="curatedBreastData"; version="2.9.0"; sha256="024sx3am50vsaaixmj8gfp3f905rf7g7qyn47sdakpv6sx48k1zl"; depends=[Biobase BiocStyle ggplot2 impute XML]; };
+  curatedCRCData = derive2 { name="curatedCRCData"; version="2.13.0"; sha256="1f6m6sllbxzca27lwyvav2d4si65w7fs9mh4mksw2sn8n8x5452v"; depends=[BiocGenerics nlme]; };
+  curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.11.1"; sha256="1gdnp5m8d3lz88hvsm3j2jq9w1di14ifls5l9q51jxm045yg0yjj"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; };
+  curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.19.0"; sha256="0yvc1kpy4ql2sd467dggi6kpwxrvvqyasr0mgc61s1snmakvm06y"; depends=[affy BiocGenerics]; };
+  curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.3.3"; sha256="0khdg080c5ivirh84w1w6pvl9g4yi8i8f4sl82q3a2nwldqswghz"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment S4Vectors]; };
+  davidTiling = derive2 { name="davidTiling"; version="1.21.0"; sha256="18ivz1z0il8s9sk6c5mzgipsbs8xswbq7swwm422ji1yp75lkd9p"; depends=[Biobase GO_db tilingArray]; };
+  derfinderData = derive2 { name="derfinderData"; version="0.115.0"; sha256="1xvvcbsbmrkri2nl7g1wpbbsa7wn49dj85xwxbsf8yffmisxb09k"; depends=[]; };
+  diffloopdata = derive2 { name="diffloopdata"; version="1.9.0"; sha256="12a5338djyhg94q7wdahij4c9dnrx5qx04a1g9304wpk5z6cmxni"; depends=[]; };
+  diggitdata = derive2 { name="diggitdata"; version="1.13.0"; sha256="09b1mk68mg3jqf63c54xdh805vd79hbnnh02rf6qb3pq6w9b6z64"; depends=[Biobase viper]; };
+  dressCheck = derive2 { name="dressCheck"; version="0.19.0"; sha256="0k3h5i86345xx0d31qim1d1aw25axwy48hiq717fbnz2mpwsggj7"; depends=[Biobase]; };
+  dsQTL = derive2 { name="dsQTL"; version="0.19.0"; sha256="0lwgnkvzpipqnzfh3vlqgk568ys1bqjyfih97c7vb8mn57i100fz"; depends=[Biobase GGBase SummarizedExperiment]; };
+  dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.21.0"; sha256="0k99wgjm4a7mjs76p48mwfp2y17xn4r2bral2c1hbyj2y4bl1ycz"; depends=[GEOquery marray]; };
+  ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.21.0"; sha256="1pbindvfhr7lf01r0kncp23f6jxlwmkd362mix2gw2g006a83y4f"; depends=[affy ecolicdf]; };
+  estrogen = derive2 { name="estrogen"; version="1.27.0"; sha256="1m0q2k6p6ydp7ykqwi9a079knxmp14xlrpcwncklsapibcvyz8lr"; depends=[]; };
+  etec16s = derive2 { name="etec16s"; version="1.9.0"; sha256="0ljn90gf4sm7615xw25dil15kgf81gl0hvbp24snx4nbflnhns4q"; depends=[Biobase metagenomeSeq]; };
+  faahKO = derive2 { name="faahKO"; version="1.21.0"; sha256="19dxcf3yfgy8h8xn76h7x2ihvgy90923a28j3b2k972r84zzy7gk"; depends=[xcms]; };
+  fabiaData = derive2 { name="fabiaData"; version="1.19.0"; sha256="104c70pp9cnkx3y2mm6yxj4vj6k2mqrhw1n2cibhxnnqnl2lnwnr"; depends=[Biobase]; };
+  facopy_annot = derive2 { name="facopy.annot"; version="0.115.0"; sha256="0aribb9b0rjd2xlxchbsjq3darg6klhsc8ajpa34m0rldkp3nzrl"; depends=[]; };
+  facsDorit = derive2 { name="facsDorit"; version="1.23.0"; sha256="0xxdz1xfb661pnrqji6vxsmmr90h1v1i195k9gb4dll6hwbq0n11"; depends=[prada]; };
+  ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.19.0"; sha256="0jjaj492k4akc30yvr4q8y31wdi152iq5s3pl5i10sl9xrbg80hj"; depends=[lumi]; };
+  fibroEset = derive2 { name="fibroEset"; version="1.23.0"; sha256="1g22av8zj4nq9prnps7zgrzvva9d5a6h016llg0brpf9qjpg58p3"; depends=[Biobase]; };
+  fission = derive2 { name="fission"; version="0.115.0"; sha256="1wx3ama4pdklyrjb54ww69ig554iv2c7j568zpxdywclg38z6pms"; depends=[SummarizedExperiment]; };
+  flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.17.0"; sha256="1ahg5g9ypxbhm7jrsbq1hjk5r5fmgvirawfd2xqfiaw5x9pkmrai"; depends=[flowCore]; };
+  flowPloidyData = derive2 { name="flowPloidyData"; version="1.7.0"; sha256="0f3cnq2s215a6wrz2cbp90219smvhr4zsvl02wbd40xb8902zhdc"; depends=[]; };
+  flowQBData = derive2 { name="flowQBData"; version="1.7.0"; sha256="1xla98i06j1qi2w88x1v8agvqcljzwxfcxakw0fl6phwl07hz9na"; depends=[]; };
+  flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.17.0"; sha256="058q46w84jd7rf50pn26fiyh1n312jvxbcdrm5i2mmzg358hrr6y"; depends=[]; };
+  frmaExampleData = derive2 { name="frmaExampleData"; version="1.17.0"; sha256="10lr219ghj409himn3g080s5saln3k355x9jhrk9fx69r8g127d7"; depends=[]; };
+  furrowSeg = derive2 { name="furrowSeg"; version="1.9.0"; sha256="1a4gwrbqliz3cwn9iqwsn27qhmq9l3rh9k59ca94vsjmkrqx7bjk"; depends=[abind dplyr EBImage locfit tiff]; };
+  gageData = derive2 { name="gageData"; version="2.19.0"; sha256="1zrps414095nkc49f90a7f8zy224ll60dm6b46sfkajd35bprafj"; depends=[]; };
+  gaschYHS = derive2 { name="gaschYHS"; version="1.19.0"; sha256="0alxcrnk8kyjrs73idgihwvz42hbn4d6laayl849rzcna1fp48sp"; depends=[Biobase]; };
+  gatingMLData = derive2 { name="gatingMLData"; version="2.21.0"; sha256="16gwgign7bq4yccq36wav2w8xl193c6aca6bgh9l8fv0z0rdgxnv"; depends=[]; };
+  gcspikelite = derive2 { name="gcspikelite"; version="1.19.0"; sha256="197lx2a6jlsrv5bg3ih28maikyb8jk91krifk80xys3yfhp9dhyb"; depends=[]; };
+  geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.17.0"; sha256="0qxdhn5is2d47iv01z7in8gd3s2dzrgir8s8j4611f7sgy9s9px4"; depends=[GenomicFeatures rtracklayer]; };
+  genomationData = derive2 { name="genomationData"; version="1.13.0"; sha256="02fq74q6vkraivdrka8l0hascvsxg2ys6p40774vjhrhrcvmnfkm"; depends=[]; };
+  geuvPack = derive2 { name="geuvPack"; version="1.13.0"; sha256="07h53q19zg89rvzjk3aqgp52gynlxg5frxm5h2q3q5ihidp118cr"; depends=[SummarizedExperiment]; };
+  geuvStore2 = derive2 { name="geuvStore2"; version="1.11.0"; sha256="1ggac70x9pblbnzm6wg6rpmbgrkf802b2vgnfah1516grx0dwrkd"; depends=[BatchJobs GenomicRanges gQTLBase]; };
+  golubEsets = derive2 { name="golubEsets"; version="1.23.0"; sha256="1h45rwz6z4wgibbyafv8946vfs303km7ixcradml4ymbpwibp4ib"; depends=[Biobase]; };
+  grndata = derive2 { name="grndata"; version="1.13.0"; sha256="1ybgk5nf9nqrmw4mchpf183zyik6szzsm2cxh619fv27f0i3hjzk"; depends=[]; };
+  gskb = derive2 { name="gskb"; version="1.13.0"; sha256="0gac903pldny2p1fv3rhxr9v24iznnrz17xhdd8z01rsy0yvxdql"; depends=[]; };
+  h5vcData = derive2 { name="h5vcData"; version="1.115.0"; sha256="0viw7na4wqscaj0vijharvdj8mvwm0mxw0b2gm3slb9crkmksra7"; depends=[]; };
+  hapmap100khind = derive2 { name="hapmap100khind"; version="1.23.0"; sha256="07r1nsl92awkkw41midkb9iv4c93my7c222li2f4mym8hn4ahn8p"; depends=[]; };
+  hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.23.0"; sha256="0dvb3b2ls7g66vsv9qzl29kkjmdd6mwrhqxzj0a1d7qnkg48kgy1"; depends=[]; };
+  hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.23.0"; sha256="0jqyvd1khz84l1qw31xk2szb9ycsp76yrs1h81ahg64sslygnfg0"; depends=[]; };
+  hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.23.0"; sha256="128p97qmp7br5vwmn934akkh0h4xgirpzc4q7kaxh3w211rch7rm"; depends=[]; };
+  hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.23.0"; sha256="0a1n93nin8hpqh0qswbl9phlwgllam0xxpa2qxr63dyd5k1liwz6"; depends=[]; };
+  hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.23.0"; sha256="1m17r4va3vbiml0avlb7xp2qhh82vig934h3gpmz9190hy6ikds4"; depends=[]; };
+  harbChIP = derive2 { name="harbChIP"; version="1.19.0"; sha256="1566kxfblk6z4dia4f3gl3v0dsz8lx343nlflbp2wfb6gd314dl6"; depends=[Biobase Biostrings IRanges]; };
+  healthyFlowData = derive2 { name="healthyFlowData"; version="1.19.0"; sha256="052kvg8gvfbqc4fpr8np1q9li7f52daq1rndpg7zmc5zn4nqjzrn"; depends=[flowCore]; };
+  hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.19.0"; sha256="1c113f0aj51mdvdizi6m2wmm0v7zxsa3pkp3bjq2426v449qr3ls"; depends=[]; };
+  hgu133plus2CellScore = derive2 { name="hgu133plus2CellScore"; version="1.1.0"; sha256="05y00zzwflkkqblf811k5pxdcc9ivmvv9znlvsa232dkk4f1fnvy"; depends=[Biobase]; };
+  hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.19.0"; sha256="005llh7vpfc01qbq1wnq1nribqgh1kj7mw0rz59dsmr92czm7lbi"; depends=[]; };
+  hgu2beta7 = derive2 { name="hgu2beta7"; version="1.21.0"; sha256="1d80nxbf8ffmh7ipvxw2smvhgq4xvjhnhmwpwmkwn30yghrm46wj"; depends=[]; };
+  hmyriB36 = derive2 { name="hmyriB36"; version="1.17.0"; sha256="1s1gsysv8wsk9fzd34fjw2rp6jk8nysg1wd6dhay5mqphv92abkh"; depends=[Biobase GGBase]; };
+  humanStemCell = derive2 { name="humanStemCell"; version="0.21.0"; sha256="02y71ydwlygn6yickjx3gjsmrhp6dnvqk5319is70gwd214466r1"; depends=[Biobase hgu133plus2_db]; };
+  iontreeData = derive2 { name="iontreeData"; version="1.17.1"; sha256="171gx10sfmpvwlv8ww5ckgc71y10lips3ws6v566amsdysafy82y"; depends=[]; };
+  kidpack = derive2 { name="kidpack"; version="1.23.0"; sha256="1ib24nbvqgids10k1glvpswavnv0qd14nvx9bw13bk09vndagkyi"; depends=[Biobase]; };
+  leeBamViews = derive2 { name="leeBamViews"; version="1.17.0"; sha256="1mldlpdpnivfi60rnsbz7466jf9ssyfgb2xv9ipwc8nlmszd6g45"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; };
+  leukemiasEset = derive2 { name="leukemiasEset"; version="1.17.0"; sha256="15c31vzfn83pfjj8bmvg4sl0hynlvaz2wcg3fzlxmlpbf6b5rqd7"; depends=[Biobase]; };
+  lumiBarnes = derive2 { name="lumiBarnes"; version="1.21.0"; sha256="043w39jdc35pgblprh2p4crpxcix39ya9kg3g4q8dcajasr13dag"; depends=[Biobase lumi]; };
+  lungExpression = derive2 { name="lungExpression"; version="0.19.0"; sha256="1rbbkjv3vjrk6d22k7msnq124y47a8pb4vdf388f1a8j9403jfpi"; depends=[Biobase]; };
+  lydata = derive2 { name="lydata"; version="1.7.0"; sha256="0lq17l0klsn081m2nd9hrx50nxksvf7186drby66qvq6bhw3vhms"; depends=[]; };
+  mAPKLData = derive2 { name="mAPKLData"; version="1.13.0"; sha256="1h4x00a7rziqm3cqkddpp7ahrb36045yq71lskdjyp43k066jplw"; depends=[]; };
+  mCSEAdata = derive2 { name="mCSEAdata"; version="1.1.0"; sha256="0rcfyk6mwlxgkk7q40djbcbd4kx4vyy79h6dxb37zd7mpzxj03nx"; depends=[]; };
+  mammaPrintData = derive2 { name="mammaPrintData"; version="1.17.0"; sha256="0gfhiz8wqdxx56an3yp5jagsr7bx131lia86yycvhyaylsj0pv7i"; depends=[]; };
+  maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.25.0"; sha256="14m82492wb7jmqwjllnqak9rivyky1prcqgp1yn0g05c406fj0r9"; depends=[]; };
+  metaMSdata = derive2 { name="metaMSdata"; version="1.17.0"; sha256="0j6h0s75w50jp3lcfs5cilqaqhhinlfn9c6zlpki6906fj1q6dxx"; depends=[]; };
+  methyvimData = derive2 { name="methyvimData"; version="1.3.0"; sha256="0jacj9jyqs5x11xds6bindab6q96br95r37dxmgxw5gxl9lcn6ql"; depends=[minfi]; };
+  miRNATarget = derive2 { name="miRNATarget"; version="1.19.0"; sha256="05x4vl8x2brm3bj04kddzcqjnm72jw29prmcwr1ildbaadmzh3fg"; depends=[Biobase]; };
+  miRcompData = derive2 { name="miRcompData"; version="1.11.0"; sha256="1qgzplmv16anh7c760nf51fh671z0lmxqmkn0qfmj55d54gfgfmh"; depends=[]; };
+  microRNAome = derive2 { name="microRNAome"; version="1.3.0"; sha256="0hbs64bhd129cq098y5ijf6q2nvn2w382d29isws92q1ln12r36b"; depends=[SummarizedExperiment]; };
+  minfiData = derive2 { name="minfiData"; version="0.27.0"; sha256="1h7mb52p73bw66rxwjjfmaan6scs9pc6rj2f9wb5hx9hddwz5xy4"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; };
+  minfiDataEPIC = derive2 { name="minfiDataEPIC"; version="1.7.0"; sha256="119sr9yb82dlcjgddlqwzgn72c7zghz26kzdda48s9zxlf31f9yp"; depends=[IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest minfi]; };
+  minionSummaryData = derive2 { name="minionSummaryData"; version="1.11.0"; sha256="1i5ilakb9a4w7zf4zwymmpxyqn8s4y7295gdw2spgafgny0ayvag"; depends=[]; };
+  mitoODEdata = derive2 { name="mitoODEdata"; version="1.17.0"; sha256="1pabl518xj88hlpfdqsbg2178ac2in11ma3y0syvq7wr2nqdqj6s"; depends=[]; };
+  mosaicsExample = derive2 { name="mosaicsExample"; version="1.19.0"; sha256="17xvlaxlw6jn7w81dyg74n84nny6apaxv8b7qbv7gcyil3h2xr7f"; depends=[]; };
+  mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.19.0"; sha256="1y7vkiqp4mkf16mpl5yl1jzmh1fv67d6k4i8qfi1lm68q2av9ggv"; depends=[]; };
+  msPurityData = derive2 { name="msPurityData"; version="1.9.0"; sha256="0z7gs75bci301mhhp9j8lxpivjns2bmr51vsz04d4k308j19w1wv"; depends=[]; };
+  msd16s = derive2 { name="msd16s"; version="0.115.0"; sha256="1gspbva55x3bz2xzgdm9yfif0rgbd9gz9alswh1cy1kj99b0qk54"; depends=[Biobase metagenomeSeq]; };
+  msdata = derive2 { name="msdata"; version="0.21.0"; sha256="1srm1djnzfrj6klzxm2s721glk75lakb2428arqn3bm8vzvqw5vy"; depends=[]; };
+  msqc1 = derive2 { name="msqc1"; version="1.9.0"; sha256="0qdn1n6nisabv1iq8xqv3h14vyjwpc8576gl88km0kfd6pwwyij2"; depends=[lattice]; };
+  mtbls2 = derive2 { name="mtbls2"; version="1.11.0"; sha256="1ismd5yp3vgj1cqp4y92gy5z856bs6sy3fgbigjjba2rrb3m4k1z"; depends=[]; };
+  mvoutData = derive2 { name="mvoutData"; version="1.17.0"; sha256="13kakn04xrngx9m80m1gqwdx3f75qixy6h9y0jvh16jk49kdnxcd"; depends=[affy Biobase lumi]; };
+  pRolocdata = derive2 { name="pRolocdata"; version="1.19.1"; sha256="1bh5qq8q0ar380nbci4y2bij19imgb5b7q5yf71mmlsxbk3284fz"; depends=[Biobase MSnbase]; };
+  parathyroidSE = derive2 { name="parathyroidSE"; version="1.19.0"; sha256="1dmnm348yxa9p6lnia4iiil1s4jkxj1n83frhml06brnqymbb9wn"; depends=[SummarizedExperiment]; };
+  pasilla = derive2 { name="pasilla"; version="1.9.0"; sha256="09rzh3w8nki9gqsk3pznk867ipg7s7imz7ma67cl0rh8pz2vg05i"; depends=[]; };
+  pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.19.0"; sha256="0d2b4qav1m0whr7gwn2h2962qd72i3fc0y9c36k6nxr7jyfmv1jj"; depends=[]; };
+  pathprintGEOData = derive2 { name="pathprintGEOData"; version="1.11.0"; sha256="1s5nilgzs1kgdjaqyq7warfg672qvd14m61bdvl0g12bkab61sv8"; depends=[]; };
+  pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.17.0"; sha256="0wwd5cc8ywi5181q8hrxw6jx6pxyrfayfdpw7jzp3nkj8x222d31"; depends=[]; };
+  pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.17.0"; sha256="0g5y5nsi99dsx6n1zfjlc6vi4ikmv2l1ba6sbdid9019k79v4495"; depends=[]; };
+  pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.17.0"; sha256="1qz6saflpsa9naj536k7ciqks95hb6l1z2v6srclqq7b45465h1b"; depends=[]; };
+  pcxnData = derive2 { name="pcxnData"; version="2.3.0"; sha256="1whw0wrfq1dfbxpfcz9z749dh27fadxmwp3dln945qh0nrjli6zc"; depends=[]; };
+  pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.19.0"; sha256="1rfp34332p0fbx9yfb87rlhwwzjy1pm3zf372pvhv1r7qm8w3dyh"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+  pepDat = derive2 { name="pepDat"; version="0.115.0"; sha256="0rzwyq7aj3rf6sghybsn27vimlqv8z78bq5xs5jibjvwy697xczn"; depends=[GenomicRanges]; };
+  plasFIA = derive2 { name="plasFIA"; version="1.9.0"; sha256="0ivyvrx2wmr9wsi852h3fdkbc8qrxhx1gf21aiazlygz3x796fml"; depends=[proFIA]; };
+  ppiData = derive2 { name="ppiData"; version="0.19.0"; sha256="0hglfcyzlz7j090qylilqxx9jhivk3ipkq6q0zn2grydrj0g0xib"; depends=[AnnotationDbi graph]; };
+  prebsdata = derive2 { name="prebsdata"; version="1.17.0"; sha256="1jccx76j7xqbl4660f0akh6bnvhcvpn1wkn2hchbv9w1s9ywy9pi"; depends=[]; };
+  prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.9.0"; sha256="0wqm9wbqz15ls55mzvd6kfssix02pn2qaymin6s0b6w2imji85np"; depends=[Biobase]; };
+  prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.9.0"; sha256="19r3gb718gll5fx03q1q0471r7fx25iix7ncff6v54pp4lvnjk9q"; depends=[Biobase]; };
+  prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.9.0"; sha256="1y9pzi3w2k3fj6lnmlhzh5dvazb7vkqvchm1a6fi3lj3wdqv12lw"; depends=[Biobase]; };
+  prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.9.0"; sha256="0pclqc7qzypwd4jvld3dmy43fc5hram1lzcfbdnp4vj8r86mw7il"; depends=[Biobase]; };
+  prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.9.0"; sha256="02vg37vllda3yvw6lq7xggil6l3n7v4y37s2cqixqrrmnczzqb2z"; depends=[Biobase]; };
+  pumadata = derive2 { name="pumadata"; version="2.17.0"; sha256="0ag7kv1k9jaj943l0szxlk2qfx5mlpspwsrnnyxxcpi3s8r8nyn4"; depends=[affy Biobase oligo puma]; };
+  qPLEXdata = derive2 { name="qPLEXdata"; version="0.99.1"; sha256="05v19rlbskvy15504ys8x3s2hhbdzwnyz3dwjas6h0b7rs3d51p7"; depends=[dplyr knitr MSnbase qPLEXanalyzer]; };
+  rRDPData = derive2 { name="rRDPData"; version="0.115.0"; sha256="1z334hpwrl3f23r7cyr6zr7niwmccmxpwzhydgwlimvkdg8yn2gv"; depends=[rRDP]; };
+  rcellminerData = derive2 { name="rcellminerData"; version="2.3.0"; sha256="1qms5v7jpvncdkllcan0xnqxhbxsh3kij4hcin8m4xd470vnf0xs"; depends=[Biobase]; };
+  restfulSEData = derive2 { name="restfulSEData"; version="1.3.0"; sha256="01vbzdx354qpl58lznn9938jn93rf9nikwjfmy1w33z5cmirc7ad"; depends=[ExperimentHub SummarizedExperiment]; };
+  rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.19.0"; sha256="1bcn3s36w3asb2di8851wg67dpx3rwalw9php1sklzrbh2f7jazs"; depends=[]; };
+  sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.5.0"; sha256="06p4cq30diwx5flxc31lw3k6z66y6villf99qq99f4ab5x3gad94"; depends=[SummarizedExperiment]; };
+  scRNAseq = derive2 { name="scRNAseq"; version="1.7.0"; sha256="15cxr52qakxhsbjnm8vl33qlwbvl3lghkrk4l2v0dih4mw4g65nb"; depends=[SummarizedExperiment]; };
+  seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.13.0"; sha256="0z9dspkjvjn20q542bjq7xyc7fpy76y3ic01h14cvql42m0vhl53"; depends=[]; };
+  seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.17.0"; sha256="0hz9vf8fplqm3gfrfiiirm0w6g9x6bjq7l96275aizbx3g6a80kb"; depends=[]; };
+  seqc = derive2 { name="seqc"; version="1.15.0"; sha256="0xkc712swyr9w267vsbnyhpjif47mjbgkj52f0y4b2s7vs521h0s"; depends=[]; };
+  serumStimulation = derive2 { name="serumStimulation"; version="1.17.0"; sha256="153zq6qpk02mkk31v5sl129j50wiw9n8c7n28f39w0mzg93yjyv5"; depends=[]; };
+  sesameData = derive2 { name="sesameData"; version="0.99.3"; sha256="0q9j82m0b9vpl7an4kqbbzlpj50qv47fbi7anj7kkxdk8w2ck0l3"; depends=[AnnotationHub curl ExperimentHub]; };
+  seventyGeneData = derive2 { name="seventyGeneData"; version="1.17.0"; sha256="00fmvpvp2bi2cv0441bzchir91iz8ip077m350jhp99nzcj6khg3"; depends=[]; };
+  shinyMethylData = derive2 { name="shinyMethylData"; version="0.115.0"; sha256="0d1sm0bcfwd7q644jdxp069q4qjbzrg44srm60knxhp1kbf2ll5i"; depends=[]; };
+  simpIntLists = derive2 { name="simpIntLists"; version="1.17.0"; sha256="1cgr86ibyz4xmhsrmrr0qx8f1xhclw7q4mrrbr5znvy4nvhbzpz6"; depends=[]; };
+  stemHypoxia = derive2 { name="stemHypoxia"; version="1.17.0"; sha256="076h70m11z178q1v58rbb1731nskck64sr4w29x1jby8h87rqkvk"; depends=[]; };
+  stjudem = derive2 { name="stjudem"; version="1.21.0"; sha256="1ccr0zcqwffizqbd624j980kn40hmic2497mj2ws19chwqxaz24j"; depends=[]; };
+  synapterdata = derive2 { name="synapterdata"; version="1.19.0"; sha256="1yppixbw3pxsaag1zfsd39p78d5l8702ysxxjgnmi50ak0lrwb2w"; depends=[synapter]; };
+  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.9.1"; sha256="0hix85s3m17f7xlj4n4qdhff799r4hf78bc5gbpi8djykmbg3glq"; depends=[BiocGenerics]; };
+  tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.19.0"; sha256="0mpj8j8s9380lf830b862k2rj1mpfa3vflkai5bacwnx9i3dbmnz"; depends=[]; };
+  tinesath1probe = derive2 { name="tinesath1probe"; version="1.19.0"; sha256="07fyj1vdpzkz8iw6d9bqxgi4482rvq0r945p3rxa5a0cvwcsh1xi"; depends=[AnnotationDbi]; };
+  tissueTreg = derive2 { name="tissueTreg"; version="1.1.0"; sha256="1whm1a9r5bmrdzqchv7qzgnxnclq1qbzqjv0p6f6d6y7mw3rr6f6"; depends=[]; };
+  tofsimsData = derive2 { name="tofsimsData"; version="1.9.0"; sha256="17pwxdik4phg1cc10ycp2j38n63l1rfna8pzz16j05858ig24lif"; depends=[]; };
+  topdownrdata = derive2 { name="topdownrdata"; version="1.3.0"; sha256="095mhjpni166p351k50y0605gb3ydsrhdnf8i92w6q84qnl9dapw"; depends=[]; };
+  tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.19.0"; sha256="1gby12vp7b88h3g86r5r01lj86chs30q505qijv3zq769px7fd2g"; depends=[Biobase]; };
+  tximportData = derive2 { name="tximportData"; version="1.9.0"; sha256="06jmawmj6sssjjp2jhfzwbzhp8lv2jwbgaaz9qfwbxhnscxzj3cj"; depends=[]; };
+  vulcandata = derive2 { name="vulcandata"; version="1.3.0"; sha256="1b7wn4kvqlb4fww98505nwnwfj5knsivx9fzli5fda2k4vzf6d4x"; depends=[]; };
+  waveTilingData = derive2 { name="waveTilingData"; version="1.17.0"; sha256="1w0wvnk4r7vvg9xvqmpmwzbp1sr7plg214d6wgdwgmp9bm785vxf"; depends=[]; };
+  yeastCC = derive2 { name="yeastCC"; version="1.21.0"; sha256="1kbhbqcab7p3p160xvgwka8gfhxnjl05p9hxb7jjixi4yr30dzvj"; depends=[Biobase]; };
+  yeastExpData = derive2 { name="yeastExpData"; version="0.27.0"; sha256="13vz99brk9bb10swlrisiiwilyjn6pl1z3arw47sahm7grw4sgpc"; depends=[graph]; };
+  yeastGSData = derive2 { name="yeastGSData"; version="0.19.0"; sha256="06gnrh6kll5rmdvhigrf7blyyap6dz517gkhx2ljvlbwwz1hd35l"; depends=[]; };
+  yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.17.0"; sha256="0xq65383vmh1jnfxnfhrzfdhr5s0qzy0xb844d8lvmsn77mq7jpr"; depends=[]; };
+  yriMulti = derive2 { name="yriMulti"; version="0.11.0"; sha256="0gsr2y94hfmjmpz37y7q80wnkhlz8q028qn7dwm15a5rvzvs8ccv"; depends=[dsQTL GenomeInfoDb GenomicFiles GenomicRanges geuvPack gQTLBase Homo_sapiens MultiAssayExperiment SummarizedExperiment VariantAnnotation]; };
+  zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.115.0"; sha256="11lmhpd94vywkir5m02qb7j278k7hjlp085xq9wgaxmr07vxzyy6"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index efb91b43bb04d..78823c4f46880 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -4,1483 +4,1545 @@
 # Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix
 
 { self, derive }:
-let derive2 = derive { biocVersion = "3.6"; };
+let derive2 = derive { biocVersion = "3.8"; };
 in with self; {
-  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.8.0"; sha256="0l2zn5hqbab30lnzk856iki51jn4l9na7jdagibhvf777v5jcz51"; depends=[ABAData data_table gplots gtools Rcpp]; };
-  ABSSeq = derive2 { name="ABSSeq"; version="1.32.3"; sha256="05pcn9p24nifz10a9pzrwkmsps8yhrr214yryypapshghb7kmz76"; depends=[limma locfit]; };
-  ABarray = derive2 { name="ABarray"; version="1.46.0"; sha256="19m6qlcvylz8qgvcagsnir0pjhdyl4axdfj9q53q9ff1iraw6qwj"; depends=[Biobase multtest]; };
-  ACME = derive2 { name="ACME"; version="2.34.0"; sha256="1n7scyw5lklzaprmy6dy0qim1ypwpvfrzzgczkby1dljk0pd4i16"; depends=[Biobase BiocGenerics]; };
-  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.18.0"; sha256="02imx6x2hcb3bk6qwgwmwsv22dbbl1a6iyk35paqflsk1kdbn9fx"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
-  AGDEX = derive2 { name="AGDEX"; version="1.26.0"; sha256="0qy9zihx8bqz343h2wk3iy5j71142r11a2862lz5sj05h94kxy0i"; depends=[Biobase GSEABase]; };
-  AIMS = derive2 { name="AIMS"; version="1.10.0"; sha256="1c3mq7lm91779w27c35ych1sp5rcja75zim9a267qc0pqa4xlzv2"; depends=[Biobase e1071]; };
-  ALDEx2 = derive2 { name="ALDEx2"; version="1.10.0"; sha256="0q63sfnm4h6w6yhv55m87884ym60g1q1qnd82fqx6vlh4nssvz53"; depends=[BiocParallel GenomicRanges IRanges multtest S4Vectors SummarizedExperiment]; };
-  AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.4.0"; sha256="0zgl47x8bvdsngq5sp0iq4ssx4skn81l85fspfwl3qyvr4y3r91r"; depends=[]; };
-  ANF = derive2 { name="ANF"; version="1.0.0"; sha256="0s39mh0xbrr3kkack6n48jfwg2b0nrqilm2q0v64rf7jpfn6gj11"; depends=[Biobase igraph MASS RColorBrewer survival]; };
-  ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.18.0"; sha256="1gy2r863g21phwba59ksf9rp3azgy18f9cslka0l4kxckk701n85"; depends=[ARRmData]; };
-  ASAFE = derive2 { name="ASAFE"; version="1.4.0"; sha256="13vdv961i48lhkmaxnpg33j628h5a8b6f7s5anvgxskv2b0dzzz7"; depends=[]; };
-  ASEB = derive2 { name="ASEB"; version="1.22.0"; sha256="0pry207kvczv9ihs7vcq1ljhll4i3grn08wprip9n9yy1xy4w2xj"; depends=[]; };
-  ASGSCA = derive2 { name="ASGSCA"; version="1.12.0"; sha256="1b7i4qwajvv5dmn1qn5k0azv3ad5kxjkwnwsgvjlh7m573shdpxk"; depends=[MASS Matrix]; };
-  ASSET = derive2 { name="ASSET"; version="1.16.0"; sha256="12863h5f7ib3p26ghim2h0l7zn51y3624rihsybj5lpycnxkam9q"; depends=[MASS msm mvtnorm rmeta tmvnsim]; };
-  ASSIGN = derive2 { name="ASSIGN"; version="1.14.0"; sha256="12g1dh35azv1z5bc7n7gyr0vnyyi2r2jrvi6x0gyikbdszxwfysx"; depends=[ggplot2 gplots msm Rlab sva]; };
-  ASpli = derive2 { name="ASpli"; version="1.4.0"; sha256="19v9p4brgrzijin759n1q8zjrlksrzhmczi1nwhsjgbg47f35vs7"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; };
-  ATACseqQC = derive2 { name="ATACseqQC"; version="1.2.10"; sha256="0f1j89an2rckjrmvvmy6crmrgz2jxgmmajhx333crl8jjqi1aqm8"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges limma motifStack randomForest Rsamtools rtracklayer S4Vectors]; };
-  AUCell = derive2 { name="AUCell"; version="1.0.0"; sha256="0b6az665vpdkp82xcr4xgric3nw9204g47rj4316s30l5w5l1j2v"; depends=[data_table GSEABase mixtools R_utils SummarizedExperiment]; };
-  AffyCompatible = derive2 { name="AffyCompatible"; version="1.38.0"; sha256="1lxxpldgrsl0nf63cfhbqpraylfb3118y4j8q4xknr7x8pj95gns"; depends=[Biostrings RCurl XML]; };
-  AffyExpress = derive2 { name="AffyExpress"; version="1.44.0"; sha256="0nwvgkh9nc9gag9dh85g3x4d5125p00c9jc55knpr11jraj2xifw"; depends=[affy limma]; };
-  AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.24.0"; sha256="197rrlkxmynh8fy1xzmh68d2kygpdw7kkrysar3nsikl051yl6vb"; depends=[affy]; };
-  AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.28.0"; sha256="0yx9pz9641hi9g67nkhlngz4hbykbp2g4p0xji90jjw6ajf28qwa"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.16.0"; sha256="0plqdj4828v9icn958f7isrdpvqwk2smxacv6qpd35dzlpmlrpgh"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra nlme Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
-  AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.12.0"; sha256="1spasp0r91lbrc6l0qjadv1yg1m1659dkc2pm1mf09bpplbsagf1"; depends=[Biobase graph log4r rjson]; };
-  Anaquin = derive2 { name="Anaquin"; version="2.2.0"; sha256="0j9f3ck23g9s09lf2adbds5pxnf9i0ji06x30gpi1dcakrs6izf2"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; };
-  AneuFinder = derive2 { name="AneuFinder"; version="1.6.0"; sha256="07mwfzpv9ya9ma74n993pihjhi10pjpnzbx1bfvk55h4mcyl7r7c"; depends=[AneuFinderData bamsignals BiocGenerics Biostrings cowplot DNAcopy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; };
-  AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.40.0"; sha256="1dh4qs1a757n640gs34lf6z2glc96nan86x0sqaw5csadl2rhnlc"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
-  AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.2.0"; sha256="04zf864c1fvdlaay2r5cn30fc1n5i3czh31fs62qlrvs61wjiscs"; depends=[GenomicRanges lazyeval]; };
-  AnnotationForge = derive2 { name="AnnotationForge"; version="1.20.0"; sha256="01vbrf76vqfvxh6vpfxkjwccxggnha3byqzj333glqz2b6kwx5q1"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; };
-  AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.28.0"; sha256="1g6y7bwk573yaays0fmlicxq2452sli0kv41bq8sh4ja2l5jh5i6"; depends=[AnnotationDbi DBI]; };
-  AnnotationHub = derive2 { name="AnnotationHub"; version="2.10.1"; sha256="14v8g44a6zg9j2rwn9x9y8509k0wr2cw8yccliz24glplb40wva4"; depends=[AnnotationDbi BiocGenerics BiocInstaller curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; };
-  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.8.1"; sha256="08pvswszxnbr6b3amg2g2353iil2bm9bs571c6lf4v8z0z1by8g5"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; };
-  ArrayExpress = derive2 { name="ArrayExpress"; version="1.38.0"; sha256="01kb4322pfl9w6za6glb777hdyc8j36xs6flz3b11n1mjryipz7c"; depends=[Biobase limma oligo XML]; };
-  ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.28.0"; sha256="04qnxgywyxww8xd6r8vgy8sglbixd25749dmbsw0wgqk6zcgysim"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
-  ArrayTV = derive2 { name="ArrayTV"; version="1.16.0"; sha256="1hn5dngk4civwzx1w2py1n9g1k1jv3kwrj6z6ysvfsfi4q668341"; depends=[DNAcopy foreach oligoClasses S4Vectors]; };
-  ArrayTools = derive2 { name="ArrayTools"; version="1.38.0"; sha256="0dyd3qwc0x25m66wqd3az8l0mabiw13j5wx2f620psyq0y5ghlkd"; depends=[affy Biobase limma xtable]; };
-  AtlasRDF = derive2 { name="AtlasRDF"; version="1.11.0"; sha256="1n52s6saydhh5j5kki9zkilhlxd8nn8463988gyr1jsb4g6fdljv"; depends=[hash SPARQL]; };
-  BAC = derive2 { name="BAC"; version="1.38.0"; sha256="04s7fbb8b4is97alj64p86jnh1lgf4a0n02wg3g9rvd75jxmzbai"; depends=[]; };
-  BADER = derive2 { name="BADER"; version="1.16.0"; sha256="05p006rqydnvz5a8gdbara9fsyn51b5flc05j593bvvlmkc6anl5"; depends=[]; };
-  BAGS = derive2 { name="BAGS"; version="2.18.0"; sha256="1qhmrz6ffhhsbnmcc0xmb64psv50b1jd1gxkjhhv479mcfl6mk06"; depends=[Biobase breastCancerVDX]; };
-  BASiCS = derive2 { name="BASiCS"; version="1.0.1"; sha256="02acpq0mrdr8l3xa3k32k2mq8k96c95gm9603m5z5z3x3npjdzq7"; depends=[BiocGenerics coda data_table KernSmooth matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; };
-  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.8.0"; sha256="0fv5gyzfv0093dlyrlci9d88fcb0ifgljxwivrxpkbbsll5vrpxh"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
-  BCRANK = derive2 { name="BCRANK"; version="1.40.0"; sha256="0vbjskazhm5v4lmwdc456r5vl2v848ldqrzbdjrdxjlvd72wfprw"; depends=[Biostrings]; };
-  BEAT = derive2 { name="BEAT"; version="1.16.0"; sha256="0x4k45qgzwv6m00zq1jhbhc2aa5slgg5p4g8g909vajc75fpp6g7"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
-  BEclear = derive2 { name="BEclear"; version="1.10.0"; sha256="1skkqzph89lx9cwlgyd2xmn1808sn5byfa8mqdq6w60j6vwplpzn"; depends=[Matrix snowfall]; };
-  BGmix = derive2 { name="BGmix"; version="1.38.0"; sha256="1778bm1hx8bw00n0l3d5jvfldc7hqmpg2w1nbsc3c017rd1l2ryk"; depends=[KernSmooth]; };
-  BHC = derive2 { name="BHC"; version="1.30.0"; sha256="0j8sb6ifq2nxvlarm1zqa89yzfs3si4w43ily9nnbmlnhngr6d0m"; depends=[]; };
-  BLMA = derive2 { name="BLMA"; version="1.3.3"; sha256="1qxj3izpv4pphq515kqq5qcsg1p847knpm961pcipmikbzxrvfqw"; depends=[Biobase graph GSA limma PADOG ROntoTools]; };
-  BPRMeth = derive2 { name="BPRMeth"; version="1.4.0"; sha256="0b7p2z69zjxrza2qfgpg6dfk96r9gfjm3v4qzafjy0hrbcfi2d74"; depends=[assertthat data_table doParallel e1071 earth foreach GenomicRanges IRanges MASS randomForest S4Vectors]; };
-  BRAIN = derive2 { name="BRAIN"; version="1.24.0"; sha256="0cxci3clyz98r8vx6cq49ypc3s3bkhx8rx0h60r54va6gbp1j2lm"; depends=[Biostrings lattice PolynomF]; };
-  BSgenome = derive2 { name="BSgenome"; version="1.46.0"; sha256="1jbzq7lm2iajajn2bifxnkss0k9fdvgqr30mral17cbhp5f6w4lq"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
-  BUMHMM = derive2 { name="BUMHMM"; version="1.2.0"; sha256="00w730jxdl83sm385a63d35b2gfxlxj0jlj85xa3li5w94cwpb07"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; };
-  BUS = derive2 { name="BUS"; version="1.34.0"; sha256="07hm54q8db209xc9sfj3w0dbrd7fqdzzs1083dwabfmrgwq69ivn"; depends=[infotheo minet]; };
-  BaalChIP = derive2 { name="BaalChIP"; version="1.4.0"; sha256="1zaknwb718hpvlrwxfan7xyd3mm7iim3mffsc2d7gfxd5s3fa4q3"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; };
-  BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.6.0"; sha256="04wl2s36ji1qdxm5x1nvmb9licb65hdfch319zvhinvsr04nig6i"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; };
-  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.22.0"; sha256="1pck2mnb9ik3lz88xn9g1rgaww1k4khv55fab920gk7plcj9fqvp"; depends=[RCurl RJSONIO]; };
-  Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.14.0"; sha256="1xylz923wn9n9cw19hlyrgq3rrf8r172jhi9a3gqlw3bmzhxh7h0"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
-  BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.6.0"; sha256="1qx0zfxy8xi2djmk8b6fbbipv64gdp9b85acy3z4z9dnsq80qps1"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; };
-  BatchQC = derive2 { name="BatchQC"; version="1.6.1"; sha256="1fjin9j6gzxkb9zif2wk56w6axb9ld104p8kly0ld2b3l73knnid"; depends=[corpcor d3heatmap ggvis gplots knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
-  BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.4.0"; sha256="1dkch2md8fi23i3pg90rzxy185v6953jhz4l2icgglxhp15ydmfp"; depends=[Biobase]; };
-  BayesPeak = derive2 { name="BayesPeak"; version="1.30.0"; sha256="1f8r1z7mmh40nrfqj1b3drjli6zb6hm645a9xi39claid2kvfh9z"; depends=[IRanges]; };
-  BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.30.0"; sha256="153ks6bbhqzdkl88wvszjg5f67hr0gnf1mnhn6crq7i3pjy1jw0m"; depends=[]; };
-  BgeeDB = derive2 { name="BgeeDB"; version="2.5.0"; sha256="08q93yk0hb4sbavk7i1z2qdklhl87f70ywr7xnq26r5frxcpcxm6"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
-  BiGGR = derive2 { name="BiGGR"; version="1.14.0"; sha256="1frxzj99qh94ll1xsvvnmgnfai7wfzchsqdrk2s0cp7z40yng13b"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; };
-  BiRewire = derive2 { name="BiRewire"; version="3.10.0"; sha256="08z2h5fq1nm192s2vwzv1q6sp82axkk81p05bib71wl5vg0j5fpk"; depends=[igraph Matrix slam tsne]; };
-  BiSeq = derive2 { name="BiSeq"; version="1.18.0"; sha256="0277lknj60gniwx4vr3ffd46gldzgjr7lbw8xy5xzdd0wa45wanz"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
-  BicARE = derive2 { name="BicARE"; version="1.36.0"; sha256="1ikjnpg1j7pk6y9jm0p8y28aqrq37xryhj3qnksphwvwwj533xi2"; depends=[Biobase GSEABase multtest]; };
-  BioCor = derive2 { name="BioCor"; version="1.2.1"; sha256="0f6r23imyldfacxacmici1r918b700w2i8fmd69d36bvykra59xs"; depends=[BiocParallel Matrix]; };
-  BioMVCClass = derive2 { name="BioMVCClass"; version="1.46.0"; sha256="08f8zcmncbmbhrm3y9i8wvjfivskhp8580rcndkcc82wd5g8fqdc"; depends=[Biobase graph MVCClass Rgraphviz]; };
-  BioMedR = derive2 { name="BioMedR"; version="1.1.0"; sha256="1wdszvk1qkwpfzxghbjz0zvh5zxf1wkd2f29f4hjxh09dkza49r0"; depends=[Biostrings ChemmineOB ChemmineR doParallel fmcsR foreach GOSemSim org_Hs_eg_db pls randomForest rcdk RCurl rjson]; };
-  BioNet = derive2 { name="BioNet"; version="1.38.0"; sha256="1pbi461aly08vy16sbakx249q01pyn3iwnp6xbdyi45gr1x9g3c0"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
-  BioQC = derive2 { name="BioQC"; version="1.6.0"; sha256="1lrvynzh38h62ikzig6b5fq1j738d0rrpb9bgj1lm1rwf9bbdgvs"; depends=[Biobase Rcpp]; };
-  BioSeqClass = derive2 { name="BioSeqClass"; version="1.36.0"; sha256="0drgj7dhx87qspqwrxhmjiycvz2vn14kh9wx5g0r7qimvkga9lgr"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
-  Biobase = derive2 { name="Biobase"; version="2.38.0"; sha256="1cgm1ja1kp56zdlzyy9ggbkfn8r2vbsd4hncmz8g4hjd47fg18kg"; depends=[BiocGenerics]; };
-  BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.40.0"; sha256="0hwmqv8nimc8gl1c5a72ckmgag5j8886ab62i1irlkfis5x2rj8m"; depends=[Biobase]; };
-  BiocCheck = derive2 { name="BiocCheck"; version="1.14.0"; sha256="1nzp8kgw13z9pgf885rplj6k37jcldfhbz0adqclxr2gq0yalmyx"; depends=[BiocInstaller biocViews codetools graph httr optparse stringdist]; };
-  BiocFileCache = derive2 { name="BiocFileCache"; version="1.2.3"; sha256="0fam0j8kwf9kfbvh4h7q4m53via75c5wnbn2g55cv3d37hikbpsm"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; };
-  BiocGenerics = derive2 { name="BiocGenerics"; version="0.24.0"; sha256="03wxvhxyrhipbgcg83lqlfn7p9gbzzrnl48y0dq7303xgp232zai"; depends=[]; };
-  BiocInstaller = derive2 { name="BiocInstaller"; version="1.28.0"; sha256="19fga27bv6q9v5mpil74y76lahmnwvpg2h33rdx1r79nvljkd19d"; depends=[]; };
-  BiocParallel = derive2 { name="BiocParallel"; version="1.12.0"; sha256="13ng3n2wsgl3fh0v6jnz3vg51k5c1sh44pqdvblcrcd1qyjmmqhd"; depends=[BH futile_logger snow]; };
-  BiocSklearn = derive2 { name="BiocSklearn"; version="1.0.2"; sha256="1zpfb7g353c01ffldrx7251919r6giy58s19w78jf0bslagblv4y"; depends=[BBmisc knitr reticulate SummarizedExperiment]; };
-  BiocStyle = derive2 { name="BiocStyle"; version="2.6.1"; sha256="03pp04pkcq99kdv2spzr995h2cxsza7l6w3d4gp4112m06prcybm"; depends=[bookdown knitr rmarkdown yaml]; };
-  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.4.2"; sha256="1nfph17y36vkji7yyvmkry134s4naml256p6687ag53klqxvvz7x"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown stringr]; };
-  Biostrings = derive2 { name="Biostrings"; version="2.46.0"; sha256="0vg50qdlxqcm2d6axjnzg8wh8pr4c5gz03l8bdl0llmwzp0zclzk"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
-  BitSeq = derive2 { name="BitSeq"; version="1.22.0"; sha256="1xkmvzv2kdla3mrarlw21w1hz788w71443jbn36a8dc4p6wrnxhy"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
-  BrainStars = derive2 { name="BrainStars"; version="1.22.0"; sha256="0fipnpjpsp462dsfsvcrnysca4vsq2k6z15a6mxfxvqs1gybhvvj"; depends=[Biobase RCurl RJSONIO]; };
-  BridgeDbR = derive2 { name="BridgeDbR"; version="1.12.0"; sha256="1yzn8sghqiy64l9q793yp9r3f1g1zy6ixzxbwb7skg1f5n3j7iig"; depends=[RCurl rJava]; };
-  BrowserViz = derive2 { name="BrowserViz"; version="1.10.0"; sha256="1v3d0sfj05f0l4zfw1bd27gjrfkgca0n3mxxc30b42ybdmiif3xc"; depends=[BiocGenerics httpuv jsonlite]; };
-  BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.10.0"; sha256="0yps8ll1d14q0b93mpmmp0pgrjaqvxn0d7iqvpy9yg888zk46g8x"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; };
-  BubbleTree = derive2 { name="BubbleTree"; version="2.8.0"; sha256="1nhf7sndiakjddvgihicc1vdnzqb8wmmlkng73sim1lb5hrjr391"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; };
-  BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.42.0"; sha256="1vxr91xnicbmbwz5cssaviq7p0334ikrirm8jmsaxa9sb59cdy07"; depends=[]; };
-  BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.42.0"; sha256="1kay46cmrlilnjmiv2wnl99a4i9nc76f9j1j5rxg8cqxfq2hhmd2"; depends=[BufferedMatrix]; };
-  CAFE = derive2 { name="CAFE"; version="1.14.0"; sha256="0lv0s2d0zqj43dqdkw5m4ac9190l6bfxj73adn5k2fl4wzl3a0rq"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
-  CAGEr = derive2 { name="CAGEr"; version="1.20.0"; sha256="0gavrpwibf8gm53f292x1f64vdr2byx97c18cvxg4x3g5m60vx3n"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
-  CALIB = derive2 { name="CALIB"; version="1.44.0"; sha256="1n6nlw0da0cyd8ca04gmg3wwpc0sqy0fbxclbxcjhn86rlwyxmg5"; depends=[limma]; };
-  CAMERA = derive2 { name="CAMERA"; version="1.34.0"; sha256="1ibs7s611kdh82hyp5fbkp1mlk0c2nksbkys0h3prsg0lkss2jvi"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
-  CATALYST = derive2 { name="CATALYST"; version="1.2.0"; sha256="1q31zzi15q2z46wsk3p4fvq8imxjkyywi849h5jyrvnxhca28mbz"; depends=[drc flowCore ggplot2 gridExtra matrixStats plotly RColorBrewer reshape2]; };
-  CAnD = derive2 { name="CAnD"; version="1.10.0"; sha256="17nzlplz9d8dhzm546bznwmz20p7lxnsvq35qd09a3rdcf1abz77"; depends=[ggplot2 reshape]; };
-  CCPROMISE = derive2 { name="CCPROMISE"; version="1.4.0"; sha256="0r0aardhmz76zd5lj1qzwyva8la0jv9wczfmak3r0pp2axaw13yr"; depends=[Biobase CCP GSEABase PROMISE]; };
-  CEMiTool = derive2 { name="CEMiTool"; version="1.0.3"; sha256="07ighg7y1rpx00xylg1yhd03fvs2yi215rfyii8ckzwf8l9829l4"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
-  CFAssay = derive2 { name="CFAssay"; version="1.12.0"; sha256="01yakrkpbs43013936rh8qd4giiz7y7cp9jrdx9i4p6h5h8jzj28"; depends=[]; };
-  CGEN = derive2 { name="CGEN"; version="3.14.0"; sha256="14s1j2h5cb2gfgn73yvb933ng63cr9i8lx8hisd0g8lcfi2b5rxw"; depends=[mvtnorm survival]; };
-  CGHbase = derive2 { name="CGHbase"; version="1.38.0"; sha256="0fynvcsjdbgp69i0nxrc8ni58rhb1kx9k5r3nb91n9i8s43gjqlm"; depends=[Biobase marray]; };
-  CGHcall = derive2 { name="CGHcall"; version="2.40.0"; sha256="11pi6awz3858yb4s0z3qf3kcmsdgp6d4aj41g4lfix1sv5amllch"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
-  CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.32.0"; sha256="1br3yly4f32yqqnamscnbkz60bpyphj59igw4jnc8zj6ax0rfz4c"; depends=[Biobase CGHbase CGHcall]; };
-  CGHregions = derive2 { name="CGHregions"; version="1.36.0"; sha256="01c4knp9i0k899h34fa7xzd2agil2pis5h2cnnx017zfcfbjf9sq"; depends=[Biobase CGHbase]; };
-  CHRONOS = derive2 { name="CHRONOS"; version="1.6.0"; sha256="0az45ygm4xjkfjz1s4wyq4xqy9ymaf70rhayvavjz4fcnq03z4fz"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; };
-  CINdex = derive2 { name="CINdex"; version="1.6.0"; sha256="0lr0fqqm6fakavjx0pw3hhyxxdxgc6ncxp9qjw9macinmkgw5r96"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; };
-  CMA = derive2 { name="CMA"; version="1.36.0"; sha256="0l5ikjvfdpy054xsb21z2dz3mjsr3ni639dz2205kpp5l7nwlckd"; depends=[Biobase]; };
-  CNAnorm = derive2 { name="CNAnorm"; version="1.24.0"; sha256="13d34cpg5x9nyl2vb2302p8v0x8mcx81qj4v0az242zchn679rbs"; depends=[DNAcopy]; };
-  CNEr = derive2 { name="CNEr"; version="1.14.0"; sha256="1yf0zpy5qp1vfrjkkld1zp4xiy1jj7rk0b65cbpmhxk6la50wlbc"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; };
-  CNORdt = derive2 { name="CNORdt"; version="1.20.0"; sha256="0jrfv8jis5sd4x5zqmk0p5vcb23b42q128b7p35yyb59gjnnm5dz"; depends=[abind CellNOptR]; };
-  CNORfeeder = derive2 { name="CNORfeeder"; version="1.18.0"; sha256="09h2f9asrpw6yrzpa7cq81bl3viz9nl9s0nfdm2af7bvlrwpyf79"; depends=[CellNOptR graph]; };
-  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.20.0"; sha256="171i49bhfq8vy826m9kpg8pvpgs66al71yd5ydpmv14zkkjz3fnp"; depends=[CellNOptR nloptr]; };
-  CNORode = derive2 { name="CNORode"; version="1.20.0"; sha256="1w6xwggfm0sh90n6qb4gdx4ljpav8ax20r667vk3ysq8vyd7fgqy"; depends=[CellNOptR genalg]; };
-  CNPBayes = derive2 { name="CNPBayes"; version="1.8.0"; sha256="11083vhq1fgqzav5xlcada0ryyqyhgcxxr7c3ijwi6z7xrldx2fm"; depends=[BiocGenerics coda combinat dplyr GenomeInfoDb GenomicRanges ggplot2 gtools IRanges magrittr matrixStats mclust purrr RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment tibble tidyr]; };
-  CNTools = derive2 { name="CNTools"; version="1.34.0"; sha256="0nxdx3h5s0fgr4m4i1lizdcgxb7wjddzwxj28m5l67vm919734ka"; depends=[genefilter]; };
-  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.8.0"; sha256="087m2r7fcw6z7ybbsnzxycsj289c2q6lq1d7zam1ilqhw1bi4rxi"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq openxlsx plyr Rsamtools S4Vectors]; };
-  CNVrd2 = derive2 { name="CNVrd2"; version="1.16.0"; sha256="1rqjms7k3630kabbc6ish88308lqlrlbzkjflr5apcilc6rfyrx1"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
-  CNVtools = derive2 { name="CNVtools"; version="1.72.0"; sha256="0ihmgg5f0p7yhg0273jb785fcrhcw704vz8r6ban8c63wk0qbqb5"; depends=[survival]; };
-  CODEX = derive2 { name="CODEX"; version="1.10.0"; sha256="1knfgii0n8grn4436aksk7f2xkk93ih2snvrp7p8pkr206kqadnq"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; };
-  COHCAP = derive2 { name="COHCAP"; version="1.24.0"; sha256="1ggxn35hif4x4k1rbnxinf0pdqbg1n53wym9rm5zs6cnya4aimgj"; depends=[COHCAPanno gplots RColorBrewer WriteXLS]; };
-  COMPASS = derive2 { name="COMPASS"; version="1.16.2"; sha256="1g9y5gryy1r8sg75008v3b2a1l2wkxvf8h5bnljnkc0wsd4f4nvb"; depends=[abind clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang scales tidyr]; };
-  CONFESS = derive2 { name="CONFESS"; version="1.6.0"; sha256="0kmvhwyzxz9ahvvzicigxal3r4ya8y5i090m7pi7d1p5arir7djl"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
-  CORREP = derive2 { name="CORREP"; version="1.44.0"; sha256="10bjv02x2xzanajfbsvbxd7s2s07z0gydx1ypmbfym41jjwac9ra"; depends=[e1071]; };
-  COSNet = derive2 { name="COSNet"; version="1.12.0"; sha256="0x5kg4c5ml7ndqq81k5jy07fyra4q6nhhly6v7qd98gpmvrj6gnk"; depends=[]; };
-  CRISPRseek = derive2 { name="CRISPRseek"; version="1.18.0"; sha256="0qvswjday1mjfa7009kgak09crgi6y7l1irc5hys4b8zmrnxzyc0"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; };
-  CRImage = derive2 { name="CRImage"; version="1.26.0"; sha256="1y1xs3agswi4da6mcra3pvssasd4cvhdr2sv664as0dg9m7r43a8"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
-  CSAR = derive2 { name="CSAR"; version="1.30.0"; sha256="1915ns969hs46rh85y2krdqgrc81yxhxfv6h8narcni805rgj8n5"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-  CSSP = derive2 { name="CSSP"; version="1.16.0"; sha256="0xxsck347hvml9ppl9vkvh0f40mkfskwbasz93x5jqvkf046jxda"; depends=[]; };
-  CVE = derive2 { name="CVE"; version="1.4.0"; sha256="0h8xcbnaamz479rax8c8ni7xnqsi43nvkshqhmlynfg60m8yl6cp"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny WGCNA]; };
-  CancerInSilico = derive2 { name="CancerInSilico"; version="1.4.0"; sha256="19pp282x994ykxczyvls8x71dfwzra21myxky4w2clhgabhqrw9h"; depends=[BH Rcpp testthat]; };
-  CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.20.0"; sha256="16csf668vxrngc5him5hbkj1bbzhi378sxwlfvh2dia2zipazg0w"; depends=[AnnotationDbi limma qvalue]; };
-  CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.4.0"; sha256="0n3la51s0pk3nmbdpv4z0y633qydajby3fy6nxwhpdkkxmlirrgc"; depends=[cluster ConsensusClusterPlus iCluster impute limma NMF sigclust SNFtool survival]; };
-  Cardinal = derive2 { name="Cardinal"; version="1.10.0"; sha256="1yda7zzrmgyz58cg2myp6diwn39w353s4jkmp4d3yhvww2m9kyim"; depends=[Biobase BiocGenerics irlba lattice matter ProtGenerics signal sp]; };
-  Category = derive2 { name="Category"; version="2.44.0"; sha256="0mkav04vbla0xfa0dssxdd0rjs589sxi83xklf5iq5hj3dm8y0i8"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; };
-  CausalR = derive2 { name="CausalR"; version="1.10.0"; sha256="0fj6ndrg78r6ss7ngmpja9dg482namrxxg6vdjdn4agiznk6jn92"; depends=[igraph]; };
-  CellMapper = derive2 { name="CellMapper"; version="1.4.0"; sha256="16pa802b7lg398p8r4ijbiimzhg86fpyq54k13l7pmc4qp26405b"; depends=[S4Vectors]; };
-  CellNOptR = derive2 { name="CellNOptR"; version="1.24.1"; sha256="0p6gksg6h5mbja0mfkh755cvhv7bzkwbg4dy0y34aighz945vy3a"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
-  CexoR = derive2 { name="CexoR"; version="1.16.0"; sha256="1n3j5l3dlpigd0ihls8s3kwipajj0d9cp0v592f54v75q49fbsz6"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
-  ChAMP = derive2 { name="ChAMP"; version="2.9.10"; sha256="1c8sadqkx6cxd1hgms340m2jl3pxmkxk59yfbp69rqbrbjlx2zjy"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel FEM GenomicRanges goseq Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; };
-  ChIPComp = derive2 { name="ChIPComp"; version="1.8.0"; sha256="1nj3903nhii76v6jrm7bfw8kngbq525zikb3nwhvmp4905c77z40"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
-  ChIPQC = derive2 { name="ChIPQC"; version="1.14.0"; sha256="1nnmgzad7kzydrmz374f9xvf8s13q6vhanz93v6d9jqh6jnd5di0"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
-  ChIPXpress = derive2 { name="ChIPXpress"; version="1.22.0"; sha256="0wcs7gw0kgvbk1f4i8j9cr8kwv1lj45zv9q069cify78rdb106rb"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
-  ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.0.0"; sha256="02w4k41wx9cqfk0zjzcv8vdfgwv9rswijmdrsbmcpbrmbwn2jlxi"; depends=[Biostrings BSgenome GenomicRanges IRanges RcppRoll S4Vectors]; };
-  ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.3.2"; sha256="0hh7ppc4fsil7vczng897dkzz2a1x0s2j2qvw1v2g8hm82mv070k"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
-  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.12.7"; sha256="1zab489d7a6bh6ylc68x6yn47gdkmr7p3677grx9l2qafrryjr04"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools S4Vectors seqinr SummarizedExperiment VennDiagram]; };
-  ChIPseeker = derive2 { name="ChIPseeker"; version="1.14.2"; sha256="1db2k7j0rr9q8jlfxlji62zyhzfh7yhsacyg1dj5sgwbhhn0xliy"; depends=[AnnotationDbi BiocGenerics boot DOSE dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
-  ChIPseqR = derive2 { name="ChIPseqR"; version="1.32.0"; sha256="0igqlfr5grhkr7dsdyg3c31d3r1wpn413vxmzlckiimfwdi35rqv"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
-  ChIPsim = derive2 { name="ChIPsim"; version="1.32.0"; sha256="01kmhzyvnp03v9xydm9xrrkdmlf5dpsnzzcf13i9r03x3m44r4ga"; depends=[Biostrings IRanges ShortRead XVector]; };
-  ChemmineOB = derive2 { name="ChemmineOB"; version="1.16.2"; sha256="0zrg6f5cg54f1bpwjhx2h97w267jr2gyncgfyjs7njkjwwrl9ads"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
-  ChemmineR = derive2 { name="ChemmineR"; version="2.30.2"; sha256="1n83s6bl5lcqgrs30g307vji3ras39pagwgfwcaknhdhwv5wx9d4"; depends=[BH BiocGenerics DBI digest ggplot2 gridExtra Rcpp RCurl rjson]; };
-  Chicago = derive2 { name="Chicago"; version="1.6.0"; sha256="1s2qrz7qbdn3nbkjqyyrmh04kbdrknc7w5cdasg5sch8znnvq6gw"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
-  ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.32.0"; sha256="0kshy9ri174ksgdnifmf57mjkyjczcx98x98idjmjcxlwrzx4xjr"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; };
-  ClassifyR = derive2 { name="ClassifyR"; version="1.12.2"; sha256="1ybcsvh45i4dgx0b7z1wxxh51ydfkx5bh75343f1dpwl1igp8cjw"; depends=[Biobase BiocParallel locfit ROCR]; };
-  Clomial = derive2 { name="Clomial"; version="1.14.0"; sha256="1hd135pcs5sngg1dw93b3f1qnrbl3d1ynyk0wbaal9wzys7fzmcq"; depends=[matrixStats permute]; };
-  Clonality = derive2 { name="Clonality"; version="1.26.0"; sha256="1l19zpnnrx1xz5dc2mvyljlllhlk0gjld8lk675g8iqhm3i8z861"; depends=[DNAcopy]; };
-  ClusterJudge = derive2 { name="ClusterJudge"; version="1.0.0"; sha256="0iff5dsvl92gfidgly0gyv4ivb97j45rmmc5rlllij1z1p0mjrhq"; depends=[httr infotheo jsonlite lattice latticeExtra]; };
-  ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.6.0"; sha256="19wjjzv2f6lkkl0vyyx9jw4y6dqvl5qz7ppk85j3k3r9yhjlpnv1"; depends=[pracma princurve RColorBrewer scatterplot3d]; };
-  CoCiteStats = derive2 { name="CoCiteStats"; version="1.50.0"; sha256="0k8nf7yzbwyyxxgcn4qa7f254vngkabbaxs40ijyyzhwldwdqcjn"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  CoGAPS = derive2 { name="CoGAPS"; version="2.12.0"; sha256="1yhxk94r9l0yz03n3d6gd78daazgbgy84f2840al04b74mr89bx8"; depends=[BH cluster doParallel foreach ggplot2 gplots RColorBrewer Rcpp RcppArmadillo reshape2 shiny]; };
-  CoRegNet = derive2 { name="CoRegNet"; version="1.16.0"; sha256="1d702vgki4wqx355y5v83ajga3j477l2bgvb0lbpkxjaxi57zm80"; depends=[arules igraph shiny]; };
-  CompGO = derive2 { name="CompGO"; version="1.14.0"; sha256="0acjn3w7axq4674p2jsc71hga32svd2fc3xn2mrs85i9bcckwmv5"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; };
-  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.17.1"; sha256="1x6kp55iqqsd8bhdl3qch95nfiy2y46ldbbsx1sj1v8f0b0ywwcy"; depends=[circlize colorspace GetoptLong GlobalOptions RColorBrewer]; };
-  ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.42.0"; sha256="1pjw7r4x9867zjvdva58jsgask94ydqzrwzn3z6li47bin5ic0m1"; depends=[ALL Biobase cluster]; };
-  CopywriteR = derive2 { name="CopywriteR"; version="2.10.0"; sha256="17fy2lc5yf3nh6v077kv87h53n263hqz2540lzrl0vjiqrl2plca"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
-  CorMut = derive2 { name="CorMut"; version="1.20.0"; sha256="0dy02halbp57vmfbjgjhkgc6icxrvy9nxpb92arrgl6ly8bflcwx"; depends=[igraph seqinr]; };
-  Cormotif = derive2 { name="Cormotif"; version="1.24.0"; sha256="1inxd86lndp2jmdzvjj222697safcppr0gzhcfrcj4bygl36ma6v"; depends=[affy limma]; };
-  CountClust = derive2 { name="CountClust"; version="1.4.1"; sha256="08097iyxx2qm675bnqm8c4hq6rwyqsdfzxkf46mllpyf2mk3wwwf"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; };
-  CoverageView = derive2 { name="CoverageView"; version="1.16.0"; sha256="1091mxiclb3zhr48bdj7z8gi3v69l4w25cfpfbxhhp70rffn9xfr"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
-  CrispRVariants = derive2 { name="CrispRVariants"; version="1.6.0"; sha256="15za6ysnnjfwmiq2dhbpr3kww6c2jvc2y1mf8rfpqx56bd1dh3cb"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
-  CytoML = derive2 { name="CytoML"; version="1.4.1"; sha256="1jj79adwrzwx012xvw3czv0m94jc3j2ibpijdfbz8fpjhynrzwqb"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; };
-  DAPAR = derive2 { name="DAPAR"; version="1.10.4"; sha256="15ghdx2yccsk98bmynljiwdfkjjfqafq62wc87zsgydql59c10kh"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr foreach ggplot2 gplots graph highcharter imp4p impute imputeLCMD knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes tidyr tmvtnorm vioplot]; };
-  DART = derive2 { name="DART"; version="1.26.0"; sha256="15hqsdi7pa1qn5c5af2izhf609c7lmb0zsv2qwyc9xbf7dn42qmf"; depends=[igraph]; };
-  DASC = derive2 { name="DASC"; version="0.99.11"; sha256="1wm43kgvq3wkwp8hmz70m9c7yxxjsanpqxvcm6x63bna02ysb90y"; depends=[Biobase cvxclustr NMF]; };
-  DBChIP = derive2 { name="DBChIP"; version="1.22.0"; sha256="07psmmvcdl4r5m71kccd9rd3vk521ilhwmcll37pfrmb16s1856x"; depends=[DESeq edgeR]; };
-  DChIPRep = derive2 { name="DChIPRep"; version="1.8.0"; sha256="1ii7mdppqk3gg3ly9x35d0ij2grmi7678dli4xfd2mzkzyc5b6wm"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
-  DECIPHER = derive2 { name="DECIPHER"; version="2.6.0"; sha256="1rc9vipclkiib71684dl0qrd6yll672xxbig22x8v99hscdd3d8y"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
-  DEDS = derive2 { name="DEDS"; version="1.52.0"; sha256="18gpj5xk5byiqv548s0vcvp8l5f0k49k8z9iq5qsn53jhh53f26s"; depends=[]; };
-  DEFormats = derive2 { name="DEFormats"; version="1.6.1"; sha256="1wix5n76438896sz62cgsrzjjx4cw7mhxgvsq43w2vpsp3gdrp59"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges SummarizedExperiment]; };
-  DEGraph = derive2 { name="DEGraph"; version="1.30.0"; sha256="083w1vrp0s3xkiz1qm3d03fi1dm69gspq7pqadqwrc3qypjkp3hi"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-  DEGreport = derive2 { name="DEGreport"; version="1.14.1"; sha256="0mbqmkgp9l7ygrh6dsf77mf9fqrql7i4wpw5rg87l6p2misz6662"; depends=[Biobase BiocGenerics cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggplot2 ggrepel knitr logging magrittr Nozzle_R1 psych quantreg reshape rlang S4Vectors scales SummarizedExperiment tibble tidyr]; };
-  DEGseq = derive2 { name="DEGseq"; version="1.32.0"; sha256="0dh1ig8nj3mf0f8masf48imkkadma0dywbraydcy3cw9vdnc5c7j"; depends=[qvalue samr]; };
-  DEP = derive2 { name="DEP"; version="1.0.1"; sha256="0glkq6xlhcsr364zl4nkc7g3gnscv0yb3kcyvhzgm3bbfvd9q7ac"; depends=[assertthat Biobase broom circlize ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; };
-  DESeq = derive2 { name="DESeq"; version="1.30.0"; sha256="0mn5w3cy16iwwk8zxs7za6aa6cnrca75z0g45zd5zh1py5d7nfv9"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-  DESeq2 = derive2 { name="DESeq2"; version="1.18.1"; sha256="1iyimg1s0x5pdmvl8x08s8h0v019y0nhjzs50chagbpk2x91fsmv"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-  DEXSeq = derive2 { name="DEXSeq"; version="1.24.4"; sha256="1a80yv742fx5c7qav7imsdybphf0d5bixsqyf8w5zng7fk8j16d5"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
-  DEsubs = derive2 { name="DEsubs"; version="1.4.0"; sha256="1i9blymzj18r9646vac9grrjxw6xar8m6chn1dgdila17jag1wlp"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; };
-  DFP = derive2 { name="DFP"; version="1.36.0"; sha256="117gmzcgr9wr9wb7g0rm7wlrakd76ys1frhmhx1k6ps97ibxlz1k"; depends=[Biobase]; };
-  DMCHMM = derive2 { name="DMCHMM"; version="1.0.0"; sha256="1y0wmxks51h0d21v8g4mryq7kzq49khhpa88fbhza9xp2bmwk358"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
-  DMRScan = derive2 { name="DMRScan"; version="1.4.6"; sha256="10b9qlr0la3ilrw44vcq4y8pg7284adrh506wbx7f9ipgka8qx4y"; depends=[GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; };
-  DMRcaller = derive2 { name="DMRcaller"; version="1.10.0"; sha256="0z5rzzbnlw3m1yp8d5y2y4rplz73q06kh5gkf57rmpg1pzkfbvca"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-  DMRcate = derive2 { name="DMRcate"; version="1.14.0"; sha256="1kzb6lai3969v8sjwwzrzm9x2adngh5ij2jf0ig073aab3cfibh6"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; };
-  DMRforPairs = derive2 { name="DMRforPairs"; version="1.14.0"; sha256="1q489w68q4mxg7f8h36f7gmwbldc2fq3a69k6b25d3wg7583v4ax"; depends=[GenomicRanges Gviz R2HTML]; };
-  DNABarcodes = derive2 { name="DNABarcodes"; version="1.8.0"; sha256="0x3pwln8v57w045kxr6hq778hpy5f21gfq5m6wj41rq9awvx5s2p"; depends=[BH Matrix Rcpp]; };
-  DNAcopy = derive2 { name="DNAcopy"; version="1.52.0"; sha256="127il5rlg1hzjlhwhs64x3nm18p00q1pd9ckb2b9ifl0rax95wai"; depends=[]; };
-  DNAshapeR = derive2 { name="DNAshapeR"; version="1.6.0"; sha256="1p44bi5pysrc4pw63zrhxy5q4yqh81kncnp585cjlcbbbyqwz8sv"; depends=[Biostrings fields GenomicRanges Rcpp]; };
-  DOQTL = derive2 { name="DOQTL"; version="1.14.0"; sha256="0hpvh84la7i9m5l9c1hrhmr62f031dyv7nq6aai58bd0lqh9izp5"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; };
-  DOSE = derive2 { name="DOSE"; version="3.4.0"; sha256="10dw82car6vi13lic2dghm1gw3a8d2s6nrdhh69fhb7gj6lhr5ds"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim igraph qvalue reshape2 rvcheck S4Vectors scales]; };
-  DRIMSeq = derive2 { name="DRIMSeq"; version="1.6.0"; sha256="17z8flsb5ngnkcd1g1fj3m0yms71w6q45abc30wwvcnxrg1m9scn"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; };
-  DSS = derive2 { name="DSS"; version="2.26.0"; sha256="0an0nr64f46s9smli0lpj6z62b25dd6xmyk92ndx9kp38vldmv0z"; depends=[Biobase bsseq DelayedArray]; };
-  DTA = derive2 { name="DTA"; version="2.24.0"; sha256="0729w0zkcnwk3rcf4ziz5xw4fsv4dq9p9ri8yizxsxiara4lnhlw"; depends=[LSD scatterplot3d]; };
-  DaMiRseq = derive2 { name="DaMiRseq"; version="1.2.0"; sha256="0m16yh2cfqb5ysdir4b5c3v73204ac5fa0lyvi6x1djkm6nj04hh"; depends=[caret corrplot DESeq2 e1071 EDASeq FactoMineR FSelector ggplot2 Hmisc kknn limma lubridate MASS pheatmap plsVarSel randomForest RColorBrewer reshape2 SummarizedExperiment sva]; };
-  DeMAND = derive2 { name="DeMAND"; version="1.8.0"; sha256="1gf5c3m0jwgipz1wl8viq781kfj0nmpa29cjad9qgrkpihfagh03"; depends=[KernSmooth]; };
-  DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.20.0"; sha256="1877jcl6l2chfa6djv227hf2bqcb4w7frnhmrlh6rzqssq5zrx43"; depends=[ggplot2 limSolve pcaMethods]; };
-  DeepBlueR = derive2 { name="DeepBlueR"; version="1.4.1"; sha256="13qg2nmmhicl1n4ry38syz6ah6mvq2vw6c53id7piyyk0xj3rhrc"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; };
-  DelayedArray = derive2 { name="DelayedArray"; version="0.4.1"; sha256="0s7h2giyvz04cg6248kbbzpwhxdrpnsvl2s8k5c8ricisd9aaz4b"; depends=[BiocGenerics IRanges matrixStats S4Vectors]; };
-  DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.0.3"; sha256="1cxjbjdq9hg9cm95rci0al7a4pk2h73ym276ahw9q4977zbg6381"; depends=[DelayedArray IRanges Matrix matrixStats S4Vectors]; };
-  DiffBind = derive2 { name="DiffBind"; version="2.6.6"; sha256="1sm5h6nq77hjfis6kr1nqyizcxgfz87dgpqc4fxlfqkmsd9n3vkp"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; };
-  DiffLogo = derive2 { name="DiffLogo"; version="2.2.0"; sha256="0nc07vn9ldhnv9wm5i9b7axkvsi7v5gcf8saa6zlkr7mf5lsinhg"; depends=[cba]; };
-  Director = derive2 { name="Director"; version="1.4.0"; sha256="1yq4amwflg168fgdr91lh4c8y3azw2fdsbp2b0j6mnhcjqgmaxk8"; depends=[htmltools]; };
-  DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.20.0"; sha256="1c4s6x0qm20556grcd1xys9kkpnlzpasaai474malwcg6qvgi4x1"; depends=[BiocGenerics IRanges S4Vectors]; };
-  Doscheda = derive2 { name="Doscheda"; version="1.0.0"; sha256="04dzr26lvhcd9h6b5s61csygrc1357b8d6zxbn955s6crbr5p2ns"; depends=[affy calibrate corrgram d3heatmap drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; };
-  DriverNet = derive2 { name="DriverNet"; version="1.18.0"; sha256="068ps1ril55fhfbxlzchrjyx75xvqqh8ny7gp99k6hcmksjnbbsb"; depends=[]; };
-  DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.20.1"; sha256="0bw9bwwacp9mznldl61r5znsy34yb1zkil6fd9ilxp8wmxicphjk"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; };
-  DupChecker = derive2 { name="DupChecker"; version="1.16.0"; sha256="1fxcs2vljp2rh9qp2xmqp8ri6v41gzdy51jhhv33rxfgh9jz70g5"; depends=[R_utils RCurl]; };
-  DynDoc = derive2 { name="DynDoc"; version="1.56.0"; sha256="1zc43f2v7qh44slc0za71jb0a5fsqp55y5fbnb9fnd6139im5vxc"; depends=[]; };
-  EBImage = derive2 { name="EBImage"; version="4.20.1"; sha256="0xwq9jd9sn5h3al7k03byr4diyrmk4jx344spdcaw58a830w9q7j"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; };
-  EBSEA = derive2 { name="EBSEA"; version="1.6.0"; sha256="13qgmcwv4b06zgaalqf9sq0wkkhnf38h98fw2dqql8z9w3n5sbnz"; depends=[edgeR gtools limma]; };
-  EBSeq = derive2 { name="EBSeq"; version="1.18.0"; sha256="0pr7xaf64wn3ry358raqd7vpp7p3zq88qp9jkx6xf9f83bmyx7mw"; depends=[blockmodeling gplots testthat]; };
-  EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.12.0"; sha256="1bg4y0jqf034p400j30yskb0fhxk9mlnbrmdcr29r2212xra4g7b"; depends=[EBSeq]; };
-  EBarrays = derive2 { name="EBarrays"; version="2.42.0"; sha256="0hd297adyp3fkppmzncdcn0y7kvgixkp460816vsrzphs4v2fi1m"; depends=[Biobase cluster lattice]; };
-  EBcoexpress = derive2 { name="EBcoexpress"; version="1.22.0"; sha256="1k9n95hqhd5rb811vc1idjslv6m5x3s30zv9h545h26cklqqmd76"; depends=[EBarrays mclust minqa]; };
-  EDASeq = derive2 { name="EDASeq"; version="2.12.0"; sha256="07zm89zcivyn2261aq9grqmly8ji482kr9h9dyfknfdfrpv7jpwv"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
-  EDDA = derive2 { name="EDDA"; version="1.16.0"; sha256="000kp07khndncb9d4gql8gkjwrv3r08qf118g51zcmfrpzn26a30"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
-  EGAD = derive2 { name="EGAD"; version="1.6.0"; sha256="0dxbw39dymwxd6hvnx9c1y97z6d2br55c0md1l72wajf5qa8nvfc"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; };
-  EGSEA = derive2 { name="EGSEA"; version="1.6.1"; sha256="1srjms8xa9qnnm6mzlgmdqk0zd4485k6d20ygzqqi0jj86xa6ava"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 Glimma globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; };
-  ELBOW = derive2 { name="ELBOW"; version="1.14.0"; sha256="0hw7sb20id7zxdashrsxxhcw96z0m3yp12gizq4x5gw53iipw73w"; depends=[]; };
-  ELMER = derive2 { name="ELMER"; version="2.2.7"; sha256="0qdl79x7g1pd8z16s3zja2hvmf9bmr6520gh7ghavdh6qaxqji0h"; depends=[biomaRt circlize ComplexHeatmap doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr readr reshape rvest S4Vectors SummarizedExperiment TCGAbiolinks xml2]; };
-  EMDomics = derive2 { name="EMDomics"; version="2.8.0"; sha256="09lkg7c1sl5jmg8z1yfaqw5hy3jcpb0wyh0l9sc14hbsncvq1nmh"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
-  ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.4.0"; sha256="0mw3pgbpk1q0jgzcb3pk2kgdw9igh1zm4bywzfzg7k1k1xjzk3yy"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; };
-  ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.26.0"; sha256="0vc9d17m5bdjj4wqcl5lr99bv89yzs75m94rfckjjzvx7j6cmqcx"; depends=[rJava XML]; };
-  ENmix = derive2 { name="ENmix"; version="1.14.0"; sha256="117jp47hpm276x4q25jwqfagymvay0qk3ji5l9xvrj74piwqpgwh"; depends=[doParallel foreach geneplotter impute MASS minfi preprocessCore SummarizedExperiment sva wateRmelon]; };
-  EasyqpcR = derive2 { name="EasyqpcR"; version="1.20.0"; sha256="06lmq3pp0j86rv9bgs809r30qscgpxv5vjbkccf32q9wv82vd7hw"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
-  EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.6.0"; sha256="1wv1anm4bwm2kqi9lqn06bl1w17q6wvc1v2amrifbqjbmi5k7g8y"; depends=[]; };
-  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.9.4"; sha256="03n7w56r14y3jrrsdl2awcan5d0hsn3kd8900lrj015pmgf2r9d0"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
-  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.8.7"; sha256="12wrxbp14ahjjph85g040f72yk4j47svsyyv7b9s56mkc513vd6v"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
-  EpiDISH = derive2 { name="EpiDISH"; version="1.0.0"; sha256="065bvrfsssf5y4j9axqdcybqb5i8y2hnl09f9jr44bpbay34ay5f"; depends=[e1071 MASS quadprog]; };
-  EventPointer = derive2 { name="EventPointer"; version="1.2.0"; sha256="1yh6yhaf8c2rp8f4ipsk014552pplb28cl5z7wjwvarjb21waj05"; depends=[affxparser doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph limma MASS Matrix matrixStats nnls prodlim RBGL S4Vectors SGSeq stringr SummarizedExperiment]; };
-  ExiMiR = derive2 { name="ExiMiR"; version="2.20.0"; sha256="0saxway680972dmn6q1gbbmkxcwv08hl2bq973qbyrv5drg6g4vv"; depends=[affy affyio Biobase limma preprocessCore]; };
-  ExperimentHub = derive2 { name="ExperimentHub"; version="1.4.0"; sha256="1hgg3x6r4ldlqjv8by6vv5n5f8h647y3lvxwrmi79c6dvrghp0j3"; depends=[AnnotationHub BiocGenerics BiocInstaller curl S4Vectors]; };
-  ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.4.0"; sha256="07nd9n09naq8p276fbnad3wp95y11n5ws65xncf66i7356a3rkw4"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocInstaller curl DBI ExperimentHub httr S4Vectors]; };
-  ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.6.0"; sha256="099xkp39mbdg1xm6mydnpwrkbyn3y719xf1s4xyva0nkwx1g14b8"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; };
-  ExpressionView = derive2 { name="ExpressionView"; version="1.30.0"; sha256="1kjp8ndbx5bhk941ba6nza42h8zi97xwam2q0pf8pk168sch41kr"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; };
-  FEM = derive2 { name="FEM"; version="3.6.0"; sha256="0bs7p9lqp6bi7c9j8vi4gbj8md14cqc9vxxkfb0bc35mr5641q4d"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
-  FGNet = derive2 { name="FGNet"; version="3.12.0"; sha256="1f33k7dx7f97kzjpq1jvs614vjsyg3yd03s2y7xxwhydmx02n7vs"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
-  FISHalyseR = derive2 { name="FISHalyseR"; version="1.12.0"; sha256="07q5paypybw8qq17wyl7qqlrdy5kfg2k24rj2ic4gjgb6qiic38b"; depends=[abind EBImage]; };
-  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.14.0"; sha256="1nyw8h4kjddn75878adhlilwjnm4wlyhksyp2ygx6cm35fbqa2v3"; depends=[fda MASS]; };
-  FamAgg = derive2 { name="FamAgg"; version="1.6.1"; sha256="02fy27g8vi9byhnfav0121291jbwiypnj1r9i56hbgwwzplqbr5z"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
-  FindMyFriends = derive2 { name="FindMyFriends"; version="1.8.0"; sha256="13f6hdjn4l5xfrdskq2abpzczxcm8sy71fqpfj6hsxzj06fz9a36"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
-  FitHiC = derive2 { name="FitHiC"; version="1.4.0"; sha256="12ylhrppi051m7nqsgq95kzd9g9wmp34i0zzfi55cjqawlpx7c6n"; depends=[data_table fdrtool Rcpp]; };
-  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.10.0"; sha256="0mgqnmznqpy8ikzg1829bjgxnznm43wkgirhpgfskdxfzr4zqs3a"; depends=[jsonlite RCurl XML]; };
-  FlowSOM = derive2 { name="FlowSOM"; version="1.10.0"; sha256="0kgzyngm36wzwgsrf40p00543w4spisph78yp5hl5i4hghh4zkij"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; };
-  FourCSeq = derive2 { name="FourCSeq"; version="1.12.0"; sha256="08fq289m8g7fgmsrph1gq45q6zpfnrzpm0n4qyf2vc5hsdgnm4qh"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
-  FunChIP = derive2 { name="FunChIP"; version="1.4.0"; sha256="0gx2yjid47p9q7f89823avqj4r367s1ifvh4p2g351gzij63p9ab"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges RColorBrewer Rcpp Rsamtools shiny]; };
-  FunciSNP = derive2 { name="FunciSNP"; version="1.22.0"; sha256="1lgvca8npk1092dyl5jhx46ir46b3ab5jgshj5b19dg0bdzi0fj1"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
-  GA4GHclient = derive2 { name="GA4GHclient"; version="1.2.0"; sha256="1k9rd1q47ac75h3vw54kxi89g8w11bis6cz26xkvhdcim97bxs10"; depends=[BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges httr IRanges jsonlite S4Vectors VariantAnnotation]; };
-  GA4GHshiny = derive2 { name="GA4GHshiny"; version="1.0.0"; sha256="1q461l1dy7fsl1y081iyijwizk342q7v5l0irpmx1gnp2kpmvpr2"; depends=[AnnotationDbi BiocGenerics dplyr DT GA4GHclient GenomeInfoDb GenomicFeatures openxlsx purrr S4Vectors shiny shinyjs shinythemes tidyr]; };
-  GAprediction = derive2 { name="GAprediction"; version="1.4.0"; sha256="10hknskkfvpzjzcih1h6pl68p9ix9zh98ym1gzw68qjx0mhlm591"; depends=[glmnet Matrix]; };
-  GEM = derive2 { name="GEM"; version="1.4.0"; sha256="0r6zgsyfwra3qx1vis7a7mr5aiqyj7rpgs3cqdir2yjlg3y01r1w"; depends=[ggplot2]; };
-  GENESIS = derive2 { name="GENESIS"; version="2.8.1"; sha256="0w3xrw6a1fkcp49nyarkp4yykjk79gqq7rzwixdk4363d5pnm7gp"; depends=[Biobase BiocGenerics gdsfmt GenomicRanges graph GWASTools IRanges S4Vectors SeqArray SeqVarTools]; };
-  GENIE3 = derive2 { name="GENIE3"; version="1.0.0"; sha256="1lxbkhlvb082nrmlq2b57chi0vpyaqwj56ngbzli8qdmp1gz4qd3"; depends=[reshape2]; };
-  GEOmetadb = derive2 { name="GEOmetadb"; version="1.40.0"; sha256="003inwm8qkjdaihlx4009nwj3rgjn3xdk0m8k696qhniq99gcd0a"; depends=[GEOquery RSQLite]; };
-  GEOquery = derive2 { name="GEOquery"; version="2.46.15"; sha256="1l5vcksida44zkrqvrp9krqd4yhn6xh24y9jfvkyjvhq4x8fl18z"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; };
-  GEOsearch = derive2 { name="GEOsearch"; version="1.1.4"; sha256="0k0vn99rz2821gswb834nn9ib099a152y2828ka7qvhag4shzdy9"; depends=[org_Hs_eg_db org_Mm_eg_db RCurl]; };
-  GEOsubmission = derive2 { name="GEOsubmission"; version="1.30.0"; sha256="0sl9m7lk7jczpcfhn50yn322v1s65d9swjidcnzk3ydv47z419p8"; depends=[affy Biobase]; };
-  GEWIST = derive2 { name="GEWIST"; version="1.22.0"; sha256="0lfm19s4z5j7zhpzhfa7rqdz09ip05cf2zbnsqv9widdmkcw2wnk"; depends=[car]; };
-  GGBase = derive2 { name="GGBase"; version="3.40.0"; sha256="0iavmbfvx5in8pq4c7bx63anlj4l1ra5qmr3pgx7x3cp43d6qsza"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
-  GGtools = derive2 { name="GGtools"; version="5.14.0"; sha256="0h1lcz363z7gcy3i3ap0vrdrq71wlzr3y0f9866zmn67hlrfbp7i"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
-  GISPA = derive2 { name="GISPA"; version="1.2.0"; sha256="1kyghhfv0jabc823kxcab267snjnxba7d3swnfssshrxirwbgy3b"; depends=[Biobase changepoint data_table genefilter GSEABase HH lattice latticeExtra plyr scatterplot3d]; };
-  GLAD = derive2 { name="GLAD"; version="2.42.0"; sha256="1ay8wrhgwv6jyc54pv8xywdhm3v48qavdm6rq7l0n7fy4kydxz75"; depends=[]; };
-  GMRP = derive2 { name="GMRP"; version="1.5.0"; sha256="124jzpd0y8c1fdp6ndh75q0nqbcwjkmmm3w6ih2qinanbc2b5bmp"; depends=[diagram GenomicRanges plotrix]; };
-  GOFunction = derive2 { name="GOFunction"; version="1.26.0"; sha256="0ykagd4klrsjbf5iqn87anlplvnvvd3fhklpn1fm4fkx1lvg6jvx"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
-  GOSemSim = derive2 { name="GOSemSim"; version="2.4.1"; sha256="0if17mizlf1v85nzbzkc3nl8052cmf7a3a04zrphc0rv8ndyl1s7"; depends=[AnnotationDbi GO_db Rcpp]; };
-  GOSim = derive2 { name="GOSim"; version="1.16.0"; sha256="1gy95bywv33if5fkhaihx8h64mcvzn7hrid91zib9asfpllbq3j7"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
-  GOTHiC = derive2 { name="GOTHiC"; version="1.14.0"; sha256="0qn9nlr1yfd91p5wriwnvqmwndfzpy0c18zbnqkv7i2s66mcwkja"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
-  GOexpress = derive2 { name="GOexpress"; version="1.12.0"; sha256="0yfqw3v1ywwpkvnsjz20mkg9ay35hfs4ldab6gza197jbg61qq88"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; };
-  GOpro = derive2 { name="GOpro"; version="1.4.2"; sha256="1djrws9n6znzhzs8lbpclcx227d5fv23mmw181pcnmp9kgf0f4w4"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; };
-  GOstats = derive2 { name="GOstats"; version="2.44.0"; sha256="04gqfdlx9fxf97qf0l28x4aaqvl10n6v58qiz5fiaw05sbj1pf1i"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL Rgraphviz]; };
-  GOsummaries = derive2 { name="GOsummaries"; version="2.12.0"; sha256="1aqzr7llwcq2w5vn7q3yny7x6kllr62cm43qs3d2qm4iyvfb2a4s"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
-  GRENITS = derive2 { name="GRENITS"; version="1.30.0"; sha256="0bi7vxq3wh9vy4hibpbpk5vzf0skqxs1jg3macscbvwm7ggqs801"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-  GRmetrics = derive2 { name="GRmetrics"; version="1.4.1"; sha256="11ifwb1avizipg2v5safs0i7yr1rrydyg41y76ccc45ygjdy303g"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; };
-  GRridge = derive2 { name="GRridge"; version="1.2.0"; sha256="1s29c9jsh34qswib39v0xp9ir005d9pa5lv92ka3s8a4y5hxfi7a"; depends=[annotate Biobase BiocGenerics graph GSEABase Iso penalized survival]; };
-  GSALightning = derive2 { name="GSALightning"; version="1.6.0"; sha256="1n9dc5ahfslh9yvz81ppgjlnpmcm1c84rsmpgzy2hrzkrrnqxlsx"; depends=[data_table Matrix]; };
-  GSAR = derive2 { name="GSAR"; version="1.12.0"; sha256="0v6sy4mi3zvgnk0f9diy4zz8vl5n5pdm3yyb6hm6bqy56wx0bl7r"; depends=[igraph]; };
-  GSCA = derive2 { name="GSCA"; version="2.8.0"; sha256="1r9kdvrj1f91cdl8zwkhpskdg7m10qpz1xy0a3r67xfs2ciyagyi"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
-  GSEABase = derive2 { name="GSEABase"; version="1.40.1"; sha256="10cmjxahg2plwacfan6g0k8cwyzya96ypc7m1r79gwqkyykxw5fz"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
-  GSEAlm = derive2 { name="GSEAlm"; version="1.38.0"; sha256="1kz27bbccgi34z1i1wlsk8ikqbv2mi8f8i9is0irhl9zgvbrczxz"; depends=[Biobase]; };
-  GSRI = derive2 { name="GSRI"; version="2.26.0"; sha256="12silcf67r3ni40g7vsc7iv15arzy7w12abpj2xcjfd9nr4d84js"; depends=[Biobase fdrtool genefilter GSEABase les]; };
-  GSReg = derive2 { name="GSReg"; version="1.12.0"; sha256="1rdzkv6kf14shfddvrz3pssjgr6pvg6is4lzcvjzrxai4y34n0y6"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; };
-  GSVA = derive2 { name="GSVA"; version="1.26.0"; sha256="1zvi0w7clm5qg6fv6akqw4cx84kswcgzfzjdkhxsrid0l4hwmw09"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; };
-  GUIDEseq = derive2 { name="GUIDEseq"; version="1.8.1"; sha256="1vx24scbwr4xqhza4q90jpw3xv1pyd7afbqlxijy2fv4p1fzwi4h"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
-  GWASTools = derive2 { name="GWASTools"; version="1.24.1"; sha256="1x8p32f47fki2kl0pkjv4v7az8s1b6zwqjnxywfxy0drs9g6lky4"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
-  GenRank = derive2 { name="GenRank"; version="1.6.0"; sha256="071k23qknpd46x22bj2cmp07mmxj22higw8ma4b0a8w0wmd05bwz"; depends=[matrixStats reshape2 survcomp]; };
-  GenVisR = derive2 { name="GenVisR"; version="1.8.1"; sha256="0c8dm4k2fn4g7vpjvd452vx0a1xb4rp5w1ii1h4q96957s8s52hj"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; };
-  GeneAnswers = derive2 { name="GeneAnswers"; version="2.20.0"; sha256="11bdc59ybi1kck3jkzilf0vmql6a3k97b1f9h940h28mhgn5x9w6"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
-  GeneBreak = derive2 { name="GeneBreak"; version="1.8.0"; sha256="1157crj12c3girr6973a24ph15rfjw0vcakr42fpx7yhhirs89lb"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
-  GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.24.0"; sha256="1l8829axy6fp29bkqlwbjcsajq99yb86yp5cc8211zprlhlxb30i"; depends=[Biobase PGSEA]; };
-  GeneGA = derive2 { name="GeneGA"; version="1.28.0"; sha256="172hwxp91zj4pvamarnkx9cf1jm3zplws7scb4q00n1nxirhfzfd"; depends=[hash seqinr]; };
-  GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.4.0"; sha256="14jnlc1icg7ws6gvffx3jpmhzcfaznzw6p8i0l1wpx22jyy3qam5"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; };
-  GeneMeta = derive2 { name="GeneMeta"; version="1.50.0"; sha256="1cf8z6wy9yhs1y7f8fimjkx52brgr9fkhjaa9a62d2rvan65g9s2"; depends=[Biobase genefilter]; };
-  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.20.0"; sha256="17r2106r9fkpsj592dq6k70n8jj6gv65hrmblnsssck6h0n6n3ix"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; };
-  GeneOverlap = derive2 { name="GeneOverlap"; version="1.14.0"; sha256="02svcyk1pa470033q2iv8148ypf6gbisxl8f09ksblvrrd0flh38"; depends=[gplots RColorBrewer]; };
-  GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.34.0"; sha256="0ycxk1njlrshk6wr466r8jdj3pfl125ilifgrvcbgr526ndalmpp"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; };
-  GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.22.0"; sha256="1v2ry9k8kqr95nx1z347f8hqdbawqb8f5p7iq7jb2w1smvhb26fr"; depends=[Biobase limma MASS survival]; };
-  GeneSelector = derive2 { name="GeneSelector"; version="2.28.0"; sha256="0fc12sngwsw3sggmi08lb8r8lvb3hp77jqv3k1501nba4gq2wa9s"; depends=[Biobase limma multtest samr siggenes]; };
-  GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.46.0"; sha256="174swyvx1j9px2shn1188zgilyiclxclr317gsv5ab7f671lzl8n"; depends=[gmodels gtools mvtnorm]; };
-  GeneticsPed = derive2 { name="GeneticsPed"; version="1.40.0"; sha256="0q2jrpi6ha4hsxsmprwsrls2ybs0clms6vh7smwa9j9g5lz7i93y"; depends=[gdata genetics MASS]; };
-  GenoGAM = derive2 { name="GenoGAM"; version="1.6.0"; sha256="1dvaapinarpgn3i63iqhdbjh9mc5h7sgdxwlv9d55l42d1jyj6h3"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; };
-  GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.38.0"; sha256="15p75cbbgwgcc3awyvawkah491yim0rp73af815pfiai11a51i4m"; depends=[biomaRt]; };
-  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.14.0"; sha256="1jhm0imkac4gvchbjxj408aakk39xdv2fyh818d3lk295bz6bnyp"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; };
-  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.14.2"; sha256="1659nj1xps7vliy5955i51x6hvrf16n1z0dfh10mmpaaswn2d2mv"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-  GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.2.0"; sha256="0ndzpzripibx38nk40xpz4xkghhr4an3skqdhfh8479jk2fnfwjd"; depends=[data_table GenomicRanges httr IRanges jsonlite lazyeval magrittr readr xml2]; };
-  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.30.3"; sha256="010vn8hlwbnw12pd1d8pv6m12yp3xwx557gba5rbjq9p4qypnn3z"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RMySQL RSQLite rtracklayer S4Vectors XVector]; };
-  GenomicFiles = derive2 { name="GenomicFiles"; version="1.14.0"; sha256="0r0wmrs5jycf1kckhnc2sgjmp336srlcjdkpbb1ymm7kazdd0s9n"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
-  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.12.0"; sha256="0f0ki2zsaxg6f4qr47xgyhxm6jvms0s1zab7f0vcnw8jd7vhmnzn"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
-  GenomicRanges = derive2 { name="GenomicRanges"; version="1.30.3"; sha256="07cszc9ri94nzk4dffwnsj247ih6pchnrzrvnb0q4dkk33gwy8n1"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
-  GenomicScores = derive2 { name="GenomicScores"; version="1.2.2"; sha256="0g6i90vn29pasiqbq0088bgdisr356539z94scv7cila968inh7n"; depends=[AnnotationHub Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors XML]; };
-  GenomicTuples = derive2 { name="GenomicTuples"; version="1.12.0"; sha256="0962l9204vm5x7vcqzlvlgblhdczwp4zbq4i262gqh79lnx4yq1y"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
-  Genominator = derive2 { name="Genominator"; version="1.32.0"; sha256="1gh56xyfgx5f8rb0wbpvkg8h2q1ci2qf3ngkg3sficn65pbj9iha"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
-  Glimma = derive2 { name="Glimma"; version="1.6.0"; sha256="19640crf4pivalivakk22llr9z505d5iq09fnlj4cj6fnga7abzq"; depends=[Biobase edgeR jsonlite S4Vectors]; };
-  GlobalAncova = derive2 { name="GlobalAncova"; version="3.46.0"; sha256="16bhrkrz24hwxv0py4xiv043z1gxlak3qvdrdmc8pw7swv52hv9w"; depends=[annotate AnnotationDbi corpcor globaltest]; };
-  GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.0.0"; sha256="1z3p1xyj45hapvy765akxf88ll9fzsjnprc1g8cv9a9fdjg7vw36"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
-  GraphAT = derive2 { name="GraphAT"; version="1.50.0"; sha256="0hrcz1d4k0g1k8izzk9znwxgr3f6ilv93vswqv3z3sfk5ib3aznr"; depends=[graph MCMCpack]; };
-  GraphAlignment = derive2 { name="GraphAlignment"; version="1.42.0"; sha256="1vq6g4w75wlnq201mc93xmbp80dj9rc3ay7zqcpwr4bjnpmgh53v"; depends=[]; };
-  GraphPAC = derive2 { name="GraphPAC"; version="1.20.0"; sha256="0g0r6714d0bamq5gwggqkbh9ac23wqjdlp358br7z4gkgixxz8zd"; depends=[igraph iPAC RMallow TSP]; };
-  GreyListChIP = derive2 { name="GreyListChIP"; version="1.10.0"; sha256="17bn80x35nw0ys4n67m8sq3zij5ikasi4fqchx98pn72czl932r4"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; };
-  Guitar = derive2 { name="Guitar"; version="1.16.0"; sha256="03pivwaw41ycpg4iwppg9dn7ina8g98kixwpxhv9nnvkzf3124xp"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
-  Gviz = derive2 { name="Gviz"; version="1.22.3"; sha256="1grjzrjpzkw572pbvpsvdnfkfgwybl0cnjd7nnk2xdr26wnbsi9a"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
-  HCsnip = derive2 { name="HCsnip"; version="1.17.0"; sha256="109svm1nzvf0a6hi9fvg7pzfpdbh44dlp6v0dphqm246gqh2cq22"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
-  HDF5Array = derive2 { name="HDF5Array"; version="1.6.0"; sha256="0kcdza41saqv6vlpvqd841awbiwkg84lh0plx6c7fmfgbqv7a0jh"; depends=[BiocGenerics DelayedArray IRanges rhdf5 S4Vectors]; };
-  HDTD = derive2 { name="HDTD"; version="1.12.0"; sha256="0dd1z93pv141q51nvjh6dfgvxw6h9wwdllbvy7s4z5vd43w576s8"; depends=[]; };
-  HELP = derive2 { name="HELP"; version="1.36.0"; sha256="0216pwpfi626g49hgz8g2gniixakcdx5yhrw03dy0pn0xp26wnhc"; depends=[Biobase]; };
-  HEM = derive2 { name="HEM"; version="1.50.0"; sha256="10p66m46zqm7dj6ldx8dqrwymaplzrpvbg6yqzyx7llvzar7dil7"; depends=[Biobase]; };
-  HIBAG = derive2 { name="HIBAG"; version="1.14.0"; sha256="0kk4bf6q6kk8vm18vy56p075538awfbv310c4241m5j3i7g4pxxl"; depends=[]; };
-  HMMcopy = derive2 { name="HMMcopy"; version="1.20.0"; sha256="0jhfgshaj5917b24siiik72qaa19w05v5jqa6zj5vi8j02lv7i9g"; depends=[geneplotter IRanges]; };
-  HTSFilter = derive2 { name="HTSFilter"; version="1.18.0"; sha256="1q1782cky7kh042wfr5h588019jwzm9sw4c9f503hq2gfgb6n3xi"; depends=[Biobase BiocParallel DESeq DESeq2 edgeR]; };
-  HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.30.0"; sha256="1h75igpbws4hdd2nrnbf8w0rpyfjmbb57m3ja5fir0l4x7lwn1rw"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
-  HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.8.0"; sha256="0b7j6fbww9336ph4xmw8gvln5b6iy3fmcsx5ggxjln8vdy8ca4yi"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; };
-  HTqPCR = derive2 { name="HTqPCR"; version="1.32.0"; sha256="0bzygl0mk35y6zwixsqxv4k3hdwjj77hia97bdj4bngm1x5qllai"; depends=[affy Biobase gplots limma RColorBrewer]; };
-  Harman = derive2 { name="Harman"; version="1.6.0"; sha256="17s3kxldvfnk5j20n0csbx967xa4npb5x0wy7whhb6zdk9dw7g6q"; depends=[Rcpp]; };
-  Harshlight = derive2 { name="Harshlight"; version="1.50.0"; sha256="0jcl49dgb6h3s0yh0ym7sfmsfyc2f3ykvnizp66i18by7fa5va60"; depends=[affy altcdfenvs Biobase]; };
-  Heatplus = derive2 { name="Heatplus"; version="2.24.0"; sha256="0lil1yfqqga9l6qrgismngvary4495zmi4yk01izpcx29pk8zn6n"; depends=[RColorBrewer]; };
-  HelloRanges = derive2 { name="HelloRanges"; version="1.4.0"; sha256="0pbikr79lh6iij044sy6fw6i2bqigmna4hb806kyihclpm0rs3y2"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
-  HiCcompare = derive2 { name="HiCcompare"; version="1.0.0"; sha256="1r25l4q7rpzjhz02ys78a4p8ga3wrd231znk84pp7xgka3xpprv0"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; };
-  HiTC = derive2 { name="HiTC"; version="1.22.1"; sha256="0da1jw9my2n2gihs31zyn14wwr23d8v2vij39ll7rm6fma3ydfbl"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
-  HilbertCurve = derive2 { name="HilbertCurve"; version="1.9.1"; sha256="1k3l3i8fpfhzsdwrlkyp7k8rpkyg51lx6c776vd8nm4f2nqn7z36"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
-  HilbertVis = derive2 { name="HilbertVis"; version="1.36.0"; sha256="1yilvi5pcr0z5h0n0mf7hfrjc7cl44vn6svczlmw57n8pxf8p35g"; depends=[lattice]; };
-  HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.36.0"; sha256="12bwk0lj2s6jgrpwigc4jd80irzxqjwc8smq1dhsm6pj62v0gvlk"; depends=[HilbertVis]; };
-  HybridMTest = derive2 { name="HybridMTest"; version="1.22.0"; sha256="0lrfqalazszcywv58q1grmxp3dn6yxgi3xmwi53cq5bacizqdq3j"; depends=[Biobase fdrtool MASS survival]; };
-  IHW = derive2 { name="IHW"; version="1.6.0"; sha256="14vbi9p3bi09qc0vjnwksfgv5c95ka468c1w5qjj6v99cyj548id"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
-  IMAS = derive2 { name="IMAS"; version="1.2.0"; sha256="0568llff8d11fykanhy3ja1wbi7hidwixyql8zbi04nfxskpsa6k"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; };
-  IMPCdata = derive2 { name="IMPCdata"; version="1.14.0"; sha256="1aaj9fvp6f8zqwadkms23lghf65rghb729m84rdv4c7q4flb96sy"; depends=[rjson]; };
-  INPower = derive2 { name="INPower"; version="1.14.0"; sha256="17d53fa96pqh7xhvhmydrvy00x3dvba6npapc5hngzzlr7pc07bv"; depends=[mvtnorm]; };
-  INSPEcT = derive2 { name="INSPEcT"; version="1.8.0"; sha256="1v3zyiqc0b5rhbkx7w7r2a7m88jgafp84vsgrs9wi8fhs8mvyvd1"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; };
-  IONiseR = derive2 { name="IONiseR"; version="2.2.0"; sha256="1qrdgm94xpm075nlgv9zklm7pwfbfjj2d45lv0gs11qj4xi8rccx"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; };
-  IPO = derive2 { name="IPO"; version="1.4.1"; sha256="0bskznr2w1pfanxfnffg1gdjvwii3wkpsgmz96pjxa23yw1ykpgp"; depends=[BiocParallel CAMERA rsm xcms]; };
-  IPPD = derive2 { name="IPPD"; version="1.26.0"; sha256="0s2xl5k9sr8kqqn9hbi0kbqmn4xm78fnsqg7g82w69ah3v7myl1f"; depends=[bitops digest MASS Matrix XML]; };
-  IRanges = derive2 { name="IRanges"; version="2.12.0"; sha256="1vqczb9wlxsmpwpqig6j1dmiblcfpq6mgnq8qwzcrvddm4cp47m5"; depends=[BiocGenerics S4Vectors]; };
-  ISoLDE = derive2 { name="ISoLDE"; version="1.6.0"; sha256="02xl3a9pdwdyjm0iyza43b26bvvpxz13z30kbwv4g3h7w5q3szvr"; depends=[]; };
-  ITALICS = derive2 { name="ITALICS"; version="2.38.0"; sha256="047s6q6l2zv3d01hw0qxxshq69cvz8d6cq631n5r6i4bp2pnay32"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; };
-  IVAS = derive2 { name="IVAS"; version="1.98.0"; sha256="1ngijwnx07i7i0pj72dz6c6kims0n5cjcs75yaw5dfwl00xn9p2a"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; };
-  IWTomics = derive2 { name="IWTomics"; version="1.2.0"; sha256="1ndpyikxf4z4p7xmmpbd4h7mv9pcdjds0ziwvzi55r486065i2z1"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; };
-  Icens = derive2 { name="Icens"; version="1.50.0"; sha256="19aidmg2f7ij1zak8cxy4y8y1dbhgb17y87zkw8829zh2diz04hm"; depends=[survival]; };
-  IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.22.0"; sha256="0dxrylxdyi22x7bsdv70rkwi3j6q0gyddhx48d9f84dsi51zimz4"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
-  IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.26.0"; sha256="19y4xjj5fakyf7mdc33r9lygayq4clgm03410iw3si5vy2ib720l"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
-  IdeoViz = derive2 { name="IdeoViz"; version="1.12.0"; sha256="1ihfxp4dngwk72nxw36w15d28cpz4y0qxagap4km76i51c9jm855"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
-  Imetagene = derive2 { name="Imetagene"; version="1.8.0"; sha256="1xgdwp5xvl57xll1i691c0fqnj5rp53l86my3wvbxwd9jdj6rz6v"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; };
-  ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.6.2"; sha256="14ad6ar2pprisahv433w20whpnrssr0hfsm59d6m3bkwaff4hb8h"; depends=[Biobase data_table ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore reshape2 rjson Rlabkey rmarkdown scales]; };
-  ImpulseDE = derive2 { name="ImpulseDE"; version="1.4.0"; sha256="04l1rkpmk682af5yw9whj8ngq788kmzf7p76paayb6ihamhkcfq1"; depends=[amap boot]; };
-  ImpulseDE2 = derive2 { name="ImpulseDE2"; version="1.2.0"; sha256="11gr6ycg46ywkrwrnarn5a582nq8x47mhlg140d7fw2wiy20b8ln"; depends=[Biobase BiocParallel circlize ComplexHeatmap cowplot DESeq2 ggplot2 knitr Matrix S4Vectors SummarizedExperiment]; };
-  InPAS = derive2 { name="InPAS"; version="1.10.0"; sha256="1svpjpkqv8va2mrf3b366rqbiwy73jf5rxc32md4arjprs1kb13v"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
-  IntEREst = derive2 { name="IntEREst"; version="1.2.2"; sha256="1ck2kmb25wf6rw97mag8l99g05mwaxs2lhpv1722inqq24q0smmq"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; };
-  InterMineR = derive2 { name="InterMineR"; version="1.0.0"; sha256="0gb493spb89c4qz1s9ng9g8w136zcqdnq0rlpqqw3bxdpqck83fb"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; };
-  InteractionSet = derive2 { name="InteractionSet"; version="1.6.0"; sha256="1wmp4dqxj19dbd97r6zfzv81j06vh9j7bpypcxib8f2lyx26cwm9"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; };
-  IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.0.0"; sha256="096503aaiznkcpxksxjq95lfb6pcbdvimns8ahc56vr6m5nqnpfx"; depends=[FGNet igraph knitr]; };
-  IrisSpatialFeatures = derive2 { name="IrisSpatialFeatures"; version="1.2.0"; sha256="0glx0p5qjfs2fk48qcdi7w14iyj0chk1plv5r69c8iyyc4frd7xk"; depends=[data_table dplyr ggplot2 gplots magrittr RColorBrewer Rcpp SpatialTools spatstat tibble tiff]; };
-  IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.14.0"; sha256="085clvn2wgqicvmd2c0h9ah59l6bwy0l6y8lq69ajy7il1grm4qq"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
-  IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.0.0"; sha256="0bb3y3r26kwgx84lhr52fyrk9i2jjwhnarr3wdxpyj4j00w2dq1f"; depends=[Biostrings BSgenome cummeRbund DBI DRIMSeq edgeR GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges plyr RColorBrewer reshape2 rtracklayer spliceR tximport VennDiagram]; };
-  JASPAR2018 = derive2 { name="JASPAR2018"; version="1.0.0"; sha256="0kx6bfcmp9a0rka0pgpl7lsaw79imcd6zrpgzqg5l1031vlyplc4"; depends=[]; };
-  JunctionSeq = derive2 { name="JunctionSeq"; version="1.8.0"; sha256="01db6xpmci0kldwi2x8xfmsbi4iywghcz8spd5601dd03cnmxxrk"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix Rcpp RcppArmadillo S4Vectors statmod stringr SummarizedExperiment]; };
-  KCsmart = derive2 { name="KCsmart"; version="2.36.0"; sha256="0a1flc9bm4w0rfy3jf8fim7c0ddy9zjln0kgyyi3ps7n4rk4n75q"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
-  KEGGREST = derive2 { name="KEGGREST"; version="1.18.1"; sha256="02gwmm79djj55a90dzc80hlgwc6bafl7xd7fnx2q59pk945k3z9c"; depends=[Biostrings httr png]; };
-  KEGGgraph = derive2 { name="KEGGgraph"; version="1.38.0"; sha256="028icymxshg4v80b5xhvpdqm87qxi9s6yycp2z5w55mhw8l22azw"; depends=[graph XML]; };
-  KEGGlincs = derive2 { name="KEGGlincs"; version="1.4.0"; sha256="17l8hd072052hd8wfnxj06455qdgdx2bk456rl8ga6bjqbn0r4nq"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; };
-  KEGGprofile = derive2 { name="KEGGprofile"; version="1.20.0"; sha256="0kd5wpnqpp9r1fy12islaj09qfnvkdf705rmapbzly47abqsziad"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png RCurl TeachingDemos XML]; };
-  LBE = derive2 { name="LBE"; version="1.46.0"; sha256="0706nydzjl61ycnvck4xmpfk5x3pa2kllfivyxcjajhwlb4zr6r0"; depends=[]; };
-  LEA = derive2 { name="LEA"; version="2.0.0"; sha256="1h1x2z2mamlvb4cf7541b1f7jh25i4lfhjm0nl5sfr1la1dmgsdn"; depends=[]; };
-  LINC = derive2 { name="LINC"; version="1.6.0"; sha256="0jlbrcpmsk360mrqdfknkbc6zl87f7fxssd9hf2dp8fqkl3g1sfd"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; };
-  LMGene = derive2 { name="LMGene"; version="2.34.0"; sha256="1nvv7dmpxgkwg9js3dzy09863bmm5xm068dmr1sl9jbjmx4lwwn0"; depends=[affy Biobase multtest survival]; };
-  LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.4.0"; sha256="1svy7mav82rq60bw3akriinb9kfbj02ysl1kcnhvdqicdb3ms5x4"; depends=[CAMERA xcms]; };
-  LOLA = derive2 { name="LOLA"; version="1.8.0"; sha256="0wkgibvrh8ddqqbms7id8yqi4ic0nf1ppdjxzg86xafglzz8m26d"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; };
-  LPE = derive2 { name="LPE"; version="1.52.0"; sha256="10fm0p1khfypgghn4zp9w6bxc78mwvs39vcvhvpyrppr5xfqbn4c"; depends=[]; };
-  LPEadj = derive2 { name="LPEadj"; version="1.38.0"; sha256="10h0mja8zz5cys8aa07vsp58h178bs66izwh0i6jc5b44hcdxrd2"; depends=[LPE]; };
-  LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.28.0"; sha256="093ndks9sx81q0hw6y5nz3dfb9w1adi0g3h6jqk5bl7h41lnrldw"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
-  LedPred = derive2 { name="LedPred"; version="1.12.0"; sha256="1lhl6gkya72d4h0v32y3jpaz69g0l7n3v8ahgsz6dil84m4ksc8w"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; };
-  Linnorm = derive2 { name="Linnorm"; version="2.2.0"; sha256="0a1zly4shxmq51zjdrmr7hsvmyaqs1xnhrisq93z4djrxq0paj0v"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 gmodels igraph limma MASS mclust Rcpp RcppArmadillo Rtsne statmod vegan zoo]; };
-  LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.32.0"; sha256="0l175s1376wlkb0lva2xafq8p5n3011ldqm3dqcnhkb8mxfqkn4f"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; };
-  Logolas = derive2 { name="Logolas"; version="1.2.0"; sha256="12syxp90dam9094xfgjvb820p14hgxx2xj08di9an12kb6h5s13b"; depends=[]; };
-  LowMACA = derive2 { name="LowMACA"; version="1.10.0"; sha256="1qn60nrjr9aiw44wyp0q0qhsjm8hl3rzlc8wi6g9k3jaq2jq4v41"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; };
-  LymphoSeq = derive2 { name="LymphoSeq"; version="1.6.0"; sha256="1zh7wzw49nz3sf58m8rqi0dkgi9h9zff8jpdc4065pgjwg05r39s"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; };
-  M3C = derive2 { name="M3C"; version="1.0.0"; sha256="0d25abzyq74g7faqyig4rpg963wbb39p9n420hdwrr7scbyij0v3"; depends=[cluster doParallel doSNOW foreach ggplot2 Matrix matrixcalc NMF RColorBrewer]; };
-  M3D = derive2 { name="M3D"; version="1.12.0"; sha256="1w3bxwl19xrs3aigbzqa9n3v5yz6f7216ngyyilwhplnivq1k7zl"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; };
-  M3Drop = derive2 { name="M3Drop"; version="1.4.0"; sha256="12s0nzih42gsr57532z0nmn6gccq40hfazsfqbl97w681ngfnk94"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; };
-  MADSEQ = derive2 { name="MADSEQ"; version="1.4.1"; sha256="0yc0ad7idb404ccw89w2lrqcfr9fdjlg876l8wsar6xgq7pa0lhd"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM zlibbioc]; };
-  MAIT = derive2 { name="MAIT"; version="1.12.0"; sha256="1l90yy6m2x83bka9222wcyim005pvpimja7ipj9f1bizymd5ivls"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
-  MANOR = derive2 { name="MANOR"; version="1.50.0"; sha256="039msah06ga9vxk2i4qm7kv5lsxrmfr0ws9mdmh0bw6kv7l61wsr"; depends=[GLAD]; };
-  MAST = derive2 { name="MAST"; version="1.4.1"; sha256="0waqz85gzyv09cjf4shz9dydazh0knczylh8854icn1i87x5sjsj"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr reshape2 S4Vectors stringr SummarizedExperiment]; };
-  MBASED = derive2 { name="MBASED"; version="1.12.0"; sha256="1ys9m3g2c93wck6cj5n0vcdzca7f4qcxgc14zhabbs4pv70qc8mf"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
-  MBAmethyl = derive2 { name="MBAmethyl"; version="1.12.0"; sha256="1h2hb4lbs1p101zd6k5xpp5ashib9iqrgkp2afdj0v4s8v9f2h09"; depends=[]; };
-  MBCB = derive2 { name="MBCB"; version="1.32.0"; sha256="0amqmzi54dvkgzylavy0dbv973s2p02jppd5vzqzkrqs8amb3r4c"; depends=[preprocessCore tcltk2]; };
-  MBttest = derive2 { name="MBttest"; version="1.5.0"; sha256="0gswdh61mmqn7h4d6vwvis08lxx383ynj6pk2va3z8bn25qki5lz"; depends=[gplots gtools]; };
-  MCRestimate = derive2 { name="MCRestimate"; version="2.34.0"; sha256="1n4abpm6ld4ap87pgrv3mfr1aycdjb4hjg3fm699rckyl9qynjr3"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
-  MCbiclust = derive2 { name="MCbiclust"; version="1.2.2"; sha256="0xll7qdg8cf854yzwxmzvd8xh0pjzkq9x9fskcsv7brm25ar6ghv"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; };
-  MEAL = derive2 { name="MEAL"; version="1.8.0"; sha256="0mccjr21jvmwlszhb9qixm7dr83gkhm2hjh9yrn11d22cm9r6g1q"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SNPassoc snpStats SummarizedExperiment vegan]; };
-  MEDIPS = derive2 { name="MEDIPS"; version="1.30.0"; sha256="06mm424g3rc8j64wfyv6w40m106wifzhi91nsbpi317fg98qfd3d"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
-  MEDME = derive2 { name="MEDME"; version="1.38.0"; sha256="137p9z1g3z4r7q3nsrpsp2gbm657nrbrrq96ph1mykvv41ylq59p"; depends=[Biostrings drc MASS]; };
-  MEIGOR = derive2 { name="MEIGOR"; version="1.12.0"; sha256="05ww7an7vk67rjcf31g9aq033w6yhx9dagrhj3ki5ks7hcwig1yv"; depends=[CNORode deSolve Rsolnp snowfall]; };
-  MGFM = derive2 { name="MGFM"; version="1.12.0"; sha256="0yjr14anr5rny6g1508nrw905d4b01jh34vpwi8737p1q4d9bzis"; depends=[annotate AnnotationDbi]; };
-  MGFR = derive2 { name="MGFR"; version="1.4.0"; sha256="04nxg65m1s8qyq8sbs8733d541r0vcmabz27w03vs87f0dbxhg11"; depends=[annotate biomaRt]; };
-  MIGSA = derive2 { name="MIGSA"; version="1.2.0"; sha256="0ih5i1acb7igbcqk7wykxhncvl5vbgx34gl5nqc65adpqb0199fl"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase limma matrixStats mGSZ org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; };
-  MIMOSA = derive2 { name="MIMOSA"; version="1.16.1"; sha256="1fsjpqpv32ps8pyj1mjkhrpikchhmm3l06yyjqy3bgrfa1ch36vx"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-  MIRA = derive2 { name="MIRA"; version="1.0.1"; sha256="0dapp1q6vrdixz8n2g6ivav4d4si3wg1na7cg5jirb22mwi2rrpk"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; };
-  MLInterfaces = derive2 { name="MLInterfaces"; version="1.58.1"; sha256="0hran4cavh1zlzwjwpmmd13qsx95z7kf8pqmh7w1pb36isj2z3hy"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
-  MLP = derive2 { name="MLP"; version="1.26.0"; sha256="0mhaw39rbzrnrminvsiq6vrdrmf3zm2zqg3ilnsq1zw8bm2bsbh7"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
-  MLSeq = derive2 { name="MLSeq"; version="1.18.0"; sha256="1r6b33ic2lnj3v2qzs7r904rfyibz96yr35mgpiz4zzsax4ar6v4"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
-  MMDiff2 = derive2 { name="MMDiff2"; version="1.6.0"; sha256="13f96dw630hadqa0z83ispdni728g7zl12xj8zxrf5hvw1c1hs2h"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
-  MODA = derive2 { name="MODA"; version="1.4.0"; sha256="1baxma9g4ir24fxwxgm3hphvv8j521wgmvy86fcl2rai6ayy8liy"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; };
-  MPFE = derive2 { name="MPFE"; version="1.14.0"; sha256="0jh1s0skaw16d94149hisjnfn2hk6z7hdd4ishzwziqbwag60z0w"; depends=[]; };
-  MSGFgui = derive2 { name="MSGFgui"; version="1.12.0"; sha256="1yr1m12svmcx7y1524j8dw91rf0gn28gs9hy7gan88lnjv4hlnh9"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
-  MSGFplus = derive2 { name="MSGFplus"; version="1.12.0"; sha256="1xpzcmvlk394sqwl2lx8ihhgsnrfifpkrbh79b7lwwjzijr37npv"; depends=[mzID ProtGenerics]; };
-  MSnID = derive2 { name="MSnID"; version="1.12.1"; sha256="1zw508kk4f8brg69674wp18gqkpx2kpya5f6x9cl3qng7v4h5pxx"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; };
-  MSnbase = derive2 { name="MSnbase"; version="2.4.2"; sha256="1ig64bf881p118dwqfr0ry41m7yhnyv165smv8fdwfv7sb6sagif"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors vsn XML]; };
-  MSstats = derive2 { name="MSstats"; version="3.10.6"; sha256="03a9069zv0m8m28a9rh53m12rhgrc299frhqiwl1jj6b82myv5hp"; depends=[broom data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm MSnbase preprocessCore purrr Rcpp reshape2 snow stringr survival tidyr]; };
-  MSstatsQC = derive2 { name="MSstatsQC"; version="1.0.0"; sha256="1987j8l5q6cyyg8wpyv1mgv5s3qwdxvdb2c2qhl5svaksxlni2hi"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; };
-  MVCClass = derive2 { name="MVCClass"; version="1.52.0"; sha256="03ym7qlybs99ir629h9mmm2kqpmx1lzliql7qgbfiydpynvplahy"; depends=[]; };
-  MWASTools = derive2 { name="MWASTools"; version="1.2.0"; sha256="0pgb6qnqqzz6y22cbxivx04v0rak76i2kc3aasdrz324xjv5hq09"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; };
-  MantelCorr = derive2 { name="MantelCorr"; version="1.48.0"; sha256="0jnj6cyvpk41pi9f021wgqjnrns3xcixa7gbnqaa83gv8zrm2d8n"; depends=[]; };
-  MassArray = derive2 { name="MassArray"; version="1.30.0"; sha256="113d6hkzx4gn2n58ljm6awfzyjzvsa7q4rhybnfqv9rfh93q1iin"; depends=[]; };
-  MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.44.0"; sha256="1q0m4s4f7pajkc99aijaskcd4qg50w98bllsr89154vnrcaszhz0"; depends=[waveslim]; };
-  MatrixRider = derive2 { name="MatrixRider"; version="1.10.0"; sha256="07msw0h3mgn9l8kdc1zzijxy62dfawrxx8rd2xw6djammb9gl1p5"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
-  MaxContrastProjection = derive2 { name="MaxContrastProjection"; version="1.2.0"; sha256="0a5jsm0rrxw0il17bysjy7inzf7ay9lrzi1kyxifl4k64j8ssj3r"; depends=[EBImage]; };
-  MeSHDbi = derive2 { name="MeSHDbi"; version="1.14.0"; sha256="10ir9ma04cwn2kbd10anv4yqljh5p60lq53da8191psv82ni9cfx"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
-  MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.50.0"; sha256="0gky9yhd7k0w83ysnjjy21m8wwjg5k5y85ba19bc1k8412x5alj8"; depends=[]; };
-  MergeMaid = derive2 { name="MergeMaid"; version="2.50.0"; sha256="0bsjrm6wm732saw07l2y4mmbsdgxk5b4x74zsjjv4k92dbfbwraa"; depends=[Biobase MASS survival]; };
-  Mergeomics = derive2 { name="Mergeomics"; version="1.6.0"; sha256="1m2d2clg3mj8m365zcivqdn81ira83m69cxr1s4syrl1a2cymkz6"; depends=[]; };
-  MetCirc = derive2 { name="MetCirc"; version="1.6.0"; sha256="106anz431236gn0himc273h9w721wk6l9gmkilydviflb0x990j3"; depends=[amap circlize scales shiny]; };
-  MetaCyto = derive2 { name="MetaCyto"; version="1.4.0"; sha256="036j7mnfgvra1ryzqiw7mpsavc0akmalryswq6n9z02gmns5sij1"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; };
-  Metab = derive2 { name="Metab"; version="1.12.0"; sha256="0gnpdhvzhqs3ajdj439x2wr3b3yzx5qgb6brlw9hxz63l4fpipn7"; depends=[pander svDialogs xcms]; };
-  MetaboSignal = derive2 { name="MetaboSignal"; version="1.8.0"; sha256="0qydccfbyys8gfalzcadx0hiljq2ias5qphwsdxglh1xlqkh2919"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; };
-  MethPed = derive2 { name="MethPed"; version="1.6.0"; sha256="0m442v7akv5r274hx56r6vkcsg4ha897ira4mbkiqfsrxscmajh2"; depends=[Biobase randomForest]; };
-  MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.10.0"; sha256="14xd5h6pgla2kh1l1rn7x2ddal98ypazqr120kyifqf05y5sf1ph"; depends=[Biostrings gplots seqinr stringr]; };
-  MethylAid = derive2 { name="MethylAid"; version="1.12.0"; sha256="1km22cscxkgyx6blbsrnh5q8pj7fmw5caqnj72bzi76zw8mr0fli"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny SummarizedExperiment]; };
-  MethylMix = derive2 { name="MethylMix"; version="2.8.0"; sha256="0dbsmkiidc83hncqkw4g1kz7dwdr631s4a3a982v7krfsgvcqwyi"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; };
-  MethylSeekR = derive2 { name="MethylSeekR"; version="1.18.0"; sha256="0d1ya2jbgqk9s4clpsaipm4l9585ycxg5bmhg4dmmcph0w6dcsjl"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
-  Mfuzz = derive2 { name="Mfuzz"; version="2.38.0"; sha256="18c83g8ydbb24v1n0rcp3lv533ikhs6wwchvmdbsy2whlsy3sv1i"; depends=[Biobase e1071 tkWidgets]; };
-  MiChip = derive2 { name="MiChip"; version="1.32.0"; sha256="1jbwri284jzjaxml4ddz4kcmhhz48naqiydj4ixc85hk3gpjglaa"; depends=[Biobase]; };
-  MiPP = derive2 { name="MiPP"; version="1.50.0"; sha256="1kdi0m4856dsal6qx458x35ybnaj960ys83dgg5w4c8420k9mv9m"; depends=[Biobase e1071 MASS]; };
-  MiRaGE = derive2 { name="MiRaGE"; version="1.20.0"; sha256="1jbs427vpld18l83s5dngijc8rgllqvrili8gv4in20nr6dyk9hi"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; };
-  MineICA = derive2 { name="MineICA"; version="1.18.0"; sha256="1zdq5i14ksm8rirbry6j1dh56r1bhy5yvfzrxfjkm94lynqcdpdy"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
-  MinimumDistance = derive2 { name="MinimumDistance"; version="1.22.0"; sha256="1j2g0ji1ac9608b965rr9vvbhlcbvirqypngh11havh3vn54m9rf"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
-  Mirsynergy = derive2 { name="Mirsynergy"; version="1.14.1"; sha256="09hg5mak0ba0vifix5s0nq7md4hjldmar23jyxz5da1lp22cza9i"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
-  MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.28.0"; sha256="058nvymnnzd61a7x2vpzic1s2nm3q520cnfdhd6i09isg6kqr6c8"; depends=[Biobase lattice limma statmod vsn xtable]; };
-  MoPS = derive2 { name="MoPS"; version="1.12.0"; sha256="0g4awrm90kjnk66b291y2n5vwwwzpdb3kaq96sxfc5a1af8q5q81"; depends=[Biobase]; };
-  MoonlightR = derive2 { name="MoonlightR"; version="1.4.0"; sha256="0kisic6bzp2gy1yjg717izbkirlvrwb1wndckd2yvncrjzpidcq6"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; };
-  MotIV = derive2 { name="MotIV"; version="1.34.0"; sha256="0lvkzbw328mxyp2pd95ymi1nbk78jx880h00jxwdf17a5rkikgh6"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; };
-  MotifDb = derive2 { name="MotifDb"; version="1.20.0"; sha256="16gk7sbrk188kv3mdsnvcnfzvd2dyxm7wmmwvcqz560x0xn0l0k9"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors splitstackshape]; };
-  Mulcom = derive2 { name="Mulcom"; version="1.28.0"; sha256="1dh4sn64n1db2hlbx58mb49kmfassr1r92d9lphzzqhsicq78p8c"; depends=[Biobase fields]; };
-  MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.4.9"; sha256="0kbr2nfxkny9y6hgijr2xpzczs0ijv0g7nh37yrzgkh10rwjsflq"; depends=[Biobase BiocGenerics GenomicRanges IRanges reshape2 S4Vectors shiny shinydashboard SummarizedExperiment tidyr]; };
-  MultiDataSet = derive2 { name="MultiDataSet"; version="1.6.0"; sha256="0h187dkqn63m6askai30x31va24hiv4ig0kxvp9xraz7n9zfr24g"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; };
-  MultiMed = derive2 { name="MultiMed"; version="1.12.0"; sha256="1b48iv34bnsbyg7j70kwi8iyikc1hxlcfmaxsc97249dfq71rfab"; depends=[]; };
-  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.4.3"; sha256="0ml4gsp5dfv23xqrknxh25q8q65hly1xb1215lcwyc8hj9z8f941"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; };
-  NADfinder = derive2 { name="NADfinder"; version="1.2.0"; sha256="0npzbgbpwir4jv8h4giar9w8vjy3rivk55bimqd9bq7m83iwqapq"; depends=[baseline BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; };
-  NCIgraph = derive2 { name="NCIgraph"; version="1.26.0"; sha256="094dnqj1gss4dh8hsc8y9k98b0g33n7yy714kjavcd16glp4w7i0"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; };
-  NGScopy = derive2 { name="NGScopy"; version="1.12.0"; sha256="1aibq3rbs52vyhcx388p7szax7v8ac023pxayqmn2xq3kzj172ah"; depends=[changepoint rbamtools Xmisc]; };
-  NOISeq = derive2 { name="NOISeq"; version="2.22.1"; sha256="0v04597hwvr4y96789samj6jpgipsdv15hsmkgs3pdli48cjwff3"; depends=[Biobase Matrix]; };
-  NTW = derive2 { name="NTW"; version="1.28.0"; sha256="0gkj636fmr519hylb3kc70qxmx9cw3xim0vpx60qsr0kl6h5m7hq"; depends=[mvtnorm]; };
-  NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.9.2"; sha256="1ss7q5zbqnkrv8fds2x3amjva5v8y8x4b5h1flh5paivdpv29frk"; depends=[Biobase matrixStats Rcpp]; };
-  NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.10.0"; sha256="0r5yf2vgn0182074fa46ziclx9dbm60j4n7yck66ck81xp0jpwps"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; };
-  NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.22.0"; sha256="1ai2fdckd2d383bnwwpp60yz3f67gm8xnxqm74ah8gpn3ll9dxm8"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
-  NetPathMiner = derive2 { name="NetPathMiner"; version="1.14.0"; sha256="1dcpayafvarf8brd3rh9ik6ki5z2fqqzwxpxdjm5bwfb7l3ida3w"; depends=[igraph]; };
-  NetSAM = derive2 { name="NetSAM"; version="1.18.0"; sha256="05m6i3gcyvc9hzmfpj9wzim9b8p5lgv984y6805nrszr7dmhlyjv"; depends=[graph igraph seriation]; };
-  NormqPCR = derive2 { name="NormqPCR"; version="1.24.0"; sha256="0js03x4gqrqs0pv9m5ih34zrxgc8vcv3dil17wzgfimrm044z0yl"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
-  NuPoP = derive2 { name="NuPoP"; version="1.28.0"; sha256="1z5pgdi8l40yvbixsgajd2afyi2mkqvxgx0v4k3xxqw1w97kmrgv"; depends=[]; };
-  OCplus = derive2 { name="OCplus"; version="1.52.0"; sha256="1fxfc66b8qmcq0yq1n1z7fj5d8hw0z59b3sdypdhhyw5ddcri0lf"; depends=[akima multtest]; };
-  OGSA = derive2 { name="OGSA"; version="1.8.0"; sha256="1i6xh0y9ymxrdjywm8sayb7jgiyqgmz66wd94ja4f2na4xsw9gps"; depends=[Biobase gplots limma]; };
-  OLIN = derive2 { name="OLIN"; version="1.56.0"; sha256="18b4hadkz1zp79ing1nd9z9456a9l6wk8is6gmzj6dbbs4g1pypc"; depends=[limma locfit marray]; };
-  OLINgui = derive2 { name="OLINgui"; version="1.52.0"; sha256="115irlwwfzf7ywgbry2jwxl1h8hp6mlr9b36q509ah5c7kn58r1r"; depends=[marray OLIN tkWidgets widgetTools]; };
-  OPWeight = derive2 { name="OPWeight"; version="1.0.0"; sha256="18crhxdlxixv1qp8vc5f711g1sxwhixpd5h0vb6jr9rkyq2v942b"; depends=[MASS qvalue tibble]; };
-  OSAT = derive2 { name="OSAT"; version="1.26.0"; sha256="0nc79hh2vbqh864c9zac1pbghgx1fbq7maz4dxwl02hhpxj0187d"; depends=[]; };
-  OTUbase = derive2 { name="OTUbase"; version="1.28.0"; sha256="019c8d2dfhf2q9zq0xgj0pakymyk48ssbqnags4hhfp684af61r6"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
-  OmicCircos = derive2 { name="OmicCircos"; version="1.16.0"; sha256="13dw36n0lg5cafsrgkgr65al6y7jij2clyf1wzidn05p508i02m3"; depends=[GenomicRanges]; };
-  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.10.0"; sha256="0s7zyj3xkr74w0jw604hv3v775kqjpdgks4gkkrkfa3a1xj7xa5b"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
-  Onassis = derive2 { name="Onassis"; version="1.0.1"; sha256="11sq6f3qcq37i4blml024kb24ifcq1xplklv2i9c55wg299ni620"; depends=[AnnotationDbi data_table GEOmetadb OnassisJavaLibs rJava RSQLite SRAdb]; };
-  OncoScore = derive2 { name="OncoScore"; version="1.6.2"; sha256="0lv3rx92fslikv79cpib839wbhj7v3ad869n50frqylyp6kn5nyg"; depends=[biomaRt]; };
-  OncoSimulR = derive2 { name="OncoSimulR"; version="2.8.0"; sha256="1b0myymp38j6fbd4y8ppwmsj8v9w96g8wayc20bcygm16i1zjm5k"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; };
-  OperaMate = derive2 { name="OperaMate"; version="1.9.0"; sha256="11ah55sl04gm8hq3gkcz3b4shq4dxdpwlwl0wn4j82ciai0k6wsm"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; };
-  OrderedList = derive2 { name="OrderedList"; version="1.50.0"; sha256="1sk9ni3vyixb3vwn86vz174lfd7n7rnc8jmm1fx94pjsp9r6sbgr"; depends=[Biobase twilight]; };
-  Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.6.2"; sha256="12gvdrn843334f665dqqjmlny4f6nyaql4h1181q8gfpnrc6kqwp"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges RSQLite S4Vectors]; };
-  OrganismDbi = derive2 { name="OrganismDbi"; version="1.20.0"; sha256="0yxvhwn0m53wfwp0zi81x96argdf7cf1lpymc2as51apvfcnjdl8"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; };
-  Oscope = derive2 { name="Oscope"; version="1.8.0"; sha256="02j7a9yifnsl3acrwgn83f12rf9xf6lgrhl28cp9p0zhr5ljf306"; depends=[BiocParallel cluster EBSeq testthat]; };
-  OutlierD = derive2 { name="OutlierD"; version="1.42.0"; sha256="1n34110czydhff8lkhfkd0hb1xcjka5a0wnvzb3wiyaiaihca26y"; depends=[Biobase quantreg]; };
-  PAA = derive2 { name="PAA"; version="1.12.0"; sha256="186gfkz9pm0bdd3zr5cnb8qzj4fqkdcrch1bmny8iwsidi3kcxph"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
-  PADOG = derive2 { name="PADOG"; version="1.20.0"; sha256="1lp8j2phh7f0vs6w7dc6w1lbfalqhb4ymfg5n4qci8lpzs52rm75"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; };
-  PANR = derive2 { name="PANR"; version="1.24.0"; sha256="0qvivfnydj4abva5r0yy3p1q4db70z8yjrzzm3ryvjal8hvrdh39"; depends=[igraph MASS pvclust RedeR]; };
-  PAPi = derive2 { name="PAPi"; version="1.18.0"; sha256="1flyf97qpffl9aa1sf7q4c62npk6j3jdvh3va5m0816iwq21nm9r"; depends=[KEGGREST svDialogs]; };
-  PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.42.0"; sha256="144s1lzb83rb7g809v582jc0xhsw0gsy2n5wdmsd2bi3j4i8kb2q"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
-  PCAN = derive2 { name="PCAN"; version="1.6.0"; sha256="0inm1kfi9xvd3jhqivxh4vzc6vsijh1z7fwzsqb35rlbi2cl7snd"; depends=[BiocParallel]; };
-  PCpheno = derive2 { name="PCpheno"; version="1.40.0"; sha256="1sgw116qif7w52va7qg8n51a40nvmhybvgr5nxlvgvrwylkhqfai"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
-  PECA = derive2 { name="PECA"; version="1.14.0"; sha256="1c3nbsvng951fsg9vk3yki215f3abgsxqhd025gyvs120nw4c9kv"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
-  PGA = derive2 { name="PGA"; version="1.8.1"; sha256="14lm4ab7lib80wmkim4j72n4msmbx7nhlbv349cxrpc9k0dxmycm"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; };
-  PGSEA = derive2 { name="PGSEA"; version="1.52.0"; sha256="1g0kfhrvq8hv4lpwq3p3p6fkm2bmfjmkfw9312jrwnbjj0hfwd34"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
-  PICS = derive2 { name="PICS"; version="2.22.0"; sha256="0jb4hzswiyrqpnazfpd6wd11gdlmv18za7fyr4slxv0rc9rkf8qm"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
-  PING = derive2 { name="PING"; version="2.22.0"; sha256="1lvbl3g2m643nypc0nfmhjpfv4zl7qk457kg9i7y7l1lzqwqsk0s"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
-  PLPE = derive2 { name="PLPE"; version="1.38.0"; sha256="1w8njdkvhs7y5j78d3y591202811sb8dsldf23yiyfihbjv61vzv"; depends=[Biobase LPE MASS]; };
-  POST = derive2 { name="POST"; version="1.2.0"; sha256="1j96hqyhznq419xvvs9kkhppr6nfp0p95r5xz979pbvf8qhzypqx"; depends=[Biobase CompQuadForm GSEABase Matrix survival]; };
-  PPInfer = derive2 { name="PPInfer"; version="1.5.1"; sha256="16c9ysal2v9vr54jkg0xcmrmf58l4p6qv61fmp3qxm89r833hry9"; depends=[biomaRt fgsea ggplot2 igraph kernlab STRINGdb yeastExpData]; };
-  PREDA = derive2 { name="PREDA"; version="1.24.0"; sha256="09wwd4q4d2nzjwvnv0anaz3hhcykdaccnqc1azn56lqdajlgqzfz"; depends=[annotate Biobase lokern multtest]; };
-  PROMISE = derive2 { name="PROMISE"; version="1.30.0"; sha256="0vc847sd638xm6f7n2b77sik9kqq9kxnmmms3qy06sbkynb0rk7h"; depends=[Biobase GSEABase]; };
-  PROPER = derive2 { name="PROPER"; version="1.10.0"; sha256="0k7lpwqyflaifgs6aac55cichlf2za76gjfdijgp3f1vzvs2qn57"; depends=[edgeR]; };
-  PROPS = derive2 { name="PROPS"; version="1.0.0"; sha256="1zscpjnjazw1m0bsq5x685h0pag68ddw6x0f5h99z6h06206xzki"; depends=[Biobase bnlearn reshape2 sva]; };
-  PROcess = derive2 { name="PROcess"; version="1.54.0"; sha256="1x7hdbdhrbpp3qp6b604fiw13rid6dh57j9wgl0v3ligf84siv1q"; depends=[Icens]; };
-  PSEA = derive2 { name="PSEA"; version="1.12.0"; sha256="16l7g49vd4j06gr9lzny663md872nhdpzpsnx3niaqmd28izm9p7"; depends=[Biobase MASS]; };
-  PSICQUIC = derive2 { name="PSICQUIC"; version="1.16.4"; sha256="073lg2g1bixyiigdkixndcn29dhaznwh6v7v6ibq10h7qc5gl7k5"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
-  PWMEnrich = derive2 { name="PWMEnrich"; version="4.14.0"; sha256="1aw0v9s5xy3gjsyhy04zm8xgsrv4a1n4j02zspyz6rf1acakishg"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
-  PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.6.1"; sha256="1xh8p2q5znlwqcwas75kiy2fpz4va1y074z1c69p3h8h1xkivkzc"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; };
-  Path2PPI = derive2 { name="Path2PPI"; version="1.8.0"; sha256="0mzrnq3caq2nz6lckb7gbc87kq4l4nlywy2iwwjvdn6yzsxl2hb3"; depends=[igraph]; };
-  PathNet = derive2 { name="PathNet"; version="1.18.0"; sha256="1rvm44y7fcf3mqy9c3hb5vx53b3xad20znbhkm4fqwgdb74dxyfv"; depends=[]; };
-  PathoStat = derive2 { name="PathoStat"; version="1.4.1"; sha256="1al0h4mw5lsmn4n3d76d8p9px62l4y5c5z78md2zchnam3x9ii78"; depends=[alluvial ape BatchQC BiocStyle corpcor DESeq2 dplyr DT edgeR ggplot2 gtools knitr limma matrixStats MCMCpack pander phyloseq plyr preprocessCore rentrez reshape2 rmarkdown scales shiny tidyr XML]; };
-  PathwaySplice = derive2 { name="PathwaySplice"; version="1.0.0"; sha256="1yi302xjf355xi14vx5rl6qyrm35qz9llf48fwrj7ycb41vla0fj"; depends=[AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; };
-  Pbase = derive2 { name="Pbase"; version="0.18.0"; sha256="17ya1mmz8dqrr81vcfy3ygw490bwg26xkj72mcmba17cyy0nv11x"; depends=[AnnotationFilter Biobase BiocGenerics BiocParallel biomaRt Biostrings cleaver ensembldb GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
-  PharmacoGx = derive2 { name="PharmacoGx"; version="1.8.3"; sha256="1lax2naj6qcjp4fy640m9pflvi2y1aqbsh5m9j2mpphy6a1dlvmh"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; };
-  PhenStat = derive2 { name="PhenStat"; version="2.14.0"; sha256="1hjj1i083ihi7c1lc1rrh3k7513xcqpybn3aaivdjw66pi1bg7vp"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; };
-  Pi = derive2 { name="Pi"; version="1.6.2"; sha256="0x3b5cs7r4cjvjjc2gx7xapzlkvg56784aj04zg6271hldpcd84j"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; };
-  Pigengene = derive2 { name="Pigengene"; version="1.4.20"; sha256="13pzgzls2k48h31h25n2rw028n97xaxfxlb4dq49ndwy5874cbzb"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
-  Polyfit = derive2 { name="Polyfit"; version="1.12.0"; sha256="1gkn6g5hwa8ss156armxam9ky5fd7dj0k3gh1b0gy5plpzzyzv1h"; depends=[DESeq]; };
-  Prize = derive2 { name="Prize"; version="1.8.0"; sha256="1vaf4n69pb2sa6fd79988picz08d3c46cjmxfr5qf7hxay9lbwc6"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
-  ProCoNA = derive2 { name="ProCoNA"; version="1.16.0"; sha256="06jlzcr9b6nfrlgb1wqxp7r2z8042ygjx4d2z7jzg07hqn3gymjz"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
-  Prostar = derive2 { name="Prostar"; version="1.10.5"; sha256="1z9qli85if894j6s4a21yq6990hamz3ql1399m2wjjzka3w8kd29"; depends=[DAPAR DAPARdata data_table DT highcharter htmlwidgets rhandsontable shiny shinyAce shinyjs webshot]; };
-  ProtGenerics = derive2 { name="ProtGenerics"; version="1.10.0"; sha256="16ijp50448wnabp43klx943rhdvh7x45hvy7cnpq1s4dckxhhyni"; depends=[]; };
-  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.8.0"; sha256="1myd5gqr3nmbp6f1n7ilp6qjcfgm401frm4ldvxbjyppxh6m1wh5"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
-  PureCN = derive2 { name="PureCN"; version="1.8.1"; sha256="12wpqwz771vzz5yad67d9j1jhgi5ccxngyqcjcddqwsiws65prwc"; depends=[BiocGenerics Biostrings data_table DNAcopy edgeR futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges limma RColorBrewer Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; };
-  Pviz = derive2 { name="Pviz"; version="1.12.0"; sha256="1piws8xrq40qk3dkhci01wrcz4nz11rp8j2kf8rxvm9bsf2wxhk5"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
-  QDNAseq = derive2 { name="QDNAseq"; version="1.14.0"; sha256="0lgbv4s0xqgrs7q6ynb3c273sf7pyrp51jnc8ravq1z5g0a2zshy"; depends=[Biobase BiocParallel CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; };
-  QUALIFIER = derive2 { name="QUALIFIER"; version="1.22.0"; sha256="1lp9b3g1nlfdvd8iaryrs6314fc2rpqcdfvbr92sb114yd0kj6qp"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
-  QUBIC = derive2 { name="QUBIC"; version="1.6.4"; sha256="0sncmd1xrph5hd9y7sj53943cdf6fvhami4l8qd13qr5ikf07v0l"; depends=[biclust Matrix Rcpp RcppArmadillo]; };
-  QuartPAC = derive2 { name="QuartPAC"; version="1.10.0"; sha256="1l7bljgqwsawn1naq62mcvp50fh5mhwc3qxxi7r6dy25v05ji4gr"; depends=[data_table GraphPAC iPAC SpacePAC]; };
-  QuasR = derive2 { name="QuasR"; version="1.18.0"; sha256="0z87i7drfz1ssqwh27w4bhclf2k6i5bhjbfmn646pjb6qb6cvxia"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
-  QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.6.0"; sha256="15i1lnc0k317ccvk7xdqq4hfqxip49lv0yvlkygf4xwa9g3z1vjl"; depends=[dplyr Rcpp rlist]; };
-  R3CPET = derive2 { name="R3CPET"; version="1.10.0"; sha256="1cfb32rykza8h9v2h75674lhapykm3s6cym0c513mmr69vdbmqva"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
-  R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.28.1"; sha256="1vqv4gywwird0a55qw6c9pq67jml4f8pa28zrf04gim1mgalzfyl"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
-  R4RNA = derive2 { name="R4RNA"; version="1.6.0"; sha256="0qxzqf8gjmblh9xlra8554fmr59gkpiq6pa8q9xmi5y56pgpzcqv"; depends=[Biostrings]; };
-  RBGL = derive2 { name="RBGL"; version="1.54.0"; sha256="18jad23i3899ypv4bg3l47cvvs3qnj1pqis2p9x0135yv5y6wnv7"; depends=[graph]; };
-  RBM = derive2 { name="RBM"; version="1.10.0"; sha256="1nqmf9yiaam767f2wkwggnw6v0rymszx7chnkis0xbdsllzqb0j4"; depends=[limma marray]; };
-  RBioinf = derive2 { name="RBioinf"; version="1.38.0"; sha256="01qk9ddk8bm9sl70rlwgmrkz2y7dnqzrhi13hhh0ii62s0z0gdwh"; depends=[graph]; };
-  RCAS = derive2 { name="RCAS"; version="1.4.4"; sha256="0jnrikh0qhpxgjc6rdgfj9d57x4i5b40wxx7lfafrxdxg60qsy1g"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
-  RCASPAR = derive2 { name="RCASPAR"; version="1.24.0"; sha256="1v19pv81q0g965mks88ablznzhcdk3kfd7j2dgxx4r12bl1afawg"; depends=[]; };
-  RCy3 = derive2 { name="RCy3"; version="1.8.0"; sha256="09p66zxh82j5pcjz1zn3cg43rpsp0gnkwja836m6g1i450zrialv"; depends=[graph httr RCurl RJSONIO]; };
-  RCyjs = derive2 { name="RCyjs"; version="1.10.0"; sha256="0vlyh32byw49j3vfw0avknixflpjs5h599xxlbf2zc6irvncg1wg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
-  RCytoscape = derive2 { name="RCytoscape"; version="1.27.1"; sha256="1ai82y181bfckq8lqs1vsax2n1jwd5krz3x4b5ys56y3qjdqrgxy"; depends=[BiocGenerics graph]; };
-  RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.16.0"; sha256="1fzv1qn7jkz0zcvj2n7ijf7z40pjp9myhxfffpafwrvbrn4qg0wg"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
-  RDRToolbox = derive2 { name="RDRToolbox"; version="1.28.0"; sha256="0sm13v95m5b9jr451kbc4bichw6bhxlphxzaavkbvqh8qdv1l83q"; depends=[MASS rgl]; };
-  REDseq = derive2 { name="REDseq"; version="1.24.0"; sha256="1k5d7s67gd4bjp6y6xjjplkjr7kv69iia11npmdwda743agkmyb7"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; };
-  REMP = derive2 { name="REMP"; version="1.2.5"; sha256="1vpx4jzh8yyjpiqw4jr4chhha5dg4p2pwjza4mfbnpkzjbdy9ssr"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 caret doParallel foreach GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b2_hg19 impute IRanges iterators kernlab minfi org_Hs_eg_db ranger S4Vectors settings SummarizedExperiment]; };
-  RGSEA = derive2 { name="RGSEA"; version="1.12.0"; sha256="1w63gc0pqgc2ran4a5pd4qxmcj9mx9hxy4has6jbar66pa6q4sfw"; depends=[BiocGenerics]; };
-  RGalaxy = derive2 { name="RGalaxy"; version="1.22.0"; sha256="1cd5my1jzhlijshd4mh5zc7gsv5jic08i1ydmysjh760q97fg99v"; depends=[Biobase BiocGenerics optparse roxygen2 XML]; };
-  RGraph2js = derive2 { name="RGraph2js"; version="1.6.0"; sha256="0shrvxsm452yrd7x36m31fkmwry55jagfvqpd7hzssj0imkg521w"; depends=[digest graph rjson whisker]; };
-  RIPSeeker = derive2 { name="RIPSeeker"; version="1.18.0"; sha256="0bqkzwrncww7il36273chkd3gfxmii7p566ycki9qij419pwr35y"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  RITAN = derive2 { name="RITAN"; version="1.2.0"; sha256="199kddc19fwkfgqnbhx7v4sl5h6lj6f3wqs5xy9f9n9bg09f5rrf"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png ProNet RColorBrewer reshape2 RITANdata sqldf STRINGdb]; };
-  RIVER = derive2 { name="RIVER"; version="1.2.0"; sha256="00j9i0hrn0j2i5rxgsax3ixj8pwm2ks9fyvp657yd5amm1vackxq"; depends=[Biobase ggplot2 glmnet pROC]; };
-  RImmPort = derive2 { name="RImmPort"; version="1.7.2"; sha256="0h3r7q7lfl4z7srmallaldljv2231j3zhxy0d4x9q7ghcfglfnbf"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
-  RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.2.0"; sha256="0xjscfbxrrfnd40dmzhrrly0v3pk1k33jdl4z19bslh89gmrmygr"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
-  RLMM = derive2 { name="RLMM"; version="1.40.0"; sha256="01mbk00fbhzldivxlr5jfy1fgfrdbd657lya3s3p7zxw7z0054a0"; depends=[MASS]; };
-  RMassBank = derive2 { name="RMassBank"; version="2.6.0"; sha256="1yfnj64ybl95a7bc4980i5h6cvs2hq3nkmj9dklarcp9wfw5p59w"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; };
-  RNASeqPower = derive2 { name="RNASeqPower"; version="1.18.0"; sha256="08x58sd6q5xm47ix2f1kkqpgyk10nnbf994i4m1wia8fjhx0hdkm"; depends=[]; };
-  RNAinteract = derive2 { name="RNAinteract"; version="1.26.0"; sha256="1cscf2izpx924ai0vian9mm528mn1k618zqscss7mry13ik78p3c"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
-  RNAither = derive2 { name="RNAither"; version="2.26.1"; sha256="0fs3kab20h77d00kg48rdgslj3fsmnl73qi740sa7xmwx6ra5lc7"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
-  RNAprobR = derive2 { name="RNAprobR"; version="1.10.0"; sha256="0lq0cf5g004w2gi8rs29rhdy3p49njmwnw5jhfijfj4hgkgc6caf"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr Rsamtools rtracklayer S4Vectors]; };
-  ROC = derive2 { name="ROC"; version="1.54.0"; sha256="0a60k93q0zsmj2s4gy9wgzpd5yl9xdv2g62m18z4s4dmr3ykwsdv"; depends=[]; };
-  ROTS = derive2 { name="ROTS"; version="1.6.0"; sha256="12dqbwqiiz21im45iqf41nm25anf0fffip86glpydwwc0km054jh"; depends=[Biobase Rcpp]; };
-  ROntoTools = derive2 { name="ROntoTools"; version="2.6.0"; sha256="0lxxqa8syanb9v4nzc93arlwg65zyf4hkgxgw6q4h62mxkabdp0d"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
-  RPA = derive2 { name="RPA"; version="1.34.0"; sha256="1s5d8wpy3n69f9lnsi8avwalbzzvi7v8np6bv3vcnxy3nfx0iqx3"; depends=[affy BiocGenerics phyloseq]; };
-  RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.0.2"; sha256="14hs5mam4yjcm00zqz5fgmgxzwhw45fniaihch2mwrb6kbys2y68"; depends=[]; };
-  RRHO = derive2 { name="RRHO"; version="1.18.0"; sha256="1nz643k6bahg1bizw5bgjkpv2hd7hpi87s4kh1z38jqfpfixw9lk"; depends=[VennDiagram]; };
-  RSVSim = derive2 { name="RSVSim"; version="1.18.0"; sha256="0f2fv2cxwhsl6gvz3dpgk55faymdwxyry6lr3l6f2s8f6rqpnzgf"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
-  RTCA = derive2 { name="RTCA"; version="1.30.0"; sha256="0y2vrqfr4qjgsq8f82a5xnfhm835wi5zqf1xlxrv4mpxm9f9jr38"; depends=[Biobase gtools RColorBrewer]; };
-  RTCGA = derive2 { name="RTCGA"; version="1.8.0"; sha256="1x4kms2f7zskxqskzdi9q8adwxyi1w42kn5mj1skhgihdk5ai3b6"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
-  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.8.0"; sha256="0r3j9ky44gfpm1qz95la23j93khd00rcg6nz20dkvrfzsdqkixah"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges httr IRanges limma plyr RaggedExperiment RCircos RCurl RJSONIO S4Vectors SummarizedExperiment survival XML]; };
-  RTN = derive2 { name="RTN"; version="2.2.0"; sha256="0h7dd0zn7fiy22ab65fh47vi5j312r6rc8c43zh4f7c3cx3ls53s"; depends=[car data_table igraph IRanges limma minet RedeR S4Vectors snow]; };
-  RTNduals = derive2 { name="RTNduals"; version="1.2.0"; sha256="055milw62gndj13z0gpzi5f9zjxsnhdg8rvfm5msiyivay2ms7ki"; depends=[RTN]; };
-  RTNsurvival = derive2 { name="RTNsurvival"; version="1.2.0"; sha256="072hv2b6s9k6s8bp23sq3frq8h5wx2kr4jz1j2kyih17psa5kpkb"; depends=[png RColorBrewer RTN RTNduals survival]; };
-  RTopper = derive2 { name="RTopper"; version="1.24.0"; sha256="18ncjfwm1rsxrxz32n5z1a88rn0z8hlrksxlm9ninhl4igas0661"; depends=[Biobase limma multtest]; };
-  RUVSeq = derive2 { name="RUVSeq"; version="1.12.0"; sha256="0hkvj1gb11ci2ywqbqdfydx9pm0wchja2lbwkqjvw2svqmc9clww"; depends=[Biobase EDASeq edgeR MASS]; };
-  RUVcorr = derive2 { name="RUVcorr"; version="1.10.0"; sha256="0nhpz89x4z4dgdxynrxbpdaxbhnxk86ychnmln3vk5b9fp3yj3v2"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
-  RUVnormalize = derive2 { name="RUVnormalize"; version="1.12.0"; sha256="071p0wc0y38j2rvbbqzr6i5i2rvmmxdc3yj2fggvlbwbq2k4dfpx"; depends=[Biobase RUVnormalizeData]; };
-  RVS = derive2 { name="RVS"; version="1.0.0"; sha256="1m0w3cp5395sh43b05kc7067wyvmqlq6kiczp0b868392bhaq8hs"; depends=[gRain kinship2 snpStats]; };
-  RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.2.5"; sha256="05zl433y8bagqvf1672zjdwxlp39g2f3qmv12xycrmgz5gs43d53"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  RamiGO = derive2 { name="RamiGO"; version="1.23.0"; sha256="0dmr58masqca38z412lh2kfi1g498ifyz8bwy7kbk6ybjhxvklmv"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
-  RankProd = derive2 { name="RankProd"; version="3.4.0"; sha256="186aadri7p4fnf76cjgi2r1ic51dicks5alfw4hzx0dzi2hyy606"; depends=[gmp Rmpfr]; };
-  RareVariantVis = derive2 { name="RareVariantVis"; version="2.6.0"; sha256="1c1miqsrvf89dygg8m2axdq995axylhhdyi1gvig368l17vvcgsp"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
-  Rariant = derive2 { name="Rariant"; version="1.14.0"; sha256="1kfw2gfvdgzi5ldarmmwnksgg256vfaripcridlsb2pgwzay52k4"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
-  RbcBook1 = derive2 { name="RbcBook1"; version="1.46.0"; sha256="0qj8zvhq9cq3akdl6zpspvvz9jlvc0lxrn4ap7qd984406jihyg4"; depends=[Biobase graph rpart]; };
-  Rbowtie = derive2 { name="Rbowtie"; version="1.18.0"; sha256="0v3x9i6wmps7x0zpvgimzfwarg4246nbk4cpa1kim46r5jkl5m4v"; depends=[]; };
-  Rbowtie2 = derive2 { name="Rbowtie2"; version="1.0.2"; sha256="1cc2z55qzp3psnhii0d71dmb71d0s3wzl8dsyxyxcr95clp4irsi"; depends=[]; };
-  Rcade = derive2 { name="Rcade"; version="1.20.0"; sha256="0awsdg6wfm6hykj96s8cgz2mhn2i4jl1yabg7xfj0nmd776gv5fa"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; };
-  Rchemcpp = derive2 { name="Rchemcpp"; version="2.16.0"; sha256="1k5rgk944x0xy0y7l4fba1gfbiq6vnpbgmwwm520vv061v9g72nz"; depends=[ChemmineR Rcpp]; };
-  RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.18.0"; sha256="0lghahggrh3142rn9f2rnh517740d62bh7rc97zd2sjk3rfdb761"; depends=[flowType graph Rgraphviz sfsmisc]; };
-  Rcpi = derive2 { name="Rcpi"; version="1.14.1"; sha256="1g19arw0j0h02mfvlcilhy305ksy25x8y6v4qyvfbbspj9nccn0l"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
-  Rdisop = derive2 { name="Rdisop"; version="1.38.0"; sha256="1s77iw418g5fchpjl590cn97yhpcp9rhynwnckiqpyyyd8bg31i4"; depends=[Rcpp RcppClassic]; };
-  ReQON = derive2 { name="ReQON"; version="1.24.0"; sha256="0fsg0y2kxzkcfa6yv79w4swnw3ymjw3rbzw458a39npmavxvl08l"; depends=[rJava Rsamtools seqbias]; };
-  ReactomePA = derive2 { name="ReactomePA"; version="1.22.0"; sha256="0zckjs3w0pvk64g2wf5awc6npd43irv7ac38c5v3jy13lh0p4kc2"; depends=[AnnotationDbi DOSE graphite igraph reactome_db]; };
-  ReadqPCR = derive2 { name="ReadqPCR"; version="1.24.0"; sha256="1aapiyx6qx8bcx6qvr9ljg0nin2dnxlpvsm3n935d2riq94ah492"; depends=[affy Biobase]; };
-  RedeR = derive2 { name="RedeR"; version="1.26.0"; sha256="03gf09mawc8ps8bx32vh2xgwqhha6gb9cm9yz1g78650mj7sanxc"; depends=[igraph]; };
-  RefNet = derive2 { name="RefNet"; version="1.14.0"; sha256="1ssqj0jym17pawi3vh4y38fqj1sv59sq1sb4dsvlhkcf7c8lp33d"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
-  RefPlus = derive2 { name="RefPlus"; version="1.48.0"; sha256="0px6s5r72s1yscvy2k7fkgliy86z1wq7q8yfc0yjj8kj9qyi0wmy"; depends=[affy affyPLM Biobase preprocessCore]; };
-  Repitools = derive2 { name="Repitools"; version="1.24.0"; sha256="1aynhawn0fssm0haqqm7y22q8sky7an5gdnixalr7yykrnyy9wia"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; };
-  ReportingTools = derive2 { name="ReportingTools"; version="2.17.3"; sha256="0r0dp3s87q2706rqck2120bmq9nnmbfkxf8yyrm2i4zvkpay18yd"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; };
-  Rgraphviz = derive2 { name="Rgraphviz"; version="2.22.0"; sha256="1y9nyjffa9644jch0p2i3w302fmnyc2kb0c3z1f3d5zp1p4qmyqv"; depends=[graph]; };
-  Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.0.0"; sha256="0kkc4rprjbqn2wvbx4d49kk9l91vihccxbl4843qr1wqk6v33r1w"; depends=[]; };
-  Rhtslib = derive2 { name="Rhtslib"; version="1.10.0"; sha256="1dw3p44bfr0m7w39ckc2k37sjcp1zz0b9g12mr8am15jaj6v0q2j"; depends=[zlibbioc]; };
-  RiboProfiling = derive2 { name="RiboProfiling"; version="1.7.2"; sha256="0yygf098phiakaj8c74c337gbwpd0dh4haabbg2qq1k0qjw4prmp"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; };
-  Ringo = derive2 { name="Ringo"; version="1.42.1"; sha256="12r4bcn2sivcp68rd7jr4w4a8yz7xdydwx6bv1mi2lp2s2mzf5c5"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
-  Risa = derive2 { name="Risa"; version="1.20.0"; sha256="10ypbd9qwh1rk27fwm8naf3gl05w9zlw79qyr55pk5m6x5lnn9cb"; depends=[affy Biobase biocViews Rcpp xcms]; };
-  Rmagpie = derive2 { name="Rmagpie"; version="1.34.0"; sha256="1hvv8pps0q7xnsl33rammqvyj191j5gs78r2333jgscxnw4byqb7"; depends=[Biobase e1071 kernlab pamr]; };
-  RmiR = derive2 { name="RmiR"; version="1.34.0"; sha256="10n8i7qirbd8xrb73ccxyj7c6bi1szx263nwjh8w2j9x4dgzx22x"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
-  RnBeads = derive2 { name="RnBeads"; version="1.10.8"; sha256="1kawb781y7pscbmll69pzk4gnb0xz3s8llj3icy3c8y0arkg98xz"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; };
-  RnaSeqGeneEdgeRQL = derive2 { name="RnaSeqGeneEdgeRQL"; version="1.1.0"; sha256="06i2fy89wck0jhpc174d81ka7jim8gjamjk0ym1j0fh3ldiw9yvm"; depends=[edgeR GO_db gplots org_Mm_eg_db]; };
-  RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.10.0"; sha256="1r0bn121bf5fcp4im4hm2c6rccgf7fb1vvxj2iri8ippc2k60d2c"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
-  Rnits = derive2 { name="Rnits"; version="1.12.0"; sha256="00ddzbjms9wpiinc021s4b50wbzdafnml96ngsmi7rd8ipr3k3vp"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
-  Roleswitch = derive2 { name="Roleswitch"; version="1.16.0"; sha256="1jp55lkfwwx08rbdkp5324ziwn5b3pzrcidk18zpplgwn4c6jsk9"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
-  RpsiXML = derive2 { name="RpsiXML"; version="2.20.0"; sha256="0svh7fdl957q47jqc5q8sysvghs5anhj61r3zcapikbbi19x8j4i"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
-  Rqc = derive2 { name="Rqc"; version="1.12.0"; sha256="11l72jympxbb156llifc5qa1zx34774b0waqq3nyv351bqm2l5c8"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; };
-  Rsamtools = derive2 { name="Rsamtools"; version="1.30.0"; sha256="0pjny5fjvbnfdyhl3bwxin678sha2drvs00sivxh3l772cn6yams"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-  Rsubread = derive2 { name="Rsubread"; version="1.28.1"; sha256="1fvk88jmvx987hifj3j6lrvwpma66vqmvszphgsfvy6nq4j2wnr0"; depends=[]; };
-  Rtreemix = derive2 { name="Rtreemix"; version="1.40.0"; sha256="1h7frl1zgkzvrfjzdc6l2xybhp68pizdi7vix012m3imfs97sj25"; depends=[Biobase graph Hmisc]; };
-  S4Vectors = derive2 { name="S4Vectors"; version="0.16.0"; sha256="03s8vz33nl6mivjb7dbvj702dkypi340lji1sjban03fyyls0hw0"; depends=[BiocGenerics]; };
-  SAGx = derive2 { name="SAGx"; version="1.52.0"; sha256="1fjyhs3isbzp4fk460gk4xfqs62ha9vra8blzbkng3r86axarlgd"; depends=[Biobase multtest]; };
-  SANTA = derive2 { name="SANTA"; version="2.16.0"; sha256="12l03j2vh74n8lbvdr436qylaxhj3ysqg0m7crl9l30kpzg4agcv"; depends=[igraph Matrix snow]; };
-  SBMLR = derive2 { name="SBMLR"; version="1.74.0"; sha256="0l2c0irfk50kiz22w8gzzsanh3dv5bpqrzfy1ba6bw5ghs066j65"; depends=[deSolve XML]; };
-  SC3 = derive2 { name="SC3"; version="1.7.7"; sha256="1x9x450qnaw94px9b861zyxyyfxxbclw1bq765adfixgrlakyw1w"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; };
-  SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.20.0"; sha256="1fgkrr6303b0hn9rdkry3rd7yskqanmxy74akxgk4nkjwf817rra"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
-  SCnorm = derive2 { name="SCnorm"; version="1.0.0"; sha256="0vpwca5gbhdm1g1xsb9451z2cvqr9c85z79whq011d52adz5fmr6"; depends=[BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SummarizedExperiment]; };
-  SELEX = derive2 { name="SELEX"; version="1.10.0"; sha256="0f81sa0azbh7n7vg39865pv923k2sza7md713g5fkn78vrx5q645"; depends=[Biostrings rJava]; };
-  SEPA = derive2 { name="SEPA"; version="1.8.0"; sha256="0g0gqwgsn8bp9mz40dbqb4f785mhwcmb5y4jsgj16i5pv0ll59a7"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; };
-  SGSeq = derive2 { name="SGSeq"; version="1.12.0"; sha256="0wbwyr4nckjkafc1h80a0isz27lyg87r42ym4zs6nmpj0p3xv94q"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; };
-  SICtools = derive2 { name="SICtools"; version="1.8.0"; sha256="0n3m3435wa95mld4b57hr31rfhlk41yw1qqi1jdnybkqgdndpqf8"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; };
-  SIM = derive2 { name="SIM"; version="1.48.0"; sha256="1n207w5idd2v515v8ppsfx7q1wvn2zxy6if7dp2hpr0x2qvxijnf"; depends=[globaltest quantreg quantsmooth]; };
-  SIMAT = derive2 { name="SIMAT"; version="1.10.0"; sha256="0gd99p8kjf1wn0xygdyppxgddp9bnp3a3grg8za2mmm8xv5r990h"; depends=[ggplot2 mzR Rcpp reshape2]; };
-  SIMLR = derive2 { name="SIMLR"; version="1.4.1"; sha256="09siwqc57f0rfx0297hk2jbpvvayhk47wkvapz2ap621ya203b0z"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; };
-  SISPA = derive2 { name="SISPA"; version="1.8.0"; sha256="18v8fw3l4pxh4fi18fhnqxbd1hlhp2w36s31vf58ffldq3bz1bpb"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; };
-  SLGI = derive2 { name="SLGI"; version="1.38.0"; sha256="1p0lwzmzz820npnsw9sk6x12innc39qv0ja0di7rplkmsi60z92j"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
-  SLqPCR = derive2 { name="SLqPCR"; version="1.44.0"; sha256="16kvssib1j4d5cn3b350ip2m9m7fcsgm1mgq13wbfnwcd6sx52kb"; depends=[]; };
-  SMAP = derive2 { name="SMAP"; version="1.42.0"; sha256="0n2f1qib0k9rxdizmrazxp2wnf6ycaz90b0vzszvakawc9np36dq"; depends=[]; };
-  SMITE = derive2 { name="SMITE"; version="1.6.0"; sha256="1s5gsgf878996hvd15gbjas7lyxlsw7s4xxcpcmgnlzq1dxyq0ma"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; };
-  SNAGEE = derive2 { name="SNAGEE"; version="1.18.0"; sha256="0315x8dl21i9zysp55nmjikha9fxykw8lzba4bk7gf0bc0947i26"; depends=[SNAGEEdata]; };
-  SNPRelate = derive2 { name="SNPRelate"; version="1.12.2"; sha256="05x0jjybzkyvjc9sq590hg2lc6fjxqmnlvgvwc0d7pyri5pa4rki"; depends=[gdsfmt]; };
-  SNPchip = derive2 { name="SNPchip"; version="2.24.0"; sha256="1z0708rqn9h9ajmdqv44y2yl0gqqg9gy1h5yj3wzjpj4dgy5d4l0"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; };
-  SNPediaR = derive2 { name="SNPediaR"; version="1.4.1"; sha256="083i242x2a133wgpbi6plw7hs426b4qsgl7792akr0fm965mnna5"; depends=[jsonlite RCurl]; };
-  SNPhood = derive2 { name="SNPhood"; version="1.8.0"; sha256="082fwmzdjwgn2x33isi81a05l557367ham162li3q76g2jfcmh7r"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  SPEM = derive2 { name="SPEM"; version="1.18.0"; sha256="05gpj1fykiw8xjcbd6splqkb8jsyksnhzl6g6pzinpbczhslq55a"; depends=[Biobase Rsolnp]; };
-  SPIA = derive2 { name="SPIA"; version="2.30.0"; sha256="0m2vv6zj0vgd98w2jrlbwbyn998ml2i2wr9160gmq5h77rn91xq3"; depends=[KEGGgraph]; };
-  SPLINTER = derive2 { name="SPLINTER"; version="1.4.0"; sha256="06xamivcwlpwj6n8c3wzgd5ykh21q2mrdl7zz1bnicq5npha99l9"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo]; };
-  SPONGE = derive2 { name="SPONGE"; version="1.0.3"; sha256="1jb7nwji4j9kvnx40hr26qhcn3pbmjaahl4cpvqbljs9pmi9lfdy"; depends=[bigmemory Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; };
-  SQUADD = derive2 { name="SQUADD"; version="1.28.0"; sha256="1z139p0xbaq4gvd9acxnd8dlapdsiaab1fj10pc7wx2iz4dj9zd6"; depends=[RColorBrewer]; };
-  SRAdb = derive2 { name="SRAdb"; version="1.40.0"; sha256="18aayqid2fhhkjf7anlk34qw3fj3byxsxcrw2lmq4s4mqq06k5vh"; depends=[GEOquery graph RCurl RSQLite]; };
-  SRGnet = derive2 { name="SRGnet"; version="1.4.0"; sha256="1a2as38svd6vp6pdllir4gs6jqicg7n7ya42ffjgiy2rpnyijbci"; depends=[DMwR EBcoexpress gbm Hmisc igraph limma MASS matrixStats pvclust]; };
-  SSPA = derive2 { name="SSPA"; version="2.18.0"; sha256="0dq4j299yjg5wq40f3qdm8hi0vv6zg1d04hml1rw25s1ws2pngyj"; depends=[lattice limma qvalue]; };
-  STAN = derive2 { name="STAN"; version="2.6.0"; sha256="09aal6p3sdbvcp6dkrj533x3m1qxxrkgsk35j9idz643vv133xjp"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; };
-  STATegRa = derive2 { name="STATegRa"; version="1.12.0"; sha256="08k2chi5cgpj2xxi16jzc3prsp3qpwwq0f4wrqzd9rwj6f9afwk5"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
-  STRINGdb = derive2 { name="STRINGdb"; version="1.18.0"; sha256="0hrhjx4cpl2zp2chgyw0ayadsv8g1nnarn7gyxni76ci4wayh7bf"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
-  STROMA4 = derive2 { name="STROMA4"; version="1.2.0"; sha256="06g2p52mgc3f9hzyqcjbcfvk28fx6ynf3c9gbwvchibjaiqdy1sh"; depends=[Biobase BiocParallel cluster matrixStats]; };
-  SVAPLSseq = derive2 { name="SVAPLSseq"; version="1.4.0"; sha256="190r34lir810hla9wp3pwl3w2yvw5x532988vyvjzl49wdhq535n"; depends=[edgeR ggplot2 limma lmtest pls SummarizedExperiment]; };
-  SVM2CRM = derive2 { name="SVM2CRM"; version="1.10.0"; sha256="0v4qgs4bmi44i36pm5y7bdkjiwj853738j8f7rxzqnp3y8nbbwjn"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; };
-  SWATH2stats = derive2 { name="SWATH2stats"; version="1.8.1"; sha256="1hd4gxb2p81v2d9x4zw0asfm7r9s0wq2flnpl9g7r9fxm2yfi339"; depends=[data_table ggplot2 reshape2]; };
-  SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.32.0"; sha256="0n1pjpgdsisq4zv9dny3bfzjz3ga1cibh2gmm5irplfxgpcdlnqa"; depends=[]; };
-  ScISI = derive2 { name="ScISI"; version="1.50.0"; sha256="0ssyx32bcaz40yr9iraczk9p53ymia4m8nfsmzxzr804fyz8hnvw"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; };
-  Scale4C = derive2 { name="Scale4C"; version="1.0.0"; sha256="035fyjswn23s6az36j5b94b1aj31n6yb5w243bqqwvqrl2kqhkdv"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; };
-  SemDist = derive2 { name="SemDist"; version="1.12.0"; sha256="1h3ld34h61sx228ix68sg86y3w9mzh3iq1gdri0lbixvhzx9w25b"; depends=[annotate AnnotationDbi GO_db]; };
-  SeqArray = derive2 { name="SeqArray"; version="1.18.2"; sha256="05w051i63af4akr6zna9w14bdyi06bpif0vab9yvf6iwq2ag72kz"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-  SeqGSEA = derive2 { name="SeqGSEA"; version="1.18.0"; sha256="1vaqa6jkvwxpbqnz9wz3i6p26mky6d7d704cjv5as67j04v99b2a"; depends=[Biobase biomaRt DESeq doParallel]; };
-  SeqSQC = derive2 { name="SeqSQC"; version="1.0.0"; sha256="0qj1y9zsjxkh08jkw80hl62072viincq1pvcz9r3i0m28nhk7pg5"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; };
-  SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.1"; sha256="0vjgksqyapvkdbnl3af0sjbbraslyc6m7f63sl05m87zdkav8fzz"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; };
-  ShortRead = derive2 { name="ShortRead"; version="1.36.1"; sha256="1cyv47632m9ljkxfsvnvmd19sb607ys5kz8fwh6v39dnw16g0a6m"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
-  SigCheck = derive2 { name="SigCheck"; version="2.10.0"; sha256="1k2xmb7jcjbdxafr8fspf9pbc0jwcll914lqc42gvhhjq6rnf8q4"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
-  SigFuge = derive2 { name="SigFuge"; version="1.16.0"; sha256="0ddy6bayb05gsgh06p5awhjwyx57z0l8fb5x6p0dci2fgzy6gr4f"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
-  SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.16.0"; sha256="0jkd78wl5ksm05qjmsx7s8aznh3kfpi34yvxaxv763pqjqzkxa82"; depends=[Biobase limma mclust Ringo]; };
-  SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.0.0"; sha256="1r276i97w64a5vdlg6952gkj7bls909p42zl8fn8yz87cdwyaars"; depends=[BiocGenerics S4Vectors SummarizedExperiment]; };
-  SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.14.0"; sha256="107ykkkfy4xpvaflqpsbxkbw5514pxkicffpr24p3x5lj5zp6b8h"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
-  SpacePAC = derive2 { name="SpacePAC"; version="1.16.0"; sha256="1dc8z66kzn6lxrc2xz3kyl7fjxy0i0gvjgxc9w3fqvdhkxqp7k6n"; depends=[iPAC]; };
-  SpeCond = derive2 { name="SpeCond"; version="1.32.0"; sha256="1k54zxj224fshnx76hsjxkwaj9vb6387ssgpr0v3zgnf7p4zf4sx"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
-  SpidermiR = derive2 { name="SpidermiR"; version="1.8.2"; sha256="144rfrp55cbcqjnlv93mannfvk33wrxw2sxf5yabs75y2hvi63ri"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
-  SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.18.0"; sha256="1pvi2vc5jca4mpangyfllbh5h16015kmcdrwhs32a25wp0fpqhq3"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
-  StarBioTrek = derive2 { name="StarBioTrek"; version="1.4.0"; sha256="137y50vxz2jd8lmb7zx3f25by0imzvarimrpfxg7v6marcgpd3nj"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; };
-  Starr = derive2 { name="Starr"; version="1.34.0"; sha256="0wqcp98v2isy2bnq3qyf5v5lzy19kap2i6qbi9d5mlaxqjrq5afq"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
-  Streamer = derive2 { name="Streamer"; version="1.24.0"; sha256="1bmjvg2lb9qmh0fffgkw4wpmjv5rg9iwqhmxz30ciiw8vw6xcklq"; depends=[BiocGenerics graph RBGL]; };
-  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.8.1"; sha256="19vlwnby83fqjrilsxvnvgz0gvby7mrxvlmx18nb3p1w591ddfjh"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; };
-  Sushi = derive2 { name="Sushi"; version="1.16.0"; sha256="0axaqm480z8d0b2ldgxwm0swava1p4irc62bpl17p2k8k78g687g"; depends=[biomaRt zoo]; };
-  SwathXtend = derive2 { name="SwathXtend"; version="2.0.0"; sha256="1v8mil305503cpspwk9zln3csv2f1h72afjdddpzks9didq5i3xf"; depends=[e1071 lattice openxlsx VennDiagram]; };
-  SwimR = derive2 { name="SwimR"; version="1.16.0"; sha256="033hh3bpkn6qladvn7iz0fvrbphffzy1rkvmi0j32v9n9h88lizz"; depends=[gplots heatmap_plus R2HTML signal]; };
-  TCC = derive2 { name="TCC"; version="1.18.0"; sha256="10nmha786k85jr93vbnlsxkrr2wiykxa5rl2z5ry49w14fis82m5"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
-  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.6.12"; sha256="0pih8jpzffsjlhamfpvgcapa48dq2m86f4hxqr5m5z4vgjd7j1mv"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; };
-  TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.4.7"; sha256="1hwq13rsynxv18pzahq54107n2dm0wgbh7a5xizda4zqgf4s50gj"; depends=[clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks]; };
-  TCseq = derive2 { name="TCseq"; version="1.2.0"; sha256="07wbp4caw18g1mf5h40i1c1y7jadfqmx3p7a8zz5rjjibsfa2bw1"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; };
-  TDARACNE = derive2 { name="TDARACNE"; version="1.28.0"; sha256="0agzpgz39ya46kgnz95ff2h0hml2mb14fb3pdj218adas24zq9jf"; depends=[Biobase GenKern Rgraphviz]; };
-  TEQC = derive2 { name="TEQC"; version="3.18.0"; sha256="0rnqlk677hcf2w3whc9gdqm21gjqf4rsanaw8a847jc7li8isnpj"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
-  TFARM = derive2 { name="TFARM"; version="1.0.0"; sha256="050hpw7xaw7di6m9lgb1ac6cnp3lcv4f9l9d9r3rm1i42q51l8gs"; depends=[arules fields GenomicRanges stringr]; };
-  TFBSTools = derive2 { name="TFBSTools"; version="1.16.0"; sha256="0sivvbqmw5psciyzm5dyyjq9bpcvnhxz8kxis3zgkm9mmjgx84hy"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; };
-  TFHAZ = derive2 { name="TFHAZ"; version="1.0.0"; sha256="0kxri2yv12pc9hq55i7qcjlk64p7w0i9kgbf2im2rzlbdb8xc3cm"; depends=[GenomicRanges IRanges S4Vectors]; };
-  TIN = derive2 { name="TIN"; version="1.10.0"; sha256="16lv7k4js3zbak0b1m2mlimd1f56gif3vlm2hpc5vx1y315mz9gd"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
-  TMixClust = derive2 { name="TMixClust"; version="1.0.1"; sha256="1mv9hv5hjg55mwbp824n5b74w8zcb9sv8a1wa6hxmfb00n6wcr4h"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; };
-  TPP = derive2 { name="TPP"; version="3.6.0"; sha256="1gma7lfnq1ybcqnl9536wv22advjaqxmysfgamrgn38zwbcwhdi9"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; };
-  TRONCO = derive2 { name="TRONCO"; version="2.10.3"; sha256="1kw4j57wri0sm3piinq169pkljfb3ff4vcj1ify2il2pl7va94l4"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
-  TReNA = derive2 { name="TReNA"; version="0.99.10"; sha256="1yiq953w6830v1fba4gglnf485m6lis11qlpp9g1jw0x4s0rpg70"; depends=[DBI doParallel flare foreach GenomicRanges glmnet lassopv randomForest RPostgreSQL RSQLite vbsr]; };
-  TSCAN = derive2 { name="TSCAN"; version="1.16.0"; sha256="0m88r5yg46ra8k6ymzfrk68fqbg2y47kshzgj5flblbay079hnxg"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
-  TSRchitect = derive2 { name="TSRchitect"; version="1.4.0"; sha256="0qymyjmzpi1n5fpyzw8riz32kwsc2bi1cw3sx9sxvpvhjk45dmyx"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  TSSi = derive2 { name="TSSi"; version="1.24.0"; sha256="03i7nnqnbhjpyx8z8gpwysrgi9ln89pgdqaisyk0cmxrsnpp9wxa"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
-  TVTB = derive2 { name="TVTB"; version="1.4.0"; sha256="1p167jjcmsfh2y1wlc5r9j7i4cpdq3kjjnykcq4if737d3xyw15b"; depends=[AnnotationFilter BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges GGally ggplot2 Gviz IRanges limma reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; };
-  TarSeqQC = derive2 { name="TarSeqQC"; version="1.8.0"; sha256="0xpsjl470sa0kvmi3yz25fx9j657d19cbspxxy9vhpr60wyfahpp"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
-  TargetScore = derive2 { name="TargetScore"; version="1.16.0"; sha256="1davh5chqz8y94ddpzmnjh79m5678yxjk120bfl7857y888ywhc7"; depends=[Matrix pracma]; };
-  TargetSearch = derive2 { name="TargetSearch"; version="1.34.0"; sha256="03ndkhwzgbr005v6m6wppylcg862nnfb69fgmjm9nfxrp70vviy6"; depends=[ncdf4]; };
-  TitanCNA = derive2 { name="TitanCNA"; version="1.16.0"; sha256="00xf005mndqx79y8w6c10p02xyshjv0cmd3wxib73d2s1ns482s6"; depends=[data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges Rsamtools VariantAnnotation]; };
-  TnT = derive2 { name="TnT"; version="1.0.1"; sha256="110h66824anbgsbw3cp74yzlka1v8wmkz6fhgs3n51iz6qikk6f9"; depends=[Biobase data_table GenomeInfoDb GenomicRanges htmlwidgets IRanges jsonlite knitr S4Vectors]; };
-  ToPASeq = derive2 { name="ToPASeq"; version="1.11.0"; sha256="1qbx2n8zlmb5gvmy8r91hxli268vbvd4a5blzl2jwa1v3fb09rim"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz SummarizedExperiment TeachingDemos]; };
-  TransView = derive2 { name="TransView"; version="1.22.0"; sha256="1306l12khnd5xnaimf4rk85nylik4im95f1m56p44rpmhgs33gq6"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; };
-  TurboNorm = derive2 { name="TurboNorm"; version="1.26.0"; sha256="0ayn3my5n78y91sj8z92vxj8s7i8jlhh9nbwqf4b541p5xvbc2sd"; depends=[affy convert lattice limma marray]; };
-  TypeInfo = derive2 { name="TypeInfo"; version="1.44.0"; sha256="05q3h91vhbmp9irvsc1mgwkilzqz87wc6cbk78kk979s225fsqis"; depends=[]; };
-  UNDO = derive2 { name="UNDO"; version="1.20.0"; sha256="0i0xdc74mmarr57fk15c4iyq9pm2zgic8ini0ldbk1hx5ci3if6x"; depends=[Biobase BiocGenerics boot MASS nnls]; };
-  UniProt_ws = derive2 { name="UniProt.ws"; version="2.18.0"; sha256="071qmc0jy58wabxwqrv6w4rlg42xj5rzb12ji56a5pdsh1j2nrfw"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
-  Uniquorn = derive2 { name="Uniquorn"; version="1.6.0"; sha256="05cy9yfw4qb5drxjmisahcca729vdqb6l9qfmrar897bwm2kwb7h"; depends=[BiocParallel DBI R_utils RSQLite stringr WriteXLS]; };
-  VanillaICE = derive2 { name="VanillaICE"; version="1.40.0"; sha256="14swl2fvi56583zmqsfwd5kxvzdn2xm9rf1b0x0r7nn62hkzdmp2"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
-  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.24.5"; sha256="07ywn3c4w83l3sr76d0z3b1nv9icgdh3phsjlc6cfx7i6nfmvxw2"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-  VariantFiltering = derive2 { name="VariantFiltering"; version="1.14.0"; sha256="1w959g9iyqiijzr8w3xf4i1pb2jjasyvzwrvyhjymn3xgj7hqiab"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny SummarizedExperiment VariantAnnotation XVector]; };
-  VariantTools = derive2 { name="VariantTools"; version="1.20.0"; sha256="1ma1qs9n606a5gjcm8l9fna8vfg5f8ixdzriwaalhys22pyjgqsy"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  Vega = derive2 { name="Vega"; version="1.26.0"; sha256="1kya7h7xa47d7l3svkpnkwjg49izpjfird5fjja6490ynr1a55yd"; depends=[]; };
-  VegaMC = derive2 { name="VegaMC"; version="3.16.0"; sha256="1lmgmaf4andfxv2z4h2pahyggnic5wj61llzkm8q4k0q7i50l63i"; depends=[Biobase biomaRt genoset]; };
-  XBSeq = derive2 { name="XBSeq"; version="1.10.0"; sha256="0p2f2wckndgrsf0jjcag22i6bgrn2ky78ngdk9c5cvqnxwjcfagz"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
-  XDE = derive2 { name="XDE"; version="2.24.0"; sha256="11g74znfafp03q710mhmzgxap6f7j04b75jhm7x6lmd6cbwqh25p"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; };
-  XVector = derive2 { name="XVector"; version="0.18.0"; sha256="1i4i3kdxr78lr1kcxq657p11ybi7kq10c8kyaqyh6gfc8i9rhvmk"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
-  YAPSA = derive2 { name="YAPSA"; version="1.4.0"; sha256="0jv940xdqrbb8hw13nm6cky767zn9k8wh6sh5vz5b7hgh7c75kww"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; };
-  a4 = derive2 { name="a4"; version="1.26.0"; sha256="1fvnpk4bqvglqq04mykk7k57f52phmv8b77mn33hd0lli0ym9a90"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
-  a4Base = derive2 { name="a4Base"; version="1.26.0"; sha256="0kj0svm9c7cbrdwm1wqj76jg9vkq34jqqq2b249ss44d17y1cr2s"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
-  a4Classif = derive2 { name="a4Classif"; version="1.26.0"; sha256="1i14390103kzafbk5ark9n7svw78jm1pkcv4dwwz8q3ibywanyyz"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
-  a4Core = derive2 { name="a4Core"; version="1.26.0"; sha256="1sbg7aaprmkw381y2b3mjw7fsl0p8xy3gciwfysc4f2fxmxcq51y"; depends=[Biobase glmnet]; };
-  a4Preproc = derive2 { name="a4Preproc"; version="1.26.0"; sha256="058fjw1l82gmk50kjxsy98zxc22fy1k9cj7bk45dxf5ahzpklg0b"; depends=[AnnotationDbi]; };
-  a4Reporting = derive2 { name="a4Reporting"; version="1.26.0"; sha256="1v21sqib2rmrgw2ij4vcb4hbiqybbn7b40x65594xygkridaw4vv"; depends=[annaffy xtable]; };
-  aCGH = derive2 { name="aCGH"; version="1.56.0"; sha256="0878jpirklqlpl90qwcf6cj3jdiadcywk0ilhbiqcmdxlsf0w549"; depends=[Biobase cluster multtest survival]; };
-  acde = derive2 { name="acde"; version="1.8.0"; sha256="0hfby7fdvvj0ip2r27z4c0i6ap18nh08c7gas8vrrrqbznprsqjg"; depends=[boot]; };
-  adSplit = derive2 { name="adSplit"; version="1.48.0"; sha256="13bvql5kd6dz5gpwjyp1b91n8xr4kc9b3sy1m1g184452ccin5na"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; };
-  affxparser = derive2 { name="affxparser"; version="1.50.0"; sha256="1nyzr5277np3dqig4fpnhx6xqsswsrp7rmb6ll6gram47k9l2hf9"; depends=[]; };
-  affy = derive2 { name="affy"; version="1.56.0"; sha256="0jmbkimma5ffsdkk3xp03g4lpz84gd95nkqakif2nqq6wmx0syrj"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
-  affyContam = derive2 { name="affyContam"; version="1.36.0"; sha256="17sjgm12y66z22y442mg9dh1b4yivi6cz8gdm49q3szibxgjprv8"; depends=[affy affydata Biobase]; };
-  affyILM = derive2 { name="affyILM"; version="1.30.0"; sha256="080z6cavmphrqh4y3cbf2cclzbljl7v2rwrcdsrz3h5pnisf064b"; depends=[affxparser affy Biobase gcrma]; };
-  affyPLM = derive2 { name="affyPLM"; version="1.54.0"; sha256="04h7wvxcdqkwpywlbwycvm9l5az6z5hqw44s33vcx9xpnhbsw7q8"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
-  affyPara = derive2 { name="affyPara"; version="1.38.0"; sha256="1jb80dlm3zmrfjq60y0gnb8530pma22b6zkd9crlczl120sfiybv"; depends=[affy affyio aplpack snow vsn]; };
-  affyQCReport = derive2 { name="affyQCReport"; version="1.56.0"; sha256="0jdhswh8y7fj55k3c4lk9nfr8vqp41mvg0jla1rh7y0qjh0fkv4c"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
-  affycomp = derive2 { name="affycomp"; version="1.54.0"; sha256="12ckmzi5z0gxccrycgprvd0hzz52ygryqszgbkxdnnrcwcgbb4x0"; depends=[Biobase]; };
-  affycoretools = derive2 { name="affycoretools"; version="1.50.6"; sha256="11d5k4lnpsnm6aa5j3352l4cyfrlhigp2fnykkwkqwc7714a02mg"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; };
-  affyio = derive2 { name="affyio"; version="1.48.0"; sha256="1pzzp3d3dbmyf34gvivfiprkpscn36rgvhrq853a1d3avcwr5ak9"; depends=[zlibbioc]; };
-  affylmGUI = derive2 { name="affylmGUI"; version="1.52.0"; sha256="1k1wkiajdnkcfrvdmhjgc969hyq7gk53ni2khqcw8jqv9kqqa1r1"; depends=[affy affyio affyPLM BiocGenerics BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
-  affypdnn = derive2 { name="affypdnn"; version="1.52.0"; sha256="02js489yb6nni3i7jrl1zz0bm5xs6a47pb6nq72fmh1frwikx37w"; depends=[affy]; };
-  agilp = derive2 { name="agilp"; version="3.10.0"; sha256="0yyvmlyxajad1f7fx91bsq3rbwm5i4vyr1vpp6y4vicaxmnlkas3"; depends=[]; };
-  alpine = derive2 { name="alpine"; version="1.4.0"; sha256="16ip0pmdxm7bhnnk5z376miwqkl018m6wzdaxls7cszfv04alass"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; };
-  alsace = derive2 { name="alsace"; version="1.14.0"; sha256="08jdjyjxc6r513zlk7nsrnydsg2fxsws77g1wq0gpcgwx8m7s697"; depends=[ALS ptw]; };
-  altcdfenvs = derive2 { name="altcdfenvs"; version="2.40.0"; sha256="0fdy1yxgq9rnhgm17ml4wms56fsdmgr5hvqdjmpjslgwjn4922gk"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; };
-  ampliQueso = derive2 { name="ampliQueso"; version="1.16.0"; sha256="1d3nyps5pa4s52mwnsqhlm4pddqanns003qggs2qidb5rcbvhd4m"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
-  amplican = derive2 { name="amplican"; version="1.0.0"; sha256="1lv0xvfk2spcl23hn005w7c4iyvsbrqgpvc5rbw6nkrxzmay5g16"; depends=[BiocGenerics BiocParallel Biostrings clusterCrit data_table dplyr GenomeInfoDb GenomicRanges ggbio ggplot2 ggthemes gridExtra gtable IRanges knitr Matrix matrixStats rmarkdown S4Vectors ShortRead stringr waffle]; };
-  anamiR = derive2 { name="anamiR"; version="1.6.1"; sha256="0mxpxangzbvx7rpzm4ak321pcgj6pa0nbslgvh8rplyz4sf6v0z6"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; };
-  annaffy = derive2 { name="annaffy"; version="1.50.0"; sha256="0qprkcvq56h6dwcylqsa0dq0nmv5bk280j89cwa3brm4jfncs4hm"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; };
-  annmap = derive2 { name="annmap"; version="1.20.0"; sha256="0q4lcx1j5av5jpn2wmarn7z32clzzdaprvpcagnvv453i11vp5bi"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-  annotate = derive2 { name="annotate"; version="1.56.2"; sha256="0ybg9k1s289h15nj1kp9821i1rsk1gkn8i8blplmk7gsgpbw1f42"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
-  annotationTools = derive2 { name="annotationTools"; version="1.52.0"; sha256="1kmhgasb26dbq10d4r8wig5pjlbiqcqsa12zpgcsasj8kvpr2gpd"; depends=[Biobase]; };
-  annotatr = derive2 { name="annotatr"; version="1.4.1"; sha256="10izqb0x92fjpsycsyppvz6yidg8ssix452jfni692na7ih564y9"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges org_Dm_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db readr regioneR reshape2 rtracklayer S4Vectors TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Dmelanogaster_UCSC_dm6_ensGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene TxDb_Rnorvegicus_UCSC_rn5_refGene TxDb_Rnorvegicus_UCSC_rn6_refGene]; };
-  anota = derive2 { name="anota"; version="1.26.0"; sha256="1fvr9yvyf0m7m5dnfbzbm29kd1yqq78carv9v7xx60szi30w4lvq"; depends=[multtest qvalue]; };
-  anota2seq = derive2 { name="anota2seq"; version="1.0.1"; sha256="0fya2plqvpmypm3jf6mwncpi1ngjsprbnadh7j33wdshr4znhyc3"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; };
-  antiProfiles = derive2 { name="antiProfiles"; version="1.18.0"; sha256="03y6j3y0qvfzwbwzjgjsl5zlqayqj1400gj278m28l70l43ifnyg"; depends=[locfit matrixStats]; };
-  apComplex = derive2 { name="apComplex"; version="2.44.0"; sha256="132j6gm70h8sma82jd566hrih7npa217h5r6kqx4lq5yw3dlqcs1"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
-  apeglm = derive2 { name="apeglm"; version="1.0.3"; sha256="06j68szmxdr9c8qmmlcx85rv1hjl2rk52lagack83cr3q1gd10bj"; depends=[emdbook GenomicRanges SummarizedExperiment]; };
-  aroma_light = derive2 { name="aroma.light"; version="3.8.0"; sha256="0crnk6851jwypqr5l5jcbbay0vi5vvdjyisaf6z2d69c39wmr6sc"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
-  arrayMvout = derive2 { name="arrayMvout"; version="1.36.0"; sha256="0z35dyc1r4hn8bfmym5yi08s8mi9vn50pn0vvmggphzm25cwyln9"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
-  arrayQuality = derive2 { name="arrayQuality"; version="1.56.0"; sha256="14q0a9my42ya21615l46pllcw4dlnmqi8nac0m4iimlpjm0ic7w6"; depends=[gridBase hexbin limma marray RColorBrewer]; };
-  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.34.0"; sha256="1rz3llx2ww5ngp7l2i1y4zxsjb8gsyhz1srs06s0asp49kq88qcv"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
-  attract = derive2 { name="attract"; version="1.30.0"; sha256="0af0jiscz7s3i8k6p7ygihb6fflhk57alqmn15b42bcn9a5d31l8"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; };
-  bacon = derive2 { name="bacon"; version="1.6.0"; sha256="1i6y1dfmnqv5n5nbhfmq4qvkivd88sfvlypsm4xs4jsb8ij0aq5y"; depends=[BiocParallel ellipse ggplot2]; };
-  ballgown = derive2 { name="ballgown"; version="2.10.0"; sha256="10x49g1di4q134k1ialxb992lq3asg8qiib08a125la5yfwr179y"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
-  bamsignals = derive2 { name="bamsignals"; version="1.10.0"; sha256="15id6mkj95skb4kfafvfs2j7ylydal60c3pspcl7llhwpq6vcqvl"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
-  banocc = derive2 { name="banocc"; version="1.2.0"; sha256="0cc1kx01mpn1gg5ym6lij77zf0canricj0lchvx1vq5as6qazrbh"; depends=[coda mvtnorm rstan stringr]; };
-  basecallQC = derive2 { name="basecallQC"; version="1.2.0"; sha256="1kvknsz0s35r5zfc4gn08jzl914l54pbn92cwxbnay598zfg0shz"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; };
-  baySeq = derive2 { name="baySeq"; version="2.12.0"; sha256="1d918rmbzqncr7jw6byr3xyqybvcsgcyf96immqcl1c5xvgmqn5z"; depends=[abind edgeR GenomicRanges]; };
-  beachmat = derive2 { name="beachmat"; version="1.0.2"; sha256="0b6dzja5fbx4dawb7ixj67mlhw4fy62pfp20mfp918fy96zmdwqz"; depends=[DelayedArray HDF5Array Rcpp rhdf5 Rhdf5lib]; };
-  beadarray = derive2 { name="beadarray"; version="2.28.0"; sha256="0azcqszgggcllwpib8vh9zkl393hikc2qfaq9izprpdrnsb5amqi"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
-  beadarraySNP = derive2 { name="beadarraySNP"; version="1.44.0"; sha256="15lr0mavyhnl0vzq4ndw2da6wxsvwrrrmrj9dzj1h8ml305m5r7w"; depends=[Biobase quantsmooth]; };
-  bgafun = derive2 { name="bgafun"; version="1.40.0"; sha256="1s3k333y7hxxkblkivi58gpxzd58divi01xv8sqdl2grvw0zj9d4"; depends=[ade4 made4 seqinr]; };
-  bgx = derive2 { name="bgx"; version="1.44.0"; sha256="0nbf0nnsv75a3zcwnl82wvg7ysbw8zsjk3zd7s5g61ma710smq07"; depends=[affy Biobase gcrma]; };
-  bigmelon = derive2 { name="bigmelon"; version="1.4.0"; sha256="1q8mp765bzj9bb9b25s2qn58z2iyy8956frwa0y8qz19hgg5iyvk"; depends=[Biobase gdsfmt GEOquery methylumi minfi wateRmelon]; };
-  bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.26.1"; sha256="17zic27wmdxxrfli0qmi0lggl1kspyk8nh02bbwkyv28ia6j3g9h"; depends=[bigmemory]; };
-  bioCancer = derive2 { name="bioCancer"; version="1.6.0"; sha256="1k6ppqr6dpibfk0hf55zz3rd2vfprh9fzmd3wwahx87nd7qj8n6m"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; };
-  bioDist = derive2 { name="bioDist"; version="1.50.0"; sha256="02y8dlkgjjryy73d04yqyf2aifsrivf5xmcn7i06qfch2w9fbnn9"; depends=[Biobase KernSmooth]; };
-  bioassayR = derive2 { name="bioassayR"; version="1.16.0"; sha256="1kzz10nzqgd3zjivnwnr6hwl2gsjvi14aslashvclcym1104vmxl"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
-  biobroom = derive2 { name="biobroom"; version="1.10.1"; sha256="095bkbqbd42bd6gnafwnahm9a9jg0cxa1ndnlx34v9yfwaxnjxk5"; depends=[Biobase broom dplyr tidyr]; };
-  biocGraph = derive2 { name="biocGraph"; version="1.40.0"; sha256="11lfiwgwlxp1b1yip4n320v6a31yvc2iy3c6jcq5h50ylc8srdyi"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
-  biocViews = derive2 { name="biocViews"; version="1.46.0"; sha256="09zyqj1kqc089lmh9sliy0acanx9zimcasvp71dsrg2bqm08r1md"; depends=[Biobase graph RBGL RCurl RUnit XML]; };
-  biomaRt = derive2 { name="biomaRt"; version="2.34.2"; sha256="1zlgs2zg0lmnk572p55n7m34nkxka8w10x8f2ndssjkffl2csy79"; depends=[AnnotationDbi httr progress RCurl stringr XML]; };
-  biomformat = derive2 { name="biomformat"; version="1.6.0"; sha256="0ss70nca7dadhjk0assrj6kqgwxrk9w7sxwynk2cmw8rn4kqiabs"; depends=[jsonlite Matrix plyr rhdf5]; };
-  biomvRCNS = derive2 { name="biomvRCNS"; version="1.18.0"; sha256="05lh0np314zhwd9imwkxfch5mn46964m4ws151x9r51siz262bmb"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
-  biosigner = derive2 { name="biosigner"; version="1.6.0"; sha256="0d6801vvw4778yjq0i5izgazm86h5v6xrfks4qrm3di0yh0nald9"; depends=[Biobase e1071 randomForest ropls]; };
-  biosvd = derive2 { name="biosvd"; version="2.14.0"; sha256="0xp032z4c1ws0hh52s67hxv254d6hn4kz9ggrkfwyjq0yby3s0lb"; depends=[Biobase BiocGenerics NMF]; };
-  biotmle = derive2 { name="biotmle"; version="1.3.0"; sha256="18012n55swz9grkpdkapklgzbxhqkxbrcc9nika3vvhfpwxi2n8l"; depends=[BiocParallel biotmleData DBI doFuture dplyr future ggplot2 limma magrittr Matrix SummarizedExperiment superheat SuperLearner tmle wesanderson]; };
-  biovizBase = derive2 { name="biovizBase"; version="1.26.0"; sha256="14l4vhj0a4ssr9m9zdzz3qpd4qw1mhgq5bmxq7jhrq3j9kmd6i2f"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  birta = derive2 { name="birta"; version="1.22.0"; sha256="1zwdgidcn82z5nnkzjr1p1z2vjl6bsajnisw7kz4w18br11rakwh"; depends=[Biobase limma MASS]; };
-  birte = derive2 { name="birte"; version="1.14.0"; sha256="1qlw1a0fd35b68kykvy1x6sr583n7qn88nixddsmkb963xvkksgv"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; };
-  blima = derive2 { name="blima"; version="1.12.0"; sha256="00c3kfs9l9qr2wxj8h3a1x6bngkkz0i8axmmsh2k12jp5b3fk0sx"; depends=[beadarray Biobase BiocGenerics Rcpp]; };
-  bnbc = derive2 { name="bnbc"; version="1.0.0"; sha256="1vy2331idwwlcx243nrx61bns0f9whn21yq25nxs4mn903qy0kyw"; depends=[BiocGenerics EBImage GenomeInfoDb GenomicRanges IRanges matrixStats preprocessCore Rcpp S4Vectors SummarizedExperiment sva]; };
-  branchpointer = derive2 { name="branchpointer"; version="1.4.0"; sha256="07qjlrdhj2qs65911cmvrd8q9dq077nk00m6vpnwx1fx0n0js6kf"; depends=[biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg38 caret cowplot data_table gbm GenomeInfoDb GenomicRanges ggplot2 IRanges kernlab plyr rtracklayer S4Vectors stringr]; };
-  bridge = derive2 { name="bridge"; version="1.42.0"; sha256="0axck328cvwzhwlzi500l42x58k09c8zb84zq6hngpwnvlpcyyjk"; depends=[rama]; };
-  bsseq = derive2 { name="bsseq"; version="1.14.0"; sha256="0j6nrb6syhdmyg9s7s8mbvfyagq7khxg7nwdi32w2hcdyp05hkr4"; depends=[Biobase BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit matrixStats permute R_utils S4Vectors scales SummarizedExperiment]; };
-  bumphunter = derive2 { name="bumphunter"; version="1.20.0"; sha256="0ag0h0xgja6fyind52hg5bcm482iv8rvwrnj7cfr0la1wndi2slh"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
-  caOmicsV = derive2 { name="caOmicsV"; version="1.8.0"; sha256="158jb9665151fm8dm6xs4cxv65wa2h7bn5ixhwqaa893wrlqjnh3"; depends=[bc3net igraph]; };
-  canceR = derive2 { name="canceR"; version="1.10.0"; sha256="0sgj40j9p6s14cmbp4gmlmqkjnfqigjilzbijlmfhcrg70ly3sqd"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
-  cancerclass = derive2 { name="cancerclass"; version="1.22.0"; sha256="07pxb2fsp9b9wa39xdsd5rddw9j9v20ai4hmsmwvm7mi4yr2r5b2"; depends=[binom Biobase]; };
-  casper = derive2 { name="casper"; version="2.12.0"; sha256="11xqxhjlgyk8pnlkscyc1prgvy707w5ls7n1bz1yjgqdg84nbv7m"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
-  categoryCompare = derive2 { name="categoryCompare"; version="1.22.0"; sha256="045xwg1h0jjbm4yd0f21c09ha91k6vzhrn3yqzzi4mhb07mpjczx"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; };
-  cbaf = derive2 { name="cbaf"; version="1.0.2"; sha256="0im83489xpbfppg9l46i6fv19ch41zccrf16gks2nyx64hrhllz3"; depends=[BiocFileCache cgdsr genefilter gplots RColorBrewer xlsx]; };
-  ccmap = derive2 { name="ccmap"; version="1.4.0"; sha256="185bvhmh9806lqd694dcrfl3mhn4k75kwnidsqs8ncqnb865hy01"; depends=[AnnotationDbi BiocInstaller ccdata data_table doParallel foreach lsa xgboost]; };
-  ccrepe = derive2 { name="ccrepe"; version="1.14.0"; sha256="0hpm9gcmc1pdd1rzg5l0jw1xswwqbaajkdnrvrdwbhcvl9jbk5yp"; depends=[infotheo]; };
-  cellGrowth = derive2 { name="cellGrowth"; version="1.22.0"; sha256="04cq203ab8yz32pjgh3b8kg7bzljqyjlyqxnfxl9ygk686jj4skm"; depends=[lattice locfit]; };
-  cellHTS2 = derive2 { name="cellHTS2"; version="2.42.0"; sha256="0c004givz5a0x7vxiqb6qz9a27qm53ggy6wwaaxplh9kzqjqszkx"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
-  cellTree = derive2 { name="cellTree"; version="1.8.0"; sha256="1c5mla2kf14c3pc02v16nlnhqmr2dh66l2liirc9myr7mgiqzaa8"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
-  cellbaseR = derive2 { name="cellbaseR"; version="1.2.0"; sha256="002af82q6blm65w8ig1sclp42mw6q6j3ag8vfv7zrxwxwxrsg9r3"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; };
-  cellity = derive2 { name="cellity"; version="1.6.0"; sha256="0szsa9q1znj5avyr2i83ih7m5hfq53786l9lmyxgc80mpzskj95s"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; };
-  cellscape = derive2 { name="cellscape"; version="1.2.0"; sha256="066lkswc296vvy0d3fdr2sp1s4s242jmnfj431vrqryvzv7678zm"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; };
-  cghMCR = derive2 { name="cghMCR"; version="1.36.0"; sha256="10c6cnm2qbg0gb3klfv1xlwhbzj9x6aimxg7jnz29fgnn3xnd8cs"; depends=[BiocGenerics CNTools DNAcopy limma]; };
-  charm = derive2 { name="charm"; version="2.24.0"; sha256="0zr96pwq7zd45lffl67fxvzrxhmjk8pmh8rfawhc7mmazds2ip9a"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
-  chimera = derive2 { name="chimera"; version="1.20.0"; sha256="0z50pwynvyx2gc619b7w6chwdb7pxs2gf1ywh9vp7vzghkdv0wx4"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  chimeraviz = derive2 { name="chimeraviz"; version="1.4.3"; sha256="1jwgra30lqi4zyyda2xcy7zkgnbidlxqfhh48bq8scfym0b34kjf"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db plyr RCircos RColorBrewer readr Rgraphviz rmarkdown Rsamtools S4Vectors]; };
-  chipenrich = derive2 { name="chipenrich"; version="2.2.0"; sha256="0q24il68grjqdxpy7qjk6lw6l5zlmw6yybrbrbb8l42gljyi6s74"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; };
-  chipseq = derive2 { name="chipseq"; version="1.28.0"; sha256="1ymcq77krwjzrkzzcw7i9909cmkqa7c0675z9wzvrrk81hgdssfq"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
-  chopsticks = derive2 { name="chopsticks"; version="1.42.0"; sha256="0awwk8k7vnsc0c1ic17m2mhmpin0s0ijd2gn7my9yysqzld9sncd"; depends=[survival]; };
-  chroGPS = derive2 { name="chroGPS"; version="1.27.3"; sha256="0glqisz3nzlrcvjryxf406dkiq6sg9bg1g3bcqqnmayirm92w5qv"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; };
-  chromDraw = derive2 { name="chromDraw"; version="2.8.0"; sha256="1lqrpbf322kxpx5068mw650ibzqksfmxc4j6q1fs4dv0ghpxdcsf"; depends=[GenomicRanges Rcpp]; };
-  chromPlot = derive2 { name="chromPlot"; version="1.6.0"; sha256="16qy1zqwlxc2pdkdb1jf8rknvr5cz2k4vbg2jybr6ks73pzagb47"; depends=[biomaRt GenomicRanges]; };
-  chromVAR = derive2 { name="chromVAR"; version="1.0.2"; sha256="08bp5wyxg5s9gjwnpymcahhy5rar64x385msczam62i1h1y95f8b"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
-  chromstaR = derive2 { name="chromstaR"; version="1.4.0"; sha256="1ky2z9v6gwwgzvd498ng9ac5s7x8nkgm5170gywr7bgw7lqrycjz"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; };
-  chromswitch = derive2 { name="chromswitch"; version="1.0.0"; sha256="1ym7vdj6lfwi4nja38lixm3vsxp296dpb90zwnmabws3dhysxhfy"; depends=[Biobase BiocParallel cluster DescTools dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats mclust NMF rtracklayer S4Vectors tidyr]; };
-  cisPath = derive2 { name="cisPath"; version="1.18.0"; sha256="0ya1kkvghs23c4rqydkas68a7y6z16ihjnv8ljjy9h3i7pdani4h"; depends=[]; };
-  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.16.0"; sha256="1r4iqnyrrjlx1crwy8ai7igkga3114nibqwj22kk364aqpr99jvv"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
-  cleaver = derive2 { name="cleaver"; version="1.16.0"; sha256="1zzlmq121xix1hqa0cr7swda15jj4p9b05k8fc3531c6znhfcscp"; depends=[Biostrings IRanges S4Vectors]; };
-  clippda = derive2 { name="clippda"; version="1.28.0"; sha256="0bzbws6wzvqalhcf7m29fnn01iqyavdgmfrfhhdvhi77253pggqk"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
-  clipper = derive2 { name="clipper"; version="1.18.0"; sha256="0mwmqc274hdwsskjianbnyzjk755kqc2s0m91g7rim43hqddgw4a"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
-  clonotypeR = derive2 { name="clonotypeR"; version="1.16.0"; sha256="079qgnprgzir8k94kxhq7xvv9hjnwlb7xgagcs71fr0rci0163pb"; depends=[]; };
-  clst = derive2 { name="clst"; version="1.26.0"; sha256="1h1dyd42k7m7r5gdf7ddf3c7v27k906xf6cv7nhvdf4d6nac73nw"; depends=[lattice ROC]; };
-  clstutils = derive2 { name="clstutils"; version="1.26.0"; sha256="19p0ral4xnf3gq99a0b4fc33fpngjll3pgr6ds3kkk00ynrwc3g6"; depends=[ape clst lattice rjson RSQLite]; };
-  clustComp = derive2 { name="clustComp"; version="1.6.0"; sha256="0gfddardn3ib4g2b70jk55hg09vjmwd182m013vnhl476896zpb3"; depends=[sm]; };
-  clusterExperiment = derive2 { name="clusterExperiment"; version="1.4.0"; sha256="07mcwjjff86d0jmj70za7j4h7kvs9j34s0z46rk5ivp71nxfnn4w"; depends=[ape cluster dendextend howmany kernlab limma locfdr matrixStats NMF phylobase RColorBrewer RSpectra stringr SummarizedExperiment]; };
-  clusterProfiler = derive2 { name="clusterProfiler"; version="3.6.0"; sha256="0667k479xc1c8b6gkhnki1z56pvp2v98r3ar4x5gbdv0kg9yby6s"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim magrittr plyr qvalue rvcheck tidyr]; };
-  clusterSeq = derive2 { name="clusterSeq"; version="1.2.0"; sha256="1akcknsn89cllfjpb09nr8b3aalfp7bhyd57cs5i327hdjwlbgna"; depends=[baySeq BiocGenerics BiocParallel]; };
-  clusterStab = derive2 { name="clusterStab"; version="1.50.0"; sha256="0rrzxq8gcxk828lx5kmicrd1qk5xfj0nlzs5233a0x9az5xhrj38"; depends=[Biobase]; };
-  cn_farms = derive2 { name="cn.farms"; version="1.26.0"; sha256="001nynrmi568vv82b83jlc9wys8bj5qa6xljj777wdpc48f8swjg"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
-  cn_mops = derive2 { name="cn.mops"; version="1.24.0"; sha256="157355f5x3wv8p1kdn527yyvgh2zs9rc733f0rldxc9fabrsk4lz"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
-  cnvGSA = derive2 { name="cnvGSA"; version="1.22.0"; sha256="0j7xhag1w64kzsmgpl5sz4grqcwffp84azhbx1gy3p83syxh8j4q"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
-  coGPS = derive2 { name="coGPS"; version="1.22.0"; sha256="0h4x9fa3glkrdakwyvzm07zx9w4cp1zrlxz8zhkq9k4j5n2n71c5"; depends=[]; };
-  coMET = derive2 { name="coMET"; version="1.10.2"; sha256="0ni5vsf1rwz52cmmh7p0kdjgyq295dyh1cyj1jj7jh8i44cghws3"; depends=[biomaRt colortools corrplot GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
-  coRNAi = derive2 { name="coRNAi"; version="1.25.2"; sha256="0npwxyy3bh8wz8zz94fz76aiiffg4l4lxhnjkz9nsgdn6r8n1ykk"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
-  cobindR = derive2 { name="cobindR"; version="1.16.0"; sha256="06r6wz7kpymdvghinimf2in0sxryyn3lmvdr6cmsnbc5pbzq4brs"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
-  codelink = derive2 { name="codelink"; version="1.46.0"; sha256="0j4k5b1bhif0rqqwv5kmqmc9rrgsvs659accimlp1n797raw78ds"; depends=[annotate Biobase BiocGenerics limma]; };
-  coexnet = derive2 { name="coexnet"; version="1.0.0"; sha256="12k0pkl4h410dhig9lpvpsbdhlsi5xbcqr981v7298dh7z4rxz4h"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; };
-  cogena = derive2 { name="cogena"; version="1.12.0"; sha256="1ngkr5qbjpxi90jfv8nnap11s2vy4wfpd1hiimcn1sf78i3kvpcg"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
-  compEpiTools = derive2 { name="compEpiTools"; version="1.12.0"; sha256="0mg02j9z55xq0vwy87kcbv100br88m3bxsbdvrlff46k6gdzj55g"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
-  compcodeR = derive2 { name="compcodeR"; version="1.14.0"; sha256="09q0vk6fb56vf5bnd2jh3c896pr4fihr5ib05ih8f7db052dxbf4"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
-  consensusOV = derive2 { name="consensusOV"; version="1.0.0"; sha256="0pzb232b5jq9rzy5gk6cf114hid04jdwaqvrn5rzazr1fabrlg5y"; depends=[Biobase gdata genefu GSVA limma matrixStats randomForest]; };
-  consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.6.0"; sha256="1565azz566mbc1yvraingqx42830775i21vp74xn9ldaqywaqizd"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; };
-  contiBAIT = derive2 { name="contiBAIT"; version="1.6.0"; sha256="0by6qdmj4hs0mdjh4fia57m6ds50g2xaf5k8wc06w9ws47ryrqcs"; depends=[BH BiocParallel clue cluster colorspace diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; };
-  conumee = derive2 { name="conumee"; version="1.12.0"; sha256="12pa1zf4v3kkpq1k34x45d1nakm3afh9rsc8byz53j3w97wdwpy4"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; };
-  convert = derive2 { name="convert"; version="1.54.0"; sha256="0h74byyd87kd3hr902y4n93lvrq07p8iwkzcmj9m4pbpnmlpahi4"; depends=[Biobase limma marray]; };
-  copa = derive2 { name="copa"; version="1.46.0"; sha256="0aamwvm0qq4dsr14glzlnhqx90ljh820rgh5r4gppww5q040dw75"; depends=[Biobase]; };
-  copynumber = derive2 { name="copynumber"; version="1.18.0"; sha256="01kcwzl485yjrkgyg8117b1il957ss0v6rq4bbxf4ksd5fzcjmyx"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
-  coseq = derive2 { name="coseq"; version="1.2.0"; sha256="1jw6xmw32q6jdy8ypircd5q9grllh9bsgq0ga6n4a9qbv23syd9p"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 gridExtra HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; };
-  cosmiq = derive2 { name="cosmiq"; version="1.12.0"; sha256="1g51zbi73hmc2nacai46if123kxlc1wdax0nq9ixipmyrqby74xm"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; };
-  covEB = derive2 { name="covEB"; version="1.4.0"; sha256="0wgimjzzysms0ccpaay36w5ad9pw1ip8imb2hxv4a86913agk1xv"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; };
-  covRNA = derive2 { name="covRNA"; version="1.4.0"; sha256="0813fb4yr4ya5rp1lx2av7c6svpsdp7m6aq8rddxp9qbrcqpjz7v"; depends=[ade4 Biobase genefilter]; };
-  cpvSNP = derive2 { name="cpvSNP"; version="1.10.0"; sha256="1akyp9fdyi6sa9sf1c8rw43alvfx3dkdhqp1mifd6dz6q6030wd8"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
-  cqn = derive2 { name="cqn"; version="1.24.0"; sha256="1iw4a3f3hysbhgilv424yvglq0rj9vyryd0riq0ifzmg9dhim11n"; depends=[mclust nor1mix preprocessCore quantreg]; };
-  crisprseekplus = derive2 { name="crisprseekplus"; version="1.4.1"; sha256="1n9rl417pqlvcwlmbafw9gbjanxi9dynkcwb3zx8nak6mgy24y5c"; depends=[AnnotationDbi BiocInstaller BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; };
-  crlmm = derive2 { name="crlmm"; version="1.36.0"; sha256="0i9094kkvxkg3djqvyv2sqfmpvyl5hlcwscas2pmkz6vn2ld1f9s"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-  crossmeta = derive2 { name="crossmeta"; version="1.4.0"; sha256="08pj8jnrrpmrq11ljj0szrw985qhgnj42kawah1jg1siry3l2pqb"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocInstaller ccmap data_table doParallel doRNG DT fdrtool foreach GEOquery ggplot2 limma matrixStats metaMA metap miniUI oligo pander plotly RColorBrewer rdrop2 reshape shiny stringr sva]; };
-  csaw = derive2 { name="csaw"; version="1.12.0"; sha256="0jw4dncqwf35fg6sf2syj9pwm9wrm0yc9wgichjwrh11ya9zfk49"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
-  ctc = derive2 { name="ctc"; version="1.52.0"; sha256="0brqh8m0yj7i3794mmrh3bi2mkbhzpg52j7h8qiqyjh7y2l1i3kg"; depends=[amap]; };
-  ctsGE = derive2 { name="ctsGE"; version="1.4.0"; sha256="1hxgh559lqa2f80p73mcyz8k6l20hykyk7rmyhi7j9wa21y2mzwv"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; };
-  cummeRbund = derive2 { name="cummeRbund"; version="2.20.0"; sha256="01v920fps6snqpn7gaairq1y76zfjcdya6j9pb9mfw2hkm8gad40"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; };
-  customProDB = derive2 { name="customProDB"; version="1.18.0"; sha256="0n7rjhvaqcg19qb40i4pwfqv62xzc8gj1y4v0qd9kyff1kh7dkxz"; depends=[AhoCorasickTrie AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; };
-  cycle = derive2 { name="cycle"; version="1.32.0"; sha256="03c3vr0mk5wyb77x3ypxqsaz2x16l9hasnakx3zbf6z8qrx92nss"; depends=[Biobase Mfuzz]; };
-  cydar = derive2 { name="cydar"; version="1.2.1"; sha256="0pxnq8g649ki4697xzydfvqyanzfxjzlcf8lbsnyx46fzqy39zwk"; depends=[Biobase BiocParallel flowCore Rcpp S4Vectors shiny SummarizedExperiment viridis]; };
-  cytofkit = derive2 { name="cytofkit"; version="1.10.0"; sha256="08lrnin6jpyjjgkmw2d71zvrsv0al10g28cqjcwwn9m6ax3nkf79"; depends=[Biobase colourpicker destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny shinyFiles vegan VGAM]; };
-  cytolib = derive2 { name="cytolib"; version="1.0.1"; sha256="1yyrh5f67qslqsi3pqrw9ffz31sglp7jj5m83mhsjlpk4w20fv7i"; depends=[BH RProtoBufLib]; };
-  dSimer = derive2 { name="dSimer"; version="1.4.0"; sha256="1rgmdc4q8vwdph1szzd3gzcdc53pr1w037yc19vgqm16ip2ryhff"; depends=[AnnotationDbi ggplot2 GO_db igraph org_Hs_eg_db Rcpp reshape2]; };
-  daMA = derive2 { name="daMA"; version="1.50.0"; sha256="1hqqm4x8w65xv0kdqh14a0mh24p71k934rh8c70bi025rxn3pq76"; depends=[MASS]; };
-  dada2 = derive2 { name="dada2"; version="1.6.0"; sha256="0lcfwh26cy1fpjxq2i5jb60rs4s0jnv8l9cxijqaakbs3xhmzdkr"; depends=[Biostrings data_table ggplot2 Rcpp RcppParallel reshape2 ShortRead]; };
-  dagLogo = derive2 { name="dagLogo"; version="1.16.1"; sha256="1bvqpx0bxp4b0vzjf8zhbxphqpf4sggjn10d27pd462qpfg1wkaj"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
-  dcGSA = derive2 { name="dcGSA"; version="1.6.0"; sha256="1xi3hx06bd376cfyclpk7crxa8crwkxk276vcssr681w0fhnrk06"; depends=[BiocParallel Matrix]; };
-  ddCt = derive2 { name="ddCt"; version="1.34.0"; sha256="0h6s2x9xa5mnvp653pv0qsk3yq7pdvdiqz0321q08hz7ai0r7vdd"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
-  ddgraph = derive2 { name="ddgraph"; version="1.21.0"; sha256="09m60a85cyjx4hjxqvp9qz1y2jkqwpafxy95l80xmqygal5d4jc4"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; };
-  debrowser = derive2 { name="debrowser"; version="1.6.8"; sha256="11ra9rppy6japi10xy523g7a72cj2zkjb9c9581wy4wrw2kym2rj"; depends=[annotate AnnotationDbi baySeq clusterProfiler d3heatmap DESeq2 DOSE DT edgeR GenomicRanges ggplot2 ggvis googleAuthR gplots igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva V8]; };
-  deepSNV = derive2 { name="deepSNV"; version="1.24.0"; sha256="16k8wv495fx5qq1xnv4da9bbkp90jbqklry2zynz1fmfhfxcdmvn"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
-  deltaGseg = derive2 { name="deltaGseg"; version="1.18.0"; sha256="1bmm83n8sw16492nzhbh585crzrrwajcfbm2yr8kgbnnv370x3rj"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
-  derfinder = derive2 { name="derfinder"; version="1.12.6"; sha256="1bp8qw3m5crncwz586b4f4w1x0kcm6r39md3w8il2d9xlvjvmml0"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
-  derfinderHelper = derive2 { name="derfinderHelper"; version="1.12.0"; sha256="06aj2h98vm27pc1laxi7pjxhwxm756scl2r9d8f1x1gsg2aa0k1b"; depends=[IRanges Matrix S4Vectors]; };
-  derfinderPlot = derive2 { name="derfinderPlot"; version="1.12.3"; sha256="1p0pqy2rdd4lmz91gyxwcm1gpnyb89qzy9j9fsm1jy84iaanan40"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; };
-  destiny = derive2 { name="destiny"; version="2.6.2"; sha256="18id35mjlwnavqi04lzr47vj6y3j8y8g1rxb6hdc6dklajnvyyln"; depends=[Biobase BiocGenerics ggplot2 Hmisc igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother VIM]; };
-  dexus = derive2 { name="dexus"; version="1.18.0"; sha256="1l9x51w1q58zvh53slcmw8rbb2v1sii380acap1frp4idi56wmig"; depends=[BiocGenerics]; };
-  diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.60.0"; sha256="0bfs3n9crca46q0cgkpknl4xf5vc4dr5anly9kn77prb1zp9b0p3"; depends=[minpack_lm]; };
-  diffHic = derive2 { name="diffHic"; version="1.10.0"; sha256="0j7vmgpxakzk3gazdy06xhpcqnb19pib0jxfz67nc7fgkyrmhzqi"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
-  diffloop = derive2 { name="diffloop"; version="1.6.0"; sha256="0gv6wimcdfnbzqi0d5j8af6siqcqgaa7asmkz2nr6lvcicp3b6nc"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; };
-  diffuStats = derive2 { name="diffuStats"; version="0.102.0"; sha256="08dhygy58rr7zb8r2vrrxfdrdcyzdjwmafz0q0y65ay4zxn2s4w0"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; };
-  diggit = derive2 { name="diggit"; version="1.10.0"; sha256="06swg9sz8csim6nq5cdpx9aqzsrfi1yhid4yb61ivyxf9p5hl1rn"; depends=[Biobase ks viper]; };
-  discordant = derive2 { name="discordant"; version="1.2.0"; sha256="105lwz17r2vjzd9qz869p8qrjabac418nj6hxx8n8dxbykgyxihq"; depends=[Biobase biwt gtools MASS]; };
-  dks = derive2 { name="dks"; version="1.24.0"; sha256="1fd4lyzfgf8iz3aqgayvvf2n166aq1hl57b6syfwazi42xfjxlhk"; depends=[cubature]; };
-  domainsignatures = derive2 { name="domainsignatures"; version="1.38.0"; sha256="19c8n4xrwh9f46a5b41g7rp9h1inf9yjw0kr9ihd70gspbizx0h3"; depends=[AnnotationDbi biomaRt KEGG_db prada]; };
-  doppelgangR = derive2 { name="doppelgangR"; version="1.6.0"; sha256="0hk01sayqnqidx768kgassdpqfavckbksgd40qf4jn9xaxq5a18f"; depends=[Biobase BiocParallel digest impute mnormt sva]; };
-  dualKS = derive2 { name="dualKS"; version="1.38.0"; sha256="007h6bnm01h75gxzwxg8jwzzpsfa69b8wzf5ds3grnsx8c7rm9rv"; depends=[affy Biobase]; };
-  dupRadar = derive2 { name="dupRadar"; version="1.8.0"; sha256="17b00ddsdnmhlba5rfylaxs3i5hfm6h959n6mmch4j02iy10bdpn"; depends=[Rsubread]; };
-  dyebias = derive2 { name="dyebias"; version="1.38.0"; sha256="18mliq9ja1mdl18m0ys52fri1pjw6bj9zx3s3mc623kiki5zc4jk"; depends=[Biobase marray]; };
-  easyRNASeq = derive2 { name="easyRNASeq"; version="2.14.0"; sha256="11l0bj9wcp5k0a5nq0adn4w891cllfdn7qrqg76k7klx5h0p37bx"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
-  ecolitk = derive2 { name="ecolitk"; version="1.50.0"; sha256="0xagah7nrj6dghl2ib75l8wlwj7kzdssnlbpjdwhm67nsys3hvx4"; depends=[Biobase]; };
-  edge = derive2 { name="edge"; version="2.10.0"; sha256="1knr03yiw0cq0kj9hklmkaap4qiphm2ph51bjn1m5cn7nyckramz"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
-  edgeR = derive2 { name="edgeR"; version="3.20.9"; sha256="0y52snwbz37xzdd7gihdkqczbndlfzmmypv6hri3ymjyfmlx6qaw"; depends=[limma locfit Rcpp]; };
-  eegc = derive2 { name="eegc"; version="1.4.0"; sha256="1v3586qddx1l74ha083x36m3lqdblrhmwd63k22jzfpkh30adz09"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; };
-  eiR = derive2 { name="eiR"; version="1.18.0"; sha256="1ypd7yq9c6mqp7nm984dm60qzvwy4qb81zrp2mvp7g87c5vdj2a3"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; };
-  eisa = derive2 { name="eisa"; version="1.30.0"; sha256="11ydmv5kddq75sknbax1aiyxq60rx146qa7pd3m09axjzvk83mq5"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
-  ensemblVEP = derive2 { name="ensemblVEP"; version="1.20.1"; sha256="0785hhfsgmnkangcq6lg48kdr5pifxs6j9v6apv80457k70d7ybv"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
-  ensembldb = derive2 { name="ensembldb"; version="2.2.2"; sha256="1yngndkf3588z91z0a2fvkg423p26ajm6xv1p27x0l9mzhhaqq3k"; depends=[AnnotationDbi AnnotationFilter AnnotationHub Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; };
-  epiNEM = derive2 { name="epiNEM"; version="1.2.0"; sha256="0d3r4m0q3w2ljf4bm03z1dpiiih9cshzpbi4nnqq3jwls82f7nlq"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; };
-  epigenomix = derive2 { name="epigenomix"; version="1.18.0"; sha256="0x567fxak38ngy5hs3x567381aigh1x1fb8ww8xvmpf2wlzrlfwp"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; };
-  epivizr = derive2 { name="epivizr"; version="2.8.0"; sha256="088f28jscw2w5p06jhp2qxjfpwscrf0kbq5lnlnmmshc1ghbmdvw"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; };
-  epivizrChart = derive2 { name="epivizrChart"; version="1.0.0"; sha256="1xgqv1gqb8fksp43313fsmgb73h8z568s28zd039a7d7v4pi0n0v"; depends=[epivizrData epivizrServer htmltools rjson]; };
-  epivizrData = derive2 { name="epivizrData"; version="1.6.0"; sha256="101ibx9nq17dnn5j8kjy31pm8ly4nyzs1rrlbsvk0140avjhz154"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
-  epivizrServer = derive2 { name="epivizrServer"; version="1.6.0"; sha256="0qa13yvq9ywa3m1n2vmi60087cgg18rpnqbr1m7f137ivnxyb11b"; depends=[httpuv mime R6 rjson]; };
-  epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.6.0"; sha256="0rbd2kmdi0y97mx72gkg93s97slfig1k1bgcv5maknsqqqcwzz8j"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
-  erccdashboard = derive2 { name="erccdashboard"; version="1.12.1"; sha256="19fg4n99w983wp6ffmzadzfp1bzmsn8papb5szbrxz102r2mq6df"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; };
-  erma = derive2 { name="erma"; version="0.10.1"; sha256="1fi8nc6fbd7i4p9i9hli31xplmdpsxqcdrb8v3nf8fx9klllbdav"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; };
-  esATAC = derive2 { name="esATAC"; version="1.0.23"; sha256="1g2pai0b98dfnng4h7w2xs73qp2dqacmx8x3ackqi6a515x0cyaf"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
-  esetVis = derive2 { name="esetVis"; version="1.4.0"; sha256="1yb238lxy8sqmxim3zd25rp642cpz8p25vdffjlija2wivq8phn1"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
-  eudysbiome = derive2 { name="eudysbiome"; version="1.8.0"; sha256="13ayrigzy55h6an3am9f77r6mzcvyfcpxpby71xilhaf6mjhyj39"; depends=[Biostrings plyr R_utils Rsamtools]; };
-  exomeCopy = derive2 { name="exomeCopy"; version="1.24.0"; sha256="17rpa7mck2rrivrv5vqk4abb094v79v8dbzh6n5dj4hnw53b9wif"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
-  exomePeak = derive2 { name="exomePeak"; version="2.13.2"; sha256="01fz3icmwq0zblvl070vmhr6fm0nxgzrvyl5xr68sv234by2nml7"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
-  explorase = derive2 { name="explorase"; version="1.42.0"; sha256="1xqilix4fn603p0lqrdgl6npc5j0fcy8rcc37clzl3sm4mfklhdd"; depends=[limma rggobi RGtk2]; };
-  fCCAC = derive2 { name="fCCAC"; version="1.4.0"; sha256="0fnjh0h4hn9qzz9f3hc09piwiizsf5ljz82k8f30c81d65bhx6qj"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; };
-  fCI = derive2 { name="fCI"; version="1.8.0"; sha256="0p85pya1k37qjnvbjqg96ydip7dd1xkw9zxj35fyw3hxsbrd0d7g"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
-  fabia = derive2 { name="fabia"; version="2.24.0"; sha256="1c4kfn2gdwg72ypyfvsqbgk2pl4qqhr6pjnzd7xla9w1whlkag07"; depends=[Biobase]; };
-  facopy = derive2 { name="facopy"; version="1.12.0"; sha256="1m3sj06p9inl3p1aslj7ybx7hrc6zm9zxb2bdvxwyn1wwlgkcx35"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz S4Vectors scales]; };
-  factDesign = derive2 { name="factDesign"; version="1.54.0"; sha256="1hpdf64ghfnpb2rd6qmha8yh5vy2gcnh8jk1pgj951k5vcxrx9zc"; depends=[Biobase]; };
-  farms = derive2 { name="farms"; version="1.30.0"; sha256="0k5nygacdj38qw828xn417ahbsanf074r5pknl34l66f4vggpkv2"; depends=[affy Biobase MASS]; };
-  fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.14.0"; sha256="05cyryfbkww757y15wg08iblm1vv3sfgkb54kfviyc5lg8r789kr"; depends=[doParallel Hmisc impute LiquidAssociation preprocessCore WGCNA]; };
-  fastseg = derive2 { name="fastseg"; version="1.24.0"; sha256="0dd7nr3klwz9ailwshnbynhd62lwb8zbbpj6jf3igpb94yi6x2jp"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; };
-  fdrame = derive2 { name="fdrame"; version="1.50.0"; sha256="1nnaibcxkfr6nzw7vm5ihhbzzcvvg2y9r65msy02k1x5gwd6ca43"; depends=[]; };
-  ffpe = derive2 { name="ffpe"; version="1.22.0"; sha256="0c0l1wb4ydxz6rddvg0bv9j75dv892mm452imm3lh7s5q0gq6004"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
-  fgsea = derive2 { name="fgsea"; version="1.4.1"; sha256="187c8xckx0s1p19i85nsiapgb3mppjqxp7zyld5hqyjvw3zcdj50"; depends=[BiocParallel data_table fastmatch ggplot2 gridExtra Rcpp]; };
-  flagme = derive2 { name="flagme"; version="1.34.0"; sha256="15rbh6v22mjg9ms6kkl7z056k3bm117klw16hl69mjpd3crcs1by"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; };
-  flipflop = derive2 { name="flipflop"; version="1.16.0"; sha256="1fwvffjgf45plchwkcmfi298y2nf4ynd7dxrb2xlcw4gzx6b3ghs"; depends=[GenomicRanges IRanges Matrix]; };
-  flowAI = derive2 { name="flowAI"; version="1.6.3"; sha256="1xczc62ifjq4zr5xyjhf96rp8anzw2sfg0jmgplzs0na05d4601g"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 scales]; };
-  flowBeads = derive2 { name="flowBeads"; version="1.16.0"; sha256="06jcflmdbm9f8zjh2vxbi093v16hqyi5q0c0fmvg59384p9z0315"; depends=[Biobase flowCore knitr rrcov xtable]; };
-  flowBin = derive2 { name="flowBin"; version="1.14.0"; sha256="1svbph6drm4lb5k8l8x2sjl4bfanyrjy1f5nky7rrgqb00hhdq5h"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
-  flowCHIC = derive2 { name="flowCHIC"; version="1.12.0"; sha256="12yl4jwxy6mz047yqvzwkvp1yy4d323flzmpgfpv6v3pvz7x82lq"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
-  flowCL = derive2 { name="flowCL"; version="1.16.2"; sha256="1zaic9cf7xw4qmdcrhi9a9zcxvxlnn9iii0a6lnwwkpsspgn1bnj"; depends=[graph Rgraphviz SPARQL]; };
-  flowClean = derive2 { name="flowClean"; version="1.16.0"; sha256="1crpgaw1bilvgcyr93c2qx6jbx18ca52dzr6r8cqznlfxdnz48jj"; depends=[bit changepoint flowCore sfsmisc]; };
-  flowClust = derive2 { name="flowClust"; version="3.16.0"; sha256="1c8ppgy4i42l250m71ri3gbw8mw1yw2saplx9wrhnykvwxnsx210"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-  flowCore = derive2 { name="flowCore"; version="1.44.2"; sha256="09vp822nrhyfxibwh22g2rdl4yv6n4w1rm7hy9hkz8rsbpbdbwv4"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
-  flowCyBar = derive2 { name="flowCyBar"; version="1.14.0"; sha256="06wzxlw02x5nzn5qc91yjawrmimsns2kmw4rm3rgbh10d4qh8r09"; depends=[gplots vegan]; };
-  flowDensity = derive2 { name="flowDensity"; version="1.12.0"; sha256="1df181ilq7mnwlfvyjjvgd262f2sq09c5wg5fpf531m5jiaj6qpk"; depends=[car flowCore flowWorkspace GEOmap gplots RFOC rgeos sp]; };
-  flowFP = derive2 { name="flowFP"; version="1.36.0"; sha256="0kpw90pxappz3mbidfqjv8l6cpc4qg2hgi1wqh4rzx8b2bdl5a8f"; depends=[Biobase BiocGenerics flowCore flowViz]; };
-  flowFit = derive2 { name="flowFit"; version="1.16.0"; sha256="0ssyzfngfx31p7v96hgzfzc94n081fll97r6i44pycg42j9bkf6k"; depends=[flowCore flowViz gplots kza minpack_lm]; };
-  flowMap = derive2 { name="flowMap"; version="1.16.0"; sha256="1gpxvnil740xnhiphgammis89819vf5s9q06nchwh92j2phj8afr"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
-  flowMatch = derive2 { name="flowMatch"; version="1.14.0"; sha256="0x0719w1k42v9v3i717hyvf3wqii6ldrjmjpvak6jl7w2kn4yfn3"; depends=[Biobase flowCore Rcpp]; };
-  flowMeans = derive2 { name="flowMeans"; version="1.38.0"; sha256="0mqgblmfili3nxnfz5h0hrhdl6wz4ylnslyx17kw7pyd0wskd26v"; depends=[Biobase feature flowCore rrcov]; };
-  flowMerge = derive2 { name="flowMerge"; version="2.26.0"; sha256="0lpgipgrirhc5i5qzby1krg7vbd4jg566y3i5k18lxsccws12zx6"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
-  flowPeaks = derive2 { name="flowPeaks"; version="1.22.0"; sha256="0cs0sbs9cx3syjv3dhl9b56s8ccpb00cwz9z18j31yaijl1h13vi"; depends=[]; };
-  flowPloidy = derive2 { name="flowPloidy"; version="1.4.2"; sha256="15z3laz0g3agv9dhga29myhmri5w6ivj10rivq4r0kv7lql1wzlx"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
-  flowPlots = derive2 { name="flowPlots"; version="1.26.0"; sha256="0bg523vxnk3kjwwplqykamdfqmyr7b0laxkml06rfr0rbj5lcdc5"; depends=[]; };
-  flowQ = derive2 { name="flowQ"; version="1.38.0"; sha256="1vxc7fn747x7i2v0nv821nx9z1d5d4dyd6fa0vbmn7smjkbdxbzd"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
-  flowQB = derive2 { name="flowQB"; version="2.6.0"; sha256="04hjsswngbxi40rxcb13hzvzm8y7yzpr6qzwhnishp0a5614rzka"; depends=[extremevalues flowCore]; };
-  flowStats = derive2 { name="flowStats"; version="3.36.0"; sha256="0l5czm38d2vscw4hbnd79y57gjhdymqjy8kyq86s5g6h4kzir4x7"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow]; };
-  flowTime = derive2 { name="flowTime"; version="1.2.0"; sha256="0308bdkyc1q5s9aasmxdxqh8gzwcmxxdnsamyjl6dkm62s64cf7j"; depends=[flowCore plyr]; };
-  flowTrans = derive2 { name="flowTrans"; version="1.30.0"; sha256="0sjpsv908v4gxi55acmmx5c07923adn2p1x8z3bisxv2pwx1n5fw"; depends=[flowClust flowCore flowViz]; };
-  flowType = derive2 { name="flowType"; version="2.16.0"; sha256="16z3yxqsgvnwchnfd7bnkj403xxhdifiv8a0ddisy9y1rnil2qpj"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
-  flowUtils = derive2 { name="flowUtils"; version="1.42.0"; sha256="0d4ab30xp722h9avi785wj8z1qz7dy65z5faqf3jc6j6v40bzikq"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
-  flowVS = derive2 { name="flowVS"; version="1.10.0"; sha256="07vcqcxzd9cw4hvc1yld2v05zcxqs5p9spka2l80pmsjr0aij043"; depends=[flowCore flowStats flowViz]; };
-  flowViz = derive2 { name="flowViz"; version="1.42.0"; sha256="1fbr0snid9vgb133sb5dwkk469n465p8r490r67vsmm8wqsf6iyl"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-  flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.9"; sha256="04vs7knal0mrlj0rxpq5p3x1243ji0191zf0xmvk9689m94ib2za"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
-  flowcatchR = derive2 { name="flowcatchR"; version="1.12.0"; sha256="0i6r86b1g98kaw8nhbnjjrw8gw6vvhfpr5r7dn4whl4hwlizc5qx"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
-  fmcsR = derive2 { name="fmcsR"; version="1.20.0"; sha256="0cbbil337zbb968zibkysrmpc8bwlpn7rl908zyvzvj8v11lxzcc"; depends=[BiocGenerics ChemmineR RUnit]; };
-  focalCall = derive2 { name="focalCall"; version="1.12.0"; sha256="07lb0ijdsryd31dxp5fgp393p9f21b7in3rnf9j43qn8wmz48hnl"; depends=[CGHcall]; };
-  frma = derive2 { name="frma"; version="1.30.1"; sha256="0319m8l7n2sfp4m6zipm7pkc57xikb735qk605m952m8ra08v8ml"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
-  frmaTools = derive2 { name="frmaTools"; version="1.30.0"; sha256="02z7igfcvhjg9f36snmmif8d7lsca9n9izg8zc543hcy7s704aa2"; depends=[affy Biobase DBI preprocessCore]; };
-  funtooNorm = derive2 { name="funtooNorm"; version="1.2.0"; sha256="09n7vq5f26px57sy35s29b8pmb9wcx6kii0h0i354sr3yg21ccpc"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; };
-  gCMAP = derive2 { name="gCMAP"; version="1.22.1"; sha256="0va9jixmp3v001gnym3clyjwarxs5d31vnyklzv31n5zffd7dm3l"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
-  gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.18.0"; sha256="152nd7vxz3cja8xmg5rq4j08lvd7cw1y09a737bfdq1zwrxc22v8"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
-  gCrisprTools = derive2 { name="gCrisprTools"; version="1.6.0"; sha256="0x7bsnhs3qwimfkkxr8yslawdfy83x5ip8j2wlwq4m9hqwqk060g"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; };
-  gQTLBase = derive2 { name="gQTLBase"; version="1.10.0"; sha256="1756vfcj2dkkgcmfkkg7qdaig36dv9gfvpypn9rbrky56wm1p035"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  gQTLstats = derive2 { name="gQTLstats"; version="1.10.1"; sha256="0gvq1sf2zjbkk431x40z6wql3c1rpclnnwa2f1hvykb8mmw70kmq"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr erma ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggbeeswarm ggplot2 gQTLBase HardyWeinberg IRanges ldblock limma mgcv plotly reshape2 S4Vectors shiny snpStats SummarizedExperiment VariantAnnotation]; };
-  gaga = derive2 { name="gaga"; version="2.24.0"; sha256="1fzk3f4n612iwhxvzd81igl62hb674cjac959ivp8gjx8akw5jpx"; depends=[Biobase coda EBarrays mgcv]; };
-  gage = derive2 { name="gage"; version="2.28.2"; sha256="0h0mlhns9j7cpfksvdlvx9jb7szm3r1dwqb3s4s8p8hmkb9byyii"; depends=[AnnotationDbi graph KEGGREST]; };
-  gaggle = derive2 { name="gaggle"; version="1.46.0"; sha256="0x6xydavk1dfdqrl97xawq5difaa4v9lhy11941bvfaa9xz01jpv"; depends=[graph rJava RUnit]; };
-  gaia = derive2 { name="gaia"; version="2.22.0"; sha256="160l7df4my5n29z2x9579dh0519vyk4d5m4hpmjacr9bh5r9n3va"; depends=[]; };
-  garfield = derive2 { name="garfield"; version="1.6.0"; sha256="0lrlk42ic38my0gkkyakkxaxijs6rykkwhvka9zay82spcszmqv8"; depends=[]; };
-  gaucho = derive2 { name="gaucho"; version="1.14.0"; sha256="0yf7y9qipdnzcll34q93dyi7q7bmq0iwg38s74d3984wjsqj3l61"; depends=[GA graph heatmap_plus png Rgraphviz]; };
-  gcapc = derive2 { name="gcapc"; version="1.2.0"; sha256="0qa9yy6ljnbmb3a5wlwx75p8bwi665d24i029b9drw72zwqv4v81"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; };
-  gcatest = derive2 { name="gcatest"; version="1.8.0"; sha256="0spcxaj4finimyv812j13xp3nxj249blwwaxl308bd84kqd02pnn"; depends=[lfa]; };
-  gcrma = derive2 { name="gcrma"; version="2.50.0"; sha256="1s2njjcvqm9siwga20f1z49lhk4cg13chzbk8sfdnvwi57yr6rwh"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-  gdsfmt = derive2 { name="gdsfmt"; version="1.14.1"; sha256="0d7yj5jm5kyw2jkbrzsyzzx1iw6lg4rbdyrvl7g62bjig6wvk0z1"; depends=[]; };
-  geNetClassifier = derive2 { name="geNetClassifier"; version="1.18.0"; sha256="14qvrjbcvkqp2azfqi33y7pwg4wlf1vabddbirinw73za5b4jf48"; depends=[Biobase e1071 EBarrays minet]; };
-  geecc = derive2 { name="geecc"; version="1.12.0"; sha256="1njvcwfdbpvmvvx8lcfw0baigjldr0v0rkqbk2rhb0h6wsiljfm2"; depends=[gplots hypergea MASS Rcpp]; };
-  genArise = derive2 { name="genArise"; version="1.54.0"; sha256="101dammhv29w78cm2xylln4s7rzcy6sqw44navzs260xccdipxab"; depends=[locfit tkrplot xtable]; };
-  genbankr = derive2 { name="genbankr"; version="1.6.1"; sha256="1f88ix4c4pfy5hhc2wlj2zrdz1jjfzzkrj4swk34ril24gf6av2z"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
-  geneAttribution = derive2 { name="geneAttribution"; version="1.4.0"; sha256="11p8zqmmcfccl0fnyjm5kv8rbasamj6mra3bvk5jxsi4cqmbx9wx"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; };
-  geneClassifiers = derive2 { name="geneClassifiers"; version="1.2.0"; sha256="1canrqw0g6v32vy2p2xd4pz6kw5k2zyzgff5ii0p86w519dzg16v"; depends=[Biobase BiocGenerics]; };
-  geneRecommender = derive2 { name="geneRecommender"; version="1.50.0"; sha256="16cf2zkjffmdr2lhm7b4ckcw6p0kx40whw36m6y9510i8pmzy3y9"; depends=[Biobase]; };
-  geneRxCluster = derive2 { name="geneRxCluster"; version="1.14.0"; sha256="0r0lnhf19qw1d4p87632lz0rgx0d9q3cakpd6qh43b10fil7wjgp"; depends=[GenomicRanges IRanges]; };
-  geneXtendeR = derive2 { name="geneXtendeR"; version="1.4.0"; sha256="02a3aqn115l85cnvxy16ppri4hwir6mcp1av6s00nj66afxxnzmv"; depends=[AnnotationDbi data_table dplyr GO_db networkD3 org_Ag_eg_db org_Bt_eg_db org_Ce_eg_db org_Cf_eg_db org_Dm_eg_db org_Dr_eg_db org_Gg_eg_db org_Hs_eg_db org_Mm_eg_db org_Mmu_eg_db org_Pt_eg_db org_Rn_eg_db org_Sc_sgd_db org_Ss_eg_db org_Xl_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; };
-  genefilter = derive2 { name="genefilter"; version="1.60.0"; sha256="173swlg6gj4kdllbqvyiw5dggbcxiwlwpqmllsv4dxzn7h25i3g7"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
-  genefu = derive2 { name="genefu"; version="2.11.2"; sha256="1z70pnzgci0sjpr8vsvyg93zrjim7jh9jmba0p3pgqp3qw4gbi34"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
-  geneplast = derive2 { name="geneplast"; version="1.4.0"; sha256="12ncf9rpnv1mwmdw4rbzzhggppcnzch764aiipy0jb21ix9xj61q"; depends=[ape snow]; };
-  geneplotter = derive2 { name="geneplotter"; version="1.56.0"; sha256="1z3g7frc1iviwrsv2dlm4nqvkc0685h4va0388yfxn102ln8wwma"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
-  genoCN = derive2 { name="genoCN"; version="1.30.0"; sha256="0m4sj2w0zra67d939knzriwda0nwphzspsmnl9jakl0kq8dvhjki"; depends=[]; };
-  genomation = derive2 { name="genomation"; version="1.11.3"; sha256="1d2g1v6xhrf3gm86pv8ln22df5g6v6k6i4i39v4j82zn4apany6v"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer RUnit S4Vectors seqPattern]; };
-  genomeIntervals = derive2 { name="genomeIntervals"; version="1.34.0"; sha256="11jlmfy8i245s3bnkcg49s8vrqfkrp5w2ibxdcixyckm7pzrv29r"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
-  genomes = derive2 { name="genomes"; version="3.8.0"; sha256="09ib88jqncywzc1rmjbj6p1i6nrrmbqxsn6jajdgqlgw8kpb490y"; depends=[curl readr]; };
-  genoset = derive2 { name="genoset"; version="1.34.0"; sha256="1cw6g8r3n33xlqmbjsfn6kkdzz19kh71ag529sjbk9wlxi69rrz0"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  genotypeeval = derive2 { name="genotypeeval"; version="1.10.0"; sha256="1pff2n1s350j6i7klsnwqlizkdvvfpyqqrvc7kq5gj7yh508dxy9"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer Rtsne VariantAnnotation]; };
-  genphen = derive2 { name="genphen"; version="1.6.0"; sha256="0m1g1hfhhbq3xjdr2fjf3wbng6d953kci965h298c168dv3864k6"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; };
-  gespeR = derive2 { name="gespeR"; version="1.10.1"; sha256="10aw6s5bn5jiw3qlqskcp2ngshgyykslsqlwrdpyahr4rh7z0zyl"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
-  ggbio = derive2 { name="ggbio"; version="1.26.1"; sha256="1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  ggcyto = derive2 { name="ggcyto"; version="1.6.2"; sha256="0qg9ivya9c2998hq40c0pvzfilb1q24h13fafymwa8p2lj59jyrg"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
-  ggtree = derive2 { name="ggtree"; version="1.10.5"; sha256="1gkfjgihykkvqrhvzhr5brwzsgva0mxvfpa664k08jan9brjg22f"; depends=[ape ggplot2 magrittr rvcheck scales tidyr treeio]; };
-  girafe = derive2 { name="girafe"; version="1.30.0"; sha256="0k8fjn7d1hxwin0vywly7vc570048i7nckhyw9j4cind6fi6f75v"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
-  globalSeq = derive2 { name="globalSeq"; version="1.6.0"; sha256="19aws180r5gwxrz6xmfgic0mp8piki2qmzrxyy1f75866blk3r4f"; depends=[]; };
-  globaltest = derive2 { name="globaltest"; version="5.32.0"; sha256="1fk9yk6n3aqigcly5zsb0jnb6jmdbn3jgbp1wyv6sby124sr4hmr"; depends=[annotate AnnotationDbi Biobase survival]; };
-  gmapR = derive2 { name="gmapR"; version="1.20.0"; sha256="158ql56mbc1fw5nyzyw4cx4p5zyavwdm9117hy3ka3cxdpqaihbs"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  goProfiles = derive2 { name="goProfiles"; version="1.40.0"; sha256="0fdlqmyglgrpjcc24vp3mfz8yq6v79lnzvnkxj8rslnhddcf6lkq"; depends=[AnnotationDbi Biobase GO_db]; };
-  goSTAG = derive2 { name="goSTAG"; version="1.2.0"; sha256="07v5yqzsagygmz8kpkjmy8f2g8p7997mvkisi5jb1kd00hggzpw9"; depends=[AnnotationDbi biomaRt GO_db memoise]; };
-  goTools = derive2 { name="goTools"; version="1.52.0"; sha256="07wa206pk7wqawgs77009cjrd8xx6wvxzaakahcc1hh0hawhkk2r"; depends=[AnnotationDbi GO_db]; };
-  goseq = derive2 { name="goseq"; version="1.30.0"; sha256="01nnlh40v4zs8h26bf5ksl72a8826vl1lhdlfqawk304wr7k8kkf"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; };
-  gpls = derive2 { name="gpls"; version="1.50.0"; sha256="0sp3c783wxgg3g37yqq4901rdygl54ab2wqyjcgl2jrajaw44m3g"; depends=[]; };
-  gprege = derive2 { name="gprege"; version="1.22.0"; sha256="1k77dxm1mf761par04pfs27qwpy2s43a5z91z9r9zpjp9sb37nnf"; depends=[gptk]; };
-  graph = derive2 { name="graph"; version="1.56.0"; sha256="15aajjp8h2z14p80c8hyd4rrmr9vqsm7bvwb989jxjl4k6g52an1"; depends=[BiocGenerics]; };
-  graphite = derive2 { name="graphite"; version="1.24.1"; sha256="1ddqm2dlazczr8471171gznbpmm8cykxqn9c7vg3c3ysj7qmgxzx"; depends=[AnnotationDbi checkmate graph httr rappdirs]; };
-  groHMM = derive2 { name="groHMM"; version="1.12.0"; sha256="0cjkj0ypyc4dfi9s8dh88kh6q4xlpnc0wal7njg4b4gqj0l2hva7"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
-  gtrellis = derive2 { name="gtrellis"; version="1.11.1"; sha256="0mx4xvaipd0ydlnn4rlgbc47phlqgpihc55la6hv1fz2rs3k948v"; depends=[circlize GenomicRanges GetoptLong IRanges]; };
-  gwascat = derive2 { name="gwascat"; version="2.10.0"; sha256="0n5x5i5v6a8wpn5mxmlpkl34b4kyypmymiwww6g61zch7xqrgywi"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
-  h5vc = derive2 { name="h5vc"; version="2.12.0"; sha256="181rsqda0bs7w2vz5dg3xzffla7yvlfkk7pfc0dzsjhw1b0yf3lx"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
-  hapFabia = derive2 { name="hapFabia"; version="1.20.0"; sha256="0mnc2mh3sqagvzhws1qr8vb57gp1r7n65wq6264vab2zcklhq7mh"; depends=[Biobase fabia]; };
-  heatmaps = derive2 { name="heatmaps"; version="1.2.0"; sha256="0kkfzxx1ccacy4gyv9nj151w137ca084rja8kakcnnvp3vcwn5z8"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; };
-  hiAnnotator = derive2 { name="hiAnnotator"; version="1.12.0"; sha256="0xa1x8xilh2x6xnnghz10j5r4q3ib5j28wkik7r79kpvzw7i55xc"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
-  hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.14.0"; sha256="1aa12m9r7zzcf91xpn8dfagr3cqp5wcp0gmkcczknavj8wgzzjmp"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl rSFFreader sonicLength]; };
-  hicrep = derive2 { name="hicrep"; version="1.2.0"; sha256="0fza8zngc3cn8why5qfqscfsbj3nblbvxk4maj2ccsgpc0lrkb52"; depends=[]; };
-  hierGWAS = derive2 { name="hierGWAS"; version="1.8.0"; sha256="0kyxyv5vi7q6pfjxqbxi99f3p6g9fckjafgqkv3fg98sn2nb7zyh"; depends=[fastcluster fmsb glmnet]; };
-  hopach = derive2 { name="hopach"; version="2.38.0"; sha256="1v28bbz3bp7a5rpd02mxfxznhl4iwnn2bkh2kf25g64chg4jksfx"; depends=[Biobase BiocGenerics cluster]; };
-  hpar = derive2 { name="hpar"; version="1.20.0"; sha256="0s5v79mgxdx862v1jrdf5pdap81nz5vjx25ni8s3sl97ldckf6j8"; depends=[]; };
-  htSeqTools = derive2 { name="htSeqTools"; version="1.26.0"; sha256="1migbh30hh2bpa63iv1l0jqnz9ryvkx4apwyj0qzyd07b2p55qcz"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; };
-  hyperdraw = derive2 { name="hyperdraw"; version="1.30.0"; sha256="00fi3687bnddjzx46y98i2pqm7dczn4icgsrbhhyhqkwg49v97hr"; depends=[graph hypergraph Rgraphviz]; };
-  hypergraph = derive2 { name="hypergraph"; version="1.50.0"; sha256="1c0f5fp6ybn88y1k408flqnndfjzfkig7vhbfxny1a43yyr0aib5"; depends=[graph]; };
-  iASeq = derive2 { name="iASeq"; version="1.22.0"; sha256="1kp787zv6h4wcp3naz0zbpw1z1m2vdg1xc9db31a9j2kbv7j9xd2"; depends=[]; };
-  iBBiG = derive2 { name="iBBiG"; version="1.22.0"; sha256="0vcwv1kf0mm21bx4ab6z1fn0gcgqaygrcrln0c96kpdz3zsx37mw"; depends=[ade4 biclust xtable]; };
-  iBMQ = derive2 { name="iBMQ"; version="1.18.0"; sha256="12gdj5ngagydkrb18hn8cms3bsvzdd3pkzrqdfxw16ppm1sy6mbd"; depends=[Biobase ggplot2]; };
-  iCARE = derive2 { name="iCARE"; version="1.6.0"; sha256="1cdw483lmqi605s1chfwzjk7kqxbky3pya4nyvmnggv4r4nc26qk"; depends=[]; };
-  iCOBRA = derive2 { name="iCOBRA"; version="1.6.0"; sha256="1y2h7d689wnvspvpkcih2z21r6yi70iicjyr3z91czqbr6vw5hsd"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; };
-  iCheck = derive2 { name="iCheck"; version="1.8.0"; sha256="0z2hz21vd8j08ivnqq1w8n9qyn8h7sr56fl42npq6a6zyi7ab4zf"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; };
-  iChip = derive2 { name="iChip"; version="1.32.0"; sha256="02cpv5nkbyjnjxcbavdxy8m6fwkj03nqss49gp30mv1a2wnin7w0"; depends=[limma]; };
-  iClusterPlus = derive2 { name="iClusterPlus"; version="1.14.0"; sha256="06a9iavp24rkj64plzw505crg02hcd06g68drs8fgfabvdlb2jiy"; depends=[]; };
-  iGC = derive2 { name="iGC"; version="1.8.0"; sha256="125n780c9hx7wh5s1w21j3j71bzw1wa3gxapsnkcrn1vzh8agbmj"; depends=[data_table plyr]; };
-  iPAC = derive2 { name="iPAC"; version="1.22.0"; sha256="1x5npvg3k8jmj2xbx0p871iii51gwxqwk0waczd58ylvv023j1gr"; depends=[Biostrings gdata multtest scatterplot3d]; };
-  iSeq = derive2 { name="iSeq"; version="1.30.0"; sha256="0rypm4dhkkgd1j7vzbpcm2n6b6qcig483si46r16fwkn4hzwb11v"; depends=[]; };
-  ibh = derive2 { name="ibh"; version="1.26.0"; sha256="08f1a3f0m8900y3rgrq7v9ww6055bwpqc3liqpm0yf8fz3n83wnm"; depends=[simpIntLists]; };
-  ideal = derive2 { name="ideal"; version="1.2.0"; sha256="0fyh6y8k5ly19y2iysgvjsgagla0pfsihf3wwqzdcx0hp6f6ksz9"; depends=[AnnotationDbi BiocParallel d3heatmap DESeq2 dplyr DT GenomicRanges ggplot2 GO_db goseq GOstats gplots IHW IRanges knitr limma pcaExplorer pheatmap plyr rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; };
-  idiogram = derive2 { name="idiogram"; version="1.54.0"; sha256="0y3wv1bqnaa624c4425qh8sz0sd57pvd16wgxb1i88ryb2q7gc6n"; depends=[annotate Biobase plotrix]; };
-  illuminaio = derive2 { name="illuminaio"; version="0.20.0"; sha256="02miyvard3y0d6qwbhq37bp4qypwph09k09630v6calr2q4jmzdh"; depends=[base64]; };
-  imageHTS = derive2 { name="imageHTS"; version="1.28.1"; sha256="18y5wfxfxp4lw1cxxps662gm4wsjs30di455zhpgw65l7y76r5jh"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
-  immunoClust = derive2 { name="immunoClust"; version="1.10.0"; sha256="1mxrg832ziys1wq3vbs6gqdbg0j85y3dnqkkffmz4srl6733z9c1"; depends=[flowCore lattice]; };
-  impute = derive2 { name="impute"; version="1.52.0"; sha256="0b8r4swvyx3cjcc2ky8yn0ncpzlbi1pgfsn3wpbjmhh7sqrffm2n"; depends=[]; };
-  intansv = derive2 { name="intansv"; version="1.18.0"; sha256="0y76a4bv8lyrlvcl8xz4268xw358wwxys2xqkgznk8l3hxrswbmv"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
-  interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.16.0"; sha256="01zxpbfx3nirvgw34v1wi62p4n6h2abqzfh89rcvlcdyw7vwgsrg"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
-  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.16.0"; sha256="01yb945jqqimwjgriza6yy4dnp303cdirxrhl4hjyprfdlmnz5p5"; depends=[BiocGenerics shiny]; };
-  inveRsion = derive2 { name="inveRsion"; version="1.26.0"; sha256="12gfn4kxw5phb0vf1lx30vdp4lh4jxsdgy5ddbdgiv87cbzz6ldi"; depends=[haplo_stats]; };
-  iontree = derive2 { name="iontree"; version="1.24.0"; sha256="196b8pbnkyai4lxij17mhc8hikgdxcbdsqa04cck27fkplbiy6pq"; depends=[rJava RSQLite XML]; };
-  isobar = derive2 { name="isobar"; version="1.24.0"; sha256="1n27wks04fiqw3qm1nkjh533qk3fwnxivganl9x5c29jfmglzmk9"; depends=[Biobase biomaRt distr ggplot2 plyr]; };
-  isomiRs = derive2 { name="isomiRs"; version="1.6.0"; sha256="0bgcbwfx1clcq38fkvw9d60rz2zhww77nppb26mhzazmibhxyaa2"; depends=[Biobase BiocGenerics DESeq2 DiscriMiner dplyr gamlss gamlss_dist GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges lme4 RColorBrewer RcppEigen readr reshape S4Vectors SummarizedExperiment tidyr TMB]; };
-  iterClust = derive2 { name="iterClust"; version="1.0.0"; sha256="05fdil91cg2z90vfyahhkjj5mj4ajsrxaddl9qfdk86lx0q7migb"; depends=[Biobase cluster]; };
-  iterativeBMA = derive2 { name="iterativeBMA"; version="1.36.0"; sha256="0ck8fqici1916ardwp04grnclg6ydl731mcbd0xh1a1k7zzd0jbc"; depends=[Biobase BMA leaps]; };
-  iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.36.0"; sha256="096qnp9wisc4hnpgy37a4h1xb1f01kqc9rhrhfkp25wkf1yxgwmi"; depends=[BMA leaps survival]; };
-  ivygapSE = derive2 { name="ivygapSE"; version="1.0.0"; sha256="1y82cm0xmddhfz12iqqwpq9ifaml3r0yxs4c3cvp6k2c0wlhl173"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; };
-  joda = derive2 { name="joda"; version="1.26.0"; sha256="0qwfkq40zl16lngrmhw8lxx1qn5lh076nl6bydrzksvh1bjs78b6"; depends=[bgmm RBGL]; };
-  karyoploteR = derive2 { name="karyoploteR"; version="1.4.2"; sha256="18g6dm6bl5qyr50gydlvq948cmvg21iyb6l33cyh7p4haajf7xaa"; depends=[bezier biovizBase digest GenomeInfoDb GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; };
-  kebabs = derive2 { name="kebabs"; version="1.12.0"; sha256="1mbymzrbwzzfd5ygf8fk89igv7x0damgskri39fj913aqifgkf42"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
-  keggorthology = derive2 { name="keggorthology"; version="2.30.0"; sha256="117s7b32nkv95adh2j91b87r90svhfb91ag28brsq3r333m2q8cn"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
-  kimod = derive2 { name="kimod"; version="1.6.0"; sha256="0mb9bv6bz7k27vs8rl26kh2zm8mvpkgzqhgc471lp4qz8f4fsbxc"; depends=[Biobase cluster]; };
-  lapmix = derive2 { name="lapmix"; version="1.44.0"; sha256="1b7daaqsq3bvb1wbhf99pk8kl4pm4kac7bnx211isr7ica34pxb5"; depends=[Biobase]; };
-  ldblock = derive2 { name="ldblock"; version="1.8.1"; sha256="1q8dz8wcq1r7kr635s9q21g36sxkdybk8khhpa4p57qv8r0gppl0"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; };
-  les = derive2 { name="les"; version="1.28.0"; sha256="0xy7ggc2b20i1c78mww84xvc0jhbinxn00nbfvnbw997vjqr7r79"; depends=[boot fdrtool gplots RColorBrewer]; };
-  lfa = derive2 { name="lfa"; version="1.8.0"; sha256="06w0032wwqm2cxid7brb6iq6bkhqc5x3a08wwyjbib6lnj5n7rvh"; depends=[corpcor]; };
-  limma = derive2 { name="limma"; version="3.34.9"; sha256="1y2fm61g5i0fn0j3l31xvwh9zww9bpkc4nwzb1d0yv1cag20jkdc"; depends=[]; };
-  limmaGUI = derive2 { name="limmaGUI"; version="1.54.0"; sha256="1mhqxy4bfb38lp57wrm6jm57xbwhqz6z78cxjdjr8r9inysddjlp"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
-  lmdme = derive2 { name="lmdme"; version="1.20.0"; sha256="1742ffw592cpp0bxd38g4k51h28iaax995lzmgxb3di6kj6h8an3"; depends=[limma pls stemHypoxia]; };
-  logicFS = derive2 { name="logicFS"; version="1.48.0"; sha256="1qkbc6xgmppicg30613ak0dy8fn1irq6n8kf2qvwd95y210zlcfv"; depends=[LogicReg mcbiopi]; };
-  logitT = derive2 { name="logitT"; version="1.36.0"; sha256="08jb55ccxbdcyrd497lgdhwkmj97r9rl21jc411l7fwckqz3pgwn"; depends=[affy]; };
-  lol = derive2 { name="lol"; version="1.26.0"; sha256="00wl4zw0qvinb2cy0cbcgrg0a9xr6s7b4y30ykd4666fmdk60dg3"; depends=[Matrix penalized]; };
-  lpNet = derive2 { name="lpNet"; version="2.10.0"; sha256="0r3xyhws10fq84y2rxv9v5wqbg05di4kkccv1l63idf38g33dvs1"; depends=[lpSolve nem]; };
-  lpsymphony = derive2 { name="lpsymphony"; version="1.7.1"; sha256="1qm131flq00dgvkdv6qz8xbh24qqadg8hn35q6ymsv6ql390xi06"; depends=[]; };
-  lumi = derive2 { name="lumi"; version="2.30.0"; sha256="1gy0137h5l2xmq3ahqsgg0lzczgbqck4qrqbgfnh8r0cb2r8vaaj"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
-  mAPKL = derive2 { name="mAPKL"; version="1.8.0"; sha256="08f6r31zlabsa7b8k5cnnwir7scjaix6mnnkgfs5h4gvb49vrbbm"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; };
-  mBPCR = derive2 { name="mBPCR"; version="1.32.0"; sha256="0wvwfq4aqnhn0943v807sij3dasf93l3rhvcj7a65jpv4csd4vx2"; depends=[Biobase oligoClasses SNPchip]; };
-  mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.12.0"; sha256="0iijl9afnynhh2pa9v1xj5b1cf0svjzlkvg3al8jrv0i28jibvi7"; depends=[GenABEL MASS outliers qtl]; };
-  maCorrPlot = derive2 { name="maCorrPlot"; version="1.48.0"; sha256="0jy6b57pi58795v1xhshaqrvpd27qarzv06r8il0d9085asc3v1r"; depends=[lattice]; };
-  maPredictDSC = derive2 { name="maPredictDSC"; version="1.16.0"; sha256="02wzz7s6cr0bligvxm37gwkbhzwfmaki27drbdaaiyssqmdb4bkq"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; };
-  maSigPro = derive2 { name="maSigPro"; version="1.50.0"; sha256="1d6rwfm42spfbqsbssbrc69rv2fj8gcxm4na9k66vij7dwi8nvd0"; depends=[Biobase MASS mclust venn]; };
-  maanova = derive2 { name="maanova"; version="1.48.0"; sha256="1vvjk6y8mp5h7l8yk4f1y48jx5k9fl9s12x2mgsbap306paw860q"; depends=[Biobase]; };
-  macat = derive2 { name="macat"; version="1.52.0"; sha256="168jw5bi1nbj2dfhipnvja7w0avmiw6vrvdany73d41fvigmagj5"; depends=[annotate Biobase]; };
-  made4 = derive2 { name="made4"; version="1.52.0"; sha256="1ns7f47l7ig2fm95l67ppym5gbkbr8lp18vx51pqwjg8r5rvj9sc"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maftools = derive2 { name="maftools"; version="1.4.28"; sha256="17b3v1v9ipid8gqsq2gy0fpminc58f1mng9i2andswfr5ip38g7s"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
-  maigesPack = derive2 { name="maigesPack"; version="1.42.0"; sha256="1c92kkr2rmfydckmbvri8g0lzz1v3hx93zpmb1pwrnlfpm01j95j"; depends=[convert graph limma marray]; };
-  makecdfenv = derive2 { name="makecdfenv"; version="1.54.0"; sha256="17fmzd12acdpq3vfnqrafmmg5jcmdgkf83mrqjpw92zah2w8490a"; depends=[affy affyio Biobase zlibbioc]; };
-  manta = derive2 { name="manta"; version="1.24.0"; sha256="060x5rdzkx882pa8x9w7j3sgj0clar6w35yblbcggq579r9jpx06"; depends=[caroline edgeR Hmisc]; };
-  mapscape = derive2 { name="mapscape"; version="1.2.0"; sha256="1nsr3n0vb0a9bzv2d9mginl5lcv8dvxpkv86ygn790bbkz35fq8x"; depends=[base64enc htmlwidgets jsonlite stringr]; };
-  marray = derive2 { name="marray"; version="1.56.0"; sha256="14c93i86yc7jn4ax8p4l0z6v9xisw1bv7gzb4a0gbxhxn7mddaic"; depends=[limma]; };
-  maskBAD = derive2 { name="maskBAD"; version="1.22.0"; sha256="0rg2r9yg3wviz0s5z5palmzbqb4cya4b0hd6w43fnwrfp46hqlp8"; depends=[affy gcrma]; };
-  massiR = derive2 { name="massiR"; version="1.14.0"; sha256="17bb7cm6wiwygxvp37gjiagxzali2023ikwxpqwghz6dn58nkqnl"; depends=[Biobase cluster diptest gplots]; };
-  matchBox = derive2 { name="matchBox"; version="1.20.0"; sha256="0m9swn284xk6y7vw2l8r5yjbq0b7x8n8ypd706fz9yc5ppg89h4j"; depends=[]; };
-  matter = derive2 { name="matter"; version="1.4.1"; sha256="1l8z30pzl0jssdkfmzwa5741mbn81sraw79jm38qv7h72mjsm891"; depends=[biglm BiocGenerics irlba]; };
-  mcaGUI = derive2 { name="mcaGUI"; version="1.26.0"; sha256="1ymdlc23jc0glfg15nlax71awkhqbaz5xv7pxnppf2m5sz73gfy0"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
-  mdgsa = derive2 { name="mdgsa"; version="1.10.0"; sha256="0xivpr1w41pzvfs4hjyc0vvmrbq0pbckai7j2vf4iq5sxxc4xyv3"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
-  mdqc = derive2 { name="mdqc"; version="1.40.0"; sha256="0khrkhl4ksvls4qb0273zn9bc9dzd6234v1ly6vb2b2dslm8z9r0"; depends=[cluster MASS]; };
-  meshes = derive2 { name="meshes"; version="1.4.0"; sha256="1sz2hj16q0swz13vfaf63njg920xnx9ysdcbwfqlyik1i7s0c0h2"; depends=[AnnotationDbi DOSE GOSemSim MeSH_db rvcheck]; };
-  meshr = derive2 { name="meshr"; version="1.14.0"; sha256="00k37apfbfw1qxvh8wz1hg9gg32h8lib9yw0i9y1882krz61x5b6"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; };
-  messina = derive2 { name="messina"; version="1.14.0"; sha256="0483dvnq6ns4pfq8axcqgbd2n3b8i1b9063appyi5cqfa29s2sqm"; depends=[foreach ggplot2 plyr Rcpp survival]; };
-  metaArray = derive2 { name="metaArray"; version="1.56.0"; sha256="1n3hmf0gajfpg5gmjgdxnpb4x395wm03bpfvccgnkkwfv6qrzd7v"; depends=[Biobase MergeMaid]; };
-  metaCCA = derive2 { name="metaCCA"; version="1.6.0"; sha256="02a6562i2gddnk0izlrsdby7sx2s36axkdwy8c1z92s4n71m05q1"; depends=[]; };
-  metaMS = derive2 { name="metaMS"; version="1.14.0"; sha256="1lp0i0pf1xc0rhr61rh7qna0hbl0svqm5ysfgdl04i2ghglrrmqm"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
-  metaSeq = derive2 { name="metaSeq"; version="1.18.0"; sha256="1d8rr4nwbqxb7amdfrphw2ndyfhh74w20qgbzwlfc0wppwfwm5rr"; depends=[NOISeq Rcpp snow]; };
-  metabomxtr = derive2 { name="metabomxtr"; version="1.12.0"; sha256="0214idivldfmfym3hkj7qicmcjiymikag3ydqxp7fq8m7vb3vxdz"; depends=[Biobase BiocParallel Formula ggplot2 multtest optimx plyr]; };
-  metagene = derive2 { name="metagene"; version="2.10.1"; sha256="0h7i6jgpz8zh9l1w0w82333bnw7zrdn577s5ma2lcpfpybrr17zs"; depends=[BiocParallel data_table DBChIP EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats muStat purrr R6 Rsamtools rtracklayer stringr]; };
-  metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.10.0"; sha256="1c8l4dvw9vaw2kcc11a8six5rcayc2girzzz88lq4a2ly5f225kv"; depends=[ape Biobase Biostrings dbplyr dplyr lattice lazyeval magrittr metagenomeSeq purrr RSQLite ShortRead stringr]; };
-  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.20.1"; sha256="15ib66lir0smsk1zq41g5nf6r93wvg5a3bai44gg7f1cgc5xf4xp"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
-  metahdep = derive2 { name="metahdep"; version="1.36.0"; sha256="10v5zx3xn9xr18qwb2hy3566xzk4a38084xvbs7cfh9aypq58zfj"; depends=[]; };
-  metaseqR = derive2 { name="metaseqR"; version="1.18.0"; sha256="0g707gimklmnhmgicvslmbzam67fmh3h9h4nsqv41pc5kp74n6ql"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
-  metavizr = derive2 { name="metavizr"; version="1.2.1"; sha256="114nr1nb8wniqb8gq0v6ah9vimbf4k1iy0k2chr0rz6jh7b4larc"; depends=[Biobase data_table digest epivizr epivizrData epivizrServer epivizrStandalone GenomeInfoDb httr metagenomeSeq phyloseq vegan]; };
-  methInheritSim = derive2 { name="methInheritSim"; version="1.0.0"; sha256="0ji9yz4x8yk9d156ssfcf4mv0gkrbrfh37w1saywap4680ap47r3"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; };
-  methVisual = derive2 { name="methVisual"; version="1.30.0"; sha256="0xdzmvhs4hjj12w6lfwa7vcikdgc08krqxdak1959zclw4mp4jq6"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
-  methimpute = derive2 { name="methimpute"; version="1.0.0"; sha256="0fgdd7dqs2sjvm3g0ivlnb61d8ccc32zvwbjgaw2raz6g4dm4c53"; depends=[Biostrings GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; };
-  methyAnalysis = derive2 { name="methyAnalysis"; version="1.20.0"; sha256="0cmgv74pc4gj1qrsk2a7hx45vssf73hcc80zpqlhwzy3yg103ql3"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; };
-  methylInheritance = derive2 { name="methylInheritance"; version="1.2.0"; sha256="05i7z2b0xyszfadkk0qcgvhx6fxlfv7dcqj6ix0y0349fgsd2phz"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; };
-  methylKit = derive2 { name="methylKit"; version="1.4.1"; sha256="1k0nfn9318sgwm4z963bhnbp4c3zv85v3f9886vc5hgaisr0yvai"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; };
-  methylMnM = derive2 { name="methylMnM"; version="1.16.0"; sha256="0lq1kgliyy1q48csgc9bprapy9va5kpqlpm87wq4d967a5q0ja5h"; depends=[edgeR statmod]; };
-  methylPipe = derive2 { name="methylPipe"; version="1.12.0"; sha256="076z90fmzkp9j4xdlr2amif8kkdmmkh0jcvs384207if09w9i4v9"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
-  methylumi = derive2 { name="methylumi"; version="2.24.1"; sha256="05hwixscc79hbjx7g94nkrwk26zjf156dlvhgfjr890zn4mj709c"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
-  methyvim = derive2 { name="methyvim"; version="1.0.0"; sha256="1hz6c4bdgslxrbkr0q9fx6ffrrilxcanm8f5alady5qndm4vmiw1"; depends=[BiocGenerics BiocParallel bumphunter cluster doFuture dplyr future GenomeInfoDb ggplot2 gridExtra gtools IRanges limma magrittr minfi SummarizedExperiment superheat tmle wesanderson]; };
-  mfa = derive2 { name="mfa"; version="1.0.0"; sha256="17mwf4p4cr4xz1g32p4j0jaxvzfvjzilyrl9nv686nr7cplgkbgp"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; };
-  mgsa = derive2 { name="mgsa"; version="1.26.0"; sha256="087hmvrrd5x1s6198g9q8nwrpd36zywg39dl4l6x8qkr7zgjzakb"; depends=[gplots]; };
-  miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.0.4"; sha256="1cjjikbw6anb1cgwl4718lv1k5acc2fhl6c0gmszdl16x8z2yyz1"; depends=[]; };
-  miRLAB = derive2 { name="miRLAB"; version="1.8.0"; sha256="0fj96h1xan56sc71ycc4c5b2q7chncsknmdlj318lz95mydbiwdv"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
-  miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.6.0"; sha256="1chsigqmfxajd8gll2rq7ccbrsgp9k0cddn4ds4zkiiz6a79iiww"; depends=[AnnotationDbi DBI miRBaseVersions_db]; };
-  miRNApath = derive2 { name="miRNApath"; version="1.38.0"; sha256="11137kg0a1l8z2aiz6qisg1gq21rpgzhwr4z8dg0bkh9137jwnx8"; depends=[]; };
-  miRNAtap = derive2 { name="miRNAtap"; version="1.12.0"; sha256="0lq3kvs6ri9pdjxwl2hyvdymcnx33avgw7mfg1h6q7dfx0icwiw2"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
-  miRcomp = derive2 { name="miRcomp"; version="1.8.0"; sha256="1fxmkn5vp0szjjb0cl8vmaz411x7m10krs4j8dkvlnfhzlqhar96"; depends=[Biobase KernSmooth miRcompData]; };
-  miRmine = derive2 { name="miRmine"; version="1.0.0"; sha256="09sxjj2pj4s03dqqphywyhvmk3q2gvdn2nph5nplqwny6q9m2i1v"; depends=[SummarizedExperiment]; };
-  miRsponge = derive2 { name="miRsponge"; version="1.2.0"; sha256="0c3213hpf78ynqlaj12p0j9172gvlrhrx4rn4kmr6g1ja9xk80k7"; depends=[clusterProfiler corpcor DOSE igraph ProNet ReactomePA survival varhandle]; };
-  microRNA = derive2 { name="microRNA"; version="1.36.0"; sha256="0mc81fy9y3jgc3ll074ksmw72d8yp29pyaankn3na24r96lfcxnj"; depends=[Biostrings]; };
-  microbiome = derive2 { name="microbiome"; version="1.0.2"; sha256="185igm8dr5irc4bhgjflkxax0gk4lgm3zznqazv378j435194xgh"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; };
-  mimager = derive2 { name="mimager"; version="1.2.0"; sha256="14r0h676nhsbg175hj7jmkp1ny5wfhykmy2jm2s9qgdsfrgacgv2"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; };
-  minet = derive2 { name="minet"; version="3.36.0"; sha256="1ig9kwh7fvhpglxkda9l5nkaz3rmhl6bc006h6mrz9hl130vmnn8"; depends=[infotheo]; };
-  minfi = derive2 { name="minfi"; version="1.24.0"; sha256="1pk5savz9ziarx2iajqnck4vjmh3bnrmzy5m06vx3vmcww46ddi7"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter data_table genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
-  mirIntegrator = derive2 { name="mirIntegrator"; version="1.8.0"; sha256="05z8yq7jl3s3i3p9b6p7b16hrshg69gmfs0f67xq0svfb3fqpm85"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
-  missMethyl = derive2 { name="missMethyl"; version="1.12.0"; sha256="1fvpny7x56l55zhgabm6al2i2n0hix7fp7d01bzirsn7chxpwny3"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
-  mitoODE = derive2 { name="mitoODE"; version="1.16.0"; sha256="11kyihynbl3kcrngv8dhiqn3ghpkvv0xi35pf8np2p41zdhbrpyv"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
-  mogsa = derive2 { name="mogsa"; version="1.12.2"; sha256="0a29q9jak4vr05ngh2pcsfifa9i6p086acjk2qrzwnc3lcfm00bm"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
-  monocle = derive2 { name="monocle"; version="2.6.4"; sha256="1x4y02kn8spzz8y4hgmis9h2l494ys2j1vjs0axh32fp1rpc6d8c"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
-  mosaics = derive2 { name="mosaics"; version="2.16.0"; sha256="08q48zakyfydrj8vix3a5w0j4ix5h1hpqccv0jxgj55gpdc062kj"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
-  motifRG = derive2 { name="motifRG"; version="1.22.0"; sha256="193zl2rlzwxv9p9q5i7rilj3w05ndqfyp9bdpvagp5s5cin4hf44"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
-  motifStack = derive2 { name="motifStack"; version="1.22.4"; sha256="13wrpdgyhzrqdp7k0d7iym2pjjla46rh3i1qwm34j22n7j0pxs8x"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
-  motifbreakR = derive2 { name="motifbreakR"; version="1.8.0"; sha256="1jfff6jgvrylhnpyc5zq1fah33xq8vf7hypv22vg7js6m8bmcx5j"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
-  motifcounter = derive2 { name="motifcounter"; version="1.2.1"; sha256="1k47yca1w59w0k7w4cxahhq4r2jyb8vflpzmrl7wnypb4lf9mbc0"; depends=[Biostrings]; };
-  motifmatchr = derive2 { name="motifmatchr"; version="1.0.1"; sha256="0a7hg307f274n8vxknl0381xpvgphsim07pk7dnh0af3a63lh2ji"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; };
-  mpra = derive2 { name="mpra"; version="1.0.0"; sha256="11lb626w779hawfl06n85mfm0ld8p46ns6s67fkxcxggr4rbkh82"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; };
-  msPurity = derive2 { name="msPurity"; version="1.4.0"; sha256="105z60rdflpz0j9ckrwc7dpywh9v3lqwbs4adwlrvziz87ah29al"; depends=[DBI doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 RSQLite stringr]; };
-  msa = derive2 { name="msa"; version="1.10.0"; sha256="15czlzssrxsgjckxy6ckphfcyj2q12iq5q86238xj16wfqphax45"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
-  msgbsR = derive2 { name="msgbsR"; version="1.2.0"; sha256="0gnv5gk9as3gn85gwgs8agrvzk5948wiwa685xjpwz359vbqnxrs"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; };
-  msmsEDA = derive2 { name="msmsEDA"; version="1.16.0"; sha256="1d7h4q8dbiv6p7sfslfmhjhrfr3fkjwl82gvb1179wb8qm3qkgwc"; depends=[gplots MASS MSnbase RColorBrewer]; };
-  msmsTests = derive2 { name="msmsTests"; version="1.16.0"; sha256="0gy8y6ca57j7gqp69r008802gfpkay56k4aigy04xij1jd17abx7"; depends=[edgeR msmsEDA MSnbase qvalue]; };
-  multiClust = derive2 { name="multiClust"; version="1.8.2"; sha256="01kidj4ggv26981b411vf4lsa61pghb4d56j6nr88r87rja9mn2l"; depends=[amap cluster ctc dendextend mclust survival]; };
-  multiMiR = derive2 { name="multiMiR"; version="1.1.0"; sha256="0zl1m62j9gdb11n4xp2piw36ildjvs5z2gw7f3sdjbkdl6jvsgwz"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; };
-  multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.2.0"; sha256="1zqlgz2iprwqnib9hsxynygnvwb0mqn4zbgbqrj7nsxsd5qsad51"; depends=[doParallel foreach SummarizedExperiment]; };
-  multiscan = derive2 { name="multiscan"; version="1.38.0"; sha256="07fb0a7kn8bjvq9cx4dvdjrf92830vwpz5n31mgk58aw3vg3mz66"; depends=[Biobase]; };
-  multtest = derive2 { name="multtest"; version="2.34.0"; sha256="0n11rd49xl2vn3ldmfips7d3yb70l8npjcqsxyswr9ypjhgzkv9j"; depends=[Biobase BiocGenerics MASS survival]; };
-  muscle = derive2 { name="muscle"; version="3.20.0"; sha256="16kawdvm08hag2kghdn438z0ysby67p989v3xlcf9r8f62isw6b7"; depends=[Biostrings]; };
-  mvGST = derive2 { name="mvGST"; version="1.12.2"; sha256="132s30c116gmbimzf1jw70p0pz4fv6lbfqb90sxnzbqvb8alvs0h"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; };
-  mygene = derive2 { name="mygene"; version="1.14.0"; sha256="0qqkpsqk99575rc49kj7s5yl22jb96gmk47i5lm700qi4v9fyim4"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
-  myvariant = derive2 { name="myvariant"; version="1.8.0"; sha256="1r4hqy5jz4xqswj3pfzxmncjapjmcksbx428f7lfncj844198g1q"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
-  mzID = derive2 { name="mzID"; version="1.16.0"; sha256="0yk70dka56zd8w62f03ggx3mandj91gfa767h9ajj0sd3mjmfqb9"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
-  mzR = derive2 { name="mzR"; version="2.12.0"; sha256="1x3gp30sfxz2v3k3swih9kff9b2rvk7hzhnlkp6ywlnn2wgb0q8c"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
-  ncdfFlow = derive2 { name="ncdfFlow"; version="2.24.0"; sha256="1rvqlfzdbqz7a035c2d0rfziail71pvyla6fi3mv1xzrm2vpw0b8"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo Rhdf5lib zlibbioc]; };
-  ndexr = derive2 { name="ndexr"; version="1.0.4"; sha256="1hr49a3svk65d585yix13ggd57zv5zzmavb81c452y2jpay0www0"; depends=[httr igraph jsonlite plyr tidyr]; };
-  nem = derive2 { name="nem"; version="2.52.0"; sha256="0114b8nzv07gii87rdcvia6n7jn203f5whx6x6x54ijxq8m1fkk8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
-  netReg = derive2 { name="netReg"; version="1.2.0"; sha256="1cmh66m5zp1awrg79f8d09b48shq8hyjvkz6mfxrnvqbcj32v8ph"; depends=[Rcpp RcppArmadillo]; };
-  netbenchmark = derive2 { name="netbenchmark"; version="1.10.0"; sha256="173jmvslg8vj078psnvk6s4sns8n9zv2z8hkq6iq64pavmn9cf91"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; };
-  netbiov = derive2 { name="netbiov"; version="1.12.0"; sha256="1xxqrpjsn6pc097d4c1389gn80404pxjxzsm5zz4bcfk30lr5w3l"; depends=[igraph]; };
-  nethet = derive2 { name="nethet"; version="1.10.0"; sha256="1ssmjgxmsyzwhsnpq263q3vmspg74xzin6bny3y9icvs8x893mbp"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
-  netprioR = derive2 { name="netprioR"; version="1.4.0"; sha256="1cppds5a3d8fs4wbfj2asc24ksxk27718gwyyy5hgigy7zx9z4h3"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; };
-  netresponse = derive2 { name="netresponse"; version="1.38.0"; sha256="131xbpkaglnspa2zxq49qwn2nnphlh1ly5s5hx8p9a0da2ccspas"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
-  networkBMA = derive2 { name="networkBMA"; version="2.18.0"; sha256="04rkhi1iiwygilzmfbwsd2acg7cvpmdrli6qb0a0wi1g0yx7k95a"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; };
-  nnNorm = derive2 { name="nnNorm"; version="2.42.0"; sha256="0dm1h989vkimcf51glqjc1lqiaq28cgym82m99afcisinldnwlhr"; depends=[marray nnet]; };
-  nondetects = derive2 { name="nondetects"; version="2.8.0"; sha256="0x06jz8gw97nks84y7pkgqm8p1jqdfgpxcrk48q8pdnc2flaq4a0"; depends=[Biobase HTqPCR limma mvtnorm]; };
-  normalize450K = derive2 { name="normalize450K"; version="1.6.0"; sha256="0cdcl7jp9hhk2dkwhyrzxg8f768r3llfi3vy5a5ppann9016nxp6"; depends=[Biobase illuminaio quadprog]; };
-  normr = derive2 { name="normr"; version="1.4.0"; sha256="0g1f623f1rzsp7ywm2434gcvws4biziav76iliir5g10zafgw6vc"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; };
-  npGSEA = derive2 { name="npGSEA"; version="1.14.0"; sha256="0v99nirx9j4dpfsb1ihyhj7iwy7hkxda6bf0l3326mi13xy2jirb"; depends=[Biobase BiocGenerics GSEABase]; };
-  nucleR = derive2 { name="nucleR"; version="2.10.0"; sha256="047ny4dm6x45hsagznwibrq6i3rycvvwmxl8hgh1c2phl87njpbi"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
-  nucleoSim = derive2 { name="nucleoSim"; version="1.6.0"; sha256="0gyxb4ydhx3igxddp4jh9qg9787bv1lk8dyahq7y96jv4qmmw65k"; depends=[IRanges S4Vectors]; };
-  nudge = derive2 { name="nudge"; version="1.44.0"; sha256="1yp2x6hdn6vhvy922f4d74zyw2n5shrhlpxiig50hwd8dar2nn5f"; depends=[]; };
-  occugene = derive2 { name="occugene"; version="1.38.0"; sha256="1lwf3kv171lapk4lk8v33996rjb54q3w4dbdn1b64vlcgw5586ip"; depends=[]; };
-  odseq = derive2 { name="odseq"; version="1.6.0"; sha256="15qlapq5vp3s99888kmmabvkl0vx507qkkh7v9a9zd7algz5shwj"; depends=[kebabs mclust msa]; };
-  oligo = derive2 { name="oligo"; version="1.42.0"; sha256="1rjnsr3h4bi3bjv580iv2rfs9c062qyilm9xxkk3rx2l0ylih05y"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
-  oligoClasses = derive2 { name="oligoClasses"; version="1.40.0"; sha256="0xly40mz55z0lis2b1zh3nhyf5qw2d8qlrm6n51hz49y0bqjssr9"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
-  omicRexposome = derive2 { name="omicRexposome"; version="1.0.1"; sha256="13bjic4msqpjh0llqa0fs4nzmskf0h97mi614n458c3109bscdjk"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma MultiDataSet omicade4 PMA rexposome SmartSVA stringr SummarizedExperiment sva]; };
-  omicade4 = derive2 { name="omicade4"; version="1.18.0"; sha256="0f83c907lbqw0idzrxl5a7hb4r9ginrj4798ymfkgc2m6a5x1w46"; depends=[ade4 made4]; };
-  oncomix = derive2 { name="oncomix"; version="1.0.0"; sha256="015sgiagij3pzxvcqygbby1rsl8ximmwpd09lb50w95xa1ks466z"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; };
-  oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.41.0"; sha256="0hx5s3y9zgx41p516q9w09crkihyn8hckwmf8jzxj7llrplc3dm1"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
-  oneSENSE = derive2 { name="oneSENSE"; version="1.0.0"; sha256="0jq4affxz5jr6pn01cz0cwbl1f930v63pzswz787m7lv7bvvbnl4"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; };
-  ontoCAT = derive2 { name="ontoCAT"; version="1.29.0"; sha256="057sbc0s08i22gjg886ngz0k59r4v29ssh11qj0wyv4n5g3zs0hg"; depends=[rJava]; };
-  ontoProc = derive2 { name="ontoProc"; version="1.0.0"; sha256="0la7lcynmdgavvzdz7b5g726pm4205r8194dnsmnhc5h3lryr36k"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; };
-  openCyto = derive2 { name="openCyto"; version="1.16.1"; sha256="1qzx0qq1d2hi5whqi0kbg8xmjbglv6j2fli3wcx932g66lxwg3sv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-  openPrimeR = derive2 { name="openPrimeR"; version="1.0.4"; sha256="1gw4b7df390q40zy0bnv0wlwr9dwji99rhgy678k32nm8r2cdc19"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; };
-  openPrimeRui = derive2 { name="openPrimeRui"; version="1.0.0"; sha256="1mchbalmq6mbxp9mdrmndz3pja7j1ffx5xglnzglfdqm2004gdlf"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; };
-  oposSOM = derive2 { name="oposSOM"; version="1.16.0"; sha256="1855wrszaxwc8rghhn1hgj6hrp5mxsyffbs9ccjckq5jl3z7z1mj"; depends=[ape arules Biobase biomaRt fastICA fdrtool igraph pixmap scatterplot3d som tsne]; };
-  oppar = derive2 { name="oppar"; version="1.6.0"; sha256="0h4wfgjq8xm5f6bcaj5vxy686ymr42r3ig9zw93ayycpfl81p275"; depends=[Biobase GSEABase GSVA]; };
-  pRoloc = derive2 { name="pRoloc"; version="1.18.0"; sha256="0syqcpfwm7bxk7jzr988zx91m7ny4aiy9rc286xakd4snl4vafc0"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo Rtsne sampling scales]; };
-  pRolocGUI = derive2 { name="pRolocGUI"; version="1.12.0"; sha256="0d4gv7nkwh8wbgdx37gwg4c29704q3z811cwwxdpx3gdgsa1iizw"; depends=[Biobase dplyr DT ggplot2 MSnbase pRoloc scales shiny]; };
-  paircompviz = derive2 { name="paircompviz"; version="1.16.0"; sha256="1yw27k417zcbx2dji8hjw6g1qcp8762k2c9j7gddfck7k7qjf1jc"; depends=[Rgraphviz]; };
-  pandaR = derive2 { name="pandaR"; version="1.10.0"; sha256="0x7mandjc2dk020pq8733wshzszrav3i29iq74pnp13dfrz4zb92"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; };
-  panelcn_mops = derive2 { name="panelcn.mops"; version="1.0.0"; sha256="0wg88axsgmrsihib7yc1xgm45q5d9dgikqvqncn7fx59i81f6l6c"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
-  panp = derive2 { name="panp"; version="1.48.0"; sha256="1pfajph1wzwww2w9djpkb8rwszjcb0hink81fy27js3ppzm3cc7l"; depends=[affy Biobase]; };
-  parglms = derive2 { name="parglms"; version="1.10.0"; sha256="11gxwv274g6fyz3ckl6l7wrzx229zgdparlplb7niz63cqqhggn5"; depends=[BatchJobs BiocGenerics doParallel foreach]; };
-  parody = derive2 { name="parody"; version="1.36.0"; sha256="073prpjv5hf2y0864gzjj4c0hlncw81nw877f0yykskpq72df38i"; depends=[]; };
-  pathRender = derive2 { name="pathRender"; version="1.46.0"; sha256="11q5nbscf1zcpw437vp12vx7n80dm3m3nymc7r79hbz3idpn16bp"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; };
-  pathVar = derive2 { name="pathVar"; version="1.8.0"; sha256="1l8544smgrfqavpv1xjwxj2mv8m8jgp50basylkamg1q1098l1h6"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; };
-  pathifier = derive2 { name="pathifier"; version="1.16.0"; sha256="0sr8fnp5i2f38cnxsa3lag60ibjzp169yml55jay2gc0br6bsjm7"; depends=[princurve R_oo]; };
-  pathprint = derive2 { name="pathprint"; version="1.6.0"; sha256="0f2icjqxw4q3zgkr71836xhvad488w21xjwy62c2cnh9zbmm47wj"; depends=[]; };
-  pathview = derive2 { name="pathview"; version="1.18.2"; sha256="1jspjwf919gifwqx29wgsjfyrdwp6a1i7ip444gcqz9i7crpfwvz"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
-  paxtoolsr = derive2 { name="paxtoolsr"; version="1.12.0"; sha256="09djd4ix6abljqv70k89p6slghi2y6phyy679f2dsyqn8cmhlp8s"; depends=[data_table httr igraph jsonlite plyr R_utils rJava rjson XML]; };
-  pbcmc = derive2 { name="pbcmc"; version="1.6.0"; sha256="123bijvnq29b9sc2wa9a887wdk8223bn26bv64pmrv97qnkvfarg"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; };
-  pcaExplorer = derive2 { name="pcaExplorer"; version="2.4.0"; sha256="1z8nahkz13v86k1c89nypxjxwawds1b4r7inbzns20g61caxxxnc"; depends=[AnnotationDbi biomaRt d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges knitr limma NMF pheatmap plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; };
-  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.22.0"; sha256="0371ns6702nk5s3pj59z04i2sjf24sj0wm3m4rj67q4p5v7v1ksz"; depends=[AnnotationDbi Biostrings ellipse]; };
-  pcaMethods = derive2 { name="pcaMethods"; version="1.70.0"; sha256="0ii235g0x0492kh8cfrf28ni0b6vd6fh7kizkqmczzqggd6b1bk8"; depends=[Biobase BiocGenerics MASS Rcpp]; };
-  pcot2 = derive2 { name="pcot2"; version="1.46.0"; sha256="1pymhr9ypp5g27bbnayrz4ks8rg5j634bf4l596m2b6c4q9d9rc5"; depends=[amap Biobase]; };
-  pcxn = derive2 { name="pcxn"; version="2.0.0"; sha256="1iq3i3cj7zq7xyprgjv4v4whycm67lzcrsz9p08lxyzz7ci2y6xn"; depends=[pcxnData pheatmap]; };
-  pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.42.0"; sha256="0cs47qzkpphixcwn3fl9pfrw1qans8y51y8lb9phikh4s8cdq061"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pdmclass = derive2 { name="pdmclass"; version="1.47.0"; sha256="1grc1fyn8yhwixi7638bsyb3zc6zhzzrbfh4hcpqk6gf653dls63"; depends=[Biobase fibroEset mda]; };
-  pepStat = derive2 { name="pepStat"; version="1.12.0"; sha256="0bnak90zfycd5a9qkz4lhwk4h61pr0pwn3hzaksxcv6c025h0mwm"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
-  pepXMLTab = derive2 { name="pepXMLTab"; version="1.12.0"; sha256="062bgkdqmp1hqibdar3x3lq1vdkpds9xzadq6fivj0iyx4lwpsl0"; depends=[XML]; };
-  pgca = derive2 { name="pgca"; version="1.2.0"; sha256="16v1fdw3abbxh5jmrsam8mhhamhjgkwmx7i16d2kxsybxp3k4zrb"; depends=[]; };
-  phenoDist = derive2 { name="phenoDist"; version="1.26.0"; sha256="0mhk918cbk6zg6acs7fzvpy2fkj9gdj0acx5mfzvvypahlfbf1za"; depends=[e1071 imageHTS]; };
-  phenoTest = derive2 { name="phenoTest"; version="1.26.0"; sha256="0wl1b9g5wlqzjll1kvgl29fl1qg6dqj9qwz5wfdhkvpxh43z4pyb"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; };
-  phenopath = derive2 { name="phenopath"; version="1.2.0"; sha256="150yqs7p63baxg713rh2qhbbg78d58wfmmsk3nqbspm4nk7kl458"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; };
-  philr = derive2 { name="philr"; version="1.4.0"; sha256="1b6fvhpdp1wd20sdb72a3mxyrvdxvmsjp99f0hnpvnb1yfnjcm7r"; depends=[ape ggplot2 ggtree phangorn tidyr]; };
-  phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.2.0"; sha256="1l0zrrah3p602g61jy5gh9bnv6qi26klwzvfs6c47z3dpsp7ikzy"; depends=[matrixStats plyr]; };
-  phyloseq = derive2 { name="phyloseq"; version="1.22.3"; sha256="0djy250cnzvjbb1psxwi4ffsb5yszsk54ma540nw0s7bbqy83pn0"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
-  piano = derive2 { name="piano"; version="1.18.1"; sha256="11da6z1xsk1r89ggh299yp5d3b4xw3nmmvj0lx6wf1liai4jss06"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; };
-  pickgene = derive2 { name="pickgene"; version="1.50.0"; sha256="14wgfjnpa1fnnvf0rrfil556ixdsicfyd3yvs7wwsri42vwixgl9"; depends=[MASS]; };
-  pint = derive2 { name="pint"; version="1.28.0"; sha256="0lz5svmm5gqxqcjic4689d07wkbndbszscs25cdm690wdgkvj5bm"; depends=[dmt Matrix mvtnorm]; };
-  pkgDepTools = derive2 { name="pkgDepTools"; version="1.44.0"; sha256="0s1zwh8dl8lm99avk3kd88kk5x9s1hmal7aqmc0psw57gxid91qq"; depends=[graph RBGL]; };
-  plateCore = derive2 { name="plateCore"; version="1.36.0"; sha256="02h42k6aivmchapa9bl5dxpl37706p31ky4a1hr48yfgacr750sn"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
-  plethy = derive2 { name="plethy"; version="1.16.0"; sha256="027z64s0dcyvyzjmggz0s5jas3zcx7ckp2rs6190dp16hrldqrmc"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
-  plgem = derive2 { name="plgem"; version="1.50.0"; sha256="0sgxppvjiqraw292d1kxwl2lwb6sd1ck1w560q299sp78zsnsaan"; depends=[Biobase MASS]; };
-  plier = derive2 { name="plier"; version="1.48.0"; sha256="0n0mj5cwgpqgdlmyhifwb66yp3m3j610f8xs4bkhpk36x9b8bbvx"; depends=[affy Biobase]; };
-  plrs = derive2 { name="plrs"; version="1.18.0"; sha256="0y98vknq7052vsapd7wjihczbrfhvnckhxy80sxslbryh3nsmbfs"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
-  plw = derive2 { name="plw"; version="1.38.0"; sha256="1mys9rslhc3rb23wbvlnxwl4dcca2m395bxfg7i4217hvzai7b25"; depends=[affy MASS]; };
-  pmm = derive2 { name="pmm"; version="1.10.0"; sha256="1bzmh0p0c649sqp1lhz8zdqh4k7b3n78akgn2wlhawjbx3lb5f6i"; depends=[lme4]; };
-  podkat = derive2 { name="podkat"; version="1.10.0"; sha256="0c93gnrcw8rwq9r4f7kkpsdjflarwixjpadaa05w98vqa9x5ycc4"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
-  polyester = derive2 { name="polyester"; version="1.14.1"; sha256="10dj2qy5b94qd0j0rm7a6j50zqaxdjjwy583cgci158cf8s8y915"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
-  ppiStats = derive2 { name="ppiStats"; version="1.44.0"; sha256="14xrvcfbp177mpdlzi2kxmv0v9j93i4r1xsw06fr3gw9a7l6zg3r"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
-  pqsfinder = derive2 { name="pqsfinder"; version="1.6.3"; sha256="0rf0sjd1gsdvn1qilckp5y9vb7j3wgs9h12gcxcjfrcaax8b3h6h"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; };
-  prada = derive2 { name="prada"; version="1.54.0"; sha256="19f8h411mzbrim1wvncr7wa3ah0qc1vy9kzcbx64pcif2xfb5qin"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
-  prebs = derive2 { name="prebs"; version="1.18.0"; sha256="0ss2rij3lv45d4va4dcpmclyaqmkjwk9hyppylkwlvcbgf0ng8xf"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
-  predictionet = derive2 { name="predictionet"; version="1.24.0"; sha256="10ki86jp7a4dim849zf5pbvd7bgbil8299xl08akyqf7pl37j2qj"; depends=[catnet igraph MASS penalized RBGL]; };
-  preprocessCore = derive2 { name="preprocessCore"; version="1.40.0"; sha256="0mrdgbkb9dcfr9gsqyxfpshnxx60mq97pl98b8yl00l2gfwz48ph"; depends=[]; };
-  proBAMr = derive2 { name="proBAMr"; version="1.12.0"; sha256="1arql2f4f6zjsqrshdqmbz8vlvydb5v66q0qa7rmdlz9hj9smahk"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
-  proFIA = derive2 { name="proFIA"; version="1.4.0"; sha256="0psn21jsrqplgwjisbfzqrfwiqcy45cwi04pmg1w1dw1bbwmjjzp"; depends=[Biobase BiocParallel minpack_lm missForest pracma ropls xcms]; };
-  procoil = derive2 { name="procoil"; version="2.6.0"; sha256="0ijqarp7rgszja1yymancygqcxsxw6cg4ydxzipw1wk6a3gl71ck"; depends=[Biostrings kebabs S4Vectors]; };
-  profileScoreDist = derive2 { name="profileScoreDist"; version="1.6.0"; sha256="0grw3386czykfq1yxrvqbph9l1xs4hpxb8hx0fjsd0v3mhvgkbk9"; depends=[BiocGenerics Rcpp]; };
-  progeny = derive2 { name="progeny"; version="1.0.0"; sha256="1ijhqsk6k70dmkkwxl003r9rcmx7j16z4i8fxjhxnx5d8g3swib9"; depends=[Biobase]; };
-  prot2D = derive2 { name="prot2D"; version="1.16.0"; sha256="1fp530fammi9xifx5g72jz8k7y3chjfg3mpybsbf5pzvva1429sj"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
-  proteinProfiles = derive2 { name="proteinProfiles"; version="1.18.0"; sha256="069ksj5md9m7zylqwy6pyj3p9pa4j04vn4ss4d2r8n7a5z8f7d1g"; depends=[]; };
-  proteoQC = derive2 { name="proteoQC"; version="1.14.0"; sha256="1kv8ah7pbfl1gbb1pnjlmdw5bskfyh0hsn0nxraz0ybvwzn3kdsl"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; };
-  psichomics = derive2 { name="psichomics"; version="1.4.5"; sha256="0lvkbjkdg5m1ni6rrnzzq2d2p5j0156vp2q9i3c8ji40fp7rx0vv"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; };
-  psygenet2r = derive2 { name="psygenet2r"; version="1.10.0"; sha256="0xf03vjyjiz4093cqnvi3dm532scx3f17mcf0av96h052vy10qb7"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; };
-  puma = derive2 { name="puma"; version="3.20.0"; sha256="0pcwppa2zlzpfl5fafl4h5xcf0pnyvz3hkykl192hzp26wcjsc1i"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
-  pvac = derive2 { name="pvac"; version="1.26.0"; sha256="0lmwy5a74ikq0sl6zqw69kag6q3p092qwh1lzvv7rl2j9wm2yl46"; depends=[affy Biobase]; };
-  pvca = derive2 { name="pvca"; version="1.18.0"; sha256="1bjv97fq6cpa8j11j0zjpmpxyszr5a2w7z95r47hvqysi1mm7ypv"; depends=[Biobase lme4 Matrix vsn]; };
-  pwOmics = derive2 { name="pwOmics"; version="1.10.1"; sha256="02ffzf5hp6mp24pmsivsb8kfarcxqdb7a02narhysp1drccyywzr"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots graph igraph rBiopaxParser STRINGdb]; };
-  qcmetrics = derive2 { name="qcmetrics"; version="1.16.0"; sha256="1agypdz696i868j7yzispmbljm5vc67zpfc3njq322bvgcfv6j78"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
-  qpcrNorm = derive2 { name="qpcrNorm"; version="1.36.0"; sha256="1lgdlggp4g19d47lv3wr87zj7lc50w433f2j9c7sc5symslqzrp5"; depends=[affy Biobase limma]; };
-  qpgraph = derive2 { name="qpgraph"; version="2.12.0"; sha256="10xmdlc2h67krc2bbcpv2sjgv8vqdxn49knzpnn22rvgc3ab5np0"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
-  qrqc = derive2 { name="qrqc"; version="1.32.0"; sha256="0p8r78qrrrkmvbvlapwbdzd363y8qmiwmw3aiipmv959cpbsy2ci"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
-  qsea = derive2 { name="qsea"; version="1.4.0"; sha256="00fym964mlzkydmd6mmhd2hsv87lga5zg8cc6dglzwycmbmcb7cr"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; };
-  quantro = derive2 { name="quantro"; version="1.12.0"; sha256="1vw44c0vr1mx5mc89i864l8d9hjp0pyrv6fdd1kzswzdi02nf8bq"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
-  quantsmooth = derive2 { name="quantsmooth"; version="1.44.0"; sha256="1n0q6mlmsidzw9qifplm9hhcxbx37hb6062mssw1klpmy2x9sfhg"; depends=[quantreg]; };
-  qusage = derive2 { name="qusage"; version="2.12.0"; sha256="08x9v602fgdnzff0csiz5nwzmw8ld1z6yy607acncs0hnj16jvcw"; depends=[Biobase limma lsmeans nlme]; };
-  qvalue = derive2 { name="qvalue"; version="2.10.0"; sha256="1rd9rnf16kh8wc076kahd9hsb9rfwsbzmz3kjmp0pj6rbiq0051i"; depends=[ggplot2 reshape2]; };
-  r3Cseq = derive2 { name="r3Cseq"; version="1.24.0"; sha256="1nahiwz98w788c63d140bjq664dhjmycpkmrcdv4s27hrwpwagz3"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
-  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.18.0"; sha256="1n8vlnxsn1n9c1vpss0zzlr2i088gwf34gjr7kvqmpyyplym51q4"; depends=[data_table XML]; };
-  rCGH = derive2 { name="rCGH"; version="1.8.1"; sha256="1dmxijdbvmjspc8p1k04as326p98gyjrkdwrhjnzm5jdxm87jjjb"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; };
-  rDGIdb = derive2 { name="rDGIdb"; version="1.4.4"; sha256="08hddkq1jpb24gp3id5w0bv48cqzx7h81mvdl0wvjsd8gz31nw2c"; depends=[httr jsonlite]; };
-  rGADEM = derive2 { name="rGADEM"; version="2.26.0"; sha256="1rbw8k20ri6jhqn9mgkjzyjp7s1z58bgxd5hb35zcpyd7fb2aifw"; depends=[Biostrings BSgenome IRanges seqLogo]; };
-  rGREAT = derive2 { name="rGREAT"; version="1.11.1"; sha256="040pvbnx935f49xgpj3wx64dfsf95f729sb93qmpn74ndpa1f3h6"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
-  rHVDM = derive2 { name="rHVDM"; version="1.44.0"; sha256="1qw4k1xq4qq378dgymxw83ilw6sb2qk3zm6pk15br4v935016vgz"; depends=[affy Biobase minpack_lm R2HTML]; };
-  rMAT = derive2 { name="rMAT"; version="3.28.0"; sha256="0cn7ffipgbj2b7vim6l0flw25nn0w7pdzxzz0m41n2jz18rm7203"; depends=[affxparser Biobase BiocGenerics IRanges]; };
-  rRDP = derive2 { name="rRDP"; version="1.12.0"; sha256="0iw4hjhvf32ng8bqhqs0b2s882a8fcvpq4wq8ifrj27n5sxjs5gh"; depends=[Biostrings]; };
-  rSFFreader = derive2 { name="rSFFreader"; version="0.26.0"; sha256="1a2m567jnb90ra8vk5wagc756h5fahss3hs4xxky1xgacpafyk5k"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
-  rTANDEM = derive2 { name="rTANDEM"; version="1.18.0"; sha256="0a6w19kfdg3776iksvw60qyxbrjdvk7d02q5a4kcws1cn73dzpi2"; depends=[data_table Rcpp XML]; };
-  rTRM = derive2 { name="rTRM"; version="1.16.0"; sha256="0bckbq0h1iy2vrv3mbzm9bq9r709hgbs240sa2dmf3bwn7329rxh"; depends=[AnnotationDbi DBI igraph RSQLite]; };
-  rTRMui = derive2 { name="rTRMui"; version="1.16.0"; sha256="0qx969aivrivccr443jvpvjji3zabp31jgg0cd4ddl5w0gw2i1pm"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
-  rain = derive2 { name="rain"; version="1.12.0"; sha256="1nlz4vri4blqk4d7hzh8wsda8viwl80f4vhpfx04sxmsz5i9w305"; depends=[gmp multtest]; };
-  rama = derive2 { name="rama"; version="1.52.0"; sha256="1g67sv7hm64m0c8g9z9y2pnxhdlbhpddyg6yx364klkx3gn017hp"; depends=[]; };
-  ramwas = derive2 { name="ramwas"; version="1.2.0"; sha256="013gqial7zmalh4y2a97fp6262h3038mr2j3pg71vm7r4ww5q16c"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; };
-  randPack = derive2 { name="randPack"; version="1.24.0"; sha256="1qb7r4f8cjmn4wdpqydbqq75xzzxffqbh28dcfbbymcyvnc0vxma"; depends=[Biobase]; };
-  rbsurv = derive2 { name="rbsurv"; version="2.36.0"; sha256="1v4fdlfl884w74w6rlap7rqckmk1kiryp2w0zciy4ghilkgikbf5"; depends=[Biobase survival]; };
-  rcellminer = derive2 { name="rcellminer"; version="2.0.0"; sha256="1y5rzv9ggfxgyy4z5hm7awd8zb8n57qr2954p2j4ikhj62b6h6z2"; depends=[Biobase fingerprint ggplot2 gplots rcdk rcellminerData shiny stringr]; };
-  readat = derive2 { name="readat"; version="1.4.0"; sha256="10pib536kmkpi3ij8cccxyap7zw0q1jfd1bcv4c38vn04jm3smaa"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_sets assertive_types Biobase data_table dplyr magrittr openxlsx pathological reshape2 stringi SummarizedExperiment testthat tidyr]; };
-  reb = derive2 { name="reb"; version="1.56.0"; sha256="0sh9r77r2s3fmkbkwrazl705dqwr2wh0mx34pxhjfvfic0jc1r5x"; depends=[Biobase idiogram]; };
-  recount = derive2 { name="recount"; version="1.4.6"; sha256="0gqv59rm9k5kcfiq99vxz9g86p2vy7znq5cd84bc7hg6qkva1ah0"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
-  recoup = derive2 { name="recoup"; version="1.6.0"; sha256="09i0c2wv9c6hqc4mq6kklp0maqskpfxj871j44256dxlfh81xm3b"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
-  regionReport = derive2 { name="regionReport"; version="1.12.2"; sha256="1fvkmd2yfkvkj44ldywr1z0l1cn7c64nq3920fhlarqygv92d7xx"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
-  regioneR = derive2 { name="regioneR"; version="1.10.0"; sha256="1vprp3l929hwzmvgskbhawfgnrymwc9n2rxd16rgagnv1dxnjxfp"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; };
-  regsplice = derive2 { name="regsplice"; version="1.4.0"; sha256="0gzm6xazidlkz33ialrxh47n1glx3bkz484rf7ily965fhs0vv53"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; };
-  restfulSE = derive2 { name="restfulSE"; version="1.0.2"; sha256="14sw5k0bhw059yn8lw6rd275j3756znp7pirdyb1srva53isgdik"; depends=[AnnotationDbi AnnotationHub bigrquery DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client S4Vectors SummarizedExperiment]; };
-  rexposome = derive2 { name="rexposome"; version="1.0.0"; sha256="1lg3ms0zx60nbhb7y7bhcl49cf63g0licxjpqrmx2jg9w0ikfj5g"; depends=[Biobase circlize corrplot FactoMineR ggplot2 ggrepel glmnet gplots gridExtra gtools Hmisc imputeLCMD lme4 lsr mice pryr psygenet2r reshape2 S4Vectors scales scatterplot3d stringr]; };
-  rfPred = derive2 { name="rfPred"; version="1.16.0"; sha256="1m79rykh534iss41nw62j0dyx6v0vqk543m7dlgl7zm2kpyzdpc3"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
-  rgsepd = derive2 { name="rgsepd"; version="1.10.0"; sha256="0r1adlc7dxwnm8h6nh4w05z3bffvr10cch7i68a7dli968yza2vj"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
-  rhdf5 = derive2 { name="rhdf5"; version="2.22.0"; sha256="145858qg1xan6imxcbprzq3yn3mdf532aahdr6cibvdjg47hs4c1"; depends=[zlibbioc]; };
-  rhdf5client = derive2 { name="rhdf5client"; version="1.0.7"; sha256="0hq812larfzim4cpq26mx6ckcrpz6p1m55xl2z9dk7zwqapnd2ri"; depends=[httr rjson S4Vectors]; };
-  riboSeqR = derive2 { name="riboSeqR"; version="1.12.0"; sha256="0fg2zn5az1djdjnsrli26rl53ljrrjzmspx02dmgwf1a7nm7qmfz"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; };
-  rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.36.0"; sha256="0y0mxzs24jz9nxcvjxymj0zxjfn1rlx3d8dzvdmfn98lbgyzm4dv"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
-  rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.8.0"; sha256="050dc6asknh8snk6xkvpp5ivyikalslsawadh11lnw5wb4fixmhm"; depends=[RColorBrewer]; };
-  roar = derive2 { name="roar"; version="1.14.0"; sha256="1q0a9l3wrlpr0s9gy93zm6lpxp6b18kg8bm2hn0759b73qpqw2bf"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  rols = derive2 { name="rols"; version="2.6.1"; sha256="0xcsfgnsykdx4iiixsx7iafnzspirpkvx4bj5swfkmay6gfif27w"; depends=[Biobase BiocGenerics httr jsonlite progress]; };
-  ropls = derive2 { name="ropls"; version="1.10.0"; sha256="05fr2s8ciqn20scr6b9i4bnss7ah2svyfg6jcs605w8vc1i90bmw"; depends=[Biobase]; };
-  rpx = derive2 { name="rpx"; version="1.14.0"; sha256="004kq35qzk7a16vwiqxxc42k3djvwnay70hl65913z09cv8k48mk"; depends=[RCurl xml2]; };
-  rqt = derive2 { name="rqt"; version="1.4.0"; sha256="1i563yifxib3lib3x734nvkx7r1nnkp2x9hh7yrkrbwr6pp5hv39"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; };
-  rqubic = derive2 { name="rqubic"; version="1.24.0"; sha256="1568ipcnbgby4vwv0w8ak267dhg2ad5axxgir09xwxqdp3vm7cxm"; depends=[biclust Biobase BiocGenerics]; };
-  rsbml = derive2 { name="rsbml"; version="2.36.0"; sha256="10bbvjv1ihps5r1rx4hrfmdssgvak1dy15098jk61rqdl50xrf8i"; depends=[BiocGenerics graph]; };
-  rtracklayer = derive2 { name="rtracklayer"; version="1.38.3"; sha256="1khzfczm35k5lq9h0jlqrq01192spzjyh8s6is89spj006flwn4k"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
-  runibic = derive2 { name="runibic"; version="1.0.2"; sha256="1nccwf551jpskh4adg3swfcdg2qwvq17cjigjq0aqp8ymcqani8v"; depends=[biclust Rcpp SummarizedExperiment testthat]; };
-  sRAP = derive2 { name="sRAP"; version="1.18.0"; sha256="0yh1a2nlr1cy82vsp8kqghzgy84mwig1cpdys68bapj3cdzv9g5s"; depends=[gplots pls qvalue ROCR WriteXLS]; };
-  sSeq = derive2 { name="sSeq"; version="1.16.0"; sha256="08japi9dybqzvhcjj6yvchy94lbv62wbcd7kz3ilcygs6ykawqlh"; depends=[caTools RColorBrewer]; };
-  safe = derive2 { name="safe"; version="3.18.0"; sha256="0wpbmisvgkz1axx930nh5dx4dmhgmz2z5g17k1ifyvigpap75hh2"; depends=[AnnotationDbi Biobase SparseM]; };
-  sagenhaft = derive2 { name="sagenhaft"; version="1.48.0"; sha256="0g3jd86gv8zkdjqjd617b9chrl6gmbilhzsa7afkxzbqvr7k3h4y"; depends=[SparseM]; };
-  samExploreR = derive2 { name="samExploreR"; version="1.2.0"; sha256="0hbdcybv99h1wfpnlwinkwnbiizprl0zvdrnqbw9z049mvw6dls4"; depends=[edgeR ggplot2 RNAseqData_HNRNPC_bam_chr14 Rsubread]; };
-  sampleClassifier = derive2 { name="sampleClassifier"; version="1.3.1"; sha256="06l1clgs3xkv86pm7k4an5nbsiwykmclshcqdyyz820hjil4jzys"; depends=[annotate e1071 ggplot2 MGFM MGFR]; };
-  sangerseqR = derive2 { name="sangerseqR"; version="1.14.0"; sha256="162rmbri3il6xf4ifl46q7yryp3fhcxy5vyg3s7rnhk2c7scm2ss"; depends=[Biostrings shiny]; };
-  sapFinder = derive2 { name="sapFinder"; version="1.16.0"; sha256="1xwm6ljpsfq2ps0568lk7ybab2x1zhijwgn6c1qvrwp674y3h51q"; depends=[pheatmap Rcpp rTANDEM]; };
-  savR = derive2 { name="savR"; version="1.16.0"; sha256="1z50z5lf6x58phcsbrmy2pwz9zgm89yb0lpr9v4i5rd46bfi22ib"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
-  scDD = derive2 { name="scDD"; version="1.2.0"; sha256="04d4h29kv8k3i92jpbckcakky6f7ww4mjgv9f3ha702c8vphp5c1"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; };
-  scPipe = derive2 { name="scPipe"; version="1.0.6"; sha256="16day8ga9qp9y4aff2z6j1y9lclpzzl7nqw1h3pawfpy465kwif8"; depends=[BiocGenerics biomaRt GGally ggplot2 MASS mclust Rcpp reshape Rhtslib robustbase S4Vectors scales SingleCellExperiment SummarizedExperiment zlibbioc]; };
-  scater = derive2 { name="scater"; version="1.6.3"; sha256="0q3s96gf8saa1dq2fvmpl0jyj7bx3wrdfck3hanb8pxkcir2p7dn"; depends=[beachmat Biobase BiocGenerics biomaRt data_table dplyr edgeR ggbeeswarm ggplot2 limma Matrix matrixStats plyr Rcpp reshape2 rhdf5 Rhdf5lib rjson S4Vectors shiny shinydashboard SingleCellExperiment SummarizedExperiment tximport viridis]; };
-  scde = derive2 { name="scde"; version="2.6.0"; sha256="0cxaail8sa0bn56gp88x64p0k022hixh44s32i37al4wd70nlv12"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; };
-  scfind = derive2 { name="scfind"; version="1.0.0"; sha256="1rm2sgdv3z2lxrlws227z6q8h4ydpbvnd37l7f8pask1nc6zbky3"; depends=[bit dplyr hash Rcpp reshape2 SingleCellExperiment SummarizedExperiment]; };
-  scmap = derive2 { name="scmap"; version="1.1.5"; sha256="0jqgk9sjb5bp5gbzq14vsif5gd5ry4213glvnpmhgqm23hmwbfhi"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; };
-  scone = derive2 { name="scone"; version="1.2.0"; sha256="1xq48d3z78p54iclb1ii074i7f88qfzh5djfiyrwf3k6gsapadfi"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; };
-  scoreInvHap = derive2 { name="scoreInvHap"; version="1.0.0"; sha256="04q2rs1gw7v97lwcialyswqzl0kd5c5298v60cm6wha25i6lwgbs"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; };
-  scran = derive2 { name="scran"; version="1.6.9"; sha256="0cs64cnf0xjcgmawr210y99j3gxs6aqgh8081n9827kkqnx2y5dm"; depends=[beachmat BiocGenerics BiocParallel DT dynamicTreeCut edgeR FNN ggplot2 igraph limma Matrix Rcpp Rhdf5lib S4Vectors scater shiny SingleCellExperiment statmod SummarizedExperiment viridis zoo]; };
-  scsR = derive2 { name="scsR"; version="1.14.0"; sha256="05xqrv1babqvlvr4m5k0r7yy4fbr0y46f3i4v4zcjilda1qf54pb"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
-  segmentSeq = derive2 { name="segmentSeq"; version="2.12.0"; sha256="0jqdddzrxahf6i7cmaay5v9ig9969avhv8ddh72v6ndfphlkfb64"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
-  semisup = derive2 { name="semisup"; version="1.2.0"; sha256="14q2p38a8r4ry8swwi88k96rchmcnplknq1a62lvm98k09k1887r"; depends=[SummarizedExperiment VGAM]; };
-  seq2pathway = derive2 { name="seq2pathway"; version="1.10.0"; sha256="0wz9x4kv2zw21sppkmfp9qmclwffm5yhzx580yd3iggi1calq8bg"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
-  seqCAT = derive2 { name="seqCAT"; version="1.0.0"; sha256="00m0w0l14y8k1viqv60n8p384lv80vnny3x9f5rmi1bba02kxkw7"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges lazyeval S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; };
-  seqCNA = derive2 { name="seqCNA"; version="1.24.0"; sha256="1qq217mrxi0ygafyy4fvbjxhwabvific2bj0iq7871dx4dq3mcf9"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; };
-  seqLogo = derive2 { name="seqLogo"; version="1.44.0"; sha256="1ql4q4vx0j61a893dqc3c8zxmgs8sqhy3j1qhyfdvbd01vw9w1kq"; depends=[]; };
-  seqPattern = derive2 { name="seqPattern"; version="1.10.0"; sha256="1kcm5w83q7w0v0vs7nyp4gq5z86c6n6pqy9zmyyhxcrns7f597pm"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
-  seqTools = derive2 { name="seqTools"; version="1.12.0"; sha256="1m69xbd9p3mzwn9wgn30b6995lydn973dfz9l65c0f5qr59ww5ns"; depends=[zlibbioc]; };
-  seqbias = derive2 { name="seqbias"; version="1.26.0"; sha256="1i1zqslv0qws12x45c37h7fkgpz5wv3v87h72n4pw8gh80bgcafl"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
-  seqcombo = derive2 { name="seqcombo"; version="1.0.0"; sha256="0bkap2c1061yg2ws2m1fafxi37pqzkg9mzim5sqiq8sgcfmk6na6"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr rvcheck]; };
-  seqplots = derive2 { name="seqplots"; version="1.16.0"; sha256="1plwmdq2hjcqs94l7s03h9amcxdimwdrmi11z03xn10dfn1xig70"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; };
-  sevenbridges = derive2 { name="sevenbridges"; version="1.8.1"; sha256="0v22pwyrgxh6mjqqcxz9ix7ripl5xds0l8p38w0w08ynbdns1w5b"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
-  shinyMethyl = derive2 { name="shinyMethyl"; version="1.14.0"; sha256="17w7shgr4s5w3y1ik8zgr9brv7q87dx9l6dfqywsyvfmmkddimwa"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
-  shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.16.0"; sha256="17x0bq1kzvmqqf30y0dmmp9777i62525mp4ysyv2m6vb9bgrbc4y"; depends=[mixtools rTANDEM shiny xtable]; };
-  sigPathway = derive2 { name="sigPathway"; version="1.46.0"; sha256="18nn7rpg67dz30v1drm0lnsb1wnww7maxdg4gk960wayasp8hk2z"; depends=[]; };
-  sigaR = derive2 { name="sigaR"; version="1.26.0"; sha256="196jj39frqi9vmdl592ihkji4vxfimv6xr9cbmlgnnpjpd68b05k"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; };
-  siggenes = derive2 { name="siggenes"; version="1.52.0"; sha256="1g88rga3pksmydkqd117wsqj1i5hfzi3rkadac51n8bk0sx6rfmw"; depends=[Biobase multtest]; };
-  sights = derive2 { name="sights"; version="1.4.0"; sha256="1hnzvx9avgvv4jgsgilbdyri9qqbf4sbcpyy47j31sg70ilzydxs"; depends=[ggplot2 lattice MASS qvalue reshape2]; };
-  signeR = derive2 { name="signeR"; version="1.4.0"; sha256="0rmdwjhp6ps9bvmhk1znarzg1kk319sb2rvxr51qwwka7idxfa0n"; depends=[BiocGenerics Biostrings BSgenome class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; };
-  sigsquared = derive2 { name="sigsquared"; version="1.10.0"; sha256="0v68p83k43xx7yvxzknxzwqyvvccffi557dlz25wh8v8s3wkyk2c"; depends=[Biobase survival]; };
-  similaRpeak = derive2 { name="similaRpeak"; version="1.10.0"; sha256="144mc40q2jgswk2w1ri5bh0cs8lgs0b6s1jwljrilfpvjww0r36f"; depends=[R6]; };
-  simpleaffy = derive2 { name="simpleaffy"; version="2.54.0"; sha256="0b91hlsgq61rbwv08w2951dric7chvq1mfsp9716qvw7l8jqngng"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
-  simulatorZ = derive2 { name="simulatorZ"; version="1.12.0"; sha256="1nzkaa6x0my1pk4h8naznckmzdd72wwdfxk6ivczbpnzxhnpz8nd"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
-  sincell = derive2 { name="sincell"; version="1.10.0"; sha256="07p2ck9wzxw4kz9bzxq8kggmmy2yvbz939mcn43giag1chx2ndax"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
-  sizepower = derive2 { name="sizepower"; version="1.48.0"; sha256="199rqpbjp4l5faw6z9srfg7vs7kmdbzh12vm52s02v8mayb46mbp"; depends=[]; };
-  skewr = derive2 { name="skewr"; version="1.10.0"; sha256="0s78dp3lg27x4qrs9q9nvi69vfrphncf5ivm15rf9k49smhr3bh3"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; };
-  slalom = derive2 { name="slalom"; version="1.0.0"; sha256="0jjr9k7fdvi4sg1ivnb65migcmyz3rg3fwm9gd50q6w80bs64g89"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; };
-  snapCGH = derive2 { name="snapCGH"; version="1.48.0"; sha256="12pdmmywr9lf44kna3wr59h1zyjck3734qw11ahhah40j5k247xd"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
-  snm = derive2 { name="snm"; version="1.26.0"; sha256="14fpxl3h7673qffavknavjnlwcqk22qx3qh7i1p2i35gg3qw5rs0"; depends=[corpcor lme4]; };
-  snpStats = derive2 { name="snpStats"; version="1.28.0"; sha256="1x9qwynh2hwl24vq02naf4mchpch7xi2pkdrlgw896k28kx0lvir"; depends=[BiocGenerics Matrix survival zlibbioc]; };
-  soGGi = derive2 { name="soGGi"; version="1.10.0"; sha256="0jlpyq55byaqlnmn9n2k5scmm4iv7gzyl0ll7fn6ddhi3vxw4jxi"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.2.0"; sha256="0pbj09424a8f0xsr446bcxqgmha2zzmfvrcszknli1ai7isp23sq"; depends=[MASS MCMCpack optparse tmvtnorm]; };
-  specL = derive2 { name="specL"; version="1.12.0"; sha256="03bkh0z3pd6jl47wq2h6zd73fvaggwnaj2b4ibijwkg1643mfiip"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
-  spikeLI = derive2 { name="spikeLI"; version="2.38.0"; sha256="00fixl9jpjfm0qgsg1lwi0315sa53j1j9fbrl69j8y2gbr8kgg28"; depends=[]; };
-  spkTools = derive2 { name="spkTools"; version="1.34.0"; sha256="0vpyv78c6c58qrcz91mir7jh9gx2j2l48bclabvgi0k2156wpwn7"; depends=[Biobase gtools RColorBrewer]; };
-  splatter = derive2 { name="splatter"; version="1.2.2"; sha256="05bqmck2hszxlvj0vb1j7fbyv4fp2q7bjv7ywlg6hs9bx7zk1iaj"; depends=[akima BiocGenerics BiocParallel checkmate edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
-  spliceR = derive2 { name="spliceR"; version="1.20.0"; sha256="1skwj4cqf4s14df42jgy5b9fxrb5c5np9khc0wkg732qddbdlagd"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
-  spliceSites = derive2 { name="spliceSites"; version="1.26.0"; sha256="19av0wkdvy4x4p0nkhy9ca450d6j0s68m2lp26116ydh4lzv4p8x"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
-  splicegear = derive2 { name="splicegear"; version="1.50.0"; sha256="0i47l91p77s4acgrx9c8ll2va7amysw1g2acs36mn99hpz86v4m4"; depends=[annotate Biobase XML]; };
-  splineTimeR = derive2 { name="splineTimeR"; version="1.6.0"; sha256="12x1lzcz8xih462nbzihdn9npypzr9clwy36vvwrfwh2plcq7314"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
-  splots = derive2 { name="splots"; version="1.44.0"; sha256="09zcf9l3mr3y650di1v5h47fp020n0cf5hp9ccjwf1480wwl7rpn"; depends=[RColorBrewer]; };
-  spotSegmentation = derive2 { name="spotSegmentation"; version="1.52.0"; sha256="0jmhgk37na16fhlfqx3a6fhm7syyh25qh4nrwgc4f94d13hs70mp"; depends=[mclust]; };
-  sscore = derive2 { name="sscore"; version="1.50.0"; sha256="0ivs9fb6ps0hv1ywja95x9xbsmljcv6zjkpvyb25a6l06vyjdh08"; depends=[affy affyio]; };
-  sscu = derive2 { name="sscu"; version="2.8.0"; sha256="1aa48cr8xxin9vzv280k7m4z6qy59gzclhdnj9gpxrh90kghv5vs"; depends=[BiocGenerics Biostrings seqinr]; };
-  ssize = derive2 { name="ssize"; version="1.52.0"; sha256="02c1gwl4c6sf95k0rgahb2vbgwi53vlfz6nydg7zmqa3hvf16mr3"; depends=[gdata xtable]; };
-  ssviz = derive2 { name="ssviz"; version="1.12.0"; sha256="1q8hvqpqniyfma8k2j0xpb8jnc05xdazh74kk3b0fkriqz11n8xw"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
-  staRank = derive2 { name="staRank"; version="1.20.0"; sha256="0f7ql6sc5dxk86ca4qmlgsbvzvw1h97y6jmzbrcvn24n9c3hkrgy"; depends=[cellHTS2]; };
-  stageR = derive2 { name="stageR"; version="1.0.0"; sha256="0553av4ys27ag7v77mfb7wxw7d09g1f0vf4615jcjir9mvc6y3qj"; depends=[SummarizedExperiment]; };
-  statTarget = derive2 { name="statTarget"; version="1.8.0"; sha256="0z6niv4i50f8b7g78c7rcdrniblvv5sq2phb7vd2glnh038r1rl0"; depends=[gWidgets2 gWidgets2RGtk2 impute pdist pls plyr randomForest ROC rrcov]; };
-  stepNorm = derive2 { name="stepNorm"; version="1.50.0"; sha256="10fd623pqy944q9l913bv1a3dh7wk4i0r211hvvzdr39kfhjl6mf"; depends=[marray MASS]; };
-  subSeq = derive2 { name="subSeq"; version="1.8.0"; sha256="1z9qwfclhnnvcp4r4zfi201rmgd0hj47rd77x958m1d6d3z65m34"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
-  supraHex = derive2 { name="supraHex"; version="1.16.0"; sha256="10lhdhlb33p91np6ldmxc8yqgxwly7p37nlacm77q35dp05a453n"; depends=[ape hexbin MASS]; };
-  survcomp = derive2 { name="survcomp"; version="1.28.5"; sha256="09winy33410hw6srybaw49m2nb5cyp3fx0ww9gyhhkh73cvb6xwb"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
-  sva = derive2 { name="sva"; version="3.26.0"; sha256="0q5xb68wfcnchy8rkv5ma67pmz1i91lsnvmwmj8f1c3w4xan3pgw"; depends=[BiocParallel genefilter limma matrixStats mgcv]; };
-  swfdr = derive2 { name="swfdr"; version="1.4.0"; sha256="0ls0w09bkxxqv1y50d5c1s0qpxb1xdyall8ypvky8awi7v6jlrcg"; depends=[dplyr ggplot2 reshape2]; };
-  switchBox = derive2 { name="switchBox"; version="1.14.0"; sha256="0mhkf4wwd3v3s1148nafbd6x6ys8j933glh4gp3wj24ddmmpxvb2"; depends=[gplots pROC]; };
-  switchde = derive2 { name="switchde"; version="1.4.0"; sha256="0fxdg1d0jgqqas5cwmpcm96qfja0xw62x1421ahxfsrh1q6hqay6"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; };
-  synapter = derive2 { name="synapter"; version="2.2.0"; sha256="1m9s2pdm38wb5riyy0wf8g4a2ilrrkznsy9virdiqqm5kqzpkzic"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; };
-  synergyfinder = derive2 { name="synergyfinder"; version="1.4.2"; sha256="11zpza9ghd1dckb604c5v3rxpgf6v29qm9yp1vpdnm04gfj2q6iy"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; };
-  synlet = derive2 { name="synlet"; version="1.8.0"; sha256="1pchh66wg3cvx1kq1l521lg7w0qpnw5azig339pnpwwymh9fpa5j"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
-  systemPipeR = derive2 { name="systemPipeR"; version="1.12.0"; sha256="11mj8pjq5vj25768vmagpzv74fvi3p3kdk5zdlznqyiaggri04cv"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
-  tRanslatome = derive2 { name="tRanslatome"; version="1.16.0"; sha256="1whnx5ka8jhqsis68drs7ah3dg5lj6vfw3a42l7s8mp94n0qdixj"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; };
-  tenXplore = derive2 { name="tenXplore"; version="1.0.0"; sha256="0f57ak81vndff6xij2hn28xnrly1088sw7bc1jgfgzldy94mxn1m"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; };
-  ternarynet = derive2 { name="ternarynet"; version="1.22.0"; sha256="1k8s31zjyrid1wkhg5ighphi8nr8i5nbcd0sjqpjzv1zhi35hdaa"; depends=[igraph]; };
-  tigre = derive2 { name="tigre"; version="1.32.0"; sha256="007lnj4hcq8sls8vdr59h7hjjsdjwk3i6snx97i8ply683ndc3ph"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
-  tilingArray = derive2 { name="tilingArray"; version="1.56.0"; sha256="0ahw51r1zsb47r2q90670ngakb34y49d3njwlchyk2r6vz3kzqkb"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
-  timecourse = derive2 { name="timecourse"; version="1.50.0"; sha256="0lr4znyi82mqjm02wwr7zq6l2cfbq2gliynxim45xhahqp43cbpr"; depends=[Biobase limma marray MASS]; };
-  timescape = derive2 { name="timescape"; version="1.2.0"; sha256="0v3a7gn2d852h8m0053a57w153z4nlmp5mb5g96kjw06vvwr71jd"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; };
-  tkWidgets = derive2 { name="tkWidgets"; version="1.56.0"; sha256="0z1vd0nymyvvrn5jc97q33y9xl6w8pd4wzb6yyfjg8jy85kswfgf"; depends=[DynDoc widgetTools]; };
-  tofsims = derive2 { name="tofsims"; version="1.6.0"; sha256="1zpq0c01fqm3yl2mkvx1yl2ajj2a933wa6h7hinrh3mdyix8pzrn"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
-  topGO = derive2 { name="topGO"; version="2.30.1"; sha256="1cgz4knxr328xfqlhl6ypxl6x86rfrlqz748kn94ainxjzz55i6x"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
-  topdownr = derive2 { name="topdownr"; version="1.0.0"; sha256="1yshm8a6dirnmda5ydx1ksndbbcrqlp25lrj1rqxnaclqb9xn0g2"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR S4Vectors]; };
-  trackViewer = derive2 { name="trackViewer"; version="1.14.1"; sha256="029yff299x23imqyk62cmxcsvdx34a6b4l9zp4p46iq3jb841h66"; depends=[AnnotationDbi GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz htmlwidgets IRanges pbapply Rsamtools rtracklayer S4Vectors scales]; };
-  tracktables = derive2 { name="tracktables"; version="1.12.0"; sha256="02l5n4sbwzig5kdnjyhhqpiwskaf8f4pqkra3m511vrqfpmd39f3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
-  transcriptR = derive2 { name="transcriptR"; version="1.6.0"; sha256="0malha3w4vm21bmqdvn8y9q37m0ilghbyzmwgayvx9lvy3mfnk2s"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
-  transcriptogramer = derive2 { name="transcriptogramer"; version="1.0.0"; sha256="08yab83dkwjwbbgf05k05c32yn74ls8xy7lm3yr39sb3nfqmra9n"; depends=[biomaRt data_table doSNOW foreach igraph limma progress RedeR snow topGO]; };
-  traseR = derive2 { name="traseR"; version="1.8.0"; sha256="1zqcz7w8pwc2vzjr137iv1bpfddh17kvmqaz7hgs9z1962704l0y"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
-  treeio = derive2 { name="treeio"; version="1.2.2"; sha256="1m92hrfgy3lca7x674qp41j2x4gpanfvvc7gsmxw3d1q7fwqlvwl"; depends=[ape ggplot2 jsonlite magrittr rvcheck]; };
-  trena = derive2 { name="trena"; version="1.0.3"; sha256="1yk88mc3lcgm75wzqgl6xz4f1vk1i5q9qybr5m7s71m4dvwszgpb"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 stringr vbsr]; };
-  triform = derive2 { name="triform"; version="1.20.0"; sha256="09hlnkrbzgk0vn1jcbja2i0hv54pfr2nzf33ik0rabrvv75zhb46"; depends=[BiocGenerics IRanges yaml]; };
-  trigger = derive2 { name="trigger"; version="1.24.0"; sha256="16r7b0wy37pbylz9ch6516nygpxrb31qm42i8amh04jy60zw64rw"; depends=[corpcor qtl qvalue sva]; };
-  trio = derive2 { name="trio"; version="3.16.0"; sha256="1bw0cy95qrzmg6qiy9j8n4ydi734z3q78l1pnaxagdk1ji5ab577"; depends=[]; };
-  triplex = derive2 { name="triplex"; version="1.18.0"; sha256="0x74ykqkjhbbarzgkdba090lw61n3wzpy4izsnnbawix96wqy6dx"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
-  tspair = derive2 { name="tspair"; version="1.36.0"; sha256="079wj12v6x5df2cvmhwg241042h6lgbky4hpa36b3pd7z6pjsq6w"; depends=[Biobase]; };
-  tweeDEseq = derive2 { name="tweeDEseq"; version="1.24.0"; sha256="1ms9psb5xagkxam117iksb1fj815jdlymddhlf3kv6hgyj4bx793"; depends=[cqn edgeR limma MASS]; };
-  twilight = derive2 { name="twilight"; version="1.54.0"; sha256="0b7k6dw23814qgzwqxrvpaj3f22fmkivd32scspf4i2rzm33dh53"; depends=[Biobase]; };
-  twoddpcr = derive2 { name="twoddpcr"; version="1.2.1"; sha256="0d8i2vr3db16nndgw4sy0kmkx7517pykvp48jsrw26n38gbbmvx0"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; };
-  tximport = derive2 { name="tximport"; version="1.6.0"; sha256="1gyqcm91hxg1kgjqcz2qw1n56yp9pymjzs50rwcpb2893dr8sp2h"; depends=[]; };
-  uSORT = derive2 { name="uSORT"; version="1.4.0"; sha256="0zr6x9na95n055jk5csipvvd8dsf9pzqh7y4z4fhzfgj8bb2rwbv"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; };
-  unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.14.0"; sha256="1d6khk7d6crrlhp3plwfi0d7nxvdk02ggnm4s5s6c5s3jpk64jra"; depends=[BiocGenerics HTqPCR]; };
-  variancePartition = derive2 { name="variancePartition"; version="1.8.1"; sha256="08isp7j3dd9qii7ly8sf2glpc7x9r6dpc0ci4ix3l5diw2lq30xx"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 MASS pbkrtest reshape2]; };
-  vbmp = derive2 { name="vbmp"; version="1.46.0"; sha256="01bzkdjpb5hv9h2pf4p4h2w19771wc5p6hvij7ywygdx560hb93p"; depends=[]; };
-  viper = derive2 { name="viper"; version="1.12.0"; sha256="1k9yfz010v1g5ap900m1skaxc7ygy20y4xdc8a2c0dgfkclnw59m"; depends=[Biobase e1071 KernSmooth mixtools]; };
-  vsn = derive2 { name="vsn"; version="3.46.0"; sha256="18y62phzirj75gg6v5l41jwybmk23ia6w7qhch0kxc4bl2rysw6j"; depends=[affy Biobase ggplot2 lattice limma]; };
-  vtpnet = derive2 { name="vtpnet"; version="0.18.0"; sha256="02nws97nmlrpzwb5jqm3fmg38mp1qdf41hzwmmprhfhsymnmc4ch"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
-  vulcan = derive2 { name="vulcan"; version="1.0.0"; sha256="1yxm6yg7d65wh9rl6k5b6831y4hr5l9nnmfi0azxz1h4x1ghqbdj"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; };
-  wateRmelon = derive2 { name="wateRmelon"; version="1.22.1"; sha256="08imbxhs4ikm6panz3y64b24d2ghy1s2ksgd8siff53hg2v59rqr"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
-  wavClusteR = derive2 { name="wavClusteR"; version="2.12.1"; sha256="01b8aqwi7nd8l7mkiqgg9skvl0r6y1vwslwchyk95a9l4hkhxrz9"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
-  waveTiling = derive2 { name="waveTiling"; version="1.20.0"; sha256="1dlz548vjnarz15mscmj56jp2hn810w0dy7xprxx22n51h7kb7jg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
-  weaver = derive2 { name="weaver"; version="1.44.0"; sha256="06fg8z4gp2mabiy9jrfwkrrz1r4qzzgjk3lxj6d53ii2xhq95vy6"; depends=[codetools digest]; };
-  webbioc = derive2 { name="webbioc"; version="1.50.0"; sha256="1kg6apnhq97ypmpx6qm2f7wip81f910mjlg9kmd9zzmhnkrhqamd"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
-  widgetTools = derive2 { name="widgetTools"; version="1.56.0"; sha256="0xkasd8z4sy9dsb2r7k3x2vhbqh9md39bz3qqwjsz8hgl6f0ggsr"; depends=[]; };
-  wiggleplotr = derive2 { name="wiggleplotr"; version="1.2.0"; sha256="1scqvmh16y6c81qlvfa8y9z47p8wl4lccq0sm5wy4jay6zch8mn2"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; };
-  xcms = derive2 { name="xcms"; version="3.0.2"; sha256="0qk9mjg4qdv88vmcsdalf59za46ifikxp7snwf5a6n3jaykzx4xl"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer S4Vectors]; };
-  xmapbridge = derive2 { name="xmapbridge"; version="1.36.0"; sha256="0jv07kgjh3jkk61bw92kr3s10sai427f93r5j5hjzjhn6wzpahqy"; depends=[]; };
-  xps = derive2 { name="xps"; version="1.38.0"; sha256="1xmsbjkcy04nz1npbr2bia1p4x4q6b55mmk0vqkphjl6x93dw6c8"; depends=[]; };
-  yamss = derive2 { name="yamss"; version="1.4.0"; sha256="08mq0f27if86wacck1317fhm6gchxqzbj2vj9sxasr865jdzr1r9"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; };
-  yaqcaffy = derive2 { name="yaqcaffy"; version="1.38.0"; sha256="144kz9q7ahrvv5h6r96pva039s1ms2pz5rsqkx1hv1jjb19070lg"; depends=[simpleaffy]; };
-  yarn = derive2 { name="yarn"; version="1.4.0"; sha256="1gr7nwhp8gpzv6zbwh56q37bkgq1g61i1lhqsps40izwr2ib8qiv"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; };
-  zFPKM = derive2 { name="zFPKM"; version="1.0.0"; sha256="1bj2a1m0ivnv604796d1x4cf9y2nwwbsql5k3vvv1gvjp7wlp81v"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; };
-  zinbwave = derive2 { name="zinbwave"; version="1.0.0"; sha256="0r7drhs77brk0p47kvz8s0xcwpsrgmwrqzzshs84ip1sgci41iia"; depends=[BiocParallel copula edgeR genefilter glmnet SingleCellExperiment softImpute SummarizedExperiment]; };
-  zlibbioc = derive2 { name="zlibbioc"; version="1.24.0"; sha256="1zr9hbh55hglfpy15cpxwmddxblhyb0an15953l3rbhmlh2vpy92"; depends=[]; };
+  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.11.3"; sha256="08rrz6binj0hilji6gkdmqvwj0hp1b9rk6jx10gvn6wi3hg1nv4n"; depends=[ABAData data_table GOfuncR gplots gtools Rcpp]; };
+  ABSSeq = derive2 { name="ABSSeq"; version="1.35.2"; sha256="0x86y1j8h9ad4vyzadb4xngzfihz73jcy2qrn5d2bpigv3m3rar5"; depends=[limma locfit]; };
+  ABarray = derive2 { name="ABarray"; version="1.49.0"; sha256="1rnsk81lhybj612rb2b886al567m58ax77kng4ip43ivzd3yssil"; depends=[Biobase multtest]; };
+  ACME = derive2 { name="ACME"; version="2.37.0"; sha256="1ihpzaxhpdg8lvd30g9xhjhsil34s7w8w06cy04dp7zv117yda55"; depends=[Biobase BiocGenerics]; };
+  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.21.0"; sha256="107hm5klybm8lp12bjir6gjcka8a5q4c54nvq3sn0avvzcj5caf4"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
+  AGDEX = derive2 { name="AGDEX"; version="1.29.0"; sha256="0bidzm02g5f4ivnrymg9m7kpmjlg93zv1alpcsjx6ssbaix42r33"; depends=[Biobase GSEABase]; };
+  AIMS = derive2 { name="AIMS"; version="1.13.0"; sha256="15ch50fw03q66d7x0asri8ff5xr82r8rxd46i80zij1fg27avkxa"; depends=[Biobase e1071]; };
+  ALDEx2 = derive2 { name="ALDEx2"; version="1.13.0"; sha256="01c4bjbybivjqq1hl9dpmndn3mfk595yyjjkljcxbza6wax99rd0"; depends=[BiocParallel GenomicRanges IRanges multtest S4Vectors SummarizedExperiment]; };
+  AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.7.0"; sha256="12al115s0h3pylk8dv2d9kn241vqhdqww6y44md0ywwcpfrbkdvi"; depends=[]; };
+  ANF = derive2 { name="ANF"; version="1.3.0"; sha256="0386q8bx4r00i12l79k0yi17f9kj1iw5fg3gg760pjspp67v810s"; depends=[Biobase igraph MASS RColorBrewer survival]; };
+  ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.21.0"; sha256="1ipryh3wagasfz1kzhdja7mp6sfpl8xf01pi0nh2mwyah7k76h5n"; depends=[ARRmData]; };
+  ASAFE = derive2 { name="ASAFE"; version="1.7.0"; sha256="0p6q9zpfqf7cz1lb0cm75ddhhcrdf90dpblrxhn8hkh5wgn3yp0m"; depends=[]; };
+  ASEB = derive2 { name="ASEB"; version="1.25.0"; sha256="00wwdg07zgqbaparqail1pnffx5r63007rq65shlxda483f3ywr1"; depends=[]; };
+  ASGSCA = derive2 { name="ASGSCA"; version="1.15.0"; sha256="0f9mih8bhv4ibwqni7z94n4v3kz5cm2paqdp5c0y7hvg9i836gyl"; depends=[MASS Matrix]; };
+  ASICS = derive2 { name="ASICS"; version="1.1.0"; sha256="0a81s0yhn4zb8jyq889sz94rf22mrmsnpika0j1hs1sc3h2li3v2"; depends=[BiocParallel ggplot2 gridExtra plyr quadprog ropls speaq SummarizedExperiment zoo]; };
+  ASSET = derive2 { name="ASSET"; version="1.99.0"; sha256="1c43xdlgqpmq192cxfbpsq6f767zlcmpm7am539673yr6fc8ql7i"; depends=[MASS msm rmeta]; };
+  ASSIGN = derive2 { name="ASSIGN"; version="1.17.1"; sha256="06rzdkdq66sl0lxbr3mvw6ybgs2laxyx7iaqgmjwf96b2j869jqb"; depends=[ggplot2 gplots msm Rlab sva]; };
+  ASpli = derive2 { name="ASpli"; version="1.7.0"; sha256="19i2says6d2sl160537vzvj9iz5zmrv6xlyprv0787n7yswssy6s"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; };
+  ATACseqQC = derive2 { name="ATACseqQC"; version="1.5.1"; sha256="15spnf3a5hangks4k07gyjcnr6cjzxim4zjrjjilyx6jmfc7wiib"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; };
+  AUCell = derive2 { name="AUCell"; version="1.3.4"; sha256="1v53cq58jj3nvgrj7xrypmw0g4882yma950yc7k9189sdbbxxdm6"; depends=[data_table GSEABase mixtools R_utils shiny SummarizedExperiment]; };
+  AffyCompatible = derive2 { name="AffyCompatible"; version="1.41.0"; sha256="1gxk7kggb29hhfqz2a1g6yqy8mbg0x7gvajnnqgamdggylg7zz32"; depends=[Biostrings RCurl XML]; };
+  AffyExpress = derive2 { name="AffyExpress"; version="1.47.0"; sha256="1ph5vgm6hxifdyg8v3vgcqwm7k1fh4d3jnf10i4p7x4gi00xycan"; depends=[affy limma]; };
+  AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.27.0"; sha256="17m0sn1rb6485lvrpn677z3y540pc93ykbyjg1plrl3qby6nxc5q"; depends=[affy]; };
+  AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.31.0"; sha256="1hxvi9hdx8shikljwbh60k4ylir2hdibkccqd5wr4hb08spnam4j"; depends=[affy affycoretools Biobase limma preprocessCore]; };
+  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.19.0"; sha256="13cw6k6xgkillkj7jfgflgb42nfb85hj919yd1i0css4zi9gxd2w"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra nlme Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+  Anaquin = derive2 { name="Anaquin"; version="2.5.0"; sha256="1cqrm7pmirdd23dw8lvrdjfkjp6rgx15s8h88jbilcv7qajg32jc"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; };
+  AneuFinder = derive2 { name="AneuFinder"; version="1.9.0"; sha256="1b0rrnxb8ldw9mxva42m0jj6r2xjn91rnrw409dmk365j8nxva2f"; depends=[AneuFinderData bamsignals Biostrings cowplot DNAcopy doParallel ecp foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; };
+  AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.43.1"; sha256="150mxlr5fcid4vnv8gh0imr9y9lzgyxrmvzmah4l8kg7r5rllm6k"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
+  AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.5.2"; sha256="12lkv4dg25r5p77s84xzyh3aw8pybcdrkvqf21n8xv41gxpycdkq"; depends=[GenomicRanges lazyeval]; };
+  AnnotationForge = derive2 { name="AnnotationForge"; version="1.23.0"; sha256="07b8m6g4zm1lj6pxscjyg7b39km8wx68jiqimdd7ddkzj9xqyvg8"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; };
+  AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.31.0"; sha256="1sf2afh9s94k1j9xx7csv7k1cah52s8ks7bhjr13m5c2dad3df1f"; depends=[AnnotationDbi DBI]; };
+  AnnotationHub = derive2 { name="AnnotationHub"; version="2.13.1"; sha256="1zhnadp24h7hxjgdgp4x4c2iwnciw6gvi6ycxbql1yilqr3ip6w0"; depends=[AnnotationDbi BiocGenerics BiocInstaller curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; };
+  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.11.1"; sha256="1s7bfmynwx6y555bsxp3cgkfa3gnc0ll476qydszw4agspp8wyn9"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; };
+  ArrayExpress = derive2 { name="ArrayExpress"; version="1.41.0"; sha256="1xac01vhc8cdx7cp32qw4cfqyl20my5wdw3jf9mwb6qybjk557w7"; depends=[Biobase limma oligo XML]; };
+  ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.31.0"; sha256="16j2a1qyhykzyqggfwaxvp4ay6l9ckimd4djh1qdp3ayqaign04r"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
+  ArrayTV = derive2 { name="ArrayTV"; version="1.19.0"; sha256="1swim5w679hskgwfdm9fbfdwhlra7wp4fgsl38vmainayna90xw9"; depends=[DNAcopy foreach IRanges oligoClasses S4Vectors]; };
+  ArrayTools = derive2 { name="ArrayTools"; version="1.41.0"; sha256="1pkv72pkiqxjb0f642p7gdc0gfr7xg9vc96awi149a5z71bbykli"; depends=[affy Biobase limma xtable]; };
+  BAC = derive2 { name="BAC"; version="1.41.0"; sha256="0jk4drgs8w1fvarkhm4sbkm9ls6vh67vja9f2f29p4n0ykgf06y2"; depends=[]; };
+  BADER = derive2 { name="BADER"; version="1.19.0"; sha256="1y2lw5f6l32q3p3bral7bz2h57fvd7mpj00q4ds6l3y8j8grp3vf"; depends=[]; };
+  BAGS = derive2 { name="BAGS"; version="2.21.0"; sha256="1j4284wvpabpzvb3khslfraz6wz5yznv9gsly5xaskximq1i1h74"; depends=[Biobase breastCancerVDX]; };
+  BASiCS = derive2 { name="BASiCS"; version="1.3.3"; sha256="0rljf429zjglh7an6m09m0d8skykciksh2k8vjc6jm3rbsl4j1k5"; depends=[BiocGenerics coda data_table ggplot2 KernSmooth MASS matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; };
+  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.11.0"; sha256="0nma095v38ysx0gjjrp6xslwmi78kgqqzqlmcvbf61qgbpggnqbj"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
+  BCRANK = derive2 { name="BCRANK"; version="1.43.0"; sha256="06082ki14mb4xrbx32lpi7q06bsnmjsc08ggx0si0fxdbf0584r5"; depends=[Biostrings]; };
+  BEARscc = derive2 { name="BEARscc"; version="1.1.0"; sha256="169n512vaa23l3qaxxxa8x6zhy7jqmflsr43dn3k8qncwk1q7pml"; depends=[data_table ggplot2 SingleCellExperiment]; };
+  BEAT = derive2 { name="BEAT"; version="1.19.0"; sha256="1c3csghkdbqmaj36bg75fnx626rp2myykwc4hpxlij1sy8a9pjra"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
+  BEclear = derive2 { name="BEclear"; version="1.13.0"; sha256="0swsrlf6rdxkdbncf5f18zxfimmgiay42i12lg5apb5rk9in890c"; depends=[Matrix snowfall]; };
+  BGmix = derive2 { name="BGmix"; version="1.41.0"; sha256="1v6rpn322g4qp3q3hisvi419nnslzpfqdp37bdc1spmsh88inb1j"; depends=[KernSmooth]; };
+  BHC = derive2 { name="BHC"; version="1.33.0"; sha256="18jpic1xk5gnxfw7r4hw0591lmrcncv412qd1q08l2nqw0a24895"; depends=[]; };
+  BLMA = derive2 { name="BLMA"; version="1.5.0"; sha256="1cpy2dx1da1bn0wc43fwva2akq473ww4nz241dq5xfrk2hwwkz91"; depends=[Biobase graph GSA limma PADOG ROntoTools]; };
+  BPRMeth = derive2 { name="BPRMeth"; version="1.7.13"; sha256="1ypinfv1z6gw73whx0fjkz9h6sl6lzwfcsnfpjrwy94q59rpzyw0"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; };
+  BRAIN = derive2 { name="BRAIN"; version="1.27.0"; sha256="1pssh10b8pqy7f4hs1akws8lvikd0j9rwblrzsymvnnl5qf8rdqm"; depends=[Biostrings lattice PolynomF]; };
+  BSgenome = derive2 { name="BSgenome"; version="1.49.1"; sha256="1i0qrm065407zvi454gjdx3rykabf5zwl18l23d7zvl5d9cwcpv2"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+  BUMHMM = derive2 { name="BUMHMM"; version="1.5.0"; sha256="0qs117jr903zyr55xql7793nr8scyqhfn9acnw4d29im2jwfhclq"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; };
+  BUS = derive2 { name="BUS"; version="1.37.0"; sha256="0rd0d1wm65q1x821l74y96w48dbqdlbd8gzz04fwz2lbpp4x6645"; depends=[infotheo minet]; };
+  BaalChIP = derive2 { name="BaalChIP"; version="1.7.0"; sha256="18jvr700mqfqalby53jhjskz2wrfbyl3x6bgx28yxzzg0hk7d897"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; };
+  BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.9.0"; sha256="0piq8lc4p23q2y3606kk9y52iwg7nc8jbnmicq44m2gnmp5b9r0m"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; };
+  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.25.0"; sha256="14p570w1ld2va2xjzk4aq64brx25h8mizcicyrvmlnppj7cwbpmm"; depends=[RCurl RJSONIO]; };
+  Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.17.0"; sha256="0ynfj4x0hkjxxza8v85kda2a5rrmwzjh1am3ffnv1mvpi3dnb95l"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
+  BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.9.0"; sha256="074zndzd7dbz31khkn73a3jqfyacl56dd8b82zq5lykirw647zp4"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; };
+  BatchQC = derive2 { name="BatchQC"; version="1.9.0"; sha256="1vcpjbalsvlcmrg2wxckpkk1qczwhs5c9yzp7wyk0jff9ayccd7w"; depends=[corpcor d3heatmap ggvis gplots knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
+  BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.7.0"; sha256="0ikq8bk4viw9kj55cci37cdicbmyq9p5fa0vxw0bsa9ichj47cl5"; depends=[Biobase]; };
+  BayesPeak = derive2 { name="BayesPeak"; version="1.33.0"; sha256="0grhyp7i834sj1j2kavpk2ydy0970gjcvllxy05l9vs9cilhczgp"; depends=[IRanges]; };
+  BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.33.0"; sha256="0asbgmcidblxj82w5bv0g0c5l9w2nzyr7qparbxg2inxcqimsa37"; depends=[]; };
+  BgeeDB = derive2 { name="BgeeDB"; version="2.7.0"; sha256="07y8jh5r6rvx083gdcy7hdlpazmaj17mrbcqi6ysj8j0ipjxsrgv"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
+  BiFET = derive2 { name="BiFET"; version="1.1.5"; sha256="0rghzii29k5sqm4bnf86mncly5gln9kn14nzjxb9ycpmls33nfx0"; depends=[GenomicRanges poibin]; };
+  BiGGR = derive2 { name="BiGGR"; version="1.17.0"; sha256="1nsjg5lk87i0mrby23jzfxs80cipq2dra4gx2v3mxphiqixrn92i"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; };
+  BiRewire = derive2 { name="BiRewire"; version="3.13.0"; sha256="10wgsw38774a6fzwhr98hxiangna3s1rb0i7dw2bvmkx9c6ldmbh"; depends=[igraph Matrix slam tsne]; };
+  BiSeq = derive2 { name="BiSeq"; version="1.21.0"; sha256="12wnihb693dk6ri3hqcm7cjyy0r3dffvjcfybypl75zsj42k7zb7"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
+  BicARE = derive2 { name="BicARE"; version="1.39.0"; sha256="1gdglclrkrsxw7lks9rczhjy3ldsrl18qbk6h4f10d3rf6b147b1"; depends=[Biobase GSEABase multtest]; };
+  BioCor = derive2 { name="BioCor"; version="1.5.1"; sha256="0wfd7sapzxj135wp6kga0xb8z5ycvvhwdwh1307sh0k8k8wb5pd9"; depends=[BiocParallel GSEABase Matrix]; };
+  BioMVCClass = derive2 { name="BioMVCClass"; version="1.49.0"; sha256="01v6bzq8jsqd3p2cpg0hlfccqzkr9fk9zkby2dg1npwrf27x6j4g"; depends=[Biobase graph MVCClass Rgraphviz]; };
+  BioNet = derive2 { name="BioNet"; version="1.41.0"; sha256="039mzwvfamlxkqn9ipn7vab7qnnn0153sg7dcp4g5glfxgmqnngh"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
+  BioNetStat = derive2 { name="BioNetStat"; version="1.1.1"; sha256="1jr1z0shh0cspqmg0dqwwqhsljvl53aay19qpss5a64ifas8mzmr"; depends=[BiocParallel ggplot2 Hmisc igraph knitr pathview pheatmap plyr psych RColorBrewer RJSONIO shiny shinyBS whisker yaml]; };
+  BioQC = derive2 { name="BioQC"; version="1.9.0"; sha256="0v9czgv6n57nczg2ijz78dfknvmlbxbdrsi8c90wiyxr888gkb3m"; depends=[Biobase Rcpp]; };
+  BioSeqClass = derive2 { name="BioSeqClass"; version="1.39.0"; sha256="1390g5saw7jf6q7k5kavql595jw8xd8y53lwlfmxfgiapf2nvg36"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
+  Biobase = derive2 { name="Biobase"; version="2.41.1"; sha256="0hfi88z32ma74mc2h0d8xx2m9pqwcwr77f6mfh21sqnkb5mqwsdm"; depends=[BiocGenerics]; };
+  BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.43.0"; sha256="0xdn0zrd034mxzc6khqfnsp0rynfpd7zbxhmcmj5j0h83m9kyfnw"; depends=[Biobase]; };
+  BiocCheck = derive2 { name="BiocCheck"; version="1.17.15"; sha256="06wzf7j170bf9msnv61da70hlhv08k5lykwzachij1396514ypr6"; depends=[BiocInstaller biocViews codetools graph httr knitr optparse stringdist]; };
+  BiocFileCache = derive2 { name="BiocFileCache"; version="1.5.2"; sha256="170dyswpaxwg8jhw99797n5haixk7pm657dj09ydv8zjb5jaqhz0"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; };
+  BiocGenerics = derive2 { name="BiocGenerics"; version="0.27.1"; sha256="1v2vqhixnn4caanpnmd0pw7jnczfkc79wlb9c7v0kwpz9h79h023"; depends=[]; };
+  BiocInstaller = derive2 { name="BiocInstaller"; version="1.31.1"; sha256="1cprnjbymb2r1z228nyg6bbnridazw6bh6yh0mcfxq6h0cd0ig8y"; depends=[]; };
+  BiocOncoTK = derive2 { name="BiocOncoTK"; version="1.1.6"; sha256="01g7drd8c9082kvpw5xyxmans8mksw0rm1s6rv6ml6ibzbxjrz2z"; depends=[bigrquery ComplexHeatmap dplyr DT GenomicRanges httr IRanges magrittr rjson S4Vectors shiny]; };
+  BiocParallel = derive2 { name="BiocParallel"; version="1.15.6"; sha256="1ifav2pl6szvs6a5nkkgsf7j70i496q2lsj73gb3li4krm6yslvf"; depends=[BH futile_logger snow]; };
+  BiocSklearn = derive2 { name="BiocSklearn"; version="1.3.0"; sha256="1dh0w9h81ydnnwf7dx19an7pja3n511pw16yl0bgmqr8ng51lvwn"; depends=[BBmisc HDF5Array knitr reticulate SummarizedExperiment]; };
+  BiocStyle = derive2 { name="BiocStyle"; version="2.9.3"; sha256="1ggbx5c94fr20mykkj3ghsia91c2jdi4yyhrm9jfwxdaxy9k8kfl"; depends=[bookdown knitr rmarkdown yaml]; };
+  BiocVersion = derive2 { name="BiocVersion"; version="3.8.0"; sha256="1kyqzca8n7wggz6lfx7xj0i1h1s3rma15v11iycgkdka58443qqr"; depends=[]; };
+  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.7.1"; sha256="04nxl3idhy3smyvp246vc28509i7hf5qv24zn366q012zdykywzr"; depends=[BiocStyle bookdown devtools git2r httr knitr rmarkdown rstudioapi stringr]; };
+  Biostrings = derive2 { name="Biostrings"; version="2.49.0"; sha256="015yg11649nz6w0c8a6jsrjynh047phixssziid64rsff0gf13fv"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
+  BitSeq = derive2 { name="BitSeq"; version="1.25.0"; sha256="0ffqwdd5zjwcd819h3rg554c2drvi05l40ffg30p380azk0xkksp"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
+  BrainStars = derive2 { name="BrainStars"; version="1.25.0"; sha256="0svlrnd131m2lrpafxcpzbjqj3pvzcsi6azk1f4l2f21yimmx2iq"; depends=[Biobase RCurl RJSONIO]; };
+  BridgeDbR = derive2 { name="BridgeDbR"; version="1.15.1"; sha256="0fd6v87qhv7mjmsw5xs6r3bs52h1axm150jp6vng4ph20jq8gicg"; depends=[RCurl rJava]; };
+  BrowserViz = derive2 { name="BrowserViz"; version="2.3.0"; sha256="0f4hayj2iinfqiwpl53nmnw0cfv9p6sz25ggwpz1pyib24n2n9b6"; depends=[BiocGenerics httpuv jsonlite]; };
+  BubbleTree = derive2 { name="BubbleTree"; version="2.11.0"; sha256="0a69azv8v67jfdyg9mfaf58g1v3b09brhr2fvgl2lq7d48gi0cbh"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; };
+  BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.45.0"; sha256="0qr9dsdh04msxva28n37shjk4j6a4m0i5v4plkk7qpvb6ccbvrf8"; depends=[]; };
+  BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.45.0"; sha256="1v2yh5pvjc3x25nq6cdqazm1x80ir2qz4jlmssgd31n1bz8r4x48"; depends=[BufferedMatrix]; };
+  CAFE = derive2 { name="CAFE"; version="1.17.0"; sha256="1rgb3wk41q1079i959fjr81jwqd8r3rj0n781hfxbn9b5kia5inq"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
+  CAGEfightR = derive2 { name="CAGEfightR"; version="1.1.0"; sha256="09hf2xla5dl9gh59aa024z23j5lnqdrnamf34fw0r2p394qfz9gz"; depends=[assertthat BiocGenerics BiocParallel GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges grr Gviz IRanges Matrix Matrix_utils pryr rtracklayer S4Vectors SummarizedExperiment]; };
+  CALIB = derive2 { name="CALIB"; version="1.47.0"; sha256="1j486knj1l7chda7gdlkkzrrs7vwi39brzkshj1zcsn87r9j1j09"; depends=[limma]; };
+  CAMERA = derive2 { name="CAMERA"; version="1.37.0"; sha256="0n0xvhcy3y84cq6q45ms56z4nrs6q762iqgxp266kpl93z16rw4v"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
+  CAMTHC = derive2 { name="CAMTHC"; version="0.99.6"; sha256="02gv6vqahyy7fqy0vihqsvd811d65znfjz5jmshn03qp27av11wk"; depends=[apcluster Biobase BiocParallel corpcor DMwR geometry NMF pcaPP rJava SummarizedExperiment]; };
+  CATALYST = derive2 { name="CATALYST"; version="1.5.3"; sha256="1b2gfqzb9bp4k830lyn9d87xhzcdqb2vrykihp36r96gj1g6hdg4"; depends=[Biobase circlize ComplexHeatmap ConsensusClusterPlus dplyr drc DT flowCore FlowSOM ggplot2 ggrepel gridExtra htmltools limma magrittr matrixStats nnls plotly RColorBrewer reshape2 Rtsne S4Vectors scales shiny shinyBS shinydashboard shinyjs SummarizedExperiment tidyr]; };
+  CAnD = derive2 { name="CAnD"; version="1.13.0"; sha256="07ypm7zz4hf64q478b7s2q46m3imcs0kjc77gkwxky3ymsvid07y"; depends=[ggplot2 reshape]; };
+  CCPROMISE = derive2 { name="CCPROMISE"; version="1.7.0"; sha256="1yb8idgdka7psnwa7w94lsld8ghphhdz8kcyvp1na6l88lyc2iyi"; depends=[Biobase CCP GSEABase PROMISE]; };
+  CEMiTool = derive2 { name="CEMiTool"; version="1.5.0"; sha256="0h45vf64fg0pkh73k2wplfi26w3j4rnh7gyfnx9ia5bkm0z7l2fj"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
+  CFAssay = derive2 { name="CFAssay"; version="1.15.0"; sha256="06xq5rwbbgxknymn061ck1vyqlb8l715cpf7k40w3l4v95h02jiz"; depends=[]; };
+  CGEN = derive2 { name="CGEN"; version="3.17.0"; sha256="1i31ckwfw6nx0fpfg2g8zq83r6zykvkxfrqkib9kj4wvxx24kvcx"; depends=[mvtnorm survival]; };
+  CGHbase = derive2 { name="CGHbase"; version="1.41.0"; sha256="0yvg2jjqs98lrrybpygc77npfj27h5mkdrh3y5mfd5s6jzvyc8pz"; depends=[Biobase marray]; };
+  CGHcall = derive2 { name="CGHcall"; version="2.43.0"; sha256="1r8df0xvnhzwhbg1l1wp474f85j6l1g2ivvzmqxcqr5va1clz6g9"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
+  CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.35.0"; sha256="0bas6wmdw9h8ablm85ggbb776nfxrf4lpfvv5rkahd10b35y3x4b"; depends=[Biobase CGHbase CGHcall]; };
+  CGHregions = derive2 { name="CGHregions"; version="1.39.0"; sha256="0r3gvrinr7f5qn89v6rs5bxx4sjalsjl0f2cf6vzbzgnmdysarns"; depends=[Biobase CGHbase]; };
+  CHARGE = derive2 { name="CHARGE"; version="1.1.0"; sha256="05zqkiqnc82bmb580f16v6d02kfq55sdrm0nxk86h5kp1cs8fryk"; depends=[cluster diptest factoextra FactoMineR GenomicRanges IRanges matrixStats modes plyr SummarizedExperiment]; };
+  CHRONOS = derive2 { name="CHRONOS"; version="1.9.0"; sha256="17zxbbdy1ibsj4991iazm6rny2x4xx7rzknkc6z348fzxk2m7g0x"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; };
+  CINdex = derive2 { name="CINdex"; version="1.9.0"; sha256="1rixd0fylffc77hlc7cig7viwdhdy9r68cb3qba16sd5ywbg74gs"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; };
+  CMA = derive2 { name="CMA"; version="1.39.0"; sha256="05yx2rwnrzdsgbyv86iyy17qiz6sy91bl6y3qf29aid3yndawc1s"; depends=[Biobase]; };
+  CNAnorm = derive2 { name="CNAnorm"; version="1.27.0"; sha256="152cwha5mg66vc1ax6k2mwnahwj0cgcs3khii747y3xxn4p8m0z5"; depends=[DNAcopy]; };
+  CNEr = derive2 { name="CNEr"; version="1.17.3"; sha256="0gf354j2vynrjl3afbifqkd276q2qz2ywwc7661gqxcjz26jirxq"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; };
+  CNORdt = derive2 { name="CNORdt"; version="1.23.0"; sha256="14iadllrhjc1jp4njlr88bhjyb84f3gnbwjzld4n5v8s8ra8xj3a"; depends=[abind CellNOptR]; };
+  CNORfeeder = derive2 { name="CNORfeeder"; version="1.21.0"; sha256="1l1ij3r0rdywm0k47iy66v3sy0i23pr8zly1blyzpbxaqhmks3h1"; depends=[CellNOptR graph]; };
+  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.23.0"; sha256="1z1fs64kd575hmmzxa7hx0lxkvd93mzdygw3h4g1sa2fyr9xycfb"; depends=[CellNOptR nloptr]; };
+  CNORode = derive2 { name="CNORode"; version="1.23.0"; sha256="1r8sv5rdfpc1qjhdmz05p6gny03r1rxzayiwwbkh0xj6iwswbqdz"; depends=[CellNOptR genalg]; };
+  CNTools = derive2 { name="CNTools"; version="1.37.0"; sha256="1hzdyjkbwv5iwapkf7a04r55gi1m0bg2ckjkmj4v94kfc5031nwc"; depends=[genefilter]; };
+  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.13.0"; sha256="1pjmrdxg56gjwzbzvs38pdziymhsny9wnj4f5xqkmnkw6ps7v0m1"; depends=[exomeCopy foreach GenomeInfoDb GenomicRanges ggplot2 gplots IRanges NOISeq openxlsx plyr reshape2 Rsamtools S4Vectors shiny shinyFiles shinyjs stringr testthat]; };
+  CNVrd2 = derive2 { name="CNVrd2"; version="1.19.0"; sha256="0xdkckwys2963ylj2mid10k9dwwwmsks29pdp5z4266z0z3r9x9b"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
+  CNVtools = derive2 { name="CNVtools"; version="1.75.0"; sha256="1x70y389szy3b6vimlpzjsqdg4kykmx01wfw8aks5hxq9z23vaik"; depends=[survival]; };
+  CODEX = derive2 { name="CODEX"; version="1.13.0"; sha256="1zfg0ka7cvrd1pp4qv8a25crkq78v0qm73z8x4246rlyzvnnxds5"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; };
+  COHCAP = derive2 { name="COHCAP"; version="1.27.1"; sha256="0a241dbwj6q0x7r3af252dvdv9i07vbslz0nc532gwv8r56426pw"; depends=[BH COHCAPanno gplots RColorBrewer Rcpp RcppArmadillo WriteXLS]; };
+  COMPASS = derive2 { name="COMPASS"; version="1.19.0"; sha256="025gd220j77l4w55k9kmpr3438ffbjhq93ivc124jq3yr7qmpfgc"; depends=[abind BiocStyle clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang rmarkdown scales tidyr]; };
+  CONFESS = derive2 { name="CONFESS"; version="1.9.0"; sha256="03rdyklmk31pzg4q6gn8j501gx5hh7awbx4xbvgnw0hzk8753lbb"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
+  CORREP = derive2 { name="CORREP"; version="1.47.0"; sha256="061hyv2jxhjpwycv9c0s0881nsq1z3pm0jcn9simdha55hzb20hs"; depends=[e1071]; };
+  COSNet = derive2 { name="COSNet"; version="1.15.0"; sha256="0irkzh1rm430y5a67rx0rzc4bgb9zg9jyh768bgl1mcf3hjdqsgl"; depends=[]; };
+  CRISPRseek = derive2 { name="CRISPRseek"; version="1.21.0"; sha256="1jnwr3jy0ak9nv4x6n9n5zfggmrr849y4rw8qq819ig6a3swafqz"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; };
+  CRImage = derive2 { name="CRImage"; version="1.29.0"; sha256="1b5giadnwi8h4x8bmkw5064grhaijmnkidbbd8fi2pc1pz406fli"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
+  CSAR = derive2 { name="CSAR"; version="1.33.0"; sha256="1i2amxpka75l91bhvfdwzs85hcl9c11rz82l2xsjybj0ff3v0m91"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+  CSSP = derive2 { name="CSSP"; version="1.19.0"; sha256="1ic79b6cg68ylwj9r7ak21m1fbwrys3kwcllmhpdf8v0fldk6qld"; depends=[]; };
+  CTDquerier = derive2 { name="CTDquerier"; version="1.1.0"; sha256="00y2cm7sbzkb7q8xn4jqh1478v6jhjrcmhgc2y3h13abb0v93xl0"; depends=[BiocFileCache ggplot2 gridExtra igraph rappdirs RCurl S4Vectors stringdist stringr]; };
+  CVE = derive2 { name="CVE"; version="1.7.12"; sha256="0v39bkic6wxhh2asj0sf1cb0amvrli56ni5dxy6ilnka8437ywyw"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny tidyverse WGCNA]; };
+  CancerInSilico = derive2 { name="CancerInSilico"; version="2.1.0"; sha256="1rpphiy5bda3gpfscgyzci5dynyqdia5nb720pdjzxbz9xkr87f5"; depends=[BH Rcpp]; };
+  CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.23.0"; sha256="1dxw34fbr25q20k7z9isl4r0w5gz8jj1a0hd9kb4nqhm1yzilpai"; depends=[AnnotationDbi limma qvalue]; };
+  CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.7.0"; sha256="09c7k5789i4afsgk1vxbz036s5gyxlnwmmwwpcgq0v4y920s37w3"; depends=[cluster ConsensusClusterPlus iCluster impute limma NMF sigclust SNFtool survival]; };
+  Cardinal = derive2 { name="Cardinal"; version="1.13.0"; sha256="0iq9b3357c0drhy0yh1rk71z9bh7g6dxh4wwjvwig1bnd3wy506d"; depends=[Biobase BiocGenerics irlba lattice matter ProtGenerics signal sp]; };
+  Category = derive2 { name="Category"; version="2.47.0"; sha256="0nrac7r5f13byc68h38ii1jld3m7w63qr340mnaylc2vc2ics6jz"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; };
+  CausalR = derive2 { name="CausalR"; version="1.13.0"; sha256="0npjg5zg4ckqhgjayb0rxvaaggbd52n61bs7mba6f20dnq1x0q5j"; depends=[igraph]; };
+  CellMapper = derive2 { name="CellMapper"; version="1.7.0"; sha256="0jxanbmhi4004kilhdd19fp12yyjx8dcy91iify4ivrhp9c4xwr0"; depends=[S4Vectors]; };
+  CellNOptR = derive2 { name="CellNOptR"; version="1.27.0"; sha256="0ig7g50lmy8z3b00adkanmr7nz56nf35ayfbxby2phpxirqf15wj"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
+  CellScore = derive2 { name="CellScore"; version="1.1.0"; sha256="11hsyz15b8kfmb8vjgpwy5hgkmcizlv4ygnw0ffmkvpnjmlib4rm"; depends=[Biobase gplots lsa RColorBrewer squash]; };
+  CellTrails = derive2 { name="CellTrails"; version="0.99.12"; sha256="10fn3vkkvjva6np8nkb39dxwkybac567rc0xxn09wlnxpqmfh8i7"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; };
+  CexoR = derive2 { name="CexoR"; version="1.19.1"; sha256="1yga6kc562ginzzb0cq8icyjkbj599j9q4hxzgd6hhf5590nfjfy"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+  ChIC = derive2 { name="ChIC"; version="1.1.0"; sha256="1nh1dcqzf3m5gpkgblf7lx599c8dxm7gk53d7y12a7mdlrnzsh5j"; depends=[BiocGenerics caret caTools ChIC_data GenomicRanges IRanges S4Vectors spp]; };
+  ChIPComp = derive2 { name="ChIPComp"; version="1.11.0"; sha256="0lia22xjj1w8m7hwpfcyaf6cldk05f78v93x3p947xdrkymx6lgc"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
+  ChIPQC = derive2 { name="ChIPQC"; version="1.17.0"; sha256="0d68nizvlp9gx9s33s5ll4pmrp7rhpjd3xqc8pngc3zvwa4sjg96"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
+  ChIPSeqSpike = derive2 { name="ChIPSeqSpike"; version="1.1.0"; sha256="15w26zchxjggz8236afgykdncdzim9n3lyr4bm5p7qxzqs8aigbv"; depends=[BiocGenerics corrplot GenomicRanges ggplot2 IRanges LSD Rsamtools rtracklayer S4Vectors seqplots stringr]; };
+  ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.3.0"; sha256="08cwdrafzq4ilvck21dc49nf0mjb27vbxrb8i860pfdd77i08hz4"; depends=[Biostrings BSgenome GenomicRanges IRanges RcppRoll rtracklayer S4Vectors]; };
+  ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.5.0"; sha256="17w5qibbn4gpvmzndmh3igzbkvzljk88nkz7imld01n8wp4f0kni"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
+  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.15.0"; sha256="0hck74qkrg4m9w30lag9jfv0ikh2q9d95fa73zjcbdil7n792l7k"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools S4Vectors seqinr SummarizedExperiment VennDiagram]; };
+  ChIPseeker = derive2 { name="ChIPseeker"; version="1.17.0"; sha256="0002vn7kw83c8lzyrdkwi5c3vpkld3xihfa8zlx6hz41221im2vb"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
+  ChIPseqR = derive2 { name="ChIPseqR"; version="1.35.0"; sha256="0q5s9pzdmiv2z6cjvy24nzpqsblr2p60qrd8kdgkh8hxx6wq79f1"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
+  ChIPsim = derive2 { name="ChIPsim"; version="1.35.0"; sha256="1rz89zn383j8pa3g3rgabiw6zcg9h1nfbrmln4vwbbk6yk877l5l"; depends=[Biostrings IRanges ShortRead XVector]; };
+  ChemmineOB = derive2 { name="ChemmineOB"; version="1.19.0"; sha256="0w9pr4k12a8c8h69ycn231igd74a8m72v1icii11jiijl3i9hfg3"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
+  ChemmineR = derive2 { name="ChemmineR"; version="3.33.1"; sha256="1dzm3cw6i3k38p9i0yzf0bcad8zqvkip434k11ppplk5ch923rzi"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra png Rcpp RCurl rjson rsvg]; };
+  Chicago = derive2 { name="Chicago"; version="1.9.0"; sha256="0b3j250w0piasfs3jbyycy9w4snvrn7vbaq31hhj150gjvphsgzk"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
+  ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.35.0"; sha256="18xgngy77rj8q91bj9v8kpzqijz15ax5w9db0xiyrspvi39z4fx4"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; };
+  ClassifyR = derive2 { name="ClassifyR"; version="2.1.6"; sha256="0xnayr0w00nwmg9j6x6kl6i66l46ai734ifmgvdpgg18d6zi7zhr"; depends=[BiocParallel locfit MultiAssayExperiment plyr S4Vectors]; };
+  Clomial = derive2 { name="Clomial"; version="1.17.2"; sha256="0kl6fbgrihbz2qk7gzpdjclh9x874kb0wsk3615b21ra9qdfl3va"; depends=[matrixStats permute]; };
+  Clonality = derive2 { name="Clonality"; version="1.29.0"; sha256="0hlrj9rl7d0wzyk6a95p68gx76m34bfgxvpz68r3qhdzi0z0lxbn"; depends=[DNAcopy]; };
+  ClusterJudge = derive2 { name="ClusterJudge"; version="1.3.0"; sha256="1zc019s15skjnzjm0vb5y3z4rd5cnk1awnvwxwj062y3pzr5kp62"; depends=[httr infotheo jsonlite lattice latticeExtra]; };
+  ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.9.0"; sha256="18j2jscwgmv2hcsi00182n03rvcqyaxbazzplxx5jqrgmqqzngmz"; depends=[pracma princurve RColorBrewer scatterplot3d]; };
+  CoCiteStats = derive2 { name="CoCiteStats"; version="1.53.0"; sha256="0xy1zy4951r9xpjmhia8krrc429azbfg22nqzd9p0jcqflfj2sq7"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  CoGAPS = derive2 { name="CoGAPS"; version="3.1.0"; sha256="1ra3p9dqgpyfn3f4jq0jhamiiais0y2pli4qpyq3k3x510810mkd"; depends=[BH cluster doParallel foreach ggplot2 gplots RColorBrewer Rcpp reshape2 shiny]; };
+  CoRegNet = derive2 { name="CoRegNet"; version="1.19.0"; sha256="1m532i7r1bz3dg5p2h8cfgligds95v6a57kv0xzan1gn37pys9g1"; depends=[arules igraph shiny]; };
+  CompGO = derive2 { name="CompGO"; version="1.17.0"; sha256="04f22n17b4cyv1mapimkmc913d22cpvifdznfgqgbmrkjsyygg2k"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; };
+  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.19.1"; sha256="1wdbffj94jycbg95gpj8c5bdll2697v9rhqanv075373qa8f1miq"; depends=[circlize colorspace GetoptLong GlobalOptions RColorBrewer]; };
+  ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.45.0"; sha256="1ypfclg252j9d7v78r81n14f0gsaxgzk6n1509rdv010h0xbaw2q"; depends=[ALL Biobase cluster]; };
+  CopywriteR = derive2 { name="CopywriteR"; version="2.13.0"; sha256="11gls7dh4n4kd6dijvly5r3x918ivbpyriyz0y50333vpafm4swr"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
+  CorMut = derive2 { name="CorMut"; version="1.23.0"; sha256="0y0sbnz3rlv98b87i7qcqv7zy1js180hmpy45fw55kmzjvd4j6vq"; depends=[igraph seqinr]; };
+  Cormotif = derive2 { name="Cormotif"; version="1.27.0"; sha256="0spl1qg0p8za8w6ikiwsf4d1spx55g1b73vcbpxbipmjymwc408i"; depends=[affy limma]; };
+  CountClust = derive2 { name="CountClust"; version="1.9.0"; sha256="12f2bazvyz0xvd9a67qxwii30441nsnmxd89706h4k1ba1zgp436"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; };
+  CoverageView = derive2 { name="CoverageView"; version="1.19.0"; sha256="0alj0908pfih5z5zyi5szkimcm73sfsbqwpg6w594iglgyvbfbck"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+  CrispRVariants = derive2 { name="CrispRVariants"; version="1.9.0"; sha256="18ww7xjykyrn0fh07b341pzg7zypd4hmq2adpn6m331v7v91m3dw"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
+  CytoDx = derive2 { name="CytoDx"; version="1.1.0"; sha256="02zh10icpc0iv0bcyayr6bcvbjsvgbq9whg7mnlqlnf8x4hx6mk2"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; };
+  CytoML = derive2 { name="CytoML"; version="1.7.7"; sha256="0qr52pq6l04w2y0dqkh3vmyyxjd3jc0yh8yvx1hxy2yglvdb9mpw"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; };
+  DAPAR = derive2 { name="DAPAR"; version="1.13.0"; sha256="1qv5hgwcxpxjy5p0rbsr12wcplqvhyr2qwa1yr26ga7wqspbqg5g"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr foreach ggplot2 gplots graph highcharter imp4p impute imputeLCMD knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot]; };
+  DART = derive2 { name="DART"; version="1.29.0"; sha256="1akgln0w3xbvis0pcgjdm07jbbfsg0yn732gkvh1hzkpg26iwgfr"; depends=[igraph]; };
+  DBChIP = derive2 { name="DBChIP"; version="1.25.0"; sha256="1c3s5ffbdbhsr35q5mxs1vhl3glrjfwnpng11xlrcsj9h3jpxhva"; depends=[DESeq edgeR]; };
+  DChIPRep = derive2 { name="DChIPRep"; version="1.11.0"; sha256="00r70fvr49fy4xmyyspgwiqphz96xcq9pz5c0srprrf4az71fl96"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
+  DECIPHER = derive2 { name="DECIPHER"; version="2.9.1"; sha256="1b09amzwvchh56wy0bs2f6hgjrsa09hdpqql6ywkj7n7abg022vf"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
+  DEComplexDisease = derive2 { name="DEComplexDisease"; version="1.1.0"; sha256="0swqxmyqlh05albirm8n32wl31s4gbv45qn9c5mpdpvr6zsldylg"; depends=[BiocParallel ComplexHeatmap DESeq2 edgeR Rcpp SummarizedExperiment]; };
+  DEDS = derive2 { name="DEDS"; version="1.55.0"; sha256="0823ycm0j30dh1pbpxbcfwqglpff72675cr4h18rk0fx0v742vhy"; depends=[]; };
+  DEFormats = derive2 { name="DEFormats"; version="1.9.0"; sha256="1vd3dnc38mmgkw07qbazra8928c6r8wcxcizq05bwgjqhwfjdyxs"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges S4Vectors SummarizedExperiment]; };
+  DEGraph = derive2 { name="DEGraph"; version="1.33.0"; sha256="1xmawr15c8nxw8hgh3ijq2cp6ynkb8xana6zfidcibwmgfs7zlw6"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
+  DEGreport = derive2 { name="DEGreport"; version="1.17.2"; sha256="1zf1fryw0h1kh8hwi0v6xkvr22gi7qbynn1j2fmx9n5n2246n3ad"; depends=[Biobase BiocGenerics circlize cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggdendro ggplot2 ggrepel knitr logging magrittr Nozzle_R1 psych RColorBrewer reshape rlang S4Vectors scales stringr SummarizedExperiment tibble tidyr]; };
+  DEGseq = derive2 { name="DEGseq"; version="1.35.0"; sha256="0kynaqbzlsldxjkqxd396xs5gfzmkvrkxhn14ihv651iviarwb8b"; depends=[qvalue samr]; };
+  DEP = derive2 { name="DEP"; version="1.3.2"; sha256="0yy70j6ng0cdg16s3nmly2447857h0ks71q16c7vp2xgxjlqbipd"; depends=[assertthat circlize cluster ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; };
+  DEScan2 = derive2 { name="DEScan2"; version="1.1.2"; sha256="04xla8cr3f3r1dwvahs55l93bzlnds04c42kx93lgyn5r2ksqr8n"; depends=[BiocGenerics BiocParallel ChIPpeakAnno data_table DelayedArray GenomeInfoDb GenomicAlignments GenomicRanges glue IRanges plyr Rcpp RcppArmadillo rtracklayer S4Vectors SummarizedExperiment]; };
+  DESeq = derive2 { name="DESeq"; version="1.33.0"; sha256="1h56v3d1kj8inh3xy08k6kfc31czyq9a2zwy1v2kibcaa79z4zrn"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
+  DESeq2 = derive2 { name="DESeq2"; version="1.21.6"; sha256="02libh2lsna118na2lbc8hmd11dm9lia6gcnb59jqp69w9mmmpyk"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+  DEXSeq = derive2 { name="DEXSeq"; version="1.27.0"; sha256="113dircdkngrrsb50mk3pp4x4nis2b27j020blxra3i9n3g2zrq7"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
+  DEsingle = derive2 { name="DEsingle"; version="1.1.4"; sha256="0nzm9nw9rqmk13vz7vyqjiy096m1vka51pqrs830yyf4vq69g457"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; };
+  DEsubs = derive2 { name="DEsubs"; version="1.7.1"; sha256="0wj89308s4rq2d1i1f6y79wj2fpk0gk2gzpfam0x5pfppzz83cx8"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; };
+  DFP = derive2 { name="DFP"; version="1.39.0"; sha256="10yamzm28gnayrjc58jvj6mjg2j6gr266f65i9rrz5shnz9244wl"; depends=[Biobase]; };
+  DMCHMM = derive2 { name="DMCHMM"; version="1.3.0"; sha256="0076i6d9qpphbxrkz0maqi6qsviix0sxckz6hg5mwrymsawssh48"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
+  DMRScan = derive2 { name="DMRScan"; version="1.7.4"; sha256="1gdnn3kzlfhj3vp4j1r7q8ggfqq5jmcx1jyrpd8wc9pn0nhnamiv"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; };
+  DMRcaller = derive2 { name="DMRcaller"; version="1.13.1"; sha256="01ip1xgyr1jjmrg85agbxxg4b6ihy9jkxfrf1hjkpmi1qkzw8pxz"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
+  DMRcate = derive2 { name="DMRcate"; version="1.17.0"; sha256="19k6cl4a154hgasqk3nycb0wxra0yg1nvn3ywbsikn17pa6qiyzc"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; };
+  DMRforPairs = derive2 { name="DMRforPairs"; version="1.17.0"; sha256="0094pw863dnc57kfif490fabcsggplfdr5xh41asldydp2x1pwcy"; depends=[GenomicRanges Gviz R2HTML]; };
+  DNABarcodes = derive2 { name="DNABarcodes"; version="1.11.0"; sha256="1hpsdybpj3dszjxvlh7x2j5xdrgyhx03sv15hlg2bn4jj6am4iiy"; depends=[BH Matrix Rcpp]; };
+  DNAcopy = derive2 { name="DNAcopy"; version="1.55.0"; sha256="1bmd22nmfbrcwvz9qk6rh4f81faxh7f71fk2pgvgdcz97kzl4g8w"; depends=[]; };
+  DNAshapeR = derive2 { name="DNAshapeR"; version="1.9.5"; sha256="1am9mcfr1fab29p06ppyl74qsdpvbq716vbys0dx8r9j1bf7x36x"; depends=[Biostrings fields GenomicRanges Rcpp]; };
+  DOSE = derive2 { name="DOSE"; version="3.7.1"; sha256="0dldsqs807hgnfx59vl1q90hh1lv9x2dbxndbfi97yvzlkhnar55"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim qvalue reshape2 S4Vectors]; };
+  DRIMSeq = derive2 { name="DRIMSeq"; version="1.9.0"; sha256="1q3zff7wrk9hflz1jzrs1g0pacsv62rgif0bhglsk1877iqj8nip"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; };
+  DSS = derive2 { name="DSS"; version="2.29.0"; sha256="1jwjyfx1356j0jxryf8f3mnl764fd5bz5p395z6ax8xsafzkabq1"; depends=[Biobase bsseq DelayedArray]; };
+  DTA = derive2 { name="DTA"; version="2.27.0"; sha256="129hvbvdgq7whh1f63gdh28w0g5avl3xqwvjm61makyyqyx47ipf"; depends=[LSD scatterplot3d]; };
+  DaMiRseq = derive2 { name="DaMiRseq"; version="1.5.1"; sha256="0zli040zjbgphlg2f0bxcb69nlhzzfzjr91cs8999p8hb80dml7l"; depends=[arm caret corrplot DESeq2 e1071 EDASeq FactoMineR FSelector ggplot2 Hmisc ineq kknn limma lubridate MASS pheatmap pls plsVarSel randomForest RColorBrewer reshape2 RSNNS SummarizedExperiment sva]; };
+  DeMAND = derive2 { name="DeMAND"; version="1.11.0"; sha256="1fmswncd9jp49ni7rpg7xkcrnz2nh58xj9nyig1098hib00y70ml"; depends=[KernSmooth]; };
+  DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.23.0"; sha256="0hnnw6k246a0dsj0ppfrj40ddrl3czpdq28gvkahyig64ljwfrbm"; depends=[ggplot2 limSolve pcaMethods]; };
+  DeepBlueR = derive2 { name="DeepBlueR"; version="1.7.0"; sha256="198apfr10nfnk82zhmsnk9vpq2ykfi6yh79gwdnnkls8h2r5nqz9"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; };
+  DelayedArray = derive2 { name="DelayedArray"; version="0.7.18"; sha256="1a2a558xc638prbb96xfkd97m40cf3hdv3g40r8a1xfw0vk9669k"; depends=[BiocGenerics BiocParallel IRanges matrixStats S4Vectors]; };
+  DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.3.4"; sha256="12ljlbk01p9cv8vwjapq1nknvsqf3qp44qh4yyq1j5cr8l8rg2xx"; depends=[DelayedArray IRanges Matrix matrixStats S4Vectors]; };
+  DiffBind = derive2 { name="DiffBind"; version="2.9.0"; sha256="0ka72zizphm2sphr8gm53602wgm7rkfc6hx0fql3cb34yjg11wi1"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; };
+  DiffLogo = derive2 { name="DiffLogo"; version="2.5.0"; sha256="00vk5qj0byh8ggg5nmaa94ddbi42rl59y049bxx37qr98qyw79yj"; depends=[cba]; };
+  Director = derive2 { name="Director"; version="1.7.0"; sha256="0xd8fviwd59smfzvrvwszpv69a74606w8iwds9gq8yi8s38288bs"; depends=[htmltools]; };
+  DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.23.0"; sha256="1wxb094p90628bbkm4vzjrpxcagcpm17iqa0f1hjfy7b8a1my9wh"; depends=[BiocGenerics IRanges S4Vectors]; };
+  DominoEffect = derive2 { name="DominoEffect"; version="1.1.0"; sha256="1n2hr24izsd3zvxc795zw7678kwz4glaz09r49s0wr1lp70rgzb0"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; };
+  Doscheda = derive2 { name="Doscheda"; version="1.3.0"; sha256="1yfywqzxjj88wwnwmrm3yd9z1al74w2xzijzk1zqdjy5lg8vc1qn"; depends=[affy calibrate corrgram d3heatmap drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; };
+  DriverNet = derive2 { name="DriverNet"; version="1.21.0"; sha256="0ja7jpnh2rh4gkcv0h99mma19rk07y1vmh4hpkyxg1m1mb1q4vyv"; depends=[]; };
+  DropletUtils = derive2 { name="DropletUtils"; version="1.1.5"; sha256="1yq3ijm3g71gh9gp72lwr7dzq395j548xvp11vrn0bp867rx4b5s"; depends=[beachmat BiocParallel edgeR Matrix Rcpp rhdf5 Rhdf5lib S4Vectors SingleCellExperiment]; };
+  DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.23.0"; sha256="01hrd65q8h9r09y91vnl7x8gczgi3q8vlxihyingxjdc09qn86xd"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; };
+  DupChecker = derive2 { name="DupChecker"; version="1.19.0"; sha256="03bfyg1h08ya41svmvnyd0mxs4qakrk7xwpyv2m51cn3rk2cgacl"; depends=[R_utils RCurl]; };
+  DynDoc = derive2 { name="DynDoc"; version="1.59.0"; sha256="1cdyv6ylgdz7fyj8dnndy5y0khg0na8r7sss5p1pja73idxdqpvf"; depends=[]; };
+  EBImage = derive2 { name="EBImage"; version="4.23.0"; sha256="1v9lnyc5x3xwrabqgr4l9mx67bgwbq4gyyimq87pm1id5p3vpb9d"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; };
+  EBSEA = derive2 { name="EBSEA"; version="1.9.0"; sha256="14bgrkfx93gcr0j9fj48krnfvhnbjxnqanvnx85n5x48bk40s2jr"; depends=[edgeR limma plyr]; };
+  EBSeq = derive2 { name="EBSeq"; version="1.21.0"; sha256="0nbw3mkqgify3yijwizdznafvfyd4qizfqaj5f3w04nx0h8m8b2h"; depends=[blockmodeling gplots testthat]; };
+  EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.15.0"; sha256="067fi2vy35y3n6a5264a7af3j03jg46fp7vzl80ca7x8vqji4xvy"; depends=[EBSeq]; };
+  EBarrays = derive2 { name="EBarrays"; version="2.45.0"; sha256="1wvim2qldy74qccgqkj6hwqxjhwm3sgj2gsr88qqh16gvfqy1w9z"; depends=[Biobase cluster lattice]; };
+  EBcoexpress = derive2 { name="EBcoexpress"; version="1.25.0"; sha256="1xpihh3pxm492kqrf7pnz6sarz98hqhrgw3ybicja3cvn5ihlk1j"; depends=[EBarrays mclust minqa]; };
+  EDASeq = derive2 { name="EDASeq"; version="2.15.2"; sha256="1d7dq3fl9qmv5bll4vkbj4zvd9md44grpr4vdxk29wcjm6dzjyma"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
+  EDDA = derive2 { name="EDDA"; version="1.19.0"; sha256="1q15lj4sa76yhjgyzng1sr60aa1dbfyw51dphvg7n1c1jngqib0n"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
+  EGAD = derive2 { name="EGAD"; version="1.9.0"; sha256="1k1bv3z5dvgiid0vdfc3kkx9b37qbafybqxvdc188685nfkkkr03"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; };
+  EGSEA = derive2 { name="EGSEA"; version="1.9.0"; sha256="1qasrnfmrnvk05v4w4yyj0wyp02jcg0ww8svjnmhhlqpyj256s99"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 Glimma globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; };
+  ELBOW = derive2 { name="ELBOW"; version="1.17.0"; sha256="0g4ss21apdp6zsg70fl79f2xz4gwdl0ygyp03a636xpg2y6hbrx3"; depends=[]; };
+  ELMER = derive2 { name="ELMER"; version="2.5.4"; sha256="0qzivgb21y1g7y7j7dm0y2w7w2wdvxsfxblp8q21rh5z1wxr696x"; depends=[biomaRt circlize ComplexHeatmap doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr readr reshape rmarkdown rvest S4Vectors stringr SummarizedExperiment TCGAbiolinks xml2]; };
+  EMDomics = derive2 { name="EMDomics"; version="2.11.0"; sha256="0snk2fcikj34s2hhfg9i5di92nd8lbg26ypvc1b1zcf7rj5yy07p"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
+  ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.7.0"; sha256="01sjpf4s0gdsiv6pqjmh0jq582wax9za47qf619igyzhwy2crvp1"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; };
+  ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.29.0"; sha256="1pj6r1sb3izyr2ilv95j3nl92297zxiypjipl1x3nrqpnjn7k032"; depends=[rJava XML]; };
+  ENmix = derive2 { name="ENmix"; version="1.17.0"; sha256="0hk2qj8y976ybz2pxj5ldnr13z3l64s8z7na18ry85yvbv90xzs3"; depends=[doParallel foreach geneplotter impute MASS minfi preprocessCore SummarizedExperiment sva wateRmelon]; };
+  EasyqpcR = derive2 { name="EasyqpcR"; version="1.23.2"; sha256="1fdfhclpyv6ls6misnwa4kvm9qlgnv65pqg58q2rqd2w012kic02"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
+  EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.9.0"; sha256="131xg14zp0kqxwk1y2yfxb0sysf4ad97klrgsrnqkdbvjfz8wfa0"; depends=[]; };
+  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.11.2"; sha256="1rfls2xz7v7bj27f07rzvlq4d12ajzbcpza11wq6jy73snvb29p4"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
+  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.11.4"; sha256="0lwlwpm1rjycj8nwiyiiv061bhchgvk231l3l4wrw3x1zif7rwhc"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
+  EpiDISH = derive2 { name="EpiDISH"; version="1.3.0"; sha256="07ln6hyq2lfil1xwackvhb2biay3ig6bvsyf2ll5n3glk938x02d"; depends=[e1071 MASS quadprog]; };
+  EventPointer = derive2 { name="EventPointer"; version="1.5.0"; sha256="1fa6xq8kwwbp39whm2xp8si3kz5hfpndlga8mf2jjlj2gd3nf3xj"; depends=[affxparser doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph limma MASS Matrix matrixStats nnls prodlim RBGL S4Vectors SGSeq stringr SummarizedExperiment]; };
+  ExiMiR = derive2 { name="ExiMiR"; version="2.23.0"; sha256="01syzl0q719fif0pdhn31hrwpbq14idwpyppcwl0b0156aid7lwv"; depends=[affy affyio Biobase limma preprocessCore]; };
+  ExperimentHub = derive2 { name="ExperimentHub"; version="1.7.1"; sha256="0jy93f8dy5mmmc0hdd97h4di4660878gfi7mhjwk7rhldrcsm8jh"; depends=[AnnotationHub BiocGenerics BiocInstaller curl S4Vectors]; };
+  ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.7.0"; sha256="0gwv7zjdwhsxi992qxhds7rbha3xlqfix6cxnipx53gi72cl5plm"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocInstaller curl DBI ExperimentHub httr S4Vectors]; };
+  ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.9.1"; sha256="0pg30fbiz2q45b06p5jmav4gncbl01003m9m8lk2ifi0sxvx4jn6"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; };
+  ExpressionView = derive2 { name="ExpressionView"; version="1.33.0"; sha256="14h6jgdaikyjpf5bqban0ixscw3k28pczh0bsvnkhyb5916qfxch"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; };
+  FELLA = derive2 { name="FELLA"; version="1.1.1"; sha256="0vqq9bzdy691c11rb2dbgvv0nwqqy8wdd397wjh991lfk3f4n3bz"; depends=[igraph KEGGREST Matrix plyr]; };
+  FEM = derive2 { name="FEM"; version="3.9.0"; sha256="0nb9gp6x1crzrj9jgz7s6mq639iqp7zdf1q7qqv0ri3gcgw758jw"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
+  FISHalyseR = derive2 { name="FISHalyseR"; version="1.15.0"; sha256="0izn77dhzhsg69i893r9sy6qalw4qr120m6k5x5k6z9w01dgq47x"; depends=[abind EBImage]; };
+  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.17.0"; sha256="1m3vcffnbyf27x481gx4xmxrknb70dk0ll08zd14kfvn6lf3cgf4"; depends=[fda MASS]; };
+  FamAgg = derive2 { name="FamAgg"; version="1.9.0"; sha256="1vqkaa1cpzd2cdyql66skz3jkrnp5ibdbhwipkj82dgww9zwwkbx"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
+  FastqCleaner = derive2 { name="FastqCleaner"; version="0.99.39"; sha256="18zklgacbk8iv8i6rlmip8bcfwn9v18jpf4xb9p7pkadldphjnfc"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; };
+  FindMyFriends = derive2 { name="FindMyFriends"; version="1.11.0"; sha256="0ij596qkpn4y5m9zmj6hcamrmjjm8nwqjm9d2g1wq28i5xrmra0w"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
+  FitHiC = derive2 { name="FitHiC"; version="1.7.0"; sha256="071246cfl4iqy3nnl2c24n8sd9dkmjjj8cna74dh1km3cc6xb0vz"; depends=[data_table fdrtool Rcpp]; };
+  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.13.0"; sha256="09kqhj41w7snkr1m29wmjj4n7acy821mv8kbb49f1mljaxz0v94q"; depends=[jsonlite RCurl XML]; };
+  FlowSOM = derive2 { name="FlowSOM"; version="1.13.0"; sha256="0vw98kxlcyd9rwa2r9rgjwfp5f5pmb122w2xk1gfhsf9kqh7db7g"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; };
+  FourCSeq = derive2 { name="FourCSeq"; version="1.15.0"; sha256="0d8qnalv97a37l0xqxi4qi7s03zxs81122h4rw6rpi03pn5h7i10"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
+  FunChIP = derive2 { name="FunChIP"; version="1.7.0"; sha256="15pfl68yynvidx9r69xxf3zavn79savabam5yjjwqq7g9yvhzjw5"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges RColorBrewer Rcpp Rsamtools shiny]; };
+  FunciSNP = derive2 { name="FunciSNP"; version="1.25.0"; sha256="0dl63s5f8s82www9maf10bbmss7ddbflq820lcq1zgrfcdr9a484"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
+  GA4GHclient = derive2 { name="GA4GHclient"; version="1.5.0"; sha256="1bcskcxcmv47rdgrw0i8rm4cn27jqy86rx8z83qnanbzqp4g7kgg"; depends=[BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges httr IRanges jsonlite S4Vectors VariantAnnotation]; };
+  GA4GHshiny = derive2 { name="GA4GHshiny"; version="1.3.0"; sha256="031p9qa6cp4gxlgp8whswl7b11d24d4zl3m9fkqg3i461kjyswxj"; depends=[AnnotationDbi BiocGenerics dplyr DT GA4GHclient GenomeInfoDb GenomicFeatures openxlsx purrr S4Vectors shiny shinyjs shinythemes tidyr]; };
+  GARS = derive2 { name="GARS"; version="1.1.0"; sha256="0qczfvlywnqiz06ggvndmq32sg61qm7njg77fzml5v66anqsqmhq"; depends=[cluster DaMiRseq ggplot2 MLSeq SummarizedExperiment]; };
+  GAprediction = derive2 { name="GAprediction"; version="1.7.0"; sha256="04bxpyc13mq7klkpkyw574cbk6xsjn9n91za7hvmzg5xfzgdr2rg"; depends=[glmnet Matrix]; };
+  GDCRNATools = derive2 { name="GDCRNATools"; version="1.1.0"; sha256="0i8gyq3rk79ph099bivgrvl33c73vhrlqss0ms61zv8r392prvjh"; depends=[BiocParallel biomaRt clusterProfiler DESeq2 DOSE DT edgeR GenomicDataCommons ggplot2 gplots jsonlite limma org_Hs_eg_db pathview rjson shiny survival survminer XML]; };
+  GDSArray = derive2 { name="GDSArray"; version="1.1.0"; sha256="0jn3jjpr5z3nrhral7bphlxnc5mhg2nllpzf73j2i4q7dbyhjxic"; depends=[BiocGenerics DelayedArray gdsfmt IRanges S4Vectors SeqArray SNPRelate]; };
+  GEM = derive2 { name="GEM"; version="1.7.0"; sha256="01vyj5nhzs6g3drnybl5i5wj2n2x50wjfnb2q62r053rz7r4xpwj"; depends=[ggplot2]; };
+  GENESIS = derive2 { name="GENESIS"; version="2.11.5"; sha256="1vkxb4ry8ghl9c38lr5dkwkf5kjak0h0vq18k69fpj94dfkkn91y"; depends=[Biobase BiocGenerics dplyr gdsfmt GenomicRanges graph GWASTools IRanges Matrix S4Vectors SeqArray SeqVarTools]; };
+  GENIE3 = derive2 { name="GENIE3"; version="1.3.1"; sha256="0zp1g97xmigjarpbmfnay1gac5fjhcslrdp656gzafdah32k2nzl"; depends=[reshape2]; };
+  GEOmetadb = derive2 { name="GEOmetadb"; version="1.43.0"; sha256="05ad0h84vqkcp9b9966dsmgwl4r2xsg9wjjgwcfx00yc9jgg94lj"; depends=[GEOquery RSQLite]; };
+  GEOquery = derive2 { name="GEOquery"; version="2.49.0"; sha256="0ylny4lni33hj1qspqig7iw9g3h9mz4yc9bj8cdf13w2qj4sjysz"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; };
+  GEOsubmission = derive2 { name="GEOsubmission"; version="1.33.0"; sha256="17qck1a7szkgaixkjzq2c4vw7kb7cy8sv609z3i8h0pljrprvx07"; depends=[affy Biobase]; };
+  GEWIST = derive2 { name="GEWIST"; version="1.25.0"; sha256="0dr7vz9v8cfjg8vxxqs0c7i4vzvfdnp741b82radwb0ya4crfml0"; depends=[car]; };
+  GGBase = derive2 { name="GGBase"; version="3.43.2"; sha256="1kwh6di0kgw821mh0gmgrm8b0mlbcyji5yc0pn4v836w0wc0amqb"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
+  GGtools = derive2 { name="GGtools"; version="5.17.0"; sha256="06qldw101w7syy1m9ynq9rpxs2546yzn8zdmsp416aawn3qw2xjb"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
+  GIGSEA = derive2 { name="GIGSEA"; version="0.99.25"; sha256="0k6njipzq9r6g9gkn9g2blkmhq752yv4n2127wxvxfi4kkwf8nfc"; depends=[locfdr MASS Matrix]; };
+  GISPA = derive2 { name="GISPA"; version="1.5.0"; sha256="1030cwbkccj2scjmszlzbxd28qgwga26hf86jly8xmw9qvpa77y1"; depends=[Biobase changepoint data_table genefilter GSEABase HH lattice latticeExtra plyr scatterplot3d]; };
+  GLAD = derive2 { name="GLAD"; version="2.45.1"; sha256="1cpjai8dxqb35xf2933rf4z08zmli760scz6s1zdzbgpc92dl2zl"; depends=[aws]; };
+  GMRP = derive2 { name="GMRP"; version="1.9.0"; sha256="06q87139z5dgl0c4i8jhry15q9ah9k19kgjmadkb55lfsb3akazn"; depends=[diagram GenomicRanges plotrix]; };
+  GOFunction = derive2 { name="GOFunction"; version="1.29.0"; sha256="08xyzk6hs3v263k949l94g6xq9lg5k86yzgqr89bmcyinsxlqk1j"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
+  GOSemSim = derive2 { name="GOSemSim"; version="2.7.0"; sha256="1qxvx4mk49k5d51xnvxn8wsw6dsidskpx6qddnm42ls9a4d9cypd"; depends=[AnnotationDbi GO_db Rcpp]; };
+  GOSim = derive2 { name="GOSim"; version="1.19.0"; sha256="0irpycjkzzdymg50zf2szgf7v4s2s0skfpjf5ckdrzskkjr2jzc1"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
+  GOTHiC = derive2 { name="GOTHiC"; version="1.17.0"; sha256="0n0h9k190p1glmvlrdpa5xdxj797mfdzb109yj5wy981s5q11gpb"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
+  GOexpress = derive2 { name="GOexpress"; version="1.15.0"; sha256="0k1hiinzn4553gh6app0kvd84md0g3jydv1y2rlzrcasamba7xvv"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; };
+  GOfuncR = derive2 { name="GOfuncR"; version="1.1.2"; sha256="0w2f866j82qcyvjj2cn9cqmaxx0sijywbxhsqfkvrsr8vbkhbmgi"; depends=[AnnotationDbi GenomicRanges gtools IRanges mapplots Rcpp vioplot]; };
+  GOpro = derive2 { name="GOpro"; version="1.7.0"; sha256="07qpvf17w1cq8qxdg0xdygdgnk9dc15ar7422q0y54kcgnfq0zj4"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; };
+  GOstats = derive2 { name="GOstats"; version="2.47.0"; sha256="1dxzr3xnn60iy2xv8k0j1r9bz1lq1g1n792gzl308dsy35p25cim"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL Rgraphviz]; };
+  GRENITS = derive2 { name="GRENITS"; version="1.33.0"; sha256="1jgsk0wcrkcvf6cgypmdyj6zjfxwxan5xm88l1ycdrilfrx1g582"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
+  GRmetrics = derive2 { name="GRmetrics"; version="1.7.0"; sha256="1vbnbn7r4fjv2p2qn5681kg0yqj5s1k4hf5jj52qgzjrp2qs4s6l"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; };
+  GRridge = derive2 { name="GRridge"; version="1.5.0"; sha256="10kz82nj90ilkj6wlsfvqlqrikgm5qw95m02xn99vghs4bj3yh0d"; depends=[glmnet graph Iso mvtnorm penalized survival]; };
+  GSALightning = derive2 { name="GSALightning"; version="1.9.0"; sha256="1qwq8yawf0llik4880y9j3qzbl9py404wrp6p2738qjb1mxyx9nr"; depends=[data_table Matrix]; };
+  GSAR = derive2 { name="GSAR"; version="1.15.0"; sha256="0i1rapjvdyw596vaqvsk49qbbrjnz1pam34559ws767r70vp0nng"; depends=[igraph]; };
+  GSCA = derive2 { name="GSCA"; version="2.11.0"; sha256="1w3028l6bj92phwhnxs71vxc1wn1bbqac37f4anr8wrxw1bvngid"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
+  GSEABase = derive2 { name="GSEABase"; version="1.43.0"; sha256="0f1rh227kx0wxndvgc283jfml5v2zmf184ajghflpq2crhv0sj7j"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
+  GSEABenchmarkeR = derive2 { name="GSEABenchmarkeR"; version="1.1.0"; sha256="1ykpinxwz9hqpb8wjrv8jwcq4gmnjkmxg4b8akgdwlypv766smgj"; depends=[AnnotationDbi AnnotationHub Biobase BiocFileCache BiocParallel edgeR EnrichmentBrowser ExperimentHub GEOquery KEGGandMetacoreDzPathwaysGEO KEGGdzPathwaysGEO rappdirs S4Vectors SummarizedExperiment]; };
+  GSEAlm = derive2 { name="GSEAlm"; version="1.41.0"; sha256="1di0d7zpsigi6k4bxfnq0yniyssxrmzdih3xayg6facpwgyhkp6n"; depends=[Biobase]; };
+  GSRI = derive2 { name="GSRI"; version="2.29.0"; sha256="0g3nncckasyx3n6nq5aihahzk73h6xb1m8xmq3m046vz245ny76x"; depends=[Biobase fdrtool genefilter GSEABase les]; };
+  GSReg = derive2 { name="GSReg"; version="1.15.0"; sha256="1qazhsx6gfnywwkhxip962v4jr5njbf97k36nbnq20q0yavwgzhz"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; };
+  GSVA = derive2 { name="GSVA"; version="1.29.0"; sha256="1yay4qw83jfpg1sskh8aizwblj1cxvjb974s7hbrc9a8z0dlkcnn"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; };
+  GUIDEseq = derive2 { name="GUIDEseq"; version="1.11.0"; sha256="1qxb0mrrldyac16zfzkqcy11750hakr4hgqm8ai1cabr6xd5yna1"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
+  GWASTools = derive2 { name="GWASTools"; version="1.27.1"; sha256="1w0magisa8rv0s1kppppas3lacrkmkg7finjc3bja1dh3npd1v5j"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
+  GateFinder = derive2 { name="GateFinder"; version="1.1.0"; sha256="1blj8407nl6nsn8dyg31xj4ii8rr2rfkg35g1hf97j60dk53bmwf"; depends=[diptest flowCore flowFP mvoutlier splancs]; };
+  GenRank = derive2 { name="GenRank"; version="1.9.0"; sha256="05g9mram44zs76m48rvplwdhdlhkygfxrzgdsd43was2xvyj6nvb"; depends=[matrixStats reshape2 survcomp]; };
+  GenVisR = derive2 { name="GenVisR"; version="1.13.2"; sha256="1ca47n9ddnm20vjj7070wfmmd9ff8w58d5rd79sq23hszmzwyzlf"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI FField GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; };
+  GeneAnswers = derive2 { name="GeneAnswers"; version="2.23.0"; sha256="08fgg33yls55357a45zfcghk87z7z2lqzh8wfiina122yg29c7ss"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
+  GeneBreak = derive2 { name="GeneBreak"; version="1.11.0"; sha256="1nw97k4cxd7l35r14jq5mf46wa4rlfm2zg28x176z6wh0jlz4gba"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
+  GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.27.0"; sha256="0bmhxzrg5d7v4lv4k2igl7ah8fncrggyziwqyhawavig17i1iqzc"; depends=[Biobase PGSEA]; };
+  GeneGA = derive2 { name="GeneGA"; version="1.31.0"; sha256="0fdfb6x7rjg4ak5xbikwj6fmmrnr3hnsi97amn69w81087228b5g"; depends=[hash seqinr]; };
+  GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.7.0"; sha256="03kkfv7vj717brzdw346yapxfg414v84wncqqrv3si03q4w450mz"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; };
+  GeneMeta = derive2 { name="GeneMeta"; version="1.53.0"; sha256="18f1nca21drjpv55b4d92zkgqr3zqhzp98slq6xfqvsj3rip6y5v"; depends=[Biobase genefilter]; };
+  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.23.0"; sha256="1076pgsykk88dswza9m1bbh1nzvb5l1680h0q971vdvy1z1sks4c"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; };
+  GeneOverlap = derive2 { name="GeneOverlap"; version="1.17.0"; sha256="0dqsq1sd1ly6gvnpq3xcv9idr30kazx97jha9icv1g64d337l289"; depends=[gplots RColorBrewer]; };
+  GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.37.0"; sha256="1672nriz5r0gpgb6c9bsa864ap3ap68n1igvpf9q8mf3sw659m3b"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; };
+  GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.25.0"; sha256="1lwszjpxp9bj0hd5z1kasq2qv49swji3ib1ljlph22wh0j9jimid"; depends=[Biobase limma MASS survival]; };
+  GeneSelector = derive2 { name="GeneSelector"; version="2.31.0"; sha256="134l462i60mym5k4z46nfx1f7r2r0fa069v1jddrjfmcv3v0gbs8"; depends=[Biobase limma multtest samr siggenes]; };
+  GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.1.0"; sha256="0w8ydly5qi8cvdhhda2q3k8fj9k9v1sg3c45h4ki02vx19j2kap0"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; };
+  GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.49.0"; sha256="1n9d1i45dcmp2irnsc5ak9pk33r68nzd84iixylwaj302l7yphjs"; depends=[gmodels gtools mvtnorm]; };
+  GeneticsPed = derive2 { name="GeneticsPed"; version="1.43.1"; sha256="0agd99r4jhp4y2ix5qrbwrycy3r8pc1cwa09ib3mhg5jdszm6jr8"; depends=[gdata genetics MASS]; };
+  GenoGAM = derive2 { name="GenoGAM"; version="1.9.0"; sha256="02f7xvsv4l27dqj6cxm363n67kkbyz26z36gl4mybcgivvdvmi6h"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; };
+  GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.41.0"; sha256="07vwj2pbrxgj3k673m8xrf3cpqc1g753fvj950qwmy4jmz6s8w04"; depends=[biomaRt]; };
+  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.17.1"; sha256="1ck578vgv3ya4kgdacxspiqrx8150zic0va745f98gafx2cv7b66"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; };
+  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.17.2"; sha256="0n3rl6mlyn1q4rjbjh8dlbq7sy192jc2zy3y4qlaacmmfrw4sv5h"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+  GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.5.3"; sha256="0nagrdckv853kfqrajs8jr2zhmmipnw36nsa8nr796y6q7ldq492"; depends=[dplyr GenomicRanges httr IRanges jsonlite lazyeval magrittr rappdirs readr S4Vectors SummarizedExperiment xml2]; };
+  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.33.0"; sha256="1dnj1drlly4ac6q29zycvyjaw50fl6l1iqwhsn5syvywb5ccmgh5"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; };
+  GenomicFiles = derive2 { name="GenomicFiles"; version="1.17.0"; sha256="08zjr3x7sn5fpqfl021vc8imdprd18hanyq7c2gwn5r0y30cyxrp"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.15.0"; sha256="0p2nsfwfxkl16iwv5apaikd6abbi21czdy7wh9kkyb4frh2938yd"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
+  GenomicRanges = derive2 { name="GenomicRanges"; version="1.33.6"; sha256="07allayr8aflgra393xikfd5zs1s8b2yrsw308dqdxjyc0i3497i"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+  GenomicScores = derive2 { name="GenomicScores"; version="1.5.1"; sha256="1pkisnqp2rwdyxxm5504107scc0kds0ry07xmx451bn1i52lg3n1"; depends=[AnnotationHub Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors XML]; };
+  GenomicTuples = derive2 { name="GenomicTuples"; version="1.15.1"; sha256="1xin5m11q94w64kcb6aqsi422cgbcagb0g45ir90dqf9d79v8vjz"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
+  Genominator = derive2 { name="Genominator"; version="1.35.0"; sha256="0qvzw9r8hn19gzkj6r94v4787h9lbw8y2s9k7zasn2cdyx55074i"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
+  Glimma = derive2 { name="Glimma"; version="1.9.2"; sha256="1njcjla1az23lrg5j93s1hxjrrjsf808plmvdhiai14fdlgzfb8w"; depends=[edgeR jsonlite S4Vectors]; };
+  GlobalAncova = derive2 { name="GlobalAncova"; version="3.49.0"; sha256="0y71r0biivxpyrjkl2132ngnz1fl5byi7rbig9g0j5svsmh9kk48"; depends=[annotate AnnotationDbi corpcor globaltest]; };
+  GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.3.0"; sha256="10iwh4z3zpv8x239y8i5qpp88ygyg4fiyhsgpyld11fg3d1qkn4h"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
+  GraphAT = derive2 { name="GraphAT"; version="1.53.0"; sha256="0wsn0nfj4qds2kxm3gxfx8wwyf00l0ifvk660czm7zc6ppfj1sb8"; depends=[graph MCMCpack]; };
+  GraphAlignment = derive2 { name="GraphAlignment"; version="1.45.0"; sha256="0mdy8g3i4b7wy9zqfbb1zia1h84kv2av4yl6japzz5ymiipjaimy"; depends=[]; };
+  GraphPAC = derive2 { name="GraphPAC"; version="1.23.0"; sha256="1wy20xjw6ikdjd66pk654dj5zcaxm2mn8vnwxr6s628x9c70rh0w"; depends=[igraph iPAC RMallow TSP]; };
+  GreyListChIP = derive2 { name="GreyListChIP"; version="1.13.0"; sha256="0m9qvb3rw1hr119vq2k5fdbywq8vfgfhxwm6r9nfmxdhdir6178j"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; };
+  Guitar = derive2 { name="Guitar"; version="1.19.0"; sha256="0khy7vhr8r56r14kiqz83py227jaji46aqlqs8yhj7kh6cgh59c5"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
+  Gviz = derive2 { name="Gviz"; version="1.25.0"; sha256="0c64bn8dqvcwi3jdfx0yg2jc7x1v41h4py7ily9z82ms8lfv7jh8"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
+  HDF5Array = derive2 { name="HDF5Array"; version="1.9.4"; sha256="1ld8fm7zvd3kzrqynx3q8vzcbn1k82lim1fnhz449x4gxi6gddpg"; depends=[BiocGenerics DelayedArray IRanges rhdf5 S4Vectors]; };
+  HDTD = derive2 { name="HDTD"; version="1.15.0"; sha256="00zrdmpscbycmlli7qvx6vdy7nyckxfazylrx83qaffg9d7a9wc4"; depends=[Rcpp RcppArmadillo]; };
+  HELP = derive2 { name="HELP"; version="1.39.0"; sha256="1sb43vndrk5qbazxwx3n0lmkb43525vmarj3hbkqplid5bppcddp"; depends=[Biobase]; };
+  HEM = derive2 { name="HEM"; version="1.53.0"; sha256="090k94d4bfmf1fqbxhlp2vb70x7934xwq8fjmgc2wlrq5d1iqjff"; depends=[Biobase]; };
+  HIBAG = derive2 { name="HIBAG"; version="1.17.1"; sha256="1raldjan5w9fvvk0hrwydyb1j6rs3566ks07nhym16f7bzrml85b"; depends=[]; };
+  HMMcopy = derive2 { name="HMMcopy"; version="1.23.0"; sha256="1ciawdh971fwfa60lb1469pqgmw9giyqksqk5zkfbal967pia1ck"; depends=[geneplotter IRanges]; };
+  HTSFilter = derive2 { name="HTSFilter"; version="1.21.0"; sha256="1c85v66fax6h00dkny5308mv1vsdinj590x6w4aghd6b4nb16qgr"; depends=[Biobase BiocParallel DESeq DESeq2 edgeR]; };
+  HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.33.0"; sha256="10agvn6dcmzczj5xdpviisnamfs6642xskh7zgh14c0p13gv76xs"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
+  HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.11.0"; sha256="0k6ql5pkn2yjvmf13g4lzrqb0jcnp0rqsvakkqmirpj2b40wynj1"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; };
+  HTqPCR = derive2 { name="HTqPCR"; version="1.35.0"; sha256="09wc412znd92fi3lm909mrz3xd9cjiwiw6b0ncki1yc186faizr4"; depends=[affy Biobase gplots limma RColorBrewer]; };
+  Harman = derive2 { name="Harman"; version="1.9.0"; sha256="1kcv48g1fwh36xdw8cx0v28n4dl9s4414vwa0alnwdy2j0b9n8qk"; depends=[Rcpp]; };
+  Harshlight = derive2 { name="Harshlight"; version="1.53.0"; sha256="0nlghc13lmhvsy06spvzhc7cihpzayli1iyid7h7ifa8zik6dz72"; depends=[affy altcdfenvs Biobase]; };
+  Heatplus = derive2 { name="Heatplus"; version="2.27.0"; sha256="1fyz7272w2ixisvg0gsv30svppd6xd47r79xg1r1y2qy62q04bca"; depends=[RColorBrewer]; };
+  HelloRanges = derive2 { name="HelloRanges"; version="1.7.0"; sha256="1h88zrvx3h4s7jsadyf3f3x6p0hbkn2f6smnkdmm7fva4lhlg7hl"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  HiCcompare = derive2 { name="HiCcompare"; version="1.3.0"; sha256="1kj8aqq4ddlsh3xnrzbj3hid67ai7p7d4hk2avxscicyrrskkq8w"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; };
+  HiTC = derive2 { name="HiTC"; version="1.25.0"; sha256="1mryn42bsvswb0gf027aw4qbrk57w8859zyvicymdi3d78pw8rmv"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+  HilbertCurve = derive2 { name="HilbertCurve"; version="1.11.1"; sha256="0mv3ijx5506wng7zs556k2ljb11si73f9109hg3i8jl5qcn5zdn9"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
+  HilbertVis = derive2 { name="HilbertVis"; version="1.39.0"; sha256="068jm0ls9ix06w4argkaldfrsx6fynywh0776ygn0iaxmcjm2fpb"; depends=[lattice]; };
+  HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.39.0"; sha256="1jq70si8q74jg22zg4gx4c6nbi8zszgiqrbc6cavn4v578fam3z1"; depends=[HilbertVis]; };
+  HybridMTest = derive2 { name="HybridMTest"; version="1.25.0"; sha256="0g667li0fhf085ha9210xwj3r0sy7ks9lj5v8lpiyz48yi8w2nfn"; depends=[Biobase fdrtool MASS survival]; };
+  IHW = derive2 { name="IHW"; version="1.9.1"; sha256="0h7gpmcnlahclhplfmi89s3ai3syg1cdvv2mc6nrx9kq7dckl3xv"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
+  IMAS = derive2 { name="IMAS"; version="1.5.0"; sha256="0lwn1kp5z488yryx8zzi0b5kdm5kzycdbpnn6lbx6ixjkhs26fkl"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; };
+  IMMAN = derive2 { name="IMMAN"; version="1.1.0"; sha256="0sgyiq7wif4imq81qqgwhbrx54dr26gb22j79mzzjyprv8yxgdkj"; depends=[BiocFileCache Biostrings igraph seqinr STRINGdb]; };
+  IMPCdata = derive2 { name="IMPCdata"; version="1.17.0"; sha256="0r5j70i1mdrpxjznmb6i561076n1vk1h371kvlxkb8y343ajz7sq"; depends=[rjson]; };
+  INPower = derive2 { name="INPower"; version="1.17.0"; sha256="1ilqffcbaxwk54m297f4znhbphjjipjfd82554z4mwdrkf0cz2lw"; depends=[mvtnorm]; };
+  INSPEcT = derive2 { name="INSPEcT"; version="1.11.0"; sha256="1na92547w6qn6dkhy3zp3gj1g3vr2y3kx6j78hnq0ch9l8k9s2c7"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; };
+  IONiseR = derive2 { name="IONiseR"; version="2.5.0"; sha256="0gn75w73ahyk3vm70vq003rlg1wsazfy7qygdp4dnq0g9qpz8dyy"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; };
+  IPO = derive2 { name="IPO"; version="1.7.0"; sha256="096a1c2ybmki12kqj2y1njpjbsia4qqd3rmj851cmks9h33mxk8m"; depends=[BiocParallel CAMERA rsm xcms]; };
+  IPPD = derive2 { name="IPPD"; version="1.29.0"; sha256="1gwsq17ipba4q7jby4hj7bwrpbfzach5spsvnb4571x7nr6yx7qg"; depends=[bitops digest MASS Matrix XML]; };
+  IRanges = derive2 { name="IRanges"; version="2.15.14"; sha256="1w12vvyfi53hr45xhl1vzsygig9vdzlxkkyjsylbwc9ny595pam7"; depends=[BiocGenerics S4Vectors]; };
+  ISoLDE = derive2 { name="ISoLDE"; version="1.9.0"; sha256="111p1wxyn3kqx6gdnrl55jwnlnqfa98wljkiw4wqqf2cdrykb7pr"; depends=[]; };
+  ITALICS = derive2 { name="ITALICS"; version="2.41.0"; sha256="1lj5n1xgq49xn8yv8q6lfg01hw8l4yc5ffc98falzhlcvqxhkvzc"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; };
+  IVAS = derive2 { name="IVAS"; version="2.1.0"; sha256="0ipw8834ag1j2qg3i5nnfcncrjpzhd2m5hzhn1bjpvhd357r1gn1"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; };
+  IWTomics = derive2 { name="IWTomics"; version="1.5.0"; sha256="0v5q1ywvgvcwlfh7a9krh06b1ad4i5kpnm67az81znliz3s2m60y"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; };
+  Icens = derive2 { name="Icens"; version="1.53.0"; sha256="16cxm1i6ir74l2x80wsp544ykffy91m4fv8v283nki0hx434pkn7"; depends=[survival]; };
+  IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.25.0"; sha256="025zqjc36whlraq3hjz0p5dzj5m19y50clrlgrimrz4ag5bfmf2q"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
+  IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.29.0"; sha256="0fn8xp7ybpg0z3bnk9sab53y7kflzys0r1cvikyp5n8pfkrr95g2"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
+  IdeoViz = derive2 { name="IdeoViz"; version="1.17.0"; sha256="0yr7yisb9hr2jsdlv7m59p9kiaxssv6rj8x4rqzraaipd7cn0gcy"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
+  Imetagene = derive2 { name="Imetagene"; version="1.11.0"; sha256="1zswp6h2c9nn4p73knp4wsnbqv77gp86njzpxjvgqjmvfj57y8nc"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; };
+  ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.9.0"; sha256="00v2dfzcxwffpss873j1i74vl1qgimdqamyx4gj4cqjv76qcdrqc"; depends=[Biobase data_table ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore R6 reshape2 rjson Rlabkey rmarkdown scales]; };
+  ImpulseDE = derive2 { name="ImpulseDE"; version="1.7.0"; sha256="0g34jfff5lsvzak21fdi2fdx9a2v0n1f2cmjsk62jkjzr9jpyp2f"; depends=[amap boot]; };
+  ImpulseDE2 = derive2 { name="ImpulseDE2"; version="1.5.0"; sha256="1f9nymih6fwq6p53x9f7zjblkdrrj0f89w1lv9f8bdz1y4icn1y4"; depends=[Biobase BiocParallel circlize ComplexHeatmap cowplot DESeq2 ggplot2 knitr Matrix S4Vectors SummarizedExperiment]; };
+  InPAS = derive2 { name="InPAS"; version="1.13.0"; sha256="0hk6lr9sk4yvgj9pw0w48936lmgz478k5jfbh1jmybixgx9cnl7k"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
+  InTAD = derive2 { name="InTAD"; version="1.1.0"; sha256="0pm720gl7apzbcqxd53gj4ynkglv4bb0xrzibcwbpwgsmi75g55c"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggpubr IRanges mclust MultiAssayExperiment qvalue rtracklayer S4Vectors SummarizedExperiment]; };
+  IntEREst = derive2 { name="IntEREst"; version="1.5.1"; sha256="1drlpx96rfdr94i3aqvwb839ivwb6y4kg1qqip6hh33shrh7hzf0"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; };
+  InterMineR = derive2 { name="InterMineR"; version="1.3.0"; sha256="0rsf9ssnzcsfynk3ifsn2g5hk8g8nlkli0x7b7p5x60w8pvawss4"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; };
+  InteractionSet = derive2 { name="InteractionSet"; version="1.9.1"; sha256="0zdsdqmym0s09fp724xfa53bfy5isnj4gpxwaircl6js44rdp0f2"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; };
+  IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.3.0"; sha256="015mjy0fcch4z3nsy5jvyl6jcc6zigvfh4s35nm3yjw2plg06jm4"; depends=[igraph knitr]; };
+  IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.17.0"; sha256="0fx9zkvg8471kcyda3hvp7zjv6d1z1pr2sq5882xn1amhcjpwws1"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
+  IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.3.1"; sha256="19pzz6airm4jghr699g2sx8d0m8sxplmgyy09508npwxq5kkw4rw"; depends=[Biostrings BSgenome cummeRbund DBI DRIMSeq edgeR futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges plyr RColorBrewer reshape2 rtracklayer tximport VennDiagram]; };
+  JunctionSeq = derive2 { name="JunctionSeq"; version="1.11.0"; sha256="1pq098zb6ynsrxmvppjvh4ws642sry12hz1rsc53ph5n375blxga"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix Rcpp RcppArmadillo S4Vectors statmod stringr SummarizedExperiment]; };
+  KCsmart = derive2 { name="KCsmart"; version="2.39.0"; sha256="1y5lrcl4inkdmbr9bma02j7g4r0my49jvc434mzgvjmv6zfilm4k"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
+  KEGGREST = derive2 { name="KEGGREST"; version="1.21.1"; sha256="1kk89li0nzp0g8p3v69c8b8ijqia9rz45139f56kl7vfvrr8l7yd"; depends=[Biostrings httr png]; };
+  KEGGgraph = derive2 { name="KEGGgraph"; version="1.41.0"; sha256="0sd2m80q2igal5qh03qcdjpcyi6rxk8w3mxgd9rjars6ykcj0g84"; depends=[graph XML]; };
+  KEGGprofile = derive2 { name="KEGGprofile"; version="1.23.0"; sha256="0y1whzp0q1hlrcg9qhba6fh5iimnqp6phvd7kl8phkyhi5zzsv9a"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png RCurl TeachingDemos XML]; };
+  LBE = derive2 { name="LBE"; version="1.49.0"; sha256="07r55w9f7a5fdp183rjx5f15jzkw73q6r7ra7drk887xylzmxvd0"; depends=[]; };
+  LEA = derive2 { name="LEA"; version="2.3.0"; sha256="1k7zxl6aa09kr2gmh6lhg1hdb332fqggdi8hk4gbjcgsa533sqcc"; depends=[]; };
+  LINC = derive2 { name="LINC"; version="1.9.0"; sha256="1295829apimwfiyhxzyl61wlabd7j18zdycrrai2f3d42005pfjw"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; };
+  LMGene = derive2 { name="LMGene"; version="2.37.0"; sha256="1pkgkn12bgmamfcbdi5c352v92q31rzwcq69kh00z7wb07flcmf2"; depends=[affy Biobase multtest survival]; };
+  LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.7.1"; sha256="16agj2lk871hqnwjrwg59qxsblr7gb2pd5y5h734c2san34y09r3"; depends=[CAMERA xcms]; };
+  LOLA = derive2 { name="LOLA"; version="1.11.0"; sha256="1pgxwcbd0sdb9npq6sjvbjjlqq13750795m9ycjz3mg2989y4rn5"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; };
+  LPE = derive2 { name="LPE"; version="1.55.0"; sha256="08pghdnq4l4zj21q3jz77x2hryjps1jk0rpdlv9kr207f535ww9l"; depends=[]; };
+  LPEadj = derive2 { name="LPEadj"; version="1.41.0"; sha256="0sjhx44m1rfkhpq87996wc7n8axz2k8c4ni818rx78cqpha5ybjl"; depends=[LPE]; };
+  LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.31.0"; sha256="0wgjvy0r0p254kr686nnvjdwbqhbq06q1izy2idh9aaa043swaqn"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
+  LedPred = derive2 { name="LedPred"; version="1.15.0"; sha256="1jbwxs9hcwqcm1dpn24jkq0xi8jyja9mq347frpn8vc1m08w4bjx"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; };
+  LineagePulse = derive2 { name="LineagePulse"; version="1.1.0"; sha256="00y0xcw89c1kdmcdj4pw620szrhxy2sykb7iblfbxz04cbj7vygs"; depends=[BiocParallel circlize ComplexHeatmap ggplot2 gplots knitr Matrix RColorBrewer SingleCellExperiment SummarizedExperiment]; };
+  Linnorm = derive2 { name="Linnorm"; version="2.5.0"; sha256="013i53zmjgrkb4icgzp9mdmn7wqfm8r24izm6vifigczqphm0g0i"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 gmodels igraph limma MASS mclust Rcpp RcppArmadillo Rtsne statmod vegan zoo]; };
+  LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.35.0"; sha256="0ggrhgdlw44k0q5nddn60m91225xx4c58ydjgd98b4rz4a0l9qjy"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; };
+  Logolas = derive2 { name="Logolas"; version="1.5.0"; sha256="0h6pq0mp935ygm8pcnk4g9wxg9hcqnbssw6ar1kw59kcama062fs"; depends=[Biostrings ggplot2 gridBase LaplacesDemon SQUAREM]; };
+  LowMACA = derive2 { name="LowMACA"; version="1.11.2"; sha256="1ir6vfjiwjhi6hj6pzksh2wfrcsmhkd80zwc135md0gmxr5bhhw8"; depends=[BiocParallel Biostrings cgdsr data_table httr LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; };
+  LymphoSeq = derive2 { name="LymphoSeq"; version="1.9.0"; sha256="0s0hwgbxdmkpdp6mnvd181idg0n3z87wf4w0arjih1205n1hqsyw"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; };
+  M3C = derive2 { name="M3C"; version="1.3.3"; sha256="1h9f5syg4r435w5p5azgmyfmfaycqx0mmbs8jgz2hp3m04f8a967"; depends=[cluster dendextend doParallel doSNOW foreach ggplot2 Matrix matrixcalc NMF RColorBrewer Rtsne sigclust]; };
+  M3D = derive2 { name="M3D"; version="1.15.0"; sha256="1fdfahbdfx3csn27q61djp27a2w6jr9yl9hw6rakjnj7mk5s1xrj"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; };
+  M3Drop = derive2 { name="M3Drop"; version="1.7.0"; sha256="0w4vwlbaz68if7vanhr79nqg84cq9r60drrawc9c5c6gfcfzzjmz"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; };
+  MADSEQ = derive2 { name="MADSEQ"; version="1.7.0"; sha256="00x1nbvf375nik8v12hwpbnn84l70j5jycv8kp37fn18909100lh"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; };
+  MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="1.1.2"; sha256="03inn8i0pragrph3nia1zvkjd5kr3iz5ggj2i1fm6ir9259c7n01"; depends=[Category clusterProfiler data_table DOSE ggExtra ggplot2 ggrepel ggsci GOstats gridExtra pathological pathview pheatmap png RColorBrewer reshape sva]; };
+  MAIT = derive2 { name="MAIT"; version="1.15.0"; sha256="0z1wl9hxqcfy7nlwqccz244kljdjra58drlhjfvc38kiy4q7nsyg"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
+  MANOR = derive2 { name="MANOR"; version="1.53.2"; sha256="1ss77yxivvgv2nswdp5qbbjc21ghrnwvj3w33xj4zv79bdb92qga"; depends=[GLAD]; };
+  MAST = derive2 { name="MAST"; version="1.7.2"; sha256="07v6gjlh645w60c5fq206lmm2qpld1qqirdszrnrz00zrxzrnpz0"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr reshape2 S4Vectors SingleCellExperiment stringr SummarizedExperiment]; };
+  MBASED = derive2 { name="MBASED"; version="1.15.0"; sha256="19zn2xmarpiszs3jfmmlgc5nflc2gafbby3x68l38sich2jn1kix"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
+  MBAmethyl = derive2 { name="MBAmethyl"; version="1.15.0"; sha256="19lgv7lcy5qc6xbsngqvfxbaqcyk3rz907983ngqa9magr7xy2r1"; depends=[]; };
+  MBCB = derive2 { name="MBCB"; version="1.35.0"; sha256="0cmmyj0c13b47apdk04qqqfg35rywh5fa0d2inhi31lfvbfd8bcx"; depends=[preprocessCore tcltk2]; };
+  MBttest = derive2 { name="MBttest"; version="1.9.1"; sha256="1m99zma2zg070sr759y8gkmm1qwnswqapbhl175xf8kxma1gh4cb"; depends=[gplots gtools]; };
+  MCRestimate = derive2 { name="MCRestimate"; version="2.37.0"; sha256="1b1cp4aan1wnzspihjm2snp16qjd3flr3ixx19mvsqzy5p38pf69"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
+  MCbiclust = derive2 { name="MCbiclust"; version="1.5.0"; sha256="1zkxh6gax7rnp6n5dd6kwcljwds33fv5ps4crn41hzndllpbbc93"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; };
+  MDTS = derive2 { name="MDTS"; version="1.1.2"; sha256="0q3v06za1wdkrzp711gs7awpk4dvrxj0xy6m5lzjyjz5qdd2nym5"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; };
+  MEAL = derive2 { name="MEAL"; version="1.11.3"; sha256="04s5gqmn2gd399ba7gj9968d5ryisi6hl7n75mrgns5zq7mb3q7s"; depends=[Biobase BiocGenerics DMRcate GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl permute S4Vectors SmartSVA SummarizedExperiment vegan]; };
+  MEDIPS = derive2 { name="MEDIPS"; version="1.33.0"; sha256="0c37ns7z4wgir91lhz36035nvp1vc886fardjn2p74bz5w90w16x"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
+  MEDME = derive2 { name="MEDME"; version="1.41.0"; sha256="1l0i3vz1zp9lmvvfn5h6baf9kzvdyb9m1qffwlg3dvzdzdqadx0l"; depends=[Biostrings drc MASS]; };
+  MEIGOR = derive2 { name="MEIGOR"; version="1.15.0"; sha256="0ch31d8g993ikz7dklzfh9mfn1cv8wv7k3nihdspqvbm37m8c0v1"; depends=[CNORode deSolve Rsolnp snowfall]; };
+  MGFM = derive2 { name="MGFM"; version="1.15.0"; sha256="08qgxz6aglxgzrbmxmay1xg402vw0a4yp86ifb5p0bwaniiv6k72"; depends=[annotate AnnotationDbi]; };
+  MGFR = derive2 { name="MGFR"; version="1.7.0"; sha256="11vw9yyv6j2pjj4cmlw0f3blxz4iwx3p9r0xpzis5zs12x7pn17f"; depends=[annotate biomaRt]; };
+  MIGSA = derive2 { name="MIGSA"; version="1.5.0"; sha256="1n4gh139cp05ahqjd3hyj2pzj9p0pyqhbwhsyg208mlm1arkdyxg"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase ismev limma matrixStats org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; };
+  MIMOSA = derive2 { name="MIMOSA"; version="1.19.0"; sha256="1z3hj0ivv4zw4sprzr5bhxp5fpzkg37m1sk1y90cfm42p4vyqagg"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
+  MIRA = derive2 { name="MIRA"; version="1.3.0"; sha256="0wsgpmig3vz0iy7395a8091n5w5s5xmi709bd5pppdqw2zwhnmn6"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; };
+  MLInterfaces = derive2 { name="MLInterfaces"; version="1.61.1"; sha256="1nmcxaa3r34xhzcs063pwggck2yhwvc1ckzyhqabbb41jflnnw3g"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
+  MLP = derive2 { name="MLP"; version="1.29.0"; sha256="0fqrpnqb9031f3y1qgmvxr0ynygp1rzjg2dsy4g2z98jzwbncznk"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
+  MLSeq = derive2 { name="MLSeq"; version="1.99.8"; sha256="1h72lhvrvkpbl5dil3gk2kw6ax3xpycp87511a5ndzagnl2499js"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma plyr sSeq SummarizedExperiment xtable]; };
+  MMDiff2 = derive2 { name="MMDiff2"; version="1.9.0"; sha256="1l3frx6myj4jglypv5il3pgjpm3szq5xfp5p8k8xilahmg98ykh1"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
+  MODA = derive2 { name="MODA"; version="1.7.0"; sha256="0wm5sc2fh5j191128xlxdqmfsh8ix8k33gkcz6yn8rfpj3rdfhzg"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; };
+  MPFE = derive2 { name="MPFE"; version="1.17.0"; sha256="1jalc9ny5lv3h7awrkg5mmagjh15js5rmpqfl7pn15499186fajp"; depends=[]; };
+  MSGFgui = derive2 { name="MSGFgui"; version="1.15.0"; sha256="198lczhpgjlv0mq1k4rch4fm0gjm7g65j108ib69n5zbzkcqgbri"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
+  MSGFplus = derive2 { name="MSGFplus"; version="1.15.0"; sha256="19b61p8ihxni4psfrc7akgrq6aq28wzf73zp0bizwqfkv4lphm7l"; depends=[mzID ProtGenerics]; };
+  MSnID = derive2 { name="MSnID"; version="1.15.0"; sha256="167hjrp9zsa84swbrkmjaxc0haza02qzzfg64855rrf0m319g0v0"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; };
+  MSnbase = derive2 { name="MSnbase"; version="2.7.1"; sha256="0gc1hysdd3ng6a0n3fqidrwgm2b3x4mlrccrxba5ank312i6f5iq"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; };
+  MSstats = derive2 { name="MSstats"; version="3.13.4"; sha256="0vc36h2s1xmird1ghadw0v9r12gxh73xjmgbclfydg0q4i0x6762"; depends=[data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore randomForest reshape2 snow stringr survival tidyr]; };
+  MSstatsQC = derive2 { name="MSstatsQC"; version="1.3.0"; sha256="1sp72cpks1cw3h6j9lzscs9lf9s9gl092h3jnxixkzf44cjlbxah"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; };
+  MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.1.0"; sha256="1cr6l6axi7cqqb547dhsha7zdn85grgvvq2436skxws172pl0pv3"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly RecordLinkage shiny]; };
+  MVCClass = derive2 { name="MVCClass"; version="1.55.0"; sha256="0xkwwvq66cnmac52ik95siq78ny9nfbgp4xncdamq7gmn7wasacr"; depends=[]; };
+  MWASTools = derive2 { name="MWASTools"; version="1.5.1"; sha256="015zdbmxlpv9y2qsg6ny59ljy8cn2vz4grmwa8dragr7pmivqikf"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; };
+  MantelCorr = derive2 { name="MantelCorr"; version="1.51.0"; sha256="03sqqfi06hcprya25aj3p9sa35x9n2m9ffnplnh6gqmcv22fj75k"; depends=[]; };
+  MassArray = derive2 { name="MassArray"; version="1.33.0"; sha256="1ni7dw8lk73n3b19m0rnd8cszb4p6la6msld0z63lgvih4m3z805"; depends=[]; };
+  MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.47.0"; sha256="0mq6xfdj11m49xi6x14lp6kh9idfbrmy9kx7jpjm90hwdjnl48ym"; depends=[waveslim]; };
+  MatrixRider = derive2 { name="MatrixRider"; version="1.13.0"; sha256="0plcabv6wc7s4q7ippi7i9ckc3lg4pwxdm32gpsmmssff37jx41c"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
+  MaxContrastProjection = derive2 { name="MaxContrastProjection"; version="1.5.0"; sha256="10hdj1kb9ywwgzf7nj7hzmh2hr5si6ps0h120nkdjmjscyd2sw26"; depends=[EBImage]; };
+  MeSHDbi = derive2 { name="MeSHDbi"; version="1.17.0"; sha256="1m73m7dgcl1n2rgb8c8qar65w18b1qq42n458yw3di88xly6wmb3"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
+  MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.53.0"; sha256="0j6v368naid00b1igibjp94yxyz0sqhsr8lxgxv0xwy85ivsqlbi"; depends=[]; };
+  MergeMaid = derive2 { name="MergeMaid"; version="2.53.0"; sha256="1dn5shrkyhph13x5qyygvp10jd8acs6rka9vr3g9dh0rq4mx4114"; depends=[Biobase MASS survival]; };
+  Mergeomics = derive2 { name="Mergeomics"; version="1.9.0"; sha256="1qs7jcgg5ah2iw6lcfwnp9lag5cah0d0gg9jk2qhrnqi22cjrymf"; depends=[]; };
+  MetCirc = derive2 { name="MetCirc"; version="1.11.0"; sha256="1v37sbd1c3m5mqyqlm7jcv1dascwwb1m9fm1cr2rn8r2whi9yfib"; depends=[amap circlize scales shiny]; };
+  MetaCyto = derive2 { name="MetaCyto"; version="1.3.2"; sha256="19kvmrzfakyjavd0y6j2ixzmlm070fdz6sygn0vczpdkqmir5vqd"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; };
+  MetaNeighbor = derive2 { name="MetaNeighbor"; version="1.1.0"; sha256="1jj4jh27ysl3ilhw20pf1srw0n47c0dbc3s760blwbf5qnrlhivv"; depends=[beanplot gplots RColorBrewer SummarizedExperiment]; };
+  Metab = derive2 { name="Metab"; version="1.15.0"; sha256="12l43jyrsq1dcbbrkr6k66hrcwkx8ynyniz3cfs17im09nrj20jz"; depends=[pander svDialogs xcms]; };
+  MetaboSignal = derive2 { name="MetaboSignal"; version="1.11.0"; sha256="0cpmbq55d7bf9mky0m0ydg1qs60sxq8wl2apkhvnyfhifv3f316q"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools org_Hs_eg_db RCurl]; };
+  MethPed = derive2 { name="MethPed"; version="1.9.0"; sha256="0xi7s75ph09xi8f57hnmlfzr4xazj875wqc98dr198r5985sl99v"; depends=[Biobase randomForest]; };
+  MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.13.0"; sha256="02kc184ql68rqll95sza94qnzjgh8wvg76h3z5r3lqmxdd7bblz9"; depends=[Biostrings gplots seqinr stringr]; };
+  MethylAid = derive2 { name="MethylAid"; version="1.15.0"; sha256="15xkcbjj7mcmbm5di1bxslfiipnbdarsfsg16kmd530v9lmll331"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny SummarizedExperiment]; };
+  MethylMix = derive2 { name="MethylMix"; version="2.11.0"; sha256="1lm88i5b03i08s4dydmw7jjxp5qpn5nz72by74nqzc36m6ignk8k"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; };
+  MethylSeekR = derive2 { name="MethylSeekR"; version="1.21.0"; sha256="0zpd930n3vyv94yic8zjfgl68m3kr4z35ab5lzprjmpyy8hg7szn"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
+  Mfuzz = derive2 { name="Mfuzz"; version="2.41.0"; sha256="0hdjkg90kk7igjx26hfm9wfh7lymm0cgxsn263a7sy1cb6ld7nx8"; depends=[Biobase e1071 tkWidgets]; };
+  MiChip = derive2 { name="MiChip"; version="1.35.0"; sha256="19w0kzyg6s950g0p4a4gdkkblsz30zv57rs3dqzqh1rgcrcb4gpf"; depends=[Biobase]; };
+  MiPP = derive2 { name="MiPP"; version="1.53.0"; sha256="0ii5vlx5gwkz01ivg0qjml8q5zqdvz21rrxgqhx2zdqwi6cbfww0"; depends=[Biobase e1071 MASS]; };
+  MiRaGE = derive2 { name="MiRaGE"; version="1.23.0"; sha256="1inywp84lh8qwairxrb8cvql171mg4jrg66aqg0nhihqm0mjwnn5"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; };
+  MineICA = derive2 { name="MineICA"; version="1.21.0"; sha256="1n711vz5g1rrz6hnm88w3ycm0yczq4a0h2rg635g7x33sszjr3dk"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
+  Mirsynergy = derive2 { name="Mirsynergy"; version="1.17.0"; sha256="0n8vspalfwisnfk486i90pxi2hd2xi32b36pfl3ifrpqyr2rylix"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
+  MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.31.0"; sha256="10cdaprs899j3fswds8vx4gm2xp5kcx11l53ymxlyjr5592887fm"; depends=[Biobase lattice limma statmod vsn xtable]; };
+  MoPS = derive2 { name="MoPS"; version="1.15.0"; sha256="0bmxwf1i2szan2wn4gxmf4qskrsaydkkrbg7agmgzgbzhvb47dgs"; depends=[Biobase]; };
+  MoonlightR = derive2 { name="MoonlightR"; version="1.7.1"; sha256="040hkp66mr432762wkwyyhxpsqqrhkri06szl7wyfpmf3gmydj9i"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; };
+  MotIV = derive2 { name="MotIV"; version="1.37.0"; sha256="0wzf7dzw063i613gx8pa3sf1hvqc52yhb8dqpy87g3smalfj3qr3"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; };
+  MotifDb = derive2 { name="MotifDb"; version="1.23.0"; sha256="1s0191bn7418bkl5zha6a99wnznznrndk13z8jhzjcpp4kk6m1f7"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors splitstackshape]; };
+  Mulcom = derive2 { name="Mulcom"; version="1.31.0"; sha256="0l8wn2ma3s55w86wv3779y39vsp45rfa5nkjj1cjn26qc2ay0r0f"; depends=[Biobase fields]; };
+  MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.7.14"; sha256="1wwi9dgf41zvkv2zkrx6wvk15zhml618mz3ki7gzshzp3p9wxwr7"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment tidyr]; };
+  MultiMed = derive2 { name="MultiMed"; version="2.3.0"; sha256="085vmkq1hd9x1za5c21gvndyl46ymd7w5hwixvhnsclzb4r7gav7"; depends=[]; };
+  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.7.0"; sha256="1iy96za3b31sm9kkbg6vf17a88pyhdk580yrhl580ggwjjkn3fz6"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; };
+  NADfinder = derive2 { name="NADfinder"; version="1.5.0"; sha256="0wjnfi09d686ypifgqrn191hh8xgv7m87fnak84ss5ka9lwhii54"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; };
+  NCIgraph = derive2 { name="NCIgraph"; version="1.29.0"; sha256="06jmifga56d9cnqp4wb9hm6g32fhsk6n0g70qqw1k4l5k7m2v5wv"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; };
+  NGScopy = derive2 { name="NGScopy"; version="1.15.0"; sha256="1b8190zyq3sixmvg9kw7jshxsyb2zicfm0w6qfgah0aq9jgb9gxz"; depends=[changepoint rbamtools Xmisc]; };
+  NOISeq = derive2 { name="NOISeq"; version="2.25.0"; sha256="18hz9g1p1kacb1f4b3sxfrp1gl6wk87p20d5580krrqk9a69al2n"; depends=[Biobase Matrix]; };
+  NTW = derive2 { name="NTW"; version="1.31.0"; sha256="183y8sqf3h4ik1cm6zhvzmijc8kanmv3lvqh4v4cb7qhvgrgb3ln"; depends=[mvtnorm]; };
+  NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.11.0"; sha256="0sl0chkrx8s4625ch43x9r8n5k7cd0y18cinafrligqfrwnc5yx0"; depends=[Biobase matrixStats Rcpp]; };
+  NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.13.0"; sha256="1km8i428rn4q5b89d56bcnwkrpvhf67bzmxwzxfdwm1qr956vab2"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; };
+  NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.25.1"; sha256="1lqs0rcx52c3hnx89wngmyyhn02a7nf007x95z85rqzrclgy27ki"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
+  NetPathMiner = derive2 { name="NetPathMiner"; version="1.17.0"; sha256="0p6syyn31nfx3qgw8yv6m7jry2prnjnf6pc9qf889407438q11cf"; depends=[igraph]; };
+  NetSAM = derive2 { name="NetSAM"; version="1.21.0"; sha256="15crfdd8a7wlmn3vmwqxzfihaph64lay7k75dx5mjwswp01w5g37"; depends=[graph igraph seriation]; };
+  NormqPCR = derive2 { name="NormqPCR"; version="1.27.0"; sha256="1481sv255pq76scmbwvw66blknww2w8d9c4md4gmsgkifwnwvqjf"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
+  NuPoP = derive2 { name="NuPoP"; version="1.31.0"; sha256="1sfv98q0z3x5lzmvhbjh1k65flxhsjfx5nqhlhhihcs5rjx8pa3h"; depends=[]; };
+  OCplus = derive2 { name="OCplus"; version="1.55.0"; sha256="0nn2adv9v0j0dhz93kd2d3bh1fx31vg3qk9sygrf1xbwqppmcyp9"; depends=[akima multtest]; };
+  OGSA = derive2 { name="OGSA"; version="1.11.0"; sha256="063y4bzxiwjb0nvh3lkkgd39p59sy9drzcckpkxm5yxm3scrdy2f"; depends=[Biobase gplots limma]; };
+  OLIN = derive2 { name="OLIN"; version="1.59.0"; sha256="0q0cr7yfprvzl01dgb4mwpbwnj1yfpn4myf8jksckiy0s2cwinra"; depends=[limma locfit marray]; };
+  OLINgui = derive2 { name="OLINgui"; version="1.55.0"; sha256="1wjsb9h443d82x6vq70plhv7cgc3n7imvjlian1a0hd9dbcx9ss3"; depends=[marray OLIN tkWidgets widgetTools]; };
+  OPWeight = derive2 { name="OPWeight"; version="1.3.0"; sha256="1jjpz8inwfwpky316l61lka8g0dp69qr8kbgi6g54f0y0kjcq5fa"; depends=[MASS qvalue tibble]; };
+  ORFik = derive2 { name="ORFik"; version="1.1.0"; sha256="03fv9dr9jpzavrnbjd1pp6jlbi5i3sbg6zbi3p7z95rm8j1cds6x"; depends=[Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp Rsamtools rtracklayer S4Vectors]; };
+  OSAT = derive2 { name="OSAT"; version="1.29.0"; sha256="174jna1bl6vkbr3zypyfnhakfm7bm6llfcgghr4m9bvc8a6hxq6b"; depends=[]; };
+  OTUbase = derive2 { name="OTUbase"; version="1.31.0"; sha256="0p86dn54pipqy3v74iwgvs2xqxypq6iq58y9m0pqbncryrszcs0p"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
+  OmaDB = derive2 { name="OmaDB"; version="1.1.1"; sha256="1y2xflz6cbdhxsyd0nx131amxmq4jjfcgma34vrl6jzl9y9l96ga"; depends=[ape Biostrings GenomicRanges httr IRanges plyr topGO]; };
+  OmicCircos = derive2 { name="OmicCircos"; version="1.19.0"; sha256="03laa1vjjxgrpcz2sxdq9dq0fa2s04jvf56q03h5gx8hkfn4rv7v"; depends=[GenomicRanges]; };
+  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.13.0"; sha256="1fqmyfpjmpx3ihbvf5w15v48w2zbkx8iyyajc9gpsb033abzl3fm"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
+  Onassis = derive2 { name="Onassis"; version="1.3.0"; sha256="1smj5ii8mblmkg1p8ssi5xq5aqa13nl7fc0nlpbflv3cpssimzjs"; depends=[AnnotationDbi data_table GEOmetadb OnassisJavaLibs RCurl rJava RSQLite]; };
+  OncoScore = derive2 { name="OncoScore"; version="1.9.0"; sha256="0ckcnhr5f6lcarg6zjyszmf5yl6gw1g09j6jnqq87pk9g7nsi3n6"; depends=[biomaRt]; };
+  OncoSimulR = derive2 { name="OncoSimulR"; version="2.11.0"; sha256="02kbkpjkpi3srxgz8jcyk1dhsc2q19ghbd3p160v2sf966g1286d"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; };
+  OrderedList = derive2 { name="OrderedList"; version="1.53.0"; sha256="1pdv3pih594x3bkrzmm7ab418mxjsa17qbv0dpmw4w1yyvrlyz5m"; depends=[Biobase twilight]; };
+  Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.9.0"; sha256="196ispr6m2r1fc4l4jm985njh8xz7qxcsr8w0kvffv63zx0zy807"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges RSQLite S4Vectors]; };
+  OrganismDbi = derive2 { name="OrganismDbi"; version="1.23.0"; sha256="0mjav9c9w5mwmkdisci9c7i993xyvqbmsa8nw9kyhqirsxf0p7cc"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; };
+  Oscope = derive2 { name="Oscope"; version="1.11.0"; sha256="1x8z5i3v42787iv9hddp65cggnlvr7xa9kippi0sn0wr7gd79zcw"; depends=[BiocParallel cluster EBSeq testthat]; };
+  OutlierD = derive2 { name="OutlierD"; version="1.45.0"; sha256="085nk41icxzx8halczi4kjd262y8dfxq6lrhwiy8qjb216hbrln6"; depends=[Biobase quantreg]; };
+  PAA = derive2 { name="PAA"; version="1.15.0"; sha256="06slcqrpcvz713ga5vl2w0dyswqb78nnqvvf0dxi5cdw8g3h58gs"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+  PADOG = derive2 { name="PADOG"; version="1.23.0"; sha256="10libml1j14yy70s22yf8i4mh8awmnx5a94b3krmh6py2xlw41nj"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; };
+  PANR = derive2 { name="PANR"; version="1.27.0"; sha256="0zr55whhmqyic41chlzxhrn081ray8gl90llb6rwigvmzhfjabyr"; depends=[igraph MASS pvclust RedeR]; };
+  PAPi = derive2 { name="PAPi"; version="1.21.0"; sha256="1qnbqa72w1734j6rbdbays1f4ysl2b1r65p2hi580zwwi6isaa3i"; depends=[KEGGREST svDialogs]; };
+  PCAN = derive2 { name="PCAN"; version="1.9.0"; sha256="14ph4mk4svinwpy0rw2b3n96dswahw6273lggw2blp9s24a56a1h"; depends=[BiocParallel]; };
+  PCpheno = derive2 { name="PCpheno"; version="1.43.0"; sha256="004qx7rclh2q9bbrqf4d54jlzpha8vg0lbaf67gf42ivav0fl908"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
+  PECA = derive2 { name="PECA"; version="1.17.0"; sha256="0p4vg0kcrypxm4g8al50rcvrk10lqs23mc00hrd1s8ydycvgd26a"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
+  PGA = derive2 { name="PGA"; version="1.11.2"; sha256="08ksqsrpx8mj3mbdbvnbx9bnwxqskkyd340a13r76f5d1p44086m"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; };
+  PGSEA = derive2 { name="PGSEA"; version="1.55.0"; sha256="07ynkcxppvm8s525y10ly6jcc0ga93a8sqihdxhs1yg092pcbx64"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
+  PICS = derive2 { name="PICS"; version="2.25.0"; sha256="1qfv4ddkym5s7171i0c4s5v3x8liaxngpv40y362cr895wa63mwm"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
+  PING = derive2 { name="PING"; version="2.25.0"; sha256="1lgvn09a1frb6cqrnrvmyzlwm7rgis61wd1gqv5y6pf0w6m6ya9k"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
+  PLPE = derive2 { name="PLPE"; version="1.41.0"; sha256="11a1wsgzssn5nqbmxxrfqk7js6h3y0zcxgfyqr5hvfz6licl2q3v"; depends=[Biobase LPE MASS]; };
+  POST = derive2 { name="POST"; version="1.5.0"; sha256="099q5w5sgpamgncga096szl40i3lzjnphki2kfby0svkkvjiyrhl"; depends=[Biobase CompQuadForm GSEABase Matrix survival]; };
+  PPInfer = derive2 { name="PPInfer"; version="1.7.0"; sha256="0pvhfc3qyxx6vxww6fx7jx8hb72sl4jna1c3bnyw6z7lvp7a8cxw"; depends=[biomaRt fgsea ggplot2 igraph kernlab STRINGdb yeastExpData]; };
+  PREDA = derive2 { name="PREDA"; version="1.27.0"; sha256="15ndnwf3f1cj2h0vrh71gs7xdvy97nncbxrlwk6yisvgndjbdmsb"; depends=[annotate Biobase lokern multtest]; };
+  PROMISE = derive2 { name="PROMISE"; version="1.33.0"; sha256="1gkbpj9cd5fbrrp2zmffnckynbn81kqyg5wvy2g88spa1zxsx6vp"; depends=[Biobase GSEABase]; };
+  PROPER = derive2 { name="PROPER"; version="1.13.0"; sha256="1w77rishajj0azrcf0cfsg9is98w1f1w3hfh72rgi7kc93d0k4v0"; depends=[edgeR]; };
+  PROPS = derive2 { name="PROPS"; version="1.3.0"; sha256="15md6zvsa9ismdwbhlzwxkyj38n4bqv4kpbvxbzg7kb50hc109w6"; depends=[Biobase bnlearn reshape2 sva]; };
+  PROcess = derive2 { name="PROcess"; version="1.57.0"; sha256="1sb25yfpvq4z6famifk951gwx75dd51srf1khm96psz9k0klxbqg"; depends=[Icens]; };
+  PSEA = derive2 { name="PSEA"; version="1.15.0"; sha256="1rcz03n4asjajlncppvfhmlnar6f9qzb6m9bg99nmp0gdkjcwa2j"; depends=[Biobase MASS]; };
+  PSICQUIC = derive2 { name="PSICQUIC"; version="1.19.0"; sha256="06x6r2js8mxl10yrgmmvzb0na5ydya3ldzxaagh8z21smi154215"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
+  PWMEnrich = derive2 { name="PWMEnrich"; version="4.17.0"; sha256="1mknim17d0wl7vhn6cffjasisd9nmgs4b3fjz42yjj9y5xqjxwv9"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
+  PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.9.0"; sha256="0x1rzblyy45xdr3hnjbacip7v1pbr54wfc2abldgij9mgc0hmhl9"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; };
+  Path2PPI = derive2 { name="Path2PPI"; version="1.11.0"; sha256="1f6qc6cvsrnhh26lkprjan9fxc1kw4hbb1wbr83rswg0lj8nyg6r"; depends=[igraph]; };
+  PathNet = derive2 { name="PathNet"; version="1.21.0"; sha256="1gnzghvj0gf4mcbh099v6c13gqjkalgb3g9fpn2i86fq8h61zplh"; depends=[]; };
+  PathoStat = derive2 { name="PathoStat"; version="1.7.2"; sha256="0j5by6yqgiyj17wn036dkb9q3d47ynb4m4w9zkf01d38lqzfp2hr"; depends=[ape BiocStyle ComplexHeatmap corpcor DESeq2 devtools dplyr DT edgeR ggplot2 glmnet gmodels knitr limma matrixStats phyloseq plotly plyr RColorBrewer rentrez reshape2 ROCR scales shiny shinyjs tidyr vegan webshot XML]; };
+  PathwaySplice = derive2 { name="PathwaySplice"; version="1.5.0"; sha256="15yc7d84cghmqai4m86bzi3cwidngmn6b680a1ngm6lmfj03bykj"; depends=[annotate AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr EnrichmentBrowser ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq KEGGREST mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; };
+  PharmacoGx = derive2 { name="PharmacoGx"; version="1.11.0"; sha256="0s2gwvp9pdc1qf35apcgscz2xrx5sy1x9kcixy9wjwm4qnhr8cag"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; };
+  PhenStat = derive2 { name="PhenStat"; version="2.17.0"; sha256="1fvkaqg1ignyknjgrnj359a5276rrscrkdk9029851rjpyzwypd5"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; };
+  Pi = derive2 { name="Pi"; version="1.9.0"; sha256="1bdr53dxz2sfmm7n4214m5mqp47l8ipsm562mhs1pybqfawfwfff"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; };
+  Pigengene = derive2 { name="Pigengene"; version="1.7.4"; sha256="072bzpimq9135r4s7sfxgw8sb6h0fgygay9fvlbldfcql8amx7kp"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
+  Polyfit = derive2 { name="Polyfit"; version="1.15.0"; sha256="0k3apzd7szmglba2s51grmp4lbvv2wmv6kvv43mvbvrvc59cyxq5"; depends=[DESeq]; };
+  PowerExplorer = derive2 { name="PowerExplorer"; version="1.1.1"; sha256="06igcls1khn3dvajp7289v4ax6yr5cgg0da0d81dkr38cb6lwnpx"; depends=[Biobase BiocParallel data_table DESeq2 ggplot2 gridExtra MASS ROTS S4Vectors SummarizedExperiment vsn]; };
+  Prize = derive2 { name="Prize"; version="1.11.0"; sha256="0fk26mk97l3jdj9n20ha7m8gcfxc20w4c9c5xshnphfij56brrr5"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
+  ProCoNA = derive2 { name="ProCoNA"; version="1.19.0"; sha256="1648ly7mpqfhj1phnvwrkzsj31wdk5ddg7cc073kbwwgmz859r0d"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
+  Prostar = derive2 { name="Prostar"; version="1.13.0"; sha256="01k76vh9z15ya8cjymwmpcl0z79q3fqpz2m5yvvsy21ijw2vd004"; depends=[DAPAR DAPARdata data_table DT highcharter htmlwidgets R_utils rhandsontable shiny shinyAce shinyBS shinyjs webshot]; };
+  ProtGenerics = derive2 { name="ProtGenerics"; version="1.13.0"; sha256="0mcdiy93c01ki2zfv90a5q00hss8i4mds4gw6n6gp32f40ap7h2j"; depends=[]; };
+  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.11.0"; sha256="01279ybid6k8l8w564rpx7jd1487dafxkmgfzvg0964z930i7qsm"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
+  PureCN = derive2 { name="PureCN"; version="1.11.11"; sha256="1n2ikzcyxw8rfbid2bgg6fnn3nlfwgmjw73f9y06hyci0m2qpc8n"; depends=[BiocGenerics Biostrings data_table DNAcopy futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges Matrix RColorBrewer rhdf5 Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; };
+  Pviz = derive2 { name="Pviz"; version="1.15.0"; sha256="08kkrhxmy60lkvmjwpkv3nv7w8mybv5465923a9hghzs291qjvn4"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
+  QDNAseq = derive2 { name="QDNAseq"; version="1.17.0"; sha256="113s3ir4dxhxxpfy700hp2lgvx6qgzy1nbqin0g3fz7z0y50m2ns"; depends=[Biobase BiocParallel CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; };
+  QUALIFIER = derive2 { name="QUALIFIER"; version="1.25.1"; sha256="1acaga0zc3vnjmr15xmyd05xp2cdwh96armg47qbpb4kygfh433g"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
+  QUBIC = derive2 { name="QUBIC"; version="1.9.0"; sha256="1kayxj3msc171x6glgvqpqygrigf8x0knknk7ci7fmbg6haf44jf"; depends=[biclust Matrix Rcpp RcppArmadillo]; };
+  QuartPAC = derive2 { name="QuartPAC"; version="1.13.0"; sha256="0mxq3nn5lqfqk8lpg1pys724pvviqz1fkhbnp5zlszvyhikmic9q"; depends=[data_table GraphPAC iPAC SpacePAC]; };
+  QuasR = derive2 { name="QuasR"; version="1.21.0"; sha256="1q3h4dg95wqmfkbrp5rvyp7qazafcgwc4chhw7rlwdbvic080g63"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
+  QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.15.0"; sha256="0b0qxsqf3g42k68d22w22n8y5yjvhx4jfkwpaxg38z5i8404n03k"; depends=[dplyr Rcpp yaml]; };
+  R3CPET = derive2 { name="R3CPET"; version="1.13.0"; sha256="0viqypiwmrhi08islj8lg2byhvhfblwjj340ms2a7wf8zbyl439l"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
+  R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.31.0"; sha256="16cri94hg585804xaq5gfbs9nn62nhmcayapvwpb2y7vs855g4qx"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
+  R4RNA = derive2 { name="R4RNA"; version="1.9.0"; sha256="08jrmdcdwk9dzk38sjc6rxn4nf3s5lg6x9w540drhiynd3jw9nxw"; depends=[Biostrings]; };
+  RBGL = derive2 { name="RBGL"; version="1.57.0"; sha256="0bm2wfsi3himissj2x1v16rgrz3j2wz9s1kisaxxpgv27a4bvp0i"; depends=[graph]; };
+  RBM = derive2 { name="RBM"; version="1.13.0"; sha256="0ssl53wbzakkggx2jlzy378jnw13w116dxs3wnzmdaywa5nqbamr"; depends=[limma marray]; };
+  RBioinf = derive2 { name="RBioinf"; version="1.41.0"; sha256="1bi7dx51nhq7y2s0395hncbfbwfhdixwwn5n238f6fq6sxg95v1h"; depends=[graph]; };
+  RCAS = derive2 { name="RCAS"; version="1.7.0"; sha256="14s4f6lfy31vv791h8yasc4b3883r0ksjab9wrsw8w8381ac2323"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
+  RCASPAR = derive2 { name="RCASPAR"; version="1.27.0"; sha256="00r0p6hzzjsgpwc0ja6ws2sn7fp5qzlcajvwq3l5zd99zcn3lds8"; depends=[]; };
+  RCy3 = derive2 { name="RCy3"; version="2.1.13"; sha256="1kp2hgh2kid9xy8w97wkwc3759sxz7lp6inamsflff5a12ffd41c"; depends=[BiocGenerics graph httr igraph RJSONIO XML]; };
+  RCyjs = derive2 { name="RCyjs"; version="2.3.6"; sha256="1gbqpf9ljvlhl8zmd39d7fifn67sv6gmfvryfk9yf0y53x9l95sc"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; };
+  RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.19.0"; sha256="0in7bnx1v9z9z55b88hmix8fgrjysbzjxp0c53psq3k7fm46yxg7"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
+  RDRToolbox = derive2 { name="RDRToolbox"; version="1.31.0"; sha256="0zm1319g4b0jfqi7ix7insqadilccmlcc1bnwf4hwgw1d2bsby1p"; depends=[MASS rgl]; };
+  REDseq = derive2 { name="REDseq"; version="1.27.0"; sha256="0s1v5qlbzz54pck44vy0bzhkm0ga7wa01nrr4x1fbswxbkz80djy"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; };
+  REMP = derive2 { name="REMP"; version="1.5.0"; sha256="0gr7x6l9z871p41w32q8dqz2jaglvz51d7zrrwxy55iidbnqw5jv"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 caret doParallel foreach GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b2_hg19 impute IRanges iterators kernlab minfi org_Hs_eg_db ranger S4Vectors settings SummarizedExperiment]; };
+  RGMQL = derive2 { name="RGMQL"; version="1.1.0"; sha256="1z7dj3lmw40b08x33bl9fb4asr22syn0cinl12ya60nawh5rlxsi"; depends=[BiocGenerics data_table dplyr GenomicRanges glue httr plyr RGMQLlib rJava rtracklayer S4Vectors xml2]; };
+  RGSEA = derive2 { name="RGSEA"; version="1.15.0"; sha256="1c0i33lz0cl983dk520g2caf0844jknd39h71fy6kynknqxmnqqs"; depends=[BiocGenerics]; };
+  RGalaxy = derive2 { name="RGalaxy"; version="1.25.0"; sha256="04xs1w3yndlrdbac2ybzhdk8fdbg95a3qmjjqyykhfl5mck97d97"; depends=[Biobase BiocGenerics optparse roxygen2 XML]; };
+  RGraph2js = derive2 { name="RGraph2js"; version="1.9.0"; sha256="0y7fnysz9rljyrk4gs1r29zgxzzcpwk3jayv6km20l6abxzbfccr"; depends=[digest graph rjson whisker]; };
+  RIPSeeker = derive2 { name="RIPSeeker"; version="1.21.0"; sha256="02m401h56lb88qcfbidfxvh5nxls465y68jgjcfv7sd4x83ykd7z"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  RITAN = derive2 { name="RITAN"; version="1.5.2"; sha256="0nfnrh4w3y33rygdl07ydvxzl05nnysl3zlsg9nf459w98y4s7xg"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png ProNet RColorBrewer reshape2 RITANdata sqldf STRINGdb]; };
+  RIVER = derive2 { name="RIVER"; version="1.5.0"; sha256="1fdav14pba08a1hyqh82yad1ynvbzbc9i5gn5gxiypa833s5v31h"; depends=[Biobase ggplot2 glmnet pROC]; };
+  RImmPort = derive2 { name="RImmPort"; version="1.9.0"; sha256="0amhihh6g8j817xr05bqcp9sx564gp0jlg34iinmjqzizksflv1g"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
+  RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.5.0"; sha256="008nmql2f1qw246bj50w38kabcfw2bvgqb086ch9h9cv4b976dwi"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
+  RLMM = derive2 { name="RLMM"; version="1.43.0"; sha256="1hfr0w56jai1v3x0b6w4z5y00yf8j2aa2yhcd994lj48klwgjacp"; depends=[MASS]; };
+  RNASeqPower = derive2 { name="RNASeqPower"; version="1.21.0"; sha256="0gd3mbish7k4zwfv4kadcnifwm485p7zizvdj8pk1ns1fl5cwpbz"; depends=[]; };
+  RNAdecay = derive2 { name="RNAdecay"; version="1.1.1"; sha256="1xnj3q52biy8rzpyvd7b77sszsvs01sxkkkkkz0waqi61q58rhvv"; depends=[ggplot2 gplots nloptr TMB]; };
+  RNAinteract = derive2 { name="RNAinteract"; version="1.29.0"; sha256="03xizq9h93ii1jwjbk6kcmh71fc882qk9fnv3hbl15a9d8yvzpnv"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
+  RNAither = derive2 { name="RNAither"; version="2.29.0"; sha256="0w90awkmdi2h6q2hpvl6i5qbkdggbpvac1cbxx2995hmx8lc6pwa"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
+  RNAprobR = derive2 { name="RNAprobR"; version="1.13.0"; sha256="0hjhk0ap6n17ccjkjfxq8c8cfg166gcwbapmwixac4dqwqg5k997"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr Rsamtools rtracklayer S4Vectors]; };
+  ROC = derive2 { name="ROC"; version="1.57.0"; sha256="1glip25d37gz13b2c4zpk1vm34kvfxvgbsz302ww0g8wqq3cc0i5"; depends=[]; };
+  ROTS = derive2 { name="ROTS"; version="1.9.1"; sha256="061z3cnwaz5fgbpikg6vqazp1bqsxp7ln8krn3i1fz20k4ny800z"; depends=[Biobase Rcpp]; };
+  ROntoTools = derive2 { name="ROntoTools"; version="2.9.0"; sha256="1ivsr52qf9sz08zpp1vbvwyqpsfd55m4jj8g62mb5khkmrf8mnwl"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
+  RPA = derive2 { name="RPA"; version="1.37.0"; sha256="0cm2sfv6pkrxjq8xnby2hsnda687bdlc63b3i96fmhzjldfwnixf"; depends=[affy BiocGenerics phyloseq]; };
+  RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.3.0"; sha256="1ji9m1x9l84iwdw1bd2bhbvdfwn3jnw80inc6xnc6vp4k64zll4m"; depends=[]; };
+  RRHO = derive2 { name="RRHO"; version="1.21.0"; sha256="00wy53vmfdzfv56ib277cl7rnv2l6klyixyjq93whmzr39d8mbwi"; depends=[VennDiagram]; };
+  RSVSim = derive2 { name="RSVSim"; version="1.21.0"; sha256="0l7wq0cvws0n78xp14rwagrjhm3pxzf2jg3k1w5pv6w778mhm9dw"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
+  RSeqAn = derive2 { name="RSeqAn"; version="1.1.0"; sha256="186qcffr5f1g5x5didd8gkhfdl9wxdivqjwxbcn001i3k71h11mm"; depends=[]; };
+  RTCA = derive2 { name="RTCA"; version="1.33.0"; sha256="0wyvn004xjxgr80ar5a0bcc6jpz9ksi03is8yc8ijsdlssk9cs71"; depends=[Biobase gtools RColorBrewer]; };
+  RTCGA = derive2 { name="RTCGA"; version="1.11.0"; sha256="1r5qxbbw420cq2a648ispxwlswv5xpi9r4r89r7d7cgaw1k1n0h5"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
+  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.11.1"; sha256="0ajrz01aqqs30m5dq6x0l2gn49vhbi4k9ppyzgdy0ljpvx95c8hb"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges httr IRanges limma plyr RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; };
+  RTN = derive2 { name="RTN"; version="2.5.1"; sha256="1gwvqqjky6cgq4sdj8myjqrywdx7a44wnvb20l47qlqamlr41905"; depends=[car data_table igraph IRanges limma minet RedeR S4Vectors snow]; };
+  RTNduals = derive2 { name="RTNduals"; version="1.5.1"; sha256="17vp27lxjh3v0y2s1d96xk2y3wxwj2lh40c5z7lqh6qx89lyhirz"; depends=[RTN]; };
+  RTNsurvival = derive2 { name="RTNsurvival"; version="1.5.0"; sha256="0fyks8lvxqdli3wm0z0py6vn5y3mfpvi95mqb7hycafc2812am68"; depends=[png RColorBrewer RTN RTNduals survival]; };
+  RTopper = derive2 { name="RTopper"; version="1.27.0"; sha256="1d2bnvjlwgrahxjd1x6gzdhz70wyd990iq9204kc072qyi40l2yz"; depends=[Biobase limma multtest]; };
+  RUVSeq = derive2 { name="RUVSeq"; version="1.15.0"; sha256="1dnjshlpalfnrgk9dmig5k1bnshpk4ifp3bvh1cp1z55yihmw111"; depends=[Biobase EDASeq edgeR MASS]; };
+  RUVcorr = derive2 { name="RUVcorr"; version="1.13.0"; sha256="0cfq69vvajn2s8gyrr4g9vzf8l8wp7p6hg6jlfffv2kfn3yhd05g"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
+  RUVnormalize = derive2 { name="RUVnormalize"; version="1.15.0"; sha256="02v5kj8hbzgcckqq671zypfkf460j3rxiqxh4w5izp9bxqdv9g3g"; depends=[Biobase RUVnormalizeData]; };
+  RVS = derive2 { name="RVS"; version="1.3.0"; sha256="0y98yaj5lvlc4104nqjhk7g00f1zqaqsig3mdf7hvwqhlwdsyh0l"; depends=[gRain kinship2 snpStats]; };
+  RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.5.2"; sha256="157sfaz4s6wpvccn4s7w0j0iv69zqzf8vxpamp4kdzdhg9ky7byw"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
+  RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.1.0"; sha256="1kzxl773z4619lvznxv67yb7k2lfjn3bfgfssgql0adrjfm8qi1a"; depends=[dnet igraph Matrix]; };
+  RankProd = derive2 { name="RankProd"; version="3.7.0"; sha256="1zqawks6i567dk4ylnyh0jddnp62nqygshv4ihy39xhjab4j04wx"; depends=[gmp Rmpfr]; };
+  RareVariantVis = derive2 { name="RareVariantVis"; version="2.9.0"; sha256="1466zh50n0f1apkbd38lp84r8byras0pna5bm49bc7i7s9agkp14"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
+  Rariant = derive2 { name="Rariant"; version="1.17.0"; sha256="0nm0k2d1bhqsk9gir38gd0py6xn5wk0b985kpix8ghi64mypmqmr"; depends=[BiocGenerics dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
+  RbcBook1 = derive2 { name="RbcBook1"; version="1.49.0"; sha256="1ar8jl97fillw0g7kf09mxkr9215dw3jmw2b6qaq9pch7qg8qnr7"; depends=[Biobase graph rpart]; };
+  Rbowtie = derive2 { name="Rbowtie"; version="1.21.0"; sha256="05ql92h3s7ppsf5fdrsqbhsn9snwhf168yr78n7qhafw9p6ry77j"; depends=[]; };
+  Rbowtie2 = derive2 { name="Rbowtie2"; version="1.3.0"; sha256="02cf3hn9nb10583fwxqzb8iygsm5xzmxhk4y0iadyvxi6nsz6lbk"; depends=[]; };
+  Rcade = derive2 { name="Rcade"; version="1.23.0"; sha256="0d6cyn6b06g0qkps2d7b65p7pa7bz6iv71lv4hbzmdc581azg4fq"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; };
+  Rchemcpp = derive2 { name="Rchemcpp"; version="2.19.0"; sha256="17kz0ld7hnrvdv69hz3kj3mhv2f4qms9i65lrwam63g0aydfzyrx"; depends=[ChemmineR Rcpp]; };
+  RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.21.0"; sha256="0fzmw1kxnaqmk5h61r2dkwq0xp8ir7gg7kq2wkhyvpd68hr3ir3d"; depends=[flowType graph Rgraphviz sfsmisc]; };
+  RcisTarget = derive2 { name="RcisTarget"; version="1.1.2"; sha256="1a909bnc96bhn1jd8yk1d68f9x49lbd6wgbmwqxq1k1iqh8qj2hs"; depends=[AUCell BiocGenerics data_table feather GSEABase R_utils SummarizedExperiment]; };
+  Rcpi = derive2 { name="Rcpi"; version="1.17.0"; sha256="0a6cs6bvnzx9cp5y4m3h9in0bhq78iy50p48p59k6qqzkvldgcqy"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
+  Rdisop = derive2 { name="Rdisop"; version="1.41.0"; sha256="038bgrf5bcdwy8bji5wprq55ypajwp68lqv1i24bk6hikfm2g7p9"; depends=[Rcpp RcppClassic]; };
+  ReQON = derive2 { name="ReQON"; version="1.27.0"; sha256="1dvsnbsl5ljwfirn61rbcxvrdy74qv96xbs4d8x1wmkfs2bsm2gy"; depends=[rJava Rsamtools seqbias]; };
+  ReactomePA = derive2 { name="ReactomePA"; version="1.25.0"; sha256="0hrprjkzg6mdsyqyxgzpscfvgm0335j2avv96a9n70w7rj1zx3ym"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite igraph reactome_db]; };
+  ReadqPCR = derive2 { name="ReadqPCR"; version="1.27.0"; sha256="0qbfx6kj6bk60wilbnp49inairhhsi1638i5hhfd1w8365mmzalq"; depends=[affy Biobase]; };
+  RedeR = derive2 { name="RedeR"; version="1.29.0"; sha256="00j3yr07qg363ghbgv76ydyar0jp48zdfw5pdpxnv13mzm48wa4r"; depends=[igraph]; };
+  RefNet = derive2 { name="RefNet"; version="1.17.0"; sha256="0lcbg131gxkvsvmbwj4gpqdpfqjik91jmyd2g745yb7rayly252g"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
+  RefPlus = derive2 { name="RefPlus"; version="1.51.0"; sha256="0wq0l2883ns2sl8ia5qdx6wn9227lxaz7m0g3lqmr36xkflc1ka1"; depends=[affy affyPLM Biobase preprocessCore]; };
+  Repitools = derive2 { name="Repitools"; version="1.27.0"; sha256="1anh3fn4wyn69838y7jr5h6bhi8m7d7r1n68rbqvsvbr4bik54vr"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; };
+  ReportingTools = derive2 { name="ReportingTools"; version="2.21.1"; sha256="0rdndxizkbx8bdjcx82x59y326ypsxrlmzyrgkgkmm3hgq041n97"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; };
+  Rgin = derive2 { name="Rgin"; version="1.1.0"; sha256="1yqif2dpw0c3p4kg8pni80ggh3f6430nd7k3k0fxirz74ljv642h"; depends=[RcppEigen]; };
+  Rgraphviz = derive2 { name="Rgraphviz"; version="2.25.0"; sha256="06kvi85d2wgm2v9pvxn9swrvi4cavww5idcc7gx4d80w4kwzhx5f"; depends=[graph]; };
+  Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.3.1"; sha256="1g25896i244fv2bpzd68sd542s2842fs39bssxdjd8fcshxkzy2v"; depends=[]; };
+  Rhtslib = derive2 { name="Rhtslib"; version="1.13.4"; sha256="0g60pz7ssy872ppws7qvsv7miph3yhx48p6sqmxi3qbz0qs6dq15"; depends=[zlibbioc]; };
+  RiboProfiling = derive2 { name="RiboProfiling"; version="1.11.0"; sha256="0l76dfz2r2grx31v8ic80k3mry78m20znssrh5i7v6xfh33ghg6c"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; };
+  Ringo = derive2 { name="Ringo"; version="1.45.0"; sha256="0pwyfjv8f91g7i1h9qpzwgbkgyh04dyvmrm9v4rdabmfbhr38c6g"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
+  Risa = derive2 { name="Risa"; version="1.23.0"; sha256="1kch6h68a6sxdrndqzxmqhyj5mv08iipdmv09z3hax7aw45lk08h"; depends=[affy Biobase biocViews Rcpp xcms]; };
+  Rmagpie = derive2 { name="Rmagpie"; version="1.37.0"; sha256="1qzxifxdkc86p4q8l7qz8bmxlh5an7zkmgbzb72chwm6bby774m8"; depends=[Biobase e1071 kernlab pamr]; };
+  RmiR = derive2 { name="RmiR"; version="1.37.0"; sha256="0zz0jgqfqph0rhkbx0bgm8kcwm81hsk1cml8a917gfymfpzj93s8"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
+  Rmmquant = derive2 { name="Rmmquant"; version="0.99.11"; sha256="0lj7dnjf5msrn7fbr68krv2rgav8qrpahgj37qa64k5cn0xyiblw"; depends=[BiocStyle DESeq2 devtools GenomicRanges org_Mm_eg_db Rcpp S4Vectors SummarizedExperiment TBX20BamSubset TxDb_Mmusculus_UCSC_mm9_knownGene]; };
+  RnBeads = derive2 { name="RnBeads"; version="1.13.1"; sha256="146aziw6d7jalkjj81kgdkbnmzpvia8khgqkbpfngjykyykdgqy9"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; };
+  RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.13.0"; sha256="0d27jiw016fkmzpd4lsjnrkd122amqi37cr5rpnwviyw47rw5dxj"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
+  Rnits = derive2 { name="Rnits"; version="1.15.0"; sha256="0vg3rx87fw9y792b9icf1qliwsbi7h74csk7n9ya8jwjsyb0fcv2"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
+  Roleswitch = derive2 { name="Roleswitch"; version="1.19.0"; sha256="12pqrclq4vfsv0y9ykisri5l2zy3pz3sz22xqlqfkmlldqvngy4v"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
+  RpsiXML = derive2 { name="RpsiXML"; version="2.23.0"; sha256="061r9c1lb3qrm4lwpk87ynsi6nqjwqv2cxk9z6l01b14cb2mn6r3"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
+  Rqc = derive2 { name="Rqc"; version="1.15.0"; sha256="07zq9p2jkkzfjkccwryfh02xrz6bq20lw3z9v1pikk0dap6g1447"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; };
+  Rsamtools = derive2 { name="Rsamtools"; version="1.33.0"; sha256="0qp084lwadvwngn98lmlj758yra7il5sykdnxj82a4llr38fwg20"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+  Rsubread = derive2 { name="Rsubread"; version="1.31.5"; sha256="14azrcgip829pm1aa6yq2s50zghf83l7mn7pizc98qjrlkwbia89"; depends=[]; };
+  Rtreemix = derive2 { name="Rtreemix"; version="1.43.0"; sha256="0wkszdsbpkai8snqvgr46mc0kqlgha76hclr4kbgddlbg9cmbymh"; depends=[Biobase graph Hmisc]; };
+  S4Vectors = derive2 { name="S4Vectors"; version="0.19.17"; sha256="1cqv7lcgrqbvffmi8xw0pwwl2k3s6kyyfx4dhj05w42r5ax9wk0k"; depends=[BiocGenerics]; };
+  SAGx = derive2 { name="SAGx"; version="1.55.0"; sha256="1xriaf6qhmisx7415jgrpk6p0jhhv0mn3ab1zj4g6dvm495s0579"; depends=[Biobase multtest]; };
+  SANTA = derive2 { name="SANTA"; version="2.19.0"; sha256="0qfzmsqssb62bab9csak82s0dhrrpz93q0825sdjk7sy2qnp3c6l"; depends=[igraph Matrix snow]; };
+  SBMLR = derive2 { name="SBMLR"; version="1.77.0"; sha256="0xhs5adrirlplm8m3ldsw0m085wqi7mgjn3c7ldkhmlr9w9vc7wg"; depends=[deSolve XML]; };
+  SC3 = derive2 { name="SC3"; version="1.9.1"; sha256="1nj5sjxgv0ic0s74w9vy3dwnrwywwj2kaydnn5s1p1hnrc6xsm11"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; };
+  SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.23.0"; sha256="1l7h4r4msq8gdiklmnb8cnh29babknzsbncxg3qkrf28q6gihz29"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
+  SCnorm = derive2 { name="SCnorm"; version="1.3.0"; sha256="0zij0ny8xnmxcci08br3vb10dfmsxp11mgfr6f5ga8s868n09260"; depends=[BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SummarizedExperiment]; };
+  SDAMS = derive2 { name="SDAMS"; version="1.1.0"; sha256="0z6ajklzq6srlx2r4ymgpsgfzzg5qzypcza7kh0zfahg2pb262w4"; depends=[qvalue SummarizedExperiment trust]; };
+  SELEX = derive2 { name="SELEX"; version="1.13.0"; sha256="0n2xpdyr6sy8mnbq9vqccaphfa5pjbldcnmpm4zb9w2zdg27g24k"; depends=[Biostrings rJava]; };
+  SEPA = derive2 { name="SEPA"; version="1.11.0"; sha256="19904q9pxbxwaj8vfqk1nvwb5sn69g15zfk9xyb7wwnwxrrkph0r"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; };
+  SEPIRA = derive2 { name="SEPIRA"; version="1.1.0"; sha256="0wxk45lp7gdnshr4w4205khkq6dn09p7vr77s9hdz8968wj0rzg3"; depends=[corpcor limma]; };
+  SGSeq = derive2 { name="SGSeq"; version="1.15.0"; sha256="09ksqyszgh84lwv0vzy8kp4vdhczdqpk1mr7h18ja5rpilnk60r0"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; };
+  SIAMCAT = derive2 { name="SIAMCAT"; version="1.1.0"; sha256="0aaw372yl2b74ni3hr788bqglma679vqfzhfad2903ln0lx54rl3"; depends=[beanplot glmnet gridBase gridExtra LiblineaR matrixStats mlr ParamHelpers phyloseq pROC PRROC RColorBrewer]; };
+  SICtools = derive2 { name="SICtools"; version="1.11.0"; sha256="1jgq6acqqfx6fcwkyqn49p94m399dblc86s3hf7xgdml61jjxa81"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; };
+  SIM = derive2 { name="SIM"; version="1.51.0"; sha256="0z23b4pgiyah5qcixhww7csmkq01gw0bd9hmzrwrn046yy3mmnql"; depends=[globaltest quantreg quantsmooth]; };
+  SIMAT = derive2 { name="SIMAT"; version="1.13.0"; sha256="0kac998ddp94qls9jd68bd32cvnkxzdk63ysrcliiwmxcpplymrq"; depends=[ggplot2 mzR Rcpp reshape2]; };
+  SIMLR = derive2 { name="SIMLR"; version="1.7.0"; sha256="0f8ds6qjkj2z79pl18pwgwsn5fp0k05s50kakfiy9cbmbhnqy9ik"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; };
+  SISPA = derive2 { name="SISPA"; version="1.11.0"; sha256="1cw4xzcqjp8pdaglar9dfgr25zqyb6h31k3hn66hyxg9cyagj4k4"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; };
+  SLGI = derive2 { name="SLGI"; version="1.41.0"; sha256="0ihb43dmab2188641l5zpn98djj68mm5xq2v79wqrh136n9cam9j"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
+  SLqPCR = derive2 { name="SLqPCR"; version="1.47.0"; sha256="0m2qhkc6l158phg5hwfcs5wlq2n2nrhsjprrmzjv3q9rsdhwid8c"; depends=[]; };
+  SMAP = derive2 { name="SMAP"; version="1.45.0"; sha256="1i94sywcxp3pg30b93v5p9n70va1mixk67jxxfyhc6dlbfpx7d3y"; depends=[]; };
+  SMITE = derive2 { name="SMITE"; version="1.9.0"; sha256="1hvmbsz7p4ibjfh2a45aqpvv1kridkfg3zk3kzgbmws5l1vf154z"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; };
+  SNAGEE = derive2 { name="SNAGEE"; version="1.21.0"; sha256="0lsb2rqb1a3dgfgv5bijgb87y3zdl3mp1p38nzzi05n180yrgpzr"; depends=[SNAGEEdata]; };
+  SNPRelate = derive2 { name="SNPRelate"; version="1.15.0"; sha256="02xaxm3qrlgalndk4fmmvdy0rxpv565ysh2vc36gxcdvgz39pf1s"; depends=[gdsfmt]; };
+  SNPchip = derive2 { name="SNPchip"; version="2.27.0"; sha256="15cf2nrwixiqiyav5634qlv7md5dmv17h3z97j5771dv75fkl2gr"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; };
+  SNPediaR = derive2 { name="SNPediaR"; version="1.7.0"; sha256="0van1q586n5dd5snvhc3j7hkdhdwrmbky9mj1nfdfzgcdl7bnmk3"; depends=[jsonlite RCurl]; };
+  SNPhood = derive2 { name="SNPhood"; version="1.11.0"; sha256="03dami2l6y21fh7sazh3bzjhj1n9vqc0fva4ig1kkdansd1bvp0f"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  SPEM = derive2 { name="SPEM"; version="1.21.0"; sha256="19l21yaqcazymnapqalrkb6az10jkmzy8zvp5wh28rb8bl2p88f3"; depends=[Biobase Rsolnp]; };
+  SPIA = derive2 { name="SPIA"; version="2.33.0"; sha256="06si8xr8hc4sr87gafaphv9rfiq9w82gwd4xzwn0js00fgalffvd"; depends=[KEGGgraph]; };
+  SPLINTER = derive2 { name="SPLINTER"; version="1.7.2"; sha256="070ciavxg9y5mahaaaq7sbsz1zkv8llz69x6qvh332v0hchn29yg"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo stringr]; };
+  SPONGE = derive2 { name="SPONGE"; version="1.3.0"; sha256="0xnrzzlm12rrr54ymfa10pcmzgq7njqhgynv9ki9msxrvn1rhcd4"; depends=[Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; };
+  SQUADD = derive2 { name="SQUADD"; version="1.31.0"; sha256="0dh04i31lzdpkmqhawm1krn132hqj6qz5i6cj2sxxvk4chqq1xmf"; depends=[RColorBrewer]; };
+  SRAdb = derive2 { name="SRAdb"; version="1.43.2"; sha256="01nr09lkm4lwc6p0mfl1nn8g4fkzsw8c157snkcclqzn829121bp"; depends=[GEOquery graph RCurl RSQLite]; };
+  SRGnet = derive2 { name="SRGnet"; version="1.7.0"; sha256="1b6y5wq18vb41wvjdgbwr5mhwbyi0brzj941950w9if4hm1xrxs6"; depends=[DMwR EBcoexpress gbm Hmisc igraph limma MASS matrixStats pvclust]; };
+  SSPA = derive2 { name="SSPA"; version="2.21.0"; sha256="1bsn84xsapnfdfrv6nbp4a7604y2jfkf7zj1xzhv582klawwxzyg"; depends=[lattice limma qvalue]; };
+  STAN = derive2 { name="STAN"; version="2.9.0"; sha256="0i8y0a2i60irdg3061l4fmwdmnfrf0fc5byhx1bwbr8w5g4ahpnh"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; };
+  STATegRa = derive2 { name="STATegRa"; version="1.17.1"; sha256="1k55kb5x108iq3f2hbbair96x9kn8cci0753jkmd485j3mizfqq4"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
+  STRINGdb = derive2 { name="STRINGdb"; version="1.21.0"; sha256="079y5h2jfx40vr5yvvpafzzld1z7jc9z98gm31qy7gvm2lyzvgl5"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
+  STROMA4 = derive2 { name="STROMA4"; version="1.5.0"; sha256="0b20pdxc3wsndqhhrxjayi3ldsjnim3cgswa73kjdpdrm3amsvy4"; depends=[Biobase BiocParallel cluster matrixStats]; };
+  SVAPLSseq = derive2 { name="SVAPLSseq"; version="1.7.0"; sha256="0g27ik0m7z6wya7z2xgaip0c8dingv1c2jq9qbwpwipvk2yl8f50"; depends=[edgeR ggplot2 limma lmtest pls SummarizedExperiment]; };
+  SVM2CRM = derive2 { name="SVM2CRM"; version="1.13.0"; sha256="0bnd0bpxwd2c33xdp9bfn8lsvf9dm8an4n43py6akshf6q2l9x3y"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; };
+  SWATH2stats = derive2 { name="SWATH2stats"; version="1.11.4"; sha256="144p070bcq5j45byw9z666qkzjk8c4brscl4pnsgkghzgiv7fg34"; depends=[biomaRt data_table ggplot2 reshape2]; };
+  SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.35.2"; sha256="0dzapl17bgykgsd9qapc1v0ihzn229n25zvagjp1kdx3r4jqmkbb"; depends=[]; };
+  ScISI = derive2 { name="ScISI"; version="1.53.0"; sha256="02m4ma2izak4vg4240hnny0b84x440myayjwqcysg8r5gr6pzd83"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; };
+  Scale4C = derive2 { name="Scale4C"; version="1.3.0"; sha256="1a97dchcinhp24k0r5f7agca33zk3qyh1scz8250aiilhfa4w37y"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; };
+  Sconify = derive2 { name="Sconify"; version="1.1.0"; sha256="0is0ix7591gjzpbnv388gnr2jnxbpbjvywv3ln61ign9p5h9gjva"; depends=[dplyr flowCore ggplot2 magrittr readr Rtsne tibble]; };
+  SemDist = derive2 { name="SemDist"; version="1.15.0"; sha256="1rfmlihgk2wa1z3a2yqp43nddxw4nmjaybv9jvp84b0yi3drvn8z"; depends=[annotate AnnotationDbi GO_db]; };
+  SeqArray = derive2 { name="SeqArray"; version="1.21.2"; sha256="0kkci67zrxlyhkbap9khn8655wl63h33004gkxzz1b3drvn0a95b"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+  SeqGSEA = derive2 { name="SeqGSEA"; version="1.21.0"; sha256="10900fdl0g6izlpxwc3x2yix3cxpqfx6xxvbdq66mx2zqaksrq88"; depends=[Biobase biomaRt DESeq doParallel]; };
+  SeqSQC = derive2 { name="SeqSQC"; version="1.3.0"; sha256="19jv3yyga2fxpndi0rr36vrjz694l97aabr3llkcw7a6mgk78g12"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; };
+  SeqVarTools = derive2 { name="SeqVarTools"; version="1.19.2"; sha256="18l60hwj04hr8yln8rm1g0s71axxhnpkzn1khfr0v872csi57m8p"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix S4Vectors SeqArray tidyr]; };
+  ShortRead = derive2 { name="ShortRead"; version="1.39.0"; sha256="1cwpd5xf40gwpcnwmvxysxsl21cgfx3rdgigrawlzlzfd7j9kdig"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
+  SigCheck = derive2 { name="SigCheck"; version="2.13.0"; sha256="1cbdry06knmycqyc7p0z598rxlyyrw6yc8an8qm74b9p8vbnwp1a"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
+  SigFuge = derive2 { name="SigFuge"; version="1.19.0"; sha256="07j9nzw5c4g99yf458n8jwkndr79mam2n4a6kcz9fpcsyjq4plp4"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
+  SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.19.0"; sha256="0916ml80crldixb8jn5sbzp156ba0r9lc7wc2ri8wmrslv3w97lv"; depends=[Biobase limma mclust Ringo]; };
+  SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.3.6"; sha256="0rlww0zvrkfjpx68qafvakbaa5lcjlyrp0phrsji4zh5niv0sy4x"; depends=[BiocGenerics S4Vectors SummarizedExperiment]; };
+  SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.17.0"; sha256="1xq3m2i0b9rklg741796i8n1x0d07mn3xbdmvlc3islh368661jw"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
+  SpacePAC = derive2 { name="SpacePAC"; version="1.19.0"; sha256="10g626vyxaidiypjwymk183hvn4nm2vayvka127aavpfaq4ka55r"; depends=[iPAC]; };
+  SparseSignatures = derive2 { name="SparseSignatures"; version="1.1.0"; sha256="1yhk7grm59ba7d7zwbqa9wlc00jzng9gdbaprpq9r5j6kj61id1z"; depends=[Biostrings BSgenome BSgenome_Hsapiens_1000genomes_hs37d5 data_table GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF nnlasso nnls]; };
+  SpeCond = derive2 { name="SpeCond"; version="1.35.0"; sha256="0sqb84sa7yf34lwwkchh5wb3dp6n4wk8kzqmsydx5lsaz6fxg32r"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
+  SpidermiR = derive2 { name="SpidermiR"; version="1.11.0"; sha256="1gjjibc2lck5ihjm9k6vh032igvr5zw8dp1r0561cq00sd8w1y2v"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
+  SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.21.0"; sha256="08n37qnhfk6j6gf0scm5m6i7q8ags821v4lp8aw670kij8xm4j5w"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
+  StarBioTrek = derive2 { name="StarBioTrek"; version="1.7.0"; sha256="1fv0xdgzjmmsla8265732vc31drpija8wfdigg5cjhh89mrlpgfm"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; };
+  Starr = derive2 { name="Starr"; version="1.37.0"; sha256="0is2fy9zf2cgl3ywkn89v7n134sh812gibr3mpb8iccplvis7dks"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
+  Streamer = derive2 { name="Streamer"; version="1.27.0"; sha256="14wdvp51cgmzahqqr9dv5whgrl85yjj72sj1v3kqislqvfkn7lww"; depends=[BiocGenerics graph RBGL]; };
+  SummarizedBenchmark = derive2 { name="SummarizedBenchmark"; version="1.99.1"; sha256="1madkjzhjlv7hh5av4pwkjk35vdmc5pcdsy70fngck4kvrhbs28z"; depends=[BiocGenerics BiocParallel crayon digest dplyr ggplot2 mclust rlang S4Vectors sessioninfo stringr SummarizedExperiment tibble tidyr UpSetR]; };
+  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.11.5"; sha256="19qrcp3psnx3dpkcif3i0dy8fgn4nwliqii8v7mjllh2v6vz71x4"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; };
+  Sushi = derive2 { name="Sushi"; version="1.19.0"; sha256="1pqgrjprsifbf6whzw4y01sqwal35c160ibg49d5rn1r22lyqkc2"; depends=[biomaRt zoo]; };
+  SwathXtend = derive2 { name="SwathXtend"; version="2.3.0"; sha256="1fzkbl4rl3w04z449m3y4dwq4lmqjll0xsqg88kr1jy7k0bzhfnv"; depends=[e1071 lattice openxlsx VennDiagram]; };
+  SwimR = derive2 { name="SwimR"; version="1.19.0"; sha256="03qv3hcky138x449s5axc8j37j45hpalibmwwa3zd5a4fa15zmqr"; depends=[gplots heatmap_plus R2HTML signal]; };
+  TCC = derive2 { name="TCC"; version="1.21.1"; sha256="0p2cphkmzlpzqy2shszyzwxga35hyp0q8n0aj9hbjzvapnil61pg"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
+  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.9.2"; sha256="1jbgv3p5dqhjkm5spn6x73z00ghjb1i4fbmn9xpns0v93axmd1k8"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; };
+  TCGAutils = derive2 { name="TCGAutils"; version="1.1.11"; sha256="1dmsjw34shqjhj59g4r3320pgh2hlssp8yb12mhcf21xs95a6pql"; depends=[BiocGenerics GenomeInfoDb GenomicDataCommons GenomicRanges IRanges MultiAssayExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; };
+  TCseq = derive2 { name="TCseq"; version="1.5.0"; sha256="1xir0481s72jwp0jnrb9134pv9vwy3g8mhk0rpzwr4qvxxxy7zxn"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; };
+  TDARACNE = derive2 { name="TDARACNE"; version="1.31.0"; sha256="19qk0kc7yi4z8kqg7a9msxdiazad3y7xvshmf6pk0999ypacqws4"; depends=[Biobase GenKern Rgraphviz]; };
+  TEQC = derive2 { name="TEQC"; version="4.3.0"; sha256="1ldjq8ap4si95zqywhp27rzd8kgij2p9hvcb0w8qvzw2ndk950z4"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
+  TFARM = derive2 { name="TFARM"; version="1.3.0"; sha256="1c4gks6kvp8x68vnq7npxbq0q94gavbxvx3155prvx5qhsxw4jb8"; depends=[arules fields GenomicRanges stringr]; };
+  TFBSTools = derive2 { name="TFBSTools"; version="1.19.1"; sha256="1mi591pydgvkj5qzjlssg1lqrkgn2in8cj43af1nm9am7l92gwkw"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; };
+  TFEA_ChIP = derive2 { name="TFEA.ChIP"; version="1.1.0"; sha256="07vwxy4sv8d8ij3cp7p17pvdf1nwbq883iqdjpcfb57ah67ffcx2"; depends=[biomaRt dplyr GenomicFeatures GenomicRanges IRanges org_Hs_eg_db R_utils TxDb_Hsapiens_UCSC_hg19_knownGene]; };
+  TFHAZ = derive2 { name="TFHAZ"; version="1.3.0"; sha256="1j03dp2n459b373ig3yds88f1x5yawr9jqr91w2s8smx5vqqicm8"; depends=[GenomicRanges IRanges S4Vectors]; };
+  TFutils = derive2 { name="TFutils"; version="1.1.0"; sha256="04q54z0hrskz3grw1ayzvcj93r3ziba01sx359c9syh6hbwzl5cd"; depends=[AnnotationDbi AnnotationFilter Biobase data_table dplyr GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges GSEABase Gviz IRanges magrittr miniUI Rsamtools S4Vectors shiny]; };
+  TIN = derive2 { name="TIN"; version="1.13.0"; sha256="0iphf37gff3m1hyvijbbpp46bmjvwdppqrrwgf1yj660r01cyvyl"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
+  TMixClust = derive2 { name="TMixClust"; version="1.3.0"; sha256="1ga7mxlaxv4hglixlqa3kjrvqikzc46mrs1435aihhf649h8zz6j"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; };
+  TPP = derive2 { name="TPP"; version="3.9.1"; sha256="183qdgly3a4xxiv1y8ckcm890dkg5rqyl99ab6pdgk3g53mx3pva"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; };
+  TRONCO = derive2 { name="TRONCO"; version="2.13.0"; sha256="117vq5ia5q68z5ymbvi5y010l4qpwxsbwm9xxx5jl49a86np8s6f"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
+  TSCAN = derive2 { name="TSCAN"; version="1.19.0"; sha256="05zkydpl57j6b02bq0v3896612lbq33jbm896kimygbk4k2wa3g5"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
+  TSRchitect = derive2 { name="TSRchitect"; version="1.7.1"; sha256="06vzd7vs9ld714jhzdd46ippdmzmwfg705kky2wrcz6lq547llgp"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  TSSi = derive2 { name="TSSi"; version="1.27.0"; sha256="1a4xvqmbx2wlhad1pb6013sas5gqm27kc7jhyqp49ccbwm7ayz4r"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
+  TTMap = derive2 { name="TTMap"; version="1.3.0"; sha256="0fg0d930icbm62rvfv0d177ld126f1shm5knird50da4vx3qr1a9"; depends=[Biobase colorRamps rgl SummarizedExperiment]; };
+  TVTB = derive2 { name="TVTB"; version="1.7.0"; sha256="1514rfqdrp3s1z4zf53zprslqdbsdl1w3crfbqgsv6hisqrrwlm2"; depends=[AnnotationFilter BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges GGally ggplot2 Gviz IRanges limma reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; };
+  TarSeqQC = derive2 { name="TarSeqQC"; version="1.11.0"; sha256="1gbvfn5vpsbfbvpif8lvq55aav6ak619s1f743c7xj9md84rhx59"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
+  TargetScore = derive2 { name="TargetScore"; version="1.19.0"; sha256="1phdg2ncvsjgjsfggxv37n74fwj8asw73vccb8iaqj8x7vlkci85"; depends=[Matrix pracma]; };
+  TargetSearch = derive2 { name="TargetSearch"; version="1.37.2"; sha256="065nq07xwdb8s7n4gg0bwdpbasdank6ga9nza25x0lsf1m4kky8r"; depends=[ncdf4]; };
+  TissueEnrich = derive2 { name="TissueEnrich"; version="1.1.0"; sha256="12j0wkw964pbq62hiiavjk172hr3yp333v6c6g5kxmv2vycbxb3m"; depends=[dplyr ensurer ggplot2 GSEABase SummarizedExperiment tidyr]; };
+  TitanCNA = derive2 { name="TitanCNA"; version="1.19.0"; sha256="12c30v6f9i841jyfprn3bxm9dimczwvn5d846kjxmpghf3dgdlgi"; depends=[data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges Rsamtools VariantAnnotation]; };
+  ToPASeq = derive2 { name="ToPASeq"; version="1.15.1"; sha256="13wzyspyipi122g976hp2haqyjhhgnwpaj844w2by8x65nh1hicl"; depends=[graph graphite Rcpp]; };
+  TransView = derive2 { name="TransView"; version="1.25.0"; sha256="1vlfncr2qv03r0b695ya47dd6h2m6qcvzndag1rqi5zzdn6p0w4q"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; };
+  Trendy = derive2 { name="Trendy"; version="1.3.2"; sha256="09r1slmx8cr8hc8nz5kkhd25mp19nk3mvlsg3c15lx39n5pimnhs"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; };
+  TurboNorm = derive2 { name="TurboNorm"; version="1.29.0"; sha256="15k6cxxwjkb56r9b1r17va2ssq4da7z72dvvgj91bd3x6vqph13q"; depends=[affy convert lattice limma marray]; };
+  TxRegInfra = derive2 { name="TxRegInfra"; version="1.1.2"; sha256="18ymkwfarxfh56y4gg2fh72fccgi2xyjnb4091bgfsg8nvib6wbv"; depends=[BiocParallel GenomeInfoDb GenomicRanges IRanges mongolite RaggedExperiment rjson S4Vectors SummarizedExperiment]; };
+  TypeInfo = derive2 { name="TypeInfo"; version="1.47.0"; sha256="1nh15bs814s09cck4829r48n18g0w4haglbn826razjrcj5k46y0"; depends=[]; };
+  UNDO = derive2 { name="UNDO"; version="1.23.0"; sha256="0csl0kh2ksswmv53cmy10b35ns5l9yg917m99f9pjrnql1n3ciq6"; depends=[Biobase BiocGenerics boot MASS nnls]; };
+  Ularcirc = derive2 { name="Ularcirc"; version="0.99.20"; sha256="1i48shbv1cwl1z4czpzc53iyab0d04aqw4w27w9cnvzxqs9fc0aj"; depends=[AnnotationHub Biostrings BSgenome data_table DT GenomeInfoDb GenomeInfoDbData GenomicFeatures gsubfn httpuv mirbase_db moments shiny shinyFiles Sushi yaml]; };
+  UniProt_ws = derive2 { name="UniProt.ws"; version="2.21.3"; sha256="1ifzfghq7kk6s3wagjsvc1qz9gldfypgmniiw8pcsm1sji1y31ps"; depends=[AnnotationDbi BiocFileCache BiocGenerics rappdirs RCurl RSQLite]; };
+  Uniquorn = derive2 { name="Uniquorn"; version="2.1.0"; sha256="0livhr3kqjhh7s45fahvmshk7f6bbakpx58x16l7vclb1dlzkhii"; depends=[data_table doParallel foreach GenomicRanges IRanges R_utils stringr VariantAnnotation WriteXLS]; };
+  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.27.1"; sha256="1m3bjqif7kwnwwry5zdm74jysq8pnxzkgkdf75bjgw08gg6ykd6j"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+  VariantFiltering = derive2 { name="VariantFiltering"; version="1.17.1"; sha256="0gfvnbs9wh4g3z029b6h5pjky84iz4i9ijmg0kz83v2xybnv1n34"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny shinyjs shinythemes shinyTree SummarizedExperiment VariantAnnotation XVector]; };
+  VariantTools = derive2 { name="VariantTools"; version="1.23.0"; sha256="1kr4w5c1rwsamb168ahj74f379rk87qldm2mivhn73zq75qrawaf"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+  Vega = derive2 { name="Vega"; version="1.29.0"; sha256="1zjdhszz65wpjirakkl53a4jqh43z6ryvndf0hxal4gc586gifcd"; depends=[]; };
+  VegaMC = derive2 { name="VegaMC"; version="3.19.0"; sha256="1c4vfm2vv2xm6yw2ca57ml9bn6n9ddc2p8pcbxivxkxc8b5n2ysn"; depends=[Biobase biomaRt genoset]; };
+  XBSeq = derive2 { name="XBSeq"; version="1.13.0"; sha256="014c96hz2nqjz865xmbhcsqqxxgssd9rn1j1pgmxakkz87mcnvji"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
+  XDE = derive2 { name="XDE"; version="2.27.0"; sha256="1mls0fx2z2n7izmrmhpv6jg87x36d1j9x6gq51hhkzw5rbq25ng6"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; };
+  XVector = derive2 { name="XVector"; version="0.21.3"; sha256="12p9s5d10cpm86v202gdw6y9gnsmcsny43gv6qnhz48ilzwql4mc"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
+  YAPSA = derive2 { name="YAPSA"; version="1.7.0"; sha256="1ny51v4papa067aylq7njyi2f17yp44y955szpark0lj0p759vjb"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; };
+  a4 = derive2 { name="a4"; version="1.29.0"; sha256="0anj0gkbiccvb93xqzi7k1xxw2kqlwcf82pf4pqadc2fvmb1yfd7"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
+  a4Base = derive2 { name="a4Base"; version="1.29.0"; sha256="03lnbfg94xwrib8g40y4bazp122zy9nnpv4v1m18wjc10hi7z7qp"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
+  a4Classif = derive2 { name="a4Classif"; version="1.29.0"; sha256="1q5axh2494x2w40rqcj6kvrc3nbdyz117mxn39p1340ga7y2wxb7"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
+  a4Core = derive2 { name="a4Core"; version="1.29.0"; sha256="1vv7x9iijn88vkj4yp66swkipsdm347m2hs59g76bdypsd926slv"; depends=[Biobase glmnet]; };
+  a4Preproc = derive2 { name="a4Preproc"; version="1.29.0"; sha256="1yhdsx23rd1mihj18jwvb7rl6kgyvbh4a75lsv0faqvsh9bk2k77"; depends=[AnnotationDbi]; };
+  a4Reporting = derive2 { name="a4Reporting"; version="1.29.0"; sha256="1m79clrlf0f5f108vyamy2ia8sbxi3mm2kf8ckhbbsr6qgmnqcsb"; depends=[annaffy xtable]; };
+  aCGH = derive2 { name="aCGH"; version="1.59.0"; sha256="17nqy2sgkvjzhm3l8ypg93i7yzsniy536b2wz7rd6km52spldp7r"; depends=[Biobase cluster multtest survival]; };
+  acde = derive2 { name="acde"; version="1.11.0"; sha256="18551wkanalxk32g37j2yg766qgddsxid0lzv2rb61gqjb7qrmpa"; depends=[boot]; };
+  adSplit = derive2 { name="adSplit"; version="1.51.0"; sha256="1azczbx6w17a1awwpfc1bbgx14562mr41mgii7skm9r8jb9pxn4n"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; };
+  adaptest = derive2 { name="adaptest"; version="1.1.0"; sha256="0ddrkkh8mh3fq65dz6rrxm9wykyalwa90jf5vb0kllgjd3n6hvk8"; depends=[calibrate origami SummarizedExperiment tmle]; };
+  affxparser = derive2 { name="affxparser"; version="1.53.0"; sha256="1n81df9451r3pixakgjwi4zqna7gp0s9v6qrjpyw71294swi169f"; depends=[]; };
+  affy = derive2 { name="affy"; version="1.59.0"; sha256="1z57jn6l79jwks0j64m63s5h4kxdxg08qjmi646765xlf3xi746j"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
+  affyContam = derive2 { name="affyContam"; version="1.39.0"; sha256="1mh1yqrdh47ggqibgghnlmjfq46n0w4q1hdji7cv1js6kry7wqcf"; depends=[affy affydata Biobase]; };
+  affyILM = derive2 { name="affyILM"; version="1.33.0"; sha256="0q41aznln8kngmv0q6036zvzbbk5sw46lhmss3npk7r6q0ryyvwr"; depends=[affxparser affy Biobase gcrma]; };
+  affyPLM = derive2 { name="affyPLM"; version="1.57.0"; sha256="17vy0knf0vb3l824q2ib4hp0izw4s8phbjalsrzbwvmm7gg25xv7"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
+  affyPara = derive2 { name="affyPara"; version="1.41.0"; sha256="1j81wl9ivx24jag4jnnv6viblpqba72c72nmcxs60cdqq44vs87h"; depends=[affy affyio aplpack snow vsn]; };
+  affyQCReport = derive2 { name="affyQCReport"; version="1.59.0"; sha256="16sz9rii38vph2qiplab0f7fakd2vl77df543mfiykk3w5f0why2"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
+  affycomp = derive2 { name="affycomp"; version="1.57.0"; sha256="167bgzq82zsl2mdgzai95msh188j10hwrmp4bqab5qh9h2s8phvb"; depends=[Biobase]; };
+  affycoretools = derive2 { name="affycoretools"; version="1.53.2"; sha256="10zr09sqg6yf5f22qy0157qp03c479lxcdlippxawsq3x5dag533"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; };
+  affyio = derive2 { name="affyio"; version="1.51.0"; sha256="1p10bycid4dlhxhllalffywrc06xj1qjzs9f9fvj1y1yzj3xgmqz"; depends=[zlibbioc]; };
+  affylmGUI = derive2 { name="affylmGUI"; version="1.55.2"; sha256="0i0psf8rp2ars1ibb13vchmgapb8mf1smmabgb54c8gmd3lzx6js"; depends=[affy affyio affyPLM BiocGenerics BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+  affypdnn = derive2 { name="affypdnn"; version="1.55.0"; sha256="11gwlr0ghw5c0977sgyhvghb953cgppp3vz3g1gfd3mdgkckvpqw"; depends=[affy]; };
+  agilp = derive2 { name="agilp"; version="3.13.0"; sha256="1z7bxkdmqpz4kn1m2z91knnp36mp7z5awzj6qqwj7xwydc85m8np"; depends=[]; };
+  alpine = derive2 { name="alpine"; version="1.7.0"; sha256="0d5r1izkx7lvl9f7sy0sy97mpvxaj05010vxmgw0c5yfpzzi3hz1"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; };
+  alsace = derive2 { name="alsace"; version="1.17.0"; sha256="0p17f29n1z3n4x2rpv4hja10aq5349653ra4hwl5fbli3fa0ww43"; depends=[ALS ptw]; };
+  altcdfenvs = derive2 { name="altcdfenvs"; version="2.43.0"; sha256="1md8rb732bpsxs1r1mgvd9f98ixg596rn28pw6pq8bl8hj5jh3l9"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; };
+  ampliQueso = derive2 { name="ampliQueso"; version="1.19.0"; sha256="0nvwvvrm41vi289zp86s4yb0b6z9i54gq43vmvk1jh556rg1wsh6"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
+  amplican = derive2 { name="amplican"; version="1.3.1"; sha256="16h9py6yl6nb2203wk00g0lvgkic4f9xdwzrxdq9rk1mlnmjbyd2"; depends=[BiocGenerics BiocParallel Biostrings clusterCrit data_table dplyr GenomeInfoDb GenomicRanges ggforce ggplot2 ggthemes gridExtra gtable IRanges knitr Matrix matrixStats rmarkdown S4Vectors ShortRead stringr waffle]; };
+  anamiR = derive2 { name="anamiR"; version="1.9.0"; sha256="07xldx4dqc3s5vrankh1swg8a4hy50ihiw5wx5ndxvkpig8sspr8"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; };
+  annaffy = derive2 { name="annaffy"; version="1.53.0"; sha256="0z97liznk6by9a7klw0wirpchd9n57ycsf80xsprnlgy60slypvc"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; };
+  annmap = derive2 { name="annmap"; version="1.23.0"; sha256="0m74p8zrqhyfgpbqf4s98174y7gz9p1nh9q272xbsqn8ckdk8c0a"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
+  annotate = derive2 { name="annotate"; version="1.59.0"; sha256="0m384l8asvl2kswaar408w08yps7n822pfsxqby8igblrfzjgxjq"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
+  annotationTools = derive2 { name="annotationTools"; version="1.55.0"; sha256="18rxyi7sx93l52agbxnla1b7gn2bk3fpby0qj224nqinydjxkmjj"; depends=[Biobase]; };
+  annotatr = derive2 { name="annotatr"; version="1.7.1"; sha256="0ccad82zrdy028dyycsvbcdijh2xl1ibjqz36wfnnnipxwc9fq89"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; };
+  anota = derive2 { name="anota"; version="1.29.0"; sha256="1najgyj4qn9954jxbq0c4psarsq8mrg6fz0w3p9vmcm68l8lz3ig"; depends=[multtest qvalue]; };
+  anota2seq = derive2 { name="anota2seq"; version="1.3.0"; sha256="0kr5wm6sirkycp0f017vqialqzzjadyfkm2fpv2zj6v8acnv3704"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; };
+  antiProfiles = derive2 { name="antiProfiles"; version="1.21.0"; sha256="166mx0y4b3j1vd3daxr9wd48d007qh1sj1vjssjfails6j4sy9lh"; depends=[locfit matrixStats]; };
+  apComplex = derive2 { name="apComplex"; version="2.47.0"; sha256="0pqgrzfvljvinsalki5sc31c38k959g5gzag7sn33iilqw7s8grx"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
+  apeglm = derive2 { name="apeglm"; version="1.3.0"; sha256="1y9g9s68fqiinr2lwx10s5m533ccgbpzh4wqlf7nbjw696vshjnb"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; };
+  arrayMvout = derive2 { name="arrayMvout"; version="1.39.0"; sha256="1yrqx8vkbhwsdh0x3ig5wmy3ynx56154wgc69hzssvw38jdlp9vy"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
+  arrayQuality = derive2 { name="arrayQuality"; version="1.59.0"; sha256="1nhavhn4vnxvmj2hw8qlrnbyp3nsv3m90qcj20ijiv85jkr10mpa"; depends=[gridBase hexbin limma marray RColorBrewer]; };
+  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.37.0"; sha256="0bd78q63gsnh0bfspif6zgkp77wf634xcq6h53ka96qs7d98nxcv"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
+  attract = derive2 { name="attract"; version="1.33.2"; sha256="15mrqxcqflm3f77s336dyh8q57ipr27ca81aap6pwfxgpqykay49"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; };
+  bacon = derive2 { name="bacon"; version="1.9.0"; sha256="018082c3g5cdi3i1z1q26cq4v1f529d1c2q92p6qyzblcs8m2j2m"; depends=[BiocParallel ellipse ggplot2]; };
+  ballgown = derive2 { name="ballgown"; version="2.13.0"; sha256="16x4bh9wdqw5isia1vwi8kynlfaxvvc808lnbdkz8964rfxn317i"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
+  bamsignals = derive2 { name="bamsignals"; version="1.13.1"; sha256="1jyf9arivqk42zsj9k3fgjvz7d8ixlm2irsac4vkfjvr8nrfssyr"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
+  banocc = derive2 { name="banocc"; version="1.5.0"; sha256="1i86y34yhcaadl7ans6ypcr5yprqlnl4fl0bmr1k28pd8knwgq70"; depends=[coda mvtnorm rstan stringr]; };
+  basecallQC = derive2 { name="basecallQC"; version="1.5.0"; sha256="1g6hisqbg41kwz16iw7ai2rbw6hvndv560m7jxa85cm3kl9s5dxh"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; };
+  baySeq = derive2 { name="baySeq"; version="2.15.2"; sha256="01iv53gsrqm0ia44dzirdfpfqdrav46xxwml7xmb6cfgafx118qd"; depends=[abind edgeR GenomicRanges]; };
+  bcSeq = derive2 { name="bcSeq"; version="1.3.0"; sha256="1l1zpf1pyf7r3qqif6f4fjzxrvcj18yz8ggads1q98z74nrzwgwq"; depends=[Biostrings Matrix Rcpp]; };
+  beachmat = derive2 { name="beachmat"; version="1.3.2"; sha256="0mr1a8zcrrfs2klavq4jzw5lpcv64l3rvjpqx78jdhdvrfd0fi99"; depends=[DelayedArray HDF5Array Rcpp rhdf5 Rhdf5lib]; };
+  beadarray = derive2 { name="beadarray"; version="2.31.0"; sha256="1kf6fzq11mr49xav1ivz366vpsjaqhi1l0k4751k79s6rr30m6d6"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
+  beadarraySNP = derive2 { name="beadarraySNP"; version="1.47.0"; sha256="1x4byqw6d2xy4db6pgbadsdwakw39lvw58dckijk2fwgrimzipn0"; depends=[Biobase quantsmooth]; };
+  bgafun = derive2 { name="bgafun"; version="1.43.0"; sha256="02pv0b72m7xy2hqjdhz881qkp83api8lwbjngq7v29xhp7mpmgq3"; depends=[ade4 made4 seqinr]; };
+  bgx = derive2 { name="bgx"; version="1.47.0"; sha256="1vh2hhjsfyx8laq1xym7zaxsakgwcp0ybha6xxdc18mwlwr3q412"; depends=[affy Biobase gcrma]; };
+  bigmelon = derive2 { name="bigmelon"; version="1.7.0"; sha256="0r753dyi2ls6dy99zh519mvqqc9pr8vy16pyvmpmpvxg8bj1hx90"; depends=[Biobase BiocGenerics gdsfmt GEOquery methylumi minfi wateRmelon]; };
+  bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.29.0"; sha256="0cxbd4zdvrpqycnvgw7svvngknscc4s9ycqp3csa8v1gpc9bj9cd"; depends=[bigmemory]; };
+  bioCancer = derive2 { name="bioCancer"; version="1.9.0"; sha256="131a7la949ckklcbsr9rbm99nhaz7zlbk6ck7lhc8n55z5lig30d"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; };
+  bioDist = derive2 { name="bioDist"; version="1.53.0"; sha256="04pazvkmw36ghicyzbqvb7rq3kvpw7qrj01k7gddrg4c1dc2rdd2"; depends=[Biobase KernSmooth]; };
+  bioassayR = derive2 { name="bioassayR"; version="1.19.0"; sha256="1c2xjbh0lnik1dn2iwicpd0y1swbnnz1zac1vlaabhmxdw2g1h0n"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
+  biobroom = derive2 { name="biobroom"; version="1.13.0"; sha256="1csxi4f7d0lg1j9sjnmp089pma65pq1k2yyimrh0vl8yw92zlns6"; depends=[Biobase broom dplyr tidyr]; };
+  biocGraph = derive2 { name="biocGraph"; version="1.43.0"; sha256="1ps4r6rkffmqisfz5wip981r3dbx57n3r1j6whw9l6dbs043fjql"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
+  biocViews = derive2 { name="biocViews"; version="1.49.4"; sha256="1mgf21zbq8pm3iw8fsw700wzdjca1kf575xayaibblfsxcd1y59q"; depends=[Biobase graph RBGL RCurl RUnit XML]; };
+  biomaRt = derive2 { name="biomaRt"; version="2.37.3"; sha256="087vd0csab9ph21ijahjj66wpwnbsd48mvym12y7wrw71rvincw2"; depends=[AnnotationDbi httr progress RCurl stringr XML]; };
+  biomformat = derive2 { name="biomformat"; version="1.9.0"; sha256="1n8dwxkd6k0nvksg6dpcq84da9y9mjsmbn62362ja2kjgzqkh80x"; depends=[jsonlite Matrix plyr rhdf5]; };
+  biomvRCNS = derive2 { name="biomvRCNS"; version="1.21.0"; sha256="193cfwknlm28pm5n7ydmrnaczw7xisiz07l29jyk0h05jrmrvna0"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
+  biosigner = derive2 { name="biosigner"; version="1.9.0"; sha256="0v33vksq23byv5ybkb0mmvcb5fag3ghy9gcvb9aj16i7r0bs61ql"; depends=[Biobase e1071 randomForest ropls]; };
+  biosvd = derive2 { name="biosvd"; version="2.17.0"; sha256="19l7mc1pbsbbzsb635iiqb778xq1lrlnmsnyd324471c3rnb1yn7"; depends=[Biobase BiocGenerics NMF]; };
+  biotmle = derive2 { name="biotmle"; version="1.5.1"; sha256="0ihc1g60j1lkz3na23vvpd9c8xcz0p8wm5ksa6169zxjgqb90mmv"; depends=[BiocGenerics BiocParallel doFuture dplyr future ggplot2 ggsci limma S4Vectors SummarizedExperiment superheat tmle]; };
+  biovizBase = derive2 { name="biovizBase"; version="1.29.0"; sha256="0cmfigqy4ajrsdgwiwnwkhnznk14phq2di7yijjr0n3whk2xbvp4"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  birta = derive2 { name="birta"; version="1.25.0"; sha256="0c8rvf63cq6rzax2vhgk4y2xjgylnygihgv8yw7iznhpvqxxqm5g"; depends=[Biobase limma MASS]; };
+  birte = derive2 { name="birte"; version="1.17.0"; sha256="14xgvv12457yai92vvbpnc2fn4bnc129nrpwxl4kck09mh7kzfii"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; };
+  blima = derive2 { name="blima"; version="1.15.0"; sha256="160vdrinkq6pw851sxc9k0ybhh1ms0zd3jnxri6gdysbk2c2da2n"; depends=[beadarray Biobase BiocGenerics Rcpp]; };
+  bnbc = derive2 { name="bnbc"; version="1.3.0"; sha256="07jzc55x31zn5ak5rlpc0xpqgnkl03vhpdrd8ay12n450zggd77q"; depends=[BiocGenerics EBImage GenomeInfoDb GenomicRanges IRanges matrixStats preprocessCore Rcpp S4Vectors SummarizedExperiment sva]; };
+  branchpointer = derive2 { name="branchpointer"; version="1.7.0"; sha256="0ii7y3as43g7yp2qbzxv0bz66ayng8pxgk95303fp2l2akjb7gnx"; depends=[biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg38 caret cowplot data_table gbm GenomeInfoDb GenomicRanges ggplot2 IRanges kernlab plyr rtracklayer S4Vectors stringr]; };
+  bridge = derive2 { name="bridge"; version="1.45.0"; sha256="11rqvigax6j1bqj1nyf4x6ssmqi0892m1rhak1wz3xcj4adb8vwz"; depends=[rama]; };
+  bsseq = derive2 { name="bsseq"; version="1.17.0"; sha256="0mx9x996lhq63la9wkmygvdk8s215j3j833vx738prncc5wkkl4v"; depends=[Biobase BiocGenerics data_table DelayedArray DelayedMatrixStats GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit permute R_utils S4Vectors scales SummarizedExperiment]; };
+  bumphunter = derive2 { name="bumphunter"; version="1.23.0"; sha256="1dn6z7q8k54vd59dqirvdy6048ywa3c4njc2vrja8f5i2lsvfwc8"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
+  caOmicsV = derive2 { name="caOmicsV"; version="1.11.0"; sha256="0lxlk5wlfna009k2jk8kgj61ks3hfcx1lvpymidb2yjx0kk2n7sg"; depends=[bc3net igraph]; };
+  canceR = derive2 { name="canceR"; version="1.15.0"; sha256="08iz3lih2rhnwd31pfq6ra6kwwgmmggrfrcqsivnp49ni19gy0sq"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
+  cancerclass = derive2 { name="cancerclass"; version="1.25.0"; sha256="059nw8y6319m8k3i4l4crbydia2xz8v3dzc1dgj0hz6v3gfkxh8v"; depends=[binom Biobase]; };
+  casper = derive2 { name="casper"; version="2.15.0"; sha256="129grx8bb2scjsvcqgyxigsw1n36miqbpf8val5yzm0lv9zwv24s"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
+  categoryCompare = derive2 { name="categoryCompare"; version="1.25.0"; sha256="16zmqs8mf8lhsnlqfna40bq46v2zgqn823y98ycnx4c1m1l2jmk3"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; };
+  cbaf = derive2 { name="cbaf"; version="1.3.0"; sha256="19zy92jk8g5dzh5r2hpdc96yjgh0plqzn189giww65sq6hgiqvl2"; depends=[BiocFileCache cgdsr genefilter gplots RColorBrewer xlsx]; };
+  ccfindR = derive2 { name="ccfindR"; version="1.1.1"; sha256="1xp960q6jcskganvygxkpr9may680s30p57fjm5x625z4vwvd8r8"; depends=[ape BiocGenerics gtools Matrix RColorBrewer Rtsne S4Vectors SingleCellExperiment SummarizedExperiment]; };
+  ccrepe = derive2 { name="ccrepe"; version="1.17.0"; sha256="1k464wrgigq0yyr2w7pw8qwkql49jnl58ayr26785ajdn79lfcq4"; depends=[infotheo]; };
+  cellGrowth = derive2 { name="cellGrowth"; version="1.25.0"; sha256="12flwz3pzjhwqxsljy5g2ylgxiygln24z5zydc62xrkjcg3wqgn0"; depends=[lattice locfit]; };
+  cellHTS2 = derive2 { name="cellHTS2"; version="2.45.0"; sha256="1dbjsxhfifjpmyn3w3zhmhaf3s2arrpl6lipg31sp9w9xfiij1xs"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
+  cellTree = derive2 { name="cellTree"; version="1.11.0"; sha256="1rkrj316fm2xx1x7wjk9qv2kdr4vxhbixfw7y2r1p6kvxl1xwdi0"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
+  cellbaseR = derive2 { name="cellbaseR"; version="1.5.0"; sha256="0067s59gq395ha4kjmdvqx3bdjgkgczwvchwjswr23hm6ffbgss3"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; };
+  cellity = derive2 { name="cellity"; version="1.9.0"; sha256="0rdknpw38cwf4vvq30g573irv4l51gyx9yaff8rkrd0b38bpywa8"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; };
+  cellscape = derive2 { name="cellscape"; version="1.5.0"; sha256="0was4lsw2rpg98kzdzpd6wv84jzfh7ncgnvsyc2ijbjanf52ycxd"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; };
+  cghMCR = derive2 { name="cghMCR"; version="1.39.0"; sha256="119nk170b8a8lr1hi2nmj2bgaydkxf11732bqxhpm13hn9cyvnpr"; depends=[BiocGenerics CNTools DNAcopy limma]; };
+  charm = derive2 { name="charm"; version="2.27.0"; sha256="0cgrh027qjy34nb0xd0fl7fxifpgb1i9qcy3g7w7vv0sgj5g2gxc"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
+  chimera = derive2 { name="chimera"; version="1.23.0"; sha256="16l1y016wdmdqm4psnl3rxs4gw1d8b0hvfr29x9sv7153fpvqxhf"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
+  chimeraviz = derive2 { name="chimeraviz"; version="1.7.0"; sha256="12xkgvmqfdwfzrxw6f3iqkbknqw3238ks5903jk314wc1sz1pxxc"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer readr Rgraphviz rmarkdown Rsamtools S4Vectors]; };
+  chipenrich = derive2 { name="chipenrich"; version="2.5.0"; sha256="1ssvmnnlf6s37hbj0cdpcjyfz3qj7mv1nfxbdsb3cbq541lxidlv"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; };
+  chipseq = derive2 { name="chipseq"; version="1.31.0"; sha256="0pfi2jyi3cb73c6k0300k1yvk2nvzh6lc19qmgs9qxqm0zjh5vly"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
+  chopsticks = derive2 { name="chopsticks"; version="1.47.0"; sha256="0lvd5fpvlkwzplm6wpxrmi6gl35vg9li8zs8kiyf65yggp8azkd7"; depends=[survival]; };
+  chroGPS = derive2 { name="chroGPS"; version="1.99.1"; sha256="18i133z22d7pmd4xkkm2ciqpawvp7lh7sx4qkcysixxi9cdj7iix"; depends=[Biobase changepoint cluster DPpackage ellipse GenomicRanges ICSNP IRanges MASS vegan]; };
+  chromDraw = derive2 { name="chromDraw"; version="2.11.0"; sha256="17lb88jp4997nmdb7g3rmi509vn552rda603diq5qxjd8hxszhj7"; depends=[GenomicRanges Rcpp]; };
+  chromPlot = derive2 { name="chromPlot"; version="1.9.0"; sha256="0g7vnv12m9db563p99kcdv9mjb5h2saxmvq810ckw3vd9hxla4sm"; depends=[biomaRt GenomicRanges]; };
+  chromVAR = derive2 { name="chromVAR"; version="1.3.0"; sha256="1vx8ai2x3mmrlpqz4kww19q6drwhs51ndfhqvcm20hnjvw4q86fb"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
+  chromstaR = derive2 { name="chromstaR"; version="1.7.1"; sha256="0jhli9jzxi35j8ar94wjjqbg3d3ankbizx2ck5kfpsr4kz6cf91j"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; };
+  chromswitch = derive2 { name="chromswitch"; version="1.3.1"; sha256="1qylaxmyrh16gxh8l5isngs4ixk3v758f41r3nc15r1gbncdv7nx"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; };
+  cisPath = derive2 { name="cisPath"; version="1.21.0"; sha256="0bgc9jm3lkpij938yd1jni7yd4jbahqgr6s9zlzrly24f3pks24a"; depends=[]; };
+  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.19.0"; sha256="0d7xk559jg3bik9gwzi3lh51jspmq3ain706d2cm4dq96wms03a5"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
+  cleaver = derive2 { name="cleaver"; version="1.19.0"; sha256="19jrmz8bjj9yg52j002zyf6v1as2k7m0g0msvmgvlsf0nvgk5h72"; depends=[Biostrings IRanges S4Vectors]; };
+  clippda = derive2 { name="clippda"; version="1.31.0"; sha256="18jsfx4y09mzsah8w2pqwarl7h1kn76cm6sjh6r3dqikbzq24rak"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
+  clipper = derive2 { name="clipper"; version="1.21.1"; sha256="19gkqz94sxamw8gx1rib17j7sxivzflrhypkp4bsyqshkydyzgcq"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
+  clonotypeR = derive2 { name="clonotypeR"; version="1.19.0"; sha256="03hyifp94i9fj391gz0p73g2jkgfc4cjscsgiszmm99j4mjp6641"; depends=[]; };
+  clst = derive2 { name="clst"; version="1.29.0"; sha256="0bz0hd7zjr9a225hg1jl0r86zvdz4i9i63grg0nm0dvs32pbaf2g"; depends=[lattice ROC]; };
+  clstutils = derive2 { name="clstutils"; version="1.29.0"; sha256="0fsqlx06qd7bqdnk746pcn1w29xbpcpjazsnvk1dibxyxqkbqvjh"; depends=[ape clst lattice rjson RSQLite]; };
+  clustComp = derive2 { name="clustComp"; version="1.9.0"; sha256="1lmg17d3n97kp5z21wl2kyx140kmqlfwsm4q6qcq7j9zyfq2jrdc"; depends=[sm]; };
+  clusterExperiment = derive2 { name="clusterExperiment"; version="2.1.5"; sha256="0fwbvm25ymmazw4i1l1v5bd0yrihzgiqmkycfxk5ismf9nbyny13"; depends=[ape BiocGenerics cluster DelayedArray dendextend edgeR HDF5Array howmany kernlab limma locfdr matrixStats NMF phylobase RColorBrewer Rcpp RSpectra S4Vectors scales SingleCellExperiment stringr SummarizedExperiment zinbwave]; };
+  clusterProfiler = derive2 { name="clusterProfiler"; version="3.9.1"; sha256="0bz6n4y10f2kgkxmsr2rf8clqfsg2drgavx0xp36jv66bp511l4d"; depends=[AnnotationDbi DOSE enrichplot ggplot2 GO_db GOSemSim magrittr plyr qvalue rvcheck tidyr]; };
+  clusterSeq = derive2 { name="clusterSeq"; version="1.5.0"; sha256="1naw9hprdgb2wxqcvjvzgmjhnl0cncixar7gzs7d63dyf9d3khzs"; depends=[baySeq BiocGenerics BiocParallel]; };
+  clusterStab = derive2 { name="clusterStab"; version="1.53.0"; sha256="1fz5l64c7sfzxvqrfxbwvla6k72dq32r9v9nsc4cycpmyyfvgqfg"; depends=[Biobase]; };
+  cn_farms = derive2 { name="cn.farms"; version="1.29.0"; sha256="03nq4xyq4q4x9ajlz24pda4jy2vqnxrr2jyrfy54d54qqkn6hj18"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
+  cn_mops = derive2 { name="cn.mops"; version="1.27.0"; sha256="1fzsp4amldbfg2msll3synvwlwdsda1fajwsl5qxg83pcy0v8rm2"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
+  cnvGSA = derive2 { name="cnvGSA"; version="1.25.0"; sha256="0ha9nh485r7x67q25cj6r7m8lckw9bm1kvd1rvkrwn6nnlld8bn1"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
+  coGPS = derive2 { name="coGPS"; version="1.25.0"; sha256="081ljzlc0vq19h7w31ccqxbdhi2rivi8qrrvnxw6imj0pfckn1hn"; depends=[]; };
+  coMET = derive2 { name="coMET"; version="1.13.0"; sha256="1vyzwrdf10n9ribfcacfxmsfkr6pm9g4gi90n2c5lhhn4983m1wk"; depends=[biomaRt colortools corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; };
+  cobindR = derive2 { name="cobindR"; version="1.19.0"; sha256="1hb6mwd6xqxgzdglz496cn39hmjnxs87qc0c633r6a2bhq8dpcca"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
+  codelink = derive2 { name="codelink"; version="1.49.0"; sha256="0fqxdmzwx6vhclsamc4i0kshdnqpjpqgzrmjm2lwvjai2bnbiaz4"; depends=[annotate Biobase BiocGenerics limma]; };
+  coexnet = derive2 { name="coexnet"; version="1.3.0"; sha256="0kqzvi5zs1nvcnbvgrq06fzzcfdsga5fz0r70drcsx449nkqrj5c"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; };
+  cogena = derive2 { name="cogena"; version="1.15.0"; sha256="05hdmx7awxsrbblm0sfgszhi10wggpx2141ariy01gvha8kmm8l8"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
+  compcodeR = derive2 { name="compcodeR"; version="1.17.0"; sha256="0b591axva9x93pq7cbcg9z86n6rdnaw29q18q7cwvd44j5l8b6ah"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
+  condcomp = derive2 { name="condcomp"; version="0.99.1"; sha256="0493d56hqn1vrd85j7174y9i2f7whqy68nn5645fr57a0wl4bn4i"; depends=[cluster ggplot2 ggrepel outliers]; };
+  consensusOV = derive2 { name="consensusOV"; version="1.3.0"; sha256="0jk776svh4krp1cj77sy9lrp3rx6ka8vbc4xz1armf9vd9sn0ln8"; depends=[Biobase gdata genefu GSVA limma matrixStats randomForest]; };
+  consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.9.0"; sha256="0hdfnvvd06s2pbrsbrcp6nky7clvj2xqdf3d6x728mxfv17yflrl"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; };
+  contiBAIT = derive2 { name="contiBAIT"; version="1.9.0"; sha256="1fgff5pr9ggqpl85yh410lspq0mbq9r264rsw716hqjy2rm6g8bd"; depends=[BH BiocParallel clue cluster colorspace data_table diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; };
+  conumee = derive2 { name="conumee"; version="1.15.0"; sha256="1xpq77j6zwqj3s8qxjvnzvrwk27g6cipqp8k8g1x61ayalw5mwn9"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; };
+  convert = derive2 { name="convert"; version="1.57.0"; sha256="1bfwmxcvg3dxygzbl290l645ri610fxymvba349hj785w9v09hgi"; depends=[Biobase limma marray]; };
+  copa = derive2 { name="copa"; version="1.49.0"; sha256="08myzip07f28iyyf1v28y60pwmyabv7yhbd1y9avmmfa8swh4zav"; depends=[Biobase]; };
+  copynumber = derive2 { name="copynumber"; version="1.21.0"; sha256="1qcrq5ls1rj5had0v2abcya5bbm1mpni97lxvlm75yxpalkrbmg1"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
+  coseq = derive2 { name="coseq"; version="1.5.1"; sha256="0b5680pzwalgl8dfdclc03cp9742ap65d16h86h150h72h55cvh1"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 gridExtra HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; };
+  cosmiq = derive2 { name="cosmiq"; version="1.15.2"; sha256="1n91gp3v27924pavlm4kkidihzhdgj5p679x5krxkqf430f3kbk4"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; };
+  covEB = derive2 { name="covEB"; version="1.7.0"; sha256="01qy9713bixj1nbdhafyappbm0m6q6k769akzysvcb4cs74isq3x"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; };
+  covRNA = derive2 { name="covRNA"; version="1.7.0"; sha256="06rx0g294hndxkb2rgjghn7jbw0vn63wy54705s57wmi0cacq8dd"; depends=[ade4 Biobase genefilter]; };
+  cpvSNP = derive2 { name="cpvSNP"; version="1.13.0"; sha256="0wv304nisngcbc8as6anlb7i090wl078rs0pclix975akj9s4zpw"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
+  cqn = derive2 { name="cqn"; version="1.27.0"; sha256="1680ww5rr4y1jqhb267hbgk77ha87awbjrl3id5cz7d7ps75a7fb"; depends=[mclust nor1mix preprocessCore quantreg]; };
+  crisprseekplus = derive2 { name="crisprseekplus"; version="1.7.0"; sha256="01s08znfbd4am3lxm42664jx5qkjm383w50k36f2linrsg8j2rdc"; depends=[AnnotationDbi BiocInstaller BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; };
+  crlmm = derive2 { name="crlmm"; version="1.39.0"; sha256="1piwi4w7shmszq2kbcw400jp0iqjhjv6q7kd7zpa4yqnh35dxa8q"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
+  csaw = derive2 { name="csaw"; version="1.15.7"; sha256="18wy6q7qb4zif2sjgr0fygq6y3yj706iijib6dw2ywb4xsb7gqy8"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
+  ctc = derive2 { name="ctc"; version="1.55.0"; sha256="0zkzdv3yrrr671bvr0j7xi1c358r7k09f96x5sciljg95gwpq6fm"; depends=[amap]; };
+  ctsGE = derive2 { name="ctsGE"; version="1.7.1"; sha256="1m8fm0339d17hfprwgpck31dqmm9cf1ajk60rii32sphv8x1h0r8"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; };
+  cummeRbund = derive2 { name="cummeRbund"; version="2.23.0"; sha256="12npw9nr02fs1lyj1fism4zbw1vbd47rxyyc21z8kx9ra5c76df9"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; };
+  cycle = derive2 { name="cycle"; version="1.35.0"; sha256="0wij6y9alg55kric7bs8syrw8ypd5w0iayh057qcl9qqr5lp1vq7"; depends=[Biobase Mfuzz]; };
+  cydar = derive2 { name="cydar"; version="1.5.0"; sha256="1qch98a8p1wmyaccz7zg1vsamikr8rmrqki9w5ahkdn5f05z7fs4"; depends=[Biobase BiocParallel flowCore Rcpp S4Vectors shiny SummarizedExperiment viridis]; };
+  cytofkit = derive2 { name="cytofkit"; version="1.13.0"; sha256="0dl0y609w2y3wpncw4mxhflrnq1ymdmzp8qwnrlc13ykkrcwh40w"; depends=[Biobase colourpicker destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny shinyFiles vegan VGAM]; };
+  cytolib = derive2 { name="cytolib"; version="1.3.0"; sha256="0zyfs7j7jijrrg7v8zf77nlad63x8id2f9bpcid4pn61qlqxqhgf"; depends=[BH RProtoBufLib]; };
+  dSimer = derive2 { name="dSimer"; version="1.7.0"; sha256="0ra9y6df21s97pa8810dzbcwjhbh9br86mlqkgvvrq5rxwj97a35"; depends=[AnnotationDbi ggplot2 GO_db igraph org_Hs_eg_db Rcpp reshape2]; };
+  daMA = derive2 { name="daMA"; version="1.53.0"; sha256="1ahmx5c58az3s3jybz3gx7g853n0qy7b84rm7gq157yi4iil01wf"; depends=[MASS]; };
+  dada2 = derive2 { name="dada2"; version="1.9.0"; sha256="1w8lq1ikzfa2dzmx0bk1p3v88af9ddhv8fqqkvh2pr1n71r09nrc"; depends=[BiocGenerics Biostrings data_table ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; };
+  dagLogo = derive2 { name="dagLogo"; version="1.19.0"; sha256="0bp4cclcwc6asnk5s9fzzcq17lv5fz93j0smsszq3csl99qpiwmi"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
+  dcGSA = derive2 { name="dcGSA"; version="1.9.0"; sha256="0d85qpq1v9sky5x8nv5w0hfry9w833kkljq5laa2x3n10czp1hb3"; depends=[BiocParallel Matrix]; };
+  ddCt = derive2 { name="ddCt"; version="1.37.0"; sha256="11nh9xzx3iyvbb1k40581ym17a0l2brcqmscx9riyh8bzh7jh1h0"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
+  ddPCRclust = derive2 { name="ddPCRclust"; version="1.1.1"; sha256="0lykdnbhl19nx00yxp09a2nvi10yq13dpqy30ixvbcjl04562j2q"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; };
+  debrowser = derive2 { name="debrowser"; version="1.9.0"; sha256="099gdj0vxihwyb35pfk3hhfay7zyz3nirzlzccnjknrybfdyd7i3"; depends=[annotate AnnotationDbi baySeq clusterProfiler d3heatmap DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 ggvis googleAuthR gplots igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva V8]; };
+  decontam = derive2 { name="decontam"; version="1.1.0"; sha256="1chys2j507y4pqcca2vsf905qz7g7vw71f3rapxq39mhzp4bcjda"; depends=[ggplot2 reshape2]; };
+  deepSNV = derive2 { name="deepSNV"; version="1.27.2"; sha256="0rm1wvw8qq20d4dcqijbsizhnyyrdvl6wwb6gfvafq5rzfdi01xc"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
+  deltaGseg = derive2 { name="deltaGseg"; version="1.21.0"; sha256="1378dj1gghsphwwbhbfixbnf49lfjxy0dn297b5lsjh2h40znc2z"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
+  derfinder = derive2 { name="derfinder"; version="1.15.0"; sha256="199nk5kjza1cy9rclgff6qq2pkzw5lfg69y9s60hbyd0hacxsqxx"; depends=[AnnotationDbi BiocGenerics BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
+  derfinderHelper = derive2 { name="derfinderHelper"; version="1.15.0"; sha256="1v32nrznh4nm67fsjqcqbj3ifb8hiddqfcmg8nlwmgiwq78fxksi"; depends=[IRanges Matrix S4Vectors]; };
+  derfinderPlot = derive2 { name="derfinderPlot"; version="1.15.0"; sha256="1zabxardj0gw8b4bscpkdxbddcd5ygxpgv0da6c7i04jp5qb80sg"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer RefManageR reshape2 S4Vectors scales]; };
+  destiny = derive2 { name="destiny"; version="2.11.3"; sha256="0z9z0frhif84rshnpffizjjv2ckr1mp7vqlk9r3fyyxzz1pkrl29"; depends=[Biobase BiocGenerics ggplot2 ggthemes igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother SummarizedExperiment VIM]; };
+  dexus = derive2 { name="dexus"; version="1.21.0"; sha256="0p7ihli3la0x42v042azwxnjhwn6h8vlnfs8rrbg5wbpz1i3nsy9"; depends=[BiocGenerics]; };
+  diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.63.0"; sha256="19g9azy3s359k84rg677l0yndq13h48fs0rmddrs4z8z8w4k2n9h"; depends=[minpack_lm]; };
+  diffHic = derive2 { name="diffHic"; version="1.13.3"; sha256="0ka8kma6imv3i2j1y2p83aandrmpvj6w1wqj5dsanx4mh6f316vk"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
+  diffcoexp = derive2 { name="diffcoexp"; version="1.1.0"; sha256="1dmf32f2mq4m71nbr8g5bhkv8wl8lhyljs5jgpnkzw7ibfaisr6j"; depends=[BiocGenerics DiffCorr igraph psych SummarizedExperiment WGCNA]; };
+  diffcyt = derive2 { name="diffcyt"; version="1.1.1"; sha256="17g08x65glkgjn5h24h45fi9qdq53s9bmn323zpnc6012p8cx8vb"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; };
+  diffloop = derive2 { name="diffloop"; version="1.9.0"; sha256="0wfnh79xkfkkzm3rkx90i0ij81l33ssm03b91mfq02yzijqv5dzv"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; };
+  diffuStats = derive2 { name="diffuStats"; version="0.105.0"; sha256="1dhnqf2nljmc3pvn9hwmnihlgg5qwjnh5almfzw9vgnwm10yrkjl"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; };
+  diggit = derive2 { name="diggit"; version="1.13.0"; sha256="1zy4na2sa2g8vg7aw6n8k3965yyhal0sp6f8rrgwgh3wd8w1zf56"; depends=[Biobase ks viper]; };
+  discordant = derive2 { name="discordant"; version="1.5.0"; sha256="1lnljhz2xa7xfdbi8dwq1nzdm0w9j35251yh0dndhrq0sck1a3dg"; depends=[Biobase biwt gtools MASS]; };
+  dks = derive2 { name="dks"; version="1.27.0"; sha256="04da9f6ckqzw8dppxrrcc7aqgkb980jq1g15dkmzx9ys54bnhh78"; depends=[cubature]; };
+  dmrseq = derive2 { name="dmrseq"; version="1.1.12"; sha256="0whd2fwvbf7xxxdw2dmfpn1xp3xp7w8jli9n0nj2yi0p0a98889n"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; };
+  doppelgangR = derive2 { name="doppelgangR"; version="1.9.5"; sha256="16d6j10b57llfwvg7kcimmhisg1rqmnvv3pb46fgn1mldahmiziq"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; };
+  drawProteins = derive2 { name="drawProteins"; version="1.1.0"; sha256="1bhdz04d8xv8hx821n6scni9gpc8r6qqs954i9dc1p366x995y8c"; depends=[dplyr ggplot2 httr]; };
+  dualKS = derive2 { name="dualKS"; version="1.41.0"; sha256="125gpaykiy2cplkvixghj2c1xh08zga7jvi2xmsh0j1illdssab5"; depends=[affy Biobase]; };
+  dupRadar = derive2 { name="dupRadar"; version="1.11.0"; sha256="17m3xmw8m4qaljlz3kw158mrnqcm3ss0c8dqla8j4p33mfyzc7qy"; depends=[Rsubread]; };
+  dyebias = derive2 { name="dyebias"; version="1.41.0"; sha256="0c4z54pw2pdfg4z2mm70w6h4my2kv1swndy50r4bjv0ll46yyvcs"; depends=[Biobase marray]; };
+  easyRNASeq = derive2 { name="easyRNASeq"; version="2.17.0"; sha256="0siki1k4qvkgkyhldrz7i05vhria9nd9yvf848a4gkx4l68v2189"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
+  ecolitk = derive2 { name="ecolitk"; version="1.53.0"; sha256="14df276m23zlmz6q2lhbv2j91wj2jaxhs6wnl5x5gnjj1p8jv6wj"; depends=[Biobase]; };
+  edge = derive2 { name="edge"; version="2.13.0"; sha256="1y1g10lkpkv0z6sk79ir91jarx0gdl9fy5lx4snykq1amk7b9ib1"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
+  edgeR = derive2 { name="edgeR"; version="3.23.3"; sha256="0lz12phiqppzyvq1mf6gfdvzpqf2jpf0635n6vym7nqpxpksrgiy"; depends=[limma locfit Rcpp]; };
+  eegc = derive2 { name="eegc"; version="1.7.4"; sha256="1q3fslmrw66z7x3anl8w7hszgz5qlq2f7d9hp9r6x4acipxni5ff"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; };
+  eiR = derive2 { name="eiR"; version="1.21.0"; sha256="0s0xrnxzrwp4cc0jw3a0vpx7psyiwjz4a5y3ajxr68lq7k09hdma"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; };
+  eisa = derive2 { name="eisa"; version="1.33.0"; sha256="18jk4iwav2r95wfjynl9dwnhsm5n97kq0i7xv5dhgw2gqh5yfv64"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
+  enrichplot = derive2 { name="enrichplot"; version="1.1.2"; sha256="0hnh32gkayps5zh7hddgwrsyskq19i2wqbs1ph627fbckk1xqzlr"; depends=[AnnotationDbi cowplot DOSE ggplot2 ggraph ggridges GOSemSim igraph reshape2 UpSetR]; };
+  ensemblVEP = derive2 { name="ensemblVEP"; version="1.23.0"; sha256="0sz0xsnw4ycq1rja9nzdzayralrnvnds6adxg1bzbgsgnhfi9qv0"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+  ensembldb = derive2 { name="ensembldb"; version="2.5.2"; sha256="047c06v6d3qxw72bj0ynqvh3sk9jyv3pswf15i132qg12jq7yn8r"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; };
+  epiNEM = derive2 { name="epiNEM"; version="1.5.0"; sha256="1kiaz5w2c793n3038qr8jyjgbw0shn8ljrargl0pk3d0i66cqah4"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; };
+  epigenomix = derive2 { name="epigenomix"; version="1.21.0"; sha256="11vcdklmg7ghwr3da1n5bnm272m0wgqinhc1gj3i6wpgcvijnwr3"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; };
+  epivizr = derive2 { name="epivizr"; version="2.11.0"; sha256="14mmgfl9hqyx760l1c56hgfswbqpr34afvlyzjc459kyr8i57b5q"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; };
+  epivizrChart = derive2 { name="epivizrChart"; version="1.3.0"; sha256="0gbisd84w11fyl4zwwhakv2vv729ly9vh88zwixv46y4y1lln92v"; depends=[epivizrData epivizrServer htmltools rjson]; };
+  epivizrData = derive2 { name="epivizrData"; version="1.9.0"; sha256="1r6pqsl8fyzqgwmg5msad2bsh7drgbyk39sn84pfrrv66zpp6yxj"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
+  epivizrServer = derive2 { name="epivizrServer"; version="1.9.1"; sha256="01177j6yhiwbiarpj0v98dv4rcfhxyj9s7brxmzi9s3qrkfw9787"; depends=[httpuv mime R6 rjson]; };
+  epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.9.0"; sha256="1jkhwa3wc391x961hy9k5bhbp5zjijs7y9fjy836yc54kdxghdq4"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
+  erccdashboard = derive2 { name="erccdashboard"; version="1.15.0"; sha256="0g8b2ngfc5a6cagpiqh1q2k66s3d275r03z1yb2lvaqv1bprx0s7"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; };
+  erma = derive2 { name="erma"; version="0.13.1"; sha256="01s2rpcbhd9hi2md5nzccral4ffp3xjl3qkkhm42q114dfbk5ccp"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicFiles GenomicRanges ggplot2 Homo_sapiens IRanges rtracklayer S4Vectors shiny SummarizedExperiment]; };
+  esATAC = derive2 { name="esATAC"; version="1.3.1"; sha256="0jdn6xhwvlsv6gh0lhmwkznlnv71dd3875qvna5livjvs2m8m84w"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr motifmatchr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
+  esetVis = derive2 { name="esetVis"; version="1.7.1"; sha256="0xhgq2w38wfyg1ixh455ppi0880yfp44ld8y44l8yz2646qp904d"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
+  eudysbiome = derive2 { name="eudysbiome"; version="1.11.0"; sha256="0372hl9jsk225zjm3ca63q95x4rcnj4i13r7192gfxzisy7y9i36"; depends=[Biostrings plyr R_utils Rsamtools]; };
+  exomeCopy = derive2 { name="exomeCopy"; version="1.27.0"; sha256="003r5750vnadkvc19aaw8rf4qlfs1015nmndmsaazbg70dwkkdyl"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
+  exomePeak = derive2 { name="exomePeak"; version="2.15.0"; sha256="1xyx8c1sflf98fp2588cvwmpz7f4bji6mwaw0297cj7h4893nb2a"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
+  explorase = derive2 { name="explorase"; version="1.45.0"; sha256="18cch1m5k8sr9fjgfqv6ya2miwin89viq7sigpdv15r0xiz1js77"; depends=[limma rggobi RGtk2]; };
+  fCCAC = derive2 { name="fCCAC"; version="1.7.1"; sha256="1cpma76xn4ddqyjsyhlgwa812v4p2kkby77diyy7gxha843ylncl"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; };
+  fCI = derive2 { name="fCI"; version="1.11.0"; sha256="0h94ivm66d3cnrf0cnrymq3b4a2v5jg38ylv8wylnidj5g98czap"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
+  fabia = derive2 { name="fabia"; version="2.27.0"; sha256="0lp2h8px9f4czvld93v1cpra31375qwvyfaq336jc7ib2myvdclz"; depends=[Biobase]; };
+  factDesign = derive2 { name="factDesign"; version="1.57.0"; sha256="1kf98xygnq5pwjl7ak5jasrkgnrqhzpb81gljgsc0xp3a1mj37gn"; depends=[Biobase]; };
+  farms = derive2 { name="farms"; version="1.33.0"; sha256="1xbndc128m1f5jv8firhgsbgyqvwrxma22182p5axxjf5qwymnl9"; depends=[affy Biobase MASS]; };
+  fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.17.0"; sha256="1j3zhxcn21d81dh0afb5h84xh6lrfj0z7ldfdsqlr5f7l9niljfc"; depends=[doParallel Hmisc impute LiquidAssociation preprocessCore WGCNA]; };
+  fastseg = derive2 { name="fastseg"; version="1.27.0"; sha256="079yskkxy0fvjckgc8n5nd3rs96q44v6078k3p95kgyr57sxa56s"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; };
+  fdrame = derive2 { name="fdrame"; version="1.53.0"; sha256="1vxh7hjpqkl6wp1ycm11rfjn3xw56n4jj61j7gmzcb8x5f6nchr8"; depends=[]; };
+  ffpe = derive2 { name="ffpe"; version="1.25.0"; sha256="0pkzf7rh51bb4ha8aimb7l49qd7zfm7hb6fambwwdf91l842d5i7"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
+  fgsea = derive2 { name="fgsea"; version="1.7.1"; sha256="1aiiqc3jbanlxa6q3inqzj1h81dpar2i05bmaja38k7inciaysa0"; depends=[BiocParallel data_table fastmatch ggplot2 gridExtra Matrix Rcpp]; };
+  flagme = derive2 { name="flagme"; version="1.37.0"; sha256="0pjyi90l7k2i7bm93p9yyvrx18jmwcg0gaj2wixa0inyx9w5bymc"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; };
+  flipflop = derive2 { name="flipflop"; version="1.19.0"; sha256="0283bks3jbscnvyj51jm3z47rvdpfmaj40bc2h1ck8md82jrhiqj"; depends=[GenomicRanges IRanges Matrix]; };
+  flowAI = derive2 { name="flowAI"; version="1.9.1"; sha256="1j2a7aivy54vlf9vhk2d12wfzr3jdqq6582wd7pi2sg5j15mbl7v"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 rmarkdown scales]; };
+  flowBeads = derive2 { name="flowBeads"; version="1.19.0"; sha256="16h0jd88nada5lsaxl7q1m3nqf7gzqc1hw9cv5q96qa8n13a50la"; depends=[Biobase flowCore knitr rrcov xtable]; };
+  flowBin = derive2 { name="flowBin"; version="1.17.0"; sha256="0axib7fny5n1h0fcisy2ll67m1illv41swwi1xdc37d2v605c6jk"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
+  flowCHIC = derive2 { name="flowCHIC"; version="1.15.0"; sha256="1qsa6lkdang9x44wva0dwkgvv4kxqadk3jvjkg0q59bdf137irrs"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
+  flowCL = derive2 { name="flowCL"; version="1.19.1"; sha256="1fwa5r4hxnfya5ylzgx61nakfalsc0ahvy3da4xj78l52w17bjah"; depends=[graph Rgraphviz SPARQL]; };
+  flowClean = derive2 { name="flowClean"; version="1.19.0"; sha256="091d79vx5w76xhhjm1zvjfyfv9pn4ni91a85yq2ca4laplsd0nqn"; depends=[bit changepoint flowCore sfsmisc]; };
+  flowClust = derive2 { name="flowClust"; version="3.19.0"; sha256="1wkxfk1962cxwax2giyzva771rjxjcjy70vd9lsi7qkkxy5r3fdy"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
+  flowCore = derive2 { name="flowCore"; version="1.47.3"; sha256="0dp0aks75xzihg1nbyh441v76pgl3ikznzg1csswlzsnll4s6gdv"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
+  flowCyBar = derive2 { name="flowCyBar"; version="1.17.0"; sha256="1c3a12slk8z8y1vr8j09p2k5h2pw697ysk0a74p6n20sfl1zd3h9"; depends=[gplots vegan]; };
+  flowDensity = derive2 { name="flowDensity"; version="1.15.0"; sha256="0ppvvcd9brm1xqrlz7cdj35knylahqyafaabm4b7qdnwf0nz578x"; depends=[car flowCore flowWorkspace gplots RFOC rgeos sp]; };
+  flowFP = derive2 { name="flowFP"; version="1.39.0"; sha256="02n85dv2qvxzwdi44mc7awvxc26nbwpbzawb0ikjv8gwf4www9ch"; depends=[Biobase BiocGenerics flowCore flowViz]; };
+  flowFit = derive2 { name="flowFit"; version="1.19.0"; sha256="0ydpczklwaf0lr1vhz0fcp9qi29gc0hbn8l4qnfa4l7r2s3md418"; depends=[flowCore flowViz gplots kza minpack_lm]; };
+  flowMap = derive2 { name="flowMap"; version="1.19.0"; sha256="1viidnbhw054q1vl4d6xqsz1h1y764w1jsjs9nqgfnpxqmrlgls2"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
+  flowMatch = derive2 { name="flowMatch"; version="1.17.0"; sha256="0b1da6sfaykwj0dk4hbrj71q209jyarl0x40i5n324nj8r4ja7hz"; depends=[Biobase flowCore Rcpp]; };
+  flowMeans = derive2 { name="flowMeans"; version="1.41.0"; sha256="1ixzwry1435w20w40z87yhscbgskbldqmrz0x7nqvlqp5yn1ax71"; depends=[Biobase feature flowCore rrcov]; };
+  flowMerge = derive2 { name="flowMerge"; version="2.29.0"; sha256="0imabypbjyn83jyb3isichi7fy4p4nkmsphcqbkimpjrfgc391kw"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
+  flowPeaks = derive2 { name="flowPeaks"; version="1.27.0"; sha256="12fw6vp5lar9y8k2hx8pjnr2km5bs1rjgdam3ifrfdj0rgicf6rk"; depends=[]; };
+  flowPloidy = derive2 { name="flowPloidy"; version="1.7.0"; sha256="06lwd20c97lq5b9z11agvi4d9h601pxgzsi3xzkqp3q8c7xnpa1a"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
+  flowPlots = derive2 { name="flowPlots"; version="1.29.0"; sha256="0ylxkvhzghzybsi20lpprz430sl2d6mnrkbwp8bbsysr2ymsjml6"; depends=[]; };
+  flowQ = derive2 { name="flowQ"; version="1.41.0"; sha256="0290mk6zj2f2y4qiks9z9lnrl87fa0024idmdcf7slwlngf59mfd"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
+  flowQB = derive2 { name="flowQB"; version="2.9.0"; sha256="0d4n8qxja851z4d7ran9wr4rhfa64mnkhz7rqwa0vggrq1y0ksja"; depends=[extremevalues flowCore]; };
+  flowStats = derive2 { name="flowStats"; version="3.39.0"; sha256="1bz0saqkxznyq9ilabi1j4nwd18yk1p740asj7zlirqhiik2x20m"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow]; };
+  flowTime = derive2 { name="flowTime"; version="1.5.0"; sha256="0qh2p696xh8xsi0j7d6s75kbf8ajm4virfs8c6c1rn48n4grhlpy"; depends=[flowCore plyr]; };
+  flowTrans = derive2 { name="flowTrans"; version="1.33.0"; sha256="1fqw49s9dgz4khq3m73bf8f7vy9xzhdl91n0rkmcnwq7kd6wm5n9"; depends=[flowClust flowCore flowViz]; };
+  flowType = derive2 { name="flowType"; version="2.19.0"; sha256="1313ak0n79pvhzpckrapbkzrzxhd8qnxawpvagm92lsdg5p79mfc"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
+  flowUtils = derive2 { name="flowUtils"; version="1.45.0"; sha256="1vrbyzhifqaf47a73hac75s4dnsg6fys3nhhl1rf81hsjhqh7q80"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
+  flowVS = derive2 { name="flowVS"; version="1.13.0"; sha256="16r8ig33ym1d8hp2hvxnlszifc0qpmd4vnqzg1nn31a4j3xf575r"; depends=[flowCore flowStats flowViz]; };
+  flowViz = derive2 { name="flowViz"; version="1.45.0"; sha256="076hjz0mvc7pygmlrapsgg6scsxkzd714yg4wq8r8fbbpblqhkxf"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
+  flowWorkspace = derive2 { name="flowWorkspace"; version="3.29.4"; sha256="1669sl43r31ikj5mjzgmlynls994607xg0x2rz1y1dxcy84rb9vc"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra matrixStats ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
+  flowcatchR = derive2 { name="flowcatchR"; version="1.15.0"; sha256="0m1wbddxi2sifhpil00gd9vr27i75h30cw3a2m59hccxw4di139j"; depends=[abind BiocParallel colorRamps EBImage plotly shiny]; };
+  fmcsR = derive2 { name="fmcsR"; version="1.23.0"; sha256="1m8v98qi3x2cwr74ynndb0ilw8m8n0dz7w7fpyv0fm3s0vy3x0rx"; depends=[BiocGenerics ChemmineR RUnit]; };
+  focalCall = derive2 { name="focalCall"; version="1.15.0"; sha256="1vnihlpxaplnjp7h9n3k3py0103qz98dnkm1p7hns93pf185ih05"; depends=[CGHcall]; };
+  frma = derive2 { name="frma"; version="1.33.0"; sha256="02n251fwg34f0mkvingrsv1n0v77cvmpmd44rs1a4qyl5nj3x9v6"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
+  frmaTools = derive2 { name="frmaTools"; version="1.33.0"; sha256="1w62s3i6q92ka44dy8sqid21fgpjjghmnyavj3swx5czpn476vny"; depends=[affy Biobase DBI preprocessCore]; };
+  funtooNorm = derive2 { name="funtooNorm"; version="1.5.0"; sha256="175np47a1n3l9dkpfza9wdndxk3adk9np87c8hi4ybhjbx9w8bj5"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; };
+  gCMAP = derive2 { name="gCMAP"; version="1.25.0"; sha256="0mp0cg33slfpnqzk2fsggpb3dfgq95isj42lia0i3hkwkdfcisly"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
+  gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.21.0"; sha256="15fmiii9kkiy1p9d2h7hg9fi3kacifz6113hpkzkk0lic4phncg5"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
+  gCrisprTools = derive2 { name="gCrisprTools"; version="1.9.1"; sha256="1nscfxbyvy596sak9lj5g1wcbk7zprgy5654bbv69ain9p1i3kzc"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; };
+  gQTLBase = derive2 { name="gQTLBase"; version="1.13.0"; sha256="0rszhclakgc0xyg8jdb9mxgwaqcb28rcs9pyrg31d0wxi44c90w2"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
+  gaga = derive2 { name="gaga"; version="2.27.0"; sha256="09q5xfki8nnp5z4ia0l07pnvsmiwag7ahr1bxbic9aajql873ipk"; depends=[Biobase coda EBarrays mgcv]; };
+  gage = derive2 { name="gage"; version="2.31.0"; sha256="1lkq0xq7qz8vzd0y996c8yskh8wkm15hqs68krbs9z08scwjzpqg"; depends=[AnnotationDbi graph KEGGREST]; };
+  gaggle = derive2 { name="gaggle"; version="1.49.0"; sha256="0bi19b9ndccrky2i89scjzgna5b2gj0p74licynn8pm1jfwla584"; depends=[graph rJava RUnit]; };
+  gaia = derive2 { name="gaia"; version="2.25.0"; sha256="009lclb7dvy1mgxzxmp8nywcbq0jdq26qdla0vl7jb8p8vjp5k1c"; depends=[]; };
+  garfield = derive2 { name="garfield"; version="1.9.0"; sha256="1pndkw2an642ldgz0lw07l70gybj5npfs9w8qi2wm77fqfih8lj0"; depends=[]; };
+  gcapc = derive2 { name="gcapc"; version="1.5.0"; sha256="196fi5c1bhaq7qfxvw8jfbfahjygk1a6ykkjlrbqkhk60lzk9gbl"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; };
+  gcatest = derive2 { name="gcatest"; version="1.11.0"; sha256="0x0k557fydigj81610a39b8hg973wbjsfj0ailpjfa1grp77csa1"; depends=[lfa]; };
+  gcrma = derive2 { name="gcrma"; version="2.53.0"; sha256="14gcna1sagqizaryq5hv5907hw7agds8v0s2n1hd8k1yrpayhkwc"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
+  gdsfmt = derive2 { name="gdsfmt"; version="1.17.2"; sha256="13rkbhjis5fjzalj03bpckq4w177c6v2m4p7743yvjhqhyyah9pq"; depends=[]; };
+  geNetClassifier = derive2 { name="geNetClassifier"; version="1.21.0"; sha256="0ikpsmjwbiq8kidyvllx51ih0b7jnw9s1nz6z6hfz21zf98kz9p6"; depends=[Biobase e1071 EBarrays minet]; };
+  geecc = derive2 { name="geecc"; version="1.15.0"; sha256="0wfa0a4hlwvjsjvxk7m6lgjxjvph3392a4kskg2y1vphh916qnxr"; depends=[gplots hypergea MASS Rcpp]; };
+  genArise = derive2 { name="genArise"; version="1.57.0"; sha256="08hrc2y06prmacdzrd3qnlbyzrr9127jgglq7babrnhw0dffjl96"; depends=[locfit tkrplot xtable]; };
+  genbankr = derive2 { name="genbankr"; version="1.9.0"; sha256="0nzbf189w2rg9hy7h7qcw3jpz9lhl2yq57rhps29lgmizgdml8qp"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
+  geneAttribution = derive2 { name="geneAttribution"; version="1.7.0"; sha256="1snpd1xy66kaj2mb8xjasgm3bipydxbrbcpvp5bny9shvk6di0cf"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; };
+  geneClassifiers = derive2 { name="geneClassifiers"; version="1.5.0"; sha256="0qwqb1sq6bw688br5c5lxvc7dxwg1qwwb30dn9pklgfgpnjwp86n"; depends=[Biobase BiocGenerics]; };
+  geneRecommender = derive2 { name="geneRecommender"; version="1.53.0"; sha256="1qrlk46y1hkgva2yrf8x2smy82p4kmzjpr7kyk9381rfl64nn18q"; depends=[Biobase]; };
+  geneRxCluster = derive2 { name="geneRxCluster"; version="1.17.0"; sha256="0vlhskyymdnbigdq1qj9gimklcmzvybh74zn7f65if5ssqdgmj10"; depends=[GenomicRanges IRanges]; };
+  geneXtendeR = derive2 { name="geneXtendeR"; version="1.7.0"; sha256="0j3k3ijq7ml52avs6np7q5137fr348xi5012dkw1nmn4sqm9dwpy"; depends=[AnnotationDbi data_table dplyr GO_db networkD3 org_Ag_eg_db org_Bt_eg_db org_Ce_eg_db org_Cf_eg_db org_Dm_eg_db org_Dr_eg_db org_Gg_eg_db org_Hs_eg_db org_Mm_eg_db org_Mmu_eg_db org_Pt_eg_db org_Rn_eg_db org_Sc_sgd_db org_Ss_eg_db org_Xl_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; };
+  genefilter = derive2 { name="genefilter"; version="1.63.0"; sha256="0wn6gwj8v3xl11mhx40529hlssay79n24vn071saq2y475bxhgkl"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
+  genefu = derive2 { name="genefu"; version="2.13.0"; sha256="1i0w1bhg93gpjwn2w2k9kz3z99vdifdf7a9nza8d79lirj4512p4"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
+  geneplast = derive2 { name="geneplast"; version="1.7.0"; sha256="1ydcahw9imi281xdgpr7asihavsks3jjh52nhdrx0qn5plml254r"; depends=[ape igraph snow]; };
+  geneplotter = derive2 { name="geneplotter"; version="1.59.0"; sha256="1yqxqxchjn31sqw3csk5y3jmshb3v5580q245skam5r5v2nw5lhb"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
+  genoCN = derive2 { name="genoCN"; version="1.33.0"; sha256="1rcly2dfm93lbsc1inm3z669l19k213zyq31kb4kkg1cnam2cflv"; depends=[]; };
+  genomation = derive2 { name="genomation"; version="1.13.0"; sha256="04101y44lnxlxkyhb2gb4d0wr9cy1s1c31dsfhqgl1rhy8rxi5b4"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer RUnit S4Vectors seqPattern]; };
+  genomeIntervals = derive2 { name="genomeIntervals"; version="1.37.0"; sha256="1xinqj7zzwjxx6qxi6mxrws2ajjm8cy7g9v1773x7mh47w9rz7mw"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
+  genomes = derive2 { name="genomes"; version="3.11.0"; sha256="0vvc43ih4idj6jakm4jvwynvi4v90nndvbz18kb7nxb7fh1bl9m3"; depends=[curl readr]; };
+  genoset = derive2 { name="genoset"; version="1.37.0"; sha256="0awbbvhz1qzra92ghal5wrqrkya4v0wd15q75dmqxb5xx36s8if6"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
+  genotypeeval = derive2 { name="genotypeeval"; version="1.13.1"; sha256="0qlzqfzpb74prq6b7zg77d610i8hj0d2f7jhi4l1difcgf8y7j2j"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
+  genphen = derive2 { name="genphen"; version="1.9.0"; sha256="1bps7mgznp5by1kfwmapnfj3vkdqiz3p3816kg9jmg7iggxn8gih"; depends=[Biostrings doParallel e1071 foreach ranger rstan]; };
+  gep2pep = derive2 { name="gep2pep"; version="1.1.1"; sha256="0h6qf7fl2hmg5chv6g9qfj5ih4mfc6xmihqny9pzg277i5gwmdsj"; depends=[Biobase digest foreach GSEABase iterators repo rhdf5 XML]; };
+  gespeR = derive2 { name="gespeR"; version="1.13.0"; sha256="1qc9d8vp5s5rzw7bqbfm2n5l23yfk9d3kpmhyd4hnr9jb2h4jypp"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
+  ggbio = derive2 { name="ggbio"; version="1.29.0"; sha256="0skf5m8qglvv2y70jppjblvpl94cgimns02kprsqp85ghmbshy7s"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  ggcyto = derive2 { name="ggcyto"; version="1.9.10"; sha256="17pvxml685gic39ycgq2crwnznw7ih0g5bhynxziffnfg0zqb6fc"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
+  ggtree = derive2 { name="ggtree"; version="1.13.0"; sha256="1zkaasmb2y1k8hqjr7cbvhasmv1ykclhfqj3h0s6m6yvh2iql9nb"; depends=[ape dplyr ggplot2 magrittr purrr rlang rvcheck scales tibble tidyr tidytree treeio]; };
+  girafe = derive2 { name="girafe"; version="1.33.0"; sha256="0jdckfnsfvcqf7gnfbpxw12q0la9cxzfmhhy4n492fqavnzpbfgj"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
+  globalSeq = derive2 { name="globalSeq"; version="1.9.1"; sha256="105sxbs03xdfv6ikl517sj14wzn0cc92lxv5yfzabj2ys8911dl1"; depends=[]; };
+  globaltest = derive2 { name="globaltest"; version="5.35.0"; sha256="150mf64cr528jzcpc9ydfs1kf9dwrr8xnw47abpkxgmfmqi6jl01"; depends=[annotate AnnotationDbi Biobase survival]; };
+  gmapR = derive2 { name="gmapR"; version="1.23.0"; sha256="0c6chbf3kzx3z57gs36b0bi1bc58514sklxkplv80z7xnvxs8pl9"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+  goProfiles = derive2 { name="goProfiles"; version="1.43.0"; sha256="19r3h8rnfs826aldlgkjgsllk4wj95rq7lq37qd927bjgvi4kbnj"; depends=[AnnotationDbi Biobase CompQuadForm GO_db stringr]; };
+  goSTAG = derive2 { name="goSTAG"; version="1.5.0"; sha256="13bnzz3adj9186sp992fbjp9442nvp7f0a80jnz1nygdr0d45i7m"; depends=[AnnotationDbi biomaRt GO_db memoise]; };
+  goTools = derive2 { name="goTools"; version="1.55.0"; sha256="1lzgsdqvwrxckg5pdbmnxldifrsm7zyvl72pl3sz8x2997b4lc97"; depends=[AnnotationDbi GO_db]; };
+  goseq = derive2 { name="goseq"; version="1.33.0"; sha256="102w1cxz2ab0gyzamy9rcdbf73bgkvqrm0lxasz6m2h79j9gfmc9"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; };
+  gpls = derive2 { name="gpls"; version="1.53.0"; sha256="02yca8lllmq7lmbg55kn3yhsb0s9d2b828aj08lsp5hxmyill36k"; depends=[]; };
+  gprege = derive2 { name="gprege"; version="1.25.0"; sha256="123ggwjdkc2la9vbv6kmv7l7pg0wz3jzk4q0df5zm38a3nr8gy7p"; depends=[gptk]; };
+  graph = derive2 { name="graph"; version="1.59.0"; sha256="1pcn9rr9j679g6hgsh235nar5via1rmgj1dqpyp7sl9zfjrcim2p"; depends=[BiocGenerics]; };
+  graphite = derive2 { name="graphite"; version="1.27.2"; sha256="0c3ha2hjpzwbrv5jh2376ayd2c7j9z857m70rx8xiv5bn3kzvazz"; depends=[AnnotationDbi checkmate graph httr rappdirs]; };
+  groHMM = derive2 { name="groHMM"; version="1.15.0"; sha256="1q18f8ibjwik01n54c373fss82jwamik430irgaya8q5b5659c0d"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
+  gsean = derive2 { name="gsean"; version="1.1.0"; sha256="0aar598qdhppzkzrrmhzd1nkn7i3xci401yz3w5dsgz27fy12c18"; depends=[fgsea PPInfer]; };
+  gtrellis = derive2 { name="gtrellis"; version="1.13.1"; sha256="1nz1hq1nmn3759cnf7w2svkk7v6lzrp85l49vjwy7wfrpk612wch"; depends=[circlize GenomicRanges GetoptLong IRanges]; };
+  gwascat = derive2 { name="gwascat"; version="2.13.1"; sha256="1y595365q7hw84sgg6c307d3h1bryml4rxq1hg2vcr2ai0cbb065"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
+  gwasurvivr = derive2 { name="gwasurvivr"; version="0.99.38"; sha256="0dcza6pscq9lndk3x1bc139fh3r61lwfrm88vizyaini7xyzd2p0"; depends=[GWASTools matrixStats SummarizedExperiment survival VariantAnnotation]; };
+  h5vc = derive2 { name="h5vc"; version="2.15.0"; sha256="001lz9pjr7ddlw8v69nvhmbdzzx643vd5akl7dzjx4z0kg3xyf55"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
+  hapFabia = derive2 { name="hapFabia"; version="1.23.0"; sha256="0dhq26aqqmnzmx3cnwmmrqa8zx5gxq48is1wmljvfn86qixr70xr"; depends=[Biobase fabia]; };
+  heatmaps = derive2 { name="heatmaps"; version="1.5.0"; sha256="0lz2cxw3fxyvnmnzk95k791x8x3vjn5cif2bqp3zv2rlkwgdjd7m"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; };
+  hiAnnotator = derive2 { name="hiAnnotator"; version="1.15.0"; sha256="12q17c31j1q1jbh1z1ddlcml1wxin5s32yz9xk7dd7bxa81frpmg"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
+  hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.17.0"; sha256="1qad1winpzjwjn9wnr7xvmspza2j0islsdqh7aig767svipw8870"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl rSFFreader sonicLength]; };
+  hicrep = derive2 { name="hicrep"; version="1.5.0"; sha256="17k4wynjjbailalm4h0gghw5fz7gavjpdzm3ibk1gih46l24fr0d"; depends=[]; };
+  hierGWAS = derive2 { name="hierGWAS"; version="1.11.0"; sha256="0wfv8pxnm8v1lwj1cbk4d7v0cyjzra8nm8gaawwr0aqcsg7ksp2f"; depends=[fastcluster fmsb glmnet]; };
+  hipathia = derive2 { name="hipathia"; version="1.1.1"; sha256="1x7aa8vbmzrfw5psyc4a7qcsnhfgcynfvp5k7qba4q5cp85gcgym"; depends=[AnnotationHub coin DelayedArray igraph limma matrixStats MultiAssayExperiment preprocessCore S4Vectors servr SummarizedExperiment]; };
+  hmdbQuery = derive2 { name="hmdbQuery"; version="1.1.1"; sha256="1rkyh115mn65rq90i7g3idw1n856v3r6139rbvaai7939rbi4gg9"; depends=[S4Vectors XML]; };
+  hopach = derive2 { name="hopach"; version="2.41.0"; sha256="1i329clrw9bjxkchinadprix36xjak5x6i1zqpdj27kyr8w26gn2"; depends=[Biobase BiocGenerics cluster]; };
+  hpar = derive2 { name="hpar"; version="1.23.2"; sha256="04h4xfmappx0vipw1fa9kd8n9hs4cpcfsllxcrq77akndkf1dc92"; depends=[]; };
+  htSeqTools = derive2 { name="htSeqTools"; version="1.29.5"; sha256="0rigcwd8mc3kjsj0kxzxnspzqz0d1i58vav71p7a4cx76yrzi5z1"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; };
+  hyperdraw = derive2 { name="hyperdraw"; version="1.33.0"; sha256="0qcp9p3n7gxskvw8afz7yr2msm0gikl7v3dvzvrhfypad9czplx0"; depends=[graph hypergraph Rgraphviz]; };
+  hypergraph = derive2 { name="hypergraph"; version="1.53.0"; sha256="1mj14bgkbs3p0smf6phfig2rcf7kd88d85djr6rq1c3vpiyhpyx3"; depends=[graph]; };
+  iASeq = derive2 { name="iASeq"; version="1.25.0"; sha256="0p4m13k5n974469xh8vhz8xd5b37ill3i9jmglq0fa47n7rbdjz1"; depends=[]; };
+  iBBiG = derive2 { name="iBBiG"; version="1.25.0"; sha256="1dbcazr88ac38g58jgr9byqaql36jvfn5bmr8gibn3hr187c5ypf"; depends=[ade4 biclust xtable]; };
+  iBMQ = derive2 { name="iBMQ"; version="1.21.0"; sha256="19f1iqfcdsq0lg9hbl65qwb7lwp9n36vrdnyah63dn7k3c23p5x1"; depends=[Biobase ggplot2]; };
+  iCARE = derive2 { name="iCARE"; version="1.9.0"; sha256="0z884xysrf00h56l4djq1yrm8478s4f3jqq0bz6sf5wqzibr492k"; depends=[]; };
+  iCNV = derive2 { name="iCNV"; version="1.1.0"; sha256="1kqsrw6pq4lcnfnf5ak4pdmcv3cr7p1jhmk304g5ywxpbd2fdfp9"; depends=[CODEX data_table dplyr fields ggplot2 rlang tidyr truncnorm]; };
+  iCOBRA = derive2 { name="iCOBRA"; version="1.9.1"; sha256="08nzcsph0w5zp6l2lwrg2624gsgs939rkv1662ic72jf8759i4s1"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; };
+  iCheck = derive2 { name="iCheck"; version="1.11.0"; sha256="0bs9zzcc1pbdvvzq912yqr2waic72jj4pv6ksqjg6s9wz390a4gc"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; };
+  iChip = derive2 { name="iChip"; version="1.35.0"; sha256="0c610x3g5nkpwsrkix66s3z8dc24dv11dfidms757hc0fwchnsq3"; depends=[limma]; };
+  iClusterPlus = derive2 { name="iClusterPlus"; version="1.17.0"; sha256="1ax42hac2wqkyawm9dwwzm0lf81cihric78j38v1vjic918l1b14"; depends=[]; };
+  iGC = derive2 { name="iGC"; version="1.11.0"; sha256="1bcbf1azdb4svdjz8yaxs55l76g5c8i1h53s66qjhss8i3pjydr3"; depends=[data_table plyr]; };
+  iPAC = derive2 { name="iPAC"; version="1.25.0"; sha256="1mdcr7fa2y78cnndsd8y08hrmlzbgbsgmhq0kzpszr79xj49kdzx"; depends=[Biostrings gdata multtest scatterplot3d]; };
+  iSEE = derive2 { name="iSEE"; version="1.1.2"; sha256="0x8pmyzpbb1x33ixh1jnpfs58l7b1d12r51gk7gjqxa291phg7zk"; depends=[AnnotationDbi BiocGenerics colourpicker cowplot dplyr DT ggplot2 igraph mgcv rentrez reshape2 rintrojs S4Vectors scales shiny shinyAce shinydashboard shinyjs SingleCellExperiment SummarizedExperiment vipor viridisLite]; };
+  iSeq = derive2 { name="iSeq"; version="1.33.0"; sha256="1sxy4hxpds6k1flmspwf9y4j8wkr96142z64scigg9mf3p88h5zz"; depends=[]; };
+  iasva = derive2 { name="iasva"; version="0.99.3"; sha256="1ax0594b3d2glam0lb4dzqzx8bbfdln0wglr96szjdxa6qi31ghk"; depends=[BiocParallel cluster irlba SummarizedExperiment]; };
+  ibh = derive2 { name="ibh"; version="1.29.0"; sha256="07954bdkijs41r0h39fhlzpd8d75vhlk8gl4zlbaky93prsmi1hf"; depends=[simpIntLists]; };
+  icetea = derive2 { name="icetea"; version="0.99.10"; sha256="14yzjsydnv2k8x183l7a94jmxsd27p2ndwzdvkd93d5nkh5iq36l"; depends=[BiocGenerics BiocParallel Biostrings csaw edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; };
+  ideal = derive2 { name="ideal"; version="1.5.0"; sha256="1pdj0r0qfjwrwvsb4lrwl3mxd6wb4bwmabd9z413868453qk101p"; depends=[AnnotationDbi BiocParallel d3heatmap DESeq2 dplyr DT GenomicRanges ggplot2 GO_db goseq GOstats gplots IHW IRanges knitr limma pcaExplorer pheatmap plyr rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; };
+  idiogram = derive2 { name="idiogram"; version="1.57.0"; sha256="0nsldgh780amhdafafrkp1lzriwskm3l89fkn2licxvpw63rlajn"; depends=[annotate Biobase plotrix]; };
+  igvR = derive2 { name="igvR"; version="1.1.6"; sha256="12jl0yj6pgjfvrx3rv63nj88zdvakzrh499gx4kz1m5s8wqxswdi"; depends=[BiocGenerics BrowserViz GenomicRanges httpuv rtracklayer VariantAnnotation]; };
+  illuminaio = derive2 { name="illuminaio"; version="0.23.0"; sha256="00qf9qjinyqd16r3zv99cgkwxdy44f2i6q2hlhmic7942j6h6r55"; depends=[base64]; };
+  imageHTS = derive2 { name="imageHTS"; version="1.31.0"; sha256="0d7l8w5i0nlfks1iak0qdkxrarfx280wyqbpig38bhbmzkv31xrg"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
+  immunoClust = derive2 { name="immunoClust"; version="1.13.0"; sha256="0z17f415rqad4hmwhxgl1gh8a1r42v5yz38rpq9yhssq7w1mw8q0"; depends=[flowCore lattice]; };
+  impute = derive2 { name="impute"; version="1.55.0"; sha256="1nb2zpnx9ia2br0044jky4kcqj2vw1vw35s34869i35n90n3vqqc"; depends=[]; };
+  intansv = derive2 { name="intansv"; version="1.21.0"; sha256="0a2qrnw1jd5d7mqvmin54110xvn1089p16bfi14660qzip6cwb0i"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
+  interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.19.0"; sha256="1iwv231mc6g2jp6l6b3rs0gm5n1pb7mbah522q3d4s563avs9g0d"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
+  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.19.0"; sha256="0jwsm5i5s6gkxb05n8fmsybyvi5829g6i6y39nxcpd189ihbmv16"; depends=[BiocGenerics shiny]; };
+  inveRsion = derive2 { name="inveRsion"; version="1.29.0"; sha256="12pzk7ppd48ccmfr3q2950pfckcc2kfvgnailwai7jxgss1h1148"; depends=[haplo_stats]; };
+  isobar = derive2 { name="isobar"; version="1.27.0"; sha256="02aa78jia246w729bg4pl54shjwp51yymskhy842xnznw01nd8p7"; depends=[Biobase biomaRt distr ggplot2 plyr]; };
+  isomiRs = derive2 { name="isomiRs"; version="1.9.1"; sha256="1k60zgb2b2yqwzb02nwvri10p1a2qdlgm4g0wg6593fmkr1q9p8h"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics cluster DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors SummarizedExperiment tibble tidyr]; };
+  iterClust = derive2 { name="iterClust"; version="1.3.0"; sha256="1bm2ld3w6sm1jn7s0yk9v7d53xmf2ix411p7pp2fyjqfj6vl3iz4"; depends=[Biobase cluster]; };
+  iterativeBMA = derive2 { name="iterativeBMA"; version="1.39.0"; sha256="07xy5vjmgzglab6hp82xkd6gc67lb58n8g26zvssldpzm1kir70j"; depends=[Biobase BMA leaps]; };
+  iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.39.0"; sha256="1cj63g97xm05clix5cv3dmjdwb806rb5va262hfhvmd2aa6bgq2k"; depends=[BMA leaps survival]; };
+  iteremoval = derive2 { name="iteremoval"; version="1.1.0"; sha256="0ggmvmif5ak35mjzd000dflcbnp0zx14zspn2nabkak74zvdjsgm"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; };
+  ivygapSE = derive2 { name="ivygapSE"; version="1.3.0"; sha256="1730rd55ws484q4iwgd06cps8jfg7f1wzryjr0gzaykxq7n2yi94"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; };
+  joda = derive2 { name="joda"; version="1.29.0"; sha256="0n76l7mrkqrsvjq67hp9am3b6ixi2v9vz7hppj36y37r02myhdlb"; depends=[bgmm RBGL]; };
+  karyoploteR = derive2 { name="karyoploteR"; version="1.7.1"; sha256="1fvvc8181vasbdky42yijhknm57pypb6abkswl9si91fv2zm4z28"; depends=[bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; };
+  kebabs = derive2 { name="kebabs"; version="1.15.0"; sha256="061cpbsqd444p3jw08kv72b3q2cbrzd1939vgbbsg98l550684bs"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
+  keggorthology = derive2 { name="keggorthology"; version="2.33.0"; sha256="11a1d08pycj99xzhwblgrjwl6idm6l90i0ya1c0q0bwmaiyqqbwp"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
+  kimod = derive2 { name="kimod"; version="1.9.0"; sha256="1q2ndbpw13c9a6g5vs29w5zzrw3ac5y5rjnndw660xljfphid6x4"; depends=[Biobase cluster]; };
+  kissDE = derive2 { name="kissDE"; version="1.1.0"; sha256="0k5jw601sygbvvqysha243mbhwqv80c6k8dmbj9mdqpkd0bxw6aw"; depends=[aod Biobase DESeq2 DSS ggplot2 glmnet gplots matrixStats R_utils]; };
+  kmknn = derive2 { name="kmknn"; version="0.99.13"; sha256="1qdsm0y1saz594s2bijqwfg74yjds1s55mzsw26sw11rvk63x1z6"; depends=[BiocParallel DelayedArray Rcpp]; };
+  lapmix = derive2 { name="lapmix"; version="1.47.0"; sha256="08qj6i6y42ax82j29maf89zs0k03iv6p30v1zlvgixfh1p86ffk4"; depends=[Biobase]; };
+  ldblock = derive2 { name="ldblock"; version="1.11.1"; sha256="0z53xkh2khlfsnvr0nqsw8k6s375ba2y5a3njbr9qnif3r0846km"; depends=[BiocGenerics erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; };
+  les = derive2 { name="les"; version="1.31.0"; sha256="11ad0v5j31s8kcg4572ga4znnpx9ry83m994bqbk3h51cb48pzm8"; depends=[boot fdrtool gplots RColorBrewer]; };
+  lfa = derive2 { name="lfa"; version="1.11.0"; sha256="1vww3lfzb3kx2hp1cm48vg1rmnazgklz1qz1y36yydg53lbl8igi"; depends=[corpcor]; };
+  limma = derive2 { name="limma"; version="3.37.2"; sha256="1wf9xpp8l43ld7mkinqznd2dxlpw4w9vgd8y8zg9nz7gp5h0b148"; depends=[]; };
+  lmdme = derive2 { name="lmdme"; version="1.23.0"; sha256="0192ffh3qmqx31d67zxr8sg7qvwd4wmcgzxq44w9sflb947sn8ds"; depends=[limma pls stemHypoxia]; };
+  loci2path = derive2 { name="loci2path"; version="1.1.0"; sha256="0lqixyyv6wrmqbfl67yy131421pmyi6hp7hn11lbf3xm8q56smah"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; };
+  logicFS = derive2 { name="logicFS"; version="1.51.0"; sha256="1bijly35nfy6ix6b0h2salriy143xyc3l591hcngvif504zjd57b"; depends=[LogicReg mcbiopi]; };
+  logitT = derive2 { name="logitT"; version="1.39.0"; sha256="0ynd7h26ask2i15cxikx9igcm9cdmmihg561l1dv3m9zw84s6mvb"; depends=[affy]; };
+  lol = derive2 { name="lol"; version="1.29.0"; sha256="050i433xkj365q7k5i7gw07z8li29myd3zgavjg14p9lkdcwia0w"; depends=[Matrix penalized]; };
+  lpNet = derive2 { name="lpNet"; version="2.13.0"; sha256="1k94rsji8p9ri8mvs6xc23dm4fq4pxcd9323c6jllq9bdljxffkp"; depends=[lpSolve nem]; };
+  lpsymphony = derive2 { name="lpsymphony"; version="1.9.0"; sha256="1lsxg37yc6ddnw13dfg79yy7gz0ppv5mp92cvxc8pyh7x4m4mbaq"; depends=[]; };
+  lumi = derive2 { name="lumi"; version="2.33.0"; sha256="1i192shbsczsnc7j6z1hqks6bsxq4rbkfkxbb99y77m7xzzw642i"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
+  mAPKL = derive2 { name="mAPKL"; version="1.11.0"; sha256="093kg8mildsmq7w6xa0ml86m8lyn00rafz3q3p9adw6i2x3lpm1b"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; };
+  mBPCR = derive2 { name="mBPCR"; version="1.35.0"; sha256="1nyzymd036biskr5b5gpz8z14mqjsxrbj2mn0sv9vp22lkcj0ls3"; depends=[Biobase oligoClasses SNPchip]; };
+  mCSEA = derive2 { name="mCSEA"; version="1.1.1"; sha256="1fj53j42p62rr1chyb22wvqd25iqd1cwgw1bdgdzpx8n0d9lh64d"; depends=[fgsea GenomicFeatures GenomicRanges ggplot2 Gviz Homo_sapiens IRanges limma mCSEAdata S4Vectors SummarizedExperiment]; };
+  mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.15.0"; sha256="1xmhzllrj06g33pa1yq4mkg9sg8dhi1fz4239763pnid8l2jz40y"; depends=[MASS outliers qtl]; };
+  maCorrPlot = derive2 { name="maCorrPlot"; version="1.51.0"; sha256="0hj93i05fqjx03c7lbdk81985v1qyy89yjwqjd75pqiy4jx2yy8f"; depends=[lattice]; };
+  maPredictDSC = derive2 { name="maPredictDSC"; version="1.19.0"; sha256="1hn35cgd9571b5vz3wv76lhg2hr77kl1s6r6nmpnjph4asqhj7yg"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; };
+  maSigPro = derive2 { name="maSigPro"; version="1.53.0"; sha256="0gf80ff0jhag6mj6r888ivla5fccrdg63d7wh1g322ygp5b27h4s"; depends=[Biobase MASS mclust venn]; };
+  maanova = derive2 { name="maanova"; version="1.51.0"; sha256="0az1jxfmjjpz3aqb5hvxpw912rh188b6gf02jj3q4v294131rqw4"; depends=[Biobase]; };
+  macat = derive2 { name="macat"; version="1.55.0"; sha256="1bmalm7v6hxab5vcqqq6s3s2313xq0pifk7yxq20kh7n8m7n64iw"; depends=[annotate Biobase]; };
+  made4 = derive2 { name="made4"; version="1.55.0"; sha256="0pywxxcxbi3wihx7v67rcgk7clzwkc0611687rq764xlkwljaxfw"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
+  maftools = derive2 { name="maftools"; version="1.7.05"; sha256="070w04yq3khxl3pnd96cw8kxfv1j7iwwqwpc618pnarr7ii734mz"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
+  maigesPack = derive2 { name="maigesPack"; version="1.45.0"; sha256="04ihpaqpkimf5k2j8hf2zwjqm6s75nkr1bn8gsvg21m88gajsh3x"; depends=[convert graph limma marray]; };
+  makecdfenv = derive2 { name="makecdfenv"; version="1.57.0"; sha256="1v9a3r9gxijglxyhjb52jqm6p9vqkn549cim9zbw6mhngn2cqnzs"; depends=[affy affyio Biobase zlibbioc]; };
+  manta = derive2 { name="manta"; version="1.27.0"; sha256="0p3r0l0sgnf9rrih35a3n7c6l9a3q9xpd2hilmf3pbrrc5hrxnhm"; depends=[caroline edgeR Hmisc]; };
+  mapscape = derive2 { name="mapscape"; version="1.5.0"; sha256="0fs1cn7aw2awgjqmjjb70p5pz6fdnwfvix57wijvalc5qy777h1a"; depends=[base64enc htmlwidgets jsonlite stringr]; };
+  marray = derive2 { name="marray"; version="1.59.0"; sha256="01kgc79bhg5yg1zkglkpm85zrhm3dl5j63hvxbll3xsrrmy4bhs9"; depends=[limma]; };
+  martini = derive2 { name="martini"; version="1.1.0"; sha256="1aj39flz18cnl9042hqlnqzyq6ff9j4dl5b2fm29y150s0j2wz5p"; depends=[igraph Matrix Rcpp RcppEigen Rgin S4Vectors snpStats]; };
+  maser = derive2 { name="maser"; version="0.99.15"; sha256="12i7yzv4id25186ny5j4bzjlg6jwrk0mwisnpaakvk9fwja4ygl5"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; };
+  maskBAD = derive2 { name="maskBAD"; version="1.25.0"; sha256="09g28yd1jwxrvqh59lbcnni8ba1kk0gkgcxb2x7s9m35nx8sdr04"; depends=[affy gcrma]; };
+  massiR = derive2 { name="massiR"; version="1.17.0"; sha256="0gf0j965ssrawvyx4i3mq5xrwbjy73vplig3d5518425l38g3ajp"; depends=[Biobase cluster diptest gplots]; };
+  matchBox = derive2 { name="matchBox"; version="1.23.0"; sha256="0gkn4jx9fhpgdrbcqvq6yjy3yyh1fsxw7gq9izcy2mkyp9z2343i"; depends=[]; };
+  matter = derive2 { name="matter"; version="1.7.1"; sha256="0vjabjvh3gcxlvjbyncvj6jngwg701h9kr9w334rz1f4l9szkvrl"; depends=[biglm BiocGenerics digest irlba]; };
+  mcaGUI = derive2 { name="mcaGUI"; version="1.29.1"; sha256="0klxp5g2s7c6k93imdkc9dxvzzvb89d5jf7x7p7v0mmsm6rbhg95"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
+  mdgsa = derive2 { name="mdgsa"; version="1.13.1"; sha256="06p6dfffc7h80wzsypq1xk80q1ilzqpjxrwmvi70sdqv9fc9ac17"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
+  mdp = derive2 { name="mdp"; version="1.1.0"; sha256="0a5r860nywkd35h16vsgqqj0iin0ldbra0b8cs1ql2bwmdjccl7i"; depends=[ggplot2]; };
+  mdqc = derive2 { name="mdqc"; version="1.43.0"; sha256="1h0pk6amx5vj9zxxwa3aydhnph0cn2qcibz7xk5whpr3fqrzk1b4"; depends=[cluster MASS]; };
+  meshes = derive2 { name="meshes"; version="1.7.1"; sha256="1ccbl1gnsapb5r60d2bdfgrj2fmn1glk5yxjxjlv68r9xkv0nfk8"; depends=[AnnotationDbi DOSE enrichplot GOSemSim MeSH_db rvcheck]; };
+  meshr = derive2 { name="meshr"; version="1.17.0"; sha256="03q7ihrg2a61kw3nkb13jn2fj3mv0p9g6pas5dm62z5i0yfgqypz"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; };
+  messina = derive2 { name="messina"; version="1.17.0"; sha256="0zllyp3azgv0yyx0hdcad1bv41shqvkyw143nb7nc79x34zgm11m"; depends=[foreach ggplot2 plyr Rcpp survival]; };
+  metaArray = derive2 { name="metaArray"; version="1.59.0"; sha256="0xp7qnvgj9qa83lwv6dcbs3fw41jyp1lsw17n87jr9x2gnz9v2ly"; depends=[Biobase MergeMaid]; };
+  metaCCA = derive2 { name="metaCCA"; version="1.9.0"; sha256="1i8qgq7qxngkrgibwqh8c6yigpi5w7bf1jivpmkk1swzlsa620y8"; depends=[]; };
+  metaMS = derive2 { name="metaMS"; version="1.17.0"; sha256="194pw7fbf9nr0wxq7fbg4j45lh36va6ypr62aj8zc6l2hh42d2b5"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
+  metaSeq = derive2 { name="metaSeq"; version="1.21.0"; sha256="0fcwfk0vz0pa5pykxlf4g8zg5iyd40qncq40kh8zydymkkz7njqg"; depends=[NOISeq Rcpp snow]; };
+  metabomxtr = derive2 { name="metabomxtr"; version="1.15.0"; sha256="09mx5a26maf4zm670r17xs9bfyn7xz6hhyjh9bbbkm4lf0fyph22"; depends=[Biobase BiocParallel Formula ggplot2 multtest optimx plyr]; };
+  metagene = derive2 { name="metagene"; version="2.13.1"; sha256="0lyv5mm5bvvj2v3519swvwwsgmma952ccy8rxnpzr628lrvllcw9"; depends=[BiocParallel data_table DBChIP EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats muStat purrr R6 Rsamtools rtracklayer stringr]; };
+  metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="2.1.0"; sha256="1dbw7cvyrh4w8cjqdvslph3lbrxxyxnpc71l69myasf4w1hwwsjb"; depends=[ape Biobase Biostrings dbplyr DECIPHER dplyr lattice lazyeval magrittr purrr RSQLite S4Vectors stringr]; };
+  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.23.0"; sha256="09bfw6g9k4mimnlcrqf5690gpwn5f02pcairnnrmkx5kx7smj4zw"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
+  metahdep = derive2 { name="metahdep"; version="1.39.0"; sha256="1zm6j0i9myn4q4lwc2almy6d6khg1kqb8ij11cr5dhxmwx444ma8"; depends=[]; };
+  metaseqR = derive2 { name="metaseqR"; version="1.21.0"; sha256="1ny7srzlw1gv0bf4zflji0k48s6mw6cl2141y5l6wxwyiljgxvdp"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
+  metavizr = derive2 { name="metavizr"; version="1.5.1"; sha256="1wvdzqvjlr2ygxkq2pvkfw5xdr09yafmalf4k5ya7mc70cg6w7nb"; depends=[Biobase data_table digest epivizr epivizrData epivizrServer epivizrStandalone GenomeInfoDb httr metagenomeSeq phyloseq vegan]; };
+  methInheritSim = derive2 { name="methInheritSim"; version="1.3.0"; sha256="180lha5avnrlnkc709hy5akmajwpkzb2slk7gf7641349lx3890v"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; };
+  methVisual = derive2 { name="methVisual"; version="1.33.0"; sha256="0pyj09zkan51w6w0wnkg3ww49hlwqarl5sfw7wrbarfdvxvlyqpa"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
+  methimpute = derive2 { name="methimpute"; version="1.3.1"; sha256="09v7dw2sdkzrypw9brqyym9ipmplww2r3jh5fybw66zj2fiqxhx6"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; };
+  methyAnalysis = derive2 { name="methyAnalysis"; version="1.23.0"; sha256="1fhhk2yqcq2rh30369izn32w7jzcyzhlwaa5wcds4mb2caiyr4kj"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; };
+  methylInheritance = derive2 { name="methylInheritance"; version="1.5.0"; sha256="1bf765bvv63xp3fxxf9rx0x5z8x4sk1xfwm67nm10shsd4wbh0za"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; };
+  methylKit = derive2 { name="methylKit"; version="1.7.4"; sha256="1mi3w3b60k1nnrp7g2dv4b561y9ws493n5v0s8gwz4w7m12xb2qx"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; };
+  methylMnM = derive2 { name="methylMnM"; version="1.19.0"; sha256="1rzx8sd1kg4krzjqbnv0fi89lgc12xjdzlkbc8dpj8mx8d6gp8xg"; depends=[edgeR statmod]; };
+  methylPipe = derive2 { name="methylPipe"; version="1.15.0"; sha256="0v00cc5jiw0n6nxq5nvbmaknbanp0gbzk8d3p5igfj3pva6zvpjy"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
+  methylumi = derive2 { name="methylumi"; version="2.27.0"; sha256="1carjnp9fbldzyms0cnc5lv92y4cxgzri9wxd5m4svrdfagnj75z"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
+  methyvim = derive2 { name="methyvim"; version="1.3.0"; sha256="1w8jm4qba2cqi1ghrk0lmwhmdh6hn9fdbzh8f3gf7hlbbg5wf678"; depends=[BiocGenerics BiocParallel bumphunter cluster doFuture dplyr future GenomeInfoDb ggplot2 ggsci gridExtra gtools IRanges limma minfi SummarizedExperiment superheat tmle]; };
+  mfa = derive2 { name="mfa"; version="1.3.0"; sha256="14qb1l4czylj2jid2fqk24pqkg2rgv4fs2d719xmd8yd9snhda7r"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; };
+  mgsa = derive2 { name="mgsa"; version="1.29.0"; sha256="1vhp23qx5vzaqmn06vngfd9c3y5ygizc6hhx1ccv7m5x4lz2a4jg"; depends=[gplots]; };
+  miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.5.0"; sha256="0gj23y3sk269j0zci53f9b3mdqvdnk84awg80zxv5s25wjzsvwwf"; depends=[]; };
+  miRLAB = derive2 { name="miRLAB"; version="1.11.0"; sha256="12xyplcm923lhwpjxwy8a9xfn6mrhpcf264kyckzswmxzvnqy3n8"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
+  miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.9.0"; sha256="116zkdwspzb0rp6yhz9bjfarbi2mvvlngsb53zs1js59kzsrw06a"; depends=[AnnotationDbi DBI miRBaseVersions_db reshape2]; };
+  miRNApath = derive2 { name="miRNApath"; version="1.41.0"; sha256="1hndq9aq3r3mci5j9ysfkb8kdw2zp7bbi3j7qfcdchm9q3g78rya"; depends=[]; };
+  miRNAtap = derive2 { name="miRNAtap"; version="1.15.0"; sha256="03i5bbjygkas379kp6frf68d4f7md3safbkayqiccdaq1vszah08"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
+  miRcomp = derive2 { name="miRcomp"; version="1.11.0"; sha256="08b4na83sdp3q6hcadbyc59jmd151vwg26prjvxvsmacqajlf2xc"; depends=[Biobase KernSmooth miRcompData]; };
+  miRmine = derive2 { name="miRmine"; version="1.3.0"; sha256="10j2f6ldxxf78aps1ygvdzpvga5smb4xv9m4mhgbhl9qfbkqvkd1"; depends=[SummarizedExperiment]; };
+  miRsponge = derive2 { name="miRsponge"; version="1.7.0"; sha256="1w61pnjzp6g7p6sz6y88h6zdifmqdijr89y25rqrgk6ybz50206j"; depends=[clusterProfiler corpcor DOSE igraph linkcomm ProNet ReactomePA survival varhandle]; };
+  microRNA = derive2 { name="microRNA"; version="1.39.0"; sha256="0c1dvhp81kxv1kxr77rl7wgq5wr92gj37m8qsgn0b40zs5b1b49i"; depends=[Biostrings]; };
+  microbiome = derive2 { name="microbiome"; version="1.3.1"; sha256="0vwx4m4w26lrs5n30ikc5h38bcbpi5ynfiqm8kbnqmldzsfcq56q"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; };
+  mimager = derive2 { name="mimager"; version="1.5.0"; sha256="1jl3j7l75g04a7w2cf7kgci78b2q68wadpbq8hcg91qrr1jahw89"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; };
+  minet = derive2 { name="minet"; version="3.39.0"; sha256="0lbga3id91swx8vnfcw4vgwq5bypr3a110il3a84kwr9naq9vnvi"; depends=[infotheo]; };
+  minfi = derive2 { name="minfi"; version="1.27.5"; sha256="107y7npvk5cdr7nz6ll8whyhc83ni1wl3vsx28wyblh7qwk3fh64"; depends=[beanplot Biobase BiocGenerics BiocParallel Biostrings bumphunter data_table DelayedArray DelayedMatrixStats genefilter GenomeInfoDb GenomicRanges GEOquery HDF5Array illuminaio IRanges lattice limma MASS mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
+  mirIntegrator = derive2 { name="mirIntegrator"; version="1.11.0"; sha256="1f6xi68rgc5xgmcpv25lfz9khdwh94k59a2r2lj81y7h1fg3asck"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
+  missMethyl = derive2 { name="missMethyl"; version="1.15.0"; sha256="027avacdx9h4b2gj7sv0a1a38iaby0x882zbn25zh4fabgjclffv"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
+  missRows = derive2 { name="missRows"; version="1.1.0"; sha256="10wj9g5xy3y7zk3n0nnkvppj66zl226bd5cjbkgwicz8kb29n4ld"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; };
+  mitoODE = derive2 { name="mitoODE"; version="1.19.0"; sha256="1qkhf4y5cnwxv39lacdph3r030d9d4jc76lzgg9gl7gyk9801rhh"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
+  mlm4omics = derive2 { name="mlm4omics"; version="0.99.20"; sha256="1h6s1ddj73wy1v79vpvjsf5hkjyxf3fha5w2n2cqr89ix4k76l3l"; depends=[BH ggplot2 MASS Matrix Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  mogsa = derive2 { name="mogsa"; version="1.15.0"; sha256="02a9p3awa8lix75ghw8x0nm9dzccg57ydyg1hr5kxx3bq51lvj3v"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
+  monocle = derive2 { name="monocle"; version="2.9.0"; sha256="15m4221g6m5r8w3af9qk8jxqnqjjj31xvfcxi2n7dhfvqw4f35a1"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
+  mosaics = derive2 { name="mosaics"; version="2.19.0"; sha256="1d5b7rhxzzzlyapfq4fmml8k41fpha2bw398jzq6xsk52wfjjbiv"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
+  motifRG = derive2 { name="motifRG"; version="1.25.0"; sha256="0ramq5yk9ri04waj16vgcvr8jgd93afn2q8yr4avzaq9a1klsh7a"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
+  motifStack = derive2 { name="motifStack"; version="1.25.0"; sha256="0ry64xf3gsiapickxzhbh9sn4yhwnvg9vqxv6wrj565wl284zd1h"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
+  motifbreakR = derive2 { name="motifbreakR"; version="1.11.0"; sha256="1kaadjkcvdm1i8cpnz4qfyiwiffd0h61wx8mwa4x1xqyiwj5s04y"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
+  motifcounter = derive2 { name="motifcounter"; version="1.5.2"; sha256="0cs9cp09r6k63ap131ir13hcswipwshdzy2gg562v8yrnysvv96p"; depends=[Biostrings]; };
+  motifmatchr = derive2 { name="motifmatchr"; version="1.3.0"; sha256="0p1v2nbxw889ck8jsvw0qkxqxnpzqvha2k64r9f8xg2d06pfr7ya"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; };
+  mpra = derive2 { name="mpra"; version="1.3.0"; sha256="1bh73npgphq2xanx9sc9yz0dpcilcvwnwz030fpy2mvaipnrqpjc"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; };
+  msPurity = derive2 { name="msPurity"; version="1.7.1"; sha256="0jf1r0p2v20g87lirzi956vkrzm25px9q47pbjfw3k2hf4k97pwp"; depends=[DBI doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 RSQLite stringr]; };
+  msa = derive2 { name="msa"; version="1.13.0"; sha256="0z2haqbz22q1zxmks570vky1a1i101pscq2ryi50aj78g4k87ad1"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
+  msgbsR = derive2 { name="msgbsR"; version="1.5.0"; sha256="1hlpg3zd4w514f1p0c36jsgg0dlirmnw1fq5l734yabgbf6zkv3l"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; };
+  msmsEDA = derive2 { name="msmsEDA"; version="1.19.0"; sha256="0xni6k9ij49zzxlhnbhn6v0nij49m26cxyv6xdlwfp0jh37390gk"; depends=[gplots MASS MSnbase RColorBrewer]; };
+  msmsTests = derive2 { name="msmsTests"; version="1.19.0"; sha256="1kz9s9dc4rxz77k743ql6j84h2hv8fkbwl7707gqfs5789gj7w41"; depends=[edgeR msmsEDA MSnbase qvalue]; };
+  multiClust = derive2 { name="multiClust"; version="1.11.3"; sha256="0gjn9pl685pkl2yv6dbkdqr9hc3pcl39fk2h3nrd1irl7gf7isrw"; depends=[amap cluster ctc dendextend mclust survival]; };
+  multiMiR = derive2 { name="multiMiR"; version="1.3.0"; sha256="1zhpsipbcm1hqcc75nf0xjfm6v4nqc8bgp9pgj1v5q4ni8vffzsf"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; };
+  multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.5.0"; sha256="1z750jwpvcl679ikzlcyy0yrifx13abxy8wigsxwrbc4wcljqyqw"; depends=[doParallel foreach SummarizedExperiment]; };
+  multiscan = derive2 { name="multiscan"; version="1.41.0"; sha256="08s4rpikrjzhip9zpb5dc0fi98hj304qlcvxm1agi881awlvpkig"; depends=[Biobase]; };
+  multtest = derive2 { name="multtest"; version="2.37.0"; sha256="1xlizjdzvxn0i9gs1jpkb07fkkx1prrr1v5n6kfvff9izh40cx6j"; depends=[Biobase BiocGenerics MASS survival]; };
+  muscle = derive2 { name="muscle"; version="3.23.0"; sha256="110wvrf2isiw2by15vkxsds5sxy68l1vav8fq55f5f8lx77450yp"; depends=[Biostrings]; };
+  myvariant = derive2 { name="myvariant"; version="1.11.0"; sha256="14mskpia58g17ydcv2d535kslj0fwm8rm0n4mv1qm0rff81v5hn3"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
+  mzID = derive2 { name="mzID"; version="1.19.0"; sha256="0czwvilzp756qfyjzf6x4wskg7w35zwl3df3md4p03v95c1ynbdk"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
+  mzR = derive2 { name="mzR"; version="2.15.1"; sha256="0m9q5ja326wz7cjmd6b1lvkhjggg5mlw8mxaqa90fs4qz6cr8hw6"; depends=[Biobase BiocGenerics ProtGenerics Rcpp Rhdf5lib zlibbioc]; };
+  ncdfFlow = derive2 { name="ncdfFlow"; version="2.27.0"; sha256="0m29ncb8i4xndialy9x8iagyvamiacq6jvdbl8v9m0f18ygv9y81"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo Rhdf5lib zlibbioc]; };
+  ndexr = derive2 { name="ndexr"; version="1.3.0"; sha256="0558086vrjiliwpjyvwszy5dimq4p39x3gwiywx7jdjlzgwcv44q"; depends=[httr igraph jsonlite plyr tidyr]; };
+  nem = derive2 { name="nem"; version="2.55.0"; sha256="0y0yp1bq3ixkxdqjx4lbx5h1yfx2vsia2zpqnjjvp9hzqjddvvbl"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
+  netReg = derive2 { name="netReg"; version="1.5.0"; sha256="15dzz0068s38rxp0vjz9ssa09575xw5nggxl86r2zxcmb93x3yng"; depends=[Rcpp RcppArmadillo]; };
+  netSmooth = derive2 { name="netSmooth"; version="1.1.0"; sha256="1d2mpc9n32aah9dnmwk2bc44c9nq006i4xj79hg7z6cvsxkh67cb"; depends=[cluster clusterExperiment data_table entropy Matrix scater SingleCellExperiment SummarizedExperiment]; };
+  netbenchmark = derive2 { name="netbenchmark"; version="1.13.0"; sha256="0ssagk6gwdbrqwc037y05xjbnaiv7k5mq8rmwmx6y3d74jwwpb3d"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet PCIT pracma Rcpp]; };
+  netbiov = derive2 { name="netbiov"; version="1.15.0"; sha256="1njiy14g8pf4yps4npwsm4x883qgixwvv0f3p2pb69p9r4kg0phy"; depends=[igraph]; };
+  nethet = derive2 { name="nethet"; version="1.13.0"; sha256="0kvwwcwm4hx1r3f24s84pw19vms0aj0bacd79c3r7z26mlmzw7zh"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
+  netprioR = derive2 { name="netprioR"; version="1.7.0"; sha256="076b72g6b9k2zz277i6whjw49jcl6b3bmr9n652nc11d1ydwq3ic"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; };
+  netresponse = derive2 { name="netresponse"; version="1.41.0"; sha256="1spzd74z279rvpw0vpw3bw19gimhcdrcxk6hgxv1w7b0nllih606"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
+  networkBMA = derive2 { name="networkBMA"; version="2.21.0"; sha256="1gax5312r6cz4s1qxxlg8k63dlk4ja8b57c2br1q0kpcdgbwhrqr"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; };
+  nnNorm = derive2 { name="nnNorm"; version="2.45.0"; sha256="0m8zcv7kyv7ll6bw599nlihmssfizivkrfm1sqr1ndjwmc8b6blp"; depends=[marray nnet]; };
+  nondetects = derive2 { name="nondetects"; version="2.11.0"; sha256="0iiwvad8cb3g2a7701vci7g2qkvhc43arw4cw7zpmg46qk6yhvv0"; depends=[arm Biobase HTqPCR limma mvtnorm]; };
+  normalize450K = derive2 { name="normalize450K"; version="1.9.0"; sha256="01j9gp2d7b8n30ckf61ywncw0il81lf6d0sfczr39bqdq2x2xyj3"; depends=[Biobase illuminaio quadprog]; };
+  normr = derive2 { name="normr"; version="1.7.1"; sha256="15ajyr38km4fph8np8r171j4f97fwyvy0jcqdbs79gdh792h12sm"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; };
+  npGSEA = derive2 { name="npGSEA"; version="1.17.0"; sha256="0fw33zgrp9wkchddagsd93ijkspi20d8p7yvsqspqrjy3yv6yq3i"; depends=[Biobase BiocGenerics GSEABase]; };
+  nucleR = derive2 { name="nucleR"; version="2.13.0"; sha256="17fndr7wp7i31k3g18chm6nvqmh1di8s0l0v3kp61sn7v4qbfcc8"; depends=[Biobase BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr Rsamtools S4Vectors ShortRead]; };
+  nucleoSim = derive2 { name="nucleoSim"; version="1.9.0"; sha256="0bn8gihg4b70gmdyvn91i5adzfbkfaqcb59kv3y56dss04ss736j"; depends=[IRanges S4Vectors]; };
+  occugene = derive2 { name="occugene"; version="1.41.0"; sha256="13dqbp1kaan56xqlgfdqrld0l3qwky6487mf9j0g7788yxwl1fnm"; depends=[]; };
+  odseq = derive2 { name="odseq"; version="1.9.0"; sha256="0yyg4y77ch7x0f6xa10wnz8kydc2pjrrpbvdc448388acmmbpdbl"; depends=[kebabs mclust msa]; };
+  oligo = derive2 { name="oligo"; version="1.45.0"; sha256="1w36wqry07ml048q55xnckb2mldv4llivsc72b9j5vhn54776n9d"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
+  oligoClasses = derive2 { name="oligoClasses"; version="1.43.1"; sha256="14h79m2pq7a5472xh9rvbn5dfr07nczx0iz8g7jc7sji10jp83nd"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
+  omicRexposome = derive2 { name="omicRexposome"; version="1.3.0"; sha256="1x18vkfn1m8cwzwdg9lvpbmiprgpy3hs4x9h6jwqavgdnpq8lv60"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma omicade4 PMA SmartSVA stringr SummarizedExperiment sva]; };
+  omicade4 = derive2 { name="omicade4"; version="1.21.0"; sha256="055jnv8m9fhj2hixbc997mqv56p07azg40k8qb91mdc8fidypka6"; depends=[ade4 made4]; };
+  omicplotR = derive2 { name="omicplotR"; version="1.1.2"; sha256="0myr943y0dvpyh75sjc41cj9i77psmy7j60vl3y4daqd9vbgpkws"; depends=[ALDEx2 compositions knitr matrixStats rmarkdown shiny vegan zCompositions]; };
+  omicsPrint = derive2 { name="omicsPrint"; version="1.1.0"; sha256="0zsx8zabz07jyfl1xj28ak6k69jfrrig38psl7qny82ydz8bnbas"; depends=[MASS matrixStats MultiAssayExperiment RaggedExperiment SummarizedExperiment]; };
+  oncomix = derive2 { name="oncomix"; version="1.3.0"; sha256="0rpwkksxakhwhqvir646gj0x8b1nqsnc2cvjzvh0mlxvv4zmmc0n"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; };
+  oneSENSE = derive2 { name="oneSENSE"; version="1.3.0"; sha256="1krimcp6p2m6ls7vkkyfpacjxmg8fa1shwjw5cl2nvcgbn391k15"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; };
+  onlineFDR = derive2 { name="onlineFDR"; version="0.99.7"; sha256="18naq5jfds1njalqqsi6b1hs2sld55flnv63s8yk2cnhpjcfyq47"; depends=[]; };
+  ontoProc = derive2 { name="ontoProc"; version="1.3.1"; sha256="0hh9rha7b5y3hnahmk1mkmwi22bdrjnm6r7fym2lpgdaihs3b43z"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; };
+  openCyto = derive2 { name="openCyto"; version="1.19.1"; sha256="1i8n1yzrnmbl0h6ykqj9hl30nml8nvlvz4b975w1jh5sp21x0gcv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+  openPrimeR = derive2 { name="openPrimeR"; version="1.3.0"; sha256="0sq1f9ir2n9rrxa10cjwfsk1rwmi0aryd31z9zb9i5hciinv99gy"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; };
+  openPrimeRui = derive2 { name="openPrimeRui"; version="1.3.0"; sha256="08ysqxf6dl5rsbxgfv6z9llxclmqn2gwf775r3py0x49sx4ra2hn"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; };
+  oposSOM = derive2 { name="oposSOM"; version="1.19.1"; sha256="16rnwlay7m6y4cf9333bq7zwnp5lcy1i1p23zl0mcvzlb9mam4j1"; depends=[ape arules Biobase biomaRt fastICA fdrtool igraph pixmap scatterplot3d som tsne]; };
+  oppar = derive2 { name="oppar"; version="1.9.0"; sha256="0j26hqskvfv8qb13kmi4dcg3ylzxgwxl4xn4chvi5k8svli4r2qw"; depends=[Biobase GSEABase GSVA]; };
+  pRolocGUI = derive2 { name="pRolocGUI"; version="1.15.0"; sha256="0vrpylrnl02abj6akcp0fb06fk18k42xv78g5f4cyy2jqdgqgijq"; depends=[Biobase dplyr DT ggplot2 MSnbase scales shiny]; };
+  paircompviz = derive2 { name="paircompviz"; version="1.19.0"; sha256="1glli54k00gpm04p177hwgsdq352ypc7r8swbksk18j8xghk8cq4"; depends=[Rgraphviz]; };
+  pandaR = derive2 { name="pandaR"; version="1.13.0"; sha256="13mv40jsclngfzcapscw0wxv67dd2ym4kkpcvy2v03z37ak3n1fk"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; };
+  panelcn_mops = derive2 { name="panelcn.mops"; version="1.3.0"; sha256="17d8ms86xvhqprwazi3cnv3sxyaxmammkf3dczka78i0dwl0p0df"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
+  panp = derive2 { name="panp"; version="1.51.0"; sha256="1yrxsjc0r9z0nfgbc9n9p5mhqhyx7x76v7vcjah6hdv4svi78csc"; depends=[affy Biobase]; };
+  parglms = derive2 { name="parglms"; version="1.13.3"; sha256="0x8j7ffz8h7303n90v27wcb71x75m7j1rq4yz59iv9fpis16yj27"; depends=[BatchJobs BiocGenerics doParallel foreach]; };
+  parody = derive2 { name="parody"; version="1.39.0"; sha256="0lkv6csikcm2jw70gz3bkzjzj48w8dlx1gfc0sh5l49q2szn3fha"; depends=[]; };
+  pathRender = derive2 { name="pathRender"; version="1.49.0"; sha256="1ln36h3jy35398r92i5hm4qvcjfsmc0frpy4dpgi75ab1wgjzb1s"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; };
+  pathVar = derive2 { name="pathVar"; version="1.11.2"; sha256="1v0pia06qx995b9y4vllp844f5846877zyl587xz5026mnbr5p5l"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; };
+  pathifier = derive2 { name="pathifier"; version="1.19.0"; sha256="0sazl4wi6pivvr2r098parc8j68hq8apfjb0nk6vicfisx0dqk1h"; depends=[princurve R_oo]; };
+  pathprint = derive2 { name="pathprint"; version="1.11.3"; sha256="14x9i2gkra49aqnpi0xd94430nl05sw3yr85ramaxrzavm7lxvsf"; depends=[]; };
+  pathview = derive2 { name="pathview"; version="1.21.0"; sha256="0s8mq51gknca91qgy4q7fmgm4ga251w214f3zapc7zlxykb2qrys"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
+  paxtoolsr = derive2 { name="paxtoolsr"; version="1.15.0"; sha256="1fr6w5jbhj5rdsb53cafzsdn23b2rfcyyi6ivcfvn408x59cg3fg"; depends=[data_table httr igraph jsonlite plyr R_utils rJava rjson XML]; };
+  pbcmc = derive2 { name="pbcmc"; version="1.9.0"; sha256="1hxhpxixl5jfpiqpwqvkfcnp2k7sw43asc5ikj6qpl4p5xrrfn0d"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; };
+  pcaExplorer = derive2 { name="pcaExplorer"; version="2.7.0"; sha256="138a6qrg0cqq5n5565i5y4fzlbk79hjk11ziz8hh2dxbymv1h9mq"; depends=[AnnotationDbi biomaRt d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges knitr limma NMF pheatmap plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; };
+  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.25.0"; sha256="10c08lawhg1p7jydk2bb5z6rjn7pjrfr069s06syababq75j1pnw"; depends=[AnnotationDbi Biostrings ellipse]; };
+  pcaMethods = derive2 { name="pcaMethods"; version="1.73.0"; sha256="0k079s8fwqhwk5hmbl0rqi52nav2dzbbsilnn2a2x92c2rzfiqc0"; depends=[Biobase BiocGenerics MASS Rcpp]; };
+  pcot2 = derive2 { name="pcot2"; version="1.49.0"; sha256="0ffg35602h7k904dq47sgnfyky041alnypaf3gvx7m6f8yszq46c"; depends=[amap Biobase]; };
+  pcxn = derive2 { name="pcxn"; version="2.3.0"; sha256="1d7maq8vbxcs1bvz4qlc29583nbfq6jpan0gsqday51xj7ngqbcs"; depends=[pcxnData pheatmap]; };
+  pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.45.0"; sha256="15whr6rjdf75z6wg9k8zsyvfn08vidimzx2rw6ki1zmbh0fz8in6"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+  pepStat = derive2 { name="pepStat"; version="1.15.0"; sha256="08dpwiphw9s8dafy4m946jxi1jfyc3lzzdg4h0ax7d6knzq0za73"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
+  pepXMLTab = derive2 { name="pepXMLTab"; version="1.15.0"; sha256="1bwp82zvg65yrhlx1xk2jci9fqsgc83h1x7124ci2afzlvx56ms5"; depends=[XML]; };
+  perturbatr = derive2 { name="perturbatr"; version="1.1.0"; sha256="0cwk2f0bm9vlgdngb9blcpcwg2gl8ik0rdx0a6i36qzdd256qk91"; depends=[assertthat diffusr doParallel dplyr foreach formula_tools ggplot2 igraph lazyeval lme4 magrittr rlang scales tibble tidyr]; };
+  pgca = derive2 { name="pgca"; version="1.5.0"; sha256="1scxcrfs8b0rw38c0v569dnq2b5viqvm3ckjwm1gzqgxcjy6r324"; depends=[]; };
+  phantasus = derive2 { name="phantasus"; version="1.1.2"; sha256="1g4q9ff11i7xfw29g9mqwqvr1py4mwwddd0yr1dhw92abbc5w2z4"; depends=[assertthat Biobase fgsea GEOquery ggplot2 htmltools httpuv httr jsonlite limma opencpu protolite rhdf5 Rook stringr svglite]; };
+  phenoTest = derive2 { name="phenoTest"; version="1.29.0"; sha256="10mw83ivb99ipndjjc5r69wpsanfvzx01bfpzhq5pygjzhl6m8jb"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; };
+  phenopath = derive2 { name="phenopath"; version="1.5.0"; sha256="05a1d7apyhg4d4nahl97i0794fji6dnnd454wfww89adjx68nfnc"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; };
+  philr = derive2 { name="philr"; version="1.7.0"; sha256="165k6cnj08lpkw66zljiqqwfy1knd2n46mg734d0fiy72j2va4z2"; depends=[ape ggplot2 ggtree phangorn tidyr]; };
+  phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.5.0"; sha256="0m9lgg1wcyy3ppxvmkgdv5ccz48j5mw1fsxg21vw08hpm6fm9y60"; depends=[matrixStats plyr]; };
+  phyloseq = derive2 { name="phyloseq"; version="1.25.0"; sha256="1344gil3dsnvy92fsp91wvh6j1rd7xzjjapmjkvdz5rjs5rh0kd2"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
+  piano = derive2 { name="piano"; version="1.21.0"; sha256="1d7gld59bryzcvnvl6x8wx3v1wji58rs4zszsqpyz73qmw8ikw0d"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; };
+  pickgene = derive2 { name="pickgene"; version="1.53.0"; sha256="1nklcgm3wryljq22hc3fcja6x2kwa9bilp76gzhy8zpj8swwjszl"; depends=[MASS]; };
+  pint = derive2 { name="pint"; version="1.31.0"; sha256="10kwlp947h03w8xqcs9qcyp21wvx60sl47k2cnbrdhva3wf35vp3"; depends=[dmt Matrix mvtnorm]; };
+  pkgDepTools = derive2 { name="pkgDepTools"; version="1.47.1"; sha256="08wc5qklyddz5p237q75dipvykiksdr17xcd2qkfzj3138wfkgvy"; depends=[graph RBGL]; };
+  plateCore = derive2 { name="plateCore"; version="1.39.0"; sha256="0vf42ms3vky8n2n7x16kc284252zifjmch32lsww0lmsxv0h857n"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
+  plethy = derive2 { name="plethy"; version="1.19.0"; sha256="05v123qrpasl11kivp1p2ib0v638yi4y19gk4df8mfald95nxcmn"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
+  plgem = derive2 { name="plgem"; version="1.53.0"; sha256="04hwkr3v126mildi76jfr5b8s8lly9z60iydh5i3dc5zsyd6h84f"; depends=[Biobase MASS]; };
+  plier = derive2 { name="plier"; version="1.51.0"; sha256="1m7bwaypnaw7kk756k0wl6xi3s0j9awi986lpa8ncjv587q0442h"; depends=[affy Biobase]; };
+  plrs = derive2 { name="plrs"; version="1.21.0"; sha256="18k3xad3gmkw74klyvqzbvnlr1pq93is6dqxm2bxb4cmzar12f6k"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
+  plw = derive2 { name="plw"; version="1.41.0"; sha256="0q9dwj7rznhdj1h34ygnw0snfswnr8ycx0927jzsiiycz31n8z0f"; depends=[affy MASS]; };
+  plyranges = derive2 { name="plyranges"; version="1.1.8"; sha256="10p0i8q229gy0z3fg90m3xaib32v9w1zxcmn3gb87ipz9mic8ykk"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr rlang Rsamtools rtracklayer S4Vectors tidyr tidyselect]; };
+  pmm = derive2 { name="pmm"; version="1.13.0"; sha256="0p0xnkz6hgnpvai7947861kw5hmjwwf3zj2y423whdr7x2lpdayw"; depends=[lme4]; };
+  podkat = derive2 { name="podkat"; version="1.13.0"; sha256="1h297id3gxix06xmhqkl1lc5gfp4vi8jkfh2gpld4bw233fvi6h5"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
+  pogos = derive2 { name="pogos"; version="1.1.0"; sha256="1135bxxhamcxs5hn6hq43hc7s7cr9v0jy2884dz7f9qvgnrqhymi"; depends=[ggplot2 httr ontoProc rjson S4Vectors shiny]; };
+  polyester = derive2 { name="polyester"; version="1.17.0"; sha256="0dz73jsyx3yivpmxz7p1q14i2rvj388bq53d7w1mz3ixrqilzgz2"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
+  powerTCR = derive2 { name="powerTCR"; version="1.1.1"; sha256="0427r8qwy8j3z2mpvka2b6y2k39nwiy86gb06njs6m19f597936v"; depends=[cubature evmix magrittr purrr tcR truncdist VGAM]; };
+  ppiStats = derive2 { name="ppiStats"; version="1.47.0"; sha256="0prrs1g99g55i993689c6s497crijnl96z2qzgga1y9w4zbf6g88"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
+  pqsfinder = derive2 { name="pqsfinder"; version="1.9.0"; sha256="1igg500dvwq1lvxyl0c8fcdkgpmxzsxcd6c24pz0dhjqsaxml2as"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; };
+  prada = derive2 { name="prada"; version="1.57.0"; sha256="0isj6w4lzfsqwwzs3njddabn2xznjqhp0bbihwfvc31kiya9k8di"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
+  prebs = derive2 { name="prebs"; version="1.21.0"; sha256="0q5ibq492jw8axp50qijn0fsa5qxarxnlxz4s8hv3ql6rjlsiw8v"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
+  predictionet = derive2 { name="predictionet"; version="1.27.0"; sha256="0ls88pw7k1vy3qjzl91dj6kfbkgvz67448zhj1b3g308b33qasqk"; depends=[catnet igraph MASS penalized RBGL]; };
+  preprocessCore = derive2 { name="preprocessCore"; version="1.43.0"; sha256="13859ip42jk6j6ngs8bwkzfarrqzd0jzhq9kdgsnicl9kf9k9vj6"; depends=[]; };
+  proBAMr = derive2 { name="proBAMr"; version="1.15.0"; sha256="1cl1ns7m1d1n3ayhga7f45xrjx9cy2a8l9xs2z7x3074kx8h8xxg"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
+  proFIA = derive2 { name="proFIA"; version="1.7.0"; sha256="1qx79xamr77rjdfr50ms0dzrmwqwc2fzd24k2njbknxvz8kay5is"; depends=[Biobase BiocParallel minpack_lm missForest pracma ropls xcms]; };
+  procoil = derive2 { name="procoil"; version="2.9.0"; sha256="048wkmsidcw31mqjli2vspkf332ddx74dd709xbw5bkggw5l5a0b"; depends=[Biostrings kebabs S4Vectors]; };
+  profileScoreDist = derive2 { name="profileScoreDist"; version="1.9.0"; sha256="1jv9szg451ljggx458sgcgiaf1p6i7sin62lhbh6b8jn1s4h7qrw"; depends=[BiocGenerics Rcpp]; };
+  progeny = derive2 { name="progeny"; version="1.3.0"; sha256="0rini10n59yzyq7bzckbyxvvl2lgj35k4dzm72lx47cws8nlqyl0"; depends=[Biobase]; };
+  prot2D = derive2 { name="prot2D"; version="1.19.0"; sha256="1aawirq8plgdrz88yzzqh3p1m8y17ygf2l3a433lzrm3ffz6y3qx"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
+  proteinProfiles = derive2 { name="proteinProfiles"; version="1.21.0"; sha256="0zvgf4zmx42idyy8c6zfmf4gv22gxpyw1bs8285d9bfjk7qpvgwc"; depends=[]; };
+  proteoQC = derive2 { name="proteoQC"; version="1.17.0"; sha256="17a6wmkxr8jfb7nbwykfc562fgj4p8addq5idajag2ijaiycvzz5"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; };
+  psichomics = derive2 { name="psichomics"; version="1.7.0"; sha256="0vj20pw305p4i08s7kxj0np1xxi8mhdlasagypc76ysnlhq0w6bn"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; };
+  psygenet2r = derive2 { name="psygenet2r"; version="1.13.0"; sha256="0hpipknbcg3ic6sr19ksy1zs71h2kk3p1bvvhqy4xirajzqf3z41"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; };
+  puma = derive2 { name="puma"; version="3.23.0"; sha256="1h299ach0bff17az4vfa7dbb9x8z3b32mfmg322afpmfvj3xdqa7"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
+  pvac = derive2 { name="pvac"; version="1.29.0"; sha256="0ax1pndxw4knhas0cp54b9gyr3xjl6rriyif1sccmqrszswkdv06"; depends=[affy Biobase]; };
+  pvca = derive2 { name="pvca"; version="1.21.0"; sha256="0ayi9f2zd5f3c96w8kfb68nmd6idbg1l19h0ys1zdjgzz1dkqqc2"; depends=[Biobase lme4 Matrix vsn]; };
+  pwOmics = derive2 { name="pwOmics"; version="1.13.0"; sha256="0y4jsybxd6bcv9hqa25zij5lsbh55790njdy0p383pywbsn2dwvs"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots graph igraph rBiopaxParser STRINGdb]; };
+  qPLEXanalyzer = derive2 { name="qPLEXanalyzer"; version="0.99.9"; sha256="0kaa1y5m150b3c6chpkadcj5l446kjq2hhvwf17n1gn58gzmbalv"; depends=[assertthat Biobase BiocGenerics Biostrings dplyr GenomicRanges ggdendro ggplot2 IRanges limma magrittr MSnbase preprocessCore purrr RColorBrewer statmod stringr tibble tidyr]; };
+  qcmetrics = derive2 { name="qcmetrics"; version="1.19.0"; sha256="1m2q9lhvk9yicsn5anw88hvs3jg7wqfm9vhm1g43hbgjbqy4jzqj"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
+  qpcrNorm = derive2 { name="qpcrNorm"; version="1.39.0"; sha256="18h58d58c0hs804n0xzsn0ydp4xw5cvab447zxq50g4adajjf7r8"; depends=[affy Biobase limma]; };
+  qpgraph = derive2 { name="qpgraph"; version="2.15.0"; sha256="1q6lrhxq4zra6x3wx3ikc70np8yqz8b6hzgdiy4fxx6b4kjcpnd3"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
+  qrqc = derive2 { name="qrqc"; version="1.35.0"; sha256="1mcb7gpncr91lq95vmbf6skjm5hxqlzx25inac3zwj3j4q07ipnk"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
+  qsea = derive2 { name="qsea"; version="1.7.3"; sha256="11icpr1x374r77kn7fdlys37m8q6xi7g84gnn6m0wdx7srla3aal"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; };
+  quantro = derive2 { name="quantro"; version="1.15.0"; sha256="1r9q1kmql8fgdnljgb17simjkfdm14nn0fxmrh09ijg8640bdis4"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
+  quantsmooth = derive2 { name="quantsmooth"; version="1.47.0"; sha256="1w2gwaxy90s6laghgdhxqb0c0s93ci8g61zbrn7xjpd6af1vz1md"; depends=[quantreg]; };
+  qusage = derive2 { name="qusage"; version="2.15.0"; sha256="025xjbaw1mkvh0wa656l851f1c2m4sjxqb6xvjks3fz4bwlrk2xr"; depends=[Biobase limma lsmeans nlme]; };
+  qvalue = derive2 { name="qvalue"; version="2.13.0"; sha256="1g6lfgn73z68imy6qmh9s1zyniaq1wyx8jyllrk4lxpgk17i5dgh"; depends=[ggplot2 reshape2]; };
+  r3Cseq = derive2 { name="r3Cseq"; version="1.27.0"; sha256="13cswnxp8ikv95xb3szn7br7xm5ml3mpj365vxhaky2s1x9kxr9p"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
+  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.21.0"; sha256="0bgxw31ivqmzykxhrnzrswf39kxp7sj9kpi4fz8pxggjwnb59pfl"; depends=[data_table XML]; };
+  rCGH = derive2 { name="rCGH"; version="1.11.2"; sha256="10284xrdqh0pbn8a3ibwr2znf3lajnimli93lrhs4d60cna8wp9n"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; };
+  rDGIdb = derive2 { name="rDGIdb"; version="1.7.0"; sha256="12c3ly2x1wc9ry514vzks20drv8q1r19sflhpnwhbc00lmh13s1k"; depends=[httr jsonlite]; };
+  rGADEM = derive2 { name="rGADEM"; version="2.29.0"; sha256="1bqzmawhz1m00zcbnvznxzvak5f1b65xalr7sgas2sbrd77lvrhr"; depends=[Biostrings BSgenome IRanges seqLogo]; };
+  rGREAT = derive2 { name="rGREAT"; version="1.13.2"; sha256="18cfmvcmk60shrg2pd2qwi1s5679sbrv846vac2py29f6c7gq5zl"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
+  rHVDM = derive2 { name="rHVDM"; version="1.47.0"; sha256="1y8dkws06j7jh6rnlq3y91bn5wy8fn2ha224mmvx4qchp6y9xcxd"; depends=[affy Biobase minpack_lm R2HTML]; };
+  rMAT = derive2 { name="rMAT"; version="3.31.0"; sha256="0d2hn2jjs6c5xjwf6w0m9v53bb9mfpqvmms5vnzhwh6z3jankavm"; depends=[affxparser Biobase BiocGenerics IRanges]; };
+  rRDP = derive2 { name="rRDP"; version="1.15.1"; sha256="0m00070c87za48a4in8bqzb3l77177jqys2ya6wv6xylmfig899j"; depends=[Biostrings]; };
+  rSFFreader = derive2 { name="rSFFreader"; version="0.29.0"; sha256="1302ln1sshljannk1wkig4hf4cr5zk98z091jvbgs8icfg7k12by"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
+  rTANDEM = derive2 { name="rTANDEM"; version="1.21.0"; sha256="1n7yaycgh5822j119si8i66yn0asg1mz9a9g7idiyvj8gpq54fv5"; depends=[data_table Rcpp XML]; };
+  rTRM = derive2 { name="rTRM"; version="1.19.0"; sha256="1x8gbrn4b80v52isxg8a5rhkwijnlx649xyipnj206ky6ihzd3hc"; depends=[AnnotationDbi DBI igraph RSQLite]; };
+  rTRMui = derive2 { name="rTRMui"; version="1.19.0"; sha256="0gw5yx609nzk8r8qc7q9zgkfs32s79d8v1zpw2njcb5d6figs7b1"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
+  rWikiPathways = derive2 { name="rWikiPathways"; version="1.1.0"; sha256="0vcqrcg90npn3rmwkywnf0qnjwxw491mn0xrski70yyij2lylckg"; depends=[caTools httr RJSONIO]; };
+  rain = derive2 { name="rain"; version="1.15.0"; sha256="0zrxh7bmc9x9rh6zbb0zmv3nvz6l7hqq21h4gh3rzzyjy79vw3aj"; depends=[gmp multtest]; };
+  rama = derive2 { name="rama"; version="1.55.0"; sha256="0kmp25yw86vqxf43br2j75svvaprz97s5nvnxxjxbjwiigbjla7h"; depends=[]; };
+  ramwas = derive2 { name="ramwas"; version="1.5.0"; sha256="0g794y9xawkrfcylasjjv123rlsz1yfrdl89nrr4i99jfw7innw2"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; };
+  randPack = derive2 { name="randPack"; version="1.27.0"; sha256="0s7460iz01vmkf4a8g3vn6hrfx94bp5mihfyjkcv46nd9p3k6af5"; depends=[Biobase]; };
+  rbsurv = derive2 { name="rbsurv"; version="2.39.0"; sha256="08lh9hn97sc0rx9vmkd977kpijs6gqa6r89my7afsvmkm8v7n7ls"; depends=[Biobase survival]; };
+  rcellminer = derive2 { name="rcellminer"; version="2.3.0"; sha256="0rm5azbpyfsdaqxmip7wyw8f5apwac8s6n6cm0sqdwwsslm5dsl4"; depends=[Biobase fingerprint ggplot2 gplots rcdk rcellminerData shiny stringr]; };
+  readat = derive2 { name="readat"; version="1.7.0"; sha256="186hx7r5gvybvp1f6yzpi515b7hsv3a6il02hwpr8y1xdx3408nv"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_sets assertive_types Biobase data_table dplyr magrittr openxlsx pathological reshape2 stringi SummarizedExperiment testthat tidyr]; };
+  reb = derive2 { name="reb"; version="1.59.0"; sha256="0sdlhx64sh55waxj47hz9kfb6bvxrw4ycyzj5cycr1w3sk2idszc"; depends=[Biobase idiogram]; };
+  recount = derive2 { name="recount"; version="1.7.2"; sha256="17cymdrkr9aiszv98qfsy7das1ain2g0g8q4f8ik7bk868ahsaj2"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
+  recoup = derive2 { name="recoup"; version="1.9.0"; sha256="0z13mj7b5hywp5mbk0faq01k7d1mpnz2b9633h75hkh04w5260n9"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
+  regionReport = derive2 { name="regionReport"; version="1.15.1"; sha256="12mbpblgg0lf3kixi1isx92jkxxcnifhwq03ipgigrkd0iv9s7q6"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
+  regioneR = derive2 { name="regioneR"; version="1.13.0"; sha256="0iy118hy66d7wina49sh7xwi0akx9hp7k98gwfjc0bpwdj7gs1h9"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; };
+  regsplice = derive2 { name="regsplice"; version="1.7.0"; sha256="1gl5isfrqi0xyb4mdv7j6sb8ah4mzmwkaal1kcphjsrj8g46ba80"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; };
+  restfulSE = derive2 { name="restfulSE"; version="1.3.1"; sha256="02jq9gjf7z70ny1bmywx39igxm29nkmc6qv1acy81gxxpsr8naih"; depends=[AnnotationDbi AnnotationHub bigrquery Biobase DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client rlang S4Vectors SummarizedExperiment]; };
+  rfPred = derive2 { name="rfPred"; version="1.19.0"; sha256="0xnb68s8iw01cnxma5iqyfki4f30i4if7kxc9p0i8w1nv3jf28xj"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
+  rgsepd = derive2 { name="rgsepd"; version="1.13.0"; sha256="128dqx7qzs9pf7ffxn94g8krkyryhcvj4wq9m1mdfj024yl4s04i"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
+  rhdf5 = derive2 { name="rhdf5"; version="2.25.4"; sha256="129jzsqfswv6vhvfypqm9wcsnm94blq2zmjcp78c1vcjxc2i4li6"; depends=[Rhdf5lib]; };
+  rhdf5client = derive2 { name="rhdf5client"; version="1.3.3"; sha256="0iyhqsnfr7c9z7zk80i6i15f7sqkb28nakjxccldhn0g8xkaavq9"; depends=[DelayedArray httr rjson S4Vectors]; };
+  riboSeqR = derive2 { name="riboSeqR"; version="1.15.0"; sha256="0cwf51cish38slfv3cqfn4rqjs8k9wwwph0n4w7wd4dh7c9p2rmn"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; };
+  rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.39.0"; sha256="07q9dblld6ns943ppjdl1xlbzhg3yvxci8v1x2kbifqwlvv2lzs6"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
+  rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.11.0"; sha256="0r1n74x5xbp264ap9xsndiich89cv2140whi6ax179dpjs57ikaa"; depends=[RColorBrewer]; };
+  roar = derive2 { name="roar"; version="1.17.0"; sha256="09wmsfn4lqzj8ffqlf5z9npx4v0y3bpvxrm6b5rggc3prlq9m4qb"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; };
+  rols = derive2 { name="rols"; version="2.9.1"; sha256="0lzwl32zd61cj57ndxs9y74bclfpwl7s590a81cj99kidz6sx0c3"; depends=[Biobase BiocGenerics httr jsonlite progress]; };
+  ropls = derive2 { name="ropls"; version="1.13.6"; sha256="1gbjnpm5phimfgg2qfav04wc4aabvinj8gxirw9f6gp1wra0kbyr"; depends=[Biobase]; };
+  rpx = derive2 { name="rpx"; version="1.17.0"; sha256="0h5s2dwnpn7qqk5wk7128agdh9av9jzxhix4xrl0nhdd3jzi202y"; depends=[RCurl xml2]; };
+  rqt = derive2 { name="rqt"; version="1.7.0"; sha256="1iai2g1k7ybdlmw4r9k2zqdqq58ayggzs0gzdrn1bxmgp83v87fv"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; };
+  rqubic = derive2 { name="rqubic"; version="1.27.0"; sha256="06pp8ha9va9hkr5s7dmw6xsxs55sv0cn9vwysja0n4hdbbh5fx9v"; depends=[biclust Biobase BiocGenerics]; };
+  rsbml = derive2 { name="rsbml"; version="2.39.0"; sha256="0ch87r9v7yxxqab81n99silsi6am7vwf1fzg43jg8x5726yz4pip"; depends=[BiocGenerics graph]; };
+  rtracklayer = derive2 { name="rtracklayer"; version="1.41.3"; sha256="1z8g303smfg3c3rax3c9fx4017fy9ch5sbvqsiincykigjsrn21b"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+  runibic = derive2 { name="runibic"; version="1.3.1"; sha256="1l1rywk4lhgssmysd8998gd1wr5ms08s2s8skq2ss6qcxp1qrnvi"; depends=[biclust Rcpp SummarizedExperiment testthat]; };
+  sRAP = derive2 { name="sRAP"; version="1.21.0"; sha256="1mfailybmpa5ikc372qcfp57rnsksv6kn4x48bf6c0g5vln2kpjh"; depends=[gplots pls qvalue ROCR WriteXLS]; };
+  sSeq = derive2 { name="sSeq"; version="1.19.0"; sha256="19d7xj3bqvvlxl23i08ab8ja53342nzi658a1f7xzf7khgp58fg9"; depends=[caTools RColorBrewer]; };
+  safe = derive2 { name="safe"; version="3.21.0"; sha256="12h9d3dradnnkmhxz94d1b191q6xvx74nvp9y9y46yla7rxqpzma"; depends=[AnnotationDbi Biobase SparseM]; };
+  sagenhaft = derive2 { name="sagenhaft"; version="1.51.0"; sha256="0mvj275rrqvz53fsv48c5gd3lzxmwh036353bmw7jswb1mrrv5qz"; depends=[SparseM]; };
+  samExploreR = derive2 { name="samExploreR"; version="1.5.0"; sha256="1gnlrkvyzw36m3da67vz7g8cfrrk4lg0yg2b9svhf3rjhfq6sjvv"; depends=[edgeR ggplot2 RNAseqData_HNRNPC_bam_chr14 Rsubread]; };
+  sampleClassifier = derive2 { name="sampleClassifier"; version="1.5.0"; sha256="08lr8b0dg489mfiljnpqdryflim8m902b66fl8qkkn5hm842dm22"; depends=[annotate e1071 ggplot2 MGFM MGFR]; };
+  sangerseqR = derive2 { name="sangerseqR"; version="1.17.0"; sha256="02v0khp8dksvj8h0p3py5cdxwgbla9hv60mrj6ay2d6yyv2w0vz6"; depends=[Biostrings shiny]; };
+  sapFinder = derive2 { name="sapFinder"; version="1.19.0"; sha256="0f0k3afijnj0h6bh46cnkm3gajdsvngamcw2q5xbdrafidrk6npm"; depends=[pheatmap Rcpp rTANDEM]; };
+  savR = derive2 { name="savR"; version="1.19.0"; sha256="1lzlrpv244pnwmf3347r7l5vwz0cd4hlm9nvlpdlvv8glvf7v4ay"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
+  scDD = derive2 { name="scDD"; version="1.5.0"; sha256="1s2a4nz3ys4vllk9dphwskqrw2bb9shkqx4bismprn0b7qcmnv9j"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; };
+  scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.1.0"; sha256="0d4rrrk4fdrnrf7rdqwz915sg7m81w0fzfrrnjzpsncpwzkqa1pg"; depends=[dplyr ggplot2 magrittr rlang tibble]; };
+  scPipe = derive2 { name="scPipe"; version="1.3.7"; sha256="1gvpkcxjal81r5vh4f16ll9p0nj70iyp8gp5c9rkg2pr0p28ryx3"; depends=[AnnotationDbi BiocGenerics biomaRt GGally ggplot2 MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase S4Vectors scales SingleCellExperiment SummarizedExperiment testthat zlibbioc]; };
+  scater = derive2 { name="scater"; version="1.9.6"; sha256="0yxw73fvxyvq99lnpwp4j4mf2jy6zkyw934ql2y2avbnyclj4id5"; depends=[beachmat Biobase BiocGenerics data_table DelayedArray DelayedMatrixStats dplyr ggbeeswarm ggplot2 limma Matrix plyr Rcpp reshape2 rhdf5 Rhdf5lib rjson S4Vectors SingleCellExperiment SummarizedExperiment tximport viridis]; };
+  scde = derive2 { name="scde"; version="2.9.0"; sha256="1zmhbjdy9v2v11q261l7gwjm77qpiyqdskgbkcaxf7a65wbzs90r"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; };
+  scfind = derive2 { name="scfind"; version="1.3.0"; sha256="08xkvmjd6p6vsnfk7a5y4586b9r3ap7l9ig0g6cd6cj8pjhvf51b"; depends=[bit dplyr hash Rcpp reshape2 SingleCellExperiment SummarizedExperiment]; };
+  scmap = derive2 { name="scmap"; version="1.3.0"; sha256="0pnflc49ysq7sxcg0ddcapi65vfjq3zl9pnz119hjr6avp8sjmhy"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; };
+  scone = derive2 { name="scone"; version="1.5.0"; sha256="0n49j4z48zfrrj7a9nv538vyi5611w5r68rw9w99c28k2n6lvril"; depends=[BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; };
+  scoreInvHap = derive2 { name="scoreInvHap"; version="1.3.1"; sha256="1nysi4blc9rxfsq4kwyyq9nbzdww7xfwgrcw8czvnfca59dbfgdq"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; };
+  scran = derive2 { name="scran"; version="1.9.10"; sha256="1c55i0iq6dfhxdmnps440d0i1lsidj2wx0v2a476lks4hi32bwsf"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dynamicTreeCut edgeR igraph kmknn limma Matrix Rcpp Rhdf5lib S4Vectors scater SingleCellExperiment statmod SummarizedExperiment]; };
+  scsR = derive2 { name="scsR"; version="1.17.0"; sha256="1ppw53nl05rfs7jkgr464pa24yrczlvh7yfgmn5apd3yxbmf9i9w"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
+  segmentSeq = derive2 { name="segmentSeq"; version="2.15.0"; sha256="07cm7314vjhsara5ngs3j0gi7fjbdvn51r6s7ifxm6vij43ivpqs"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
+  semisup = derive2 { name="semisup"; version="1.5.1"; sha256="170x6s5q1lja64p4ldpravlaal8vs7rzqk8lyvrydsg02ss7vj7h"; depends=[SummarizedExperiment VGAM]; };
+  seq2pathway = derive2 { name="seq2pathway"; version="1.13.0"; sha256="03gbim70cnym2ga6zynj67r9ad1j4hrgydzzsi8r1nykkmjlk5lj"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
+  seqCAT = derive2 { name="seqCAT"; version="1.3.3"; sha256="0s3r550w41x5kdzqjnk2ypp2fn3sd8qn8b85s4h8rdzyc8brp0d8"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges lazyeval S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; };
+  seqCNA = derive2 { name="seqCNA"; version="1.27.0"; sha256="03zxkdcvxgjjhciv1w9l9gdj21ljqrw3c9cgkf2pqp3jk0swpaa7"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; };
+  seqLogo = derive2 { name="seqLogo"; version="1.47.0"; sha256="1hqfgxd7yvh7lm5q3qfhlkiy0pq5ffxls317miivsgid28shwmwk"; depends=[]; };
+  seqPattern = derive2 { name="seqPattern"; version="1.13.0"; sha256="1xm7f3z29ahyiiy8586yfy5m4cqalws8hsyp8yc9xybw0mwdpyhg"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
+  seqTools = derive2 { name="seqTools"; version="1.15.0"; sha256="0qnj79xhgflhjcrd2n61fmx099q83iil8hy6pq7jzhnzhg4572pj"; depends=[zlibbioc]; };
+  seqbias = derive2 { name="seqbias"; version="1.29.0"; sha256="1lv6wcqzlr40jmwac9s07ixx9vyikkc5a8f5wjmip9gglyy7m5f4"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
+  seqcombo = derive2 { name="seqcombo"; version="1.3.0"; sha256="1l4n2472kr4kimf4aq8v5whqwjpzwbkisfrf74wjljdj43903dr2"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr rvcheck]; };
+  seqplots = derive2 { name="seqplots"; version="1.19.0"; sha256="1qx7b2jzhprncgff4n88w7kq10hp98a6bcky0lq4z8rjf3ksaph7"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; };
+  seqsetvis = derive2 { name="seqsetvis"; version="1.1.2"; sha256="0az4s9v69b57fnisc5ln827da7cyhx16wwzh5cx8qqhkffzn323s"; depends=[data_table eulerr GenomicRanges ggplot2 IRanges limma png RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+  sesame = derive2 { name="sesame"; version="0.99.3"; sha256="1dz1jx4cmpbis0h3mmk5p7h6ybprsrnvdbzcv6kj0h0q31al2rg9"; depends=[DNAcopy GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore R6 randomForest sesameData wheatmap]; };
+  sevenC = derive2 { name="sevenC"; version="1.1.0"; sha256="05h05y7nkq73igsv54znawrzav7ijvrzwqsbpw8di43fah1klpg7"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; };
+  sevenbridges = derive2 { name="sevenbridges"; version="1.11.0"; sha256="1c3mj8k5fscj4hcg7rm12zjfp9hbwlp9k83hi8ijq55iw66jp399"; depends=[curl docopt dplyr httr jsonlite miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
+  shinyMethyl = derive2 { name="shinyMethyl"; version="1.17.0"; sha256="0cs3s08mijpcz598d07as3yl0fcw3x5q6q1lxmq29x36kmfz6yrg"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
+  shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.19.0"; sha256="0yvf4rxpki7xb7f7yckxrm7ycsx2clqn13smc2m7ihdyvg5kw941"; depends=[mixtools rTANDEM shiny xtable]; };
+  sigFeature = derive2 { name="sigFeature"; version="0.99.4"; sha256="011drdrq1pj37jbp8289rws1nmhbyivghbfpkirj6g4wc6pnpghn"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; };
+  sigPathway = derive2 { name="sigPathway"; version="1.49.0"; sha256="0fzqf17xqb0f2af9lz392l656naddann4wsxn233d28dajdvw5rx"; depends=[]; };
+  sigaR = derive2 { name="sigaR"; version="1.29.0"; sha256="0lmv6m0rb7pnrqp6gd8klni3vd0rb98xscfx7qb5xpkihqcnya9s"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; };
+  siggenes = derive2 { name="siggenes"; version="1.55.0"; sha256="1lfw6ny0s76jcypqin49raz1zrbl1rwds3646c8h52rd37c4hdx0"; depends=[Biobase multtest]; };
+  sights = derive2 { name="sights"; version="1.7.0"; sha256="0ygld23zpqqa7xalbq1kyf6x03kpqbmicr4hrysjk54h3r5pv56y"; depends=[ggplot2 lattice MASS qvalue reshape2]; };
+  signeR = derive2 { name="signeR"; version="1.7.1"; sha256="1xmz6b33n0idby69739mm8frv4l95g8rsdcp98dg6fhpf2s49ky3"; depends=[BiocGenerics Biostrings class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; };
+  signet = derive2 { name="signet"; version="1.1.0"; sha256="1rdmq4x0xf13hl54f2nbnckz8nci9391g6l00zznv1vzykp6awdm"; depends=[graph igraph RBGL]; };
+  sigsquared = derive2 { name="sigsquared"; version="1.13.0"; sha256="11bjd0bq2kf4inkybx7hkf970ma8rhwvagrlwxnxafh8nzw5amn8"; depends=[Biobase survival]; };
+  similaRpeak = derive2 { name="similaRpeak"; version="1.13.0"; sha256="1lgs161banaxsi22ydgmw1jpf04h7js92sqzir5v7ms0h12nym15"; depends=[R6]; };
+  simpleaffy = derive2 { name="simpleaffy"; version="2.57.0"; sha256="0yc44svjmh2vr1z3a77nvmas7kfcl0p6rjygq6ax477rvzldw7rq"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
+  simulatorZ = derive2 { name="simulatorZ"; version="1.15.0"; sha256="1x90bakarcp01h72536yr0ks2w3a64l0lwvdvka8whwm72sh8255"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
+  sincell = derive2 { name="sincell"; version="1.13.0"; sha256="0mqm5qrb5nrcpigpvkjvhs0fh386x9lm6p5ns1vl38gvdq9yqvi3"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
+  singleCellTK = derive2 { name="singleCellTK"; version="1.1.5"; sha256="180klrpaq8dz484xpd76aif2n5jyqxi4l0lr969v0yby9hn9jvyq"; depends=[AnnotationDbi ape Biobase circlize cluster colourpicker ComplexHeatmap data_table DelayedArray DESeq2 DT ggplot2 ggtree gridExtra GSVA GSVAdata limma MAST matrixStats multtest plotly RColorBrewer reshape2 Rtsne S4Vectors shiny shinyalert shinyjs SingleCellExperiment SummarizedExperiment sva]; };
+  singscore = derive2 { name="singscore"; version="1.1.0"; sha256="1n21cikl874xhbx2c0nd678p53s6gvavih3dz2cbm1l1mprn5gx1"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel ggsci GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape SummarizedExperiment tidyr]; };
+  sizepower = derive2 { name="sizepower"; version="1.51.0"; sha256="0g0f5z0ccypk7m81b2nhrrj86fv1fin96qm8wba2j6ib2wf0p4np"; depends=[]; };
+  skewr = derive2 { name="skewr"; version="1.13.1"; sha256="0kgs9xf1609y0na5d9lrl6gj3rrpraagbhnhh9iq3p5b0r1ad92m"; depends=[IlluminaHumanMethylation450kmanifest methylumi minfi mixsmsn RColorBrewer S4Vectors wateRmelon]; };
+  slalom = derive2 { name="slalom"; version="1.3.0"; sha256="0b68dq85h3rq0q4lbiv7zv4wg1prf79kh96m06hg9dp6336wy60w"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; };
+  slingshot = derive2 { name="slingshot"; version="0.99.8"; sha256="0yafvan6py8m4xnhx89hipzv4kbyviivxgn07mp74falci5f9mxw"; depends=[ape clusterExperiment igraph matrixStats princurve rgl SingleCellExperiment SummarizedExperiment]; };
+  slinky = derive2 { name="slinky"; version="0.99.18"; sha256="09074wzn1534x76fczfcj6jl94vgv33yq3vhzsv1m342kwqn3mi5"; depends=[curl dplyr foreach httr jsonlite readr rhdf5 SummarizedExperiment tidyr]; };
+  snapCGH = derive2 { name="snapCGH"; version="1.51.0"; sha256="0qfkc3sa8inlnviw5wx36nyy71b59xas9rqsmfb4j32nxdhqj64p"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
+  snm = derive2 { name="snm"; version="1.29.0"; sha256="052mayih2hdgsgklqhvzmvnvx82ch8q4jvpx8ch5rp4k4g0qlqyj"; depends=[corpcor lme4]; };
+  snpStats = derive2 { name="snpStats"; version="1.31.0"; sha256="1pxdf5qnibp6szwsllcayqxm9164yl30awfizlv6jmphfkah2i35"; depends=[BiocGenerics Matrix survival zlibbioc]; };
+  soGGi = derive2 { name="soGGi"; version="1.13.0"; sha256="1xg6yaprmafl861g66j5pymlg1hpjanyibyi3zkrd15avvxw23g9"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.5.0"; sha256="15vpj6v1x84zfy7vblhkm1vsv8hp5qa0fhfgfxbnzc5v28g1g41h"; depends=[MASS MCMCpack optparse tmvtnorm]; };
+  specL = derive2 { name="specL"; version="1.15.0"; sha256="1xdfsvq7i9g2pbr0fh0awdwvl3j5ggk1r0n5bxhq7s2p4kjppxc6"; depends=[DBI protViz RSQLite seqinr]; };
+  spikeLI = derive2 { name="spikeLI"; version="2.41.0"; sha256="1wx57idxn0wbg9mcfxdydcs5fbxmarsvv4hjcp62r5dpp4ymhcsb"; depends=[]; };
+  spkTools = derive2 { name="spkTools"; version="1.37.0"; sha256="12nwaifk726dr0lh6yf8xaxdmhlybiy88fwc1qypm3kvw6jff6ma"; depends=[Biobase gtools RColorBrewer]; };
+  splatter = derive2 { name="splatter"; version="1.5.1"; sha256="0anp2ipvagv2vfhnk0yzldmn9s1z3liqmmqrs23s1yfi9dasdgbs"; depends=[akima BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
+  spliceSites = derive2 { name="spliceSites"; version="1.29.0"; sha256="1ivw3zsy5jggacvcby2nx9g9h0r1vvj331qpxxnvzajp9j0187yq"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
+  splicegear = derive2 { name="splicegear"; version="1.53.0"; sha256="15bc3wmz3rz2jipgfj51bj2shr5cy941vnzxnk277yzh5wvz9hvc"; depends=[annotate Biobase XML]; };
+  splineTimeR = derive2 { name="splineTimeR"; version="1.9.0"; sha256="114c641vyi585yl11czkq5n8gl01q6h8q34g427sj7aspqpf8lkc"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
+  splots = derive2 { name="splots"; version="1.47.0"; sha256="18yb8ifayd8cjs7najls4bzw0z3s9pyyid54vhcg1ll6860crymw"; depends=[RColorBrewer]; };
+  spotSegmentation = derive2 { name="spotSegmentation"; version="1.55.0"; sha256="16zbzf05pg39vs6k1yvdsi880vfa3im4bq7rvyg8fvffb07pxr5l"; depends=[mclust]; };
+  srnadiff = derive2 { name="srnadiff"; version="1.1.0"; sha256="1zn43lad3q5cvajr5zw07rcd1q95528xr3kcvr0b0j2c2wqd9q5v"; depends=[BiocParallel BiocStyle DESeq2 devtools GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  sscore = derive2 { name="sscore"; version="1.53.0"; sha256="0p6klmcl2zd4i8qmmqj043p310grjmi6b2d610wanas03f0jdv71"; depends=[affy affyio]; };
+  sscu = derive2 { name="sscu"; version="2.11.0"; sha256="0hnzxyyp82psjddh97kw3g533aiczkji858jl1xqi1kbr02avwc0"; depends=[BiocGenerics Biostrings seqinr]; };
+  ssize = derive2 { name="ssize"; version="1.55.0"; sha256="061gpsj4dlzxii5ar3rdbc0kpvwby9639l3pk8vfslvcbl290w9f"; depends=[gdata xtable]; };
+  ssviz = derive2 { name="ssviz"; version="1.15.0"; sha256="18yz1jy0rl4r7ws21kyl1rjix81jkrqbqhqxgn9qf7zsssynxjf9"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
+  staRank = derive2 { name="staRank"; version="1.23.0"; sha256="1gqvfbs15hdg7fkz6yxjxwn227am7lj372yhiiadgm629bwgcyxi"; depends=[cellHTS2]; };
+  stageR = derive2 { name="stageR"; version="1.3.25"; sha256="0gq5j7an4m0npc7vx4p8csiwhsdhx9p48gfjp3gds2jjrlnrpsc0"; depends=[SummarizedExperiment]; };
+  statTarget = derive2 { name="statTarget"; version="1.11.0"; sha256="06cwz5mwlc580bj2pqli08a6ia4q68d792jx0ssjhk6ggh58czqp"; depends=[gWidgets2 gWidgets2RGtk2 impute pdist pls plyr randomForest ROC rrcov]; };
+  stepNorm = derive2 { name="stepNorm"; version="1.53.0"; sha256="1iq4kv3dj8nr9nqd4nnrndss4ypc87a9pl389ha9q671ifqahaii"; depends=[marray MASS]; };
+  subSeq = derive2 { name="subSeq"; version="1.11.0"; sha256="0grwj60ax5i9z3bg04wi73pq9qx5mizldc059ja23f4rkk4nq7vg"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
+  supraHex = derive2 { name="supraHex"; version="1.19.0"; sha256="0m4plhy7v0rfxr8ysndyqmd1x9nbf2y3hbka5gvs3zmi45wd4rds"; depends=[ape hexbin MASS]; };
+  survcomp = derive2 { name="survcomp"; version="1.31.0"; sha256="0r95jgddlvgx61jwsjgdqb2npm4mi19jyrqw2349h3bds6w1r840"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+  sva = derive2 { name="sva"; version="3.29.0"; sha256="0xrqhnayir6c3hz7yw35rlscgbv6hp0s798v5qmlgdfk4s2x1sq4"; depends=[BiocParallel genefilter limma matrixStats mgcv]; };
+  swfdr = derive2 { name="swfdr"; version="1.7.0"; sha256="1bnqmz6vcj79j6cp15gla9lmsa3d96m790f5yl9vffbcj48n0rlc"; depends=[dplyr ggplot2 reshape2]; };
+  switchBox = derive2 { name="switchBox"; version="1.17.0"; sha256="01bx0ij8ylk0r1hn73mq2dhf07mw8z44bw3mhrydhr8byp0rqz0c"; depends=[gplots pROC]; };
+  switchde = derive2 { name="switchde"; version="1.7.0"; sha256="0kicwjsm5k7glcqp3q19aq2cqdyh3s6jblzp836xgygwxm1yab2m"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; };
+  synapter = derive2 { name="synapter"; version="2.5.1"; sha256="0nmkyza5a7lzmdpv50s7zn1gd30w4xvjlxaycg8id1n2cjzazq75"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; };
+  synergyfinder = derive2 { name="synergyfinder"; version="1.7.0"; sha256="0v76jdh7dh9hhjgxfbls529lrv1wkjvaym39s7ahm3p1njycx05d"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; };
+  synlet = derive2 { name="synlet"; version="1.11.0"; sha256="0ijhssagav4hw7nm8x5157crdv4i8yhikrk6qf9w134lkkl0mviq"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
+  systemPipeR = derive2 { name="systemPipeR"; version="1.15.1"; sha256="1ljvvsbwnn03czl8rckbx4rlnggh29y133k95ldj3p8vjn61f23r"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+  tRNAscanImport = derive2 { name="tRNAscanImport"; version="1.1.1"; sha256="0b9qr0wkbdy31j1jnxi6k883avr60shx8v111ra3pjvrfnczl933"; depends=[assertive BiocGenerics Biostrings GenomeInfoDb GenomicRanges reshape2 rtracklayer S4Vectors stringr]; };
+  tRanslatome = derive2 { name="tRanslatome"; version="1.19.0"; sha256="08wlv7a39m1zrk8pssmck2zmyghn19ksr9fpf03z8ypwsqghaac5"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; };
+  tenXplore = derive2 { name="tenXplore"; version="1.3.0"; sha256="1x0b4gjs1igir8k8zlwc66w63gsf2ffk3vk7yas1cl3ivvvvw400"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; };
+  ternarynet = derive2 { name="ternarynet"; version="1.25.1"; sha256="01yzfiyrbkdgzzkdnn2ifa879j8pal38k8zm83d4ad9y06v8ndbm"; depends=[igraph]; };
+  tigre = derive2 { name="tigre"; version="1.35.0"; sha256="0bby62hc2858pppk071fn2qrnqyjwc7fnpvg17y5ff2042mg0g02"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
+  tilingArray = derive2 { name="tilingArray"; version="1.59.0"; sha256="1kbw2hj4x3wizqia245kfb1x7rkd6prij7ywif8w3wcv9c8p919m"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
+  timecourse = derive2 { name="timecourse"; version="1.53.0"; sha256="1424s2ai9mkmxxswy6i928gzkk6kk5yz59nxkz91icg39xlf0rl5"; depends=[Biobase limma marray MASS]; };
+  timescape = derive2 { name="timescape"; version="1.5.0"; sha256="0p0i3ypd4gg44l8s7yvphjwzadnnf5l6grg28wbm7miim54vvc2y"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; };
+  tkWidgets = derive2 { name="tkWidgets"; version="1.59.0"; sha256="0nxvgfl8kmasb1i6s3sq46qz0f7sjbqlwm5hpww1856bqd8dyyld"; depends=[DynDoc widgetTools]; };
+  tofsims = derive2 { name="tofsims"; version="1.9.0"; sha256="0hadp7726y0vfaz953hwpl27j8bhrdwrm66c81ic4jrpcicixvvr"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
+  topGO = derive2 { name="topGO"; version="2.33.0"; sha256="1avq073grahvf92sg4jr6fg3ld5z18l1pnfsgp337m308zvss0mv"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
+  trackViewer = derive2 { name="trackViewer"; version="1.17.2"; sha256="0hnhcns4kblnlvdsvvs3z1cmgmjvligyw90ykgskq47navwghjmm"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; };
+  tracktables = derive2 { name="tracktables"; version="1.15.0"; sha256="05glrr3f9clix43nvbsknicm9lyckswc5vj654444zhx08dmgnj5"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
+  transcriptR = derive2 { name="transcriptR"; version="1.9.0"; sha256="0i5lclprp0ajm56czknqci6wiml9y30gy4y2gzm9150da2d6m3jc"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
+  transcriptogramer = derive2 { name="transcriptogramer"; version="1.3.5"; sha256="0yfkblrbjgm1nf0c7bvb3xks5mmyf4d6g5m0anzhscq2l6a3r01a"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; };
+  traseR = derive2 { name="traseR"; version="1.11.0"; sha256="18s4sy6v9wzcyd0i33zh1kf4nbxmsmzpvqsz6nz7d26xprmir450"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
+  treeio = derive2 { name="treeio"; version="1.5.1"; sha256="1qn2zxv3adkwddar9d76xghamjl9y7589l2b2b17kd1pldx0q9m3"; depends=[ape dplyr jsonlite magrittr rlang rvcheck tibble tidytree]; };
+  trena = derive2 { name="trena"; version="1.3.0"; sha256="1jchm38bwa4bf4a6mjwy4h96qjm65m05qq5yvwdd9257pm1lfs6p"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 vbsr]; };
+  triform = derive2 { name="triform"; version="1.23.0"; sha256="0rmxaa6hfslpqg5zngcy8s659v9n5mry6kjm1svniz347z7smdrj"; depends=[BiocGenerics IRanges yaml]; };
+  trigger = derive2 { name="trigger"; version="1.27.0"; sha256="0yi3r23yw1vsz5y5wxzql0gmvwks0i6kn7f4r53swzmb12fkgs7h"; depends=[corpcor qtl qvalue sva]; };
+  trio = derive2 { name="trio"; version="3.19.0"; sha256="1zix49bxx0qiz535cl8pmzjdbh4n4g5qa6bzd87p6ylrzzyxcq0j"; depends=[]; };
+  triplex = derive2 { name="triplex"; version="1.21.0"; sha256="0y7r8b1a21cmys6l0li20bnlhi644i3085k8mkh80rzqin30aqgf"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
+  tspair = derive2 { name="tspair"; version="1.39.0"; sha256="0anbb202pazdryadm7ww68nlrmyzand8kiwjfxnf59n6ansls8nd"; depends=[Biobase]; };
+  tweeDEseq = derive2 { name="tweeDEseq"; version="1.27.0"; sha256="0aycx0ixg6bj05wz9am84jxbwa9qbbh3hmjp0w4pppzbmv6xrydw"; depends=[cqn edgeR limma MASS]; };
+  twilight = derive2 { name="twilight"; version="1.57.0"; sha256="0mhx126yqlq76smabagwjxdff6n3vn9vzsr38nn0v8cs4vzq7v20"; depends=[Biobase]; };
+  twoddpcr = derive2 { name="twoddpcr"; version="1.5.1"; sha256="0kw54x0wsf6mdbdzhvlyh8p8s6vw7yr8a2iyac7j50sqz3zwip5y"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; };
+  tximport = derive2 { name="tximport"; version="1.9.7"; sha256="0xyb1zigqcpdfcwb3gyn7zwqmdxca4cpwl83qhxrfhb30jccxs6g"; depends=[]; };
+  uSORT = derive2 { name="uSORT"; version="1.7.0"; sha256="1f5dabc7ksz6fhx7x87dm8whlxrhzh5zzfysgs18fv6yn815x747"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; };
+  unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.17.0"; sha256="0rf9hrilb6d9jr2lbw20d3almds9lmhbdkmm130kx26kybp6vi1i"; depends=[BiocGenerics HTqPCR]; };
+  variancePartition = derive2 { name="variancePartition"; version="1.11.6"; sha256="1759wz6xfvsbc0kf09dqq3n59nqqw0z81khh5gvzbgvq5q17ak3h"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest reshape2]; };
+  vbmp = derive2 { name="vbmp"; version="1.49.0"; sha256="0h2lwkqx765s6iyyr3mivj83zdg761bci0jz1g8q9wl8xk72ajif"; depends=[]; };
+  vidger = derive2 { name="vidger"; version="1.1.3"; sha256="1hvxp7lzy95i37vyhk0xa0dpn64f9kflx6k95cndl0bbivq6lrbb"; depends=[Biobase DESeq2 edgeR GGally ggplot2 ggrepel knitr RColorBrewer rmarkdown scales SummarizedExperiment tidyr]; };
+  viper = derive2 { name="viper"; version="1.15.0"; sha256="0cl6qn0jw5xgrg2wz9rkx8j5w3hx9vbjw1yh1ayvsdghb4vb8k5b"; depends=[Biobase e1071 KernSmooth mixtools]; };
+  vsn = derive2 { name="vsn"; version="3.49.1"; sha256="1lklwnxvwv1x68nyywxkdgla5pz8d94a86whf5x9vcbvcmk92x2i"; depends=[affy Biobase ggplot2 lattice limma]; };
+  vtpnet = derive2 { name="vtpnet"; version="0.21.0"; sha256="0f89b3s1412sxwp64dlnc8rlawy2w86d1y5g1c7n2hd290m51dvp"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
+  vulcan = derive2 { name="vulcan"; version="1.3.0"; sha256="182aq3ly17chrlisdjsf3zzwxfv004cwbbpl2rfk40ws1376xf1i"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; };
+  wateRmelon = derive2 { name="wateRmelon"; version="1.25.0"; sha256="0arrpkdrxy1rz3ryiswq767rz5rqmvs2rxj85lagk6rj17ia64c2"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
+  wavClusteR = derive2 { name="wavClusteR"; version="2.15.0"; sha256="0pngqm1b5z8zm5sdnqprq5mibrfm5rwzi0sa0mgwg9gsrn8wcg09"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
+  waveTiling = derive2 { name="waveTiling"; version="1.23.0"; sha256="018vhrv092qfyd5vmdbq216h3rsr6xk9nnknb4x0vnk1l7yckrk8"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
+  weaver = derive2 { name="weaver"; version="1.47.0"; sha256="096sgg9xrnlf819bh6gz6a9phbhn7a54phd4nl8gz7xfjxscfrhi"; depends=[codetools digest]; };
+  webbioc = derive2 { name="webbioc"; version="1.53.0"; sha256="0vm80p0sbp9lj9d29g3agmkrav4whbndgj4rhw9gz9cd7i1lv0jj"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
+  widgetTools = derive2 { name="widgetTools"; version="1.59.0"; sha256="1ypz4rpi6yw6dg1w1dgnjx389xldmjzh484bs9dqzz27ly8b860v"; depends=[]; };
+  wiggleplotr = derive2 { name="wiggleplotr"; version="1.5.0"; sha256="1n338nhd8rpdv218qwnlrj8vqvnq131x51nfylzv9a8fn4d3lv7g"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; };
+  xcms = derive2 { name="xcms"; version="3.3.2"; sha256="1pnbp8a9gx1ys69yr7vv7mdzl5mcj9azxy0agq16xhxix7mwp13w"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors]; };
+  xmapbridge = derive2 { name="xmapbridge"; version="1.39.0"; sha256="075yj9vqy4gf5ijirpfnm08rxqzg3bflirlr5j6qmr146jsj5cky"; depends=[]; };
+  xps = derive2 { name="xps"; version="1.41.2"; sha256="01da8wc01fry7z8ma880h5g6vvqi3rdwqg5wmx9x56yfg0c293im"; depends=[]; };
+  yamss = derive2 { name="yamss"; version="1.7.0"; sha256="1h8wz9cm042n9scgpm0m3c7v3wik8nr7lrm4nb47bikzcij7ymd3"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; };
+  yaqcaffy = derive2 { name="yaqcaffy"; version="1.41.0"; sha256="044gyqh9pk2ml6f99mfjfw7zp2ygnis74jh4x8z7i99q6jip8pbn"; depends=[simpleaffy]; };
+  yarn = derive2 { name="yarn"; version="1.7.0"; sha256="19x4r9mmii1r4ypj2p6f4vk396f0xqzbbpys3wqkwklf9gsqia32"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; };
+  zFPKM = derive2 { name="zFPKM"; version="1.3.0"; sha256="12yj97g1y37aq4qfyqchgvp93kkb0bzxmk196s1vygh4dk0b36lp"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; };
+  zinbwave = derive2 { name="zinbwave"; version="1.3.2"; sha256="1arl59nlzksmc95hqp5pj86yj8xq122mdw3ng4pxwdbm5fs63dw7"; depends=[BiocParallel copula edgeR genefilter glmnet Matrix SingleCellExperiment softImpute SummarizedExperiment]; };
+  zlibbioc = derive2 { name="zlibbioc"; version="1.27.0"; sha256="17jr4jgl30qlnmjfzzc1qd1rah5c9bwbp08dsnkhy7fxpwimqm2i"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index ee3dcdef20c92..db78421cf5efa 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2018-04-20"; };
+let derive2 = derive { snapshot = "2018-07-06"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -13,7 +13,7 @@ in with self; {
   ABCp2 = derive2 { name="ABCp2"; version="1.2"; sha256="1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx"; depends=[MASS]; };
   ABHgenotypeR = derive2 { name="ABHgenotypeR"; version="1.0.1"; sha256="08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l"; depends=[ggplot2 reshape2]; };
   ABPS = derive2 { name="ABPS"; version="0.2"; sha256="1k3f5i34f4w2khkszb4qhwwcpiy7gsfh82vjr6rypwg6rx5rjclq"; depends=[kernlab]; };
-  ACA = derive2 { name="ACA"; version="1.0"; sha256="0z4wz85iv5k5vw29m6xfh2v96shv314nbxkv3v3yhl77br4bmj4q"; depends=[]; };
+  ACA = derive2 { name="ACA"; version="1.1"; sha256="1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq"; depends=[]; };
   ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
   ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
   ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
@@ -22,33 +22,32 @@ in with self; {
   ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; };
   ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; };
-  ACTCD = derive2 { name="ACTCD"; version="1.1-0"; sha256="15l70diy1x2pfyv8miki76frnk3f33qfxcxafh6cp8zwc6gmr0m4"; depends=[R_methodsS3]; };
+  ACTCD = derive2 { name="ACTCD"; version="1.2-0"; sha256="0mzjxxr2zfdidw8ibh6w8mvpkw3q3nvngqi05g9ind26ckvk053p"; depends=[GDINA R_methodsS3]; };
   ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; };
   ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
-  ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
-  ADMM = derive2 { name="ADMM"; version="0.2.2"; sha256="0rwszi152nm6rrmgh23js2cv0yfrsa6vky4gmrgszxgx8sw221v9"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
+  ADMM = derive2 { name="ADMM"; version="0.3.0"; sha256="0j3sh497pf495qf1ivvp8h4hplq6km6m923kiv5j02sianl1j9zh"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; };
   ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
-  ADMMsigma = derive2 { name="ADMMsigma"; version="1.0"; sha256="141jzg7cvq1wlscrpb4hfkdshbm0vgzy4cas8vb6abh53j8h2g8q"; depends=[doParallel foreach ggplot2 Rcpp RcppArmadillo]; };
+  ADMMsigma = derive2 { name="ADMMsigma"; version="2.0"; sha256="1lyixqbfmrk850y4v89chwws0arjc6j420r55p733p0zvj0mryha"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
   ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; };
   ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
   AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; };
   AER = derive2 { name="AER"; version="1.2-5"; sha256="0qksj91h1c5kaci0w7q1n6780669di146ll5wnbjppnkz57z237g"; depends=[car Formula lmtest sandwich survival zoo]; };
   AF = derive2 { name="AF"; version="0.1.4"; sha256="1ych5b2bin65lk415l8rhql2cpma3djnxvdi8ja1hgd9absm7j04"; depends=[data_table drgee stdReg survival]; };
-  AFLPsim = derive2 { name="AFLPsim"; version="0.4-2"; sha256="0bbbvv81nxqp5gc4hdhk0hyhb4n8f9w83kf21cgmqhy9cqnyr4s8"; depends=[adegenet introgress]; };
-  AFM = derive2 { name="AFM"; version="1.2.2"; sha256="132zbxim3cbyxhv27l9i3jyhf5c47ckzsg4qndpwbyjhd0p9x7qh"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
-  AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
+  AFM = derive2 { name="AFM"; version="1.2.4"; sha256="12k0rx7mi45anyg31gbi8ni9jrfh6asp3cbpwvbhl6kv7ypip9ww"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
+  AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; };
+  AGHmatrix = derive2 { name="AGHmatrix"; version="0.0.4"; sha256="1l9gk7fl39gwpy5r6fnbzycixj9k22hma2hxlfwqxr3vrvpj66zq"; depends=[Matrix]; };
   AGSDest = derive2 { name="AGSDest"; version="2.3.1"; sha256="10jakc2qs5gnbp0g4k05isy0ii73ric50gmwkbb1khf9x0b5v6dg"; depends=[ldbounds]; };
   AGread = derive2 { name="AGread"; version="0.1.2"; sha256="17jj6g0df3cldaq4brn1abdivfg7w5bwycbrs70ynmy6iqib8piy"; depends=[data_table dplyr magrittr seewave]; };
   AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; };
   AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
   AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
   AID = derive2 { name="AID"; version="2.3"; sha256="0p3cjbd6kxdy5igmgzkc2bd3w0p0w1jb9jkn9n0id5lv44b5gskj"; depends=[ggplot2 MASS nortest psych tseries]; };
-  AIG = derive2 { name="AIG"; version="0.1.8"; sha256="19vw3gycj0i41g08jaf4jh1nff7d0dpqga1hs20gs3n02cxim6mg"; depends=[dplyr magrittr mgcv rgl]; };
+  AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; };
   AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
-  ALA4R = derive2 { name="ALA4R"; version="1.5.6"; sha256="0fj5y6z179glhc2jj3ksd5w29xmlqm71n23hp1vynrza70fz0gna"; depends=[assertthat digest httr jsonlite plyr RCurl sp stringr wellknown]; };
+  ALA4R = derive2 { name="ALA4R"; version="1.6.0"; sha256="1b3j0k5k4kr38df6rdqfm9pyhgzc4xc70fxf83d8061xjf4rq0wk"; depends=[assertthat digest httr jsonlite plyr RCurl sp stringr wellknown]; };
   ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; };
-  ALEPlot = derive2 { name="ALEPlot"; version="1.0"; sha256="14dbn357g48la45xn4x7x5slja7rsrnin8k9s5c4is4rxvigwhwb"; depends=[yaImpute]; };
+  ALEPlot = derive2 { name="ALEPlot"; version="1.1"; sha256="0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w"; depends=[yaImpute]; };
   ALKr = derive2 { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
   ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; };
   ALSCPC = derive2 { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
@@ -62,33 +61,34 @@ in with self; {
   AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; depends=[unmarked]; };
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
-  AMR = derive2 { name="AMR"; version="0.1.1"; sha256="1kyy70g6nh37a1kfcc4p3d8yd61rhsk07rzh8hk0x5zyvc6gcs8l"; depends=[dplyr reshape2 rvest xml2]; };
-  ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; };
+  AMR = derive2 { name="AMR"; version="0.2.0"; sha256="0n3qzkqxq06vxx0nk4983k7khcy14hc4cxd3cii8lscf3y6bmvjc"; depends=[backports data_table dplyr knitr reshape2 rvest tibble xml2]; };
   ANN2 = derive2 { name="ANN2"; version="1.5"; sha256="17b0dv1dl4kni7yvrrwk65cadk6f7qk7505r27j9v530pffyv1k3"; depends=[Rcpp RcppArmadillo robustbase]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
   ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; };
   ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; };
   APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; };
-  APML0 = derive2 { name="APML0"; version="0.8"; sha256="15qg0iapl2qh4llc8qazxc9qb4fi82snnw2agjgi29zcq7lzi2ww"; depends=[Matrix Rcpp RcppEigen]; };
+  APML0 = derive2 { name="APML0"; version="0.9"; sha256="1scvcrcsjgdrq9gfv8qxbd703k76cyk01ml93bcr8j8kiwv05z0f"; depends=[Matrix Rcpp RcppEigen]; };
   APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; };
   APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
   APfun = derive2 { name="APfun"; version="0.1.3"; sha256="02p40n4l66r63wq8x7ygchfhxmnpaa7vgy4bjhkqx5gfi2v4psxd"; depends=[maptools raster rgdal sp yesno]; };
   APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; };
-  AR = derive2 { name="AR"; version="1.0"; sha256="1h9rzlwnfm646s7423pcxz0zqykyadiw4sbxlygy2382la81x69x"; depends=[DISTRIB]; };
+  AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; };
   AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
   ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; };
   ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; };
+  AROC = derive2 { name="AROC"; version="1.0"; sha256="1mmcd8nqwzaqghzbcrv0g767j57svzvlzgk71ir61vvjhsk91dkg"; depends=[Hmisc MASS Matrix moments np]; };
   ARPobservation = derive2 { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
   ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; };
   ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; };
   ARTP = derive2 { name="ARTP"; version="2.0.5"; sha256="0lwvhf5lamw28sd41vrhyin8ab92rl93j1ahk0aacwvnikgmfkpj"; depends=[]; };
   ARTP2 = derive2 { name="ARTP2"; version="0.9.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; };
   ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; };
-  ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.1.0"; sha256="017m7cji04gbcn396jz428llik15zgdvbr6bf1c8scds692paz3n"; depends=[sp]; };
-  ASIP = derive2 { name="ASIP"; version="0.3.2"; sha256="0zrn3hnn46zxmvchicyzy7zz2jnv8y1249a6sdi3w9rw2d8q025g"; depends=[gdalUtils raster rgdal]; };
+  ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.2.1"; sha256="0f0bl1fxda012d8pgqpaqb80m0nn490xih3ddscfqgb87zgrp4sx"; depends=[sp]; };
+  ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; };
   ASMap = derive2 { name="ASMap"; version="1.0-2"; sha256="0fhivq5i2py79jkwfms0my77p9x8lrkn5vn1lwbsawfkyar4dvkq"; depends=[fields gtools lattice qtl RColorBrewer]; };
   ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
+  ASSA = derive2 { name="ASSA"; version="1.0"; sha256="0xdmkl3qy1i6rb5wpiw6rqhz5c88zg9nav7qll235jvxwh3388xk"; depends=[]; };
   ASSISTant = derive2 { name="ASSISTant"; version="1.2-3"; sha256="072lmvmdi5yfyfda42vs556ciwj2rnka02isnknk6czir3947nck"; depends=[mvtnorm R6]; };
   ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
   ATR = derive2 { name="ATR"; version="0.1-0"; sha256="0ljrpix3ksi0v38sfb25s2dlfj1yjbvwcz147dk2v2c24cn3r816"; depends=[partykit]; };
@@ -110,27 +110,26 @@ in with self; {
   ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; };
   AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; };
   AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; };
+  AdaSampling = derive2 { name="AdaSampling"; version="1.1"; sha256="1n3kcxmhzllnj2cac5jx400k85n20dgjmgma9r6wva43j49sag05"; depends=[caret class e1071 MASS]; };
   AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; };
   AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; };
   AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; };
-  AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.65"; sha256="0f92dgfiglbklr4lv5kqxks8d04f675jlj2xjy9aqk4cgdj264xk"; depends=[MASS mgcv nlme SemiPar]; };
+  AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.67"; sha256="0s8vv960pkbccpwlfsg1jsfjnfmq9iy8cj1fak5fn2s60zb7nm0a"; depends=[MASS mgcv nlme SemiPar]; };
   AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; };
-  AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; };
   AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; };
-  AdhereR = derive2 { name="AdhereR"; version="0.1.0"; sha256="07r3a8bfhwm2pghhngavw4z6gv42dyq21dz2lypapcv32qnxkaag"; depends=[data_table lubridate manipulate snow]; };
+  AdhereR = derive2 { name="AdhereR"; version="0.2.0"; sha256="1w42wg52ca0vdrj61dmyikvjvsndwhpyvnkzyissf3zvb69v32im"; depends=[data_table lubridate manipulate shiny]; };
   AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; };
   AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; };
+  AdvDif4 = derive2 { name="AdvDif4"; version="0.2.18"; sha256="0vc8hbqjad9rsssd3ff84bgqxz4q6ad1fbz5gcaq1s08979r3kkk"; depends=[]; };
   AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; };
-  Agreement = derive2 { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; };
   AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.0"; sha256="0k2lcyxfsavis9g1g5293f0mw7f6jakkr11wkkjvxdlnba9c80r8"; depends=[Rcpp]; };
   Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; };
   AlgDesign = derive2 { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; };
   AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; };
-  AlignStat = derive2 { name="AlignStat"; version="1.3.1"; sha256="1x9nlf3z6rpfca3k3cqm673sid418mnl44df9v93nyj5dpd70ylc"; depends=[ggplot2 Rcpp reshape2 seqinr]; };
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
   AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; };
   AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; };
-  Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; };
+  Amelia = derive2 { name="Amelia"; version="1.7.5"; sha256="1mnvms3bgc5i0v7wdmfx7nikr8wxyzmqi36sj2fz4qv5b0mf4zpa"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
   AmesHousing = derive2 { name="AmesHousing"; version="0.0.3"; sha256="1fr01ka8x8gdnky6cbd2bjlh1lx71gzq440zsknn9kxvf01s6pxm"; depends=[dplyr magrittr]; };
   AmigaFFH = derive2 { name="AmigaFFH"; version="0.1.2"; sha256="0749j6m8pvdq4lm0n46bn052nxvplh3nvp2miz4hagw8q2p5fsyl"; depends=[adfExplorer ProTrackR tuneR]; };
@@ -140,7 +139,7 @@ in with self; {
   AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; };
   AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; };
   AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.1"; sha256="1v8jlyzqp9k084lzmaihp5nh7mybbgnnxnbbfkydq24b9wskfd4b"; depends=[Rcpp]; };
-  AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; };
+  AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-17"; sha256="1gqhjknqq325m0ryabcdw1r3j5b9xwxg09ndqdcyw4rknc2mdzn1"; depends=[fastICA R_matlab tkrplot]; };
   AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; };
@@ -152,8 +151,7 @@ in with self; {
   AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.0"; sha256="0pp9ihrkjwzp6zyglkp81ry4fzm1s26r687bhxswx5iz1brzmhdn"; depends=[scatterplot3d shiny smacof]; };
   Anthropometry = derive2 { name="Anthropometry"; version="1.10"; sha256="1rny65070yrdxnny8frp5ryp811h59924z5pfwg0cmd2szxnxnz7"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
   Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; };
-  ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; };
-  AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
+  AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-7"; sha256="1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh"; depends=[CORElearn ellipse lattice MASS plyr reshape2]; };
   AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; };
   ArArRedux = derive2 { name="ArArRedux"; version="0.2"; sha256="0ql9yx46sgqkc3jd7yaw3vwg8rnykbsvpcahrgc66753kcxih04q"; depends=[]; };
   ArCo = derive2 { name="ArCo"; version="0.3-1"; sha256="1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk"; depends=[boot glmnet Matrix]; };
@@ -162,12 +160,13 @@ in with self; {
   ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.3"; sha256="0012rjbk3bxf6j7p0skp02yrgqzl903dclnmm7c038f941krjcfq"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; };
   ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
   ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
-  Arothron = derive2 { name="Arothron"; version="1.0.0"; sha256="0fwxrjkqq8dkh38s3dcky0d6nggnmvfik0w3c4mzslzipnm84sin"; depends=[compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
+  Arothron = derive2 { name="Arothron"; version="1.0.1"; sha256="1zqc73i4bl9mbrijmfix4rl14ljh7sj0j1bdx6d65knscjr522sr"; depends=[compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
   AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; };
   AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; };
+  AssetCorr = derive2 { name="AssetCorr"; version="1.0.1"; sha256="1ls08p120gn7mv7nfslc08dw159d001z57xx9wkyfz7v8r27qhsy"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; };
   AssetPricing = derive2 { name="AssetPricing"; version="1.0-1"; sha256="0pbb1362dgdipbj3h50ykissl3gdqf1j1mpq53ixprvyc966c5h4"; depends=[deSolve polynom]; };
-  AssocAFC = derive2 { name="AssocAFC"; version="1.0.1"; sha256="0fxqsj2a9wi5py4sw3mzf27zx82nbj1q294vj1n0jh9ryc68wyh3"; depends=[CompQuadForm]; };
+  AssocAFC = derive2 { name="AssocAFC"; version="1.0.2"; sha256="1rjiiir472dnr15xyvpn81s62nf01gl70khr8mrni65ssp5m30fb"; depends=[CompQuadForm]; };
   AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; };
   AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
   AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; };
@@ -186,25 +185,25 @@ in with self; {
   BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; };
   BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; };
   BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
-  BALCONY = derive2 { name="BALCONY"; version="0.2.0"; sha256="0ddg5fy82yxnmh54dilpljwfziqpc8rjladmcdnn5p98n9a6ypvl"; depends=[Biostrings dplyr readr Rpdb scales seqinr]; };
-  BAMBI = derive2 { name="BAMBI"; version="1.1.1"; sha256="1jzvsaf9cn28ny40vg0wlvdqz6f4i7n6iyym8s0aj58aiazwsmh5"; depends=[label_switching Rcpp RcppArmadillo]; };
+  BALCONY = derive2 { name="BALCONY"; version="0.2.7"; sha256="1xdhldr6y3hrnp4g3zpplfcgiv0n8ci792hkaps9l47799vww03r"; depends=[Biostrings dplyr progress readr Rpdb scales seqinr]; };
+  BAMBI = derive2 { name="BAMBI"; version="2.0.0"; sha256="09ib729h3wz1gbadsrlj2y05xbdwms9m4dhwmq9dfzm9v9qpw9n0"; depends=[bridgesampling coda future future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve]; };
   BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
-  BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.1"; sha256="1xs65drkpd1zmrvyrv0kndd5z5q4y425524w6mrh96qya9qjrmsx"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; };
-  BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; };
+  BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.2"; sha256="0yxsgk4p7i8arjkchsiml6lx97inpmaihb61787vcl8kxyx7v6wr"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; };
   BANOVA = derive2 { name="BANOVA"; version="1.1.1"; sha256="11cvf7wjip1vn5qn9hwxvdh98i8li9ijydfywf2ks2hls2430qbk"; depends=[coda rjags rstan runjags]; };
-  BART = derive2 { name="BART"; version="1.6"; sha256="06a6bxrxspgjij8mgi1gzq7fbak9zqppprl55jbb91nkf13svbzq"; depends=[Rcpp survival]; };
-  BAS = derive2 { name="BAS"; version="1.4.9"; sha256="0c0mj7ijgghbjmyrwr6qp2a3iidsxli3a0wb4njjaj5n7b7yggby"; depends=[]; };
+  BART = derive2 { name="BART"; version="1.8"; sha256="1nb1xj2v8d54fw4fppfsvai3q8csavqiksrybsc7imb4cfvdkw9h"; depends=[Rcpp survival]; };
+  BAS = derive2 { name="BAS"; version="1.5.1"; sha256="0p1pjv8nx3jkjn8j9r87lngwgwxra3hh8qj6qklppnkznly533hr"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
   BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; };
   BASiNET = derive2 { name="BASiNET"; version="0.0.3"; sha256="0kcmc4jpiwmdydbyjfm1jx4ravxkqzvqca3p5gp26nx14xglm9hi"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
   BAT = derive2 { name="BAT"; version="1.5.6"; sha256="0m6yfxymhzi8n2l421ngy6cz3qa5v7yrd1jhpi8ymlnf8dysd57x"; depends=[nls2 raster spatstat vegan]; };
   BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; };
   BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
-  BAwiR = derive2 { name="BAwiR"; version="1.0"; sha256="0bic9f84cnjka6vk55icjviqr206fmv7lnihvdksnbghgcya890w"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plotly plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; };
+  BAwiR = derive2 { name="BAwiR"; version="1.1"; sha256="1wdwvghdhlld4iim49ia3k3g1rxrji8qh6jy63klglq6hb1rwx6c"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; };
   BB = derive2 { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
   BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; };
+  BBI = derive2 { name="BBI"; version="0.2.0"; sha256="1mv6sh853y8p4by76637bky6yl57qyhmgqmd2n2k7r0cxg8hprcx"; depends=[vegan]; };
   BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
-  BBMV = derive2 { name="BBMV"; version="2.0"; sha256="18sikaj3l5bvbpnl03rzm0h3zrgnnwv716spb2050jz6gzvgd2dx"; depends=[ape]; };
+  BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; };
   BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; };
   BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; };
   BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; };
@@ -214,43 +213,46 @@ in with self; {
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
   BCEA = derive2 { name="BCEA"; version="2.2-5"; sha256="0jiizwnxycbz9x8fmkcw3rcjkgg5b9fawyddf8swvx23cnfm6z8z"; depends=[MASS]; };
   BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; };
-  BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
+  BCRA = derive2 { name="BCRA"; version="2.0"; sha256="1g0iix3ik2gsxpz6zp5fz2ka1y5xybs6x3r42ssnlffcmmdd9bsw"; depends=[]; };
   BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
   BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; };
   BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; };
   BClustLonG = derive2 { name="BClustLonG"; version="0.1.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.46"; sha256="1y3rcl0x1cvcsfp4p1v82v0i119izwa8hkvs5qang70slv973bbv"; depends=[igraph Matrix]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.51"; sha256="08cc9ab7ipkxm5jxg5qyq40l58jqf5yg02igxi3xbqrb946ynqqx"; depends=[igraph Matrix]; };
+  BE = derive2 { name="BE"; version="0.1.0"; sha256="1mav5hvzsggh13szny0s0iy44di2jna523z8cjcy89s7nv2fqaag"; depends=[]; };
   BEACH = derive2 { name="BEACH"; version="1.2.1"; sha256="0a6xwczw3d2jnksb5lpf7j859pnyfxcab4kfv4v7lmf9iasbyyf5"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
   BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
   BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; };
-  BETS = derive2 { name="BETS"; version="0.3.6"; sha256="0m32ad2ysb5dr4125fccrbi5cndal3qml0lflnp9kdbm6wwhqv85"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny stringr urca webshot xml2 zoo]; };
+  BETS = derive2 { name="BETS"; version="0.4.4"; sha256="0cfndahvqdma95sbyf4r3bhf6hxplkx7dmpcx41s1mqcr0bgnxvp"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; };
   BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; };
-  BGGE = derive2 { name="BGGE"; version="0.6.1"; sha256="1ndn4cj9mrkx2mrlh2dgyy3lpx526fmg91zqgvdcbvn99r5sl17j"; depends=[]; };
+  BGGE = derive2 { name="BGGE"; version="0.6.3"; sha256="0i7dz1j2p3nmqad6ja5b45maa3a1wn1gsh1g7sahyqr72s2bvvkn"; depends=[]; };
   BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; };
   BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; };
   BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
   BH = derive2 { name="BH"; version="1.66.0-1"; sha256="14kab6wp0c27d8x4jqyf065p4bj210s9b67c0bfsfjnp29aypn8p"; depends=[]; };
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; };
-  BIEN = derive2 { name="BIEN"; version="1.2.2"; sha256="11bqbkw6v4yvlvpv0bhmn5q7ady12hmp9ziak5jzsc7p4d8azd5r"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
-  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.4-9"; sha256="0v9q2gxb7i9zgkkf8ka85r3l3ypg21fzl48paliqi5ac144l177q"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
+  BHTSpack = derive2 { name="BHTSpack"; version="0.4"; sha256="15a1xx2j6s94jrhlbbkriqzs7wfbh2nkz564zvmn20czmaf7v5iq"; depends=[R2HTML xtable]; };
+  BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; };
+  BIEN = derive2 { name="BIEN"; version="1.2.3"; sha256="0p23kahba55gkk6wx10ii6vrni3b7ia2a4jb64ww4kwp86bknx3d"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
+  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.5-44"; sha256="16mgbf2jpz3fkn1gb8xcc8h45k8p74sq5gp2kk8q2g3z7gg697xh"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; };
-  BIGL = derive2 { name="BIGL"; version="1.1.1"; sha256="008f3x0hkmifra1wcv56hxjjf2rqc9qxsbpi23aq4pgk7mxdaax7"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
-  BINCOR = derive2 { name="BINCOR"; version="0.1.0"; sha256="0fzynq85zbjybylxrpk89sq4l1ccm8k4z1bn25b6rgnz5m18r8hs"; depends=[pracma]; };
+  BIGL = derive2 { name="BIGL"; version="1.2.0"; sha256="1n14ar765iqafi8ckpghxrafivmpf583yckfxk07haz4186klvss"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
+  BINCOR = derive2 { name="BINCOR"; version="0.2.0"; sha256="0x2s82jql429shk70bhjdy9kamz8dz5ymsxj6kp8ga1711bpwyq6"; depends=[pracma]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
   BIOMASS = derive2 { name="BIOMASS"; version="1.2"; sha256="1d9rwgh0ws27yd0p2la7pn49sb71lh9bg4f42fpx448ah8dimw17"; depends=[httr jsonlite minpack_lm msm raster]; };
   BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; };
-  BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
-  BIS = derive2 { name="BIS"; version="0.2.0"; sha256="15wybfj03rzrxxdm19mm7b7c2l71lzs50n7vw8vnyx1n5w1k97jv"; depends=[dplyr readr rvest tidyr xml2]; };
+  BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; };
   BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; };
   BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
   BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; };
   BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.5"; sha256="0wnxfyl8hz1a0k33v5nc3j1ziwcv1fnw8639l0xv92p5rn7n5nc5"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; };
   BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
   BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; };
+  BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; };
   BMA = derive2 { name="BMA"; version="3.18.8"; sha256="1a32ghn17ymb3zdh9xv6zvqcxc81m4y478mk6z9bfndq7ihy1ih5"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; };
   BMRBr = derive2 { name="BMRBr"; version="0.1.0"; sha256="1z54annplzydnxvwd0rkhcw5rmfx8r99k28ld5rgh22xq3zdq825"; depends=[rvest xml2]; };
@@ -267,7 +269,7 @@ in with self; {
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; };
   BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; };
-  BNSP = derive2 { name="BNSP"; version="2.0.2"; sha256="0vapcf8qxcdmragbmwai4yddpmwwm79mksf4zcych0d4a0ij39h6"; depends=[coda ggplot2 gridExtra plot3D threejs]; };
+  BNSP = derive2 { name="BNSP"; version="2.0.6"; sha256="0phi41khw525nsrizxak933j2hlhpkgdskvwv8yqljhvyamxgaql"; depends=[coda cubature Formula ggplot2 gridExtra plot3D plyr threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
   BOIN = derive2 { name="BOIN"; version="2.6.3"; sha256="0hvx75zjb5bj005ggj9j67p9f8hpq8p6c0ihidf3avfrirl8g98p"; depends=[Iso]; };
   BPEC = derive2 { name="BPEC"; version="1.2.1"; sha256="142x0iw3sanvqm0n2hfba8pwndfk8l5qzhgpca9gcya7wkcmmmf7"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; };
@@ -278,39 +280,39 @@ in with self; {
   BSL = derive2 { name="BSL"; version="0.1.1"; sha256="0g8nqsnhrghan2kx5iciv01drzn8kbx5klmrvcjz0ajfqjdm8kg4"; depends=[coda cvTools foreach ggplot2 glasso gridExtra MASS Rcpp RcppArmadillo]; };
   BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; };
   BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; };
-  BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
+  BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
   BSquare = derive2 { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; };
   BTLLasso = derive2 { name="BTLLasso"; version="0.1-7"; sha256="1lhi3dlg37g4r7nrj46w1yc8jkrzi9159ansapnqdi15jrjpx9p9"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; };
   BTR = derive2 { name="BTR"; version="1.2.4"; sha256="0vf71a36id6zgx0phb0kyry7y9xcdhnincxh3fryzhdigxkahg4h"; depends=[diptest doParallel entropy foreach igraph infotheo poweRlaw Rcpp]; };
   BTSPAS = derive2 { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[actuar coda ggplot2 plyr R2OpenBUGS rjags]; };
   BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; };
   BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; };
-  BUCSS = derive2 { name="BUCSS"; version="0.0.2"; sha256="188d9f0gdhym28xvvk5z10amdbg50w6ab4ik2r9qfc3p1v7k10q9"; depends=[]; };
+  BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; };
+  BUCSS = derive2 { name="BUCSS"; version="1.0.0"; sha256="133wsv784abrs6s1rhdi65qdrw5wx806r6pf76g3vbsf2qhk51qb"; depends=[]; };
   BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
-  BVSNLP = derive2 { name="BVSNLP"; version="1.1.0"; sha256="09vffm27jwpfmil6dn7jbsrh9ys3199l0qpfqrjcvz21nsgd43hg"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
+  BVSNLP = derive2 { name="BVSNLP"; version="1.1.5"; sha256="1m6cpxm6pd831472qzj370f6q9sf416zd6ixphg3yqvvakgdznv8"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
   BWStest = derive2 { name="BWStest"; version="0.2.1"; sha256="1kwd1s1dd21qca31np49aql839j8325y8bnxlcq84nw48vqv0jgc"; depends=[memoise Rcpp]; };
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
   BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; };
   BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; };
   BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; };
   BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; depends=[foreach iterators R6 RColorBrewer rTensor]; };
-  BacArena = derive2 { name="BacArena"; version="1.6"; sha256="1w25xrb0gafcw3h7bf44x96zyv108gzlk273nf2835768m4psacr"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; };
-  Bagidis = derive2 { name="Bagidis"; version="1.0"; sha256="1prdbkc0qgzkkrkhp43pjyg35q9ivngk8wa4a7khlnfsj21jaraf"; depends=[abind]; };
+  BacArena = derive2 { name="BacArena"; version="1.7"; sha256="137n3nyz68v912c5nhq1qslgifb7k797f5sz567smhimzjhx842f"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; };
   BalanceCheck = derive2 { name="BalanceCheck"; version="0.1"; sha256="09mkssic173glgcn592cb6zmz80kndggqc4hc800f91xnfql0332"; depends=[ade4 mvtnorm]; };
   BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.2"; sha256="0a4mb5lwjcy5d3h0ypsqmqniqx3dm64mssj65apgl48wqbm6zvv0"; depends=[Rcpp]; };
-  Ball = derive2 { name="Ball"; version="1.0.0"; sha256="1b4p4isgybxid14yywpgl7nv4d126281901wvwx6qwvf40nbfq3l"; depends=[gam survival]; };
+  Ball = derive2 { name="Ball"; version="1.2.0"; sha256="1x3l3bg4mn5kvm98p1ypn7gi61q2wm1224n9d99x1pms1iqhx4zv"; depends=[gam survival]; };
   BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; };
   BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; };
   Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
-  Barycenter = derive2 { name="Barycenter"; version="1.3"; sha256="1xrcbr80az80h9hx1ik9cxi86j9j9663iv62kgkh6lknafl3mmh5"; depends=[Rcpp RcppArmadillo]; };
+  Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; };
   BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; };
-  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.0"; sha256="0jjw7iqlyasyivssmkwkn97al9k8l6bs57zkjwf7hjrj36jfa4x1"; depends=[curl dplyr quantmod rvest stringr tidyr XML]; };
+  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.1"; sha256="1mc35y3zxmijgywfd1qhvlpb66rzc8n6j3ynvfrg5c7z8j8592h3"; depends=[curl dplyr quantmod rvest stringr tidyr XML]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.7"; sha256="035658marnw57p4f38g99rwmvmb6hpbq0fhlxp3qbw22zfnnkvs9"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; };
   BatchMap = derive2 { name="BatchMap"; version="1.0.2.0"; sha256="0v3k4xrmsbyhzgmph8xna11dgpp10yxqmss95asrj6n814jxj19b"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
   BayClone2 = derive2 { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; };
   BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
   BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
-  BayLum = derive2 { name="BayLum"; version="0.1.1"; sha256="1qgpn7blazgb1mkjcnn8x0j7z3k6vgcqpg0vm4gg4r4pxyw61b9n"; depends=[ArchaeoPhases coda hexbin Luminescence rjags]; };
+  BayLum = derive2 { name="BayLum"; version="0.1.2"; sha256="172ynm4z1m8dc954q4x9vwc2lyxqbwmqaxmz8v49jm8r2ifv7h8c"; depends=[ArchaeoPhases coda hexbin Luminescence rjags]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
   BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; };
   BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; };
@@ -320,9 +322,9 @@ in with self; {
   BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
   BayesESS = derive2 { name="BayesESS"; version="0.1.12"; sha256="18dhswny8idj2wqpa66amz1yqk8yhk1vwazj4p70pk8jnpg8cdfy"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; };
   BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
-  BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-2"; sha256="17zfs8bmzp59zaxzcrzis2sxdnqxrv9h1kpb22112mp9l1alvwl4"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
+  BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
   BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
-  BayesGOF = derive2 { name="BayesGOF"; version="3.0"; sha256="15699lms3g9j9fwc6lng0bg1yngz18pvmvxwaqg8258qjwc79xlx"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
+  BayesGOF = derive2 { name="BayesGOF"; version="4.0"; sha256="10y36qyp674kgw08wrb6drd942314frw4ilkwna6qg6nqh07jzbk"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
   BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
   BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
@@ -334,7 +336,7 @@ in with self; {
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
   BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; };
   BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; };
-  BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; };
+  BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; };
   BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
   BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; };
@@ -343,20 +345,19 @@ in with self; {
   BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; };
   BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
   BayesVarSel = derive2 { name="BayesVarSel"; version="1.8.0"; sha256="1sf18m4p8zaw2s5fv4p9s99n1n0cgzscgfhm5ngkzif43kwz1l6n"; depends=[MASS mvtnorm]; };
-  BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; };
-  BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-0"; sha256="1w5v2z39wm04s1j0vjw7kvgnkgf423qk2yzxdkpf38x47za2wrfh"; depends=[]; };
+  BayesX = derive2 { name="BayesX"; version="0.3-0"; sha256="0vgi0yng53x0w18h4n0ygqmcky7jwmk99j4gcv2vwhcmz45s73j0"; depends=[coda colorspace maptools shapefiles sp]; };
+  BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
   BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; };
   BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.3"; sha256="1lli3v922cvp1kwg4sllgvm4rnb972anlpl0lklqk3aqi7ff6flw"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard]; };
   BayesianTools = derive2 { name="BayesianTools"; version="0.1.4"; sha256="13imh2vc3picfy1ppzfisgkhk2n8w8s0fnhklkni06wz1816h2zd"; depends=[bridgesampling coda DHARMa ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; };
   Bayesianbetareg = derive2 { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[betareg mvtnorm]; };
-  Bayesthresh = derive2 { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[coda lme4 MASS matrixcalc mvtnorm VGAM]; };
   BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
-  Bchron = derive2 { name="Bchron"; version="4.2.7"; sha256="13zqwl4a6wg0163c3qnfnxlljh6yndim0qcz617hxka5iib74afs"; depends=[coda ellipse inline MASS mclust]; };
+  Bchron = derive2 { name="Bchron"; version="4.3.0"; sha256="1pbm2s2qpha58q5girc9vssanxqv6r65bwxw5fk5dmpgvl4ag3vj"; depends=[coda ellipse MASS mclust]; };
   Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; };
   BeSS = derive2 { name="BeSS"; version="1.0.5"; sha256="1gq0zfrzkh2cndly7amhjy0qnfb60lsj7izmdlf2m8h7yrcicjzv"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
-  Benchmarking = derive2 { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
+  Benchmarking = derive2 { name="Benchmarking"; version="0.27"; sha256="0y31l3ddxm16sylw7p6dnv39w9ydjkjn92gi0za7s0vx07mzimxp"; depends=[lpSolveAPI ucminf]; };
   BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
   Bergm = derive2 { name="Bergm"; version="4.1.0"; sha256="13qdcwycppwy9qqc42zi5fz6wg4a47pfczb3nnfj1bdn2drxqw2x"; depends=[coda ergm Matrix MCMCpack mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
@@ -364,14 +365,14 @@ in with self; {
   BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; };
-  BiDAG = derive2 { name="BiDAG"; version="1.1.1"; sha256="1rncjsdyam7dnhd6ccdlvc85nnc79nsifcm24spc05k8rvx1836x"; depends=[pcalg Rcpp]; };
-  BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
+  BiDAG = derive2 { name="BiDAG"; version="1.1.2"; sha256="076v7p70clk6wc20gr1cf6vi1x01nbi9pn7z51zwwg6i54a7hsr4"; depends=[pcalg Rcpp]; };
+  BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; };
   BiG = derive2 { name="BiG"; version="0.1.0"; sha256="1wi2lyj3q1x47cpf1mdm5kqvjlcvbrliym6j5jbmwz7npc910vrb"; depends=[truncnorm]; };
   BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; };
   BiTrinA = derive2 { name="BiTrinA"; version="1.2"; sha256="0q2wqxj2ipmppilhvq80cnvhnhcp26h422i8ghx26nrkswhx378s"; depends=[diptest]; };
   BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; };
   BibPlots = derive2 { name="BibPlots"; version="0.0.3"; sha256="06cpz4h57mz5vpapgsrc9g67dkkiabp1n6avnccvgcpzjr0zscsw"; depends=[]; };
-  BigQuic = derive2 { name="BigQuic"; version="1.1-7"; sha256="1bhi9dilrprgjvqyc2hb4a0y8rm9la0m5lgry9mf184p56z1syzb"; depends=[Matrix Rcpp scalreg]; };
+  BigQuic = derive2 { name="BigQuic"; version="1.1-8"; sha256="1kg48jqm62qmz5x0h6fgvd5fs5dvg51x4spsn1q503ag4dqqdjc0"; depends=[Matrix Rcpp scalreg]; };
   BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; };
   BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
   BigVAR = derive2 { name="BigVAR"; version="1.0.2"; sha256="14vb6nc6bn22dd112sg9zypkchmkv17gnwxs915k0k5vbb9czlr5"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
@@ -379,10 +380,10 @@ in with self; {
   BinNonNor = derive2 { name="BinNonNor"; version="1.4"; sha256="00405ww9mh910jqww60w7cb8qbjql2jn13m60ly0bnxilg44r0bb"; depends=[BB corpcor Matrix mvtnorm]; };
   BinNor = derive2 { name="BinNor"; version="2.2"; sha256="03cggpk9fhndnk9vv5i6fzsq4wjxc5405xxlxg3l9gb618kj437f"; depends=[corpcor Matrix mvtnorm psych]; };
   BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.4"; sha256="0qiy0wf9i9r44ycz1jl666nwpsv5yz7vzz1szdy22sk68lz984bv"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
-  BinQuasi = derive2 { name="BinQuasi"; version="0.1-3"; sha256="0kxn71kfaldxji1a0zwnkalpjgrvw0jjfqm2f82gvj8cgcn69lgr"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog Rsamtools S4Vectors SummarizedExperiment]; };
+  BinQuasi = derive2 { name="BinQuasi"; version="0.1-5"; sha256="1xjkxf625ggfi5nzj8kvb99xmyvva9qbvl0a3szk0aksqhqlikqi"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; };
   Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; };
   BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; };
-  BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.1"; sha256="1f4y1mrscy9z87yglbynnsis623ar0gqpda3dfm9isa2z10c24qr"; depends=[expm Formula lmtest numDeriv]; };
+  BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.2"; sha256="0la8mi2wadcxwrq882n4zxvihyqkp8m383c28gl9gm4fs8cqwlxi"; depends=[expm Formula lmtest numDeriv]; };
   BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; };
   BioCircos = derive2 { name="BioCircos"; version="0.3.3"; sha256="0l8kd1imb8022n631psm9na0vp502ndn2q7m3mshx9c0mnqsv8n3"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; };
   BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; };
@@ -390,9 +391,9 @@ in with self; {
   BioInstaller = derive2 { name="BioInstaller"; version="0.3.3"; sha256="0mr3qyabr4pwz4cjnig5nzbq0hqqd9rmrpnhmgb1gp3c6l013yk1"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; };
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
   BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; };
-  BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
   BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
-  Biocomb = derive2 { name="Biocomb"; version="0.3"; sha256="0shhsljg0knfp83b3hrs2c674sqx2348h5m99jhf19jf1i98pf1k"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
+  BiocManager = derive2 { name="BiocManager"; version="1.30.1"; sha256="1d7dqmkg6h02x6agc20prj8nkz061pm7f1gqizibsfz13wv5cx6w"; depends=[]; };
+  Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
   BiodiversityR = derive2 { name="BiodiversityR"; version="2.9-2"; sha256="15wa7la36mfr9fi8cahvrkcd5n5gjiar66mj1c1gsaazjwqsfw6n"; depends=[Rcmdr vegan]; };
   Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
@@ -407,66 +408,71 @@ in with self; {
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
   Blaunet = derive2 { name="Blaunet"; version="2.0.7"; sha256="19p2rqbg44pi0dz2iimjgr69zyrjf0dfsic6spph81dyrri1zyvh"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; };
-  Blendstat = derive2 { name="Blendstat"; version="1.0.1"; sha256="1riw2g114xar6ix1q97701lbbsgc55c1q73nrdvwm0raicjxhisi"; depends=[lattice MASS]; };
-  BlockFeST = derive2 { name="BlockFeST"; version="1.3"; sha256="062x7lrcpkd15j3ar58j1gssbd0h66dym7c004jf0k040dkk0z43"; depends=[BASIX]; };
+  Blendstat = derive2 { name="Blendstat"; version="1.0.2"; sha256="04rn5yqkmqrcali75ly476x0dasysbxilynziy48mrm6q3h7xyjy"; depends=[lattice MASS]; };
+  BlockCov = derive2 { name="BlockCov"; version="0.1.0"; sha256="102slm6qfhsra5fg2qzwi3ldi4xny596g2cq4csiprpkhl9qwyli"; depends=[Matrix]; };
+  BlockFeST = derive2 { name="BlockFeST"; version="1.6"; sha256="0hj7a5as7nxbgjac7lbj6qfwffx3g8x8phpf9a55f1c9cdzi73a5"; depends=[BASIX]; };
   BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
-  BoSSA = derive2 { name="BoSSA"; version="3.2"; sha256="03m4l77mq1h7vxfwkkp2r9acnbwd46mq85z27iizmwixnh81pgxy"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
+  BoSSA = derive2 { name="BoSSA"; version="3.4"; sha256="0sv42gyv5pzn9w6bn1y361mg6x8z9h1mbgyp8yp5wbv3jl6469s6"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
   Bolstad = derive2 { name="Bolstad"; version="0.2-38"; sha256="1535cfpn202vb037q027dy51kc4yg5g9mpn4l6x2q1pwrvnnx18f"; depends=[mvtnorm]; };
   Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
   BoltzMM = derive2 { name="BoltzMM"; version="0.1.1"; sha256="0jb81wn8b5lhvlkpv4rs66qdmryf57n2xmxgwl1qk0n8bfzy8ayi"; depends=[BH Rcpp RcppArmadillo]; };
   BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; };
   BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; };
-  BoolNet = derive2 { name="BoolNet"; version="2.1.3"; sha256="1s64a46wfp31jsyfdg2m8269qaq7x798y2bj0dyk69di1nxx2daa"; depends=[igraph XML]; };
-  Boom = derive2 { name="Boom"; version="0.7"; sha256="1jfy1namnrpnly992jvhv5qiwnj5mdz5vp6f1xglsgd4wf39sfxb"; depends=[BH MASS]; };
-  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.9.0"; sha256="05pd55jrbmg3pipc5nhq80g9bk47g4rkjx89q788bz7lzn11gdsn"; depends=[BH Boom]; };
+  BoolNet = derive2 { name="BoolNet"; version="2.1.4"; sha256="0jd7nxz09glrv8hb0rwg7xng77hqcskwdp49wsljhgh71di1y5vs"; depends=[igraph XML]; };
+  Boom = derive2 { name="Boom"; version="0.8"; sha256="02930f5iw62csbvlz1d4s9nihynjipn1xi60sl5z1hrf75yvm37a"; depends=[BH MASS RcppEigen]; };
+  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.0.0"; sha256="07cgzwcnr3z5qnm1fsc75xh9c61gljgd8s633g336dqls4b7nfan"; depends=[BH Boom]; };
   BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; };
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
-  BootValidation = derive2 { name="BootValidation"; version="0.1.3"; sha256="097s6yd2g6ahc7rrdpzjarmvqajvzfz2dzawm8gijiami0dkfm9m"; depends=[glmnet pbapply pROC]; };
+  BootValidation = derive2 { name="BootValidation"; version="0.1.5"; sha256="0whb13gg2zsx8gzwd1f895jai0z2xpfjifdr91kdxmzpsmw78jxj"; depends=[glmnet pbapply pROC risksetROC survival]; };
   BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; };
   Boruta = derive2 { name="Boruta"; version="5.3.0"; sha256="181ldma4rfd14bnq5prhhsjji1hpr4jmn69b017cs08w7k0nqdi9"; depends=[ranger]; };
   BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; };
+  BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="5.9.2"; sha256="0cyhqglz0mhfi8yk3a1qdry5ljd8rjzayqj1hyw44w9b8xsm6659"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-8"; sha256="09c6zdzf5k5x7zv5m6ygl4k5xbprlpb6s3lrq432mmv8rn2yi58z"; depends=[brglm gtools lme4 qvcalc]; };
   BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; };
-  BrailleR = derive2 { name="BrailleR"; version="0.26.0"; sha256="1grqs3sb1xk28vmpcbidb6s805wqzkrrx41qqz7jc5y8vpspba51"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest pander rmarkdown XML xtable]; };
+  BrailleR = derive2 { name="BrailleR"; version="0.28.0"; sha256="0hg3858aa9zr68rd7xdc1kjapdfp5lgy8rx07qd3brljnhjaxxsz"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown whisker XML xtable]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
-  BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.4"; sha256="0d51i3dpdfay3562b87la0731jfc5bq5d04mxs1qdrzw6p69ijvn"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; };
+  BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.5"; sha256="0hw9a3d2wqngvw17bgiwl7l9pn0f7pn8v3da6zz4gpf986pk8blq"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; };
   Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-5"; sha256="1ly9fx6mmiwrni52li0c23amsh4k36zjv9h5432igf0fgldhr3pq"; depends=[]; };
   BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; };
-  Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; };
+  Brq = derive2 { name="Brq"; version="2.1"; sha256="0my9sb0761nq1ivx31k7nwpg8xidqvd0zv3lan57hnsmn7d1i7a9"; depends=[]; };
   Brundle = derive2 { name="Brundle"; version="1.0.8"; sha256="1yj196x6xb75qgi16pgg3dyjmxmjklfjcpxymaki32drhmylf24z"; depends=[DESeq2 DiffBind lattice Rsamtools]; };
   BsMD = derive2 { name="BsMD"; version="2013.0718-1"; sha256="06w1dl5zp1cgjhk3m2zz6xsmcfwdk6ar3gmxdn96v71mqnhv81v1"; depends=[]; };
   BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; };
   BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
   BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; };
-  BusinessDuration = derive2 { name="BusinessDuration"; version="0.1.0"; sha256="0bx147qcf44q2bpl4rcyps18vk2dawcgn7870j8ljc8d86lqnvqd"; depends=[chron]; };
-  BuyseTest = derive2 { name="BuyseTest"; version="1.0"; sha256="1nfj2ajah2dg1p47g2z0zf9s24sxj4dfn3nny1h4qmqwcb4vs55g"; depends=[data_table lava Rcpp RcppArmadillo snowfall survival]; };
-  C50 = derive2 { name="C50"; version="0.1.1"; sha256="1pq1plsh7kf45f0ghrja0xjikaxgvq14k8k80ml5rkabyv11zg03"; depends=[Cubist partykit]; };
+  BusinessDuration = derive2 { name="BusinessDuration"; version="0.2.0"; sha256="17923n1r3n8kp7qqzr2dv8ffax355yyc3b9f6mv2hxy6k31hrrb8"; depends=[chron]; };
+  BuyseTest = derive2 { name="BuyseTest"; version="1.3.2"; sha256="1wdc2w8pdjnsj2hn902zrn6d734d9y4l4cfxd4hq1m1n7ly6gnnk"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; };
+  C443 = derive2 { name="C443"; version="1.0.0"; sha256="0d04769m9kkjqpj1cgfhqrri893nwi6qn7fz63z5pkym5cig5yyi"; depends=[cluster ggplot2 gridExtra igraph MASS partykit qgraph RColorBrewer reshape2 rpart]; };
+  C50 = derive2 { name="C50"; version="0.1.2"; sha256="1fpspmsm62h077dkdhii23bs3sxlblabfqj4waz794ihw1b9hicg"; depends=[Cubist partykit]; };
   CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; };
   CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; };
-  CAISEr = derive2 { name="CAISEr"; version="0.2.1"; sha256="1y070r50vhs5ri91zw28wr8nkiq15n9dpjggi6hs601a0bj7463v"; depends=[assertthat]; };
+  CAISEr = derive2 { name="CAISEr"; version="0.3.0"; sha256="00jj01hyk86f90b8krl3k8pfh98blhq6vmvnizwwhrmkzy7d7bbj"; depends=[assertthat pbmcapply]; };
   CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; };
-  CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; };
+  CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-1"; sha256="1xsnqyj0qdi081rdnpas9ciy9zbhdcjx3lphl6drk0bbmik3znkv"; depends=[mice mvtnorm randomForest]; };
   CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
   CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; };
-  CANSIM2R = derive2 { name="CANSIM2R"; version="0.12"; sha256="1r8fln9rqjsqhbnxvng9wpdnp6mb1gxlq3qkff4q2wbhf18wwn7w"; depends=[Hmisc reshape2]; };
+  CANSIM2R = derive2 { name="CANSIM2R"; version="1.12.0"; sha256="12wnbgrcx9373n5n5wm6scsw8aq1jfrjzfh2f38asn7sxm3ky6ri"; depends=[downloader Hmisc reshape2]; };
   CARBayes = derive2 { name="CARBayes"; version="5.0"; sha256="0kii28mf75m7ij1l0bz2w93h7m1wwq1xjvv3d3nf3ps9h8rxzi8d"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; };
   CARBayesST = derive2 { name="CARBayesST"; version="2.5.2"; sha256="0jww40ghcfiq7laprdicynn1m34ykz9l9navi9rdx8p8d7k76ykc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
   CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; };
   CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
-  CARRoT = derive2 { name="CARRoT"; version="0.1.0"; sha256="1zwc59pf0wpd9hy2apx723plag3dmas39sn7rf1cfkn7h9dm27iz"; depends=[doParallel foreach nnet Rdpack]; };
+  CARRoT = derive2 { name="CARRoT"; version="1.0.0"; sha256="1xcvyk9id3scr629n7f3b1hxzfk5947n22s1hwdwi4njf3p7s67f"; depends=[doParallel foreach nnet Rdpack]; };
   CARS = derive2 { name="CARS"; version="0.2"; sha256="1n8p4n9fbl20jps9g9pbspw54hq9y6kqbggc8h0i9pbm1b25ngrg"; depends=[np]; };
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
-  CAST = derive2 { name="CAST"; version="0.1.0"; sha256="0mihpcknwk86m41x14j2g3f2s2ya20sh99ng85rcph57a4v6ar05"; depends=[caret]; };
+  CASMAP = derive2 { name="CASMAP"; version="0.5.9"; sha256="1rhvc44ngcvwlp12iawry5i4fmdkb1waldb0x3diw3jssim3n6mq"; depends=[Rcpp]; };
+  CAST = derive2 { name="CAST"; version="0.2.0"; sha256="01n4sdk6gsjz2g157h4y04rwkjxwzzsia3pqs0slnmvmf4yzr0b4"; depends=[caret ggplot2]; };
   CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; };
   CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; };
-  CATkit = derive2 { name="CATkit"; version="3.2.3"; sha256="1vl60m6x3mqgghqzpxq8aalpjpcagamjk5zg62mqpwx0vgdwv2fy"; depends=[assertr magic MASS png rtf season signal]; };
+  CATkit = derive2 { name="CATkit"; version="3.3.2"; sha256="1yyz3dc9r2dn16q745374dpwgf56880kv0yg35h6dhmrya3xrprm"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; };
   CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
   CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; };
   CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; };
-  CBPS = derive2 { name="CBPS"; version="0.18"; sha256="0dd63s9nrgra51w005j35scbswbknqgv9ppawh0311hpr7anrir9"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
+  CBPS = derive2 { name="CBPS"; version="0.19"; sha256="0rb04x8lin5p6h0ziiv2zh98qvah5mkpd3qbgrmhczacavvpb8hl"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
+  CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
   CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; };
@@ -474,11 +480,10 @@ in with self; {
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
   CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
-  CDECRetrieve = derive2 { name="CDECRetrieve"; version="0.1.0"; sha256="059pppiczvnfm4shyac6myzbq1vyz2pl7mxq225sy9ppdf813y61"; depends=[dplyr httr lazyeval lubridate magrittr purrr readr roxygen2 rvest stringr tibble tidyr xml2]; };
-  CDF_PSIdekick = derive2 { name="CDF.PSIdekick"; version="1.2"; sha256="1h2d5xh7zj3d8r63qndvd5c8z52byn1852b51zmj6ypc90fil25x"; depends=[Rcpp]; };
+  CDECRetrieve = derive2 { name="CDECRetrieve"; version="0.1.1"; sha256="0rxwsyr2j35f52vzpg5v4jn5qi72xn1gbqxnpsfn8c6hhmqdfjwz"; depends=[dplyr glue httr lazyeval lubridate magrittr purrr readr roxygen2 rvest stringr tibble tidyr xml2]; };
   CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive2 { name="CDM"; version="6.1-10"; sha256="00c25k4hliqc4w15njasp0azsyy1x13h7y3kh1b9dl3qkpqs5r2z"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="6.3-45"; sha256="159ahd17ddv0y78xrfrm1zdq5wfwav4jc26b41wd23zli1ljnlj5"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
@@ -488,9 +493,8 @@ in with self; {
   CENFA = derive2 { name="CENFA"; version="0.1.0"; sha256="1bxrqvi67s93mvkbigb8l7rrn2j2ix7qw7vcxf4dbwd7xf3qqv6q"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
   CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
-  CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
-  CGPfunctions = derive2 { name="CGPfunctions"; version="0.1"; sha256="0zsvhhp5pgqrn518c1cmmxama1cadg7grscimz08cclzidcqq0w1"; depends=[car dplyr ggplot2 rlang tibble]; };
-  CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; };
+  CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; };
+  CGPfunctions = derive2 { name="CGPfunctions"; version="0.4"; sha256="05rfv923bisg8270vc6hnh3sb1fldbyqwdwj7xqghbvcrgch2b4k"; depends=[car devtools dplyr ggplot2 ggrepel rlang scales tibble]; };
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
   CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; };
   CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; };
@@ -500,18 +504,19 @@ in with self; {
   CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; };
   CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; };
   CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
-  CINNA = derive2 { name="CINNA"; version="1.1.4"; sha256="0wq7kiycx4ly6pm9f81g0wjzrhb123zzflsx7mnxs7lc77ga2h2b"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
-  CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
+  CINNA = derive2 { name="CINNA"; version="1.1.41"; sha256="1s0hcqikb02xnz6kw4aapl5dw6p1dksjnr3yhhnfw6wibbkls1hc"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
   CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; };
   CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
   CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; };
+  CJAMP = derive2 { name="CJAMP"; version="0.1.0"; sha256="0kvmb8vh3dfhdavmvkfmr8293p5lgjws6p7kzmc7r9h6bzmc2hcr"; depends=[optimx]; };
   CLA = derive2 { name="CLA"; version="0.90-1"; sha256="1rpklm21i9rjw0vfhaz9brq9571yjynwfhpv6dp6fbl3cj7bwb8g"; depends=[]; };
-  CLME = derive2 { name="CLME"; version="2.0-9"; sha256="11kwk3v5kbk1k2gsglpvlq6nyh0b0qd97jpqcv1s2swx12pzdxqc"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
+  CLME = derive2 { name="CLME"; version="2.0-10"; sha256="1jlib4pi3ifhfwmvd1jj4kkl6npirykhz0wlvv19nvhf3514y04s"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
   CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
   CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
   CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
+  CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; };
   CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
-  CMatching = derive2 { name="CMatching"; version="2.0"; sha256="0g8hiag51cqj0wy7lbaa5x4xbnyb74s5xiws6pwxhrvbp3ym69bs"; depends=[lme4 lmtest Matching multiwayvcov]; };
+  CMatching = derive2 { name="CMatching"; version="2.1"; sha256="172b5pzs6z8rdziqn1cq0s4zcr5hd2ql3wjslf6rv7zn9afkmjdr"; depends=[lme4 lmtest Matching multiwayvcov]; };
   CMplot = derive2 { name="CMplot"; version="3.3.1"; sha256="01qpy7bb3503i3b8v4psrxbx9ff5vzcv54j55mdr1bphwmnp1kzq"; depends=[]; };
   CNLTreg = derive2 { name="CNLTreg"; version="0.1"; sha256="1fjc45kv2nm902vpfynfxj0n7nm2prazm44nhg2m30vd6l1ijisv"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1"; sha256="0s98ckg6ms3kh49b8la2d8rsdb0m4m0v8gdbj48nqxncdvg25qk4"; depends=[adlift CNLTreg fields nlt]; };
@@ -522,7 +527,6 @@ in with self; {
   COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
   COCONUT = derive2 { name="COCONUT"; version="1.0.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; depends=[]; };
   COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; };
-  COMBIA = derive2 { name="COMBIA"; version="1.0.5"; sha256="0f4p2gb16bb46jcdmzlaaicymqnw18c7qc39m0s5jwps4c8whyym"; depends=[gdata hash lattice latticeExtra oro_nifti]; };
   COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.1"; sha256="14gjrf2hj7dy4hd0qnh6vqjzh7gc6g7gm7rh1d8dingkjwmjzrqb"; depends=[]; };
   CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; };
   CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; };
@@ -535,40 +539,46 @@ in with self; {
   CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; };
   CPBayes = derive2 { name="CPBayes"; version="0.3.0"; sha256="1vzh9sgij194j7kiwjgba7xsqffiif9zamj9gdv2lk91wdcqaxid"; depends=[forestplot MASS]; };
   CPE = derive2 { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[rms survival]; };
-  CPHshape = derive2 { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; };
   CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind mvtnorm plyr]; };
+  CPP = derive2 { name="CPP"; version="0.1.0"; sha256="1kdf43pnavjbmxkvrj78fiwl0ykln9x9ck8pcivhj9q5rsfbhbh4"; depends=[ineq kappalab mc2d]; };
   CPsurv = derive2 { name="CPsurv"; version="1.0.0"; sha256="1r68pp3jbcbwgfac132h30qx6ah780aychr49rlncn17xbdalxsh"; depends=[muhaz survival]; };
   CR = derive2 { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; };
   CRAC = derive2 { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; };
   CRANsearcher = derive2 { name="CRANsearcher"; version="1.0.0"; sha256="09gw1s28gb0l2cn4w3asl6zlr7wfacxwafbdrayajwckyfkjl5dl"; depends=[curl dplyr DT lubridate miniUI shiny shinyjs stringr]; };
-  CREAM = derive2 { name="CREAM"; version="1.1.0"; sha256="09mmfcgh5vfh4hq9vgsr1qsph7qq4w555j1j7zjcq69cfabp0np9"; depends=[]; };
-  CRF = derive2 { name="CRF"; version="0.3-14"; sha256="0xhjj76730yjlpwbhcpdzqp7s37a9rhf4adk1s7hfb0jm8b76fgh"; depends=[Matrix Rglpk]; };
+  CREAM = derive2 { name="CREAM"; version="1.1.1"; sha256="1lccpwn6c5pmykgf689gvvpqdcilkys4vclpxjhllhanjrfhcs3q"; depends=[]; };
+  CRF = derive2 { name="CRF"; version="0.3-16"; sha256="1vw8gkrhymqi7x3p257k8vvn4df4s16w8hhm1myzhcp6bf44jqg4"; depends=[Matrix]; };
   CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
-  CRPClustering = derive2 { name="CRPClustering"; version="1.0"; sha256="1mr6wcfsgl3x9dx3sx1iav1i82r70jn985y7jkmvip0h9xslrk7g"; depends=[MASS mvtnorm png randomcoloR]; };
+  CRPClustering = derive2 { name="CRPClustering"; version="1.2"; sha256="19m7jg6ck2gqmry2p35h3vv8msm4w1x7qwwmm746r646q7w9ylml"; depends=[dplyr lucid MASS mvtnorm png randomcoloR]; };
   CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
   CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; };
+  CSESA = derive2 { name="CSESA"; version="1.0.4"; sha256="05nijz8x5sgmc4aykxsqg2i1n50zx0kd5lqi5a1fwxbx2miw27sv"; depends=[Biostrings]; };
+  CSFA = derive2 { name="CSFA"; version="1.1.0"; sha256="0dqva3i4jhlbjmqwngxqgl6prfs3cxb219jqc7yvjjk8n4nz8jim"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; };
   CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; };
+  CSeqpat = derive2 { name="CSeqpat"; version="0.1.1"; sha256="1vgwkiin485n3bks09bg4ricjfw1l8k5qfv7l0xp50zha3r18g1y"; depends=[NLP tm]; };
   CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; };
+  CTRE = derive2 { name="CTRE"; version="0.1.0"; sha256="1v2327g78rva3n7lvn66rznzzf2qbdak0jp8gakgljpl30kpkv5v"; depends=[assertthat MittagLeffleR plyr tea zoo]; };
   CTT = derive2 { name="CTT"; version="2.3.2"; sha256="1f4ba2qnxx5vlj64sxz4ynby9hv7f32v6ls8yn887z51m33xdxi8"; depends=[]; };
   CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; };
   CUB = derive2 { name="CUB"; version="1.1.2"; sha256="031jkzh6cr8gd2naqv54xs3vlrqmcbl9d2in66kd0dr2i41l3qj7"; depends=[Formula]; };
-  CUFF = derive2 { name="CUFF"; version="1.4"; sha256="01lx4ds1rlh7vndv13s11mhhamgsbqnsqjgd44iryfl3jmy3xfz3"; depends=[openxlsx xtable]; };
+  CUFF = derive2 { name="CUFF"; version="1.5"; sha256="1cphwhimzmsljfjvfvpld4mixznlsg5azzv7dwrgnh8q4wpnaxpc"; depends=[openxlsx xtable]; };
   CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; };
   CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.3"; sha256="149d16d5y7zxkzq8gmb5spfrvirv0vyhk2qx0v7vclkr8adz9sva"; depends=[]; };
   CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; };
   CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; };
-  CVST = derive2 { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
+  CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; };
   CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
   CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
-  CVXR = derive2 { name="CVXR"; version="0.95"; sha256="1sf8n27w7dlix55bc5rdrrn361yc6xslwykd1vj51zh908c5as1w"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; };
+  CVXR = derive2 { name="CVXR"; version="0.99"; sha256="1by7jgy70wbf1bvskxi1l3lfkcl6cbigk64ncb2g8h2c974wn9pi"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; };
   CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
+  CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; };
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
-  Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.2"; sha256="07g7ik3xb9ijghkz94qyk87c2d4q942h4d0yicwr1j1xzcv5qzsw"; depends=[]; };
+  Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; };
   CaliCo = derive2 { name="CaliCo"; version="0.1.0"; sha256="1fz4sx6wsrkmcfjjgjn7z26m266m844qz8ms4vk6bnhx0h1rp6qa"; depends=[coda DiceDesign DiceKriging FactoMineR ggplot2 MASS Matrix R6 Rcpp RcppArmadillo testthat]; };
   CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; };
   Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; };
+  CaseBasedReasoning = derive2 { name="CaseBasedReasoning"; version="0.1"; sha256="0hwll17j0br8sr0ci3bfa5rx4r36hr7myq7b5fav664zjxdh9wr4"; depends=[cowplot data_table dplyr magrittr R6 ranger Rcpp RcppArmadillo RcppParallel rms survival tidyverse]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
   CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; };
   CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; };
@@ -577,8 +587,7 @@ in with self; {
   CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; };
   CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; };
   Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; };
-  CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
-  CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
+  CePa = derive2 { name="CePa"; version="0.6"; sha256="1qpxx9x656g678wp190q29vxkb54sfkalg0csg0ndlcvi03dvl3d"; depends=[graph igraph Rgraphviz]; };
   CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
   CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
@@ -587,9 +596,9 @@ in with self; {
   CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
   ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; };
-  ChainLadder = derive2 { name="ChainLadder"; version="0.2.5"; sha256="0023qbwyrb6vifsllws9jj1hlylmglzfc339d5rg8nhb50i4v6fd"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
+  ChainLadder = derive2 { name="ChainLadder"; version="0.2.6"; sha256="0mpb7br76ng3m9g4ncx2g628zmjyf1rvi3lyxmfsmilpq6vh30n1"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
   ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; };
-  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.12"; sha256="0iz40xbkcjlydxnlm437iiy3pb8viqym6bwimhbjvm2v3dq5p8h5"; depends=[Rcpp RcppArmadillo]; };
+  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.13"; sha256="1nkz8n3a6f0xl56py45pv0rp0n0kmz3a1m616w38mjjlcypdalwq"; depends=[Rcpp RcppArmadillo]; };
   ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; };
   Chaos01 = derive2 { name="Chaos01"; version="1.1.1"; sha256="0ibxibmlyc6wkhqj2achwkwdkniin60y8xh8b80nq6ggmm7w9crw"; depends=[]; };
   ChaosGame = derive2 { name="ChaosGame"; version="0.3"; sha256="0nfp2qnhzpncs0yd5rknspin6c4hidqhxdd973ysiivg63wxwz8d"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
@@ -598,37 +607,37 @@ in with self; {
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
   ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.97"; sha256="0kdcwv9kncv2r5mabp0mf9bmnajcnxmqavrl2lpn3d2pji6pv1qq"; depends=[plyr]; };
   ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.11"; sha256="00z09bplm5qvd31y7m4b4knsrl0n27j9635m1gdak6lg4db4nxrd"; depends=[devtools kohonen MASS pls]; };
-  ChoR = derive2 { name="ChoR"; version="0.0-3"; sha256="085p604zbk4l88q4ig2fnfhadxvsssyjl2r48g8s99yx49cvd9sx"; depends=[commonsMath rJava]; };
+  ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; };
   ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
   CholWishart = derive2 { name="CholWishart"; version="0.9.2"; sha256="1dlq6a9j3ifhmw94w158czc72f31rns0xfw4zbfx4zcah678raq6"; depends=[]; };
-  CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; };
   CircMLE = derive2 { name="CircMLE"; version="0.2.1"; sha256="031pmfyqwif16am7h1csk1dg9vhy0jgdc8w4z60kqqsgf3yk6il9"; depends=[circular]; };
   CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; };
   CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; };
-  CircStats = derive2 { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[boot MASS]; };
-  CircularDDM = derive2 { name="CircularDDM"; version="0.0.9"; sha256="187vq7s8bp822lncv4gi3f98myg8na6cbg92zvdlzbsx50fylipf"; depends=[Rcpp RcppArmadillo]; };
+  CircStats = derive2 { name="CircStats"; version="0.2-6"; sha256="07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf"; depends=[boot MASS]; };
+  CircularDDM = derive2 { name="CircularDDM"; version="0.1.0"; sha256="1wxdjj7dndvhvl00cykcrwmw9f7halsg3a0db56kp2mhf54rj37z"; depends=[Rcpp RcppArmadillo]; };
   Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; };
   CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; };
   Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.1"; sha256="1jx5419r2c55qxh4kfjdm37594bqcalqgdrqihsr8aafxhh96b8z"; depends=[]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
-  ClassComparison = derive2 { name="ClassComparison"; version="3.1.5"; sha256="0h83xf6vwp1wjavsnpcdxc033pyyc68vmghwmcivalcp3kahz6gf"; depends=[Biobase oompaBase]; };
+  ClassComparison = derive2 { name="ClassComparison"; version="3.1.6"; sha256="1y0yx3qnd5mkbqjxyfjjg2y0c0b9jjwn71z97h82ya5ci3fffndi"; depends=[Biobase oompaBase]; };
   ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.7"; sha256="03lp1dbp2mzrzk1hn7nkp7nm1ngs0qndlk3zz7qjh3a67x7xr5p1"; depends=[Biobase cluster mclust oompaBase oompaData]; };
+  CleanBSequences = derive2 { name="CleanBSequences"; version="0.4.0"; sha256="12s24v2kfyc32pm34ibw58zzjqhzwlrqrkhl0m70jcqvn50b5r98"; depends=[Biostrings]; };
   ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; };
   ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; };
   ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
   ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="0.1.0"; sha256="1lqf2ksgchl1j5hfkz7r5yczvkjgi3238k8nkfkd70nyil9vjq06"; depends=[Rcpp]; };
   CluMix = derive2 { name="CluMix"; version="2.1"; sha256="080gd6v8yj83djmf4wg7cwk6q6w6gsg4xfsgw5qd6z8h3kpyn45m"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; };
-  ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; };
+  ClueR = derive2 { name="ClueR"; version="1.3"; sha256="04axd5wrh8xszyvm6kcvhr3qs0rx9nj0z99j26qijf5w80lmhaki"; depends=[e1071]; };
   ClusVis = derive2 { name="ClusVis"; version="1.1.0"; sha256="17cn3hm37jv10aybaidy89kch6814hdi8g44s94xa9li7nixzass"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; };
   ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; };
   ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; };
   ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; };
   ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; };
   Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.1"; sha256="18is8aa496qr7afmyqy12s267ans0hhzy0xs8nzr3qp70mwrbbh1"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr tibble]; };
-  ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.9"; sha256="116rj2ynk37pc5ic6xlnh3gvzl6qasly8avchmwcdsg4w7i2z8l7"; depends=[]; };
-  ClusterR = derive2 { name="ClusterR"; version="1.1.1"; sha256="0b9x0a1s0d9nnkkcm417xsaciwb66771s14ir6n6mm7yq1g6x417"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
+  ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.1.2"; sha256="04charq9ydxiy8qvign3nc3ksg5v8d7jq39kdx7nndwgyjsidaic"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
   ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
@@ -636,17 +645,16 @@ in with self; {
   CoDiNA = derive2 { name="CoDiNA"; version="1.0.0"; sha256="1anc127d4xx1yks5kq2glcv8sijs0sfab9wjs7j9g1aqp97hmk33"; depends=[data_table geometry igraph magrittr plot3D plyr reshape2 visNetwork]; };
   CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; };
   CoImp = derive2 { name="CoImp"; version="0.3-1"; sha256="0zj152w4cvnbfl144ggs3ixmyywxf9dqhh04jfydmv2a8n6px89n"; depends=[copula gtools locfit nnet]; };
-  CodeDepends = derive2 { name="CodeDepends"; version="0.5-3"; sha256="03p82s0abca2jimzqvxdzykfzca7c7fhm5xsjxybcksr4gggr5sc"; depends=[codetools XML]; };
+  CodeDepends = derive2 { name="CodeDepends"; version="0.6.0"; sha256="0gyvafhqrjgy81z3b7ii8p6rxi2zaakvrxb52fnbr616lk8xlmfw"; depends=[codetools graph XML]; };
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
   CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; };
   CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; };
   CollessLike = derive2 { name="CollessLike"; version="1.0"; sha256="080mrvszysdqvx03sd4aczvhs1zmhc6fx8zp5nwrh7mmyajslxkx"; depends=[ape igraph]; };
   CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; };
   ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; };
-  ComICS = derive2 { name="ComICS"; version="1.0.3"; sha256="1jfs0ygr88532jjw2ablyn2r3sg3hfsv5yrm4gkdgzakychj3dy2"; depends=[glmnet]; };
+  ComICS = derive2 { name="ComICS"; version="1.0.4"; sha256="0brsb7y1bg23sdpxs4j1y3xdgr1q7iinxnnp17rravw72l991xqa"; depends=[glmnet]; };
   CombMSC = derive2 { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
   CombinS = derive2 { name="CombinS"; version="1.1-1"; sha256="06g41zbjl54cbhhs8q7l4bbvszclvbxn3m2dqg800d6ghs9vgl6v"; depends=[]; };
-  Combine = derive2 { name="Combine"; version="1.0"; sha256="0n3jkxf4s778d6fzcanb2b09xhpv5sqzawpg17bbfngfhp0vfyrq"; depends=[]; };
   CombinePValue = derive2 { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; };
   CombinePortfolio = derive2 { name="CombinePortfolio"; version="0.3"; sha256="0w4mw748ix7jyqfirr8bm93i742y7bpir7q5x1j3r9cqpi9h5zfv"; depends=[]; };
   CommEcol = derive2 { name="CommEcol"; version="1.6.5"; sha256="02xra47znnbnsgxy6xinyk2dv8asshd4fgh7bn6qf7m6p4d743pj"; depends=[ape gmp picante vegan]; };
@@ -656,41 +664,39 @@ in with self; {
   CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
   Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; };
   CompDist = derive2 { name="CompDist"; version="1.0"; sha256="02c18ksk6clv674yh79bzg3mh9hymzhal51j6g0rnvqd5ra8g66c"; depends=[actuar fExtremes numDeriv PearsonDS rmutil VGAM]; };
-  CompGLM = derive2 { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; };
+  CompGLM = derive2 { name="CompGLM"; version="2.0"; sha256="08h91lqafs2af1ms2zmd0v5bg2y9218frk5l6bj3y53791aqd5s2"; depends=[Rcpp]; };
   CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
   CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; };
   CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
-  CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
-  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.0"; sha256="13gwxnqa0r805i1b5z3ym4pp297305jwvdn7b35pf2v9zlcnyh7c"; depends=[data_table expm Matrix]; };
+  CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-5"; sha256="0p1wb97riv9mb4wiyyb1m4n2z6jf8nnfa6znwjdriphdhdwhpnha"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; };
+  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.2"; sha256="0zyawv3kh3hxp771bh01jck2cvy3mz92nkv454lk70h35qm4sgrb"; depends=[data_table expm Matrix]; };
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
-  CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; };
   Compind = derive2 { name="Compind"; version="2.0"; sha256="1qadyl96c9cmk1i763gc055hgv414ha59418lqk183kwl5sgbqy5"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; };
-  Compositional = derive2 { name="Compositional"; version="2.9"; sha256="1vmnckp17hl3yr4qfpisavmfcvvsnh3d6v721dgns9a93cqs30z0"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
+  Compositional = derive2 { name="Compositional"; version="3.1"; sha256="0xy9b1gvxpr3k2351yax5yq6iijk3yws2fa07wmjykkl0y7m85zc"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
-  ConR = derive2 { name="ConR"; version="1.2.1"; sha256="0k6761x5dfibbbzfzmkc73ahfmw54d5rpj0rj32232qdlk48hqk5"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
+  ConR = derive2 { name="ConR"; version="1.2.2"; sha256="0my9cb7psm0zinyfr1p8a53lbfbqf6hx7lfyxkqszckpj7gsg3hr"; depends=[doParallel fields geosphere maptools plyr raster rgdal rgeos sp spatstat spatstat_utils tibble writexl]; };
   ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; depends=[coneproj]; };
   Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
-  CondIndTests = derive2 { name="CondIndTests"; version="0.1.3"; sha256="1lmys6a3cwk8c3d08lpb2dny9madsdf2fnslx6qjx27cg95bhdcb"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; };
+  CondIndTests = derive2 { name="CondIndTests"; version="0.1.4"; sha256="0588by7rxrzm2zjigk44snsfv89vkp4fh7y72qm39g57vdz3ykjx"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; };
   CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
   ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; };
   ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; };
-  Conigrave = derive2 { name="Conigrave"; version="0.1.1"; sha256="0k9azng63pyq7xic5w00mllbyq17pz8g1zmgr6zpvkmfv13fa6yw"; depends=[ggplot2 miceadds mitools]; };
+  Conigrave = derive2 { name="Conigrave"; version="0.3.0"; sha256="15zfaivawk83xr6gx5ij1xc43z5vgci8x0hglxjnhla02zn0zh9f"; depends=[ggplot2 magrittr miceadds mitools stringdist]; };
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; };
   ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; };
   ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.2"; sha256="0761wfjxh26kf4q1qcfzfaj52553yiw1ny6l84r3wzzx4hv893qy"; depends=[caret mclust mixture mnormt mvtnorm]; };
   ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.0"; sha256="1hlff3wx8r1wpkhrz0n27wjnzy6z2q8s9smyb906gwwa9xga7njy"; depends=[]; };
-  ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
-  ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.0.0"; sha256="0ndb7k2lfv6014a7c61a2mmcsywpa478lk6fh7d0jkv55hmnzvs9"; depends=[lmtest sandwich]; };
+  ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.1"; sha256="0f74aaglby4hmg72957cj3y7jdchy5kq793skl7yidrjc1nk04ib"; depends=[lmtest sandwich]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
   CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-7"; sha256="00x2ijyg1bj2xp679i453d4fd58qp7mfj3pvv3cddh0hl8yfns18"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; };
-  CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; };
+  CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.1"; sha256="044si0nwniiglrcg6mjvs4z3hk6hhhsy49c6pigy6yf1wvvqxp4m"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
-  CorReg = derive2 { name="CorReg"; version="1.2.1"; sha256="1c7vvlxza0r9r07rr464y3kfkrnzz15l4jc7s727wjrw2az8rnpy"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
+  CorReg = derive2 { name="CorReg"; version="1.2.8"; sha256="18l9aiv2ipvs14ycnzq99yvnkws38wnj42zbk5jqgv33kn37qbx2"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
   CorShrink = derive2 { name="CorShrink"; version="0.1-5"; sha256="03g5njb191nqiy0lmk8jrwyrnl3w733b8h0krkbsjh2zravyw1xc"; depends=[ashr corpcor corrplot gridExtra Matrix reshape2]; };
   Corbi = derive2 { name="Corbi"; version="0.4-2"; sha256="0h088iplryaipnfp8svw3djh016z23lv66q51gfbqpvchvjdwypw"; depends=[CRF Matrix mpmi]; };
   CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; };
@@ -707,30 +713,30 @@ in with self; {
   CountsEPPM = derive2 { name="CountsEPPM"; version="2.1"; sha256="1w1l4kbk8c2prq7f38maz0fc44j9za6cmj0vydmcgscb9s6f3mg7"; depends=[expm Formula numDeriv]; };
   CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; };
   CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
-  CovTools = derive2 { name="CovTools"; version="0.3.0"; sha256="0p5mfrdp4p5fz9ld0rqrd2kj73hi1dzx0iwl4rihhgfgdplzknhf"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; };
+  CovTools = derive2 { name="CovTools"; version="0.3.1"; sha256="0ph7rip2lm71qb386diw93n84jaqijz6bqn0i6zgd5gg8j3szx46"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; };
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
   CoxPhLb = derive2 { name="CoxPhLb"; version="1.0.0"; sha256="1j8dvbjv4h0zdjvwvpswdlsb9pf3gxixh2rhl0m1kxm6f6h5ig0z"; depends=[survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
   CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; };
-  Cprob = derive2 { name="Cprob"; version="1.4"; sha256="1kjw5hhb3fy12xlyg01i8ynl78gx0r57kvmgafbqix1s3pg2hyw6"; depends=[geepack lattice lgtdl prodlim tpr]; };
+  Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; };
   CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
   CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; };
   CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; };
   CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
   CrossVA = derive2 { name="CrossVA"; version="0.9.1"; sha256="13skbazs1mh5am70qlwxhvxgfx4gwlzzq6zy3vdzaa3zbykkxlvw"; depends=[lubridate]; };
-  CrossValidate = derive2 { name="CrossValidate"; version="2.3.1"; sha256="1v9fwhhy2xxrrn0xd2yg7ngy7adm85fmyvqhcvnpa91ifr4ijrly"; depends=[Modeler oompaBase]; };
+  CrossValidate = derive2 { name="CrossValidate"; version="2.3.2"; sha256="1dlvkv712rz3gw03c04qlk0l0mqjyds3m3pnbszk4848zby5ac6r"; depends=[Modeler oompaBase]; };
   Crossover = derive2 { name="Crossover"; version="0.1-17"; sha256="168j8fl6h7x1pia5f5c18yrf0y1lvznib8clq1mv0imb7cjzkkhi"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
   CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; };
-  CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
-  CsChange = derive2 { name="CsChange"; version="0.1.3"; sha256="08ss1dzwirmnlgw440g3k3vnrl1imhmd2gljnid8z2dzj5450alr"; depends=[boot Hmisc rms survival]; };
+  CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; };
+  CsChange = derive2 { name="CsChange"; version="0.1.4"; sha256="1lpi8igwfdmsgm26qy4qi5cikilb0xpaajl1fd6vn696bwm1ljc2"; depends=[boot Hmisc rms survival]; };
   CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; };
-  Cubist = derive2 { name="Cubist"; version="0.2.1"; sha256="18w82l44b6jsmz19l34dmaqb22qvjcwhs4cddzhs6pzicvqw645k"; depends=[lattice reshape2]; };
+  Cubist = derive2 { name="Cubist"; version="0.2.2"; sha256="1m45dpnr5djsfgqlinng6z0f2wbig2vbidlg19r3zcraqwn1agnd"; depends=[lattice reshape2]; };
   CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; };
-  Cyclops = derive2 { name="Cyclops"; version="1.3.0"; sha256="0sznzzz21qn1cxxfa3wiwvfza7lykzzf0xyqvawha9vzm8qzgqnq"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel survival]; };
-  CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.0"; sha256="1014r17krw74drykdlw24pgqylidp8yxa00zhf340ilcxfpacxyi"; depends=[curl httr jsonlite]; };
-  CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="1.0"; sha256="0hr74igy43d5ybzlgqpvx9ingw6h83w502b6k55cp6zqcv5rl8d5"; depends=[CytobankAPI]; };
+  Cyclops = derive2 { name="Cyclops"; version="1.3.4"; sha256="0iv4rsxy6zngjlbvwkx41np8phv49i6gp0f8yzb5k2azwksx2r3j"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen RcppParallel survival]; };
+  CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.2"; sha256="0mv6f1v6kclz8ima9f0b3qdb7gc85nn2cnfnzb3vqhm9vvibz8ls"; depends=[curl httr jsonlite]; };
+  CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; };
   CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; };
   D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
   D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; };
@@ -738,12 +744,11 @@ in with self; {
   DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; };
   DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; };
   DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
-  DAC = derive2 { name="DAC"; version="0.1.0"; sha256="0x27asjn1y8bxgc35ic4jpara4f7vn8w61fpg4glkjy5nbh5ss0p"; depends=[fGarch flexmix]; };
+  DAC = derive2 { name="DAC"; version="0.1.1"; sha256="0abnl70k4c98n29qi64sfd5nch10abw9fknhf2aksyi0qadsiyjq"; depends=[blavaan flexmix sfsmisc truncnorm]; };
   DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; };
-  DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; };
   DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; };
   DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; };
-  DALEX = derive2 { name="DALEX"; version="0.2.0"; sha256="0dls9v912bcww4csax35spxl9zx71g9ig9inzi9cr9ffinpw9rgk"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; };
+  DALEX = derive2 { name="DALEX"; version="0.2.3"; sha256="0v2dmc4nnz28qjc378138j0lri2rlbrmwz97xsn9z557y4hrrmmh"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; };
   DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; };
   DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
   DAMisc = derive2 { name="DAMisc"; version="1.4-3"; sha256="1hic53vi7mj4fvggxjl4d3j4zw8wwczh6pldyi8idrhm45hw2nh4"; depends=[boot car effects gdata lattice MASS nnet pscl QRM sm VGAM xtable]; };
@@ -752,7 +757,7 @@ in with self; {
   DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
   DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; };
-  DBI = derive2 { name="DBI"; version="0.8"; sha256="16nf8flxr5vdz8yrpprfbzydy3ajixkp9hc8ibd9n7r9nc29waym"; depends=[]; };
+  DBI = derive2 { name="DBI"; version="1.0.0"; sha256="1x8wy2vg2gcgd9bww04qmf0dsn3kp0rfjd8q8j1r2x9zxccg25pz"; depends=[]; };
   DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; depends=[blob DBI desc hms R6 testthat withr]; };
   DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
   DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
@@ -764,12 +769,14 @@ in with self; {
   DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; };
   DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
-  DClusterm = derive2 { name="DClusterm"; version="0.2"; sha256="0bnl9ic8q7mrb2508c5g2fkpp7wbhasivgvhldqnbqn2lyy8l76a"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
-  DDD = derive2 { name="DDD"; version="3.6"; sha256="0lkij10z6bviay2dg6k5pmb9ddg4smcz96fkww0qx8h636zd2xlq"; depends=[ade4 ape deSolve expoRkit Matrix phytools pracma SparseM subplex]; };
+  DClusterm = derive2 { name="DClusterm"; version="0.2-1"; sha256="1xnnm73ivz4pgsszjj5wxzq1f2az110wmn88j89xy2wgk8rp0rab"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
+  DDD = derive2 { name="DDD"; version="3.7"; sha256="0clcrmdxfvlk8kay9qhx8lxwf22w042l4ffvl097i8pfqlik97g1"; depends=[ade4 ape deSolve expm Matrix phytools pracma SparseM subplex testthat]; };
   DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
   DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; };
   DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; };
+  DDPGPSurv = derive2 { name="DDPGPSurv"; version="1.0"; sha256="1d271yv621jmwd4dmdnhpwrk95gbpw7g6r2v05lc3d6wzlzpd78c"; depends=[MASS mc2d mvnfast Rcpp RcppArmadillo survival]; };
   DDRTree = derive2 { name="DDRTree"; version="0.1.5"; sha256="16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk"; depends=[BH irlba Rcpp RcppEigen]; };
+  DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; };
   DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
   DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
   DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
@@ -778,13 +785,13 @@ in with self; {
   DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
   DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; };
   DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; };
-  DEploid = derive2 { name="DEploid"; version="0.4.4"; sha256="1hcn54mn1kil6kg77j4aij15h69fnmp40d6xxfgijjcgydp211bf"; depends=[magrittr plotly Rcpp scales]; };
+  DEploid = derive2 { name="DEploid"; version="0.5.0"; sha256="18v1fyxf6pbkanwmncd9jx9l7c9dk3y9dbc89a4cp3qshfn4vbhi"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; };
   DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; };
   DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; };
   DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; };
-  DHARMa = derive2 { name="DHARMa"; version="0.1.6"; sha256="1b7yqy4id6ydvyqrgpl5zkmch64rl2b0jcj6ww5rq6afzgkfbfay"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
-  DHS_rates = derive2 { name="DHS.rates"; version="0.3.0"; sha256="039pa3pln7vj2md4kcv9070qbm8v7aknhhgh49hs5xiwa682g1f7"; depends=[haven matrixStats reshape survey]; };
+  DHARMa = derive2 { name="DHARMa"; version="0.2.0"; sha256="0jh01z2ygz8hi0vh2fxw52ck0wia4hp44qc7v0bks8776gbwj8il"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc]; };
+  DHS_rates = derive2 { name="DHS.rates"; version="0.3.1"; sha256="1lwmd58q2pqynh2dj3alcrri8zwxayq92nn7hwzwlqw70xr5anqv"; depends=[haven matrixStats reshape survey]; };
   DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; };
   DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; };
   DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; };
@@ -810,17 +817,19 @@ in with self; {
   DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; };
   DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
+  DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; };
   DPWeibull = derive2 { name="DPWeibull"; version="1.2"; sha256="0s1c3pn8pivg4227xhis5scmh9zc6fq36inphy6226hriny6q0v9"; depends=[DPpackage matrixStats Rcpp truncdist]; };
   DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; };
+  DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; };
   DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
-  DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; };
+  DRIP = derive2 { name="DRIP"; version="1.3"; sha256="08v6sajgaqa0zvkr9hfzjxsj78acrkj6l9hjxkirbspg3fwqphk7"; depends=[caTools readbitmap]; };
   DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
   DSAIDE = derive2 { name="DSAIDE"; version="0.6.0"; sha256="0jg5shgq1f9k0fcpzkpynd87xfcj8ky09xsz8n8yfvy4fw8d77kl"; depends=[adaptivetau deSolve knitr shiny]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
   DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
-  DSsim = derive2 { name="DSsim"; version="1.1.2"; sha256="1n46r7nn2wl8xnc22wf91mcz745yzx83g8nk5mmj429j3i0sfd77"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
+  DSsim = derive2 { name="DSsim"; version="1.1.3"; sha256="1i92l29lqn7nb6zdkjydp9fvg8m8qazysnrjafknvnm5gy7mgqwb"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
   DT = derive2 { name="DT"; version="0.4"; sha256="06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix"; depends=[crosstalk htmltools htmlwidgets magrittr]; };
@@ -832,6 +841,7 @@ in with self; {
   DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
   DTRlearn = derive2 { name="DTRlearn"; version="1.3"; sha256="0ngzvjlzn20pff1ihw87nar7riiva4pnfih7hlsr0iszd3v3b1gq"; depends=[ggplot2 glmnet kernlab MASS]; };
   DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; };
+  DTWBI = derive2 { name="DTWBI"; version="1.0"; sha256="001lkjk8dh6mdcysc8mw9c37xp543hjfci0k0py44z7c90b9p2la"; depends=[dtw e1071 entropy lsa rlist]; };
   DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.7"; sha256="1syxw49pzh36nfq0zfr83cwpac86fnj0b7nlqiin4jb00h8vrf6i"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
   DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; };
   DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; };
@@ -843,20 +853,19 @@ in with self; {
   DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; };
   Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; };
   Dasst = derive2 { name="Dasst"; version="0.3.3"; sha256="0nrcvcfzr2y1jc984rpi3fmggns65sphc6nqr9l91h5qvpdcw7cl"; depends=[]; };
-  DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
   DatAssim = derive2 { name="DatAssim"; version="1.0"; sha256="120gazyyxda9faydv2lyqgvflhqi2fhih1szq0sy5v1gh4xb0hhy"; depends=[Rcpp RcppArmadillo]; };
-  Data2LD = derive2 { name="Data2LD"; version="0.1-1"; sha256="1klvp4zjbv4g07rahfmwxdms0bh7ca064iap681r1w5jbyq8pkzx"; depends=[fda Matrix R_cache]; };
+  Data2LD = derive2 { name="Data2LD"; version="1.1.0"; sha256="0sa6iwhhnj7rakj57zscl4008jskd26zbdvxqr08bpf8xbk9v3xi"; depends=[deSolve fda Matrix R_cache]; };
   DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; };
   DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; };
   DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; };
-  DataExplorer = derive2 { name="DataExplorer"; version="0.5.0"; sha256="1vsbnm720p786f627sfx447p8q45nwd2gdm7b9hf4d3rsmrcwqsf"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
+  DataExplorer = derive2 { name="DataExplorer"; version="0.6.0"; sha256="1vwihlslrcwca3q15hxpa9kvajv0clz7scqycaxhxk9ngdwcqh10"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
   DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
-  DataVisualizations = derive2 { name="DataVisualizations"; version="0.9.2"; sha256="0np64vbk878i52gbh7gs1pklqy60zpa7n44ir7mxqyw3v50bvp8s"; depends=[AdaptGauss ggplot2 magrittr Rcpp RcppArmadillo]; };
-  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.0.1"; sha256="0j7l8jgm19gbi5xprhy1brqaghm4r1a7qy0wkcjb3i46as3v9dyj"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
-  Datasmith = derive2 { name="Datasmith"; version="1.0-1"; sha256="1ba23b8a931pvml2dzw0zkm40akcl2lb6rps6bffrl7lvxiy35y1"; depends=[igraph lbfgs MASS Matrix nloptr truncnorm vegan]; };
+  DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.1"; sha256="1y38q1rw92qzsl22663v730i9c1mlyyw9pb167f8f81snb0x9fda"; depends=[AdaptGauss ggplot2 magrittr Rcpp RcppArmadillo sp]; };
+  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.1.3"; sha256="00dd9m7qf97ymrjjklg4a0j93wcn6mrmvg7spywm524nickcd4f6"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
+  DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.0.0"; sha256="1m739q9x5w2xcwx19qm633z6xfijqdgcdvfjj6c5jhn66hc401nq"; depends=[rJava]; };
+  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.0"; sha256="19in7n2fs5m965wf37mplsafiqrmgv1lcyhf7rlk4wvq4y2gvic6"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
   Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
-  DeLorean = derive2 { name="DeLorean"; version="1.3.0"; sha256="0bsmrpraaks4nsjdbhn1npvybb29pxiby8sdimv36nqpb1fyjgpk"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; };
   DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
   Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
@@ -865,26 +874,27 @@ in with self; {
   DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
   DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
   DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
-  Delaporte = derive2 { name="Delaporte"; version="6.1.0"; sha256="1gpckw6vd00cjpf164rmxxdvg08ky1as9rj7ls3l52ghyn0s3pxs"; depends=[]; };
+  Delaporte = derive2 { name="Delaporte"; version="6.2.0"; sha256="0lhi4gfps00c9psr8kk7zzh7ky4y7xi2va303darxq9j6v509qck"; depends=[]; };
   DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; };
   Delta = derive2 { name="Delta"; version="0.1.1.11"; sha256="1fi5sgyrf86xmfxhglqxcc0hq5mpc8ar3nk2s4wx3rw4if3sdxdz"; depends=[]; };
   Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; };
   DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
-  DendroSync = derive2 { name="DendroSync"; version="0.1.0"; sha256="0694pw5wh6ff30gpxxn4spkdyzybqhdvh2p9ciijnn454rqv6qm6"; depends=[ggplot2 gridExtra nlme]; };
+  DendroSync = derive2 { name="DendroSync"; version="0.1.1"; sha256="0lizdkd5izqn3n4iqcj6gyc2p2c3ajljfhv5js4wfl2fljs46wkg"; depends=[ggplot2 gridExtra nlme]; };
   DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; };
   DensParcorr = derive2 { name="DensParcorr"; version="1.0"; sha256="15w0ifcq1js0wyjscfhlbga77sgzqpmz7zmwa77y92iwna8q66ad"; depends=[clime gplots]; };
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
-  DepthProc = derive2 { name="DepthProc"; version="2.0.2"; sha256="0n9hs6fp047gnd8y87rzx5qcr3hqg3pdck97hcbzkd8jsi1b1daw"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
-  Deriv = derive2 { name="Deriv"; version="3.8.4"; sha256="1la2afxr9nilb32s3nc1j3spxzgcqn48aywq96pckpjk8vypsjyy"; depends=[]; };
+  DepthProc = derive2 { name="DepthProc"; version="2.0.3"; sha256="0zzbk0vbl2qfwr5j203xpzahf6kl0ya4l7xfjdc6diadfnr0w94y"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
+  Deriv = derive2 { name="Deriv"; version="3.8.5"; sha256="0815ws2zmla3ici1n8amkc8fz8lwpbg5z68m8j3nhc79m2ikvm20"; depends=[]; };
   DescTools = derive2 { name="DescTools"; version="0.99.24"; sha256="1ns0vqpnfj995dq1l6pmah2wi6l8zacndha6brhy97hyn84mc83k"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
   DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.0"; sha256="1qyxbnmr2dycyfivdyvdqcbpk993q9glrixgp64pflx3sqz91yyk"; depends=[DescTools rstudioapi]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; };
-  DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.2.1"; sha256="0mb33ihqr8jj1ispykvyc7jn1wyaagb535ya5jgwlqrians41ihc"; depends=[jsonlite RCurl reshape]; };
-  DetMCD = derive2 { name="DetMCD"; version="0.0.4"; sha256="0jdwwx15k8g3f5izcswsj28nfdw3n50x710mc938031yn7hjmkhg"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
-  DetR = derive2 { name="DetR"; version="0.0.4"; sha256="0kvmbh7cdy3hmds1znahy1lqhd68y21kmmcki9xbq1b76n4h812n"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; };
+  DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.0"; sha256="1cgxnsxivsqchzqywv470q9qwxczmcvwhrr51m70mcbzmib4mxw3"; depends=[curl dplyr jsonlite magrittr RCurl reshape]; };
+  DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
+  DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; };
   DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; };
+  DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.1.0"; sha256="02kk0qqi9skb2pszfsgasa9fj7iz1brwxgwcw1dq9gf5hxr9zra4"; depends=[]; };
   DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.0"; sha256="0zik8j50yfxgzdv2cf6q80kw8nb5y55l9sbrp60qc08r3fp6s61b"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
   DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; };
   DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; };
@@ -904,10 +914,10 @@ in with self; {
   DirectEffects = derive2 { name="DirectEffects"; version="0.1"; sha256="0c9inxn624c5rxa86d8r8jhsrm42rcsm4xxrwg7h3lvpairiyil2"; depends=[Formula]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
   DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; };
-  Directional = derive2 { name="Directional"; version="3.1"; sha256="0zx6wflc3hnal3n0ql427dsw8npd46sbz4v42lj53yax71cdg8lj"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  Directional = derive2 { name="Directional"; version="3.2"; sha256="0wjlkaq6wwpfllyk9qjmpap3vy0yxgbd12yz4nmmf51fnpqv75a6"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
-  DisHet = derive2 { name="DisHet"; version="0.2.2"; sha256="03jg7y8hd7c7bi9df37g1p7i28l7l2hyana4y2js7hgc88gv376l"; depends=[gtools matrixStats]; };
-  Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
+  DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; };
+  DisImpact = derive2 { name="DisImpact"; version="0.0.2"; sha256="0rn92vdxll4r20q0ybqrd3sdpa1bsg9zmbb98zmllfvmh2fgj6a1"; depends=[dplyr magrittr rlang]; };
   DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
   DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; };
   DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; };
@@ -916,17 +926,15 @@ in with self; {
   Distance = derive2 { name="Distance"; version="0.9.7"; sha256="0g2zb7im3l4043bml7akd2cbss3p7mlvds6iv1libimlpy1dr71f"; depends=[mrds]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
-  DivE = derive2 { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
-  DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
   DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.11"; sha256="0plwvji2rrxmjnf61mj1ijglc9z62n26ijqsf65s35c19qv2g0y1"; depends=[DoE_base]; };
-  DoE_base = derive2 { name="DoE.base"; version="0.32"; sha256="1qy3n8m9y9h4cv3p6vdjifv7118rmqqxshk7sqls0m4xr3vyzwv5"; depends=[combinat conf_design lattice MASS numbers vcd]; };
+  DoE_base = derive2 { name="DoE.base"; version="1.0"; sha256="01h2slkrc4vzmz54vilv6qkgfz0f9jhq3bb684rl7cx55smhzr68"; depends=[combinat conf_design lattice MASS numbers vcd]; };
   DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.9"; sha256="0l4dxb0f4ql5k3x1avfzs1w54qwjxfp8rl9h9vg6p1zhbkz4qz06"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
-  Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
+  Dodge = derive2 { name="Dodge"; version="0.9-2"; sha256="0767n6hyspqrv5cgx3ghhai0qffj6haga7s86pv7mq8zvjcxjlzv"; depends=[]; };
   Dominance = derive2 { name="Dominance"; version="1.1.0"; sha256="1dzfj79hv3ds72dy4fn14bp68fiw06vdxkp4dvyvj37yrrqpcxyz"; depends=[chron gdata igraph XLConnect]; };
   DoseFinding = derive2 { name="DoseFinding"; version="0.9-16"; sha256="0ncr95lf4mifmx6n2qkg8m3cn326zj9w4hr7afsdxg155l11w89z"; depends=[lattice mvtnorm]; };
   DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; };
@@ -938,7 +946,8 @@ in with self; {
   DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; };
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
-  DstarM = derive2 { name="DstarM"; version="0.2.2"; sha256="014xlj5kipl2jpcgcqs1ynw05x17wbsgc5mhfjn3p96bbp6pkzzy"; depends=[DEoptim ggplot2 rtdists RWiener]; };
+  DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; };
+  DtD = derive2 { name="DtD"; version="0.1.0"; sha256="1alkgd2rpjrg1sl1l22qsr5b5d3i4scvfxijhffxb0897yvg71ri"; depends=[checkmate Rcpp RcppArmadillo]; };
   DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
   DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; };
   Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; };
@@ -951,21 +960,20 @@ in with self; {
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
   EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; };
-  EBS = derive2 { name="EBS"; version="3.1"; sha256="0flj62lcshrcn5n4fmssgb2qdvg0l6r71rsn3h0clfjhbg96pqz5"; depends=[MASS]; };
   EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; };
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.4"; sha256="14dpja9wr1qqip388c8b6xvdvdpwwmyq5piv182ir0rwrla5nzdb"; depends=[Matrix]; };
-  ECctmc = derive2 { name="ECctmc"; version="0.2.4"; sha256="1aw0cbfgzlrkyc3m1rfhbdcdyb8wjcfx6p2mz1hvds86mf1pzv1i"; depends=[Rcpp RcppArmadillo]; };
+  ECctmc = derive2 { name="ECctmc"; version="0.2.5"; sha256="0prryvc17bm1xrhzlqk2w9nj181bg99j1dph3d36h0n1vfq1d7if"; depends=[Rcpp RcppArmadillo]; };
   ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.13"; sha256="0dq8ja4ydxnc7qx35qhh9ryqgi7ambwz6ka2821mmq3p994crswn"; depends=[jsonlite shiny]; };
   ECoL = derive2 { name="ECoL"; version="0.1.0"; sha256="0rizs41fk4w3lwrc4xw8hl035pvg0y746w1zy3bs8ch0hqyplhdm"; depends=[cluster e1071 igraph MASS]; };
-  EDA = derive2 { name="EDA"; version="1.0.1"; sha256="13qyi7yh1xqsyyvd51j5dl6dx4xh6kr97pz5v4wn46nbx6vna0dk"; depends=[ggplot2]; };
+  EDA = derive2 { name="EDA"; version="1.2"; sha256="146kji0hk19vfag1j11vga5smkk1w4za9l5iakjgh61scsh2l791"; depends=[ggplot2]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
   EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; };
   EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
   EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; };
-  EFAutilities = derive2 { name="EFAutilities"; version="1.2.1"; sha256="1hgmj9zk9mwqwmqila1ana6jzqg55aj535pkrzai2y6yq45dvfh9"; depends=[GPArotation mvtnorm plyr]; };
+  EFAutilities = derive2 { name="EFAutilities"; version="1.2.2"; sha256="1gknnfyhv16a16wgach0ps9wd08d75bach4p80vjq6ld9fjvpw2h"; depends=[GPArotation mvtnorm plyr]; };
   EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
   EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; };
   EGRET = derive2 { name="EGRET"; version="2.6.0"; sha256="0alr47pmq1ml64j500vkqwmvrqa3i1ccbf3w7w44fbbjy1vfp04a"; depends=[dataRetrieval fields lubridate survival truncnorm]; };
@@ -994,16 +1002,16 @@ in with self; {
   EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
   EMP = derive2 { name="EMP"; version="2.0.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; };
   EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; depends=[pracma]; };
-  EMSaov = derive2 { name="EMSaov"; version="2.2"; sha256="12y0mj72la4ciwzgr38w9ssik4hixjf5kjsjwrvz6z59hi0ldfly"; depends=[shiny]; };
+  EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; };
   EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
-  EMVC = derive2 { name="EMVC"; version="0.3"; sha256="1n7fxmqg8762lc7lg50h6wcrxrrz4nvi0xdaganz84l8vp8w90ms"; depends=[]; };
-  EMbC = derive2 { name="EMbC"; version="2.0.0"; sha256="11qnln7a36zcrycbs0lz0qdvili25adv0rxdybmb6kk20a6q1lwf"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
+  EMVS = derive2 { name="EMVS"; version="1.0"; sha256="10ksrj1aav062cszg4ymnwsgib7a9hlnkksfcvmy26nx5gj2g7zl"; depends=[Rcpp RcppArmadillo]; };
+  EMbC = derive2 { name="EMbC"; version="2.0.1"; sha256="0id68ws6l858nvyy790m17j9gddxmm97z66x24w5r58dxi6yfcrp"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
   ENMeval = derive2 { name="ENMeval"; version="0.2.2"; sha256="1w8mjcmxxkx8lxxzzbjpv1i7cm6l8hhml7ynp80s9yiprr04bq9c"; depends=[dismo doParallel foreach raster rJava]; };
   ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; };
   ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
   EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
   EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; };
-  ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; };
+  ERP = derive2 { name="ERP"; version="2.0"; sha256="0y476ir8j54q20ibzpkla32wxp6yjv04ca67ry9kajq64ibflh7w"; depends=[corpcor fdrtool irlba mnormt pacman]; };
   ERSA = derive2 { name="ERSA"; version="0.1.0"; sha256="063i9fmdccyrbap7fgas9371zv13gpcgzhlsphsn8jw9nmzpdii4"; depends=[broom car combinat dplyr ggplot2 leaps modelr purrr RColorBrewer shiny tidyr]; };
   ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
   ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; };
@@ -1014,7 +1022,7 @@ in with self; {
   ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; depends=[fields goftest lattice maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; };
-  EValue = derive2 { name="EValue"; version="1.1.3"; sha256="0c3fsb3p277533gn6yw8ml7d6za211j8k46ga88fsh4mlg28hb6p"; depends=[ggplot2 metafor]; };
+  EValue = derive2 { name="EValue"; version="1.1.4"; sha256="09b66sck5r2ysjxpjhwgjcapx6wj1jg3v56b0x48dk7bqzmmizsd"; depends=[devtools ggplot2 metafor msm]; };
   EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
   EWGoF = derive2 { name="EWGoF"; version="2.2.1"; sha256="0n1fx6k9ndb2s9ybzizbqz662c9s1f48q6v697pqhnfy9si1nplz"; depends=[Rcpp]; };
   EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; };
@@ -1023,21 +1031,19 @@ in with self; {
   EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; };
   EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
   EasyMx = derive2 { name="EasyMx"; version="0.2-1"; sha256="03yshzb4wh3n667z9lmrwsz16chpgnl8qv3qlx425mj5iiyv626z"; depends=[OpenMx]; };
-  EasyStrata = derive2 { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
   EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; };
   Ecdat = derive2 { name="Ecdat"; version="0.3-1"; sha256="1lvfp2ih8ng3kn3cia687j5fd27iwiak7gk3bhgjp8bnlgblqq02"; depends=[Ecfun]; };
   Ecfun = derive2 { name="Ecfun"; version="0.1-7"; sha256="0s4hhvwyi411xr7c1fv098nmwqjcyvh8vy65j5w9hd80l864lvkl"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
-  EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-4"; sha256="18l5v7zsmz35brnf6b8qfxbs8906rmyc2kkh9bm96x01m3vx8pkh"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
+  EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
   EcoIndR = derive2 { name="EcoIndR"; version="1.2"; sha256="1p2m4kramcf71xlm9hbk5l5mb8nmjfac1p3csai7m2gmikf559yj"; depends=[]; };
-  EcoNetGen = derive2 { name="EcoNetGen"; version="0.1.1"; sha256="004y0l8hdl1kmph7y954m8k3rrqfgi6krdwywww136q0yfjdw27v"; depends=[ggplot2 igraph]; };
+  EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.0"; sha256="194gry90h6m91zjvv7na8gyf3rws3mzv7rk5xhwrr2znlgcalzis"; depends=[ggplot2 igraph]; };
   EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
   EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; };
   Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; };
   EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; };
-  EdSurvey = derive2 { name="EdSurvey"; version="1.0.6"; sha256="1p8cxr69ckz6py0hmagm9aq7kp1q48ymffmnpwsvwh2yfkzl90yq"; depends=[data_table LaF lfactors Matrix NAEPprimer wCorr]; };
-  EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.0"; sha256="1pbpknz1v5k7fgwvzv5ldyxxshys4sx7d17hbwzph1z68jcmixzg"; depends=[editrules igraph Rcpp]; };
+  EdSurvey = derive2 { name="EdSurvey"; version="2.0.3"; sha256="1aw0b2i7vhfz11nr6ywk873cmgvpfvim89r3m6paqgnq01yyw8nw"; depends=[data_table Formula haven LaF lfactors magrittr MASS Matrix NAEPprimer RColorBrewer readr readxl rvest stringi stringr tibble wCorr xml2 xtable]; };
   EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-2"; sha256="1vkg5gi0gysnw0gz9ah8pdnnlkdfsz0jy53ps2jnnpy8lbr45zc9"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
   EffectStars = derive2 { name="EffectStars"; version="1.9"; sha256="15n5mrba2s0qxcg3zikfwpxqwv38h39zmvj8sz62ni4pdhrhhjh3"; depends=[VGAM]; };
   EffectStars2 = derive2 { name="EffectStars2"; version="0.1-2"; sha256="0121zb627zwkgbb84sn2dclph56dc5rkfjpci5xwd0w99vh3q66l"; depends=[miscTools VGAM]; };
@@ -1050,7 +1056,8 @@ in with self; {
   EloRating = derive2 { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
   Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; };
-  EmiStatR = derive2 { name="EmiStatR"; version="1.2.0.6"; sha256="1ygi3rz4xc7y0m1jd23g3li62br7fs0dcm6fj8kha5q93xn6yvrx"; depends=[doParallel foreach lattice shiny xts zoo]; };
+  EmiStatR = derive2 { name="EmiStatR"; version="1.2.1.1"; sha256="1fid29ipmrq2557wcva1miifgwxdcm8g27ws5wb1lq6yiaz0z4w0"; depends=[doParallel foreach lattice shiny xts zoo]; };
+  EmissV = derive2 { name="EmissV"; version="0.664.7"; sha256="09m5h0fgj7pavfxwh4anihpq69dkqay9z4xdj0c3rbqvsxgq4bx3"; depends=[data_table lwgeom ncdf4 raster sf sp units]; };
   EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.3.6"; sha256="0fiwvdzcyz6ayzqfa6j2ygpab1cwbi04gd2c2g1j9qbdq95myipa"; depends=[ggplot2 gridExtra]; };
   EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; };
   EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
@@ -1066,19 +1073,19 @@ in with self; {
   EnvStats = derive2 { name="EnvStats"; version="2.3.0"; sha256="0f0sda26in2a25vq8xr6pkskjk10q2pg463h9c1xap3bghq4xgc3"; depends=[ggplot2 MASS nortest]; };
   EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.26"; sha256="0c54nvcyjvsmzmk326avbi69vbpw9vlvcqh8c6j32byiwj251ans"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; };
+  Epi = derive2 { name="Epi"; version="2.30"; sha256="0gfq4zg2c9cnwh7islsbbzaw80a2wwnh3kjv3wr1fvp11hhhdknk"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; };
-  EpiCurve = derive2 { name="EpiCurve"; version="2.0-1"; sha256="15y6nlinw3ppi4bn8xpsrch1avn7642f06lcsv2bjyi1carhfqkw"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
+  EpiCurve = derive2 { name="EpiCurve"; version="2.1-1"; sha256="0y6llpxa8xyfn9cxhq35mzfp1gc7la1708q85q4hz0l115abvk92"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
   EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; };
   EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.2"; sha256="1rxq9z5lhcgzn02d9k6vgl2cb5x0s9gsly63byx4gg1h91bsvmp6"; depends=[coda]; };
   EpiModel = derive2 { name="EpiModel"; version="1.6.5"; sha256="1h9490x7vna8z2dib6vgkxhpqvbybg655k88jn48i6qkda8dzv54"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
-  EpiStats = derive2 { name="EpiStats"; version="1.0"; sha256="17i8i3v8qpwas4h6g8sbdl42syg20fm22c7p1bnv4nzx28p9yzhy"; depends=[dplyr epiR]; };
-  EpiWeek = derive2 { name="EpiWeek"; version="1.1"; sha256="19bvjiiz8qn9nlvf3nq238qi1hszlm6asrc03p8ykp6gpl2pi6js"; depends=[]; };
+  EpiStats = derive2 { name="EpiStats"; version="1.1"; sha256="0xd9b3miyk2jijraph7zac7k7hqm0vn9wg1fsccfl17xy6h2wq2w"; depends=[dplyr epiR]; };
   EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; };
   Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
+  Equalden_HD = derive2 { name="Equalden.HD"; version="1.0"; sha256="19b529yaffls43fr5vrcrrvkia27mjrcx69r9svafk61z96i6pfm"; depends=[]; };
   EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; };
   EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
   EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
@@ -1093,21 +1100,21 @@ in with self; {
   EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; };
   Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; };
+  ExPanDaR = derive2 { name="ExPanDaR"; version="0.2.0"; sha256="1iwkzrfdvxgik5c1vq04351var0micf4vh6zmkzyd8qbyvxwnnch"; depends=[CodeDepends corrplot dplyr DT ggplot2 Hmisc kableExtra lfe PKI scales shiny shinycssloaders stargazer tictoc tidyr]; };
   ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
   Exact = derive2 { name="Exact"; version="1.7"; sha256="0d0h406w2l99gxq6pmh9crxxrvdidcajk7bqzmifl7nfb77vp1av"; depends=[]; };
   ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
-  ExactPath = derive2 { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[lars ncvreg]; };
   ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; };
   ExcessMass = derive2 { name="ExcessMass"; version="1.0"; sha256="1z8l1lja02wxw8l72s3bq6sgjymn5929n123xk6b7ndd52zlfgf5"; depends=[]; };
   ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.10"; sha256="11lg1n9wls96cg1byj5bfircw4bsf0rbk37h8fl0hkh29m6gyy16"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; };
   ExpDE = derive2 { name="ExpDE"; version="0.1.4"; sha256="0yjsap92dd1sb23fhw69i0ddk3lyj5f4kwp9rvz4k0vxry10hx7g"; depends=[assertthat]; };
-  ExpDes = derive2 { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
-  ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
+  ExpDes = derive2 { name="ExpDes"; version="1.2.0"; sha256="0zisgb129fdg2igc3gp8jkrv9bz2r7bz2i20ap07mqlvhq88515a"; depends=[stargazer]; };
+  ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.2.0"; sha256="0fny5hcg76bm04vpbkvlwzw78m5gj28rvich7k1hhrhlxm3xi3hf"; depends=[stargazer]; };
   ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; };
   ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; };
+  ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; };
   ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.6"; sha256="12bc4mmkmggvk3kfmz6nq13fa2470z0bx8smnvq9vf1ypdiiw85y"; depends=[Formula]; };
   FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; };
-  FACTscorer = derive2 { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; };
   FADA = derive2 { name="FADA"; version="1.3.3"; sha256="1kckksim3m6kypm3qnyijgmnrq6dwjfs5jax5dr94giwlpfcdl8q"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
   FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
   FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
@@ -1126,20 +1133,21 @@ in with self; {
   FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; };
   FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
   FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; };
-  FDboost = derive2 { name="FDboost"; version="0.3-0"; sha256="06cwd8534k3h7mk6w9z7fyq0gvb74w12gxh3njmy4m7hw8yzicc8"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
-  FENmlm = derive2 { name="FENmlm"; version="2.1.0"; sha256="112n9px4hw2k7kgbkfvw9my6fjwb2ggf2q2xrycn7dp3wblsmz20"; depends=[MASS Matrix numDeriv Rcpp]; };
+  FDboost = derive2 { name="FDboost"; version="0.3-1"; sha256="1bwf3kkx912386ljb210hci1y2vg0wcd6v6i6arhzzbr7gc0y39q"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
+  FENmlm = derive2 { name="FENmlm"; version="2.1.1"; sha256="00cm1k5lqa7i2aginhkw4f430gigr7cj7g6shr83z61axqfmwdg4"; depends=[MASS Matrix numDeriv Rcpp]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
   FFTrees = derive2 { name="FFTrees"; version="1.3.5"; sha256="0qz3w7qh8lgl4fn2hmrd4mnp17vaz5yf7kcpcrm038xvqq3w5c5k"; depends=[circlize e1071 igraph progress randomForest rpart stringr yarrr]; };
   FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
-  FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
   FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
   FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-  FHDI = derive2 { name="FHDI"; version="1.2.3"; sha256="19480lp2hp0ss2mij1z2ikhdqlkxrfpyy66sz5i0jab48675l9v5"; depends=[]; };
+  FHDI = derive2 { name="FHDI"; version="1.2.5"; sha256="0654k6rjbw3acpxn7iiqz5my5msw7jyzm5c6m26m00cjcrmmvivd"; depends=[]; };
   FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; };
   FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
   FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; };
+  FIAR = derive2 { name="FIAR"; version="0.6"; sha256="1rqwxzya77yydp6kas5ic54nwvn8wmsn14p0s16xhy1mqxykysnb"; depends=[lavaan Matrix np]; };
+  FILEST = derive2 { name="FILEST"; version="1.0.3"; sha256="0i622rfr9sb22c922kk0gg4l1akx54m6zx7wy3w1p5xrr1zjjyvp"; depends=[KRIS rARPACK]; };
+  FIT = derive2 { name="FIT"; version="0.0.5"; sha256="1hky7m5b7n0d7lm79b7l7p055f8zfl7gsjdvbq09c4iwdli8h33n"; depends=[gglasso MASS Rcpp RcppEigen XML]; };
   FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; };
-  FLIM = derive2 { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[MASS zoo]; };
   FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
   FLSSS = derive2 { name="FLSSS"; version="5.2"; sha256="1px9n0rnjg32ngy8bs0z1jzmspnkn15q273w74vxjykqfd5xayfd"; depends=[Rcpp RcppParallel]; };
@@ -1155,20 +1163,18 @@ in with self; {
   FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; };
   FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
   FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; };
-  FRB = derive2 { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
   FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; };
   FREGAT = derive2 { name="FREGAT"; version="1.1.0"; sha256="04rcbwbwi53d8his0ss9hj4s2c28r292f4f2ayl70av7k74nnccy"; depends=[Matrix]; };
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
   FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.0.1"; sha256="05hcds1g1hkpr3fww1i462p633xlhwv594fpbphvw8fm10mc0hns"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
-  FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; };
   FRK = derive2 { name="FRK"; version="0.2.1"; sha256="042j6n3yx46123d0qsghbynjf1h0iri4kfd92z5nbcgv7wggk4d3"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; };
-  FRegSigCom = derive2 { name="FRegSigCom"; version="0.1.0"; sha256="02lvgxxr12rfs4k7dg3rl249nbvfkqaywas3k6jhm378j3j8yaaf"; depends=[fda]; };
-  FSA = derive2 { name="FSA"; version="0.8.19"; sha256="0sj928r3dx320q3684ckw8yny6s209n57j0sxdzk7bwl9syyp6ma"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; };
+  FRegSigCom = derive2 { name="FRegSigCom"; version="0.2.2"; sha256="1jbksgx561fc4bgsyz3d1b3amqc80bzzl96ri74rbd3lqbhgrn0y"; depends=[fda Matrix Rcpp RcppEigen]; };
+  FSA = derive2 { name="FSA"; version="0.8.20"; sha256="1vvsjwyb03wiqxlzgig3gxn9aj5lr7kx183gsjz2xysxp07rv9hf"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
   FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; };
-  FSelector = derive2 { name="FSelector"; version="0.21"; sha256="0qk54b4svihwcmfdp5k8pcvy60568zlg4z2qqiawr7h4inzmvrlk"; depends=[digest entropy randomForest RWeka]; };
-  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.8"; sha256="0qn916i0gcq7l4ym8yyl9dk0iwh6m4fkwcvvm60yvzbglv8dpqjc"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
+  FSelector = derive2 { name="FSelector"; version="0.31"; sha256="1ryqrwz9h7ggxvmxyw4viajlkvd3r7i6ihcfrwsz6axyk5y0qarg"; depends=[digest entropy randomForest RWeka]; };
+  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.10"; sha256="1i844k8qacbxv4hzv2d8d0jxijf2p2r1xh1ihcp4dijc9ap8wvg8"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
   FTRLProximal = derive2 { name="FTRLProximal"; version="0.3.0"; sha256="0wnlswvxiw7gvmn9yq1v8jixwspfbvcg3rklqcd0ib38d72ww7w0"; depends=[Matrix]; };
   FUNLDA = derive2 { name="FUNLDA"; version="1.1"; sha256="1qqwpics63qab43mvpm275rk9iywawr4gap0qa832i6iy3jp1h3c"; depends=[Rcpp RcppArmadillo]; };
@@ -1177,30 +1183,30 @@ in with self; {
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
   FactoClass = derive2 { name="FactoClass"; version="1.2.4"; sha256="0rzbzl32hk4mrs6njm4cnj84ifsf52ms5khy43m9bfmwwmadbilr"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
-  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.1"; sha256="09fnlqwnijg94yfm3q41pdck9yxaq037m7421g4hdxaigljjb6ml"; depends=[FactoMineR rmarkdown rrcov]; };
-  FactoMineR = derive2 { name="FactoMineR"; version="1.40"; sha256="1s4mdmxp66ipnbqwzs1s2fyyr8vzbrxamr2sd9k5a6sqwy7pgjv8"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
+  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.3"; sha256="1924f5sfadgs47ja1ljwqm3slnmqqz1pwxhh9cn1rg1hi8g7db6f"; depends=[FactoMineR rmarkdown rrcov]; };
+  FactoMineR = derive2 { name="FactoMineR"; version="1.41"; sha256="1h20hydav6l2b7bngqw1av4l5rrh0wk58nhailga1f4qw9lrv259"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
   FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; };
   Factoshiny = derive2 { name="Factoshiny"; version="1.0.6"; sha256="1rb16g4gqq9mmwgpp94j9g5iv5p1psjqllsp9qn7ccccmgn6nnw9"; depends=[colourpicker FactoMineR shiny]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
   FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; };
   Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; };
   FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; };
-  FarmTest = derive2 { name="FarmTest"; version="1.0.2"; sha256="1khf2l1rza1kayqrfxf17l365x1ckqs8wnqihqdq9l1jz77p7a7n"; depends=[Rcpp RcppArmadillo]; };
+  FarmTest = derive2 { name="FarmTest"; version="1.0.3"; sha256="1lpl49bhnch3i56z1lrvn55qr4dimc4xp8jm3w3xiccxkpr933jj"; depends=[Rcpp RcppArmadillo]; };
   FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; };
   FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
-  FastHCS = derive2 { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
+  FastHCS = derive2 { name="FastHCS"; version="0.0.6"; sha256="0ds0g2lbzc33is8g8yxfs6hpvl2zdrgi9fqa7c71c3b3fwn9cqlv"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
   FastImputation = derive2 { name="FastImputation"; version="2.0"; sha256="0zhin8000c78kba6zly9mvpxdxx68kcsh2hn697pxkl73wqsz3p5"; depends=[Matrix]; };
   FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; };
   FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; };
-  FastPCS = derive2 { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
-  FastRCS = derive2 { name="FastRCS"; version="0.0.7"; sha256="1pszpmb5qki4cchd1pc0j6s4sfflaikbfrbisf6c2j9p8ssxxfgk"; depends=[matrixStats Rcpp RcppEigen]; };
+  FastPCS = derive2 { name="FastPCS"; version="0.1.3"; sha256="152fy5hq675n1mjdsi31a77rmi3vylvvbfgywrh62chy5xa1bf34"; depends=[matrixStats Rcpp RcppEigen]; };
+  FastRCS = derive2 { name="FastRCS"; version="0.0.8"; sha256="11kqd8aii9sy65m5inxiqggyajb41iy6w92zp5wggx7pbg9m6lmy"; depends=[matrixStats Rcpp RcppEigen]; };
   FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
   FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; };
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; };
-  FateID = derive2 { name="FateID"; version="0.1.1"; sha256="1v861cfzbrva43b9w2qa9pb9xbrjj91wqcf4m5nvq5via55i14b4"; depends=[caTools DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; };
-  FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
+  FateID = derive2 { name="FateID"; version="0.1.2"; sha256="1ky03qc6vc2q8v9inanm0bmybjjcx53izjfylszhmnlgph1fp6n8"; depends=[DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som zoo]; };
+  FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.3"; sha256="0k8n3c0yiz6bb9rq6ra8z2hypb4hw4qcsdfbrgrw74kqivscs62i"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.5.2"; sha256="0lr6q9j8rnjkn5vvk7z4irsxfhkzhi1s36pp5j8175dak240415h"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf soilDB sp stringr]; };
+  FedData = derive2 { name="FedData"; version="2.5.4"; sha256="18j98l3bx8psd13nb47y7qrs58ds1i1pbib1d6q1178pf1k474i3"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf soilDB sp stringr]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
@@ -1212,30 +1218,29 @@ in with self; {
   FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; };
   FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
   FindIt = derive2 { name="FindIt"; version="1.1.4"; sha256="1rnkxngkqsmqs0d0m8ihscpsigxbjgl5ga5nyfwf97b1hrbv4j37"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; };
-  FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
-  FinePop = derive2 { name="FinePop"; version="1.4.1"; sha256="06wabgrxfq11ncbll5d0f07kkh23w2hrvjx8k1vy55q9f1dwd3sb"; depends=[]; };
+  FinePop = derive2 { name="FinePop"; version="1.5.0"; sha256="0dis6nxdlgvznsv0817hnfc4nirv7vvzi0n1wd378zdn60j2fwbv"; depends=[]; };
   FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
-  FishResp = derive2 { name="FishResp"; version="0.2.0"; sha256="1iscxa06pqd6rci3fwdxq2pqyiirr2fzbhs9c9xwyp3c9cmamv8h"; depends=[chron lattice mclust respirometry rMR]; };
-  FisherEM = derive2 { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[elasticnet MASS]; };
+  FishResp = derive2 { name="FishResp"; version="0.3.0"; sha256="1rn4vpg33q7x7j0srjndz3c16gzl97f31pvcqcnbnp1c687irb6l"; depends=[chron lattice mclust respirometry rMR]; };
   FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
   FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
-  FixedPoint = derive2 { name="FixedPoint"; version="0.4"; sha256="07qhvaw4abd039dxlcfm5126lv6p5ybbw78qcmi4x51hvq6icals"; depends=[MASS]; };
+  FixedPoint = derive2 { name="FixedPoint"; version="0.5"; sha256="1jnkbb52g3avs0pm37g5qn4m3ssn2qc6adr8xp5z7ahsbkffkyw2"; depends=[MASS]; };
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
   FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
+  FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; };
   FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; };
-  FlowScreen = derive2 { name="FlowScreen"; version="1.2.4"; sha256="0lp5andxzcs2wyhgwp44ss6b3jjqzf7qy0w9a0yiqxby3h58szwd"; depends=[changepoint evir zyp]; };
+  FlowScreen = derive2 { name="FlowScreen"; version="1.2.5"; sha256="1kslqvxm73s8fvhf6ahmxmjgs73b78lcbcf4af1cp7axksp4bv8v"; depends=[changepoint evir zyp]; };
   Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
   ForeCA = derive2 { name="ForeCA"; version="0.2.4"; sha256="1i19lmhl1kgfnd7zipjr6xp5ir9rvjy13sbq321jaf8ya60bjdd9"; depends=[ifultools MASS reshape2 sapa]; };
-  ForecastComb = derive2 { name="ForecastComb"; version="1.1"; sha256="1ki769m3cw3kb8jhbrgiwssspszsipmg2hlbk4ifldi8s19l9m12"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; };
+  ForecastComb = derive2 { name="ForecastComb"; version="1.2"; sha256="1sx151a37aadvki3bvlya4g5mbd8ns9644n4mc6f6mhglikx5y2g"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; };
   ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; };
   ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; };
   ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
-  Formula = derive2 { name="Formula"; version="1.2-2"; sha256="0ad49bzip1zqmpj1d8jajwl4bd81fm3k6dq8p26x6mvlzc04dvwd"; depends=[]; };
+  Formula = derive2 { name="Formula"; version="1.2-3"; sha256="0wiqh8rr9d5ciy80wj8f5fnmiiw0ywanvvnhkwd622dx42dk848l"; depends=[]; };
   ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
   FourScores = derive2 { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
   FrF2 = derive2 { name="FrF2"; version="1.7-2"; sha256="1qjgx7zbnabbs4zq7hn3j1i1xyy4yjwnz7pn25kz9s3szqr1fk66"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
@@ -1245,15 +1250,14 @@ in with self; {
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.4.5"; sha256="0m9w5v9pdi84r5z2rzcr0v1fn3ycx5d344ab67c9984j55p8pqpj"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.5-1"; sha256="10472bclx40ha5nz15csyk3j3kwdzfb22wx64zc1s16s903w9jhw"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
-  FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
+  FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; };
   Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
-  FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
   FusionLearn = derive2 { name="FusionLearn"; version="0.1.0"; sha256="03x21dpl72dkd4cmmaqdh42hwbdpp5c5ib79ig8pkv196231r5dn"; depends=[]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; };
-  FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; };
+  FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.1"; sha256="056k3gr257qg5wzcgaw0ad5y5cfzdlqkfypl170f0yy0l7gfzag1"; depends=[MASS]; };
   FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-5"; sha256="1achmsc107b26d266q0vmip8vi3qaa5z0p183z2fjdm7zh9ch6ag"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
   FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; };
   FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-2"; sha256="0nvnz5df25slqdwnlw1fdv3xx9sz980x71805h8baw32ajg28a72"; depends=[]; };
@@ -1264,11 +1268,11 @@ in with self; {
   FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
   G1DBN = derive2 { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; };
   G2Sd = derive2 { name="G2Sd"; version="2.1.5"; sha256="165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; };
-  GA = derive2 { name="GA"; version="3.0.2"; sha256="0jpgbniyxvilnr1jv6vmrfgnar3qczvq819xjb70inp5f41zd6wx"; depends=[foreach iterators]; };
+  GA = derive2 { name="GA"; version="3.1.1"; sha256="0048ahd6yla5h67lhxqjh7lmdww6qgi7b830nlk997dyi82drmdz"; depends=[cli crayon foreach iterators Rcpp RcppArmadillo]; };
   GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
   GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; };
   GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; };
-  GADMTools = derive2 { name="GADMTools"; version="2.1-1"; sha256="1xlr3qa6li3izms51mf3g35hj0gximvgibx6d821ikxzp6892mha"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos scales sp stringr]; };
+  GADMTools = derive2 { name="GADMTools"; version="2.2-2"; sha256="0y5zd3wgq98654g5r8zjwn8kcbrc5kskrfw7xhrcgmzija25qxdn"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos sp stringr]; };
   GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; };
   GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
   GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; };
@@ -1277,26 +1281,24 @@ in with self; {
   GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; };
   GAS = derive2 { name="GAS"; version="0.2.6"; sha256="18a3hagwfy0xa7abkwgf2pk5l2n0bxg4kr8y0m5iapkbc3gx5rvz"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
   GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; };
-  GAparsimony = derive2 { name="GAparsimony"; version="0.9-1"; sha256="1j8r56pri7h0xr0fiihkwgccjb33n89lz8ah5p42bak7ay9fglkm"; depends=[foreach iterators]; };
+  GAparsimony = derive2 { name="GAparsimony"; version="0.9.2"; sha256="0c8al4kw1fd9krninpxijg99lhfmlw4mf2623md2and25r6ixlld"; depends=[foreach iterators]; };
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
-  GBJ = derive2 { name="GBJ"; version="0.5.0"; sha256="07wrydd2vlvwc56hgcrqbass0d0qamn3rg5vsf9bamxa6pcg9s53"; depends=[BH mvtnorm Rcpp SKAT]; };
+  GBJ = derive2 { name="GBJ"; version="0.5.2"; sha256="1zfddk1gn1hh67x9n5zrav5gmmrfdbnf29cz72kd3g64z2f78fgw"; depends=[BH mvtnorm Rcpp SKAT]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-  GCD = derive2 { name="GCD"; version="4.0.1"; sha256="00rbj57km104yi39rid922qvw1xdavs4f82cnrsv1gnn9ic7fv3q"; depends=[]; };
+  GCD = derive2 { name="GCD"; version="4.0.2"; sha256="1gb3qhqa212vy85qscnfssvb4rk8fq5j6zs779jq9c6jzvlfv6wb"; depends=[]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalignR = derive2 { name="GCalignR"; version="1.0.1"; sha256="1p1zxf5s75ckyj7a61n43ix314p3b99knyg6z5d4sn5n417h2m42"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
-  GD = derive2 { name="GD"; version="1.3"; sha256="1bpcp048hphxjas3dhqyyvs1xbv0356495zhl4r0mgrk9969qkh2"; depends=[BAMMtools ggplot2 reshape2]; };
+  GD = derive2 { name="GD"; version="1.6"; sha256="1rlgr4z4ibz5m8m18mw11bqcbbvfjxw2mljg78jp0lb294zh1kbb"; depends=[BAMMtools ggplot2 reshape2]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
-  GDINA = derive2 { name="GDINA"; version="2.0.8"; sha256="0mzs49hvns7bzs78ccdj6nzji0ci990sa2znsfnaqly6b38b7qaj"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
+  GDINA = derive2 { name="GDINA"; version="2.1.15"; sha256="1cndib7frd40199l8zijspnidwig9jvhhk3s5dbbhlgxswq6idsz"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
   GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; };
-  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.11"; sha256="0xb9fvd7vyfdpshx1y7jcwrm9fbb4mlkvw2f7qk7isgz8dvyhzdn"; depends=[changepoint GENEAread MASS rpart signal]; };
-  GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
-  GENEAsphere = derive2 { name="GENEAsphere"; version="1.4"; sha256="0z6qazcgjcs03zz26167dxg6mgjaq1z0qdsa4ggh32813l4k0ijw"; depends=[GENEAread ggplot2 MASS misc3d rgl]; };
-  GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
+  GENEAread = derive2 { name="GENEAread"; version="2.0.2"; sha256="0nkza3srfa67mmxnvhhq2wg3zm7ij73r7rpgssjaaijcxqm7qyvl"; depends=[bitops GGIR mmap]; };
+  GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
   GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; };
-  GERGM = derive2 { name="GERGM"; version="0.11.2"; sha256="0vvvbb7y5lqa60n7w14gm8r7gwgah593w63162amjxmdk9jir9bi"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; };
+  GERGM = derive2 { name="GERGM"; version="0.13.0"; sha256="1h3fzkgc553bvxhcmvmlgk9sdais186h4gs1qagdihwpwn8ymbjk"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; };
   GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; };
   GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
   GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; };
@@ -1306,13 +1308,15 @@ in with self; {
   GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
   GFD = derive2 { name="GFD"; version="0.2.5"; sha256="14bhqk5hi9w2078nn382ksgw37bx5r1jadizcrwbisglccxa0ncd"; depends=[magic MASS Matrix plotrix plyr]; };
   GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.3"; sha256="0pqx5fr039izhwi2kdzq9v6nlviyjclzddd092g8mkadj36diwk5"; depends=[cmprsk compound_Cox joint_Cox]; };
+  GFORCE = derive2 { name="GFORCE"; version="0.1.2"; sha256="1bxc0id3vivva4d62h468vv4zrvjgzh91mlm97ga9qnlhd1r20wr"; depends=[lpSolve MASS]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
-  GGIR = derive2 { name="GGIR"; version="1.5-18"; sha256="0v8i3rw5wxmzhfb3dawyykabypvfjskbsmr0phky994kx93zm604"; depends=[data_table Rcpp]; };
+  GGIR = derive2 { name="GGIR"; version="1.5-23"; sha256="06bz8zlw3b2m1lb884jcbh935wxjri8hsa25aw4x7h3n70sgza25"; depends=[data_table Rcpp]; };
+  GGMM = derive2 { name="GGMM"; version="1.0.0"; sha256="18haggjagp0bwy451ghz18nbjgp8zdw1m9iavjj38s57igs611n4"; depends=[equSA huge mvtnorm]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-12.1"; sha256="0nrkbai9jps54ldx3cvwd4x4wingfj73najwx4bv98z8zxpbnky5"; depends=[gtools lars mvtnorm]; };
-  GGUM = derive2 { name="GGUM"; version="0.3.1"; sha256="1dgnhg0ggnp3f8qwzrcnapwzaraddnk2xsksin6pzybz21hfdvxd"; depends=[abind psych Rdpack viridis xlsx]; };
-  GGally = derive2 { name="GGally"; version="1.3.2"; sha256="02px7j28wzbhcgcwm2m0pxb6g7s5zvphl64ix55pkvag4m2ky57l"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; };
+  GGUM = derive2 { name="GGUM"; version="0.3.2"; sha256="0kkdg8d4ib862v6y9xjczh4v52fzzcv5c31hdf44jw4lc7npwc82"; depends=[abind psych Rdpack viridis xlsx]; };
+  GGally = derive2 { name="GGally"; version="1.4.0"; sha256="1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; };
   GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; };
@@ -1323,53 +1327,53 @@ in with self; {
   GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
   GLIDE = derive2 { name="GLIDE"; version="1.0.1"; sha256="02pmn0ydrmblgchz189avlrz3zaz0qfhy75d945yphpmvjf9f9m5"; depends=[doParallel foreach MASS]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
+  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.2-0"; sha256="06ppv7clwqd817aas9dkq1ry8vz9rbss5rdgwzc65y715r0y906k"; depends=[MASS nlme]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
   GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; };
-  GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
+  GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; };
   GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; };
   GMCM = derive2 { name="GMCM"; version="1.2.4"; sha256="1y0yr6i4l28qw22drca7r4mzqjfbpm3jdssfb7p8pc664g6vmm81"; depends=[Rcpp RcppArmadillo]; };
-  GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
-  GMDH2 = derive2 { name="GMDH2"; version="1.1"; sha256="16jnpwr7sbfai0h5prr7768nsxz65qfds46gphdryi5nd65dbv60"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
+  GMDH2 = derive2 { name="GMDH2"; version="1.4"; sha256="13vbzqxmqvp39rbxw41nqfrmk0w6w8qc9nzgfbfpc07h3gcwva41"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
-  GMSE = derive2 { name="GMSE"; version="0.3.1.9"; sha256="02qzz4w99qissb3b95p7y5bk2wn43k01802vwnzxlq27swhkg17i"; depends=[shiny shinydashboard shinyjs]; };
+  GMSE = derive2 { name="GMSE"; version="0.4.0.4"; sha256="14m4rygb24k4prkiqsqv3w5v0gv98pqpqdmgimk5wi33npxy2c2b"; depends=[shiny shinydashboard shinyjs]; };
   GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
   GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
   GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; };
   GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
   GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
   GPB = derive2 { name="GPB"; version="1.0"; sha256="18cdgz00j0j1rchzn2l253rii3b0iv9ipnh5sk3yvmwrqiabmrf8"; depends=[]; };
-  GPC = derive2 { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; };
   GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-1"; sha256="1qlbs9xxdn7q90afh5zc6fgp213fxyh3xmmhz5dm6azbwx92x3la"; depends=[car caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos wordcloud]; };
   GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
   GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
   GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; };
   GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
-  GPM = derive2 { name="GPM"; version="1.0"; sha256="0k2mglgmq1hb0x9gdypvzgi7s3vkdpf6qcvgyd4qc3mfg3avbnmk"; depends=[lattice lhs randtoolbox]; };
+  GPM = derive2 { name="GPM"; version="1.0.1"; sha256="0sqr2s9wcqh2giyslvkgprn22b4aigalx2dd9y57lz7kfljvril7"; depends=[lattice lhs randtoolbox]; };
   GPPFourier = derive2 { name="GPPFourier"; version="2.1"; sha256="1wlzpiqlg5zx3rv29l1ql3apcaykvk72zc0anwxr152qlk910l2q"; depends=[mFilter Tides]; };
   GPareto = derive2 { name="GPareto"; version="1.1.1"; sha256="100r7v7vdkd8i8asb8fnz86rgmkd9kd5bnrc7kdzndfg6jsyycrg"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; };
   GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
   GPoM = derive2 { name="GPoM"; version="1.1"; sha256="0n1fnmwiygispihqgcx762wkvp28pnm8kcwlx9vxhpafswsp112q"; depends=[deSolve rgl]; };
-  GPrank = derive2 { name="GPrank"; version="0.1.2"; sha256="0z9xhydnq04p872zl7glxhndmijjihfgffl6bijc9a0rs95zaacd"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
-  GPseq = derive2 { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
+  GPrank = derive2 { name="GPrank"; version="0.1.3"; sha256="118v08kyp0s8j24cmfyyzj8klgd4g3jqi1x5l76w1iznnlpyd6kf"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
   GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
-  GRANBase = derive2 { name="GRANBase"; version="1.6.8"; sha256="1pcm0fy3jwwaifd4m7qyil1miaxmi6v7glp2krbkngp6f8qb0bph"; depends=[covr dplyr hexSticker htmlTable jsonlite RCurl sendmailR stringi switchr]; };
+  GRANBase = derive2 { name="GRANBase"; version="2.5.0"; sha256="1sc7f47dnrwww89v4n8y41zvc9z8i8lv7qgya6nwf98vh9b6ifmi"; depends=[covr dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; };
+  GRANCore = derive2 { name="GRANCore"; version="0.2.2"; sha256="0f4w5nyqnfq20apqrc7harg4capxrr648wfbgghdg18j3gh3spdc"; depends=[switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; };
   GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
+  GREP2 = derive2 { name="GREP2"; version="1.0.0"; sha256="1nzy8v4xjvaw5zsmbfxljfmy78njd3mw7rkgh6k6c0mf30mrb51i"; depends=[AnnotationDbi Biobase EnsDb_Hsapiens_v86 EnsDb_Mmusculus_v79 EnsDb_Rnorvegicus_v79 GenomicFeatures GEOquery org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db RCurl rentrez tximport XML]; };
   GROAN = derive2 { name="GROAN"; version="1.1.0"; sha256="06xcbdcg3rmb9939d9ansy75jn0axy0c36rmgjhcji8gf959kmyz"; depends=[plyr rrBLUP]; };
   GRS_test = derive2 { name="GRS.test"; version="1.1"; sha256="1ap9453rj5zan6c3ix7jb1qxhxh42bfv295dgqbgjpdygjdlbm6n"; depends=[]; };
   GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; };
-  GRaF = derive2 { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
   GSA = derive2 { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
   GSAQ = derive2 { name="GSAQ"; version="1.0"; sha256="1p1rab2dlh4h9bfg464nhx708p7kc4q01ifccdh5756lq1qh2kzv"; depends=[]; };
+  GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
   GSCAD = derive2 { name="GSCAD"; version="0.1.0"; sha256="0a5smd1prfi6n58ghhz5v81p88v3cnmk2v6r0nn9gy7sa1r2z8xc"; depends=[fields Matrix Rcpp RcppArmadillo]; };
   GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="1.6"; sha256="0zvj91a3sbpgy4988xzmz6xa73rn8b2hkh67jryahm2l5azigsng"; depends=[coin memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="1.7"; sha256="1w8kim7qfrx28bx4l4qkfghwysmyhm7xa0pjagvrh5ar35m4ga67"; depends=[memoise rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
-  GSODR = derive2 { name="GSODR"; version="1.2.0"; sha256="0zhj2c51mxkdy2z7bllas1qb5jg83263w9vv6iksy5j47vxm2py8"; depends=[curl dplyr magrittr purrr R_utils readr rlang tibble]; };
+  GSODR = derive2 { name="GSODR"; version="1.2.1"; sha256="0nmr5pmwxmriaf16r39hs85g2qfzz3k176klgvlmp4shg4ln2p64"; depends=[curl dplyr magrittr purrr R_utils readr rlang tibble]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
   GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; };
@@ -1382,9 +1386,9 @@ in with self; {
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   GWASinlps = derive2 { name="GWASinlps"; version="1.1"; sha256="1041yb5zn27a9srylmawj2kbkcsjz65x0apa413wyb32pz73l6ni"; depends=[horseshoe mombf]; };
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
-  GWLelast = derive2 { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
+  GWLelast = derive2 { name="GWLelast"; version="1.2.1"; sha256="1g6xmw93jl9cv3c7p76wk3lq8qhqxgjhmn1cgiyyy5jbf14gbasv"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
   GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; };
-  GWSDAT = derive2 { name="GWSDAT"; version="3.0.0"; sha256="1nyvbaxfh2hp3nk1lw6aksq2cjj2w4qa1cy7vjkrisl2dz0nfi2z"; depends=[deldir geometry Kendall lattice MASS Matrix readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; };
+  GWSDAT = derive2 { name="GWSDAT"; version="3.0.1"; sha256="1v93fbbpmbcigi1m9vyzrgcbnrrpgh7h963vicwy9ilzc06vhm68"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; };
   GWmodel = derive2 { name="GWmodel"; version="2.0-5"; sha256="1v0a2fxs1nfm84vrggj1zmbij6kqzc5mgmqlvrh80hj3w87zpiry"; depends=[maptools Rcpp RcppArmadillo robustbase sp spdep]; };
   GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; };
   GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
@@ -1394,9 +1398,7 @@ in with self; {
   GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; };
   GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; };
   GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; };
-  GenABEL = derive2 { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; };
-  GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
-  GenAlgo = derive2 { name="GenAlgo"; version="2.1.3"; sha256="00lr13kvkmw7zgg6b67yba0qym24vqb09xm94rwh2wd5mbh2fh2v"; depends=[ClassDiscovery MASS oompaBase]; };
+  GenAlgo = derive2 { name="GenAlgo"; version="2.1.4"; sha256="1mgdvzc5dd7d1wlk8c7d8gd9b2di16mjmyd2i3am05jfw3q26ahv"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
@@ -1409,10 +1411,10 @@ in with self; {
   GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; };
   GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
   GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; };
-  GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
-  GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.0.0"; sha256="1r63ikfv5s1f3agl6i2ny84yzky0macxmknkavnzbn4sqb8cmrbd"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; };
+  GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.2"; sha256="13dyzd2xspiw709iq1xw8lsik8q7abz327x11cdn02zalizvw5ip"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
-  GenomicMating = derive2 { name="GenomicMating"; version="1.3"; sha256="1qnxr1dxw7xk6zncvql1lq4zba8vdfprhjgq56lzv1dckfddzfgc"; depends=[emoa Rcpp RcppArmadillo scatterplot3d]; };
+  GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; };
   GenomicTools = derive2 { name="GenomicTools"; version="0.2.6"; sha256="19illcfcm34vr90kh4cbdwf7k8hy700dlzylsaicv3h4xi7iydgs"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
   GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; };
   GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; };
@@ -1422,13 +1424,13 @@ in with self; {
   GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
   GerminaR = derive2 { name="GerminaR"; version="1.2"; sha256="10x22xl3r93i5mc6w7m5mqm3z386dsffwrb8h9c1bznrnynnsy63"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; };
-  GetDFPData = derive2 { name="GetDFPData"; version="0.6"; sha256="19srfls3fmxbjhwhsc3r76n34ls8s5940d831j4n93f4lzq33wyp"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
+  GetDFPData = derive2 { name="GetDFPData"; version="0.7"; sha256="0c8cdx0hgcnrsppmq7vk70ivhczlb4blqfghqb9rni295r3hzd47"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
   GetHFData = derive2 { name="GetHFData"; version="1.5"; sha256="1lm2k37y86fn45hhvyswj60dql0m33kia0wirs3zc981s4nsxp0i"; depends=[curl dplyr lubridate RCurl readr stringr]; };
   GetITRData = derive2 { name="GetITRData"; version="0.7"; sha256="0cmqbncd5bjxgb1r9yvdv2hkx4qdmnpn2a62bgndnaya1yk5050l"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
   GetLattesData = derive2 { name="GetLattesData"; version="0.9"; sha256="1rqhs8039m3ar76nail7gavw6678zs20r9dg98rp5igqx5jjys73"; depends=[curl dplyr readr stringdist stringr XML]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
   GetTDData = derive2 { name="GetTDData"; version="1.3.1"; sha256="1a8f22nxs85g2zznh1ma37lmycypg8f7d5kdhyb5vrirvrpi5p05"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; };
-  GetoptLong = derive2 { name="GetoptLong"; version="0.1.6"; sha256="1d98gcvlvp9nz5lbnzr0kkpc2hbkx74hlhrnybqhg1gdwc3g09pm"; depends=[GlobalOptions rjson]; };
+  GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; depends=[GlobalOptions rjson]; };
   GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; };
   GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
@@ -1437,10 +1439,10 @@ in with self; {
   Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
   GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
   GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; };
-  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.13"; sha256="04jvha0mafslqz5nr99xjylg9n2x31gj9v4mgyg7qcmfwpqyw3ch"; depends=[]; };
+  GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.0"; sha256="1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"; depends=[]; };
   Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
-  Gmisc = derive2 { name="Gmisc"; version="1.5"; sha256="0jiyqi0mmwbb7v8jqksvm42r4sq1d5najqkapnpj5jzn6izq6vh5"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
-  GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; };
+  Gmisc = derive2 { name="Gmisc"; version="1.6.2"; sha256="15ax691xk14y7qxnr1d0qbzb7y3ikv0x4qgsn4ss9z6b0hqclc84"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
+  GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; };
   GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; };
   GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; };
   GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; };
@@ -1448,21 +1450,20 @@ in with self; {
   Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; };
   GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
   GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; };
-  GraphKit = derive2 { name="GraphKit"; version="0.5"; sha256="1ip0rkrwxpjcd9mhz2z8n7lwdrjj1idymsafm8aac1hfbxr6c0xz"; depends=[Rcpp RcppArmadillo]; };
   GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; };
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; };
-  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.1"; sha256="0r6b8hzzx0ja0skp4w4s49jpkkjbb3an62vp74qh5sf2wi1hx9x6"; depends=[rJava]; };
   GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; };
-  Greg = derive2 { name="Greg"; version="1.2.1"; sha256="0li05w2nbqvabhwwmhxiwjalr1q79xad9yd2vycpz198c048kiqf"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
+  Greg = derive2 { name="Greg"; version="1.2.2"; sha256="0drp9qf7yid88vcd2q2qdw23l1jynircffqnylznz8xzyh4qv7ik"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
   Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
+  GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; };
   GroupSeq = derive2 { name="GroupSeq"; version="1.3.5"; sha256="0c74nlsqa5ly0kf6p4n7gfvd0ygkq78bx851ryniwpnnalvsq8l7"; depends=[]; };
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
   GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; };
   GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; };
-  GuardianR = derive2 { name="GuardianR"; version="0.8"; sha256="07bg7wz7d2rgjkw5ldzi5p7nd4ch39m6ql5w4sqnvds4r08jspj9"; depends=[RCurl RJSONIO]; };
+  GuardianR = derive2 { name="GuardianR"; version="0.9"; sha256="0z0bgm3kr7yqx0yfzhs07k1gs97zpjajfnxn1w1m5w76s7czfzl7"; depends=[RCurl RJSONIO]; };
   Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
   HAC = derive2 { name="HAC"; version="1.0-5"; sha256="0dc79qjhyydq0k4d8wvg970hs56i9yhxjrh5ky9a178ya61vw208"; depends=[copula numDeriv]; };
@@ -1472,20 +1473,20 @@ in with self; {
   HBP = derive2 { name="HBP"; version="0.1.2"; sha256="0khw15xj3k40bsdbbs1m5ad1ykji3fx0549697c1svhkm7zrrny4"; depends=[BiocInstaller coin flexclust ggplot2 gplots HiTC igraph lattice multcomp OmicCircos pgirmess reshape2 rtracklayer]; };
   HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
   HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
+  HCmodelSets = derive2 { name="HCmodelSets"; version="0.1.1"; sha256="0xyaap718x01g2w5gk6yz3s87zvxfymhfn5klazn16jh8v446m4f"; depends=[ggplot2 mvtnorm survival]; };
   HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; };
   HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; };
   HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; };
-  HDInterval = derive2 { name="HDInterval"; version="0.1.3"; sha256="1zjddw8s6xc2gsz6285g3dzzarnhb77sra1dbxghgn2nrgn2y0i5"; depends=[]; };
+  HDInterval = derive2 { name="HDInterval"; version="0.2.0"; sha256="1y51q0dwav3x7c0vp571v89vq1a5mivsxsyahqrv1la12zw0m7il"; depends=[]; };
   HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
   HDPenReg = derive2 { name="HDPenReg"; version="0.93.2"; sha256="0blmp7cwsklp8aqdcyyjmv419cgc7iz0pb4629y8slqw0zq2n6gm"; depends=[Matrix Rcpp rtkore]; };
-  HDclassif = derive2 { name="HDclassif"; version="2.0.2"; sha256="0gykjqqhrqz1x9xl867hxhrp197y3x4679zh9v84i1nd9yxlamah"; depends=[MASS rARPACK]; };
+  HDclassif = derive2 { name="HDclassif"; version="2.1.0"; sha256="1d79wki03yyr3hqz44xlx07msmxb59sm2mrq2za34fdbvvrmw58v"; depends=[MASS rARPACK]; };
   HDoutliers = derive2 { name="HDoutliers"; version="1.0"; sha256="0pby640bad0jcf1lkwg2g6flassb1pimnjm411c6x8rgvmiphc23"; depends=[FactoMineR FNN mclust]; };
   HDtest = derive2 { name="HDtest"; version="0.1"; sha256="0vlwpx9l6r0izfcf9fgna72w39w64b95s3q527mapjb6a3676avg"; depends=[checkmate doParallel expm foreach MASS mvtnorm]; };
   HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
-  HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
-  HEMDAG = derive2 { name="HEMDAG"; version="2.0.1"; sha256="1sdgcc1adf21zd6qy48wkvnfakgpx7c4f750hnp8vjpanlrizp1w"; depends=[graph PerfMeas precrec preprocessCore RBGL]; };
+  HEMDAG = derive2 { name="HEMDAG"; version="2.1.3"; sha256="110c37y08ivqvh5qcn6plsxf7ariqwdx6my7xv83kj2v570a4qiw"; depends=[graph PerfMeas precrec preprocessCore RBGL]; };
   HGNChelper = derive2 { name="HGNChelper"; version="0.3.6"; sha256="1bm6zxwafbp65p6w4rk2y1bw7ig60br2mk75c4frdzqw3yw0zwxd"; depends=[]; };
-  HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
+  HH = derive2 { name="HH"; version="3.1-35"; sha256="0sykmmipbph9x7k371liiyj2vmqv0as2hr9x6yrn38ls6bscjlj4"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="2.2"; sha256="114nfpdjdisryil9l8cws885qdskgrjm2cclx543hh4cdhpnkxnp"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIBPwned = derive2 { name="HIBPwned"; version="0.1.7"; sha256="04l9309lmgn33gdwm162g6vywz8p9sdgmy2baxj98jv7x791wj3r"; depends=[crul jsonlite memoise ratelimitr urltools]; };
@@ -1495,30 +1496,29 @@ in with self; {
   HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; };
   HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; };
   HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
-  HLSM = derive2 { name="HLSM"; version="0.7"; sha256="0cj4mbg7vamlabxynik59n5l3w5fiwa84qypprr8wr7ms2aimfa0"; depends=[coda igraph MASS]; };
+  HLSM = derive2 { name="HLSM"; version="0.8"; sha256="1503n1qb91ca2m37g4lfzgzh1kh5l74g7z1r9s5grsj2s9by0ayh"; depends=[coda igraph MASS]; };
   HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.1.8"; sha256="15z0war5isw9xnln7py3di8f45pwvdw6x6wljl18fcxpmanmlfcf"; depends=[RCurl XML]; };
   HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
   HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
   HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.0"; sha256="19iwy0nj0vw3cslrfdai1l1yg84c5diyxpy65jd2f419ag3rmki3"; depends=[Rcpp RcppArmadillo Rdpack]; };
   HMMoce = derive2 { name="HMMoce"; version="1.0.0"; sha256="0w2hrqjz75j9l6wimz9rsr8bwa5rvag0pavmyqkcb8jgqdgka8hx"; depends=[curl doParallel dplyr fields foreach imager locfit lubridate maptools raster RColorBrewer rgeos RNetCDF sp]; };
-  HMMpa = derive2 { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
   HMP = derive2 { name="HMP"; version="1.5.1"; sha256="0v32pkgr9rhpz77y18z356lc68hcncbszawwqsldwhwc8dvb3rwn"; depends=[dirmult doParallel foreach ggplot2 gplots lattice MASS rpart rpart_plot vegan]; };
   HMPTrees = derive2 { name="HMPTrees"; version="1.4"; sha256="1jha64iyb0816rdg2i3z7i31z02r72k6acmvw0ibw3sli8zcvphb"; depends=[ape dirmult doParallel foreach HMP]; };
   HMR = derive2 { name="HMR"; version="0.4.2"; sha256="0rbpghih99avaq803f6hb66pfbqgzh1i2yaqs0mhbj61yyjzyb7b"; depends=[]; };
   HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-  HRM = derive2 { name="HRM"; version="0.8.0"; sha256="0p6m73l6i9psa3xh2l02c6r2f2wiysn5nharyryz0p50rz7ajhls"; depends=[ggplot2 MASS matrixcalc plyr reshape2 xtable]; };
+  HRM = derive2 { name="HRM"; version="0.9.1"; sha256="0pv3lly5rm620868mkka3m0hp5k2yrpymwdjdh19s4vdj4xjnb15"; depends=[data_table ggplot2 MASS matrixcalc plyr pracma reshape2 xtable]; };
   HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   HSAR = derive2 { name="HSAR"; version="0.4.2"; sha256="0rxb2klmyynr8rzq6ka8p40lw81wjd0jkw2wg3vg90zny0zps98j"; depends=[Rcpp RcppArmadillo spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; };
   HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; };
-  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-8"; sha256="0s3m771l83psfwk6dqw2zf0vyvk5v2h730b5nwaky9xvgvp0mrms"; depends=[]; };
+  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
   HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
-  HTSSIP = derive2 { name="HTSSIP"; version="1.3.2"; sha256="0y5xqpq55x1q4afs9qwn949y6f4f11fl9zxn2ffzv17zsia7b7xl"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
+  HTSSIP = derive2 { name="HTSSIP"; version="1.4.0"; sha256="04wfwbi57rxjd69inagvj3qricshwia16k6d2r4fgg9wmikgx4yv"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
   HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
-  HURDAT = derive2 { name="HURDAT"; version="0.1.0"; sha256="074c5spfsg4f3hg9f316wz72m2j3kvycl8hb4j7i7z62wswgi420"; depends=[dplyr lubridate magrittr purrr readr stringr tibble tidyr]; };
+  HURDAT = derive2 { name="HURDAT"; version="0.2.0"; sha256="12l087j2bak9yzmwvxaamjysmqih3jzrvv5cgmx9xzl548wk9vv4"; depends=[dplyr lubridate magrittr purrr readr stringr tibble tidyr]; };
   HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
   HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
   HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; };
@@ -1528,9 +1528,9 @@ in with self; {
   HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
   HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
-  Haplin = derive2 { name="Haplin"; version="6.2.1"; sha256="13kix0skxk35zgwci1fwxkqm8bxbsxf5kid7qs88ib9pgix7qg41"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
+  Haplin = derive2 { name="Haplin"; version="7.0.0"; sha256="1hdclx33ndjgz4xvg8myngzslcrmvc994nlgf3hp3km3591j62rj"; depends=[ff ffbase MASS mgcv snow SuppDists]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
-  HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.9"; sha256="0qk3lly5qczn61rj0q9xzscppspvk238yjgr4p71pkzkjhiv40jz"; depends=[mice Rcpp Rsolnp]; };
+  HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.1"; sha256="16n8qanxx0p5ny5zqxafn8hwb1xv94y1wig1iql8as5a5qh8lwcz"; depends=[mice Rcpp Rsolnp]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
   HelpersMG = derive2 { name="HelpersMG"; version="3.0.0"; sha256="1y5q4z9yxap16bkcjsybm2754wm0x31hfqdnp2bb4gbvhz1jhas6"; depends=[coda]; };
@@ -1542,6 +1542,7 @@ in with self; {
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
+  HiResTEC = derive2 { name="HiResTEC"; version="0.52"; sha256="1kci3kxrf96ba9vawh2ln1rhpzyfkj259v8iyhrdrnhq58xrvkf5"; depends=[beeswarm Biobase InterpretMSSpectrum openxlsx plyr Rdisop xcms]; };
   HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-11"; sha256="1yh85pdb9r90qxcl5gxslyplxzrx8knrrsl2q65l57zfkqj185ja"; depends=[]; };
   HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
   HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
@@ -1562,17 +1563,17 @@ in with self; {
   HydeNet = derive2 { name="HydeNet"; version="0.10.7"; sha256="001ifh5ddg7q4rckhi662zd9a8milfi3v2gmgy76x0wq2xph7yrj"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; };
   HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
   HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
-  IAPWS95 = derive2 { name="IAPWS95"; version="1.0.0"; sha256="1rw6i3a653m11fyza42jhbqi6607fiqgmq15qfn5bqhq8sdgmn9p"; depends=[ggplot2 pander Rcpp]; };
+  IAPWS95 = derive2 { name="IAPWS95"; version="1.1.0"; sha256="03kggkcyvbgh7l9haa1ljg0sv6f2rs06r6j0w2x7cpm31qmc3yzl"; depends=[ggplot2 pander Rcpp]; };
   IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; };
   IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; };
   IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; };
+  IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; };
   IATscores = derive2 { name="IATscores"; version="0.2.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; };
   IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; };
-  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.2-5"; sha256="1b5fsrbqycz8zgpxk3vc48cba7vb818rw5hgmf92q11azm4n1q5s"; depends=[lsa tidyr]; };
+  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.3-2"; sha256="16ynw5p26cyji6g5k7nhq56p5h86rrkrh9xr85kajb1f3dr6rmyw"; depends=[lsa tidyr]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
   IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
   IBDsim = derive2 { name="IBDsim"; version="0.9-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; };
-  IBHM = derive2 { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[cmaes DEoptim Rcpp]; };
   IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
   IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
   ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
@@ -1583,7 +1584,7 @@ in with self; {
   ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
   ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; };
-  ICEinfer = derive2 { name="ICEinfer"; version="1.0-4"; sha256="0fa5mxj224jgppp09bblyi9w9racz5lb1i20npvnccafcm36f7y1"; depends=[lattice]; };
+  ICEinfer = derive2 { name="ICEinfer"; version="1.1"; sha256="0q07npgnssia7assvl1084080w3w434viyz5r1lj5slrx9gfdh8b"; depends=[lattice]; };
   ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
   ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
   ICRanks = derive2 { name="ICRanks"; version="1.3"; sha256="0n8gyqlwx38v2lfx7r49h43k2f4z4ml78x3lq0sc952n4rckzgiv"; depends=[multcomp Rcpp]; };
@@ -1594,34 +1595,36 @@ in with self; {
   ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
   ICcalib = derive2 { name="ICcalib"; version="1.0.7"; sha256="1p224srs1jakl7iyybcn9f6r9kcwxyrikdrfa9wjgkhz60pv88fs"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
-  ICtest = derive2 { name="ICtest"; version="0.3"; sha256="0g4h6gkz6zp28a1hvrvm89wckx6sg5fqzy0flb97a6lh9xpmb83g"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
+  ICtest = derive2 { name="ICtest"; version="0.3-1"; sha256="10wxx2b8m5h0k8f6lgf0z1xhvhr14dyrda2pf46w03fa23f5mb7l"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
   IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; };
+  IDE = derive2 { name="IDE"; version="0.1.0"; sha256="0z8nc2h3ivy7prxh9ndg8q3inh6rmjg7x969gj7z6qbml3122zq8"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; };
   IDF = derive2 { name="IDF"; version="1.1"; sha256="19fx04gvzwzkxbd453l3wx46s22dbnh0nxdrmsr4f7l67kihbwdr"; depends=[evd ismev]; };
   IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; };
   IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
-  IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
-  IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
+  IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.5"; sha256="05wxymvv1p7dik5y227qnp4w1lpdmqfp17zrk6iah8gyv9yjsvbh"; depends=[doParallel foreach igraph spatstat]; };
   IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; };
   IDmining = derive2 { name="IDmining"; version="1.0.4"; sha256="1jjxw9pdhd3wx5qnjnssf0j3bg91li1ar5ps02dhv0c49hslg0x0"; depends=[data_table doParallel foreach]; };
   IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
+  IFSPlot = derive2 { name="IFSPlot"; version="1.0"; sha256="0sydm9g54v5xy6m5rikx7q020aqvsilzcbg6c4vl79g9d2r8q07s"; depends=[gplots jsonlite Rcpp RcppArmadillo reshape2 rgl]; };
   IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; };
-  IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
   IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; };
   IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; };
   IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; };
   ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; };
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
   IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; };
-  IMIFA = derive2 { name="IMIFA"; version="1.3.1"; sha256="1xk2l1zk7arrbb8lxs5s03pjapks98xx8dfpic8qmha3qjlav90c"; depends=[abind e1071 matrixStats mclust mvnfast plotrix Rfast slam viridis]; };
+  IMIFA = derive2 { name="IMIFA"; version="2.0.0"; sha256="09jsk7m0427z4wdpwip4p6idinvdnvc4c3s637p9z9lcgz54vszy"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; };
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
   IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; };
   IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; };
   IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; };
-  IMak = derive2 { name="IMak"; version="1.1.2"; sha256="19si4hhvi8kddkp2kr1yw2bcw1qkk0i42saklvwk751gdmyzl9p3"; depends=[]; };
+  IMak = derive2 { name="IMak"; version="1.2.0"; sha256="0h9hs9zpi7glf1i4gjl8xvz5hq23ask81mxpmfjpyxv03j1bwdih"; depends=[]; };
   INCATome = derive2 { name="INCATome"; version="1.0"; sha256="1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs"; depends=[genefilter limma multtest RankProd siggenes]; };
+  INDperform = derive2 { name="INDperform"; version="0.1.1"; sha256="08wp7zn0s61nl2r99r3712cxkhqp9xy2vghpjjcvr5y48dkw7kzf"; depends=[cowplot dplyr ggplot2 htmlwidgets jsonlite lazyeval magrittr mgcv nlme purrr RColorBrewer rhandsontable shiny stringr tibble tidyr vegan]; };
   INLABMA = derive2 { name="INLABMA"; version="0.1-8"; sha256="13r89r14xpihfqddwzkhxg4jgxyl59826x2insrall3mj2yffj90"; depends=[Matrix sp spdep]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
-  IPEC = derive2 { name="IPEC"; version="0.0.9"; sha256="02nzh8yq6nshnljxlkqyvd9spnqbcxfdlcr2zl33syhgqjsaz34h"; depends=[MASS numDeriv]; };
+  IPCAPS = derive2 { name="IPCAPS"; version="1.1.5"; sha256="0d1nws86k1yph2f4drwrh4jvmmc9nnqmmswpwirmgsp3ma58kc42"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; };
+  IPEC = derive2 { name="IPEC"; version="0.1.0"; sha256="1dcmjvqsz3hlfymnlsld9psalfvq7z51yx39dkd11d25cj1mf8na"; depends=[MASS numDeriv]; };
   IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; };
   IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
   IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; };
@@ -1629,22 +1632,23 @@ in with self; {
   IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
   IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.1.0"; sha256="033j0dba1bzbbjn7q827h4d1rw91z8gbr2bb119lds4v8zkkfpxx"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.6"; sha256="1kccc4rbnyczdif7plvl3jfa3nfqfasybbbqmdkfiz0mhgvn1z4r"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.8"; sha256="0j419gn9jv9zpd2rzgsc6flz6k22gr11kany1av02cvs5dymwb4p"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
   IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; };
   IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
   IRTpp = derive2 { name="IRTpp"; version="0.2.6.1"; sha256="10shzyiawk65pikawvhg58kx6fpvs1dazqmfjf3rfvly1lc0px1q"; depends=[FactoMineR MASS mvtnorm numDeriv Rcpp]; };
-  IRdisplay = derive2 { name="IRdisplay"; version="0.4.4"; sha256="19l4flvik8zw2pany8dpjbrh0bji6bag6pmclgwqnq80532hnfp8"; depends=[repr]; };
+  IRdisplay = derive2 { name="IRdisplay"; version="0.5.0"; sha256="1jwhcp9dp1kdqcx8zq6lzbczsm9rg5qlb8sd9aznpvn9a2745d9x"; depends=[repr]; };
   ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
   ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
   ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; };
   ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; };
-  ISOcodes = derive2 { name="ISOcodes"; version="2017.09.27"; sha256="1nnbp110fzlckbi6vdigrn275d3j7ixys0b8np8ran876piwddjp"; depends=[]; };
-  ISOpureR = derive2 { name="ISOpureR"; version="1.1.1"; sha256="1mi0hl32wfgc7znvs1ay9i9lwdj022d88asdgcbs63vx335qg99w"; depends=[futile_logger Rcpp RcppEigen]; };
+  ISOcodes = derive2 { name="ISOcodes"; version="2018.06.29"; sha256="0dzqfhrqb43bwkpblmzfx5viwgrd84sin461msczwdqx7b9da92a"; depends=[]; };
+  ISOpureR = derive2 { name="ISOpureR"; version="1.1.2"; sha256="0z3i6l0c76kpfxihj3y9mldj10iw2lrb1r50v8bf20qrbxfckci1"; depends=[futile_logger Rcpp RcppEigen]; };
   ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
   ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; };
   ISwR = derive2 { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
   ITGM = derive2 { name="ITGM"; version="0.6"; sha256="0acrm15vb1r0nnp0bp5zf8g27i3sy3d7bpd50lj0w1rl6dgwfznh"; depends=[data_table Fgmutils ggplot2 gsubfn plyr randomcoloR rbokeh sqldf]; };
-  ITNr = derive2 { name="ITNr"; version="0.1.0"; sha256="0fxh7qs96w945sp7gnjk069rp1j8bj949r9c2skabw8bnkf5yi1k"; depends=[animation blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph Matrix ndtv network networkDynamic plyr RColorBrewer reshape2 sna statnet tnet WDI xergm xergm_common]; };
+  ITNr = derive2 { name="ITNr"; version="0.2.0"; sha256="1bpnijwlrjg2l2qi9m5dlywq8xpb019kiqw288fzv6njm1yvwy56"; depends=[animation blockmodeling circlize comtradr cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph maps Matrix ndtv network networkDynamic plyr RColorBrewer reshape2 sna statnet tnet WDI xergm xergm_common]; };
+  ITRSelect = derive2 { name="ITRSelect"; version="1.0"; sha256="0zwgvcbjjd9wg19d36ygzsdkm04ndv91wg20wc3d78dbvyzy2kmh"; depends=[Formula Matrix ncvreg Rglpk svMisc]; };
   IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
   IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; };
   Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
@@ -1654,13 +1658,13 @@ in with self; {
   Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
-  ImputeRobust = derive2 { name="ImputeRobust"; version="1.2"; sha256="0hr5payxqyk5nckwx84j5wqrj477219qbp76908aylwb7c7iw9n4"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
+  ImputeRobust = derive2 { name="ImputeRobust"; version="1.3"; sha256="1mpccld9dw2v5rifla5g4qydcqkfagspnnq7r8if5lfm8mji33k3"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
-  InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.5"; sha256="15r3pdbwgnvk1qaqvb3m2xiczlv5jr7j7iwdgrxsn8n09q0aa4ds"; depends=[coda ggplot2 rJava]; };
-  IncDTW = derive2 { name="IncDTW"; version="1.0.1"; sha256="0ycr46l1h1zxrw5kszfgl3w1f9law539fi7j1i3fb2s59n5kh2k5"; depends=[ggplot2 Rcpp scales]; };
+  InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.0"; sha256="12fqnim6n8ha1bm8vs6ni21s5h0jb9sny88hn0xy6nsgzzzwpw5i"; depends=[coda ggplot2 InterVA5 rJava]; };
+  IncDTW = derive2 { name="IncDTW"; version="1.0.3"; sha256="19ppjpczbjv1bpzyyyasr5szblrsjimpc04hazhdgqzhil0v5sj2"; depends=[ggplot2 Rcpp scales]; };
   IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; };
   IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
-  IndepTest = derive2 { name="IndepTest"; version="0.1.0"; sha256="0l9vfp34k4nhlg3nymj0gqkpjblzbbvnz0zcajvq4c8nw9968c5i"; depends=[FNN mvtnorm Rdpack]; };
+  IndepTest = derive2 { name="IndepTest"; version="0.1.1"; sha256="1fiyafi22zs8cd42pnkf1psv4nxnrj7nk088pvk99hgasb7wjhpq"; depends=[FNN mvtnorm Rdpack]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
   IndexNumR = derive2 { name="IndexNumR"; version="0.1.0"; sha256="1385j7a1hz8i5g00x1p1rd32gq243w2zrzvk781zjqdq7az33fsw"; depends=[]; };
   IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; };
@@ -1679,16 +1683,17 @@ in with self; {
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
   IntegrateBs = derive2 { name="IntegrateBs"; version="0.1.0"; sha256="1pkx4wpahd1sabzx55law3710x3vbh9yi6kii8gs2xfq3cb1llmq"; depends=[]; };
   IntegratedJM = derive2 { name="IntegratedJM"; version="1.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; depends=[Biobase ggplot2 nlme]; };
-  IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.8"; sha256="0y3hagjx3pzhqyqm3pydl3s3f1g9d5yb2w3ybxll11913p3gll3i"; depends=[bootstrap caTools ggplot2 limSolve MultivariateRandomForest Rcpp]; };
+  IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.9"; sha256="0kklgc48cib4bjfs9qbw13nkp8xyjdazrg6z15x69jylnxyakic7"; depends=[bootstrap ggplot2 limSolve MultivariateRandomForest Rcpp]; };
   InterVA4 = derive2 { name="InterVA4"; version="1.7.5"; sha256="0la99ylx8fnn4kpqa364nhs12y2hzp3sm0awsx5sfdv6n7m9js33"; depends=[]; };
-  InterVA5 = derive2 { name="InterVA5"; version="1.0"; sha256="0lp75yinm1ph648s0jxgjixmn4q9g1rbky6hnppicpan2mk6d7ls"; depends=[]; };
+  InterVA5 = derive2 { name="InterVA5"; version="1.0.1"; sha256="1wsaf48ajqnb9cb7h13jrinmszk6ayqim15fkgxbirmp88hcy9k1"; depends=[]; };
   Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
   Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; };
   InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; };
   Interpol = derive2 { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
   Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
-  InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.1"; sha256="00nhfz1hs2j1pqhwgw5c337kl1azr3vmlcd1krnl4fgs5yz6ksyq"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; };
+  InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.2"; sha256="1iaw4i14l2vp1f163g2q4pwv9cnqrx14ik4s8zw0iha4zwcrc3ja"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; };
+  IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.0"; sha256="0dpgfgnnx6r29y8y3pac1rgi503wvlwggx5dh6fhqnxw5yfink61"; depends=[Rcpp]; };
   InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.7-1"; sha256="1pz06l50fm8327n1v8wnvh8q51g97crb4c07si3hywd5y1hkiwkp"; depends=[glmnet linprog mboost RColorBrewer]; };
   InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
   Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; };
@@ -1699,7 +1704,7 @@ in with self; {
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
   IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="1.1"; sha256="0w1zsb6qjcgyig8mahmpw0plxzqm2yqvg7gnqf50q1mpvdani2f4"; depends=[MASS]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="1.3"; sha256="1c7m48vj4884xzxilgv8ykginaayy8mp35xf6xaw7v0f4x2w3bk9"; depends=[MASS]; };
   IsoriX = derive2 { name="IsoriX"; version="0.7.1"; sha256="1x2vdgvnfkrgcrm7pdrdvr7m72y0274dab5cyhz31j8l2gqxw9la"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
   JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; };
@@ -1717,26 +1722,24 @@ in with self; {
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
   JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; };
   JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; };
-  JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
   JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; };
-  JSM = derive2 { name="JSM"; version="0.1.2"; sha256="18h3jhfg5ch9312aidpbs0fz5rd54alv4kjhvkchddhp3alyhp82"; depends=[nlme Rcpp RcppEigen statmod survival]; };
+  JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; };
   JWileymisc = derive2 { name="JWileymisc"; version="0.2.1"; sha256="0cli204f1b5hj3qz62fycww12a6dv7xxxszkxgrxirw6mpdf858c"; depends=[cowplot data_table devtools foreach ggplot2 Hmisc lavaan MASS mgcv mice multcompView plyr]; };
   JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; };
-  Jdmbs = derive2 { name="Jdmbs"; version="1.1"; sha256="06af66128vfcf28fylaz7qqzqrpn6s9hz89pd5jwpr32wxc5vwcg"; depends=[igraph png rmarkdown]; };
+  Jdmbs = derive2 { name="Jdmbs"; version="1.3"; sha256="0jjnn1lrrakai34srp9ks8a563amd1rp9vd4ydnpmgfma5qlify0"; depends=[igraph png]; };
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
-  JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; };
+  JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
-  JointAI = derive2 { name="JointAI"; version="0.1.0"; sha256="0im17n3w6mhgd2lnjja0ca30b2yz06qn7frcsr9qbbhnc4p7pnv4"; depends=[coda MASS mcmcse rjags]; };
+  JointAI = derive2 { name="JointAI"; version="0.2.0"; sha256="1y3mvj1m2mi6ss3svfrlk5lbyh3zp1mkyjgl7fv317n3xjg006s2"; depends=[coda MASS mcmcse rjags]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
-  JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
-  JuliaCall = derive2 { name="JuliaCall"; version="0.12.2"; sha256="1408pzvnsxc1mq31b0nf61qc5rby7ymnz3vpkab4xds7kh0fcqh9"; depends=[R6 Rcpp]; };
+  JuliaCall = derive2 { name="JuliaCall"; version="0.14.0"; sha256="1zrj1jn55qxxg95h1rfbfgzd7dn3hxm7gkwbin6zkcxi8qdc3690"; depends=[R6 Rcpp]; };
   JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; };
-  JuniperKernel = derive2 { name="JuniperKernel"; version="1.2.3.0"; sha256="17r4ssjjayvnp9fp9jalklp3p8dadyx5hvi9z3bh3sw4b7kx4lyd"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
+  JuniperKernel = derive2 { name="JuniperKernel"; version="1.4.0.0"; sha256="0yjfdpilz08cbnn35bxiqbn0d312mfxzdkb643db0zl34x5akxpa"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
   KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
-  KFAS = derive2 { name="KFAS"; version="1.3.1"; sha256="0hnf9ljy19hng7cvr0qixcf8h9z2spp5c9512gfm9c7zn6802k54"; depends=[]; };
+  KFAS = derive2 { name="KFAS"; version="1.3.2"; sha256="11ikpac63as1c4mz6kdrynjyy4wrfr4qrk1m2g4gbcrg10dnc06q"; depends=[]; };
   KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
   KGode = derive2 { name="KGode"; version="1.0.1"; sha256="05g8zr3jm13cl6wk9m693gxa3fn5cjppm56j7ih4zzswzk9b67h9"; depends=[mvtnorm pracma pspline R6]; };
   KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
@@ -1745,12 +1748,13 @@ in with self; {
   KODAMA = derive2 { name="KODAMA"; version="1.4"; sha256="0qzpgj6ljzd8n8vgmf53pmblsmypl86j7njd3pz0d370bxfchsqj"; depends=[Rcpp RcppArmadillo]; };
   KOGMWU = derive2 { name="KOGMWU"; version="1.1"; sha256="0n07wrpmmvxflxpmhkp3gm40xz2w4j0l8dsljhmfiyxcf5y7kq2g"; depends=[pheatmap]; };
   KRIG = derive2 { name="KRIG"; version="0.1.0"; sha256="1hpmjzzrh5b042xh14dgxvn5x5ini63vq5jz1i6rjgvsdf734f98"; depends=[Rcpp RcppArmadillo Rdpack]; };
+  KRIS = derive2 { name="KRIS"; version="1.1.1"; sha256="0v2xgdwd8lp399il6grjkysq2gj38fmjlxlvg5ciq3g3cp7cdy3m"; depends=[rARPACK]; };
   KRLS = derive2 { name="KRLS"; version="1.0-0"; sha256="1zyf3smfzfm3n43i35rlj1w6vcip2hxkvk4f8lp77xbsry0gmwjw"; depends=[]; };
   KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; };
   KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; };
   KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; };
   KScorrect = derive2 { name="KScorrect"; version="1.2.3"; sha256="1i69glkyi3ydzfgd8d6zrbgjq7gy9laq00jdppbqnl13i1n14sp7"; depends=[MASS mclust]; };
-  KSgeneral = derive2 { name="KSgeneral"; version="0.1.0"; sha256="19rrm411c2fvx4bxi9qc6v9spqpf52k08i7gvhici9dx2hhm3134"; depends=[dgof MASS Rcpp]; };
+  KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; };
   KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
@@ -1762,16 +1766,17 @@ in with self; {
   KernelKnn = derive2 { name="KernelKnn"; version="1.0.8"; sha256="1xiz90n9wggn5fv42h8c6gd3j6vmkwyq1433wwnmzrz5kw7f6vgb"; depends=[Rcpp RcppArmadillo]; };
   Kernelheaping = derive2 { name="Kernelheaping"; version="2.1.8"; sha256="03m5dwgm98x6ncifyyp2yxln4bm87rkrx84bdihywjd0x73pbklv"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
-  Knoema = derive2 { name="Knoema"; version="0.1.13"; sha256="10r7gpr39f32h4znmh8kywcs0l2g9ij75qqcyd3ai1fyif54wyqc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
-  KnowBR = derive2 { name="KnowBR"; version="1.7"; sha256="1h5xpj7cqj6130rwsd6bssvwmzc6ldb5wbjgqw7bc588ll1q5rsg"; depends=[fossil mgcv plotrix sp vegan]; };
+  Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
+  KnowBR = derive2 { name="KnowBR"; version="1.8"; sha256="1krkaxwx8qqlnlwc9fc663qx5y9c9lcws69fnqjdcfgim54pl3xz"; depends=[fossil mgcv plotrix sp vegan]; };
   KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
-  KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; };
-  Kpart = derive2 { name="Kpart"; version="1.2.1"; sha256="0jx5rqiw0y9hc1czg75iy4jvd993d7dri90s4iiskbg6x6z65mi9"; depends=[leaps]; };
+  KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; };
+  Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; };
   KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; };
   KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
+  L0Learn = derive2 { name="L0Learn"; version="1.0.2"; sha256="0igfmw4kpc5m6r1kj944ch48sdyx82c8imid3vrk67q2pcwqqc1a"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
   L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
   LAGOSNE = derive2 { name="LAGOSNE"; version="1.1.0"; sha256="08sf4mm40gv9mr57pxsl1b62s2dqvbvrhy2irzqspyqk5ai2aw0m"; depends=[curl dplyr lazyeval magrittr purrr rappdirs sf stringr]; };
-  LAM = derive2 { name="LAM"; version="0.2-9"; sha256="0znkh25aa2vv3h3rfqdaadk58c2p7rwfw8xx5i8fs6dzyvx6c99l"; depends=[CDM coda Rcpp RcppArmadillo sirt TAM]; };
+  LAM = derive2 { name="LAM"; version="0.3-48"; sha256="12a38rvb0krfl0yffhyn7nmxcgkga46kfn4h7wzvnr0hpl5a7kjf"; depends=[CDM coda MASS numDeriv Rcpp RcppArmadillo sirt TAM]; };
   LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
   LBSPR = derive2 { name="LBSPR"; version="0.1.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
@@ -1792,13 +1797,12 @@ in with self; {
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
   LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; };
   LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; };
-  LEGIT = derive2 { name="LEGIT"; version="1.2.1"; sha256="1ma4rpchinl4i58ljcdfgwik1rfc79waicpv1f9wdddjfsijwyay"; depends=[boot doSNOW foreach formula_tools gtools Hmisc iterators pROC snow]; };
+  LEGIT = derive2 { name="LEGIT"; version="1.2.2"; sha256="1agr8q6wz30fznz4810b27yr2z56n4wrbm96ixck1bpcaahmfcv9"; depends=[boot doSNOW foreach formula_tools Hmisc iterators pROC snow]; };
   LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; };
   LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; };
   LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; };
   LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; };
   LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; };
-  LICurvature = derive2 { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; };
   LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; };
   LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; };
   LINselect = derive2 { name="LINselect"; version="1.1"; sha256="1dx97pnfwlv6w00qp8b2ah8jl1arfh39x1vzry8zrxgxisq407wq"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; };
@@ -1811,28 +1815,28 @@ in with self; {
   LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; };
   LNIRT = derive2 { name="LNIRT"; version="0.3.0"; sha256="1xlfk3a0x8abs6xwsm9s50nvi53s1a7nhnskhvjbi3rdzkvkrwxl"; depends=[MASS]; };
   LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
-  LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; };
   LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; };
   LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; };
-  LPGraph = derive2 { name="LPGraph"; version="1.0"; sha256="0hbcllrvjsgkapkf28957y47jrhajrk7j67iw36bxpbb25xfvl7i"; depends=[car SDMTools]; };
+  LPGraph = derive2 { name="LPGraph"; version="2.0"; sha256="1d3czxihaz3f09bfb34knqb6prhcx50kh8y4qrhhakic999z6ifw"; depends=[car PMA SDMTools]; };
   LPKsample = derive2 { name="LPKsample"; version="1.0"; sha256="0vxps8zd9zg1aw4p2qd8wamcjkbl68yvppnlvshm2ry5dahwz1wk"; depends=[apcluster igraph mclust]; };
   LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; };
   LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; };
   LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
   LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
   LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
-  LPWC = derive2 { name="LPWC"; version="0.99.2"; sha256="1cir7w4rrpw7iqc1waf5aijk41hl19mdg1q7ml7mi0js88xy0a0y"; depends=[]; };
-  LPmerge = derive2 { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Matrix Rglpk]; };
+  LPWC = derive2 { name="LPWC"; version="0.99.3"; sha256="1kbm3anba39q4fn1yxaljrk93d2asp63dalhynymlcqr9p9grhzn"; depends=[ggplot2 knitr]; };
+  LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; };
+  LPower = derive2 { name="LPower"; version="0.1.0"; sha256="0g9y5s4k3l4zw97qh6c9jj6ysl39y4fprvqw1ybykirvgflisi8x"; depends=[MASS nlme]; };
   LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; };
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
-  LS2W = derive2 { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
-  LS2Wstat = derive2 { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
+  LS2W = derive2 { name="LS2W"; version="1.3.4"; sha256="1h4vvl1gfxkdjmy6syl0gf4fv03xxxw82cxwvy10b40sf20lwmnv"; depends=[MASS wavethresh]; };
+  LS2Wstat = derive2 { name="LS2Wstat"; version="2.1"; sha256="0i1b409bhvlm4hpcgm4bhd7pqk4bkcyy48d7bci254ppcr7z1m9q"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
   LSAfun = derive2 { name="LSAfun"; version="0.5.2"; sha256="114qhnx4dr7ywh3fzkjd35xygpnn74g5nv66ahj7hf5w0gg13ws9"; depends=[lsa rgl]; };
-  LSAmitR = derive2 { name="LSAmitR"; version="1.0-1"; sha256="0p1j4q1b7488wbwl2c9py6ldq2j7ri1dvnmmknx5lwvzv0xsawsd"; depends=[Hmisc lme4]; };
+  LSAmitR = derive2 { name="LSAmitR"; version="1.0-2"; sha256="15qyij193scrvc1ghcssr6qdzxc4l4qh199s09bz5hvr62zwfdgb"; depends=[Hmisc lme4]; };
   LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; };
   LSD = derive2 { name="LSD"; version="4.0-0"; sha256="0fsp3pwrnnic9mzkd6yxa4bnxbvg68712lb20vd42wf6jb39r2h3"; depends=[]; };
   LSDinterface = derive2 { name="LSDinterface"; version="0.4.0"; sha256="0nj4m924cj7x2djalrfyrrmycq2ha6s52m34kjgs7fc9f548lhx0"; depends=[abind]; };
-  LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.1.4"; sha256="1gfd890vr31ab37xbx7yhwbqk6y659d0dqyir7vrgma48cd0nidv"; depends=[abind car DiceKriging kSamples LSDinterface randtoolbox rgenoud sensitivity tseries]; };
+  LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.2.0"; sha256="1aab4djk510q35gr6vj5vx1p7jhqg2ph6fw4sjbsg60bjnr3nyyi"; depends=[abind car DiceKriging kSamples LSDinterface randtoolbox rgenoud sensitivity tseries]; };
   LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
   LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; };
   LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; };
@@ -1840,7 +1844,6 @@ in with self; {
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
   LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; };
-  LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
   LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; };
   LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; };
   LaF = derive2 { name="LaF"; version="0.8.0"; sha256="1nasj0502i0dbzqgm1pdvmc0wj1hk2q5fzanpcsh7zslsikiqxyq"; depends=[Rcpp]; };
@@ -1851,24 +1854,23 @@ in with self; {
   LambertW = derive2 { name="LambertW"; version="0.6.4"; sha256="09ygalklv0d767nwziqwaxa7h517rzqgaznmb04q43122x2gwb3k"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; };
   Langevin = derive2 { name="Langevin"; version="1.2"; sha256="0iy1nh4wzipw8spmfr0kscdnpaz3cq4idkbl5khiia2jid0kimvl"; depends=[Rcpp RcppArmadillo]; };
   LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; };
-  LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.0"; sha256="1fx85kfdvap914b2fsylkd6wiwcfxpmndkrynivwjczwx1hr5na1"; depends=[]; };
+  LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.1"; sha256="0xxx8967v015fy56m0hqfnr1mwgisj8ximdl05bs28ymzvdx37kp"; depends=[]; };
   LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; };
   LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; };
   Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
-  LatticeKrig = derive2 { name="LatticeKrig"; version="6.4"; sha256="02il7cks03kmbra3sf90kdfp0dzg4kfmy512hd542nzwwa8pivsm"; depends=[fields spam]; };
+  LatticeKrig = derive2 { name="LatticeKrig"; version="7.0"; sha256="04waq7dpp86rpa8qgrjbpl72k6vhkd300vxfc1xxy5z7k36pinqh"; depends=[fields spam]; };
   Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; };
-  LeArEst = derive2 { name="LeArEst"; version="0.1.5"; sha256="13rxch3f16yvcil255abdp2vc7v2ipy3xj38s7hmjikqfdmxpkw4"; depends=[conicfit jpeg opencpu]; };
-  LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
-  LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
+  LeArEst = derive2 { name="LeArEst"; version="0.2.0"; sha256="1492r6l0azs4ga6ia02bggk1jsx6q6rg05ins9ng6f41h04v6q3m"; depends=[conicfit doParallel foreach jpeg opencpu]; };
+  LeLogicielR = derive2 { name="LeLogicielR"; version="1.2.1"; sha256="0jd280ial4wfj5j6sbxgl2cbxabycsgmh2zsad7v7hcwbhhdd09i"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; };
   LearnGeom = derive2 { name="LearnGeom"; version="1.3"; sha256="0fqf5k3gsdxwyfcbkypqiq0ir8ay8r9bdy8iljhj308ammq0mxzk"; depends=[RgoogleMaps]; };
-  LendingClub = derive2 { name="LendingClub"; version="1.0.4"; sha256="03pgarbraj6in7pk7zaci98aq6dh52vsqb64my5p0bczgl2cpzmm"; depends=[dplyr httr jsonlite plyr]; };
+  LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; };
   LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.1.2"; sha256="0ziy86l6q01l471lmpldhs48xqlyw1va75np5hkzaq5wapr9pfk4"; depends=[data_table quanteda scales stringdist stringi]; };
   LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
-  Libra = derive2 { name="Libra"; version="1.5"; sha256="1kd3d06qjswqhwdsjkijixd4yijzks8xcdrkpyh99dwg045fg9h7"; depends=[nnls]; };
+  Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; };
   LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; };
   LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; };
   LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; };
@@ -1883,14 +1885,12 @@ in with self; {
   LncFinder = derive2 { name="LncFinder"; version="1.0.0"; sha256="1ygbmazjm2jk0wrd13khpx8rkwd51cb50qxs2zdad0w09705mpsx"; depends=[caret e1071 seqinr]; };
   LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
   LncPath = derive2 { name="LncPath"; version="1.0"; sha256="1cihwlj5sv000qg2wa931yx4ca6nixgihjna4g3fh7nr5aiv6cfn"; depends=[igraph samr]; };
-  LncPriCNet = derive2 { name="LncPriCNet"; version="1.0"; sha256="19cw3x97xv42kc4jag7axnmpd0nfnwg7vnwcn2bgcmm5gapmfn1h"; depends=[]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
-  LocalControl = derive2 { name="LocalControl"; version="1.1.0"; sha256="0hfm8lllsg5h95ib0h89hbhwcnk2959y9i3kllwmxhmqbirvlpx9"; depends=[cluster gss lattice Rcpp]; };
+  LocalControl = derive2 { name="LocalControl"; version="1.1.1"; sha256="1fshqm6ag0scjawf2vn8zz9vrx4fv0shk2qyk60adb1ms85y8rrq"; depends=[cluster gss lattice Rcpp]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-1"; sha256="1hy7fnahncpsgqxfy352lxk298i69w7drlspsgdvpzdbghca3y3i"; depends=[MASS mclust mvtnorm rgl tkrplot]; };
-  LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
-  LogicReg = derive2 { name="LogicReg"; version="1.5.9"; sha256="0rxzhbf51psdj7wb2dcah16y8f5q7y8p0yybz54rm00d1qagl6nq"; depends=[survival]; };
+  LogicReg = derive2 { name="LogicReg"; version="1.5.10"; sha256="15p9wklws7dwrc2ai8gj00mgjl41qwlnd2r85mvc4k89v3aafql7"; depends=[survival]; };
   LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
   LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
   LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
@@ -1900,11 +1900,11 @@ in with self; {
   LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; };
   LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; };
   LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.8.3"; sha256="0mrmxz5b1px44h50ai25lza67k2ji78sdi1b6nd373kpmix5kxa1"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.8.5"; sha256="01fd7hwridcrc0vi8cmj2pvpmbqdgqnh1qjnj7mq6cxcyijzd6sg"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  M2SMF = derive2 { name="M2SMF"; version="1.0"; sha256="0hf5ckpridi70yv15h0771q1grhqr9c592r87hgba7yh55dqqcq1"; depends=[dplyr MASS]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
-  MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.3"; sha256="0xv4ldyjp6pa2jk81al5ldvm72ywzb9fmwim8l97xcbydm5wxjcx"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
-  MAINT_Data = derive2 { name="MAINT.Data"; version="1.2.1"; sha256="0fmlmb88005diqwbxlgkzzb7bvxpdkiqiadp649id3mgcz100kcd"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
+  MAINT_Data = derive2 { name="MAINT.Data"; version="1.2.2"; sha256="12ha0lznk14ijjamp6y30srkvn8y1ppn8k4dvb4b8gaip5zzj0pp"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.17"; sha256="047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11.1"; sha256="1aj6gakhbpis576b264s43w55dhmd5rszj54z910plybxq8hzmir"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
   MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1"; sha256="1y2nr65cvqkvzzjsr3lmpk58lqd5rqvmzjdakhwhw4s6ymggd9hf"; depends=[lattice MALDIquant robustbase signal wmtsa]; };
@@ -1916,13 +1916,13 @@ in with self; {
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
   MARSS = derive2 { name="MARSS"; version="3.10.8"; sha256="1cmkish5rbv7lpm8fnv6d33plkfvxis4r4p48bx10fll1ba11m7h"; depends=[KFAS mvtnorm nlme]; };
-  MARX = derive2 { name="MARX"; version="0.1"; sha256="1yanv7q5l8ybw3mh0rvhxyqi2sp8w4b9vnas7lpqflc06j4nnv4p"; depends=[fBasics matlab stabledist tseries]; };
-  MASS = derive2 { name="MASS"; version="7.3-49"; sha256="1yjbnj1p4z0vw84wga8q5fyqiw4n6r7pc6rdwam7vsbiamyzfcqs"; depends=[]; };
+  MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; };
+  MASS = derive2 { name="MASS"; version="7.3-50"; sha256="16hasv9k4n773jsyzvh8s3gbga49hwdj8n5hxij6zqisy4i0kxq6"; depends=[]; };
   MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; };
   MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
   MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
   MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-  MAVE = derive2 { name="MAVE"; version="1.2.9"; sha256="0h54iaw0nlyddgl266sk2gkrq8ff1xn510bfw12csqk7xnydm18f"; depends=[mda Rcpp RcppArmadillo]; };
+  MAVE = derive2 { name="MAVE"; version="1.3.8"; sha256="0zr8i21z6c4jwgqdyx7kya8k9016b7fffk4fjjxgas6yg6k2x1la"; depends=[mda Rcpp RcppArmadillo]; };
   MAVIS = derive2 { name="MAVIS"; version="1.1.3"; sha256="02hi3n2rligmgg9afqwkpdny2kl68simkaqdd6k1swzlrih0fs4s"; depends=[compute_es ggplot2 irr MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS weightr]; };
   MAVTgsa = derive2 { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
   MAc = derive2 { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
@@ -1947,37 +1947,36 @@ in with self; {
   MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
-  MCMCglmm = derive2 { name="MCMCglmm"; version="2.25"; sha256="0crici0g6x2471kk9092f72gc6ghbwwqid3w8jsnsvy6ymmk2wih"; depends=[ape coda corpcor cubature Matrix tensorA]; };
-  MCMCpack = derive2 { name="MCMCpack"; version="1.4-2"; sha256="1nizmfxyyrp0sbmyprgm97xmi3amxwix1gj7p9v0sjjklv1djap4"; depends=[coda lattice MASS mcmc quantreg]; };
+  MCMCglmm = derive2 { name="MCMCglmm"; version="2.26"; sha256="0dx3464mihnm8pf2vwr409ca5m7mvm2054x9jigazg66zsd3fxyj"; depends=[ape coda corpcor cubature Matrix tensorA]; };
+  MCMCpack = derive2 { name="MCMCpack"; version="1.4-3"; sha256="0rmz1rr1y7ycxj293hhy72vajbyblnrjgqvc2qgb63xfs5svi8qq"; depends=[coda lattice MASS mcmc quantreg]; };
   MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.8"; sha256="1qyhxljfcnyj7450vik4j81qilvphwc1b2xv48fnx1pnapfl45wz"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
-  MCMCvis = derive2 { name="MCMCvis"; version="0.10.0"; sha256="1yw4xrbkl2mdylvibnqy14v211a1h5knqgpp0syplvjaysjk9irm"; depends=[coda overlapping rstan]; };
+  MCMCvis = derive2 { name="MCMCvis"; version="0.11.0"; sha256="099sa541xrskn1jipx16hrgasriv4jy7jgjq9vyjwcagzh2hljz3"; depends=[coda overlapping rstan]; };
   MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
   MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; };
   MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
   MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; };
   MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
-  MChtest = derive2 { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
   MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
+  MDFS = derive2 { name="MDFS"; version="1.0.1"; sha256="17b9lphdgp90vcldlz4p8g1a87pf1d1vg1b8vz8xhn95cb0vr4ci"; depends=[]; };
   MDM = derive2 { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
   MDMR = derive2 { name="MDMR"; version="0.5.1"; sha256="1pv57xl7pjsqxz1j8mnfmjaa36mlr749yb4c44ppdrx6khvw662x"; depends=[car CompQuadForm lme4]; };
   MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; };
-  MDR = derive2 { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
   MDSMap = derive2 { name="MDSMap"; version="1.0"; sha256="15557ca83bvsqcmsa48vispagg9a05658i22cqk706shjsp782n5"; depends=[princurve reshape rgl smacof]; };
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
   MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; };
   MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
-  MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
   MEPDF = derive2 { name="MEPDF"; version="1.0"; sha256="171pzhz4z0373663mfnfi5cqd9gnj0aamwr56ag16dxm8xfyppcj"; depends=[MASS plyr pracma]; };
-  MESS = derive2 { name="MESS"; version="0.5.0"; sha256="1khm9x7kk68xcnjm9iij1s5zvj8n6dp1iwyp2y8fcv12qnvrjpbc"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
-  MEclustnet = derive2 { name="MEclustnet"; version="1.1"; sha256="1ayyrxdb9qd7fxnr8y2lbjcd2c8m38mjm1ks6z22vyddbhkf78in"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; };
+  MESS = derive2 { name="MESS"; version="0.5.2"; sha256="159vnyyab31s871j5hcqwn1g1zp18ym08jz6jcgiamwn0aprbzny"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
+  MEclustnet = derive2 { name="MEclustnet"; version="1.2.1"; sha256="1pznisvvgshqbixyj8jya35yhmmpxxa1ivh48c9iafgapwc4yn4s"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; };
   MExPosition = derive2 { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; };
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
   MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; };
   MFDFA = derive2 { name="MFDFA"; version="1.0"; sha256="1gy1v49525i2bhr14nvpz8rqcz3lchfnvm0g53qlln55jdndgsx4"; depends=[]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
   MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
+  MFPCA = derive2 { name="MFPCA"; version="1.2-3"; sha256="0zhmhk1cihk5h4c0qpcna5m687169qxlanbjc92scwab3q8hs2i9"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
   MGLM = derive2 { name="MGLM"; version="0.1.0"; sha256="06gaz82nn7fbfv7bm9xx6dsk95xq3gircvh6knzm963r1bw8f1pk"; depends=[]; };
@@ -2003,30 +2002,34 @@ in with self; {
   MKmisc = derive2 { name="MKmisc"; version="1.0"; sha256="1ykzj9flq1nx8k7aybd2sh5rd8a2hzk4gwz0iqqsl18k1khzbdla"; depends=[ggplot2 RColorBrewer robustbase]; };
   ML_MSBD = derive2 { name="ML.MSBD"; version="1.0.0"; sha256="1myr4pnznkypb7jjpyr5iv4yh29q9kv6g8gmfh9x3wy96xy15wmz"; depends=[ape]; };
   MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; };
-  MLCM = derive2 { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
   MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
   MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; };
-  MLML2R = derive2 { name="MLML2R"; version="0.2.0"; sha256="1r8a2sbv7c0xhdacg3gm3x5iml713xbc54c26q5rqx7mdnhsjiqk"; depends=[]; };
+  MLML2R = derive2 { name="MLML2R"; version="0.2.1"; sha256="055gps9zv8cv08lkf14p22d7r3kidwkwkhfv45xlg6i4fzcgllxb"; depends=[]; };
   MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; };
+  MLZ = derive2 { name="MLZ"; version="0.1.1"; sha256="1x2mmd7rb6rk2qb84i7k71w8l14m5dvkwg1xpjqgy9lzqnwhxi45"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; };
   MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; };
-  MM = derive2 { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; };
+  MM = derive2 { name="MM"; version="1.6-5"; sha256="0vi6wp6p48jjfmnspdsnmw0yqz39sjk6nrkxdw7kan5h17h4rwd7"; depends=[abind emulator magic Oarray partitions]; };
   MM2S = derive2 { name="MM2S"; version="1.0.5"; sha256="0h10cbsdnndllwq4cb4aamjy104ckvn01skh7rixa1iqdndac9fx"; depends=[GSVA kknn lattice pheatmap]; };
   MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
+  MM4LMM = derive2 { name="MM4LMM"; version="1.0.5"; sha256="1kj0kq98fqsfaj2gahn16jnfj86jq1v6jnmcs5ml944yvhmwx5n3"; depends=[Matrix Rcpp RcppEigen]; };
+  MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; };
   MMDai = derive2 { name="MMDai"; version="1.4.0"; sha256="0bb7hg8fkmzg87xr1b2hxhy75xi461ks6w12z85k4c77kswfpx3b"; depends=[DirichletReg]; };
   MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
-  MMS = derive2 { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
+  MMPPsampler = derive2 { name="MMPPsampler"; version="1.0"; sha256="1lk5hh4ihclldrbx2pbfzxvspjaywh7mg6nhs2mjr5dcdj2h0hky"; depends=[cowplot ggplot2 gtools MASS Rcpp RcppArmadillo]; };
+  MMS = derive2 { name="MMS"; version="3.0.11"; sha256="0gc4iz371bi65sp49gvjh99f8jvii8l0k12kn1vbpzk4a3cw7iad"; depends=[glmnet Matrix mht]; };
   MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; };
   MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; };
   MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; };
   MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
-  MOCCA = derive2 { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
+  MOCCA = derive2 { name="MOCCA"; version="1.3"; sha256="1ffpnqcrkrr7vh0f1fyyai0c2wq3v8sk2qhnhds49z7p6xrsmh21"; depends=[cclust class cluster clv]; };
   MODIS = derive2 { name="MODIS"; version="1.1.2"; sha256="1iww1rnxv2xw63b5bz7xrxb3q8dmgqzbw704gshislkhjwn37q87"; depends=[bitops devtools mapdata mapedit maps maptools ptw raster RCurl rgdal rgeos sf sp XML]; };
   MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; };
-  MODIStsp = derive2 { name="MODIStsp"; version="1.3.3.1"; sha256="0685mrddw47428p61dw30yqdp5m0z2xh3rjfdrrdicfyx7kaii5m"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 hash httr pacman plyr raster RCurl rgdal rgeos RJSONIO sp stringr XML xts]; };
+  MODISTools = derive2 { name="MODISTools"; version="1.0.0"; sha256="0b3hdj26f1s07c9k67az3xl82wixzniqaidxz8269grx7vndjmsz"; depends=[httr jsonlite tidyr]; };
+  MODIStsp = derive2 { name="MODIStsp"; version="1.3.5"; sha256="0mk39dvr0msx8xas6zxpzq95bg2whk8r2dc1zggh61rfi9r9d9mn"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 httr jsonlite pacman raster rgdal rgeos sp stringr xml2 xts]; };
   MOEADr = derive2 { name="MOEADr"; version="1.1.0"; sha256="0q0bm13v85raq5hdfpzg4v5kj12zjh31fr1x0zv9g5blxy10dqgy"; depends=[assertthat FNN]; };
   MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; };
-  MOLHD = derive2 { name="MOLHD"; version="0.1"; sha256="1si1sfrznq477pdzwqz5p3x2vsx3bl9bhrmxaqsimsja58blxygn"; depends=[fields iterpc]; };
+  MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; };
   MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; };
   MOST = derive2 { name="MOST"; version="0.1.0"; sha256="0nmjx5hsn67hdglcqyanq3az76rs15knv8qy28f8paah5s9w24xf"; depends=[]; };
   MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; };
@@ -2035,10 +2038,11 @@ in with self; {
   MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
   MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; };
   MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; };
-  MPSEM = derive2 { name="MPSEM"; version="0.3-3"; sha256="0ir1zlg0vz0nfdair3apa737dw4078lbxyk932755d3rj0cm20c3"; depends=[ape MASS]; };
-  MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
-  MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
-  MPsychoR = derive2 { name="MPsychoR"; version="0.10-6"; sha256="0lxfsxcry5r619cw751m5wn8wgf08j41cgan67xswn42ir7prdpx"; depends=[]; };
+  MPSEM = derive2 { name="MPSEM"; version="0.3-4"; sha256="0pj3gv2waxg5v1xv0qcwscq2c0g5w4w2b9ip3b761gs75mdy07g0"; depends=[ape MASS]; };
+  MPTinR = derive2 { name="MPTinR"; version="1.11.0"; sha256="1pflypcysc43yp4rh1lxnf7f0qklc6rl4y1mvj6ydwv5nlz52mbh"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
+  MPV = derive2 { name="MPV"; version="1.53"; sha256="14qnvcqqscd9hwn2mxf5dclv3ncj7w6vc3blxaml3rflriha6rls"; depends=[]; };
+  MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; };
+  MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; };
   MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
   MRFA = derive2 { name="MRFA"; version="0.2"; sha256="1ld9bchldx4y8g0zp2nr6r439f9vqy5xcr9bkv4g4vphm2c5zq72"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; };
@@ -2050,10 +2054,9 @@ in with self; {
   MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.1.0"; sha256="1f6ivr6cx4irqkry219x4nk6k5zhp3b19axy2xbfc3dx5zixhpjl"; depends=[]; };
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
-  MSBVAR = derive2 { name="MSBVAR"; version="0.9-3"; sha256="0ybkkl3hfff2jgz4a0z105bb0v6jl4dkkqmdg382and8w0mc496c"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; };
-  MSCMT = derive2 { name="MSCMT"; version="1.3.2"; sha256="00s4wwggc70w6cg94ff853jnw5hcln6i0719n4xr92cpxaa7irnw"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
+  MSCMT = derive2 { name="MSCMT"; version="1.3.3"; sha256="1962lc6p5cy8pkbshzbl3jnd2pqnk9afs4lmp4qb7fqkmb4xpka3"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
   MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
-  MSGARCH = derive2 { name="MSGARCH"; version="2.1"; sha256="0z4fp37x65ggbn8kx0xbdwq1x18z93azr36smpfqxaykiiwwfa22"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
+  MSGARCH = derive2 { name="MSGARCH"; version="2.3"; sha256="0dax3cx0dzmg086vhymnm5x5s7ljdnxx1k52xnnvrm6pprhdgaqn"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
@@ -2062,8 +2065,8 @@ in with self; {
   MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; };
   MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; };
   MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
-  MSwM = derive2 { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
-  MTA = derive2 { name="MTA"; version="0.1.1"; sha256="07bkisjvdxzf79ngwc8c5ikmnfas82m894hdc87q2yh0lzf12987"; depends=[igraph rgeos sp]; };
+  MSwM = derive2 { name="MSwM"; version="1.3"; sha256="1ny7rzpq6x6yy0iz3ad51vwdh7i4sy60pvgdxda3jcz5wal3hgqm"; depends=[nlme]; };
+  MTA = derive2 { name="MTA"; version="0.1.2"; sha256="1149xjq6ybjv6llzlq67j5xc6dspb4mvd72n62nlbq3zz80x7f84"; depends=[igraph rgeos sp]; };
   MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; };
   MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; };
   MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
@@ -2075,35 +2078,36 @@ in with self; {
   MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
   MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
   MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; };
-  MVN = derive2 { name="MVN"; version="5.1"; sha256="1w0q42yqh6c0yl2mkcpn28da59i5svrqg18z2dndnxhvyl46ij3d"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
+  MVN = derive2 { name="MVN"; version="5.5"; sha256="05jl9g7jyx6a5fc8bw5si393s7f9swygma8h461v8abqbakihb2q"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
   MVR = derive2 { name="MVR"; version="1.32.1"; sha256="03dbd5nib8cx0rwdi4g9fihbkdxazpvbdjh7sfnavsyyrgnqa31m"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
-  MVar_pt = derive2 { name="MVar.pt"; version="1.9.9"; sha256="1lhy66k9x9ymj03d4f7wi6rdx60bwgy6gfv49jq3vr4cj8dv22i9"; depends=[]; };
-  MVisAGe = derive2 { name="MVisAGe"; version="0.2.0"; sha256="18w3qf85l81sbxhzxs61jbsng14lbd8vzvbprq0ywkxb2lsq16n2"; depends=[]; };
+  MVar = derive2 { name="MVar"; version="2.0.2"; sha256="0h1sm2vzjg86v3sv43pbf9fxjx5d6bxx519aa25y0r27nh9fif5y"; depends=[]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="2.0.2"; sha256="0b7qgfa180vv2m6l5vqxqc96700srdzzix2kwccfvjimby522a1b"; depends=[]; };
+  MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; };
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
-  MXM = derive2 { name="MXM"; version="1.3.3"; sha256="1xzw7ad3kpd8chfksgfsv0wdy7h1kzw5n410ndfhd1mx1cdfghj9"; depends=[doParallel dplyr energy foreach geepack hash knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
+  MXM = derive2 { name="MXM"; version="1.3.5"; sha256="0pmv6qya38kxsys39qzdgh7zqjz7i052f25xmqwc5fa4l08jmm6a"; depends=[bigmemory doParallel dplyr energy foreach geepack hash knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
-  MagneticMap = derive2 { name="MagneticMap"; version="1.0"; sha256="1634bk6x92z01gyiy89c1g6z5cjsj8pf4f358y7rk2kppmfz4cf7"; depends=[scatterplot3d]; };
   MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; };
   Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; };
   ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.4"; sha256="0c5hw01nlnxrys8d9qhwvnls834i0081pf9iic9kx5k6ckc7iwha"; depends=[Rcpp RcppArmadillo]; };
-  ManlyMix = derive2 { name="ManlyMix"; version="0.1.11"; sha256="0vnx4cmx5vv8qh3pn75lz1mxap1ar4jnc5j15552vvi4i9pgmmar"; depends=[]; };
+  ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; };
   ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; };
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; };
   MapGAM = derive2 { name="MapGAM"; version="1.1"; sha256="0sh7qnzzahaz09nmld5p8df93my6k5vpvgmvqdlz84vghcfbfpa2"; depends=[colorspace gam maptools sp survival]; };
   MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; };
   MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
   MarginalMediation = derive2 { name="MarginalMediation"; version="0.5.1"; sha256="1v7ly1yaglyh257b1q4vc7sfrk41lb4ar9dpwf5ppap581pgpz3f"; depends=[boot magrittr purrr]; };
-  MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; };
+  MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.1"; sha256="1dz5ig16yz5n8i1dqrbg5xjigryznk61br80fj20prq4qhsdsqi6"; depends=[gtools matrixcalc sandwich]; };
+  MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; };
   Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; };
   MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; };
   MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; };
   MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; };
   MatchItSE = derive2 { name="MatchItSE"; version="1.0"; sha256="01ghv3hdlsx6ypvsh7k0mi20yc8vg7z602mhcprhhh97qsb81v6h"; depends=[Rcpp RcppArmadillo]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
-  Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; };
+  Matching = derive2 { name="Matching"; version="4.9-3"; sha256="00mw02379dg6da19glfz9bbbhz902b0ppp9p66rgayd0fmnk9gqz"; depends=[MASS]; };
   MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
   Matrix = derive2 { name="Matrix"; version="1.2-14"; sha256="15hknim84nj3f54vkchca5ac0c3ip15v1by18k5parmn8wsl19j9"; depends=[lattice]; };
   Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; };
@@ -2117,13 +2121,13 @@ in with self; {
   MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.5.2"; sha256="0k64yzn7qnjxkxxqg5yrgq1ksdp37qfx0yc8a2n1zrdwj9f9ba2i"; depends=[dplyr lubridate rgdal rgeos rmapshaper rvest sp stringr xml2]; };
   MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.5"; sha256="065l1n2nr5jsc0mdlxj10plzp8m09025hzbd8if3pn6gsl520b6l"; depends=[dplyr futile_logger stringr webutils]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
-  Mcomp = derive2 { name="Mcomp"; version="2.7"; sha256="1bv88z0cy2ark9i8wggxj101bygpsfkaxql5k0g7m90jlq8b4xr1"; depends=[forecast ggplot2]; };
+  Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; };
   MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
   MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.0"; sha256="1gggia97ww4kiqhh2lnsmadgdxvpr36mdx1yrbgarj0sp6ilrd3l"; depends=[]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.6"; sha256="0cx2bkz5m96dirqknfsi9944rhnn14wwdimw1hq1p8c073z40i7a"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
-  Mega2R = derive2 { name="Mega2R"; version="1.0.2"; sha256="0v56sd0q8bxirjm851sjba52sb846ccqn7bihy0zm4fkqlfdm5m3"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; };
+  Mega2R = derive2 { name="Mega2R"; version="1.0.4"; sha256="1c51bway05rqywvw05022cjlqzciidqz9xwz17iwf536gndc348p"; depends=[AnnotationDbi DBI gdsfmt GenomeInfoDb pedgene Rcpp RSQLite SKAT]; };
   MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.3.0"; sha256="1nnj4nmzrvdj2arq74bg5ckhmll2z9ydnd75ds48njbhxla2645l"; depends=[ggplot2 iterpc knitr Matrix plotly rmarkdown robustbase]; };
   MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
@@ -2134,16 +2138,16 @@ in with self; {
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
   MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
   MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
-  MetaComp = derive2 { name="MetaComp"; version="1.1.1"; sha256="0ndnjpg0c9k4171n190qwxmy79kw2ax4y5ap4xvaf0x561p072l6"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
+  MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
-  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.3"; sha256="0zf45c6prr1g9xqsn4f5cxh30qvadbk0hzknz2hff6ljggjxxfia"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
-  MetaLonDA = derive2 { name="MetaLonDA"; version="1.0.9"; sha256="1iy7p91ln48fhym7gna8xmqrva6fcwxapqcyh1h6hqr0h3j392qd"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; };
+  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.4"; sha256="1dflmm59p4dkrs8iad4b4sc9qcv0x8707irf62mznczlg4mrni4z"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
+  MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.0"; sha256="0pmbq6f5dqq29h56wsrnq3nyk5s281jc8vh89h2wkbj9djay4bw0"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; };
   MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; };
   MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
   MetaSKAT = derive2 { name="MetaSKAT"; version="0.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; };
-  MetaSubtract = derive2 { name="MetaSubtract"; version="1.3"; sha256="0z7l666n3whfs5zqjqlq1aa10f1h4mv1di0alksllkijfi6pcnzq"; depends=[]; };
+  MetaSubtract = derive2 { name="MetaSubtract"; version="1.42"; sha256="070j46fp0kb5g9iyd7x4nnaqi1sqxsly3fmka361nzik4pr2x8a3"; depends=[]; };
   MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
   MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
@@ -2159,7 +2163,7 @@ in with self; {
   Metrics = derive2 { name="Metrics"; version="0.1.3"; sha256="1mpqbi1lihxgndfpm8b6c5hiibvnscz1b5xjgi16x2fqk3cz4i0z"; depends=[]; };
   MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; };
   MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
-  MiRKAT = derive2 { name="MiRKAT"; version="1.0"; sha256="1j2sasxrld9lxmhm4lrrxm2r32nfdiqsg5qjnplx7z55djjxqq4m"; depends=[GUniFrac MASS PearsonDS survival]; };
+  MiRKAT = derive2 { name="MiRKAT"; version="1.0.1"; sha256="1adhy9ysjm8xa45sb4x17ryznvg91c9xdf0irpcgc7rbg34rxf5x"; depends=[GUniFrac MASS PearsonDS survival]; };
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
   MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; };
   MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
@@ -2174,30 +2178,32 @@ in with self; {
   MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
   MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
   MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; };
-  MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.2.0"; sha256="1r6hamc4vanxdbmp37ib20drw49c4vxkskqb93qlagaqxgr9xch0"; depends=[stabledist]; };
+  MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.3.0"; sha256="0lp3jazmcg90gp019djr4xx8zwxrrmjidp53rc2v7s122razn9lr"; depends=[stabledist]; };
   MixAll = derive2 { name="MixAll"; version="1.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; };
   MixGHD = derive2 { name="MixGHD"; version="2.2"; sha256="1cq6mar6h56nscnd7xs6spf45mlqp48lssw2i57zfvi75f6s70p4"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
   MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; };
   MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; };
+  MixSAL = derive2 { name="MixSAL"; version="1.0"; sha256="15dymyzfs3bwskaf6xndj291g6nhw7k1q93y1cba55a6fdjh5qz9"; depends=[MASS]; };
   MixSIAR = derive2 { name="MixSIAR"; version="3.1.10"; sha256="0kc0apzl6aq9qjgrnnad78k71g91hzc1d7f3j0s1kpwzax2q6l2l"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 rjags]; };
   MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; };
   MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; };
   MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; };
   MixedPsy = derive2 { name="MixedPsy"; version="1.0.0"; sha256="19cgw82jdkcpkca90bab1k5gcb2prlxm634n4m7yx0p0mj736fha"; depends=[beepr boot brglm lme4 Matrix mnormt]; };
   MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; };
+  MixfMRI = derive2 { name="MixfMRI"; version="0.1-0"; sha256="08k8j52mrjpcrnwz74va4w3cdfrbkzp00wdzrrrzifx7lcmxrqzv"; depends=[EMCluster fftw MASS Matrix MixSim RColorBrewer]; };
   MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; };
   MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; };
   MlBayesOpt = derive2 { name="MlBayesOpt"; version="0.3.3"; sha256="0aazcf94gckgxd51r21hv3msa18br5xcq8xp03w448di546qzbnn"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; };
+  MmgraphR = derive2 { name="MmgraphR"; version="0.2"; sha256="0al65hsqpak44w5zvdzhyh6l1q981lzyvx37hbcy0z0qn3vz16kn"; depends=[colorspace march TraMineR]; };
   MoEClust = derive2 { name="MoEClust"; version="1.1.0"; sha256="1442x2ajiib1fgj6bc3zlqy9q3bjnhnn29f7fjin99lq7c5r132p"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
   MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; };
   MoTBFs = derive2 { name="MoTBFs"; version="1.0"; sha256="09ymfgw6psc1y0dczvsrsw5cki58wn0d8vj56ydfylrxn24g3jfq"; depends=[bnlearn lpSolve quadprog]; };
   Mobilize = derive2 { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
-  Modalclust = derive2 { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; };
   Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
-  Modeler = derive2 { name="Modeler"; version="3.4.2"; sha256="0zf3z3y4w1jixmcbhkgrjh4dx7x3bfi66hrbzsxyfp7abk0p2d6l"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
+  Modeler = derive2 { name="Modeler"; version="3.4.3"; sha256="1k2zwky0i15kypa9mdqc51qipah6pf1zgkrb6xc76xsavjyacfjm"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
   MomTrunc = derive2 { name="MomTrunc"; version="1.41"; sha256="0az499xzvnczqnbh4g3h5jyz8isq0zdw0x654haac6v6045f5xav"; depends=[matrixcalc mvtnorm]; };
   Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
@@ -2207,32 +2213,29 @@ in with self; {
   MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.3-9"; sha256="130hv05fwsskk1bvr7fk8bmafq26vimkfgssjdk3zaz0hm3pxrp4"; depends=[quadprog]; };
   MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.5"; sha256="0a62wq448kq10mf1nhdr0nybzzz7d63nxakggpzmkzz4fz0l67bd"; depends=[abind codetools reshape rlecuyer snow snowfall]; };
-  Morpho = derive2 { name="Morpho"; version="2.5.1"; sha256="1cxxsg7j0fq9drxkl6xlaw7j2cajzx9khcs9f3mb9l2ixd42hqnp"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
+  Morpho = derive2 { name="Morpho"; version="2.6"; sha256="11v0lv1mfyp252y20jxlr9bym3rh8mcr2v25qhvq1133jr420lyd"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
-  MortCast = derive2 { name="MortCast"; version="1.1-1"; sha256="077kk08pckm07rh7vxiw8whiyc4fbsj3qihih6mg09slaq8zr825"; depends=[wpp2017]; };
-  MortHump = derive2 { name="MortHump"; version="0.2"; sha256="1yhrdcwqf27v22mrysh51m3jcrnf74x21x7db25nic8q8fdmchj2"; depends=[demography HMDHFDplus Matrix minpack_lm MortalitySmooth RColorBrewer svcm WeightedCluster]; };
-  MortalityLaws = derive2 { name="MortalityLaws"; version="1.3.0"; sha256="1db4p7kl3kh3kdzqbbvyj3zxv6pz0jnc9fl7j2590ajwd5m9crg4"; depends=[minpack_lm pbapply RCurl]; };
+  MortCast = derive2 { name="MortCast"; version="1.2-0"; sha256="1lmkqywcb3acfmbknxpl62n87rv4qz7hq2kyl98x8l62w6swabr6"; depends=[wpp2017]; };
+  MortalityLaws = derive2 { name="MortalityLaws"; version="1.4.0"; sha256="1440fhwhmg72q7nv3cpnb658vhlkz586i17h82jjwr4v63almq8m"; depends=[minpack_lm pbapply RCurl]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
   MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; };
   MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; };
   MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-2"; sha256="0hy6g0fgidjpz7mn1qwwdnhyxjm0v2g9r3fl32zmkvix3852qx1r"; depends=[boot coda digest ggplot2 gsubfn lattice pander plyr texreg xtable]; };
-  Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
   MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; };
+  MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
   MuMIn = derive2 { name="MuMIn"; version="1.40.4"; sha256="1xw7b74qg0ivgk3l1krjn2wrl969c41hr0y2nk0z8fw94xcfggyr"; depends=[Matrix]; };
   MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; };
   MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; };
   MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; };
   MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
-  MultNonParam = derive2 { name="MultNonParam"; version="1.2.5"; sha256="12jfpqs77qxzy7vj6adx9im3qmzqvgwk4bnxmr26k3z48css242l"; depends=[]; };
-  MultiABEL = derive2 { name="MultiABEL"; version="1.1-6"; sha256="09lwpfpa2x812m7hmy7dxsz4ysv486xfk08r7ag8lbw3ym034vvl"; depends=[data_table svMisc]; };
+  MultNonParam = derive2 { name="MultNonParam"; version="1.2.6"; sha256="1w9kp7qswz38r2xfi8sc52kc52c8hi2jzjsh8gj4491ds1lilv0r"; depends=[]; };
   MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; };
   MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
   MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; };
   MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; };
   MultiMeta = derive2 { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; };
   MultiOrd = derive2 { name="MultiOrd"; version="2.3"; sha256="157bsd5x3cw2yyv5y1hccpn7v42lqf99w09m6kdm0rxnhgjm8k1v"; depends=[corpcor Matrix mvtnorm psych]; };
-  MultiPhen = derive2 { name="MultiPhen"; version="2.0.2"; sha256="095avrxxi5q5nwi5kd6drz9az5fjq668my7z658mjdf3fl58csjm"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; };
   MultiRNG = derive2 { name="MultiRNG"; version="1.1"; sha256="1kljkxwl0ym0dzvhvj2jqkp8077wdgkcqfi3m4zrjcxdblzjmm00"; depends=[]; };
   MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; };
   MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
@@ -2241,8 +2244,8 @@ in with self; {
   MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.2"; sha256="07qdi43bg03xyr99361c0565m1i5kzqjbvlc2npnyjyc2ygr386d"; depends=[glmnet Matrix tidyverse]; };
   MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
   MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.1.0"; sha256="1g6yqp53dbd96jcjgmif39zb3a7f9zil10dhqi3vz3qv6r2vsnkj"; depends=[foreach MASS]; };
-  MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.17"; sha256="0s67w8ifd7g231aqq0qdia13kyb1cczhxrigsgrw48pqcfkv9208"; depends=[lpSolveAPI]; };
-  MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.1"; sha256="0x13q2kckw7c7bl35vdxyhhr7ij62wf0qbkxa40fi6aq2gjh89m6"; depends=[lme4 Matrix statmod]; };
+  MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.18"; sha256="1d7cqa44yayyhwkl5wkp68b7vxakfnlwkprs811z8c2fmfm8vk5r"; depends=[lpSolveAPI]; };
+  MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.2"; sha256="1z9nh8iywlsjsrrmpm6h8hcnaqvh93dldn5rhp4wnj3c7db8qscy"; depends=[ggplot2 lme4 MASS psych statmod]; };
   MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.5"; sha256="0mww4x1hqraiyvmw2f9s6h180kplmj36hb7zfg7xlkmgdf4apk8d"; depends=[bootstrap Rcpp]; };
   MvBinary = derive2 { name="MvBinary"; version="1.1"; sha256="1lrrxvphxv4gmlazx67q4bck9373nqylqgkwcjzwb52291a3zyiv"; depends=[mgcv]; };
   My_stepwise = derive2 { name="My.stepwise"; version="0.1.0"; sha256="10wka6kzk8krwdsyjfnn78dfqflq4zg3vjkk0i2ywjm5vap6aqa5"; depends=[car lmtest survival]; };
@@ -2250,11 +2253,12 @@ in with self; {
   Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; };
   NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; };
   NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
-  NAM = derive2 { name="NAM"; version="1.5.5"; sha256="1g3jvqvzs0wmy1phz25irfb5xh4274cdwcjm5dxmqnjdh30d31n3"; depends=[randomForest Rcpp]; };
+  NAM = derive2 { name="NAM"; version="1.6.1"; sha256="1cyi5vc2ppwfd7bixm21cyy4z9alcx2dz316zgwnc5n3jy0wdb81"; depends=[randomForest Rcpp]; };
   NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
   NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
   NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; };
   NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; };
+  NBLDA = derive2 { name="NBLDA"; version="0.99.0"; sha256="1fd6f43yhwvdb81r0b9hpmna5bphhqcgwiwjkpdyqz4h9cdmsj21"; depends=[ggplot2 sSeq]; };
   NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; };
   NCA = derive2 { name="NCA"; version="2.0"; sha256="08951mmmpziljclwzmbni1s5a62wr9s80iyfsr07gkdz4sx3cvqf"; depends=[gplots KernSmooth quantreg sfa]; };
   NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; };
@@ -2264,6 +2268,7 @@ in with self; {
   NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
   NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; };
   NFP = derive2 { name="NFP"; version="0.99.2"; sha256="1wnllzlww8257sbrgvfyvd21qvhf7j17mcpf6d4p6binaw8svnsb"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; };
+  NFWdist = derive2 { name="NFWdist"; version="0.1.0"; sha256="0833lg0pd763awrc6ibidwf2ldl79w9lmm5acq4bnpd2hzsx60l8"; depends=[]; };
   NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
   NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
   NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
@@ -2273,6 +2278,7 @@ in with self; {
   NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
+  NITPicker = derive2 { name="NITPicker"; version="1.0.0"; sha256="0dls638mjkl8qnfx6gnzfa2ba8w6wcnq7np8lmvp9kw7fkqxnslb"; depends=[fda fda_usc fdasrvf]; };
   NLMR = derive2 { name="NLMR"; version="0.3.0"; sha256="0cqs48jy9ydivjpmx76dyxxdhh3lww7qrmx5s8jcsxxxnn93lq8m"; depends=[checkmate dplyr fasterize purrr RandomFields raster sf spatstat tibble]; };
   NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; };
@@ -2280,10 +2286,10 @@ in with self; {
   NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
   NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; };
-  NMOF = derive2 { name="NMOF"; version="1.2-2"; sha256="03286pp57m7imbgw334r34yg7c5zbaw3d1qxr0sbhmc2jxvv1arm"; depends=[]; };
-  NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; };
+  NMOF = derive2 { name="NMOF"; version="1.4-3"; sha256="1anq2q8a7gyghrnlrkk7k4njpxfnr2944ksyqx8nk8bqhp1k8fcr"; depends=[]; };
+  NNLM = derive2 { name="NNLM"; version="0.4.2"; sha256="18hk476mnd89pzrxb65hg20j6cyk2l4l95ksf7vh73fwpxr1dz4q"; depends=[Rcpp RcppArmadillo RcppProgress]; };
   NNMIS = derive2 { name="NNMIS"; version="1.0.0"; sha256="02k766klw2fssiii5f4291qvs144ab9i5b6pmqvhyr87zdb87nf9"; depends=[survival]; };
-  NNS = derive2 { name="NNS"; version="0.3.8.6"; sha256="0dfnqy2i306vvqah40p3mj7yyxr9gxrgw8555p6shjiwhqp8rdaq"; depends=[data_table rgl stringr]; };
+  NNS = derive2 { name="NNS"; version="0.3.8.7"; sha256="0fbqnkhg4dq2ld5l48b3l5aaa7zl4wrkkk7ds6y7a1228xnsaq1g"; depends=[data_table rgl stringr]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
   NOAAWeather = derive2 { name="NOAAWeather"; version="0.1.0"; sha256="077c7z13y2lhjzk2fbb9yfa1ay31dfryxmyg76z7l1a03h20xrvb"; depends=[dplyr ggExtra ggmap ggplot2 gridExtra jsonlite lubridate RCurl scales tcR tidyr]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
@@ -2297,16 +2303,15 @@ in with self; {
   NPHMC = derive2 { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[smcure survival]; };
   NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; };
   NPMOD = derive2 { name="NPMOD"; version="0.1.0"; sha256="1m3rfgyxdbyr0m5vznav5qk70ch45wz3dc8wccxjcxrcfkn8i18k"; depends=[BSDA clinfun gWidgets nortest pspearman readxl rlang RVAideMemoire]; };
-  NPMPM = derive2 { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
   NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
   NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; };
-  NSM3 = derive2 { name="NSM3"; version="1.11"; sha256="0lnmzpmh3i4lh5lfba6rhacf4zadbcrs7ify354h5245j0gxp1bv"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
+  NSM3 = derive2 { name="NSM3"; version="1.12"; sha256="0spkzx2zm8q85h7ij9r52bsqlwgw2fsc7zw3aaz8644q0xlnjnvj"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.2.0"; sha256="04mn9lh4cl1hkz27z7ldqnfwmrvqi7m1zrvscpywdcilpjmcryv0"; depends=[]; };
-  NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.1"; sha256="1grz2yxrklqglw9027c8k01jnb42p453fcd38arw4wd85y5hbam4"; depends=[snowfall]; };
+  NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; };
   NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; };
   NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; };
   NatureSounds = derive2 { name="NatureSounds"; version="1.0.0"; sha256="1gx0h0z3zc373l0mxcigc25s41l3yiylzsrir5k4rrr2bvzgf8ir"; depends=[]; };
@@ -2319,49 +2324,50 @@ in with self; {
   NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
   NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
   NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
-  NetLogoR = derive2 { name="NetLogoR"; version="0.3.2"; sha256="1dqskma7iw178sy6gz0gr00zg84jgh95dv8w3hwz1wxsqpbpf1sb"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; };
-  NetOrigin = derive2 { name="NetOrigin"; version="1.0-2"; sha256="1ldlx4nmc5k756fmbm9vxn9rwzxmad84zpi6318pjr52izms6q2k"; depends=[colorspace Hmisc igraph]; };
+  NetLogoR = derive2 { name="NetLogoR"; version="0.3.3"; sha256="1msln8k3rllsb414c35pw90bral039vijjrfhd7xzk9267jcv7vk"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; };
+  NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; };
   NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; };
-  NetRep = derive2 { name="NetRep"; version="1.0.4"; sha256="1a58wxmjhd2jm5n6bl5l2706fbvfvjksfaal65fy04ssw14nziw8"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo ref RhpcBLASctl statmod]; };
-  NetSim = derive2 { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
+  NetRep = derive2 { name="NetRep"; version="1.2.1"; sha256="0adlnq22nslp8ildbrf0z26783kzgz4cyn45a981qyjbw4c42hin"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
   NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; };
   NetworkChange = derive2 { name="NetworkChange"; version="0.3"; sha256="1brpa6fhmrgafmk1iw19g0pppwxi0ld0nyhx9c0fgnkn9m82isjk"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; };
   NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; };
   NetworkDistance = derive2 { name="NetworkDistance"; version="0.1.0"; sha256="0k11crn1wiisw4qrc2yidrhdvscx59skqy4ckxdiykpb1jh5a7s4"; depends=[doParallel foreach igraph Matrix network Rcpp RcppArmadillo Rdpack RSpectra]; };
   NetworkExtinction = derive2 { name="NetworkExtinction"; version="0.1.0"; sha256="1scza639kf3zzz2yd9q31wsvxpvpq8hbx82a206jkxlxb4dq6vxr"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; };
-  NetworkInference = derive2 { name="NetworkInference"; version="1.1.2"; sha256="0lydfkpgsi842fbapnggpngarvqc8arhy4qn13x47myk1mmkkisj"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
-  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.1.1"; sha256="19gn50f96nnccgv68vp6850pjdcl433lmppshc2imcjw4hn45fra"; depends=[corpcor corrplot doSNOW fdrtool foreach graph hypergeo igraph MASS Matrix ppcor psych pwr qgraph R_matlab RBGL RColorBrewer]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.1.2"; sha256="1wgiwbackqwdis1mw3nyrv3wgi8c8s49cl16f8l46yn7763nkskf"; depends=[corrplot doSNOW fdrtool foreach igraph IsingFit MASS Matrix ppcor psych pwr qgraph R_matlab]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.1"; sha256="1dsjv0vm45skw74x1fz3gd7g6p52ayfwz85bh92j29mfxbnacbnn"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
-  Nippon = derive2 { name="Nippon"; version="0.6.5"; sha256="187jzqsabg0vfvipbaig6nsdwclk5p3hgkvg0yid2ip8qc5qcmdw"; depends=[maptools sf sp stringr]; };
-  NipponMap = derive2 { name="NipponMap"; version="0.1"; sha256="09cvzw32f0kwlwvrv7r6cx2x2jkc2wv843aip8r3iziixmcy7vxq"; depends=[sf tibble]; };
+  Nippon = derive2 { name="Nippon"; version="0.7.1"; sha256="1nw0kaqw5my2bx7i82q4j2qlsmc95kgjnbm9r9np3swhq6wizrmq"; depends=[stringr]; };
+  NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; };
   NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; };
   NlinTS = derive2 { name="NlinTS"; version="1.3.2"; sha256="1isr6ci6dsbbx804y3hc8aqvhggfs7ix5yiz32dby69i85b6lj5a"; depends=[Rcpp Rdpack timeSeries]; };
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
-  NonCompart = derive2 { name="NonCompart"; version="0.4.1"; sha256="0a701lx83vf79pvym2igg2wbkhnx0jykfiglwhic4hvl1lw0f4g2"; depends=[]; };
+  NonCompart = derive2 { name="NonCompart"; version="0.4.3"; sha256="14wvr17p0dza11p97vmjcn27l73vmw5ms3gbrgxcxm33ybwya63n"; depends=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
   Nonpareil = derive2 { name="Nonpareil"; version="3.3.1"; sha256="0ldl90h499wwm992cj71phf3ryqvjnq0ygarcxf7h85krr4j3sx2"; depends=[]; };
   NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; };
-  NormPsy = derive2 { name="NormPsy"; version="1.0.7"; sha256="1v6jlbxiapkygivx5vv4ravs86n94qxlmj4q940jjfbbk24bssdc"; depends=[lcmm]; };
+  NormPsy = derive2 { name="NormPsy"; version="1.0.8"; sha256="13w4xjdjjg9mzmfaflc0gp306kazyvxshpj4vnl6gym3vpi9qax8"; depends=[lcmm]; };
   NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; };
   NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
   Numero = derive2 { name="Numero"; version="1.0.3"; sha256="1jj269b5cw7w4bgp6qvh0b3kpj32fjpsb2nbhyhjlkf7m03gnwwv"; depends=[Rcpp]; };
+  NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; };
   OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; };
   OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; };
   OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; };
-  OBsMD = derive2 { name="OBsMD"; version="2.1"; sha256="1w5d23m3nzswin803icw9vsafqcis2lkzr5bnhaa3bl5dq1xn5q5"; depends=[]; };
+  OBsMD = derive2 { name="OBsMD"; version="3.0"; sha256="1swjmcg9zl374x14qj03km4pi6xil79h0v55jxyx0pq210dvipzn"; depends=[]; };
   OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; };
   ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
+  ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.1"; sha256="0j6kw32hq9gfiwmyh4zxx7ibfxplhass7q309y8r656lkhvr9nin"; depends=[checkmate deSolve]; };
+  ODEsensitivity = derive2 { name="ODEsensitivity"; version="1.1.1"; sha256="06s561450fimn1fvky56nvz9j0nzmbh1hm5x9p1zygsxvzgrks36"; depends=[checkmate deSolve ODEnetwork sensitivity]; };
   OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; };
-  OECD = derive2 { name="OECD"; version="0.2.2"; sha256="07flhhca7734fffcqvxjl1hlhbbhn6lch868rlpps0r99jxy8m5q"; depends=[httr rsdmx xml2]; };
+  OECD = derive2 { name="OECD"; version="0.2.3.999"; sha256="02bldn2c5cnjx171ckqrrb06v50m7zps20sb6k1crmx550vmgajc"; depends=[httr rsdmx xml2]; };
   OGI = derive2 { name="OGI"; version="1.0.0"; sha256="0qw55jamkvdf3vfa5c0ygbymbs4d9q15dihiqz691hdfnyjvc2mk"; depends=[lpSolve]; };
   OHPL = derive2 { name="OHPL"; version="1.3"; sha256="0hm229nyv96s3sjljn5rwh89g1n6wsf24qm3ll5ccb0q2pcwnd7r"; depends=[glmnet mvtnorm pls]; };
   OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
@@ -2383,10 +2389,11 @@ in with self; {
   OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; };
   OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; };
   OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; };
-  OTUtable = derive2 { name="OTUtable"; version="1.1.1"; sha256="0mjjfndc67gzkqskcq4sxpr8fwx3lm3wjgapgg64rbj5x4i1w4rp"; depends=[]; };
+  OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; };
   OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; };
   Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; };
   OasisR = derive2 { name="OasisR"; version="3.0.0"; sha256="0dk8asv5v0qiqqf45r3hhh67sa03qdkpgsss649mp2pxzm8chv1y"; depends=[measurements outliers rgdal rgeos seg spdep]; };
+  Observation = derive2 { name="Observation"; version="0.2.0"; sha256="0v81manzcvv8x9hbf75c8klslzdabha53rasyba91vvcbrshhq6j"; depends=[AGread svDialogs]; };
   OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; };
   Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; };
   Ohmage = derive2 { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
@@ -2399,14 +2406,14 @@ in with self; {
   OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; };
   OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; };
   OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
-  OpVaR = derive2 { name="OpVaR"; version="1.0"; sha256="03bl7z78zgjmpc0mpmcq98zfscj3jja1fiwzx58rw5yk0dhqrhm8"; depends=[actuar evmix goftest MASS ReIns tea truncnorm vcd VineCopula]; };
+  OpVaR = derive2 { name="OpVaR"; version="1.0.5"; sha256="14kq95i8n0g1wy3s32llw3803qzkxlyz9307clc1bwzi0wp22x5f"; depends=[actuar evmix goftest MASS pracma ReIns tea truncnorm vcd VineCopula]; };
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
   OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
   OpenImageR = derive2 { name="OpenImageR"; version="1.0.8"; sha256="1j7p1wrzznrisbzw8j1qsxyyv3zr5hk6q9yxw97y6lrfh3c26ig1"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
   OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.9.6"; sha256="0141q6rwppwab426fn65vcnj06nivibl11aqi8dp32rcxgi5s9y8"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
-  OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.9.9"; sha256="02p125r83r63zjysd94s1wvmxp1gh38dpqs3r8ly5qzdx5jzk5yf"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
   OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; };
@@ -2419,14 +2426,15 @@ in with self; {
   OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; };
   OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; };
   OptionPricing = derive2 { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; };
+  Orcs = derive2 { name="Orcs"; version="1.0.0"; sha256="0bkd5mfb6jmn5iwrcjmbxxp81ncdr5h5ii7im2ryai2205pmcqsa"; depends=[bookdown devtools knitr lattice latticeExtra plotrix raster Rcpp rgdal sf sp]; };
   OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; };
-  OrdLogReg = derive2 { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; };
   OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
   OrdNor = derive2 { name="OrdNor"; version="2.1"; sha256="1s3lhkscr4w36qjq02qlb3pw37naq0k99khr9648qzshhzsfxibl"; depends=[corpcor GenOrd Matrix mvtnorm]; };
   OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; };
   OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.5-3"; sha256="1dx9d8rb1dfqyhyc26zhfnxiv3rz2ikvs2mwqnsrq3lsjs9dvyc8"; depends=[]; };
   OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; };
   OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-0"; sha256="1g78abh9i3x0g34vjqz2ic9330rbgn8k0hgdcrznxgsfnlgnpx9x"; depends=[MASS]; };
+  OscillatorGenerator = derive2 { name="OscillatorGenerator"; version="0.1.0"; sha256="0zqw8l955msxkdviw5vd493749zwc22qby9mfmyqnqqmq0pyjw4w"; depends=[]; };
   OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-16"; sha256="1ffqfr1pwlf53ahbh01ygv3d2d8fl47k9kk61l2h0g4h601swadi"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
   OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; };
   OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; };
@@ -2436,41 +2444,40 @@ in with self; {
   P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
   PAC = derive2 { name="PAC"; version="1.0.10"; sha256="0cr34vjd6dr5jkbv1hhd7ln35ih8h62fmz2q8h2plbxaww88zcjf"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
-  PAFit = derive2 { name="PAFit"; version="1.0.0.3"; sha256="0s9zxr9368cf6skskqb2q67jkynzm4s3qp07i0m1zrmn9142hw9z"; depends=[igraph magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
+  PAFit = derive2 { name="PAFit"; version="1.0.0.4"; sha256="178hxn376q911kc6nsbkbgi7s26nhw5clzv7iiq6c7ns6dg7npr7"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
   PANICr = derive2 { name="PANICr"; version="1.0.0"; sha256="167s1p7y8mmhcdnng0s5i09kjfh088jhmxs74rkyda52l9hyx363"; depends=[coda MCMCpack xts]; };
   PARSE = derive2 { name="PARSE"; version="0.1.0"; sha256="0y408va1rfn3j8cb1i0k8kypyg9mb6yfj513l54f23z31d3bi45m"; depends=[doParallel foreach gplots mvtnorm]; };
-  PAS = derive2 { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; };
+  PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; };
   PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; };
   PASWR2 = derive2 { name="PASWR2"; version="1.0.2"; sha256="04vwgmi56spjriwp2ls5zcgslfg1y4pvwa0m33f9izay0y6q2wfx"; depends=[e1071 ggplot2 lattice]; };
   PASenseWear = derive2 { name="PASenseWear"; version="1.0"; sha256="0x84j1vdds4g08birmjxb0c2g1ahwv83bk11532jkmg32dnhmj58"; depends=[ggplot2]; };
   PATHChange = derive2 { name="PATHChange"; version="1.0"; sha256="1pmxhaych01cywx9bb5z0p5lbxcma7x6nlprivpx3gnpg7m9srpg"; depends=[rlist stringr VennDiagram]; };
   PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; };
-  PAactivPAL = derive2 { name="PAactivPAL"; version="2.0"; sha256="1mjfxq0a9fql8bg5c6l5w1knjqq29cb4l10ppxnym9gnsjrk0kw1"; depends=[]; };
   PAmeasures = derive2 { name="PAmeasures"; version="0.1.0"; sha256="0c2pkms06lijly9clxp6zkasqy4zjicdwnvbqwvhp45yavwmkkkj"; depends=[survival]; };
   PBD = derive2 { name="PBD"; version="1.4"; sha256="1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb"; depends=[ade4 ape DDD deSolve phytools]; };
   PBIBD = derive2 { name="PBIBD"; version="1.3"; sha256="0zh73bsiwmsqw1vhs2dazndsf0894kfv3vfv88wr4fnh7njysz6r"; depends=[]; };
   PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; };
-  PBNPA = derive2 { name="PBNPA"; version="0.0.2"; sha256="1qyjksm2z1p279aimb3zaaaj4328m5p0cbkqm3qzl87yp5g45vyq"; depends=[metaRNASeq]; };
+  PBNPA = derive2 { name="PBNPA"; version="0.0.3"; sha256="1wmgcmspilfv6pjy7696j2xmq8m41p27plnr1qr0fnzyz66pf37m"; depends=[metaRNASeq]; };
   PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
   PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.2"; sha256="12pl95mcak88524s8zvk9dzib2g40fwaz6iz7igx9wg6vib9d1sj"; depends=[]; };
-  PBSmapping = derive2 { name="PBSmapping"; version="2.70.4"; sha256="09kzydgghgmhnna24gpq1hjgw7w9i1lm6nwkj358jsik6fjph73r"; depends=[]; };
+  PBSmapping = derive2 { name="PBSmapping"; version="2.70.5"; sha256="15h28lb0zriaf4020l3a069plrklbvbg5x231r5fqflshj6v8a9f"; depends=[]; };
   PBSmodelling = derive2 { name="PBSmodelling"; version="2.68.6"; sha256="1d5shqvzfyi0fy03wcib2db497nsdw211ahfcvl1kaady1immz2w"; depends=[XML]; };
   PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; };
   PCA4you = derive2 { name="PCA4you"; version="1.2.4"; sha256="117wb0h4jqjymm1p90m6vgj713iavrmj035c2gz5nynligvfnm83"; depends=[mixOmics]; };
   PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; };
   PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; };
   PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; };
-  PCDimension = derive2 { name="PCDimension"; version="1.1.8"; sha256="1359cmswynv9xqbfb60kh32ifm9wgm20iplkdfzf5v2c4vxd0rmf"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; };
+  PCDimension = derive2 { name="PCDimension"; version="1.1.9"; sha256="1i9ay632ssq0xw58clh48dlqq429252dy0czg1qpkvsvb7dvab9c"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; };
   PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; };
   PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
   PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; };
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
   PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; };
-  PCPS = derive2 { name="PCPS"; version="1.0.5"; sha256="1v5173zskkyc79b68a3x0b1harq5xp4igisf94ajgqqmkpf61qcp"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; };
-  PCRedux = derive2 { name="PCRedux"; version="0.2.5-1"; sha256="1p5qmz09ajbm1iypyz5rn9bwzbbx57gc6a0xzrm900dw2r2cf7ph"; depends=[bcp changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR robustbase testthat visdat zoo]; };
+  PCPS = derive2 { name="PCPS"; version="1.0.6"; sha256="0mihkivlpycqbzc3z8clsmiqg3c6hqnapk29h794lf99had03hp8"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; };
+  PCRedux = derive2 { name="PCRedux"; version="0.2.6-1"; sha256="0pirra4fx2s4ks34ng7fc2vjcmzym3ffpld901glf8hppycsgf6c"; depends=[bcp caret changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR randomForest robustbase testthat visdat zoo]; };
   PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; };
   PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; };
   PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; };
@@ -2481,7 +2488,7 @@ in with self; {
   PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; };
   PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; };
   PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
-  PET = derive2 { name="PET"; version="0.5.0"; sha256="0k26lfkb58sdqy5b5kd7dkd7nzhxqh1b8pxyx2bdl0lx50sn94jc"; depends=[adimpro]; };
+  PET = derive2 { name="PET"; version="0.5.1"; sha256="1gdq7ai8hgl9h53b72j7sfk09l7yr2b84pdy9bl1z3x8zxbsp8br"; depends=[adimpro]; };
   PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; };
   PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; };
   PGRdup = derive2 { name="PGRdup"; version="0.2.3.3"; sha256="1s0v44922zpxl3w9kzn9xzvs5jldg35gjrnlf89f89i3rs59gg98"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
@@ -2490,24 +2497,25 @@ in with self; {
   PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; };
   PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; };
   PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; };
-  PINSPlus = derive2 { name="PINSPlus"; version="1.0.0"; sha256="1vyn6hz4b0gzpvs6m0lbs09vv8531z74vkm2ss1244gn991p7iif"; depends=[cluster doParallel entropy foreach pbmcapply]; };
+  PINSPlus = derive2 { name="PINSPlus"; version="1.0.1"; sha256="02yxv1x06p6vr50g4amj4wwjlk04wadic74d1wpkxxg69zpv35lz"; depends=[cluster doParallel entropy foreach pbmcapply]; };
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; };
-  PKNCA = derive2 { name="PKNCA"; version="0.8.4"; sha256="013b4d74virwjpxq20m566ya85q31aq6bdgk5fpjrwh5ja6805ka"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; };
+  PKNCA = derive2 { name="PKNCA"; version="0.8.5"; sha256="0lklg2w1rcas70rj72q390n6lkxq557731a90b7plh2g32xsp32k"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; };
   PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
   PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
-  PLMIX = derive2 { name="PLMIX"; version="2.0"; sha256="1dvlzv3hajdj3cc83kkna7igzppy88dwppap12zaxnh2afwpvv7k"; depends=[abind foreach gtools label_switching MCMCpack rcdd Rcpp]; };
+  PLMIX = derive2 { name="PLMIX"; version="2.0.1"; sha256="1m1v745v5gd5npxl5cz3dqm2839wyl5j8qx6d66nnqbqj6ywg15v"; depends=[abind foreach gtools label_switching MCMCpack rcdd Rcpp]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
-  PLmixed = derive2 { name="PLmixed"; version="0.1.2"; sha256="1pi4ivw090lbg983d8wymhk0i97jrzi1nrkrrz3llnafadysh4rh"; depends=[lme4 Matrix numDeriv]; };
-  PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; };
-  PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; };
-  PMCMR = derive2 { name="PMCMR"; version="4.2"; sha256="1dqfn68034xkik4xfl8mlqsh7x427f7cwna5axj8gvjcj9l48x8c"; depends=[]; };
-  PMCMRplus = derive2 { name="PMCMRplus"; version="1.0.0"; sha256="11sliznixsrrlr0y365hxpg64jfva8l1ilrnkdd32ddy8713sin7"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
+  PLmixed = derive2 { name="PLmixed"; version="0.1.3"; sha256="0n2d7mzviwlw2d1mk3rwhcac170khgfsdivwysqxji2qwgdhgl32"; depends=[lme4 Matrix numDeriv]; };
+  PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; };
+  PMA = derive2 { name="PMA"; version="1.0.11"; sha256="1v8h66l602zd74mw73ygsy667nqg8p0k0wqhbsjl1imafl207s5d"; depends=[impute]; };
+  PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; };
+  PMCMRplus = derive2 { name="PMCMRplus"; version="1.2.0"; sha256="13gn16k6gg7fv9rjx5bf6q3zfx3499s52m5k59n053nr4i5d8215"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
+  PMmisc = derive2 { name="PMmisc"; version="0.1.0"; sha256="12nw64x88cb1amqgdpcdmkiwcg3vs3kdlxlz0kw7frwgaw3l0l06"; depends=[robust]; };
   PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.1.1"; sha256="038xylgq3mp1nl5rf11swprv08khvzfw0jg5bmd0yvqmygr082jq"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; };
   POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; };
   POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; };
@@ -2516,44 +2524,46 @@ in with self; {
   PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; };
   PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
   PPCI = derive2 { name="PPCI"; version="0.1.2"; sha256="1k6kbln0h1wkzg594k1db6r3nk5dqwhg8gm1hgval05dsdhp8j8b"; depends=[rARPACK]; };
-  PPRL = derive2 { name="PPRL"; version="0.3.5"; sha256="1j8qfa6ipk9x6w7g5y0lz14cf72s2zpkrp5gk2qbvx1pm3w1zyh6"; depends=[Rcpp settings]; };
-  PPforest = derive2 { name="PPforest"; version="0.1.0"; sha256="1s0g8icyx30sih2xbdihp9xbmygfgd1hs642qdl5559fqshylbzs"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
+  PPQplan = derive2 { name="PPQplan"; version="0.1.0"; sha256="06v4agq8bd3ssbfnl1jyfzy5xi4jwj6wqfmj9qalrv9kllh839mv"; depends=[ggplot2 plotly tolerance]; };
+  PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
+  PQLseq = derive2 { name="PQLseq"; version="1.0"; sha256="1r4zxwb3rw7k9jixv1wqkgdq5zjlwf85xrc0np8j96k1gdwals72"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
   PRIMME = derive2 { name="PRIMME"; version="2.2-0"; sha256="1iwwh871v87fz6j6q9nvfiq8x8nz2v87n52l80a15d5rvvxv2rbi"; depends=[Matrix Rcpp]; };
   PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.5"; sha256="12wfb4p8ra1b8xwq42350cxl2fy9gsrp5m7inyxnh31vplgripy9"; depends=[glmnet Hmisc quantreg superpc survival]; };
-  PRISMA = derive2 { name="PRISMA"; version="0.2-6"; sha256="1yzcx4js0xaxp1mp7ginhfz8jji49rkw3x15a9mlmpz260gkfs98"; depends=[ggplot2 gplots Matrix]; };
+  PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; };
+  PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; };
   PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; };
-  PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
   PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; };
   PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; };
-  PRROC = derive2 { name="PRROC"; version="1.3"; sha256="03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc"; depends=[]; };
-  PReMiuM = derive2 { name="PReMiuM"; version="3.1.7"; sha256="1l2ibwn5z647dwhrjzgrz3qqzdbkqk3zrpn95hy4ysa32pdz300n"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
+  PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; };
+  PReMiuM = derive2 { name="PReMiuM"; version="3.2.0"; sha256="0aib10kalc8y1vdkbd8ipdkg9wyb984pwf979fm8d6jjbdhp0sa7"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
   PResiduals = derive2 { name="PResiduals"; version="0.2-5"; sha256="05jk543lv8isbxv24cbzqh80l6xs05lx2k9xzz7s0121vb2yd3v4"; depends=[Formula MASS rms SparseM]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
-  PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
+  PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
   PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; };
   PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; };
   PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; };
-  PSM = derive2 { name="PSM"; version="0.8-11"; sha256="1p1a8k0c44z75vsh55yni5gxmw6znxw4x1mjbgwj59y1k3pf2aiv"; depends=[deSolve MASS numDeriv ucminf]; };
-  PSPManalysis = derive2 { name="PSPManalysis"; version="0.1.1"; sha256="1mbgfblxflk12vr8y70a6avzjz9jh2m0wkmnzg0njgcwaqwvhlpm"; depends=[devtools]; };
+  PSM = derive2 { name="PSM"; version="0.8-12"; sha256="0h83b7bhslgnrq4442464i9iil6gjhw3pwxvgz5313pfk2km30vg"; depends=[deSolve MASS numDeriv ucminf]; };
+  PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.0"; sha256="0vya2zlsmgf6zmkk9k9aaaqkx7qprknl0wazqlqd7zdp8z0zj39j"; depends=[devtools]; };
   PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; };
-  PSTR = derive2 { name="PSTR"; version="1.1.0"; sha256="1wzbwll5c2qsvngzqycg2zk6dghbr45mk8chj6kzzppmkk7vzj47"; depends=[ggplot2 snowfall tibble]; };
+  PSTR = derive2 { name="PSTR"; version="1.2.1"; sha256="0vydm3s7m6fkwfnrfs29hwq7z5zfhrxx1ryvr3wrw1481ir29nc2"; depends=[ggplot2 magrittr plotly snowfall tibble]; };
   PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; };
   PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.6"; sha256="0y2zqvm2d9minpc22ndq6mar3brbv9k6s1apl19zwpc8h5g3jx5l"; depends=[doParallel foreach survival]; };
   PTXQC = derive2 { name="PTXQC"; version="0.92.3"; sha256="1spkbjji36s2dlhm5b8svpnjmana2jy1ppa0pfgjg7rpsp3369xq"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
-  PUlasso = derive2 { name="PUlasso"; version="3.1"; sha256="0cnnv9laga24h01aqkk7kzmmv2x5cgcq5l45w8vj5pvfyhvm4067"; depends=[BH doParallel foreach Matrix Rcpp RcppEigen]; };
+  PUlasso = derive2 { name="PUlasso"; version="3.1.1"; sha256="092dwymmx3msj2wg8lrnnxib2y49g4s3yzy6fhfcl5wl0d2779ws"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; };
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
+  PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
   PWEALL = derive2 { name="PWEALL"; version="1.2.1"; sha256="08a7ih9yyp0dqw89n1qhwbxhgiks91c3wjbaz08b6ck6cv6gzy6k"; depends=[survival]; };
-  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.16"; sha256="015zqbq9wsg0wc1y5s4x8vc7klkfa928xcl23v732vy28j0jf20h"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; };
+  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.20"; sha256="0g15ib0zks6q7swpd9s5zyl3sp83r54959ckvc88wn19bmn8dj9l"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; };
   PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; };
   Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
   PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
-  PairedData = derive2 { name="PairedData"; version="1.1.0"; sha256="1wga7cln8gvbvxycbbd859vq6gyjjvmcqvvzqmqdpwcdjf2j47gz"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
+  PairedData = derive2 { name="PairedData"; version="1.1.1"; sha256="07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
   PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; };
   PakPC2017 = derive2 { name="PakPC2017"; version="1.0.0"; sha256="196jvhv7pv4pvnnz9izk6icxv3aml26mif0w6g4907izyszf8cal"; depends=[dplyr magrittr]; };
   PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; };
@@ -2565,9 +2575,10 @@ in with self; {
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
   ParallelForest = derive2 { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
+  ParallelLogger = derive2 { name="ParallelLogger"; version="1.0.0"; sha256="16mwfylpk7r6cy87vb1d1h8mkwn32cmygpqvy5kk538lj9b8jcdl"; depends=[jsonlite snow XML]; };
   ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
   ParallelTree = derive2 { name="ParallelTree"; version="0.1.2"; sha256="0x99x1iycx8ik8cih972awnxifvmhbrmjrf2csmnn9fw4rsqn0p5"; depends=[ggplot2]; };
-  ParamHelpers = derive2 { name="ParamHelpers"; version="1.10"; sha256="0nzsl3hby4dhnp7rw47zjmdrrfsgp5w1ai9fpw3bgc4k5sk9nql0"; depends=[BBmisc checkmate]; };
+  ParamHelpers = derive2 { name="ParamHelpers"; version="1.11"; sha256="181p2r4zh53v6hjdr8fn7m1g65rl4svql8h1zjz25y1chk0g850n"; depends=[backports BBmisc checkmate fastmatch]; };
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
   PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; };
@@ -2579,7 +2590,7 @@ in with self; {
   PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; };
   PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; };
   PeakSegJoint = derive2 { name="PeakSegJoint"; version="2017.08.11"; sha256="1xp0gxdwsy6z06kbfg5ca2qm0kwva8scxbg22km20cikwpgdi6rm"; depends=[data_table PeakError penaltyLearning]; };
-  PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2017.07.12"; sha256="0bpwm2n2wz707ykgd088zadi5jmixkwxx6822b6l6qw67x85pfyc"; depends=[penaltyLearning]; };
+  PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; };
   Peaks = derive2 { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
   PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; };
   PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
@@ -2588,8 +2599,8 @@ in with self; {
   PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; };
   PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
   PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
-  Peptides = derive2 { name="Peptides"; version="2.3"; sha256="17nbjh06vi4syb0hlg7y646xik4csp3fs6r6z0c676k5sxs33mrd"; depends=[Rcpp]; };
-  PerFit = derive2 { name="PerFit"; version="1.4.1"; sha256="0mzd9yrgsswxlhljlk8nxi0dhy3k4a9jax9w9c9s29j4m7z9jf01"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
+  Peptides = derive2 { name="Peptides"; version="2.4"; sha256="1i5p0z4zhis4p1czwz3cryr64lys4dp2fddnmmasgspl8fyz8p05"; depends=[Rcpp]; };
+  PerFit = derive2 { name="PerFit"; version="1.4.2"; sha256="147f2fbcjb0639h0bmiikli05r3jlbp559hj9v9af3s09l1l6v8y"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; };
   PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
@@ -2597,24 +2608,24 @@ in with self; {
   PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; };
   PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
   PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; };
+  PetfindeR = derive2 { name="PetfindeR"; version="1.1.3"; sha256="1dkiawadfsb8akssnhddd64bn6dq6r95c7j4g3mkbq6fs9106h8x"; depends=[dplyr httr jsonlite plyr]; };
   PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; };
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
   Phase123 = derive2 { name="Phase123"; version="1.5"; sha256="05yvzx0sf6dq47nr5bk1kd2icndf20z39y9fj90zqdm3ay2hi586"; depends=[Rcpp RcppArmadillo survival]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
-  PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.2.0"; sha256="1vnissx2p10w2w435vr2jqw50cs5518l1gpq4pkyyxckcrd300w9"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
+  PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.2.2"; sha256="1mr4jq44ijdiabp3simfjh9zcl9anp1w0dili6w5sq8dzgids8gj"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
   PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; };
-  PhySortR = derive2 { name="PhySortR"; version="1.0.7"; sha256="1xpxkd2bf3xdsfwa0bzkppr6y7p6v7s4iy0x0m8fiwj93n9jh0pz"; depends=[ape phytools]; };
   PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; };
   PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.1.0"; sha256="0ji78zx0gp1nd5assrmwxdkxryfjijnn9g34w2g2qv32s1fdj6ak"; depends=[ape capushe foreach glmnet grplasso LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
   PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; };
-  PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
-  PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.2"; sha256="04l1id872mlgpid746l8dz2wdcjxh79cqw835gsph6ngxg0g8qp6"; depends=[Rcpp RcppArmadillo]; };
+  PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; };
+  PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; };
   Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; };
   PivotalR = derive2 { name="PivotalR"; version="0.1.18.3"; sha256="14l7y57zmfr7h4bq01j83am2plxx320kkhbsh0x2ypif9dni4rf2"; depends=[Matrix]; };
   PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-3"; sha256="1w2ihclnh3x83ip4hh95bchv5j832cqy6n140q5q1dbfz6fy1bxv"; depends=[igraph MASS Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; };
   Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; };
-  PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.6.10"; sha256="1dqc6k7mq9k6g9gndgjm6cf61mgl0liy4qwpzragbhq6lym8hw6w"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
   Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; };
   Plasmode = derive2 { name="Plasmode"; version="0.1.0"; sha256="1qcni9zdckhsnw616jn7rdfd09kbl5wd4hljdja0w73jz1wd1z14"; depends=[arm epiDisplay foreign gbm glm2 lattice latticeExtra lme4 MASS Matrix mgcv nlme nnet RColorBrewer survey survival twang xtable]; };
   PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-1"; sha256="0fdk70vfxgmf2hy6j0djbksi5znvilsi74rrbqd0lfhi841j15qj"; depends=[]; };
@@ -2633,17 +2644,17 @@ in with self; {
   PoloniexR = derive2 { name="PoloniexR"; version="0.0.1"; sha256="1qik272z5lmzv9k1kfr5v0m8sydbdhbrc732n1zpwnqc1spfqb20"; depends=[anytime digest httr jsonlite RApiDatetime xts zoo]; };
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
   PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
-  Polychrome = derive2 { name="Polychrome"; version="1.1.0"; sha256="1a0ifbvkw85sxwc8zjj8hy88avmqyjsfxk2cd16qsp0p9wfn872y"; depends=[colorspace scatterplot3d]; };
-  PolynomF = derive2 { name="PolynomF"; version="1.0-1"; sha256="0sr5v43hp1ydy2230vm3mrg4pnnv7nivhnp3zni9svc8g0bd8z8p"; depends=[]; };
+  Polychrome = derive2 { name="Polychrome"; version="1.1.1"; sha256="100hxrzgyxxnwm2y2f0y740x9qk7dhxnrvya6hyg3kgg0mmr3nq3"; depends=[colorspace scatterplot3d]; };
+  PolynomF = derive2 { name="PolynomF"; version="1.0-2"; sha256="0zczryvjykr7yifb5isvys2mzgi0yj92j3p3xixn2qzzq9cr0h9a"; depends=[]; };
   Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; };
   PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; };
   PopED = derive2 { name="PopED"; version="0.3.2"; sha256="1lvzqpij4dqbw144ya25bhlx96mwaxz932r0bl3jsx1si9ijb8xz"; depends=[codetools dplyr ggplot2 MASS mvtnorm]; };
   PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
   PopGenReport = derive2 { name="PopGenReport"; version="3.0.0"; sha256="0z4g7ll3dk9mgawnn7k0ysgj8w55adivc4zcrr898x399g7vnfx4"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
-  PopGenome = derive2 { name="PopGenome"; version="2.2.4"; sha256="1l0c8p1vpj4zbbgjcnjzdiryfzfl6ad070sp54q83k7iaracmqzd"; depends=[ff]; };
+  PopGenome = derive2 { name="PopGenome"; version="2.6.1"; sha256="074vfyfhlqnc38jb0shwp5a4ikvb4jflfghmg88h3a2za3nj4abs"; depends=[ff]; };
   PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
   PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; };
-  PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
+  PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.1.0"; sha256="1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff"; depends=[foreach PerformanceAnalytics xts zoo]; };
   PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; };
   PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; };
   PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.0.3"; sha256="1s9msqjxqxqafhncc3hi5prhzl5cj0incd5rc9fxc23l5l4n9xjx"; depends=[Rglpk]; };
@@ -2652,19 +2663,20 @@ in with self; {
   Power2Stage = derive2 { name="Power2Stage"; version="0.5-1"; sha256="155w5yp0pdq4g3638m0c54i81lfk0g0f339hzbxpkxhs8ds7g2zv"; depends=[cubature mvtnorm PowerTOST]; };
   PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
   PowerTOST = derive2 { name="PowerTOST"; version="1.4-7"; sha256="02k6jn5dw70518g55bchax0l5gkci827lqwwyxwnn6rzs3mx4ybs"; depends=[cubature mvtnorm TeachingDemos]; };
-  PowerUpR = derive2 { name="PowerUpR"; version="0.2.3"; sha256="046p4mrw50k1a0m672i2zx5vxfpyggiazp95qz8kx6bnq472ixp2"; depends=[]; };
-  PracTools = derive2 { name="PracTools"; version="0.8"; sha256="0hmdsm1ya6fw0f2fv4b85bkr35vlqmjf1sd9jmw1d4izpifv187h"; depends=[]; };
+  PowerUpR = derive2 { name="PowerUpR"; version="1.0.0"; sha256="04lc6xjwwy9wxd7pg1wm5vg0bq3194cp0r7i72da7c10b31frdh1"; depends=[]; };
+  PracTools = derive2 { name="PracTools"; version="0.9"; sha256="0yra18is5pdwzw3vc5sk53g89n5rz1hpn8zlvcx541nxr43i69sd"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
-  PreProcess = derive2 { name="PreProcess"; version="3.1.4"; sha256="0zvy7wx9wfsdcvnjdr1angh0shqwhlm48byc0ymciqlx6xagaw0b"; depends=[oompaBase]; };
+  PreProcess = derive2 { name="PreProcess"; version="3.1.5"; sha256="049gdrp4kwvsid2bn12f61557qgpfv8cpzrd1b4ml47jpw8w0xdk"; depends=[oompaBase]; };
   PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; };
   PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
   PrevMap = derive2 { name="PrevMap"; version="1.4.1"; sha256="1hmvfk5zpflwncaiy2rr0jr2gr2gk66na6ks82b6dfgk8xdc8xmk"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
+  PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
-  ProFit = derive2 { name="ProFit"; version="1.1.1"; sha256="0krnxdf9dddry4a5k1dag43va7lii1ykk0857kk1dfnl56sm3l51"; depends=[celestial fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; };
+  ProFit = derive2 { name="ProFit"; version="1.1.2"; sha256="0z8prfmjx9zs7cqd316pc5iy3mg9vldcl12d3mk8llpvynn86ja3"; depends=[celestial cubature fftw FITSio LaplacesDemon magicaxis RColorBrewer Rcpp]; };
   ProFound = derive2 { name="ProFound"; version="1.0.1"; sha256="0ym8ggzm0b8zpfsq8xjjnwa09826gssaqhrqjyq88pwbhzh0y4pl"; depends=[celestial data_table FITSio magicaxis]; };
   ProNet = derive2 { name="ProNet"; version="1.0.0"; sha256="10r0gcxv0djrw99nd6a1jrnwvqmidw10ll645gvkp8l39li0107n"; depends=[igraph linkcomm MCL Rcpp]; };
   ProTrackR = derive2 { name="ProTrackR"; version="0.3.5"; sha256="19ilj03w5jpc1hw5avyb780iy3rdbby3kliym0si2zv6gyi9k541"; depends=[audio lattice signal tuneR XML]; };
@@ -2674,15 +2686,14 @@ in with self; {
   ProfessR = derive2 { name="ProfessR"; version="2.3-5"; sha256="0q04mjfr2g2l2md8c7nampivg6z4wjv6nfcq13b94sgixak0ww6f"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
-  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.8"; sha256="0kagahw30m0drlda75hgwbpp7cqrxyf1512ar56qlgm8z73hab3n"; depends=[]; };
-  ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.6"; sha256="0hx8v18m0wymbjjccy8sm34sqchs9gsf6piyhbs50nm00dqiamv6"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; };
+  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.8.2"; sha256="1yxfx7vi1vvwlk5wzjlkv7q591hq6a5jdv4brzb6v670fmw21kvd"; depends=[]; };
+  ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.7"; sha256="1nammbm9hjsgb46cqvhwx45lfaaxw13d12q43fgwk411a91rblm1"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; };
   ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.0"; sha256="1baf4v9c2pqqmlgxs1jf7fhwqbsw0l1g7rdiia21acxix2j3b7wj"; depends=[]; };
   PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; };
   PropClust = derive2 { name="PropClust"; version="1.4-3"; sha256="0k1wn62vlrddzhknyjpizpqxzrgl38frncql3mrlwakkn0kh8l5z"; depends=[dynamicTreeCut flashClust]; };
   PropScrRand = derive2 { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
   ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; };
   Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; };
-  PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; };
   Pstat = derive2 { name="Pstat"; version="1.2"; sha256="17bqkaf9590jhiaamaafmvkqmy2aqkcfqhk8m4w35g58j48yk4yx"; depends=[]; };
   PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
   PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; };
@@ -2692,6 +2703,7 @@ in with self; {
   Publish = derive2 { name="Publish"; version="2018.04.17"; sha256="0dbcql2mi2qsxzcgcqa58yqynfq1800fa06ikyay2dm6gdyf0apq"; depends=[data_table lava multcomp prodlim survival]; };
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
   PwrGSD = derive2 { name="PwrGSD"; version="2.3"; sha256="1iisib4bnb3fp0nwxnal13fgd0fs1vckchr4cj716k72jh6k7slm"; depends=[survival]; };
+  PxWebApiData = derive2 { name="PxWebApiData"; version="0.1.0"; sha256="0rd82kmpija4kkyl283b1z61q0abasimz4z7rki3kvfr0afa44j3"; depends=[httr jsonlite rjstat]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-4"; sha256="0krr5k0y9rggzq8f74nc6pyf47g8va1lvva31vc774hbb0rmr7gf"; depends=[pack R6]; };
   QCA = derive2 { name="QCA"; version="3.2"; sha256="1bjsc24b3g7xdb1fi3f4y1297g185gasl3xsgqxibck2zjlagl11"; depends=[fastdigest shiny venn]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
@@ -2703,7 +2715,7 @@ in with self; {
   QCSimulator = derive2 { name="QCSimulator"; version="0.0.1"; sha256="1ff7xagnzibhrwrmkqyky4ik3kx7rrlajrs1ypm210sl1d73jwvs"; depends=[ggplot2]; };
   QFASA = derive2 { name="QFASA"; version="1.0.2"; sha256="1gfclbalcfcfmb8bq7rp8kpnaqblai9y7n7n7zh4a3qmia5vrz2b"; depends=[Rsolnp]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
-  QGglmm = derive2 { name="QGglmm"; version="0.6.0"; sha256="1n53qba6y1hcxg1ry8bp41mgcycckli9q2syippvd7xdlq3srhqd"; depends=[mvtnorm R2Cuba]; };
+  QGglmm = derive2 { name="QGglmm"; version="0.7.1"; sha256="0hgs99vfan2nsz5i98an5z65lyw3a3ddhwzl0ffvlngw7gnshzqd"; depends=[cubature]; };
   QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; };
   QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; };
   QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; };
@@ -2714,11 +2726,12 @@ in with self; {
   QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
   QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; };
   QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
+  QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.0"; sha256="1yk4sl4hlapcjajwq85jwcmpli4myib9862sz7ary676giq1vp18"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp stringr]; };
+  QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="1.0"; sha256="05v93p3s9kncyzhiqgmd79h6b61xrr2k9vpgv9hjj0pkhsyanqc1"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp shiny stringr]; };
   QTLRel = derive2 { name="QTLRel"; version="1.0"; sha256="0hlnh04w45imf0f7rm9pg1whlps5zxh00qvvn81hip16bv48cw79"; depends=[gdata lattice]; };
   QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
   QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; };
   QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; };
-  QoLR = derive2 { name="QoLR"; version="1.0.3"; sha256="1z3wicybqsyczgjjd84g95bjxw80l5y8b68ayp300bm5jd4f2pha"; depends=[survival zoo]; };
   Qtools = derive2 { name="Qtools"; version="1.3"; sha256="1vbjydacgczjlsf8b8id25n3k0cq74i43nsvax22k8hbvj4g0b94"; depends=[boot MASS mice quantreg]; };
   QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
@@ -2729,13 +2742,14 @@ in with self; {
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
+  QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; };
   R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
   R_filesets = derive2 { name="R.filesets"; version="2.12.1"; sha256="0grd3wk5xh7jgp10m78knj0snqyxqv7yir6wvz2wq5rabvcn9mab"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
   R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; };
   R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; };
-  R_oo = derive2 { name="R.oo"; version="1.21.0"; sha256="0723gxjazgqq7v3lwnl7axw3brzcnizvhbd71ijkkv8mz31fwp34"; depends=[R_methodsS3]; };
+  R_oo = derive2 { name="R.oo"; version="1.22.0"; sha256="0k6xwy93fpb2p7bs76lzk52br9rv5xnd9524xj8qyazv1132x1n0"; depends=[R_methodsS3]; };
   R_rsp = derive2 { name="R.rsp"; version="0.42.0"; sha256="1zcq0hzi0j7fvj2rs796a1i120wbr0387vck17rrd644awwbsbm0"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
   R_utils = derive2 { name="R.utils"; version="2.6.0"; sha256="03j7hrs03kyj9qrjxyp5kqv4lpqqpk6xwbkzx6j15d8928yrjr2x"; depends=[R_methodsS3 R_oo]; };
   R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
@@ -2745,7 +2759,6 @@ in with self; {
   R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; };
   R2DT = derive2 { name="R2DT"; version="0.1"; sha256="0zydrdx6xdlacq6s01jwv4rv6ydmbwmiif40rilp8h76bim0kdbr"; depends=[data_table devFunc plyr]; };
   R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
-  R2GUESS = derive2 { name="R2GUESS"; version="1.7"; sha256="07w54r5r9v7pa8aklmwbwdcc57j3a3b46b1a7mwmzcl11mcfwdph"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
   R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; };
   R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-5"; sha256="09p8xrxhcf6biy1mffv31p2hlr19s51f3n67az52f3xv5lyp9wm8"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; };
   R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; };
@@ -2759,12 +2772,11 @@ in with self; {
   R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
   R6 = derive2 { name="R6"; version="2.2.2"; sha256="13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"; depends=[]; };
-  RAC = derive2 { name="RAC"; version="1.1.1"; sha256="0ybyjjpw8f4wbdhkhbnjg8wy82ibxsywyjrsi406l2knnkx0mvmg"; depends=[matrixStats plotrix rstudioapi]; };
+  RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; };
   RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
-  RADami = derive2 { name="RADami"; version="1.1-2"; sha256="1k4g58r64i19j8wj3d202283bnwaxf19l7ckiz29dlw4zidx6mvz"; depends=[ape Biostrings geiger hierfstat IRanges phangorn]; };
   RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; };
   RAHRS = derive2 { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; };
-  RAM = derive2 { name="RAM"; version="1.2.1.3"; sha256="1p6rqqbp5q3pqy9m6npml52nkfh8pd4kc245kb22qjslbvl3rrkn"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
+  RAM = derive2 { name="RAM"; version="1.2.1.7"; sha256="0aalswivpjs1glwf4yh3b79lch3n32fyj5xda55h3v7gzs7p0d7f"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
   RAMP = derive2 { name="RAMP"; version="2.0.1"; sha256="1n8h58j6v1xs6adrr4w4ha7pn1q2fh14dyg7zgpp2smv0j2b33dr"; depends=[]; };
   RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; };
   RANKS = derive2 { name="RANKS"; version="1.0"; sha256="1lvaya9jlqrr9klqznw4fz5h5x0sw191ci74hpymb4gzhhxcbp27"; depends=[graph limma NetPreProc PerfMeas RBGL]; };
@@ -2774,12 +2786,11 @@ in with self; {
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; };
   RATest = derive2 { name="RATest"; version="0.1.2"; sha256="0cxb82kzmywgslf6hfjl6v015s64jh483bzxnhph420mcp3ysbfk"; depends=[ggplot2 gridExtra quantreg]; };
-  RAdwords = derive2 { name="RAdwords"; version="0.1.16"; sha256="1a7r600s7r4pp0wwcsgyzkc6v7nywbsv3s0q118wmx2ig5rsyihw"; depends=[RCurl rjson]; };
+  RAdwords = derive2 { name="RAdwords"; version="0.1.17"; sha256="1w6fkg7a5dp6s80fzcgs65f0d7qp43l4yawh00ly0b750f2fnxvp"; depends=[RCurl rjson]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
   RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; };
   RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
-  RAtmosphere = derive2 { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
   RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; };
   RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
   RBesT = derive2 { name="RBesT"; version="1.3-3"; sha256="0pink9jza2pfm1vqmzgp0pcyg9a4ak4c9igcxj692np82mv8hi0j"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
@@ -2794,12 +2805,13 @@ in with self; {
   RClickhouse = derive2 { name="RClickhouse"; version="0.4.0"; sha256="0lb0sgs2f78y2z5ip2wqml88vykrwkdhn3i36y9hyrm34ackis6h"; depends=[DBI dbplyr dplyr Rcpp yaml]; };
   RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
   RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; };
+  RColetum = derive2 { name="RColetum"; version="0.1.2"; sha256="1c5p3g2bcijp3pgq5jyh1w5r6ni0rnw5kqdz72misx4mapjf7apl"; depends=[dplyr httr jsonlite]; };
   RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
   RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.10"; sha256="02pyh6kvsfbwgccf8v77aa3ky21kps1rpgaii20wmridrgqj90vg"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.2.3"; sha256="18x1561l5hnaayvv8mca8gncqfgn4bbqx69gkb0jk3wa6s11y2qk"; depends=[httr]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.2.6"; sha256="03zp8y76084l2zjzf9bbfhig7gi01a21gnjfiajzi8q851nfgl29"; depends=[httr lwgeom magrittr sf]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
   RDS = derive2 { name="RDS"; version="0.8-1"; sha256="18xn0ci35xs2myzj8rny6pp08cn8ljl3l4fdgaqp05fphgb5fh8j"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; };
@@ -2811,7 +2823,7 @@ in with self; {
   RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; };
   REAT = derive2 { name="REAT"; version="2.0.0"; sha256="0al0502h1iyd03c4hsy35nxz3nbvvfshi5jxxvxlh1x4bxvpy1vs"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="1.3"; sha256="0byd7587vddffplzp8kc2aakab61pck2r25rajxfn0rsvl5yvxyx"; depends=[Matrix reliaR Rmosek]; };
-  RECA = derive2 { name="RECA"; version="1.3"; sha256="1v9ff2inxwpq91pjl6g9bpl9nmlyryp030g6abydikkhkcq3n74b"; depends=[]; };
+  RECA = derive2 { name="RECA"; version="1.6"; sha256="0bb6phd7f8rrz7754bn6sp53jrvcl6xg6lkj330945xwia1dhpxi"; depends=[]; };
   REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
@@ -2823,14 +2835,14 @@ in with self; {
   RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; };
   REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
-  REddyProc = derive2 { name="REddyProc"; version="1.1.3"; sha256="1ixc3bdsqy1mavzpbgw9sxlbnkrmy7sbb7wizh5133gi4p2f2bdh"; depends=[dplyr logitnorm mlegp purrr Rcpp rlang tibble]; };
+  REddyProc = derive2 { name="REddyProc"; version="1.1.5"; sha256="1f0r8pdyghqbgrncar83pj935crf80yqms48sj9yf1jal5px068b"; depends=[dplyr mlegp purrr Rcpp rlang tibble]; };
+  REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; };
   REndo = derive2 { name="REndo"; version="1.3"; sha256="02hk2azmhdbr28vf8fglljiccij0284ypjzkk9yh23rw7pnbdk4g"; depends=[AER corpcor data_table e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
   RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
   RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; };
   RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
-  RFinfer = derive2 { name="RFinfer"; version="0.2.0"; sha256="1cgdrg7gm8hdaaycipn8wjx7s4652jyy664n1my9qynmc56qib4n"; depends=[Matrix party pbapply randomForest]; };
   RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
   RForcecom = derive2 { name="RForcecom"; version="1.1"; sha256="1ch1pwpnqagzb9n4qbgr804bmnz819kp36r5a4zhijmq8xpv3qr2"; depends=[httr plyr RCurl XML]; };
   RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; };
@@ -2840,48 +2852,49 @@ in with self; {
   RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; };
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
-  RGF = derive2 { name="RGF"; version="1.0.2"; sha256="06qvilx9z659q0kad5h1r6mdf4vc8lmr8bzw5nrjsjpb92v5crh5"; depends=[Matrix R6 reticulate]; };
+  RGF = derive2 { name="RGF"; version="1.0.3"; sha256="00s360kba9w58bzyhikh487gymryq0g62zhyr3zd2vfm4x0rl0ms"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; };
-  RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; };
   RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; };
   RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; };
   RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; };
-  RGreenplum = derive2 { name="RGreenplum"; version="0.1.0"; sha256="19wb85npy27r011yfp90y1dvl8qk2yh2qks8zg207nac0vngz4y1"; depends=[DBI RPostgres]; };
-  RGtk2 = derive2 { name="RGtk2"; version="2.20.34"; sha256="1yhdcd7f987bdd2y08dcx95i1hbfakgd8v1c606jxwr2dclyhx70"; depends=[]; };
+  RGreenplum = derive2 { name="RGreenplum"; version="0.1.2"; sha256="1mc0zmmnb9306j2cjn1j71bp35ri8p35rw6rlmrqyxgpvlw09r3d"; depends=[DBI RPostgres]; };
+  RGtk2 = derive2 { name="RGtk2"; version="2.20.35"; sha256="17nxxhkk9jvcwfajbhs5kyrx00lx1irggfbq3l2gp28dvb1cn6z9"; depends=[]; };
   RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
   RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; };
-  RHMS = derive2 { name="RHMS"; version="1.3"; sha256="0pp67p8i6nsh9nvxsd1m453735s0whlril8l640m888zl6a3463j"; depends=[Hmisc pso]; };
+  RHMS = derive2 { name="RHMS"; version="1.4"; sha256="03ysg9lccpyvhz0qwhx90maxara24axlqb9rssvhy1djcmlbm7k7"; depends=[GGally ggplot2 Hmisc network pso]; };
   RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; };
   RHRV = derive2 { name="RHRV"; version="4.2.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; };
   RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
   RHawkes = derive2 { name="RHawkes"; version="0.0"; sha256="0qi32f6im6fsgvjs8bravc5z21557zn2d0a7i88dy0rri7czm5p7"; depends=[IHSEP]; };
   RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
-  RIA = derive2 { name="RIA"; version="1.4.0"; sha256="0whwja54mmd23sbljgvjnlgz3hlmgpdh53w04bcpgbmvcs281f5l"; depends=[nat oro_dicom oro_nifti]; };
+  RIA = derive2 { name="RIA"; version="1.4.1"; sha256="0a332bdyf3jyfk6szw10h5m3vd0y4j2xjbf8yr31ra8a2xq9v45z"; depends=[nat oro_dicom oro_nifti]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
   RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
   RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; };
   RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; };
   RInside = derive2 { name="RInside"; version="0.2.14"; sha256="1ks9hs78s2vgdp9nfpzwifkqnh3vnaqwand51yh9r1zyjc4k9rcd"; depends=[Rcpp]; };
-  RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; };
+  RItools = derive2 { name="RItools"; version="0.1-16"; sha256="0rs5gzlpsn8ci4s2pqaarzwd6y41vv6l4188p93x0vl2jcpd77vl"; depends=[abind SparseM survival svd xtable]; };
   RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; };
-  RJSDMX = derive2 { name="RJSDMX"; version="1.9-3"; sha256="0myjhimx1p8ndyk60qgaw6csq58s4rxr67hgx9a5i1swsmlkwciz"; depends=[rJava zoo]; };
+  RJSDMX = derive2 { name="RJSDMX"; version="1.9-3.1"; sha256="0iz4p9kl9i61sd23cqfwgwmqb48nz882mvir7p7sg5ysm0b65ijd"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
   RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; };
   RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
-  RJafroc = derive2 { name="RJafroc"; version="1.0.1"; sha256="16a8j4bw754ci8mxfhh3c3y5g53f2hr1l1mh05xw31asqcxzafrm"; depends=[bbmle binom caTools ggplot2 mvtnorm numDeriv Rcpp stringr xlsx]; };
+  RJafroc = derive2 { name="RJafroc"; version="1.0.2"; sha256="099q1ajngj147szdnnyx2yi8samc7vbjbvygafgwr20dbvp07wzg"; depends=[bbmle binom caTools ggplot2 mvtnorm numDeriv Rcpp stringr xlsx]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; };
+  RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; };
+  RKEELjars = derive2 { name="RKEELjars"; version="1.0.18"; sha256="0gnjpqkm0bl6wpy9fhma6gfm6ngw786jv01kkbxz072hp1swrgmx"; depends=[downloader]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
   RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
   RLT = derive2 { name="RLT"; version="3.2.1"; sha256="14im1lvsfpl1vlhc3fmmi4vq41br48mlgqqnwnj0qqxawzzs5738"; depends=[]; };
   RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; };
   RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; };
   RLumModel = derive2 { name="RLumModel"; version="0.2.3"; sha256="059nqbvy13jjgzhp4n9afqkc3dbv06aml5v5ffkhpx8kcmv48xp1"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
-  RLumShiny = derive2 { name="RLumShiny"; version="0.2.0"; sha256="0gchhgpdr9fb29apqni9yg72rh3hvvk7ap0869fp459hnygfcl7q"; depends=[data_table googleVis Luminescence readxl rhandsontable shiny shinydashboard]; };
-  RM_weights = derive2 { name="RM.weights"; version="1.0"; sha256="0757p4174j913k8xh90zg6fpxh25b9415zap1i7ym9ab78kn0k3i"; depends=[Hmisc psychotools]; };
+  RLumShiny = derive2 { name="RLumShiny"; version="0.2.1"; sha256="1iqayrz0bkyqa7c93cv9873acqjncw3z6rnwwpcgsn1wf40bd6pj"; depends=[data_table DT googleVis knitr Luminescence readxl rhandsontable shiny shinydashboard]; };
+  RM_weights = derive2 { name="RM.weights"; version="2.0"; sha256="1by1z7gwwx0jjhhvsjkr7f6m7n0x43bj080ah5275cja7xqr5nm6"; depends=[Hmisc psychotools]; };
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
   RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; };
   RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; };
@@ -2894,12 +2907,12 @@ in with self; {
   RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  RMariaDB = derive2 { name="RMariaDB"; version="1.0.5"; sha256="1fykcsb81pdp3v46sjphldj7nizcdp5m7a3j3p1psx0ppgg57r2d"; depends=[BH bit64 DBI hms plogr Rcpp]; };
+  RMariaDB = derive2 { name="RMariaDB"; version="1.0.6"; sha256="19pjxgz9h3bb89ra6ha6mbnzyz1sagmm82qd57y0rbrsvwn0pk2i"; depends=[BH bit64 DBI hms plogr Rcpp]; };
   RMark = derive2 { name="RMark"; version="2.2.4"; sha256="1vns8bl3fnk6hkwmm0wl2c6lgyv3vabsk07kkxrxrl1nzy11wj3a"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.6-3"; sha256="025fg36jwq44y5m7msmjql3m0avc0hl0iw49wap0fvmzy5qn24qq"; depends=[base64enc jsonlite RCurl uuid]; };
   RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-  RMySQL = derive2 { name="RMySQL"; version="0.10.14"; sha256="01891kn263b02y6addgpy3gn5axg7m10bqbqv7dg9yx9k85am590"; depends=[DBI]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.15"; sha256="0bmc7w5fnkjaf333sgc0hskiy332m9gmfaxg0yzkjxscpizdw43n"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
   RNAsmc = derive2 { name="RNAsmc"; version="0.3.0"; sha256="15k88skwqcd0m4m502fipdl1iind4mzizqdz4h63izpqfxijl3iz"; depends=[RRNA]; };
   RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; };
@@ -2908,15 +2921,15 @@ in with self; {
   RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; };
   RNGforGPD = derive2 { name="RNGforGPD"; version="1.0"; sha256="11n7fl1rrgnknn61qw6dh74amhakkjk5wyg0rms554lw9cn86x2v"; depends=[corpcor Matrix mvtnorm VGAM]; };
   RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; };
-  RNOmni = derive2 { name="RNOmni"; version="0.3.0"; sha256="0gddpfv0ggbfxids42npnd0q2bkwz81v3x7h1898qyzql3dg9pwv"; depends=[abind foreach mvtnorm plyr Rcpp RcppEigen]; };
+  RNOmni = derive2 { name="RNOmni"; version="0.4.0"; sha256="1dk7ydbdhz92ixgm7carsalsdah4s3mshlkri3b69r9maxakkkjr"; depends=[abind foreach mvtnorm plyr Rcpp RcppEigen]; };
   RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
-  RNeXML = derive2 { name="RNeXML"; version="2.0.8"; sha256="0ikdv60nkhiv70x1crd21xd92iq2gshj6248m896v1l276513g5j"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
-  RNentropy = derive2 { name="RNentropy"; version="1.2.0"; sha256="19zbjy2xrrsz674qhi6dfzppsgfdy9hp93bqj14p1w3z6smh0k8c"; depends=[]; };
+  RNeXML = derive2 { name="RNeXML"; version="2.1.1"; sha256="1hnw7m5sasbs7si3aivrg984fpjpya093zzk0jjigba2gq375x4p"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr tidyr uuid XML xml2]; };
+  RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; };
   RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; };
   RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; };
-  RNifti = derive2 { name="RNifti"; version="0.7.1"; sha256="0ysr967qqid84vh6q13z045lqpi15d4pmicx59qmvfpsdpy0dz6w"; depends=[Rcpp]; };
+  RNifti = derive2 { name="RNifti"; version="0.8.1"; sha256="1m1hw6mq47afa7kk36xkk3sb0yv28qwz503a7wq5c4djyp262mgh"; depends=[Rcpp]; };
   RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.1"; sha256="07ibpdh2z01jh9nmhs7lcz630fdq6lwal6w58np3axgcd91ch1mj"; depends=[ore Rcpp RcppEigen RNifti]; };
   ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
   ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; };
@@ -2932,7 +2945,7 @@ in with self; {
   ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1"; sha256="0cr4iy4p590zsp47jqyrvhamc4xa9nkpnnddmwqbkgvzmzxf83ap"; depends=[globalOptTests ROI]; };
   ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-1"; sha256="1viqr0dqza9386m9xmfdm5riaczp4izf3bd2jk70cmdgypjj6mzg"; depends=[R_utils Rglpk ROI]; };
   ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.0"; sha256="13ai7zkd00a03vyzfy1sm64cx8328xzwz5v8yw0shkdz5rchaq2d"; depends=[ROI]; };
-  ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.3-0"; sha256="0k012kv29hxw61iy1r06h70aiiqxrpmv62i4va80vmdfa2zr8zjg"; depends=[alabama ROI]; };
+  ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.3-1"; sha256="1b70qnm7s5gdcpn7y61gbwcln7r48gvp6hkmdwrvz1qvlsgaz6rk"; depends=[alabama ROI]; };
   ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[clpAPI Matrix ROI slam]; };
   ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.3-0"; sha256="1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf"; depends=[Rcplex ROI slam]; };
   ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="0.3-0"; sha256="15b5151xmwmmqgiwj4sy1agc9abk8dd2q95lva3ilkjj2j8y0zrh"; depends=[DEoptim DEoptimR ROI]; };
@@ -2941,16 +2954,17 @@ in with self; {
   ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="0.2-5"; sha256="0xampxba8s9kigxv4xj6nb8a7a02w1aj4ansj99z8m7qg0bg2ivv"; depends=[kernlab ROI slam]; };
   ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-1"; sha256="0i1skxk88s8cgxbr2hl5z8h88aqchrfs3206dfb92libw3yi1vas"; depends=[lpSolveAPI ROI]; };
   ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="0.3-0"; sha256="00zvjqq2sj7iaymc0lrf5lmqfbqilwh8llmq841lvsmbps45w41k"; depends=[ROI slam]; };
+  ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="0.3-0"; sha256="0hs64qbna8ggmn83g903kbxiyv5ghh2454xca0caf14x9lszv02j"; depends=[ROI xml2 xmlrpc2]; };
   ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-0"; sha256="0niq0q08033vcm59wflilii7lciqixcpf13a93hgdaypdca8lxcw"; depends=[nloptr ROI]; };
   ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-0"; sha256="0hwjgwmaclq6y5mfmykjrchpyb632qzwcvvs1nnanmrh3yhfmpg9"; depends=[optimx ROI]; };
+  ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-1"; sha256="0ph6l85hrsc40wl443kkxywb2i0cjyh38g20000rnzhygl8kd7db"; depends=[Matrix Rcpp ROI slam]; };
   ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; };
   ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-0"; sha256="0krlrmw85j1g35pvh4ig10djb6y6akyrfymkfk4dqg751w7mb4fm"; depends=[Matrix ROI scs slam]; };
   ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; };
   ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
   ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
-  RObsDat = derive2 { name="RObsDat"; version="16.03"; sha256="06d4svg4crgscn3wyg1fi8v46wlhlrgdrbfiv8ak4a5k5z0gws94"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
   ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; };
-  ROpenDota = derive2 { name="ROpenDota"; version="0.1.1"; sha256="0d9a8c008bgzcd1hqly2h010f25xgs2s430hk90yq7vvqr3lmxl7"; depends=[jsonlite RCurl]; };
+  ROpenDota = derive2 { name="ROpenDota"; version="0.1.2"; sha256="17s73yj2w5hlpy09ad83m4s2d9shg5h4zg64wvbp1ivyvpp7l308"; depends=[jsonlite RCurl]; };
   ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; };
   ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; };
   ROptEst = derive2 { name="ROptEst"; version="1.0.1"; sha256="0160xs3bmk1bdan7gkibc50qfzxlmi413grvs0bib74xlr0x2kgj"; depends=[distr distrEx distrMod RandVar RobAStBase startupmsg]; };
@@ -2968,39 +2982,39 @@ in with self; {
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.5"; sha256="0cf4mb7mjp7x3k7083c8n8fjbvrmcgq359wh6pdyj817mgkanqzv"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; };
-  RPostgres = derive2 { name="RPostgres"; version="1.1.0"; sha256="1h540z1zfzgkayggy28q07r0xnblr3vnp6j5j7la6xbz141gns38"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
+  RPostgres = derive2 { name="RPostgres"; version="1.1.1"; sha256="1s25lkb69dkc5zk5ikbqa325jw5kfavghsq7s26mrcng4va9dz6i"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
   RPresto = derive2 { name="RPresto"; version="1.3.0"; sha256="01w832ia4c44nhir5rzw33qa8h7afmf04vkfdlg32jaqi1gv5861"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
   RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.11"; sha256="0q05hdlbgbjydi0x80kgfayfkisalvmb9wy1n6afcw66pbikyb4l"; depends=[Rcpp RCurl]; };
   RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
   RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; };
   RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
+  RQEntangle = derive2 { name="RQEntangle"; version="0.1.1"; sha256="1bkx95x1dwa8w6w1qj2aflcsvapa6sipfvqpgngwbp93m0fc10ws"; depends=[iterators itertools]; };
   RQGIS = derive2 { name="RQGIS"; version="1.0.3"; sha256="0wrzjfxwciirl838lakcw7f6qyqyykqd999c9krll5krqzyq7c3c"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; };
   RQuantLib = derive2 { name="RQuantLib"; version="0.4.4"; sha256="1pki0c265nmgph9dbz2pyrq8h7295mxswavfdwsr7m1lpbpzk8s5"; depends=[Rcpp zoo]; };
-  RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; };
+  RRF = derive2 { name="RRF"; version="1.8"; sha256="09y9f3zx9jcn7rs6an7b0hvjavy2li7rl5nknxzxfx7qnlqajnld"; depends=[]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
-  RRPP = derive2 { name="RRPP"; version="0.1.0"; sha256="1c29zgfhhssg7m1ckn45bdk1jcqxs4q68bf4rq3jg8h1805jql1h"; depends=[]; };
+  RRPP = derive2 { name="RRPP"; version="0.2.0"; sha256="0wi7b9vwghw96d7v46mq3rpi4iggm1h6948rkbj32zqnxg7sfq3r"; depends=[]; };
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
   RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; };
   RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; };
   RRphylo = derive2 { name="RRphylo"; version="1.0.0"; sha256="1h167w16lky8aa18fc90rgclx1by3qa9d69n72dxmjzy0d14zjc6"; depends=[ape doParallel foreach geiger lmtest mvMORPH phangorn phytools pvclust R_utils rlist scales smatr]; };
-  RRreg = derive2 { name="RRreg"; version="0.6.7"; sha256="0v0rzyknqwrnj3dx5lvifzllv1syzflnnby6mjmnsqqb2cgyscrf"; depends=[doParallel foreach lme4]; };
-  RSA = derive2 { name="RSA"; version="0.9.11"; sha256="1hsjy755r78my6ib9s9da7mibcjxd5svh2kq0v7a466m60cyfrss"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
+  RRreg = derive2 { name="RRreg"; version="0.6.8"; sha256="1x8jn7wn1vr4wqk1wjmgk7v5lg20giin735gnvf2mm56ji5amq4d"; depends=[doParallel foreach lme4]; };
+  RSA = derive2 { name="RSA"; version="0.9.12"; sha256="0ii7isrk6c1wb3clbwqzr37v2kypwszi4rjf4caip96bmh7jg3kq"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
-  RSAGA = derive2 { name="RSAGA"; version="1.0.0"; sha256="1023br8q0i6w18kmn261kf4ql32061hq7xngl1w5mamvvp17d6b1"; depends=[gstat plyr rgdal sf shapefiles]; };
+  RSAGA = derive2 { name="RSAGA"; version="1.2.0"; sha256="1fkwgjicw8yrnkq1r925c22nn8khz6afksba6jpvm1jbwlkmhpzw"; depends=[gstat plyr rgdal shapefiles]; };
   RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
   RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; };
   RSCABS = derive2 { name="RSCABS"; version="0.9.3"; sha256="08ykkqx9rdx5s6wg2idxz35ddpsz1lir22vrjs92k51zq0jrkhv9"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
-  RSDA = derive2 { name="RSDA"; version="2.0.3"; sha256="18rka6g93yksgnwgzy4planjvsmc4d5xzf4fxarv57v6frg37y98"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; };
-  RSEIS = derive2 { name="RSEIS"; version="3.7-8"; sha256="0f065jkdz91gi6l8y5y4m95vwgjsagrxx6r5982jbafi7zyqxm7j"; depends=[RPMG Rwave]; };
+  RSDA = derive2 { name="RSDA"; version="2.0.4"; sha256="1pmqwrwjmw5fsvx3aiy8q4w4w0zh81l1118ny5g3rrb5g6ybnrxs"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve purrr RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tibble tidyr tidyselect XML xtable]; };
+  RSEIS = derive2 { name="RSEIS"; version="3.8-1"; sha256="0i4wlym8glsg90fxmzagji45xni2s04jzyrbakkil09n9rpsrl6n"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
   RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; };
-  RSMET = derive2 { name="RSMET"; version="1.2.9"; sha256="1da7kck5g0vcd1ly7xaa1i8d9b1qjf6kwf35sq5d71hfbgx2fb4k"; depends=[stringr]; };
   RSNNS = derive2 { name="RSNNS"; version="0.4-10"; sha256="1khsv1sy8jgsl9s5fypcg77lzj811xzrygwnq6ki9v375sk383gh"; depends=[Rcpp]; };
   RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
-  RSQLite = derive2 { name="RSQLite"; version="2.1.0"; sha256="0hknfqcgijdapx1ryy20zy68qmm8wsb1hjx4n4hmkgl552z82q5d"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
+  RSQLite = derive2 { name="RSQLite"; version="2.1.1"; sha256="1giwk4335sc6yhj3rs8h070g1mwy38kyqyqv6vcfxvskykj7vp6z"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
   RSSL = derive2 { name="RSSL"; version="0.6.1"; sha256="03f0i0v0nygkcci42h4bh7jngxz15wsd78cn2zkzbrqadz1c61r5"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
   RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; };
   RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; };
@@ -3009,16 +3023,15 @@ in with self; {
   RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; };
   RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
   RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; };
-  RSelenium = derive2 { name="RSelenium"; version="1.7.1"; sha256="04ghck76jh7w6kgzdszkzjwj9fhyngq13mf9iybavxph5wcy7xgq"; depends=[binman caTools httr openssl wdman XML]; };
   RSentiment = derive2 { name="RSentiment"; version="2.2.1"; sha256="0djp530yzj5a6y5nqk98pdvsgy9apqcqvkz0yjqx6856d9wrycm0"; depends=[NLP openNLP plyr stringr]; };
-  RSiena = derive2 { name="RSiena"; version="1.2-3"; sha256="125qkh8j42zm8r4acxw20m6ylq6vksja3qz6zxyyvfd3l2vqb2gy"; depends=[lattice MASS Matrix]; };
-  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.14"; sha256="0h5s9vhihjlz44l61vm83zqavkglb6f304sb04n0vhzzl797l04c"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+  RSiena = derive2 { name="RSiena"; version="1.2-12"; sha256="1bc0vdqqzkf3q3b6rzqiwd29lcq8vbvlj2qkxbx6v8wjphycz6rw"; depends=[lattice MASS Matrix]; };
+  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.15"; sha256="13mrqf458m43g435g4pbg49pid63f4ap1r8jzl84mvj1b36hy4q6"; depends=[base64enc digest httr jsonlite plyr stringr]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.2"; sha256="0phkk79ng4r54w3d4ajl505gs8svlzdf1g6q50lhraq2cbllbvgx"; depends=[RCurl]; };
   RSocrata = derive2 { name="RSocrata"; version="1.7.4-7"; sha256="1cblp0fq7836jkb8cps3l1f8gx25bsdclkjvmxmd4b79y4hapiy2"; depends=[httr jsonlite mime plyr]; };
-  RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; };
+  RSpectra = derive2 { name="RSpectra"; version="0.13-1"; sha256="1sw80chwyyjzf5px278l6xmp94yhwrlj5xh8d3wlw3dnvdkycca7"; depends=[Matrix Rcpp RcppEigen]; };
   RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
   RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; };
-  RStoolbox = derive2 { name="RStoolbox"; version="0.2.1"; sha256="1lvjiaamd2jz1m1prk429lwfwqbm3dcyq6v8hddkynd0k28qbw6s"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
+  RStoolbox = derive2 { name="RStoolbox"; version="0.2.3"; sha256="06b54g186bwgl5g8wkbj6q05bdy6sqvx433xwwvj7az1qxpa5kwr"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
   RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
   RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; };
   RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; };
@@ -3031,12 +3044,11 @@ in with self; {
   RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; };
   RTextTools = derive2 { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
-  RTransProb = derive2 { name="RTransProb"; version="0.2.0"; sha256="0ka923kg52f7dv19z9vjb7m9ji12wk92kva41idryfignxpa2bkf"; depends=[chron e1071 expm MASS Matrix matrixStats nnet pracma Rcpp RcppArmadillo zoo]; };
+  RTransProb = derive2 { name="RTransProb"; version="0.3.0"; sha256="010nsw97b0yi5l6fkwx04aacv47fww9lp7pgjdm8nb7gg9yif2bx"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; };
   RTriangle = derive2 { name="RTriangle"; version="1.6-0.10"; sha256="07ya95gmv53i2argqwgad6wd4sslql2wl1rkvsmgsvmhsb4wp9hd"; depends=[]; };
-  RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; };
-  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-69"; sha256="1fcblvvpydczakvjsiz8ffcs8zid2ln6dbah0y9ha3xfzp2qcj4z"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
+  RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-69-3"; sha256="18m4f1h0jnc8k03vpmyr8gcr4l6k0anjy660qrz8sqcaasp3ikj1"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
-  RVPedigree = derive2 { name="RVPedigree"; version="0.0.3"; sha256="0v47bcdlcd0ydw4vffy1g9lj1azvyqwz4400nmlqshf9vqyhf9qq"; depends=[CompQuadForm doParallel foreach kinship2 ks Matrix snpStats]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
   RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.7"; sha256="08mhn6732sb284y4garx0nvhad4r42pk39p3r82fad4c1c3rxkhg"; depends=[]; };
   RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.12"; sha256="1x3pq6cnkjashf49imrw76xkw9nzqgn9132l03l9v4vacgh0s47m"; depends=[Rcpp]; };
@@ -3044,7 +3056,7 @@ in with self; {
   RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; };
   RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; };
   RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
-  RWeka = derive2 { name="RWeka"; version="0.4-37"; sha256="1q0riy7w2ighyy7fh1hj3q4wa0vbbn6h7nisgkyzwkcxkfq3n2pw"; depends=[rJava RWekajars]; };
+  RWeka = derive2 { name="RWeka"; version="0.4-38"; sha256="1c0jvz2d04h31g4mp8sg9vrp5138n97gavji18yiij7pd11g5qda"; depends=[rJava RWekajars]; };
   RWekajars = derive2 { name="RWekajars"; version="3.9.2-1"; sha256="006n7m3qxnzvfhkzcr0nbwqdlhygzdhyp8x3534dx6075bm00v0f"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; };
   RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; };
@@ -3054,12 +3066,14 @@ in with self; {
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
-  RZigZag = derive2 { name="RZigZag"; version="0.1.5"; sha256="0cawn24z0rm78dn8l86k3zfh4z3xp1i910dzxp7xqjzlh3spp4ar"; depends=[Rcpp RcppEigen]; };
+  RZigZag = derive2 { name="RZigZag"; version="0.1.6"; sha256="1sb1lmm5vnzkbzqxbmipkm2zb01zg2x15jgyrsplardyy8kpqxn7"; depends=[Rcpp RcppEigen]; };
+  RZooRoH = derive2 { name="RZooRoH"; version="0.1.1"; sha256="10l7i4fdjvq921ngbcd5kmbaq9zvl44p5clyd6zyq8d7598ffz77"; depends=[data_table doParallel foreach iterators RColorBrewer]; };
   RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.4"; sha256="1ri6ybzhfdgbrbfcy12mmvv2ipg61az7vwp1dbjyzs8mgsc1cxb5"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
   RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
   Radviz = derive2 { name="Radviz"; version="0.7.0"; sha256="0x1b3s3i3f775m7ragvzpdswljry8adbkjb6aq35aqasnkvvnysq"; depends=[gridBase hexbin KernSmooth MASS]; };
+  RagGrid = derive2 { name="RagGrid"; version="0.1.1"; sha256="0jx3ch42ilcf6baw0pv42cs9lbhharma78bd8vps403p69ray4z8"; depends=[crosstalk htmltools htmlwidgets knitr]; };
   Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; };
   Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
   RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; };
@@ -3067,7 +3081,8 @@ in with self; {
   RandVar = derive2 { name="RandVar"; version="1.0.1"; sha256="0vj0p46xmj4129m6r5zg85fnvb5kx1ardwwk55nqypkxd0v58a4j"; depends=[distr distrEx startupmsg]; };
   RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; };
   RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; };
-  RankAggreg = derive2 { name="RankAggreg"; version="0.6.4"; sha256="1bskq723jx87xczw416pijajna73zhjjmbrvh3n6djxy8yjxhrq5"; depends=[gtools]; };
+  RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.1"; sha256="0hmami515jv916lxdwv31w3w2bjn954qwibvgw1qlqn8d5swndiw"; depends=[jpeg shiny tidyverse]; };
+  RankAggreg = derive2 { name="RankAggreg"; version="0.6.5"; sha256="031mff1zydxqygx8bn3g0qpwq08kaq5bpmzy6z2y0fa03hgsxz5c"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
   Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
   RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; };
@@ -3075,7 +3090,7 @@ in with self; {
   Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; };
   RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; };
   RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; };
-  RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.1"; sha256="0dcyajh3vgdl9ssdwgaf3sshq61bqqhjz30f9c99aqnpv3k4k76x"; depends=[ggplot2 pROC]; };
+  RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; };
   Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; };
   Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
@@ -3086,12 +3101,11 @@ in with self; {
   Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
   RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
+  RchivalTag = derive2 { name="RchivalTag"; version="0.0.7"; sha256="0i25rj3f54km2gdr8izgvqdbdbcq4nikywn5narm7sg79fv43pd4"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; };
   Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; };
   Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; };
-  Rclusterpp = derive2 { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
   Rcmdr = derive2 { name="Rcmdr"; version="2.4-4"; sha256="0n15wkhn8hfhcpz0n2ngxkfaysjsizksxxr1fhpfjmlpy4wxxnx0"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
   RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-10"; sha256="1fxcm0iwxdqh9qv2g6w7sqbg23zgl5z5ib2x69j5n10fglx89m8f"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
-  RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
   RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
@@ -3102,12 +3116,13 @@ in with self; {
   RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; };
   RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; };
   RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; };
-  RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-46"; sha256="0bl9nq89ga16rxlf411lbm5qsx28f1axxwchr5rp46n0h15d0d3f"; depends=[HH lattice mgcv Rcmdr]; };
+  RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-47"; sha256="1bba11izs1jhjsyb0d45c34gcihapk231qbiabcxf8x93sdmg6ga"; depends=[HH lattice mgcv Rcmdr]; };
   RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; };
   RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-5"; sha256="069kpvhflk0rwwll0vyxfdrln1lzr1zhzfzm39si63ji6v7l6msb"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
-  RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.1"; sha256="0c3mcr8bmmbpxsqm8zfy07cbyglnq5466nafbglfs5m0z836yz9i"; depends=[ordinal Rcmdr]; };
+  RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.2"; sha256="1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5"; depends=[ordinal Rcmdr]; };
   RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.8"; sha256="1s7947zvrhjrc7vchvaajp2q7xdqfg5vsmg6r7ym416cqq39i5kd"; depends=[MASS mixlm phia pls Rcmdr xtable]; };
+  RcmdrPlugin_OptimClassifier = derive2 { name="RcmdrPlugin.OptimClassifier"; version="0.1.2"; sha256="0gisjw1iniihy2c2mr9f9pxfnfr2dc0s482wb9yfn88vknx8d0rn"; depends=[OptimClassifier Rcmdr RcmdrMisc]; };
   RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; };
   RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
   RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
@@ -3116,15 +3131,15 @@ in with self; {
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
   RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
   RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
-  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-4"; sha256="0wzcqmrv9qvdcrcz0vcp5fl8f71zg6c355qrr9476524aidb29my"; depends=[randtests Rcmdr TeachingDemos tseries]; };
+  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.2-4"; sha256="17ivr48y0wh89nphjzfmgdgpsfsxw4n6bfwjln0crvqhm4xh6qmh"; depends=[randtests Rcmdr TeachingDemos tseries]; };
   RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
   RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; };
   RcmdrPlugin_epack = derive2 { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[abind forecast MASS Rcmdr TeachingDemos tseries xts]; };
-  RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.8.1"; sha256="1ak2fvz1sdbdr1y1w7i15gibwdh4a3662kvr23pka4lfpbsyrah8"; depends=[lfstat Rcmdr]; };
+  RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.8.3"; sha256="1rcr43dqyb9zw9av3awkz0640vmvhxrafal5brnhqnpg4hfbpma3"; depends=[lfstat Rcmdr]; };
   RcmdrPlugin_mosaic = derive2 { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc Hmisc Rcmdr vcd]; };
-  RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; };
+  RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.5"; sha256="1rjlc5v9ksndmzcdw5lkqvzxpsanvglm20ppbw49nna8rsylkj08"; depends=[orloca orloca_es Rcmdr]; };
   RcmdrPlugin_plotByGroup = derive2 { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[lattice Rcmdr]; };
   RcmdrPlugin_pointG = derive2 { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
   RcmdrPlugin_qual = derive2 { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
@@ -3133,48 +3148,50 @@ in with self; {
   RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
   RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.2-0"; sha256="1z13rf5iwmzb7mj3yn4ykkh1r9bl4f4idlc4a34rn4psi9j7wlh1"; depends=[date Rcmdr survival]; };
   RcmdrPlugin_sutteForecastR = derive2 { name="RcmdrPlugin.sutteForecastR"; version="1.0.0"; sha256="1np42kizkk572vharki84ka34lr7bdlckn4227bnq2l37c0zsq5y"; depends=[Rcmdr sutteForecastR]; };
-  RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.9"; sha256="0nacpipaimb1348rhv1rma85gnd38wsg741pz7xpvn347wnnc0wz"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
+  RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="0.12.16"; sha256="1rm8hcy72p1jvxikvmkwg20pjqmvmfvqb45lfghmddp2adp67qfl"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="0.12.17"; sha256="08xg8h3w25sdb3xr18g9pa0x8cirkdgljqapxmw56ss1j9fc89s2"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; };
-  RcppAlgos = derive2 { name="RcppAlgos"; version="1.0.1"; sha256="0668anb3kjw3h71n2hjqqjrmiz4dwrgw71ikviq0imw2v5030392"; depends=[Rcpp]; };
+  RcppAlgos = derive2 { name="RcppAlgos"; version="2.0.3"; sha256="0m1hj249hyn6vwhqn2jismqkd07glk7nxqxwpq81rph9wp50ji0a"; depends=[Rcpp]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.10"; sha256="08s86ak26zybawry6l6l30k1lakc71k2j58539h70dnrmsd15jna"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.8.400.0.0"; sha256="11y2ksf46zw6fcz0kk70szyfn7qqxwwd33xylrxvnyb7ldmbc5yr"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.8.600.0.0"; sha256="15wqk6lnaxf6az9ccvmzpx6pi2cs19ng8j3qvk5zw1niljpp8n3k"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppBlaze = derive2 { name="RcppBlaze"; version="0.2.2"; sha256="0hi7gh7xlmdcyzxsis8wl841d6czbcgb8qdg8y822am1mvc0wmb7"; depends=[BH Matrix Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; };
   RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.9"; sha256="0c6vdrf16f8fyaczzwapzn513wrdklsc8izmzfmfbc58s5500gvk"; depends=[Rcpp]; };
-  RcppCWB = derive2 { name="RcppCWB"; version="0.1.7"; sha256="13iax4kr5gchm483gib3cdjcbvkymhiwbpnj705c325fbsfk5rj7"; depends=[Rcpp]; };
-  RcppClassic = derive2 { name="RcppClassic"; version="0.9.9"; sha256="102gi1l6hxdkz50iy9xbpb57iy5j7flv78sdq36pn9zi8x4k8k95"; depends=[Rcpp]; };
+  RcppCWB = derive2 { name="RcppCWB"; version="0.2.4"; sha256="00zgxdakjza8i0wi6zj7lri8ma0pxnsgccm9q16i2nqqndvk4q34"; depends=[Rcpp]; };
+  RcppClassic = derive2 { name="RcppClassic"; version="0.9.10"; sha256="1q0vld06dp00d2qdwnnrga4n9abiymqw74zpci2kx813n5z1l0yc"; depends=[Rcpp]; };
   RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; };
-  RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; };
+  RcppDE = derive2 { name="RcppDE"; version="0.1.6"; sha256="1i9jj595nqpb16y22z2b8fcf0gq1fg0pbiisbd837p1cyw4nff69"; depends=[Rcpp RcppArmadillo]; };
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
   RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.4.0"; sha256="1m6ssq6lvi36ggf26y4hhq996583pxxdb978jnn1x6r9gdb0q0hi"; depends=[Matrix Rcpp]; };
+  RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
   RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; };
   RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
-  RcppGSL = derive2 { name="RcppGSL"; version="0.3.3"; sha256="0ih6lcby6rx0pkzwnd4bxq40cxa3cw9nfrphhhm9q71ng5vj1vrr"; depends=[Rcpp]; };
+  RcppGSL = derive2 { name="RcppGSL"; version="0.3.6"; sha256="16pdapq31729db53agnb48jkvdm97167n3bigy5zazc3q3isis1m"; depends=[Rcpp]; };
   RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.2"; sha256="0z5sg2jlr465196ws2pqi7j7hfmd7j8xlqqj6841m635cg4q48ba"; depends=[Rcpp]; };
   RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; };
   RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; };
   RcppHoney = derive2 { name="RcppHoney"; version="0.1.7"; sha256="1jnng6271i2a564y115mr2bq324xffcjpq0ysy8yar2cgljxgspr"; depends=[Rcpp]; };
   RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; };
-  RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.1"; sha256="0pd5jgv24yskxzp76c3i6lkpq9npdgw1i15dcf02v9h43q8n1s9s"; depends=[BH Rcpp]; };
+  RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; };
+  RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.2"; sha256="0118ajmgl8gdc1cd47x0pnp4qglszc3j3izw98m6y2gkm3rnkzad"; depends=[BH Rcpp]; };
   RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-2"; sha256="0j0hvwsbidahk2zx3zk7fhc6m9cca27iq3ivx7vdvggz8iqzszrz"; depends=[Rcpp RcppEigen]; };
   RcppParallel = derive2 { name="RcppParallel"; version="4.4.0"; sha256="1gjqmkzsi1fi0vss1nvq6i77j3aixdxd047mw9vf4l60z2ypr3h1"; depends=[BH]; };
-  RcppProgress = derive2 { name="RcppProgress"; version="0.4"; sha256="09ayw6d69i0lplmaj5md25p5hn1nmiyp6a4sh60v93nrrs1cq7iv"; depends=[devtools Rcpp]; };
+  RcppProgress = derive2 { name="RcppProgress"; version="0.4.1"; sha256="0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi"; depends=[]; };
   RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; };
   RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; };
-  RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
+  RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; };
   RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; };
   RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; };
   RcppTOML = derive2 { name="RcppTOML"; version="0.1.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; depends=[Rcpp]; };
-  RcppThread = derive2 { name="RcppThread"; version="0.1.3"; sha256="1nnyamjap1kgganvgwj48nip8nd7h35hzj7yvd131jnpq31gvvjg"; depends=[Rcpp]; };
+  RcppThread = derive2 { name="RcppThread"; version="0.4.0"; sha256="0snrs66r19zha43xqkgcz1r15f7x8ifg1vyi0d7j175bkmin2jlb"; depends=[Rcpp]; };
   RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.0"; sha256="0833j7hy7dpdxkj1m5cfyxzpp7j0n7mxjc5kx32mdn5s43iaf7yh"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
-  RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.4"; sha256="16wdsm0zzn6q0h29a1w8yjn4zxvrirsws6h31k0ljgprsn3jjhz4"; depends=[Rcpp RcppGSL]; };
+  RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; };
   Rcrawler = derive2 { name="Rcrawler"; version="0.1.7-0"; sha256="0r8s3d4dby9vn0qc5lbhab4vh3yl5yifi7ipxafsgffdxislnsdw"; depends=[data_table doParallel foreach httr selectr xml2]; };
   Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
@@ -3184,7 +3201,7 @@ in with self; {
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
   Rdimtools = derive2 { name="Rdimtools"; version="0.3.2"; sha256="0wk6sv2ahxscy4nsk826c9rlq8vxgnflg9banwdxhs6qlqhipnlb"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; };
   Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
-  Rdpack = derive2 { name="Rdpack"; version="0.7-0"; sha256="0j8jh5zj4nhcchl3xr6n6bvc4m0irjz44mw5690f7iqfi3mzkii6"; depends=[bibtex gbRd]; };
+  Rdpack = derive2 { name="Rdpack"; version="0.8-0"; sha256="0r4mcg7mqb7h0c6pn0vh622vw7kvdpmy51qvhgf753yywfznkwq6"; depends=[bibtex gbRd]; };
   Rdrools = derive2 { name="Rdrools"; version="1.0.3"; sha256="1y805j2xrv8kgh42s5lig07mb76fcz5yrxal0zaykj16cvid8287"; depends=[Rdroolsjars rJava]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
@@ -3192,19 +3209,19 @@ in with self; {
   Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; };
   Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; };
   ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
-  ReIns = derive2 { name="ReIns"; version="1.0.6"; sha256="1q2f3ggg534dlgrmb4bsv8ikph11qg29asw1fpkndd9a96kc8gbk"; depends=[doParallel foreach Rcpp survival]; };
+  ReIns = derive2 { name="ReIns"; version="1.0.7"; sha256="1r28wyb7yh5aymlnd3yxkqmn4lnfnipfsnpbgl71zql763fchwlg"; depends=[doParallel foreach Rcpp survival]; };
   ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; };
-  RealVAMS = derive2 { name="RealVAMS"; version="0.4-0"; sha256="1byh7in3bpfgdwfxp15334h167bvrcfj0cdswqy3yd81l9g2ickn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+  RealVAMS = derive2 { name="RealVAMS"; version="0.4-1"; sha256="13x8yryl5vp3rn6n2hd14ng6cgr3bxkps4y1vanimbwv4faa8116"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
   RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-10"; sha256="09xp0ad7v2bsg1r7gf3awdqcpds0v3ygsbnkm8ysy8w14sbrrydf"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
-  RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; };
+  RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.2"; sha256="0qbgamqkwh31ybk6a0jrd2r7jfvzprm6s90fiwpld8rzimgnh4f9"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; };
   Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
   RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.1"; sha256="1w0cx988ixl10d8ylfsblmk1mdd9dhzxdhp9z4n1643dkd2xzr02"; depends=[isva quadprog]; };
-  RefManageR = derive2 { name="RefManageR"; version="0.14.20"; sha256="18g2w32ldfakmnmlk1gaxq64jhx4iy7kil1s7g6lnvv1fygxpg8k"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; };
+  RefManageR = derive2 { name="RefManageR"; version="1.2.0"; sha256="09l17mj9m4v1hhc71smqbk566axycwb0f5np2z11y4waqf09dwkc"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
-  RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.3"; sha256="1d7rzvai36h7nmfvi6fdabba3rfa68x53li9jdrlk77mgpgr9vhw"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; };
+  RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.4"; sha256="1nw6hd9y2n1h3j1fqqkymz13xizv5xrsj93w702kkvkbwyl3yall"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; };
   ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.2"; sha256="1khk3yi0ixs4lzvng9pjmyyiy86bh5bx7wdyr915p1nbhq6yl2cl"; depends=[data_table ggplot2 hash]; };
   RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
   Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; };
@@ -3215,9 +3232,9 @@ in with self; {
   RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; };
   Renvlp = derive2 { name="Renvlp"; version="2.5"; sha256="0zsvjqbbakbr5bcgwpbjl8ns7hqgkk9v8g9b9yx2mjbv8vg40pz2"; depends=[Rsolnp]; };
   ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
-  RepeatABEL = derive2 { name="RepeatABEL"; version="1.1"; sha256="00bq9ls4d0kczdv752xasqbavb11bjfvpriggfc8dw3g3i7pizpg"; depends=[GenABEL hglm]; };
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
   Replicate = derive2 { name="Replicate"; version="1.0.1"; sha256="110pvissyv3dx1wpwpngcg18mpmpml49gcmdykip55s1d3ljf791"; depends=[metafor]; };
+  RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; };
   ReporteRs = derive2 { name="ReporteRs"; version="0.8.10"; sha256="18ivgd3736zcrimcyzfkh5d6h9s1srh7xdz597y596dsssx1lmc6"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
   ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.4"; sha256="0q11jcbkv9ibmkqr3mka0w5d797s8xb0155kcs5inlcacirp6wvy"; depends=[rJava]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
@@ -3225,18 +3242,18 @@ in with self; {
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.8.8"; sha256="0hbzkdi180l004y1l6v0nd6zp7rn45wx4ahaqnrm67pa366j500p"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.9.0"; sha256="1v43vakp3bqka4k295imyl95f3hkvnpkbwj61gbm37yxamxvx0s4"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
-  Rfmtool = derive2 { name="Rfmtool"; version="2.0.0"; sha256="1a8s4a4mdblzy76ljslfvz8zav2639plhby0ib5ccjnpz2sxhc7s"; depends=[]; };
+  Rfmtool = derive2 { name="Rfmtool"; version="3.0.0"; sha256="0hjy66b7d9xp4d8fzhs5zizvwlrdrmlmba2wf9fjraz5ysg0vnxv"; depends=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
   Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; };
-  Rgbp = derive2 { name="Rgbp"; version="1.1.2"; sha256="1g5v22zjgykzcg5jk7fi03xfn3jzz1yf38izjzhx2433d97hasr7"; depends=[mnormt sn]; };
+  Rgbp = derive2 { name="Rgbp"; version="1.1.3"; sha256="1340h5rzb4631h6aanrdjl4x4l0h6l5x61qqmckrdf08fw2625lp"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-3"; sha256="03v4cav465dkznm7d3bwwpx3qprhq25sp1rb5ncx2lka6inr1vzd"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
-  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.1"; sha256="0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"; depends=[png]; };
+  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.2"; sha256="112mdm53qx92n2m4ms02sbppckp44l1z19vy99j6gw3jrdprjydl"; depends=[png]; };
   Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; };
-  Rhpc = derive2 { name="Rhpc"; version="0.18-12"; sha256="095mrr6g05y9g8h88k1nf19zmjvg8hnmf5b3r6krqs4cxhp2qls2"; depends=[]; };
-  RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-12"; sha256="14qypi76h73iv3xwbb860r4f7516jyb88j92lmkifw03x86lx2b3"; depends=[]; };
+  Rhpc = derive2 { name="Rhpc"; version="0.18-185"; sha256="1clw2afvqx8bdz8f5fzqs0ybh95afp5n178hspp36awab34fpd9p"; depends=[]; };
+  RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-185"; sha256="0s950rildshsnfny6kxfw3jls4i50rfmzbg1zma4ilbwswzp7kpq"; depends=[]; };
   Ricetl = derive2 { name="Ricetl"; version="0.2.5"; sha256="0q87cxzqkkp2bk92q3wnxxsqlkafkd37lp5pki7f87a5vcxlcrak"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; };
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
   Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
@@ -3252,27 +3269,25 @@ in with self; {
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
   Rlabkey = derive2 { name="Rlabkey"; version="2.2.1"; sha256="1nsaab7nysld1gdqnpxd9g68vzs363szyinbfn6j2c7ch0vqcrka"; depends=[httr Rcpp rjson]; };
-  Rlda = derive2 { name="Rlda"; version="0.2.4"; sha256="01dh6x0yh9y7q8c8qy0zkkn2y18wzg5y90v4gcawdb1adz46izg2"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.0"; sha256="0nnkblrgycvfwn0lb9j92f5wpln69kk54z4irwi35rrfl31f689m"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; };
   Rlinsolve = derive2 { name="Rlinsolve"; version="0.2.0"; sha256="08ib0jjqicscn4mx5yv25q0x66iycx8jhazvjb47nqvn24mirprp"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
-  Rmalschains = derive2 { name="Rmalschains"; version="0.2-3"; sha256="1gh0f385s1nq12mk6a5l3nj1gd2mc6jzd66lisnxbcip25s4b8pb"; depends=[Rcpp]; };
-  RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.16.1"; sha256="1z1i43imm0ch5ki7m5pxyjcxl280zmfzv8nizraf73zw852gzhb2"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; };
+  Rmalschains = derive2 { name="Rmalschains"; version="0.2-4"; sha256="1rzslwwp6ikp3zky2zlqylsd8nmhv13iz2h87kwxfkh3611x28yk"; depends=[Rcpp]; };
+  RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.17.0"; sha256="09lrrxnkkfnbidnmag1czx2xzssdl09348nkc6pqgq6xz36a3mqc"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; };
   RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; };
   Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
-  Rmixmod = derive2 { name="Rmixmod"; version="2.1.1"; sha256="1m5yab7wq343bzg8xszbrlif3cd4d1x7xcqh82czkxbfni1gz7j7"; depends=[Rcpp]; };
+  Rmixmod = derive2 { name="Rmixmod"; version="2.1.2"; sha256="06d8iwnjd9n4rfmcsnqzhi5ai0rxlc1qwij5s7ixkncq8c402a2k"; depends=[Rcpp RcppEigen]; };
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
   Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; };
   Rmpfr = derive2 { name="Rmpfr"; version="0.7-0"; sha256="0jpj3nl76jd6vc2p1xwr8jl62q8ckwsdaxqnk9b20srkq63mfrig"; depends=[gmp]; };
   Rmpi = derive2 { name="Rmpi"; version="0.6-7"; sha256="1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw"; depends=[]; };
-  RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; };
-  RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
+  RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
   RndTexExams = derive2 { name="RndTexExams"; version="1.4.1"; sha256="1gi96hfd7dkvmbvy6hj25g1l7nwk4yhxkdjx1l3ws3c2zpi27cvj"; depends=[CopyDetect data_table stringi stringr]; };
   Rnets = derive2 { name="Rnets"; version="0.9.8"; sha256="0lcgapspl7ndrf3gxkrsv1172f2sv2587zaa1q6b950zympcvcj3"; depends=[data_table glasso igraph]; };
-  Rnightlights = derive2 { name="Rnightlights"; version="0.1.5"; sha256="162n1k8dxd8g5ymwj59v8fkiflqhl2ik9mk1g8rf46dk84h0zflb"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
-  Rnumerai = derive2 { name="Rnumerai"; version="0.2"; sha256="03qjrpi3hdbn8ni0ga57s3fsd2207mm34vl3p3n6y4vn15vg1k4n"; depends=[httr lubridate]; };
-  RobAStBase = derive2 { name="RobAStBase"; version="1.0.1"; sha256="17vfi0ia3z3s6x7frjk1alcgb0h73gwxy2n11kfl0k8w2fxgk49l"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
+  Rnightlights = derive2 { name="Rnightlights"; version="0.2.1"; sha256="07fd49i0cybnr5d14qf7d9p95frw8qjslrx9y2bwdrx89fvp0gk8"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
+  Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; };
+  RobAStBase = derive2 { name="RobAStBase"; version="1.0.2"; sha256="10bbv9jjh6zznkzrlkx7dahahicab8ld11ah1mar2kz09bdz3kih"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
   RobAStRDA = derive2 { name="RobAStRDA"; version="1.0.2"; sha256="1lyp2y38jnwv8ggrv9pdzprpf2gs62w1mpzwcqcbrmy7fzjsym0b"; depends=[]; };
   RobLox = derive2 { name="RobLox"; version="1.0"; sha256="0y193xai0mfwpm6zhxgy21h4yrlqrpvwx84bj4xnr8ql87wznh7q"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
   RobLoxBioC = derive2 { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[affy beadarray Biobase BiocGenerics distr lattice RColorBrewer RobLox]; };
@@ -3280,12 +3295,12 @@ in with self; {
   RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
   RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
   Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
-  RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; };
-  RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.0"; sha256="1pkgwglnb68563hiirkagz33jfksbzj3cvdyv13brrzx6jzcvw11"; depends=[Rcpp RcppEigen RobustGaSP]; };
+  RobustAFT = derive2 { name="RobustAFT"; version="1.4-3"; sha256="0x7sn2y9s6nwzlj8476irv893crwag6v4k7w3w589k33kkz5n2hp"; depends=[robustbase survival]; };
+  RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; };
   RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.5"; sha256="0asxhzybpfmz3zzhr32hvcxrdmdsjlqjvxiihrxc8f4w3qwnzb82"; depends=[Rcpp RcppEigen]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
-  Rodam = derive2 { name="Rodam"; version="0.1.2"; sha256="0fxsjzillr2v3sxbph13q3wrly6dx6m8rm276qzfvx1md044z14y"; depends=[RCurl]; };
+  Rodam = derive2 { name="Rodam"; version="0.1.3"; sha256="0cfqrvvwkz4marmkxxl2ihi5gdbmr51q2r0sk1lkppa5drdh8cb5"; depends=[RCurl]; };
   RonFHIR = derive2 { name="RonFHIR"; version="0.2.0"; sha256="1kcbv8ibqh7jb3dpj4p73vd168c6vlwi08s9cshl4w6hqbz1pklg"; depends=[httr jsonlite R6]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
   RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; };
@@ -3296,17 +3311,18 @@ in with self; {
   RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; };
   Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
   Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
-  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.2.4"; sha256="1klianmsm3msgy5sbigxzx1mzsl915hmam6h2llr274r5gqhg4wh"; depends=[futile_logger R6 rgl stringr testthat XML]; };
+  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.2.5"; sha256="1q24vpbzig7pr7l3nk24vs8qb476l6mcb02v6sjk7md1hrysk34y"; depends=[futile_logger R6 rgl stringr testthat XML]; };
   Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; };
   Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; };
   Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
   Rramas = derive2 { name="Rramas"; version="0.1-5"; sha256="0wy0flzp68mikq4v9k5pv6hbzx0w9mpa74dwx79i3iiddn0ylby6"; depends=[diagram]; };
-  Rraven = derive2 { name="Rraven"; version="1.0.2"; sha256="0mhf0vv58la1xh8vc31ak1wfi47zsqbjgxy7zz4bjk90g6110jyp"; depends=[doParallel dplyr foreach kableExtra pbapply pbmcapply vegan warbleR]; };
-  Rrdrand = derive2 { name="Rrdrand"; version="0.1-15"; sha256="1i7snj33p44v43bz57x1887ing8h02xrf86rv7q0qijj198qf7dr"; depends=[]; };
+  Rraven = derive2 { name="Rraven"; version="1.0.3"; sha256="076c7qki4whl6hb5918mdyn3iljgvd31c4c4lydbpwx0x0x1lxqn"; depends=[dplyr kableExtra pbapply vegan warbleR]; };
+  Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; };
   Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; };
   Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; };
   Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
   RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; };
+  Rsmlx = derive2 { name="Rsmlx"; version="1.0.1"; sha256="1vzdzidi0i4gcpdmxcsfi6qh66wk20r9cw5s3y8fqd0nkdjlsagx"; depends=[ggplot2 gridExtra MASS RJSONIO]; };
   Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; };
   Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.1"; sha256="09dsiic9bfy1yq7bwspidn6w21vff3jay8812abydz1l1fz4qv5i"; depends=[kohonen Rcpp]; };
   Rssa = derive2 { name="Rssa"; version="1.0"; sha256="0alh0vq3qqzrn1kklqfp52qknasfq6yzk2dprz3g9pyq05qhmhlw"; depends=[forecast lattice svd]; };
@@ -3316,7 +3332,7 @@ in with self; {
   Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; };
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
   Rtsne = derive2 { name="Rtsne"; version="0.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; depends=[Rcpp]; };
-  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.6"; sha256="18pi42n8zdrahwazcf553clqf0j1ngndb9vg5y71zcdwwphg7caf"; depends=[]; };
+  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.7"; sha256="12hf9r3mhjr9sawdvf7qhjf1zph2q64f77i81jwvy7awidbm0kja"; depends=[]; };
   Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; };
   RtutoR = derive2 { name="RtutoR"; version="1.1"; sha256="132vyqkzjzwms9sbw6dmkqqk45si89r0xvy477xl98k14a2q4jlw"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes plotly ReporteRs rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; };
   Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; };
@@ -3330,7 +3346,7 @@ in with self; {
   Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.6-1"; sha256="1dkz6kq9wq7q2xw2wdzii5682w9f7rmgq28g7pfh8ivimfg1q4bi"; depends=[brew digest dparser inline magrittr Matrix memoise R_utils Rcpp RcppArmadillo rex]; };
+  RxODE = derive2 { name="RxODE"; version="0.7.2-5"; sha256="04irzzv7n7jax1ricdwsmbw0gjn2x4d7cz7hg6y81qhjw4p8qgdi"; depends=[brew cli crayon digest dparser inline magrittr Matrix memoise mvnfast PreciseSums R_utils Rcpp RcppArmadillo rex]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
   Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
@@ -3338,7 +3354,6 @@ in with self; {
   SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
   SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; };
   SADISA = derive2 { name="SADISA"; version="1.0"; sha256="0v68k6pwcr2hfsffkcrvpgfwciwir2jsg3q1kvr0ka5iiizpliz3"; depends=[DDD pracma subplex]; };
-  SAENET = derive2 { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
   SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; };
   SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; };
   SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; };
@@ -3347,7 +3362,7 @@ in with self; {
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
   SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
   SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; };
-  SARP_compo = derive2 { name="SARP.compo"; version="0.0.3"; sha256="1fn2rrd89qhz3vnz58xmmdjda70k474iyh4v1cmjfdam74fax7kh"; depends=[car igraph]; };
+  SARP_compo = derive2 { name="SARP.compo"; version="0.0.7"; sha256="1z4md8qbk4k6akaxakf8njvn5mqpfzjclizvigyw41hwi03rxry3"; depends=[car igraph]; };
   SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.8"; sha256="1hz5a2zjv8hrasjck981sqahq0l88b6ard1iwsfqznalva8zywbb"; depends=[]; };
   SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
@@ -3357,15 +3372,17 @@ in with self; {
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
   SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
   SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; };
+  SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; };
   SCAT = derive2 { name="SCAT"; version="0.3.0"; sha256="1zgf4lwzgs0w3ynf6grs212mmmxihqz8cpwk65g08nna5mxzxq06"; depends=[]; };
   SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; };
+  SCCS = derive2 { name="SCCS"; version="1.0"; sha256="0v1ycyx45jlv4y82q0kpcmmfcaaspmkk9nd89k6cfh24n6zf9j6w"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; };
   SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; };
   SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
   SCGLR = derive2 { name="SCGLR"; version="2.0.3"; sha256="03v76nh6ng41hh4lm27r8ipf382sj98dyl9lh4fzl4y6ff1vwzzj"; depends=[expm Formula ggplot2 Matrix pROC scales]; };
   SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; };
   SCMA = derive2 { name="SCMA"; version="1.2.1"; sha256="17hn3axhmd6wchh1zmgrj026y5yhg6w68d1mif38rrf5cb2wwjnq"; depends=[]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
-  SCORPIUS = derive2 { name="SCORPIUS"; version="1.0"; sha256="1ipqscj20qkqik5gsiramsv18ld4k5g9w0gllf1izjimrlrnqc6n"; depends=[dplyr fitdistrplus ggplot2 magrittr MASS mclust pbapply pheatmap princurve purrr ranger RColorBrewer Rcpp reshape2 testthat tidyr TSP]; };
+  SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.2"; sha256="01rg3c5i5wbdbkssmzr9x8chd9qm3ijdgvdh1cba6ry9y88f6ry5"; depends=[dplyr dynutils ggplot2 magrittr MASS mclust pbapply pheatmap princurve purrr ranger RColorBrewer reshape2 tidyr TSP]; };
   SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; };
   SCRT = derive2 { name="SCRT"; version="1.2.2"; sha256="1x6bzcgb5blavj4zdw4jam5r8yad3plyfzk31vz9pjv39784k229"; depends=[]; };
   SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; };
@@ -3373,16 +3390,17 @@ in with self; {
   SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
   SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; };
   SDEFSR = derive2 { name="SDEFSR"; version="0.7.1.0"; sha256="1pknkda7iaq5247557b93kc3cf2ih7b3wpqpkqyfgfay3ci9kg16"; depends=[]; };
-  SDLfilter = derive2 { name="SDLfilter"; version="1.0.0"; sha256="0g6cwpz1mzmcq16h34255sanqqwyb0a8dn6h043ksvnc91h2haa0"; depends=[data_table geosphere raster sp trip]; };
+  SDLfilter = derive2 { name="SDLfilter"; version="1.1.1"; sha256="0z38lpalbmvc92fqya0zna2x74rlvqhqf08c48l4l9zwgvf0l6z0"; depends=[data_table geosphere ggmap ggplot2 ggsn gridExtra raster sp trip]; };
   SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; };
   SDMTools = derive2 { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
   SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; };
   SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
   SDraw = derive2 { name="SDraw"; version="2.1.3"; sha256="179h5byh92dkycchalf875pwq1h4ryg3hba9fs7fbq4dshki5i7p"; depends=[deldir rgeos sp spsurvey]; };
+  SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; };
   SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
   SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
-  SEERaBomb = derive2 { name="SEERaBomb"; version="2017.2"; sha256="0fjw8gjafhy6jdj4w9b4xj634gzpdnjbmn2dhhlfg3a7fqh4y91q"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales survival XLConnect]; };
+  SEERaBomb = derive2 { name="SEERaBomb"; version="2018.1"; sha256="1nlxpifsjpkmb7pjr2hmzr5rsys93p7nmrpxfkfmljblfd80zj4a"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr Rcpp reshape2 rgl RSQLite scales stringr survival tibble tidyr]; };
   SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
   SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; };
   SEMID = derive2 { name="SEMID"; version="0.3.1"; sha256="0q2lbcfl5yq2kihdfyql5n74bpf4d8z8vjkqwnpwxzmpg5qa5q32"; depends=[igraph R_methodsS3 R_oo R_utils]; };
@@ -3393,32 +3411,34 @@ in with self; {
   SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; };
   SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
-  SGP = derive2 { name="SGP"; version="1.7-0.0"; sha256="0jjrrza8s6sj3gmmldnyxshfmcaf8xhp4g50vc3rcwnkg1jhzkg8"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; };
+  SGP = derive2 { name="SGP"; version="1.8-0.0"; sha256="02yh6kvc34gn33cbnhc5b86pmir1zbl6s875hangwb3qx7r13dx0"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames RSQLite sn toOrdinal]; };
   SGPdata = derive2 { name="SGPdata"; version="20.0-0.0"; sha256="0fxv7nnxiaq6z9wii9x5qiy0vd2z8jw3gcwl5fj9m29ja7j3900g"; depends=[crayon data_table]; };
   SHELF = derive2 { name="SHELF"; version="1.3.0"; sha256="0qhkp1ypbimiq9r8yv95bipbmhm7b38ibbk9nmhdckrr6ymd2w35"; depends=[ggExtra ggplot2 MASS shiny tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
   SI = derive2 { name="SI"; version="0.1.0"; sha256="11ywmyz4mamk30p4m9qvgmba237s1xvabablh91rwq13089x8nxm"; depends=[]; };
   SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; };
+  SIBERG = derive2 { name="SIBERG"; version="2.0.2"; sha256="0wfx1dpjd09gb736sm2xhrkba26nwnzn5x575h39n2g33jwqqy2r"; depends=[mclust]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
   SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
   SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
   SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; };
   SIMMS = derive2 { name="SIMMS"; version="1.1.1"; sha256="1wgqz8zgijv5psz5r5zj9k63ikq5sr1dxqxvh48n2041slj6jdap"; depends=[doParallel foreach glmnet MASS survival xtable]; };
   SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
-  SIRItoGTFS = derive2 { name="SIRItoGTFS"; version="0.2.2"; sha256="1vjpnhpf8b3fwxgmmp7nljmk8js7sn2sn9ajlsgpmnww1bq4sh5f"; depends=[data_table dplyr easycsv reshape2 rgdal rgeos sp]; };
+  SIRItoGTFS = derive2 { name="SIRItoGTFS"; version="0.2.4"; sha256="1hyhjwkv26fpplzqrdh41r8j91la5j0jidbwnh2vla6s3wf7jg47"; depends=[data_table dplyr easycsv reshape2 rgdal rgeos sp]; };
   SIS = derive2 { name="SIS"; version="0.8-6"; sha256="1749ks5iqlj6lrn0hglifj1iy86dcpqz2pcnf1l798pa05rq8ngd"; depends=[glmnet ncvreg survival]; };
   SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; };
+  SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; };
   SKAT = derive2 { name="SKAT"; version="1.3.2.1"; sha256="0ylfz63xiq2zw9nc8nqr89qbhl3fnkhjgg9x7yxjm78vrn640hkl"; depends=[]; };
   SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
   SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; };
   SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; };
   SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; };
+  SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; };
   SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; };
   SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
   SMCP = derive2 { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; };
   SMCRM = derive2 { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; };
   SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; };
-  SMIR = derive2 { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; };
   SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; };
   SMM = derive2 { name="SMM"; version="1.0.1"; sha256="0g2blwcir0sxvqrivcyn9a8ssx34834lgcwrjwb6kcrq224dchws"; depends=[DiscreteWeibull seqinr]; };
   SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; depends=[Rcpp RcppArmadillo]; };
@@ -3426,12 +3446,11 @@ in with self; {
   SMPracticals = derive2 { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
   SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
   SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
-  SNFtool = derive2 { name="SNFtool"; version="2.2.1"; sha256="0id8qvkvxvnlqn3wha45v457pr4061j35wcwlqwh03n0j549s84l"; depends=[heatmap_plus]; };
+  SNFtool = derive2 { name="SNFtool"; version="2.3.0"; sha256="1yplcwmy7jhsvz19r82ivpxfqav7q88jcf8d0r2k8ll9iqmi1dbc"; depends=[alluvial ExPosition heatmap_plus]; };
   SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; };
   SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; };
-  SNPknock = derive2 { name="SNPknock"; version="0.5.1"; sha256="0vp6nsa2ydfn6m7fwsgjwdzhvrwzjyv79n1fa5910lj1f0g5ijw2"; depends=[Rcpp]; };
+  SNPknock = derive2 { name="SNPknock"; version="0.7.1"; sha256="0pfgmwn28bcfc45bx66gwhl5l7jsqhl3a9562rijrbjfjy4f4sln"; depends=[Rcpp RcppProgress]; };
   SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; };
-  SNPtools = derive2 { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; };
   SNSequate = derive2 { name="SNSequate"; version="1.3.1"; sha256="1w6yai79996pgg98skfb63kha8rqjzn751nmxg961rc4id1g8ysn"; depends=[emdbook knitr magic plyr progress statmod]; };
   SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; };
   SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
@@ -3442,25 +3461,25 @@ in with self; {
   SOLOMON = derive2 { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
   SOMbrero = derive2 { name="SOMbrero"; version="1.2-3"; sha256="04vla01y3qagzpyr70mx9dgl0ihk9a9vh02896fr8kc9ch3sx6bd"; depends=[igraph RColorBrewer scatterplot3d shiny wordcloud]; };
   SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; };
-  SOR = derive2 { name="SOR"; version="0.23.0"; sha256="0djmz57g23xpzv6p8i71f3zrsc6xdgqkbcvn5cbx9m78n31ipkm5"; depends=[Matrix]; };
+  SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; };
   SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
   SPA3G = derive2 { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
   SPACECAP = derive2 { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; };
   SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; };
   SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; };
   SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
-  SPAtest = derive2 { name="SPAtest"; version="2.0.2"; sha256="1h1qgjisd1kxw3644s5xmj212mnqkbfdzz9sa9wk4vb2dzv4660r"; depends=[]; };
+  SPAtest = derive2 { name="SPAtest"; version="3.0.0"; sha256="0pq8mbj05x4l3lvdgayxigviirhx6ghf4w5bkpvg9hggkb79ib9y"; depends=[]; };
   SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; };
   SPCAvRP = derive2 { name="SPCAvRP"; version="0.2"; sha256="1kqx2mf75h491aj6rm923frpj1yl9c1p666cq3f1d7aa1k9byrzi"; depends=[MASS]; };
   SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
-  SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.5"; sha256="1m8als33k8db82pr9k8n4jk6i1dqimd9klw8xawwz7gzk1h31fsr"; depends=[]; };
+  SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.6"; sha256="1py7vw1jfn9pf0xj1syyk7xv5593bilmzrb0p3iy85bks8iijlgx"; depends=[]; };
   SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; };
   SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; };
   SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; };
   SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; };
   SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
   SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
-  SPOT = derive2 { name="SPOT"; version="2.0.2"; sha256="17apfbsh4qv3yhv7jpmmyz7whwx4ilm0krspxyc4knm3yxxw26bp"; depends=[DEoptim MASS nloptr randomForest rgenoud rsm]; };
+  SPOT = derive2 { name="SPOT"; version="2.0.3"; sha256="0xh2321611dyp8za5ydb92bx2kcrij0ah40lcx42s5ai31mackyl"; depends=[DEoptim MASS nloptr plotly randomForest rgenoud rsm]; };
   SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; };
   SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
@@ -3469,40 +3488,42 @@ in with self; {
   SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; };
   SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; };
   SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; };
+  SQB = derive2 { name="SQB"; version="0.2"; sha256="11ccgf6bsnzfmqs92jl1ds09h2352qhjmwb88dvd7qww9admd0ig"; depends=[caret nnet pls rpart]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQRL = derive2 { name="SQRL"; version="0.3.0"; sha256="1d4wnm03a900gyhayxkrqpwyxmj8mbqadhi3bzqvi6wb01517a0r"; depends=[RODBC]; };
+  SQRL = derive2 { name="SQRL"; version="0.4.0"; sha256="0wl4drma9nznqdbgb95wq2g12iy87g4s3h67n8dpxp7alx5lxy7q"; depends=[RODBC]; };
   SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
   SSBtools = derive2 { name="SSBtools"; version="0.2.1"; sha256="1cqdmvh9gxyx2yciy0j54v84hl8cayifv368ip5y3k6g1cff6488"; depends=[]; };
   SSDM = derive2 { name="SSDM"; version="0.2.4"; sha256="1zn0iaav58pjzd6ckm28w16pblkjxacj2s1daj0sk0423dhjkf76"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; };
-  SSDforR = derive2 { name="SSDforR"; version="1.4.17"; sha256="0c4w1fl199ksb63xxpawmld8bri9vcpbd2ypx5qrdfk4if5jhrrf"; depends=[MASS psych TSA TTR]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.4.18"; sha256="0ffy6gk94q4wlil4jhvc0y2pxim81vza517scly71zwp004381q3"; depends=[MASS psych TSA TTR]; };
   SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; };
-  SSLASSO = derive2 { name="SSLASSO"; version="0.0-1"; sha256="045w4j9rqqmkp1am838isa9an30hlvc46w9fkpl0q6npk6fl9rws"; depends=[]; };
+  SSLASSO = derive2 { name="SSLASSO"; version="1.1"; sha256="0zkzsdk568y9n9yj160i2vxgl570zvrfagwyafapypq5bz1cyjpi"; depends=[]; };
   SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; };
-  SSN = derive2 { name="SSN"; version="1.1.12"; sha256="1c2dx7d9izd4z76pvsbbfb0r1a6w45x96mv4vb9h99yafcw380nv"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
+  SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
   SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; };
   SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; };
   SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; };
   SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
   STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; };
   STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
-  STARTS = derive2 { name="STARTS"; version="0.3-24"; sha256="13963x27y81ahwnhzghq3wadlkkq8k8mga2ap2knx5p980fj1jb7"; depends=[CDM LAM sirt]; };
+  STARTS = derive2 { name="STARTS"; version="0.4-24"; sha256="0ghyan879i7jbzj228b604gfr91m5ybdszi3v8s7ix9yiqq518rw"; depends=[CDM LAM sirt]; };
   STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; };
   STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; };
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
   STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; };
   STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; };
+  STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; };
   STV = derive2 { name="STV"; version="1.0.0"; sha256="034d9qnvgmk97ah7r9w2hvnw39f7mxs2ml6y8dad94p8phl52gfw"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
-  SUMMER = derive2 { name="SUMMER"; version="0.1.0"; sha256="14dq64h931l8r4pfhdg3i8wabb08n1fnnp8ql1bmhl1z4dqbggfl"; depends=[classInt ggplot2 maptools RColorBrewer sp spdep survey survival]; };
+  SUMMER = derive2 { name="SUMMER"; version="0.2.0"; sha256="019yfw76jihk886990pivq1mzbbjbwpn7b4bvmacgbb9v6qrsl3b"; depends=[classInt ggplot2 maptools Matrix pixmap RColorBrewer reshape2 rgeos sp spdep survey survival]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2-8"; sha256="13d9v1l85md1v6qyfrdc3l36yanw5canskngjr1sh0hmyla182bz"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
   SWMPr = derive2 { name="SWMPr"; version="2.3.0"; sha256="1z6gg8ih1m5nxm1kilpwxj4xvlbyqr67la7idrfa722y6f6264rf"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
-  SWMPrExtension = derive2 { name="SWMPrExtension"; version="0.3.12"; sha256="1l79576a4v7kdgnb3skmakbfgnxfr069dn60v31x1fjq75k2lklq"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp stringr SWMPr tidyr]; };
+  SWMPrExtension = derive2 { name="SWMPrExtension"; version="0.3.16"; sha256="1dx1wxmrmkz4cq8av0fzl0ncwl3zyzbmlcakh8272989slgfv20x"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; };
   SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; };
   SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; };
   SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; };
@@ -3513,12 +3534,13 @@ in with self; {
   SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.9"; sha256="1fl9wgbfnkn2ai4swspl88crqpgd9b43hj8rkqkky4b49b8f6bj8"; depends=[mvtnorm]; };
   SamplingStrata = derive2 { name="SamplingStrata"; version="1.2"; sha256="1qz0pcmp8a9wbq8qx1j2bv1j4makx97v9n4aiklagnmszg2gvggy"; depends=[memoise]; };
   SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; };
+  SanzCircos = derive2 { name="SanzCircos"; version="0.1.0"; sha256="0vw41qldp1gsj4mx2hdd5jfhx9r8pv62i8gvs86p6bvfzy2l1lq4"; depends=[dplyr pbapply purrr randomcoloR readr tibble tidyr]; };
   Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
   SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.2"; sha256="0xa53mqmv31gid6n82bnfmds6p8nkjlmkj15hyycxhja2j752knm"; depends=[caTools foreign haven ncdf4 network readbitmap readODS readxl tiff xml2]; };
   SciViews = derive2 { name="SciViews"; version="0.9-13"; sha256="11zkq3dz2c7l8qxm3wrr3b5bb9h70sf9qxaz983lqwpjva30baa8"; depends=[ellipse]; };
   ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
-  ScottKnott = derive2 { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; };
-  ScottKnottESD = derive2 { name="ScottKnottESD"; version="2.0.2"; sha256="08pg51rjvb29fhv8wx03q6ncfw616pszgpcdywkplbgab26rrx1q"; depends=[car effsize forecast reshape2]; };
+  ScottKnott = derive2 { name="ScottKnott"; version="1.2-7"; sha256="0jxyz0adywfvz0mks5s3kjkb2hds1g0gswshpl73hr1ypr9n39cx"; depends=[]; };
+  ScottKnottESD = derive2 { name="ScottKnottESD"; version="2.0.3"; sha256="0gjpjd8ljnp3v4fc72vhwjgscfw9vfivx710yg683pp30z0sv9nf"; depends=[car effsize forecast reshape2]; };
   ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
   ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; };
   SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
@@ -3534,10 +3556,12 @@ in with self; {
   Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="2.0"; sha256="0c7ag9svd1xlm60padg41gvz7qnbcp41kg3cz2dvi9hy2yrqw0qd"; depends=[]; };
   Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
   SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; };
-  Select = derive2 { name="Select"; version="1.3"; sha256="0gl0rba9d2l3r70wnxlc3d9s8lcgxl9scsb27x4zid5a3y7n7mpw"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
+  Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.0"; sha256="1f1rv48qpmgg0z25vmz48ziimj6bwnxlzf2k4i1xwb53qxxyysxw"; depends=[Formula MASS survival]; };
-  SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; };
+  SemNetCleaner = derive2 { name="SemNetCleaner"; version="0.1.1"; sha256="0ry6lv33iynh1dy31zag5z36wr1limi8d7bbcjykcbgsbwcbazfj"; depends=[doParallel dplyr foreach ggplot2 magrittr NetworkToolbox plyr purrr qdap RColorBrewer tm]; };
+  Semblance = derive2 { name="Semblance"; version="0.1.0"; sha256="11mpqfpv7i5nqyn9s63bfphj35sh4gx4hjy0gc22sfqn0lmvl132"; depends=[fields]; };
+  SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.1"; sha256="0m0primbkpjw4pmmabdgvp5l21aqfifnryga1rp2ng9cm5ncxxqg"; depends=[Formula MASS survival]; };
+  SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.4"; sha256="1dj8gj04yfn0lj83b90b4p0ilgphmzcalz95xw7xgvivww8yj1dg"; depends=[MASS numDeriv Rsolnp]; };
   SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; };
   SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; };
   SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
@@ -3548,29 +3572,29 @@ in with self; {
   SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; };
   SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-2"; sha256="18vycj9vpb32610sn321sbwdnjldyjm9idjw9spggdzj7gsiwwk3"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; };
   SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; };
-  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.6"; sha256="0y06am4q9cgf8cfycw9ym5qys0g99ks3cfxgk0mss34i5vhbfjfr"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
+  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.7"; sha256="0qg1zpamcbjia2q8900yzihahb0y7kc48smxipncf8bb68256pyv"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
   SeqKat = derive2 { name="SeqKat"; version="0.0.6"; sha256="0idxyn84rqsg26y6ml218g037qxrx9755ikasyn212qacc36in39"; depends=[doParallel foreach Rcpp]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; };
   Sequential = derive2 { name="Sequential"; version="2.3.2"; sha256="01zvgvdj57js08krskahk1ng3wkv9iblmirslgrmllf4q18zwsdr"; depends=[]; };
   SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; };
-  SetMethods = derive2 { name="SetMethods"; version="2.3"; sha256="10xzvr7xfv2vwa3byw4qb3v8gi8d36w9drjzqsxx52ffnjb95670"; depends=[betareg fmsb lattice QCA]; };
+  SetMethods = derive2 { name="SetMethods"; version="2.3.1"; sha256="0a8d476slmq1dpimmr1l97k2icjwr907rw463c9dqba82a3p8k7g"; depends=[betareg fmsb lattice QCA]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; };
-  Seurat = derive2 { name="Seurat"; version="2.3.0"; sha256="0kp3lw1s896zkjd6x2wp8qcg7wnm5b40g8vihps13f1m7j4nx7r0"; depends=[ape caret cluster cowplot diffusionMap doSNOW dplyr dtw fitdistrplus FNN foreach fpc gdata ggplot2 ggridges gplots gridExtra Hmisc ica igraph irlba lars lmtest MASS Matrix metap mixtools pbapply plotly png ranger RANN RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; };
+  Seurat = derive2 { name="Seurat"; version="2.3.3"; sha256="0hfv4balzjjir8gdhrzb92ap36k6imq3igvb1nn0rhb0fq7959cr"; depends=[ape cluster cowplot diffusionMap doSNOW dplyr dtw fitdistrplus foreach fpc ggplot2 ggridges gplots hdf5r Hmisc ica igraph irlba lars lmtest MASS Matrix metap mixtools pbapply plotly png RANN RColorBrewer Rcpp RcppEigen RcppProgress reshape2 reticulate ROCR Rtsne SDMTools tidyr tsne]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
   ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; };
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; };
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
-  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.6"; sha256="126rvy7pra60fz7pmc6n9liahhwrq313gbqrkvcpcwdv807l39c8"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; };
+  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.7"; sha256="0l350q6sy63m09fiamphhkc3hhlncqjn5r2w59gv2hwqnjhwhp2c"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinyjs stringr WrightMap xtable]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
-  ShortForm = derive2 { name="ShortForm"; version="0.4.0"; sha256="0fvv42n2dsl4602scad74w11vj1id9dzsj5szv7xnbgv8lzaawjm"; depends=[lavaan MplusAutomation]; };
+  ShortForm = derive2 { name="ShortForm"; version="0.4.1"; sha256="0c2q3lhcyfn3w4iqknid9gav11nlycy9lma5m49vixksv7rf5kyw"; depends=[ggplot2 lavaan stringr tidyr]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; };
   SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; };
   SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; };
-  SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
+  SiZer = derive2 { name="SiZer"; version="0.1-5"; sha256="1ldl7rza58fzfbqidr1kanhfhy744nrsxrm13qdpxirdxx3vji6q"; depends=[boot]; };
   SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; };
   SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; };
   SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
@@ -3580,11 +3604,12 @@ in with self; {
   SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; };
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
   SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.5.0"; sha256="10afb3k4rvsmgfx6m1csb0pvnjba1d896llfh3ksmjzxglmvslgw"; depends=[evd]; };
-  SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.0"; sha256="1fq1gjjjs2d91lvvpwlw1xqcr1kw10qzybzphpy6hniq1xx00nnj"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; };
-  SimDesign = derive2 { name="SimDesign"; version="1.9"; sha256="1pwci1n7psrsv4mbl1mw3806cilmf3y9v507cdlzcd8jxl354vj7"; depends=[foreach pbapply plyr]; };
+  SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; };
+  SimDesign = derive2 { name="SimDesign"; version="1.10.1"; sha256="1g7nvzvmhkisl5bibigrsiv9s9xpigyib01vf05dhyc97f1vsg18"; depends=[foreach pbapply plyr]; };
+  SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
-  SimInf = derive2 { name="SimInf"; version="5.1.0"; sha256="0ylkz6vybwza7fk24f4gybwm4afp0kcx0hlbl05jpif9gmwx6n3s"; depends=[Matrix]; };
-  SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.1"; sha256="08zd9bvi3vi2nz3ljaw9rymmqwg1k9yislk3s4ak3jgqmcaq9zls"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; };
+  SimInf = derive2 { name="SimInf"; version="6.0.0"; sha256="1bbmyqh367g4c6a2mnd78y08svaqyr96sj61wg1zn3n06892ilpg"; depends=[Matrix]; };
+  SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; };
   SimPhe = derive2 { name="SimPhe"; version="0.1.1"; sha256="00qqqsf7na5c9nslnfpbyr2ysf7d7bi6vnpfiy761nhg8vgf2vjv"; depends=[]; };
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
   SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.1.0"; sha256="1krdz4gxnqxj3wabc5hn7ayfqdfmpgg66zj09b3jnngcdaxkjlwb"; depends=[dplyr kinship2]; };
@@ -3593,14 +3618,14 @@ in with self; {
   SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; };
   SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; };
   SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; };
-  SimilaR = derive2 { name="SimilaR"; version="1.0.1"; sha256="1icm34g15c616q5ckf1d664kk6fchjbn4mw2d0bjshqsvlvn89ji"; depends=[BH Rcpp stringi]; };
+  SimilaR = derive2 { name="SimilaR"; version="1.0.2"; sha256="0sj4gd9b1hds6qi8kl508cgzl5vp7d1m3l07swxlv5bqq5adz6gr"; depends=[BH Rcpp stringi]; };
   SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; };
   Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; };
   SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
   SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.2"; sha256="1g7i31naczqf1hxmk1h5y9gq36rdfhf4al9xvwjgi9bj9zhfg3qp"; depends=[]; };
+  SimplifyStats = derive2 { name="SimplifyStats"; version="1.0.1"; sha256="14ii4mq0bjj5xndj8vr760hcc9h9jn0nvzn58424wa5iz7j2vjmb"; depends=[assertthat broom dplyr moments tibble]; };
   Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
   SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
-  SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
   SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; };
   SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
   SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; };
@@ -3610,7 +3635,7 @@ in with self; {
   SkyWatchr = derive2 { name="SkyWatchr"; version="0.8-2"; sha256="0if44d79j2hlxdccn3jd7lrfbhrr09rfhfgds132syxprwkcb2mr"; depends=[htmlTable httr sp]; };
   Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; };
   Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; };
-  SmartEDA = derive2 { name="SmartEDA"; version="0.1.0"; sha256="1wxj71fa91q2nxnl8l5iikgw6bqwphp8ymcnqisll1kp1w5f2g22"; depends=[ggplot2 gridExtra ISLR rmarkdown scales]; };
+  SmartEDA = derive2 { name="SmartEDA"; version="0.2.0"; sha256="0k89nvq074c2skjysw0n2cr410ki8f2p2fvzmwy779sgkbabc497"; depends=[data_table ggplot2 gridExtra ISLR rmarkdown scales stringi]; };
   SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; };
   SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; };
   SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; };
@@ -3623,29 +3648,27 @@ in with self; {
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
   SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; };
-  SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.23.2"; sha256="1adl0h3vnw17c364bxm5wffjkmvfzz9l0w5wkpwi6ry96vxzwy40"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
   SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.4"; sha256="0hd05rm7qn2w8rqx7pw996wpgb2rymcwzmns8xyczcyn81vjx8z8"; depends=[httr jsonlite RCurl]; };
   SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
   SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; };
   Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; };
   SoftClustering = derive2 { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
-  SoilHyP = derive2 { name="SoilHyP"; version="0.1.0"; sha256="030xzhd2mfibj4z3d73zplx814w9mpsf08bdllj6crqd9ipj4sbq"; depends=[]; };
+  SoilHyP = derive2 { name="SoilHyP"; version="0.1.1"; sha256="10lwfmhiavfyzypdb2rpc0rjsphy84vzg8mrdkncircss45cbvyp"; depends=[]; };
   SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
   SolveLS = derive2 { name="SolveLS"; version="1.0"; sha256="0yb2sx3wjhccmkq8p3jj5pp8dgsdfvv4hr88km5yajl950wkbizp"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; };
   SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
   SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
-  SourceSet = derive2 { name="SourceSet"; version="0.1.0"; sha256="0vibh0v9j8sfsh8535g03q8m28881fagkkra8xxazf3zv5197p11"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; };
+  SourceSet = derive2 { name="SourceSet"; version="0.1.1"; sha256="1326p28mngvi77b98n62cg6rln1qscyxz0616h7apc23ppdl7ybz"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; };
   SoyNAM = derive2 { name="SoyNAM"; version="1.4"; sha256="0b48nm3xgvzws9222fmq07chqx4yllz4qjgzxg156s0waxfrjjfi"; depends=[lme4 NAM reshape2]; };
-  SpATS = derive2 { name="SpATS"; version="1.0-7"; sha256="0gnv0hw5h4fin4vy6q8rjb1pry3c1vs0djkhbbkjvh52ycwlxjm7"; depends=[data_table fields plot3Drgl spam]; };
+  SpATS = derive2 { name="SpATS"; version="1.0-8"; sha256="0j7yllnw9r8zhlh6jpkp5nsmzj0z3rzq0w6rkc36vp88a0giv15n"; depends=[data_table fields plot3Drgl spam]; };
   SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
-  SpaDES = derive2 { name="SpaDES"; version="2.0.1"; sha256="00l05kc7mgip41r8yqq3nk2mr5i0acal2b4man5lsgb5vblp4ij9"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
+  SpaDES = derive2 { name="SpaDES"; version="2.0.2"; sha256="14l6rhaid4022c9gza6iy7kb6zr1844v16kn3hlgynf3zqv0mkr4"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
   SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.1"; sha256="0sipgq00lacy7yk81crr8h7xfm4vs4h66w6rqsll8i7di19g13cj"; depends=[devtools magrittr miniUI rstudioapi shiny SpaDES_core stringi]; };
   SpaDES_core = derive2 { name="SpaDES.core"; version="0.1.1"; sha256="12w2yr4q440n68p4gcj82h7gzjd240khfxjwxpngfbhbgp7rmv4b"; depends=[crayon data_table DEoptim DiagrammeR digest dplyr fastdigest fpCompare httr igraph lubridate quickPlot R_utils raster RCurl reproducible sp stringi]; };
-  SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.1.1"; sha256="0qfwcgy0nx4754zqi8fhk6q11yv9c5w6pa0wds6szga53hwwdi8g"; depends=[bit checkmate CircStats data_table digest fastdigest fastmatch ff ffbase fpCompare httr magrittr quickPlot RandomFields raster Rcpp reproducible sp]; };
+  SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.2.0"; sha256="1xqydiswjg8dn57d0lmfll1ix6ca7w969swpyhwrqkh7x17q9bvg"; depends=[bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot RandomFields raster Rcpp reproducible sp velox]; };
   SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
-  SparkR = derive2 { name="SparkR"; version="2.3.0"; sha256="0dm4yqpppf2chpcsgsj812vx8mzgmwsc4jwkilrpgxfr6s54imgi"; depends=[]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; };
   SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
   SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
@@ -3657,16 +3680,17 @@ in with self; {
   SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; };
   SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; };
-  SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
+  SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
   SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
-  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-6"; sha256="14clsb7w7p39ak00127lfa7irl67vqydvafkj8vs8qn9i3kaj6iz"; depends=[fields maps]; };
-  SpatialFloor = derive2 { name="SpatialFloor"; version="1.0.3"; sha256="14nbl0kb4c46kxvw900d972n78x6q0y9039l6p4r9w2i9ir7g1yh"; depends=[fields reshape2]; };
-  SpatialNP = derive2 { name="SpatialNP"; version="1.1-2"; sha256="048zzyy3hav8qg0zad2fsv5z1avdppwwdcv0rc6j635wzhdmsl1j"; depends=[]; };
+  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-7"; sha256="1y0h1pcfqp9ynxsr3yrfbihlwm25ypyb88jmm5k2g7xvm8h9g050"; depends=[fields maps]; };
+  SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; };
+  SpatialNP = derive2 { name="SpatialNP"; version="1.1-3"; sha256="1azymigqychsydqvy2n5fplv971i1gzxfhfnclm5r5rqh0xcdp3k"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.3"; sha256="12mx62drwqx351x4jfvv87rxr28ggz7iw83firkzr5xwfwfgr02c"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="1.2.0"; sha256="140fg3bjj7383nrdbgnk9lccj4yjq65rkprqpmf4q0mwbc89mmqc"; depends=[raster rgdal rgeos sp]; };
-  SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
-  SpatialVx = derive2 { name="SpatialVx"; version="0.6-2"; sha256="12kwwhxlvlkss1rg9ipaw97l5kw50m7crpcpv1y420sf14873j7r"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
-  SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
+  SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; };
+  SpatialVx = derive2 { name="SpatialVx"; version="0.6-3"; sha256="0shh8b4l42h93ja6mshj2bwfz1g5j6wjwf3n3ql4yx7kc0n1y7sv"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+  SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.9"; sha256="1k674xb6q64w9izjb2mdippp6sfjnlqlq6ynmzmyi8m3pv3spga6"; depends=[MASS Matrix]; };
+  Spbsampling = derive2 { name="Spbsampling"; version="1.0.0"; sha256="19ci3199hwqzh82phxr4m4d1n7y3vpn5338m20qisr7plwqv7wp5"; depends=[Rcpp Rdpack]; };
   SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; };
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
   SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; };
@@ -3674,7 +3698,8 @@ in with self; {
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; };
   SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; };
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
-  SqlRender = derive2 { name="SqlRender"; version="1.4.8"; sha256="08q9h6aca7vzgy1ipvghvrspdvmzlgmvhjgibcn38lfyl09xyfas"; depends=[rJava]; };
+  SqlRender = derive2 { name="SqlRender"; version="1.5.0"; sha256="0g9x7dkks9jcgfqz1zzkvgzgjlj2bvlbnpk1k6zc2lplxp7hgzf7"; depends=[rJava]; };
+  Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; };
   StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; };
   StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; };
   StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
@@ -3686,7 +3711,7 @@ in with self; {
   StanHeaders = derive2 { name="StanHeaders"; version="2.17.2"; sha256="11fcc59z63rkgk6pp5vhb5avjlbhbjs2v5mn496ai9jms4223ivc"; depends=[]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
-  StatCharrms = derive2 { name="StatCharrms"; version="0.90.9"; sha256="1r11zzfzhps234nzkpxw0qw0phjcdww8dkh2l6z6qkvc4495x0zh"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
+  StatCharrms = derive2 { name="StatCharrms"; version="0.90.91"; sha256="0gjxp6jz8j2kz87g17gax1pyrd498vcswrmv9az5dj52dvyxbwxf"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
   StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; };
@@ -3694,16 +3719,16 @@ in with self; {
   StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; };
   StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; };
   SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; };
+  SteinerNet = derive2 { name="SteinerNet"; version="3.0.0"; sha256="1inm36mrxsiczh9i69gbx4d0y39ccgzrjkgdp3p2a1mv0dgzvwbi"; depends=[igraph]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
   StepReg = derive2 { name="StepReg"; version="1.0.0"; sha256="1ifdns1fpsjcbwcy19h5hxnd3an53qwba2a7gpn2571zb1phraz8"; depends=[Rcpp RcppEigen]; };
-  StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.5.9"; sha256="11lsjiry04m6yf4n1q0kniad6qdrj88pkziabi5glivijq0dh1wr"; depends=[Rcpp]; };
+  StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; };
   StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; };
   StereoMorph = derive2 { name="StereoMorph"; version="1.6.1"; sha256="1q0fif4azv8nd37smhmr61mr4fls1jpm1ky40aqlv6kjm336pn1c"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; };
-  Stickbreaker = derive2 { name="Stickbreaker"; version="1.0.0"; sha256="11g97yj61s09d1687algr9f80gcgw8fadc1vbadglxh7l9wxj6lv"; depends=[lattice nnet xtable]; };
   StockChina = derive2 { name="StockChina"; version="0.3.1"; sha256="1myxyfchnkskyqb5yciw1wfk3006f51y89ipzfjzdlfyzwy1lsp1"; depends=[]; };
   Storm = derive2 { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; };
   StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; };
-  StratSel = derive2 { name="StratSel"; version="1.2"; sha256="11dkhyh0xgl23f9ksxcjl6bqfhwm6k6i1chgx23dvjifbm6s5s5p"; depends=[Formula MASS memisc mnormt pbivnorm]; };
+  StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; };
   Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; };
   StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; };
   StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; };
@@ -3711,7 +3736,7 @@ in with self; {
   StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; };
   String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; };
   StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; };
-  StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; };
+  StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; };
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
   SubTite = derive2 { name="SubTite"; version="2.0.3"; sha256="1i95f3x1nkhx9kqzxwvi15x6yq7mcdihzjxh60la6jvq5nscfi3l"; depends=[Rcpp RcppArmadillo]; };
@@ -3728,10 +3753,11 @@ in with self; {
   SuperRanker = derive2 { name="SuperRanker"; version="1.1.0"; sha256="19cfz89557ygf5dvvqykmxcr72sfa0s2d37pplp6iwbhkl4wfw04"; depends=[prodlim Rcpp]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
   SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="0.1.0"; sha256="0cw2nsqc9dx36svb49pqkmrxwk5hhbih206mwwkzfyavswxd2lpv"; depends=[gstat gtools raster rgdal rgeos sp]; };
-  Surrogate = derive2 { name="Surrogate"; version="0.6"; sha256="18cqcnzf64wk33qshsamija0r9xpnca0w2a8qz1ikj9r21vabhhw"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
+  Surrogate = derive2 { name="Surrogate"; version="0.9"; sha256="10prqish36nvkipmagqqr5whq2qhy26nlm636i4kyj2iw3139xzg"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
   SurrogateTest = derive2 { name="SurrogateTest"; version="1.0"; sha256="0dw8ic2rskwhj9f013q0j5my7qfsqihfis93frrlz4qag68jddqn"; depends=[survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
-  SurvDisc = derive2 { name="SurvDisc"; version="0.1.0"; sha256="0iqjimrljh9iaw3s406v6j03xg62ysf9xdia1yxr2ray38j8148c"; depends=[cubature MASS mvtnorm nlme simex survival]; };
+  SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; };
+  SurvGSD = derive2 { name="SurvGSD"; version="1.0.0"; sha256="0aa5zaf9akkqkxs8iqwnm93sfwakhhhs3qfafbk0vrwmb5yvzzm1"; depends=[flexsurv ldbounds mnormt]; };
   SurvLong = derive2 { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
   SurvRank = derive2 { name="SurvRank"; version="0.1"; sha256="1i08yjprzd9irs46rifa5fsmmhwbsf4py0m8qp5rprznyr8504y3"; depends=[doParallel foreach ggplot2 glmnet gplots ipred mboost randomForestSRC reshape rpart sampling survAUC survival]; };
   SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.4"; sha256="0ipr7lajnrklk963lrlgx946l6r191q3bfif4njkdmw0x797nzm2"; depends=[numDeriv survival]; };
@@ -3746,13 +3772,12 @@ in with self; {
   SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; };
   SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; };
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
-  SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="2.10-24"; sha256="1ax7b7q4slwcjamapbmnaaahrwdhrcbasjjgycdk5d7gzrzyygnx"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
+  TAM = derive2 { name="TAM"; version="2.12-18"; sha256="1mbhf5ni2a1mlyh8qa7id3p0h1baqigmh5ch2yf18h8mn52ig47i"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
-  TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; };
+  TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; };
   TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
   TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.1"; sha256="0cwga4pkfz4azm62v54jql07ymkhm97wyccz4gg6mhwy4qzigyjq"; depends=[nnet plotrix stringr VGAM]; };
@@ -3760,12 +3785,14 @@ in with self; {
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
   TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
   TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.2"; sha256="1fgjmz297jckdb0xsly1scq5n8y8awfgdkr4yfml4lim2mkdsigx"; depends=[httr jsonlite]; };
+  TDA = derive2 { name="TDA"; version="1.6.2"; sha256="1vkb4d3ayw8y4iskd6y1y9hnp0baidaxiqjqydxv2jwkdx0x9c3z"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
   TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; };
   TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; };
+  TDMR = derive2 { name="TDMR"; version="2.0"; sha256="1dqyi7i4spacg0n6f3zdhyb84crlbqvkb8xdmvdjr1jd1zx5gc32"; depends=[adabag SPOT testit twiddler]; };
   TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; };
   TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; };
-  TE = derive2 { name="TE"; version="0.1-1"; sha256="05xm9hlcsrcqa3yfw1rp4fb08yjkp66lcvdpw3a3fnx7k69j5p3g"; depends=[MASS rainbow]; };
+  TE = derive2 { name="TE"; version="0.2-2"; sha256="1yy6ky11ijnnkz2a4g6lww870pb4himn9nx230jnxpr0q8nsfqpb"; depends=[MASS rainbow]; };
   TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; };
   TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; };
   TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; };
@@ -3774,7 +3801,7 @@ in with self; {
   TESS = derive2 { name="TESS"; version="2.1.0"; sha256="05xsz2v847pwj4ja7hmg3zfbfqrwwzpf0ri0gjzb8snm2a7xm23y"; depends=[ape coda deSolve Rcpp]; };
   TExPosition = derive2 { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[ExPosition prettyGraphs]; };
   TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
-  TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; };
+  TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.8"; sha256="0h9qkl15k8v17v3g9bdnfwvh2s04ywjgg5y0xn2077dmywlja1bd"; depends=[Rcpp]; };
   TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
   TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; };
   TH_data = derive2 { name="TH.data"; version="1.0-8"; sha256="17csnwyk2f3d47nghkfy9wly5kff8zhdcfwfml7509hjrjgi13s7"; depends=[MASS survival]; };
@@ -3785,33 +3812,33 @@ in with self; {
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
   TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.7.13"; sha256="1cbm8vgjfd00678h011jzf0zjkvbv427nkp0924g2xmiai6c15xc"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.7.14"; sha256="0bpc504nz8xfwr8ack52dj4hpjcykn6zyf8n228z32dw9d5n96dl"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
   TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
-  TOSTER = derive2 { name="TOSTER"; version="0.3.2"; sha256="1sfb01cvm9h3gd2x3bs8014czlgbnnwl5gy4frknz3b9qyazi2cy"; depends=[ggplot2 jmvcore R6]; };
+  TOSTER = derive2 { name="TOSTER"; version="0.3.3"; sha256="1b1zmg0klf26hajlf420vpf8yf47np2l6ccl6062jmakg37ngh00"; depends=[ggplot2 jmvcore R6]; };
   TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; };
-  TPD = derive2 { name="TPD"; version="0.1.2"; sha256="1h8lgcrlsk68x2y01vgcn7dpq5q5180khz4csr8jbscbcdwljcl9"; depends=[ggplot2 gridExtra ks mvtnorm]; };
+  TPD = derive2 { name="TPD"; version="1.0.0"; sha256="1fwj5l519mwsffm2pw2nbpm1mnlxkxzl53i7sqy810fccw47hgag"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
   TR8 = derive2 { name="TR8"; version="0.9.18"; sha256="14nfyqwqv1l5lr5zvywd5pxrv4qz0g5v5x8sdxkjbkxi9s7xrlaw"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
   TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; };
   TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; };
-  TROM = derive2 { name="TROM"; version="1.2"; sha256="1gfnlchaa16q9cksrgdkissy2fz481bcbac0cmxnc4vb0vbnz4h5"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; };
-  TRSbook = derive2 { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
-  TSA = derive2 { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
+  TROM = derive2 { name="TROM"; version="1.3"; sha256="1glbpbq8qhlxhcscgsqivmncsmadfhlsin47r9jxxd2s087cdh2f"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; };
+  TRSbook = derive2 { name="TRSbook"; version="1.0.2"; sha256="0lj20i6gybinc196nzjfi6ayzmm970s9vp43lj60v96g5dl7qv1b"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
+  TSA = derive2 { name="TSA"; version="1.2"; sha256="0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q"; depends=[leaps locfit mgcv]; };
   TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; };
-  TSEtools = derive2 { name="TSEtools"; version="0.1.0"; sha256="16wrlbgq4xli49hha0bsg4nrv33jy0sd0d6nnzvfiqaqw8jml3rs"; depends=[xts]; };
+  TSEtools = derive2 { name="TSEtools"; version="0.1.1"; sha256="1s39j41s5d9zakvr536l7m9f72yjh3cbfpd6pijvcr3n3dznmra9"; depends=[xts]; };
   TSF = derive2 { name="TSF"; version="0.1.1"; sha256="0v3pq64yknp3n6lw6c87slv1avsv7rlb82gm670q4jzv5d174phv"; depends=[forecast fracdiff]; };
   TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; };
   TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; };
   TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; };
   TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; };
   TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; };
-  TSP = derive2 { name="TSP"; version="1.1-5"; sha256="03xxfr5kk4zhzpb1q1pwncdp0dhchm9b48wzhvvxn2dxf3mnby2w"; depends=[foreach]; };
+  TSP = derive2 { name="TSP"; version="1.1-6"; sha256="1ym97xl2icjpfkrici0wig29w06bb704hp51v7h5liygjlwpkhlc"; depends=[foreach]; };
   TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; };
-  TSPred = derive2 { name="TSPred"; version="3.0.2"; sha256="0cbf5h3yrissng4xqrgbisarml772mg6b2ap508imf29zfks76gn"; depends=[forecast KFAS MuMIn]; };
+  TSPred = derive2 { name="TSPred"; version="4.0"; sha256="0zjx33llkvvj7m4z16crybw0y6s6zvlblxn2in3j7v9cv0ihhsa8"; depends=[EMD forecast KFAS MuMIn vars wavelets]; };
   TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.2.13"; sha256="0wbwkhc1b5dql87sj1441cknidpgwcflwlid2yj6d64a6wsipn1l"; depends=[bfast broom ggplot2 RcppRoll strucchange]; };
   TSSQLite = derive2 { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[DBI RSQLite tframe tframePlus TSdbi TSsql]; };
   TSTr = derive2 { name="TSTr"; version="1.2"; sha256="0nljkqsrwzg7i82arpfrz2k9m1k1akin1akf01c5cadxq4rgarsf"; depends=[data_table stringdist stringr]; };
@@ -3826,7 +3853,7 @@ in with self; {
   TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
   TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; };
   TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
-  TSrepr = derive2 { name="TSrepr"; version="1.0.0"; sha256="1r2704zx9mk5w9k98labslp9wqj23jgn28k5jl31lvwcqgj5qqpv"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; };
+  TSrepr = derive2 { name="TSrepr"; version="1.0.1"; sha256="07gxsp4cfzpjmm6l9wpcdxar3sngm0ih0gp4c8gb6kyzm7pb780n"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; };
   TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
   TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; };
   TSstudio = derive2 { name="TSstudio"; version="0.1.1"; sha256="1myvih5kd9pliczddjscqlq811dswqh9d8an8p5bi12h31w9pp30"; depends=[forecast lubridate magrittr plotly reshape2 xts zoo]; };
@@ -3835,12 +3862,12 @@ in with self; {
   TTR = derive2 { name="TTR"; version="0.23-3"; sha256="07r62ngyzjl4aszdxnr3n6bnbcgcap32yhd430jsilicg8n06di1"; depends=[curl xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
-  TUWmodel = derive2 { name="TUWmodel"; version="0.1-8"; sha256="0c00jd2bq4i5fd55hj7l2grkpn990p0kmhbsh95b2zrzhbwgcjp6"; depends=[]; };
+  TUWmodel = derive2 { name="TUWmodel"; version="1.0-1"; sha256="1q150r0m93cjj0q1qvn4drhgvhvvgb63d8iii5crhzjpqbdhyka7"; depends=[]; };
   TVsMiss = derive2 { name="TVsMiss"; version="0.1.1"; sha256="1lvswq3syp2mfcf0higmyg5k5qhg1q6jaz8g75az3xajn4jylm0k"; depends=[glmnet Rcpp]; };
   Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
-  TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; };
+  TableMonster = derive2 { name="TableMonster"; version="1.7"; sha256="1xa4bkcpzhm50dwbpya346swjjfw46n2x26xm30p8gppilg5c0lb"; depends=[xtable]; };
   TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; };
-  TailRank = derive2 { name="TailRank"; version="3.2.0"; sha256="15m4wzhngrv8001r2cmq0a4a7j2kk8p061rhnpbqa7mfbfg6jkr5"; depends=[Biobase oompaBase oompaData]; };
+  TailRank = derive2 { name="TailRank"; version="3.2.1"; sha256="142m0cq9j8y5g9wh4plxya1jqi0dv6p6praxx3jb84kwqspi91xr"; depends=[Biobase oompaBase oompaData]; };
   TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; };
   TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
@@ -3848,15 +3875,15 @@ in with self; {
   TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
   TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; };
   Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; };
-  TcGSA = derive2 { name="TcGSA"; version="0.10.5"; sha256="14gnlk2r0q9zjc3431v97s7ydcyycvl0xh8bmz08mhzi20snrkpq"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
-  Tcomp = derive2 { name="Tcomp"; version="1.0.0"; sha256="0ddswvww9yk31gh8qb9nh0glf9w2mp3ny7zps79kdcnvbkrpcbfs"; depends=[forecast Mcomp]; };
+  TcGSA = derive2 { name="TcGSA"; version="0.11.1"; sha256="072i04cp91v2ygarpqg8dlqqf8hia0ryambcv83fcchz9hzs2yx6"; depends=[cluster cowplot ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
+  Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; };
   TeXCheckR = derive2 { name="TeXCheckR"; version="0.5.1"; sha256="18p3hyrrglgn2fdn5q9p1ayb58nznpdr5sy9mniybzsxrmfhghax"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; };
   TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; };
   TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; };
   TeachingSampling = derive2 { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
   TempleMetrics = derive2 { name="TempleMetrics"; version="1.1.0"; sha256="02cs2dgcmxgz1y98x4rpq4l4khqvbnr0248s6rgrgq5l3z2s4qr0"; depends=[BMisc pbapply]; };
-  Ternary = derive2 { name="Ternary"; version="1.0.0"; sha256="1dqkvddsb0g4bhiqnq22n4lfkxcrwimygai5lsrn1nlijyhcxfn1"; depends=[]; };
+  Ternary = derive2 { name="Ternary"; version="1.0.1"; sha256="0myppwcb4qvz9nkig641zrlf8yhy96qyg1yzh5nnli8a8xg0hjpk"; depends=[]; };
   TestDataImputation = derive2 { name="TestDataImputation"; version="1.0"; sha256="07k4sgjda1gwdlx5rap5fhs5rww2ahzyf0fq98dsm99gvjajnmwn"; depends=[Amelia mice]; };
   TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; };
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
@@ -3898,28 +3925,29 @@ in with self; {
   Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
   TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
-  TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.5"; sha256="0zdni9zqz3yy5ac2xfn3x2ad2lsmm7aw67nshv2sis828f9bsj9x"; depends=[geosphere ggplot2 magrittr rgdal rgeos RPostgreSQL sp spacetime trajectories xts]; };
+  TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; };
   TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
   TransferEntropy = derive2 { name="TransferEntropy"; version="1.4"; sha256="0620axdj6qyskf7xszrs8j5d2l73ns4bgbdg03fvr8i7jmq70zb8"; depends=[BH Rcpp]; };
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
-  TreeBUGS = derive2 { name="TreeBUGS"; version="1.3.1"; sha256="0zwbp7z31hw6krwhf21wpy5ryfhf0hhipjrsmvbrb7d4sx9am2vb"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
+  TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.0"; sha256="0xcipsfwghnf2x2x0i77vr79xs646v354skwxxw6m72ff6arbfz4"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
+  TreeDep = derive2 { name="TreeDep"; version="0.1.1"; sha256="0229ip18vbz36ks28p6pja30fb72qcdp7vwi2x0aiymhiigsmirs"; depends=[ggplot2 lubridate]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
   TreeSearch = derive2 { name="TreeSearch"; version="0.1.2"; sha256="0q25zw53whp1v57pkc50h2j7jb64jpip00s0qnmvdgncbrs4zhx5"; depends=[ape memoise phangorn R_cache Rdpack]; };
   TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; };
-  TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; };
+  TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; };
   TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; };
   TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; };
   TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TrioSGL = derive2 { name="TrioSGL"; version="1.1.0"; sha256="0xzyv1vppw0v1xjpf83nnv1sx1xy7197ay6l7dzvr0vllappdam9"; depends=[]; };
   TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; };
-  TropFishR = derive2 { name="TropFishR"; version="1.2.1"; sha256="17c7v85srx2l5chlz4yj8x6qrnlp9vvm11qkag73ma2x2a365sgn"; depends=[doParallel GA GenSA MASS msm propagate reshape2]; };
+  TropFishR = derive2 { name="TropFishR"; version="1.6.0"; sha256="0cgrzxga3k3zyqmqf3qixsl0aln0g7zb39h6m9m3gpjx5ih86gbk"; depends=[coda doParallel GA GenSA Hmisc MASS msm propagate R2jags reshape2 rjags]; };
   TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; };
   Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
   TukeyC = derive2 { name="TukeyC"; version="1.3-0"; sha256="1rkd20m9f97n88zlyidipqs6nd6hldw8s4bxiwvrj1ba2lbg09p3"; depends=[doBy]; };
   TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; };
-  TunePareto = derive2 { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; };
+  TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; };
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
@@ -3943,18 +3971,18 @@ in with self; {
   UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; };
   Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; };
   Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; };
-  Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; };
+  Umpire = derive2 { name="Umpire"; version="1.3.5"; sha256="1l0mpx66vgn282hc1c75bgxh471fbmyh3y0ldxb0h4pj55db93xq"; depends=[]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
   UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.7"; sha256="0b7mx919lbj12zrj8l01wfrdpqiq7s7p9q25alp7yf4jpv9w4vfa"; depends=[nloptr reshape2 rootSolve]; };
   UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; };
   UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; };
-  Unicode = derive2 { name="Unicode"; version="10.0.0-1"; sha256="1kj4b29gj3p0wzlzxqn7lwzabair6np705va0nxissfybpmwalgk"; depends=[]; };
+  Unicode = derive2 { name="Unicode"; version="11.0.0-1"; sha256="1rjyz1d7xw9i1pzx0g653ymkr5hjcmri3dl8v0skzq13qc3fag3d"; depends=[]; };
   UnivRNG = derive2 { name="UnivRNG"; version="1.1"; sha256="0vjsqc1y24z7zlclglh55kkxjhy0dc5gjsy427zdv95j58jbxa66"; depends=[]; };
   UpSetR = derive2 { name="UpSetR"; version="1.3.3"; sha256="08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz"; depends=[ggplot2 gridExtra plyr scales]; };
-  UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; };
+  UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; };
   V8 = derive2 { name="V8"; version="1.5"; sha256="155389k8laa48akg0bfsz65s4ddmpk0xpi1ha56z1sayv01vrrgc"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
-  VARSEDIG = derive2 { name="VARSEDIG"; version="1.6"; sha256="1iddpll0fdspzxxf2g1d6zwfs0xrnbq5zrch2a9flrfz2iam6brk"; depends=[]; };
+  VARSEDIG = derive2 { name="VARSEDIG"; version="1.7"; sha256="1vf0gqf81lbksp9m6yj28wsk5s29fqcfvlymy91hni814dkb1mxw"; depends=[]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
   VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; };
   VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
@@ -3964,6 +3992,7 @@ in with self; {
   VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; };
   VGAM = derive2 { name="VGAM"; version="1.0-5"; sha256="0ik3wyv6jj54bg34z0fzzk4xg0h6x98jqx4q2r7g1f0in0qgbb01"; depends=[]; };
   VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; };
+  VGAMextra = derive2 { name="VGAMextra"; version="0.0-1"; sha256="0rlj4q6ry6v3fnpmg4s33ynn7qzs5m98csap55nyn6r9ynrh5gk5"; depends=[VGAM]; };
   VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
   VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
   VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; };
@@ -3972,7 +4001,7 @@ in with self; {
   VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; };
   VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
   VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
-  VNM = derive2 { name="VNM"; version="6.1"; sha256="195fcgs6rzpji250j5kikim4k2rfg1gqgz65f2vgfbmz76wi4za6"; depends=[Rcpp]; };
+  VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; };
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
   VSURF = derive2 { name="VSURF"; version="1.0.4"; sha256="1sby2ls8yhxv4hx0y508pypsj1sbc0d269yl0xnqbxz44bhj8zzm"; depends=[doParallel foreach randomForest rpart]; };
@@ -3980,8 +4009,8 @@ in with self; {
   VWPre = derive2 { name="VWPre"; version="1.1.0"; sha256="1ccrim9nx5fmmadg687gz9qrfkyxp48rskg1n2pxfwd3h10c9js1"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
-  VarReg = derive2 { name="VarReg"; version="1.0.1"; sha256="00ygs9gk2719fnhb47z1pj7qacapzg9qs1li2206vsfrmqxjvj1a"; depends=[sn survival]; };
-  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.1"; sha256="0yy07fj0jkrninpwgnkw4h25yvbnb9z8kc02056nyh21kpj59vkl"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
+  VarReg = derive2 { name="VarReg"; version="1.0.2"; sha256="04235hr0r6sp7r3ccvcfb8l6p8yapcdrn6zl7mmvbyc4qb70gawh"; depends=[sn survival]; };
+  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.2"; sha256="0ilkn40b7845y3nlli160i6fmfaw2p1hvd97q2hnpvscrgmdqvz3"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
   VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; };
   VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; };
@@ -3994,10 +4023,8 @@ in with self; {
   VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; };
   VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; };
   VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; };
-  VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.2.0"; sha256="1vx72pn3fl27mjsa48kz5j1sj1bkjq8q0ifs5dxdfrcdswfqhjcw"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
-  ViSiElse = derive2 { name="ViSiElse"; version="1.2.0"; sha256="0k5hhzyjws0haawx2r2c0rxjbjdfx821x0jmj88786q6x67x86n0"; depends=[chron colorspace Matrix stringr]; };
-  VideoComparison = derive2 { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
-  VineCopula = derive2 { name="VineCopula"; version="2.1.4"; sha256="1mzxq3ci4z24z8d5w9x1n0d5h7ck7wbcx9y38vlaryyi5ipbhadh"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
+  VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
+  VineCopula = derive2 { name="VineCopula"; version="2.1.6"; sha256="0gppfjffz5vc35rfjjplwjfp2vpw8hmfc0257k33qki46g5haw5j"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
   VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; };
   VizOR = derive2 { name="VizOR"; version="0.8-5"; sha256="1v76m67xdlg06w3dmp27mh3mv3lfqy6bd1iq907dynp2g4qf4ww0"; depends=[lattice rms]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
@@ -4006,7 +4033,7 @@ in with self; {
   W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; };
   WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; };
   WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; };
-  WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
+  WCE = derive2 { name="WCE"; version="1.0.1"; sha256="0zp9xcq40vy2pv06rqn4d24bracm2vd3yyq4h56qppx47419fmm4"; depends=[plyr survival]; };
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
   WDI = derive2 { name="WDI"; version="2.5"; sha256="0wm3b844pn33047wfd8yp22c6ysdsi8qx71fm1h5rq5vm9mcg9cp"; depends=[RJSONIO]; };
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
@@ -4018,24 +4045,24 @@ in with self; {
   WMWssp = derive2 { name="WMWssp"; version="0.3.2"; sha256="019fcmf5zmbm20zyvx96nwp66lqm2xw7hbpacfwn8cvw3dq85chr"; depends=[rankFD]; };
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
-  WRS2 = derive2 { name="WRS2"; version="0.9-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; };
-  WRSS = derive2 { name="WRSS"; version="1.2"; sha256="0nml5sv0c4fflxvhhf7zwxdz45iid4n7v8kyc4l1qhn0wi2hihdk"; depends=[Hmisc]; };
+  WRS2 = derive2 { name="WRS2"; version="0.10-0"; sha256="17iriwkng75iy93mp99ihzmvgpgbrg0sgwxs2yx1d3ss7h0k1x3j"; depends=[MASS mc2d plyr reshape]; };
+  WRSS = derive2 { name="WRSS"; version="1.4"; sha256="1fkbrk9s3jn7qfv5jvzcgjf0jwbxi8dr7485msxj3najbhqd2qy5"; depends=[GGally ggplot2 Hmisc network]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="0.3.1"; sha256="19ddgkblyqfvnx4a9c7i8nfvcfrmnsbbb3s61hqp16j59p5gfk3x"; depends=[ggplot2 gridExtra mgcv sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="1.0.0"; sha256="16wazxf4c1awxfix4dmp1zcwrfwbkddck71gxgimf471gx60hl8p"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; };
   WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
   Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; };
   Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
   WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; };
-  WaveletArima = derive2 { name="WaveletArima"; version="0.1.0"; sha256="1f8g6r9qmhr2y7sf7x2vphv2sab5rywpfjvhsxfmzljjmirf2v3n"; depends=[forecast fracdiff wavelets]; };
+  WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; };
   WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
   WeMix = derive2 { name="WeMix"; version="1.0.2"; sha256="1wj1jxw65i94xf5zk9phgkwybvl2h05ynq0zhdc7q3j6b90mv9hn"; depends=[lme4 MASS minqa NPflow numDeriv Rcpp RcppArmadillo Rmpfr statmod]; };
   WebGestaltR = derive2 { name="WebGestaltR"; version="0.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; };
   WebPower = derive2 { name="WebPower"; version="0.5"; sha256="184wig66bcg7vsppaijq5jpq2hffl3bhshdx4ilz5hw98mimxg13"; depends=[lavaan lme4 MASS PearsonDS]; };
   WeibullR = derive2 { name="WeibullR"; version="1.0.9"; sha256="13qkfnfp2pbvb78mj7fg8cgjnbrxv6dbms70wvn9f3mc70djmrb3"; depends=[Rcpp RcppArmadillo]; };
-  WeightIt = derive2 { name="WeightIt"; version="0.3.2"; sha256="13rswk3qr01y3ikpa2d9z7l5wicgsmiqmmhx7cbnyi4jny316sa3"; depends=[cobalt]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.4.0"; sha256="1y0910wa1lx2jrbnzk9099v64skh7sm8cx85g62ikgcj291z6c8c"; depends=[cobalt]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
@@ -4051,7 +4078,7 @@ in with self; {
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
   WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; };
   WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
-  WordR = derive2 { name="WordR"; version="0.2.3"; sha256="0sn14s4vnmj6zs8mc8mj5ph78m9z9yr29lknqma3wrphb7cla50w"; depends=[dplyr officer ReporteRs]; };
+  WordR = derive2 { name="WordR"; version="0.3.0"; sha256="0wfgr5jg0vn58cn2dra3s46c5x5msqw3p666lbhhs48m75j12daq"; depends=[dplyr flextable officer]; };
   Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
   WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; };
   WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
@@ -4077,7 +4104,7 @@ in with self; {
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
   YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
-  YuGene = derive2 { name="YuGene"; version="1.1.5"; sha256="1f1bia1q1z2rzp4pw218zglf02x1m9zpz5gqllrd77ggw8ilqfjc"; depends=[mixOmics]; };
+  YuGene = derive2 { name="YuGene"; version="1.1.6"; sha256="1kv9n82wrms0c4y5fz9ckzhm1a609mnqp0pwvd0fpyscp8krmlpp"; depends=[mixOmics]; };
   ZIBBSeqDiscovery = derive2 { name="ZIBBSeqDiscovery"; version="1.0"; sha256="12g9rga9z6318ni6x6q9hdqlgl93y2xn8vf3gc6sm97fz8pliswx"; depends=[mcc]; };
   ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; };
   ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
@@ -4098,11 +4125,11 @@ in with self; {
   aSPU = derive2 { name="aSPU"; version="1.48"; sha256="0kjvwwvyhiz9i5kxqg68lq6cvxnk9vzvp5zca5hfv2g77j42wh9h"; depends=[fields gee MASS matrixStats mvtnorm]; };
   aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
   aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.1"; sha256="1jg19ns3mxfycc11i2c152d83n4kqz3dd6d269sijnxrw80kzjki"; depends=[party randomForest rpart]; };
-  abbyyR = derive2 { name="abbyyR"; version="0.5.1"; sha256="1s8zf18sh0s89vk3dl09fzrq50csmmfvmsanf5vfkv9n5lx6pklg"; depends=[curl httr plyr progress readr XML]; };
+  abbyyR = derive2 { name="abbyyR"; version="0.5.4"; sha256="1jh1c1ad6mgw7brdh2isnza1qpjlfxnqr7jl76yd93axyfl76xjx"; depends=[curl httr plyr progress readr XML]; };
   abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
   abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
   abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
-  abcrf = derive2 { name="abcrf"; version="1.7"; sha256="1gz1jhbc2qj2dvsdn22hb03lm99v8hfr5qjrjql14jvhw8y2smz8"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; };
+  abcrf = derive2 { name="abcrf"; version="1.7.1"; sha256="06vy3inikrr9hv36q4djhrgzi9zizdfnhz17wpra8kadmr7qj441"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; };
   abctools = derive2 { name="abctools"; version="1.1.1"; sha256="0x6pjdvn5z510j42byddzdvg2mgv81yy72snia5k8h7bs9k5glfg"; depends=[abc abind Hmisc plyr]; };
   abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
   abe = derive2 { name="abe"; version="3.0.1"; sha256="1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6"; depends=[]; };
@@ -4119,7 +4146,7 @@ in with self; {
   accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; };
   accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; };
   accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
-  acebayes = derive2 { name="acebayes"; version="1.4.1"; sha256="0wkygvhwf0y5jzkcj6prjmr9dlak1xgsbswlixqwrx5b48iqxgwh"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  acebayes = derive2 { name="acebayes"; version="1.5"; sha256="0533f9c44lq57cyar05z3ikg091h1pyrq84h2zghjyp66drnw6pa"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
   acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
   acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
@@ -4137,10 +4164,11 @@ in with self; {
   actuar = derive2 { name="actuar"; version="2.3-1"; sha256="0i0w5y0bgma42p4cbrbv0bxkambp7hgqqlsg90p5skfvg7r1n3bk"; depends=[expint]; };
   ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; };
-  adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; };
+  adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; };
   adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; };
   adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; };
   adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
+  adaptalint = derive2 { name="adaptalint"; version="0.2.3"; sha256="0n047zibp3jsw8d3c971xnqgl8nsqxzcayic0xkz917pwlfrdnd7"; depends=[dplyr lintr purrr]; };
   adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; };
   adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; };
   adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
@@ -4161,7 +4189,7 @@ in with self; {
   adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.12"; sha256="13mhj36nfs36988g53yrmhyd8yq2zzxl8ppzql63964n04fybbpb"; depends=[filehash sp]; };
   adephylo = derive2 { name="adephylo"; version="1.1-11"; sha256="06pnrycc7562h17gxbli935289a48na3p4vpb2w96i5cbrjg4jqm"; depends=[ade4 adegenet ape phylobase]; };
   adepro = derive2 { name="adepro"; version="2.0.0"; sha256="0q9h7wmkgdnbhg2ygw32jl0bm2vrl32ig2nci9pphgwpsfzb34jq"; depends=[audio Cairo MASS shape shiny shinyBS]; };
-  adespatial = derive2 { name="adespatial"; version="0.1-1"; sha256="19i83s19sbvjm5k0gkw8awz359q67rr3768icsjd118fji45dvg0"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep]; };
+  adespatial = derive2 { name="adespatial"; version="0.2-0"; sha256="1yqpfkz7i8jkqkbpafm09s1g6mjigpca73b4959zw7gqp9aariz6"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; };
   adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; };
   adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; };
   adimpro = derive2 { name="adimpro"; version="0.8.2"; sha256="0nfzk9pp4p16c1nvpidngag96r845376h8ljh7m6p6rhk9fs4jdw"; depends=[awsMethods]; };
@@ -4174,42 +4202,45 @@ in with self; {
   adnuts = derive2 { name="adnuts"; version="1.0.0"; sha256="0jy9wq269r7s70bwld6ngxc6vmaj9vplq4wn97x4f3c6lqy42swc"; depends=[ellipse rstan]; };
   ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; };
   advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; };
-  adwave = derive2 { name="adwave"; version="1.2"; sha256="1fnaq9v84y52kb66aq4g0xiqgllk7mi0is5qiafqf546hck3kzz6"; depends=[waveslim]; };
+  adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; };
+  adwordsR = derive2 { name="adwordsR"; version="0.3.1"; sha256="1w5qg4psm8pj89f09pz7in8zkafaimik1n6hx29y55jpmbxbk2gn"; depends=[RCurl rjson]; };
   aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; };
   afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; };
   afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; };
-  afex = derive2 { name="afex"; version="0.20-2"; sha256="150zf3lzsybpj7hm3ry0x4lliscgmmxpq92iab9fbcrvaqyaibn8"; depends=[car coin emmeans lme4 lmerTest pbkrtest reshape2 stringr]; };
+  afex = derive2 { name="afex"; version="0.21-2"; sha256="0wf6fvfwk1v2bswp1j8ab2r157vr1i9r1wr1fqhrcaxa2c4fikmz"; depends=[car emmeans lme4 lmerTest pbkrtest reshape2]; };
   affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; };
   afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; };
   afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; };
-  aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
+  aftgee = derive2 { name="aftgee"; version="1.1-2"; sha256="0g4skg333vdj0cxwkcn7sh1km9rbwjjz40qz211rlzr7x76477rx"; depends=[BB geepack MASS survival]; };
   agRee = derive2 { name="agRee"; version="0.5-1"; sha256="1hmqvpcz4vnpcl9f92q5fy1ca89l9sq25fnsw2mxfsa0yqbyxpw6"; depends=[coda lme4 miscF R2jags]; };
   aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; };
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
   agriTutorial = derive2 { name="agriTutorial"; version="0.1.3"; sha256="1ihz92f10p7nq0rw01hka5wg2svf2hgx9f39604ab0j99z0f99hz"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; };
   agricolae = derive2 { name="agricolae"; version="1.2-8"; sha256="1c6n52jralp33hl3nmpv9fc9vsvs6lcz9j75f2zbz0r4sqd2mw89"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
-  agridat = derive2 { name="agridat"; version="1.13"; sha256="1029n2jkbvybvkbf4pwdjrw6m05xyzn5xyqyfziqb7xnw51ksm2p"; depends=[]; };
+  agridat = derive2 { name="agridat"; version="1.15"; sha256="08wlh75jv856linkspx5w9irjlbjkhqy9wwaciks79s00ii5vbzj"; depends=[]; };
   agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
-  ahnr = derive2 { name="ahnr"; version="0.2.0"; sha256="0bfy7xxfxfzhv4yl9dlsyl304673p23r2h0lz3lv75iqp2gbzdjr"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; };
+  ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; };
   ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; };
-  aiRthermo = derive2 { name="aiRthermo"; version="1.1"; sha256="0i3sq7i37i82ad70z2mai09rxzk4kk27hfg5jjbh6pajwzyn5yri"; depends=[]; };
+  aiRthermo = derive2 { name="aiRthermo"; version="1.2"; sha256="0j7nldmf63rap18dfa5rcwyy61fcn592fb3h1hp08b00qw39asx3"; depends=[]; };
   aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
-  airGR = derive2 { name="airGR"; version="1.0.9.64"; sha256="08nw07v5d5pljk839i5j5wgrc5lny7v6kl8m2hd6bm9aijql7hg4"; depends=[]; };
+  airGR = derive2 { name="airGR"; version="1.0.10.11"; sha256="0m64ww5f4ilrkkpnkv9k1qxsxh519is6y8wciq472jjfwcnsscb1"; depends=[]; };
   airGRteaching = derive2 { name="airGRteaching"; version="0.2.2.2"; sha256="13alnmazf8n7sgfzh0hfq6i4cd2pl414vwrakgp36q365fkgzpnc"; depends=[airGR dygraphs htmlwidgets markdown plotrix shiny shinyjs xts]; };
   aire_zmvm = derive2 { name="aire.zmvm"; version="0.6.1"; sha256="1a6aq1fkjj053mi36ibykncd1hmcl0f5c0l2fi0cbx6hcysc28ic"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
+  airr = derive2 { name="airr"; version="1.1.0"; sha256="0fyyd6sw3fk7gwdxhxxrvsckyxj9qlqqsa20rhqdg3xslkwzzpjh"; depends=[readr stringi yaml]; };
   ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; };
   akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; };
   akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
   alakazam = derive2 { name="alakazam"; version="0.2.10"; sha256="0bfqc7rbchmj0dby8c8xlxff9gk18kq1v8zqfj3s7h3yddrr7znr"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; };
-  albopictus = derive2 { name="albopictus"; version="0.2"; sha256="1ils7y0i9dvhpnwyi31y7dvn02pcyn4dk0165ck81s08k96v3r1z"; depends=[]; };
+  albopictus = derive2 { name="albopictus"; version="0.3"; sha256="03vk2df17rkcg29il3jj5jlnjs4kkfnj1cfrxdgj3hgm7rbs38si"; depends=[]; };
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
   alfred = derive2 { name="alfred"; version="0.1.6"; sha256="07x012lj33m0pmxdwk39ywrlvlfkp7mb203dwv8v88cxplhbaiq3"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
   algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; };
   algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
+  alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; };
   alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; };
   allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
   allanvar = derive2 { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
@@ -4221,20 +4252,20 @@ in with self; {
   alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; };
   alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
   alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; };
+  alphastable = derive2 { name="alphastable"; version="0.1.0"; sha256="1c24d879jqakf20rwj0xmv41f1g3d1dq04mlcc8zshigi2diyy5c"; depends=[mvtnorm nlme nnls stabledist]; };
   alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; };
-  alr3 = derive2 { name="alr3"; version="2.0.7"; sha256="0975m657ri8ad4djrwfdv4cslw8inykq35aj5m00kmsc8gb624j0"; depends=[car]; };
-  alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; };
-  alterryx = derive2 { name="alterryx"; version="0.3.0"; sha256="0y76xy7m7dklvkhfr2czq54ffgj2j5zhnm2kza7m463j1w1mkcqz"; depends=[base64enc digest httr jsonlite]; };
+  alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; };
+  alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; };
+  alterryx = derive2 { name="alterryx"; version="0.3.1"; sha256="0vpgvh0rgrw4kckdvp4kqmmgcdgcgcdlqlzq3381jq495wcp207b"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
-  amap = derive2 { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; };
+  amap = derive2 { name="amap"; version="0.8-16"; sha256="1qnl2x98x64iaipkx5126rsddq2sx5ml43h75xyiyn30yvbmlxyk"; depends=[]; };
   ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
-  ameco = derive2 { name="ameco"; version="0.2.8"; sha256="1i2ap11z1awalw71hai719xh57banpfgj1nllca66zf781x80di9"; depends=[]; };
-  amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
+  ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; };
   amelie = derive2 { name="amelie"; version="0.2.0"; sha256="01v93dswr9nk0kvq50jri4568w17pwkcn64xbpzn2p4c7w6gqkhh"; depends=[]; };
   amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; };
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
-  amt = derive2 { name="amt"; version="0.0.3.0"; sha256="1a9hvvqh7359bs2x031qgkq364d07kf60jgn13kz5nva36c5wl8v"; depends=[broom circular dplyr fitdistrplus FNN geosphere lazyeval leaflet lubridate maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr tidyverse]; };
+  amt = derive2 { name="amt"; version="0.0.4.0"; sha256="1qdkvkxkxk7l2bjr11h0k9vhh5vapvm12f20lmj7rhamipc43ybv"; depends=[broom circular dplyr fitdistrplus FNN geosphere KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr]; };
   anMC = derive2 { name="anMC"; version="0.2.0"; sha256="1j6dah49sgfsb7bj4xys5rcaqw12rrkqhqryqz2xhdkazjmz3gpq"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; };
   analogsea = derive2 { name="analogsea"; version="0.6.0"; sha256="1fcvf3yci3szm155pnk89q36dgc55wdlffvll642zn26zc5d1y5n"; depends=[aws_s3 httr jsonlite magrittr yaml]; };
@@ -4242,29 +4273,31 @@ in with self; {
   analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; };
   analytics = derive2 { name="analytics"; version="2.0"; sha256="1jkdjqc3fnvvsgi6x9ncf36rxzq0a55cmgkcv92mfmpcramg2lk6"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca]; };
   analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
-  anapuce = derive2 { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; };
   anchoredDistr = derive2 { name="anchoredDistr"; version="1.0.3"; sha256="07q4np0zryb49cpi7w5iz0qna63cyp9nz13d8ws6x9ccg417r99a"; depends=[DBI dplyr ggplot2 np plyr reshape2 Rmisc RSQLite]; };
   anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; };
   andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
+  anesrake = derive2 { name="anesrake"; version="0.80"; sha256="1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q"; depends=[Hmisc weights]; };
   anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; };
   angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; };
   aniDom = derive2 { name="aniDom"; version="0.1.3"; sha256="1xjbj9d6kv5nprsh1z58gbi338f7sj7dimgvy92j6n1xbrlh83p5"; depends=[rptR]; };
   anim_plots = derive2 { name="anim.plots"; version="0.2"; sha256="1plpi90qzk4ng0sm77fvqyv1063w67axvdc29q5nvz4h6v4j7ks3"; depends=[animation]; };
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
   animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; };
-  anipaths = derive2 { name="anipaths"; version="0.9.3"; sha256="0pip9vhp3d4c6i6l9cmdds3nwaf8cspqviff6q7xng0ib8mi995n"; depends=[animation knitr mgcv RColorBrewer rgdal scales sp]; };
+  anipaths = derive2 { name="anipaths"; version="0.9.6"; sha256="0wqpnn85gqsy0m40allx0mngnq5lqz5qhl9g8v0kh0073xq4mvvc"; depends=[animation knitr mgcv RColorBrewer rgdal scales sp]; };
   annovarR = derive2 { name="annovarR"; version="1.0.0"; sha256="0l2csp06m5f3i1b4h0pvl8mmzx25c0b411c5sdc3qszirbplh038"; depends=[AnnotationDbi BioInstaller configr data_table DBI futile_logger glue ngstk RMySQL RSQLite stringi stringr vcfR]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
   anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; };
+  anomaly = derive2 { name="anomaly"; version="1.0.0"; sha256="1l86y3hzqi06s1v3l5vkvk679cy630i2pj0yzxyznm5fjq43l47r"; depends=[dplyr Rdpack rlang]; };
   anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.5"; sha256="132wb0xz04zib3x7802b2q546rkf097rsxyi9mi86g6vv7yyw9z1"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
   anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; };
-  antaresProcessing = derive2 { name="antaresProcessing"; version="0.15.1"; sha256="0x2rcj4cfw0rsyzdc98j8yk8mp8cnbpx4qj587wszxlyf90yzgfa"; depends=[antaresRead data_table]; };
-  antaresRead = derive2 { name="antaresRead"; version="2.1.0"; sha256="1khvwh55gfd62avaj9vl709nrcykyc4zn11fxikbqqgwm9mq7835"; depends=[data_table lubridate plyr shiny stringr]; };
-  antitrust = derive2 { name="antitrust"; version="0.99.7"; sha256="0si9vnbk6rcpp913cyfh5h4a5fx9kzafr5x5chb3gakzrbzz0hav"; depends=[BB evd MASS numDeriv]; };
+  antaresProcessing = derive2 { name="antaresProcessing"; version="0.15.3"; sha256="0asr43lf8vajf72sgpixy5w7r7v7b83a0877q6dadcxxr4mifr8f"; depends=[antaresRead data_table]; };
+  antaresRead = derive2 { name="antaresRead"; version="2.1.2"; sha256="1vw2q2affpi4icqbsh89qkhdf6xxfjnwn6939ibgw5vv8df1b11s"; depends=[data_table lubridate plyr shiny stringr]; };
+  antaresViz = derive2 { name="antaresViz"; version="0.14.0"; sha256="0xli4bvk5nds357wq3r1dp155xrcxcjscndbysfdv52827i80nxs"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; };
+  antitrust = derive2 { name="antitrust"; version="0.99.10"; sha256="1xgkbsnsn39s37my7sj917kvq67gxwai7k7lym2i18m60cnz0ilb"; depends=[BB evd MASS numDeriv]; };
   antiword = derive2 { name="antiword"; version="1.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; };
-  anytime = derive2 { name="anytime"; version="0.3.0"; sha256="1byhgplskj17d0gib9sajfnzyv8p9slgq1vy8fq9j2ibirl86a91"; depends=[BH RApiDatetime Rcpp]; };
+  anytime = derive2 { name="anytime"; version="0.3.1"; sha256="1ibpmdq8i9ch06484ql0sdwfrs6smz40qnnw523pb0ryly6q9h16"; depends=[BH RApiDatetime Rcpp]; };
   aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
   aods3 = derive2 { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[boot lme4]; };
   aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; };
@@ -4272,19 +4305,18 @@ in with self; {
   aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; };
   apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; };
   apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
-  apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; };
-  apaTables = derive2 { name="apaTables"; version="2.0.2"; sha256="0b3vaknj0a9znrgr98v35ka0lf5y1wcy1x0yv249gysikncn9mjc"; depends=[boot broom car dplyr tibble]; };
+  apaTables = derive2 { name="apaTables"; version="2.0.4"; sha256="1msb8aygzbcggdcifmcjpgcpnscvr6fq2ib5afff1vzbas9hjrs3"; depends=[boot broom car dplyr tibble]; };
   apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
-  apcluster = derive2 { name="apcluster"; version="1.4.5"; sha256="0ipg5m3d7fnbvvlavbv8q8ixyrcgdspzwkv00q93f4biybza27x6"; depends=[Matrix Rcpp]; };
+  apcluster = derive2 { name="apcluster"; version="1.4.7"; sha256="188hdfmwjjx3aic599nwmkzjqm9j9jighi5bly6qd43c1vj6ih2s"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
   ape = derive2 { name="ape"; version="5.1"; sha256="0vm2065993wf4hdqarxqykhfz9aaj0rrb98alhkq4qw1d2kdrmdp"; depends=[lattice nlme Rcpp]; };
   apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; };
   aphid = derive2 { name="aphid"; version="1.1.0"; sha256="0mf2v7b915hpasic2yqxi0g5fcrwac4d1ycikwzcd9hb9qngcb0n"; depends=[kmer openssl Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
-  aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
-  apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
+  aplpack = derive2 { name="aplpack"; version="1.3.2"; sha256="14vwzzshsgkw6gxwnnf6h9fixnwp3g8pd3rv6qjr0y8gis1lmjbg"; depends=[]; };
+  apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
   apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; };
   appell = derive2 { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
   apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
@@ -4293,7 +4325,7 @@ in with self; {
   approxmatch = derive2 { name="approxmatch"; version="1.0"; sha256="1z1lrbfvm380p2az88hrxr3f2cgbv2h70wzm99vi9a2dmh0pl7qy"; depends=[]; };
   aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
   apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; };
-  aprof = derive2 { name="aprof"; version="0.3.9"; sha256="1w95z3n08nq2fsj8dljgfkz76s1jc3sz2aia3bnfq62yd003qsnl"; depends=[]; };
+  aprof = derive2 { name="aprof"; version="0.4.1"; sha256="14qclp88j4ygd4vrxxpgy2s9939wcajjsqycdzpvn64ws29sdpvh"; depends=[testthat]; };
   apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
   apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
   apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; };
@@ -4306,22 +4338,23 @@ in with self; {
   archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="3.2"; sha256="08jam0nbqvrgrxjqj24k7f0dybyi935w977yi1qk34q1p48462ph"; depends=[rgl sp XML]; };
-  archivist = derive2 { name="archivist"; version="2.3"; sha256="0rwdk2scmd06j428zadcxmvshvssf421265632595hvcacqz6yy4"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; };
+  archivist = derive2 { name="archivist"; version="2.3.1"; sha256="04f1f9fczibda2a4wivmgwzh5p9xblm9hk8wkgd6xqrvxgv5z8mn"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; };
   archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; };
   areaplot = derive2 { name="areaplot"; version="1.2-0"; sha256="0xzfgbnzqsvnq46nsxwyqrwldbaqns3h5np0f5wxpjda9cy2rna1"; depends=[]; };
   arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
-  arfima = derive2 { name="arfima"; version="1.6-6"; sha256="0nb0r937jcl2khyj7xy41a383dbzdigjls87yjcwwgmzbpcznwal"; depends=[ltsa]; };
+  arfima = derive2 { name="arfima"; version="1.6-7"; sha256="0wajd15lbzbc62v8kclnp0fbppnm7vy2zxrsd5njx5sswvkfx5v3"; depends=[ltsa]; };
   argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
   argparse = derive2 { name="argparse"; version="1.1.1"; sha256="0fzrbj87b274vf96azdnsjxk2nf45d5wy58vzmlah4b4h7q4j524"; depends=[findpython getopt jsonlite proto]; };
   argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
   ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; };
+  aricode = derive2 { name="aricode"; version="0.1.1"; sha256="0c9k6bp0zdm4l28ga19x8v30x3zw0fbcf7wicnn15xc516glfb2j"; depends=[Matrix Rcpp]; };
   arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; };
   arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
   aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.1"; sha256="1x2lwdabvh7cjdy57jrnbdb7s9vxs18zyvfzwavi2pgldqz6v2aw"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
   aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; };
   aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; };
-  aroma_core = derive2 { name="aroma.core"; version="3.1.1"; sha256="0mbhk818m8if6cr7g42yy7ba13jh2xs66xkx4zh7dqlwrrmgjnk1"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
+  aroma_core = derive2 { name="aroma.core"; version="3.1.3"; sha256="0zikic3hqfn00kgb0078paikz4bdcqq0qygvl4xbvq48868wcz1q"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
   arrApply = derive2 { name="arrApply"; version="2.0.1"; sha256="007fsqgb9bsr4mscljhp37dvrk7cv6nrb7y28w8kc7mxvgdq29wg"; depends=[Rcpp RcppArmadillo]; };
   arrangements = derive2 { name="arrangements"; version="1.0.2"; sha256="0vqxx0pzvvqnbklpxrcq7d5ppicwbwk3gb2846in0gqjhn4ya4g1"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
@@ -4329,16 +4362,15 @@ in with self; {
   arsenal = derive2 { name="arsenal"; version="1.2.0"; sha256="1glh8vyms5hcplzzn5n6fynr8jyryy65xb2y9lf6nv7kziwqr5fk"; depends=[testthat]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
   arules = derive2 { name="arules"; version="1.6-1"; sha256="0glfqgxr87900kigmkby2ff7qrjvd6aq595q85y056i5ckjcp615"; depends=[Matrix]; };
-  arulesCBA = derive2 { name="arulesCBA"; version="1.1.3"; sha256="0dpa9v8xksq21lyv6g7m81ccpd08lq816vfy5ga8g3blkg1qfrf2"; depends=[arules caret discretization Matrix testthat]; };
+  arulesCBA = derive2 { name="arulesCBA"; version="1.1.3-1"; sha256="0k41m966m2x8xjzvpy6xn4whn9l2dpvidyh39kmhyvya87ibhyg8"; depends=[arules discretization Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; };
-  arulesViz = derive2 { name="arulesViz"; version="1.3-0"; sha256="0k9lq1w0cdk9mlbr5mwh87qrzank1nd8bwlymv4xyi7xm5y6wq4l"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; };
-  as_color = derive2 { name="as.color"; version="0.1"; sha256="1y5qpm0pabfk5qvgx6s2vqqxfhp1x99g7dva24zay34nvf4bxrzn"; depends=[]; };
+  arulesViz = derive2 { name="arulesViz"; version="1.3-1"; sha256="0lz6dl7ywzbyviib97s48namr6cjjn98anblfpigzaq16zkf2pxl"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; };
   asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
   asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; };
   asbio = derive2 { name="asbio"; version="1.5"; sha256="0p54a9x54jg81hd86br6b3dg3sr9kzl9rmnrh7x3m6bkinzc780c"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
   ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
-  asciiSetupReader = derive2 { name="asciiSetupReader"; version="1.2"; sha256="11smjl1cvbsgiql3b90x05aa8bspikijc5vzzw4d0hzpyj1j0zmy"; depends=[data_table haven readr stringi stringr]; };
+  asciiSetupReader = derive2 { name="asciiSetupReader"; version="1.4.0"; sha256="0pq23ncwlndhzw4qfvzcv9nh74fq6hh9k6w96xhxx69ajy9zd2ys"; depends=[data_table haven readr stringr zoo]; };
   asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; };
   asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; };
   asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; };
@@ -4348,7 +4380,7 @@ in with self; {
   aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
   asnipe = derive2 { name="asnipe"; version="1.1.9"; sha256="0r6hajdvasvik2ij58xm5kvlcz2gqzgqbvw0ypghrp0qkfqxkrla"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
-  aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; };
+  aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
   asremlPlus = derive2 { name="asremlPlus"; version="2.0-12"; sha256="119r7wwrz11j85idq21xdp2wq7l2jly73q3179d3bsywbmx5sr17"; depends=[dae ggplot2]; };
   assertable = derive2 { name="assertable"; version="0.2.4"; sha256="1d1mc5k9jwn2h5bny3bpkwy10kfz5qlp03z12z9401v47q12d61i"; depends=[data_table]; };
@@ -4378,44 +4410,46 @@ in with self; {
   aster2 = derive2 { name="aster2"; version="0.3"; sha256="17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9"; depends=[Matrix]; };
   astro = derive2 { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
   astroFns = derive2 { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
-  astrochron = derive2 { name="astrochron"; version="0.7"; sha256="12p4n530f4w4idadqidm6w38xdm119bipc63z34q3a2z5gmdd71b"; depends=[fields IDPmisc multitaper]; };
+  astrochron = derive2 { name="astrochron"; version="0.8"; sha256="0cliwmzm4p4f1csrx95wh3gl9nkmx3agbgrmpmf34rw6bpwmsf85"; depends=[doParallel fields foreach IDPmisc iterators multitaper]; };
   astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
   astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
   astsa = derive2 { name="astsa"; version="1.8"; sha256="023nk6chyy79scjzhv42px5cpym7rnm1c55ylcslyjdmlr5i6afk"; depends=[]; };
   asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; };
   asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; };
   asymmetry = derive2 { name="asymmetry"; version="1.2.5"; sha256="0wsmarmij4crhv5wr4mqibsf787cy7fmmp4xrclsb3gm3g1xwvzz"; depends=[gplots rJava smacof]; };
-  asympTest = derive2 { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
+  asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; };
   asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
   atlantistools = derive2 { name="atlantistools"; version="0.4.3"; sha256="06rb0c4ralx55mdlqwpjzim0inxif4cdi9732v4h1ll8jhlm5v7d"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; };
+  atlas = derive2 { name="atlas"; version="0.6.0"; sha256="0phpninwqqibafq88s3kwlv84506l2jxaz0hvcwd5hknvydcf6ib"; depends=[httr testthat]; };
   atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
   atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; };
-  attempt = derive2 { name="attempt"; version="0.2.0"; sha256="1i3y39qzk1bpg1m8f3v8bhigdcklv00ypy93npbh8lyhq4w8lk3v"; depends=[rlang]; };
+  attempt = derive2 { name="attempt"; version="0.2.1"; sha256="0366sq1mf3d0amf6yfa42gw1gwwr9rbbqnqvr8hai1bfl672zkcp"; depends=[rlang]; };
   attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
   atus = derive2 { name="atus"; version="0.1"; sha256="15arijdfyci43k0a32zc8qmm73fmzrr3ghhxw0kgipdr3w5xcmz3"; depends=[]; };
   auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
   aucm = derive2 { name="aucm"; version="2018.1-24"; sha256="0x10dawlwxqywjl7mxc2gpp2r4wnd7pb6n80xlrb9yywm7zbb6x2"; depends=[kyotil]; };
   auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; };
-  audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
+  audio = derive2 { name="audio"; version="0.1-5.1"; sha256="1imh2l43n1cvwzzby598qn59rsm5262snril6b98hyih7mw7fyad"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
-  augSIMEX = derive2 { name="augSIMEX"; version="1.0"; sha256="1d13kh9xfkpwy2285awhvgfkwyqlsdk2bypm0i1jjf10avrynxvf"; depends=[MASS Rcpp rootSolve]; };
+  auditor = derive2 { name="auditor"; version="0.2.1"; sha256="0kpadjzfnahrbryn2zh0zxb93wivlbnznrgad3025mf1qabm3xnr"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel hnp plotROC ROCR tseries]; };
+  augSIMEX = derive2 { name="augSIMEX"; version="2.0"; sha256="0j0izfk1hdzzn1s7gd64q56x8ws8nvpzh7a8d13gzwxi9dhvkzvf"; depends=[MASS Rcpp rootSolve]; };
   auk = derive2 { name="auk"; version="0.2.1"; sha256="18vqvjksnllbkwfskiv8cv0dbw92nzkxwb0rj14sxxw8y55hybyy"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
   auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; };
   autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
   autoFRK = derive2 { name="autoFRK"; version="1.0.0"; sha256="10vmgcpj2n5w9g4bjq2g3bz3n3x9b6h35w4qfr13v2sdzp3gz5da"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS Rcpp RcppEigen RcppParallel RSpectra spam]; };
-  autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
   autoimage = derive2 { name="autoimage"; version="2.0"; sha256="102f7wkrglsvdrsmyy79v0w7za5b79sn59czxzhriwrp4mrpdl47"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; };
   automagic = derive2 { name="automagic"; version="0.3"; sha256="0yzv0ianfq217jvz7rba86bcmxh09p513khvq6jk5k7isblvn0qd"; depends=[devtools dplyr formatR githubinstall knitr magrittr pacman purrr remotes yaml]; };
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
   automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; };
-  autoplotly = derive2 { name="autoplotly"; version="0.1.1"; sha256="1pm1760dd9p0h66q7y1v9icfhz1lk6i5akjda06jc2f0rq7mzlj0"; depends=[ggfortify ggplot2 plotly]; };
+  autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
+  autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; };
   autothresholdr = derive2 { name="autothresholdr"; version="1.2.0"; sha256="09wpyirsqw0s4b5221ksr0v0srrq24c6ca8kr5m4hr4ps728np0p"; depends=[checkmate filesstrings ijtiff magrittr Rcpp]; };
-  autovarCore = derive2 { name="autovarCore"; version="1.0-2"; sha256="0yvz3nn792xdam8hgnkdrhcyaf9idp0shb1s0yfj1xigknlinn9n"; depends=[Amelia jsonlite Rcpp urca vars]; };
+  autovarCore = derive2 { name="autovarCore"; version="1.0-4"; sha256="0i5fvx0z2kri0c855q40hd596kfjhmwpp2zw7d7k0xvk2xbcgbiv"; depends=[Amelia jsonlite Rcpp urca vars]; };
   available = derive2 { name="available"; version="1.0.0"; sha256="0w4i0ajw0p71k717v8hg9d8az08m8yl97w5lly87kli36p7mv30h"; depends=[cli clisymbols crayon desc glue jsonlite memoise purrr SnowballC stringdist tibble tidytext udapi yesno]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
@@ -4426,7 +4460,7 @@ in with self; {
   aws_iam = derive2 { name="aws.iam"; version="0.1.7"; sha256="0hag8j5g8rqg39x4f6d8vwwzhz98cx7549xixfl9cxiff7x9sz2c"; depends=[aws_signature httr jsonlite xml2]; };
   aws_lambda = derive2 { name="aws.lambda"; version="0.1.6"; sha256="16vis596clxn6h9j1k66224ikacsg0f9xrzqi5987nqlzrwskjgk"; depends=[aws_signature base64enc httr jsonlite]; };
   aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; };
-  aws_s3 = derive2 { name="aws.s3"; version="0.3.11"; sha256="0zb219xib86980gq00sam804m91448lsmcy4a3ac322sifmrpasc"; depends=[aws_signature base64enc digest httr xml2]; };
+  aws_s3 = derive2 { name="aws.s3"; version="0.3.12"; sha256="1yfi9ihrd0hmzxklc86mf5hcwgzsb5c4p1i402vgpg5mfvcvp3rl"; depends=[aws_signature base64enc digest httr xml2]; };
   aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; };
   aws_signature = derive2 { name="aws.signature"; version="0.4.1"; sha256="094d0jwg6433bdfkvs3r9mjvg61k78ff4ck0zhgyaz4aivlchm9j"; depends=[base64enc digest]; };
   aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; };
@@ -4436,17 +4470,16 @@ in with self; {
   awsMethods = derive2 { name="awsMethods"; version="1.1-0"; sha256="1xywcadpjyzlw5f2k9sbr8fvrj3kcr1r6swi23lc952yrl3gvpkl"; depends=[]; };
   awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; };
   awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; };
-  aylmer = derive2 { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
   bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
   bReeze = derive2 { name="bReeze"; version="0.4-2"; sha256="04zapsxb4lsi85m9qgrsm49yasf0b8wk0djdpa7xks4hjvmskfhq"; depends=[]; };
-  bWGR = derive2 { name="bWGR"; version="1.5.2"; sha256="1ijz72zxxykscbsr4n1k66zjcy6zs9azgdyf2s5w8j291zy43gw6"; depends=[Rcpp]; };
+  bWGR = derive2 { name="bWGR"; version="1.5.3"; sha256="0kgl29kmpdbzjhbwv8kdy2lygza06fb90hqr7vwbgyl4fw049k9p"; depends=[Rcpp]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; };
   backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; };
   backblazer = derive2 { name="backblazer"; version="0.1.0"; sha256="020kdydksm0brnxsa00blf5sylxd4hz49wmngk1x1fx43kdlyc41"; depends=[httr jsonlite openssl]; };
-  backpipe = derive2 { name="backpipe"; version="0.1.8.1"; sha256="1nid5rbgwiq8axkrl2gwl4vr5bjq5k5nrhq7macddvijcn3r2dz8"; depends=[]; };
+  backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; };
   backports = derive2 { name="backports"; version="1.1.2"; sha256="0mml9h3xagi7144pyb3jj9zbh9qzns7izkhdg7df20v7bikr6nz8"; depends=[]; };
   backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; };
   bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; };
@@ -4456,7 +4489,7 @@ in with self; {
   bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
   ballr = derive2 { name="ballr"; version="0.2.0"; sha256="1f5fclmgp0pznahr3ix7xiixqah01jmh2g6fvrqyi6xcin8ynwqc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
-  bamboo = derive2 { name="bamboo"; version="0.9.19"; sha256="1k81r06kw50w6lm0vi6xwjymc4l13abagrn5b6czcyki3i6pwqc2"; depends=[rscala]; };
+  bamboo = derive2 { name="bamboo"; version="0.9.22"; sha256="1fajc4880wkpxjdgh41r2fq95dllpk1irbrkvrrwvb0pf3zbmjsl"; depends=[rscala]; };
   bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
   bamlss = derive2 { name="bamlss"; version="1.0-0"; sha256="0wa54f5zyjyplys29cqhrasc6qa8p5znfal2ihp0qhhs46wzsk4y"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
   banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; };
@@ -4466,13 +4499,13 @@ in with self; {
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
   bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
-  bartMachine = derive2 { name="bartMachine"; version="1.2.4.1"; sha256="0awshy5djs6f6v77g9f4xcmg9pg3zs650bzql3nvfxw5d0zdnbzb"; depends=[bartMachineJARs car missForest randomForest rJava]; };
+  bartMachine = derive2 { name="bartMachine"; version="1.2.4.2"; sha256="100zcpbndbps01qnybrgmsfnh37j93661l4v7zcin0i56cvgg998"; depends=[bartMachineJARs car missForest randomForest rJava]; };
   bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; };
   basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; };
-  base2grob = derive2 { name="base2grob"; version="0.0.2"; sha256="0mknr1kdy2vpa8cj18crr98sp22qj27bb1g3mrm64azchsqr5k64"; depends=[gridGraphics]; };
+  base2grob = derive2 { name="base2grob"; version="0.0.3"; sha256="1hs9qym2hwq3wrknsfpmn9dvbxs3vyiqs3yfcb26knxqlv3qqw3j"; depends=[ggplotify]; };
   base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; };
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
-  base64url = derive2 { name="base64url"; version="1.3"; sha256="1azik4yqafay4m2panbnyyf7cq5qb2qjv74ikhb8rljbsgv2xchd"; depends=[backports]; };
+  base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; };
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
   basefun = derive2 { name="basefun"; version="1.0-1"; sha256="0qiszm71alh7p3inhiv9prdl4f5l45ny8plz2fm7l5h51z5xj54r"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
@@ -4483,7 +4516,7 @@ in with self; {
   batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
   batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; };
-  batchtools = derive2 { name="batchtools"; version="0.9.8"; sha256="1ch03hj8ahkfc9sr4gv985s6zzxk5xm2dbm0hm8xjygkqkd8r5n9"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; };
+  batchtools = derive2 { name="batchtools"; version="0.9.10"; sha256="0qgjag82z7s6s35lccpidkq5rivkz03gnmcggrgaa9vskv0w6q62"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
   bayesAB = derive2 { name="bayesAB"; version="1.1.0"; sha256="0g74n6jvpmb2sbmywcagb10rk8sd3pxzkw9s8s6qpg34q58v01a6"; depends=[ggplot2 Rcpp]; };
@@ -4493,7 +4526,7 @@ in with self; {
   bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; };
   bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; };
   bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; };
-  bayesImageS = derive2 { name="bayesImageS"; version="0.5-1"; sha256="1p4l3i57xm8yrczdiz4nxmd8qv0pv0chlrpvndfn3fnjbcx2cfa2"; depends=[Rcpp RcppArmadillo]; };
+  bayesImageS = derive2 { name="bayesImageS"; version="0.5-2"; sha256="01gnjxrp68jxrygijk6v42dsiyfkxawvj4ilh0sajm05iknkn419"; depends=[Rcpp RcppArmadillo]; };
   bayesLife = derive2 { name="bayesLife"; version="3.2-0"; sha256="1a3x3y77542hgndvymhnyg6dys0s5rimkgprl8psflsgsrxnbmcv"; depends=[bayesTFR car coda hett wpp2017]; };
   bayesLopod = derive2 { name="bayesLopod"; version="1.0.1"; sha256="0v9yy75mvr74jc0fz10qj1acwxjy0lbqkdqaj1hn88v294r9dw3q"; depends=[BH inline raster Rcpp RcppEigen rgeos rstan rstantools slam sp StanHeaders]; };
   bayesPop = derive2 { name="bayesPop"; version="6.2-4"; sha256="1z8s5lbvz642hxl10b4cv361izw82akq40dav3mknqqcgv1vlrk6"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; };
@@ -4502,10 +4535,10 @@ in with self; {
   bayesTFR = derive2 { name="bayesTFR"; version="6.1-2"; sha256="092sl8xk82kybpp0v06j0dxh4zal0d6j2na42ghl2ri36iy6wqvx"; depends=[coda MASS mvtnorm wpp2017]; };
   bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; };
   bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; };
-  bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; };
+  bayesboot = derive2 { name="bayesboot"; version="0.2.2"; sha256="0976ryd0gbw3kpmxg2qxyp1m2swnrpa86vdhvqrqxp7fcrs8cs2z"; depends=[HDInterval plyr]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
   bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; };
-  bayeslm = derive2 { name="bayeslm"; version="0.7.0"; sha256="132dli5lfxdghiz6g9jlzvbb71il0yv679947xrzfy68hln85d40"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
+  bayeslm = derive2 { name="bayeslm"; version="0.8.0"; sha256="1gvqkbz1wmqkxjwkdgj5pir5j1qy5dzjm4jv6mz3mplm16z5vzbl"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
   bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; };
@@ -4514,7 +4547,7 @@ in with self; {
   bayesplot = derive2 { name="bayesplot"; version="1.5.0"; sha256="1f0kgrgr87fp9576ssrygkp5n4186zq1rw5iwzhqr8s81is352li"; depends=[dplyr ggplot2 ggridges reshape2 rlang]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
-  bayou = derive2 { name="bayou"; version="1.1.0"; sha256="1ndd7lygphngvn4a432616f6anmhxbdzmkksrhpl76xvrw5agwkc"; depends=[ape coda denstrip fitdistrplus foreach geiger MASS mnormt phytools Rcpp RcppArmadillo]; };
+  bayou = derive2 { name="bayou"; version="2.1"; sha256="0biziarmamdpapv2p2ylvxqa4mcdvdwbay545w51yb73538bgkb8"; depends=[ape assertthat coda denstrip fitdistrplus foreach geiger MASS Matrix mnormt phytools Rcpp RcppArmadillo]; };
   baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; };
   bazar = derive2 { name="bazar"; version="1.0.6"; sha256="12b1x218x1yh9iadv8ciyncr841s0arvj4pbn74bryhcgbvmbwqm"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
@@ -4528,7 +4561,7 @@ in with self; {
   bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
   bcmaps = derive2 { name="bcmaps"; version="0.17.1"; sha256="12hca67n7fqplis8g954hj588zl9kj8gmph86mxhcy151qpyh927"; depends=[httr rappdirs sf]; };
-  bcp = derive2 { name="bcp"; version="4.0.1"; sha256="1cw7gnkskzwql55bxfrxajsi828zj7rjn7my7dk8lkdqz7n3lsgb"; depends=[Rcpp RcppArmadillo]; };
+  bcp = derive2 { name="bcp"; version="4.0.2"; sha256="0ixpjhyyqaz7gc2ixpask062sxhsfg8d146mm244jkqgiagydg5l"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
   bcrm = derive2 { name="bcrm"; version="0.4.7"; sha256="0s0xmmphrrsqnrsnnsqh9ska6afl4jyk0s0290w6askrlqdzjgil"; depends=[ggplot2 mvtnorm]; };
@@ -4548,17 +4581,18 @@ in with self; {
   beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
   beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
   beadplexr = derive2 { name="beadplexr"; version="0.1.0"; sha256="1aw75v4bjxrf22x0bm57qqp6r7cz8zmkd1hmk4amlxypbxd2479f"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; };
-  beam = derive2 { name="beam"; version="1.0.1"; sha256="1xp8hqs1asg2a2lqzn88cxj0gs6qfwak54sy3kzc64kjp0r9lbl9"; depends=[fdrtool igraph knitr Matrix]; };
+  beam = derive2 { name="beam"; version="1.0.2"; sha256="1gxgw4gcrlbxmlv5scddr6qh4df9xaj6zbs48k660qqn02gjxy9b"; depends=[fdrtool igraph knitr Matrix]; };
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
-  beanz = derive2 { name="beanz"; version="2.1"; sha256="0lnjaka2cmkgc7id8njclmmkjb22v6gz9bkncq5n6zidawrczqp0"; depends=[BH loo Rcpp RcppEigen rstan StanHeaders survival]; };
+  beanz = derive2 { name="beanz"; version="2.3"; sha256="1jxm1xspmyxsvmsgh5q3rykaxzqqw294pvv4vkq1p1qg1y6l1dnb"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; };
   beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; };
   bedr = derive2 { name="bedr"; version="1.0.4"; sha256="052sn90gjr34hjgyndzvcl66pv22q0kjqbx95y1pdydiwhwmhpa3"; depends=[data_table R_utils testthat VennDiagram yaml]; };
-  beepr = derive2 { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; };
+  beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; };
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
-  beginr = derive2 { name="beginr"; version="0.1.0"; sha256="0zi2c6agkxx6aq7ih2c1z4r93fsjmqp2iymxllld0d7jcpp5qbv6"; depends=[cranlogs jsonlite]; };
+  beginr = derive2 { name="beginr"; version="0.1.3"; sha256="1wrxcgapan19p2zwvmrz9fg9hwkxfm0x2qcqkanmn0mmsaixhs3h"; depends=[cranlogs]; };
   behavr = derive2 { name="behavr"; version="0.3.1"; sha256="18rpln7db8cnaj6f47vjgh7q2xbcjmd0vhfbmvm82fr7qhdnnyc0"; depends=[data_table]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
-  belg = derive2 { name="belg"; version="0.2.1"; sha256="0yl4d2zq01r0wcxdjz3v0zmhdj1g7nbw1kn56883vsv5izdliksv"; depends=[Rcpp RcppArmadillo]; };
+  belg = derive2 { name="belg"; version="0.2.3"; sha256="1ss40fxfmzld4fqpbkc3knsxdqc4nmllgvl2v4nyqzcalcknzvvf"; depends=[Rcpp RcppArmadillo]; };
+  bench = derive2 { name="bench"; version="1.0.1"; sha256="0hiwm3jbwr9wjdfx0nk3djskiw1q900h4acaqjgy97p8gl0ig3g8"; depends=[glue pillar profmem rlang tibble]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
   benchmarkme = derive2 { name="benchmarkme"; version="0.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; };
@@ -4569,8 +4603,9 @@ in with self; {
   benthos = derive2 { name="benthos"; version="1.3-5"; sha256="1mzhqqy4dblwv70v1ky5gzrr3jyky9k4wibbp589jjjrga2vhq2a"; depends=[dplyr lazyeval readr]; };
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
   berryFunctions = derive2 { name="berryFunctions"; version="1.17.0"; sha256="13wslhr3xm9davx3s69as41r53m3x0gm3mrnwrbsqcbmf9n0zbv3"; depends=[abind]; };
-  bestNormalize = derive2 { name="bestNormalize"; version="1.0.1"; sha256="0mlvaa35nsp19154g894xvfd6wg99lwxnfissf8yykwfl7fb265x"; depends=[LambertW nortest]; };
-  bestglm = derive2 { name="bestglm"; version="0.36"; sha256="1das1qnczgw46hrjplfhw00wqjd8gxqsdr9s4zmc3k8qlzhb3ych"; depends=[glmnet grpreg lattice leaps]; };
+  bestNormalize = derive2 { name="bestNormalize"; version="1.2.0"; sha256="0ixv5w4x4413131fxl47c3ma0h9ac1khakp89psnci4qjxbcx5xc"; depends=[LambertW nortest]; };
+  bestglm = derive2 { name="bestglm"; version="0.37"; sha256="0ghhi4g75mgq2pnkrvw188s65132i1d7v3hahnjrsnx4vrr8a9lz"; depends=[glmnet grpreg lattice leaps pls]; };
+  betaboost = derive2 { name="betaboost"; version="1.0.0"; sha256="11r6vywkb8182r1797aijm3czrxxghv5hjbadw61ick0masvcpml"; depends=[gamboostLSS mboost]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
   betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
@@ -4584,54 +4619,53 @@ in with self; {
   bezier = derive2 { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
   bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; };
   bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
-  bfp = derive2 { name="bfp"; version="0.0-38"; sha256="117rr680jjfn2xksqwhy7sx03cf5444jdgr9dzlr3bcc6pcxslx2"; depends=[Rcpp]; };
+  bfp = derive2 { name="bfp"; version="0.0-39"; sha256="1g3sbmi1yl7ai8v6a2ri54jqv64wzfy580s8i1w9xwbqjcrpj77m"; depends=[Rcpp]; };
+  bfw = derive2 { name="bfw"; version="0.1.0"; sha256="13hbg2kr56yfg2r58cw3l631rq1kv8bk9gcdqbgspsjn04g1iq2f"; depends=[coda MASS rJava runjags]; };
   bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; };
-  bglm = derive2 { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; };
   bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; };
   bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; };
   bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; };
   bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; };
   bhrcr = derive2 { name="bhrcr"; version="1.0.0"; sha256="0rqn9wkd25d7l295n55idsf1zch1niz5f05qnsbd1gqrq7nw42xn"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
-  bibliometrix = derive2 { name="bibliometrix"; version="1.9.2"; sha256="0xv371k1n00awk3w7cjbiyf3wxkk5vch3hf7lp2yz3fsdy2jh91s"; depends=[factoextra FactoMineR ggplot2 ggrepel igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; };
-  bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; };
+  bib2df = derive2 { name="bib2df"; version="1.0.1"; sha256="1rprcnqvs4nicd26h34kpgzlpl22430dikxs2q1sjf861qachi10"; depends=[dplyr httr humaniformat stringr]; };
+  bibliometrix = derive2 { name="bibliometrix"; version="1.9.4"; sha256="0l2lqz9qx8f86dz2asvv11iv366hvjn2fjamgm98winrvyrzqnsw"; depends=[factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; };
   bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; };
-  biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; };
-  biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
+  biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; };
   bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; };
   bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
-  bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.0"; sha256="1ik5daj2yc2shjkqypl4y6d53nmz170jvx0bdxn3hpm3g5crg1wd"; depends=[gmp]; };
+  bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.2"; sha256="1cbcxwhb25ismiyr95pfgc7nq14p4srd9y8y3g3xz0ywjs0qnjy5"; depends=[gmp]; };
   bigKRLS = derive2 { name="bigKRLS"; version="3.0.0"; sha256="043lm32cams2hc0fg1mvq08r4ippy4s5z62n1616vndfmqsn41v8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
-  bigQueryR = derive2 { name="bigQueryR"; version="0.3.2"; sha256="0l61yvvjlv1zgb1vyf1q3sj4dff1vi6lkf61hc9kqs5cvhqbf87y"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; };
-  bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; };
+  bigQueryR = derive2 { name="bigQueryR"; version="0.4.0"; sha256="1b89yfa0gwd3frdh1z6ygxv2dfncb6g4lp67nh7hkm6r9xamfrxr"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; };
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
   bigalgebra = derive2 { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; };
   biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; };
+  bigchess = derive2 { name="bigchess"; version="1.0.0"; sha256="14hjrma9qjyi9nypbvrqrzf6d1fxh4rrc48yq95vsrg7vr4han5x"; depends=[ff ffbase]; };
+  bigdatadist = derive2 { name="bigdatadist"; version="1.0"; sha256="1xmralvhdczd270c2ym47ywc7gkqs247vpjr1vpmqsgiqvr7n1ql"; depends=[FNN MASS pdist rrcov]; };
   biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
   biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
-  bigleaf = derive2 { name="bigleaf"; version="0.5.2"; sha256="13x79i15jvv1bx4xnl9jakjmbxviac0gnrprax61c5afkaqxfxh4"; depends=[robustbase]; };
+  bigleaf = derive2 { name="bigleaf"; version="0.6.5"; sha256="0l2a4xi9jyx9sd79fvva9rqqxb4mld99k0gycn07fb81m8lkf690"; depends=[robustbase]; };
   biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
-  bigmatch = derive2 { name="bigmatch"; version="0.1.0"; sha256="15qrm3kdp9wglmpsy58z117nj85j8zc6cmf5w1kydamk2c8x49c9"; depends=[liqueueR mvnfast plyr rcbalance]; };
+  bigmatch = derive2 { name="bigmatch"; version="0.2.1"; sha256="0c2rg6fiphb01xz6lm34766gwz7m054bgismwbx6wscmw51nj7rw"; depends=[liqueueR mvnfast plyr rcbalance]; };
   bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
   bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
-  bigpca = derive2 { name="bigpca"; version="1.1"; sha256="09rd8ryar8wiih50s6b246jf0idmi62fsi7ljysx7j0jarj3jyhz"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; };
-  bigrquery = derive2 { name="bigrquery"; version="0.4.1"; sha256="07hi5z8l2qm9cjfc9y1y5vjijkkwmxq1dgz3bvv578kasz6yjs11"; depends=[assertthat DBI httr jsonlite progress readr]; };
-  bigsplines = derive2 { name="bigsplines"; version="1.1-0"; sha256="0jjlv9qidn8xrz630wbyq7kz7vlxgaphv2y2siv90j01j5nj4s89"; depends=[quadprog]; };
+  bigrquery = derive2 { name="bigrquery"; version="1.0.0"; sha256="0z7wsqxla1pg2454l35kkfaz2s9hppwvpz1pds286ddldbbmyzis"; depends=[assertthat curl DBI glue httr jsonlite prettyunits progress rapidjsonr Rcpp tibble]; };
+  bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; };
   bigstep = derive2 { name="bigstep"; version="0.7.4"; sha256="0g45fgnamdv1v3b8xvpsj4rzhisyvbbddwyzvzvmmi4a8w20pzn5"; depends=[bigmemory matrixStats R_utils RcppEigen speedglm]; };
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; };
   bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
-  bikedata = derive2 { name="bikedata"; version="0.1.1"; sha256="0vs1cal05a80zjz6gqfsxs616dqrq47vgk91mrdhca3b95ywxyfq"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl reshape2 RSQLite tibble xml2]; };
+  bikedata = derive2 { name="bikedata"; version="0.2.0"; sha256="1iihf1nf3ybvkhq4j3c5p1271c56vpsmsrjf3q2r9n98g3apa6k2"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl reshape2 RSQLite tibble xml2]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; };
   bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
   billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; };
-  billboarder = derive2 { name="billboarder"; version="0.2.1"; sha256="0xmkj6l3cpyyq23hp6jhfqllpg7gkksajnq25wyccqmypxjik8jv"; depends=[ggplot2 htmlwidgets jsonlite magrittr scales]; };
+  billboarder = derive2 { name="billboarder"; version="0.2.2"; sha256="14jq3k2d0bsc2l8hsc2shps3hw6fq0k0w5m0yj9k4hbidgpg9z7n"; depends=[ggplot2 htmlwidgets jsonlite magrittr scales]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
   binGroup = derive2 { name="binGroup"; version="2.1-1"; sha256="1rwmsrm4ghpvb1vldph2frwglfvajwyj7bzi1f6mhnm9mrg80blj"; depends=[partitions]; };
-  binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
+  binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; };
   binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; };
   binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; };
   binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; };
@@ -4641,8 +4675,7 @@ in with self; {
   binequality = derive2 { name="binequality"; version="1.0.3"; sha256="0hhcmw1mq785zylcxghfnazi3xvnl7sqpqll8fqdk064a4drqkw1"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
   binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; };
   bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; };
-  binhf = derive2 { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[adlift wavethresh]; };
-  binman = derive2 { name="binman"; version="0.1.0"; sha256="103f74gm124vw4rwbfrd5dlgca3v83kqd8m5j9z3ma3snh788mkx"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; };
+  binhf = derive2 { name="binhf"; version="1.0-2"; sha256="040ss4jwqar4b5wb96gpi41xhmlqcbvs4vphxmfj8xs12hd7r6wl"; depends=[adlift EbayesThresh wavethresh]; };
   binneR = derive2 { name="binneR"; version="1.1.1"; sha256="07cfcp9jj5bks8kmxvir9y9z7fj44hvy1wyrg4jy029dvkz8g2ki"; depends=[dplyr magrittr mzR plyr tidyr]; };
   binnednp = derive2 { name="binnednp"; version="0.1.0"; sha256="0cfgz6828b2525dmph5n4zxdgkbx0nsrm4k2azhw1xfi3pz4z6ga"; depends=[fitdistrplus kedd mclust nor1mix Rcpp Rdpack]; };
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
@@ -4658,48 +4691,49 @@ in with self; {
   bio3d = derive2 { name="bio3d"; version="2.3-4"; sha256="1zmswa9xs81lbrlkkgi8dvv9xpf0ynqjqwy1k36szvfb8ar9mczr"; depends=[Rcpp]; };
   bioOED = derive2 { name="bioOED"; version="0.1.4"; sha256="1rjcqrni5xag97pxfsf40isr2c8pkqsvihf86phak8ngwl7qdgmc"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
+  bioacoustics = derive2 { name="bioacoustics"; version="0.1.2"; sha256="0xhlmcfb7ll4w655dsq6vdjn6yl2imrw6da2xg5csk2s9yg059wq"; depends=[htmltools moments Rcpp stringr tuneR]; };
   biofiles = derive2 { name="biofiles"; version="1.0.0"; sha256="1bglgl2jcp6jy3f7xwndil56i98xx4kn518s3fqdixw7n5ibmqd2"; depends=[assertthat BiocGenerics Biostrings foreach GenomeInfoDb GenomicRanges IRanges iterators Rcpp RCurl reutils S4Vectors XVector]; };
-  biogas = derive2 { name="biogas"; version="1.10.0"; sha256="1il4r71h2a0xqpjs7q97ypdd12jmdnh0kqcs6j5gpjxdsmgnhlsy"; depends=[]; };
+  biogas = derive2 { name="biogas"; version="1.10.3"; sha256="1qfidjwhaxg5zplzkldhj4zqg81xrcqmvh9x5km5yhyymzr6y4vs"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
   biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; };
   bioimagetools = derive2 { name="bioimagetools"; version="1.1.3"; sha256="1xl5q45s4amvinfzysf5za0myq1f76xvqhyza0b191bky5vk8qq1"; depends=[EBImage httr tiff]; };
   bioinactivation = derive2 { name="bioinactivation"; version="1.2.1"; sha256="1dxpa549y6dqzmi8nk57x0blqmcz51v9hj0sy3g9laj9aj0rmyzz"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS rlang]; };
-  biolink = derive2 { name="biolink"; version="0.1.3"; sha256="0cy9s9wg5rgwczqjfw6xp9ragqcj9gzp7icpm0nqwrdghsj7azjv"; depends=[DBI glue memoise rentrez RMySQL xml2]; };
-  biomartr = derive2 { name="biomartr"; version="0.7.0"; sha256="1gjl4xh9ryxsf3lhn4fqa3zw10yc0mwrfgkrbq117njsw988kms7"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite purrr RCurl readr stringr tibble XML]; };
+  biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; };
+  biomartr = derive2 { name="biomartr"; version="0.8.0"; sha256="1i56j2fsnnnrmvqxkm9clswi85grh9ikv5zgvlmka8jj26qgkgw7"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite purrr RCurl readr stringr tibble XML]; };
   biomod2 = derive2 { name="biomod2"; version="3.3-7"; sha256="0mbf6j4m7vvq82l1grmznfqirj1ynr6jzzlpx0s2wjd3hdbvgzia"; depends=[abind dismo earth gbm ggplot2 MASS maxent mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; };
   bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
   bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; };
   bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
   bioset = derive2 { name="bioset"; version="0.2.2"; sha256="1l2iss3rbzc69360r9i9j7nf0nn4fkj3j7bgc1hdabr32i19jkhh"; depends=[dplyr magrittr rlang tibble tidyr]; };
   biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; };
-  biospear = derive2 { name="biospear"; version="1.0.1"; sha256="03wsyzlxmqff6xvr10jy49p229xr6jjvr8kk93wm7wil7q6b7z42"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
   biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; };
   bipartite = derive2 { name="bipartite"; version="2.08"; sha256="16j70ikzprjsm81w9bqbp26xxf14ckw654dy7c5hkz24x62qsx2i"; depends=[fields igraph MASS permute sna vegan]; };
   biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
-  birdnik = derive2 { name="birdnik"; version="0.1.0"; sha256="1ql29qbv7jw6cngd36qcgljx0zvvzp2v5rjd44v0j04gww1kb2bc"; depends=[httr]; };
+  birdnik = derive2 { name="birdnik"; version="0.1.1"; sha256="17szs4yh3gmf6glwldbk9bhk6f40si2zv53zvgqmg3lbl3z09dv1"; depends=[httr]; };
   birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
   birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; };
   birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; };
   bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; };
   bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
-  bisoreg = derive2 { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; };
-  bit = derive2 { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; };
+  bisoreg = derive2 { name="bisoreg"; version="1.5"; sha256="0zycdqvanb1lv8gm92lkz188pjaqxbb9658cw7vv43vn3np0rchx"; depends=[bootstrap coda monreg R2WinBUGS]; };
+  bit = derive2 { name="bit"; version="1.1-14"; sha256="0m7jrqzpa1pk8ixcl814x06jf96nlvvr16x6did6cfk4zghsrfjw"; depends=[]; };
   bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; };
   bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
   bitrugs = derive2 { name="bitrugs"; version="0.1"; sha256="0sqgp05b902mdldr4ckz4knmkbsqvgl1vx0l792cn2r437yqlgp3"; depends=[]; };
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
-  bivrp = derive2 { name="bivrp"; version="1.0"; sha256="0q00k24fssvjkgpndg84vdm7w9hswq593k6yjha4pl0a8bmnv6f8"; depends=[MASS]; };
+  bivrp = derive2 { name="bivrp"; version="1.1"; sha256="0ycb3ppz8j6wd8ha52wy8xw0n5a5w4f46j6gk4hy151yslr00qay"; depends=[MASS]; };
+  biwavelet = derive2 { name="biwavelet"; version="0.20.17"; sha256="183h9mdlpizikg1xnrnd03hbij4fnf5ibsad4jcfmh6d73qcgn9b"; depends=[fields foreach Rcpp]; };
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
-  bizdays = derive2 { name="bizdays"; version="1.0.5"; sha256="0yw53qzi2wbc33q5snmf7xsisfnknvf6pqr20npkwbh3999i1gk0"; depends=[]; };
+  bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; };
+  bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; };
   bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
-  blackbox = derive2 { name="blackbox"; version="1.1.7"; sha256="1qdj6wsgr623wnhc573krnhjx65d4k9y8i3n2l2lj1qpqd538ygw"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; };
-  blandr = derive2 { name="blandr"; version="0.4.3"; sha256="03w1k646izbrygcsynrzrph7crpqdqn58544mmm9zxfvkmsilpmi"; depends=[ggplot2 knitr]; };
+  blackbox = derive2 { name="blackbox"; version="1.1.25"; sha256="1xjljxvh8jg5gnfwdb6f8ifn5s30dxjlnbal97kinq0ad33lvs48"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; };
+  blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; };
   blastula = derive2 { name="blastula"; version="0.2.0"; sha256="11vaqsfm0kszx3iq38c8vbqnwkfk77lv5021l2zq9iaxz9d83s7k"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr knitr magrittr purrr rlang stringr tibble tidyr]; };
-  blavaan = derive2 { name="blavaan"; version="0.3-1"; sha256="1r5kararl5d8fk6zlawhyjpi1sc3xp1pd2cf83qmh9wbvdsfphwg"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
+  blavaan = derive2 { name="blavaan"; version="0.3-2"; sha256="0rbwdxajrzr43wmqjmxw2hh390inba6nj15yfwqr25ipw0l2mwl3"; depends=[coda lavaan loo MCMCpack mnormt nonnest2]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
-  blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
   blink = derive2 { name="blink"; version="0.1.0"; sha256="0gi5dk2js3mssg2blji7yddrbmsynp9nr3qhzlpkpy15i81mg2xy"; depends=[plyr RecordLinkage stringdist]; };
   blkbox = derive2 { name="blkbox"; version="1.0"; sha256="14bl0b5w46gb7v8p94df5r56nj849r7jqisajagvd1irda3vkc7z"; depends=[bartMachine caret dplyr e1071 ggplot2 glmnet gtools kknn knitr magrittr nnet pamr party plyr pROC randomForest reshape reshape2 rJava rmarkdown shiny shinyjs stringr tibble tidyr xgboost]; };
   blkergm = derive2 { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[ergm network statnet_common]; };
@@ -4710,25 +4744,25 @@ in with self; {
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
   blockcluster = derive2 { name="blockcluster"; version="4.2.6"; sha256="0dskcwdh89a24j1lr829p9rrs88l13738b1gvsmsqrcrg9z955xc"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
-  blockmodeling = derive2 { name="blockmodeling"; version="0.3.0"; sha256="188m35gpf1lbs3yhqrdiz9zfmf3p4v6v0grzmax3d9w9n5g7rx2y"; depends=[doParallel doRNG foreach Matrix]; };
+  blockmodeling = derive2 { name="blockmodeling"; version="0.3.1"; sha256="0cbx44mg5b9w1sz32wsgjprbss4mfx79sn6m42lvminf0023ds1r"; depends=[doParallel doRNG foreach Matrix]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-  blocksdesign = derive2 { name="blocksdesign"; version="2.8"; sha256="0wgdgy705wpq0lh3k46ba7y8dzajgyfzcr87yvvzh610wr8vnsam"; depends=[crossdes]; };
-  blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
+  blocksdesign = derive2 { name="blocksdesign"; version="3.0"; sha256="17flj5glim3fa53k16p5pfl7dj12f76pgf4j6c1395xhn0qpww8i"; depends=[crossdes lme4]; };
+  blockseg = derive2 { name="blockseg"; version="0.5.0"; sha256="1zc6mvkdwjz7n0yj46c610gz2d3rwsjchbzdcg7k56j06vc9w4lp"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 shiny]; };
   blogdown = derive2 { name="blogdown"; version="0.6"; sha256="02ahyzcapsjaanjiz1j9jx2wh8w2fa7dwbraj5w7bl7bln87cs16"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
+  blorr = derive2 { name="blorr"; version="0.1.0"; sha256="148x2ns7l9s7pb4ksg7h8ayn2lkr18gpfskvjasycccw1q44l8bk"; depends=[car caret checkmate cli clisymbols crayon descriptr dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; };
   blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; };
-  blscrapeR = derive2 { name="blscrapeR"; version="3.1.2"; sha256="1k5g1j4n071pmh2z5lpgkll2i1abpq1h9qialdszak794x8km605"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
-  bmixture = derive2 { name="bmixture"; version="0.7"; sha256="0x876wsahm0k3v900rkvvl2sma3awkhbrsfygikk1wskh3snqbsj"; depends=[BDgraph]; };
+  bmixture = derive2 { name="bmixture"; version="1.2"; sha256="1qyxjjhwd82a4y53nj9ww4c74hrp1v2p4ii71pa59n0pq9xkqj01"; depends=[BDgraph]; };
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
-  bmlm = derive2 { name="bmlm"; version="1.3.5"; sha256="091yjllx4kfngaam1ac8rxcx547k7s7qa75pb5350qkr096pvsvs"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
+  bmlm = derive2 { name="bmlm"; version="1.3.6"; sha256="0fjxz5p698izhfg14kizm04s1wslnkr8l2l19x3pz6qx8a2dcsgq"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
   bmotif = derive2 { name="bmotif"; version="1.0.0"; sha256="1zjwlsimihszg8gg7mvvi8xmzvlsdph9x6524gb28jmd24xb4gwj"; depends=[tensor]; };
   bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; };
   bmrm = derive2 { name="bmrm"; version="3.7"; sha256="1lv4bcjri95nh4yqcp9hd3ad90lcp2drh1dwfn99i3344yw196x2"; depends=[LowRankQP lpSolve matrixStats]; };
-  bnclassify = derive2 { name="bnclassify"; version="0.3.4"; sha256="0gjca802l3lvxy1ri8qff51mrgzj8ng0lk97kb4harvrsqx3i1wi"; depends=[assertthat entropy graph matrixStats RBGL rpart]; };
+  bnclassify = derive2 { name="bnclassify"; version="0.4.0"; sha256="02xs0qn2bmkjw48w1m4d424x8wncgvh8kk1d1jx5r2mv04h32rs7"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
   bnlearn = derive2 { name="bnlearn"; version="4.3"; sha256="11zp8vf79h5a6dyijazld199pzp1lsgk3x049ykgy0bqjx2ivfvq"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
@@ -4737,39 +4771,37 @@ in with self; {
   bnspatial = derive2 { name="bnspatial"; version="1.0.3"; sha256="018rb5wacjk8igyc0qbp9rk3vjz3lffx81awlba8d2npiaxq6jbv"; depends=[doParallel foreach gRain gRbase raster]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; };
   boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; };
-  boclust = derive2 { name="boclust"; version="0.1.2"; sha256="0p6wx053yrq5cff2djqc341pj9q550b870rngspdlbqb0m4k6lr4"; depends=[d3heatmap DT genefilter ggplot2 psych reshape2 Rtsne shiny venn]; };
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
   bold = derive2 { name="bold"; version="0.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
-  bomrang = derive2 { name="bomrang"; version="0.1.4"; sha256="00pzhqqk037hc8zl52f185lnj058vg2adzg0fsndvp83h2wghnd7"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; };
+  bomrang = derive2 { name="bomrang"; version="0.2.1"; sha256="1xivym3imf9gyp88yangyh0023sycy4n8iy578msikjk487iq0w9"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; };
   bookdown = derive2 { name="bookdown"; version="0.7"; sha256="1b3fw1f41zph5yw3kynb47aijq53vhaa6mnnvxly72zamyzdf95q"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; };
   bookdownplus = derive2 { name="bookdownplus"; version="1.3.2"; sha256="0vkivgjfmqy2xfs75w8ylkpgcvca294q61jrhbpg24vnll3c281n"; depends=[bookdown knitr yaml]; };
-  boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
   boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
   boostmtree = derive2 { name="boostmtree"; version="1.2.1"; sha256="0k79zfkck1plcd51sk6i8n5qh7hpnhchkqqhjn460hf0rl2mcjab"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
   boot = derive2 { name="boot"; version="1.3-20"; sha256="0ai1qpm0p4z07xr0dvag8sdn9jrxcwanrsk9khzmww094jvr1jxd"; depends=[]; };
   bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; };
   bootLR = derive2 { name="bootLR"; version="1.0"; sha256="1asf4yxy3abfkgqqg89mv9r2iifc5bgcjipy5idni0lvwfjashnd"; depends=[boot]; };
-  bootRes = derive2 { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
+  bootRes = derive2 { name="bootRes"; version="1.2.4"; sha256="1lzj154qqqxqg6q2bjnzba8hlcx473i9cpp8kkjkpy7k87fgpm7v"; depends=[]; };
   bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
   bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
   bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; };
   bootnet = derive2 { name="bootnet"; version="1.0.1"; sha256="1r5kbcycdlb8g4zs5vsrmcxl20a6x2kj47ybz6h1s83rqiylxg1b"; depends=[abind corpcor dplyr ggplot2 gtools huge igraph IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph relaimpo tidyr]; };
   bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; };
-  bootsPLS = derive2 { name="bootsPLS"; version="1.1.1"; sha256="0ypffscbv7l13kwbgvz18smfass49sqrmivnbb84qiq91wr5frnm"; depends=[mixOmics]; };
+  bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; };
   bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
   bootstrap = derive2 { name="bootstrap"; version="2017.2"; sha256="08lmsy7k8wsgv89yc904c6fidcymr1ma2ry4fl0p69p21v4iiwa4"; depends=[]; };
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-  boral = derive2 { name="boral"; version="1.5"; sha256="1h1vf4j8p1vmhhqsrrn8jn0gynxjvkykm7f4jpsiivkfh69b0w95"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
+  boral = derive2 { name="boral"; version="1.6.1"; sha256="1336nfgr5ni42pkikknlrhiqfi6avyl54ik2173vaxkgxcrlypzz"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
-  boxcoxmix = derive2 { name="boxcoxmix"; version="0.15"; sha256="0qvlk3kcvqzrak2rvf41fs8421fpfh3ch51rq0c9ac62x2dkfidh"; depends=[qicharts statmod]; };
+  boxcoxmix = derive2 { name="boxcoxmix"; version="0.20"; sha256="1s6mkybr88dkn9mandmfrd0j7r3zrfjqgrdfywv54lasl1gcijzk"; depends=[npmlreg qicharts statmod]; };
   boxoffice = derive2 { name="boxoffice"; version="1.1.0"; sha256="08b897dp5cfv6f30k2pdvh8y5n1981msnjr6lfs4dzfc1i6y2zfy"; depends=[httr rvest]; };
-  boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
+  boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; };
   boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; };
   bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; };
-  bpca = derive2 { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; };
+  bpca = derive2 { name="bpca"; version="1.3-0"; sha256="16a7b94nk5psnm435vrwilcsria9mhr5d31fwzxy53pzp8n78kcr"; depends=[rgl scatterplot3d]; };
   bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; };
   bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
   bpnreg = derive2 { name="bpnreg"; version="1.0.0"; sha256="0mpwrhbbbw8m3cz0fl0x9j9m3n9zfdamnw83mmg4bjd0wmxkkm90"; depends=[BH haven MASS Rcpp RcppArmadillo]; };
@@ -4778,50 +4810,51 @@ in with self; {
   braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; };
   braidReports = derive2 { name="braidReports"; version="0.5.3"; sha256="107c9lrzb55dw5pal8qqpn8is3nrh19vfngx3zcfpmc49f06kskq"; depends=[braidrm ggplot2]; };
   braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; };
-  brainGraph = derive2 { name="brainGraph"; version="2.0.2"; sha256="14jj4da2l92fgv924a8s4kw39vhxafaxj6pgwpxw86d5bqmc994g"; depends=[abind ade4 boot cairoDevice data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix mediation oro_nifti permute RcppEigen RGtk2 scales]; };
+  brainGraph = derive2 { name="brainGraph"; version="2.2.0"; sha256="10bqlwrhqjzj1bqv8r77rrqjrxqbwfmzyand47bv4vb00g1wyq3x"; depends=[abind ade4 boot data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix mediation oro_nifti permute RcppEigen scales]; };
+  brainKCCA = derive2 { name="brainKCCA"; version="0.1.0"; sha256="1ag3qahlba4h4126873hg2bbi6sr729mhiw22gjgr4g4jg6lhh09"; depends=[brainR CCA elasticnet kernlab knitr misc3d oro_nifti rgl]; };
   brainR = derive2 { name="brainR"; version="1.5.1"; sha256="0ih4vwy445ciyyvf8snm42vg7rzzf6vn9qkbhj0yyd8sy88mgyss"; depends=[misc3d oro_nifti rgl]; };
   brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
   brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; };
   brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; };
   brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; };
-  breakDown = derive2 { name="breakDown"; version="0.1.5"; sha256="0m9lpd42ypspkwgwfi0pxkhg4xkrnzirm9d9rjxxf1a6y741ijl2"; depends=[ggplot2]; };
+  breakDown = derive2 { name="breakDown"; version="0.1.6"; sha256="13vcqcrm8h4bwr6rd24z0q0nbx2bpxkg39irhv2aybjg3ll8xq77"; depends=[ggplot2]; };
   breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
   breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; };
   breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; };
   breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; };
-  breathtestcore = derive2 { name="breathtestcore"; version="0.4.0"; sha256="04vi9rlb5lkml91jv55v3dyyqcjp9ly760sshpsv9lpbwq47ch7c"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; };
-  breathteststan = derive2 { name="breathteststan"; version="0.4.0"; sha256="13wqb33gvzmjpgzqyyadydz5hnqcran80azaxbixj7wga0c35pqq"; depends=[BH breathtestcore dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; };
+  breathtestcore = derive2 { name="breathtestcore"; version="0.4.1"; sha256="1wd5csdkq9i78l2d9rgp2fp2sw81n0bgi0ssfd447rw6c67x4539"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; };
+  breathteststan = derive2 { name="breathteststan"; version="0.4.1"; sha256="0jmc3984827v656h5zk1rkpbyk56cziandsdz689brw85m01kn1l"; depends=[BH dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; };
   brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
   brglm = derive2 { name="brglm"; version="0.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; };
   brglm2 = derive2 { name="brglm2"; version="0.1.8"; sha256="017m7nlh29p271dhvx19l6042qfs48hqs947kjmpc7ykzv5461y3"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; };
-  bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
   bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; };
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
   bridgesampling = derive2 { name="bridgesampling"; version="0.4-0"; sha256="1gv2h2wgj1ym7qpmxmj5s3q2xsz217ijwdx70qnh4ijvacsvaxwm"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
-  briskaR = derive2 { name="briskaR"; version="0.1.1"; sha256="0w614lb94vim6wlzj13gnfgkq0vg9fjlvwvvs11pnqq501qn2hzl"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
+  briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="2.2.0"; sha256="1wdf5bka51pwdzniwmi6vwry1lms27124zbrmzm7f7b9k6bsqv3k"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
+  brms = derive2 { name="brms"; version="2.3.1"; sha256="134qixmk9r5bq6zmbyrhzyrrd60ihn5m7nkvblj7im9n8gh415wl"; depends=[abind backports bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
   brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.67-4"; sha256="1jv1543zq74zjdrmhkcrjwxhn9bmsmmwadd9rjnn18svnrbnlq0g"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.4.4"; sha256="081x87sy6dmfvkgwfjrl5ax51k77ciyzg9x3xql25vdi92rmwj3m"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
-  brotli = derive2 { name="brotli"; version="1.1"; sha256="1jdhc03ycafjm6zfl9m95pd3krkb94mq2lhfjchfjc876mbam8x6"; depends=[]; };
+  broom = derive2 { name="broom"; version="0.4.5"; sha256="1mrrqqw1bmjf2v88ziqwb5y86g29h0a3rsx2jpw0hrzrzb8i5kcb"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
+  brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
-  brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; };
-  brt = derive2 { name="brt"; version="1.2.0"; sha256="04srx4xfx89lg79krckazlfq0hqph39h01sg6fk1ra8fv2xrcnw4"; depends=[ggplot2]; };
+  brranching = derive2 { name="brranching"; version="0.3.0"; sha256="1mpjcp4x3gcc38irflldv0szznp7jazdn62niwvifinzhq4k7pkb"; depends=[ape crul curl phytools taxize]; };
+  brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; };
+  bs4Dash = derive2 { name="bs4Dash"; version="0.1.0"; sha256="0gqh51rpmqg359pv3lqg221rw9xixvgksv1yldp6sdvy0zxpp8dx"; depends=[shiny]; };
   bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
-  bsamGP = derive2 { name="bsamGP"; version="1.1.2"; sha256="037xgkmcli24jiqahxcingyx97q0jci2ahahcpn3xbzixa161rvf"; depends=[ggplot2 gridExtra MASS]; };
+  bsamGP = derive2 { name="bsamGP"; version="1.2.1"; sha256="0b4a6ll11cykqq05ys1b0y9gdhbw6y60hjclz678vy5w8jia7a1m"; depends=[ggplot2 gridExtra MASS]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
-  bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
+  bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
   bsplinePsd = derive2 { name="bsplinePsd"; version="0.5.0"; sha256="1ddvkn182r48fbjqkiskb94afy942bnl953n0cghza4wkbkdfprd"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
-  bssm = derive2 { name="bssm"; version="0.1.4"; sha256="0wrai7s5sdjykiz8c5qrlcscm1awfz9cjaggarrs83h9fcs3n38x"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
+  bssm = derive2 { name="bssm"; version="0.1.5"; sha256="07bhngqwm2qknsk9910273wgkl1f3c564ab1p90kvyi8syc64mqg"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
   bst = derive2 { name="bst"; version="0.3-14"; sha256="02rnnv3f89329kw81a1v88wjzrfjshqjijw5hp3zyydcsfa3j088"; depends=[doParallel foreach gbm rpart]; };
-  bsts = derive2 { name="bsts"; version="0.7.1"; sha256="07bnhh82abagphfp6y40wchmgb10h2l5lnqc7am50arfa324blrh"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
-  btb = derive2 { name="btb"; version="0.1.14"; sha256="0nk76ddsg8pjd35y2yqw27iammk948i29xmr0ha9l8b867693m44"; depends=[Rcpp sp]; };
+  bsts = derive2 { name="bsts"; version="0.8.0"; sha256="06v8x2wgasbh00vvwn859y6rqp7z5ib43vvhh9qdkkrmdz4gw6sr"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+  btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; };
   btergm = derive2 { name="btergm"; version="1.9.1"; sha256="1bvq6v35fpfd4vhbq1c5jb4gg3iyfflbv0n89gv4hzm80xx50rs9"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet statnet_common texreg xergm_common]; };
   btf = derive2 { name="btf"; version="1.2"; sha256="110p7rk43g48yrnr6c9xkyzsh3kqdywsvi23dav89hl7sxahrf75"; depends=[coda Matrix Rcpp RcppEigen]; };
   bucky = derive2 { name="bucky"; version="1.0.4"; sha256="1irzv1ib40h0ijlpawp0lac572nik3x77xcdi1vyncvinc9pcmr8"; depends=[lmtest sandwich]; };
@@ -4830,23 +4863,25 @@ in with self; {
   bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; };
   bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; };
   bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; };
-  bupaR = derive2 { name="bupaR"; version="0.4.0"; sha256="197ibs7jmbn823skg18zm1kqr2p35bxrd6bw22vjlj6b10r4nqhi"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
+  bupaR = derive2 { name="bupaR"; version="0.4.1"; sha256="0gf9qzk826zq15w8fl9skg1kpmz0s87k5l1rs45ggdwg49q5pq48"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
   burnr = derive2 { name="burnr"; version="0.2.2"; sha256="1b5ys0jm2dmiz1jd5f3907dhv44wh60kmfdfhj3fzx8rk7zllm06"; depends=[ggplot2 MASS plyr reshape2]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
+  bustt = derive2 { name="bustt"; version="0.1.0"; sha256="16y1si8bk7ar6h82bb8l3xq8k2azlxdz4aa56kh33nrajvbfc1fg"; depends=[dplyr lubridate rlang tibble tidyr]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
   bvpSolve = derive2 { name="bvpSolve"; version="1.3.3"; sha256="1q5sh3kj1c07zq7mx8sh4ggp1fvwh86394qrc3ildj4wrbakmzib"; depends=[deSolve rootSolve]; };
+  bw = derive2 { name="bw"; version="1.0.0"; sha256="169mqd0vj0ia0zrfnv3g5gm9vzpj5mrxrwhfv5kh5a720inlcwj1"; depends=[ggplot2 gridExtra Rcpp reshape2 survey]; };
   bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; };
   c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
   c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; };
   c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; };
+  c3 = derive2 { name="c3"; version="0.2.0"; sha256="1af4lrgck1bff8jjp9vwyw2rpq54d1ng13rpcqlf58asdja29s9h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
-  cAIC4 = derive2 { name="cAIC4"; version="0.3"; sha256="1y12y2hk5fjhqfjbrkxl62nk0y0n1x5dh3zmiw7hqbka6i2bzsy7"; depends=[lme4 Matrix]; };
+  cAIC4 = derive2 { name="cAIC4"; version="0.4"; sha256="1lv2nawrjmb89nvp308irmbnagzjxp78l6csmql6nkwcbyhwf9rh"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; };
   cOde = derive2 { name="cOde"; version="0.3"; sha256="1r49q7qansn86wrxbhxqnn1dccd9av4lh4h5pn9kk42pls9q60nf"; depends=[Rcpp RcppArmadillo]; };
   cRegulome = derive2 { name="cRegulome"; version="0.1.1"; sha256="0rhi4f1wkl03vh9m6hsba08cfvqjfn99xyxsykv625bgxra817bd"; depends=[AnnotationDbi clusterProfiler DBI dplyr ggplot2 ggridges httr magrittr org_Hs_eg_db purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; };
-  cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; };
   ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; };
   caRamel = derive2 { name="caRamel"; version="1.0"; sha256="0al4yk77a4bh8rjdpl841bnnjvs0sjyxqswqwik1n6y0bfr8f7pl"; depends=[geometry]; };
   caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
@@ -4855,14 +4890,13 @@ in with self; {
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
   caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; };
   caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; };
-  cairoDevice = derive2 { name="cairoDevice"; version="2.24"; sha256="1xbjxz1cxnwzvb6hjns2kk97krmx24chpyvjaa25xwmvy4x6qcps"; depends=[]; };
+  cairoDevice = derive2 { name="cairoDevice"; version="2.25"; sha256="0qsg6niz6b67yiqp200mi894s615y2bp0vb2sc093l9x9bc2jvfj"; depends=[]; };
   calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
   calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
-  callr = derive2 { name="callr"; version="2.0.3"; sha256="1k3mflgn10hcvy74y4pbigpv74zb66fz1phfd3c8isqmn88xbxzi"; depends=[assertthat crayon debugme R6 testthat]; };
+  callr = derive2 { name="callr"; version="2.0.4"; sha256="1053qqq632z94pqq2v5dynjpgyv1b1c8zvidmcllw7zn8zha8gqf"; depends=[processx R6]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
-  camel = derive2 { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
   camtrapR = derive2 { name="camtrapR"; version="0.99.9"; sha256="1kzy90mwmpn2yb47xp5b8s3lj8lbkg8hfw44pwfb54gqf7wi2lkm"; depends=[overlap rgdal ritis secr sp taxize]; };
   cancensus = derive2 { name="cancensus"; version="0.1.7"; sha256="0v3wbmdqg36zn30kgj5xbndz69x3vvr0i6ag57gz8sbbgc4nyqbr"; depends=[digest dplyr httr jsonlite rlang]; };
@@ -4883,17 +4917,18 @@ in with self; {
   carData = derive2 { name="carData"; version="3.0-1"; sha256="193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j"; depends=[]; };
   carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; };
   carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; };
-  cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; };
+  cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
   care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; };
-  caret = derive2 { name="caret"; version="6.0-79"; sha256="1i6sjw279g6mj83vz5gv99x0nljcbpy7v0nbl72lmd80sf7rjshl"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
+  careless = derive2 { name="careless"; version="1.1.3"; sha256="07yq6sfp110pkd3khfn8ajdqz2r4ipcs90mpaiynh12xl0n67x7k"; depends=[psych]; };
+  caret = derive2 { name="caret"; version="6.0-80"; sha256="0xhdhazzfh0hiqv2hgxglj9ffd2p4ls8acqn2sjn0ndx6158f187"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
   caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; };
   carfima = derive2 { name="carfima"; version="1.0.0"; sha256="0bxk254q916w5h5zyyp2bs6nvbmbzqfx3jr4a80fkgbmr49chzzp"; depends=[DEoptim invgamma MASS numDeriv truncnorm]; };
   caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
   caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
   carpenter = derive2 { name="carpenter"; version="0.2.1"; sha256="1f6g85qgd53wzha8kfq8x29lb5wilgxm6bj49znzd1qj03nlnpna"; depends=[dplyr lazyeval magrittr pander tidyr]; };
-  cartogram = derive2 { name="cartogram"; version="0.0.2"; sha256="055aq2fmbx6ypyqsj427l37px8fld4b9bmc2kcmsi6fmnncb5pxa"; depends=[rgeos sp]; };
-  cartography = derive2 { name="cartography"; version="2.0.2"; sha256="0wnm9hffqa751q8savfrwrnzlwdzg3rs648h17rxa0a1wqq93lzc"; depends=[classInt raster Rcpp rgeos rosm sf sp]; };
+  cartogram = derive2 { name="cartogram"; version="0.1.0"; sha256="01ixcn6fy38r6nazch9dqlg19znssrx4d4fahvx9z7f4clnh0k80"; depends=[packcircles rgeos sf sp]; };
+  cartography = derive2 { name="cartography"; version="2.1.1"; sha256="0dd1qps1iw9cbipy1wamyb1f2ia9bcwdb1v7jaa58ac2x1y4m9gr"; depends=[classInt raster Rcpp rgeos rosm sf sp]; };
   carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; };
   caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; };
   caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
@@ -4901,30 +4936,31 @@ in with self; {
   castor = derive2 { name="castor"; version="1.3.3"; sha256="0n7d4225g28c3i4w4n9bdd8zz91kr80vvnajpn5433db71bqrrv8"; depends=[naturalsort Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
-  catR = derive2 { name="catR"; version="3.13"; sha256="1xzxgf9d33h46qxz6a8d71mi673yzdnvxcxj073z7y19hjss3pkw"; depends=[]; };
+  catR = derive2 { name="catR"; version="3.15"; sha256="1c258x8s1j4z0p1kdg7kr4ligir8q2xdcxmk2cqshxfi0p0irajz"; depends=[]; };
   catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
-  catcont = derive2 { name="catcont"; version="0.3.0"; sha256="1gz7bh3xi7x7clbwa7qvy64nqx5g6dfkyxysick2razr47dac0y1"; depends=[]; };
+  catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; };
+  catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; };
   catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
-  catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; };
-  cati = derive2 { name="cati"; version="0.99.1"; sha256="0sg6qagv1wiygylgygjfn7v4n99ifaaa34qvaspmm9b4fyfcxqa5"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
+  catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; };
+  cati = derive2 { name="cati"; version="0.99.2"; sha256="1h8x73sfjdz45zpcrv80nq8l9i1gldw0vmdgn2lhqrjaxz4zn01l"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; };
   catlearn = derive2 { name="catlearn"; version="0.5"; sha256="12sl1jlnn8669via3fbslbqs3f34andwsizkllpiw0b6k9z2yid6"; depends=[doParallel foreach Rcpp]; };
   catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; };
   catnet = derive2 { name="catnet"; version="1.15.3"; sha256="1dgqrn1lz57pwb5pca0mlvcmw9piy9xgf6fs0y2lsy4qxa9k0plk"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-  cattonum = derive2 { name="cattonum"; version="0.0.1"; sha256="04vayxycv9w5ssw69gifb1y15jkz294wia5s386wyz3bz0sf3fn6"; depends=[rlang tidyselect]; };
+  cattonum = derive2 { name="cattonum"; version="0.0.2"; sha256="0flsfyiymg8p1wik6yldas0ai1bq973rhhh4s3dblf1il4fdl4bv"; depends=[dplyr tidyselect]; };
   causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
-  causaleffect = derive2 { name="causaleffect"; version="1.3.7"; sha256="0j7k1g2s6akwbqrijbfkxsad94knjj5mz5lkwwwfr1bpxs719916"; depends=[ggm igraph XML]; };
-  causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
+  causaleffect = derive2 { name="causaleffect"; version="1.3.8"; sha256="1z7dnfq469wa263xcxfixrn5q4vcd6xl62lahnc5gc8wzvxnxz8g"; depends=[ggm igraph XML]; };
+  causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; };
   causalweight = derive2 { name="causalweight"; version="0.1.0"; sha256="1hig92w18vsyfpv1kvgymk37ik7rw7ql80p886b3s6vwdz8z0r3j"; depends=[mvtnorm np]; };
   cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; };
   cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; };
   cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
-  cbinom = derive2 { name="cbinom"; version="0.0.0"; sha256="1bg4jq67wr4hd6bxf5477wcmns3r956sgw2lm9gw1d4znvz5x3vf"; depends=[Rcpp]; };
+  cbinom = derive2 { name="cbinom"; version="1.3"; sha256="0d9rsvs0zmm37pf1v9vbkkghi0pjlavzi5ar2cvsjapg9x4zg6wl"; depends=[Rcpp]; };
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
-  cbsodataR = derive2 { name="cbsodataR"; version="0.2.5"; sha256="1dc4hbida1fbxin22paa31c0f4xj1pqzcc4649p7lbygqvf1fhqh"; depends=[httr jsonlite whisker yaml]; };
+  cbsodataR = derive2 { name="cbsodataR"; version="0.3"; sha256="1vb6678ki391w0iskggg2xkzbcvvvvpf4vnan5ymk1v7m0i3g3b9"; depends=[httr jsonlite whisker]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
   ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
@@ -4933,19 +4969,19 @@ in with self; {
   cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
   cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; };
   ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
-  ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.4"; sha256="192pfsk6yw26b6f23qgkxslsfwpav8zv6js46i61vj2wa10f4mf2"; depends=[Rcpp sparsebnUtils]; };
+  ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; };
   ccfa = derive2 { name="ccfa"; version="1.0.0"; sha256="0hhrcckiig1qfj7qb04jdmm7bwk9a17y6fn7ldxbmmw8546ad7md"; depends=[BMisc formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; };
   ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
   cchs = derive2 { name="cchs"; version="0.4.0"; sha256="1dahiyn3rj65w56hmhqdxvxh7vkjy5rxlkp1l59aq5iba21ldsyj"; depends=[survival]; };
   cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
   ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; };
   cctools = derive2 { name="cctools"; version="0.1.1"; sha256="1baqijxg75wr90y38d5g1gg8jmpz8ji7zv51wp9n1knif27rg348"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="0.7.0"; sha256="1s35wibqs2bklyi8y4j2jxfj7b5jjap2rib3pmh92da3n5jx049l"; depends=[wrapr]; };
+  cdata = derive2 { name="cdata"; version="0.7.1"; sha256="0hijmhpcz5r4sg8r4fn5h5lzklfwyzjh3dr25bwjc82jdcysjplg"; depends=[wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.7.0"; sha256="00yc3q28y20l2ppqxy6h53p9fvwhvpkc8m7csmp2lizqh787i2cc"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
   cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.0"; sha256="1z9a2rivi1i56369hkz94azfhyqch8wph819lgrxlrr4mcpl6k2p"; depends=[Formula MASS pracma]; };
-  cdlTools = derive2 { name="cdlTools"; version="0.13"; sha256="0zcw7k936mxk7ysjaqj9z3lw3vycbcnp6jhwqqysvd8n62nph24n"; depends=[httr raster]; };
+  cdlTools = derive2 { name="cdlTools"; version="0.14"; sha256="0zf00y8qcklz2yp7vx6mjvx2h2p4kq44r51z4qy88kq9v62rqz3k"; depends=[httr raster]; };
   cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; };
   cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; };
   cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; };
@@ -4954,7 +4990,7 @@ in with self; {
   ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; };
   celestial = derive2 { name="celestial"; version="1.4.1"; sha256="0cvfka5lj0sj9cd7xs68szhckzfm6cgxwxim1nd530s6gxh0l7kz"; depends=[NISTunits pracma RANN]; };
   cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
-  cellWise = derive2 { name="cellWise"; version="2.0.8"; sha256="1xahayqlpylysdiqggzqh7z75r3ldi79bx124ky84r1vab659lm7"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 scales]; };
+  cellWise = derive2 { name="cellWise"; version="2.0.10"; sha256="0cf6yri24ijlph3m7gkgcjdna87z2kz748ffgh35ai8lvwxkrg8w"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 scales]; };
   cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; };
   cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; };
   cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; };
@@ -4964,25 +5000,26 @@ in with self; {
   censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; };
   census = derive2 { name="census"; version="0.2.0"; sha256="02qlmifppnfxw7bzh0zngih8z8qz0sxpsi38h7bv324vxx94gvz2"; depends=[ggmap RCurl]; };
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
-  censusapi = derive2 { name="censusapi"; version="0.2.1"; sha256="1ax1lwnw9978iss8j1hpmbnp8pbsz8rppz37cyfn0m7xnpg9mq8b"; depends=[httr jsonlite]; };
+  censusapi = derive2 { name="censusapi"; version="0.3.0"; sha256="1i3z54ikg6nlxdq3hrb0a58v92lri096jxmkqqdg70rv089wspmf"; depends=[httr jsonlite]; };
   censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; };
   censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; };
   centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; };
+  centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; };
   cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
   cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; };
   cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; };
   cepreader = derive2 { name="cepreader"; version="1.1-2"; sha256="0pyycacsnbqz7hyrvrwwmmphrhny0byyxv66fwrvcsk3s88a7crf"; depends=[]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
   cetcolor = derive2 { name="cetcolor"; version="0.1.0"; sha256="013ghlfs27a585851cir5fxgxhi41h48irq90932y55npa8gwdak"; depends=[]; };
+  ceterisParibus = derive2 { name="ceterisParibus"; version="0.2.1"; sha256="0qjdp4mi1s5j6rzp1z858qv8pxsbh9imykpnh6lmg7diawqpll8h"; depends=[DALEX ggplot2 gower knitr]; };
   cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; };
   cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
+  cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; };
   cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
-  cgam = derive2 { name="cgam"; version="1.10"; sha256="19q90bg32vn7f7znd93a7fz1pjmw1nmfxf4y5y2wfd14qmpwfk36"; depends=[coneproj Matrix svDialogs]; };
+  cgam = derive2 { name="cgam"; version="1.11"; sha256="02iw1ljqqw3h57jkjd6f071lzny225ixkw1v0zmrg0wknrizbm7g"; depends=[coneproj lme4 Matrix svDialogs]; };
   cgdsr = derive2 { name="cgdsr"; version="1.2.10"; sha256="1xyhw7mhmjichr1l6f9y1qvfj9wm87kfbm87ji7lcwf36gxh5g23"; depends=[R_methodsS3 R_oo]; };
-  cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
-  cghFLasso = derive2 { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
   cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; };
   cgmanalysis = derive2 { name="cgmanalysis"; version="1.3"; sha256="0fb93czybl9rpndvz3lykfiwksa154vdrmils8c8l688c62gyq55"; depends=[gdata pracma zoo]; };
   chandwich = derive2 { name="chandwich"; version="1.0.0"; sha256="05x9mg33yl4d9kh5sc4lqi00hwnxdhfg2m0dkm5q0jynkhap7bmz"; depends=[numDeriv]; };
@@ -4990,36 +5027,38 @@ in with self; {
   changepoint_np = derive2 { name="changepoint.np"; version="0.0.2"; sha256="03i4l59h8cr6bizbqn288x9r85kvaz1dyhkv5fsj1189qpdi9m88"; depends=[changepoint zoo]; };
   changepointsHD = derive2 { name="changepointsHD"; version="0.3.0"; sha256="05zmypz2jz55m9avzg63dmp7fpcgi7jpc9vf2fv0kywcvf2wz5ym"; depends=[Rcpp RcppArmadillo]; };
   changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; };
-  charlatan = derive2 { name="charlatan"; version="0.1.0"; sha256="1q5ybipi6b0lzpis53rxsfa0mlkp3c9zmcw5fwq5h93vlrdf6986"; depends=[R6 tibble whisker]; };
+  charlatan = derive2 { name="charlatan"; version="0.2.0"; sha256="1j8lrkh2s7d3jpc07k3rranf8l5rsp1sp9y42fi1rhfkakwssfqd"; depends=[R6 tibble whisker]; };
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
-  chebpol = derive2 { name="chebpol"; version="1.3-1789"; sha256="1505zdzvc9drw7n8qw5jmqligjgp5gwwki4wlk8dsm0p3p06dvd2"; depends=[]; };
+  chebpol = derive2 { name="chebpol"; version="1.5"; sha256="1fsxvay91yqbhxcxchd6pf9x8jpjm9qp2rvc79wq5l5g4ng617pj"; depends=[]; };
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
   checkmate = derive2 { name="checkmate"; version="1.8.5"; sha256="1q6igk50lq4fp5d3imgcn1j063h3gsp214ra4nlf534hf4wjlkg9"; depends=[backports]; };
   checkpoint = derive2 { name="checkpoint"; version="0.4.3"; sha256="0r7v7ijyq92yd95ssxxbdlp5dv1sd09yvxr8c0yihf48kzw65s63"; depends=[]; };
-  checkr = derive2 { name="checkr"; version="0.2.0"; sha256="1fy00mxdjfyw37l95gy9qc0ny5v9kn16hv261c8sl1kgnp8zv4a9"; depends=[]; };
-  cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; };
+  checkr = derive2 { name="checkr"; version="0.3.0"; sha256="168grrzl17k43fdrh9ps4hvhiyinldlmdq8bwdpj5b5cvvhh22lp"; depends=[]; };
+  cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; };
   chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; };
   chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; };
   chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
   cherry = derive2 { name="cherry"; version="0.6-12"; sha256="1b74wlvjqxa532gxs400m1k4qs7xwpdap9ms60nlcwr7x1857mk6"; depends=[bitops lpSolve Matrix]; };
   chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; };
   chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; };
-  childhoodmortality = derive2 { name="childhoodmortality"; version="0.2.0"; sha256="1kdxb02xryc46p7q39gpvn1gwkkrr0rr398i9zxizpxaxvn0r6ql"; depends=[matrixStats plyr]; };
+  childesr = derive2 { name="childesr"; version="0.1.0"; sha256="14jca7lxyn0fip794l70mznhz4ld6iix995wrmiqynxdms6j80np"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; };
+  childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; };
   childsds = derive2 { name="childsds"; version="0.6.7"; sha256="1m5w0wbdk032b6d6h1704wji84yckyl427bja0mb4vqp28m99z48"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr reshape2 tibble tidyr]; };
-  chillR = derive2 { name="chillR"; version="0.70.2"; sha256="01hn2b88ra7kadjylj2y840lpkapm93kdracnamy15c6f5f27kmb"; depends=[fields httr Kendall pls raster RCurl readxl RMAWGEN sp XML]; };
-  chinese_misc = derive2 { name="chinese.misc"; version="0.1.8"; sha256="0c2qhdia7wpkv4x2qnq2lyvgnr0n37brd7m579hcl6zq7dw4y2m7"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; };
+  chillR = derive2 { name="chillR"; version="0.70.6"; sha256="0vkw9r2k8xdshwb3v90bp93mgbp3vj04c7hjxcmaxpsqkhxwda04"; depends=[fields httr jsonlite Kendall pls R_utils raster RCurl readxl RMAWGEN sp XML]; };
+  chinese_misc = derive2 { name="chinese.misc"; version="0.1.9"; sha256="1rs16a5rqp0yq1c5j4yl6yji7hf9x76v6x7qmxppshjii5r8055h"; depends=[jiebaR Matrix NLP purrr Ruchardet slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
-  chngpt = derive2 { name="chngpt"; version="2018.3-29"; sha256="0m1va7rknp2lmqdfhlfndhwb6ysn9vi567cc34f33829pdh0y4w3"; depends=[boot kyotil MASS survival]; };
-  choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
+  chngpt = derive2 { name="chngpt"; version="2018.6-2"; sha256="043aw52kimif7wbz87hf7bg0vmd9n73pj87lvqp0ms99jmp7q2w0"; depends=[boot kyotil MASS survival]; };
+  choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; };
   cholera = derive2 { name="cholera"; version="0.4.0"; sha256="0pm5kbaqkxkwzyda4ms90yivx0iv7hcn2z65xfqcqlsxsjbvlmhs"; depends=[deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
   chopthin = derive2 { name="chopthin"; version="0.2.2"; sha256="1ixmgq6igd2ji88qba7scny1j8rrizcf76dk4ymk3hah5dln97fz"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; };
-  choroplethr = derive2 { name="choroplethr"; version="3.6.1"; sha256="11f529zcflbqbchnp3v5yw2vwrlhyfib5pn2j6l60x0gdfxp07bb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; };
+  choroplethr = derive2 { name="choroplethr"; version="3.6.2"; sha256="0am163df7ggvvk8bk9hjq6f2jc55zzq24skpsgrx1qdlpgv7mls5"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; };
   choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; };
   choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; };
-  chorrrds = derive2 { name="chorrrds"; version="0.1.3"; sha256="1f4mrf5i5cddgv639cv45b35ff4r96hw7xh47zx04lgm295s5rvy"; depends=[dplyr httr jsonlite magrittr plyr stringr XML]; };
+  chorrrds = derive2 { name="chorrrds"; version="0.1.4"; sha256="1mfvzj3bwipdhcdhsp66ihchnnvdbcb9zww2a19ldwr6bwx7nfic"; depends=[dplyr httr jsonlite magrittr plyr stringr XML]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
+  chromoMap = derive2 { name="chromoMap"; version="0.1"; sha256="10cj9liggnbnr4isqmm8jp700z3qj4zq0dm7f7jyj7f0lg8my80y"; depends=[htmltools htmlwidgets]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chron = derive2 { name="chron"; version="2.3-52"; sha256="185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4"; depends=[]; };
   chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; };
@@ -5029,21 +5068,21 @@ in with self; {
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
   cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
   circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; };
-  circlize = derive2 { name="circlize"; version="0.4.3"; sha256="0pg947gkryygikfbv6admx8gsg02b6g219j6a1sdnqij2908yxna"; depends=[colorspace GlobalOptions shape]; };
+  circlize = derive2 { name="circlize"; version="0.4.4"; sha256="1l28maiqi549z191srncxgabx5fnvf0lld7smzwfd3vr5cx8nqww"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
   cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
   citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; };
   ciuupi = derive2 { name="ciuupi"; version="1.0.0"; sha256="1c72crf0his7vzmh86isvcvi0ahxnqdq4i6ms84hk20jmlz2hxin"; depends=[functional nloptr pracma statmod]; };
-  civis = derive2 { name="civis"; version="1.3.0"; sha256="1897b2s23clgwh35r9nvbgd3xbznbn4yxswwwy5rwc3w8yip5brj"; depends=[DBI dbplyr devtools dplyr feather future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; };
+  civis = derive2 { name="civis"; version="1.5.0"; sha256="1cxafcnmbr97i1ygfrwn0d91hyr8irxp1g9zc9zmmaqb3kw5s0sx"; depends=[DBI dbplyr devtools dplyr feather future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; };
   cjoint = derive2 { name="cjoint"; version="2.0.6"; sha256="1bhzw751ll43qbyif589yxmi3m1pbm206lqnsc5zcxsnxjf4li5n"; depends=[ggplot2 lmtest Matrix sandwich survey]; };
   ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; };
   ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
   cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
   clam = derive2 { name="clam"; version="2.3.1"; sha256="1n30fvx4macyawhzv17bzvc1s4qdn51p9mx28apfjbf80qck24g9"; depends=[]; };
-  clampSeg = derive2 { name="clampSeg"; version="1.0-3"; sha256="06j0778qzw7lkdf7wrzshn9pikr57xymb3kbxvxcywz6db5c4k47"; depends=[Rcpp stepR]; };
+  clampSeg = derive2 { name="clampSeg"; version="1.0-4"; sha256="0clmv53wz7shawg6mp4q3qp0z0gmd8jmd6flgzn2q1m8j2i62vq0"; depends=[Rcpp stepR]; };
   clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; };
   class = derive2 { name="class"; version="7.3-14"; sha256="173b8a16lh1i0zjmr784l0xr0azp9v8bgslh12hfdswbq7dpdf0q"; depends=[MASS]; };
   classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; };
@@ -5053,8 +5092,8 @@ in with self; {
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
   classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; };
   classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; };
-  cld2 = derive2 { name="cld2"; version="1.1"; sha256="0zlvnnyz5aqjwzxwghfs9pyxcgr86yg3wpmrdg85dnlggjh2j12z"; depends=[Rcpp]; };
-  cld3 = derive2 { name="cld3"; version="1.0"; sha256="0qka14z9w01b7xy6k97qcgd9qi6myfaw61imnf09mc8nqm0z3kya"; depends=[Rcpp]; };
+  cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; };
+  cld3 = derive2 { name="cld3"; version="1.1"; sha256="00jbncap8h0s26iw5i0891rag5gpf1n3s9imn6n0zbwdn1791ayr"; depends=[Rcpp]; };
   cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
   cleanNLP = derive2 { name="cleanNLP"; version="2.0.3"; sha256="0hmivb2yhj47alxc9z1hlk23hfan9vz938m6xyp639xf58l97scz"; depends=[dplyr Matrix stringi]; };
   cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; };
@@ -5063,34 +5102,35 @@ in with self; {
   clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; };
   clhs = derive2 { name="clhs"; version="0.6-0"; sha256="1vw8z4kmmpd8sbx7n8fzdd7lhg10qpnnx31nnjhv4dbd6v2nqii9"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; };
   cli = derive2 { name="cli"; version="1.0.0"; sha256="07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg"; depends=[assertthat crayon]; };
-  clickR = derive2 { name="clickR"; version="0.3.38"; sha256="1qlc4lz2y2ls5qx1rqiswl5qr5qqkn6l30cp5ikhzr3ffvwp3nym"; depends=[beeswarm boot brms lme4 lmerTest ReporteRs xtable]; };
+  clickR = derive2 { name="clickR"; version="0.4.05"; sha256="0vi8bgvnlq09wxzc51kllngcw9dw3j2m2rh6dwa017xml2cl37j8"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; };
   clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; };
   clifro = derive2 { name="clifro"; version="3.1-5"; sha256="1fbl5zljy60xp3klrsgs84rqw9484xmyq84n3wkrqc6pyvhskp4c"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
-  climatol = derive2 { name="climatol"; version="3.0"; sha256="0wfqs8yk3m6wpm86yfhsg100d4x67bzz1871mxrs69r6ybrh30qx"; depends=[]; };
+  climatol = derive2 { name="climatol"; version="3.1.1"; sha256="012spjgw20bg4rlxgwh05rhaswa4afbd35sq1isidm6i73ma0yjq"; depends=[mapdata maps]; };
   climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; };
   climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
   clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
   climextRemes = derive2 { name="climextRemes"; version="0.2.0"; sha256="0cjvmd48iaid0f95354zpxlgwy79jga9lz0p82yiv0fb2mvjpbqn"; depends=[boot extRemes]; };
   climwin = derive2 { name="climwin"; version="1.2.0"; sha256="0xqgf9hmpidxq85rfm0vndh3waw0qf2yhrzmp04sqbbqhzkf9v7n"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; };
-  clinDR = derive2 { name="clinDR"; version="1.7"; sha256="0xnrnmwg4y2vlxsmhj5pzpyiqk90xjxl91i9nn3lv90xszmdh0x2"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; };
+  clinDR = derive2 { name="clinDR"; version="1.8"; sha256="1vlzrxncx45xpg3jb8357dqk4pjylijr9fqj4pxwajnshrvsvqaw"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; };
   clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; };
   clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
   clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; };
   clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; };
-  clipr = derive2 { name="clipr"; version="0.4.0"; sha256="1bz841r3kmv16r6zxmlkvasp4nyldam00n6gh7zf8lyy9ymz38j4"; depends=[]; };
+  clipr = derive2 { name="clipr"; version="0.4.1"; sha256="061x84ildc7g1p91yw5iyj8lpqdf4hqv36as85lw8c6qv9ywbsqv"; depends=[]; };
+  cliqueMS = derive2 { name="cliqueMS"; version="0.2.1"; sha256="19vv5v4hi10nbm069nqrw3mrindj2bpv2hlmcs8g086cm4wl8ny3"; depends=[BH CAMERA igraph Matrix qlcMatrix Rcpp RcppArmadillo xcms]; };
   clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; };
-  clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
-  clogitLasso = derive2 { name="clogitLasso"; version="1.0.1"; sha256="1mm815w31n0jvbh2rwq15ja1mzvjaz1x846xq1949aj4pb692zrl"; depends=[foreach lassoshooting]; };
+  clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; };
   clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
   clordr = derive2 { name="clordr"; version="1.3.0"; sha256="16cw6i91azi3xw9slzy2v8vpdkqik8k02mvgvcl9a3irbl7wgz10"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
+  cloudml = derive2 { name="cloudml"; version="0.5.1"; sha256="1h276vxb1cfqlcbj9fciysdj4wr9zvwglxfq2sh6hh08lm1w3c0z"; depends=[jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
-  clubSandwich = derive2 { name="clubSandwich"; version="0.3.1"; sha256="1ga7f2s2jrj7xhrqz86bfsby8a6gsp9fqbfv0mjb2iaybi0is8d9"; depends=[sandwich]; };
-  clue = derive2 { name="clue"; version="0.3-54"; sha256="1fnl1wi0g8f243ra5krlpyz69pg8s8m2wwxa53hb086k7hqv74af"; depends=[cluster]; };
+  clubSandwich = derive2 { name="clubSandwich"; version="0.3.2"; sha256="1q4kidxcarlazh9zaav6vdc7ixb3hdg3zh5kr6mwkm087gi05nw5"; depends=[sandwich]; };
+  clue = derive2 { name="clue"; version="0.3-55"; sha256="0hprhzd9i5ifrmfcgddgacg404f6y1zpcpqbyqza4c5lw44am4nc"; depends=[cluster]; };
   clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; };
-  clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; };
+  clusrank = derive2 { name="clusrank"; version="0.5-3"; sha256="0am8q6xc9x9g42gmn0khdizlwrz3ssrripqrw0a36apzk61i6qpp"; depends=[MASS Rcpp]; };
   clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; };
   clustEff = derive2 { name="clustEff"; version="0.1.2"; sha256="1hy7jc8yfg554l439lfrppdsizrdmvxrqf9dwbkjckbvggg54f0k"; depends=[cluster fda qrcm]; };
   clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; };
@@ -5103,23 +5143,24 @@ in with self; {
   clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
   clusterPower = derive2 { name="clusterPower"; version="0.6.111"; sha256="1mwq188x9d495my75cdcahfjm3w46cas9jqxks5c0j63395cw9g3"; depends=[lme4]; };
   clusterRepro = derive2 { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-  clusterSEs = derive2 { name="clusterSEs"; version="2.4.1"; sha256="04f30zsk96yv7c77darfqkkqw4ij4cq8r438lzlb1l063kpaclh4"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+  clusterSEs = derive2 { name="clusterSEs"; version="2.5"; sha256="0m7vlcjs6zmfaxi1kn68fgcvfrb1gpky2fcg8jhrwc3yxzg23m74"; depends=[AER Formula lmtest mlogit plm sandwich]; };
   clusterSim = derive2 { name="clusterSim"; version="0.47-1"; sha256="0k9cn0ycz7l9g4lb434cqp9yx2ilmp25xa5hlhma9jmxlbdsbji2"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; };
   clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.0"; sha256="1dnbymivxkrhx39maannhvm8ynlgjxsiavd2d9ych5nq4mjvhnjg"; depends=[cubature Formula lme4 numDeriv rootSolve]; };
   clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
   clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; };
   clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
-  clustermq = derive2 { name="clustermq"; version="0.8.3"; sha256="1w5gklz7dw26861dqnvvm9hismn6p4wjw4hi0kf37p5hjq7cvfjh"; depends=[infuser narray purrr R6 rzmq]; };
+  clusterlab = derive2 { name="clusterlab"; version="0.0.2.2"; sha256="0pls0yk5x1a48kg1vwzm60yvpmy85gflg9kf0znvkv4k4xrz5smc"; depends=[ggplot2 reshape]; };
+  clustermq = derive2 { name="clustermq"; version="0.8.4.1"; sha256="0j8xaj2spqsvr1dmzz2xi8qwwwyvhw8nmrg3jy52zk20pcqw3c03"; depends=[infuser narray progress purrr R6 rzmq]; };
   clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; };
   clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
-  clustrd = derive2 { name="clustrd"; version="1.2.1"; sha256="05lsicz4br81fv20151j4j2bp1pfddcvywfqkagflc33z954a3z1"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
-  clustree = derive2 { name="clustree"; version="0.1.1"; sha256="0y6i4z9xzmw7jf6c9kl87zims3gs5akyl355jc539534vhmsi73a"; depends=[checkmate dplyr ggplot2 ggraph igraph rlang viridis]; };
+  clustrd = derive2 { name="clustrd"; version="1.2.2"; sha256="0jcx6afns87wyrc7j2rmc57q4447caxwrkq0j7fys5jbkcidw7bh"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
   clustvarsel = derive2 { name="clustvarsel"; version="2.3.2"; sha256="11xd3pgr4i15q9rcim8y6ybi1iijv59k7f8wh0b2368kz3kz54cj"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
+  cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; };
   cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; };
   cmna = derive2 { name="cmna"; version="1.0.0"; sha256="1x4w47j39p2f2n4jxrp4r1vw6gvpqzkgr5h158s18z26zllpvrnr"; depends=[]; };
   cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; };
@@ -5128,7 +5169,7 @@ in with self; {
   cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; };
   cmsaf = derive2 { name="cmsaf"; version="1.9.1"; sha256="02l1g5l42lxg3wlpjg5qm6h8mfr1bdcpi052z8masxf6xf4l0abr"; depends=[fields ncdf4 raster sp]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; };
-  cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; };
+  cna = derive2 { name="cna"; version="2.1.1"; sha256="1m4920ya3nm5x5yyzpd4g0vgnk4f0lc62c2favymk03ldg6kd6c4"; depends=[matrixStats Rcpp]; };
   cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; };
@@ -5137,28 +5178,29 @@ in with self; {
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
   coalitions = derive2 { name="coalitions"; version="0.6.2"; sha256="0plzrjjsbbr5mw6wqirxp1wgpl2bw2kh0gdalr8c8v2z7hc1d9r6"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; };
-  cobalt = derive2 { name="cobalt"; version="3.2.2"; sha256="1hjfhbx8pjxf87bbp41xkq03srixv5p30nw2dk1f8if7xcyzjp97"; depends=[ggplot2 ggstance]; };
+  cobalt = derive2 { name="cobalt"; version="3.3.0"; sha256="12pdcdjca9lncvjpdmpss74sz4jlk33p1l6nmyk2qvwzpf2s8f1d"; depends=[crayon ggplot2 ggstance]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
+  cocktailApp = derive2 { name="cocktailApp"; version="0.1.0"; sha256="0gc75qy0k01z0r5hl07gyc3gi98fcmapwq523vldp04arn3glnb4"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; };
   cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; };
   cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; };
   cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
   coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; };
-  coda_base = derive2 { name="coda.base"; version="0.1.8"; sha256="05bbmfswajmjc8l3g2clwj3hyj06y9v7camq910b881frl2xj584"; depends=[MASS Rcpp RcppArmadillo]; };
+  coda_base = derive2 { name="coda.base"; version="0.1.9"; sha256="0m4a77l34bk0bwcsvc8654hf5pinf2p7k2223vxkrq5ldylpwqax"; depends=[MASS Rcpp RcppArmadillo]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
-  codebook = derive2 { name="codebook"; version="0.5.8"; sha256="0zz4vw5r5dw3vfd0j71jzgdf1z1ll0sgcwqq7qrnxn1s4ya4d0v4"; depends=[dplyr DT future ggplot2 haven knitr likert mice pander psych purrr readr rlang rmarkdown skimr stringr tibble tidyr]; };
-  codemetar = derive2 { name="codemetar"; version="0.1.5"; sha256="164cjcqi0pz2h3v4i8llgjjif1gyrvisg0pqz04s4glbbf2pkz80"; depends=[devtools git2r jsonld jsonlite readr stringi]; };
-  codep = derive2 { name="codep"; version="0.8-1"; sha256="1ip84285kcqgniabw5da7az1p508wx961gr4hiqf8c24flyw08br"; depends=[]; };
+  codebook = derive2 { name="codebook"; version="0.5.9"; sha256="12hycq576klq12lqqkwjvxi2k2axl34zs78hfy78mlwlbcgm51gk"; depends=[dplyr DT future ggplot2 haven htmltools knitr labeling likert mice pander psych purrr readr rio rlang rmarkdown skimr stringr tibble tidyr]; };
+  codemetar = derive2 { name="codemetar"; version="0.1.6"; sha256="1jjm1c7fkrzyhb57ckdf3d808im5j6c20ykkjsnddh220jy4sgss"; depends=[crul curl desc devtools gh git2r jsonld jsonlite memoise purrr readr sessioninfo stringi stringr tibble usethis whisker]; };
+  codep = derive2 { name="codep"; version="0.9-1"; sha256="17jziwm56icswa4ngp51ah8w1ma7ij3cksbdaipk0ikqvb5kinkb"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; };
   codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; };
-  codyn = derive2 { name="codyn"; version="1.1.0"; sha256="0s8ssaq59vddilz0fin9sgr8fir70c220cffbsy2l0qn34q48627"; depends=[assertthat permute]; };
+  codyn = derive2 { name="codyn"; version="2.0.0"; sha256="1h58w4hb5m8qy7i5h1r7306c5aac1j887aig0imgsjhinj48pi5l"; depends=[assertthat permute vegan]; };
   coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
   coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; };
   coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; };
   coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; };
   coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
-  cofeatureR = derive2 { name="cofeatureR"; version="1.1.0"; sha256="1yz73541zsasw4k08b94vkhhs9ilchgpi5mrn4a0cqhb52il73sz"; depends=[dplyr ggplot2 lazyeval]; };
-  coga = derive2 { name="coga"; version="0.2.2"; sha256="0zbcx5g48168clvy8n4pp7pmvx0xlqfwr10fp34wf1k0j08smzx3"; depends=[Rcpp RcppGSL]; };
+  cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; };
+  coga = derive2 { name="coga"; version="1.0.0"; sha256="0mx3jdjd1s855lk451zmjf6w5rpajx39q6w7aw3kng68snyalz16"; depends=[Rcpp RcppGSL]; };
   coin = derive2 { name="coin"; version="1.2-2"; sha256="1fq58793bymzig1syjg2lvn6hsxfwkhh00jfrchh3c0y7rfhc66m"; depends=[modeltools multcomp mvtnorm survival]; };
   coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; };
   coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.1"; sha256="006ndsj37rx7fg3laama9y3xc6ivhp6b67w4wf3g161ypphlhkxv"; depends=[ggplot2 jsonlite RCurl]; };
@@ -5171,11 +5213,12 @@ in with self; {
   collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; };
   colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
   coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; };
+  colocalization = derive2 { name="colocalization"; version="1.0.0"; sha256="0szdxjj5nbb3ncxsg0b7jphlqqxnizs2lymcafk42sdgvlfkx8sr"; depends=[ggplot2]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
   colorSpec = derive2 { name="colorSpec"; version="0.7-3"; sha256="1gg55872ap3h15h5ris1qhjgyq4q55x702z9v0xsigz87fcr300s"; depends=[MASS minpack_lm]; };
-  colordistance = derive2 { name="colordistance"; version="0.8.0"; sha256="0fqj8apgfvk021cs1m79nk9kx294zxbj55jqylcrg3hadxy4plkf"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; };
+  colordistance = derive2 { name="colordistance"; version="1.0.0"; sha256="1z4pa5byk1ag6pqdqi6sn5z6caak4733399gk6zp4wi4kfd9p64a"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
-  colorednoise = derive2 { name="colorednoise"; version="0.0.2"; sha256="0y2a86fwndcgkaxr4jmls7a9d1ipij4zi3r4nchwda0bynlw6mq4"; depends=[dplyr purrr Rcpp]; };
+  colorednoise = derive2 { name="colorednoise"; version="1.0.3"; sha256="1idwb4w1r7jpjvrlly8326i4d9lw6bjlmlb591hgwl5xdf4599gi"; depends=[dplyr purrr Rcpp RcppArmadillo tidyr]; };
   colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
   colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; };
   colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; };
@@ -5187,40 +5230,42 @@ in with self; {
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
   colourlovers = derive2 { name="colourlovers"; version="0.2.2"; sha256="0fgxs73l4g1lnmc2q613ykxxrbmvq6w66zpidccqg64wa9cy5yhm"; depends=[jsonlite png XML]; };
   colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; };
-  colourvision = derive2 { name="colourvision"; version="2.0"; sha256="0gxhdyajrmnks1ivbnhxl37ivq4h3figp5kgk6g2wdn80i2b8k1a"; depends=[Matrix rgl]; };
+  colourvision = derive2 { name="colourvision"; version="2.0.1"; sha256="009nssi996dakjggk64zzmfx9mjdfj04kfy7ds3c9fsb39ynz1ag"; depends=[Matrix rgl]; };
   colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; };
   colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; };
   comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
   combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
   combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; };
-  comclim = derive2 { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
+  comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; };
   cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; };
   comf = derive2 { name="comf"; version="0.1.7"; sha256="1waxapw870fssmy9mzzpslypbal7vanlajzv9ffnsh5w2yzjdpfi"; depends=[plyr]; };
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
-  commonmark = derive2 { name="commonmark"; version="1.4"; sha256="1vb8r9khpvcf0q7acv8rsplfjjwcll302bg5kp596cvn6aacypl6"; depends=[]; };
+  commonmark = derive2 { name="commonmark"; version="1.5"; sha256="1jwx5rgm0ypd9a3v4jd9za4a644rdzhk1n4dvmgkj9hdpwsida3z"; depends=[]; };
   commonsMath = derive2 { name="commonsMath"; version="1.1"; sha256="0v9jlk75ihh8yjhq5ybighvndp0hn1d6rqh78jkh4g6ylhbpvcw0"; depends=[]; };
   comorbidity = derive2 { name="comorbidity"; version="0.1.1"; sha256="0xb3k2ql3ikdbyx8l73wsrwi62ayapszbrygk8arw1g2n0yqz2f4"; depends=[checkmate]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
-  compareDF = derive2 { name="compareDF"; version="1.3.0"; sha256="0idra4qsr73sx4rcnm3d6arfz8mrcc072jiw3lljjmwidsfdnjvr"; depends=[dplyr htmlTable tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="3.3.3"; sha256="18v5as6037ndihsslk25455y553wcbrdriav1p6zbbc52lqcf0a3"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
+  compareDF = derive2 { name="compareDF"; version="1.5.0"; sha256="0nn8yimmi1yqb5qf4brx7i8zps1mfh6w3gfx3xpsaigk1miik1hb"; depends=[dplyr htmlTable stringr tidyr]; };
+  compareGroups = derive2 { name="compareGroups"; version="3.4.0"; sha256="057578433ms4q2xs62zbv36gwx67ihwdlxl243p10y1y7ps335kg"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparer = derive2 { name="comparer"; version="0.1.1"; sha256="1nmvqzrvyxdsidkr243qdn0lj2s7j3jv1sh0mdlxm2v5063nyryr"; depends=[progress]; };
   comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
   compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; };
   compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; };
+  comperank = derive2 { name="comperank"; version="0.1.0"; sha256="0fxg32kp4v42455fia48rnbd3v84g4vsh4r4qc29d0gg93ymz9hp"; depends=[comperes dplyr Rcpp rlang tibble]; };
+  comperes = derive2 { name="comperes"; version="0.2.0"; sha256="0h531xbaidh0ld16q1q4jlx4yshyiczx464x0kkyrrr7ysg527pp"; depends=[dplyr magrittr rlang tibble tidyr]; };
   compete = derive2 { name="compete"; version="0.1"; sha256="1b1320jw8pcnjkzb0lr8j6d3z7yhlq31gszd79wdcmwnpzap9k0z"; depends=[igraph sna]; };
   complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; };
   complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; };
   complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; };
   compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
-  compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; };
-  compound_Cox = derive2 { name="compound.Cox"; version="3.10"; sha256="0xk7r7dvcm5kwvimap9v4h60nxrk6hk72hm7258pm0x32ygwidcw"; depends=[numDeriv survival]; };
+  compositions = derive2 { name="compositions"; version="1.40-2"; sha256="12mp05yi7jkdqg9iwh6bc9sx6sdxagcnrirznxy9hq8502p7238i"; depends=[bayesm energy robustbase tensorA]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.12"; sha256="143a0vgv86n1pz6442r7nk7hh04brz1x3na8msnm9njxf0qqjwpm"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
-  comtradr = derive2 { name="comtradr"; version="0.1.0"; sha256="0az61xsrwzr4g1s6g52vm9fivh985c6s06y3rb1c9ic0my385zhx"; depends=[httr jsonlite magrittr purrr]; };
+  comtradr = derive2 { name="comtradr"; version="0.2.1"; sha256="0l14qwvnzll98jp235ip6skmr3fdr1y5niqjwhz9nyk8spfbyvp1"; depends=[httr jsonlite magrittr purrr]; };
   concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; };
   concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; };
   conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; };
@@ -5238,16 +5283,17 @@ in with self; {
   condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; };
   condvis = derive2 { name="condvis"; version="0.4-2"; sha256="0l515wpsmh7g4q4w29gb1gv5kafwzfhb8as0ml8vbbrh6xcgmz9q"; depends=[MASS]; };
   coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; };
-  conf = derive2 { name="conf"; version="1.0"; sha256="0skfmk1vz8ry52l811rxnk6a8hicajza8m5ycfg7p0xb8ssyj6gi"; depends=[]; };
+  conf = derive2 { name="conf"; version="1.2"; sha256="1xk3b94k73msj2mykxr0b9q472biz40qnckkym82b4vqmga1c0rs"; depends=[SDMTools STAR statmod]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
   config = derive2 { name="config"; version="0.3"; sha256="0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs"; depends=[yaml]; };
-  configr = derive2 { name="configr"; version="0.3.2.1"; sha256="184iafdsj0k8i4n877g00fsnqmdq7k4y1azwn4d18gq2l7kg3qn1"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
+  configr = derive2 { name="configr"; version="0.3.3"; sha256="08fa04sjh2k6mbv998bp6cd7rh47j0ic3bcqdhr7zqlbd1g670x2"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
+  conflicted = derive2 { name="conflicted"; version="0.1.0"; sha256="0dai0dvb3sbnjspg5wdwm4j5d11xkmrvpjjxpzb7s70d8wp4c72h"; depends=[rlang]; };
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
   confreq = derive2 { name="confreq"; version="1.5.1"; sha256="0gy6d1kffb1w86ifldswb9krxyc2p646g9yjlfm1h243qlp52sfa"; depends=[gmp]; };
-  congressbr = derive2 { name="congressbr"; version="0.1.1"; sha256="1kfpyrakbri9zqggcfy7flxyfpf85w5gqxi0p249qjw5khz8nkz5"; depends=[dplyr httr lubridate magrittr pscl purrr stringi stringr tibble tidyr xml2]; };
+  congressbr = derive2 { name="congressbr"; version="0.1.3"; sha256="1c29nqnhiyr9y2hs5lwpqa7c54qcqfr74l5mzh13dlccz3zsm2p1"; depends=[dplyr httr lubridate magrittr pscl purrr stringi stringr tibble tidyr xml2]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
   conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
@@ -5255,7 +5301,8 @@ in with self; {
   constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; };
   constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
-  contfrac = derive2 { name="contfrac"; version="1.1-11"; sha256="0vmcazjlg0p3xaksai3k7yb9bbqkd4lhmbvxf2qymr2asqm51mdi"; depends=[]; };
+  container = derive2 { name="container"; version="0.2.1"; sha256="0vy77hhxmrai71y3ivs69ijdsk50lgrayij2mbvb0415kxv9ifs9"; depends=[R6]; };
+  contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; };
   conting = derive2 { name="conting"; version="1.6.1"; sha256="0vw6gwiajxzaai6ky0b89l2jg4kd4c6xxzb1cmzxlcdrhwmhz402"; depends=[BMS coda gtools mvtnorm tseries]; };
   contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; };
   contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; };
@@ -5264,14 +5311,15 @@ in with self; {
   convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; };
   convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; };
   convevol = derive2 { name="convevol"; version="1.1"; sha256="1d9h2vjzfmnbm4aprbvhndgjh85zp3j1hssm9082nw7zb9ycxs1s"; depends=[ape cluster geiger MASS phytools]; };
-  convexjlr = derive2 { name="convexjlr"; version="0.6.1"; sha256="08p8vgjwd0d1b2x50sihq3nxxxvddg22qvbp6g416nmhqm9pw0wb"; depends=[JuliaCall magrittr XRJulia]; };
-  convey = derive2 { name="convey"; version="0.2.0"; sha256="1sngpp769q13lp3ykk510di2iq06i7fc79z6mhdivmlw3pf40lcb"; depends=[survey]; };
+  convexjlr = derive2 { name="convexjlr"; version="0.7.0"; sha256="1dxvz5jnflswqh7iqc4fw7gbp8s6qn7rfy2b5qx4jklrvfj696yj"; depends=[JuliaCall magrittr XRJulia]; };
+  convey = derive2 { name="convey"; version="0.2.1"; sha256="1fcfzcpiy35xr2i81q002h07zf8gvbv1m5is7j475bi13666ynzh"; depends=[survey]; };
   convoSPAT = derive2 { name="convoSPAT"; version="1.2.4"; sha256="0by1z2z7gzycwrll1agkqnpn5h5cjr6b62gpwy11wl4lh48p4213"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
   cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; };
   cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; };
   coop = derive2 { name="coop"; version="0.6-1"; sha256="1hr78w7qlslpwnrz9mk6w4p5qa8sxhkzans5givy5hf9qkykn0dp"; depends=[]; };
+  coopProductGame = derive2 { name="coopProductGame"; version="1.0"; sha256="0vzx9f6za2zms9sda8p19gcmp4g6y87p91ydybjv8lz9na8hl3ix"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
-  copBasic = derive2 { name="copBasic"; version="2.0.7"; sha256="05fikcba2nmr7lphdc17nlrhxqyv8mw81q26fycwhagmahbsm2ag"; depends=[lmomco randtoolbox]; };
+  copBasic = derive2 { name="copBasic"; version="2.1.0"; sha256="16iax25jzm9613i2ml5d4xjknhycallrbcxhrsrsp8znlclbglqs"; depends=[lmomco randtoolbox]; };
   copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
   cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; };
   coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; };
@@ -5280,11 +5328,12 @@ in with self; {
   copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; };
   copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; };
   corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; };
+  corTest = derive2 { name="corTest"; version="0.9.6"; sha256="1ccb38jyl2nyff2m71pba7vs13nl59zzpdnc7k68333dd8p7zswa"; depends=[MASS]; };
   corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
   corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; };
   cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; };
   cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; };
-  coreCT = derive2 { name="coreCT"; version="1.2.1"; sha256="19aq5snv5kin913rf0a1n9z0cg2l1jn2hnxbd0h05p1qrsysx52b"; depends=[igraph oro_dicom plyr raster]; };
+  coreCT = derive2 { name="coreCT"; version="1.2.3"; sha256="1h4qvcdbx9y0q911xw5j66l16my7wdifvq2z6vbr17s0cmjfywbf"; depends=[igraph oro_dicom plyr raster]; };
   coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; };
   coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; };
   coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
@@ -5294,7 +5343,7 @@ in with self; {
   corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
   corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
   corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; };
-  corpustools = derive2 { name="corpustools"; version="0.3.1"; sha256="0723n7gjk4yrnbvars6c6a805cqpx21z9yn9745wbvfgq7a8c4hy"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi wordcloud]; };
+  corpustools = derive2 { name="corpustools"; version="0.3.3"; sha256="1hgcwnjhqfyylvqcy2j5f2k6chwyybnx38vzzvq62s6qf6p9p7by"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi udpipe wordcloud]; };
   corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; depends=[colorspace doParallel fields foreach mmand rgl]; };
   corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
@@ -5326,15 +5375,15 @@ in with self; {
   covatest = derive2 { name="covatest"; version="1.0.0"; sha256="0g4wfwxngvcssi2bmmb2q5fv909z9qm4wfc8gcldz7fckbsc0k10"; depends=[gstat matrixcalc sp spacetime]; };
   covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; };
   covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; };
-  covmat = derive2 { name="covmat"; version="1.0"; sha256="00y966897x83v471yarfikpr794b7adhgn5c9hgh0j1j4yfdc3b8"; depends=[DEoptim doParallel fGarch foreach ggplot2 gridExtra lhs Matrix mvtnorm optimx reshape2 RMTstat robust robustbase scales VIM xts zoo]; };
-  covr = derive2 { name="covr"; version="3.0.1"; sha256="116ix1ihqsslfhqmm44978ziwgb083zz971d72msk0yb0gyrkdv6"; depends=[crayon httr jsonlite rex withr]; };
+  covr = derive2 { name="covr"; version="3.1.0"; sha256="0ml7hpnwn0b4rgk0qx0pchz1m5b57issbvhl708lnb0bplvf00f7"; depends=[crayon digest httr jsonlite rex withr]; };
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
-  covsep = derive2 { name="covsep"; version="1.0.0"; sha256="1i6ygzzf2s0f7a42q2pb1v0gn369wxdyxvbk4k891irq352sf18r"; depends=[mvtnorm]; };
+  covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; };
   cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; };
   cowplot = derive2 { name="cowplot"; version="0.9.2"; sha256="13yjw7yv7imyqiawqqp304hkp6x36iv6rf6gn03dwzwkj9zwx4lb"; depends=[ggplot2 gtable plyr scales]; };
-  cowsay = derive2 { name="cowsay"; version="0.5.0"; sha256="16rlpyfiwk2f04p49inf5m3pb5nvb45xs6sdfjszihm1hxl09x7x"; depends=[fortunes rmsfact]; };
+  cowsay = derive2 { name="cowsay"; version="0.6.0"; sha256="15kiiqbh8bqdifbjh6ab9r595j2a4zyk4mgmy1w39sja1g95nlvi"; depends=[fortunes rmsfact]; };
+  coxed = derive2 { name="coxed"; version="0.1.1"; sha256="1fk9vcrad8p2xdm1q7wcrd2fk9b59cfs3lvfxi8arkmmbz7pxrmq"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
-  coxme = derive2 { name="coxme"; version="2.2-7"; sha256="0jbaw055whbbxwx6y0gggj5i9rlr787nyknwgqdf1dnzrfzm69v7"; depends=[bdsmatrix Matrix nlme survival]; };
+  coxme = derive2 { name="coxme"; version="2.2-10"; sha256="12p41qc3ryxdcw2zljgvw2gk1wl1pj7h61naqbyc1h0l3dqy8dg2"; depends=[bdsmatrix Matrix nlme survival]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
   coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
   coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; };
@@ -5347,7 +5396,7 @@ in with self; {
   cpgen = derive2 { name="cpgen"; version="0.1"; sha256="1cp3d6riy65lc1mfrxh92lc6f1qal7amhjilfzz0r529j5fipd2v"; depends=[Matrix pedigreemm Rcpp RcppEigen RcppProgress]; };
   cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
   cplexAPI = derive2 { name="cplexAPI"; version="1.3.3"; sha256="1li5sbakkq8hrgwsa4i1qa5bdjj6vm6s9sq23ccknbb8bxp4zmwv"; depends=[]; };
-  cplm = derive2 { name="cplm"; version="0.7-5"; sha256="16li79x2zyydi7gi4n8k09g9x2n1dgd9av3nqjnb0by3v31c44n0"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
+  cplm = derive2 { name="cplm"; version="0.7-7"; sha256="1683j2zbjjrpny22dp23k2mgn0y63ydxccyw7fnr6ngl50504mfb"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; };
@@ -5357,12 +5406,11 @@ in with self; {
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
   cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; };
   cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; };
-  crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
   cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
   crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; };
   cranlike = derive2 { name="cranlike"; version="1.0.1"; sha256="0lnbdkyk5mdy0qlvkx2hakqrisrxsdp5r3gif6f46pf4d9cpfj8v"; depends=[DBI debugme desc RSQLite]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; };
-  cranly = derive2 { name="cranly"; version="0.1"; sha256="1q6x6v77z6y540shyqpiq0p78rp02mmhdmnq79hvlm9ykqblzrcr"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; };
+  cranly = derive2 { name="cranly"; version="0.2"; sha256="0h6yfj805kbprgj28x43iz6lcjsv39vxdf33j9gg2gnmgr5zja67"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
   crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; };
   crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; };
@@ -5371,7 +5419,7 @@ in with self; {
   creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; };
   credsubs = derive2 { name="credsubs"; version="1.0"; sha256="12bs1whk23y41hxa976j30d31x81rmxapz9ll5y2hi5c1h4fypn4"; depends=[]; };
   credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
-  cricketr = derive2 { name="cricketr"; version="0.0.14"; sha256="0vziyagx594d0k44c53z720vwb1hflcxb7m898l5vfds8jsi6mhv"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
+  cricketr = derive2 { name="cricketr"; version="0.0.15"; sha256="0jf9a8kfhzydmspmgh2mxb18q4adbjm3jiz3brxpl42d64agq7qj"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
   crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; };
@@ -5391,21 +5439,22 @@ in with self; {
   crosswalkr = derive2 { name="crosswalkr"; version="0.1.1"; sha256="0yk5yxxsd1alfbfjg5bzjc5b07jfj5s551bzrv3dg57hxnqw9b2z"; depends=[dplyr haven labelled readr readxl tibble]; };
   crossword_r = derive2 { name="crossword.r"; version="0.3.5"; sha256="1h6r5rrmla3jsdfnkxsv4drvp3nrkqkygqv9ak0pn37zlbms99z9"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; };
   crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; };
-  crplyr = derive2 { name="crplyr"; version="0.1.4"; sha256="1z50hplp6m4zgjfhmf2j8b22np6kjzqnprrdc0qx8408cb9vc9zr"; depends=[crunch dplyr lazyeval tibble]; };
-  crqa = derive2 { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
+  crplyr = derive2 { name="crplyr"; version="0.2.0"; sha256="14j0cn3ci6vbmimcinzp25ym0h264405jn8gw7w0gk3rcamgh50s"; depends=[crunch dplyr lazyeval purrr rlang stringr tibble]; };
+  crqa = derive2 { name="crqa"; version="1.0.7"; sha256="008dmrgsajm73r3fl3lqsd4pgkdacpx6m48xg61yc02xciv7ad2b"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
   crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; };
   crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
-  crs = derive2 { name="crs"; version="0.15-30"; sha256="1mv5rf8xfgqlqnvmgsj0zdpwlddzv4d0ymsjl00g21zjq4805g09"; depends=[boot np quantreg rgl]; };
+  crs = derive2 { name="crs"; version="0.15-31"; sha256="0h8hhxnyy8lf7jpnvriaa5dn3zgp1yqhfrnc5rpjlzsx2lnyyv9r"; depends=[boot np quantreg rgl]; };
   crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; };
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
+  crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
   crul = derive2 { name="crul"; version="0.5.2"; sha256="0sfjv8jrb5x85b4dicp7789xxa0g6y89sfd96war84yidmh2a6z0"; depends=[curl httpcode mime R6 urltools]; };
-  crunch = derive2 { name="crunch"; version="1.20.0"; sha256="1hsya10ba6mb3xd1lvbn2d74g9glm0l98fbh130phq5wdnn8lpx9"; depends=[crayon curl httpcache httr jsonlite]; };
+  crunch = derive2 { name="crunch"; version="1.23.0"; sha256="0mcq4qnhn3gadq2ssglvh5wid0a0clkxza3zikxrxwa69vjp7x3q"; depends=[crayon curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; };
-  cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; };
-  crypto = derive2 { name="crypto"; version="0.1.5"; sha256="0yqdn14mv8cbn2nmxflhyn46fqbrk3iknjg3bqxyj5k426q3zqx4"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; };
+  cruts = derive2 { name="cruts"; version="0.4"; sha256="0flhlv9pabmj667azc7vjacmk4d512s34xlrip176s8cmswprzg1"; depends=[lubridate ncdf4 raster sp stringr]; };
+  crypto = derive2 { name="crypto"; version="1.0.2"; sha256="16k08kbn8lr3ycf61imc3fd0vdm2w1rzzn11c6vv7s8kfwvdcfdl"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2 xts yaml]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
   csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; };
@@ -5415,27 +5464,27 @@ in with self; {
   csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; };
   csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
   cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; };
-  cstab = derive2 { name="cstab"; version="0.2-1"; sha256="08s1vann21k4afq84cp3gjzn2z0hqr7mb2znag0qyd9lzh3z6jd2"; depends=[cluster fastcluster Rcpp]; };
+  cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; };
   cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
   csv = derive2 { name="csv"; version="0.5.2"; sha256="1gwib79fysmiwaw48ghsygyqgc00j5zwy7lfgcziw1kp6nxkdk19"; depends=[]; };
   csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
   csvy = derive2 { name="csvy"; version="0.1.3"; sha256="0vszbxqa88sdsi73wng4y8zxhrvcksqa6qs3rbh50c2nll8r8kb3"; depends=[yaml]; };
   cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; };
   ctl = derive2 { name="ctl"; version="1.0.0-0"; sha256="12hrrql9wz43s1d3sfyzlqzx7ajrl3hvf96776ik6icbm8by8h6j"; depends=[MASS qtl]; };
-  ctmcd = derive2 { name="ctmcd"; version="1.2"; sha256="0ci2lcbyl94c6nkwwd6birhdklj936qh79cdnanb50jjfbv75wyz"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; };
-  ctmcmove = derive2 { name="ctmcmove"; version="1.2.8"; sha256="16qi4y3ivcys2dfixm4vzyqbqbm2j1gc1l4bjrrp46c268qja2z3"; depends=[fda gdistance Matrix raster sp]; };
+  ctmcd = derive2 { name="ctmcd"; version="1.3.5"; sha256="0nsazcfa8bg5r2ki5wf4v6q2ws47wk97zr4a5h9jj0mp1900rz2l"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; };
+  ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; };
   ctmle = derive2 { name="ctmle"; version="0.1.1"; sha256="1k9nr2xbaqrbpp31vdcnmpwyazcw79k0r3gbcbinva4pgv2psp29"; depends=[glmnet SuperLearner tmle]; };
-  ctmm = derive2 { name="ctmm"; version="0.4.1"; sha256="1ggq86j643k2xrl1lbkp9is5759fw63vq544z69bfxm889925bm0"; depends=[data_table expm fasttime manipulate MASS Matrix numDeriv pbivnorm raster rgdal scales]; };
+  ctmm = derive2 { name="ctmm"; version="0.5.0"; sha256="1lz07gsly4acdwmv62l01g3rmmjwkiww8hsxlbx0cp0jmk63znn1"; depends=[data_table expm fasttime Gmedian manipulate MASS Matrix numDeriv pbivnorm pracma raster rgdal scales shape]; };
   ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; };
   cts = derive2 { name="cts"; version="1.0-21"; sha256="0wagxqb8msjc8z33qp7sc92l53f56d9bzz9160bmgpjxlj6cnqcj"; depends=[]; };
-  ctsem = derive2 { name="ctsem"; version="2.5.0"; sha256="15k2f9x436n78k63izgg31083spwh4r42s843h69kpvz25717m6p"; depends=[Matrix OpenMx plyr Rcpp rstan shiny]; };
-  ctv = derive2 { name="ctv"; version="0.8-4"; sha256="0yl20b1j8c11b1g0q6qv0wsaivxpikwslhky4lckbm3rwbn5vbb2"; depends=[]; };
-  cubature = derive2 { name="cubature"; version="1.3-11"; sha256="06f6gsvbb732p80r6hxvzh4ik546icxfvx21dyh65ypmw3kgm64k"; depends=[Rcpp]; };
+  ctsem = derive2 { name="ctsem"; version="2.6.5"; sha256="0dk1q18sd4s5ynxq8sdhxc7p35qqc6z87d001pykbr0kzszyf9c2"; depends=[BH corrplot MASS Matrix mvtnorm OpenMx plyr Rcpp RcppEigen rstan rstantools shiny StanHeaders]; };
+  ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; };
+  cubature = derive2 { name="cubature"; version="1.4"; sha256="1hd23b8v2kpqp5gr0va8p2q7j8w9rik6ks7zrr4b8mb2mwrakk74"; depends=[Rcpp]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
-  cubing = derive2 { name="cubing"; version="1.0-4"; sha256="11aln47l8ni33k3mmadccnphsv1rad4n5llg9ff5lpjyk9gn3am8"; depends=[rgl]; };
+  cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; };
   cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
   cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
-  cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
+  cultevo = derive2 { name="cultevo"; version="1.0.2"; sha256="0rmncp4mrdpf3izhhqn9406i36j3d3d7i8cglip04lkfbypl9jvy"; depends=[combinat Hmisc pspearman stringi]; };
   cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
@@ -5445,7 +5494,6 @@ in with self; {
   curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; };
   curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
   curvecomp = derive2 { name="curvecomp"; version="0.1.0"; sha256="0ykgbwnh32w61cjcg1nyqak42hx0jrsrpbra2wh3pgj9clg1qad2"; depends=[multcomp]; };
-  curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; };
   cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
@@ -5463,6 +5511,7 @@ in with self; {
   cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
   cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; };
+  cyclestreets = derive2 { name="cyclestreets"; version="0.1.5"; sha256="1wvg43wrnh0lz2pkkrbidzdsrkypdl2r4ccs9jhdsj8ixm158dvf"; depends=[httr jsonlite magrittr sf stringr]; };
   cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; };
   cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
   cymruservices = derive2 { name="cymruservices"; version="0.2.0"; sha256="1pgk9llaz0glhgf3n60nq3xb8kp4jkk8paz4scxff3whyksxv4yn"; depends=[purrr stringr]; };
@@ -5475,7 +5524,7 @@ in with self; {
   d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; };
   d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; };
-  d3r = derive2 { name="d3r"; version="0.8.0"; sha256="1zx351g4kl45dlva8q4ah3wdjvxjzssjpa280ljypfml3iqkzx70"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.8.2"; sha256="1i8y2pr79v2mfwgi6sgibsgwp0l717yf86dn07l39nfgyrxgx9f4"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
@@ -5483,8 +5532,8 @@ in with self; {
   dLagM = derive2 { name="dLagM"; version="1.0.2"; sha256="0wl1sivphm6plmvjixxs90ki8a1pi4nb2vxqdm5xxbi0ljwpgl1x"; depends=[AER dynlm formula_tools Hmisc plyr wavethresh]; };
   dMod = derive2 { name="dMod"; version="0.4"; sha256="12q80pk0j5081qz4rb19iib0n4h1yf1c42iq1z14yyrmki3266pm"; depends=[cOde deSolve ggplot2 plyr rootSolve stringr]; };
   dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
-  dad = derive2 { name="dad"; version="3.1.0"; sha256="1vwwcrawci8v5rz3al2647gypk0bpngvngkb5s6zxhrdvk785m9a"; depends=[e1071 lattice]; };
-  dae = derive2 { name="dae"; version="3.0-12"; sha256="0xp6cyyk4s06igh2jvrdr28n0bhma79c4cfqxx9mihfx9hcw4bh9"; depends=[ggplot2]; };
+  dad = derive2 { name="dad"; version="3.1.1"; sha256="120f7asg3hbr0c5n821jdr8c7cz67dbv1v646v6xgnyy4n6ym2qa"; depends=[e1071 lattice]; };
+  dae = derive2 { name="dae"; version="3.0-16"; sha256="0nryjijr6cq0pm02ik58lish57ld3nfd16c908jq40dhgws2q7x9"; depends=[ggplot2]; };
   daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; };
   daff = derive2 { name="daff"; version="0.3.0"; sha256="1kl5pjwxds6bz58zd5xaa1hknd6f9i0512895fhljqi7kvsrldra"; depends=[jsonlite V8]; };
   dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
@@ -5492,33 +5541,34 @@ in with self; {
   dagitty = derive2 { name="dagitty"; version="0.2-2"; sha256="11jpjr2l89glr9962mbhy4dfbdjs80nf603w90xx16s4qcmcsghc"; depends=[boot jsonlite MASS V8]; };
   dalmatian = derive2 { name="dalmatian"; version="0.3.0"; sha256="06j7ampp0hwjqgw2agplfc8mngxnb6g4yv3l08plg35769jxxz7f"; depends=[coda dglm gdata ggmcmc rjags]; };
   dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; };
+  damr = derive2 { name="damr"; version="0.3.1"; sha256="1hxsbs2kfv1js4mbllk7fkv3h0gkmw6cymakwj426hk7p8ppb586"; depends=[behavr data_table readr]; };
   dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; };
   darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; };
-  dartR = derive2 { name="dartR"; version="1.0"; sha256="1pp739vwvs4k2a3xnkywvaxppkr764zgf5jfrf8l8830jidg2fsc"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgdal rgl seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; };
+  dartR = derive2 { name="dartR"; version="1.0.5"; sha256="1xdkkxwarmspakiabds6j6zr5fmm6s7rz2f5c87c4ai2xx1mcazw"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgdal rgl seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
   dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
-  data_table = derive2 { name="data.table"; version="1.10.4-3"; sha256="12caklgr19vy9wprdks6zh825vr1iw1cajgwcnbpyvmijqdlz2xs"; depends=[]; };
-  data_tree = derive2 { name="data.tree"; version="0.7.5"; sha256="07mavj30pqgk831dw5nj0z0jri6fq8wx9a6nyx0q873if7q3j52w"; depends=[DiagrammeR R6 stringr]; };
+  data_table = derive2 { name="data.table"; version="1.11.4"; sha256="1mc1drqj5i5ar2za3nkh5j70y37s7z7xwqri2r2b72zkqggg3k7x"; depends=[]; };
+  data_tree = derive2 { name="data.tree"; version="0.7.6"; sha256="0fq7wsql4rmbfjif3klccciq7iqhrwjirj21il6n9r5f1i6x5qxn"; depends=[DiagrammeR R6 stringr]; };
   data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; };
   data360r = derive2 { name="data360r"; version="1.0.1"; sha256="1g245zg70ch81zjmd1ng16lks38qr0a6m63y582w558mza7v148g"; depends=[curl data_table jsonlite reshape2]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.1"; sha256="06nba2yir2yz1189bsag9yavdf9hfmpswxdy92dlnbz9d27jjsic"; depends=[dplyr knitr markdown stringi]; };
-  dataMaid = derive2 { name="dataMaid"; version="1.1.0"; sha256="1scpyc0c4rcb0hk1dnzaqprb59n9vrngkg2h1h1knl5klxabkj2y"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase whoami]; };
+  dataMaid = derive2 { name="dataMaid"; version="1.1.2"; sha256="1phy03bya6zd3xpypic3ymjqgx8iv2y8661mfyvbz99a2bvspj5a"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase whoami]; };
   dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; };
-  dataPreparation = derive2 { name="dataPreparation"; version="0.3.5"; sha256="186xi3nbjgqwf8kilinzd92kzwdazgcpmbb5q420vrs2va6dv0x8"; depends=[data_table lubridate Matrix progress stringr]; };
+  dataPreparation = derive2 { name="dataPreparation"; version="0.3.6"; sha256="1nx9lbwrp55wyirqyfmwddilinhyd9428l9n4kb8bwms7hjcf18h"; depends=[data_table lubridate Matrix progress stringr]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
   dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.3"; sha256="0lrv6fyqi7k079wdpqilgjlb4j2qfs3r02d9ip8s9yznfwqsl826"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; };
   datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
   datacheckr = derive2 { name="datacheckr"; version="0.2.0"; sha256="1kk38pb4dsy6ll6drz2gsngzsv81pwmjrbvh3izm22h849mvlypv"; depends=[]; };
-  datadogr = derive2 { name="datadogr"; version="0.1.1"; sha256="1b6c5c3m005zlky67gi9lf1y0938gdjyjs8yjg7x51h848sy4i5p"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; };
+  datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; };
   datadr = derive2 { name="datadr"; version="0.8.6"; sha256="0fmywnxcvw31vfb9iaxqiw19ycnd98v41pdsdknabysr7fpnygfq"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datafsm = derive2 { name="datafsm"; version="0.2.1"; sha256="16l6ssprsvnpzxlfnqj7r061x700704s5gdci5x9ixdjmglakmdd"; depends=[caret GA Rcpp]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
-  datamaps = derive2 { name="datamaps"; version="0.0.2"; sha256="01pjv5f764vw8krq9mrwnih8a8akkqa5779igh4ddh0av32gswd8"; depends=[htmlwidgets magrittr]; };
+  datamaps = derive2 { name="datamaps"; version="0.0.3"; sha256="00pvns98miq56z3prbb5qg608d5ns9wbp0711x3mmqg0bld1xwmp"; depends=[htmlwidgets magrittr]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; };
-  dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
+  dataone = derive2 { name="dataone"; version="2.1.1"; sha256="17x1v1v13v06qyjb5mvxcdnlp7ln73rhgaib1w1sc44385m33hxs"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
   datapack = derive2 { name="datapack"; version="1.3.1"; sha256="0hzc68vgjvpm235zg8k2642c3jzh3ls9kp6lpz720y1b56q8k3n7"; depends=[digest hash redland uuid XML]; };
   datapasta = derive2 { name="datapasta"; version="3.0.0"; sha256="022ci7iy683lh3fh13a4b3szzqp6j4fchil695bifhi0a34bnxyr"; depends=[clipr readr rstudioapi]; };
   datarobot = derive2 { name="datarobot"; version="2.8.0"; sha256="06yqp1lvskvcyiz8a2jy7kzv721qrvf5ycw6g9jl2bj84raifmap"; depends=[curl httr jsonlite yaml]; };
@@ -5526,8 +5576,8 @@ in with self; {
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; };
   datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; };
-  datastructures = derive2 { name="datastructures"; version="0.2.5"; sha256="0vg7s6l0d9x768j0b6nw93914raybkym0f3l7f0jpwbj265isfs1"; depends=[BH purrr Rcpp]; };
-  datasus = derive2 { name="datasus"; version="0.4.0"; sha256="18mvgdzk2f2plzgz9w47w4zxbdz24rymxvjv08j0cm242pcl11l7"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
+  datastructures = derive2 { name="datastructures"; version="0.2.6"; sha256="1sigcm4w9fj6i538vpf939x9blwx2cfa626lfc8ya8fr8wd5w7vg"; depends=[BH purrr Rcpp]; };
+  datasus = derive2 { name="datasus"; version="0.4.1"; sha256="175bzhjigri49p4v9v3kwdc233w0l3v35220m05qsbpn6in7gw67"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
   datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; };
   dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; };
   dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
@@ -5538,20 +5588,21 @@ in with self; {
   datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; };
   dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; };
   dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; };
-  daymetr = derive2 { name="daymetr"; version="1.3.1"; sha256="034yhyq58ihb9faqsqqwbhhrp64kxim0ix6nwiyx7cxahikvdsiy"; depends=[httr ncdf4 raster rgdal rgeos sp]; };
+  daymetr = derive2 { name="daymetr"; version="1.3.3"; sha256="0hq1jrkfbww3p1s4dqvm9nzg7lfhrr4ax142vr8dvrsyr6s7gg8g"; depends=[httr raster sp]; };
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
-  dbarts = derive2 { name="dbarts"; version="0.9-3"; sha256="0mxpvfaily4712k8q5wiby7rhvqm28qqi1v4b3csnlm9f0260gzi"; depends=[]; };
+  dbarts = derive2 { name="dbarts"; version="0.9-4"; sha256="1xglsx2x8jq71q5y377kcc92j8nymh3v11idjj44gixpm8lspljc"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
-  dbhydroR = derive2 { name="dbhydroR"; version="0.2-4"; sha256="189yzc7nchl31203jadf6qs3w1d3s01ifn9y6403c11qm4y63fpf"; depends=[httr reshape2 XML]; };
+  dbhydroR = derive2 { name="dbhydroR"; version="0.2-5"; sha256="1vldyc7ksi0pbdvnydbsjzap3ghh447x5c15n0s5isw82mqssnjz"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
   dbmss = derive2 { name="dbmss"; version="2.6-3"; sha256="0b3vbsb01rz46mspfk8v9dgwqkxnjkv5d6152zg1zsvyv0z9wvqd"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
-  dbplot = derive2 { name="dbplot"; version="0.2.1"; sha256="1ksjxvq8y5n5vwnpvxwbdmcywnld9fnkmq63ckcv7nbgbiyi5wgw"; depends=[dplyr ggplot2 rlang]; };
+  dbplot = derive2 { name="dbplot"; version="0.3.0"; sha256="1sdhw73a518pj81p4xzfkyk5qnfvv7pmizqgwypmkmr3j87klkdx"; depends=[dplyr ggplot2 purrr rlang]; };
   dbplyr = derive2 { name="dbplyr"; version="1.2.1"; sha256="1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
-  dbscan = derive2 { name="dbscan"; version="1.1-1"; sha256="09rh3x4g3xv5f1p8wbc847z8khj7v2r5vz9yf1lfdiy23q2w3xp1"; depends=[Rcpp]; };
+  dbscan = derive2 { name="dbscan"; version="1.1-2"; sha256="08s73i1pnyfsm10sf15rnn58lj1pzrca6i38dq5ivr5xghb3pksy"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
+  dbx = derive2 { name="dbx"; version="0.1.0"; sha256="026iqa2wnh0amkv0nnflg3wyqnfrh94imrw486k5i1561abdzndq"; depends=[DBI]; };
   dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; };
   dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
   dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
@@ -5560,24 +5611,22 @@ in with self; {
   dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; };
   dcmodify = derive2 { name="dcmodify"; version="0.1.1"; sha256="1a909v6jhihwwmq7lzv2xazrkfa1553kbrjsbjfsh1qrqdiam3sr"; depends=[settings validate yaml]; };
   dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
-  dcurver = derive2 { name="dcurver"; version="0.9.0"; sha256="16qb5lvwxzkffv1gf0gp8dsvaxipwhgnl3y6qqg0h0qx8gynf217"; depends=[Rcpp RcppArmadillo]; };
+  dcurver = derive2 { name="dcurver"; version="0.9.1"; sha256="1cfy0j3rmi3laszrgd3i59cfy4xfs2p6h9dcwbkwq6wnshrpypfn"; depends=[Rcpp RcppArmadillo]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-  ddalpha = derive2 { name="ddalpha"; version="1.3.2"; sha256="1i2zcz20zy9xd42kdz09njbkq07mj2pp6f07z6dnwi5hrmvhbh9r"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
+  ddalpha = derive2 { name="ddalpha"; version="1.3.4"; sha256="16cn0bhbaz9l9k4y79sv2d4f7pvs7dyka273y89igs5jvr99kfj1"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
   ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
-  ddpcr = derive2 { name="ddpcr"; version="1.8"; sha256="11bk4mhiqn73sjji2wz47v7jqqg9kq3amci9m6a88h4fvvgmpcz4"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
+  ddpcr = derive2 { name="ddpcr"; version="1.9"; sha256="0xdy36wdl972xgzs3chzs7x1n4z1xvj1vahcz2pxa1wrr4sd9z8q"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
   ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
   deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
   deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; };
-  deSolve = derive2 { name="deSolve"; version="1.20"; sha256="18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan"; depends=[]; };
+  deSolve = derive2 { name="deSolve"; version="1.21"; sha256="0qqc4mknw1jblzcmph1dg3k1p6w42yal0k1xjh8pqk7yb3a75hs5"; depends=[]; };
   deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
   deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; };
-  deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
-  debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
   debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; };
   decido = derive2 { name="decido"; version="0.1.0"; sha256="1d53qcpy165f9izaj0x5x5d5h7jvihhk6mghs9g52dfxrvpndfgn"; depends=[oz Rcpp]; };
   decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; };
-  decisionSupport = derive2 { name="decisionSupport"; version="1.103.6"; sha256="1lfv1a9pcf1f7la1vxpwvw8abk4jbq7cmalp374l0xasfyin2mr5"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; };
+  decisionSupport = derive2 { name="decisionSupport"; version="1.103.7"; sha256="1nmrr0fic391sxxfnyp32yb889bwb3zkyb4b8g8sk2pgrsqrbybl"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
   decoder = derive2 { name="decoder"; version="1.1.12"; sha256="0jacp5fqi3l87a86kzhivwd7bl9ndcpymw1vkzmr9r5my8d119pk"; depends=[backports]; };
   decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; };
@@ -5588,6 +5637,7 @@ in with self; {
   deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; };
   deductive = derive2 { name="deductive"; version="0.1.2"; sha256="1lz849p0if16877gndkxh7khx1rdvaayhps6khypayddajjr1njq"; depends=[lintools stringdist validate]; };
   deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; };
+  deeplr = derive2 { name="deeplr"; version="1.0.0"; sha256="0pg1vy4x53qns8qn5sv0nqplf23w8dwj0b0wbibpr52lgqjc34r7"; depends=[httr purrr rjson stringr tibble tokenizers utf8]; };
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
   default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; };
   define = derive2 { name="define"; version="0.2.7"; sha256="0m5nk6shfak43zw68vzc9ncl0a3rrrkhc5ckhb5yhjllj6g5yigf"; depends=[encode Hmisc latexpdf SASxport spec]; };
@@ -5601,12 +5651,12 @@ in with self; {
   deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; };
   deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; };
   demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; };
-  deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
+  deming = derive2 { name="deming"; version="1.2"; sha256="0lhc9asly988j38d6pdz54b8yxzigrchnz57inj2my33cfbzp300"; depends=[boot]; };
   demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; };
   demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; };
   demography = derive2 { name="demography"; version="1.20"; sha256="097k0chs8shm1r9ny6jdx2kp2shyxsivjw1n1rhb3bs0m0l3vm9r"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
-  dendextend = derive2 { name="dendextend"; version="1.7.0"; sha256="1krvqadnnh53xx5ql7bwzxaif6a317jzbs1m00gnc6jnj03rfl5d"; depends=[fpc ggplot2 magrittr viridis whisker]; };
-  dendroTools = derive2 { name="dendroTools"; version="0.0.7"; sha256="1wij1jwhbn0zs15zh2raa7xa1zfklchlyihv6baf7gkk5cmy87zg"; depends=[brnn dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly reshape reshape2 RWeka scales]; };
+  dendextend = derive2 { name="dendextend"; version="1.8.0"; sha256="1virn3c232xwcq3d0hhkgjh5gpzl01s39iwii5gxcm9mnsxjzdrh"; depends=[fpc ggplot2 magrittr viridis whisker]; };
+  dendroTools = derive2 { name="dendroTools"; version="0.0.9"; sha256="192bzpq7zxnknkn7g6w10lsqdj5qk0dq2z0dpdripi768y63cdim"; depends=[brnn dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly reshape reshape2 RWeka scales]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; };
   dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; };
   dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
@@ -5625,62 +5675,62 @@ in with self; {
   depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
   dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; };
-  derivmkts = derive2 { name="derivmkts"; version="0.2.2.1"; sha256="02q3vc70rvh83zqjaql46n4qkfmn0x2kfg9ikyps34vg7clsaqs3"; depends=[mnormt]; };
-  desc = derive2 { name="desc"; version="1.1.1"; sha256="0k07qighac1xzmm8k988zi7i88a0yfvia3gk5hbz0fyvb2v9kzrj"; depends=[assertthat crayon R6 rprojroot]; };
+  derivmkts = derive2 { name="derivmkts"; version="0.2.3"; sha256="0qw1xdn3mhz9kx4z352hdny2f46p3rx61hjk2ha5bibm8hnyzdpa"; depends=[mnormt testthat]; };
+  desc = derive2 { name="desc"; version="1.2.0"; sha256="1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6"; depends=[assertthat crayon R6 rprojroot]; };
   descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; };
   descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
   descriptr = derive2 { name="descriptr"; version="0.4.1"; sha256="1jpcfpidi49lyn02sl0hwsixzln9frrz03vrap1aq0phjcln39hh"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; };
-  desctable = derive2 { name="desctable"; version="0.1.1"; sha256="188pw8fjgm2g88nraagmxbnpv4gg89vm6mxm9w9vk88iq4hgbhjc"; depends=[dplyr DT htmltools pander purrr]; };
+  desctable = derive2 { name="desctable"; version="0.1.2"; sha256="135v6gmrvmap71il13i5s0wsxddv8wyqb70ygl05jbmb3n4x61y7"; depends=[dplyr DT htmltools pander purrr]; };
   deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
   desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; };
   designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
   designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; };
-  designmatch = derive2 { name="designmatch"; version="0.3.0"; sha256="1i8xdc6z01x59gvxdmi6qjqwqi8s9zzgfaxwd7xj49r4cl6h81pd"; depends=[lattice MASS Rglpk slam]; };
+  designmatch = derive2 { name="designmatch"; version="0.3.1"; sha256="0px6iyqik4sfs25yybamvf3ay0vd6r75acj8hin76jl6l7fwk30f"; depends=[lattice MASS Rglpk slam]; };
   desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
   desplot = derive2 { name="desplot"; version="1.4"; sha256="0brmdp095zcwx7gncng1ls972kr67ldwiq081wyafn9jm9z461ix"; depends=[lattice reshape2]; };
   detect = derive2 { name="detect"; version="0.4-1"; sha256="0hq3imp4w6bd8x4njcfrvcs5lf0vrfnags1zdph86d7hlrwfds62"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
-  detpack = derive2 { name="detpack"; version="1.1.0"; sha256="11l863yr15db0v6r3fmsk3hvvx6xiidw876009x9gp5fwrv7l1cv"; depends=[]; };
+  detpack = derive2 { name="detpack"; version="1.1.1"; sha256="0q7c01bjrvrlbrhb8vhkjw2f43jp46ny3jdyay0j760cfdaqb5zk"; depends=[]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-  detrendr = derive2 { name="detrendr"; version="0.5.0"; sha256="0fmyssnwqqi36lklyv7dx9rv37ca8x0iq8nisx9q831yqxvd4lhm"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr]; };
-  detzrcr = derive2 { name="detzrcr"; version="0.2.2"; sha256="1bv4l4aharp3gjj9ldri7ip3bfzhq57kkmihmlzdbvnk8ajdggwy"; depends=[ggplot2 MASS shiny]; };
-  devEMF = derive2 { name="devEMF"; version="3.6"; sha256="1n5i68f1j3d5yp0p0845zsvr4xhjrvj610wsb5rrlf90jwnarsx2"; depends=[]; };
+  detrendr = derive2 { name="detrendr"; version="0.5.1"; sha256="0xcr6nk4fzcwf2k3js2619dyw9if0453cwfdna4fcjqp7pifq30a"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr]; };
+  detzrcr = derive2 { name="detzrcr"; version="0.2.3"; sha256="09a8x7zphsk06n64qqbh840vrp89sza9vfnz08il6jdy77j02974"; depends=[ggplot2 MASS shiny]; };
+  devEMF = derive2 { name="devEMF"; version="3.6-1"; sha256="0lhf11bdgizhm2im13d0mc0ca834kg2cyabz92jp4mmhjvglrgf3"; depends=[]; };
   devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; };
-  devRate = derive2 { name="devRate"; version="0.1.6"; sha256="0wm6nqnr76azpwg00cspi4n8r4w5qfkvm5qqp0kshv701pnbsjbp"; depends=[]; };
-  devtools = derive2 { name="devtools"; version="1.13.5"; sha256="1x3wsk7dh3yakii61kbfvafx9yz66h40ixiwfkf03dnp2n24hngs"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
-  dexter = derive2 { name="dexter"; version="0.6.0"; sha256="1qz4j33y6n115gijxs1jg5712g8cmsv7406cx6bsm2zswvv7ra22"; depends=[colorspace DBI dbplyr dplyr DT fastmatch purrr RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
+  devRate = derive2 { name="devRate"; version="0.1.7"; sha256="1vmq467a60fz45fwdp0qs51fzdrdyj61vvdlk82046akzs8mvjvy"; depends=[]; };
+  devtools = derive2 { name="devtools"; version="1.13.6"; sha256="1d9n49djydywfyp9w3njgxs5lag4ac7719wmxy1lkgcmn3l9sx5r"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
+  dexter = derive2 { name="dexter"; version="0.8.0"; sha256="1lnhgy3ji6qa9qw0hdv4r8m4igcsasg0fx1kkz8lr80hxdg98zc3"; depends=[colorspace DBI dbplyr dplyr DT fastmatch purrr RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
+  dextergui = derive2 { name="dextergui"; version="0.1.3"; sha256="0k0dvsb5vvbhw2x57kgsifpiv9jrglapxzillj0nglg8i71wwypg"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
   df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
   dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; };
-  dfcomb = derive2 { name="dfcomb"; version="2.4-2"; sha256="163sc18ka4wkf208ml7ghjsn43b3mbyf9zm4id563az6ckkzw45p"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  dfcomb = derive2 { name="dfcomb"; version="2.5-0"; sha256="16wa7shc5rw8sax0x94i0lvg1h4wnq51mqdvsc5z8a5ki84jxlra"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   dfcrm = derive2 { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
   dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
   dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; };
-  dfmta = derive2 { name="dfmta"; version="1.6-2"; sha256="0icpgsxhzd9y0d3xv82cy807wylxck7zn31g0b3nv0nq3jxy04jk"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  dfmta = derive2 { name="dfmta"; version="1.7-0"; sha256="0ci5faqkrpqkqkl0hrx9j78cid3cr1bs5mlkw4xargf3n4lfgk5j"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; };
   dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; };
   dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; };
   dfpk = derive2 { name="dfpk"; version="3.4.1"; sha256="1nmn5ir20wx3qvcf9rvnwnni5kqbn8adhc2354fb5gcvbnxlc7mc"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
   dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
-  dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; };
+  dglars = derive2 { name="dglars"; version="2.0.1"; sha256="18iypbvk805xh0ybwawwvswsp086q2kjj2cmk1yhlq810260j686"; depends=[Matrix]; };
   dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
   dgo = derive2 { name="dgo"; version="0.2.14"; sha256="0pizzyqgnng3g5g9q2qa5wcwfdl94rz69ah071qx01k03fzayg86"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; };
   dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; };
   dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
   dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; };
-  dhglm = derive2 { name="dhglm"; version="1.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; };
   di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; };
   diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; };
   diagmeta = derive2 { name="diagmeta"; version="0.2-0"; sha256="1qdpsn0c4g459p8p90p2a9fghiwjqqmmanz3zsa5a3lv7zxmk496"; depends=[lme4 meta]; };
   diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; };
   diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
-  diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
+  diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
-  diceR = derive2 { name="diceR"; version="0.4.0"; sha256="1pxkwrbm69b97jia7nc18sprvxqxwwvvvzmxh147wgpqlmgqq47m"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen largeVis magrittr mclust NNLM pheatmap progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
+  diceR = derive2 { name="diceR"; version="0.5.1"; sha256="0r3sj6qkkj6yqz21jcbjylqsr8n6yhghix2568gffckcijzgppar"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
   did = derive2 { name="did"; version="1.0.0"; sha256="0fgwassb8m92iij78f045fl8441f1x9dhf4hnc93wl16yv5hh7g7"; depends=[BMisc formula_tools ggplot2 gridExtra knitr MASS pbapply]; };
@@ -5688,17 +5738,19 @@ in with self; {
   dief = derive2 { name="dief"; version="1.1"; sha256="0x3dwlfi130wmbsmm8vf66qxqn001b07yaiq6mp1s707dnl131mc"; depends=[flux fmsb ggplot2 plyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
   diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; };
-  difNLR = derive2 { name="difNLR"; version="1.2.1"; sha256="102b6hczmvm2pn0ld1pmqjc1pyvbgq1zk1whrgvai35c6qba40r2"; depends=[CTT ggplot2 msm nnet reshape2]; };
-  difR = derive2 { name="difR"; version="4.7"; sha256="17i8l4z7dw8nfr4b5pc72l1qm7byjcflh58kasafx9kxyvfgz258"; depends=[lme4 ltm]; };
+  difNLR = derive2 { name="difNLR"; version="1.2.2"; sha256="0d9454vy0wdl60alvwyw4y8aqwhggkr9ffq4l1mxhwfvj8ypwch0"; depends=[CTT ggplot2 msm nnet reshape2]; };
+  difR = derive2 { name="difR"; version="5.0"; sha256="0k0vw5l3pig514ngpvf0rwhwxc316ws352fgw49c3c95ydsz6wd8"; depends=[deltaPlotR lme4 ltm mirt]; };
   difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; };
   diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
   diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; };
   diffMeanVar = derive2 { name="diffMeanVar"; version="0.0.6"; sha256="0zivbd22hp0biy4vnjh21f4djfg5bl9az0wlhn47rk7fw65rgipb"; depends=[Biobase lawstat MASS methylumi missMethyl]; };
   diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; };
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
+  diffdf = derive2 { name="diffdf"; version="1.0.0"; sha256="1qb27pkjs9bapwgqlb1kablcz54hs4cg0mmf2sisl1b8q4j68q96"; depends=[tibble]; };
   diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
-  diffee = derive2 { name="diffee"; version="1.0.0"; sha256="0phkiq14qajif1nymfymwnhkdrlcx4xnk9mnyf5wgrkgywssgz21"; depends=[igraph]; };
-  diffobj = derive2 { name="diffobj"; version="0.1.9"; sha256="1adqn472qbwrfb8m2iy3sfvj2n8g3d4h6xc3hqxpbv03yyfia2c2"; depends=[crayon]; };
+  diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; };
+  diffeqr = derive2 { name="diffeqr"; version="0.1.1"; sha256="1zvjl2i38nyhk63bncqc5cva1m40sm692w7a36qc455s2jnskfh8"; depends=[JuliaCall stringr]; };
+  diffobj = derive2 { name="diffobj"; version="0.1.10"; sha256="1y3fijswy9fw7q9xdv8cz9vm279av2hlzwbq8fc8lffwrbfl1zs1"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-10"; sha256="09mkqg6avky26c2dsnhpcmby76hfqg0pwmnjhkbp4px2k6c9inrc"; depends=[]; };
@@ -5706,7 +5758,7 @@ in with self; {
   diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
   diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; };
   diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; };
-  diffusr = derive2 { name="diffusr"; version="0.1.2"; sha256="1rvfbs757rngxz7z3kq82nwls26qx35gkjiv1laay06kjs9qrgy5"; depends=[igraph Rcpp RcppEigen]; };
+  diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; };
   digest = derive2 { name="digest"; version="0.6.15"; sha256="1ia4ak956gnn0f5aqhwgam6g9z6f1y57zz8jv45jc8h79yxp8bl8"; depends=[]; };
   digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; };
   digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; };
@@ -5714,16 +5766,18 @@ in with self; {
   dimRed = derive2 { name="dimRed"; version="0.1.0"; sha256="0fasca5fsbrxdwv30hch7vb9snb844l7l8p5fjf239dq45xfy37v"; depends=[DRR]; };
   dina = derive2 { name="dina"; version="1.0.2"; sha256="1dgjny7ik2g15zbi3ywl0xbab6vnv5qkxfrb4x79w7lic5m90ldc"; depends=[Rcpp RcppArmadillo]; };
   dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
+  dineq = derive2 { name="dineq"; version="0.1.0"; sha256="1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl"; depends=[boot Hmisc]; };
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; };
-  directlabels = derive2 { name="directlabels"; version="2017.03.31"; sha256="01ahw0c56mnzwl611s8hnghicww4c4dgf5v2wv6bl1s1pramw9pr"; depends=[quadprog]; };
+  directlabels = derive2 { name="directlabels"; version="2018.05.22"; sha256="0xcpc56ssb9430b0xcdhayk3qaak2qcakyss2pz14y5w2027hblv"; depends=[quadprog]; };
   dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.1"; sha256="0ip7mcjddqg7z9hqrvbxixvkqp9j4d92zgpk6hn6acd4fxhb17r6"; depends=[ggplot2 gtools mvtnorm]; };
   dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
   discSurv = derive2 { name="discSurv"; version="1.3.1"; sha256="0vq3g42xy97ksgsghhz232spkbkr2zs8i9nm7xwdabysi9fgqdsv"; depends=[functional mgcv mvtnorm]; };
   discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; };
   disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
-  disclapmix = derive2 { name="disclapmix"; version="1.6.2"; sha256="01pn8hy3xbf1b1fbbsd4n2hv7gs97zalgq858xsrr4a0nqrvxmn5"; depends=[cluster disclap Rcpp]; };
+  disclapmix = derive2 { name="disclapmix"; version="1.7"; sha256="11qkk5bl5x3axyfdzm1hw522g643mmvk5qg7g3sc3licfvsn32i1"; depends=[cluster disclap MASS Rcpp RcppProgress]; };
+  disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; };
   discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; };
   discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
   discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; };
@@ -5733,20 +5787,19 @@ in with self; {
   diseasemapping = derive2 { name="diseasemapping"; version="1.4.2"; sha256="065ndvpx3q9ycxfjl1f2iy3s23d7qf27s1qz31ppx0n929jynn6n"; depends=[sp]; };
   diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; };
   dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; };
-  disp2D = derive2 { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
   dispRity = derive2 { name="dispRity"; version="1.0.3"; sha256="1swix45fcr0hn21pvy2dwsnbr60bvsdjk8vwh432p0s69c372m3l"; depends=[ade4 ape geiger geometry geoscale paleotree phangorn phyclust vegan]; };
   disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; };
   displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
   dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; };
   disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; };
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
-  dissever = derive2 { name="dissever"; version="0.2-2"; sha256="0s4g84lq15i00vpaafwmcbspdqy23cbj2fbyfnq60mzllyzgs0n2"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; };
+  dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; };
   distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; };
   distances = derive2 { name="distances"; version="0.1.2"; sha256="17872h4jw6cgdk40vczjlygnays2v0wdh64mz5isk7zkvqs0x1ld"; depends=[]; };
   distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
   distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; };
   distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; };
-  distfree_cr = derive2 { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
+  distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; };
   distillery = derive2 { name="distillery"; version="1.0-4"; sha256="1m0pgmlvk7bsb6q3kxagnq422babk61sf73naavac68v8x2q8fix"; depends=[]; };
   distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; };
   distr = derive2 { name="distr"; version="2.6.2"; sha256="1x118v7ycw33mkwy9frw38yn7a6ihghpssz6r2nj5766ab93i89s"; depends=[MASS sfsmisc startupmsg SweaveListingUtils]; };
@@ -5765,53 +5818,54 @@ in with self; {
   diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; };
   diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; };
   diversitree = derive2 { name="diversitree"; version="0.9-10"; sha256="0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7"; depends=[ape deSolve Rcpp subplex]; };
-  divest = derive2 { name="divest"; version="0.5.0"; sha256="07qv8zjhajyjc7yhm3kk33xj806rxv92810d52gvk4iwgmgczl78"; depends=[Rcpp RNifti]; };
+  divest = derive2 { name="divest"; version="0.6.0"; sha256="0j7glxg2sp1x11mlfrl0fciqp9w6jwf2j7s1sxchaw1b2rm0nklm"; depends=[Rcpp RNifti]; };
   divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; };
   dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
-  dkanr = derive2 { name="dkanr"; version="0.1.0"; sha256="05sw0rdfl5fr9v67lixbk2jmsxi2gdbyb6bzkf80ynp1y1izxyzq"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
-  dlib = derive2 { name="dlib"; version="1.0"; sha256="0d6p28r86jq7gwqh3njnsfgl6mmgx7famqx7p1xmra91cdlp3hqj"; depends=[Rcpp]; };
-  dlm = derive2 { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; };
+  dkanr = derive2 { name="dkanr"; version="0.1.1"; sha256="15vvfvhs715aczb0g1prgvynzx0xcmqvq7ancqcjw89al40zaiyc"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
+  dlib = derive2 { name="dlib"; version="1.0.3"; sha256="1is8j1gwf22n7yixg40rb6p4mrnbzijwfjl6vsniq8qkyy7z8k32"; depends=[Rcpp]; };
+  dlm = derive2 { name="dlm"; version="1.1-5"; sha256="1aksm66sfa7ipl5xgs4j5giac7q2m744wjl40mva56xn6i674h4r"; depends=[]; };
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
-  dlmodeler = derive2 { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
   dlnm = derive2 { name="dlnm"; version="2.3.4"; sha256="08k9x29iakgnzf4zbj6bgv6i4812mhbgraxm468wvv8ia574dm1m"; depends=[mgcv nlme tsModel]; };
-  dlsem = derive2 { name="dlsem"; version="2.2"; sha256="05ph3zqh2300b1qm6awwixiyg33rjym1m3l943cvgc036axa7smk"; depends=[graph gRbase Rgraphviz]; };
+  dlookr = derive2 { name="dlookr"; version="0.3.0"; sha256="00yxv2wfprqpsjd4c9q330agy1q3iqi4lnqk8xz62bnqizb0v3hm"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr randomForest RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
+  dlsem = derive2 { name="dlsem"; version="2.3"; sha256="1v7p6d2ylpvq69sbgicznmzsfsv08nivgj6dv6lyw7059anilgkn"; depends=[graph gRbase Rgraphviz]; };
   dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
   dma = derive2 { name="dma"; version="1.3-1"; sha256="0azask61cmkklly32nbpw9rq03v0g976i7shhvawxj20dh4h1jz9"; depends=[MASS mnormt]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
-  dmm = derive2 { name="dmm"; version="2.1-3"; sha256="0hxd4k721imicnc97h319gxs6n4plyl9y9sr5hc7pwas543dm7k3"; depends=[MASS Matrix nadiv pls robustbase]; };
+  dmm = derive2 { name="dmm"; version="2.1-4"; sha256="0qwgsv128gqapnc2xi3yas51l9d1gylgs6ww0gc3d8mavlhkz4b1"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
   dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; };
   dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
   dnet = derive2 { name="dnet"; version="1.1.3"; sha256="1av4kbcbhpj1ivz6ln26p80z5fd170971mrcy59zm67h6kdi56az"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
-  dng = derive2 { name="dng"; version="0.1.1"; sha256="04r06k6mmif7kbpham52dq2zv5rijjnsdc3sgxz6kbh5mqdn6jfq"; depends=[Rcpp]; };
+  dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; };
   dnr = derive2 { name="dnr"; version="0.3.2"; sha256="0f5xahd86x196mg7c9zrhxj7c8cg7mrnd4nzyr02xcym6cff6vqm"; depends=[arm ergm glmnet igraph network sna]; };
   doBy = derive2 { name="doBy"; version="4.6-1"; sha256="1y02awzid23bxz8hx6j8pxd6i7jaq8pdw3k60rag8y6m69incrw5"; depends=[dplyr magrittr MASS Matrix plyr]; };
   doFuture = derive2 { name="doFuture"; version="0.6.0"; sha256="04pvs2h1ibdbl6cph30rvdn5vzj9afllvh8f0iy64pgy83vls790"; depends=[foreach future iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; };
   doParallel = derive2 { name="doParallel"; version="1.0.11"; sha256="0sppgxk3d8mfsrb3cjdyn0mv0s4i7pcy8g8c3cjzbr6k8vmx5jsc"; depends=[foreach iterators]; };
-  doRNG = derive2 { name="doRNG"; version="1.6.6"; sha256="0xnqrc74qncg5iv4cvq0vh3r1sd407wvzx0hfpy8j2rcqy12574k"; depends=[foreach iterators pkgmaker rngtools]; };
+  doRNG = derive2 { name="doRNG"; version="1.7.1"; sha256="1sb75aqkliprglfxc4x4wds6alqgzhvl2n812g1d32a88ra3slr7"; depends=[foreach iterators pkgmaker rngtools]; };
   doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; };
   doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; };
-  dobson = derive2 { name="dobson"; version="0.2"; sha256="1fyf4dyzpg6hqdvr8n4ncs4dny8mg23nxbd49jd3mrlajszzg0vp"; depends=[]; };
+  dobson = derive2 { name="dobson"; version="0.3"; sha256="1vhakkg0276vq0haww5cmm8dbp20bc4874mihqasxkfylqpp6hz2"; depends=[]; };
   docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; };
   dockerfiler = derive2 { name="dockerfiler"; version="0.1.1"; sha256="17r8az17vkj46cljp0pa15xh9x2p5w85csm2hickfk2lyg2pbjnx"; depends=[attempt glue R6]; };
   docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; };
-  docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; };
+  docopulae = derive2 { name="docopulae"; version="0.3.5"; sha256="0k69ca3bjjr9q9v43ds3malwxnldizx0lr62286n0h2idqn63kfa"; depends=[]; };
   docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; };
   docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
   document = derive2 { name="document"; version="3.0.1"; sha256="1pmms1mrldjqsd2zrmpyxz86xykgq1ld4l4gv9gd1ycd7r8v0f8p"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
-  docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; };
+  docxtools = derive2 { name="docxtools"; version="0.1.3"; sha256="0c8harmlil1cqg74a0n2b544gghdl71y0qrcx34yk6ky2f8bl4s3"; depends=[dplyr ggplot2 lubridate magrittr pander purrr rlang stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; };
   dodgr = derive2 { name="dodgr"; version="0.0.3"; sha256="161qy9iyszpb44v26zn6w4d7c9bw8pg7vwgqcba0k0xc5dnr2wjc"; depends=[igraph magrittr osmdata rbenchmark Rcpp sp]; };
+  doex = derive2 { name="doex"; version="1.0.0"; sha256="1d70pb0wxc47z401ya2awjpx0rgipicxgbvkhwinx2mg0jpa8kki"; depends=[]; };
   domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; };
   dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotCall64 = derive2 { name="dotCall64"; version="0.9-5.2"; sha256="1jw0kyw95nivjimh25ri9sigqwlvk12kd45ydsh1yggigzc0k23k"; depends=[]; };
   dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
-  dotwhisker = derive2 { name="dotwhisker"; version="0.4.1"; sha256="1wmb9c0c6r0f36cks72y2jp1iwi6hxjqchq4z76vlcdxq09gmq3g"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; };
+  dotwhisker = derive2 { name="dotwhisker"; version="0.5.0"; sha256="034pvkc59jdjl27wirgb2cv84ajw5y2if20njzzp87nd4f9bb6br"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; };
   doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
   downscale = derive2 { name="downscale"; version="2.0-3"; sha256="0jvzvmwhpdr7ygcxky4yl1ldb843hrmnzhmnvl0694mmswwqsf8l"; depends=[cubature minpack_lm raster Rmpfr sp]; };
@@ -5820,70 +5874,72 @@ in with self; {
   dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; depends=[digest]; };
   dpcR = derive2 { name="dpcR"; version="0.4"; sha256="02j7fhhfq7p2wfcnr7rdy65v6dcvdym3nfyps7717p7b429chchc"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; };
   dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
-  dplR = derive2 { name="dplR"; version="1.6.7"; sha256="0i4s4anklia0bnygqrkk35gnc972qfnvzr3sfzwz7jxghigw7k8l"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; };
+  dplR = derive2 { name="dplR"; version="1.6.8"; sha256="0rgdshkkvij177y7d432wx23ch6f54ns3w93a6fayb1pl936rh7f"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-  dplyr = derive2 { name="dplyr"; version="0.7.4"; sha256="1hm8ml7yaraag1ak6kvz2mxx6if568c759ix8a1n9d7va03wj7vv"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; };
-  dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.2.0"; sha256="1flhsl4c1hws2ccrf81y4lybdz9dsbmws9zdpiry9h98h3rlaxp8"; depends=[bit64 cli crayon DBI dbplyr dplyr odbc purrr rstudioapi tidyverse]; };
+  dplyr = derive2 { name="dplyr"; version="0.7.6"; sha256="0c43h13s5mr0fklikbbm89gs6z5n66rkjzdv6w3w6kl5af5wr2fl"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; };
+  dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.0"; sha256="1yvz1hbczqvvmgkhbvvwkjx56ljqsxry86qk9bn62rdzdvhhpwhx"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; };
   dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
-  dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
   dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; };
+  dqrng = derive2 { name="dqrng"; version="0.0.4"; sha256="0qkpyr7gc3m704znfv011l19s8qsnq42rn8p43qsakvndfyqynbb"; depends=[BH Rcpp]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   dr4pl = derive2 { name="dr4pl"; version="1.1.1"; sha256="1wh7mdns9vxjkfphj2nqllh7q3k3lch5y0b4yzf3j4xrd0wyf2hm"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
-  drake = derive2 { name="drake"; version="5.1.2"; sha256="18f0mxbzz50dli3y4fzyh5qgk8ccxrvqy8a3xsc5xq4y0ilq8kvf"; depends=[bindr CodeDepends crayon digest dplyr evaluate formatR future future_apply igraph knitr lubridate magrittr pkgconfig plyr purrr R_utils R6 rlang rprojroot storr stringi testthat tibble tidyselect visNetwork withr]; };
+  dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; };
+  dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; };
+  drake = derive2 { name="drake"; version="5.2.1"; sha256="004rxsxzxyc2738p92p4mk68p88pc5n0dynkffr2pmqk50n3wrq6"; depends=[bindr CodeDepends crayon digest dplyr evaluate formatR fs future future_apply igraph knitr lubridate magrittr pkgconfig purrr R_utils R6 rlang rprojroot storr stringi testthat tibble tidyselect txtq visNetwork withr]; };
   drat = derive2 { name="drat"; version="0.1.4"; sha256="0vrpqf793vinx4v7jrbn910iplvpmrlwhdjqqzx8cl2k9hl43x08"; depends=[]; };
   drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
   drfit = derive2 { name="drfit"; version="0.7.1"; sha256="1k2chmhdwd78a5d1pxi3iskzfb4h1fxp51ji72qs73m3i6s2mqpz"; depends=[drc MASS qcc reshape2 RODBC]; };
   drgee = derive2 { name="drgee"; version="1.1.6"; sha256="01404mqvkvndn5gybq8dgkfc1cy9wk94p7k7i64h47w3zbkcwsax"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
-  driftR = derive2 { name="driftR"; version="1.0.0"; sha256="0mlhv22xmgiq4a680rk9d39gk2p1b5lrkvvmqjzmlynfy9f8bkj0"; depends=[dplyr ggplot2 glue magrittr readr rlang stringr tibble]; };
-  drm = derive2 { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
+  driftR = derive2 { name="driftR"; version="1.1.0"; sha256="0mvrmwfqg234kk5klhmw7vmf8i0g485xkx5nk73iam16fbzl9y5g"; depends=[dplyr glue janitor lubridate magrittr readr readxl rlang stringr tibble]; };
   drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
   dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
+  droptest = derive2 { name="droptest"; version="0.1.1"; sha256="065cf0rc2jw83nypjcq3nj37kmdwbaq9yglrvcffy9jcdm804kp9"; depends=[data_table]; };
   drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; };
-  drtmle = derive2 { name="drtmle"; version="1.0.2"; sha256="02i75qj1l0zd518dmkv4qdbd6r8xqrxvsg6ahaxi6pwy00dvqnqm"; depends=[doFuture future future_batchtools np plyr SuperLearner]; };
+  drtmle = derive2 { name="drtmle"; version="1.0.3"; sha256="1b2nlkmx7park79pkmnjnkckli89zh3klfamxkqndgd1s5p0aa11"; depends=[doFuture future future_apply future_batchtools np plyr SuperLearner]; };
+  drugCombo = derive2 { name="drugCombo"; version="1.0.2"; sha256="0akb0lszqr9qci9aqwrahhhza1qzdai4w15drccjm399v0csqi0w"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
   ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
   dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
   dslabs = derive2 { name="dslabs"; version="0.3.3"; sha256="1bh6n0s171n6r68fsizz2jryjlj0990bn4rbinl2ln8j17r8lgpf"; depends=[ggplot2]; };
   dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; };
-  dsm = derive2 { name="dsm"; version="2.2.15"; sha256="1b7ixbfq2xpgbc5hyhyzcr6nx4larl3qg1idccraiwrj3m2dr59h"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; };
+  dsm = derive2 { name="dsm"; version="2.2.16"; sha256="1glw3pwgar9qadjya615n5n10lg7xvclcnr3k9vn8y3fgid22f80"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; };
   dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; };
   dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; };
-  dst = derive2 { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
+  dst = derive2 { name="dst"; version="1.0.0"; sha256="0xlrczyw0i3c5hnzflrlw463x9dlmv89m7xlq9xq3krxfsx3qv4z"; depends=[]; };
   dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
-  dtangle = derive2 { name="dtangle"; version="0.1.0"; sha256="1i9wjg31ldhiyl01znzcalhwsi6yfqzxi1xdpivkzxhf25bp932r"; depends=[]; };
+  dtangle = derive2 { name="dtangle"; version="0.3.0"; sha256="0jvn7g3d2wspdhiahmn88iv9cdh9h3qj15540j39vws5jhl1dgsb"; depends=[]; };
   dti = derive2 { name="dti"; version="1.2-6.1"; sha256="1p88k7qkmas49niq618jhddc0h4mwh5gd267v6rlzzpmv5f98fkb"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
+  dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; };
   dtplyr = derive2 { name="dtplyr"; version="0.0.2"; sha256="1q75xnk52zfxnphj095dppcqdmk9v1n32069rffpnvr39nnik565"; depends=[data_table dplyr lazyeval]; };
   dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; };
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
-  dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; };
-  dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="5.3.1"; sha256="0lm8y63gx096vdnza7mcqllfnl56vaz8dnrnm7f7jvwgmkqkj1xy"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
-  dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
+  dtw = derive2 { name="dtw"; version="1.20-1"; sha256="1w301xwizncy5r8v9rwwdxfshydgp3l1pnjla1fjn6n8lx3imjj3"; depends=[proxy]; };
+  dtwSat = derive2 { name="dtwSat"; version="0.2.4"; sha256="1yvl64z3dp4qyii4p8phbk1g1l10q9fbickj0xzzvg2q1xmjps91"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales snow sp xtable zoo]; };
+  dtwclust = derive2 { name="dtwclust"; version="5.4.1"; sha256="17q48hv2zix8jz7znb5pvwq4mrixdyh1rpzmyvj8g0sz62q0h2xc"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
   dub = derive2 { name="dub"; version="0.1.0"; sha256="0sdk8sppjcfx2bsngpngm2446warsnipzzw4yz5z4jpickp52ay0"; depends=[]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
   dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
   dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; };
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
-  dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
   dvmisc = derive2 { name="dvmisc"; version="1.1.2"; sha256="1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh"; depends=[MASS rbenchmark Rcpp]; };
-  dvn = derive2 { name="dvn"; version="0.3.5"; sha256="04di2gpdacivvd9bi96w6145k280s8blavdhi1w3rw4c7sc3hag2"; depends=[RCurl XML]; };
   dwapi = derive2 { name="dwapi"; version="0.1.3"; sha256="149v1yjnrdbqjg7cpnanm1jv1dcpzqy264qk5dx8wvw9kdc5h3b8"; depends=[httr jsonlite readr rjson xml2]; };
   dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; };
-  dygraphs = derive2 { name="dygraphs"; version="1.1.1.4"; sha256="0vwg9q7xrwxkm92d55ik9gdky42bj3jlh6fi4jzwyl5nfdswklb9"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
+  dygraphs = derive2 { name="dygraphs"; version="1.1.1.5"; sha256="0bfpna7gijnfvf40fm4dhb63lf2x6n91d0ym3w936s6xiyc3ah17"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
   dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; };
   dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; };
   dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; };
-  dynOmics = derive2 { name="dynOmics"; version="1.0"; sha256="10aw362hhwqdnjf7xxzy25fdxq2zznzvg6xwvl25a9ppj76nm1rh"; depends=[ggplot2 gplots snow]; };
-  dynRB = derive2 { name="dynRB"; version="0.10"; sha256="0nd1z96rrd7dv1212ibf268dws64n7d9dqzgrqmzs4qz7gwwhngl"; depends=[caTools corrplot]; };
+  dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; };
+  dynRB = derive2 { name="dynRB"; version="0.11"; sha256="0xki395r1biasbpg0dp0daql44zszs2d3sb7q08ypcp529c9v40y"; depends=[caTools corrplot ggplot2 RColorBrewer reshape2 vegan]; };
   dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; };
+  dynamac = derive2 { name="dynamac"; version="0.1.4"; sha256="1gsqgwqamfa8zvl01zsjmbsn7q73m4aii6gzb5khppw244qjgw8y"; depends=[lmtest MASS]; };
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; };
-  dynamichazard = derive2 { name="dynamichazard"; version="0.5.1"; sha256="11lx88g0rizwxa4rfmaz9b2g8p7nnzgiqz5b0gqsc4dvz92i74fg"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; };
+  dynamichazard = derive2 { name="dynamichazard"; version="0.5.3"; sha256="1ggz3i4l5p23gkk0mvfgkiv9q8gmnamjyss8kz5i870ymwnxya09"; depends=[boot Rcpp RcppArmadillo survival]; };
   dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
   dyncomp = derive2 { name="dyncomp"; version="0.0.1-5"; sha256="1626z5523s4igw55fw97lplfgg9mzf4np8imrarkligslvc5q8ip"; depends=[zoo]; };
@@ -5898,29 +5954,32 @@ in with self; {
   dynsbm = derive2 { name="dynsbm"; version="0.5"; sha256="01vi4qzgp25l4wg2ij9pqrn775x4yj9gck0l397nwjg96pa7x2lz"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
   dynsurv = derive2 { name="dynsurv"; version="0.3-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
+  dynutils = derive2 { name="dynutils"; version="0.1.0"; sha256="0fr9gnsafi02ydmp84kv8lq6q4mcf4sg1izgd4h1s1ljvgwq3yqp"; depends=[crayon desc devtools dplyr glue magrittr processx purrr Rcpp stringr testthat tibble tidyr]; };
   e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; };
   eAnalytics = derive2 { name="eAnalytics"; version="0.1.3"; sha256="1lrkmfs2sq9p2n7g528jf6wxixqk08w468nckkij2mprhrccjjj6"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard]; };
-  eDMA = derive2 { name="eDMA"; version="1.5-0"; sha256="111iphlcxfy891xwxma7h8qylazwxhx6srffid4i167kd1dibkak"; depends=[Rcpp RcppArmadillo xts zoo]; };
+  eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; };
+  eDMA = derive2 { name="eDMA"; version="1.5-1"; sha256="0yhywv6bfb1pb6rxkw484kf2knnqar407v5khhs023kdjb01iy8q"; depends=[Rcpp RcppArmadillo xts zoo]; };
   eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; };
   eLNNpaired = derive2 { name="eLNNpaired"; version="0.2.3"; sha256="08nck2p5npyw264kgcqmgx5rx7c3h9v892f90xlcd1dnb7dqlan3"; depends=[Biobase globaltest GSEAlm iCheck samr]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
-  ePCR = derive2 { name="ePCR"; version="0.9.9-4"; sha256="0lnkb4zffn62vbx8hh953z9zh0plj8l15cc1k3x936zblzgd226r"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; };
-  eRm = derive2 { name="eRm"; version="0.16-0"; sha256="18shx4jjvymhzdab1qvlfqnmg49mwllyw3v46j9v19dy6h9l3n8m"; depends=[lattice MASS Matrix]; };
-  eVenn = derive2 { name="eVenn"; version="2.4"; sha256="1qs5qsrc89kb6w6xqc8jdxkih6h48zprvavffdqhxq4ab4i1nvbf"; depends=[]; };
+  eNetXplorer = derive2 { name="eNetXplorer"; version="1.0.1"; sha256="196m8cbd95pc8w03n0nxc625mxwpqpcw3lc3cbrvpzaljmfhqn2v"; depends=[calibrate glmnet gplots Matrix progress RColorBrewer]; };
+  ePCR = derive2 { name="ePCR"; version="0.9.9-6"; sha256="1q46njiqasrma9vr8p7m9ndwag53aavbg4l7a4shgys3w862m7kc"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; };
+  eRm = derive2 { name="eRm"; version="0.16-1"; sha256="1wyzqhka7k4a4xclicc098zgi0y2fbx4fray144qx1pyaa8p8075"; depends=[lattice MASS Matrix]; };
   eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; };
   earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; };
   earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
-  earth = derive2 { name="earth"; version="4.6.2"; sha256="1ma2qgbkw0if93wd6fk6611xkznadfxy6v6xawrk4n9b5im3j6f4"; depends=[plotmo TeachingDemos]; };
+  earth = derive2 { name="earth"; version="4.6.3"; sha256="0af02qi3np40p90v0npnwqa5dg2zszky6kjx9zjw7id7jw5kx1m6"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
   easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; };
+  easyCODA = derive2 { name="easyCODA"; version="0.23"; sha256="0mik051b34p66a2ipwi512926wl5r1zdqhdam68cr13sar2c0cbq"; depends=[ca]; };
   easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; };
   easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; };
-  easyPubMed = derive2 { name="easyPubMed"; version="2.3"; sha256="148ga6flgv74sfzz5kvvnqhfdkx6zhpl6ydzcd32lz3cq24ckli9"; depends=[XML]; };
+  easyPubMed = derive2 { name="easyPubMed"; version="2.5"; sha256="08b94pcya9bmnsipd1jn95dpadw2aqb0fnvm68n11mwg40hd272j"; depends=[XML]; };
   easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; };
   easySdcTable = derive2 { name="easySdcTable"; version="0.3.1"; sha256="0z0fq73m7vjc8wry633lvz58r2c6a6zz6w867hij1627c74mjhs4"; depends=[sdcTable shiny SSBtools]; };
   easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; };
   easyanova = derive2 { name="easyanova"; version="5.0"; sha256="13m4ddvl3nbh610y00nnihmag62g39v4ds7rx6lmifx4zq86mylp"; depends=[car nlme]; };
-  easycsv = derive2 { name="easycsv"; version="1.0.7"; sha256="03bhcylvs9q3bv4svj4mznqzv5h0m773vbikpymawk94r3gg0qaz"; depends=[data_table]; };
+  easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; };
   easyformatr = derive2 { name="easyformatr"; version="0.1.2"; sha256="0mrpd21hyafn82apclxmhs2jbd87sdw0g6lwc3h6gl5cbm213nxb"; depends=[dplyr knitr lazyeval magrittr stringi tibble tidyr]; };
   easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; };
   easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; };
@@ -5937,118 +5996,122 @@ in with self; {
   ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; };
   ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
   ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; };
+  echo_find = derive2 { name="echo.find"; version="1.1.1"; sha256="074qk22dsz29w88ydrwshjzzhrh86wyyjiiwiahq4ns5m64szw7n"; depends=[minpack_lm]; };
   echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; };
+  echor = derive2 { name="echor"; version="0.1.0"; sha256="0242yk02qkcfrivxc3zgaw3awmj4b6ra38h1gg21795yrpzcyv02"; depends=[dplyr httr jsonlite lubridate purrr sf tibble tidyr]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
-  ecm = derive2 { name="ecm"; version="3.0.0"; sha256="19szjkfy2iivdw5zbag9mbk3pm7a8qb6hvg1y4jdrpf519xb4935"; depends=[car]; };
+  ecm = derive2 { name="ecm"; version="4.0.0"; sha256="09678l6sh61f51jfpmkk4bkxind8jdn6izw6bizshr1bvk8lapjc"; depends=[car]; };
   eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; };
   ecodist = derive2 { name="ecodist"; version="2.0.1"; sha256="04piv52b4b9rgv1gy6s3b1lzapc0rqiwp1yi7f8yzgjd9329kc5g"; depends=[]; };
   ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; };
   ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; };
   ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; };
+  econet = derive2 { name="econet"; version="0.1.6"; sha256="1izb7ssb5a5r5qky3jzyp2j5p1qlhq7vhl8nhz2xhkiks8xgf4xg"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
   econullnetr = derive2 { name="econullnetr"; version="0.1.0"; sha256="0l4qy7x8f8sjc3s1bhz3kadfqifw0x9jl7dvcjwkh9q14h093cz5"; depends=[bipartite gtools reshape2]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
   ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; };
-  ecospat = derive2 { name="ecospat"; version="2.2.0"; sha256="0awzhzl90j72jxp7qk5q5vqmgyccbkw2rbw0jrhjvlwkr5q9gyvx"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; };
-  ecotox = derive2 { name="ecotox"; version="1.3.1"; sha256="1is4zn7rabpibpnyy9mwpcjdhhb02r0a2r5azw9i5asshr2d1ywi"; depends=[ggplot2 magrittr]; };
+  ecospat = derive2 { name="ecospat"; version="3.0"; sha256="1c9cbxs022f2bjnvgdfxhmqkzr30svna596r1fn5i7zsqd7dm0w6"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; };
+  ecotox = derive2 { name="ecotox"; version="1.3.2"; sha256="12nng1v73lshcy99hqrp5a1qy052z0cz5n97bq7fla7zc4is69y5"; depends=[ggplot2 magrittr]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
-  ecoval = derive2 { name="ecoval"; version="1.1"; sha256="0ihig6nq3lrz6lzix92lrlzywnqkzsp5lrbccn5slhxdj5llird2"; depends=[rivernet utility]; };
+  ecoval = derive2 { name="ecoval"; version="1.2"; sha256="098n31py05f0ram733jdc85ki3fcpjc40yn7wsi7g74jyhdb1qms"; depends=[jpeg rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.1.0"; sha256="0siq5acpy4wmqzm6zvpqj1m8a05hgk5jhb1clv06y40kqk5kjrap"; depends=[Rcpp]; };
   ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; };
   eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; };
   edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; };
   edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
-  edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; };
+  edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; };
   edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
-  edeaR = derive2 { name="edeaR"; version="0.8.0"; sha256="1qpkb5ysz5lbkqdxszgzkn7s77h6fqqd62pc0nn2abjgq2hb8a9j"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; };
+  edeaR = derive2 { name="edeaR"; version="0.8.1"; sha256="1znd9k6ia62j8rqb72lqp4b76hw659zgw3dri0z2029w0pn2m3x1"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; };
   edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; };
   edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; };
   edfReader = derive2 { name="edfReader"; version="1.2.0"; sha256="0r4918swpfddz246kkvy10a07s178zmwp7m4ydxvi8di6iga76hk"; depends=[]; };
   edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
   edgar = derive2 { name="edgar"; version="1.0.9"; sha256="1jh0aaizirj4i4kc6gq9kkpa1xdqxbjhj7fys8ap1xxxx6nfpcnf"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; };
-  edgarWebR = derive2 { name="edgarWebR"; version="0.3.1"; sha256="0gakrgag7rm18njhrs7bq99mv7yn7yxis9yscz88va16dqdp17l8"; depends=[httr xml2]; };
+  edgarWebR = derive2 { name="edgarWebR"; version="1.0.0"; sha256="0rnf3s5d5sclvd4y195mfkrazg4qvpyyrgl6jcqikygbcz8hg3j8"; depends=[httr xml2]; };
   edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; };
   edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
   edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; };
   editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; };
-  editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
-  edpclient = derive2 { name="edpclient"; version="0.3.1"; sha256="0czvwyp7z27cydsjwf3xrk88g62vsllgfcwrq13ylgki7zw5gclj"; depends=[httr ini jsonlite plyr]; };
+  editrules = derive2 { name="editrules"; version="2.9.3"; sha256="07j8wj0fk34irqgsz70h2wad3wdjv5xl1cl702vxbr0nvmpw2ngl"; depends=[igraph lpSolveAPI]; };
+  edpclient = derive2 { name="edpclient"; version="0.5.1"; sha256="1ik554fv0ji0vaknqgv726y0vh42i96bp7l4sja4bn001rkmnx4n"; depends=[httr ini jsonlite plyr]; };
   edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; };
   edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; };
   educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; };
   eechidna = derive2 { name="eechidna"; version="1.1"; sha256="01c1b41fzkq1hgg7705n96m1ji74gbfy9fisdj5pl0kgjhjiq24w"; depends=[dplyr ggplot2 ggthemes plotly rgdal rmapshaper rvest shiny shinyjs tidyr xml2]; };
   eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.6"; sha256="07wpz8zlgkbzkhmv569w7rnz3i830391arrh17sg2gc4fx9h1559"; depends=[geoR lme4 metafor mvtnorm]; };
-  eegkit = derive2 { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
+  eegkit = derive2 { name="eegkit"; version="1.0-3"; sha256="15ycx7141sfsja5s94w30cf3rpykh00cjcdhr5923525hi1bavn1"; depends=[bigsplines eegkitdata ica rgl]; };
   eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
   eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; };
   eemR = derive2 { name="eemR"; version="0.1.5"; sha256="13c5k2si8aq2461iz9413hlqzgkb25zrdfvizzk8s2nn60npyaw9"; depends=[dplyr pracma R_matlab readr rlist stringr viridis]; };
-  eeptools = derive2 { name="eeptools"; version="1.1.1"; sha256="15b7rdjcl00jdb59llmgmwbxk31shayyv5skfbljwwm7vkwa22j7"; depends=[arm data_table ggplot2 maptools memisc vcd]; };
+  eeptools = derive2 { name="eeptools"; version="1.2.0"; sha256="14cmvshalfvh1zd1gp2dsp42kjxw2pdfixwlk9zvlw7ncx9y83j3"; depends=[arm data_table ggplot2 maptools vcd]; };
   eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; };
   effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; };
-  effectR = derive2 { name="effectR"; version="1.0.0"; sha256="08r1jifrqa9fxm5jp6jsvazdpql53kpm6mj0sg70hvd8q0cilryb"; depends=[ggplot2 reshape2 seqinr shiny viridis]; };
-  effects = derive2 { name="effects"; version="4.0-1"; sha256="042f6gb799agqqxawd6ddlzplyxkd1h5v9pm759zmnj2094smw6q"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
+  effectR = derive2 { name="effectR"; version="1.0.1"; sha256="11kqp0si5jm3ffw7d1kq5b6qwdzwijdp1n2hv8a3fa5vppkp43ws"; depends=[ggplot2 reshape2 seqinr shiny viridis]; };
+  effects = derive2 { name="effects"; version="4.0-2"; sha256="10anvrn5v04i985d06fxv099970vvjllms7iwpbpa488zv5k9b81"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
   effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
   effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; };
   efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; };
+  efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; };
   ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
   egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; };
-  egg = derive2 { name="egg"; version="0.2.0"; sha256="03k6xnbpakzgwlirxcvhrb10qh1pqvj9mv8rhr4snhnf753rb75j"; depends=[ggplot2 gridExtra gtable]; };
-  eggCounts = derive2 { name="eggCounts"; version="1.4"; sha256="04rhyfckkg3q6n6izbmhh1m6ywywvrr719isnx8qghlx774qab86"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rstan StanHeaders testthat]; };
+  egg = derive2 { name="egg"; version="0.4.0"; sha256="11zi42wvjd5x68xrxsqwzwdr9mb3iw9pm02mgy3z6m21mgyvgnmn"; depends=[ggplot2 gridExtra gtable]; };
+  eggCounts = derive2 { name="eggCounts"; version="2.0"; sha256="0qlx1wm50zh5mp3bn6lkkq43d19ji2fwa4x0z5f98qhmhxa74lck"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders testthat]; };
+  egoTERGM = derive2 { name="egoTERGM"; version="1.0.0"; sha256="10q52552srz2s9v3r3k4y8v8jfcb1arirw3mr1p9a5nbixdcnp8z"; depends=[boot btergm ergm GGally Matrix network sna speedglm statnet xergm_common]; };
   egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
+  egor = derive2 { name="egor"; version="0.18.06-02"; sha256="1q0kvgz04d80drvgli1pmra6dcn77swk8z19sj3lkqx3qmgjqn7m"; depends=[dplyr igraph network plyr purrr shiny survey tibble tidyr]; };
   eha = derive2 { name="eha"; version="2.5.1"; sha256="0www19cc80xg2hi1ibajqnp931gda9pk95cnx976lq1kpxzb2pyl"; depends=[survival]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
   eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; };
   eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
-  eigenmodel = derive2 { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
+  eigenmodel = derive2 { name="eigenmodel"; version="1.10"; sha256="1x613ipqpsq5yj4bb68g7yfwavd75n02xajr2cpbzsa2vyipvpsa"; depends=[]; };
   eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
-  eive = derive2 { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; };
+  eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; };
   eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
   eixport = derive2 { name="eixport"; version="0.3.0"; sha256="1ykv5jqri4zkshawck3lfl6jrzw24k27gwhi02rckzbrg2nb3909"; depends=[ncdf4 raster sf sp]; };
   elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; };
-  elastic = derive2 { name="elastic"; version="0.8.0"; sha256="17aqf0a3spwh8k7s3kgnccbgad3sr3w63if96piygjz0lxgc7kzs"; depends=[curl httr jsonlite]; };
+  elastic = derive2 { name="elastic"; version="0.8.4"; sha256="0s0nz8j4f1qxjlgzllnfsirbpcggmb5f41zwdrb9xgwpnpn68jz9"; depends=[curl httr jsonlite]; };
   elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
   elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
   elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.2"; sha256="0jawypqlk8374izh3gq9k6fwc2gwn74xa9lbmx4ww3rq2xp90xw6"; depends=[httr jsonlite]; };
   elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
-  elect = derive2 { name="elect"; version="1.1.1"; sha256="025h69qsify0v3bsr9082wjdkglmarkjaqqkwr8j826466617n1v"; depends=[msm nnet]; };
+  elect = derive2 { name="elect"; version="1.1.2"; sha256="1m79z697abzrddy849kshwqfygji3n56xz0flwa7xrqhx3nqrj3b"; depends=[msm nnet]; };
   elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; };
   electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; };
   electoral = derive2 { name="electoral"; version="0.1.0"; sha256="0y4kkxm8vmj4gsan6qyhg28b0b6hgl4fghslk21d8w5w6syln4kh"; depends=[dplyr ineq tibble]; };
-  elementR = derive2 { name="elementR"; version="1.3.5"; sha256="1b9f601r0gdcyclr23rf33skbbvh7lnr4nlmgcwxixkfsg8mabs9"; depends=[abind colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
+  elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
   elevatr = derive2 { name="elevatr"; version="0.1.4"; sha256="0gxwlcfn271p8gf2iqwqbi61kcaahfdghsc0rwm3xxxysjb5a2b2"; depends=[httr jsonlite progress raster ratelimitr sp]; };
   elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; };
   elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; };
-  elliplot = derive2 { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; };
+  elliplot = derive2 { name="elliplot"; version="1.2.0"; sha256="186i4gr8k9bifzssblln8z6wxfmnplls3kc4m2liiz86mzsnim9r"; depends=[]; };
   ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; };
   elliptic = derive2 { name="elliptic"; version="1.3-7"; sha256="1bzd5x0yph76jh59ljl875grm52s8xpnmbgww1jjxx0hgkv7938g"; depends=[MASS]; };
-  elmNN = derive2 { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
+  elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.0"; sha256="0jl5vr2zszsapdvwcwg1m2li20k377jzyzdrz4inirsqfy5zlymq"; depends=[KernelKnn Rcpp RcppArmadillo]; };
   elo = derive2 { name="elo"; version="1.0.1"; sha256="0dhlac5l68a3jps2hx0bc7qjj8hsr1ha137hcwxnrfdwnki6chlp"; depends=[pROC Rcpp]; };
-  elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
   emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
   embryogrowth = derive2 { name="embryogrowth"; version="7.4"; sha256="10h80jy391bm1avmh347ly3a1vhlhbpfbhrf39xl7x4nwcckd6bp"; depends=[deSolve HelpersMG numDeriv optimx]; };
-  emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; };
+  emdbook = derive2 { name="emdbook"; version="1.3.10"; sha256="0880cx6rqm9vgd2zxnd2k0igfl80gy7ak15w36clwlzavab59hmv"; depends=[bbmle coda lattice MASS plyr]; };
   emdi = derive2 { name="emdi"; version="1.1.2"; sha256="135dnc7djxa7kyhaa0rd42m396ccic4mgd5pq4qj8zqgd2swj2aa"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
-  emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
+  emg = derive2 { name="emg"; version="1.0.7"; sha256="1d4l9kcji6ba137f1qqjl763q2fd6bxryxsarc3iwi3mfi2b580m"; depends=[]; };
   emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
-  emmeans = derive2 { name="emmeans"; version="1.1.3"; sha256="150kgc5ymssmcf240js4jrbhm32xn4bayrzbxry12mh1lcr9kvf2"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.2.2"; sha256="1ivrg1lp6cqffgg8hnfpw65zbkms6fbsgbw8nprbzfvfk7rrd8wd"; depends=[estimability mvtnorm plyr xtable]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
-  emojifont = derive2 { name="emojifont"; version="0.5.1"; sha256="0i4id9631ah5vzkzh6zfxgk55b2ppnbgabp1w2ivy29i0nji9wk4"; depends=[ggplot2 proto showtext sysfonts]; };
+  emojifont = derive2 { name="emojifont"; version="0.5.2"; sha256="0s1as6i5dz2rbd1aashn99fji2iksjzrkdkfi7wqnnxxpmkha3yx"; depends=[ggplot2 proto showtext sysfonts]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
   emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; };
   empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; };
   emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; };
   emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
-  ems = derive2 { name="ems"; version="1.0.0"; sha256="1x6zsrf15xn865v8awbnq1cpaqp5j2k1pmis5a8mjnw568xi0hhw"; depends=[]; };
   emuR = derive2 { name="emuR"; version="1.0.0"; sha256="19740da4m22v9ys1z8q80khf71fjbaisn1f6whgal7p3cinvkcr3"; depends=[base64enc compare DBI dplyr httpuv jsonlite MASS purrr RCurl readr RSQLite shiny stringr tibble uuid wrassp]; };
-  emulator = derive2 { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
+  emulator = derive2 { name="emulator"; version="1.2-17"; sha256="150yg99qzankcqs74jvp35al9gla5vnfylwaswcw6yryi239mgi8"; depends=[mvtnorm]; };
   enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; };
   enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; };
   encode = derive2 { name="encode"; version="0.3.4"; sha256="1ibrxa0lzni8c1nm3x061vj55faz8fvfgbl7c7b2wfanh5qnny9j"; depends=[]; };
@@ -6056,15 +6119,15 @@ in with self; {
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
   endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; };
   endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; };
-  energy = derive2 { name="energy"; version="1.7-2"; sha256="19c7bgjnm4ggf7w5mk64c5shkma3sa9wc8x117iqv7pk1bvvyy3p"; depends=[boot Rcpp]; };
+  energy = derive2 { name="energy"; version="1.7-4"; sha256="12skvlridfq4jd5mh0yxl79ps0zi2xnlh4hsdgxad0gm7qky8awd"; depends=[boot Rcpp]; };
   energyr = derive2 { name="energyr"; version="0.1.1"; sha256="1mid5f8l6v55pjzfx304a303mkn9b5r3jzmjl2fi2pz4v2jsdw04"; depends=[RgoogleMaps]; };
   enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; };
-  english = derive2 { name="english"; version="1.1-2"; sha256="1wlqpl85rq49ndrfqlixayp4zzvpad0snln5qirr1i3y2q510dgx"; depends=[]; };
+  english = derive2 { name="english"; version="1.1-3"; sha256="032yc8ls3i6k5il40k3b0n55n2pj8zkm5kackrvsdsslywhainkw"; depends=[]; };
   engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; };
-  enpls = derive2 { name="enpls"; version="5.9"; sha256="07id08k7pg2gvlyn8vnjprpr0gnggldg9am1h62s50dw54axixwd"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
+  enpls = derive2 { name="enpls"; version="6.0"; sha256="07cwxxxsz2rj6d9dhmbfbv1vmk753ca7yy8ssq8lp4lxz3n4cp6p"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
   enrichR = derive2 { name="enrichR"; version="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
-  enrichwith = derive2 { name="enrichwith"; version="0.1"; sha256="10x7p0s96hkalnnnwx2gczywblqxig9p4pllzk1ciyjjfidsc9va"; depends=[]; };
+  enrichwith = derive2 { name="enrichwith"; version="0.1.1"; sha256="0ccjflhyq18ynk154fpq7pan5a8hlf8vhkqqp023xbq01vfrhssa"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; };
   ensembleEN = derive2 { name="ensembleEN"; version="1.1.2"; sha256="033i4bcnr62kmrp1fafdw6vx8ir38kqchgxp4fidg3i750nkjnda"; depends=[Rcpp RcppArmadillo]; };
   ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; };
@@ -6074,8 +6137,9 @@ in with self; {
   entropart = derive2 { name="entropart"; version="1.5-3"; sha256="02jzcqb7sqg9fcf2vi4myki9mgdsx0jwyf535zzh124h1bwz3f3y"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; };
+  envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; };
   enveomics_R = derive2 { name="enveomics.R"; version="1.3"; sha256="1m97lmgf42ifzafz91g69nnf4q918464xir9cqjjn6ch5i7lvi65"; depends=[fitdistrplus investr modeest sn]; };
-  enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; };
+  enviGCMS = derive2 { name="enviGCMS"; version="0.5.0"; sha256="0q7kyygfwphd553lgnv8pa0zghcjj4wvq2qyh8lx2plj9fp5am3n"; depends=[animation BiocParallel broom genefilter mixtools MSnbase rcdk RColorBrewer reshape2 rmarkdown shiny xcms]; };
   enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
   envirem = derive2 { name="envirem"; version="1.3"; sha256="1axgbjl4wh44vd5r9n9rbxxsi35k806r1kdvrcmmpkzwam6zd2lp"; depends=[raster RSAGA]; };
@@ -6083,32 +6147,34 @@ in with self; {
   epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
   epanet2toolkit = derive2 { name="epanet2toolkit"; version="0.2.1"; sha256="18drz4pi2mqqwp2ji3a8k6mxh04n8yrwggf2p1k7bg3jchgh0kx3"; depends=[]; };
-  epanetReader = derive2 { name="epanetReader"; version="0.6.2"; sha256="0xj56ykfrm7m2r0rr4abgv6ip40nc2j1byxhmi7m97b2q953akld"; depends=[]; };
-  epiDisplay = derive2 { name="epiDisplay"; version="3.2.2.0"; sha256="1f9kifjgdwxs7c236nsr369ij71rj7l5ady88h4n5p5pjw2h451a"; depends=[foreign MASS nnet survival]; };
-  epiR = derive2 { name="epiR"; version="0.9-93"; sha256="1i0vi1dx5pjq4rcw8r9g7qkhrn4ra8lffrspzkrrjj12y97izmrg"; depends=[BiasedUrn survival]; };
+  epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; };
+  epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; };
+  epiR = derive2 { name="epiR"; version="0.9-96"; sha256="0gy2w49mbi9rpxw8bxb5d6i0zddl319ba1wcp24km165h9pvrs9d"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
   epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; };
   epidata = derive2 { name="epidata"; version="0.2.0"; sha256="0n0100fy65kgw3c7gdmb5z5hmla5ch51b7872snf525a2r581i28"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
-  epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; };
   epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; };
+  epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; };
   episensr = derive2 { name="episensr"; version="0.9.2"; sha256="1w1228q8q2ysi3xi3m8a9z0c7japj97dssjkzpjcrng094cy82is"; depends=[actuar boot ggplot2 gridExtra llogistic logitnorm plyr reshape trapezoid triangle]; };
   episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; };
   episode = derive2 { name="episode"; version="1.0.0"; sha256="1djk36jkvr8xvhfddqg6xsmhxc3yrgivkm8g2hr4n1qixsk1ad8m"; depends=[glmnet Matrix nnls Rcpp RcppArmadillo]; };
   episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
   epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; };
-  epitab = derive2 { name="epitab"; version="0.2.1"; sha256="0q8fxxx7ddzaj8dxxlsh1a2gxf6byw5041mr7abac9yjjga2kz97"; depends=[kableExtra knitr MASS survival xml2]; };
+  epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; };
   epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; };
-  epitrix = derive2 { name="epitrix"; version="0.1.2"; sha256="1fnmcpjbbk645s7q2jcccjv0q20z8hlzr8sl0jh6d00jrgk8qif4"; depends=[digest distcrete stringi]; };
+  epitrix = derive2 { name="epitrix"; version="0.2.0"; sha256="1699v13478379waxkjsimxsq92ya2vd98kddvsv0dr7fldwl4png"; depends=[digest distcrete stringi]; };
   eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; };
   epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
+  epubr = derive2 { name="epubr"; version="0.4.0"; sha256="0lh4fw16fb6qisygq8k7yf1cg6gm2yi8fqfsfwlaacb43d12bxzm"; depends=[dplyr magrittr purrr tidyr xml2 xslt]; };
   epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
   equSA = derive2 { name="equSA"; version="1.1.5"; sha256="0sknx2p820i26m1d0ypz4ay5rm4j9i97nvcd3wxawqk72ypvbvw1"; depends=[huge igraph mvtnorm speedglm XMRF ZIM]; };
+  equalCovs = derive2 { name="equalCovs"; version="1.0"; sha256="18w7panyd6mhdr3x1iz9fkrw7min22rishs4xhkxgxs3nnyglkrn"; depends=[]; };
   equaltestMI = derive2 { name="equaltestMI"; version="0.1.0"; sha256="1zqhgx1x6lqjwqisl3ydb6yqp3jn6x7dgnc57r93v73sjx2j5aiz"; depends=[lavaan]; };
   equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; };
-  equateIRT = derive2 { name="equateIRT"; version="2.0-4"; sha256="0j5dpgp4r5qisgw65yk7x9nwq7wxfppp0n0qqg734gqwjyfyp68b"; depends=[mirt statmod]; };
+  equateIRT = derive2 { name="equateIRT"; version="2.0-5"; sha256="0pkcg2331yaq05sn7164qvw3zqq5jxzh34k0c48zbam240ga94js"; depends=[mirt statmod]; };
   equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
   erah = derive2 { name="erah"; version="1.0.5"; sha256="00vygdrngbp53wip2x6dni3ygwax309i9si3gyqkxxbbkpv24b7i"; depends=[caTools HiClimR igraph ncdf4 nnls osd quantreg Rcpp signal XML]; };
@@ -6122,6 +6188,7 @@ in with self; {
   ergm_rank = derive2 { name="ergm.rank"; version="1.0.1"; sha256="0k5ffqxn9fspbg82j2cmrcyav3nqjk7cnsq48xwy9i3z3vaq704k"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
+  erhcv = derive2 { name="erhcv"; version="0.1.2"; sha256="1rbgp5ba7drghfgcjfg546210m7pknfmgcbk4n68jpy39c267rvn"; depends=[igraph Rdpack stringi stringr]; };
   erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
@@ -6132,56 +6199,56 @@ in with self; {
   esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
   esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; };
   esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; };
-  esc = derive2 { name="esc"; version="0.4.0"; sha256="07mgf1kdz6gjkmbsis24gjsppclaxlf7b03jpvasm1k4snfvgb5h"; depends=[dplyr purrr readr sjmisc tibble]; };
+  esc = derive2 { name="esc"; version="0.4.1"; sha256="1m1skkg3maklp6ivvh20bddasl2kkpw2p07rb1f9ywr3ypi3iyfj"; depends=[dplyr purrr readr sjmisc tibble]; };
+  eseis = derive2 { name="eseis"; version="0.4.0"; sha256="023j91j5s5b84gcgi6i9gs7ky1f8ncimlx2c5s6w37kh13nfhcby"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp rgdal rmarkdown signal sp XML]; };
   eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
   esmprep = derive2 { name="esmprep"; version="0.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; };
   esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; };
   ess = derive2 { name="ess"; version="0.1.1"; sha256="1i94sfg8r9mnzcmyddq3zb56gwkgqdclyx90a5plpyy5insk13d7"; depends=[haven httr rvest stringr tibble xml2]; };
   essHist = derive2 { name="essHist"; version="1.1.1"; sha256="06wmvwjgbb1bfsjn4bv3p2m0i5nc6shn2p62kjp3iv6z42f5wndc"; depends=[Rcpp]; };
-  essurvey = derive2 { name="essurvey"; version="1.0.0"; sha256="0wgwqm59wam5sjzn3cjh3fzbq14bfa02gjsszwg2hid1q976clqk"; depends=[haven httr rvest stringr tibble xml2]; };
+  essurvey = derive2 { name="essurvey"; version="1.0.1"; sha256="0ks2qx6pzw5g1q6hzaymlcy6slkapw8iajn10gs7l1h5ybdf5w6l"; depends=[haven httr rvest stringr tibble xml2]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; };
-  estimatr = derive2 { name="estimatr"; version="0.6.0"; sha256="0763wq8y166zwdxf2wqxvbqwps9di7i7877pffs478qr4rx24z5g"; depends=[Formula Rcpp RcppEigen rlang]; };
+  estimatr = derive2 { name="estimatr"; version="0.8.0"; sha256="0xn1rk5z5n9llg9l55wab2lpcvx3azbrkjrfwi84mc3xk1m24y3p"; depends=[Formula Rcpp RcppEigen rlang]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
-  estprod = derive2 { name="estprod"; version="0.0.1"; sha256="0nd2iz1gqinvppyxgxsdh9m26v46h2ra3cc4nqz6dqnqkslzrl4k"; depends=[boot Formula lazyeval minpack_lm]; };
-  estudy2 = derive2 { name="estudy2"; version="0.8.4"; sha256="190wxdy1qsf8fgpbp2cr0blwa97vgmdw83pmfk9i44zkpm4nrij1"; depends=[matrixStats Rcpp tseries zoo]; };
+  estprod = derive2 { name="estprod"; version="1.1"; sha256="15grcpyhaazd1sl8544gx4zpjqi9p17d6siyb6a1ykzzyy1v1fln"; depends=[boot Formula gmm lazyeval minpack_lm]; };
+  estudy2 = derive2 { name="estudy2"; version="0.8.5"; sha256="0aqvlgzp98965xmjmmg2dxj79bjcvgv0qa89h5l1lp0i0c23p908"; depends=[matrixStats quantmod Rcpp zoo]; };
   esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; };
   etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
   etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; };
   ether = derive2 { name="ether"; version="0.1.4"; sha256="1q6qxda5iw8zj7gy9h35apij5mbndd969ddip7zn5d720131kqra"; depends=[dplyr httr jsonlite Rmpfr]; };
   etl = derive2 { name="etl"; version="0.3.7"; sha256="045hkh95ki3s10l9mz4710ws2i9and4rqb0qk1c5sfslglc0riq5"; depends=[DBI downloader dplyr lubridate readr rlang rvest stringr tibble xml2]; };
-  etm = derive2 { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; };
+  etm = derive2 { name="etm"; version="1.0.3"; sha256="1srbllbmc2l1kcw2zi15sja8g3bkwz8bvy7k8al45dhyz8zdrxra"; depends=[data_table lattice Rcpp RcppArmadillo survival]; };
   etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; };
   etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
   etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; };
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
-  eulerr = derive2 { name="eulerr"; version="4.0.0"; sha256="1zjqzlr67qihvh7v66rggz8khf6f11wqw2cvxjvg07qmh3xk7sf5"; depends=[lattice polyclip Rcpp RcppArmadillo RcppDE]; };
-  europepmc = derive2 { name="europepmc"; version="0.2"; sha256="1kh1mma21jjwlwxq2h3l5klzlgy98zsryhs1si9z5cfx48lszxdb"; depends=[dplyr httr jsonlite plyr progress urltools xml2]; };
+  eulerr = derive2 { name="eulerr"; version="4.1.0"; sha256="1y4s4g49sy7bkkbadj7a8la86h9yy9lzra5jawy2ig1aa3k81d98"; depends=[GenSA lattice polyclip Rcpp RcppArmadillo]; };
+  europepmc = derive2 { name="europepmc"; version="0.3"; sha256="1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h"; depends=[dplyr httr jsonlite plyr progress purrr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
-  eurostat = derive2 { name="eurostat"; version="3.1.5"; sha256="128rlkkxdpl95wjxnrw8yzxpc6sml0vaghnaz0ra90ak1s43ndda"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
+  eurostat = derive2 { name="eurostat"; version="3.2.1"; sha256="1934lzxzs0l96c3bwwy5lpgm8kxrd55hdcmbn4prg2pzzj32wxfv"; depends=[broom classInt curl dplyr httr jsonlite RColorBrewer readr sf sp stringi stringr tibble tidyr]; };
   eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.10.1"; sha256="070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9"; depends=[stringr]; };
-  evaluator = derive2 { name="evaluator"; version="0.2.3"; sha256="1qlrrd68j622i2n0wazz3m44sc2l7hsg7fd1mc204c7pmfb6a3pl"; depends=[dplyr extrafont ggplot2 mc2d purrr readr readxl rlang scales stringi tibble tidyr viridis]; };
+  evaluator = derive2 { name="evaluator"; version="0.3.0"; sha256="1dgihzai2p47zjfjb4wnl5rvwahfsxcaqaywdsf039p0g820nr8f"; depends=[dplyr extrafont furrr ggplot2 mc2d purrr readr readxl rlang scales stringi tibble tidyr viridis]; };
   evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; };
   evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; };
-  evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; };
+  evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; };
   evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
-  event = derive2 { name="event"; version="1.1.0"; sha256="1nq34bz9dsixidym3n255vmap3gjx9nfk8pc5s7w026faf96dr2v"; depends=[rmutil]; };
+  event = derive2 { name="event"; version="1.1.1"; sha256="0w3v8j61y7vr0cjl8a1rkvi4pyjlfhmzzn1n4dgkivac4iafzqjj"; depends=[rmutil]; };
   eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; };
   eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
-  eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; };
-  evidence = derive2 { name="evidence"; version="0.8.9"; sha256="173fjmpizjmrp0qh08k2qllvjm4l53ykblfri984x9kh68aqfvnz"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
+  evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
   evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; };
   evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; };
-  evmix = derive2 { name="evmix"; version="2.10"; sha256="0q2jcd4r9ndl8c8w4g75cv5g9f58ix6ndwa99lgslw2j0ckh0z97"; depends=[gsl MASS SparseM]; };
+  evmix = derive2 { name="evmix"; version="2.11"; sha256="15ak02vfhf54b5r9savf1lmcyf6mfwashr00z913nw2aajswny1h"; depends=[gsl MASS SparseM]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
   evolqg = derive2 { name="evolqg"; version="0.2-5"; sha256="11n0gxkxhg1d2ziwbipqvyccgnsrzm3mk4xy2d7nxn662q1yl2ah"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
   evoper = derive2 { name="evoper"; version="0.4.0"; sha256="11l55jj7f4ggwvimvl3d2sv2nyds29bl4dai6ycpgnff7wwdv43g"; depends=[boot deSolve futile_logger ggplot2 plot3D plyr reshape rrepast]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
-  evtree = derive2 { name="evtree"; version="1.0-6"; sha256="0nvk78haghvp6vw6936di0bd5gfv603nxzgw3i647i68291wav0f"; depends=[partykit]; };
+  evtree = derive2 { name="evtree"; version="1.0-7"; sha256="1swq4cmx7hvsagn1nfavay5rg5r5axjxpcckvd3sy6lgvwvflcnq"; depends=[partykit]; };
   ewoc = derive2 { name="ewoc"; version="0.2.0"; sha256="0kanx14fhcbqz6gpyj7628vgy9fwz3ji5mkd4107b8pgpz2hkg00"; depends=[coda doParallel foreach Formula ggplot2 rjags]; };
   exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; };
   exact2x2 = derive2 { name="exact2x2"; version="1.6.2"; sha256="172g6ahgd7j42bjidp6svjl70ws3bz58vb8vxgnalii6awcizkcm"; depends=[exactci ssanv]; };
@@ -6189,46 +6256,47 @@ in with self; {
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-29"; sha256="0sj4bf0sab2rsgh967i5jl7ml2l1niydqmyn7c6ybai1gavsdpi1"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exampletestr = derive2 { name="exampletestr"; version="1.2.0"; sha256="05p819a6s6anxjqvs10df9kcfdg7lkg1205iw635db9g6biplrb7"; depends=[checkmate devtools filesstrings magrittr purrr readr roxygen2 stringr styler]; };
-  exams = derive2 { name="exams"; version="2.3-0"; sha256="0y21cx6knx253gka1bib8z0jmyndl4k7c2d8hfh3rwn5bdqyqj53"; depends=[]; };
-  excerptr = derive2 { name="excerptr"; version="1.4.0"; sha256="0z69lqfdm2dh9z6rqhfnj6f4b2p6sgmlvcxasg49wd0qasx86ph6"; depends=[git2r rprojroot rPython]; };
+  exampletestr = derive2 { name="exampletestr"; version="1.3.0"; sha256="1z4lw115y5ijjb603rvy63a5gvhgymkq00ak0z6da2y5p6ym5rp3"; depends=[checkmate devtools filesstrings magrittr ore purrr readr roxygen2 rprojroot stringr styler]; };
+  exams = derive2 { name="exams"; version="2.3-1"; sha256="0xg2rvfw61q5g9aj828219fqdnrwhy698xy7mkrcaly9mq95zs8b"; depends=[]; };
+  excerptr = derive2 { name="excerptr"; version="1.4.1"; sha256="0z5gayf7kkhdg7ad2w4ycar5dd42jdjybrhzfmkqb3xr9pdrnijg"; depends=[git2r rprojroot rPython]; };
   excursions = derive2 { name="excursions"; version="2.3.3"; sha256="16clwp76hq1q3m7ixjq1rv83vagxyj2fcs4jdsgvl9pzh5syzd3x"; depends=[Matrix sp]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.2.1"; sha256="0969ip7vwhs3r9zwy5l1gqg886yl4gfw8ss2frnq9nmqpn1ib1v2"; depends=[curl dplyr jsonlite purrr tibble]; };
   exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; };
   expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; };
-  expands = derive2 { name="expands"; version="2.1.1"; sha256="1ajfj5vsqal642avshjfmv0f5vi0ca3whhw5cxmpm013yckb3b3r"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
-  experiment = derive2 { name="experiment"; version="1.1-3"; sha256="0gxf6bbx06ynz96mwcb9wdb8pb0njvjnpigjc1vq5ammc3l6dkxz"; depends=[boot MASS]; };
+  expands = derive2 { name="expands"; version="2.1.2"; sha256="15r5wld63kwk3kcl5x09dj0n1mgcl076lcjsmf0vbh10x4n0avrk"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
+  experiment = derive2 { name="experiment"; version="1.1-4"; sha256="08d9m72l6n2ygy5x8aakzv3n71ybqy1i8yzv55f7r4w1kk4pbk5i"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
-  expint = derive2 { name="expint"; version="0.1-4"; sha256="17vp7znbxlf5zb944snmnml2w42avj9k70fisb8az047i3kdbvfh"; depends=[]; };
+  expint = derive2 { name="expint"; version="0.1-5"; sha256="12ki8j17p070kq2mdzzai755wy1n6kvinax0ldd63kynij9n0gdh"; depends=[]; };
   explor = derive2 { name="explor"; version="0.3.3"; sha256="1b3swb7ikp2ik3300ljg2rll5gka4l4lfg95bqbgap3ph4dclv7y"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
   expm = derive2 { name="expm"; version="0.999-2"; sha256="1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q"; depends=[Matrix]; };
-  expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
+  expoRkit = derive2 { name="expoRkit"; version="0.9.2"; sha256="0qlzz86cyfz2yyynz8bj28086d1pc93gvjy1idip80m7z6vsrsxq"; depends=[Matrix SparseM]; };
   expoTree = derive2 { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
-  expp = derive2 { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; };
-  exprso = derive2 { name="exprso"; version="0.2.7"; sha256="0s8vf1rn7mwsiypd3k8diki5brlx95rzsqikprg9j9difv03f976"; depends=[cluster e1071 kernlab lattice MASS nnet plyr randomForest ROCR sampling]; };
+  expp = derive2 { name="expp"; version="1.2.2"; sha256="0xr24xzplgamj8dkjk9n9jmrbyw056z57hkm9h4j43g63vxrinlj"; depends=[deldir rgeos sp spatstat spdep]; };
+  exprso = derive2 { name="exprso"; version="0.3.6"; sha256="0df3c79iscgrdj14d82vibsxz85zb99j55b3r6jw0zqs5czd8rhd"; depends=[cluster e1071 frbs gtools kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.8.6"; sha256="0yzbgmqblbxk494yhrs3mnr2jgsxvybamdbwc5w2w389baa78wny"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
+  expss = derive2 { name="expss"; version="0.8.7"; sha256="1p0jzqbjagx00qwjhsjyvmqijlp33qjhj7k9b8rddibvg9ysmcji"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
-  extRemes = derive2 { name="extRemes"; version="2.0-8"; sha256="0pnpib3g2r9x8hfqhvq23j8m3jh62lp28ipnqir5yadnzv850gfm"; depends=[car distillery Lmoments]; };
+  extRemes = derive2 { name="extRemes"; version="2.0-9"; sha256="0cpvcajk9xyy7662nqkyx333vrxpwsc5nmv0bfnhsbgijz5y0hvm"; depends=[car distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
   extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; };
   exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; };
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
   extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
-  extraDistr = derive2 { name="extraDistr"; version="1.8.8"; sha256="0ywn4qwnamv36l1hw27l9y5kh3v6ha5781wsv2bz6szqjgg7kdb3"; depends=[Rcpp]; };
+  extraDistr = derive2 { name="extraDistr"; version="1.8.9"; sha256="1fg8vjpal33y51iqzglk1yvy46d7js0l0wfbdy698lq8a06hq19p"; depends=[Rcpp]; };
   extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
-  extracat = derive2 { name="extracat"; version="1.7-4"; sha256="1dply8sx9r9vshi5dycxs7bchf5g33qbq7w6i5w830glfy0lk3i5"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; };
+  extracat = derive2 { name="extracat"; version="1.7-5"; sha256="1jj3mkn7s0m4dhnbrqhhxx6k2macmjjrmd7v7rqb5wivj5g7b89v"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; };
   extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
   extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
   extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; };
   extremefit = derive2 { name="extremefit"; version="0.2.3"; sha256="1m2960qbs2qha4975sq5awsvlk10s1mgb3cm91fyrm6lh50plv5m"; depends=[]; };
   extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; };
   extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; };
+  exuber = derive2 { name="exuber"; version="0.1.0"; sha256="0jm0kxw7f4pzy162alp0q9kxgyrg2qllhxl7ijaq5qx4wnyhab3m"; depends=[doParallel dplyr foreach ggplot2 purrr Rcpp rlang]; };
   eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; };
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.7"; sha256="1an39l4bkbw7s75y1pjgdwhixshdaawpy4kwyaqk7jkhhy7nl1nh"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; };
@@ -6239,7 +6307,6 @@ in with self; {
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
   ezsummary = derive2 { name="ezsummary"; version="0.2.1"; sha256="16rwg1h7gs7mnkmbwfb273fy1pwdq9ng6l4ad00anpmilqcck5ng"; depends=[dplyr tidyr]; };
   fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
-  fArma = derive2 { name="fArma"; version="3042.81"; sha256="1m27lkw17g6mmrc52y0labif8gdyacvw2lgdmwnb01vyrkghqy20"; depends=[fBasics timeDate timeSeries]; };
   fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; };
   fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; };
   fBasics = derive2 { name="fBasics"; version="3042.89"; sha256="0x6s6js52sz0rv3y66ax1bkf4mn9ihjmkyrm5clf7ymw5hvd5f5q"; depends=[gss MASS spatial stabledist timeDate timeSeries]; };
@@ -6247,7 +6314,7 @@ in with self; {
   fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; };
   fChange = derive2 { name="fChange"; version="0.1.0"; sha256="1pj4q9dsqqgv198kfv410qkpgynhd580bcsigmak598m5jx3rf7l"; depends=[fda lattice reshape2 sandwich sde]; };
   fCopulae = derive2 { name="fCopulae"; version="3042.82"; sha256="10wknqrrs5j63v7qnp5qmk85688r36vli4r99i49y2i2nv10yp5r"; depends=[fBasics fMultivar timeDate timeSeries]; };
-  fDMA = derive2 { name="fDMA"; version="2.2.3"; sha256="17c9qm32pmbn236ynkkk0z4fdfyij3h1kx7y2i9x3m5q1z7dzwb4"; depends=[doParallel foreach forecast gplots iterators MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; };
+  fDMA = derive2 { name="fDMA"; version="2.2.3.1"; sha256="0lkidcc9r3psngdn60wk5zk6k32qxgklcrk23jhf88qnrfqbasw4"; depends=[doParallel foreach forecast gplots iterators MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; };
   fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; };
   fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; };
   fExtremes = derive2 { name="fExtremes"; version="3042.82"; sha256="1n0afql4csgsqf7j9x2v8yxncvpknms643l9knm0fqb4pdbaw58c"; depends=[fBasics fGarch timeDate timeSeries]; };
@@ -6266,6 +6333,7 @@ in with self; {
   fabricatr = derive2 { name="fabricatr"; version="0.4.0"; sha256="0z04n2n44anpci8m4m5hs83nwhiczil7lkg8glcgngrdh994k8hc"; depends=[rlang]; };
   face = derive2 { name="face"; version="0.1-4"; sha256="0kkgblxzhjzifxnym6g5psiwvfgydk1scqbxraldklm8c4a12zc3"; depends=[Matrix matrixcalc mgcv refund]; };
   facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; };
+  facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; };
   facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; };
   factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
   factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; };
@@ -6285,33 +6353,32 @@ in with self; {
   famSKATRC = derive2 { name="famSKATRC"; version="1.1.0"; sha256="1xbh0by4sjxrmy00v1svcj3lb98p9krpncbhpjbli1jd2p47yk60"; depends=[bdsmatrix CompQuadForm coxme kinship2]; };
   fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
   fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; };
-  fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; };
+  fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; depends=[]; };
   fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; };
   fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; };
-  fansi = derive2 { name="fansi"; version="0.2.2"; sha256="1kjbklr24n649k17mgcxsrw8lsj4c2yd94yg1rilsnlqcyjdvpvi"; depends=[]; };
+  fansi = derive2 { name="fansi"; version="0.2.3"; sha256="1jcnzl8qdav5niv52xa1r8jp5c4wsnhsddjlnrc2ss76pzwgwvfv"; depends=[]; };
   faoutlier = derive2 { name="faoutlier"; version="0.7.2"; sha256="0h2azbkxpz03qjmq558mh7dkpv87vbvminvg69wqsx21m6hdl5r3"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; };
   far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
   faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; };
   farff = derive2 { name="farff"; version="1.0"; sha256="1w3mi0vsw7mpqznaf3rnzf7va7ax07n5rrpm2hnjh0q25lsv55hk"; depends=[BBmisc checkmate readr stringi]; };
-  farsi = derive2 { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
   fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
   fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
-  fastDummies = derive2 { name="fastDummies"; version="1.1.0"; sha256="0ns1279sxfiv5ll4faag36ldc5v40l48li36kqr1bb09s3sx9p9w"; depends=[data_table tibble]; };
+  fastDummies = derive2 { name="fastDummies"; version="1.2.0"; sha256="0w7764b64isvlimly06i46hk1rspd3bjrqi2f2gafcwz5lk2jc3s"; depends=[data_table tibble]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
   fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
   fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; };
   fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; };
-  fastLink = derive2 { name="fastLink"; version="0.3.1"; sha256="0d77z88vv8gw1hp3cpnx481yn7p5y4nq3qzsv63bifad0msnqixy"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
-  fastM = derive2 { name="fastM"; version="0.0-3"; sha256="1gyrkci6iv7j4aymy2qlwjshmigiff5x7kqjsh1yjzd43jg9ij86"; depends=[Rcpp RcppArmadillo]; };
+  fastLink = derive2 { name="fastLink"; version="0.4.0"; sha256="0cqrg6fj7ylxf5brwmdsv7wrak8b395yszdy1cz3q87r3ayi02cq"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
+  fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; };
   fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; };
-  fastR2 = derive2 { name="fastR2"; version="0.2.0"; sha256="1xwa4v0j2n0qxn1prhc9x0sz53fhsfbg2m1a6kfdp7cpvvk46pw5"; depends=[dplyr ggformula ggplot2 lattice magrittr maxLik miscTools mosaic numDeriv]; };
+  fastR2 = derive2 { name="fastR2"; version="1.1.0"; sha256="145gkz777zx80bxx1zwwj4diswl6yf2v02wgfpy3rvk2q225f1id"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
   fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; };
   fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; };
   fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; };
-  fastcluster = derive2 { name="fastcluster"; version="1.1.24"; sha256="15drhl22wm8whsy6b3vv754skfddiydb068zn1whrw5sknvkkjc2"; depends=[]; };
+  fastcluster = derive2 { name="fastcluster"; version="1.1.25"; sha256="01a2xnhhvv1swd4g8p4lzyn7ww7kg49jlnzc7kfz60jqjzpisrpk"; depends=[]; };
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
   fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; };
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
@@ -6319,18 +6386,18 @@ in with self; {
   fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; };
   fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
-  fastnet = derive2 { name="fastnet"; version="0.1.4"; sha256="0hc18yc2cmvb5v8vjj1xvnciz35hyfp9iyqhkg9jfjrlf89icny6"; depends=[doParallel foreach igraph tidygraph]; };
+  fastnet = derive2 { name="fastnet"; version="0.1.5"; sha256="0l14ahrk4p5ils5rqwkj25f7xxhjqxpibgcy942c6pyc33rbsbcl"; depends=[doParallel foreach igraph tidygraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
   fastqcr = derive2 { name="fastqcr"; version="0.1.0"; sha256="0hzlp66as7k0bh3biqkngacpkq1hi3y3gp6wg4c5476ywzm83gra"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; };
   fastrtext = derive2 { name="fastrtext"; version="0.2.5"; sha256="0zbd2sxzarxic90d2pkbn7fak5gyb81b180m91f784smb3sx1p1j"; depends=[assertthat Rcpp]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
-  fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.2"; sha256="1xqr4azc5gsr7kcm8qzwjpjy72w1b111i61wbm35vns9r38a6cxz"; depends=[kinship2 multgee]; };
+  fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.3"; sha256="00pnzr3v7vm965b3cvgplasw00akmixybvm6l9bn609c2kqbf5p3"; depends=[kinship2 multgee]; };
   fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; };
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
   fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
   fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
   fbar = derive2 { name="fbar"; version="0.4.3"; sha256="1raq8ak01gcnmcsaa3fdfqi40d67v7nfjr212jzvq7wp2qk3j10i"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
-  fbati = derive2 { name="fbati"; version="1.0-1.1"; sha256="18k8a1m2znzzwmm25dbqnqzwbjxqz4rbjaw3z9affky7lzqgbg6l"; depends=[fgui pbatR rootSolve]; };
+  fbati = derive2 { name="fbati"; version="1.0-3"; sha256="03a48sndphxrm4bmk0qx0lxnk4akkdpbvldq9dcnf9hxxmrfivh4"; depends=[fgui pbatR rootSolve]; };
   fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
   fclust = derive2 { name="fclust"; version="1.1.3"; sha256="1wpdvpfama90x8rj5yv54q7k318ad4y6pi33vsyh0rsb3fdrkqkr"; depends=[]; };
@@ -6339,7 +6406,7 @@ in with self; {
   fcros = derive2 { name="fcros"; version="1.5.6"; sha256="0n1zbzl6g9k3smdpgyb3xsa2w8ir4bdagv7w644x1jck5rd0xn2j"; depends=[]; };
   fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; };
   fdANOVA = derive2 { name="fdANOVA"; version="0.1.1"; sha256="16i0mnbxyjbw06havl277c6vi7mq5rak9cjzp8c2zvr8cakalkg4"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
-  fda = derive2 { name="fda"; version="2.4.7"; sha256="0371c32kxxvfdh18ldgc2p76dr2436ay0n9prdjwm9v0azp4rp9k"; depends=[Matrix]; };
+  fda = derive2 { name="fda"; version="2.4.8"; sha256="0n39rzbhg1hipzn51rzmbchn2358qgapg08iv7lmiqj5y7i9qns2"; depends=[Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="1.4.0"; sha256="0gp19c5lxp0g4690vdr0gpw89rl9v3l6872mf7hr8nsyyd6776vn"; depends=[fda MASS mgcv nlme rpart]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; };
   fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; };
@@ -6369,38 +6436,37 @@ in with self; {
   fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; };
   fergm = derive2 { name="fergm"; version="0.2.1"; sha256="14asdvr98nh6rayqff9xda54w95bjg4g2f72a21rhyc932d7589g"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan statnet stringr]; };
   fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; };
-  fetchR = derive2 { name="fetchR"; version="2.1-0"; sha256="1rrmky1wg2wz4m8nmvdxwbs4yxnwgdchddvh1dhp171364as3536"; depends=[plotKML rgdal rgeos sp]; };
-  ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
+  fetchR = derive2 { name="fetchR"; version="2.1-1"; sha256="0i5k40i7ryfbk1l4nn0k5hnmzhhp6970ns1j82hnih7kmdl4rlwj"; depends=[plotKML rgdal rgeos sp]; };
+  ff = derive2 { name="ff"; version="2.2-14"; sha256="1w724q4jpzbvzpilb2ifviaxkjgk9lzwxz9gksnvicbmfa20fqqw"; depends=[bit]; };
   ffbase = derive2 { name="ffbase"; version="0.12.3"; sha256="1nz97bndxxkzp8rq6va8ff5ky9vkaib1jybm6j852awwb3n9had5"; depends=[bit fastmatch ff]; };
   ffmanova = derive2 { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; };
-  ffstream = derive2 { name="ffstream"; version="0.1.5"; sha256="1q07b1wdyhbvn3784lwwz3jk591cz1rv1jnf36q1piscsb3v7ayk"; depends=[Rcpp]; };
+  ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; };
   fftw = derive2 { name="fftw"; version="1.0-4"; sha256="0172kpxzjx8239r2jbcqqbpcpqygrxk36a2kmh00f73mrq0kjhc0"; depends=[]; };
   fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; };
   fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
   fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
-  fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
+  fgui = derive2 { name="fgui"; version="1.0-8"; sha256="024fzd1c7iwqprn26hwjb9l2qlvvyzl449d7iixy0x69djwsrysv"; depends=[]; };
   fields = derive2 { name="fields"; version="9.6"; sha256="1v7z48a8jmdcil28rj8c3455k6rssr5v9qi6dyhhpbb193bj8121"; depends=[maps spam]; };
   fiery = derive2 { name="fiery"; version="1.1.0"; sha256="0251vfr7b8r4xjgcf8gyh1ddj0lj73fl0pim0k3vpzva5wmwigs1"; depends=[assertthat crayon desc future glue httpuv later R6 reqres stringi uuid]; };
-  fifer = derive2 { name="fifer"; version="1.1"; sha256="1gcv8ns4c1y3pjmixdm16raa5h6jqmc3i4m37ahj97l720j1f2ya"; depends=[fields Hmisc MASS party plotrix randomForest randomForestSRC rpart xtable]; };
   fiftystater = derive2 { name="fiftystater"; version="1.0.1"; sha256="1nri9vsqif03xrmm3g5llasqm49hj169mgv046f2l0mh9vp0fqpc"; depends=[]; };
   filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; };
   filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
   filelock = derive2 { name="filelock"; version="1.0.1"; sha256="11mmq296zg62gnxjk7dyr866kihihmsjpfg6bcc7hv6ivh4812nn"; depends=[]; };
   filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; };
-  filenamer = derive2 { name="filenamer"; version="0.2.2"; sha256="0289qpy4891fb71fa4bhc8wp4g7n1sw1kis5k5irdyyzmsa9dfhn"; depends=[]; };
+  filenamer = derive2 { name="filenamer"; version="0.2.3"; sha256="19gavhh5q7dziv0yc000w06qp58wk2cm52cxjl33p1q4cjk6gg3m"; depends=[]; };
   fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
-  filesstrings = derive2 { name="filesstrings"; version="2.2.0"; sha256="1qix25k0j1d1q3z5xiq9gc928kbb78w0j9083q5xsdik840d91kj"; depends=[BH checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; };
+  filesstrings = derive2 { name="filesstrings"; version="2.5.0"; sha256="04axsnk1912h1i6b2qp9cxxs5jd1vkwgxzg2kjw43gnm36a7188w"; depends=[checkmate magrittr matrixStats ore purrr Rcpp rlang stringr tibble]; };
   filling = derive2 { name="filling"; version="0.1.0"; sha256="0avlfl06nd8wn76ydii09ng2fqp92d4n9v2y5vg16m3my58l0srd"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
-  financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
+  finalfit = derive2 { name="finalfit"; version="0.7.8"; sha256="1jkmagr512h5vvlqyszi6zihpzbmam571bgks5js0d3wbhjs9j38"; depends=[ggplot2 gridExtra Hmisc lme4 magrittr mice plyr pROC scales stringr survival survminer]; };
   finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; };
   findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; };
   findpython = derive2 { name="findpython"; version="1.0.3"; sha256="1y08jk2ffmkf9zpwiz2xymjhfwqvls9vzsnq62v278ghw9d571jl"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
   fingerPro = derive2 { name="fingerPro"; version="1.0"; sha256="17r23x8cdllr8slk56dsmrwc4ns69b3cqy59mxxbsjnhjl3di6x8"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL reshape rgl scales]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; };
-  fingertipsR = derive2 { name="fingertipsR"; version="0.1.5"; sha256="0g1r2mrivnfv7icba1y9lx5h2a3swmd41ry2064n82l05iaw9wsp"; depends=[dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
+  fingertipsR = derive2 { name="fingertipsR"; version="0.1.8"; sha256="168z59y2mqz53qhzavzynh6y11d453dd6j5928ahg6x24hjz6d4w"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
   finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; };
   fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
@@ -6411,7 +6477,7 @@ in with self; {
   fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
   fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; };
   fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
-  fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
+  fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; };
   fitODBOD = derive2 { name="fitODBOD"; version="1.1.0"; sha256="15ylldlq12mrw06pzww54hsl8nb9krs5w1cgh037km9sndsswvji"; depends=[hypergeo]; };
   fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; };
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
@@ -6423,7 +6489,7 @@ in with self; {
   fitur = derive2 { name="fitur"; version="0.5.25"; sha256="0f33c4mg0257s9c0qldryihaq8p3y07j2nwghjpqhi3rv4mrg2xf"; depends=[actuar e1071 fitdistrplus ggplot2]; };
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
-  fixerapi = derive2 { name="fixerapi"; version="0.1.1"; sha256="0g1bs2d99yv6q6y8kh6s9skkfjany5737kys0yqy8mpflhymvh33"; depends=[jsonlite tibble tidyr]; };
+  fixerapi = derive2 { name="fixerapi"; version="0.1.5"; sha256="0mp492n75wh8ws85gh5q9bbq709a78z14pipc8vjxk0fizhxwwdc"; depends=[jsonlite tibble tidyr]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; };
   flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; };
@@ -6432,10 +6498,11 @@ in with self; {
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
   flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; };
-  flexCWM = derive2 { name="flexCWM"; version="1.7"; sha256="0kgvj3l4cscr1p3305mnz42km5i8280wrvxp317dif3pvq7iigi4"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
+  flatxml = derive2 { name="flatxml"; version="0.0.1"; sha256="0rg6khx6sgxhmvh3j8m1ady8bya2904n3maynb7393rp9s8jvb9p"; depends=[RCurl xml2]; };
+  flexCWM = derive2 { name="flexCWM"; version="1.8"; sha256="0x6rmag3gdlph1xd1xbnfxxzl4rmp4z7zsvagbcwbri21ia29s14"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
   flexclust = derive2 { name="flexclust"; version="1.3-5"; sha256="19ihdhmhaglccqpvrpc51367gkfafg4jdpabbk0j6mh2n16hi511"; depends=[lattice modeltools]; };
-  flexdashboard = derive2 { name="flexdashboard"; version="0.5.1"; sha256="0jb5wswbjr58g121nbvl93p73gxr8cx56kajgpiaw1fis6dsyfyz"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
+  flexdashboard = derive2 { name="flexdashboard"; version="0.5.1.1"; sha256="0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
   flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; };
   flexmix = derive2 { name="flexmix"; version="2.3-14"; sha256="0sl4zxh1sb2sr5q7svjw9ihrm219jzn82yrc9d43q6r1b8bpyz43"; depends=[lattice modeltools nnet]; };
   flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; };
@@ -6458,7 +6525,7 @@ in with self; {
   flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
   fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; };
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
-  fluxweb = derive2 { name="fluxweb"; version="0.1.0"; sha256="1fwxqm8pn9h0bl1cpvz9rx56zsvxz22la5bj8yrrkbg3m8jdzgvi"; depends=[]; };
+  fluxweb = derive2 { name="fluxweb"; version="0.1.1"; sha256="0y05syshj3njzhqjpgs02ils4pzw6vfvny3nng0l9pdp55015b9g"; depends=[]; };
   fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
@@ -6471,7 +6538,7 @@ in with self; {
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
   foghorn = derive2 { name="foghorn"; version="1.0.2"; sha256="17bng0fxjqrlni11vwmghimk0h38mlyjyxizrbs1fycb8khlqh94"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
-  fold = derive2 { name="fold"; version="0.2.5"; sha256="1h7vx8saq4mbmylh1zgldm8n17i8waq8fgr5d4q68553xmazws41"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec tidyr]; };
+  fold = derive2 { name="fold"; version="0.2.6"; sha256="09w157h1r1sgay37240v0f1a5ra97nra7fn4im4v69avpl34yxd2"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec tidyr]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
   fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
   fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; };
@@ -6479,21 +6546,22 @@ in with self; {
   fontcm = derive2 { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; };
   fontquiver = derive2 { name="fontquiver"; version="0.2.1"; sha256="0qv3i9hch7cygl9983s3w68wfh5qvym2jkm52pp06p6mq8a1i1wm"; depends=[fontBitstreamVera fontLiberation]; };
   foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
+  foolbox = derive2 { name="foolbox"; version="0.1.0"; sha256="1wqswfsanak9p0hpgbblva4b90pamlq1hcjf4xzwd3awjicsp56y"; depends=[magrittr rlang]; };
   forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
   forcats = derive2 { name="forcats"; version="0.3.0"; sha256="0mxn1hng43zdjh1v8shd80hrszrqahcpaqxs1s1sif0qxh84d0cm"; depends=[magrittr rlang tibble]; };
   foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.2"; sha256="1wr99jq8a0cbc7n5sdzr0gwnxsv8sjqy1x1lrazxswyj49xc06i4"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
   foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
-  forecast = derive2 { name="forecast"; version="8.3"; sha256="0k5b9skjpyzx7gbd8z6f3d92wl2f8zgli781m4jg903ra0hsyncj"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca uroot zoo]; };
-  forecastHybrid = derive2 { name="forecastHybrid"; version="2.1.11"; sha256="01jmq6mw3idvascgrmr7i69pllqzdwbks42748pq18znw3f2yvjl"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; };
+  forecast = derive2 { name="forecast"; version="8.4"; sha256="13qq25b4r4fl18yl1wb441pqk98yqhi2gidy6si1kxgifq1xyp39"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca uroot zoo]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="2.2.12"; sha256="0qvn7qn5ddpiql1464rnhn7dlp015szj0v2bbs4i5v88flp831wv"; depends=[doParallel foreach forecast ggplot2 zoo]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; };
-  foreign = derive2 { name="foreign"; version="0.8-69"; sha256="0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"; depends=[]; };
+  foreign = derive2 { name="foreign"; version="0.8-70"; sha256="11mql8q3i1q593dvd351fhvkvfab25li80d1ahl4xjjzy52qdkc6"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
   forestControl = derive2 { name="forestControl"; version="0.1.1"; sha256="0qfj4qf0d1bb1wllhpg9r8gvg353zdqv7py9a3hm33yhs3l5x0g5"; depends=[Rcpp]; };
   forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; };
   forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; };
-  forestmodel = derive2 { name="forestmodel"; version="0.4.3"; sha256="1v1m8dvird2r1jqig492msqpp9sb4s79bhgnrs9y2c0ba46jzykh"; depends=[broom dplyr ggplot2 lazyeval]; };
+  forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; };
   forestplot = derive2 { name="forestplot"; version="1.7.2"; sha256="1cqk0fwpbn4an6xn28kpvqmcp3mgv8isg8dy755sv5fkqzzjz1dg"; depends=[checkmate magrittr]; };
   forestr = derive2 { name="forestr"; version="1.0.1"; sha256="0m26x7ngl89ngk1qhg50npmwli2npmjs9pfb9rg5hmx4fzr8k63i"; depends=[dplyr ggplot2 plyr]; };
   formatR = derive2 { name="formatR"; version="1.5"; sha256="19sd23vgs4ac0fwlw40j3676k6mramb0ajlq8hdw23kjwdx1jk47"; depends=[]; };
@@ -6501,12 +6569,11 @@ in with self; {
   formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; };
   formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
-  forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
   forwards = derive2 { name="forwards"; version="0.1.0"; sha256="0pb101gdf2a4plalhhm34aixkss3lzfg8yj6yfi0d6khjmaza33i"; depends=[]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
   fourPNO = derive2 { name="fourPNO"; version="1.0.4"; sha256="08l359fj39sdbq48qk05805kv25rw1wq93db0b7rvsi3iyi2lngk"; depends=[Rcpp RcppArmadillo]; };
   fourierin = derive2 { name="fourierin"; version="0.2.2"; sha256="0hy033bzybdc214z10wnbqph5f83fsr13admnzwb1d2drpbljnc8"; depends=[Rcpp RcppArmadillo]; };
-  fpCompare = derive2 { name="fpCompare"; version="0.2.1"; sha256="0vva60xixlx6l8623qvj2sdn5w3gjscrv5g8hqmgir4f211lzg38"; depends=[]; };
+  fpCompare = derive2 { name="fpCompare"; version="0.2.2"; sha256="10a87bpbpvrbrpyfx7ygyr9b7wd3fp79nd4g2ggl1gz3b1daqgxq"; depends=[]; };
   fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; };
   fpc = derive2 { name="fpc"; version="2.1-11"; sha256="04alsqb5gbhsjg1000d8w52pmpnlwca29r0s12f7n7mdccdv6xar"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
@@ -6517,23 +6584,24 @@ in with self; {
   fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
-  fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
+  fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; };
   fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; };
   fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
   fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
   fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; };
-  frailtyEM = derive2 { name="frailtyEM"; version="0.8.3"; sha256="02nsq5zjxg1hg578jn6ihygvyzscisx8r0s14a51dq1v6cjrz402"; depends=[expint ggplot2 magrittr Matrix msm Rcpp survival tibble]; };
-  frailtyHL = derive2 { name="frailtyHL"; version="2.1"; sha256="02vk1hwjpdwdajy527q034dpvnchsnwhqqlf6nq19wqhxq7355qj"; depends=[cmprsk Matrix numDeriv survival]; };
-  frailtySurv = derive2 { name="frailtySurv"; version="1.3.2"; sha256="0qsq96p29rxlfkhbmg8cfqdnpzh8wq2nadpiim9d6l0bs20r51gl"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
+  frailtyEM = derive2 { name="frailtyEM"; version="0.8.8"; sha256="0mfhhb025wzwvch5bcvvfsljki34xahdkqli7lvqbhhihba00r1p"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
+  frailtySurv = derive2 { name="frailtySurv"; version="1.3.4"; sha256="0nsrgkfr726hkf2x3df0jgb35b6siaq7jhydzddjf4az8d08akvw"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
   frailtypack = derive2 { name="frailtypack"; version="2.12.6"; sha256="0w2v5ik4ryvl5hph9cwxcrrglwpqbyirfrayyw9g0l1wdc1mfvi4"; depends=[boot MASS nlme statmod survC1 survival]; };
   frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; };
+  frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; };
   franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; };
   frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
-  freeknotsplines = derive2 { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
+  freegroup = derive2 { name="freegroup"; version="1.0"; sha256="1x0n3mjm37b83lxa0bcylbrn1c0sdvl54mz317a8g2y2ydk7h3zi"; depends=[magrittr]; };
+  freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; };
   freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
   freesurfer = derive2 { name="freesurfer"; version="1.6.1"; sha256="1ibhl5sbz85skkawmfdr9df6wdq6b3bl6cdvykx0gcszmd3fiabh"; depends=[neurobase R_utils reshape2]; };
-  freqMAP = derive2 { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
+  freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.1.0"; sha256="0hz9wnn1pi09v4azi02ai7hh4iwml90pdrs329y3p8qzxmvry56b"; depends=[fontquiver]; };
   freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; };
   freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; };
   freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; };
@@ -6541,6 +6609,7 @@ in with self; {
   frequencies = derive2 { name="frequencies"; version="0.1.1"; sha256="0d52kf4r13n59990xhra9i6gfvs4sn7ix54d0c0g56p1rj7hnh79"; depends=[dplyr]; };
   frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.0"; sha256="02ha5jfkjaxyfp7x1h0xx32ijha2dh7h52z687a9y9azrqvjv0jp"; depends=[knitr pbapply urca vars]; };
   freqweights = derive2 { name="freqweights"; version="1.0.4"; sha256="1iy2vzv4wc2883yq8r31wpspa7gm7cd4wkgvbh7mwafll463zni2"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
+  frite = derive2 { name="frite"; version="0.1.0"; sha256="0qi03m8n05hx0ghh12zqrjvsqhyir4q9qmxb657d4vzajmih0bhn"; depends=[assertthat magrittr purrr stringr tictoc]; };
   frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
   frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; };
   frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; };
@@ -6549,13 +6618,13 @@ in with self; {
   frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; };
   frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
-  fs = derive2 { name="fs"; version="1.2.2"; sha256="194sl0vv0p2h1z474yzh9agqj1w02ppvkpz5p1b8ljn794h4ar7a"; depends=[Rcpp]; };
-  fscaret = derive2 { name="fscaret"; version="0.9.4.3"; sha256="1miqg7rd3q11aksbjf0nswwnxb7c2p2f0b85nmnwm11snbf1gg8s"; depends=[caret gsubfn hmeasure]; };
+  fs = derive2 { name="fs"; version="1.2.3"; sha256="1kbdz8hl96b2gs5vrfnwzgimn8qf8gk6ggicr7jylxzp21zzsry5"; depends=[Rcpp]; };
+  fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; };
   fsdaR = derive2 { name="fsdaR"; version="0.2-21"; sha256="121khfqy1ixqp86cl3cngc40zxjpd4nm5k0lk558nxcfgyyzvx8y"; depends=[rJava robustbase]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
   fslr = derive2 { name="fslr"; version="2.17.3"; sha256="1g7z1jsj89kqyclb3qdc7c6dgn18jqjmrxpxi62llkixhqg21yha"; depends=[matrixStats neurobase oro_nifti R_utils]; };
-  fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
-  fst = derive2 { name="fst"; version="0.8.4"; sha256="1jarhz5c6bib4n3xms1xhgybzaqdf4llfbgmnqndz2gwxjx1igia"; depends=[Rcpp]; };
+  fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; };
+  fst = derive2 { name="fst"; version="0.8.8"; sha256="0yhkpq54msr0620456gzyg5c47n8cjvnpc3iyvj24cvyar2l9vwp"; depends=[Rcpp]; };
   fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; };
   ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; };
   ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
@@ -6575,33 +6644,35 @@ in with self; {
   funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
-  funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
+  funcy = derive2 { name="funcy"; version="0.9.0"; sha256="1b6ckqi2sqg324309l0mqcjpqy5idmm71s30axflr5bcrhxkkiz3"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
   fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
   funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
   funrar = derive2 { name="funrar"; version="1.2.2"; sha256="179kxhwkd431d2n917mzjnr5qvh09f0hdm2c78lww4ijb54dhn0l"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="5.0"; sha256="0xq0n3939rsrz7dna4d3d7mrpxad2xswnblsc4a88nbq6cmx5c70"; depends=[dbscan Jmisc Kendall]; };
-  furniture = derive2 { name="furniture"; version="1.7.6"; sha256="0yz3l6lrfq5mbh4d7z6ny2gg3qixglcl9lvvs97a3l7mqwi5x4h9"; depends=[knitr]; };
-  fuser = derive2 { name="fuser"; version="1.0.0"; sha256="0l2ddc3lal3gvzkn8b09i7pzd9nvqnr45naz3ni52nmgygwdk5ma"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
+  furniture = derive2 { name="furniture"; version="1.7.9"; sha256="16nz028cgfhhn4xvhkzy6y1a1p6x4xfzna50q4jaih0pd980i07a"; depends=[knitr magrittr]; };
+  furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; };
+  fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
   fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
   futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; };
-  futile_matrix = derive2 { name="futile.matrix"; version="1.2.6"; sha256="10v7ffjm8az75lb39526p3y8b1zhmmzx07pybiy20zydznhyvv2p"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
-  futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
+  futile_matrix = derive2 { name="futile.matrix"; version="1.2.7"; sha256="0nbzcy5l3nllppwmdib1s11s7b4m7mfvqb90n6b2hgmd48jsw8wg"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
+  futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
   futility = derive2 { name="futility"; version="0.2"; sha256="0njckhwmawqhiznv241yjghh99wl72c4xknp9nzbmvi5j575rnlh"; depends=[]; };
-  future = derive2 { name="future"; version="1.8.0"; sha256="096pfwafiwr16m13qda824ba3mzqabz4cdbg08sz1vh5s2k2hp4c"; depends=[digest globals listenv]; };
+  future = derive2 { name="future"; version="1.8.1"; sha256="1bpx6b85dd8xq37527h72qszz2dg810xcp975z93hymk1d8hf41a"; depends=[digest globals listenv]; };
   future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.15.0"; sha256="0r1bnp9mnv8jk9d6dpr94cqn4zihpm7cgxqj0c3l0x9b6i0ny3z2"; depends=[BatchJobs future R_utils]; };
-  future_apply = derive2 { name="future.apply"; version="0.1.0"; sha256="1c5jyklam5j9lmr5jmn6972wwlbyaaihy4kczxib87glmc4g0a4k"; depends=[future globals]; };
-  future_batchtools = derive2 { name="future.batchtools"; version="0.6.0"; sha256="0npvy8d927k3ilmnwcq1fh5lvpdr009pyc93ils5qhwhfma3wfh0"; depends=[batchtools future]; };
-  future_callr = derive2 { name="future.callr"; version="0.2.0"; sha256="0b6f7iwx3pa6fdvb9zrzmx7ak94bgmscswyvinaysjxxcyfkmym2"; depends=[callr future]; };
+  future_apply = derive2 { name="future.apply"; version="1.0.0"; sha256="1jippm805hda75h24grp9pwypf10cp4m4hq55vni7qa9qhyi7r2x"; depends=[future globals]; };
+  future_batchtools = derive2 { name="future.batchtools"; version="0.7.0"; sha256="0sk2qs6fgq241zibjxkmvdgv7xq0lablwwd6px6rxi7asxjv7zbh"; depends=[batchtools future]; };
+  future_callr = derive2 { name="future.callr"; version="0.3.0"; sha256="0z9gmy46n823y38hq4xgc1x3v88hmz5sdfa6xsp0mk1bwlc94q8f"; depends=[callr future]; };
   futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; };
-  fuzzr = derive2 { name="fuzzr"; version="0.2.1"; sha256="10f9qd7cn0sqk02b5p1iq9prf5kjdivn0fkky4lb7chqvk2cwbv5"; depends=[assertthat progress purrr]; };
+  fuzzr = derive2 { name="fuzzr"; version="0.2.2"; sha256="1cwq7a5j6lzrlz9dw3hsfap988rh1kkgf03yni7c33zl69xp5w77"; depends=[assertthat progress purrr]; };
   fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
   fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; };
   fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.5"; sha256="1ifhvdzn0rs8gxqmpz8w1prxg3pxs5jqx5lh0r4i5rai49qjy3sb"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; };
   fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.4"; sha256="06r103hshc6xcjllv5qfiw3i1ddz4c8svy0i4j0avnffaarlc2wa"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
+  fuzzyreg = derive2 { name="fuzzyreg"; version="0.3"; sha256="1mg4c71d0yc42y4iqdwkw13nlkq09parp2xwi1fv700vmnn4gk5w"; depends=[limSolve quadprog]; };
   fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; };
   fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
@@ -6617,16 +6688,15 @@ in with self; {
   gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; };
   gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-  gProfileR = derive2 { name="gProfileR"; version="0.6.5"; sha256="1x6ym5bdlpc5z3h3wpyryym2g6qvm45blydw7s44bi165r30vrim"; depends=[plyr RCurl]; };
+  gProfileR = derive2 { name="gProfileR"; version="0.6.6"; sha256="1n6cj12j102b4x9vhyl4dljp1i0r43p23cnhqbx4als2xfxdlqgi"; depends=[plyr RCurl]; };
   gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
   gRbase = derive2 { name="gRbase"; version="1.8-3"; sha256="143qvs5mwypswdq344a48kzn83sx9jskdr9w6kxa3fzhdcqlhi7d"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
-  gRc = derive2 { name="gRc"; version="0.4-2"; sha256="0cqc3s7a1njxzmnx7yx1yjkrazbai3gpw2kc4l7g49ld4j40bsln"; depends=[gRbase MASS]; };
   gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
   gSeg = derive2 { name="gSeg"; version="0.5"; sha256="1f3appvy78adv9jll47smgw2apm3dkm9zrm17hhdxmcnqypd7ias"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; };
-  gWQS = derive2 { name="gWQS"; version="1.0.0"; sha256="0n0zwfqz5g4js5y3ss64dv5842jypr6sqacs32ax37immd34slhq"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
+  gWQS = derive2 { name="gWQS"; version="1.1.0"; sha256="03v6b90745nd0jxil39rgay1yh1lrg9p1wbi22yffd29a2arsf22"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-7"; sha256="02jrv5x7s3jm2ajpdvgsp4zkn65gjy96rvgdxhf9smp1kb6llzg0"; depends=[digest]; };
   gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; };
@@ -6642,30 +6712,31 @@ in with self; {
   gamRR = derive2 { name="gamRR"; version="0.4.0"; sha256="0grd9d7rar4lq82v55k7c2d3h0g2lh7ny4bpxanqgrq02jkpnz1p"; depends=[boot mgcv]; };
   gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
   gambin = derive2 { name="gambin"; version="2.3.0"; sha256="1kwh8s191m6gsjczqc3svf6zp1k4zi86rqz7s94rahg84vwh6a9b"; depends=[doParallel foreach gtools]; };
-  gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-0"; sha256="0z9wzvxjhnjl2bjnd5pxqzvv43hak7x5m23j76qnm05j12vw4bz1"; depends=[mboost stabs]; };
+  gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1"; sha256="06n2xk7k24gz95jy1cr6shpfd89ylispq6mn3fvxblqdf8vhdixj"; depends=[mboost stabs]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
-  gamclass = derive2 { name="gamclass"; version="0.57"; sha256="08s44n6x7m01gw02q4zgpa5vxbcgx6mnqgmdn6760ff66wy4zrgc"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
+  gamclass = derive2 { name="gamclass"; version="0.58"; sha256="0dldqnbdgrafkm1a9kb0gyyfs0s2g31iv4ndlnnm2rd63ga4xxsn"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
   games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
   gamesGA = derive2 { name="gamesGA"; version="1.1.3.2"; sha256="0srxsm1zhrx1dpm94mkcsds6rwkx9gi9yfbrkzylhrxgi4g8pvwp"; depends=[shiny]; };
-  gamlr = derive2 { name="gamlr"; version="1.13-4"; sha256="08igzs2raz6nnkz2aisxaq9jy2mlb49cqlm6gwxp0mrag4q6xxrz"; depends=[Matrix]; };
-  gamlss = derive2 { name="gamlss"; version="5.0-6"; sha256="1gwnp3i7458ms79fqi7pyna6adh0hz2jjigyxgdz98vxh39ix5ps"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
+  gamlr = derive2 { name="gamlr"; version="1.13-5"; sha256="0fc27b6qcm01drb7pb14wri2hlb464jig3x7sb8njwrxcqqia14n"; depends=[Matrix]; };
+  gamlss = derive2 { name="gamlss"; version="5.1-0"; sha256="00hiy8k3hls8igkcl2yzgx15mmj4f305zssav5bwsxwijj4m4pv6"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
   gamlss_add = derive2 { name="gamlss.add"; version="5.0-1"; sha256="1agk6pfm04hf9dp5r6dvxqkj1hykx23a16q7vch2sg752z0dadgk"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
-  gamlss_cens = derive2 { name="gamlss.cens"; version="4.3-5"; sha256="06baf94kpprj03dggnyvvmi4nw3qa23cyy1crsa0zfnaqj915ypv"; depends=[gamlss gamlss_dist survival]; };
-  gamlss_data = derive2 { name="gamlss.data"; version="5.0-0"; sha256="1mqz7m4iksmx939bz1lq05cxz3bfcksn2ggw3cv7b0k98cykgg1s"; depends=[]; };
+  gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; };
+  gamlss_data = derive2 { name="gamlss.data"; version="5.0-1"; sha256="0q0ah8x141172fxh25bk913zzs5njyn24xkah23px1zsh4684gsy"; depends=[]; };
   gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; };
-  gamlss_dist = derive2 { name="gamlss.dist"; version="5.0-4"; sha256="165ll56frlxka7iqix1anxdx6612gr62h7p0a27vi45yjbdj24id"; depends=[MASS]; };
+  gamlss_dist = derive2 { name="gamlss.dist"; version="5.0-6"; sha256="0xz0968diww9h2z2wgq2h5bgxx3h8nsv0yy4kapcay4ds1nkfyzx"; depends=[MASS]; };
   gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; };
   gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
-  gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.5"; sha256="192syg12qwhv9782spdg3sbpm2mfaj20bkr78h1ww64755srfc5k"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; };
+  gamlss_spatial = derive2 { name="gamlss.spatial"; version="2.0.0"; sha256="1pgmlc6i7p5mjb1pc7b861yjl2gwr37bbzj3j2dl0qzybrs742mx"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; };
   gamlss_tr = derive2 { name="gamlss.tr"; version="5.0-0"; sha256="02akydpvwl1qkhxpr72lv9qp4z2ra69abyq51b57rh4p60g78vhm"; depends=[gamlss gamlss_dist]; };
   gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; };
   gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; };
   gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; };
   gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; };
+  gammSlice = derive2 { name="gammSlice"; version="2.0-1"; sha256="0286gffy7hym3fwy26k8sfl7nj945lavpjvn435khp2rsmc1km2i"; depends=[KernSmooth lattice mgcv]; };
   gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; };
   gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; };
-  gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
-  gap = derive2 { name="gap"; version="1.1-21"; sha256="0vslbk66h1gkpqrpj4pkxnx7nr1fnjp0zvym9cxzyxww797bd57s"; depends=[]; };
+  ganalytics = derive2 { name="ganalytics"; version="0.10.4"; sha256="0l2l67135bvbivy1hzlrzx98kn4w6bz2mhdnfkilrs2mwlksyhvv"; depends=[assertthat googleAnalyticsR httpuv httr jsonlite lazyeval lubridate plyr R6 rvest scales selectr stringr XML xml2]; };
+  gap = derive2 { name="gap"; version="1.1-22"; sha256="1xryy228bysj7qmb73znh6vp31bchshwpsjr277vyaffr6m939ki"; depends=[]; };
   gap_datasets = derive2 { name="gap.datasets"; version="0.0.2"; sha256="0skxgiwymd8c4vsy2dbddifjj9a0bq52gdd2r62slsv0q9haw96y"; depends=[]; };
   gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
   gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; };
@@ -6681,6 +6752,7 @@ in with self; {
   gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; };
   gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; };
   gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
+  gbfs = derive2 { name="gbfs"; version="1.0.0"; sha256="1kikbsdmh8v2s3kabmfpbwzzwxkzadqz7xpn5ng90npl3j8zaps6"; depends=[devtools dplyr jsonlite lubridate readr roxygen2 stringr testthat withr]; };
   gbm = derive2 { name="gbm"; version="2.1.3"; sha256="0ayrpq5qm18dsain088mbw0037bijxcy342grb6g2qnp67llpwpa"; depends=[lattice survival]; };
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
   gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; };
@@ -6693,27 +6765,28 @@ in with self; {
   gcerisk = derive2 { name="gcerisk"; version="18.02.22"; sha256="1wy9l4s17ji5xj1cxjnb59qz3242yjs4zp76fy3rg1m0k7ib52vg"; depends=[cmprsk ggplot2 survival]; };
   gcite = derive2 { name="gcite"; version="0.9.2"; sha256="1xwnf8hsakzqg5nm5c14zw239scd2dl9rfd02mj5xp6548qwxrz9"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; };
   gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
-  gcmr = derive2 { name="gcmr"; version="1.0.0"; sha256="13xja7rh2wkmi2j7yxrkj99sl96mlcgkp3v5aagnz140jx3jibsx"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
+  gcmr = derive2 { name="gcmr"; version="1.0.1"; sha256="093j1cmfw83rck00lx2ns7sfaya7kfc8k7af0q80az7w2g9hmmpv"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
   gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
   gcookbook = derive2 { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
-  gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.7"; sha256="0n8c72m7dapy8agqcglagb8bwf0rpajdq9qsli3qyrrp7fh3h4ck"; depends=[foreach R_utils raster rgdal sp]; };
+  gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.14"; sha256="0dvp1qzxxp6rjqfxpxckbfhdqanksnm4rfgsalvb5wdm5qmm02l9"; depends=[foreach R_utils raster rgdal sp]; };
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
-  gdistance = derive2 { name="gdistance"; version="1.2-1"; sha256="1wygcx0iki7g10f9gjbycrjjadmsw3153ha9rnqvc9hwwf34m9y1"; depends=[igraph Matrix raster sp]; };
+  gdistance = derive2 { name="gdistance"; version="1.2-2"; sha256="0lqpxsg01ibkaq50qyccdhsl2sbb4kh9bcfifs1yzsg45bq27jf8"; depends=[igraph Matrix raster sp]; };
+  gdm = derive2 { name="gdm"; version="1.3.11"; sha256="1bsy8fjzc0034hxw5n4ip4lkwr38fiyvw9q21bk17sxn44cnnxz4"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
   gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; };
   gdns = derive2 { name="gdns"; version="0.2.1"; sha256="0dvrknhx0d00yi429zjdcs3ghgbpfjhrclkn6cicd049qdp4q396"; depends=[dplyr httr jsonlite purrr stringi tibble]; };
-  gdpc = derive2 { name="gdpc"; version="1.0.3"; sha256="0qc9wl7zxqwzigvzpm0nyx735ah8ascmcwd0yays5mqc74iqqx3b"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
+  gdpc = derive2 { name="gdpc"; version="1.1.0"; sha256="1q1c9pypkb8dv6bvgizaca4p43krc52fvlvjz9l6nkpazr1qx33d"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
   gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; };
   gdtools = derive2 { name="gdtools"; version="0.1.7"; sha256="122k9spymawfnfyksxyapwq9cigydy5nrjwhrwrhy3qkax3aycf6"; depends=[Rcpp withr]; };
   gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; };
   gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
-  geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; };
+  geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; };
   geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; };
   geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
   geex = derive2 { name="geex"; version="1.0.3"; sha256="0px197mz3qfx7s4wfdjlgjpss03y7wid1qa34xf4xan05dnrrnzc"; depends=[lme4 Matrix numDeriv rootSolve]; };
-  geigen = derive2 { name="geigen"; version="2.1"; sha256="1alssnwypnf20bc26q50baja6g0drwclajlsqamamss0mfc8hsnh"; depends=[]; };
+  geigen = derive2 { name="geigen"; version="2.2"; sha256="0wfd87xd438ri0a9m9dz46jfy4wpm75skc3iyppx80d03kijvcig"; depends=[]; };
   geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; };
   gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; };
   gem = derive2 { name="gem"; version="0.19"; sha256="11gzqpc9s1bkx1w6ncjylmfqqf3wj5hgca4lzygvlni9xz7pk517"; depends=[signal]; };
@@ -6735,7 +6808,6 @@ in with self; {
   gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; };
   geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
   geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; };
-  geneSLOPE = derive2 { name="geneSLOPE"; version="0.37.0"; sha256="1pw6y0n1xnprz2d4hyhlp1m9grki7s9hi2f4nqxa34wynqkp4bx8"; depends=[bigmemory ggplot2 SLOPE]; };
   geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
   genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; };
   genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
@@ -6743,10 +6815,10 @@ in with self; {
   generalCorr = derive2 { name="generalCorr"; version="1.1.1"; sha256="1ihp9pksi47f3fsv7wgrp1z4ylmf5n57n6h27v130mi7k5lh1gdy"; depends=[meboot np psych xtable]; };
   generalhoslem = derive2 { name="generalhoslem"; version="1.3.2"; sha256="1c6mmgdxdm384fl9yqpij3fvjzzima10knljsf50hl4q9f66lvag"; depends=[MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
+  genesysr = derive2 { name="genesysr"; version="0.9.1"; sha256="0cwx00bikhr32h2mxnd9v5z80zjy3y9i7b30achhlrjzvylh6q4j"; depends=[httr jsonlite]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
   genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; };
   geniusr = derive2 { name="geniusr"; version="1.0.0"; sha256="0akz6hkw9mjwgx9s9j24j5l1z4q41kbhna2245l26ymn4cf0rwjc"; depends=[httr purrr rvest stringr tibble xml2]; };
-  genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; };
   genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; };
   geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; };
   genoPlotR = derive2 { name="genoPlotR"; version="0.8.7"; sha256="1zplk0acismv4x528rmmg5jcv6ng6c4vjf5h0mr124fj3kizsrg0"; depends=[ade4]; };
@@ -6754,14 +6826,13 @@ in with self; {
   genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; };
   genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; };
   genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; };
-  genotypeR = derive2 { name="genotypeR"; version="0.0.1.6"; sha256="1y8fm3l97hrwra7a1n2gry6583r09rch1sk7vp6r9f5qwmmjc3r7"; depends=[colorspace doBy plyr reshape2 zoo]; };
+  genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; };
   genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; };
   genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; };
   gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
   gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; };
-  gensvm = derive2 { name="gensvm"; version="0.1.0"; sha256="19qd67x3j0b60wsbinjny7jwx5yh8hdk6387fl64frnq8fvi9d60"; depends=[]; };
-  geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; };
-  geoBayes = derive2 { name="geoBayes"; version="0.3.3"; sha256="1jw0fj39gzf4cislc889ndgj34svcdxk0jz85ssk936g9gp0mm0c"; depends=[coda sp]; };
+  gensvm = derive2 { name="gensvm"; version="0.1.1"; sha256="10ym8p1i66ppjhn039wqbpm2yvmirj3pfqmqqn7iji8s1hdxds73"; depends=[]; };
+  geoBayes = derive2 { name="geoBayes"; version="0.5.1"; sha256="18m1qxzq97rddbxk99za5yfdcq6nyy4nxgikylfpsb2mxanjxyx2"; depends=[coda sp]; };
   geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
   geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; };
   geoR = derive2 { name="geoR"; version="1.7-5.2"; sha256="1sy968x154bsc3i3a6mxcwnyixcnmab5bc07dgibi9vzn0nkbbpb"; depends=[MASS RandomFields sp splancs]; };
@@ -6777,7 +6848,7 @@ in with self; {
   geojsonR = derive2 { name="geojsonR"; version="1.0.4"; sha256="0248lb1kgj43czp5z4q7dcrq6ra0jhq62q9x79mgyb83bqn940h8"; depends=[R6 Rcpp RcppArmadillo]; };
   geojsonio = derive2 { name="geojsonio"; version="0.6.0"; sha256="10vi40ppy65yg655xy0j8zl6icn7d7icwfj4a84wpp28pd1bwic8"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; };
-  geojsonsf = derive2 { name="geojsonsf"; version="0.2.0"; sha256="1jc0dgxk4zlrwy6a3y2j87a7vk9w8cnmczhaf0jdw6xymmni1faw"; depends=[rapidjsonr Rcpp]; };
+  geojsonsf = derive2 { name="geojsonsf"; version="1.1"; sha256="050dcyhsjjysfp263g1f35aixrdh85zfzkg7dyhn47nr9cfgrss8"; depends=[curl rapidjsonr Rcpp]; };
   geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geomedb = derive2 { name="geomedb"; version="0.2"; sha256="1nsf7xzqayk8zbw3b6xpgiqk2w2kzc896gjswzxq128xw05cia0a"; depends=[ape httr]; };
@@ -6785,9 +6856,10 @@ in with self; {
   geometa = derive2 { name="geometa"; version="0.2-0"; sha256="1dz23jgix8sxnb69hb7jd41kdqifkf95jmcg2f6zqncqa6qg7glk"; depends=[R6 XML]; };
   geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; };
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
-  geomorph = derive2 { name="geomorph"; version="3.0.5"; sha256="015ijpmx44agmr2ddwgxy5rs1rhkxr6j6dh5wzksaw1p4mxmhfks"; depends=[ape geiger jpeg Matrix rgl]; };
+  geomorph = derive2 { name="geomorph"; version="3.0.6"; sha256="1iqz8qzcdrxvz1iywkzbwia40sxj7fkw3mcncdddb9dnq016cfdy"; depends=[ape geiger jpeg Matrix rgl]; };
   geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
-  geoops = derive2 { name="geoops"; version="0.1.8"; sha256="1n863z83y19bn97clfddhv009c8d6a1grya0q5pk0a6ylihcw11h"; depends=[Rcpp]; };
+  geonapi = derive2 { name="geonapi"; version="0.1-0"; sha256="1i0pr4zrl06ym947parxk083f1b5p58bdbpm842viq1qqwavfj6z"; depends=[geometa httr openssl R6 XML]; };
+  geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; };
   geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; };
   geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
   georob = derive2 { name="georob"; version="0.3-6"; sha256="01gq9ymqk3zyjs5n7nj27ky2bnhc7x7npbipa5bcq7jda6gxirhr"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
@@ -6808,15 +6880,15 @@ in with self; {
   germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.0"; sha256="1s6mygiwmz2cgg2dcsah4ssnj5hfilf7hfdzvv3qd57imicrlkk5"; depends=[broom ggplot2 ggrepel minpack_lm plyr Rdpack]; };
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; };
-  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.2"; sha256="14rw7pdcan4bdjfb16z3h0acx2s8l34vywsp4nn8l1pmmsvgqpap"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; };
+  gestalt = derive2 { name="gestalt"; version="0.1.1"; sha256="0gcvd61dyyq29gf2v3kg1y474diwi0hl28rb4w8zf11ac9lc0jvz"; depends=[rlang]; };
+  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.4"; sha256="1468bxmy2iv1kzjnyh5y035lxmi8wfssjk0cjx63i6dg38bhq4cz"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
   getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; };
-  getTBinR = derive2 { name="getTBinR"; version="0.5.3"; sha256="0yn8abdixckp32yicp1b5bqmdl4l9s3f67jb8d70yy77kyckzw3m"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble viridis]; };
-  getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; };
+  getTBinR = derive2 { name="getTBinR"; version="0.5.4"; sha256="1xf5b98j4b07namkhmzwmp1xhsn9g42p2zy38xhz4823x13q9yn6"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble tidyr viridis]; };
+  getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; };
   gets = derive2 { name="gets"; version="0.15"; sha256="1sz225bymjp2mrklpjagh6x622kpcvh21r0rmimd1mjhqbg0p9vs"; depends=[zoo]; };
-  gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
   gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
@@ -6838,25 +6910,28 @@ in with self; {
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; };
   ggdag = derive2 { name="ggdag"; version="0.1.0"; sha256="0ja3v8pmlzl55n8y8n9zcg5n17w8w4vdq42bqf6h8hgyqj63rcg9"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr plyr purrr stringr tibble tidygraph]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
+  ggdistribute = derive2 { name="ggdistribute"; version="1.0.2"; sha256="1cwm2fmpx5dvmg4jnydfp8d584dhhprb589p5ia9zf1fblc4jvvw"; depends=[data_table dplyr ggplot2 magrittr tibble]; };
   ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; };
-  gge = derive2 { name="gge"; version="1.3"; sha256="0bqclmm4jr7y52n7qh4jikd0804iccjdpy55bvbc2k8ypsp2biik"; depends=[nipals reshape2 rgl]; };
-  ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; };
-  ggeffects = derive2 { name="ggeffects"; version="0.3.2"; sha256="07xrbl8z5ap5yy40wdz4gcwmmmj66c01qv8jdn0smjf06xavbr0n"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
+  gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; };
+  ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.4.0"; sha256="0w2w0vwbpcwm9nqvsr2ksyary8ah6ar5gw233sbc8m3z3zx33qc1"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
-  ggfan = derive2 { name="ggfan"; version="0.1.1"; sha256="0sqf37afz9kpl2wm3cpansav9ndil8agwrblzj0fhnyrj41s148n"; depends=[colorspace dplyr ggplot2 rstan]; };
+  ggetho = derive2 { name="ggetho"; version="0.3.2"; sha256="1279y9mc4jvdpncy4xi80c2jbhkd1cv5k8hz5187dxq45ksan2bg"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; };
+  ggfan = derive2 { name="ggfan"; version="0.1.2"; sha256="0agk9r2g8gh5ixg25rix362c7hj8b255w3ff7iawinsndf0dmwpy"; depends=[colorspace dplyr ggplot2 rstan]; };
   ggfittext = derive2 { name="ggfittext"; version="0.5.0"; sha256="0ih6mqg53y5iaiq003wbzp6qqx4844yh5z9zw5d0k7gqclprmpn5"; depends=[ggplot2 stringi]; };
-  ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
-  ggformula = derive2 { name="ggformula"; version="0.6.2"; sha256="08smdd3s8dh3qjcm25v8h1r8pfvlfvkymnbhlyw4bymq479g4w0j"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; };
-  ggfortify = derive2 { name="ggfortify"; version="0.4.4"; sha256="12fzf04yqxz0297pq4cpbnxal1vdmibi9nfcmzq5g35diypqwmg9"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
-  gggenes = derive2 { name="gggenes"; version="0.2.0"; sha256="1s3lkdl9wmhcdra90bv8zzb16h2sdmpr15x8c3d0gfw7yir6prj2"; depends=[ggplot2]; };
+  ggfocus = derive2 { name="ggfocus"; version="0.8"; sha256="1gzx9hiaxni7d90wb9apqzw4rxc32gk5nrjxkgvwv52m999jh2wc"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; };
+  ggforce = derive2 { name="ggforce"; version="0.1.2"; sha256="1asz6mkgq47hp3c52dyqvzd8fyimid1by0jj263br0k0c572na9w"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
+  ggformula = derive2 { name="ggformula"; version="0.8.0"; sha256="0rfkg5viznb98rd2xkq8mg8qvmxc8xm0jmiwwjfa3x2ngivgvwnw"; depends=[dplyr ggplot2 magrittr mosaicCore rlang stringr tibble]; };
+  ggfortify = derive2 { name="ggfortify"; version="0.4.5"; sha256="1mqgikpg34czz0zj4q3yh4xq9iw2x9zkz00ss27r6pmi6zipb6rm"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
+  gggenes = derive2 { name="gggenes"; version="0.3.1"; sha256="14a3j4cjv6b4na4j1wasm3cc566armgqc81s1yy756xc9k9sp4a9"; depends=[ggfittext ggplot2 rlang]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; };
-  gghighlight = derive2 { name="gghighlight"; version="0.0.1"; sha256="12by8q31fl2kc6w5p72wvd2nxg1cpvhgdbais6hjly1sxi8jd6zp"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang]; };
-  ggimage = derive2 { name="ggimage"; version="0.1.4"; sha256="0bwzzd7f4knjg7jifsmqwbd0kbca1n5f8f4s068d6mahaff5d9mn"; depends=[base2grob ggplot2 gridGraphics magick rvcheck scales tibble]; };
-  ggiraph = derive2 { name="ggiraph"; version="0.4.2"; sha256="0bk6q0psxzggm69yyhfw047xyygp23rk63xvdd9dv6avndfn1h7n"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; };
+  gghighlight = derive2 { name="gghighlight"; version="0.1.0"; sha256="1mfjvfm5xbih7k7qz6x8akbqgh0b18dz9pybfgh7rbq2ppwnhpy9"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang tibble]; };
+  ggimage = derive2 { name="ggimage"; version="0.1.7"; sha256="08xipid3n1ab2k2xs1ip3wgbdhw2ccsm49s62ygyqjp3z0cvbn2s"; depends=[ggplot2 ggplotify gridGraphics magick rvcheck scales tibble]; };
+  ggiraph = derive2 { name="ggiraph"; version="0.4.3"; sha256="0mjzx4jhfjr1mb19cgl70g5hfznnshbf08hvlg6hhbavlsk8fclp"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; };
   ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; };
-  ggjoy = derive2 { name="ggjoy"; version="0.4.0"; sha256="1s24zn7gmk52bvjjhanxby7rxbnc2yfl0nx5nv7x7z0zja8gg7nb"; depends=[ggplot2 ggridges]; };
+  ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; };
   gglasso = derive2 { name="gglasso"; version="1.4"; sha256="0r4zfgkys8104iw1vzww3qid8a6dyn03x0jlgwrdvavfj86yhq54"; depends=[]; };
   gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; };
   ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; };
@@ -6868,54 +6943,57 @@ in with self; {
   ggmuller = derive2 { name="ggmuller"; version="0.5.1"; sha256="1wa4gcyzbwy1s200w57phahh6rwaf62qn3i400xywkf34fsi1il8"; depends=[ape dplyr ggplot2]; };
   ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; };
   ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; };
-  ggplot2 = derive2 { name="ggplot2"; version="2.2.1"; sha256="0543782ddv2hp6s0l702mnxfg8n7a6qlbm8bm55x22hnqgz8kg2z"; depends=[digest gtable lazyeval MASS plyr reshape2 scales tibble]; };
+  ggplot2 = derive2 { name="ggplot2"; version="3.0.0"; sha256="0kb977hizsvk3b1k3zr717q78bpmbabhl8cj9a3w717nkq1zas67"; depends=[digest gtable lazyeval MASS mgcv plyr reshape2 rlang scales tibble viridisLite withr]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
   ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; };
   ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; };
-  ggpmisc = derive2 { name="ggpmisc"; version="0.2.16"; sha256="1hq5zpc3zf4hq49ykrzrgj92cmh6gjsq6kpzcvzvnm5wyh9yy2iq"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; };
+  ggplotify = derive2 { name="ggplotify"; version="0.0.2"; sha256="00qkm0jlhxgihncrygmkahqq0dm6kiyfw00iyrfw0khrd4khpahb"; depends=[ggplot2 gridGraphics rvcheck]; };
+  ggpmisc = derive2 { name="ggpmisc"; version="0.2.17"; sha256="1lx5a0n00994pp16jgz4c5xxsj8px6l9wl0cdsr0dr1d43lqywq1"; depends=[broom devtools dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang splus2R tibble xts zoo]; };
+  ggpol = derive2 { name="ggpol"; version="0.0.2"; sha256="0viq6k5xswhb7dzzjwr59kc7lw6312x015lbx64y3vx71ncbrgkz"; depends=[dplyr ggplot2 gtable plyr rlang]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
-  ggpubr = derive2 { name="ggpubr"; version="0.1.6"; sha256="0mvw215bj887958p34f0dzlrb8mgyfcz9b5zvsschvbhamqinqna"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; };
+  ggpubr = derive2 { name="ggpubr"; version="0.1.7"; sha256="110ny8p41kmbz0a5rl0mv9cqpjkx6yr3ybflp1r0fmcvhwv7cr3i"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; };
   ggpval = derive2 { name="ggpval"; version="0.2.0"; sha256="1nwf3cz1258khp1barxxp28326bagvlsfhg4rcccbxcpny9vbl7d"; depends=[data_table ggplot2]; };
+  ggquickeda = derive2 { name="ggquickeda"; version="0.1.0"; sha256="00j6gpika8x2yplnirj06vrc55aljcdhd2ln7081kym8xsfrjd2h"; depends=[colourpicker dplyr DT Formula ggplot2 ggrepel gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival tidyr]; };
   ggquiver = derive2 { name="ggquiver"; version="0.1.0"; sha256="0p6li7cxjy54qrmaf9ja6aknnlxwq4sl0z1yip1mznb5rhv6lpxw"; depends=[dplyr ggplot2]; };
   ggraph = derive2 { name="ggraph"; version="1.0.1"; sha256="0sm1hf2fjfia0s8m5b1x6pi8wvww77rpck86clpa2figwvck8jqr"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
-  ggraptR = derive2 { name="ggraptR"; version="1.0"; sha256="1n3ildrm8jh6m1j8njx1icbjhpkv3d2ndx59d6ddyg4np09cmp8w"; depends=[assertthat backports colorspace colourpicker DBI dplyr DT evaluate futile_logger futile_options gdtools GGally ggplot2 ggthemes gtable htmltools htmlwidgets httpuv labeling lambda_r lazyeval magrittr miniUI munsell plyr RColorBrewer Rcpp reshape rmarkdown rprojroot scales shiny shinyBS shinyjs stringi stringr svglite tibble xtable yaml]; };
-  ggrepel = derive2 { name="ggrepel"; version="0.7.0"; sha256="0g0qfm6g71rv27423c1x846ipilnj213knyzrcr09vrpxc87l618"; depends=[ggplot2 Rcpp scales]; };
+  ggraptR = derive2 { name="ggraptR"; version="1.1"; sha256="1lknd3vibysc00c6b59c0yq2r3dda7zn8bj7gxjzjv90jwpgl0b8"; depends=[dplyr ggplot2 pacman purrr shiny]; };
+  ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; };
+  ggrepel = derive2 { name="ggrepel"; version="0.8.0"; sha256="1m3p84d6nh9mzzvxb82vgig3ngcvkz86rjwzl9a66ckdf5p611k3"; depends=[ggplot2 Rcpp scales]; };
   ggridges = derive2 { name="ggridges"; version="0.5.0"; sha256="1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj"; depends=[ggplot2 plyr scales withr]; };
-  ggsci = derive2 { name="ggsci"; version="2.8"; sha256="1s2asx9aprpzs6xqbl7yb1dv9ci9ivwqcq46fzvys8zgwzf7mkml"; depends=[ggplot2 scales]; };
-  ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; };
+  ggsci = derive2 { name="ggsci"; version="2.9"; sha256="0g73x6grbka7ahjh6z23m3wrcifp5rdfdiasbl8lq4sp6rplxwaa"; depends=[ggplot2 scales]; };
+  ggseas = derive2 { name="ggseas"; version="0.5.4"; sha256="1jpdijwll5l7bg7cmjnklkxffysi9ckzg50rw2a2cd00zwby11q9"; depends=[ggplot2 rlang seasonal zoo]; };
   ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; };
   ggsignif = derive2 { name="ggsignif"; version="0.4.0"; sha256="1rn58d7pb3axk6chiihryykrzw76adaa2yiafq4d0j6qbhax78f7"; depends=[ggplot2]; };
   ggsn = derive2 { name="ggsn"; version="0.4.0"; sha256="0si3llqlb0dg482cqxhv5lm6raawqwpcd5ymjicw3780xq7d7mrk"; depends=[ggplot2 maptools png]; };
   ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.2.3"; sha256="11y2vlcpxyh56pdfzz11bkip2nxv6rrwscqv48p5fvgn9sllly4q"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; };
+  ggspectra = derive2 { name="ggspectra"; version="0.2.4-1"; sha256="0jp1zfzsnpnvcyw4m7cn4d871pqsniyrhv3j5riir6fa4ll4nmcb"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.1"; sha256="07fpavl7735a7fhaiybf55125afs40ai8sag32xxsf8d24i5zl2s"; depends=[apaTables broom coin cowplot crayon DescTools dplyr effsize ggcorrplot ggExtra ggplot2 ggrepel gtable jmv magrittr MASS nortest purrr rlang RVAideMemoire sfsmisc tibble tidyr userfriendlyscience WRS2]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.4"; sha256="19rr5cq9s9w4ivdr42ia0vqf62vsq0l1d3f3icp0zy0r9jzsdfwp"; depends=[apaTables boot broom coin cowplot crayon dplyr effsize ggcorrplot ggExtra ggplot2 ggrepel glue gtable jmv lmerTest magrittr MBESS purrr purrrlyr rlang scales sjstats tibble tidyr WRS2]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="2.2.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
-  ggthemes = derive2 { name="ggthemes"; version="3.4.2"; sha256="0i7ygpizs00acizixc29bhbrci523ys7vzxbii9b3bcmfa3pj7i3"; depends=[assertthat colorspace ggplot2 scales]; };
+  ggthemes = derive2 { name="ggthemes"; version="3.5.0"; sha256="0drbzzb4i5jq1579fx1wmgh87ybnswjn7srak2l8g771ip49xwb8"; depends=[assertthat colorspace ggplot2 scales]; };
   ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; };
   ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
   gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; };
   ghibli = derive2 { name="ghibli"; version="0.1.1"; sha256="1jnl017hkzhiic0fndprs68xx3njlijxkaqj9d65xazcwynaq436"; depends=[ggplot2]; };
-  ghit = derive2 { name="ghit"; version="0.2.18"; sha256="117dn7j4nsdbdj1c1zndfikih3gxgxnkdxi3z0qmrbpsb9l4h1ic"; depends=[git2r]; };
   ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; };
   giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   gibble = derive2 { name="gibble"; version="0.0.2"; sha256="0a9h3q0kwk9aagcpnmih59vbm5n7hdjpa4idwagky351almblmr6"; depends=[dplyr tibble]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
   gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; };
   gim = derive2 { name="gim"; version="0.11.0"; sha256="1psmziq03k1nbdl64sy152ih4g625qkbp5l7msfibrcbpgz0hg7y"; depends=[numDeriv]; };
-  gimme = derive2 { name="gimme"; version="0.3-3"; sha256="0czms27yfv0iwwqljfpa21qx83282ky4misccbln4cxziyw1n7yz"; depends=[igraph lavaan qgraph]; };
+  gimme = derive2 { name="gimme"; version="0.4-1"; sha256="1b1f92v54r9aqbwia549abjiw712ps4s58yw2n9p9894m4ijc88v"; depends=[igraph lavaan qgraph]; };
   gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; };
   gimms = derive2 { name="gimms"; version="1.1.0"; sha256="0mqffqvaapb0m0d50vg4kvdp67yq99qf54f5anwq4md0rf3x8lid"; depends=[curl Kendall ncdf4 raster RCurl zyp]; };
   giphyr = derive2 { name="giphyr"; version="0.1.2"; sha256="1id3r291xyj1ylxgmw2cbazaz0jq4bksj8bijwagcawimfxibz45"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
-  gistr = derive2 { name="gistr"; version="0.4.0"; sha256="1q1wp3q3ppkclvw9fsc9pr5raqv2r9rdm2n8s197b8brfcjilxsi"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
+  gistr = derive2 { name="gistr"; version="0.4.2"; sha256="0bh325pf37v307isdlvdglripfki8xr6gh7n8mgi4cjparzhrh23"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
   git2r = derive2 { name="git2r"; version="0.21.0"; sha256="11xgddmxzh9cy85k8fb90il43qswpvryz0h9r0j1gbclfg2f9004"; depends=[]; };
   gitgadget = derive2 { name="gitgadget"; version="0.2.1"; sha256="02jmp5lnk156sfqlv91jn42xds98ihya1x2f97cfwpzlas5qrxky"; depends=[curl dplyr jsonlite miniUI rstudioapi shiny]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; };
   gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
   givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; };
-  gjam = derive2 { name="gjam"; version="2.2.1"; sha256="0xjkssxgpcpn37amkjwi5cjdx5b8lkgjaw2lm4wyjjfn59jj3d14"; depends=[MASS RANN Rcpp RcppArmadillo]; };
+  gjam = derive2 { name="gjam"; version="2.2.4"; sha256="16gfb199mhpg0yp7xy9x8nlpcfmhkks92fwfa1ryv6plkzn6rhkl"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; };
   gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; };
   glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; };
@@ -6927,12 +7005,12 @@ in with self; {
   glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; };
   gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
-  glinternet = derive2 { name="glinternet"; version="1.0.7"; sha256="0kvhkhkhf5bmqvhxiz83cqw478s55gbkk3s2csa9bnz8ymkcn3f4"; depends=[]; };
+  glinternet = derive2 { name="glinternet"; version="1.0.8"; sha256="06ak80j01cbrr6s8hmcc734z476rrqzib0xqjgv7c3jbw0api71y"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
   gllvm = derive2 { name="gllvm"; version="0.1.0"; sha256="13ca5ms6bbrj3ny5n438v5ma0d7ccnghysz7c8452cpdq8sn87iy"; depends=[fishMod MASS Matrix mvabund mvtnorm Rcpp RcppEigen statmod TMB]; };
   glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
-  glm_predict = derive2 { name="glm.predict"; version="3.0-0"; sha256="1kqh8g7mrpfnzklk23x7ckbn5p2qcw951cg4s9gnlncggby864ig"; depends=[MASS nnet]; };
-  glm2 = derive2 { name="glm2"; version="1.1.3"; sha256="0mmvba1ccmykm2k02ysjbiqj1lwzdwrbxr1hq1kn1gl97xlarp2x"; depends=[]; };
+  glm_predict = derive2 { name="glm.predict"; version="3.0-1"; sha256="0miba0xha99rmriqs7ifriq86ykn04j04f3ywk29bpph4iwc5faq"; depends=[MASS nnet]; };
+  glm2 = derive2 { name="glm2"; version="1.2"; sha256="09bjqz7zih644hba27illlmzfcs94q5h4fdplg948adi1z790las"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
   glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
@@ -6941,16 +7019,19 @@ in with self; {
   glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
   glmlep = derive2 { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
   glmm = derive2 { name="glmm"; version="1.2.3"; sha256="0cxlcx09a5vypv6kkcfvfjdpz2rnxhay0pjv6q53hdmbshmchbmj"; depends=[digest Matrix mvtnorm trust]; };
-  glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; };
+  glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.2"; sha256="1c4nxm6hv2x9acjss9psnh87ldsrxidnrxn01rjxbmihziyirp0y"; depends=[abind MASS sp]; };
+  glmmEP = derive2 { name="glmmEP"; version="1.0-1"; sha256="0w6q504map1frx7ch2gb7557xmc361lngsw2f80bnrlchj43rdgg"; depends=[lme4 matrixcalc]; };
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
   glmmML = derive2 { name="glmmML"; version="1.0.3"; sha256="1svawi74rfir9czqyf194wmh4fw053n81j7prnanyfskrchkd94k"; depends=[]; };
-  glmmTMB = derive2 { name="glmmTMB"; version="0.2.0"; sha256="1yqizxjapdh0n872d26bdgn8a04xc6647mnjhb40g0jj59qgmxrc"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
+  glmmTMB = derive2 { name="glmmTMB"; version="0.2.2.0"; sha256="1clpkjlmsjmn3m1z5jqv8cgw6bvpqsy4nx6k947r0jya017ny5y5"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
+  glmmboot = derive2 { name="glmmboot"; version="0.1.2"; sha256="0c7in0sq7q1dfgk316j0aizycn8mdpjknf1yfp3d670g3275sx87"; depends=[]; };
+  glmmfields = derive2 { name="glmmfields"; version="0.1.0"; sha256="1b7p1srwavpqm2468n4sxhbm988pxz7zvj76h86fig1jdqf9hlix"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstanarm StanHeaders]; };
   glmmsr = derive2 { name="glmmsr"; version="0.2.2"; sha256="05psf6yjsp3zgh7lfdh2pk1zycp7rgdk61ccm7059f60dzg182b9"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
   glmnet = derive2 { name="glmnet"; version="2.0-16"; sha256="1brr51z1fzbpyj6myyir4g6dhbp6xwl7nx4xnvrjarnf5y0csk55"; depends=[foreach Matrix]; };
   glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; };
-  glmnetcr = derive2 { name="glmnetcr"; version="1.0.3"; sha256="0w04m0q7w5xxm0yv14f2g1ykpy54pxzdplr0xcz9mn43wi4sl65a"; depends=[glmnet]; };
+  glmnetcr = derive2 { name="glmnetcr"; version="1.0.4"; sha256="1fizw48lwhdyzfdmhl1hhcv7pfjf2zm8b96m2hcwm1ckvshf5j76"; depends=[glmnet]; };
   glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; };
-  glmpathcr = derive2 { name="glmpathcr"; version="1.0.5"; sha256="0iygw7nj2bin66dh3jwz7p2nwrrz2lir0nmbgk3a2rv3w982r01q"; depends=[glmpath]; };
+  glmpathcr = derive2 { name="glmpathcr"; version="1.0.7"; sha256="18i0ivvxyirgbp5qjc2av1wanang9pbjimwva448ighad7m2dsqr"; depends=[glmpath]; };
   glmtlp = derive2 { name="glmtlp"; version="1.1"; sha256="01kyw0xipyr9z7x9z41wz7rqargzqd8s8ri34ffdvd3ggrdznl0p"; depends=[glmnet]; };
   glmulti = derive2 { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; };
   glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; };
@@ -6958,7 +7039,7 @@ in with self; {
   globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
   globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
-  globals = derive2 { name="globals"; version="0.11.0"; sha256="17spygv9m3mmn01cfxrm05pvny5ddzvr78c60hixqbfh8385na5c"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.12.1"; sha256="1yfgxnvrd0xnl5ir5835lna3a1zwy0s2apibi270mj5sflrlfwia"; depends=[codetools]; };
   globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; };
   glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; };
   glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
@@ -6973,12 +7054,12 @@ in with self; {
   gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; };
   gmm = derive2 { name="gmm"; version="1.6-2"; sha256="0pbimp4g5hpi949m6dpwwds3a9dv2m4iwwg2gbqq1m62fs18hbxi"; depends=[sandwich]; };
   gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
-  gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
+  gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; };
   gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; };
   gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; };
-  gnFit = derive2 { name="gnFit"; version="0.1.0"; sha256="05hbzxxv8443w51mwpdcdk3gyc9bh8va6i65wydw7msdk69daqxs"; depends=[ismev rmutil]; };
+  gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; };
   gnlm = derive2 { name="gnlm"; version="1.1.0"; sha256="0fv89cvbnp9n3lgg6y4sqmz9jzcgwj7vd92rwg7hixwrjyqpan4z"; depends=[rmutil]; };
-  gnm = derive2 { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
+  gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; };
   gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; };
   gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; };
   gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; };
@@ -6991,41 +7072,41 @@ in with self; {
   goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; };
   goftest = derive2 { name="goftest"; version="1.1-1"; sha256="183imn6dy28ama8bywxgyh32vgakv7bsbz4k5qbhnlhqdvzv2v6v"; depends=[]; };
   goftte = derive2 { name="goftte"; version="1.0.5"; sha256="0mqibs8kpj8qq3wpnlpfdzxx33q77clwli1q7yaxllwzbq0b99hw"; depends=[survival]; };
-  gogamer = derive2 { name="gogamer"; version="0.4.3"; sha256="0p11pxwc4vnmf2hh0zxv99qlqkqiszqawh8scw4v861i8ihp84iz"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp scales stringr]; };
   gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
   goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; };
   gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; };
+  goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; };
   googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.5.0"; sha256="183wywvsfq58yn8hj6kz83c3by36w8knckndwbih2xhxqqqj3cf0"; depends=[assertthat dplyr googleAuthR httr magrittr memoise purrr rlang tidyr]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.6.2"; sha256="14a236yz0610rh98f80prcnc2401zy52rw326wvk11ghl3w1f88z"; depends=[assertthat digest httr jsonlite memoise R6]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="0.6.3"; sha256="035xdqkkf1lcklq3whwld1lnxz830p1kplia7jbb1ay656zknb8x"; depends=[assertthat digest httr jsonlite memoise R6]; };
   googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.4.0"; sha256="1iwn0qjyxyg1xr1s492h7z2g5yzcfw8kasd4ghxmghnqvhzzf7vn"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.2.0"; sha256="1kslsi7gc4na8pm8dyizswf9pfpdq1rprn08rd7kbxsisclbzc7y"; depends=[assertthat future googleAuthR httr jsonlite]; };
-  googleLanguageR = derive2 { name="googleLanguageR"; version="0.1.1"; sha256="1r601s81dm18wb44r65ssx9kxdj849caykzpvwba1bk1xvpp4fni"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; };
-  googlePolylines = derive2 { name="googlePolylines"; version="0.4.0"; sha256="041dmsi938y47287hdv30c99d8rxjwdc12d7s29shghh64h96y50"; depends=[BH Rcpp]; };
+  googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; };
+  googlePolylines = derive2 { name="googlePolylines"; version="0.6.1"; sha256="1g28py8amkfq8cgf297w9yv1n26wm2alb6gmcal3i39qfadkdhsv"; depends=[BH Rcpp]; };
   googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; };
   googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; };
   googleVis = derive2 { name="googleVis"; version="0.6.2"; sha256="1idnp9ndgg2dwybdpw7q3pkaw9kw2vy2xkls9qykrpz1p6nf3mn1"; depends=[jsonlite]; };
   googledrive = derive2 { name="googledrive"; version="0.1.1"; sha256="1fshv85s4ldw2kc7lbbdvrl260pz76z04awx1n6lg0f5xmba9rfg"; depends=[curl glue httr jsonlite purrr rlang tibble uuid]; };
   googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; };
-  googlesheets = derive2 { name="googlesheets"; version="0.2.2"; sha256="18q0xmxn09b52rmky7gr5flp0awndcnsgb7zcvkzvkrkvmwad52b"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr xml2]; };
-  googleway = derive2 { name="googleway"; version="2.4.0"; sha256="176jmwnn6k8w6078jcq9b4pzix70sbs118g28jpi4in4sznr1dvg"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr Rcpp scales shiny viridisLite]; };
-  goric = derive2 { name="goric"; version="0.0-95"; sha256="05sbsnjjlpy1z0mfbsrihrp2gp4d66cvprhgzxy76lipgm5mmvqi"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
+  googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; };
+  googleway = derive2 { name="googleway"; version="2.7.0"; sha256="129yyy21sdbhhffg23jkhs0d6f03di4da5mwgg8x8ckv7r9jraw8"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; };
+  goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
   gower = derive2 { name="gower"; version="0.1.2"; sha256="1mbrj1lam3jfbby2j32shmmj5cn09zx3rkxbamq7q8sdg39b54gb"; depends=[]; };
   gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; };
   gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
   gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
   gpg = derive2 { name="gpg"; version="0.5"; sha256="1l13wwmhayyhgl2m3r5f5p3m3y3z3pcj38liywx6a24hpxmir7pp"; depends=[curl]; };
-  gphmm = derive2 { name="gphmm"; version="0.99.0"; sha256="0qn1z9pc8gzq63iwvjibaha525abjg45qp01nx3ggsrr4hm9xm69"; depends=[Biostrings docopt dplyr Rcpp stringi stringr]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
   gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; };
   gplots = derive2 { name="gplots"; version="3.0.1"; sha256="02nb8n3s7c1zxq2s7ycaq2ys72y7mzirxrwj954h6gdc4x1zhg9l"; depends=[caTools gdata gtools KernSmooth]; };
   gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; };
+  gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; };
   gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
   gpuR = derive2 { name="gpuR"; version="2.0.0"; sha256="1aq9gmnl69yw7124nr8jaih7598gkknp7krmdsnx600i4k37yzjs"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
   gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; };
   gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; };
-  grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
+  grImport = derive2 { name="grImport"; version="0.9-1"; sha256="1qhyw5wiyfqw1wcpvcgdwc1vgaz7j7dbc7qa5h85qgml7hb68mjv"; depends=[XML]; };
   grImport2 = derive2 { name="grImport2"; version="0.1-4"; sha256="1hwx287pp936f0wbcicplwmhz96ip00wq09dp7bvz80lqcmr8nyx"; depends=[base64enc jpeg png XML]; };
   gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
@@ -7036,23 +7117,23 @@ in with self; {
   grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
   graphTweets = derive2 { name="graphTweets"; version="0.4.0"; sha256="1zw04s61wjgrx6r6fspp59y5l3bfjf68klcrkp7alaap5dpjsn9a"; depends=[dplyr igraph magrittr purrr reshape2 rtweet splitstackshape]; };
   grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; };
-  graphframes = derive2 { name="graphframes"; version="0.1.0"; sha256="1h7dng6j2wizr14sl3f9lpvka56vd40rjs6skfdyxbn5s8ijmdd8"; depends=[sparklyr tibble]; };
-  graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.1"; sha256="1z4x32ji71rq1x89r3wmjhm1fq7klggpz6c1cf45fvcd9qs6ykhk"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
+  graphframes = derive2 { name="graphframes"; version="0.1.1"; sha256="1qharg73aaw5xdvkngsxb9wzsgb4xc067cxm20d9yiz4qm7a9050"; depends=[sparklyr tibble]; };
+  graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
-  graphkernels = derive2 { name="graphkernels"; version="1.4"; sha256="1dwk1bd2nx9kdzxq31cgynd75r7am49ygkaryb6iqcmva1wc5xs0"; depends=[igraph Rcpp RcppEigen]; };
+  graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; };
   graphon = derive2 { name="graphon"; version="0.2.0"; sha256="0fdvi2nn7g39mc85jg3rgwyk2wjh2k60pd9lyivfbg3140k1yawh"; depends=[ROptSpace]; };
   graphql = derive2 { name="graphql"; version="1.4"; sha256="103vggx9273dg4fkrhik4p1vj8qh7gxavyh933qxhajpmhnfhksh"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
-  grattan = derive2 { name="grattan"; version="1.5.3.7"; sha256="0lvmypw77za3nafq6mqasfhbhci59mq7cia9y988czs9fs9l3858"; depends=[assertthat data_table fastmatch forecast hutils magrittr Rcpp rsdmx zoo]; };
+  grattan = derive2 { name="grattan"; version="1.6.0.0"; sha256="0w8dqnj8di3fm2vp1bz2wdyh207rh9vwqc25mhxg73jjmls8rd33"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; };
   gravity = derive2 { name="gravity"; version="0.6"; sha256="15ngk6a5f6xjvisk6ma625iaw4ybg7722xgmnr4rnlmsgm95v668"; depends=[censReg glm2 lmtest MASS multiwayvcov sandwich survival]; };
-  grec = derive2 { name="grec"; version="1.1.1"; sha256="1qn1vbhlw42wqg9vj5plb12pg9xskn32z27ifyzm4kggp1vckgbf"; depends=[imagine raster]; };
+  grec = derive2 { name="grec"; version="1.2.0"; sha256="1djmi5nm4xdxzyikll3wcgfabqr952qqlyxad8frvxy878a85fpw"; depends=[imagine raster]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
   greta = derive2 { name="greta"; version="0.2.3"; sha256="10vli747b5a1m53qszxk91wppg9511la9yc823qrr51s92z8i222"; depends=[coda progress R6 reticulate tensorflow]; };
-  grex = derive2 { name="grex"; version="1.7"; sha256="0bciyafqwx404axidz4dlj856mzy73ij5sifxhvbjnn07rx844c9"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.2.0"; sha256="0d0d1c5whh94n678p07fnwn2xaqgv54qp1k1rkis72dgs8jbzm2n"; depends=[forecast zoo]; };
+  grex = derive2 { name="grex"; version="1.8"; sha256="0z81dlzk5vv51nwhfiijzpxgf71m4fsrfqzrbxx2kyf3f8c9xg1r"; depends=[]; };
+  greybox = derive2 { name="greybox"; version="0.2.2"; sha256="1kgxcg9502gn766p4qvdbixi25gc81xg49wlzv02gcsqf2nzrl1c"; depends=[forecast lamW]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
-  grf = derive2 { name="grf"; version="0.9.6"; sha256="0gv1zphjgwqssiljyqhhv6ggnvw9nyg7wf7sasilpy59qpi457wv"; depends=[DiceKriging Matrix Rcpp RcppEigen sandwich]; };
+  grf = derive2 { name="grf"; version="0.10.0"; sha256="1pfpgnnzqasai797kizmpv4sgr0i38amppmqwba22rs5mrz72c9w"; depends=[DiceKriging Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; };
@@ -7062,12 +7143,14 @@ in with self; {
   gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
   gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
-  groc = derive2 { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[MASS mgcv pls robust robustbase rrcov]; };
-  grofit = derive2 { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
+  groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; };
   gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; };
+  groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; };
   groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
   groupdata2 = derive2 { name="groupdata2"; version="1.0.0"; sha256="11j5p3afr5qc227ljdwwwp17jzaylqlhc7g0gr3jvgrhjnijs2a0"; depends=[dplyr numbers plyr]; };
   grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
+  groupedSurv = derive2 { name="groupedSurv"; version="1.0.3"; sha256="15ah8v1mfyq9xi27kkl0vwwbhf16vd4hy9h809jlw1i7b1zwg4pm"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; };
+  groupedstats = derive2 { name="groupedstats"; version="0.0.1"; sha256="19rdn86zzv40f0ha0q043wj538scbj1x2j80bwllcbl78cmpq3i3"; depends=[broom crayon dplyr glue magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
   groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; };
   growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; };
@@ -7076,16 +7159,16 @@ in with self; {
   growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; };
   growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
   growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; };
-  growthrates = derive2 { name="growthrates"; version="0.7.1"; sha256="0ci846jgshnvrvifl8snyax8ljs9n13lr42mzm89l0gpkg6lh2g0"; depends=[deSolve FME lattice]; };
+  growthrates = derive2 { name="growthrates"; version="0.7.2"; sha256="1szyc85gi0wgg98br53lxqpamic1srvfiyq1m818j38xnlyj1lxw"; depends=[deSolve FME lattice]; };
   grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; };
   grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
-  grpreg = derive2 { name="grpreg"; version="3.1-3"; sha256="0i5gxhjylva3aby933hydkdb8v842qfa4jgfs0pwim8xfr2ipjs7"; depends=[Matrix]; };
+  grpreg = derive2 { name="grpreg"; version="3.1-4"; sha256="0lxr83imsg3g9nk2cmvmg6mying23f05f5q2xniiqvayrd7i4ii9"; depends=[Matrix]; };
   grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; };
   grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; };
   grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; };
   grt = derive2 { name="grt"; version="0.2.1"; sha256="1dw5rjs82r82l6qryyyq9cczm770v4iv60d7pi1nb4b0733ndbd5"; depends=[MASS]; };
   gsDesign = derive2 { name="gsDesign"; version="3.0-1"; sha256="0cixg176ihbkwkcllabr2klc15cssdnfzwklf0q1wd23lmv6aj43"; depends=[ggplot2 plyr xtable]; };
-  gsEasy = derive2 { name="gsEasy"; version="1.1"; sha256="1g68v51wpgb0fq4nb3q4b9hv34f12dlcp6115css7748imz9p99q"; depends=[ontologyIndex Rcpp]; };
+  gsEasy = derive2 { name="gsEasy"; version="1.3"; sha256="00471kfjb6zw3n4nbx3a91xjn748hw3xpl9pq5sgbrf6xg9gcf7c"; depends=[ontologyIndex Rcpp]; };
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
   gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
   gsbDesign = derive2 { name="gsbDesign"; version="1.00"; sha256="1kbwlpxbr70aagx9jkap9xlw13r1k3y630b08wmmny421sv4zhxl"; depends=[gsDesign lattice]; };
@@ -7098,7 +7181,7 @@ in with self; {
   gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
   gsrsb = derive2 { name="gsrsb"; version="1.0.3"; sha256="1r4pc3zcmgwxbsmpwb6m24mmy0p78nq35bigjqvwcc32imyw4ls9"; depends=[ldbounds mvtnorm xtable]; };
-  gss = derive2 { name="gss"; version="2.1-8"; sha256="1g44214kbgx4gafcz482iyy3izzv2cfp6v6yqfggp6lkvn6wwv0p"; depends=[]; };
+  gss = derive2 { name="gss"; version="2.1-9"; sha256="1wscgj344szz8ry6p2kf1hgdgifzn5phs1z1p3kkzfykq5hzwq99"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
   gstat = derive2 { name="gstat"; version="1.1-6"; sha256="0snvga824v1kbd3xp46652bv6drfrgkjsi5zrbdcliqpqz79wk9f"; depends=[FNN lattice sp spacetime zoo]; };
   gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; };
@@ -7110,13 +7193,15 @@ in with self; {
   gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
   gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
   gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; };
-  gtools = derive2 { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
+  gtools = derive2 { name="gtools"; version="3.8.1"; sha256="0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
   gtrendsR = derive2 { name="gtrendsR"; version="1.4.1"; sha256="08zfh73viv9p1c4qmw3jnywa5xzbm39kfi60whl0w5pvh3q9pksf"; depends=[anytime curl ggplot2 jsonlite]; };
+  gtsf = derive2 { name="gtsf"; version="0.1.0"; sha256="11b1rgqzyywpk0qjm575l98irbifgkdlfhhynccils5y8f7vyhf8"; depends=[assertthat dplyr magrittr readr rlang sf stringr tibble]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
   gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
   gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
+  gustave = derive2 { name="gustave"; version="0.3.0"; sha256="1vijf5x07l507r0li6hs0hhxia83llpykllcrkhm00ms5na7p4jz"; depends=[MASS Matrix]; };
   gutenbergr = derive2 { name="gutenbergr"; version="0.1.4"; sha256="1xf9h0ikfzgq6bzzxa7wih29cgbfk6lgdv041fprxbd9rz38agi9"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
   gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; };
   gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; };
@@ -7129,22 +7214,21 @@ in with self; {
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
   gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; };
-  h2o = derive2 { name="h2o"; version="3.16.0.2"; sha256="181rm5y7wwmpzi45sy62blr6jk9wfbs3j14ansmh7ad1rbml3zm3"; depends=[jsonlite RCurl]; };
+  h2o = derive2 { name="h2o"; version="3.20.0.2"; sha256="1pchml5d8py4cnii5lmmw65cglixvgwgvl592kl3ix09w34grsps"; depends=[jsonlite RCurl]; };
   h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; };
   h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; };
   hBayesDM = derive2 { name="hBayesDM"; version="0.5.0"; sha256="174z98jvi04df04lpdxh3j8lmjvgrg287nxfnrcvjkibc0jiss4m"; depends=[ggplot2 loo Rcpp rstan rstantools]; };
   hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; };
-  hNMF = derive2 { name="hNMF"; version="0.5"; sha256="1nm9sy921fjzqc60p0mf6k0j5a56bdrd8hnghnpaqzs244mm08bj"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
+  hNMF = derive2 { name="hNMF"; version="0.6"; sha256="0a6wf9mhv3b7wb8kimjqm1sj9k8d2j98p7i707bgn5hvmyc39bnf"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
   hR = derive2 { name="hR"; version="0.1.3"; sha256="0s7c2aiq58c2zmv25m42cxp5chzkp5grz5bjqrknfkwjy21679h1"; depends=[data_tree reshape2]; };
   hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
-  hamlet = derive2 { name="hamlet"; version="0.9.5-2"; sha256="1fj7bqn6g127kan4l1pnv0qvzsgxqiixjaf3yn0g3cwawyzqixmv"; depends=[]; };
+  hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; };
   hansard = derive2 { name="hansard"; version="0.6.0"; sha256="13h68b300c4lkqbl5gw4hkqcbb2ikvan4hx8092ds995514rg4x8"; depends=[dplyr httr jsonlite lubridate stringi tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
-  haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
   haplo_stats = derive2 { name="haplo.stats"; version="1.7.9"; sha256="19kxascqq5qz0zdxx0w837ji207y1z2ggxkl4vmlbay03k2dw2mx"; depends=[rms]; };
-  haploR = derive2 { name="haploR"; version="1.6.2"; sha256="0xzh18170gxxd91yjvh2j3a8jkkz8hyf5rbvh4c9vfi5zirbi82z"; depends=[httr plyr RUnit tibble XML]; };
+  haploR = derive2 { name="haploR"; version="2.0.3"; sha256="0m2pqrg1734x2ab19dqf5mqgrzibd2l5g6800if0a92bi51q67bx"; depends=[DT httr plyr RUnit tibble XML]; };
   haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; };
   haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; };
   haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; };
@@ -7159,8 +7243,9 @@ in with self; {
   hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
   hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
-  haven = derive2 { name="haven"; version="1.1.1"; sha256="1fkcvsrnw8waqwggv0aydbvbi99x5kp9g78xfxj4w6s3xvdzcysz"; depends=[forcats hms Rcpp readr tibble]; };
+  haven = derive2 { name="haven"; version="1.1.2"; sha256="0pp8xjf5lzqg1wr8cwxj4njx99vxwlflwjrd7jvyzwlfpwh7n1qa"; depends=[forcats hms Rcpp readr tibble]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
+  hazer = derive2 { name="hazer"; version="1.0.1"; sha256="1k108i65rwkbq4nz9b5rqi7a9cclbvjf1afzxb1kk6jx28kzkawg"; depends=[]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
   hbdct = derive2 { name="hbdct"; version="1.0.1"; sha256="1lmbhl757hdswfq3skwbwsgxpfgim8475d9hk511dbwrzcm6wsxr"; depends=[]; };
   hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
@@ -7171,43 +7256,44 @@ in with self; {
   hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; };
   hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; };
   hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; };
-  hddplot = derive2 { name="hddplot"; version="0.57-5"; sha256="01ljwb4glignq78gpm3n8ap8ws1ss7ibdy7ybdvhnm5zj6nnvjpp"; depends=[MASS multtest]; };
-  hdeco = derive2 { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
+  hdbinseg = derive2 { name="hdbinseg"; version="1.0.1"; sha256="0fy9cqrygsnxkb3nxg56md19svrvkbijpxkqfk9p18cj5ibwrq94"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
+  hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; };
   hdf5r = derive2 { name="hdf5r"; version="1.0.0"; sha256="1s6p4cj909kc635fh5xpl87bqlcdj3dn3r1wk5g40abimk2b0pva"; depends=[bit64 R6]; };
   hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
   hdm = derive2 { name="hdm"; version="0.2.3"; sha256="0nj7pbkygzbiraw1b3pqv3bnkjhi1a0h48q0zgkcq8y79kj2f8cl"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
-  hdme = derive2 { name="hdme"; version="0.1.1"; sha256="0p8qldiiqbd2vyxyrgz0dsh7n2dw5vbvqfqy6z5vkjl52wdggp7z"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; };
-  hdnom = derive2 { name="hdnom"; version="4.9"; sha256="11yzjfp6b4apn0nyqmi0qm5rd8xy49w6hwwiq7p566mxqy32i2j2"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
+  hdme = derive2 { name="hdme"; version="0.2.0"; sha256="03fmn7yxgx56329923pzqkjfrdg0aw2i7jj1sdf0cphzmi7m426n"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack]; };
+  hdnom = derive2 { name="hdnom"; version="5.0"; sha256="0g7l5km18j11qfw8iq9ybl8lzdq6fk2g7cjc2yjsm3ava60n4xqh"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
   hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; };
   hdrcde = derive2 { name="hdrcde"; version="3.2"; sha256="1901mg2k2ch9fzn1n9k0kmxkgd1m4pxvrda7mv0mp64nf4mx43xw"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; };
   hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; };
-  healthcareai = derive2 { name="healthcareai"; version="1.2.4"; sha256="0ksanvwfdz8xdfqdkjb4i65q7x9jdrjl4z4qwsff16zfg6sj7q2c"; depends=[caret data_table DBI doParallel dplyr e1071 ggplot2 grpreg lme4 odbc pROC R6 ranger ROCR RSQLite xgboost]; };
+  healthcareai = derive2 { name="healthcareai"; version="2.1.0"; sha256="1bzlgdf3gfgayw0axiwhbm9x2rqfyibkwymw2mm28fdz65r4n73i"; depends=[broom caret cowplot data_table dbplyr dplyr e1071 ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang stringr tibble tidyr xgboost]; };
   heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; };
-  heatmaply = derive2 { name="heatmaply"; version="0.14.1"; sha256="03p2caclhfgqgpx3wwck5h06jy3mxgs05gjmwkb7hmwghkjh41jc"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
+  heatmaply = derive2 { name="heatmaply"; version="0.15.0"; sha256="0314nmlfwvgb9xmfvnw15l4is59dq1yq8i9461bykhj26jppyib2"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
+  heatwaveR = derive2 { name="heatwaveR"; version="0.3.0"; sha256="1pfbhjnky0403hwjy29ady4q41vsgk3m3mwdki5ybkp9hx0c3zm3"; depends=[data_table dplyr ggplot2 lubridate Rcpp RcppArmadillo RcppRoll tibble zoo]; };
   heavy = derive2 { name="heavy"; version="0.38.19"; sha256="15bg2qqkslkqfnsq3ixbgmq72xagh8laji0265l06xgf2l6045kx"; depends=[]; };
   heemod = derive2 { name="heemod"; version="0.9.2"; sha256="0qln5c4m11vxpsa0l07qrzs006b05hsl342pc5dgz0hwdpn5dd9j"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; };
   hei = derive2 { name="hei"; version="0.1.0"; sha256="1cvwdkm5c9p3cfgpgdj0r7222mzz1jghq2i5f20xh3786gx05sqd"; depends=[nhanesA]; };
   heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; };
-  helixvis = derive2 { name="helixvis"; version="0.2.0"; sha256="02ypsh6qjbdcnvj4bh71ghc9igsp50sj2dvc0qvk6nlbdg7cfhlz"; depends=[rJava]; };
+  helixvis = derive2 { name="helixvis"; version="0.9.1"; sha256="1xc55wyky3gnbs4gkmn1v74vgj4azriwlyd4psmc644w0rnajfjc"; depends=[plotrix]; };
   hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
   helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
   helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
   heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; };
   here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; };
-  hergm = derive2 { name="hergm"; version="3.2-0"; sha256="0yy684vjlk06r0bsx7clpjaj05q0pmbj006kbh9q6rysh35nf9p3"; depends=[ergm latentnet mcgibbsit network sna]; };
+  hergm = derive2 { name="hergm"; version="3.2-1"; sha256="0r59qkbcqvsw7pcpas636crrj710j61swjknyr5vm22da90wzj1v"; depends=[ergm latentnet mcgibbsit network sna]; };
   heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
-  hermite = derive2 { name="hermite"; version="1.1.1"; sha256="0ns8l1rf346qxalfdwc7ny0kjp212f6qnnlgillpyvd8k29kg8iy"; depends=[maxLik]; };
+  hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
   hesim = derive2 { name="hesim"; version="0.1.0"; sha256="002phncl1glv3c3gwp9ifpk56j06rka26a3774xlj3zcs6izglns"; depends=[data_table Rcpp RcppArmadillo]; };
   het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
   hetGP = derive2 { name="hetGP"; version="1.0.2"; sha256="0dffkn11pm1x5jafc7yzy0jh4c2qqipfzhw205qiqxk5gny185k8"; depends=[DiceDesign MASS Rcpp]; };
   hetmeta = derive2 { name="hetmeta"; version="0.1.0"; sha256="023bdjsv0ibisz47vaap9yamzjna4hhndk3haw2g1cm92wnrdra5"; depends=[metafor]; };
-  hett = derive2 { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[lattice MASS]; };
+  hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; };
   heuristica = derive2 { name="heuristica"; version="1.0.1"; sha256="1myivlqw6a8wh97ma9lrpgvaqb0vn4kj8yp9r4z5vc4pxgmm48g6"; depends=[Hmisc]; };
-  hexSticker = derive2 { name="hexSticker"; version="0.4.3"; sha256="0f3zm6z0gsq2ps5zv0z4d8z6v5ncgpamnpl8a9l022klqifkg6x1"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
+  hexSticker = derive2 { name="hexSticker"; version="0.4.4"; sha256="0djrf0kgjndvvqc6bd6agbfwd790axv2jycd38in9lsn8fzhxnb7"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
   hexView = derive2 { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; };
   hexbin = derive2 { name="hexbin"; version="1.27.2"; sha256="0lpfl0015lg5x7lvv9dr302bca22c7fs91pnd896ypgpzqg7pm26"; depends=[lattice]; };
   hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; };
@@ -7238,63 +7324,63 @@ in with self; {
   highlight = derive2 { name="highlight"; version="0.4.7.2"; sha256="0xc1akglgby3qd6c9y2rhcd0gpfihx5jvakji38vzlxb1m21sn10"; depends=[]; };
   highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
-  highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; };
+  highr = derive2 { name="highr"; version="0.7"; sha256="1dzknqk4x7iiiq1jkh9bqm5qcvs7mbqxbkn5955050payavabfya"; depends=[]; };
   highriskzone = derive2 { name="highriskzone"; version="1.4-2"; sha256="1q9y34nj73kg5y6qy4kb023vyzbdb0f6x23asq20bj5pmz2l25y1"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; };
   higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
   hisse = derive2 { name="hisse"; version="1.8.5"; sha256="1lhxj0cz3sdidpafll64fg1797y0472yxcr21dp2b83qbygkwfgl"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; };
-  histmdl = derive2 { name="histmdl"; version="0.6-1"; sha256="0vgfy49hrjcm3f8l2hb0fbn1ydh94g4xq2s116yf2c9pd0pwsbi1"; depends=[]; };
+  histmdl = derive2 { name="histmdl"; version="0.7-1"; sha256="0k6l3pfjzlgpxv55vy8dg4sl8zhh0460xcfszwp2k9sbzanwaamp"; depends=[]; };
   histogram = derive2 { name="histogram"; version="0.0-24"; sha256="1jihw92zi5a4dj6lzm1qvkynv9fp6j5iy83g8rzikp276x63nb62"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
-  histry = derive2 { name="histry"; version="0.1.2"; sha256="1m9zpqwzq7sqv4wpj2xxf0ndvz3cqk3bi8xq9n75z6b8q2lr74j8"; depends=[evaluate fastdigest]; };
+  histry = derive2 { name="histry"; version="0.2.2"; sha256="0l8rf0l8rq28z1afrkywf4j9q2i2i3x1njs3h42f6b7jc0rnj8vm"; depends=[CodeDepends evaluate fastdigest roprov]; };
   hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; };
-  hitandrun = derive2 { name="hitandrun"; version="0.5-3"; sha256="0cmn8rzgksnygqwa5pngbdc6pds3kxx4y7mq3mg3xk1vys9b6r4n"; depends=[rcdd]; };
+  hitandrun = derive2 { name="hitandrun"; version="0.5-4"; sha256="1cw6ya690ls7i07zbdjr27vlhww2d3c3ws3z7m20bfmwxb1pm3vz"; depends=[rcdd]; };
   hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
   hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; };
   hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; };
   hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
-  hmi = derive2 { name="hmi"; version="0.9.10"; sha256="1swbzxykf4mwgahadi5l1xy06h4ivpc4gq3izshg6fvgrapbg1r5"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; };
+  hmi = derive2 { name="hmi"; version="0.9.13"; sha256="0rxxrx5ckjzj2wqdx05mihj86v0npj99q2n7zz9d44wncvnzz9g9"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; };
   hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; };
   hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; };
   hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; };
-  hnp = derive2 { name="hnp"; version="1.2-4"; sha256="14w2n95pgi5h71fag4ndrc82z7q26za99vj5z99rv19l5jkvmd46"; depends=[MASS]; };
+  hnp = derive2 { name="hnp"; version="1.2-6"; sha256="12cbc353ipr2rcc93skf1766g38j1pvpdkqk3cswv0cxsjl2x7pl"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; };
   hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; };
   hoardr = derive2 { name="hoardr"; version="0.2.0"; sha256="13bjycnr1v524c5wxigdd3kn8bx1sgwdqb10hbmbyjxffabacafr"; depends=[digest R6 rappdirs]; };
   hogsvdR = derive2 { name="hogsvdR"; version="0.1"; sha256="0ji4j9fzwnacdqbzrj5zphak5nsin7vcja15w48fik8hv5w6qs46"; depends=[MASS Rcpp RcppArmadillo]; };
   holdem = derive2 { name="holdem"; version="1.2"; sha256="0mcb4civ4p7apm7kfl88apvb4yznsmn4hggfggmjhs046g6bi2p7"; depends=[]; };
-  homals = derive2 { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; };
+  homals = derive2 { name="homals"; version="1.0-8"; sha256="0gad0jmflw5zmzf9hk5qqmxxpbncm9gngsi24i3rgiz7565kli1r"; depends=[ape rgl scatterplot3d]; };
   homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; };
   hommel = derive2 { name="hommel"; version="1.1"; sha256="1vrfw3zxj6hlfr5czrhmx67bjbd94whfgdmsdzlmdpmj0w5r0naz"; depends=[Rcpp]; };
   homologene = derive2 { name="homologene"; version="1.1.68"; sha256="0i2ywr3rxryakp7qskgjc0pll9nskwngk5m2d2jikxxq2biqf5zj"; depends=[dplyr magrittr]; };
   homomorpheR = derive2 { name="homomorpheR"; version="0.2-1"; sha256="0qs4yimyfqx6rpxgh6h4z7vyb3qdxljnyvw1g8pxm4y75i0v6vz5"; depends=[gmp R6 sodium]; };
   homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
   hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; };
-  horizon = derive2 { name="horizon"; version="1.0"; sha256="1wrp5qr1qql21xwcjh415q67z2ym4790zfp0n81360v6bp2b3hyy"; depends=[raster]; };
+  horizon = derive2 { name="horizon"; version="1.2"; sha256="0b8m9ghfabjgdl155wh4gc4ng2lsvyfyhsy62pldbcix757b4ck9"; depends=[raster]; };
   hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
   horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; };
   horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; };
   hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; };
   hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; };
-  hotspots = derive2 { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[ineq lattice]; };
+  hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; };
   housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; };
   howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
   hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
   hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
   hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
   hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
-  hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; };
-  hsdar = derive2 { name="hsdar"; version="0.7.0"; sha256="09yx8zc9qbf2kj8k76z9a6rhh5zy4ggsxvwhx35666phdml42dy0"; depends=[caret raster rgdal signal]; };
+  hrbrthemes = derive2 { name="hrbrthemes"; version="0.5.0"; sha256="0bayblwwf4fwjc21c7zhdipvfxycfil4xkja0dirvvhk5zwszgnx"; depends=[extrafont ggplot2 htmltools knitr magrittr rmarkdown scales]; };
+  hsdar = derive2 { name="hsdar"; version="0.7.1"; sha256="1bjcgkqhjcrysyh0l1w3r1zzmv3sdlb7xzxdc504z1viy1ayh6ly"; depends=[caret raster rgdal signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
   hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
   hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
   htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
   htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; };
-  htmlTable = derive2 { name="htmlTable"; version="1.11.2"; sha256="1lbpi0kkk8b41w10scmlf27dg5azcv51a4q3p5bpqyphrnqp78k4"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
+  htmlTable = derive2 { name="htmlTable"; version="1.12"; sha256="1n5136vb7mi4rxl5jgwdmdhn4mwv2pcqyw2mrj406ih4hy6hpxa2"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; };
   htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
   htmltidy = derive2 { name="htmltidy"; version="0.4.0"; sha256="090rj1fzdsa8m4g33d4mx92dm8afh173i4hqa4zym8c909jwh9qn"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; };
@@ -7306,8 +7392,8 @@ in with self; {
   httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; };
-  httptest = derive2 { name="httptest"; version="3.0.0"; sha256="1k75i84ajka0abc8x51w74dldb0z9i08dlqbkcdby25465k01l8r"; depends=[digest httr jsonlite testthat]; };
-  httpuv = derive2 { name="httpuv"; version="1.4.0"; sha256="076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m"; depends=[BH later promises Rcpp]; };
+  httptest = derive2 { name="httptest"; version="3.1.0"; sha256="1r0grzlblyri526a3pp2n8v9zf23kf41i6kl64qmkrq1bamr0m17"; depends=[digest httr jsonlite testthat]; };
+  httpuv = derive2 { name="httpuv"; version="1.4.4.2"; sha256="03lc8j98c6fx9g431is0q5zm4y4phjg99h7w6y6c38cjg7kphr72"; depends=[BH later promises Rcpp]; };
   httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; };
   hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
@@ -7315,21 +7401,21 @@ in with self; {
   humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; };
   humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; };
   humanleague = derive2 { name="humanleague"; version="2.0.2"; sha256="1svsqfqisywf0iqf3mrh4xnssvjmml6wn7l8iq5shvpmw71l4nnl"; depends=[curl Rcpp]; };
-  humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; };
+  humidity = derive2 { name="humidity"; version="0.1.4"; sha256="1nnrjk9wjvp28s615xd9wllnwv4js3kg7rj2f6al3sk3vhiqljsk"; depends=[]; };
   hunspell = derive2 { name="hunspell"; version="2.9"; sha256="10186544s6nyd2ba470idxrxsl788dkmr1g1ri8x2n1lky9zmrik"; depends=[digest Rcpp]; };
   hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
-  hutils = derive2 { name="hutils"; version="1.0.0"; sha256="0s30wiyn8j37hi4lzs1w1lcvg8dskmbi4z396wpq3ixjvna0cfxv"; depends=[data_table fastmatch magrittr]; };
-  huxtable = derive2 { name="huxtable"; version="3.0.0"; sha256="0vb596x9c6hhnrdpqvj0x8fawaizn9yhqp8b6i13n93synyv93gy"; depends=[assertthat dplyr glue htmltools knitr lazyeval rmarkdown stringr tibble tidyselect]; };
+  hutils = derive2 { name="hutils"; version="1.1.0"; sha256="05vywa9lgnpvrkly5mbc4wlxc5v7cz58zgm6wynbxpc58m6smi73"; depends=[data_table fastmatch magrittr]; };
+  huxtable = derive2 { name="huxtable"; version="4.0.1"; sha256="1z93py9nnfpvqkackgxvr2pnd642zcvqks9x01m4nh6dsbh52bs7"; depends=[assertthat dplyr glue htmltools knitr rmarkdown stringr tibble tidyselect]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
   hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
-  hybridModels = derive2 { name="hybridModels"; version="0.2.15"; sha256="1qq466cjs1q2rz76npc6cs4rknfc6aal9q64548iv223fq16zq8z"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; };
+  hybridModels = derive2 { name="hybridModels"; version="0.3.5"; sha256="0bg065j3y3xwxlib9i78pa0ghlblyp4qq1kmh3j02w8xi00rnrs6"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; };
   hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
   hydroGOF = derive2 { name="hydroGOF"; version="0.3-10"; sha256="010f2i53rl4fjl65fg5wzaci0kc5khpak5v1zz9yxsj77fmrmvfy"; depends=[hydroTSM xts zoo]; };
-  hydroPSO = derive2 { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
+  hydroPSO = derive2 { name="hydroPSO"; version="0.4-1"; sha256="0ic43rpcr9n7fjyvw7n57pm9lhqk09pi7lg2nvngj2fg4y8288jb"; depends=[Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; };
   hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; };
   hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; };
   hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; };
@@ -7338,14 +7424,15 @@ in with self; {
   hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
   hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; };
   hyper2 = derive2 { name="hyper2"; version="1.0-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; depends=[partitions Rcpp]; };
-  hyperSpec = derive2 { name="hyperSpec"; version="0.99-20171005"; sha256="0rhn9f4faxscwrip14ndymaddc5nfd6pyrhgwkwm8hf680wdrhbl"; depends=[ggplot2 lattice latticeExtra testthat]; };
+  hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; };
+  hyperSpec = derive2 { name="hyperSpec"; version="0.99-20180627"; sha256="12bgp3nm9mwi5w3v8a9fnm4a2cxid3la0r3sxs10azikn5yw0ib5"; depends=[ggplot2 lattice latticeExtra lazyeval testthat XML]; };
   hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; };
+  hypergate = derive2 { name="hypergate"; version="0.7"; sha256="02i8aywpdp0daxqrqnxfp2xk60jby268c064lcbggjb9nbm04q0m"; depends=[lattice]; };
   hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; };
   hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; };
   hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; };
-  hypervolume = derive2 { name="hypervolume"; version="2.0.8"; sha256="003r5x9w5fvx2z8ysadx0bihz521ndizi14x8z69hvg5g74xwz84"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
+  hypervolume = derive2 { name="hypervolume"; version="2.0.10"; sha256="16q2h42c2q4b6hq5h6lkxgwizdln1nbq1l7n5f226zjlfrvgk8fx"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
   hyphenatr = derive2 { name="hyphenatr"; version="0.3.0"; sha256="0mv77njy0ha7bj3kw620fk9r8cdzqd0v3ipikihqxq47fr57ml0v"; depends=[Rcpp stringi]; };
-  hypoparsr = derive2 { name="hypoparsr"; version="0.1.0"; sha256="1bldiz5j6h9z499wwz8cbg5vshdmxgcd8qfxkz1a45q8b6nsd4vf"; depends=[data_tree readr RecordLinkage tibble]; };
   hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
   hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; };
   hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; };
@@ -7363,7 +7450,6 @@ in with self; {
   iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
   iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; };
   iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; };
-  iJRF = derive2 { name="iJRF"; version="1.1-4"; sha256="1fgbc0z647vwybffzp4iips86pxakd25dlk5jqgm049s6pa8m73v"; depends=[ggplot2]; };
   iMRMC = derive2 { name="iMRMC"; version="1.1.0"; sha256="04wpqdds5vfqvl8n5g64vnyh4a40dxjh8l1bgw1vdz1372n0421g"; depends=[]; };
   iMediate = derive2 { name="iMediate"; version="0.4"; sha256="0pwvzd0k9m2jd7sizl436vs63rg9yinisrb0flz34yj5avn6rmb0"; depends=[mediation mvtnorm plotly]; };
   iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; };
@@ -7373,43 +7459,44 @@ in with self; {
   iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; };
   iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; };
   iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
-  iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
+  iRepro = derive2 { name="iRepro"; version="1.1"; sha256="1sqg1n83m1308v6bk8ilra8w01frqyd8vpvmv63rllxz38r3vyhz"; depends=[]; };
   iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; };
-  iTOP = derive2 { name="iTOP"; version="1.0.1"; sha256="1cjrbjrpfm27widw466kgkl5xlbyjf7ipk8ki8mfn3lqp9r2f3rc"; depends=[corpcor Matrix]; };
+  iTOP = derive2 { name="iTOP"; version="1.0.2"; sha256="1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47"; depends=[corpcor Matrix]; };
   iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; };
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; };
-  ibd = derive2 { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; };
+  ibd = derive2 { name="ibd"; version="1.3"; sha256="0a94vn5awn425qw99y8y38xivgzq16s3yvpkgld54p7jwhvmgxln"; depends=[car emmeans lpSolve MASS multcompView]; };
   ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
   ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
   ibelief = derive2 { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
   ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; };
   ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; };
-  ibmdbR = derive2 { name="ibmdbR"; version="1.49.0"; sha256="1rr64gwdy65njy0a52y3vncp7hlkp0mmq5ik92xbs49f4vagz58a"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
+  ibmdbR = derive2 { name="ibmdbR"; version="1.50.0"; sha256="151gg05gcy5wpyvyflr4mc0jq1npxzq9pc4spjc81x2igd14c370"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
   ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; depends=[mgcv]; };
   ic_infer = derive2 { name="ic.infer"; version="1.1-6"; sha256="14vcwx5592br4zky9mq82akwk8pfiz7p1rx2jvyb48prrs2mm9gy"; depends=[boot kappalab mvtnorm quadprog]; };
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
   icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; };
-  ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; };
+  ica = derive2 { name="ica"; version="1.0-2"; sha256="0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"; depends=[]; };
   icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.1.0"; sha256="1xw0mz3ipkfz1jsjzwjnrm0af1gs31js7nvgy79cxqz31955zjww"; depends=[Rcpp RcppArmadillo]; };
-  icd = derive2 { name="icd"; version="2.4.1"; sha256="1ygik4kd8ip4n8vjy2n6idj3cnc966sx41sckcqbjsqdsv5g5ghc"; depends=[checkmate magrittr Rcpp testthat]; };
+  icd = derive2 { name="icd"; version="3.2.0"; sha256="0wd5d9zlhy9wh3phy4mz8zg0jv08hjizvlscaj208a64lwkzvq7g"; depends=[checkmate icd_data magrittr Rcpp RcppEigen testthat]; };
+  icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
   icenReg = derive2 { name="icenReg"; version="2.0.7"; sha256="1fc6l3mqnm4rcg49bk2plfa011g7nay71gzd4nxnjisifmw6qi2s"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
-  icesAdvice = derive2 { name="icesAdvice"; version="1.4-1"; sha256="0vhp4mh3isxibxr1i05vlxvrz53ni83s5khjvnk8i20dcri0501g"; depends=[]; };
+  icesAdvice = derive2 { name="icesAdvice"; version="1.4-2"; sha256="10f1ss949gi7s5fhfbygqaf05pshalw6sa266v4gnxqwqynf4qbj"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
-  icesSAG = derive2 { name="icesSAG"; version="1.3-2"; sha256="1w3v10qjs9jyn7dp6vsv8hyax8mn2b8y5afba4lcpzh0p8d2yzpm"; depends=[httr icesVocab openssl png xml2]; };
-  icesTAF = derive2 { name="icesTAF"; version="1.5-1"; sha256="0sj9wswpaxch195rnwav2qbk2f25xc2kdzf9xr6p8l0adxnijmki"; depends=[httr]; };
+  icesSAG = derive2 { name="icesSAG"; version="1.3-4"; sha256="1s330691an1m5h1i342ls6igqcqrlrwyhapa82x5h2krdia0nmnp"; depends=[httr icesVocab openssl png xml2]; };
+  icesTAF = derive2 { name="icesTAF"; version="1.6-1"; sha256="0fsc79id8mcdp53xsrhzy43mvhginr3sixqhsxwvcz497kwdyj4a"; depends=[]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
   icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; };
   icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; };
   icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; };
-  icr = derive2 { name="icr"; version="0.5.3"; sha256="178j4xyaxkzi6fxajw5qkab9ifabaj3lvhk2qqipb6n5p68cd9bn"; depends=[ggplot2 Rcpp reshape2]; };
-  icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
+  icr = derive2 { name="icr"; version="0.5.4"; sha256="0vm2k2pjsnikb80crzhxs1wpxpjjigyny5ldini6sxg3lwhc14l3"; depends=[ggplot2 Rcpp tidyr]; };
+  icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; };
   idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; };
@@ -7426,11 +7513,11 @@ in with self; {
   idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; };
   ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; };
   ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
-  iemisc = derive2 { name="iemisc"; version="0.9.6"; sha256="0yr2pqklj3qjlmkk2sc5rgi8dfnm9jdaagzh2dhm05lharhfzy6d"; depends=[data_table fpCompare gsubfn iemiscdata pracma r_import zoo]; };
+  iemisc = derive2 { name="iemisc"; version="0.9.7"; sha256="152qmwyfpdzif9wbjk6j60sfamy8l2fhrr3vjw5m3c05grczyn7m"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata listless pracma r_import rgdal sp stringi testit units zoo]; };
   iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; };
   iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; };
   ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
-  ifaTools = derive2 { name="ifaTools"; version="0.14"; sha256="1m10j0isbaa30rd3dnvig9v9mwizmns36q8haaw07y8zw6mngzra"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
+  ifaTools = derive2 { name="ifaTools"; version="0.17"; sha256="02w0igwhi23iym47wn81ghhixc8nlcbfw2l77zakqwiabkq4ji82"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
   ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; };
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; };
@@ -7441,22 +7528,23 @@ in with self; {
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
   iheatmapr = derive2 { name="iheatmapr"; version="0.4.3"; sha256="0124d7h8n83zb5kvvavccprlqknpqrd634zv7sz9s915xzhp7jgz"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; };
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
-  iilasso = derive2 { name="iilasso"; version="0.0.1"; sha256="08d5j0dvi8k0hzn4xn4nzplc1fliqz11jd9i4pfj80ggl5dmc2x1"; depends=[BH Matrix Rcpp]; };
+  iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; };
   ijtiff = derive2 { name="ijtiff"; version="1.1.0"; sha256="0hb201qcwynbdi2fzspvv9sdhyx0cypbsvhawhcwj5zqdp6f507f"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr rlang stringr]; };
   iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
-  imPois = derive2 { name="imPois"; version="0.1.4"; sha256="07350zly4fyx2sf9cqpfpyy8l5kn96z49kzym81p2bmhq66d408h"; depends=[geometry rgl]; };
-  imageData = derive2 { name="imageData"; version="0.1-41"; sha256="1rkkg9zzhkamql5y47kx9s8p7fnffgm7hgsdv85brj45gc441sfm"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
-  imager = derive2 { name="imager"; version="0.40.2"; sha256="17awk431r37259c0yqs6c31kyiwhm9j80g2hw9hkk21jbi4jbghj"; depends=[Cairo downloader jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
+  imageData = derive2 { name="imageData"; version="0.1-50"; sha256="0i56sksyxa50bhp3pimgag2bg37y1gfadky6i0xgg484wf1xw148"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
+  imager = derive2 { name="imager"; version="0.41.1"; sha256="0ja8pi8l44llq75af4y8blb6vby43ikmy87sx83i1i327zfjzd5g"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
+  imagerExtra = derive2 { name="imagerExtra"; version="1.1.1"; sha256="02ws4l52a3jrgqmn76p6p54mnb0ypvkd39yj8pqn8qg8l44fp3nw"; depends=[dtt imager magrittr Rcpp]; };
   imaginator = derive2 { name="imaginator"; version="0.1.1"; sha256="1xp5wsv570f1qy2fn99d8ijydmlapb6h6kinj07pilvv215dg93w"; depends=[assertthat dplyr lubridate magrittr stringi]; };
-  imagine = derive2 { name="imagine"; version="1.3.1"; sha256="0sgzsyqqfi7rcs2xqxdc6f9kji09wsa38lxv7k2vymy3kdy8p9f6"; depends=[Rcpp]; };
+  imagine = derive2 { name="imagine"; version="1.4.0"; sha256="1v0rds64i0f3xgg7ca14ncw4nrcc80gvjf1fbp498idq38z79qzc"; depends=[Rcpp]; };
   imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; };
+  imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; };
   imfr = derive2 { name="imfr"; version="0.1.5"; sha256="1f4zynra79h42dmd9qhg67wwvs7c640f5is98bq30fdphiybihgz"; depends=[dplyr httr jsonlite]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
-  iml = derive2 { name="iml"; version="0.3.0"; sha256="0jz3gw45lyb4ddw9pdfj797aipha2bwcmqrf7dyxx0ga3cfxv7ay"; depends=[checkmate data_table ggplot2 glmnet Metrics partykit R6]; };
-  immer = derive2 { name="immer"; version="0.8-5"; sha256="181mp407vy2ij35ggr1vi80y8ak6vyjplyvps1fdpxnanp1mqpw3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; };
-  imp4p = derive2 { name="imp4p"; version="0.5"; sha256="0s1vq64qspni5fqzz781a1l8ldfbwhb57h8z4dr5k9bama5s3g6l"; depends=[imputeLCMD Iso Rcpp truncnorm]; };
-  implyr = derive2 { name="implyr"; version="0.2.3"; sha256="0ap7qdnwm1gcfl67r6bfjmk9ji4z30plclwnwzlv5j7yx5si6lps"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
+  iml = derive2 { name="iml"; version="0.5.1"; sha256="043n14samxl85by7vihrc7nv45kaj287m0ab04fssvfn8rnprqlh"; depends=[checkmate data_table ggplot2 glmnet Metrics partykit R6]; };
+  immer = derive2 { name="immer"; version="1.0-138"; sha256="0jpjrvr3mpgqfyl56i95grb3jmrzzs00ciafsw9rd7fpbxnskkjf"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
+  imp4p = derive2 { name="imp4p"; version="0.6"; sha256="1aaj62ia87khkdkw6lx59dcx3lq1clfdzw7gbi0ffy99lp608q6s"; depends=[imputeLCMD Iso Rcpp truncnorm]; };
+  implyr = derive2 { name="implyr"; version="0.2.4"; sha256="1xc5c8wpq1bdvfm4rkqmvykgkil9fm9n1q9ndjv701jbdr4rnisd"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
   r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
   importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; };
   imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
@@ -7466,9 +7554,10 @@ in with self; {
   imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; };
   imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; };
   imputeR = derive2 { name="imputeR"; version="2.0"; sha256="0xyvy785jb1mv06jq25cnsbgiywi3857sdiizcjck7bx970lk02n"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
-  imputeTS = derive2 { name="imputeTS"; version="2.6"; sha256="14hkz9y6r8nl036zwi8c7k54bbkyz7zmvnq8ln7pwl15kgpcadkf"; depends=[forecast Rcpp stinepack]; };
+  imputeTS = derive2 { name="imputeTS"; version="2.7"; sha256="12y6qzy00kb7jap4h92f3zpgdazlw3y4zydhv7gzfsmx1ka7nsfm"; depends=[forecast magrittr Rcpp stinepack]; };
   imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.1"; sha256="0yxvwk1bcsid116a4zqsagf2dl3vhzva559bfjjcqdgyniapcmcj"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; };
   imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; };
+  imsig = derive2 { name="imsig"; version="0.1.0"; sha256="0qjr2xbha6ikcfmkl0crhf9akrbygwsk87xhb45q8633fk3ssw51"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; };
   in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; };
   inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; };
   inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; };
@@ -7478,14 +7567,14 @@ in with self; {
   inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; };
   incadata = derive2 { name="incadata"; version="0.6.1"; sha256="05i0zifdzc1w6p6annhzp9rdd4v82gx2sxi4lqpdnraaczdrhgbb"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; };
   incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; };
-  incidence = derive2 { name="incidence"; version="1.2.1"; sha256="0fjbccsyrxjmc17kzqhh1ykx1ai6a8gmbxsjr42crm8bjpnq77iy"; depends=[ggplot2 ISOweek]; };
+  incidence = derive2 { name="incidence"; version="1.3.1"; sha256="0qylfim4gc9i9dyhyjpfar95rznbf1lh06hvvjmxxyrc1a7lzaxw"; depends=[ggplot2 ISOweek]; };
   inctools = derive2 { name="inctools"; version="1.0.11"; sha256="08a1aqsx1f1mkykpgbqbgvai60zxj9zwpmxynyajbm4lwr3rc6rp"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma tmvtnorm]; };
   indelmiss = derive2 { name="indelmiss"; version="1.0.8"; sha256="0674hvgdq0fxab3h55iililphrr6lqp25359crvkqqgb8higbs0h"; depends=[ape numDeriv phangorn Rcpp]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; };
   indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; };
   inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
-  infer = derive2 { name="infer"; version="0.1.1"; sha256="1ln2vw4d4xcy9g6cv594glrrcqwmjynv0mfq6nsl1h94gz8wnh8a"; depends=[assertive dplyr ggplot2 magrittr rlang tibble]; };
+  infer = derive2 { name="infer"; version="0.2.0"; sha256="1wkfbrwq616nj1k0rmwvbnqy8ngrmxc49d6j69s5vpws2g3ga00j"; depends=[assertive dplyr ggplot2 magrittr rlang tibble]; };
   inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
   inferference = derive2 { name="inferference"; version="1.0.0"; sha256="1x6i8ycba9z57m1n143p1j9pmlfrhjhi4iw0fsny8xmcvqrlr85p"; depends=[Formula lme4 numDeriv]; };
   inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; };
@@ -7494,20 +7583,22 @@ in with self; {
   influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; };
   influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; };
   influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; };
-  infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; };
+  infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.1"; sha256="04fgmz58nvw0jwbj8y1r42ny84024h47w9cc0z96aqag5kg1wmxm"; depends=[MASS]; };
   informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
   infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; };
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; };
   infuser = derive2 { name="infuser"; version="0.2.8"; sha256="07qgszk8gsx3yvy47iqgp5zykn26jm65ncvyqqgwrdgibf2zamgh"; depends=[]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-  ini = derive2 { name="ini"; version="0.3.0"; sha256="0ybqklgbij69dvq8dxl8z2mb9fhdizcdcm9b5hg5n1x20ph3vbyj"; depends=[]; };
+  ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; };
   injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
   inlabru = derive2 { name="inlabru"; version="2.1.3"; sha256="09sdbzg3cdg43clkwnahkhyns019gjya55m6zhq340mgrnirx2i5"; depends=[ggplot2 rgdal rgeos sp]; };
-  inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
+  inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
   inlmisc = derive2 { name="inlmisc"; version="0.4.0"; sha256="0hhw87zvqd2mplpbmbh1y91pyfgyqamw4wiz74a6qwn705bcymah"; depends=[checkmate dplyr GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos sp xtable]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.6"; sha256="0fwznjsq4wccqfnb3a5ic1nyx538jxmlcv59xdz06y6raczjp9q9"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
+  inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; };
+  insect = derive2 { name="insect"; version="1.1.0"; sha256="11r21ljif0pwswmmdzbyy3i9q2rwxn7izhr44dkiwcyjv7yig54j"; depends=[ape aphid kmer openssl phylogram xml2]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
   insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
   inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
@@ -7515,28 +7606,29 @@ in with self; {
   install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; };
   insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
   intReg = derive2 { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[maxLik miscTools sets]; };
-  intRegGOF = derive2 { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
+  intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; };
   intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; };
-  intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
+  intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
   intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; };
-  intccr = derive2 { name="intccr"; version="1.0.0"; sha256="1y3rrxr9m8s6xvg4j8w9a2673kl1g5mmzz2p5dxjr6ddlfl8aji3"; depends=[alabama doParallel foreach numDeriv]; };
+  intccr = derive2 { name="intccr"; version="1.0.2"; sha256="1vdrdig82xbg4ax67vsr00v28z40qd54kcw6b8cml59sqn13zxl2"; depends=[alabama doParallel foreach numDeriv]; };
+  intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; };
   integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
   interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; };
   intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
-  interflex = derive2 { name="interflex"; version="1.0.3"; sha256="07a41rx553i6rlgcl4aa2xxkdql3y7bi84h2pgak9qbyxgw6mlmq"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
+  interflex = derive2 { name="interflex"; version="1.0.4"; sha256="1w92h0ay0rx8gy9jcj179206lz9irg8g0ryl31p3ijqip73v55rm"; depends=[doParallel foreach ggplot2 lfe Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
   interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   interim = derive2 { name="interim"; version="0.7.0"; sha256="05hgypckfjb9pr60cv6m8lgqibdkgksw13gy8g1rmd9njs6qcb8i"; depends=[]; };
+  interlineaR = derive2 { name="interlineaR"; version="1.0"; sha256="0y1ym6iwly8sv94pdzwv2qy1g7z4hpqlrbcrpb1ds5a62a6axqj5"; depends=[reshape2 xml2]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
   interp = derive2 { name="interp"; version="1.0-31"; sha256="0zrqlzsl71fggwy8qvhggzxphbc7ld2gahsh8h5aawvkpfz5jm8k"; depends=[deldir Rcpp RcppEigen]; };
-  interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; };
+  interplot = derive2 { name="interplot"; version="0.2.1"; sha256="0kg17g12dccs6imdqkyagm3zqziah4hvlba72irpck03w6z4sdb3"; depends=[abind arm dplyr ggplot2 gridExtra interactionTest purrr]; };
   interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; };
   interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
   intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; };
   interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
-  intpoint = derive2 { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
   intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.1.0"; sha256="0mxg9dvhn5rr1rchpqzf5i1p37kvabcb9jyqbn49zgzcwdvm6cbs"; depends=[yaImpute]; };
   introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
   intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; };
@@ -7550,7 +7642,6 @@ in with self; {
   io = derive2 { name="io"; version="0.3.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; };
   ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; };
   ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
-  ionicons = derive2 { name="ionicons"; version="0.1.1"; sha256="0v7icjx2bpb0hd3j8a14lijklyjkmw7qgp336z66wzscm6f411ip"; depends=[png rsvg xml2]; };
   ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; };
   iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; };
   iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; };
@@ -7558,23 +7649,26 @@ in with self; {
   iotools = derive2 { name="iotools"; version="0.2-5"; sha256="0rn6kvlcijnhlwajh6nmi80qlamxgz0x3pn09yp4hyfpl3zxg1fz"; depends=[]; };
   ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
   ipdw = derive2 { name="ipdw"; version="0.2-6"; sha256="1jfixvywxdhnpqz62ld2c8n6yacg88q3y1n1aisqqb7szz0zf23z"; depends=[gdistance raster sp]; };
+  ipeaData = derive2 { name="ipeaData"; version="0.0.2"; sha256="1nggkcb8rrnc3d14nhzpf48f2dpf6jcsw54i40jcp7656jqv1jnb"; depends=[data_table dplyr httr jsonlite RCurl]; };
   ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; };
   ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
-  iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
+  iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; };
   ipred = derive2 { name="ipred"; version="0.9-6"; sha256="1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"; depends=[class MASS nnet prodlim rpart survival]; };
   iprior = derive2 { name="iprior"; version="0.7.1"; sha256="01sav9594grc413kf6s9jnp4hs4q9f9424qphm91xckydiqisaav"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; };
   ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
+  iptmnetr = derive2 { name="iptmnetr"; version="0.1.2"; sha256="1m5rw66qbv5pa91ywvir2i0wnwa0j6z75242bc468d2hakz62k99"; depends=[httr jsonlite]; };
   iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
-  ipumsr = derive2 { name="ipumsr"; version="0.1.1"; sha256="0bms1jl1hwqcz6awdgs0wpxvxgsydrvfmp10qnhglh52nckf0dyb"; depends=[dplyr haven purrr raster Rcpp readr rlang stringr tibble tidyr xml2]; };
+  ipumsr = derive2 { name="ipumsr"; version="0.2.0"; sha256="0rmcl2jq12yvc5lqyi1mi5ggl59w2g6zvf3w1zpnb261vlrvikda"; depends=[dplyr haven purrr raster Rcpp readr rlang stringr tibble tidyr xml2 zeallot]; };
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
   ipwErrorY = derive2 { name="ipwErrorY"; version="1.0"; sha256="1n1j1crxnnfkg38drgg8rhc13y6s8hcsr5g0f6hi4v680dgrkhmp"; depends=[nleqslv]; };
-  iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; };
-  irace = derive2 { name="irace"; version="2.4"; sha256="07xzg4jcq0rjdq1drs3xh02y29z1gmkjkw54apmaqzc0s1pwzkk4"; depends=[]; };
+  iqLearn = derive2 { name="iqLearn"; version="1.5"; sha256="1zn43zvx0mjzh96bm73scacmladamy8jmhxim7hcfq39cfhiw3c8"; depends=[]; };
+  irace = derive2 { name="irace"; version="3.0"; sha256="1p7amffds888zfg05lfkmvl2ciydmf8bn42g2kgfy13k9r2bk96r"; depends=[]; };
   ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; };
   irlba = derive2 { name="irlba"; version="2.3.2"; sha256="0f7wb12wa0zbyllk5adcf4f517wgjpkhsx4j176i9ax6xy7jvprz"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
   irrNA = derive2 { name="irrNA"; version="0.1.4"; sha256="1i7s4c285dw1s2kiq01a81cfpd2v40y26yklr06xlmqp28iwslbr"; depends=[irr]; };
+  irregulAR1 = derive2 { name="irregulAR1"; version="1.0.0"; sha256="0pccasqcya99j4n0qdcjjnvmigj53axji9ddxbpmrgvzsyamb8ja"; depends=[Matrix Rcpp RcppArmadillo]; };
   irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; };
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; };
@@ -7584,9 +7678,9 @@ in with self; {
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
   isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
-  island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; };
-  ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; };
-  isni = derive2 { name="isni"; version="0.2"; sha256="1092sz4xskrvpxlkxnd8s7lzwqy1qnim63lzx55sspqcwdbry5hn"; depends=[Formula matrixcalc mvtnorm nlme nnet]; };
+  island = derive2 { name="island"; version="0.2.1"; sha256="0fg5nlg5iq3cl3i8xx9qq4vvizdklg6adjxmp2qrg0dyfvkllhsq"; depends=[]; };
+  ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; };
+  isni = derive2 { name="isni"; version="0.3"; sha256="0j5hy6y9br0l3xn3lx0r17hdbm1z1i49rnr2kb9z7igbq1y87pf5"; depends=[Formula matrixcalc mvtnorm nlme nnet]; };
   isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; };
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
@@ -7594,7 +7688,7 @@ in with self; {
   isoph = derive2 { name="isoph"; version="1.1.2"; sha256="1qw98cnil3rb9d3vbii8drca744qig6bfd3rc74dxm23cj86f66g"; depends=[Iso survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
-  isqg = derive2 { name="isqg"; version="1.0"; sha256="0ym3d916lpr1bmmla599xg13c8k0wvyi7b6jhzlrxi6nj5ci0vad"; depends=[BH R6 Rcpp]; };
+  isqg = derive2 { name="isqg"; version="1.1"; sha256="0vl3x498xzixhnxwwd52pwv79ym4hzj1c7f7mv8p3966281xhkfc"; depends=[BH R6 Rcpp]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
   italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; };
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
@@ -7602,7 +7696,7 @@ in with self; {
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
   iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
   iterators = derive2 { name="iterators"; version="1.0.9"; sha256="16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"; depends=[]; };
-  iterpc = derive2 { name="iterpc"; version="0.3.4"; sha256="1nbwd6lx6srjb94skghy4jd323sn8a08wvh8r5zqa4l69qg47r65"; depends=[gmp iterators Rcpp]; };
+  iterpc = derive2 { name="iterpc"; version="0.4.0"; sha256="0py11pvhl71v9fl0a6n317va8cggih4l0afn6yldnah9ai2cakvy"; depends=[arrangements gmp iterators]; };
   itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
   itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
   itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
@@ -7617,8 +7711,10 @@ in with self; {
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
   ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; };
   ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; };
+  ivtools = derive2 { name="ivtools"; version="1.0.0"; sha256="06g99wcm5hhn4avahcq9ldk4riwrz7q90yvc8f5fal70d3ca8x73"; depends=[data_table numDeriv]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; };
+  jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
   jackstraw = derive2 { name="jackstraw"; version="1.1.1"; sha256="18iah8sq64p7c6rxs21w8rbxvbmbh03jzqbam1ilp46ayfqzk9qc"; depends=[corpcor lfa]; };
   jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; };
@@ -7630,49 +7726,51 @@ in with self; {
   jcext = derive2 { name="jcext"; version="0.1"; sha256="18vmf57l2kv3rvi6laqp948m8mjkdxdy0vi4xp68480b2mjmvij1"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; };
   jcolors = derive2 { name="jcolors"; version="0.0.2"; sha256="0d71sdvj7hwafj0sx2z1nyza5j2lfd8y5yj1p94yrw32wi7b89jn"; depends=[ggplot2 scales]; };
   jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; };
+  jeek = derive2 { name="jeek"; version="1.1.0"; sha256="0s5gsgsznn8n39s0s35qxdl0q7bkvqlrf9xhland3xlzcrvpyp2g"; depends=[igraph lpSolve pcaPP]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; };
+  jiebaR = derive2 { name="jiebaR"; version="0.9.99"; sha256="1g39z9ms975ig2j9nd6nqja1l8gy50fa9pwlz563xk6p2z6v058j"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
   jmcm = derive2 { name="jmcm"; version="0.1.8.0"; sha256="0nv30shwd1219cvs9kaql0n7ppwqngj3avf2qd7nzrnbqp2gl23h"; depends=[Formula Rcpp RcppArmadillo]; };
-  jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
+  jmdem = derive2 { name="jmdem"; version="1.0"; sha256="1qz2l02m4gnxrm1ankr5qqlskl8amphzj8r763yas218fvzfa34q"; depends=[statmod VGAM]; };
+  jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; };
   jmuOutlier = derive2 { name="jmuOutlier"; version="1.4"; sha256="1vrihjvq8l2q7d3z80fkzzzwg6xmnfi8sipsgwic1lcbv6vnqndp"; depends=[]; };
   jmv = derive2 { name="jmv"; version="0.8.6.2"; sha256="0an3ni6lz85cfcra69mycka6x1hgaas6rv6ybbnikmrv846sx03n"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
-  jmvcore = derive2 { name="jmvcore"; version="0.8.5"; sha256="0w1d18qrb8aimkzv7imnj9yfdmz7ppdvaiadsaprackch16s91kx"; depends=[base64enc R6 rjson]; };
+  jmvcore = derive2 { name="jmvcore"; version="0.9.1"; sha256="01qv3m1vsabydlkshmqrg15y8nnrzkg49pq2ryxi3r6jw486qq1s"; depends=[base64enc R6 rjson stringi]; };
   jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; };
   joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; };
-  joineR = derive2 { name="joineR"; version="1.2.3"; sha256="0cg7bfn0hb7ayx2s7myja5qzdvsbzyk8fbb1x5z0fp21gyrpfz18"; depends=[lattice MASS nlme statmod survival]; };
-  joineRML = derive2 { name="joineRML"; version="0.4.1"; sha256="08zl6wv6yvk2cgp6ln2i9ziip0mjr4jrfpb1y75ln5wi00dbna3x"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; };
+  joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; };
+  joineRML = derive2 { name="joineRML"; version="0.4.2"; sha256="06a7iicq3fngsmmi8qcz2fdzdzvym5s70s3aaqlzxnl4sj9km3g2"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; };
   joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="2.14"; sha256="0k9v1v4zbv0952zyp7xv5gkmnihfswpsqzp684f9y6n6xcg3v8fx"; depends=[survival]; };
+  joint_Cox = derive2 { name="joint.Cox"; version="2.15"; sha256="1lcli1p1qv0ws1zqs845wb2swhm5vvbixsxs8yzihc5r7igyalg7"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
   jointseg = derive2 { name="jointseg"; version="1.0.1"; sha256="0wa531b5shrxhnzflfjqn2wypfb565qc2c8wngysgrgyj1kjq1pl"; depends=[acnr DNAcopy matrixStats]; };
-  jomo = derive2 { name="jomo"; version="2.6-1"; sha256="1pcac6kbag4as28l557h702kc78mr0iz4m4rkhcx602l7dch8gd8"; depends=[lme4 survival]; };
+  jomo = derive2 { name="jomo"; version="2.6-2"; sha256="0zyqwa2y08asj9xqwnngh6da1b9cqcx8pzc9cxwrmgnxd5nnsjb7"; depends=[lme4 survival]; };
   jose = derive2 { name="jose"; version="0.2"; sha256="0vgmr5kmps6yk10bbzrxz2d3y7jk0w1rxpm9gx510kpnqbj325xz"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
-  jpmesh = derive2 { name="jpmesh"; version="1.1.0"; sha256="01f0020ghl1f5fsri54gni15b36fg9vkr4xj43vy881sv11c5yr8"; depends=[dplyr leaflet miniUI purrr rlang sf shiny tibble tidyr units]; };
-  jpndistrict = derive2 { name="jpndistrict"; version="0.3.0"; sha256="0vnawpkrkhv0vjvw49ldn86qy07pqsdw7mmq13h3l4qw5jmfsd9i"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr readr rlang sf shiny stringi tibble tidyr]; };
+  jpmesh = derive2 { name="jpmesh"; version="1.1.1"; sha256="0smfv7wh0441aqx0c0km0kr54lsvqixn2chqvqn5sd3758k5id95"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; };
+  jpndistrict = derive2 { name="jpndistrict"; version="0.3.2"; sha256="0n935zwxjjnl1w0xd790gm22pdm8ng48x79iazfkjzj8dpwymdsg"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr]; };
   jqr = derive2 { name="jqr"; version="1.0.0"; sha256="1jdr3wb1fd2zjmmdicqhskgk7xbn5y6998fi9szj86p8smfckl74"; depends=[lazyeval magrittr]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
-  jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; };
+  jrvFinance = derive2 { name="jrvFinance"; version="1.4.0"; sha256="09gr8w3y0cjlwjhr72ml05y22m868hnvxwa3mwxdcvfb7nb1dmxz"; depends=[]; };
   js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; };
   jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; };
-  jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; };
+  jsonld = derive2 { name="jsonld"; version="2.0"; sha256="0mplsx2fq7pvxli1rd851cqhkaxk3y93aa46x57yf4z5rgjy34vm"; depends=[curl jsonlite V8]; };
   jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
-  jsr223 = derive2 { name="jsr223"; version="0.3.1"; sha256="030dp51fh9b7r4f7ad9drln73m3mhg2zh5fh053d65hzyszrqyqg"; depends=[curl jdx R6 rJava]; };
+  jsr223 = derive2 { name="jsr223"; version="0.3.2"; sha256="00i90b37811sva8f9bd50xxvjcn7rag9hq5ya953v6whm370r737"; depends=[curl jdx R6 rJava]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
-  jtools = derive2 { name="jtools"; version="0.9.4"; sha256="0vljw3n1ykvf3f2ydar9rb24cgiqljh195g2jc4dx77zy1kcfh4d"; depends=[ggplot2]; };
+  jtools = derive2 { name="jtools"; version="1.0.0"; sha256="0w0yw0pl2arwx4d5w83d73y7cq9papqkdg6sfk9qj1whgcd28chv"; depends=[cli crayon ggplot2]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
   jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
   junctions = derive2 { name="junctions"; version="1.0.1"; sha256="1mfzhizfzpsrlc23kdi658a1svw4p3wh1la7zpf5fk2bbksw0v97"; depends=[Rcpp]; };
   junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
-  jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; };
-  kSamples = derive2 { name="kSamples"; version="1.2-7"; sha256="0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"; depends=[SuppDists]; };
-  kableExtra = derive2 { name="kableExtra"; version="0.8.0"; sha256="01m2h8ms83h5zmy9rys0dal9y77fk7bk1f3k1l2vsg2krb5wxagv"; depends=[htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite xml2]; };
+  jwutil = derive2 { name="jwutil"; version="1.2.1"; sha256="1n9q2p167cmp134p8qpknfg4avi4nzxqmazyr1gs63sk5x51yk48"; depends=[Rcpp testthat]; };
+  kSamples = derive2 { name="kSamples"; version="1.2-8"; sha256="15d5q5vpp4wx5rk5kjxjdxpwc8mkq5sbdz8gi07iscrvhzb5rzfr"; depends=[SuppDists]; };
+  kableExtra = derive2 { name="kableExtra"; version="0.9.0"; sha256="07232lg3nzg7vqpn61v3knmsy943gap92bqhdxm28k06vj9aqgbf"; depends=[htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite xml2]; };
   kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; };
   kamila = derive2 { name="kamila"; version="0.1.1.2"; sha256="0mcray8byifjddsmwzmcpmw3zpm1y8q3nfrgpgacb36rwprqkj6z"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; };
   kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; };
@@ -7684,31 +7782,33 @@ in with self; {
   karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; };
   kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; };
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-  kde1d = derive2 { name="kde1d"; version="0.1.2"; sha256="0n28xkkhl9mfd0bcgfv181j9lqk0aiim2irnwn654fpz0y6rwhnh"; depends=[BH cctools qrng Rcpp RcppEigen]; };
+  kde1d = derive2 { name="kde1d"; version="0.2.1"; sha256="14zblm0yj806an9p463hfc9xnrdkh3x8bfxld6a9cjg513kij9ib"; depends=[BH cctools qrng Rcpp RcppEigen]; };
   kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
   kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kdevine = derive2 { name="kdevine"; version="0.4.1"; sha256="0ci51dn7jhz9swlywiqj3inkk4329argm63lhkyvcbj2kd2rjay1"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; };
-  kdtools = derive2 { name="kdtools"; version="0.3.0"; sha256="1q22h5cs5p6nvmxrnq0pdfs8aq2aghash9y387ch0g6cm1n5hzj4"; depends=[BH Rcpp strider]; };
+  kdist = derive2 { name="kdist"; version="0.2"; sha256="18q7njvsb9sbm412c6ms4b4nxg768z9qahws5rnin06gvb25nfcx"; depends=[]; };
+  kdtools = derive2 { name="kdtools"; version="0.3.1"; sha256="1c04rfnnbkh6d8435hjgnq3q42rsfyvf36ypxjsax39spynip457"; depends=[BH Rcpp strider]; };
   kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; };
   keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; };
   kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; };
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
+  kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.2"; sha256="1h02394gq8cmz7bw6k2yg4qjzmns7i6bzafkdw3x9ycf4d9l6p80"; depends=[dplyr EnvStats ggplot2 nleqslv tibble tidyr]; };
   kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; };
-  keras = derive2 { name="keras"; version="2.1.5"; sha256="0l6hs9bawrnjansmka082cqvcf4h5lnrfjgp9rivg8k89nqaknfq"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
+  keras = derive2 { name="keras"; version="2.1.6"; sha256="1xgxf9xg8b7dpnbc5dnysd4s2n74877s16f353hrbybf6m768kik"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
-  kerasformula = derive2 { name="kerasformula"; version="0.1.1"; sha256="0c19208y9v8a1w4p54z7yng5vvmb6h79fs0a20ij98ngys9afbwz"; depends=[dplyr keras Matrix]; };
+  kerasformula = derive2 { name="kerasformula"; version="1.0.0"; sha256="1hhzrrg4ryajzlih8wj2j0z3wb0ksi5zycaf9njvbd0jvfxxbzdy"; depends=[dplyr keras Matrix]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
   kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; };
   kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; };
-  kerndwd = derive2 { name="kerndwd"; version="2.0.1"; sha256="1grinlqjjsxw1x152f9y38lhijh74zc831ddc0lk2niq2rvzszdw"; depends=[]; };
+  kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
-  kernelboot = derive2 { name="kernelboot"; version="0.1.4"; sha256="1d1l9sbnlyx5a88qmd6q2zxlkr6dykcwlkk648yqmmfvqmq4xjmj"; depends=[future future_apply Rcpp]; };
-  kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; };
+  kernelboot = derive2 { name="kernelboot"; version="0.1.5"; sha256="0m31akhya7390lbkw0cjxcrzw28njbz4smd35m93aarb2lgpcj4k"; depends=[future future_apply Rcpp]; };
+  kernlab = derive2 { name="kernlab"; version="0.9-26"; sha256="0xv0slf3ggw3sswsi34416lb1g3h1pqkrr2h7r1n1kvgii3l0jcm"; depends=[]; };
   kernplus = derive2 { name="kernplus"; version="0.1.1"; sha256="1dxw1qk5gx7g05kgsbh5436r7mbv77631zjs0c4ibpscaw77g475"; depends=[circular KernSmooth mixtools]; };
   kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
   kexpmv = derive2 { name="kexpmv"; version="0.0.3"; sha256="1nx2bpyc06vlr78nhig4zaaygphjp4wqsz9jzhs4qx8wy3kh7rmy"; depends=[Rcpp SparseM]; };
-  keyholder = derive2 { name="keyholder"; version="0.1.1"; sha256="1dp326vayjzjpfhd2ajrpqjvbn6vvqa7iw9mdhblprz4cvv65g30"; depends=[dplyr rlang]; };
+  keyholder = derive2 { name="keyholder"; version="0.1.2"; sha256="157k39acn8732g0ha9m402v5hhqnc34qpghvhg430dga2r5g3cxh"; depends=[dplyr rlang]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
   keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; };
   keyring = derive2 { name="keyring"; version="1.0.0"; sha256="0asa62cgs08k0g0yhvsxr2k8rfxy3hqkd4hrv0396394v13b08w5"; depends=[assertthat getPass openssl R6]; };
@@ -7717,6 +7817,7 @@ in with self; {
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; };
   kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; };
+  kidney_epi = derive2 { name="kidney.epi"; version="1.0.0"; sha256="1n264l2snbmx72hp67gzkwwzkmivi1f4nddh3zhxvy028y47w643"; depends=[]; };
   kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; };
   kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; };
   kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
@@ -7732,12 +7833,11 @@ in with self; {
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
   klin = derive2 { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
   km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
-  kmc = derive2 { name="kmc"; version="0.2-2"; sha256="0ldyhlqdrbygvhpy4b9xp52zjvjmb0gaph0v9fhla707f63i21m5"; depends=[emplik Rcpp rootSolve]; };
   kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
   kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; };
   kmed = derive2 { name="kmed"; version="0.0.1"; sha256="0vcks4n0dpfd5cl5b8mhvhw6r2f3y12jn3d3j3dkj2grxmb9lh4c"; depends=[ggplot2]; };
-  kmer = derive2 { name="kmer"; version="1.0.2"; sha256="117ggn2i4yy0l7vvrf9miy4x63n9d34rjksd3dd3ama2alp4s95l"; depends=[openssl phylogram Rcpp]; };
-  kmi = derive2 { name="kmi"; version="0.5.3"; sha256="0b3nibvi0skrx3mjfzypqmdqx8s9zkn11f0ljscqpjr28idx4hr0"; depends=[mitools survival]; };
+  kmer = derive2 { name="kmer"; version="1.1.0"; sha256="0c96rz75qggqfb0zccn0v92jx9ws2nlw8pk6j5jghllcgm99qbdc"; depends=[openssl phylogram Rcpp]; };
+  kmi = derive2 { name="kmi"; version="0.5.4"; sha256="07h4gn69r4zxm00alj74fd0qdyp7g9x38gpi1v7yzy806wlg93fr"; depends=[mitools survival]; };
   kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; };
   kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; };
   kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; };
@@ -7746,23 +7846,24 @@ in with self; {
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
   knitcitations = derive2 { name="knitcitations"; version="1.0.8"; sha256="07h8d5cp52qcm0912c55j59k2p3c7s4af87qa7a9hafhgimnsdiv"; depends=[digest httr RefManageR]; };
   knitr = derive2 { name="knitr"; version="1.20"; sha256="1408dm25cxahk2clff8hlajaqdj5v1gs40nm3q6rf0ghd82hj93v"; depends=[evaluate highr markdown stringr yaml]; };
-  knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.1"; sha256="089147g7nqp99rwdxxsfmklsrwc8aia09sr8ndmrc335r33v6r6p"; depends=[knitr markdown rmarkdown]; };
+  knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; };
   knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
+  knnp = derive2 { name="knnp"; version="1.0.0"; sha256="038bl834zjmwdhfh5skhsjk2jqizx285g1w4y7ji9h0h03akn5nd"; depends=[doParallel foreach forecast parallelDist]; };
   knockoff = derive2 { name="knockoff"; version="0.3.0"; sha256="0irqbidp00rh07xsfyyv5d3ksa4fn9vv49rsy8ah2gb9y41iy046"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
   knor = derive2 { name="knor"; version="0.0-5"; sha256="19wjrcmfam1ck5vbidksmy923d5p5llikjxn0v248vzfz96ia1yc"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; };
   koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; };
   koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-2"; sha256="0v3cjzcpa24n479xi2lkj3yhjrgbd14iq9rz1bvywbj3shixs0bn"; depends=[koRpus sylly_en]; };
-  kofdata = derive2 { name="kofdata"; version="0.1.3"; sha256="135fkfciya8d215iv0ir7kmd01w7rlzqfcif5jz918skrv2p9mcl"; depends=[httr jsonlite xts zoo]; };
+  kofdata = derive2 { name="kofdata"; version="0.1.3.1"; sha256="1sys4ymh0ja2zb14k6hq455563np7n8jzmgakkjdghfi38lxndam"; depends=[httr jsonlite xts zoo]; };
   kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
-  kohonen = derive2 { name="kohonen"; version="3.0.4"; sha256="1aq98qbmbzsdyimhn28qiyqfrwkwq70qmm5yhx0rvhjq53bn9622"; depends=[MASS Rcpp]; };
+  kohonen = derive2 { name="kohonen"; version="3.0.5"; sha256="110ckinwzgv8b6g1cj0k0vva19abi44psf9vmqifs3450v90bq8z"; depends=[MASS Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
-  komadown = derive2 { name="komadown"; version="0.1.0"; sha256="08rg2qz4dmxl4xi0d7wdl2xgdmsc29fdc0yi40yddzrbpj4vs2z4"; depends=[bookdown knitr rmarkdown]; };
+  komadown = derive2 { name="komadown"; version="0.2.0"; sha256="0mw1bcrg10yy1y844lpik70979420h0nsar48v5p3qk783pymbdp"; depends=[bookdown rmarkdown]; };
   komaletter = derive2 { name="komaletter"; version="0.2.0"; sha256="17xkc22ci2gqypcfs1yhyzfmpsh8bmjbw6yms27cbqg4m4jdgm9v"; depends=[rmarkdown]; };
   konfound = derive2 { name="konfound"; version="0.1.0"; sha256="1w85gsms061d5hik3bc7x5gc7cp6c9h8l8q8q60isj1r0n60a81s"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
@@ -7772,7 +7873,7 @@ in with self; {
   kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
   krm = derive2 { name="krm"; version="2018.1-24"; sha256="0qysv61vjdz8674hn6mk0913dkm2bfkqmr7cybls9z9h4i068vdk"; depends=[kyotil]; };
-  ks = derive2 { name="ks"; version="1.11.0"; sha256="1wbw6zqsm7n65hbxiabpap2nbqq7795ir2r3fd7rw125hibj73k4"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv misc3d multicool mvtnorm OceanView rgl]; };
+  ks = derive2 { name="ks"; version="1.11.2"; sha256="0q99b6jv61cni5fgxvygbg8hs4fyhdmbgdzwgny7mrp1jr84izcx"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; };
   kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; };
   kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
   ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; };
@@ -7781,8 +7882,8 @@ in with self; {
   ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
-  kutils = derive2 { name="kutils"; version="1.39"; sha256="05744f8bz8mbxcqhf50rxjlknwar4ci3g0nmcx5jggwczqqmn2pq"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; };
-  kvh = derive2 { name="kvh"; version="1.1"; sha256="1dvq7wbpx1hpjshvsihivd8q8hyhji047gifxc6cjnv778r4irb1"; depends=[Rcpp]; };
+  kutils = derive2 { name="kutils"; version="1.45"; sha256="0qx40d5nk8q0kv09l73bcn7dbch89b9zi8yp75v39vcy4qxdnc2b"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; };
+  kvh = derive2 { name="kvh"; version="1.3"; sha256="0dhdvka7sdh7qcq5cz5xsv8dbxr1lr4n7wf033smsz4nvwgjixr3"; depends=[Rcpp]; };
   kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; };
   kyotil = derive2 { name="kyotil"; version="2017.12-27"; sha256="0xd64xg3nj0pj0ziycq4ndpl8kwxfng96ag8zmqzzxk85zw2vyq3"; depends=[]; };
   kza = derive2 { name="kza"; version="4.0.0"; sha256="0yfn6ijbskdkcgbgk4fwhgiiy34cw9k9vy1psi779mqd9kyjf56j"; depends=[]; };
@@ -7794,14 +7895,15 @@ in with self; {
   l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; };
   laGP = derive2 { name="laGP"; version="1.5-1"; sha256="0sqzvz78p50afp892p7ghy4fmy9p3a2ik51bzzwrx6r96ax7w971"; depends=[tgp]; };
   labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; };
-  label_switching = derive2 { name="label.switching"; version="1.6"; sha256="0k6f31gwcjfncsgd5cm9zygplif2wr8zjqrw4gmrnxcgp2z58a9w"; depends=[combinat lpSolve]; };
+  label_switching = derive2 { name="label.switching"; version="1.7"; sha256="1p4cgqf79zppvzrhh5gcxnm7f8qj03fzfmjx43mjhsr1vqig4c78"; depends=[combinat lpSolve]; };
   labelVector = derive2 { name="labelVector"; version="0.0.1"; sha256="0iwk8p3m2g6732q2pilwr3wlaiys15khd54r0vxsp2irlw77lzrg"; depends=[]; };
   labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
   labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
-  labelled = derive2 { name="labelled"; version="1.0.1"; sha256="18mz4qraxalq50rzmblsvavx4isb4194rj4iqab09qzh8ib1qzwv"; depends=[haven]; };
+  labelled = derive2 { name="labelled"; version="1.1.0"; sha256="0w1zc4w2lkhyldwqyc0drfdn251kjz94jv9p0sn6b034vcifq7ia"; depends=[dplyr haven]; };
   labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; };
   labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; };
   labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
+  lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; };
   laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
   lagged = derive2 { name="lagged"; version="0.1-1"; sha256="062a9hrnp2bsahsdasml0wzqpapyslfiwy9q2mvwqsl6j2pqkk0s"; depends=[]; };
@@ -7809,7 +7911,7 @@ in with self; {
   lakemorpho = derive2 { name="lakemorpho"; version="1.1.1"; sha256="0asrp9rvyi5ykxw922qx25rgxvyc9mh4sc7qkbpwzqw8xvgpad2z"; depends=[cluster geosphere raster rgdal rgeos sp]; };
   laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
   lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; };
-  lambda_r = derive2 { name="lambda.r"; version="1.2"; sha256="0vql32np716dpd0kjn7s7wgawd02ysgp2a5il4kb19nlw661ii3x"; depends=[]; };
+  lambda_r = derive2 { name="lambda.r"; version="1.2.3"; sha256="0cc6pszs6yccn0hgjpyn9gspv9aiva9d91ba0640i5m0l5xy7n0c"; depends=[formatR]; };
   lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; };
   landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; };
   landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
@@ -7820,31 +7922,30 @@ in with self; {
   landsepi = derive2 { name="landsepi"; version="0.0.4"; sha256="0b162vdgrd1v93bm5dc5r4nzpcm3cq5iy8v3f2axpx1fk378aaar"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
   languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.3"; sha256="1sh3k8xw88pm93wmpy1qi44i8pv5b5g6ajzas36bdi1bqm8cqzax"; depends=[attempt curl httr rjson]; };
-  languageserver = derive2 { name="languageserver"; version="0.1.0"; sha256="05ph152xrw8qmnb1mwqsq2qx11d6f4g57v9qp1mxi6y11wl21rxq"; depends=[callr jsonlite lintr R6 repr stringr]; };
+  languageserver = derive2 { name="languageserver"; version="0.2.3"; sha256="1rjdmnfgf6nj03ddsak56y6gii8kj2vayri2l26hg1n0ap99z1bs"; depends=[callr jsonlite lintr R6 repr stringr styler]; };
   lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; };
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
   largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
-  largeVis = derive2 { name="largeVis"; version="0.2.1.1"; sha256="14jgfykvawcqmb94zwpss246ljbwf4qdgmpwwfsnplrxs7agycb5"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; };
   lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
   lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; };
   lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
-  latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; };
+  latdiag = derive2 { name="latdiag"; version="0.2-4"; sha256="051chvky3hlfr4hwm9qickl6aaxwnxa88zksmzczqfspby771hq6"; depends=[]; };
   latentnet = derive2 { name="latentnet"; version="2.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
-  later = derive2 { name="later"; version="0.7.1"; sha256="0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz"; depends=[BH Rcpp rlang]; };
+  later = derive2 { name="later"; version="0.7.3"; sha256="04j2phymxgkk4hv9pfa5w3s98w5d7fvm11blrdhxmray4n618msw"; depends=[BH Rcpp rlang]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   latexpdf = derive2 { name="latexpdf"; version="0.1.3"; sha256="1zsdz3nvhifxbhp69nigq1crgm39g6gmc8xl5akp5jdidmzyrh84"; depends=[]; };
   lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
-  lava = derive2 { name="lava"; version="1.6.1"; sha256="11k9npmzp3nk2qx0h1dwwfc37j4ddd9y54bppxby0ffnb8qlpw1k"; depends=[numDeriv SQUAREM survival]; };
+  lava = derive2 { name="lava"; version="1.6.2"; sha256="1r47pps39cgvxhg1s0bqknf4jl91pbb0c76q5icxivhwb172fqcm"; depends=[numDeriv SQUAREM survival]; };
   lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; };
   lavaSearch2 = derive2 { name="lavaSearch2"; version="1.3.3"; sha256="08h9nfbjbq6l5drmq07js2b6ylv29wfrddqdlpsnysi99sj8i8aq"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; };
-  lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; };
+  lavaan = derive2 { name="lavaan"; version="0.6-1"; sha256="0k0mm66i5xfb06rc7b6is16nn7k2limas5mhlr9d5nwbqz87g4i2"; depends=[MASS mnormt numDeriv pbivnorm]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
-  lavaanPlot = derive2 { name="lavaanPlot"; version="0.3.0"; sha256="12j6r98p4ghcnk813s2z9r1mlwzkp6jyxjllk5nl554h5s5jg92i"; depends=[DiagrammeR lavaan]; };
+  lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; };
   lawn = derive2 { name="lawn"; version="0.4.2"; sha256="17nj88n5xzhjkwm0hi8g9h5a3nclvkq3k1pv3690ph14g4l9lgcj"; depends=[jsonlite magrittr V8]; };
   lawstat = derive2 { name="lawstat"; version="3.2"; sha256="03ppzyx3x6vx1n2k5l8gl9j2q2mnqa1im5smxnrlncan7yzjy7sf"; depends=[Kendall mvtnorm VGAM]; };
   lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
@@ -7860,27 +7961,25 @@ in with self; {
   lbreg = derive2 { name="lbreg"; version="1.2"; sha256="0wcw5w07fgmxwzmamf380l8vxw9fnxhbrhcwwfy6x87xby3bzr1b"; depends=[MASS]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
   lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; };
-  lcmm = derive2 { name="lcmm"; version="1.7.8"; sha256="180xfx842sic5qnfr0zh2h4345zkzlf123pdw4q6gd0mi5smwwc7"; depends=[survival]; };
+  lcmm = derive2 { name="lcmm"; version="1.7.9"; sha256="15x8i7cvifbrb64cqjng0hvk6ajnla0yakj4pfd8d4s20nzivij4"; depends=[survival]; };
   lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; };
   lctools = derive2 { name="lctools"; version="0.2-6"; sha256="06hhz0sjdrci1li03f09wij1qrl74sla2938fbkx72ffy0mdg310"; depends=[MASS pscl reshape weights]; };
   lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
   ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; };
-  ldat = derive2 { name="ldat"; version="0.1.0"; sha256="1ga96m1sl7khhwi41ab07k02ay4w8vzi5cl895h9kfavgbhqsf6m"; depends=[BH lvec]; };
+  ldat = derive2 { name="ldat"; version="0.2.0"; sha256="04l544js7xzaywd2mj3kcz40gxn98primzmzd1ihk35lqmpd7h8y"; depends=[BH lvec Rcpp]; };
   ldatuning = derive2 { name="ldatuning"; version="0.2.0"; sha256="18nm4hj7733c1cp03hyddnivhiiyv7ndnw9m6j3af019jjmvf215"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
   ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; };
   ldbounds = derive2 { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
   ldhmm = derive2 { name="ldhmm"; version="0.4.5"; sha256="1pax1hl0h07nc9d34pf0jqgpcxr7y7dpqcm2hlclrmsinhj9q8vi"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
-  ldlasso = derive2 { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
   ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
-  ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.1"; sha256="152dlphxxzllgf7al8k34qcfg6n8ajxqym62i61ahbbgjlcd0x9r"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix qvalue RBGL robustbase VGAM]; };
   leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; };
   leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
   leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; };
-  leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
-  leaflet_esri = derive2 { name="leaflet.esri"; version="0.2"; sha256="18y3hzbn4apn209rww8hk4mkx5ix6b6z01ydr31d39bqlgg6n7zf"; depends=[htmltools htmlwidgets leaflet leaflet_extras magrittr shiny]; };
-  leaflet_extras = derive2 { name="leaflet.extras"; version="0.2"; sha256="1baxcgcxizyf05w8gb5zjmvrsbrhpwvrxrblcv5vpy4vk73921v1"; depends=[htmltools htmlwidgets leaflet magrittr shiny stringr]; };
-  leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.2"; sha256="028nw9nh4q3lkw9kr4lgs78wnm79ynkjx7f215ch42183nfzlypi"; depends=[htmltools leaflet]; };
+  leaflet = derive2 { name="leaflet"; version="2.0.1"; sha256="01ngvwj2w0hlxz24x32ffwkcd5rrbm1w57mp7mlaapi3yfnxaxlq"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
+  leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; };
+  leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; };
+  leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.4"; sha256="17lrchpry3in36jdkinsxs9lzqnx65xyk9g939knc8nmjw6z2j2r"; depends=[htmltools leaflet]; };
   leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
   leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
@@ -7888,29 +7987,30 @@ in with self; {
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
   learningCurve = derive2 { name="learningCurve"; version="1.1.2"; sha256="02dl5rlvwa8dvhknf4kdfg3aial54shnxrq7k2k8yj2dj0qh062c"; depends=[ggplot2 gridExtra scales tibble]; };
   learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
-  learnr = derive2 { name="learnr"; version="0.9.2"; sha256="1z04c1djg7ghsl7p9ypc6k5m7snahnmjy10xmrzqfayx1wkfkn9n"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
+  learnr = derive2 { name="learnr"; version="0.9.2.1"; sha256="0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
   learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
   learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
+  leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; };
   lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-  lemon = derive2 { name="lemon"; version="0.3.3"; sha256="0jxcyplr69a3rganqc02ry57xj7is7dylsh9kvsy6kwnji6bvdib"; depends=[ggplot2 gridExtra gtable knitr lattice]; };
+  lemon = derive2 { name="lemon"; version="0.4.1"; sha256="16zr2xg72vxplrvsrrz2fp0akqs4am1k2ymk4mdn2yzzby41dn40"; depends=[ggplot2 gridExtra gtable knitr lattice plyr]; };
   lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; };
-  lessR = derive2 { name="lessR"; version="3.7.2"; sha256="0rmfrwp6hznivj8809n21ihriq33264yj82l3ii7kil1i3vmac3n"; depends=[ellipse foreign lattice latticeExtra leaps openxlsx png robustbase sas7bdat triangle]; };
-  lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
+  lessR = derive2 { name="lessR"; version="3.7.5"; sha256="1irsi3i6kih7mdkwvd42dknhgz16v7mdrdvfqsrqa85cshpl7aad"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png robustbase sas7bdat triangle]; };
+  lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
   lexRankr = derive2 { name="lexRankr"; version="0.5.0"; sha256="1l0p4qg6lcpp1f2n6mh1glvxzy3bis0c1ra8x9z5v26x31wmwq68"; depends=[igraph Rcpp SnowballC]; };
-  lexicon = derive2 { name="lexicon"; version="0.7.4"; sha256="1f2n90xdpbxk6ffzzlib7fxxswwkfrpf404vzx85s016529dy42m"; depends=[data_table syuzhet]; };
+  lexicon = derive2 { name="lexicon"; version="1.0.0"; sha256="0wgf5gvmvybdsijnm4hqkigzr25p3i50y3mxp98cngrm1nqdiq7m"; depends=[data_table syuzhet]; };
   lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; };
   lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
-  lfe = derive2 { name="lfe"; version="2.6-2291"; sha256="1hdzq85y1nxrinikf308mvdmyw883bfzbamr27ffdphlk403ry70"; depends=[Formula Matrix sandwich xtable]; };
+  lfe = derive2 { name="lfe"; version="2.8"; sha256="138lnrag64hwjgcsyp9y56kq4gby5c9dqfcsl88b7j02hfly7kfv"; depends=[Formula Matrix sandwich xtable]; };
   lfl = derive2 { name="lfl"; version="1.4.1"; sha256="0r9459mmnx1khpw24w943y1x4xl3zcws2cvv61216yzb0xbqwhc0"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
   lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; };
   lg = derive2 { name="lg"; version="0.1.0"; sha256="0gaid5aihc9dk3igbm8jhsspl1k4k3prqvn7j2vsm92jc7m00iyw"; depends=[ggplot2 ks localgauss logspline mvtnorm]; };
   lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
   lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; };
-  lgcp = derive2 { name="lgcp"; version="1.4"; sha256="10gnfqq5vx18w6f52fliyfnrjmyns9q5q59pn2m82q2fqwaz26d8"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; };
+  lgcp = derive2 { name="lgcp"; version="1.5"; sha256="1n1f87qg0y9r22p3q1qjnfrs7xarvsidgqgg6v2bsb55viwy11g3"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; };
   lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; };
   lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; };
   lhs = derive2 { name="lhs"; version="0.16"; sha256="09clh386i5iig8x36lx02p01zqq0kb9hzvw5slv1ggmjnp1rklcw"; depends=[]; };
@@ -7919,13 +8019,14 @@ in with self; {
   librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; };
   libsoc = derive2 { name="libsoc"; version="0.6.4"; sha256="1hdnqgnvzm5116gphxa55k2bc3ksr607px2s2yg1ilmmxdghdccw"; depends=[]; };
   libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; };
-  lidR = derive2 { name="lidR"; version="1.4.2"; sha256="1m37ncyj2z9yh40qzl4h3s4dpizmfqz8n0fcybpjjhi8yr3lipdf"; depends=[data_table future gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; };
+  lidR = derive2 { name="lidR"; version="1.5.1"; sha256="0r6y07ciajn13rhb8n57xnj1lzvz3hvjb4hm29hxclny93c45l16"; depends=[data_table future gdalUtils geometry gstat lazyeval mapedit mapview memoise RANN raster Rcpp rgeos rgl rlas settings sp]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.2"; sha256="012pfiz4l8xrwrjlzwfc0vxw1wpw2n2f2vj39mlpmg5aswg4mm8k"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; };
   lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; };
-  liftLRD = derive2 { name="liftLRD"; version="1.0-6"; sha256="1mnrhdig7kb7g6ffw7x9l8bpn66y7bh3n6ds5r2gb3nplnidi45y"; depends=[adlift nlt]; };
-  liftr = derive2 { name="liftr"; version="0.8"; sha256="1z5n7xfmaymkz9pl6pbss351dy626nd0m1wn4jpbxvx74fw99a1y"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
+  liftLRD = derive2 { name="liftLRD"; version="1.0-7"; sha256="18gcp5b5jmx37ri4b3nnqvsd0crk5wp53dh5p50arflzw0pn7qn1"; depends=[adlift nlt]; };
+  liftr = derive2 { name="liftr"; version="0.9"; sha256="1yg9ql6rklrdcd2qds223naryg3rbdi1mbqrlf5jc3cwzhllcsa9"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
+  liger = derive2 { name="liger"; version="0.1"; sha256="0q26qdy7kgqj70ka2gcpji8ni2w8kxnznhp4ig2251xllw9j7dz4"; depends=[matrixStats Rcpp RcppArmadillo]; };
   lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; };
   likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
   likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
@@ -7943,23 +8044,24 @@ in with self; {
   linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; };
   linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; };
   lineup = derive2 { name="lineup"; version="0.37-10"; sha256="1w45ll6phynn03ala0wadmp06rrgg8rcqnhz7hqy4w6q7khbkk6r"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.0.12"; sha256="03rjnr4hy7im88pawrd86nas0fzkgz3mnzdc8rclcfbbv1vyzxf5"; depends=[leaflet leaflet_minicharts magrittr MASS rowr sp stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.13"; sha256="1v6n2wdz5zkkc1k88jpjrh6nwias496dg2vvglrjd7g4bymb7715"; depends=[leaflet leaflet_minicharts magrittr MASS rgeos rowr sp stringdist]; };
   link2GI = derive2 { name="link2GI"; version="0.3-0"; sha256="0jzk1p9cygcw0xz9hqfzx74acl4ymn3jmcjj0dxrmknsvfdzcl2d"; depends=[gdalUtils raster rgdal rgrass7 RSAGA sf sp]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
   linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linl = derive2 { name="linl"; version="0.0.2"; sha256="1n3sljyycsppk11ri9jijsif3g7v4n8xvk1n4hhx0qg65kh7wmry"; depends=[knitr rmarkdown]; };
+  linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
   lintools = derive2 { name="lintools"; version="0.1.1.4"; sha256="18rqpm0cg233hclcqskdh3mfpwpbawc582j800mjalii233jzr36"; depends=[]; };
   lintr = derive2 { name="lintr"; version="1.0.2"; sha256="14l6fi2mdc2swi4xw865q63yngk2b5k553qbyvnhmwq2w4pv07pn"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
   liquidSVM = derive2 { name="liquidSVM"; version="1.2.1"; sha256="0nw8n4qg2jijbnlza15ifzqsl4pj7gjzi4nd71zp7h0aw5mnp80x"; depends=[]; };
   lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; };
-  liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
   lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
   list = derive2 { name="list"; version="8.3"; sha256="1wffh7xmhdf4hqbpz4ij0759zk0y0zsm160kzfcr2n8s9wdgm5gj"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
   listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; };
+  listarrays = derive2 { name="listarrays"; version="0.1.0"; sha256="06siz7ph9ihjv9y97bd02xibkw4qr548cv3yqjqzqw245jzxvhv7"; depends=[]; };
   listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
   listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; depends=[]; };
   listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; };
@@ -7967,7 +8069,7 @@ in with self; {
   liteq = derive2 { name="liteq"; version="1.0.1"; sha256="080ljgb2qsfmyppnlp9acmskgq94pmdbbgbhygqkxvzda5bbas8h"; depends=[assertthat DBI rappdirs RSQLite]; };
   littler = derive2 { name="littler"; version="0.3.3"; sha256="1cbsnm4ffzld93b9q8g6g6h6yskjfwa8j1xani5682ipb7r290x7"; depends=[]; };
   liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; };
-  live = derive2 { name="live"; version="1.4.2"; sha256="0f04glaji3yy16mlwmizr4c7ykngqnfk7j2zx8smfn2n6biv6qg3"; depends=[breakDown data_table dplyr forestmodel ggplot2 lubridate mlr]; };
+  live = derive2 { name="live"; version="1.5.7"; sha256="018k2l3klhkxsb6b8xvrvxajgahb6zd02cngkkayfz2477iy8kdl"; depends=[breakDown data_table dplyr forestmodel ggplot2 lubridate MASS mlr shiny]; };
   livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; };
   ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; };
   llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
@@ -7977,22 +8079,22 @@ in with self; {
   lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
   lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; };
   lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; };
-  lmQCM = derive2 { name="lmQCM"; version="0.1.0"; sha256="0y02pbvl5qbfwnhyzilbcpswwmmq0x47ggpg7pcnhd3dv4b6w6zm"; depends=[Biobase genefilter nnet]; };
-  lmSubsets = derive2 { name="lmSubsets"; version="0.1"; sha256="0lkccpk2rxv7dlm4jlk9y3cl3s4cdlfi6schvndrk69glcx0v0zd"; depends=[]; };
+  lmQCM = derive2 { name="lmQCM"; version="0.1.1"; sha256="1rznr5ky9ngfl8afqh22r4bxkzjyibrwr62f30dcdvpyh863hj0h"; depends=[Biobase genefilter nnet]; };
+  lmSubsets = derive2 { name="lmSubsets"; version="0.3"; sha256="1d78gbmxybxb98lapy5m7nyxc7slyxlj50xdh6a4nyckixmf9plp"; depends=[]; };
   lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
   lme4 = derive2 { name="lme4"; version="1.1-17"; sha256="0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
   lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
   lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
   lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
+  lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; };
   lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
-  lmem_gwaser = derive2 { name="lmem.gwaser"; version="0.1.0"; sha256="0i315plqq1c8d7nvzk7jj9b3n4pgy27673pgdbii4c5bccwm12vn"; depends=[fdrtool genetics lattice LDheatmap lme4 pastecs qtl stringr]; };
   lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; };
   lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; };
-  lmerTest = derive2 { name="lmerTest"; version="3.0-0"; sha256="08n6zdyxjbch8vf4gbp339yirf3ixxdhhai8iafxf3f1q2gcr52v"; depends=[ggplot2 lme4 MASS numDeriv]; };
+  lmerTest = derive2 { name="lmerTest"; version="3.0-1"; sha256="0pia69sc8bn37mkiprdf91iilziqb865f94k6x6c26i33fg7rq4m"; depends=[ggplot2 lme4 MASS numDeriv]; };
   lmeresampler = derive2 { name="lmeresampler"; version="0.1.0"; sha256="00v3qg5vyjjb0pcbrknzxy80kkwsypkhwkv3nsck5rscaf86y3aq"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; };
   lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
   lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; };
-  lmm = derive2 { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
+  lmm = derive2 { name="lmm"; version="1.2"; sha256="1xymcizqfqh2jp0rxgfgniflyqzgcwg04g9mllva5xgc1ydcg69k"; depends=[]; };
   lmmen = derive2 { name="lmmen"; version="1.0"; sha256="0c1yy991bff1hp47rg89j5811l50kb9pdf76834jxh38dr3b4lsw"; depends=[glmmLasso glmnet lme4 lmmlasso mvtnorm quadprog]; };
   lmmlasso = derive2 { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
   lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; };
@@ -8005,18 +8107,19 @@ in with self; {
   lmomco = derive2 { name="lmomco"; version="2.3.1"; sha256="0nyl18kipsab4ka5ywbmw28kkr6i09w4lc9pa96m1fh765zghjxi"; depends=[goftest Lmoments MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.1"; sha256="1r4g7482iz4b7jk0gj169bj96ip2wyrff1ndkwhf0qzg6r6vqa8d"; depends=[]; };
   lmtest = derive2 { name="lmtest"; version="0.9-36"; sha256="0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy"; depends=[zoo]; };
-  lmvar = derive2 { name="lmvar"; version="1.4.0"; sha256="0pwpsdmqjlj79ybx5rw82qgkjzak941d9vvdzwipjh8n51mcvwcd"; depends=[Matrix matrixcalc maxLik]; };
+  lmvar = derive2 { name="lmvar"; version="1.5.0"; sha256="068ib0abpvds0ibb0d6m71svv7d3l0is4kdin1wzsn633kk3zcfy"; depends=[Matrix matrixcalc maxLik]; };
   loa = derive2 { name="loa"; version="0.2.43.3"; sha256="0krrv5sicm4xvgilri8nwby6jlidx375b4sk273hxq7bhayw4hqq"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
   localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; };
   localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
   locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
   locfit = derive2 { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
   locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; };
-  locpol = derive2 { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
+  locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; };
   lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; };
-  loder = derive2 { name="loder"; version="0.1.2"; sha256="15bgspig46nspnslazjgwv54kscimn3zzda6fqcmld3zjhcwl333"; depends=[]; };
+  loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; };
   loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; };
   log4r = derive2 { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
+  logKDE = derive2 { name="logKDE"; version="0.1.0"; sha256="1jp36v8dfdli85lzcya4nvw17fjrsfldm8v487k1s1d1s9qz55vl"; depends=[pracma Rcpp]; };
   logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; };
   logbin = derive2 { name="logbin"; version="2.0.3"; sha256="0jvld5lh69288g80ypvqyg0s0nip9hgd8p09b91xp11vnlap0g02"; depends=[glm2 turboEM]; };
   logconcens = derive2 { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
@@ -8026,16 +8129,16 @@ in with self; {
   logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
   loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; };
   loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; };
-  logiBin = derive2 { name="logiBin"; version="0.1.0"; sha256="146jh5cpydpvv8g3ccrglm88zp8sam4airw521cxcfyg5v8qvdqs"; depends=[data_table doParallel foreach iterators partykit]; };
+  logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; };
   logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; };
   logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; };
   logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; };
   logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; };
   logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
-  logitnorm = derive2 { name="logitnorm"; version="0.8.35"; sha256="0bpj3dsxqwx96ffbx8479271nbf30pfvl7914m5af8hacqlga912"; depends=[]; };
+  logitnorm = derive2 { name="logitnorm"; version="0.8.36"; sha256="0iag05fhzrizi74bjkl909ky7zxi9yzqx6im2ki86bpczijyfxb8"; depends=[]; };
   loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
   logmult = derive2 { name="logmult"; version="0.6.5"; sha256="0ak13nfgaima6g75rxbghl7xmagfp4qshj09x1fxh2r2rcags7dk"; depends=[gnm qvcalc]; };
-  logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; };
+  logspline = derive2 { name="logspline"; version="2.1.11"; sha256="0747xl0p6kigc936kyqxqgmwxsh01lb9913w7wq0q05766pnw7kq"; depends=[]; };
   lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; };
   lolR = derive2 { name="lolR"; version="2.0"; sha256="0ygxm5qym1s64pa8a04jf44y786svrkhscda2x781jx8gpil753v"; depends=[abind ggplot2 irlba MASS pls]; };
   lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
@@ -8063,10 +8166,11 @@ in with self; {
   lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
   lpdensity = derive2 { name="lpdensity"; version="0.2.2"; sha256="1fv1biyc12zg0wfqcr5kp761fy6n6879knvlxr2zjp6rjssi3h6d"; depends=[ggplot2]; };
   lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
+  lpirfs = derive2 { name="lpirfs"; version="0.1.0"; sha256="0xkm6ds44v3g0vnh6nribysg1fbphgx81zklx82xmi5cvl5z69c1"; depends=[doParallel dplyr foreach ggplot2 mFilter Rcpp RcppArmadillo vars]; };
   lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; };
   lpme = derive2 { name="lpme"; version="1.1.1"; sha256="0si90nkgl8bqk8yvd2igdsrngiwqh8891072pfpzipifnd0f5448"; depends=[decon flexmix locpol Rcpp RcppArmadillo]; };
   lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
-  lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
+  lpridge = derive2 { name="lpridge"; version="1.0-8"; sha256="0jk4l95z9rcdqkc8lpp4sf1mg2dqj67rhqw1iafrxy5lx4jfaqqx"; depends=[]; };
   lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
   lqmm = derive2 { name="lqmm"; version="1.5.4"; sha256="117g38m650mi28ff19nd71dadbdphd1ladmrip2kbsnkpcz2q37p"; depends=[nlme SparseGrid]; };
   lqr = derive2 { name="lqr"; version="1.7"; sha256="110c18wc3y3nkdwjgrksw20kvvy65822njrpy4gwb100ifigw0v7"; depends=[ghyp spatstat]; };
@@ -8082,7 +8186,7 @@ in with self; {
   lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; };
   lslx = derive2 { name="lslx"; version="0.6.2"; sha256="0girzjmkmqym5bnw492991smyhvlz7xw70n8hlswpa4lw3x15q2n"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
   lsm = derive2 { name="lsm"; version="0.1.6"; sha256="1j68jvb7gvgr77wpq1gzh1jw3cs94im1zrlnvw4jnbgbzsmpql99"; depends=[]; };
-  lsmeans = derive2 { name="lsmeans"; version="2.27-61"; sha256="0qw4lkgaynld56ywvdyy5nqvq7c6r2v24gsy54rkcw2n4xhlnahm"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
+  lsmeans = derive2 { name="lsmeans"; version="2.27-62"; sha256="1db9ldk8maj8qr2ha3aa5bz01wv4irkiw561fzjcm9slb0iz1k7z"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
   lspartition = derive2 { name="lspartition"; version="0.1"; sha256="1c2wp9yl0jzvbh181flzywwqmm6xr5jg9qbfibw4ja9wf6xnfx8w"; depends=[combinat ggplot2 MASS matrixStats mgcv pracma]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
   lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
@@ -8101,14 +8205,15 @@ in with self; {
   lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; };
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
   ludic = derive2 { name="ludic"; version="0.1.6"; sha256="0srs3bx9cw89mlpg8b8vcmz2gnsv729j3n23pnnxgbh2w7xf705b"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
+  lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; };
   lulcc = derive2 { name="lulcc"; version="1.0.2"; sha256="1vlaidyqgx5vnf8w2y1a1jmmq7z4195avnv1mryhh414r5r1kpy0"; depends=[lattice raster rasterVis ROCR]; };
   lumberjack = derive2 { name="lumberjack"; version="0.2.0"; sha256="0yn6482wrwinabys3awp0jjnzs6mnv29jjpvr980m1jm15nwva4g"; depends=[R6]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
-  lutz = derive2 { name="lutz"; version="0.1.0"; sha256="1yf1bd005nhr5afwzs9y9h36q6hs93c8bfhgjwjvhsjrdl3rz26i"; depends=[V8]; };
+  lutz = derive2 { name="lutz"; version="0.2.0"; sha256="1ypi61b0l5pig2lvvq9lmqkqcsxhnf154lxridp0amv5rcmf2fxy"; depends=[V8]; };
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
-  lvec = derive2 { name="lvec"; version="0.1.1"; sha256="1mpw01z0n0cql451qmi0b77pbfkhx6jyc4zzs5nl82jb6x3y20wn"; depends=[BH]; };
+  lvec = derive2 { name="lvec"; version="0.2.2"; sha256="0n1l26n4khlalqd0b9bi7vc3kr5jh6mr56ca0rmnnl6bl9742nr5"; depends=[BH Rcpp]; };
   lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
-  lvnet = derive2 { name="lvnet"; version="0.3.2"; sha256="0ynp7399q98dgh51fkw1r1z8iy3qm41ny887a955n8kp8pp9l737"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
+  lvnet = derive2 { name="lvnet"; version="0.3.3"; sha256="14jik7kxljlpk0fp3gmy0i6by78higmqz1n88dy8wczcvms66ci0"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
   lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; };
   lwgeom = derive2 { name="lwgeom"; version="0.1-4"; sha256="0x58a04sklrr6vr38hbd2900b3bigdfj7zyk6pzj9y7yy5mr2cjg"; depends=[Rcpp sf units]; };
   lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; };
@@ -8136,6 +8241,7 @@ in with self; {
   macleish = derive2 { name="macleish"; version="0.3.2"; sha256="1kna1wq3p6xfzfdhw8dpdfvy4l656xcrra1f0ir86a815pm2a8l3"; depends=[dplyr etl lubridate readr rgdal rgeos sp]; };
   mada = derive2 { name="mada"; version="0.5.8"; sha256="17d41kpxjf6h8j83w6jhxm71f03nc8i2aw0xaqzrpcf5rxxy8wv8"; depends=[ellipse mvmeta mvtnorm]; };
   maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
+  maditr = derive2 { name="maditr"; version="0.5.1"; sha256="029jhapxssnrnmdf8cmdaw87gdd970538jvz6cq9k9iavw7zki7y"; depends=[data_table magrittr]; };
   madness = derive2 { name="madness"; version="0.2.3"; sha256="0qmqgrjxb0853m9kdi8cl1b9q9dljdi2zylw22asfv77f323413z"; depends=[expm Matrix matrixcalc]; };
   madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; };
   madrat = derive2 { name="madrat"; version="1.22.1"; sha256="0wk2svhi4209p8ab8i2g9q22kswpisphb2a9ln5lzwdhnryk4ya9"; depends=[digest magclass spam stringr]; };
@@ -8147,14 +8253,14 @@ in with self; {
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="1.8"; sha256="0qi86fhqaxad9bbigfv1czxhxqi3x49376pyhfkw7lc7r2fxkx6y"; depends=[curl knitr magrittr Rcpp]; };
+  magick = derive2 { name="magick"; version="1.9"; sha256="1z6wci73kaqp3ky0pfzq9mifrhs3fdsnlzqx57c3f7aryh6f2ry2"; depends=[curl knitr magrittr Rcpp]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
   mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
   makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; };
   makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
-  makedummies = derive2 { name="makedummies"; version="1.1"; sha256="1qpkghlgkzpzai290kidkmwhn4aj0balb17rs2l5amsml942lq0a"; depends=[]; };
+  makedummies = derive2 { name="makedummies"; version="1.1.1"; sha256="0aqf7hfbajfsszmqx1id8pp8yj6fzvdsdis9z4s87llf0vxq4agl"; depends=[]; };
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
   malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.1"; sha256="1c1bvfs1azvlci2yrgw5xlr460fdjwikm3vsdfz8lj1xzs1w220c"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal sp stringi tidyr xml2]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
@@ -8163,9 +8269,9 @@ in with self; {
   manet = derive2 { name="manet"; version="1.0"; sha256="1hb5mv05zcv4s2bpyh3vgkyf4r78fyvcwl3p1kwlwqn9cv1lgci2"; depends=[combinat igraph MCMCpack]; };
   mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; };
   manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; };
-  manifestoR = derive2 { name="manifestoR"; version="1.2.4"; sha256="1hd4qsa2xsa1dq5jnwh1bph34glkpaabjmsnavdjhkfzjilp32ya"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; };
+  manifestoR = derive2 { name="manifestoR"; version="1.3.0"; sha256="1bxmlg6fmr4ky9m7b65rrylspwhwc8k9s1cbxnx9dyl33wh39ci6"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; };
   manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
-  manipulateWidget = derive2 { name="manipulateWidget"; version="0.9.0"; sha256="18zk1f3dk63crpfpljafakdvfvd0494kbws0dwahwfr60avvvx2v"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny]; };
+  manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.0"; sha256="1zagrbwkn2d50zzw8i2vyb1hsq4cydmfsqiy1a2qlp6zrv8a6q9x"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; };
   mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
   mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; };
@@ -8173,40 +8279,42 @@ in with self; {
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
   mapfuser = derive2 { name="mapfuser"; version="0.1.2"; sha256="1q7l6rfs6dv76ifizfqq4pdpjpb2zwzd3vvrnhdzh8vw2mrlqcjg"; depends=[doParallel dplyr foreach ggplot2 igraph lazyeval LPmerge mgcv plotly stringi tidyr visNetwork]; };
   mapmisc = derive2 { name="mapmisc"; version="1.7.2"; sha256="0w0yvdnxk6gjcc86b6imq764va9f9hjan3ayw7qrbjpqx16fs7dx"; depends=[raster sp]; };
-  mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
+  mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; };
   mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; };
   mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
   maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; };
+  mapsRinteractive = derive2 { name="mapsRinteractive"; version="0.1.0"; sha256="1qjc5hffrk2bjw6ihlna1h0k3q9s9i19l0q0mgvcm9wpjy4c8gra"; depends=[gstat raster rgdal rgeos sp]; };
   mapsapi = derive2 { name="mapsapi"; version="0.3.5"; sha256="0v33kkny98xql6m6rp2xh39rsp00r1crpin8gqw5wh5x28n20sna"; depends=[bitops magrittr plyr sf xml2]; };
   maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
-  mapview = derive2 { name="mapview"; version="2.3.0"; sha256="07sp891j8dqryjibwdnb2j0d5kjnbndl13hgazqrk5rg4phj0hl5"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; };
+  mapview = derive2 { name="mapview"; version="2.4.0"; sha256="0gm9swj2i9f6wk0lc4kpr2f1171lys9pbycw272h3l984x8syy61"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; };
   mar1s = derive2 { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
   march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
   marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
-  marelac = derive2 { name="marelac"; version="2.1.6"; sha256="024gbrdby6h722j58wl8xn8027sanlpnz1l3hhxnllwzbz3mbdz4"; depends=[seacarb shape]; };
+  marelac = derive2 { name="marelac"; version="2.1.9"; sha256="07xhlsdzz2j5smh3v4hpm8zp4ljg9aa3i67j65hs1cq27q1jg1n7"; depends=[seacarb shape]; };
   marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; };
-  margins = derive2 { name="margins"; version="0.3.0"; sha256="0i6c39acyyvxsx2lkza2afjyhpdlb9fx0zssr24g0xdk3f7c2dc2"; depends=[MASS prediction]; };
+  margins = derive2 { name="margins"; version="0.3.23"; sha256="1gn18bmz7zwdv5fm62g4kj1x0y4lzhwvwgk4xc9hfi2mh5w08j4f"; depends=[data_table MASS prediction]; };
   marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; };
   marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; };
   markdown = derive2 { name="markdown"; version="0.8"; sha256="1vcgsh2m2f5kfgappgg71nbf04ff0j1sbk668krjs3r2n89dk3sk"; depends=[mime]; };
   marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.8.1"; sha256="1y388s73b1zs482d1d7z40kg4hizp46lc3279xspm2ryx4m49mzj"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.6"; sha256="1gyj3ykwh4ljrb5s80hihy7wl89y3p4xkckspvv4ynl9lnsbm7cs"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.6.9.8-1"; sha256="1av89829fwnf2bll7b75v2vrglw4130d5c42c3i1fiqh54jxjy7k"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.6.9.11"; sha256="0mmsj5vskbp7cs28iak5wmvx6ixq9xdd14niv7iixa19mmwc8p1d"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
   marmap = derive2 { name="marmap"; version="1.0"; sha256="187zqmpdd4kl5dviphfzdhjlaa9bss1gx4wxxc8zgn4q1g66f4c2"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
-  mason = derive2 { name="mason"; version="0.2.5"; sha256="1v2gja8kbwzx5c8y8gchh4rwwprv99ad0nhgb0hnfgjnqsbdmdv7"; depends=[assertive broom dplyr lazyeval magrittr tidyr]; };
-  matchMulti = derive2 { name="matchMulti"; version="1.1.6"; sha256="05nkrncrf7vq2bmqbhm9n6p6cyb4drbhjrrfdcw6qcdgvh3bbiy0"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
+  mase = derive2 { name="mase"; version="0.1.1"; sha256="1s8hcsz3ja3rghsv0fz82mlz4sx7dwx8y7h97minhrnj9aby9g82"; depends=[boot dplyr foreach glmnet magrittr MASS Matrix Rdpack rpms survey]; };
+  mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; };
+  matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; };
+  matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
   matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; };
   matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-5"; sha256="083gnqjxvzgqd0lvg13qwzw3cp1imp4xn2nacspfxqg4878jjpn3"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
   matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; };
   matconv = derive2 { name="matconv"; version="0.3.2"; sha256="0vnmqz5vzv5n0cfpgr30gkl0pv8p2b5cp3ap6mn01sxd671lx38z"; depends=[]; };
   mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; };
-  mathgraph = derive2 { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
-  mathpix = derive2 { name="mathpix"; version="0.2.0"; sha256="0a2yybhim2l08n03505ks8vzk8w8azlz3pngsczzd42dqfdphi9q"; depends=[base64enc httr magick purrr rstudioapi texPreview]; };
+  mathpix = derive2 { name="mathpix"; version="0.3.0"; sha256="1a49yda4r9a6pbs641ch2kmxg3pf8zxfrfi30r19z6g15jfgdrvf"; depends=[base64enc httr magick purrr rstudioapi texPreview]; };
   matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
   matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
   matlabr = derive2 { name="matlabr"; version="1.5.0"; sha256="0gy639fv0b85h4z96b2b3m635q4w62q63kfxfqny3pwr0r5vsc2p"; depends=[stringr]; };
@@ -8230,18 +8338,17 @@ in with self; {
   mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; };
   mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; };
   mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; };
-  mbbefd = derive2 { name="mbbefd"; version="0.8.8.1"; sha256="0akga4p8nj5nnfv18gk84mhl2nd6s10k1c1rh730sd44qm6zpiai"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
+  mbbefd = derive2 { name="mbbefd"; version="0.8.8.2"; sha256="1168r9gkz3z1qzh3pjh8s0wlpwlrk2rr1p91ldch9c001ym9y6mz"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
-  mbest = derive2 { name="mbest"; version="0.5"; sha256="0l6vmcqkd2b0b90jmsswrhbdmhq2x92g7sr2l99rp7xp1cxdq02w"; depends=[bigmemory foreach lme4 logging nlme]; };
+  mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; };
   mbgraphic = derive2 { name="mbgraphic"; version="1.0.0"; sha256="0b4xr2ycx8v56fp40lnxv69qfp0yzai2hdwk3kw4wsmir91d2a91"; depends=[diptest dplyr extracat GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; };
-  mbir = derive2 { name="mbir"; version="1.1"; sha256="0nn4spw8bx0wnshwnph06wxdshxxcs100d5wh0apwrhz3w8xv2x6"; depends=[]; };
+  mbir = derive2 { name="mbir"; version="1.3.1"; sha256="0wprbgjf02ybjn3yakyvz0niv2szarlmmcizdyjsaksh21byd46x"; depends=[]; };
   mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
   mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-  mboost = derive2 { name="mboost"; version="2.8-1"; sha256="163pf6dhl46w9n069pybqqc8khafhdkqhf9fmm095g66ypdbga4n"; depends=[lattice Matrix nnls party quadprog stabs survival]; };
+  mboost = derive2 { name="mboost"; version="2.9-0"; sha256="0hfw69h3j4hwwrdinmazl4abhij2drki5jp9i9qz30gyy16wf0f2"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
   mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; };
   mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
-  mcIRT = derive2 { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; };
   mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; };
   mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; };
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
@@ -8250,17 +8357,18 @@ in with self; {
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
   mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; };
   mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; };
-  mcga = derive2 { name="mcga"; version="3.0.1"; sha256="0q0nn881lii8wfw28k8jh9z0kbi5ljcwi2wpq460k2w3agsjzw5n"; depends=[GA Rcpp]; };
+  mcen = derive2 { name="mcen"; version="1.0"; sha256="0dgic137n3qvxljj3f7j3kq3x2rkblxzg55hjbknspwp0i7i4lx8"; depends=[faraway flexclust glmnet Matrix]; };
+  mcga = derive2 { name="mcga"; version="3.0.3"; sha256="109m01mab5awjf8zjzwl9j7hzac15dyq3x6zba9hsy5i02k5d5w4"; depends=[GA Rcpp]; };
   mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
   mcglm = derive2 { name="mcglm"; version="0.4.0"; sha256="0k5zkdq3c4fvyhk0lfwikmrxcrd2hg3s820l8rswz7xhl645zr5a"; depends=[assertthat Matrix]; };
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
   mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
-  mclogit = derive2 { name="mclogit"; version="0.5.1"; sha256="1qnkkjq7gxivpz3mmbq5dx9a128r3xhrdzx96kc80h3w67yc7hbl"; depends=[Matrix memisc]; };
-  mclust = derive2 { name="mclust"; version="5.4"; sha256="1i3v1q8qq0al3ifvjhcvxfsg68cx9mq8jz67jwmiqai78mw0aqvk"; depends=[]; };
+  mclogit = derive2 { name="mclogit"; version="0.6"; sha256="13n3xbdjbpj0ddq9jv2ssd6llrif38ala6c4schih0328cklgpcj"; depends=[Matrix memisc]; };
+  mclust = derive2 { name="mclust"; version="5.4.1"; sha256="1vcl4nl8by2vj2k9k84imy5m850khkgd8q02a8ica1h8vz9ijgn4"; depends=[]; };
   mclustcomp = derive2 { name="mclustcomp"; version="0.3.0"; sha256="02j87p2z9z3b8kxnvnm1syjpv6axcs09fs3mnrl1n2q6jyc4gwsr"; depends=[Rcpp RcppArmadillo Rdpack]; };
   mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; };
-  mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
+  mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; };
   mcmcr = derive2 { name="mcmcr"; version="0.0.1"; sha256="0g64df8v6snbcmk0kynfppq1mqaz9z8apfsm1zn3ch5q2afg0kqy"; depends=[abind checkr coda tibble]; };
   mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
@@ -8275,20 +8383,23 @@ in with self; {
   mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; depends=[class]; };
   mdatools = derive2 { name="mdatools"; version="0.8.2"; sha256="11xlfgcn8gb19alfjp268mlid9g2rl69s1nlm5plwyy5h8x0hvcj"; depends=[]; };
   mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
+  mdendro = derive2 { name="mdendro"; version="1.0.0"; sha256="0pxw4zkv38syajcsbcp5f5wn8bw0ah4ay950iyhql044hlmav99j"; depends=[rJava]; };
   mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; };
-  mdhglm = derive2 { name="mdhglm"; version="1.6"; sha256="1lvckais4c3pbf6zrpfkdlyqhcg4jaw11n00622h9ks413fl788v"; depends=[boot Matrix mvtnorm numDeriv]; };
-  mdmb = derive2 { name="mdmb"; version="0.6-17"; sha256="1ydvfjqid7bsgryr8j77ajmh2q40s3gh67n8027f70pa8amr9fnq"; depends=[CDM coda MASS miceadds sirt TAM]; };
+  mdmb = derive2 { name="mdmb"; version="0.7-19"; sha256="0clygi60wllc04spbm4982qpnsabjapmbjn5k0k9yl1xbd6960g1"; depends=[CDM coda MASS miceadds Rcpp RcppArmadillo sirt TAM]; };
   mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; };
+  mds = derive2 { name="mds"; version="0.1.0"; sha256="16c40m5fmj02is4vw9w284dn9pimlqp905p5ka0jw91krawasd2x"; depends=[lubridate parsedate]; };
   mdsOpt = derive2 { name="mdsOpt"; version="0.3-1"; sha256="0fyzmbaqnj42nhl32cj1kycrqkfx2qvb5vpi0qj98fi6iwsa4psq"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
-  mdsr = derive2 { name="mdsr"; version="0.1.5"; sha256="0b80l478v68w91vsmvvyvnmk0yasybmm013psy4181lhvxc93kma"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; };
+  mdsr = derive2 { name="mdsr"; version="0.1.6"; sha256="1z0sjrvnvm1bgifapmaay57lr5dgj84xzppwn579g8kammaav89x"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL]; };
+  mdsstat = derive2 { name="mdsstat"; version="0.1.0"; sha256="0k7sddnydxy39idk8z1j2632xyikpvdjdcm9xk72k0yj0cw6mr9r"; depends=[lubridate mds]; };
   mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; };
-  meaRtools = derive2 { name="meaRtools"; version="1.0.2"; sha256="1xxw0aq4k5z4i3ndja1rxl9calb8hmp4jv9l79zm33vdlggpkxzg"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
-  meanShiftR = derive2 { name="meanShiftR"; version="0.51"; sha256="0qcciayriygfwkb15n863amcpcfl97fr1sarwm3d269idf5m7w6x"; depends=[]; };
+  meaRtools = derive2 { name="meaRtools"; version="1.0.3"; sha256="03b3267h61kc9xgyl3j2n6i6rmm31rhzdlqa15qifsld23z72rs0"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
+  meanShiftR = derive2 { name="meanShiftR"; version="0.52"; sha256="0mignhiz6vjpjbxg4dkc4g5mnf5mr7ifdpj7ickhspallj6l8508"; depends=[]; };
   meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; };
   measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; };
   measurements = derive2 { name="measurements"; version="1.2.0"; sha256="1k47xmydgd9lhc6phr40zphnibiq817f5nf8619ibla2pridjn1l"; depends=[]; };
+  measures = derive2 { name="measures"; version="0.1"; sha256="1sksgp7csmwx3z981fhi2pf75kkxhfjy2zkdw8ds5iz95hd236ih"; depends=[]; };
   meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
   medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; };
@@ -8304,46 +8415,47 @@ in with self; {
   mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; };
   meltt = derive2 { name="meltt"; version="0.4.0"; sha256="0m0r7in1s8vq2pvq7pxgwjfhqds8pwhcrn5hy0wa126s1y88v34x"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; };
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
-  mem = derive2 { name="mem"; version="2.12"; sha256="0075i2mbkck06bljck44d26ys68p8vjfb1jhgzrjy1sv2g2w0qa8"; depends=[boot dplyr ggplot2 mclust RColorBrewer reshape2 sm stringr tidyr]; };
-  memapp = derive2 { name="memapp"; version="2.9"; sha256="1g53c90yvh34jisbcy5nvch7yyi7yxx7sg32492rk97h6hr2j8qv"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
+  mem = derive2 { name="mem"; version="2.13"; sha256="1k8nda479k7w9jll2wxiasx06nz39vdcz8mssfj33amb6bk874kp"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll reshape2 sm stringr tidyr]; };
+  memapp = derive2 { name="memapp"; version="2.10"; sha256="0kkim1mrajpc7b20snsrmwcki2mc2winha4lq4ybb22s16isw4p0"; depends=[dplyr DT foreign formattable ggplot2 haven magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
   meme = derive2 { name="meme"; version="0.2.0"; sha256="17zpnspc90nlga3iyl4ahasr70mnrhzja4pz7zhmjddhzjs8x3sz"; depends=[ggplot2 magick showtext sysfonts]; };
-  memery = derive2 { name="memery"; version="0.4.2"; sha256="0wfp3hf567a1q6mhrsgn4hr8x52yp4na8783f2d19hm0c3r4z51q"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
+  memery = derive2 { name="memery"; version="0.5.0"; sha256="0bin1rmna5z0y568jbnga7pcrkgjy04av3bzcyf3fpvqqmn36r8f"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
   memisc = derive2 { name="memisc"; version="0.99.14.9"; sha256="1gh6shm9nwfjwfi5f4cz2jsldfdnkj6f73279l86wki5gdf36zri"; depends=[lattice MASS repr]; };
   memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; };
   memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; };
   memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; };
   merDeriv = derive2 { name="merDeriv"; version="0.1-4"; sha256="1gkxc2bf4fx3vbf1nq1g713hhhx7031wchxmgr2ydwfrighwf8qg"; depends=[lme4 Matrix nonnest2 sandwich]; };
-  merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; };
+  merTools = derive2 { name="merTools"; version="0.4.1"; sha256="1224cmkxbkd3r10z73ww0s1nyzg00x55fv91pn1gp8p7cmpp0ni2"; depends=[abind arm blme broom dplyr DT foreach ggplot2 lme4 mvtnorm shiny]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
-  meshsimp = derive2 { name="meshsimp"; version="0.1.1"; sha256="0cdgq4vfjf0h6l55v687k5xs0nwmlpqmw424xgnsfnwxw5ljcvb1"; depends=[plot3D Rcpp RcppEigen]; };
+  messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; };
   metRology = derive2 { name="metRology"; version="0.9-26-2"; sha256="1i9lxgphn8nmkcp2zgjs6ylbccmfgv9lfch00xmx1xfb538jz82q"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="1.2.0"; sha256="1x32f23w5f3s7sc5gbbqzq9s83clarskj9vpnfnwryrx87dg1jjc"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; };
-  meta = derive2 { name="meta"; version="4.9-1"; sha256="1nv8yzcwamflcii5x6l3h5p1q7q4xrd74v40njnpgmhkn4vrkyax"; depends=[]; };
+  meta = derive2 { name="meta"; version="4.9-2"; sha256="1hzf6jphgz61d3rq8dqbyw3iddyv2x5a3xik3b606p8si19b66sh"; depends=[]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.7"; sha256="024rxnqzw9xydy0mm1w38s739qgkzjsifq23bwpvkwj0x0jnwry0"; depends=[caTools shiny shinyBS sp]; };
+  metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; };
   metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; };
-  metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; };
+  metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
   metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
   metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
-  metaSEM = derive2 { name="metaSEM"; version="1.0.0"; sha256="1i77w7b6xbi8p43s9vicj121kz7f3qp1zhqwy6qc5xcj9qaqjklp"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
+  metaSEM = derive2 { name="metaSEM"; version="1.1.0"; sha256="1jhlv93a53pnksllrvqiqv5229cvxfa2mk768yncdfv67d04vwj9"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
   metaboGSE = derive2 { name="metaboGSE"; version="1.0.2"; sha256="1nfcjplry2ba98yi3flk6zcvlys57gri3582mylh543xkcvlrifz"; depends=[AnnotationDbi ape Matrix sybil topGO]; };
   metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
   metacart = derive2 { name="metacart"; version="1.0-0"; sha256="13dp9yz6yjd2jc7lf3w3ac3vk69ry7zygf6xnvzrcwsdmxd0258n"; depends=[ggplot2 gridExtra rpart rpart_plot]; };
-  metacoder = derive2 { name="metacoder"; version="0.2.0"; sha256="0dyd16yy7adpyksfpg6d414s1l6nls5hv1k938mn7fji1px14sgj"; depends=[ape biomformat cowplot dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; };
+  metacoder = derive2 { name="metacoder"; version="0.2.1"; sha256="1l054p870679ni57l234bvma88s7cpr2ddryb87dxfh5510y86bb"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; };
   metacom = derive2 { name="metacom"; version="1.5.0"; sha256="1zsnzzxv3vsj1swybhh6g8ddffp4xrn081y192xa6a78ii8q4kav"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; };
-  metaforest = derive2 { name="metaforest"; version="0.1.0"; sha256="1jmd3rr3w9mdxgc1kqz7pc64pa8vrl4qf92h64791x1p8s71cpzk"; depends=[edarf ggplot2 metafor ranger reshape2]; };
+  metaforest = derive2 { name="metaforest"; version="0.1.2"; sha256="0ppv9vdwxggccn2202snl13vid3v2kx5ps81cadghg2kcd8axfbs"; depends=[ggplot2 gtable metafor mmpf ranger]; };
   metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; };
   metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; };
   metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
   metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; };
   metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="1.0.0"; sha256="1wzy5dnmrdfdj1386snjyisrbzbq8v4qsnq57l3wvkg1pgnz1vh2"; depends=[]; };
-  metamisc = derive2 { name="metamisc"; version="0.1.8"; sha256="06dzjnrbxqkb0d0zcdxg8fyadsbq0f0fca4xifjz16yjz1047n5k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; };
+  metamisc = derive2 { name="metamisc"; version="0.1.9"; sha256="0wjwx7ncplpchwbz0l4xmsmy0faj2wnqjxvxyi05992v3rjv4j8k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; };
   metansue = derive2 { name="metansue"; version="2.1"; sha256="0mklpnb9m0pynz3x0fin003zz0n1v6i0fdcahny70y1yxiy5agcs"; depends=[]; };
-  metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; };
+  metap = derive2 { name="metap"; version="0.9"; sha256="03vg0mb6q7j2z0pkxykbak0hcp6dcak7zxs1lw9hswz9kqrq5jhz"; depends=[lattice]; };
   metaplot = derive2 { name="metaplot"; version="0.4.9"; sha256="1nbnyh03n1kkkl4v80nbbbnkrzs1a5ri210x9q4m2v87jrcikllw"; depends=[dplyr encode lattice magrittr rlang tidyr]; };
   metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; };
   metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
@@ -8358,28 +8470,29 @@ in with self; {
   meteoland = derive2 { name="meteoland"; version="0.7.1"; sha256="1nsn4z3gbkcdhgyn13fjcpsyb0lb85kiyy6fhirlnw63dwr56a2l"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
   metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
-  mets = derive2 { name="mets"; version="1.2.3"; sha256="1f1mqpzpvh5vb8b8w72q13jhk978bcvwipf4bx3kzzgsf6yfxk5s"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.3.1"; sha256="0v6w2gy88mds9ynmlbdx67zhl61x71i9nj2km5wvzrn5kcn1500p"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
   mev = derive2 { name="mev"; version="1.11"; sha256="0iqcslnchap8zh4s3bllqqb8z0klpzg2pn8ays1xk66lj5ywl390"; depends=[boot evd gmm ismev nleqslv nloptr numDeriv Rcpp RcppArmadillo revdbayes rootSolve]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   mexhaz = derive2 { name="mexhaz"; version="1.5"; sha256="0my53dg321xfbbkxawxcggnh5gw9qkliji5gsdb8m1fi37djd67w"; depends=[MASS numDeriv statmod survival]; };
-  mfGARCH = derive2 { name="mfGARCH"; version="0.1.2"; sha256="08gkba5v8l0867rrxakn7js11v1yj7qp9vmzbjmri9hjcm02s44a"; depends=[numDeriv Rcpp zoo]; };
-  mfe = derive2 { name="mfe"; version="0.1.0"; sha256="06x6csf3pr1vdmmimg6f7iffrivj8wcdfafvld7nrzbkl09cbfbn"; depends=[C50 class e1071 infotheo MASS rpart]; };
+  mfGARCH = derive2 { name="mfGARCH"; version="0.1.5"; sha256="0p7cnizhf1cgkzhja74p257k31hb6b7y4qnn3k9yawscdmg3zy50"; depends=[numDeriv Rcpp zoo]; };
+  mfe = derive2 { name="mfe"; version="0.1.1"; sha256="0z9ddkck1z14b9cwvaam0xh869lh2fsjm1d3i8giyrcry0vvpp61"; depends=[cluster e1071 infotheo MASS rpart rrcov]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
   mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-23"; sha256="1lsrhf1yzn25pfn3f5x8yxjqnfryim4jx3iqd7ah8aalh5asqwbp"; depends=[Matrix nlme]; };
+  mgcViz = derive2 { name="mgcViz"; version="0.1.1"; sha256="1vv76cmfva1lsi921i337m44m9vykfp4rb9xidxww8dk3i9agg97"; depends=[colourpicker data_table dplyr GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI mvnfast plotly plyr qgam rgl rstudioapi shiny viridis]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-24"; sha256="15b76m1f0hz8dbmj9shqvslihdx5b7c48vck9grj5xs1z2y45r9c"; depends=[Matrix nlme]; };
   mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
-  mgm = derive2 { name="mgm"; version="1.2-2"; sha256="0n0db6np7i0lycvis9pc1bsnzam4nrr9qzlwimz7d8pp7gm313xn"; depends=[glmnet Hmisc matrixcalc stringr]; };
+  mgm = derive2 { name="mgm"; version="1.2-3"; sha256="066k5z99dssp9w5iav68mka68li1r7f5x2qbp21gnc89syrsqwnw"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
   mgraph = derive2 { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
   mgsub = derive2 { name="mgsub"; version="1.5.0"; sha256="03w40vs3vfyrksnzbawyvp02kwrmn7cqhlv6xhfzfbh8jmz55wvr"; depends=[]; };
+  mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; };
   mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; };
   mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; };
   mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
   mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; };
-  mhurdle = derive2 { name="mhurdle"; version="1.1-7"; sha256="06ph0vbm7yk5388v2aww6nmi2rhjhfjj1hl506a41m5k6hf746pk"; depends=[Formula maxLik survival texreg truncreg]; };
   mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
   miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; };
   miLineage = derive2 { name="miLineage"; version="2.1"; sha256="0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry"; depends=[data_table geepack MASS]; };
@@ -8391,14 +8504,14 @@ in with self; {
   micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
   micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; };
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
-  mice = derive2 { name="mice"; version="2.46.0"; sha256="1gjvlk67zvgipfczsca8zqk97vg3sivv82hblsdwp14s7smhjcax"; depends=[lattice MASS nnet Rcpp rpart survival]; };
+  mice = derive2 { name="mice"; version="3.1.0"; sha256="0xpn215yfzib4hw09cwilnyg9zbvq460njavfvm84mvgwbm25byi"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
   miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; };
-  miceFast = derive2 { name="miceFast"; version="0.1.0"; sha256="0089n3iagy81b6k9kdm6rh2k21vi55ly4a5d4b4snhf0rxrj7if8"; depends=[Rcpp RcppArmadillo]; };
-  miceMNAR = derive2 { name="miceMNAR"; version="1.0"; sha256="1ns7i1p2nil2s7960hkfl557qipwshibsgpwyn58ss3ch1vr213g"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
-  miceadds = derive2 { name="miceadds"; version="2.10-14"; sha256="1cpwf8j1r5k5wb4cwjz0aqrsgb5x9nhdrxb22sfw3lrfc1x6i6ay"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
+  miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; };
+  miceMNAR = derive2 { name="miceMNAR"; version="1.0.1"; sha256="1f9cikqcyj5hh8ray2bx8yhhvv378vsk5d6k7hl44c54qgna61cf"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
+  miceadds = derive2 { name="miceadds"; version="2.13-63"; sha256="1a4d0bvvc2w9d6zp8pxrcgsn8jrydbkl5wwafm6zak54z6rsipj4"; depends=[CDM coda lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
   micemd = derive2 { name="micemd"; version="1.2.0"; sha256="0l4qzhkxy43xwgfqp2c638fimixdrm94hgiabfds3sc1vbxma4r8"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
   micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; };
-  microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; depends=[deSolve]; };
+  microPop = derive2 { name="microPop"; version="1.4"; sha256="0dfqn7g445w4nydklvsq5vlkiin6kcz8kkazj7jfbm98ikdywzm8"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
   microbenchmark = derive2 { name="microbenchmark"; version="1.4-4"; sha256="0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"; depends=[]; };
   microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; };
@@ -8407,8 +8520,10 @@ in with self; {
   micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
   micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; };
   micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; };
-  microplot = derive2 { name="microplot"; version="1.0-38"; sha256="1jrm0rzq8xwrd3j1xwyy70071jk9cxqnqdbr3ljjn926yji10nfs"; depends=[cowplot ggplot2 HH Hmisc htmltools lattice ReporteRs]; };
+  microplot = derive2 { name="microplot"; version="1.0-39"; sha256="191rgmcq405c91dv0zk7in2r71n8d1m04w624950ykq6qhdjpmpp"; depends=[cowplot ggplot2 HH Hmisc htmltools lattice ReporteRs]; };
+  microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.2"; sha256="1wddf09p803hi28kzn6sq86zhgldxi34rrj7c0bpzy476abnp45s"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; };
   microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; };
+  microsynth = derive2 { name="microsynth"; version="1.0.9"; sha256="06k7lag0vlzhrq5x6h7m8q9n209hfal3dzzmpjgxb6i9xdigkr6h"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; };
   midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; };
   midasr = derive2 { name="midasr"; version="0.6"; sha256="1sg6m36jg3b6znfg97ln5a6b4z36xkyjvgxk7wmqdq3h528z8613"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
   midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; };
@@ -8421,10 +8536,11 @@ in with self; {
   mime = derive2 { name="mime"; version="0.5"; sha256="0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw"; depends=[]; };
   minPtest = derive2 { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; };
   mindr = derive2 { name="mindr"; version="1.1.0"; sha256="102r7m6jiadgmkw4w7535ba2qfxknj00y4b9hhawcjqm5v67jipz"; depends=[htmlwidgets]; };
+  mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; };
   minerva = derive2 { name="minerva"; version="1.4.7"; sha256="19snlbnk4y0lj7kfypa2g1d1s7bl3xkrxabn8p15hlwwcfb0x7vm"; depends=[]; };
   miniCRAN = derive2 { name="miniCRAN"; version="0.2.11"; sha256="1ffc367ipcxyk2a8f2y46xa01rbr5254cryf1qzzfflb3xj8n6pa"; depends=[httr igraph XML]; };
-  miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
-  miniUI = derive2 { name="miniUI"; version="0.1.1"; sha256="1qfca55phw6614qh5ligvqawpyvpb08x7ky44sffwxgff4h074lw"; depends=[htmltools shiny]; };
+  miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; };
+  miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; };
   minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; };
   minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; };
   minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
@@ -8435,8 +8551,8 @@ in with self; {
   minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
   minval = derive2 { name="minval"; version="0.8-1"; sha256="11sr69hmqnh5g2zbfajy3wqc57759basky1w72dnrd38rq50llxs"; depends=[]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-  mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; };
-  mirt = derive2 { name="mirt"; version="1.27.1"; sha256="0344gqyx8x0q5smi8ifs6dw0hgqgw23mfgw8cb9gc8ky78zydjpp"; depends=[Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
+  mipfp = derive2 { name="mipfp"; version="3.2"; sha256="1mds51vkqs2jc5kvxhzh2dmazxgbc14ahg1lxs9mn82my2p743f8"; depends=[cmm numDeriv Rsolnp]; };
+  mirt = derive2 { name="mirt"; version="1.28"; sha256="1ykki146wgdb0smdly0b2hqzvk7b31xmd1kgw69505mbm49yhzvh"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
   mirtCAT = derive2 { name="mirtCAT"; version="1.7"; sha256="038jp680hn17q8hcz346j4i0p913h7gbkqfswn0ygf1kwgsz1mpa"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; };
@@ -8450,38 +8566,39 @@ in with self; {
   misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; };
   missDeaths = derive2 { name="missDeaths"; version="2.5"; sha256="0pslssgf580zd0dd7m0l97bzgxnywj2qac0agxv6ih1a0xlxz874"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
-  missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; };
-  missRanger = derive2 { name="missRanger"; version="1.0.1"; sha256="0rab8b0fankymfhnz4f5g2hh2yq30h6cdblvz2d43i46d147js41"; depends=[FNN ranger]; };
+  missMDA = derive2 { name="missMDA"; version="1.13"; sha256="1jzhl7j506wm2s71mn3kp0ij22z0h3pra4q552s30kv48gdk8h0w"; depends=[FactoMineR mice mvtnorm]; };
+  missRanger = derive2 { name="missRanger"; version="1.0.3"; sha256="00gcnpvvy65v6k5qjk6xavdis02l8s9a56vwi39kw0rw8yhkla73"; depends=[FNN ranger]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
   mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; };
   mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
   mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; };
-  mixAK = derive2 { name="mixAK"; version="5.0"; sha256="1lb3ivcl64vny21gifll6sc2yaf970mvb1hwlch1k49125ybxz5q"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+  mixAK = derive2 { name="mixAK"; version="5.1"; sha256="0i9gp66d1mzskiif0bk0w88cinc923fsj4vi7pv0im2cwmxksiiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
   mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; };
   mixKernel = derive2 { name="mixKernel"; version="0.1"; sha256="0p0m081ivpc22z3p8308z12fcdjnid86niwk4i97dvz12dr8v9ws"; depends=[corrplot ggplot2 LDRTools mixOmics phyloseq psych quadprog]; };
-  mixOmics = derive2 { name="mixOmics"; version="6.3.1"; sha256="0bvlbxx94mxsqjwlc5pgxw8c6k32fzrv1ab2xc5zl3ag1v3g10qq"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats plyr rARPACK RColorBrewer reshape2 rgl tidyr]; };
+  mixOmics = derive2 { name="mixOmics"; version="6.3.2"; sha256="1lqhrgsfdlv1ji965zf9ndg6ngylbmqahcslwirwd5vrjvlbzjb2"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 rgl tidyr]; };
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
-  mixR = derive2 { name="mixR"; version="0.1.0"; sha256="16rl1ggavs1qfq4i3jm85acd0w2zbiacnvnnim3vi3kqa9i09byy"; depends=[ggplot2 Rcpp]; };
+  mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
-  mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
+  mixdir = derive2 { name="mixdir"; version="0.1.0"; sha256="0kr82g7s9vp3i1vyqfpn30avdxg86xh0hgngbqmm5l2brd5sa4wx"; depends=[extraDistr Rcpp]; };
+  mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; };
   mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
   mixedsde = derive2 { name="mixedsde"; version="4.0"; sha256="1hryscff4i4ayqxv9imnx4g56497s1s95fzqv8wkwcpfcqi20bqf"; depends=[MASS moments plot3D sde]; };
   mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
   mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; };
-  mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; };
+  mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; };
   mixpack = derive2 { name="mixpack"; version="0.3.6"; sha256="0q19mal86qlriwilabgy3sn33iymi5hl3wa33kvb8cd1dgdmjr7a"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
-  mixsmsn = derive2 { name="mixsmsn"; version="1.1-4"; sha256="1y15qjh6qzx3aqlv4pndmgk2mgkqpyxcd76ykn31qd8mwzddci9d"; depends=[mvtnorm]; };
+  mixsmsn = derive2 { name="mixsmsn"; version="1.1-5"; sha256="0y1ysh75xqsqk87717akiqi8p6varry8n92hanl4qwy7la0ksy7w"; depends=[mvtnorm]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
   mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
   mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; };
   mize = derive2 { name="mize"; version="0.1.1"; sha256="18mnpwwbwlyx0ixsjqai28ahp4g0wncv8c5qwy17xq2zbhwlq3jh"; depends=[]; };
-  mizer = derive2 { name="mizer"; version="0.4"; sha256="0ir6hx3fb4lkfgg7dln96fd50fr4jdrxbqp70461fsyzi3lxn6nv"; depends=[ggplot2 plyr Rcpp reshape2]; };
+  mizer = derive2 { name="mizer"; version="1.0"; sha256="0qsf3wd8ipql344i8brv1d7qbr9g5y0qhh00lxj9n8sgjg52x7a5"; depends=[deSolve ggplot2 plyr progress Rcpp reshape2]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
   mkin = derive2 { name="mkin"; version="0.9.47.1"; sha256="1cz6f9122im594dvqdmdm9yjlnmwzrx2ka63dgj0zf1ysqzf0872"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
   mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; };
@@ -8491,58 +8608,59 @@ in with self; {
   mlVAR = derive2 { name="mlVAR"; version="0.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; };
   mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; };
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-  mlbgameday = derive2 { name="mlbgameday"; version="0.1.1"; sha256="01jb2fiv847jfdl18g2b3xlihfbry2j2r9ajmw8gd82052ayyk1j"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; };
+  mlbgameday = derive2 { name="mlbgameday"; version="0.1.2"; sha256="03mz88y29wkn3510p8kzhapx0gj0mkqf0bgcjc0jpph2r1020c9a"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; };
   mlbstats = derive2 { name="mlbstats"; version="0.1.0"; sha256="1pfsc1pc5986gykx8l6afahszhaj4940l8g33fdxyy7194kbcz70"; depends=[]; };
   mldr = derive2 { name="mldr"; version="0.4.0"; sha256="1nx21yyxfaiyxpbjkc5sif6pis5v2skisxcxdqk4479h54qzwlj3"; depends=[circlize shiny XML]; };
   mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.0"; sha256="0kbfaf39vkhvscw47bkx2mmc6cmgwz1cys62iiw3yb6kvkzddr3s"; depends=[]; };
   mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
+  mleap = derive2 { name="mleap"; version="0.1.2"; sha256="1622pnbdkx5dig87srir2bxqk99lvnm2qln2wcsmhpf9jvp2vqf9"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
   mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
-  mlf = derive2 { name="mlf"; version="1.2"; sha256="1k2vplsqnccf5ymf50hgl4ly3np7n87ympd3aajpfwcn3jljbxkf"; depends=[]; };
+  mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; };
   mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
   mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
   mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; };
   mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; };
   mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; };
   mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; };
-  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.2"; sha256="1zxmiqsn3rcs0a6w785smx8ifa10083vakawy3c59pa8zigii1xp"; depends=[coxme Matrix multcomp multcompView sommer]; };
+  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.3"; sha256="0k0q7l0dja6q5jl4p7fd16c95m83db8c7g34lnaymxll824ai1lq"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
-  mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
+  mlogit = derive2 { name="mlogit"; version="0.3-0"; sha256="0frggwb1yzfs229ys60qc4acfnq2zwjr6a1zb4fv07s1zlwrvnf1"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
   mlr = derive2 { name="mlr"; version="2.12.1"; sha256="0b68pgx55f19i3pnci1n87cq2a7kfs6s2248zs1vg4xl5sw9ifww"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
-  mlrCPO = derive2 { name="mlrCPO"; version="0.3.2"; sha256="1wnh0ljh7739qcrgkgnf40xwkih0bmvpvykaaw51rascy63mf003"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
-  mlrMBO = derive2 { name="mlrMBO"; version="1.1.1"; sha256="1r6p5ph7nyqs6cqqsg04mass1zppys75n8448lv6iadlm499jzg8"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
+  mlrCPO = derive2 { name="mlrCPO"; version="0.3.4"; sha256="126kbfgcaqlvrpmz7v1l391x4v8sfzw7ccimz341im6n9ygp43rp"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
+  mlrMBO = derive2 { name="mlrMBO"; version="1.1.2"; sha256="1ziyiycgwr4vgilji8dkf1c0kyqjnbmqi3qj35q3si2xbnmcm14f"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
-  mlt = derive2 { name="mlt"; version="1.0-0"; sha256="0vbja0sxjg3a5gpa8wwnj1fvr8kkvkpzhim6lssvyy7kcb44fcya"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-0"; sha256="1shhf5pk90cfia51a0qnbg8pvvv5n86d3mjy961rjs1wj30vj3yd"; depends=[mlt numDeriv]; };
-  mltools = derive2 { name="mltools"; version="0.3.4"; sha256="18dxhims684a6fk44nrzdnry8dpxs69wim8kd7zamp8zdhy38kyy"; depends=[data_table Matrix]; };
+  mlt = derive2 { name="mlt"; version="1.0-2"; sha256="0yc1dij3q6nk15259mvl5bhnm9b70ix8nq5lniq40j1arh5v9nq0"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
+  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-1"; sha256="140bi0kjz5m7amwdxm2mpqn04i5wb1yjviwv34f1qjpzi4walml3"; depends=[mlt numDeriv]; };
+  mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; };
   mlvocab = derive2 { name="mlvocab"; version="0.0.1"; sha256="0lv9aqrwm00jdklig80yi5lxj87sh6ysg7qkg0kf1nv05lkvrpb0"; depends=[digest Matrix Rcpp sparsepp]; };
   mlxR = derive2 { name="mlxR"; version="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; };
   mma = derive2 { name="mma"; version="6.1-0"; sha256="1rrnm7szlaly8klqgi8wdh5qvfx4kx5bkl1q2y9y6zjpxmb4zvi6"; depends=[car doParallel foreach gbm gplots plotrix survival]; };
+  mmabig = derive2 { name="mmabig"; version="1.0-0"; sha256="1srrfk6dqqfc504w8rhrfag3lzsc55sw3ckkmgph6k8ss99zn285"; depends=[car glmnet gplots mma survival]; };
   mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; };
-  mmap = derive2 { name="mmap"; version="0.6-15"; sha256="0p3dsq0vffb0x0i8xh8p1r0b2hwk4zfi6nbwsi3cyaj1m7dzm0fh"; depends=[]; };
+  mmap = derive2 { name="mmap"; version="0.6-17"; sha256="1dh1i2v2pzhag8brc9c0z8vfs858rpbkg1xqqi4fi866w7g4lhxy"; depends=[]; };
   mmapcharr = derive2 { name="mmapcharr"; version="0.1.0"; sha256="0szabsacbqm51jw4q4pg304vvgqsqna5c7q1sh3f54za6dddmyxw"; depends=[BH Rcpp]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
   mmcm = derive2 { name="mmcm"; version="1.2-7"; sha256="11dgb8crz5pjpx66cxxzn4lg58jbaxxhfqlcw3hdp9wpvyqjh3sb"; depends=[mvtnorm OpenMPController]; };
   mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; };
-  mme = derive2 { name="mme"; version="0.1-5"; sha256="07k1xagwpyzsrlc00y9xlaxcpwdhz55v567i7fzvqa96ical8nlf"; depends=[MASS Matrix]; };
-  mmeln = derive2 { name="mmeln"; version="1.2"; sha256="1kcfq5y2fzsrbjyvh6dfp734ly7alj9vrjikzadlz33s7wjanh79"; depends=[]; };
+  mmeln = derive2 { name="mmeln"; version="1.3"; sha256="0hx59pizd6sgryca7g26n2wa5rdi3zd059w7yz66981p6mi4a5dk"; depends=[]; };
   mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; };
   mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
   mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
-  mmmgee = derive2 { name="mmmgee"; version="1.11"; sha256="0q7gf8r48vw4rxq7b848hcfz9iqw89sld4ra33n6kb2jqczv49xi"; depends=[Matrix mvtnorm]; };
+  mmmgee = derive2 { name="mmmgee"; version="1.12"; sha256="083hv7g2cy2r9qkwc2fihglf4avsl1dsjyy74mj39gk1pss8mh6j"; depends=[Matrix mvtnorm]; };
   mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
   mmpf = derive2 { name="mmpf"; version="0.0.4"; sha256="1lskpnhqiimf7ch5xg5f0mpvhxy18a5w9daxpp4133vx1dydm4c2"; depends=[checkmate data_table]; };
   mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; };
   mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; };
-  mmtfa = derive2 { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; };
+  mmtfa = derive2 { name="mmtfa"; version="0.3"; sha256="0qfszr6f10v27w1pfns78dyarznqryl4m1ppyqap7l8fc12sliky"; depends=[matrixStats mvnfast]; };
   mmtsne = derive2 { name="mmtsne"; version="0.1.0"; sha256="1by0hrggla6idc1isnq072i1wfpw4x7id3hkg8l65gy8iycccd12"; depends=[]; };
   mnis = derive2 { name="mnis"; version="0.2.7"; sha256="1yhhgrhsk3ww93vd29ipw16bkn16w0b2i7d46cb5bb5xs4s7vivd"; depends=[dplyr httr jsonlite Rcpp stringi tibble]; };
   mnlogit = derive2 { name="mnlogit"; version="1.2.5"; sha256="0vwragk71hisz7dy4h5i6zl9yp6wvzwlnfyw2kprnd94y02laq63"; depends=[Formula lmtest mlogit]; };
   mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
   mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; };
-  mnreadR = derive2 { name="mnreadR"; version="1.2.0"; sha256="0ymkwbfrba5nnnvi3s52fdhzva7qd0b7ab75j1m0s2i546cbwv9l"; depends=[dplyr ggplot2]; };
+  mnreadR = derive2 { name="mnreadR"; version="2.0.0"; sha256="0m8h4g43iwq2ri6y9xk68g2rrikxngqcpqy6jlva84gsxigbzbql"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
   mobForest = derive2 { name="mobForest"; version="1.3.0"; sha256="0gzn3lyi9ph5dcrfbw4xs4rkf5ngf28abf1n8vap96fdhc6nmg88"; depends=[modeltools party sandwich strucchange zoo]; };
   mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; };
   mockery = derive2 { name="mockery"; version="0.4.1"; sha256="1h8976rlwykpqrh2p6x3bcyxdhlhcwsi1wvkdk08k6hynbw877cm"; depends=[testthat]; };
@@ -8552,19 +8670,21 @@ in with self; {
   modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; };
   modQR = derive2 { name="modQR"; version="0.1.1"; sha256="1dc04wrax73f6fzkl6ycsa3wzf5347h79ah3vy3m24f4hjncnffw"; depends=[geometry lpSolve]; };
   modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
+  modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; };
   modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; };
   modeest = derive2 { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
-  model4you = derive2 { name="model4you"; version="0.9-1"; sha256="13ask2hcrw2r6qq4yz6wm2nsj2iwinnn0w78lj11fdrsj5cymnqv"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
+  model4you = derive2 { name="model4you"; version="0.9-2"; sha256="0bi69s4bxdqfkjg7ldg41a72vsvqi6ipzqhfbk5jhj7avfa990b9"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; };
   modelObj = derive2 { name="modelObj"; version="3.0"; sha256="0wc67zsh26zyr7x9s229g2mppfk6g6z12j74zj2bdhk2m7i2x3zq"; depends=[]; };
+  modeldb = derive2 { name="modeldb"; version="0.1.0"; sha256="1pb9vnviz0sy9cz2jns34j7fwadi0j250smixr840hjjvvgxyzwf"; depends=[dplyr ggplot2 progress purrr readr rlang tibble tidyr]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
-  modelr = derive2 { name="modelr"; version="0.1.1"; sha256="1rqw0b583vp107zqp4h3wj51dvv4hb3wszfr1f5f48xassc53f95"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; };
+  modelr = derive2 { name="modelr"; version="0.1.2"; sha256="09whg3q5xq6csbqwgwfwav09vda8vgady5j70sk52xcn232k363a"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; };
   modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
   modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; };
   moderndive = derive2 { name="moderndive"; version="0.1.1"; sha256="11xxklaqizlx36nyx3nzj9xkszg99qsmjqmr59z235h4wkrw8xg3"; depends=[assertive broom dplyr formula_tools janitor knitr magrittr rlang stringr tibble]; };
   modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; };
   modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; };
-  modifiedmk = derive2 { name="modifiedmk"; version="0.1.2"; sha256="1ajllhv33sdqa6bdylb6hs68kkk75qa1abv6kmnfix9k2g0bqlxq"; depends=[]; };
+  modifiedmk = derive2 { name="modifiedmk"; version="1.1.0"; sha256="08nyn1rh28rs9wpz9jvi4pyrhrlh4qaklkx4za0h027lv3086ja3"; depends=[boot]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
   modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
@@ -8572,37 +8692,38 @@ in with self; {
   modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; };
   moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; };
   mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; };
-  mokken = derive2 { name="mokken"; version="2.8.10"; sha256="1lh9gqjm13k7wfmff2vikc1qg7lqr4fagm3jiklr1pv9vgn4dnc3"; depends=[poLCA]; };
+  mokken = derive2 { name="mokken"; version="2.8.11"; sha256="1dypdf5gdz0hr3izafzfknyqx2vbr1z77c4c7vqdygv2wzhwy5i1"; depends=[poLCA]; };
   moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; };
   molaR = derive2 { name="molaR"; version="4.3"; sha256="1bzk7k6d1zbi0fhf9xwdg5mv7dcgajjbb6wxafx4nc2fjxhlldzi"; depends=[alphahull rgl Rvcg]; };
-  mombf = derive2 { name="mombf"; version="1.9.6"; sha256="01qvgxiw0wqp7j4l1qkdy88fvmydz5il09k6nrblbq0sfjf0khmq"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
+  mombf = derive2 { name="mombf"; version="2.1.2"; sha256="1lbg91ih8djxv8brwzwpxwzpbnhl7p3rj585kagykknknq5r6csj"; depends=[mclust mgcv mvtnorm ncvreg survival]; };
   momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; };
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
-  momentuHMM = derive2 { name="momentuHMM"; version="1.4.0"; sha256="0dfnxq16a2hyy1a4w7v55f6mp62xhldwsj2v54yw4s2d21dqir4y"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat LaplacesDemon MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; };
+  momentuHMM = derive2 { name="momentuHMM"; version="1.4.2"; sha256="02ia80h78msgb4c474h47cbd8n0j3bfrjcq4wl2937licdzfl43s"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel dplyr foreach geosphere ggmap ggplot2 gstat LaplacesDemon magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-  mongolite = derive2 { name="mongolite"; version="1.5"; sha256="06qry561kdg4lxvdayghmhmgb94sqy16gxjp081xnmya0vqf9wjy"; depends=[jsonlite openssl]; };
+  mongolite = derive2 { name="mongolite"; version="1.6"; sha256="0wam3sbf5p7d5ikvmf0z8cghk2lrw2c3qyh9pbffm62vdbq7wx86"; depends=[jsonlite mime openssl]; };
   monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; };
   monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; };
   monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; };
   monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
   monomvn = derive2 { name="monomvn"; version="1.9-7"; sha256="1bz967sl6ji84x9v0fypjn75d39naaqgvw31n9lgcd5lyj39hbsk"; depends=[lars MASS mvtnorm pls quadprog]; };
   monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; };
-  monotonicity = derive2 { name="monotonicity"; version="1.0"; sha256="0xpsn57lixw6pzf7qyp2x6az7vwbfw9bsd0yz93710pyyhkzr94b"; depends=[lmtest MASS sandwich]; };
+  monotonicity = derive2 { name="monotonicity"; version="1.1"; sha256="06irf6jlmhmj70c45ilf66yy2k81i3rg1qgw9ch08mj1j8ahyx7x"; depends=[lmtest MASS sandwich]; };
   monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
-  moonBook = derive2 { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; };
+  moonBook = derive2 { name="moonBook"; version="0.1.8"; sha256="1gdzpjc16l2alvf968011njgl8i7fhi2l5v97b47dh4wlnziq68x"; depends=[nortest survival]; };
   moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
   mopa = derive2 { name="mopa"; version="1.0.1"; sha256="1v876al1afli002v44b4j2acb6n66f0hzz4bmcl60jyny43d1n0c"; depends=[abind dismo e1071 earth gtools lattice PresenceAbsence randomForest ranger raster rpart sampling sp spam spatstat splancs tree]; };
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
-  morse = derive2 { name="morse"; version="3.0.0"; sha256="18657cd3pqy170wapxy3jw4cc13710bf7ix07dss30gpkbvilyvl"; depends=[coda dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
-  mortAAR = derive2 { name="mortAAR"; version="1.0.0"; sha256="0d599npgfk11mv39rk2a64vs5x31g4f7n1n13mzzzcy1lz5y1ih2"; depends=[magrittr Rdpack reshape2]; };
-  mosaic = derive2 { name="mosaic"; version="1.1.1"; sha256="1c82im22sj0sfqnwwfg7kyp2dllj89f79by07220br5wpa18bsn7"; depends=[broom dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; };
+  morpheus = derive2 { name="morpheus"; version="0.2-0"; sha256="07gk05qpabbg96svgnp2m9sw3fxsh2mgfwyda423c03yhxn1pnsm"; depends=[jointDiag MASS pracma]; };
+  morse = derive2 { name="morse"; version="3.1.1"; sha256="0j0h8jx3mx20dfdzzkn48amq5fc6mdfkb06fznqbyxrahdgwj5wg"; depends=[coda dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
+  mortAAR = derive2 { name="mortAAR"; version="1.0.1"; sha256="1dgxx5sh0nskzbigr8yq389lsnalp45d6m92q6g07jpqm7nzbazd"; depends=[magrittr Rdpack reshape2]; };
+  mosaic = derive2 { name="mosaic"; version="1.3.0"; sha256="1iaiddg81b49296jch45m9hlybv6iia5vkl2s6pkzjp2ii5yvf8k"; depends=[broom dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; };
   mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; };
-  mosaicCore = derive2 { name="mosaicCore"; version="0.4.2"; sha256="17yani6781znrrnrcji1q7h6y422bq443gzly0mm6yn8bj7v5qrc"; depends=[dplyr lazyeval MASS rlang tidyr]; };
-  mosaicData = derive2 { name="mosaicData"; version="0.16.0"; sha256="09kp3d3h3xmz9fnjaz9nr1jldjd93gyq5gq9sk2a2ymgnbmbc5wm"; depends=[]; };
+  mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; };
+  mosaicData = derive2 { name="mosaicData"; version="0.17.0"; sha256="04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9"; depends=[]; };
   mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; };
-  mosum = derive2 { name="mosum"; version="1.1"; sha256="0njpmb7mhgmaylfq1jgk198d6sc6r96kywbjpl2c465kvs8khc2f"; depends=[plot3D Rcpp zoo]; };
+  mosum = derive2 { name="mosum"; version="1.2.0"; sha256="0r827f8zbh31hggwh7vrbji3mnjv85fhvwx69kgadlaxp8z0cq1y"; depends=[plot3D RColorBrewer Rcpp]; };
   motmot_2_0 = derive2 { name="motmot.2.0"; version="1.1.2"; sha256="1hnpp2850yhvxki7pcwscg79knvxzs3gx4b19wza0wg3p02fvsb6"; depends=[ape caper coda MASS mvtnorm]; };
   moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; };
   mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; };
@@ -8610,7 +8731,7 @@ in with self; {
   mousetrap = derive2 { name="mousetrap"; version="3.1.0"; sha256="1r1cpfn6bcgk66lw0la6r3bsv62yhp2m3jkwn0g8rbwrhp9jyl6p"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
   movMF = derive2 { name="movMF"; version="0.2-2"; sha256="0kk3b16vlr6nbqn9fzgk5pb4nyy9w9b5x7khyvn34b9r0pnqmmds"; depends=[clue skmeans slam]; };
   move = derive2 { name="move"; version="3.0.2"; sha256="0pi59k2kq1z92qgsbbqn1cjx0rbkjzjhaskk76wv95s3078k062d"; depends=[geosphere httr raster Rcpp rgdal sp xml2]; };
-  moveHMM = derive2 { name="moveHMM"; version="1.5"; sha256="16r0lp3lqnmplhagixyidgyg82zsxln22v9l9fgb07lxhszrs0rj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; };
+  moveHMM = derive2 { name="moveHMM"; version="1.6"; sha256="1wz8yg87rxkq70hnahv1jd027938vl9g4wr9zvnq24vwc7hzdafz"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; };
   moveVis = derive2 { name="moveVis"; version="0.9.6"; sha256="15w11zdi2amzvq7xgz5wsf9136s127inc44x8cl3ra7jy2sbgpiy"; depends=[dismo geosphere ggplot2 gridExtra lubridate maptools move pbapply plyr raster rasterVis RCurl RStoolbox simecol sp zoo]; };
   moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.1"; sha256="020bl3i0i393dfknix03k8y70fjsf0lbw0mqrnhwsvz8kwrw3hi1"; depends=[move Rcpp]; };
   mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; };
@@ -8625,32 +8746,35 @@ in with self; {
   mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; };
   mpmi = derive2 { name="mpmi"; version="0.42"; sha256="1j7xsgz3pgbb7a4ykrcj22isbi5svqsxcckai05q7b401h1ppsnh"; depends=[KernSmooth]; };
   mpoly = derive2 { name="mpoly"; version="1.0.5"; sha256="0yjh5nnrywxzgy24nlf5v8kq8nq10ccippzfjwf8hz7zzlxzhp5q"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; };
+  mppR = derive2 { name="mppR"; version="1.1.10"; sha256="09g4zj61mh1vlhzdki7cdmbdbz6fibc7rgci9bl5vpa2cs5b3yj1"; depends=[ggplot2 igraph qtl synbreed]; };
   mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
   mpr = derive2 { name="mpr"; version="1.0.4"; sha256="13fqvndwxzqa1safa43ad90pkiqnpqmgr0pkwp8lwmnxqmrmj0jb"; depends=[survival]; };
   mpt = derive2 { name="mpt"; version="0.5-4"; sha256="01akz72z6z5ybzika120v4v6ah13hfynh98rzbmqgbchijxbbkz6"; depends=[]; };
   mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; };
   mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; };
   mrMLM = derive2 { name="mrMLM"; version="3.0"; sha256="174d12dxrsndd8hkc4ivfa5wd7ixh3vkkvd1br5zm5rwxbq3c71l"; depends=[coin data_table doParallel foreach ggplot2 lars MASS ncvreg openxlsx qqman sampling stringr]; };
+  mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="3.1"; sha256="17rqky58im1aax29fi3lc6i7kpy3n35ysdhjz9dgmykzhx41xmn2"; depends=[coin data_table doParallel foreach ggplot2 lars MASS mrMLM ncvreg openxlsx qqman sampling shiny shinyjs stringr]; };
   mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; };
-  mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
-  mrbsizeR = derive2 { name="mrbsizeR"; version="1.0.1"; sha256="1gr8mx1byq8nw095yla4gn2ascgw4d90j7a3a3rzwfdavkjj7167"; depends=[fields maps]; };
-  mrds = derive2 { name="mrds"; version="2.1.18"; sha256="0nhfyl5vcisb9z33sm37vfgnfkkmikr2wwvsjq84jaw2x2jmbxvz"; depends=[mgcv numDeriv optimx Rsolnp]; };
+  mratios = derive2 { name="mratios"; version="1.4.0"; sha256="0pjcwqx3zykpwyykwgqziwignd41sjm2s1blyjwc1lhymis4ldzq"; depends=[mvtnorm]; };
+  mrbsizeR = derive2 { name="mrbsizeR"; version="1.1.1"; sha256="0a69yyxxf4p84c2sx9kkaxgpfyck88cn0ajlnm64arrr9r99iiir"; depends=[fields maps Rcpp]; };
+  mrds = derive2 { name="mrds"; version="2.2.0"; sha256="08m5a61rpbw5pv0v0yspihkzihcxazsh6w5kmfvg68s4akjwcnqi"; depends=[mgcv numDeriv optimx Rsolnp]; };
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
-  mrfDepth = derive2 { name="mrfDepth"; version="1.0.6"; sha256="1g3bv0vpalp54pgdrfbfa32bcrph0q4j5jp1m91f328hzyx2lrmj"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
-  mrgsolve = derive2 { name="mrgsolve"; version="0.8.10"; sha256="0qanj35ppyiyhcyf2iqji68j00i1y47319mms96llwpcl039f37p"; depends=[BH dplyr lazyeval magrittr Rcpp RcppArmadillo tibble]; };
+  mrfDepth = derive2 { name="mrfDepth"; version="1.0.7"; sha256="1v0d1vm7jihg88xd4hwi5j940r5kh74c3nidh6hyvajqq97nidjq"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
+  mrgsolve = derive2 { name="mrgsolve"; version="0.8.12"; sha256="04k7mj64gqwnvwsshfn4l3iiqfbsy92qil14ysq4ncjj2h40lgkj"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble]; };
   mri = derive2 { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; };
-  mritc = derive2 { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
+  mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; };
   mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; };
   ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; };
   msBP = derive2 { name="msBP"; version="1.3-1"; sha256="0ziqzkylawc6kpcfzqwrwn6vp0562rd2yx5a4zg8p1n0y2gdpdzc"; depends=[]; };
   msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
   msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; };
   msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; };
-  msaenet = derive2 { name="msaenet"; version="2.8"; sha256="1293qdvn2qv3prnp4rwwndcjnzk49v565yfvzrvb9j7sqvjshf07"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
+  msaenet = derive2 { name="msaenet"; version="2.9"; sha256="0jrrd49fmb8drrrz5g8gk3mwk1yczcm3v0c2939bqsjyd41830vr"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
   mschart = derive2 { name="mschart"; version="0.2.3"; sha256="0lq2hhbwy3hycbvzhrhny7jk5cc4iq89a4mff5q2jjfff13vmm6g"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; };
   mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; };
+  mscstts = derive2 { name="mscstts"; version="0.2.2"; sha256="1aa8pvg3immcrpr7b6q1lf4nm8gvq9316s28jvzpp2az5hvc1w00"; depends=[httr jsonlite]; };
   mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; };
   msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
   msde = derive2 { name="msde"; version="1.0.3"; sha256="18l5ca4s1ryyb9i0zsb03klm53f25klwyg171dqkn5z4bqwznp2m"; depends=[Rcpp RcppProgress]; };
@@ -8663,7 +8787,7 @@ in with self; {
   msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; };
-  msma = derive2 { name="msma"; version="1.0"; sha256="1pq1m8hrvpfjh89wiz4f3jlzlp620clxzash5061zbhm0xjmxjpd"; depends=[mvtnorm]; };
+  msma = derive2 { name="msma"; version="1.1"; sha256="15678v3vabafd22yh16ly90ll3r02lb93dsv0vm77j4if9626qbg"; depends=[mvtnorm]; };
   msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; };
@@ -8677,6 +8801,7 @@ in with self; {
   mthapower = derive2 { name="mthapower"; version="0.1.0"; sha256="17svh0q9a982a390fgwgvrc2kygxxgyacb3j6gcksbikjrvkcfpw"; depends=[]; };
   mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
   mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; };
+  muHVT = derive2 { name="muHVT"; version="0.1.0"; sha256="1lkqas8ghnkgdnnhjmm1aivgabnqgpd3hfk8i3z7bajvi201qvx4"; depends=[conf_design deldir Hmisc MASS plyr sp splancs]; };
   muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; };
   muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; };
@@ -8685,6 +8810,7 @@ in with self; {
   mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
+  multDM = derive2 { name="multDM"; version="1.0"; sha256="06vjbsjmqdnndpqacfpgq5w8q6xg81s7vd9fhwdkww3adr7r8cg3"; depends=[]; };
   multcomp = derive2 { name="multcomp"; version="1.4-8"; sha256="0fm78g4zjc6ank316qfw977864shmy890znn4fahwc8jjdhpc252"; depends=[codetools mvtnorm sandwich survival TH_data]; };
   multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
   multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
@@ -8695,11 +8821,12 @@ in with self; {
   multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; };
   multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
-  multiROC = derive2 { name="multiROC"; version="1.0.0"; sha256="0zb52g1s4km7gs6krmn3k76p4qywx4bjakfr5gs4s4x7ki3w3x43"; depends=[boot ggplot2 magrittr]; };
+  multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; };
   multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
   multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; };
+  multicastR = derive2 { name="multicastR"; version="1.0.0"; sha256="0gs5pbnf9jr7l1hi6dq54a2isx43gdvbxx0p354r060gddj2xwqd"; depends=[data_table]; };
   multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; };
-  multicmp = derive2 { name="multicmp"; version="1.0"; sha256="0cdb1jshrkx1n9a8p4xsa11n3z9g27qcibbc6wz3jcjykdqlwi0r"; depends=[numDeriv]; };
+  multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; };
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
   multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; };
   multifluo = derive2 { name="multifluo"; version="1.0"; sha256="1blmr2cdbdwfyivvla0nmv2n44m168f3d11g5i7vydh8fl17l8vr"; depends=[ellipse imager]; };
@@ -8710,15 +8837,14 @@ in with self; {
   multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
   multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
   multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
-  multimode = derive2 { name="multimode"; version="1.1"; sha256="0dhzpvw71szyw454gi7460yr46j1vas109xgwyz9h6kwm6gi5ysn"; depends=[diptest ks rootSolve]; };
+  multimode = derive2 { name="multimode"; version="1.3"; sha256="130sh1r92z7415j4liz7ka1lpq0b5dxwqdh8s2lnd0wyjz8ysh3k"; depends=[diptest ks rootSolve]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
-  multinet = derive2 { name="multinet"; version="1.1.4"; sha256="0zajynn9mkpaqb5a208g90pv14rfxbb6k8gh9xikj4a42g9ijjsp"; depends=[igraph Rcpp]; };
+  multinet = derive2 { name="multinet"; version="1.1.5"; sha256="15zwwksyfacvlkwrbslr2rz108xb1qmq37r6zxk022hi9gkh4mnz"; depends=[igraph Rcpp]; };
   multinets = derive2 { name="multinets"; version="0.2.0"; sha256="05m0xin8wxshmwb3b9cgsvi8037wvmirbyyim1xxx2ppfwrdr2a6"; depends=[igraph Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
-  multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.7"; sha256="077pjjambyyz6z2a34vnzbwyx9imalhnca3yl6q6j7w12klis41h"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
+  multipanelfigure = derive2 { name="multipanelfigure"; version="1.0.0"; sha256="08vwz3d3gwybb1dzxhmzzik636k7y6dvrwkxpdsij7zw9p5gbbgs"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
   multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; };
   multiplex = derive2 { name="multiplex"; version="2.8"; sha256="01l3kmvsrrq0c98dv5m25yjjcbc99in6dv9k5h54cyjsw4jsjhns"; depends=[]; };
-  multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; };
   multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; };
   multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; };
   multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; };
@@ -8726,17 +8852,19 @@ in with self; {
   multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
   multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; };
+  multistateutils = derive2 { name="multistateutils"; version="1.1.0"; sha256="1fpfmqwspvrhq4n02ha5vpaybnhg8ylqmixm2r2xrk2x3kq7733r"; depends=[data_table dplyr magrittr networkD3 Rcpp survival tidyr]; };
   multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; };
   multivariance = derive2 { name="multivariance"; version="1.1.0"; sha256="1yl1qfckpf98j4ca3wv8zw8vd79isaqvq7qkakyhxy0ljx20jmlk"; depends=[abind igraph]; };
   multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; };
   multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; };
-  multiway = derive2 { name="multiway"; version="1.0-4"; sha256="0gzsxcmavyrsrkmiq7yr0jmxbyk91h9kk9w2gazqxddk2c8q4g2s"; depends=[quadprog]; };
+  multiway = derive2 { name="multiway"; version="1.0-5"; sha256="0ni38h16nddwib9nvcby59rsn9913qwhrlkpdkz99fwz8cnl8rw2"; depends=[CMLS]; };
   multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; };
   multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
   muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
+  mumm = derive2 { name="mumm"; version="0.2.0"; sha256="1dizjqi29cw2bpsr0i3a27mys2rs90yhbg1lc7a2nkg7lwqgb993"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; };
   munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; };
-  munsell = derive2 { name="munsell"; version="0.4.3"; sha256="0jdxlbjslkzaqgp058da1cgm85qvqi09wpcgpvp4hvwnmy83qz1r"; depends=[colorspace]; };
-  munsellinterpol = derive2 { name="munsellinterpol"; version="1.0.2"; sha256="1c4m9fhggczy3wk51m8qxiahkic1f1lq3r8b0x0mk34pd5wap48a"; depends=[geometry]; };
+  munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; };
+  munsellinterpol = derive2 { name="munsellinterpol"; version="2.0.1"; sha256="1pyqsgx2fhrh264yvg6ybkr4skksn1hlanh8950df1f77h70ji6i"; depends=[geometry rootSolve spacesRGB]; };
   murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; };
   musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
   musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; };
@@ -8745,12 +8873,13 @@ in with self; {
   mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
   mvLSW = derive2 { name="mvLSW"; version="1.2.1"; sha256="012p828pyzz6xnv2akax5hx79v522dg4a2gqrjss526qylpg5j9l"; depends=[fields wavethresh xts zoo]; };
+  mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; };
   mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; };
   mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
   mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; };
-  mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.3"; sha256="18gnxs1cx4f7r3m2vgrkmm41vwkamk9mn5hcgjacv2adl0ihnagd"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
+  mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.4"; sha256="08nwmw5z0m6d9xx5f1cna0i0qkanr8f2vj6yicsg1k2zh1xpx0mk"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
   mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
   mvabund = derive2 { name="mvabund"; version="3.13.1"; sha256="1z8bj9zbc8h7w1xki9sc2p2rq6lv8gbcmiy9819z54d7lx1i9cnj"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
   mvbutils = derive2 { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
@@ -8760,17 +8889,17 @@ in with self; {
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
   mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
   mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-1"; sha256="1gyc1xjyapadrv43kd4kngld37q8drhx4qfcimsvf7jdp33y6g5d"; depends=[MASS Matrix numDeriv]; };
-  mvinfluence = derive2 { name="mvinfluence"; version="0.8-1"; sha256="1lpxvc6g8g9kkshxg41a2dwbxzkfnqp4dggr2j5hh2h6f0xrca4j"; depends=[car heplots]; };
+  mvinfluence = derive2 { name="mvinfluence"; version="0.8-3"; sha256="0nygsldkm61ny5ljcc1r667rywj239j4x59ssi81cb2005kkjgm5"; depends=[car heplots]; };
   mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
   mvmeta = derive2 { name="mvmeta"; version="0.4.11"; sha256="1h1393s7xdi4sv461srsard6w961mcxxmxq9mkmfsgw5hdmkwkr2"; depends=[]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
   mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; };
   mvnfast = derive2 { name="mvnfast"; version="0.2.5"; sha256="122zjzr0v4943cax10lp6flwfv479mncvalaj09kb173s5rgmf91"; depends=[BH Rcpp RcppArmadillo]; };
   mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
-  mvnmle = derive2 { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
+  mvnmle = derive2 { name="mvnmle"; version="0.1-11.1"; sha256="131k2bnn6194y3f35r9cgys8g1z2y52123ng8iijpkpbfd147y92"; depends=[]; };
   mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
   mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
-  mvord = derive2 { name="mvord"; version="0.2.1"; sha256="1s9b1lcgfbz333mq6bhqfi9753mhgf3hl5mrakzw2i0inmhjr9mx"; depends=[MASS Matrix mnormt numDeriv optimx pbivnorm]; };
+  mvord = derive2 { name="mvord"; version="0.3.1"; sha256="1i1jhvs9h5s07zqa84i1lm3gx70v32agsiymc0v1msqai12plknb"; depends=[MASS Matrix mnormt numDeriv optimx pbivnorm]; };
   mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; };
   mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
   mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
@@ -8778,12 +8907,12 @@ in with self; {
   mvst = derive2 { name="mvst"; version="1.0.1"; sha256="0sv8pd1524pr3xpxplq468dxfd0wipdr41awqwvcljpw5wgl34qa"; depends=[MCMCpack mnormt mvtnorm]; };
   mvtboost = derive2 { name="mvtboost"; version="0.5.0"; sha256="06zgx1c2470bh3x6s2awzkxbyij6bvzv23xbvamg77v5pz5bjj6h"; depends=[gbm RColorBrewer]; };
   mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-  mvtnorm = derive2 { name="mvtnorm"; version="1.0-7"; sha256="0f7hzflygdnbwvzadr3knhybhanwg7agqddclj6mhbvwqpgb0qyh"; depends=[]; };
+  mvtnorm = derive2 { name="mvtnorm"; version="1.0-8"; sha256="0la42lylb7cjrcrc285bn69bz9kyg556xw317iz139dp1yswl410"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
   mwaved = derive2 { name="mwaved"; version="1.1.5"; sha256="1hb7y42fy26pv6cf235g4xx1vyvwx7chwryi7phjd2aavxffj18z"; depends=[Rcpp shiny]; };
   mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-  myTAI = derive2 { name="myTAI"; version="0.7.0"; sha256="1x7zhkjm89xdzgn4z2ivl9w5srsfbavzdw8kgn2v7x75ihs0dr2n"; depends=[biomartr doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
+  myTAI = derive2 { name="myTAI"; version="0.8.0"; sha256="1wgjhbf3hvhy744zmrqd2wv5bhlysrx34fklhx4car11xylnsiyl"; depends=[biomartr doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
   mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
   mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -8794,52 +8923,52 @@ in with self; {
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
   nLTT = derive2 { name="nLTT"; version="1.4"; sha256="0718r93xw8hw639xpa5w6lax7agr2k3avqx9dcdybqdp19x9qia0"; depends=[ape coda deSolve testit]; };
-  nVennR = derive2 { name="nVennR"; version="0.2.0"; sha256="0y0y15r7j3in2rqiiz42b9rzljajp0pk8172kc7gj9nshih3ryqw"; depends=[grImport2 Rcpp RcppProgress rsvg]; };
-  na_tools = derive2 { name="na.tools"; version="0.2.1"; sha256="1fdbrf97mvak44vzarwqr4w6cs6msr42zcfxl2ci3i67nlgsv4pl"; depends=[]; };
+  nVennR = derive2 { name="nVennR"; version="0.2.1"; sha256="11qkwd8laf67iqyzx3ia424vykvsvy0k9d7labdgqfx2ihd95hh2"; depends=[Rcpp]; };
+  na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; };
   nabor = derive2 { name="nabor"; version="0.4.7"; sha256="16dxnvq6yxlrignzvxjdwzwm32fn2a8bsjqjsg5qz94ir7g3pzm6"; depends=[BH Rcpp RcppEigen]; };
-  nadiv = derive2 { name="nadiv"; version="2.14.3.1"; sha256="08276bakyrn9d9vh08yzan60kigsihwfhgx788gwp6pk8v6m25wa"; depends=[Matrix]; };
+  nadiv = derive2 { name="nadiv"; version="2.16.0.0"; sha256="0pfg9hbhcjgbfmakl1jqqaf9i07i5z5jk7sh2x7x7p4354z30z9y"; depends=[Matrix]; };
   naivebayes = derive2 { name="naivebayes"; version="0.9.2"; sha256="0xmgcvvhfh7v8afi8fywaldawbx3s5hwgpvyyp2c9m6nrhw1kknl"; depends=[]; };
   naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; };
   namedCapture = derive2 { name="namedCapture"; version="2017.06.01"; sha256="14zimn3wbavbkwra8vfmqdm1q5bmlmsbg0b29cjly5dd4zlfzzb0"; depends=[]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  naniar = derive2 { name="naniar"; version="0.2.0"; sha256="04r3yfv6sv1yrwl4vasn5nxr0bn6fwdjk2zyx4p7vy8kfcw24300"; depends=[dplyr forcats ggplot2 glue magrittr purrr purrrlyr rlang tibble tidyr viridis visdat]; };
+  nandb = derive2 { name="nandb"; version="1.0.1"; sha256="1hg6j8sv2fhaqwp2hzkgdwfymr2f3j6506vz2kshj3h3387nfhm4"; depends=[autothresholdr checkmate detrendr dplyr filesstrings ijtiff magrittr MASS purrr Rcpp rlang stringr]; };
+  naniar = derive2 { name="naniar"; version="0.3.1"; sha256="0mscn99x3wwf5jdi6khlf6n9w737icf07vhz6yqsqpkzsd8z825w"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr viridis visdat]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
-  nanotime = derive2 { name="nanotime"; version="0.2.0"; sha256="138qz844sczgzzl8vn5079590hnq96w7jdbn851cpw64gmq21r4w"; depends=[bit64 RcppCCTZ zoo]; };
+  nanotime = derive2 { name="nanotime"; version="0.2.1"; sha256="0zb6gwxzmcmk2v1020xc2l3bzrz8kz1b445x3ci6s7pgwh0njxra"; depends=[bit64 RcppCCTZ zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
-  nardl = derive2 { name="nardl"; version="0.1.4"; sha256="108m1bngal27pz80l1rdlgrx7x4id42ch95w1g9d0r5jnlxlvxp7"; depends=[Formula gtools matlab strucchange tseries]; };
+  nardl = derive2 { name="nardl"; version="0.1.5"; sha256="1xi1fkwgkfc1b8qsgi4lrjx419778qk0vxzl23azcziwa6fha5p8"; depends=[Formula gtools strucchange tseries]; };
   narray = derive2 { name="narray"; version="0.4.0"; sha256="0cr0y8mqwprxk0bv9160xvqxgvqkihn3avzsjm6ccivvb8zlkqxv"; depends=[reshape2 stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
   nat = derive2 { name="nat"; version="1.8.11"; sha256="1s5hbi1b20jq0qv4px0zrwsivhi2mdlqbwx4lv55mdhj447rxk1x"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
   nat_nblast = derive2 { name="nat.nblast"; version="1.6.2"; sha256="0b2gzyzszj2v5girxyv31nvds0837lzvim7x7bs9h897yrxs57k8"; depends=[dendroextras nabor nat plyr rgl spam]; };
-  nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.8.2"; sha256="09kyi4p28n8dgw8jpv00vh9vl6nqmmgqfriwkicx8yyq65vh6fxk"; depends=[digest igraph memoise nat rappdirs rgl]; };
+  nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; };
   nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
   natserv = derive2 { name="natserv"; version="0.1.4"; sha256="0qwf7lapx5gchk8xmdnmxr10j5dnkp52mqnh1ja216z7l841cl07"; depends=[crul data_table tibble xml2]; };
   natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; };
   naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; };
-  nauf = derive2 { name="nauf"; version="1.1.0"; sha256="1c7g7qjd77lcx2nghw1mxp60q7sc2hjdr4drjkypzyqs8q3q97rm"; depends=[bayesplot car digest lme4 lmerTest loo lsmeans MASS Matrix pbkrtest Rcpp rstan rstanarm shinystan standardize stringr]; };
   nbc4va = derive2 { name="nbc4va"; version="1.0"; sha256="0y1qpkzjr327qyvmqf129m400rvn6gwk72ccnly6cqq53icrarn4"; depends=[]; };
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; };
-  ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; };
-  ncar = derive2 { name="ncar"; version="0.3.8"; sha256="02xglxz63b9b7yfkwqrh81spzkmvglay6wpylm9fwcqxdasf3bj5"; depends=[NonCompart rtf]; };
+  ncar = derive2 { name="ncar"; version="0.4.0"; sha256="0in8nvkxgd6p5xdwyqnqlnhskysbja9lw1pw3hl8zfn1qhcgqxl9"; depends=[NonCompart rtf]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
   ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; };
   ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
   ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; };
-  ncf = derive2 { name="ncf"; version="1.2-3"; sha256="0d4qbfdhwy071vhkfjn9385vak73zf9c9ghbbiba1ha2d9d2irsl"; depends=[]; };
+  ncf = derive2 { name="ncf"; version="1.2-5"; sha256="0w7zaiiy1ddahq8nw3q23k6qh4yw2d1iw4wybwiii3spn8hab57s"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
   ncmeta = derive2 { name="ncmeta"; version="0.0.2"; sha256="1qr0zfyy8g3zrmvg6i6b7sfvl3lavr391rqgf6pqhslg7i9cgpiz"; depends=[dplyr rlang RNetCDF tibble]; };
+  ncodeR = derive2 { name="ncodeR"; version="0.1.0"; sha256="0bjjz9x6cfgkgc6z32pkl5b6khhdl5yjn9mi2b3n184kvpszjygj"; depends=[cli R6 rhoR]; };
   ncpen = derive2 { name="ncpen"; version="0.2.0"; sha256="1wrpscd9n7z9lz7537qyy4rn4pjznlb8zwb79kkzmnfvyj21fi1r"; depends=[Rcpp RcppArmadillo]; };
   ncvreg = derive2 { name="ncvreg"; version="3.10-0"; sha256="0q9rk1mz2rm1h99m093kz7a2p6fl3pj4nqzblp3154q8i1kva7za"; depends=[]; };
   ndjson = derive2 { name="ndjson"; version="0.6.0"; sha256="0w7a587q45hkzmjhzlyrhk0hw4c8avkfzf4ai0wib5qk3al8gk6n"; depends=[data_table dplyr dtplyr Rcpp]; };
   ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; };
-  ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
+  ndtv = derive2 { name="ndtv"; version="0.12.2"; sha256="0jyzdi19n2h6kf8kbibg1lap3mxq9bbn390xwrv2abnc3y437vqb"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
   nearfar = derive2 { name="nearfar"; version="1.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; };
   neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
   neat = derive2 { name="neat"; version="1.1.3"; sha256="0d8igx576jhi7f666nwn0wpdyvin974k5cfm7wdszzbnpng5961k"; depends=[igraph]; };
-  neatmaps = derive2 { name="neatmaps"; version="1.0.7"; sha256="07nr8c5i1s3sba4l2123vb50b1cgn1qjdckwmyjwwai1yb3smkag"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; };
+  neatmaps = derive2 { name="neatmaps"; version="1.1.0"; sha256="0qsc0jwnyadbm45qrskpmw12i980q11i988mga8ky3x4fa4jp82d"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; };
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
   negenes = derive2 { name="negenes"; version="1.0-8"; sha256="0qyhypryp3p8c876jffg1syg05b370mw24clwlx733yx86qhmb1v"; depends=[]; };
@@ -8849,18 +8978,21 @@ in with self; {
   nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; };
   nesRdata = derive2 { name="nesRdata"; version="0.1.0"; sha256="1h33hql0vgkr2ps1ysisdxxb0cnm18mh8sbd3fxy9xf42icwfwdb"; depends=[dataone dplyr purrr rappdirs readr]; };
   nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
+  nestfs = derive2 { name="nestfs"; version="0.8.4"; sha256="1w2wb3wphpx8y17jwpnbqq9igyq854rsa35bhk51m422zhygqygk"; depends=[dgof foreach]; };
   net_security = derive2 { name="net.security"; version="0.3.0"; sha256="15vvcmakl9hl1srdhjf73g2bwwcxn93220i4gv0rcsw5732mjanz"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; };
   netCoin = derive2 { name="netCoin"; version="0.2.8"; sha256="0axac72fj5qhssdpx8k20lgayzpwzcd3pp7cz4mv6cwfzc0y8768"; depends=[haven igraph Matrix]; };
+  netSEM = derive2 { name="netSEM"; version="0.5.0"; sha256="0gcs38r3xwwcxhgs1xfbkccz9k0y7dk5kky48fvmys8v1p4rsjpp"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; };
   netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; };
   netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; };
   netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; };
-  netdiffuseR = derive2 { name="netdiffuseR"; version="1.19.0"; sha256="0rnf7hf5vxpqw2rn00yqmkgpsx752pmfigyggbs4ikfbcsjq24sx"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM]; };
+  netdiffuseR = derive2 { name="netdiffuseR"; version="1.20.0"; sha256="0z7k62dipksc8gfppicbknh5sig7jdlr80h15q89bbk26jg5lqsr"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridis]; };
   netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; };
-  netgwas = derive2 { name="netgwas"; version="0.1.4.2"; sha256="19r168xppxgdj3b0b575b47vgmzbzkgwpqh499vlm5as9livjlyb"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; };
+  netgwas = derive2 { name="netgwas"; version="1.5.0"; sha256="0ixdk602v58ii4awrvj63j0zn90z3csc0lcwajfa8j8ymryc0hgs"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; };
+  netjack = derive2 { name="netjack"; version="1.0.0"; sha256="016byr8qsmmiyk5wdafn809w2sc71mav7jdxyg4cs48gzp7zslpp"; depends=[brainGraph ggplot2 igraph Rdpack]; };
   netmeta = derive2 { name="netmeta"; version="0.9-8"; sha256="0bkfxdz14lg9r51ykwmkmpm6vhbvly35hrcgj6f26g36ihagjksd"; depends=[magic MASS meta]; };
   netrankr = derive2 { name="netrankr"; version="0.2.0"; sha256="1y56y5wv95d7mmjf8rrwr7cs0k64h9a2qbpind4xp0kakpjihn7m"; depends=[igraph Rcpp RcppArmadillo]; };
-  netregR = derive2 { name="netregR"; version="0.3.0"; sha256="106qq3mafqbcdyhnjicbzc4rzi9mr262nqb3ncpzpcvkf0xd988w"; depends=[Matrix]; };
+  netregR = derive2 { name="netregR"; version="0.3.1"; sha256="0ki0ywnwjba53bram4dxxdxx631b0rywp1rjgj83nvdbg3mdcp7x"; depends=[Matrix]; };
   nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; };
   network = derive2 { name="network"; version="1.13.0.1"; sha256="1bbkbqkqf1d7irfwh08c13c2pfypir1ssvlqrln83irqns1ikdv0"; depends=[]; };
   networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
@@ -8871,16 +9003,16 @@ in with self; {
   networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
   networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; };
   networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
-  networktools = derive2 { name="networktools"; version="1.1.1"; sha256="1cfjhh0w5gs1v6d9q40bcjs658p308i20nybnqb8r7nkf77acxbg"; depends=[cocor devtools ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet qgraph reshape2]; };
+  networktools = derive2 { name="networktools"; version="1.2.0"; sha256="023vmzvvlilr8dd1jjwp4xiszqkvpa231mkd6d9ibm3r99zcgdza"; depends=[cocor devtools eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof]; };
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; };
   neurobase = derive2 { name="neurobase"; version="1.26.1"; sha256="0fb2cvh3j650zjx7b60jfrvm5i7n3l98wis91bmyr9hx3qz24rj5"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
-  neurohcp = derive2 { name="neurohcp"; version="0.8.0"; sha256="1p38n2ggz2yj6fqrlf2jm1jnjbv8a0ifi477f5qklmr4bga2c4kr"; depends=[base64enc digest httr xml2]; };
+  neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
   neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; };
-  neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.1"; sha256="15bgb9bh4nwjhjq6wkfbk7cys4mrih3bnjv527mrack8pwkybgpa"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; };
+  neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.2"; sha256="1p1zjc3fiphkxflsyzrxx8af98aa0gp9pvby63mmrsjb0z7ps948"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; };
   neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; };
   newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; };
   ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; };
@@ -8892,19 +9024,20 @@ in with self; {
   nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; };
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
-  nima = derive2 { name="nima"; version="0.4.5"; sha256="1fllq76k4r07ymd58s865hgg3yrmwa34kr5mjd89n50mm1m110mh"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; };
-  nimble = derive2 { name="nimble"; version="0.6-10"; sha256="0aa6823b7xnp2bgrc3jwjrc2py9y57xadsahzva4zxn7vlsp5f36"; depends=[coda igraph R6]; };
+  nilde = derive2 { name="nilde"; version="1.1-1"; sha256="09r8xfwpz243xmb5l33fw7wf09lw5q9m57anqd2n5wrxfqzzz57h"; depends=[]; };
+  nima = derive2 { name="nima"; version="0.5.0"; sha256="1xpzq1mg2l9hnh83hbmxcqz3v0ai62ii7k688i8lpj0xnpsm25pl"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; };
+  nimble = derive2 { name="nimble"; version="0.6-11"; sha256="12vprr5snz05y3k4lq7x51yz1q4crwx5cn42dvbnff4pf7kpj218"; depends=[coda igraph R6]; };
   nipals = derive2 { name="nipals"; version="0.4"; sha256="0h9jxmj44x3lllxk1y2izkslafbiab175qrsxlnfcvhnaj13zsds"; depends=[]; };
-  nitrcbot = derive2 { name="nitrcbot"; version="1.0"; sha256="1cg52zv72ppv8vgfl3rccgykw2bhlk3j7pm47cydfmhqbc6sn6by"; depends=[dplyr httr]; };
+  nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; };
-  nlcv = derive2 { name="nlcv"; version="0.3.2"; sha256="1lknlqd64p15lnkydbi7zx7lmhg1fdl750yjqjaccdjzrgrqvgkv"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; };
-  nleqslv = derive2 { name="nleqslv"; version="3.3.1"; sha256="1n1sbp7436yd5g6v0060j2iwk4rppjq2pc5x47g9wlwnskdfgvl7"; depends=[]; };
+  nlcv = derive2 { name="nlcv"; version="0.3.5"; sha256="1ywnm8a13ifqa1bxnf659h1j6mg9iy02vaszyh9p966ps9c1pjab"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; };
+  nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; };
   nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; };
   nlme = derive2 { name="nlme"; version="3.1-137"; sha256="11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
-  nlmixr = derive2 { name="nlmixr"; version="0.9.0-3"; sha256="1fwnq0bnsqadadgy9i1083dz4zkidwdxm2ncy6jyrk1pb055m318"; depends=[BH brew dparser ggplot2 inline lattice lbfgs Matrix memoise minqa mvtnorm n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders]; };
+  nlmixr = derive2 { name="nlmixr"; version="0.9.1-3"; sha256="0pl9dm09wc4wa0y64ncqcrrarmimahgcdzf1hz09aj5r5l5pvfvd"; depends=[BH brew cli crayon dparser fastGHQuad ggplot2 lattice lbfgs magrittr Matrix memoise minqa n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders vpc]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
   nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; };
   nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
@@ -8926,27 +9059,29 @@ in with self; {
   nlts = derive2 { name="nlts"; version="0.2-2"; sha256="0bx6xqa3j0k01p43vnv5lcv2pryjzgsak77y1cr9rm2xwqa3j6az"; depends=[acepack locfit]; };
   nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; };
   nmathresh = derive2 { name="nmathresh"; version="0.1.3"; sha256="09pxbizmvdp2l5j1gs0v3xk2lsyclx5rndaw6b4ccn61m3x060ls"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
-  nmfem = derive2 { name="nmfem"; version="1.0.1"; sha256="10y3s7g76pnqqyg8wc3cyjiqay7scp0bdlly4yx30v2sbvxf0msx"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
+  nmfem = derive2 { name="nmfem"; version="1.0.3"; sha256="1v808k25g0ph1wvx1j89izfxy9szn0m4sf965d8nkygrk184i9gj"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
   nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; };
-  nmslibR = derive2 { name="nmslibR"; version="1.0.1"; sha256="02c2ns9dw1mkr5gmsd31j0yjcr3vr302yvqkfdkmm9csppdcrmb3"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; };
+  nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; };
+  nmslibR = derive2 { name="nmslibR"; version="1.0.2"; sha256="1ya3dqnkrlvpil2nypcl3pp6f3x20ip40avnrbqgbylak7yqg9yw"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; };
   nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
+  nnTensor = derive2 { name="nnTensor"; version="0.99.1"; sha256="0ai3mqyw24mwl6gcz2jmlvfv59y937n675gram1ajwxdlx76fxff"; depends=[fields plot3D rTensor tagcloud]; };
   nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; };
   nneo = derive2 { name="nneo"; version="0.1.0"; sha256="0jaaz15y1csh3bwmzp7mgx86m3f0w3ykzb8qdvg8ak2grxw3wl6a"; depends=[crul data_table fauxpas jsonlite tibble]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnfor = derive2 { name="nnfor"; version="0.9.2"; sha256="1wxv8s5547spw155rj7nlilsfn5d7m40xpfy87mady93n25pwm3d"; depends=[forecast glmnet MASS neuralnet plotrix]; };
-  nngeo = derive2 { name="nngeo"; version="0.1.5"; sha256="1285a0p461wm91zriy7rh3awh0k0z7ifmjkxffyxh1l84y51jfak"; depends=[geosphere lwgeom RANN Rcpp sf units]; };
+  nngeo = derive2 { name="nngeo"; version="0.1.8"; sha256="0fxiq65kd1q7w95m9hhg18xw3l8czi0li60wkr9h3dakmy2s9j7m"; depends=[geosphere lwgeom RANN Rcpp sf sp units]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
-  nodiv = derive2 { name="nodiv"; version="1.1.9"; sha256="0pbcigfqps44i07yghcg5zx5nlybivkb34bz67fnkgkpbkbs79k7"; depends=[ape picante raster sp vegan]; };
+  nodiv = derive2 { name="nodiv"; version="1.2.0"; sha256="0bdhlq5nd169hbwnik4z843xzh5bbmahrvyxj54626zxyvf1fmfb"; depends=[ape picante raster sp vegan]; };
   nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
   nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; };
   nomine = derive2 { name="nomine"; version="1.0.0"; sha256="1yaxhac002fxcyiz5x562fnhrsq9h9nx0qmw4rykjsc5l2qbi9gd"; depends=[httr RCurl]; };
-  nomisr = derive2 { name="nomisr"; version="0.2.0"; sha256="0a83fcn5qq2wycbn6acfhapni3k84jf1xj7aarmnr9az1gqdbwc9"; depends=[dplyr httr jsonlite readr tibble]; };
+  nomisr = derive2 { name="nomisr"; version="0.3.0"; sha256="0ia1i3gzp7wp8hf57arajbf7063m4jpbb2hl0l03rwg1z4afb7jd"; depends=[dplyr httr jsonlite readr rlang rsdmx tibble]; };
   nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; };
   noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
@@ -8971,6 +9106,7 @@ in with self; {
   normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; };
   normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
   normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
+  norris = derive2 { name="norris"; version="0.1.0"; sha256="1y90m9k18y0cm5rgkq1ny0d1sc14z87srlwqv99ppn1fg4r21k37"; depends=[dplyr httr jsonlite stringr]; };
   nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; };
   nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; };
   nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; };
@@ -8978,14 +9114,14 @@ in with self; {
   not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
-  novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
-  nowcasting = derive2 { name="nowcasting"; version="0.1.2"; sha256="08f45k0z5k9fmf1k9sjg71jrnlvalkylimby8plqqxiza05ga25b"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL xts zoo]; };
+  nowcasting = derive2 { name="nowcasting"; version="0.1.3"; sha256="1b74rqz7y4g5zyrbmns27v60jpv13s5aax9dyiyvnk2y7ng1kp5x"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL xts zoo]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
-  np = derive2 { name="np"; version="0.60-6"; sha256="1y72x5j9j9mcgcy2xizk31gl843hfkngxdn8s4qw7yhw2qj79hsr"; depends=[boot cubature quantreg]; };
+  np = derive2 { name="np"; version="0.60-8"; sha256="17h67a510wh83800ri6g02wvznrlhigxni8shyijz1iaxcpk8k4j"; depends=[boot cubature quadprog quantreg]; };
   npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; };
   npROCRegression = derive2 { name="npROCRegression"; version="1.0-5"; sha256="09ngfj0bd9cp19lpwsbknp2y71x36k03ph84bmf67wm1q2na7f93"; depends=[lattice]; };
   nparACT = derive2 { name="nparACT"; version="0.8"; sha256="0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b"; depends=[ggplot2 stringr zoo]; };
   nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
+  nparMD = derive2 { name="nparMD"; version="0.1.0"; sha256="0kxbcykc01b1c68hk3akfhs9xzmshxvjvhm69k4j1c4nvpz8y9z9"; depends=[Formula gtools MASS matrixcalc matrixStats]; };
   nparcomp = derive2 { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
   nparsurv = derive2 { name="nparsurv"; version="0.1.0"; sha256="1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2"; depends=[survival TH_data]; };
   npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; };
@@ -8994,21 +9130,22 @@ in with self; {
   nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
   nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; };
   npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; };
-  npmlreg = derive2 { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
+  npmlreg = derive2 { name="npmlreg"; version="0.46-3"; sha256="1k1l977g1a86918k6w7h2m8145x7adb8r7q2s4jky8s9ixa14hz3"; depends=[statmod]; };
   npmr = derive2 { name="npmr"; version="1.1"; sha256="1ss8ypvv6qcdxv7l3szivliwmhidmzi3572p3nz96ysndf56akl4"; depends=[]; };
   npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; };
   nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
   npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; };
   npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; };
-  nprobust = derive2 { name="nprobust"; version="0.1.2"; sha256="0hc2p30jalaibjwlq8g52rdpifhvmpaq2c7ww0zzhf3h1az442xs"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  nprobust = derive2 { name="nprobust"; version="0.1.3"; sha256="1zr89myhamcxzk7j04rxcc4mbi86pf09kl70p8niklm0b3wmsjzj"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   nproc = derive2 { name="nproc"; version="2.1.1"; sha256="0wpny7c1n9mmv1yywlws8gjbidkrikvcqcckrxpba9avjw2c5df8"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
   npsf = derive2 { name="npsf"; version="0.3.1"; sha256="1mv2dzn3gc7b9ynpw8dv22xd31igg4hmkgrds12n9920pghkya44"; depends=[Formula Rcpp]; };
   npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; };
   npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; };
+  npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; };
   npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
   npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; };
-  nricens = derive2 { name="nricens"; version="1.5"; sha256="0a7b4kw91qkr9vrm8swflby06a78d059im54zxxgvy42qjsijwqx"; depends=[survival]; };
-  nsRFA = derive2 { name="nsRFA"; version="0.7-13"; sha256="0xa8zm0mk5ckwsmbgdyk8xv1q56pm6j19zxd48rwl3fsqs49bpah"; depends=[]; };
+  nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; };
+  nsRFA = derive2 { name="nsRFA"; version="0.7-14"; sha256="0sd3br2a5jf6mqbxk8s2i7px9vi9bk3pl8bd5884k40xqcj77irs"; depends=[]; };
   nsROC = derive2 { name="nsROC"; version="1.0"; sha256="0c99z8kknbrnbyyv7p79sj848aq7b5n4m4r7v1yrcs61ackrdn2n"; depends=[sde survival]; };
   nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; };
   nscprepr = derive2 { name="nscprepr"; version="0.1.1"; sha256="1rd32zywrzyxz6hpn9s6cwjlg8q8rz3cc0p3b5gan8bicx0ilwjc"; depends=[dplyr lubridate stringr]; };
@@ -9016,25 +9153,25 @@ in with self; {
   nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
   nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
   nspmix = derive2 { name="nspmix"; version="1.4-0"; sha256="1cd133ncnr4g0n6w4c44q6mda8y1n7cfmsgy1x1kczvwp7cm9kk2"; depends=[lsei]; };
-  nsprcomp = derive2 { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; };
+  nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; };
   nucim = derive2 { name="nucim"; version="1.0.0"; sha256="0fyapw6f5wkybr4mwmqpk9wy349j5sa4q26pci1bsy4ly2wf9wx6"; depends=[bioimagetools EBImage fields stringr]; };
   nullabor = derive2 { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
   numDeriv = derive2 { name="numDeriv"; version="2016.8-1"; sha256="07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v"; depends=[]; };
   numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; };
   numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; };
-  numOSL = derive2 { name="numOSL"; version="2.3"; sha256="1bcj1qk3nx1jqhldx9rcwphvlxspz3bj4vb891hkw2fa2i4559c5"; depends=[]; };
-  numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; };
+  numOSL = derive2 { name="numOSL"; version="2.5"; sha256="0wrddd5yvilp66p2m9jbchd0spb55zgl3k63zf3yq3dc8jdrvzvy"; depends=[]; };
+  numbers = derive2 { name="numbers"; version="0.7-1"; sha256="1k5a24pnjhn3h330q0s7ivk2v5dsjmg2xwlhfinzixihnwhc12xy"; depends=[]; };
   numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; };
   numform = derive2 { name="numform"; version="0.4.0"; sha256="09vim4ajnnkdf27ag5j8pj7p8qyfakfh3ar1dki8bqzms2d7bkcm"; depends=[]; };
   nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
   nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
   nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
-  nycflights13 = derive2 { name="nycflights13"; version="0.2.2"; sha256="1857pwyhb5gvbdxv934nlc50n4ai7njm89js7b7ywfg7mhgha4yc"; depends=[tibble]; };
+  nycflights13 = derive2 { name="nycflights13"; version="1.0.0"; sha256="10b05cxpiysvlif59lriprxcyhgk59d3qmcpwwzk88wy6bicl9hn"; depends=[tibble]; };
   nyctaxi = derive2 { name="nyctaxi"; version="0.0.1"; sha256="187fs819g45f8irx2s9bgwnzr00lyamfv2ra88kyb8q2cq1icwwy"; depends=[DBI dplyr etl rlang stringr]; };
   nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; };
   nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; };
-  oXim = derive2 { name="oXim"; version="1.2.1"; sha256="1qjscjq5v50v7kwbmiz1niylwpnh20g5qldyxn7fw0kkqs398sk0"; depends=[gstat imagine R_matlab sp]; };
+  oXim = derive2 { name="oXim"; version="1.2.2"; sha256="1hi4ps36amvgqgj64yc3cvy4sx32z1az6lk5yy1sciy6074k5byb"; depends=[gstat imagine R_matlab sp]; };
   oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
   oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
   oai = derive2 { name="oai"; version="0.2.2"; sha256="0q1w29wrppi5sfabdw8px7zr92bgri3jhy0y7dhi46xggxfg9vm1"; depends=[httr plyr stringr tibble xml2]; };
@@ -9050,62 +9187,63 @@ in with self; {
   obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
   observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; };
   oc = derive2 { name="oc"; version="1.01"; sha256="12idrh4jxxq28lgqzr6jzgrvmmwysh5amzhmmaqn3yz49i17gcaf"; depends=[pscl]; };
-  occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; };
+  occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; };
   oce = derive2 { name="oce"; version="0.9-23"; sha256="0k5h6k4y9bas2aqwkh1dkxmwgx4d41hxy87zfih5iq8ff61d03rr"; depends=[gsw testthat]; };
+  oceanmap = derive2 { name="oceanmap"; version="0.1.0"; sha256="1kkjc213nn2ks7cqzchbmjvyp9hci8qndv8migpmyf5vjbm7d297"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
-  odbc = derive2 { name="odbc"; version="1.1.5"; sha256="0wsi2sv51v4ij3b72lzn8jlsc5d45hyj4qmr4iygpimflqsibjqm"; depends=[BH bit64 blob DBI hms Rcpp]; };
-  odds_converter = derive2 { name="odds.converter"; version="1.4"; sha256="13y3s04l2jvjhn1i4syz4y3q42ba8br0sp3mks5f5h4cp8w4j3wy"; depends=[]; };
+  odbc = derive2 { name="odbc"; version="1.1.6"; sha256="146phrsks0hfd1bfxx452kkq7ximk3fwjz9lqg9fdykar5sr6vjj"; depends=[BH bit64 blob DBI hms Rcpp]; };
+  odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; };
   oddsratio = derive2 { name="oddsratio"; version="1.0.2"; sha256="0s9w5iqcabkc7lqdh27nmg7xnw2jpwik5djjlqxb6xgabzls97d6"; depends=[cowplot ggplot2 MASS mgcv]; };
   odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
   odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; };
-  odkr = derive2 { name="odkr"; version="0.1.3"; sha256="0vcpsykr4sq4rq721vyd3wbm4jzlldvvxqh75q7x7wwhjhrnr3qn"; depends=[Hmisc stringr]; };
   odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; };
   odr = derive2 { name="odr"; version="0.7.3"; sha256="07jfd809wv92ijgw1r1nq9516zi2rkf3ik243br42glf6lszn19p"; depends=[]; };
-  oec = derive2 { name="oec"; version="2.5.2"; sha256="17np562cv6ln3j4b9iawyhbz8kfd5cy1ifj96kzyhv082jgpsk1s"; depends=[dplyr jsonlite magrittr readr servr]; };
+  oec = derive2 { name="oec"; version="2.7.8"; sha256="0qi5xkyh5xgwcivihnc9wv96lzhdzlcz4zv08pvpxf7dx1qhafrj"; depends=[curl dplyr jsonlite magrittr purrr readr rlang stringr]; };
   oem = derive2 { name="oem"; version="2.0.8"; sha256="08j9y9vq31skvdpg0kyqj50d77aijd2d95vcwm92df5vcvw9bpwz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
-  officer = derive2 { name="officer"; version="0.2.2"; sha256="1yixvlcz7mnf3w5kixd14zi0sa6vvydiqvlsnvj0zll8vplmcsij"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp uuid xml2 zip]; };
-  oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; };
-  ohtadstats = derive2 { name="ohtadstats"; version="1.0"; sha256="1wpil3ag7vzinz4ky7jpzny88a4ycfifbhayyib9cldk8d0mbcgh"; depends=[lattice]; };
+  officer = derive2 { name="officer"; version="0.3.1"; sha256="1qpy2srk4sqmnqmpaivgp5j5nc3b58mjbibzkq5nw784jni13jmj"; depends=[base64enc digest htmltools magrittr R6 Rcpp uuid xml2 zip]; };
+  oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; };
+  ohtadstats = derive2 { name="ohtadstats"; version="1.1.1"; sha256="1d011xcrn9zhb4pf9wkwlynvz3kkk95yk2l5qs352ra1dhki7b6k"; depends=[lattice]; };
   oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
   okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
   olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; };
-  olsrr = derive2 { name="olsrr"; version="0.5.0"; sha256="1id5z628bq91p3w64mq28bk247i6vb9ly1maqpf6fsfqiq2pavmv"; depends=[cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
+  olsrr = derive2 { name="olsrr"; version="0.5.1"; sha256="1kwscd1gxh1r3bsjmaanrm8jsi9gjggqmg629nmmlkx2ql5qcgja"; depends=[car checkmate cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
   omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
-  ompr = derive2 { name="ompr"; version="0.7.0"; sha256="06zhmddg19sjnl18zmjjswggjg58rjgarqj2wqf5jf0g0qz3my2n"; depends=[dplyr lazyeval Matrix progress Rcpp]; };
-  ompr_roi = derive2 { name="ompr.roi"; version="0.7.0"; sha256="1gcgwln7gfxd2jiqq3qbsiqircvjs8yhnxk9rcamim14x6gky4xg"; depends=[Matrix ompr ROI slam]; };
+  ompr = derive2 { name="ompr"; version="0.8.0"; sha256="1nmd5wa1g2xzmwqfqf882bxcrmkxbb5b414cbbzvmqzfs34yk6bl"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; };
+  ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; };
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; };
   onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; };
-  onewaytests = derive2 { name="onewaytests"; version="1.6"; sha256="0xxqsqnk0s9w0xjj3ixghm9d1yg9fhq5lc5xyicfimnigb13hddl"; depends=[car ggplot2 moments nortest]; };
+  onewaytests = derive2 { name="onewaytests"; version="1.7"; sha256="1lly2pxw08mmm4gqgj3wxa9ayhf90fyqjhnj8hcvr408k9p7bgsb"; depends=[car ggplot2 moments nortest]; };
   onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
   onlineVAR = derive2 { name="onlineVAR"; version="0.1-0"; sha256="1hqriwrlxhbi5v5wpqxfvvcb6np1iaarb3zf84ykfzi4llqqgz24"; depends=[lattice]; };
   onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; };
-  onnx = derive2 { name="onnx"; version="0.0.1"; sha256="0yzvgcpqad19sw9mhh3dfci1cqa7p3i1ssmpjyycy7rkqq8kb0xs"; depends=[reticulate]; };
+  onnx = derive2 { name="onnx"; version="0.0.2"; sha256="0gyyaplq20cb0bilnmx0k2cm7yzrfvwsawdzs0bha1p5b83l003v"; depends=[reticulate]; };
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.4"; sha256="168m4jdwbzv8lpimx9063306691hnfdjmdhb5y8195d9vcq049jr"; depends=[]; };
   ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
-  oompaBase = derive2 { name="oompaBase"; version="3.2.5"; sha256="0269jmdw236jy008ic6iwg9y2fq674alqvd5zdvy1k2grxm72hvw"; depends=[cluster]; };
+  oompaBase = derive2 { name="oompaBase"; version="3.2.6"; sha256="0lighs2546nyhpgbjsn4k53c7jw6xyla5b82v8jp3l1sqxj68a3s"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  openCR = derive2 { name="openCR"; version="1.1.1"; sha256="0dmjisnxn9hdi2a4pb7qy367g4lmmlvnc8sll55dzjir472c3zm1"; depends=[abind MASS nlme plyr Rcpp secr stringr]; };
-  openEBGM = derive2 { name="openEBGM"; version="0.5.0"; sha256="079wy3xrfdcmn0wd314rlrf4499qpdhsfq1m4b7s5y9c21h0raiy"; depends=[data_table ggplot2]; };
+  openCR = derive2 { name="openCR"; version="1.2.0"; sha256="1wz31rnvdz1s253krf423ipkmfsxia66d5adnbyp3r59mc48yh1k"; depends=[abind MASS nlme plyr R2ucare Rcpp RcppParallel secr stringr]; };
+  openEBGM = derive2 { name="openEBGM"; version="0.6.0"; sha256="0xzcdahfxdk1zjq6019yvr2mlhyqxbsqx6vd4w95mjq9h3bd5vmr"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; };
-  openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; };
-  openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; };
+  openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; };
+  openVA = derive2 { name="openVA"; version="1.0.4"; sha256="1lfc8h64y7zlcyf30pw0zrmzrjh4x4kkij0awmwwzhw402cvb16r"; depends=[ggplot2 InSilicoVA InterVA4 InterVA5 nbc4va Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
-  openair = derive2 { name="openair"; version="2.3-0"; sha256="0kfikssvmdg1r7j1z80hw7pa66rs06cki211rhmv0f12m500zl0c"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
+  openair = derive2 { name="openair"; version="2.4-2"; sha256="1kaq0ww3829qh6wsnaa2asyyqmqhdgm9am70g0vphf7lp9vjk9x1"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
   opencpu = derive2 { name="opencpu"; version="2.0.5"; sha256="1bs2z3y2zc3aqzfjh6bq3qrpzm106f5xhw7lbyng1bpcp4rch6y3"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
   opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; };
   openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; };
+  opensensmapr = derive2 { name="opensensmapr"; version="0.4.1"; sha256="1yq0fxlfb203di2y0n23zfy4xyjy1ij52s4kp1fn44pb3gmqhndm"; depends=[digest dplyr httr magrittr]; };
   openssl = derive2 { name="openssl"; version="1.0.1"; sha256="1qyql5gpwf88bkm1qarjhbqbq4hn6w0d8j4pxb5x7i96is30ap30"; depends=[]; };
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
-  openxlsx = derive2 { name="openxlsx"; version="4.0.17"; sha256="1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi"; depends=[Rcpp]; };
+  openxlsx = derive2 { name="openxlsx"; version="4.1.0"; sha256="1n7z22pm78xa77fvn77kdn68az6xzxk36y11sqf0w6h6adri4yxb"; depends=[Rcpp zip]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
   operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
   operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
@@ -9118,27 +9256,28 @@ in with self; {
   optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; };
   optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; };
   optextras = derive2 { name="optextras"; version="2016-8.8"; sha256="03wqz16q8kn0ndk241h541fa0g5y0nrfg17vph85cm5xvzdd14cc"; depends=[numDeriv]; };
-  optiRum = derive2 { name="optiRum"; version="0.37.3"; sha256="1g3kgfwa7ckh45v14qdi3gq9vy0zfpjaffcgpfapyylrsrnspy3f"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
-  optiSel = derive2 { name="optiSel"; version="2.0"; sha256="1k8xbxabbzrlyqb12zdd3jyd8i1cfppah8m8sdkc40y02llgzgyv"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; };
+  optiRum = derive2 { name="optiRum"; version="0.40.1"; sha256="1kl9mzh53pwhrxbn89dsjjpfji7k8vmysscd1qd9sw7vqdan8g6x"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
+  optiSel = derive2 { name="optiSel"; version="2.0.1"; sha256="0bk2yf7wlkf2v76dybcqvqjy6n4cr72h0l05yfxba3zl8fw7r7na"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; };
   optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; };
   opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; };
   optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; };
+  optimParallel = derive2 { name="optimParallel"; version="0.7-2"; sha256="1b705gn0f3m3cn1hy5ga6qazvl2kvgc9dmnqky2px1zbkw2n3qy0"; depends=[]; };
   optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
   optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; depends=[colorspace Rcpp]; };
   optimr = derive2 { name="optimr"; version="2016-8.16"; sha256="02dgwkcjhf6ciwb6x6gyk7nn4v2jras7l1icfd4pjbypiapwnck9"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; };
   optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; };
   optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; };
   optimx = derive2 { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
-  optional = derive2 { name="optional"; version="1.0"; sha256="1bh3w5mcv3rhlpklncwgjr0lmjhv164q17zls0xm00qr8knzm9kp"; depends=[magrittr]; };
+  optional = derive2 { name="optional"; version="1.1"; sha256="13ajzybylw0q0x6yy6i8qr6l1ar53cyl708zgqaqaj0lkj183zhz"; depends=[magrittr]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
-  optmatch = derive2 { name="optmatch"; version="0.9-8"; sha256="1fmk60yyrxgzi24f7a1r7vsbny8064ibm8dmx2h4xvslc1ynxa4c"; depends=[digest Rcpp RItools survival]; };
-  optparse = derive2 { name="optparse"; version="1.4.4"; sha256="1ff4wmsszrb3spwfp7ynfs8w11qpy1sdzfxm1wk8dqqvdwris7qb"; depends=[getopt]; };
+  optmatch = derive2 { name="optmatch"; version="0.9-9"; sha256="04w6ma1f09rjlz2qalfqk894pdkvqszr13n010y7015b3dsyqnkk"; depends=[digest Rcpp RItools survival]; };
+  optparse = derive2 { name="optparse"; version="1.6.0"; sha256="1d7v5gl45x4amsfmzn5zyyffyqlc7a82h01szlnda22viyxids0h"; depends=[getopt]; };
   optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
   optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
-  optrdd = derive2 { name="optrdd"; version="1.0"; sha256="0261dwx7g8vxpnwgr53g1qhlwf12sjrb3zb7d02viaxg8fpk61k7"; depends=[CVXR Matrix quadprog]; };
+  optrdd = derive2 { name="optrdd"; version="1.0.1"; sha256="1nvrl04vg5ayrqqf6n3sb8jp37xifl5inh9nyr7pv6szckih6cd2"; depends=[CVXR Matrix quadprog]; };
   optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
   opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; };
   orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; };
@@ -9161,20 +9300,21 @@ in with self; {
   ordinalForest = derive2 { name="ordinalForest"; version="2.1"; sha256="1ancr7xdwhbqq3rj5hijrkjbrcaih8rqcx5r41mykrrp1k1s55dd"; depends=[combinat ggplot2 Rcpp]; };
   ordinalNet = derive2 { name="ordinalNet"; version="2.4"; sha256="0c9k3p62d482sl0vg94xm6hllk2mic2nd1c5m4vhci5ycavqzdd3"; depends=[]; };
   ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; };
-  ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; };
+  ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.4"; sha256="1s8f8fpiyyxxqlcwa5pn2aj1iggf5r1q7zkvzsik6265krcsbqn6"; depends=[survival]; };
+  ore = derive2 { name="ore"; version="1.6.1"; sha256="0hy1xm03zbmd336g9jjrkdsx1z7ai32jvj1hk8a7bj9wqb5rl8g5"; depends=[]; };
   ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
   orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; };
   orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
   origami = derive2 { name="origami"; version="1.0.0"; sha256="0692n4javr0lwxcd0b83sbbhxbmxxs41sjvlsq5bc5l7n140qaca"; depends=[abind data_table future future_apply listenv]; };
-  originr = derive2 { name="originr"; version="0.2.0"; sha256="06n5qshk4dq6ac4prnhzymz7gcmp6m2zdc8d9d13ii7n7xa0ymx2"; depends=[data_table httr jsonlite taxize xml2]; };
-  orloca = derive2 { name="orloca"; version="4.3"; sha256="0mc337rjmdhrg6aw2pyiz68y311d6znh9ppl4k0v0rgavapw2aml"; depends=[png ucminf]; };
-  orloca_es = derive2 { name="orloca.es"; version="4.3"; sha256="1yqwvzqlk70jfr9qb50g7xb4spnff4yg5rc9lw37zx13lnn4kcva"; depends=[orloca]; };
+  originr = derive2 { name="originr"; version="0.3.0"; sha256="1r4w8gilr25gdqm3slviwas3s7qkpiyv4ifzp7qkby6vrdswnngb"; depends=[crul data_table jsonlite taxize xml2]; };
+  orloca = derive2 { name="orloca"; version="4.5"; sha256="1zkd80b8rqy3x389c5pwsh0k8q6hy9bg4vvqs2xigxbprz4gyzl7"; depends=[png ucminf]; };
+  orloca_es = derive2 { name="orloca.es"; version="4.5"; sha256="0lnv565c7g69649481w3rlnx0yya7bw9fkpwim9bs639flwh6w96"; depends=[orloca]; };
   oro_dicom = derive2 { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; };
   oro_nifti = derive2 { name="oro.nifti"; version="0.9.1"; sha256="19w9dzyfmfgxgxb5i0l06b6gzqksx879iwicfs76fwmb1q2ph540"; depends=[abind bitops RNifti]; };
   oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; };
   orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; };
-  orsk = derive2 { name="orsk"; version="1.0-3"; sha256="0j8bz5kddzglcljycxy8lv8h5f6hvz88nzwq3b9cdyayd8mlbxs2"; depends=[BB BHH2]; };
+  orsk = derive2 { name="orsk"; version="1.0-4"; sha256="0gbr758bnb4bpn0ndv3hkk1ny7kj5vc0w5hp540xc0g1car43ynw"; depends=[BB BHH2]; };
   orthoDr = derive2 { name="orthoDr"; version="0.5.1"; sha256="0zpi3g6pkid40cblzsxck254wxljn5bfs354l51xfb182qr76x6k"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; };
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
@@ -9182,24 +9322,26 @@ in with self; {
   osc = derive2 { name="osc"; version="1.0.0"; sha256="08ac64xqq3diw9xkialvxjvqk5khd3kjdxdi3zic2if05i3rb4ns"; depends=[raster]; };
   osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; };
   oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; };
-  osi = derive2 { name="osi"; version="0.1.0"; sha256="1wzkvsqifk0g29jnpvykn26myq27pxll3glqlp74djkz0rbpv7aa"; depends=[httr]; };
   osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-  osmdata = derive2 { name="osmdata"; version="0.0.6"; sha256="1sjaqsj0jxipg00raj20gszzjspgpy9ja37rfkx6jpaa2wh3ii87"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
+  osmdata = derive2 { name="osmdata"; version="0.0.7"; sha256="0gpb8anvm9wmhvdkirhclkyppqz1sd5siclszigff11fw4bxnwj3"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
   osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; };
+  osqp = derive2 { name="osqp"; version="0.3.1"; sha256="1q7f009xbl15prsn6l18fr307a7z76rw39z6fj380nliq6s5s56z"; depends=[Matrix R6 Rcpp]; };
   osrm = derive2 { name="osrm"; version="3.1.1"; sha256="14rf5m2pm5w414v2l1dvd6vlvirms93l8rkfbmgcvxwxmc52b187"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
-  osrmr = derive2 { name="osrmr"; version="0.1.28"; sha256="0db8db7hkpc3rl7193gldmjz6ikm2m21d11ff9jmf7l8x0shg38i"; depends=[assertthat bitops R_utils rjson stringr]; };
+  osrmr = derive2 { name="osrmr"; version="0.1.29"; sha256="1mkc39v56m7b89nbjzs50kzz8w1i1950gciiw7iyqpdj6g2knwdx"; depends=[assertthat bitops R_utils rjson stringr]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
   otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; };
-  otvPlots = derive2 { name="otvPlots"; version="0.2.0"; sha256="1halgpk5ld5ihz0da69wf72l0624r73h2wjc0zjn8b8kw1v9xgzs"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
+  otuSummary = derive2 { name="otuSummary"; version="0.1.0"; sha256="15sjjkivh37kjcj02s2l8xabn3x1kg348i69kyhbvsbqawh2s9y0"; depends=[fossil reldist reshape2 vegan]; };
+  otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
   ouch = derive2 { name="ouch"; version="2.11-1"; sha256="0xkwwi62vdahlcg3k32zb1nfwsx87zdssk79mvcxgfsw9bw4gahx"; depends=[subplex]; };
   outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; };
   outbreaker2 = derive2 { name="outbreaker2"; version="1.0.1"; sha256="1v49i9z4kx9l485ib5q91s4z6r03lyijzjrr9zyjgham59rncyij"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; };
   outbreaks = derive2 { name="outbreaks"; version="1.3.0"; sha256="1k0g9x6wvdw8lkpjiv8z1ijp6pg5hri3gawx7zfpnm05g6ncvg81"; depends=[]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
-  overlap = derive2 { name="overlap"; version="0.3.0"; sha256="09xa4v0g97rn7xjf6m8fb53h2cna5l1p20b72v0hgrhawvxbjmry"; depends=[]; };
+  overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; };
   overlapping = derive2 { name="overlapping"; version="1.5.0"; sha256="1xqpkyxpdzcvq7s2hzkbnfddffjfs1xrxhrkvl5i4qv1czdsphjn"; depends=[ggplot2]; };
+  overlapptest = derive2 { name="overlapptest"; version="1.0"; sha256="1p5xbqbl1kpvx7rjb335k7hfc8i9b13p2r2rr6rrjfa8zs74smml"; depends=[spatstat]; };
   owmr = derive2 { name="owmr"; version="0.7.2"; sha256="0206i5zzmfjdd43qziis6kqc0zsvn0l7v5sspjrywjxw2gyjfmwb"; depends=[httr jsonlite magrittr]; };
   oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; };
   oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; };
@@ -9213,7 +9355,7 @@ in with self; {
   pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; };
   pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; };
   pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; };
-  pROC = derive2 { name="pROC"; version="1.11.0"; sha256="1v61z529yj1bp7wcagyhx0jszla9hv0aq1zvxz9w19r7lcinlzjz"; depends=[ggplot2 plyr Rcpp]; };
+  pROC = derive2 { name="pROC"; version="1.12.1"; sha256="05ad69a6fxy9k903cw3h4q59ch2jv6qfg9yjdbw3cgiiazcafrlj"; depends=[ggplot2 plyr Rcpp]; };
   pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; };
   pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
   pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
@@ -9223,14 +9365,15 @@ in with self; {
   packHV = derive2 { name="packHV"; version="2.1"; sha256="1phwcm1m9in0nkyk3hminbm60iw9jp7vyd7gn871g8shfdm8ixyw"; depends=[survival WriteXLS]; };
   packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
   packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; };
+  packagefinder = derive2 { name="packagefinder"; version="0.0.7"; sha256="030s8r2k0q3vls6vndmdz8a45kqrqx9whqvrcbh3f6xgy1vhs1hs"; depends=[formattable httr jsonlite pander stringr]; };
   packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; };
-  packcircles = derive2 { name="packcircles"; version="0.3.1"; sha256="0f2y651i96sa7b7mfxg5kinmhhzvcv18lia74fdpdnmc6fxlxg17"; depends=[Rcpp]; };
-  packrat = derive2 { name="packrat"; version="0.4.9-1"; sha256="1kk6hs88y5jqgd781kk5jn5467r7sfyqd225vibflbz0s42rcv5a"; depends=[]; };
+  packcircles = derive2 { name="packcircles"; version="0.3.2"; sha256="1hqzvhk8zm95vsrvf6bifxkgdgik8hixylslfvzpfcq378zi97yb"; depends=[Rcpp]; };
+  packrat = derive2 { name="packrat"; version="0.4.9-3"; sha256="0d42x4qvz9hs7s5sl2lhklsdc8imrnp2k800xdagrpjilww9jac7"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; };
   paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; };
   pacotest = derive2 { name="pacotest"; version="0.3"; sha256="135637bidfx71xay6c69lfjvr4i0v3ckgkg0fi838p24is6icbix"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
   pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; };
-  padr = derive2 { name="padr"; version="0.4.0"; sha256="1liks4cj1cyzf6ls2h8f68xd7nry6y9ml3zdmw1fsax251dhmbq4"; depends=[dplyr lubridate Rcpp rlang]; };
+  padr = derive2 { name="padr"; version="0.4.1"; sha256="0nxclaxg31hddl2yhhm5886g7fc4j7g294ibv6hxb1cm5mrfgngy"; depends=[dplyr lubridate Rcpp rlang]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
   pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; };
   pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; };
@@ -9240,17 +9383,18 @@ in with self; {
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
   pairwise = derive2 { name="pairwise"; version="0.4.3-2"; sha256="1kb73jsfyp1daqbrmpwh8l9j28fgiapimfwdypz82m46wza1qgww"; depends=[]; };
-  pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-25"; sha256="0wpv22db63xkgjw0nwa39clgrr2finxvl0a510hkc54ijqjx9ksh"; depends=[binMto boot coin MASS MCPAN mcprofile mratios]; };
+  pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-26"; sha256="0dislkyvzckkxl2ccdpalyfbp4pfs6yvzwr175h2xcbzm5jjf35j"; depends=[boot coin MASS MCPAN mcprofile]; };
   palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
+  palasso = derive2 { name="palasso"; version="0.0.1"; sha256="00vwp0xbnp8fj8g7qn81r4j15vwp26pjjh51hc8syi8l7457alhm"; depends=[glmnet Matrix survival]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
   paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; };
   paleobioDB = derive2 { name="paleobioDB"; version="0.5.0"; sha256="195w0jzg8bhlqbsd3shi161wqr9cff6q85ik0x8w4laazzxs0jhr"; depends=[gtools maps plyr raster RCurl rjson scales]; };
-  paleofire = derive2 { name="paleofire"; version="1.2.1"; sha256="0f2bvwc370fjpacv4ipjr1gk6l4ni3lg6da2549zn6hqca0hyjis"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
+  paleofire = derive2 { name="paleofire"; version="1.2.2"; sha256="0mg03k3yf68js580ljvwcn7xfl0m1s408hb34a9h3mh3a5knm2zc"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
   paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; };
-  paleotree = derive2 { name="paleotree"; version="3.0.0"; sha256="1nk7j3l310c9wh5mqf0zw4cg6wmvx4c8pl06ahkknx3imslar96q"; depends=[ape phangorn phytools]; };
+  paleotree = derive2 { name="paleotree"; version="3.1.0"; sha256="1f90f6m6qgywxa134dv8rd43660vkr9n2s82wn0iwq7w89gqlcj2"; depends=[ape phangorn phytools]; };
   palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; };
   palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; };
-  palm = derive2 { name="palm"; version="1.1.0"; sha256="05r6hwkvsd30f5frqxh6k2f1p291s78kfh492lvdmcg8jwrnrvll"; depends=[gsl mvtnorm R6 Rcpp spatstat]; };
+  palm = derive2 { name="palm"; version="1.1.1"; sha256="1fbc5ri5k152ww3cajjjclcas22mfvypfn3hdpkkmf307lvjaja3"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; };
   palmtree = derive2 { name="palmtree"; version="0.9-0"; sha256="0cd5p82gp2g1zq8kf9ybi4wa1r2jg4dbxbp5n01qs4apmyyncl4d"; depends=[Formula partykit]; };
   palr = derive2 { name="palr"; version="0.0.6"; sha256="163c0kcsl0k3fp5q9afv3pb8246j2b3jzmd6g2vcgxb8nhs8wr2f"; depends=[]; };
   pals = derive2 { name="pals"; version="1.5"; sha256="0zc4dw8ipvhdm2qvy71k16vf8fmjs08nqbvvdi1k8h4fs648ddhi"; depends=[colorspace dichromat mapproj maps rgl]; };
@@ -9258,10 +9402,11 @@ in with self; {
   pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; };
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
-  pan = derive2 { name="pan"; version="1.4"; sha256="1p3nigmhrnlch86g89hn7l0wvkifx3k9n59g0psi95yck43kza76"; depends=[]; };
+  pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; };
   pander = derive2 { name="pander"; version="0.6.1"; sha256="1axknd1isfjg4wj5b1smvl7qr4wvjdw1kikrghjnp73xh0glr7pp"; depends=[digest Rcpp]; };
   pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
+  panelView = derive2 { name="panelView"; version="1.0.1"; sha256="1ianff9clc0318nk0xplnslfqi5sxn773qcvxv3axj247994xpay"; depends=[ggplot2 gridExtra]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
   panelvar = derive2 { name="panelvar"; version="0.5.1"; sha256="1394lvvpzbcvm2mhxw68k784jyvsnzxiq787kdf4y4538lqgfx1n"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; };
   pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; };
@@ -9301,10 +9446,9 @@ in with self; {
   partitions = derive2 { name="partitions"; version="1.9-19"; sha256="1pklfnjdc094c8nzkqcdvqzdh8v3p5n8jbg4pf9678iw648saiyx"; depends=[gmp polynom]; };
   partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive2 { name="party"; version="1.2-4"; sha256="10i1zxk93c5asinxmi6af1jbw1j4a25d5hzg7viyh73grvlkw7bc"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
-  partykit = derive2 { name="partykit"; version="1.2-0"; sha256="1zxgx0wrvn4fj2l6pjwmczj7n4232szm1kzfzaq5cn13qzndnk66"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
+  party = derive2 { name="party"; version="1.3-0"; sha256="1ih3c85s40raq8a0cy952a3g31gf2iwnafy8ij1svzc4hgfzaw2m"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+  partykit = derive2 { name="partykit"; version="1.2-2"; sha256="118zrf9015kh0gicma98ddm80qhicdlhri2h1nwz0wlng9hkyxbg"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
-  pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
   passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
   pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; };
@@ -9316,42 +9460,43 @@ in with self; {
   patentsview = derive2 { name="patentsview"; version="0.2.1"; sha256="104qq6cqvfk5m2yynpg5iwlp89y5qx18m20qp343mknxjbvqpjdg"; depends=[httr jsonlite]; };
   pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
-  pathfindR = derive2 { name="pathfindR"; version="1.0.0"; sha256="1wwl7cxgdrvcyrzyv1jrhhp850fc512585ih5g24jmrfr6n0422h"; depends=[AnnotationDbi DBI doParallel foreach knitr org_Hs_eg_db pathview rmarkdown shiny]; };
+  pathfindR = derive2 { name="pathfindR"; version="1.2.0"; sha256="1wf6wv9mdiagv3r4d5nviw8c2zxw7hlxa0mm9kk624g1qfhknnz2"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 knitr org_Hs_eg_db pathview rmarkdown shiny]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
   pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
   pathological = derive2 { name="pathological"; version="0.1-2"; sha256="07g7ps6zfxi98y98kwas95rr5ybfd4bpih5mhkjafc7bn99254n2"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_reflection assertive_strings assertive_types magrittr plyr stringi]; };
   patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; };
   patternize = derive2 { name="patternize"; version="0.0.1"; sha256="0xmz7ca555275a4x89vdmyk9x3m3sk964iwspv0dnxsmx5s1xmz7"; depends=[abind Morpho raster rgdal RNiftyReg sp]; };
-  patternplot = derive2 { name="patternplot"; version="0.2"; sha256="15kvihsyabg8l4458hqyg2dzaj37lshk5jx019vvzr9rjbcznj17"; depends=[dplyr ggplot2 gtable jpeg png R6 Rcpp RcppParallel]; };
+  patternplot = derive2 { name="patternplot"; version="0.2.1"; sha256="0ixb9x32fciwxwxnna47z9jb6s1zf3d9jqfiwvv4slaygi2cgydr"; depends=[dplyr ggplot2 gtable jpeg png R6 Rcpp RcppParallel]; };
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
   pavo = derive2 { name="pavo"; version="1.3.1"; sha256="1vr3crp71dibm3jn88wh4gdia2l3z4aqmfns7v5pllqadk9s1064"; depends=[geometry mapproj pbmcapply rcdd]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; };
   pbapply = derive2 { name="pbapply"; version="1.3-4"; sha256="0lk5kxac09xzdv6vf7ix6r5bfrm7cnpyr2l5mkd4igpciadszzfd"; depends=[]; };
-  pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
+  pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.4-5.1"; sha256="0ghdq8ry6fiq8qj3plq2n8isjx6iacnhqd1z73bjckmvp99g221n"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
   pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-2"; sha256="1xiwfpi8r0l8jlfrc35aknm09y4qbn0hvvkscdpcxv9q7zifvl3v"; depends=[pbdBASE pbdMPI]; };
-  pbdMPI = derive2 { name="pbdMPI"; version="0.3-5"; sha256="1i970p74j53bnvqwv4ac03i7rbwp9ixbq1qbcv2x878wwz6fkcc2"; depends=[rlecuyer]; };
+  pbdMPI = derive2 { name="pbdMPI"; version="0.3-6"; sha256="105nny9d4vm61iarckwf0x6lngkmg3jxys7nigshywhp91073ygk"; depends=[rlecuyer]; };
   pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
   pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; };
-  pbdRPC = derive2 { name="pbdRPC"; version="0.2-0"; sha256="0qndlgv6r9k17mz75g7d2k5alg0qp5h7scpnz2zl6kqlpr8z6l2p"; depends=[]; };
+  pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; };
   pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-4"; sha256="0wl8iir00nyb4j0sm8nssmgb2xhr8g2064pql0s72cgbzkq1k1cm"; depends=[pbdMPI rlecuyer]; };
-  pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-2"; sha256="0dzwwffinn9bbb73dmmh88c374f9057bl0a8dq97fbv63j4a5qpc"; depends=[]; };
+  pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-3"; sha256="1jkfcfhspvqra7vbllrvkz3jx8j7d0ang6zzcdjgpb7200sc29mf"; depends=[]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
   pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; };
-  pbmcapply = derive2 { name="pbmcapply"; version="1.2.4"; sha256="0wh0ljy9nbb7ifh06bf79hwc2ci9482hdppgpa1zpz8x2mgyvy04"; depends=[future]; };
+  pbmcapply = derive2 { name="pbmcapply"; version="1.2.5"; sha256="0bnw1x6p4rq7ckl1i1yqi317dfy24gbd56y1v7m0ycvld6srjh5n"; depends=[future]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
-  pcIRT = derive2 { name="pcIRT"; version="0.2.2"; sha256="0sf6kkcsblc758sb1gkl4ryr72w0xhkd9nr4xdns8c9dfg9qcw1h"; depends=[combinat Rcpp]; };
+  pcIRT = derive2 { name="pcIRT"; version="0.2.3"; sha256="1gr4rij7anvfzbs4pvzhvfl0msbm83qs5n588l4jbraxqynvmkaw"; depends=[combinat Rcpp]; };
   pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
   pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; };
   pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; };
-  pcalg = derive2 { name="pcalg"; version="2.5-0"; sha256="002y7b0r750nbnrg8w53q2fyvk13jk4jrqlf3f2777qw7si5vmz3"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
-  pccc = derive2 { name="pccc"; version="1.0.1"; sha256="1br157yip3cizd05rgw22shrvjz2jrd6kad3dkswayksx8wrnvhz"; depends=[dplyr Rcpp]; };
+  pcadapt = derive2 { name="pcadapt"; version="4.0.3"; sha256="1kyvpfbzbg9ja6xrdj31baw50vixq2incg635kj3rnklvg4izfnx"; depends=[BH data_table ggplot2 magrittr mmapcharr plotly Rcpp robust RSpectra vcfR]; };
+  pcalg = derive2 { name="pcalg"; version="2.6-0"; sha256="1xdcgihaz6xl33nb8yxj0dz0d2dmfjvlwl4rlizyxgf5l2c7dn9f"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pccc = derive2 { name="pccc"; version="1.0.2"; sha256="0ha15prf6zaa2kq4hhaadr5s0mr765b4rpx4q608136sh3hps574"; depends=[dplyr Rcpp]; };
   pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; };
   pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; };
   pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; };
@@ -9359,10 +9504,10 @@ in with self; {
   pch = derive2 { name="pch"; version="1.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; };
   pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
-  pcr = derive2 { name="pcr"; version="1.1.0"; sha256="1rz9jxjs9s7kwg3aljfm1x2v7jsg94wawmhgs8va83g46pbl26g8"; depends=[broom devtools dplyr ggplot2 magrittr purrr readr tidyr]; };
+  pcr = derive2 { name="pcr"; version="1.1.1"; sha256="1bm8c8ajb0imvnp8nwhskjkqdi4v9f11bsz2qdk45i5l2mq16kjc"; depends=[broom devtools dplyr ggplot2 magrittr purrr readr tidyr]; };
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
   pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
-  pcse = derive2 { name="pcse"; version="1.9.1"; sha256="07382jz75ywqr4q750rk66yf0j28k54plx281k1yi541la8vic57"; depends=[]; };
+  pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; };
   pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
   pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.1"; sha256="0j68jmsm6c9pan195k0l0nm1ldbipl5ywlbwkz61dblspizh04iw"; depends=[ddalpha multitaper Rcpp RcppArmadillo]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
@@ -9371,11 +9516,12 @@ in with self; {
   pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
-  pdftools = derive2 { name="pdftools"; version="1.6"; sha256="00m5x1n5kjzvc1wljfy8riq2srxjvklasnh6ps8a89zbgglhp5cv"; depends=[Rcpp]; };
+  pdftools = derive2 { name="pdftools"; version="1.8"; sha256="1yyhwr17bln59cr819igd7mxdy5mhqf5fwd68x8w3kgag0v0qyaz"; depends=[Rcpp]; };
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; };
-  pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; };
   pdp = derive2 { name="pdp"; version="0.6.0"; sha256="12x9j3lwnss45wlafd5kc4nw293vhffijmgyafahqwz9if829m10"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; };
+  pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; };
+  peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; };
   peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; };
   peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; };
   peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; };
@@ -9391,14 +9537,12 @@ in with self; {
   pems_utils = derive2 { name="pems.utils"; version="0.2.17.8"; sha256="1qxsjzxb8gdw1hyxgd923s609k98pjdaxs6wm3pg4bl1w8sxqi8d"; depends=[ggplot2 lattice latticeExtra loa plyr RColorBrewer]; };
   penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
   penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
-  penRvine = derive2 { name="penRvine"; version="0.2"; sha256="0zjjc987anz5is7rxf17yqpgr44cx30pv790sdbd4rlzwdrzcjbw"; depends=[copula doParallel fda foreach igraph lattice latticeExtra Matrix quadprog]; };
-  penalized = derive2 { name="penalized"; version="0.9-50"; sha256="0q60pgmx2wbnc7i1zf1i0sxn1zy257hl73ii0abx83zpcywq9vb6"; depends=[Rcpp RcppArmadillo survival]; };
+  penalized = derive2 { name="penalized"; version="0.9-50.1"; sha256="0lhibn0bzdrlvdsp4ni0989jniyfbxnixh32g7qm5qwxf5jbky18"; depends=[Rcpp RcppArmadillo survival]; };
   penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
   penalizedSVM = derive2 { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
   penaltyLearning = derive2 { name="penaltyLearning"; version="2017.12.08"; sha256="0pkd853dq7frp0f9aii99qpnx9mk4gzb73iykfa5q9bnp45z8qd0"; depends=[data_table geometry ggplot2]; };
   pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
   pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; };
-  pendensity = derive2 { name="pendensity"; version="0.2.10"; sha256="023gl993jniv5r8l9nkaha7v6k2rb1hxm7z543dpr4186kjbi7zl"; depends=[fda lattice]; };
   pense = derive2 { name="pense"; version="1.2.0"; sha256="0wilfjhkj5hrgm7mak1hvlk07wrr3f774w26vyvbwlm8xsxxsbzz"; depends=[Matrix Rcpp RcppArmadillo robustbase]; };
   pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; };
   peperr = derive2 { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
@@ -9410,7 +9554,7 @@ in with self; {
   performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; };
   pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
-  permDep = derive2 { name="permDep"; version="1.0-1"; sha256="03va74vxzijy169pqf6qhpw4afb3r3ia5y0qcfqz1xjs2zmck7mj"; depends=[BB survival]; };
+  permDep = derive2 { name="permDep"; version="1.0.2"; sha256="0dv740vnjy99rc6px8w4ngis3w6zc4c67m0bx2lh327sqb7q3zsd"; depends=[BB survival]; };
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
   permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; };
   permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; };
@@ -9418,6 +9562,7 @@ in with self; {
   permuco = derive2 { name="permuco"; version="1.0.1"; sha256="19spn5ra41v7s4ixdg5pbksfi8linhvhvfmllz72iw6wbzsw8m0m"; depends=[MASS Matrix permute]; };
   permutations = derive2 { name="permutations"; version="1.0-2"; sha256="04lak21x0z1cskgm5w4xdyq59kmyrz64bwfpf332vfka54aiv8lk"; depends=[magic numbers partitions]; };
   permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; };
+  permutes = derive2 { name="permutes"; version="0.1"; sha256="1m5596l80nyyzassiwb6zd2fnp2jglj5vkp9xsbp28swd0q2wd90"; depends=[ggplot2 lmPerm plyr viridis]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
   personalized = derive2 { name="personalized"; version="0.1.5"; sha256="1id3ml5n7l7lgd029csn23ffrsqhm4g1id20hxqhqz4knknfxkkf"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
@@ -9425,49 +9570,49 @@ in with self; {
   perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
   perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
   perturbR = derive2 { name="perturbR"; version="0.1.1"; sha256="13in5xjv1854ihalyj4427ix4scc17b95iw72rcb4yivha9jgplq"; depends=[dils ggplot2 igraph mcclust]; };
-  pesticides = derive2 { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
   petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; };
-  petrinetR = derive2 { name="petrinetR"; version="0.1.0"; sha256="0na8srzwi933bva9j3hrn4ji8s58dm28jpxw9q13mpahzch4r454"; depends=[dplyr visNetwork]; };
+  petrinetR = derive2 { name="petrinetR"; version="0.2.0"; sha256="04alyjjnwgkbd4qigxki57v3hqa02vr1d5g7slp5njds1vk928ci"; depends=[DiagrammeR dplyr purrr visNetwork xml2]; };
   petro_One = derive2 { name="petro.One"; version="0.1.3"; sha256="13bxd011lprimy5m3z08l4yng2fkp28b1ad1bqs0piffx5bxw13n"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka tibble tm urltools wordcloud xml2]; };
   pewdata = derive2 { name="pewdata"; version="0.2.0"; sha256="17j8fdn9x6hannr91zyccya523z3zm03gr517xfcyrd0m486xnqb"; depends=[httr magrittr purrr rvest]; };
   pez = derive2 { name="pez"; version="1.1-1"; sha256="14n9s604wwh07kjir5kw6sra6bbmnpg00h3zvli3zqd8lx892hm8"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante quantreg vegan]; };
   pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
   pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; };
+  pgbart = derive2 { name="pgbart"; version="0.6.11"; sha256="1xfbpbxqynglw7j311pmx3qsi40r0416yflklh0qggr3pq0qf88k"; depends=[BayesTree]; };
   pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; };
   pgirmess = derive2 { name="pgirmess"; version="1.6.9"; sha256="1i1qn68isaz2lbpqyydjgj9kri09aknza5qjn6m1wa1alyl7f611"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
   pglm = derive2 { name="pglm"; version="0.2-1"; sha256="14hnlidf62kzcf83jc7k17n4hjjaj82scdwh8a7qxd056vygkqx2"; depends=[maxLik plm statmod]; };
   pgmm = derive2 { name="pgmm"; version="1.2.2"; sha256="1z39148gvs5nndd54x2afpsqdyqd8apjgnxn0ndv2071aa8gyk1j"; depends=[]; };
   pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
   pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; };
-  pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
   ph2bayes = derive2 { name="ph2bayes"; version="0.0.2"; sha256="1xm7930gycxrz308dnfnp023yidqik52sbrli35f3773mnfcid2g"; depends=[Rcpp]; };
   ph2bye = derive2 { name="ph2bye"; version="0.1.4"; sha256="0h5d8d4bagkp6g0nb67cb225ki5p1amnclnfj6afgdcsli5clr67"; depends=[animation nleqslv Rcpp VGAM]; };
+  ph2hetero = derive2 { name="ph2hetero"; version="1.0.2"; sha256="0aphkdb0ka8lk9q3r4ivkv4hrn7xz62rgqdbpkcwh9s455n38nyi"; depends=[clinfun mvtnorm]; };
   ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; };
-  phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
   phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
   phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; };
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
   phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
+  phateR = derive2 { name="phateR"; version="0.2.8"; sha256="17wlfdcfb14wxv3j45pd5672g5b2w858b65z6x3ck4hi2v8kz19v"; depends=[ggplot2 Matrix reticulate]; };
   phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
-  pheatmap = derive2 { name="pheatmap"; version="1.0.8"; sha256="1ik0k69kb4n7xl3bkx4p09kw08ri93855zcsxq1c668171jqfiji"; depends=[gtable RColorBrewer scales]; };
+  pheatmap = derive2 { name="pheatmap"; version="1.0.10"; sha256="1jzxs5hwbz3r0z2pp09i7fd14sndxnrbm3zibaac3kny4nzydzf7"; depends=[gtable RColorBrewer scales]; };
   phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; };
   phenex = derive2 { name="phenex"; version="1.4-5"; sha256="00lsymflbmlxzxz8rxcpc94pc9zmhybial9f2xkz98h6h45zgrjl"; depends=[DEoptim foreach]; };
   phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
   pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; };
-  phenoCDM = derive2 { name="phenoCDM"; version="0.1.2"; sha256="1158ac6cjl83pnfxmklxjnh35nagx1c21iidawr1s7pqv858ixix"; depends=[rjags]; };
+  phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; };
   phenocamr = derive2 { name="phenocamr"; version="1.1.0"; sha256="10k7z82skkf9l15a2b77ygg5lkg0x68z7xbkw4p3mgs68dd9ah63"; depends=[changepoint curl daymetr DT jsonlite leaflet plotly shiny shinydashboard zoo]; };
   phenology = derive2 { name="phenology"; version="7.0"; sha256="1glbjm7i2kyl04k0sam29zy1lpzfq2mpkgg44jpnby8c9vz8pkmi"; depends=[HelpersMG lmf numDeriv optimx]; };
   phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; };
   phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; };
+  phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; };
   phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; };
-  philentropy = derive2 { name="philentropy"; version="0.1.0"; sha256="19nrfkla64jbd46ig13ljy6k5dxiwq2mnsfn37sgy9sf4h8zzwk3"; depends=[dplyr KernSmooth Rcpp]; };
-  phmm = derive2 { name="phmm"; version="0.7-10"; sha256="1ra5qf24qmwjf8cra9yh20i2s8jv0kzb1gyw96il8r5cdl20gbcz"; depends=[lattice Matrix survival]; };
+  philentropy = derive2 { name="philentropy"; version="0.2.0"; sha256="1vqbvqa099zr1kdl1f46krgx1nvp7rj6mcii19w5dmjrdf8xv8mk"; depends=[dplyr KernSmooth Rcpp]; };
   phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; };
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
   phonics = derive2 { name="phonics"; version="1.0.0"; sha256="02bkw589iijlzbw0cbg9qhq99jij2p92cqrxa77chkly4naqkqds"; depends=[BH Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.20"; sha256="0w4xcg9r6hn8lv8jkmfr1b2w2q30wxs6m3nv4409hy9rp77qgfcl"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
+  photobiology = derive2 { name="photobiology"; version="0.9.21"; sha256="02516yl2fgfnswyfrhq8s229bniv81ml5vkdq7ap17a2g4v92hvc"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
   photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.4.4"; sha256="14aiw5jxd6wnngy1rbbm85l0yx64nxrancal017wvr5n867c32d6"; depends=[photobiology]; };
   photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.14"; sha256="1q0dd3szr06rm6zy2mkb37n4s37554x71jgkhmw88iiy58y2fkv5"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl tibble tidyr]; };
   photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; };
@@ -9488,14 +9633,14 @@ in with self; {
   phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; depends=[ape igraph NHPoisson phylobase]; };
   phylobase = derive2 { name="phylobase"; version="0.8.4"; sha256="00hh53ibr7ddck4rl1rz9bpjsvjym040c5f78l1yizv6q9rakhfp"; depends=[ade4 ape Rcpp rncl RNeXML]; };
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; };
-  phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
+  phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; };
   phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
-  phylogram = derive2 { name="phylogram"; version="2.0.1"; sha256="17032pr87cdyz2aynb17jspkghq64xivsf1ylky2niypz7xbz0i3"; depends=[ape]; };
+  phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
-  phylolm = derive2 { name="phylolm"; version="2.5"; sha256="0bffqzba6kcv8jyya7pja10mjnklhihczljhmj8q0pdrmd6qgqp8"; depends=[ape]; };
+  phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
   phylopath = derive2 { name="phylopath"; version="1.0.0"; sha256="1n6f7piygps3pwqapsvqpz764995kxhdqz1hc5n6znvl01ykdqx5"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; };
-  phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.1"; sha256="0bxhikzrs5gcwkchpmxwvampyrbwv0d3ay5i7s766x6687xzm6qa"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; };
+  phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; };
   phylosignal = derive2 { name="phylosignal"; version="1.2"; sha256="0apsg4v1n58wn8y8wnl6x1ahl903i29hh8bs2dw6ky2jafkjj4jb"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; };
   phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
   phylotate = derive2 { name="phylotate"; version="1.2"; sha256="19nssrdax5w5a50159j39jgs7305s48k3h56ivyzs5di6l7x1yxj"; depends=[]; };
@@ -9505,20 +9650,20 @@ in with self; {
   physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
   phytools = derive2 { name="phytools"; version="0.6-44"; sha256="1y815pv1cksj244vcb7q4qr45gzr4cb1qwi166h65ryggywcj48w"; depends=[animation ape clusterGeneration coda combinat maps MASS mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
-  picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
+  picante = derive2 { name="picante"; version="1.7"; sha256="0qhaxxmab3c3qw06kx4swfyiqiiqail5h79aarvffryvh0qdgr3m"; depends=[ape nlme vegan]; };
   picasso = derive2 { name="picasso"; version="1.2.0"; sha256="1bclrv0g2frdw6bfqacjbbzn9vg3354i2bh5zn6hkix7r8rqymzg"; depends=[MASS Matrix]; };
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
-  piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; };
+  piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.0.1"; sha256="1pi0jii0yhmvy0rqlchlijrhvdqa07i4wzj4cdd25bbjnfy97ayc"; depends=[car lme4 MASS nlme pbkrtest]; };
   pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; };
-  pillar = derive2 { name="pillar"; version="1.2.1"; sha256="1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd"; depends=[cli crayon rlang utf8]; };
+  pillar = derive2 { name="pillar"; version="1.2.3"; sha256="1rzhssprqgam1nq3s0f5rzxhxsq02azcghvxf6k8kmsmddf1n7f8"; depends=[cli crayon rlang utf8]; };
   pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; };
-  pimeta = derive2 { name="pimeta"; version="1.0.0"; sha256="0ri6qznk3nj1a2nj9qdahlm452drzcb51x8g89ffb3y6xjsh6y5g"; depends=[Rcpp RcppEigen]; };
+  pimeta = derive2 { name="pimeta"; version="1.0.1"; sha256="1l50k34xrnhfwwnwa7ym97blhqi84nkgcf9y5yg6hcg75ajgi6zl"; depends=[Rcpp RcppEigen]; };
   pinbasic = derive2 { name="pinbasic"; version="1.2.0"; sha256="1sn4q9g2pw8z6gyxi302bd7p578ldy1g6419w56z7jgv7m8n7g73"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
   pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; };
   pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; };
   pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; };
-  pinp = derive2 { name="pinp"; version="0.0.4"; sha256="1bjvhq9glrahknh46irfpg83wilpws923mm5l4aldb75xrbpliyw"; depends=[knitr rmarkdown]; };
+  pinp = derive2 { name="pinp"; version="0.0.5"; sha256="12wypniib0pacgd3lvk64r1xy01yangjk9k2b2pkj8il4ycvijk4"; depends=[knitr rmarkdown]; };
   pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; };
   pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; };
   pipeR = derive2 { name="pipeR"; version="0.6.1.3"; sha256="16lj227x24pviqb4dcrj7a55l31p5mm0cbwsb6m3y3n6k5wcd2nh"; depends=[]; };
@@ -9527,31 +9672,35 @@ in with self; {
   pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; };
   pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
   piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; };
+  pivot = derive2 { name="pivot"; version="18.4.17"; sha256="0nhf76f2g35cx5f1m00wsy29n6xm2x5wajs5myaasks7hbkk0w3y"; depends=[assertthat colorspace DBI dbplyr dplyr lubridate magrittr purrr rlang tidyr tidyselect]; };
   pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; };
   pivottabler = derive2 { name="pivottabler"; version="0.4.0"; sha256="1q7gmfrqx3sn32q9rrr0y3hywq0fvm5gs5d3jj6mqcbs53jqvzqc"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
   pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; };
-  pixiedust = derive2 { name="pixiedust"; version="0.8.2"; sha256="0p04bs0p52k38qn1mv7qcsyilqbcaq3gnksvk9ij8j6r2qr4l8h4"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; };
+  pixiedust = derive2 { name="pixiedust"; version="0.8.4"; sha256="0rq1q30x36p1135kv2s8nfshi8w73167dj14f4c5m3fczhljc7lr"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; };
   pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
   pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; };
+  pkgbuild = derive2 { name="pkgbuild"; version="1.0.0"; sha256="10iz8057mixl9j73pq2cbp4ib6dadfsgi3fcsjjm7l3wwb9issd9"; depends=[callr crayon desc R6 rprojroot withr]; };
   pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; };
   pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; };
+  pkgdown = derive2 { name="pkgdown"; version="1.1.0"; sha256="0w1f23d600j9s8sa5xq63j2p6pvch8nndcxc63s14szlfjlvmddd"; depends=[callr cli crayon desc devtools digest evaluate fs highlight httr magrittr MASS memoise purrr R6 rematch rlang rmarkdown roxygen2 rsconnect rstudioapi tibble whisker xml2 yaml]; };
   pkggraph = derive2 { name="pkggraph"; version="0.2.2"; sha256="0pzqlim84b22ahq5yr50ybffqa0f5k5ch372v37nw1ndzci211d8"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; };
-  pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
-  pkgnet = derive2 { name="pkgnet"; version="0.1.0"; sha256="0f7xakl7vsx4byw6wfb1yw9bk95wrqsjs8wq6prg697zpdy3c7fw"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr mvbutils R6 rmarkdown visNetwork]; };
-  pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; };
-  pkr = derive2 { name="pkr"; version="0.1.1"; sha256="0mwrpkmf016lpwkjhhjpq7bw18mvshpyhwgmgqfrfl9gfbq4gphd"; depends=[binr foreign forestplot]; };
+  pkgmaker = derive2 { name="pkgmaker"; version="0.27"; sha256="0spcamjncj78kzjps2rw4v1a4494yazv6xvhn0vmdflnypc8k8hp"; depends=[bibtex codetools digest magrittr registry stringi stringr withr xtable]; };
+  pkgnet = derive2 { name="pkgnet"; version="0.2.0"; sha256="0rbwpmkphsy51zncy2pv2cnf7v2dpk8gf8qwmbz4iyiq94kqri6f"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr mvbutils R6 rmarkdown visNetwork]; };
+  pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; };
   pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; };
   plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
   pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; };
   plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; };
   placement = derive2 { name="placement"; version="0.1.1"; sha256="1narjb90sb5prvzfv2x30bz8y9aq8hqggza91ghwi47m99vm1dg6"; depends=[base64enc digest jsonlite RCurl stringi urltools]; };
-  plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
+  plan = derive2 { name="plan"; version="0.4-3"; sha256="0j3mvcy97r7adcs7q6z0w9ng74jcfwii1xp8kcl2cwbzs2fd425r"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
+  planor = derive2 { name="planor"; version="1.3-9"; sha256="0hivy4iqfw896d2zmcx5c3rmlfj8fkqg1qn2x8mdlial3dzm3mz6"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
   plantecophys = derive2 { name="plantecophys"; version="1.3-2"; sha256="1jj9rkhdmcnmp6fzbxmkfwmsdx2w7v923rv0xn5c5iv7wys7vwfm"; depends=[]; };
   plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; };
   plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; };
-  platetools = derive2 { name="platetools"; version="0.1.0"; sha256="1cx01hspha59w1vd33kv8prapjinfipv1ikli97zhxrcs45r6v07"; depends=[dplyr ggplot2 plyr RColorBrewer]; };
+  platetools = derive2 { name="platetools"; version="0.1.1"; sha256="0k2b13izcpr638hkfar2b09r49gyll71dmbvl1sffqw80pnz2wx0"; depends=[dplyr ggplot2 plyr RColorBrewer]; };
   playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
+  plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; };
   pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; };
   pleio = derive2 { name="pleio"; version="1.5"; sha256="1y9nkv5bzfkzbl373405v3xq54nz37wjz9zkxfzl8ggr5i9lcbqy"; depends=[Matrix rms]; };
   plfMA = derive2 { name="plfMA"; version="1.0.4"; sha256="0q6wiiknmgw812kcf9qq309zlizyry7ldn6m08lkw6xq6i4f4s85"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma RGtk2]; };
@@ -9559,7 +9708,6 @@ in with self; {
   plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
   plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; };
   plm = derive2 { name="plm"; version="1.6-6"; sha256="1a14a8zbqzm2a6z44haa0c23ax9j1jk72dhrkca8q0abbd5lkx85"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme sandwich zoo]; };
-  plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
   plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
@@ -9568,22 +9716,23 @@ in with self; {
   plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
   plotKML = derive2 { name="plotKML"; version="0.5-8"; sha256="0rd9242li967w253xhfywg72d3v1n5dybjxldkjgdix17gddwn5k"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
   plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
-  plotMElm = derive2 { name="plotMElm"; version="0.1.4"; sha256="17fif2rqsf4f9jr4s7nr7wikwg63nibz6yjkldf7yh1qqqfikd2g"; depends=[ggplot2 interactionTest]; };
-  plotROC = derive2 { name="plotROC"; version="2.2.0"; sha256="08dszp08mvw7lpvznlq3xw5bayl05lmnf4v2pmy5snyyxd9zsv4x"; depends=[ggplot2 gridSVG plyr shiny]; };
+  plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; };
+  plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; };
   plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
   plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; };
   plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
   plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; };
-  plotmo = derive2 { name="plotmo"; version="3.3.6"; sha256="11v1jncw2x96j1f7nhv9sqvy3ia3035yh8slpy2ky7lf8ravjy58"; depends=[plotrix TeachingDemos]; };
+  plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.1"; sha256="0if4cahihxm0b2k3r0w6qj91mwwsjy5zm289zk6myg65i7ijqly4"; depends=[]; };
+  plotmo = derive2 { name="plotmo"; version="3.4.2"; sha256="19g3b0pjxzv1nd65q0aimgw16xyq451l8bgyfhvwxm30c4qyafd5"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
   plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; };
-  plotrix = derive2 { name="plotrix"; version="3.7"; sha256="0rw81n9p3d2i03b4pgcfj5blryc94f29bm9a4j9bnp5h8qjj6pry"; depends=[]; };
+  plotrix = derive2 { name="plotrix"; version="3.7-2"; sha256="0hx3xv94gzlyy7ny5k4mzs7w1798h1zka175m5bkzc524493cm88"; depends=[]; };
   plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; };
   plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; };
   pls = derive2 { name="pls"; version="2.6-0"; sha256="15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx"; depends=[]; };
-  plsRbeta = derive2 { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
-  plsRcox = derive2 { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
-  plsRglm = derive2 { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[bipartite boot car mvtnorm]; };
+  plsRbeta = derive2 { name="plsRbeta"; version="0.2.2"; sha256="1ia3hngpzaav3gfcxajb1fxa2ljgbwd5xkrahc2bxi7wfdidngs5"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
+  plsRcox = derive2 { name="plsRcox"; version="1.7.3"; sha256="17x79ihl9xpahva9ibbipyp1z9crvwm3y5g7ynxfjq7rjxwvw13y"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
+  plsRglm = derive2 { name="plsRglm"; version="1.2.3"; sha256="0qf3nh3nw6psqr12zw9r5vagrlpwav3xiv3rh7xra13zx821kr4g"; depends=[bipartite boot car mvtnorm]; };
   plsVarSel = derive2 { name="plsVarSel"; version="0.9.4"; sha256="19xz7ds4jx5ql999mwn9zs983rlshf14y4nlah8cfy9gpi0vl1g1"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; };
   plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
   plsdof = derive2 { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
@@ -9593,31 +9742,31 @@ in with self; {
   plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; };
   pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; };
   plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
-  plumber = derive2 { name="plumber"; version="0.4.4"; sha256="0fxbqp7x74x21dkkxklg7j0020pmvl9byfs9lgp1bxrnli84h6ik"; depends=[crayon httpuv jsonlite R6 stringi]; };
+  plumber = derive2 { name="plumber"; version="0.4.6"; sha256="1c5pryslly2ibbfc65qlavbnnaksp3p18xr1cghwbw00kz4ig147"; depends=[crayon httpuv jsonlite R6 stringi]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
   plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; };
   pmatch = derive2 { name="pmatch"; version="0.1.3"; sha256="1k83ysgc4dwms0k5knh2rj99l3kfclw9a29h2ksphy0g4r1ig9k3"; depends=[dplyr glue purrr rlang tibble]; };
-  pmc = derive2 { name="pmc"; version="1.0.2"; sha256="1pamxg2cwyg36w0xnggrv5w03lb12l25z2da7xm1jvr17h0ipqmh"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
+  pmc = derive2 { name="pmc"; version="1.0.3"; sha256="06bsab09i9ydgsjx5i50kdb22ldp4g1v83a01kz3mswybi4lv9w2"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
   pmhtutorial = derive2 { name="pmhtutorial"; version="1.2"; sha256="1dviqazdk3ggxwwyv20409w3qadka0gbcgviwyywssn2x4cg0vih"; depends=[mvtnorm Quandl]; };
-  pmlr = derive2 { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
   pmml = derive2 { name="pmml"; version="1.5.4"; sha256="1acld1x0z5rgyxb5id071s3zvf2vbv4b9nngvxrb63ay3yyy124b"; depends=[stringr XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
+  pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; };
   pmxTools = derive2 { name="pmxTools"; version="0.1.0"; sha256="1a242c85ywk026vb778s8bjc331ww11rb15pai02wbvpw9x4kpa0"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML xpose]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
   poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
   pocrm = derive2 { name="pocrm"; version="0.11"; sha256="04snn7k8baf2ymjzr3zkxd425r5dq9h6abr5dm10mhfjqj1njpq0"; depends=[dfcrm nnet]; };
-  poibin = derive2 { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
+  poibin = derive2 { name="poibin"; version="1.3"; sha256="0lkqxpk5f27ghjia2akzi1c51hk9p9qkw8vysa0qwkbsgasq86p3"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
-  pointblank = derive2 { name="pointblank"; version="0.1"; sha256="11v0x264065iljhv77m4yc44zqd0i9bg95c6qiv8d85nf97201hh"; depends=[digest dplyr Hmisc htmltools knitr lazyWeave lubridate magrittr mailR pixiedust purrr readr rJava rlang rmarkdown stringr tibble tidyr]; };
-  pointdensityP = derive2 { name="pointdensityP"; version="0.3.3"; sha256="0ifkxxlmrrwscakmlap5bpfkzn4gfx9nc84p98i2spncnyd215ya"; depends=[data_table]; };
+  pointblank = derive2 { name="pointblank"; version="0.2.0"; sha256="102ra763wwz0445wlvsr975ynrf4ywgggjw8hvwrqkjcvrk4rq8x"; depends=[commonmark DBI dplyr glue httr magrittr purrr readr rlang rmarkdown RMySQL RPostgreSQL stringr tibble tidyr]; };
+  pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; };
   poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
   poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; };
@@ -9627,11 +9776,11 @@ in with self; {
   poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; };
   polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
   poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
-  politeness = derive2 { name="politeness"; version="0.2.2"; sha256="06h4g9xbk5dbaqzhybqc0mppa61ypb7ryi6hghqnqyj32y8r6dbr"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
+  politeness = derive2 { name="politeness"; version="0.2.4"; sha256="0r8wsghznbkdl3nn1rh7wi3l9zggdrvi2yjish7inkd8ygs4p8x1"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
   pollen = derive2 { name="pollen"; version="0.70.0"; sha256="1hk9sjxzwglj98ryic3m80lajzv1klnq9dl6i97c8f0ihbf97zdq"; depends=[dplyr lubridate purrr]; };
   pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; };
-  polmineR = derive2 { name="polmineR"; version="0.7.5"; sha256="0yz2c915jrf3dqadi6px9jidfwr4jd23rjrpas4xg4m6dx0f70jm"; depends=[data_table DT jsonlite Matrix pbapply R6 slam tm]; };
-  polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
+  polmineR = derive2 { name="polmineR"; version="0.7.8"; sha256="18dg0p74drc9awgiwsy3wkdc3z350kvsdsjhnm35047kqg67v2bc"; depends=[data_table DT jsonlite Matrix pbapply R6 RcppCWB slam stringi tm xml2]; };
+  polspline = derive2 { name="polspline"; version="1.1.13"; sha256="08hz6wlaipjss3cfk0dvr7yy6fc7cd4hqv9finj40kkm5n262xck"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.6.1"; sha256="16nr83gmv6pnk89nqxh8ihzacb0y8l4lz05c8sp6whmr26ja9vnf"; depends=[sp]; };
   polyPK = derive2 { name="polyPK"; version="3.0.0"; sha256="1vdfsad2b9habvm2ikjgn7ihnm851q9lqmgqjlsl737ka1vsgisf"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls samr sqldf xlsx]; };
   polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; };
@@ -9639,36 +9788,38 @@ in with self; {
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
   polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; };
   polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; };
-  polyclip = derive2 { name="polyclip"; version="1.6-1"; sha256="07xxw5ik30ds18kv808hynzmz3w351k6lj4ifz9kak0s7xsaqfn3"; depends=[]; };
+  polyclip = derive2 { name="polyclip"; version="1.9-0"; sha256="0c4xf5m1amig0glnq3nczrl3fww0g57xwkgb6qnkyc7l7chin9ac"; depends=[]; };
   polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; };
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
   polyglot = derive2 { name="polyglot"; version="0.1.2"; sha256="01sb3ilr58252yw0b2669vjdf8574br0n2n0ffwd86gc9f3islb3"; depends=[]; };
   polymapR = derive2 { name="polymapR"; version="1.0.16"; sha256="0j9zsgm4v78scsl4bblrf2rs691296p1sdimqqzs03d56cgaky04"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
   polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; };
   polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; };
-  polysat = derive2 { name="polysat"; version="1.7-2"; sha256="0ahx2pvlv2vdfiskwgawcrp447249ha0dq4qkhav3hpyvdg3in38"; depends=[]; };
-  polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
+  polysat = derive2 { name="polysat"; version="1.7-3"; sha256="155zcrjvpnqdzakmxqds17wmn5kl4rrkv9bqlxq8hrrly3nf6ynz"; depends=[Rcpp]; };
+  polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-  pomp = derive2 { name="pomp"; version="1.16"; sha256="1ns1ygza76dqrrscm7ajv3pbf5wgvcfsfbjxc20b50z30zjm7712"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  pomp = derive2 { name="pomp"; version="1.17"; sha256="0f7706hgpa70b5l1p34yq57fqyk4w55z8d5rvsv03m2cxilngc9k"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
   pompom = derive2 { name="pompom"; version="0.1.4"; sha256="0j37gq6lfccypclhrp7w3yfgsjbhfgqwg7x87r6rgywz6b3fnsgh"; depends=[ggplot2 lavaan qgraph reshape2]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
-  pool = derive2 { name="pool"; version="0.1.4"; sha256="0k209n40l2kwahy7b6hjwj1l19pdhnnq36jzxjmhv5zdad7dmckq"; depends=[DBI dbplyr dplyr later R6]; };
+  pool = derive2 { name="pool"; version="0.1.4.1"; sha256="1a8kyfwylr8gl2z2w2fmf6657yqvw0ylf1pxg00flddf8fnwbh0w"; depends=[DBI dbplyr dplyr later R6]; };
   poolfstat = derive2 { name="poolfstat"; version="0.0.1"; sha256="1g6qx4518cr77wdlbicda68jm2yji24h14mjv5sq7zq241h4ailh"; depends=[]; };
+  pooling = derive2 { name="pooling"; version="1.1.1"; sha256="0011w80pxz01scj2sa69m1bcfq797hq3ihpw46fdlxsxavz8prwy"; depends=[cubature dplyr dvmisc ggplot2 ggrepel mvtnorm pracma]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
-  popEpi = derive2 { name="popEpi"; version="0.4.4"; sha256="010nsb3jlz769i8srkd3528a52h9gpw7q7gn4vraz9nx8g8585bs"; depends=[data_table Epi survival]; };
+  popEpi = derive2 { name="popEpi"; version="0.4.5"; sha256="1155ck62avinpaaijgiad4crg5zkkq7npmlmzf7q05j4ssna9mvz"; depends=[data_table Epi survival]; };
   popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
   popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
-  popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; };
-  popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; };
+  popReconstruct = derive2 { name="popReconstruct"; version="1.0-5"; sha256="0fvrjb3b3bahi5da0ikzv164p49zvgm43mskqd7p9dgadbg1xpi2"; depends=[coda]; };
+  popbio = derive2 { name="popbio"; version="2.4.4"; sha256="165rs8w9h71qip3aw47wq48xnzv8zg8ixm7r6qqmkg3knw095hwh"; depends=[]; };
   popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; };
   popkin = derive2 { name="popkin"; version="1.0.5"; sha256="147ic0d7cgs4x9vz4jm4wd6ckikn0s8a0q1mknmcrcfisq8zim75"; depends=[RColorBrewer Rcpp RcppEigen]; };
   poplite = derive2 { name="poplite"; version="0.99.19"; sha256="0y1l21clp9b5m50chqnqmvyd6rsk6xgn2bqf1877gx3h1qidh5fm"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; };
-  poppr = derive2 { name="poppr"; version="2.7.1"; sha256="01g2kcbrlnfw27yrvf3wzj68r5h8xif5baalx1rdfp16v49jkx34"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; };
-  popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; };
+  poppr = derive2 { name="poppr"; version="2.8.0"; sha256="132lfxcdqxhh3f09sdgwas4372yrqcflws936fqyp0isg59siyzx"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; };
+  popprxl = derive2 { name="popprxl"; version="0.1.4"; sha256="076aia4qbq5yw2nxafq2ys5n5c7wv77i8k1nmzb3all193vjf203"; depends=[poppr readxl]; };
   popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; };
   poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; };
   population = derive2 { name="population"; version="0.2"; sha256="1k0hwh17dyfbbyw8gprsz1klx6l2ncq5mxkmnjmknlnrkpah0bbl"; depends=[abind]; };
+  populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.2"; sha256="00xfpfd1ly2cv82x5r9sy1h7gq2yhhw2gz0sw3z1cpk9vxzvr6d9"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
   portes = derive2 { name="portes"; version="2.1-4"; sha256="09liy2bia76h5dh21s8skq9pj8k4wpq5agwrmr1pnvlpgc8m2b60"; depends=[]; };
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
@@ -9679,7 +9830,7 @@ in with self; {
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.1"; sha256="04sr0nhdd1v915m0zf5gasznzgi08ykcy20kkwdw0l5mvvdbic8m"; depends=[VGAM]; };
   powell = derive2 { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
   powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; };
-  powerCompRisk = derive2 { name="powerCompRisk"; version="0.1.1"; sha256="0qsgibjzf6qx778s126c2k7nbf8f10gsh4cfkkhkxcv344rqxg10"; depends=[MASS mvtnorm]; };
+  powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; };
   powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; };
   powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
   powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; };
@@ -9692,7 +9843,7 @@ in with self; {
   ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; };
   ppclust = derive2 { name="ppclust"; version="0.1.1"; sha256="10fcyayda634lg5g992g21casqx5k0jni9r30km5rczzib7cz9gg"; depends=[inaparc MASS]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
-  ppitables = derive2 { name="ppitables"; version="0.1.2"; sha256="1hw25zvvbmc6vxbhcrpz9xkwc6lbc9v1r77fil3gv2wm5n672s4h"; depends=[]; };
+  ppitables = derive2 { name="ppitables"; version="0.2.0"; sha256="097rrkgv1xvn00gcmv9mfy4qwx4f4wjaj4j0c2az6smkhnzyr37n"; depends=[tibble tidyr]; };
   ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
   pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
@@ -9705,24 +9856,24 @@ in with self; {
   prais = derive2 { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
   praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
-  praznik = derive2 { name="praznik"; version="4.1.0"; sha256="1f652s1gpc2sw2i9xd4ga22kpdbihwpkb3a8csvycm07dhgynv03"; depends=[]; };
+  praznik = derive2 { name="praznik"; version="5.0.0"; sha256="01xbhcgvq6mf89ryh2gif7aa9956kpka3j4mqaxlglxs53vdrfnk"; depends=[]; };
   prc = derive2 { name="prc"; version="2018.1-31"; sha256="0xvf1f202qwpjb1kh469jk45l592q7bfzngyi8ifry94bi7mphp7"; depends=[kyotil nlme]; };
   prcbench = derive2 { name="prcbench"; version="0.7.3"; sha256="0xdmwjhxpcdaiqawhmlpr4ddlx22xk3rywa70jpm1vk5hc9pwivk"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
   prcr = derive2 { name="prcr"; version="0.1.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; };
-  pre = derive2 { name="pre"; version="0.4-1"; sha256="1pcc8njy43pfpszrgs782fgwsnh8h990giq8q7ra6vvwyhgza8m3"; depends=[earth Formula glmnet MatrixModels partykit stringr]; };
+  pre = derive2 { name="pre"; version="0.5.0"; sha256="04dfn9nd0ikilz7cf7q0y7z5dn961jjg1gby7h46fixkwnf7fdfs"; depends=[earth Formula glmnet partykit rpart stringr]; };
   preText = derive2 { name="preText"; version="0.6.2"; sha256="0pcnqssv542cfajzrqfsbq0jf628nnmcb3nryvd7d5wk4wdkji4q"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; };
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
   precrec = derive2 { name="precrec"; version="0.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
   predatory = derive2 { name="predatory"; version="1.2"; sha256="1qbkifx16ixzimshm8lsg3d1y7cj453ksn8cpwy03xql6b19r8x4"; depends=[readr stringr]; };
-  prediction = derive2 { name="prediction"; version="0.3.2"; sha256="1a65006i4gs9syvc240zzhx91mvf49jy60grz375lq0bzkxy4ly0"; depends=[data_table]; };
+  prediction = derive2 { name="prediction"; version="0.3.6"; sha256="19d7312f5lkqfglfvlgssnvyw7gl161s0xradcry44r1i6qp05j1"; depends=[data_table]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
   predkmeans = derive2 { name="predkmeans"; version="0.1.0"; sha256="1xmzdv35hxnslffkj8nbahhxrxmv7995pkdq2igw72x9wbryqlhs"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
-  predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.0"; sha256="08j9q46a0xq9z5n78zbk35745rv7ni2ymz500b02f04hl2x7wrrm"; depends=[caret forecast Metrics tseries TSPred]; };
+  predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.1"; sha256="0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl"; depends=[caret forecast Metrics tseries TSPred]; };
   prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; };
-  preference = derive2 { name="preference"; version="0.1.2"; sha256="113car6miax832kl0gzlqawwq3f5xbp06fz1ygz9nkzxh7mpmi11"; depends=[]; };
+  preference = derive2 { name="preference"; version="0.2.2"; sha256="0rj8mmlzkk8rhxdm1370xp3sayhfmpvq2jrn9rkrk6y3mk28q78r"; depends=[ggplot2 tidyr]; };
   prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; };
   prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
   prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; };
@@ -9731,7 +9882,7 @@ in with self; {
   preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; };
   prereg = derive2 { name="prereg"; version="0.3.0"; sha256="1lnpdwgri5rcwbwz9wh059rl6nrhlp5342gn9rnyp0gqwyni9hpd"; depends=[rmarkdown]; };
   presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; };
-  preseqR = derive2 { name="preseqR"; version="3.1.2"; sha256="0xafl51yc0y8rxwz3cc0a6mjv7ajgn8bzpynxgmkb3gjx0jla5kp"; depends=[polynom]; };
+  preseqR = derive2 { name="preseqR"; version="4.0.0"; sha256="1g2rnnmi45649vpy6z45v5i3wxm54s138ajqrzwi3a5r7x3xnhq1"; depends=[polynom]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; };
   prettycode = derive2 { name="prettycode"; version="1.0.1"; sha256="0iw38q5yx92m71wrbp52d14bl3nqwpjrd57l2w9chasmlrjnl2aw"; depends=[crayon withr]; };
@@ -9740,17 +9891,17 @@ in with self; {
   prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
   prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
-  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.2.1"; sha256="0yy2ndvmcwb5syb1km0hkv73mwlnnf53mpqp02p98xib1bm4a1w4"; depends=[]; };
+  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.3.2"; sha256="0hmqhsbpf8sbk5285mm8g0gi0s7s05dzbdci4fp3xyjn30659gdr"; depends=[]; };
   prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; };
-  primefactr = derive2 { name="primefactr"; version="0.1.0"; sha256="1p0hlf0llyfccg0pa2fccxp8zzhwsyrpd18d8ih1z7mx88kyrhwm"; depends=[]; };
+  primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; };
   primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
   primerTree = derive2 { name="primerTree"; version="1.0.3"; sha256="0k81h6ln9yjg3r4j8n5f8g8xlrq1pvrr5ywrw16s4mjjhx3r1ylg"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; };
   primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; };
-  princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
+  princurve = derive2 { name="princurve"; version="2.0.3"; sha256="1yc14nychxk2ddhqd2v7cfpx5hgdspxcrg42kvs5jvic54dbjjc2"; depends=[Rcpp]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
-  prioritizr = derive2 { name="prioritizr"; version="3.0.4"; sha256="0c82v0vz7b95milgzbbh5z19h1qmybb44lxxmw5407pqrdv2fihl"; depends=[assertthat BH data_table doParallel magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp uuid]; };
-  prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.1"; sha256="0mskny9j6dwfbndzqpbmqh552vc86xqwjdpjk2h64qza2abyh5vr"; depends=[raster sp]; };
+  prioritizr = derive2 { name="prioritizr"; version="4.0.2"; sha256="1v5bkarsgi40w9afalsjfgl7azd1q4lzwr0ipw761cnqcnhkkmkh"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; };
+  prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.2"; sha256="1gljrll89r2y6nb4jwcp1pyjs5qrahqawi84kgg74w2q6xq65kga"; depends=[raster sp]; };
   prioritylasso = derive2 { name="prioritylasso"; version="0.2.1"; sha256="1wcykrhv1d762h7k7qkvnsjk7l6sincmh6vc6wmgpmmwx5nch70x"; depends=[glmnet survival]; };
   prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; };
   prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; };
@@ -9761,12 +9912,13 @@ in with self; {
   probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; };
   probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
   proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; };
+  processanimateR = derive2 { name="processanimateR"; version="0.1.1"; sha256="1him2rdamg4q2kidc7a95pgihhcwfaz678cgdxgzz563dlgqkgac"; depends=[bupaR DiagrammeR DiagrammeRsvg dplyr htmlwidgets magrittr processmapR RColorBrewer rlang scales shiny shinycssloaders tidyr zoo]; };
   processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; };
-  processmapR = derive2 { name="processmapR"; version="0.3.0"; sha256="056g379hi80r1hxd77axayb4sa5a97bvxrlsh0nqw6pam5ycqr53"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr]; };
+  processmapR = derive2 { name="processmapR"; version="0.3.2"; sha256="0j42791qarxrn5ianbndbx0rkq6av4gvrxjl92svzki1mv5cl59n"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr viridis]; };
   processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; };
-  processx = derive2 { name="processx"; version="2.0.0.1"; sha256="0yw23lp9xjvbpswzghkmjiayw7p19hbvmgv58k3i6b8g5nav4qcg"; depends=[assertthat crayon debugme R6]; };
-  prodest = derive2 { name="prodest"; version="0.1.1"; sha256="1j8gqxswwvnd45givadlvblnsc3qli228gz77d7alc19qf1wrrvz"; depends=[DEoptim dplyr Matrix Rsolnp]; };
-  prodigenr = derive2 { name="prodigenr"; version="0.3.0"; sha256="1217l9r012xrgzna1bf9z31n2gw36h6grga3949kg7ghxrzjbm4q"; depends=[devtools]; };
+  processx = derive2 { name="processx"; version="3.1.0"; sha256="0wjr3cqwvnjxbvln25szffmkns5w0xysivdjr6chxap4nh515b0i"; depends=[assertthat crayon R6 testthat]; };
+  prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; };
+  prodigenr = derive2 { name="prodigenr"; version="0.4.0"; sha256="1rbfg3jzspw51lbhjbdy0wy5fgl3k3cnb324i73nbgjn7ycmpfqx"; depends=[clipr clisymbols crayon desc devtools fs git2r rmarkdown rprojroot usethis withr]; };
   prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; };
   productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; };
   productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; };
@@ -9782,35 +9934,35 @@ in with self; {
   profvis = derive2 { name="profvis"; version="0.3.5"; sha256="0wkpmjlrfrvrn0pp81n7cbxg8xzi796d0mxfi1v7m41x6z43fm6a"; depends=[htmlwidgets stringr]; };
   progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; };
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
-  progress = derive2 { name="progress"; version="1.1.2"; sha256="1fxakchfjr5vj59s9sxynd7crpz97xj42438rmkhkf3rjpyspx59"; depends=[prettyunits R6]; };
+  progress = derive2 { name="progress"; version="1.2.0"; sha256="1rhwm0bdw30z3rvl0bn56xprjl3zrdy7150w4gl4bkvn2d6h9fav"; depends=[crayon hms prettyunits R6]; };
   proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
-  projections = derive2 { name="projections"; version="0.0.1"; sha256="1qrgazxdihzp1i4aghkwkh6q5g1all39bvd83gwh4hj9pxm2w5zy"; depends=[distcrete ggplot2 incidence]; };
+  projections = derive2 { name="projections"; version="0.3.0"; sha256="1zhyylbp10g2syfj8mybr5cas68wf4h4fk3s7cca4iiihnglcfwz"; depends=[distcrete ggplot2 incidence]; };
   projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; };
   projmanr = derive2 { name="projmanr"; version="0.1.1"; sha256="0mmfmp5qf4r75q4hjbra2pxym77m16g28n94z5yj2qdzq46hgl4c"; depends=[ggplot2 igraph R6 tidyr]; };
   projpred = derive2 { name="projpred"; version="0.8.0"; sha256="06wi8lc88xm45drqhb3mcq5l1g1zm2msgi1m0857vldg6828gjbq"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools rstan rstanarm]; };
   promises = derive2 { name="promises"; version="1.0.1"; sha256="0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"; depends=[later magrittr R6 Rcpp rlang]; };
-  promote = derive2 { name="promote"; version="1.0.1"; sha256="1f8f5rm25fx4146hf3rds2lb7qpfz17fa5r2a1f4s3q5p86svgqn"; depends=[httr jsonlite stringr]; };
+  promote = derive2 { name="promote"; version="1.0.2"; sha256="0nxbwy6ls7bn0dqxa87a2gc74yvpyvsvn03q4v0sy3jmdyca0c73"; depends=[httr jsonlite stringr]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; };
   propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
-  propagate = derive2 { name="propagate"; version="1.0-5"; sha256="168ya3a74fjqwl9bzsb3ywzypb90h8snymgvxryrx7plrfcmwlav"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
+  propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
   properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; };
-  prophet = derive2 { name="prophet"; version="0.2.1"; sha256="10qd3w9jgk3d53465005b0di2lxa6cg67lj81fzmf2h919ai9i5m"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; };
+  prophet = derive2 { name="prophet"; version="0.3.0.1"; sha256="0ays7qn8vsa8kwzh5fk0b7nbd0l72yczjbg9h0ajkyywz3jda3fv"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rstan scales tidyr xts]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
-  propr = derive2 { name="propr"; version="3.1.9"; sha256="0bwkn923id6wd9c4qas6j363i9v4ziwvcr8d0rijxyvg23vjaq6x"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="3.5.1"; sha256="0wja6snr1hd1ms3wzg6scvs30zip5kbq0jx2j31dxrmy6fwd4h2j"; depends=[fastcluster ggplot2 igraph Rcpp]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
-  protViz = derive2 { name="protViz"; version="0.2.45"; sha256="0mvq0p0lnxwpia1znyizha5gdj6f9i07nghp3gv9kfficlq3fw03"; depends=[Rcpp]; };
+  protViz = derive2 { name="protViz"; version="0.3.1"; sha256="1im3ajimycsc1zpzbihxlsibjk0462q0vldy7v5ypsqnjbi1ndxm"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
   proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; };
   protiq = derive2 { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[graph mvtnorm RBGL]; };
   proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; };
   protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
   protoclust = derive2 { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
-  protolite = derive2 { name="protolite"; version="1.7"; sha256="002vncki8r33z9k208h19q90jwjy3d58fk3xzkh6cbsv4hgay9g0"; depends=[jsonlite Rcpp]; };
+  protolite = derive2 { name="protolite"; version="1.8"; sha256="05w5lgf255agj70qdyjm64ci9j0pncz0k0bxhq2cxjbkv09169lr"; depends=[jsonlite Rcpp]; };
   proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; };
   prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
   protr = derive2 { name="protr"; version="1.5-0"; sha256="1mi14hph6cqdsgjw4p00miaa4bh2axkwfcmxaiv7f7v4dk8i52y1"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.2.1"; sha256="17syaxfrwm9kh5q825hj7bsrvi4h9avpdabw9y0vq20y87w8cq1s"; depends=[assertthat dplyr magrittr purrr rlang SnowballC stringr tidyr tokenizers]; };
-  provenance = derive2 { name="provenance"; version="1.9"; sha256="1d40k85cxnnxy480ylvy6wwswgf8hbxgcbansx90hyg9cb3rvhil"; depends=[MASS]; };
+  provenance = derive2 { name="provenance"; version="2.0"; sha256="1775dxxk506nwaigyjsvprf4fibmiamwp7p7cl01g3mbr4gyrm0z"; depends=[IsoplotR MASS]; };
   proxy = derive2 { name="proxy"; version="0.4-22"; sha256="0l0ff8irmmvic941is290hd5vszyhaj5nfwna4v3w9c1zk5nr1ma"; depends=[]; };
   prozor = derive2 { name="prozor"; version="0.2.3"; sha256="1686lfmzmzl1488xnppv95hfr83gf67xfzqsw49gdas0aba3plhh"; depends=[AhoCorasickTrie doParallel foreach Matrix plyr seqinr stringr]; };
   prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; };
@@ -9823,9 +9975,10 @@ in with self; {
   psda = derive2 { name="psda"; version="1.0.0"; sha256="0zsvm6rqcxv186xbi8nqd4ak93lhrm1hp7339cks140vdp8yl7ys"; depends=[ggplot2 plyr raster rgeos sp]; };
   pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; };
+  pseudorank = derive2 { name="pseudorank"; version="0.2.0"; sha256="17zr5q76l0y57n7am3c6zg3cwrhcvv2l8q561jcasacp16yg4gy3"; depends=[doBy Rcpp]; };
   pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; };
-  psgp = derive2 { name="psgp"; version="0.3-17"; sha256="11rx3xim9jx8klpz1p2xj1laimd5q5qs9mvigbh48gsjrm0pnd5v"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; };
-  psidR = derive2 { name="psidR"; version="1.4"; sha256="1whdjsab5cihlq4gp06xafl3zg7z0cjb4622d23v24igz7kr0ic2"; depends=[data_table foreign RCurl SAScii]; };
+  psgp = derive2 { name="psgp"; version="0.3-18"; sha256="1jfkqwqnmzj3m1d9gxbp2rjkbqb0di75gh78zg861by5qhhaz1a7"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; };
+  psidR = derive2 { name="psidR"; version="1.5"; sha256="02cyy1dqgg6mcqyvb0py674lyhhk3h0zi9p02yqacbr81swsjpam"; depends=[data_table foreign httr openxlsx RCurl SAScii XML]; };
   pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
   psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; };
   pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
@@ -9833,33 +9986,32 @@ in with self; {
   pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
   pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive2 { name="psych"; version="1.8.3.3"; sha256="1zhp8j81nkzd65168zdw9ylypb9n07ajan21x0wqcn8jdbg970sg"; depends=[foreign lattice mnormt nlme]; };
-  psychmeta = derive2 { name="psychmeta"; version="1.0.0"; sha256="0wbjq8908wnch45n4mblx1lxsp5r65jv2g9d46lar6qxrawqbaqg"; depends=[boot dplyr fungible ggplot2 knitr MASS metafor nor1mix progress RCurl RefManageR reshape2 rlang rmarkdown rtf stringr tibble tidyr tmvtnorm]; };
-  psycho = derive2 { name="psycho"; version="0.1.4"; sha256="0drzr3svs76wx7ki6s4c5i27r5p309wgzdcpxz1j5i4ivvwhkl0b"; depends=[dplyr ggcorrplot ggplot2 lmerTest MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm stringr tidyr]; };
+  psych = derive2 { name="psych"; version="1.8.4"; sha256="1kzv9nc7rwn1sj1zxd8xrbs6c7qlka7j2c8lsr4f20znkd3qx8gf"; depends=[foreign lattice mnormt nlme]; };
+  psychmeta = derive2 { name="psychmeta"; version="2.1.1"; sha256="0sjsmzncbzqrhcmv221jliqvfhdd70ysrxax9dprsl8kyyvifvrl"; depends=[boot cli crayon data_table dplyr fungible ggplot2 knitr MASS metafor nor1mix progress purrr RCurl RefManageR reshape2 rlang rmarkdown stringi stringr tibble tidyr tmvtnorm xml2]; };
+  psycho = derive2 { name="psycho"; version="0.2.8"; sha256="0739y1svarfw6v4jrf3q6n0vnb6wfij9dnmvzvn87wg8rsp0bvrl"; depends=[BayesFactor broom coda DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lmerTest loo MASS MuMIn nFactors pbkrtest ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; };
   psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
   psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; };
-  psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; };
+  psychotools = derive2 { name="psychotools"; version="0.4-3"; sha256="023cfh9ks8cdk458g4yvjhdy8g9vkcabgpj24bcs46r8nga3adjv"; depends=[]; };
   psychotree = derive2 { name="psychotree"; version="0.15-1"; sha256="1awavyzblh4s0v15kv52sq5dpalg5p0fp7ih46jxppm1srdxsz41"; depends=[Formula partykit psychotools]; };
+  psyosphere = derive2 { name="psyosphere"; version="0.1.4"; sha256="0z3qnbybpf5zk07zny2mq8ax8lr0m4n7gwp899km0lixb10z4ysf"; depends=[geosphere ggmap ggplot2 lubridate plyr rgdal RgoogleMaps SDMTools sp]; };
   psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
-  psytabs = derive2 { name="psytabs"; version="1.0"; sha256="0dgp5h0jxmqbkkjvd39w1ds9hcggd27fc7pfarwa3iivphf35dim"; depends=[lavaan mokken plyr psych R2HTML rtf]; };
   ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; };
   ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
   ptstem = derive2 { name="ptstem"; version="0.0.3"; sha256="0dasfqkrd5dkqr1wbg56qrpkyjcb0lcdfcgz5mbxbhs478gf0nwj"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; };
-  ptw = derive2 { name="ptw"; version="1.9-12"; sha256="111b0s66p7fk6z6bnm3wckpfjxr1gshv0rqqy5wy6qg60hp7bcfd"; depends=[nloptr]; };
+  ptw = derive2 { name="ptw"; version="1.9-13"; sha256="0iighsx6xn8nbw4qpzmwgi4czmr5m8yrr7fzm7mx7cvx2r5ffmbq"; depends=[nloptr]; };
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
-  pubh = derive2 { name="pubh"; version="0.1.7"; sha256="0dha3adlbrxgkamlb5i2lcnqcsspqb30fmj0f2zhz0bh4i83lznb"; depends=[bookdown car descr Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival visreg]; };
+  pubh = derive2 { name="pubh"; version="0.2.2"; sha256="13byp5xha102h9y8dhka4fz9gdan4gshcy6bvkgvkj106h7zhy4q"; depends=[bookdown car descr effects Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival]; };
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.12"; sha256="04zb5lbjdrhdpam4xmkcc947icsnias5pxbv2pwhvyhk7mz16nya"; depends=[boot R2HTML RCurl XML]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
-  pulsar = derive2 { name="pulsar"; version="0.3.2"; sha256="1zfkxksynrphfv6lpr7rc3g9k643840bgrdv9ic700984vxgg68m"; depends=[Matrix]; };
-  pulver = derive2 { name="pulver"; version="0.1.1"; sha256="0zj3a66hjing4a87lvhxlvdp72kpn0s2d6r5kc0pi06ls04r8sax"; depends=[DatABEL Rcpp]; };
+  pulsar = derive2 { name="pulsar"; version="0.3.3"; sha256="1lhc9cvxkxvjcl2hi2kivwqp4gddq32kysy1rhpi34i9w0y3gav6"; depends=[Matrix]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
+  puniform = derive2 { name="puniform"; version="0.1.0"; sha256="16s5qk17wnag7fqgslxpayaq6nczaj2izgdkrkcssgjxfwnanzgm"; depends=[ADGofTest metafor Rcpp]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
   purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; };
-  purrr = derive2 { name="purrr"; version="0.2.4"; sha256="0wgbnbrqncjpggg8f9bdpcd1gy351s5f0az5k8lc55cvs9lhz3gd"; depends=[magrittr rlang tibble]; };
-  purrrlyr = derive2 { name="purrrlyr"; version="0.0.2"; sha256="1wkngb87xmlkghsqjr7l5fhlj3a54prvg6v6hd0prn768xw4rc1c"; depends=[BH dplyr lazyeval magrittr purrr Rcpp]; };
+  purrr = derive2 { name="purrr"; version="0.2.5"; sha256="0dc53zzan3km2l9lzxjixcv6yn7dhw2ppmz8qf2awhak7x2qm9m4"; depends=[magrittr rlang tibble]; };
+  purrrlyr = derive2 { name="purrrlyr"; version="0.0.3"; sha256="0cx3vzrkd8dv6cgpdhjn119fyn2kvixvkabvf2h5l6ab61x54wpx"; depends=[BH dplyr magrittr purrr Rcpp]; };
   pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
-  pvar = derive2 { name="pvar"; version="2.2.2"; sha256="0a84nap9rwlfvhi4yj6mh7wrmzsi06w1zpmshw84lkm2h2ch02gy"; depends=[Rcpp]; };
   pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; };
   pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; };
   pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
@@ -9873,7 +10025,7 @@ in with self; {
   pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; };
   pwt9 = derive2 { name="pwt9"; version="9.0-0"; sha256="1y8zildqnagrp8vf6d8ips0896yp0qcvwy600yv1bqdnglvmn62b"; depends=[]; };
   pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; };
-  pxweb = derive2 { name="pxweb"; version="0.6.3"; sha256="106nb0a3v295cam8ixhdwpgjhwq8p71c2z5c49s6xnqwmf6rbd0h"; depends=[data_table httr plyr RJSONIO stringr]; };
+  pxweb = derive2 { name="pxweb"; version="0.6.37"; sha256="1ia38iqs4iiq3zsdwk13zxfvc2i3h3jgmz790pr24iimsvhazff0"; depends=[data_table httr plyr RJSONIO stringr]; };
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
   pyinit = derive2 { name="pyinit"; version="1.0.2"; sha256="148b8l5a8c636rgm8dwd8v6ggw9qmkafc5a40bciqc4rk09lfhl3"; depends=[robustbase]; };
   pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
@@ -9889,14 +10041,14 @@ in with self; {
   qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; };
   qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
   qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
-  qdap = derive2 { name="qdap"; version="2.2.9"; sha256="19jlh6k3vw6c20xfygn20dgs86h2a16imn23afgxlfggbazwxjyd"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
+  qdap = derive2 { name="qdap"; version="2.3.0"; sha256="11m2si5zn0sls7hhfdcny3cmhirfxr4m49krqww2msj636yr2f64"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
   qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; };
   qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; };
   qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; };
   qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
   qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; };
-  qgam = derive2 { name="qgam"; version="1.1.1"; sha256="15f2c0n4j8q1vgd3hi2q7lmf78a3zxi5a01p0lq0916jms08lk27"; depends=[doParallel mgcv plyr shiny]; };
-  qgraph = derive2 { name="qgraph"; version="1.4.4"; sha256="0hgqjf5ljyrni0ifkq9x0ninyqwsaqd9z9i4d4phrww586590apn"; depends=[BDgraph colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
+  qgam = derive2 { name="qgam"; version="1.2.2"; sha256="0761rkkfaxi3scfdici9a8sz6sbs5d6p9wnffdlmyn5jmqj9g24q"; depends=[doParallel mgcv plyr shiny]; };
+  qgraph = derive2 { name="qgraph"; version="1.5"; sha256="1m078lij70ik6r9nxznbi18bavdsx5ai06417j3bsdipy39xrb85"; depends=[abind BDgraph colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych reshape2 sem sna]; };
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
   qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
   qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; };
@@ -9904,13 +10056,13 @@ in with self; {
   qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
   qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; };
-  qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; };
+  qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; };
   qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; };
   qle = derive2 { name="qle"; version="0.17-1"; sha256="1zsvmnxdfd6avr14z5101i4kmks87yrsn15wiq5sx8gsfbxksjkj"; depends=[digest expm lhs mvtnorm nloptr]; };
   qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; };
-  qmethod = derive2 { name="qmethod"; version="1.5.2"; sha256="1snllw82cijl7qgmgkn2x1k3x43x0hxbvh5mx5sffrma9kkv2fii"; depends=[digest GPArotation knitr psych xtable]; };
+  qmethod = derive2 { name="qmethod"; version="1.5.4"; sha256="1c64b7jy9llz5dhfnk75yamjva043213gd08dsr27pyjkmbyqms1"; depends=[digest GPArotation knitr psych xtable]; };
   qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
-  qpcR = derive2 { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS Matrix minpack_lm rgl robustbase]; };
+  qpcR = derive2 { name="qpcR"; version="1.4-1"; sha256="1r01q7jv3w59yx1gc0qw91rq7rvdhqsi8y57sqqkmwyqfw2x2vsv"; depends=[MASS Matrix minpack_lm rgl robustbase]; };
   qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; };
   qqplotr = derive2 { name="qqplotr"; version="0.0.2"; sha256="1cfzs77labxsfqq3flqz40gihyaz4bsi9vhsx6qqgpl6v4iz0a2h"; depends=[dplyr ggplot2 knitr MASS robustbase]; };
   qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; };
@@ -9919,19 +10071,19 @@ in with self; {
   qrNLMM = derive2 { name="qrNLMM"; version="1.4"; sha256="0h1jra247flipv4pwww8rn61pj8jxpiaw74f2czs950klnznp1xm"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
   qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; };
-  qrcmNP = derive2 { name="qrcmNP"; version="0.1.0"; sha256="0fhbycxzmz3bpr6y2i4aphqfclfriifrc8w10p8z10l8sabifrsx"; depends=[qrcm survival]; };
+  qrcmNP = derive2 { name="qrcmNP"; version="0.1.2"; sha256="0psgnz2fdj530wjj14pv5x2889yzphnlsg10lry9i6dvmxd8m47k"; depends=[qrcm survival]; };
   qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; };
   qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; };
-  qrfactor = derive2 { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; };
   qrjoint = derive2 { name="qrjoint"; version="1.0-0"; sha256="18jmxb5wv16gy4vf0cgp4x885s53i3z3qmc46bdr4md513mc980w"; depends=[coda kernlab Matrix quantreg]; };
   qrmdata = derive2 { name="qrmdata"; version="2016-01-03-1"; sha256="192dcsmvl3xbzlk658cfp2sk5fkgbjhjd4g1mrcs8s63hmzbwdzc"; depends=[xts]; };
   qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; };
-  qrmtools = derive2 { name="qrmtools"; version="0.0-8"; sha256="111rhfaj2hwh2267y3y20wh9dxp0fj2m68j0hv4rmdslm2xwfjzq"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
-  qrng = derive2 { name="qrng"; version="0.0-3"; sha256="0xdhmcqvgjmrf4c72x76yz5kp0jiysy8q6f67lix1h4mvzr4q2qd"; depends=[]; };
-  qrnn = derive2 { name="qrnn"; version="2.0.2"; sha256="0w4gzignkfrx220fk9j4by0ibr4r9s66il0f43k6abf0czvqdxx4"; depends=[]; };
+  qrmtools = derive2 { name="qrmtools"; version="0.0-9"; sha256="0q6hp6j4hcj17i1c1rf180rvjcjmka0zq4r89x2rb5cwrhgps99a"; depends=[lattice Quandl quantmod rugarch xts zoo]; };
+  qrng = derive2 { name="qrng"; version="0.0-5"; sha256="0ddwbbw5w7y8vns83z4dyh8inl976k2cg55rxbynaks8bdxr38mj"; depends=[]; };
+  qrnn = derive2 { name="qrnn"; version="2.0.3"; sha256="0lc1gj674ll168dbcb1wh0zxmvjaqfhfxg7p2zfpakq63qns442g"; depends=[]; };
   qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; };
-  qtbase = derive2 { name="qtbase"; version="1.0.13"; sha256="0bi3lxhnfj4pzhc11yd580zmfn9wnkbvag5rlm2g7c9i2dsi0inj"; depends=[]; };
-  qte = derive2 { name="qte"; version="1.2.1"; sha256="1skl7a4dqxfj8p2d1wpan4j7bmr1l5aqyxlzl9qmbx0brf9r5gk4"; depends=[BMisc formula_tools ggplot2 Hmisc pbapply quantreg texreg]; };
+  qsort = derive2 { name="qsort"; version="0.2.1"; sha256="046imyjdbsakhf6i6p63xafb9dx7fcixbdqnkm34wrzzvyjvxh15"; depends=[cowplot ggplot2 gridExtra purrr]; };
+  qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; };
+  qte = derive2 { name="qte"; version="1.2.2"; sha256="0h4kffavw2ii765c4bvwg19nlzk1si8sw09iklwmmb6gdm2v5m81"; depends=[BMisc formula_tools ggplot2 Hmisc pbapply quantreg texreg]; };
   qtl = derive2 { name="qtl"; version="1.42-8"; sha256="1l528dwvfpdlr05imrrm4rq32axp6hld9nqm6mm43kn5n7z2f5k6"; depends=[]; };
   qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
   qtlbook = derive2 { name="qtlbook"; version="0.18-6"; sha256="0kbz7icp6fzl2bgk50fcg8x704aijpz3xbqrzraj7qa3z8gakaj6"; depends=[qtl]; };
@@ -9944,48 +10096,47 @@ in with self; {
   quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; };
   quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; };
   quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
-  quadprogXT = derive2 { name="quadprogXT"; version="0.0.2"; sha256="1yqcxpzahrmlyz1rsp3fgs1dsjf7y7lhp98ybpmlgpj6c9z2abcl"; depends=[quadprog]; };
-  quadrupen = derive2 { name="quadrupen"; version="0.2-5"; sha256="193hn3yf6c5i3p4n8gpg78nvsf2jdlcw40mm4p2ffxk7xzmv8xvl"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
+  quadprogXT = derive2 { name="quadprogXT"; version="0.0.3"; sha256="1pa494xpmxanbqcpylhhhm4bnsd1vkrixnmi2rg2bdw21x77hlmb"; depends=[quadprog]; };
+  quadrupen = derive2 { name="quadrupen"; version="0.2-6"; sha256="0din0b4iaixjfkdiy4gbl83hq6z7v7aca2xk65hzfsalp6llk91x"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
   qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; };
   qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; };
   qualpalr = derive2 { name="qualpalr"; version="0.4.2"; sha256="0lgg8r7w2fwd2nw8x3k876pyc9r3igqri57akc5fwi92gb8grj5b"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; };
   qualtRics = derive2 { name="qualtRics"; version="3.0"; sha256="1cd49jvk04gx278v74yc93f4jni7k30v0anz95mz98x4y3xr45nd"; depends=[assertthat dplyr httr jsonlite readr rlang sjlabelled stringr yaml]; };
   qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; };
-  quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; };
-  quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  quanteda = derive2 { name="quanteda"; version="1.2.0"; sha256="19rr0dkcazdkyzyy7srawf57mmvjjz3nvxik0bkqx6cl7cvrjajz"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi XML yaml]; };
+  quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; };
+  quanteda = derive2 { name="quanteda"; version="1.3.0"; sha256="140xs8581l29p4zn26d9ijzpzcqpgf91l279vbagbpbsj3z8zqky"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
   quantmod = derive2 { name="quantmod"; version="0.4-13"; sha256="16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0"; depends=[curl TTR xts zoo]; };
   quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; };
-  quantreg = derive2 { name="quantreg"; version="5.35"; sha256="18f3qxv1j1bqmq55hzssz8mnp5ww4flhy80rm2v1rk0mmg9paz7m"; depends=[Matrix MatrixModels SparseM]; };
+  quantreg = derive2 { name="quantreg"; version="5.36"; sha256="023gdzahxp582rpabilpxbl3wyjrgjjnnrhcv9xhrqdfiq5l2yza"; depends=[Matrix MatrixModels SparseM]; };
   quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; };
   quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; };
-  quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-0"; sha256="0lscz07k14z1mgxdgi7j0nd5098x6p4hsm9qzw8fgnsz4xgm5qxn"; depends=[quantreg]; };
+  quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-2"; sha256="0g8jlgxivsg788g73ji7vckc6hgncsjkpyc0l8awcpaxi7i3a98l"; depends=[quantreg]; };
   quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; };
   quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; };
   quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; };
   questionr = derive2 { name="questionr"; version="0.6.2"; sha256="0mjgwm6xm753r6bjlz79c9vp7xxkb69hiv3mlzrm50slh34x7jhx"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
   queuecomputer = derive2 { name="queuecomputer"; version="0.8.2"; sha256="0zpyi4hqhsy2jlbf2ygfl25wh3m166ifp9yw4h4ycd1pga9bj43n"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
   queueing = derive2 { name="queueing"; version="0.2.11"; sha256="1rgavpivvxwww1qiphbjm25d1avhjcjv31imsrzrkwh1d12b2k7x"; depends=[]; };
-  quhomology = derive2 { name="quhomology"; version="1.1.0"; sha256="0acglmjp4x8f81iysxp8x7v5279p8gdidj308b9spn6xbmqgbr8z"; depends=[MASS numbers]; };
-  quickPlot = derive2 { name="quickPlot"; version="0.1.3"; sha256="091d81x5kbjs4hawrdlvkp6ylmcsjg4xqs47hk2nrv5im2nl8i7z"; depends=[data_table ggplot2 gridBase igraph raster RColorBrewer rgdal sp]; };
+  quhomology = derive2 { name="quhomology"; version="1.1.1"; sha256="0wiih00zk4682wy1r4nyifh76h5bnvl3f785wjzmrwylnfy951l3"; depends=[MASS numbers]; };
+  quickPlot = derive2 { name="quickPlot"; version="0.1.4"; sha256="13g86gdfidkvp70w4gscp81c4vzbhbl7b47a7knw4h7hswsb9a1p"; depends=[data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; };
   quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; };
   quickblock = derive2 { name="quickblock"; version="0.1.0"; sha256="15zv7znhq3rl5jkdy0jyxr0h2mkpxir04vvl2hw57c5mn79izcpr"; depends=[distances scclust]; };
-  quickmapr = derive2 { name="quickmapr"; version="0.2.0"; sha256="1hxcq4h1rgdmypn3kgmwppzhacyspcj7iv2sy7s2xx5y69x62hf1"; depends=[httr raster rgdal rgeos sp]; };
+  quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; };
   quickmatch = derive2 { name="quickmatch"; version="0.1.2"; sha256="03wnx6hifr4pmwm6fsxamcaf5ig59nfia9lyn6mzxplinfid71w6"; depends=[distances sandwich scclust]; };
-  quickpsy = derive2 { name="quickpsy"; version="0.1.4"; sha256="0zvi5g43dj1a3f6nysw9gc9nnhm0z5h6sfka4ggwr14fw6k0gz3l"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
+  quickpsy = derive2 { name="quickpsy"; version="0.1.5"; sha256="0r1xjcx02p0fsgfcd2h0dxcagzxxan405cjwh8sjdgi5p01jrym8"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
   quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; };
   quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; };
-  quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; };
   quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; };
   quotedargs = derive2 { name="quotedargs"; version="0.1.2"; sha256="034fhfmfq62yf7akx2i0bim70jq9azkk2h28k79lwax7ysydsjnj"; depends=[]; };
-  qut = derive2 { name="qut"; version="2.0"; sha256="1r0yg99p88ar1d9qhayzpplssjpsy901b7n6yr7r4n9nldh8p7xz"; depends=[flare glmnet lars Matrix]; };
+  qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; };
   qvcalc = derive2 { name="qvcalc"; version="0.9-1"; sha256="1ll71yww8rsbp0qa60w7vdna8yk60cq66cjn5cdk3bkdwyni28yy"; depends=[]; };
   qwraps2 = derive2 { name="qwraps2"; version="0.3.0"; sha256="0xhlb0c955raxrqw202f7jd9c1wkrigh1qs93m2739jkwkyv2n3b"; depends=[devtools dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; };
   r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; };
   r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
+  r2d3 = derive2 { name="r2d3"; version="0.2.2"; sha256="1r70x14s6vb4hyig5avb0vd6ynj2y6g2n7vd50hzm1yhb6w2z81b"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
   r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
@@ -9993,13 +10144,13 @@ in with self; {
   r6extended = derive2 { name="r6extended"; version="0.1.1"; sha256="184c3jh84vihbwg81c2wv3ndaddki8cpas3wgvqk2akyq168rnfc"; depends=[digest hellno magrittr R6]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
-  rAmCharts = derive2 { name="rAmCharts"; version="2.1.6"; sha256="00bc05jjyaky71pdic455cs6anqf0gm7563vwwxxzqnrm8lknrag"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
+  rAmCharts = derive2 { name="rAmCharts"; version="2.1.8"; sha256="02j4wbgh3hfkv3zhrpjyjj61w76qmm4v0642crlzdab959n5qsfy"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
   rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
   rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
   rCAT = derive2 { name="rCAT"; version="0.1.5"; sha256="03nbhcfgawz0a8h5fr51aqn1n9v7kprwvafxzjb2pb8751rica2d"; depends=[pracma rgdal sp]; };
-  rCBA = derive2 { name="rCBA"; version="0.3.0"; sha256="1jsykb747clzd5j78h50gclf7171hk015yssi02lbai79q359r56"; depends=[arules R_utils rJava TunePareto]; };
+  rCBA = derive2 { name="rCBA"; version="0.4.2"; sha256="1ky3426h6idadwr3al6vzglw34xdlq54gl5cxaafwgdilj0p0qmq"; depends=[arules R_utils rJava TunePareto]; };
   rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
   rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; };
   rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
@@ -10007,11 +10158,11 @@ in with self; {
   rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
   rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; };
   rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; };
-  rDVR = derive2 { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
   rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; };
-  rEDM = derive2 { name="rEDM"; version="0.6.9"; sha256="0825yh82vlkmjkrwbk7xfhdq4c7yq7n4bmmw6x7ywmhbnayqj6b3"; depends=[Rcpp RcppEigen]; };
+  rEDM = derive2 { name="rEDM"; version="0.7.1"; sha256="03f5dd8ki13g3xwiji05pjmmgz13j34hjv9hwv7jcq113g1sc509"; depends=[Rcpp RcppEigen]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
-  rENA = derive2 { name="rENA"; version="0.1.4"; sha256="007kgb5n30c4jpbp7q2f0yj5mplb8pvhs8pvghy8zbwrl61n4kx5"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll scales]; };
+  rENA = derive2 { name="rENA"; version="0.1.5"; sha256="1iwz7dk0x9114zjgk9gg3awx3c8lnd9xhzk2bqvsan7v24xqrcgy"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll rmarkdown scales]; };
+  rERR = derive2 { name="rERR"; version="0.1"; sha256="1ymf0v3r2sv9m72c19csk38fy5kmld3i18jh06rir5kxkb5l245p"; depends=[dplyr ggplot2 numDeriv plyr reshape2 survival]; };
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
   rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; };
   rFTRLProximal = derive2 { name="rFTRLProximal"; version="1.0.0"; sha256="1458gqy2zbaa62vaimawdr1nk0lsgwz1j4pgw21fkw7bskcszz0f"; depends=[data_table FeatureHashing foreach magrittr Matrix Rcpp RcppArmadillo RcppProgress]; };
@@ -10022,8 +10173,8 @@ in with self; {
   rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
   rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
   rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; };
-  rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-8"; sha256="0maws52n4lj2byfyv8fj8npk2qyd3dzy83x5h2s1nmgbjm2m36kj"; depends=[chopsticks rJava]; };
-  rJava = derive2 { name="rJava"; version="0.9-9"; sha256="0ilibvhxydnh9yhhi9h9isgkq41xvwj43b5m9dhnsm2w5cziaawk"; depends=[]; };
+  rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; };
+  rJava = derive2 { name="rJava"; version="0.9-10"; sha256="0y7yg70i3zwbwl4g36js4dqpl51cmwss5ymrsk24d1z07bflp4y9"; depends=[]; };
   rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
   rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; };
   rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; };
@@ -10038,7 +10189,7 @@ in with self; {
   rNOMADS = derive2 { name="rNOMADS"; version="2.3.9"; sha256="15l6150vsaa7y2wv896mhdbakxdsg87fx74bbj0rsn0757jss525"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
   rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; };
   rPackedBar = derive2 { name="rPackedBar"; version="0.1.0"; sha256="12jwkch3264m6ksl8rdjirwdzm1g8b4050mm6rysw9v57k3v57ji"; depends=[data_table plotly scales]; };
-  rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; };
+  rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; };
   rPraat = derive2 { name="rPraat"; version="1.0.8"; sha256="06f97sa43i0b4x8j48higgx5jyj5q73j6mf2730yfm4db6ahz94m"; depends=[dplyr dygraphs readr stringr]; };
   rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
   rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; };
@@ -10048,66 +10199,66 @@ in with self; {
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
   rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
-  rTableICC = derive2 { name="rTableICC"; version="1.0.6"; sha256="1wasfkcnbd2azv2v0n02932zxa86lxrvndny2821lvf7xrc9yy55"; depends=[aster partitions]; };
+  rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; };
   rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
-  rWind = derive2 { name="rWind"; version="0.4.1"; sha256="19bv69y236sjlkf082wrs38nhijhrpbsnh4vc8phdzg7dj9my09j"; depends=[gdistance Matrix raster]; };
+  rWind = derive2 { name="rWind"; version="1.0.2"; sha256="0w109l3hibl1w0g2qj2rqm59qfs9zbry5q8azii86mqpgwxk7zln"; depends=[gdistance lubridate Matrix raster]; };
   rWishart = derive2 { name="rWishart"; version="0.1.0"; sha256="1kg2n8lyfdp76fw36m13rlb0qy1ffk8n701ffmf5dgkfp0x8nnn7"; depends=[lazyeval MASS Matrix]; };
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   rabi = derive2 { name="rabi"; version="0.1.0"; sha256="02ldpkqpdvh0b660j34bppw5j9pl3a2b4vkzaaiq4kcangahg2r6"; depends=[numbers polynom stringdist]; };
   race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
   radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; };
-  radiant = derive2 { name="radiant"; version="0.8.0"; sha256="1v8anqn2q2ybv2wzb1c6la9hxmjyvg922xzikdv8491dgicd3dqh"; depends=[AlgDesign psych r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; };
-  radiant_basics = derive2 { name="radiant.basics"; version="0.8.0"; sha256="1x2frv5srb8q3l9arhws861pxyjb4spiajxr9g8fmjq3jjhd63cg"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; };
-  radiant_data = derive2 { name="radiant.data"; version="0.8.1"; sha256="1ylina1jlrmvjkj8pwg0ip5jv1038vnzyckmf542xl7g11x8rvw1"; depends=[base64enc broom car curl dplyr DT ggplot2 gridExtra jsonlite knitr lubridate magrittr markdown pryr psych r_import readr rmarkdown rstudioapi scales shiny shinyAce tibble tidyr]; };
-  radiant_design = derive2 { name="radiant.design"; version="0.8.0"; sha256="0n2a0jpjcxxmmr9sbky7v2cnzil3hv6b20yzkyc9lf4a48pqlm4l"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; };
-  radiant_model = derive2 { name="radiant.model"; version="0.8.0"; sha256="0zlb5ny3s15d1ngdhszkn5wzij4y5fz7c2lwkb9g619pr0ngrwr8"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet pryr psych r_import radiant_basics radiant_data rpart sandwich shiny stringr tidyr yaml]; };
-  radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.8.0"; sha256="0l3rk5045apjb2jx04jf3mwjixg8cjwrgmz83km9627n93cabs2l"; depends=[car dplyr ggplot2 Gmedian GPArotation gridExtra magrittr MASS pryr psych r_import radiant_data radiant_model scales shiny wordcloud]; };
+  radiant = derive2 { name="radiant"; version="0.9.5"; sha256="0a5dvmvnvn2jd53grvagbxw6lb4mp3l809911dlh2rr4b9z9nkyx"; depends=[AlgDesign psych r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate rstudioapi shiny]; };
+  radiant_basics = derive2 { name="radiant.basics"; version="0.9.5"; sha256="0xwsgi4nr9i7wi699cgmfdyb7nxf98af4vgl56i1bbnxl8k0bnxz"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data rstudioapi scales shiny tidyr]; };
+  radiant_data = derive2 { name="radiant.data"; version="0.9.5"; sha256="0mbxfqn79nphii4hb6kxl2wc0w0ra16y378rp2yw9a9926zdb7mb"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce tibble tidyr writexl]; };
+  radiant_design = derive2 { name="radiant.design"; version="0.9.5"; sha256="1lqim49ifw019aqfrz2pqa81yn2kg5hixn3ywd5hfj670n5sd5hr"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data rstudioapi shiny]; };
+  radiant_model = derive2 { name="radiant.model"; version="0.9.5"; sha256="1r1gz8hlrihadzz4x73ccrxqkz744lbr8h29fa77ghkiy9y55abq"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart rstudioapi sandwich shiny stringr tidyr yaml]; };
+  radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.5"; sha256="1rpk757r80l38y0y4w94h363xdmrv7mp6qpnwpcbrza20w9dhqvs"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang rstudioapi scales shiny]; };
   radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; };
-  radir = derive2 { name="radir"; version="1.0.2"; sha256="09lcq8ax5x5yk3sqx15rvw3vyi8fyfzgs76kxjhf7hcw4qnib46d"; depends=[hermite]; };
+  radir = derive2 { name="radir"; version="1.0.3"; sha256="0v1w0jy19fqscwkggyjashb6n9r6xjc0d971zw0lqnh1ap3chg0y"; depends=[hermite]; };
   radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
   rags2ridges = derive2 { name="rags2ridges"; version="2.2"; sha256="04f9gvwpgrx54dgbjjixlxa2056aqcz2kryn4jplwf5fc0vj1lyn"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape sfsmisc snowfall]; };
   ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.1"; sha256="0zjqrvy1k1lz4caakcj3c6l2j637wp6nxbzfj0gvcn2c4pjcrdyp"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; };
   ragtop = derive2 { name="ragtop"; version="0.5"; sha256="0h09h9ws9c2d9xc00w4hl000h0kbvq16lz4vgv1w93am8zmsp4wm"; depends=[futile_logger limSolve]; };
-  railtrails = derive2 { name="railtrails"; version="0.0.3"; sha256="0dbyqviig0sadialqr66x93v3xn8y4qgdb323mji7rasdp5w8ws4"; depends=[tibble]; };
+  railtrails = derive2 { name="railtrails"; version="0.1.1"; sha256="1hi55rcxmr7k3na3rpjqmd5fpgn51bymrp7yxmw45ff7mlzpa5h6"; depends=[tibble]; };
   rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
   raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
   rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
   rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; };
   ramchoice = derive2 { name="ramchoice"; version="0.2"; sha256="0br6n6mxcz099rj3dh1sp28wy9g5rqwh0arg0s968pc5h0jfbai5"; depends=[MASS]; };
-  ramcmc = derive2 { name="ramcmc"; version="0.1.0"; sha256="0s5jgjqkschr64srblppv9lbvhynlpfiy8cy12fywpmnbv8viazq"; depends=[Rcpp RcppArmadillo]; };
-  ramidst = derive2 { name="ramidst"; version="0.1.0"; sha256="1q4lvq2c2vj9xrm2p2w2qjsl4qvwcl6y54y68mmbd6cw7wqpffjj"; depends=[rJava]; };
+  ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; };
   ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; };
   ramps = derive2 { name="ramps"; version="0.6-15"; sha256="0c7y64z0ysjy0kh234xfqhbwwn1vgscvp1n4l2fjk5s5xz8633pn"; depends=[coda fields maps Matrix nlme]; };
   ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
   randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-  randgeo = derive2 { name="randgeo"; version="0.2.0"; sha256="056c522zw2x4ab7z2bpkw9byfn1gzsfavbjaxdgwi4n934f46h14"; depends=[]; };
+  randgeo = derive2 { name="randgeo"; version="0.3.0"; sha256="14hlh9k66lcbf0xhnxx12rrnyl8awqcsm3csvxdz23s5wnm2ya5p"; depends=[]; };
   randnet = derive2 { name="randnet"; version="0.1"; sha256="1mpz3dsbzd5hffv2v5p6jdp0z07f7rhgcjinr1lwggvxw37xwrkj"; depends=[AUC entropy irlba Matrix poweRlaw RSpectra]; };
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; };
   randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="2.5.1"; sha256="1p5a5z7ddhnsrln8vpdrwvxbgknwdigczjw8vpxzbkckmf6qfidd"; depends=[]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.6.1"; sha256="0wmqy1m04iknqzfajhfcb6cjpl9h35x13ihsdx91l1d1yki7yq71"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
   randomLCA = derive2 { name="randomLCA"; version="1.0-15"; sha256="10rx2ah50dcjxz5y492c59d3pn0dvlgjaxfdf8sknkf6s4pmwkis"; depends=[boot fastGHQuad lattice Matrix]; };
   randomNames = derive2 { name="randomNames"; version="1.0-0.0"; sha256="12q5bs65qivddiaxbsp128j94h2vyrgjvmm80d52r36ffbaigl09"; depends=[data_table]; };
   randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
   randomcoloR = derive2 { name="randomcoloR"; version="1.1.0"; sha256="0sirxgrf7xf470d7lls45c698l6c078hqjkjcswmwz6kphykrzhg"; depends=[cluster colorspace Rtsne scales stringr V8]; };
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
-  randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; };
-  randomizeR = derive2 { name="randomizeR"; version="1.4"; sha256="0l7gvpm52fwbz79vgy7vn4z2n4gqigimdj6r9drm3lfzbylmx3js"; depends=[ggplot2 plotrix]; };
-  randomizr = derive2 { name="randomizr"; version="0.12.0"; sha256="0g0n63srydljvj4spjl5r08khq0sqlhsj01s150m31cxf23zdjli"; depends=[]; };
+  randomizeBE = derive2 { name="randomizeBE"; version="0.3-4"; sha256="1x1lh1rrw7ma2wls0dflz18lk9h0qdy9gb11af95hqpabqc85rd7"; depends=[]; };
+  randomizeR = derive2 { name="randomizeR"; version="1.4.2"; sha256="0jv0mc40cy4w17jrsb2023l7k7cnzl9czdigl4shq9nx67mccdwx"; depends=[ggplot2 plotrix]; };
+  randomizr = derive2 { name="randomizr"; version="0.16.0"; sha256="0lsba2nzzx8vnkyj8fzf9lfnkq743qdzir9f15pk23xycjzlncfs"; depends=[]; };
+  randomsearch = derive2 { name="randomsearch"; version="0.1.0"; sha256="176grqp6rv4hiyzr9fzx2zz360h5nkrw39gidclgmrp7ckn5qs4v"; depends=[checkmate fs parallelMap ParamHelpers smoof]; };
+  randquotes = derive2 { name="randquotes"; version="0.1.0"; sha256="1rpcmxkpq8lgfzrjaipf5x573gm6rc31c9fafghiy99c0iphf46w"; depends=[curl jsonlite xml2]; };
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
   randtoolbox = derive2 { name="randtoolbox"; version="1.17.1"; sha256="13akf13qi4yhj9gapym05074b1qzk03vgysy81qsd73pd8r107ls"; depends=[rngWELL]; };
   rangeBuilder = derive2 { name="rangeBuilder"; version="1.4"; sha256="1jjy1d3kljysm3mqgdszdi6incbmg2di63akxswfaiqcp1m68a6y"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; };
-  rangeMapper = derive2 { name="rangeMapper"; version="0.3-1"; sha256="005r97zwz0czsp543h1g3zrys00s6wdyk0ji9pk7jn625i02cbdk"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
-  rangemodelR = derive2 { name="rangemodelR"; version="1.0.1"; sha256="04zv8a4nhin9masvbw1cmbwdkls4wgq81xfw6kg0wdh1hpqjz1z0"; depends=[]; };
-  ranger = derive2 { name="ranger"; version="0.9.0"; sha256="1pilj5pxl8jl0gsy9vsyqxqdqfcxzvphbgvrlp4hf7r9mrfw9v0p"; depends=[Matrix Rcpp RcppEigen]; };
+  rangeMapper = derive2 { name="rangeMapper"; version="0.3-4"; sha256="0qrcxbh8saflqjmaa18fcyk5cqk6h4rz92zhqckswyqynx6m0cps"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
+  ranger = derive2 { name="ranger"; version="0.10.1"; sha256="12z67xkgdmr5cflpd6cln0mn5xxajanqbfwlckv6cfma0gvf2z1j"; depends=[Matrix Rcpp RcppEigen]; };
   rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; };
   rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
@@ -10117,8 +10268,7 @@ in with self; {
   rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; };
   rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; };
   rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
-  raptr = derive2 { name="raptr"; version="0.1.1"; sha256="17k392vid1is0wl5iyr8b41xyw5y0ad7drvlmrcsda7683yal3p3"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; };
-  rare = derive2 { name="rare"; version="0.1.0"; sha256="05bnh2m1sah6zvzvmm3bq1i2n5kmhhxnlzbrjxzmb9vj6skaglv1"; depends=[glmnet Matrix Rcpp RcppArmadillo]; };
+  raptr = derive2 { name="raptr"; version="0.1.2"; sha256="17aba9jxlvvf2946wy2y0ck5j85sqzkr8q1yk68cdqkf45lxkvz8"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; };
   rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
   rarhsmm = derive2 { name="rarhsmm"; version="1.0.7"; sha256="0pvqa6f0ib1jb0rwc6wv6hfinncb21v2g0y0hsy5l33gdagjw2sz"; depends=[glmnet Rcpp RcppArmadillo]; };
@@ -10128,8 +10278,9 @@ in with self; {
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
   rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
-  rasterVis = derive2 { name="rasterVis"; version="0.44"; sha256="041a3d6vcvsah6qm4mf2nc70sln9djlv2ymq389icagiwdqjw9xh"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
+  rasterVis = derive2 { name="rasterVis"; version="0.45"; sha256="0x1d28jn6l78lhccbnlnzyr18734f16rcfnfyl9vqpkrn7sgwc3i"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.3.9"; sha256="0w6i9czcbj8ipd9nn4w4h4pqk6xd8anh00cn60hss9hs18fcb21d"; depends=[assertthat]; };
+  ratematrix = derive2 { name="ratematrix"; version="1.0"; sha256="09nbgybgdgdkc6bdcxjiy1kdgv398lgih1aqzd7abj5lndlh8pny"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
   ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; };
@@ -10137,15 +10288,15 @@ in with self; {
   ratios = derive2 { name="ratios"; version="1.2.0"; sha256="16q9v2lhgklvdp3hi9x3afdldznfpwg775p80m2g5074q2dzjpgg"; depends=[data_table stringr]; };
   rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; };
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
-  raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; };
+  raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; };
   rbacon = derive2 { name="rbacon"; version="2.3.4"; sha256="1va1rap2n6mcjfzclqg5h58ggrs2kb4nlaam5ch984w9rzq59g2l"; depends=[coda Rcpp]; };
-  rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; };
-  rbcb = derive2 { name="rbcb"; version="0.1.3"; sha256="0bghbxrgy4lpxyazqlm90i42dav1kjca02l2nmw320v01rvw5qvd"; depends=[httr jsonlite tibble xml2 xts]; };
+  rbamtools = derive2 { name="rbamtools"; version="2.16.11"; sha256="1pr1isq9yk5mpi41cnihg4zn5g9az7yr9m42759hibqqyb6nw78a"; depends=[refGenome]; };
+  rbcb = derive2 { name="rbcb"; version="0.1.5"; sha256="0w76jgl75i36xb150m5vlqbd6k0nhxx34fcl0vw9l1in5pwd6qgw"; depends=[httr jsonlite tibble xml2 xts]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
   rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
-  rbgm = derive2 { name="rbgm"; version="0.0.4"; sha256="0sqi42vz3fdgp7gpa4jjh8dxz3iwwagw9in70jpz6fc18ivizkp1"; depends=[dplyr geosphere raster sp tibble]; };
+  rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; };
   rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
-  rbi = derive2 { name="rbi"; version="0.9.0"; sha256="0am6r8dy3nfahprkyvap73x3b6vxgc604v7mf9wbb9vwjja00xzp"; depends=[data_table ncdf4 reshape2]; };
+  rbi = derive2 { name="rbi"; version="0.9.1"; sha256="0jfaakzl15dz6bsbcd6y2pnf3bdccs3bx90c6hzsjpvck7fcvxpi"; depends=[data_table ncdf4 reshape2]; };
   rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; };
   rbison = derive2 { name="rbison"; version="0.6.0"; sha256="09mbhk56ns1qldgcj8qard3dsvsfbnlrq4s4drc46lr1s8lqjd1h"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; };
   rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
@@ -10157,63 +10308,64 @@ in with self; {
   rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
   rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
   rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; };
+  rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; };
   rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
-  rcarbon = derive2 { name="rcarbon"; version="1.1.0"; sha256="0y201lrmdisw7rmzaxsyiwdj4kms7q1dvw34ial28989ci1rslrw"; depends=[doParallel foreach sp]; };
+  rcarbon = derive2 { name="rcarbon"; version="1.1.3"; sha256="08gg72gakns9akcsi5j79jxsx8cngbzf3sg0qvpj22xsrp7amxr2"; depends=[doParallel foreach knitr sp]; };
   rcartocolor = derive2 { name="rcartocolor"; version="0.0.22"; sha256="1dh1n01v70sfmymg1w0f272j6nwnrzawqx5x4ljgh46pzqprx56r"; depends=[ggplot2 scales]; };
   rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; };
-  rcbsubset = derive2 { name="rcbsubset"; version="1.1.3"; sha256="16wd0j0z2ll8hqrk27fss4k9fyjw6xwx30xkrphx9jj2ws08wibl"; depends=[MASS plyr]; };
+  rcbsubset = derive2 { name="rcbsubset"; version="1.1.4"; sha256="0sfsmnxs4c8blzg0bb2ffb2xcsjv7pp39arnda988f7b2aas59wj"; depends=[MASS plyr]; };
   rcc = derive2 { name="rcc"; version="1.0.0"; sha256="0a77d54c9qahhsjzpa0436ddsj4j44013r7rbxm0fjz04c0d2921"; depends=[]; };
   rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; };
   rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; };
   rcdd = derive2 { name="rcdd"; version="1.2"; sha256="1s7idrfvl0hhyckrfiakszqw6fk34f9iiyxspzya3rqyhih014ay"; depends=[]; };
-  rcdk = derive2 { name="rcdk"; version="3.4.5"; sha256="0wybaa5wmxixqlrf84sph3shg495jvawsxqd7xg8adp7jixa8iiv"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
+  rcdk = derive2 { name="rcdk"; version="3.4.7"; sha256="1r7cqr9adcbvw5zcnh0vpfahi5ywcjk8axhpj1pqrv24lb208c6j"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; };
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
-  rclimateca = derive2 { name="rclimateca"; version="1.0.1"; sha256="1mv4i290x0bwvap5njizal5z0ccbkqjfyk2pmcbx4sml5crhx6yy"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
+  rclimateca = derive2 { name="rclimateca"; version="1.0.2"; sha256="012p6vj78m43y8n85diaf5z11h4v0p4s898jmlipvsha11q60csn"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
   rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; };
-  rcompanion = derive2 { name="rcompanion"; version="1.13.0"; sha256="1smkwp7xjkwiix1m7cx13hwnmka8nqv6m3s5wlzd02l9grc5ldrp"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
-  rcongresso = derive2 { name="rcongresso"; version="0.3.2"; sha256="15b7m1z5lr66kwhl8v8k2car4id9ssd0ypz75z259v8c1w0k7xkl"; depends=[dplyr httr jsonlite magrittr tibble tidyr]; };
+  rcompanion = derive2 { name="rcompanion"; version="1.13.2"; sha256="0kpr0pxfi8al6zdx0imp9nf9m98h8srimij7gf018ik4v6kjyjiv"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
+  rcongresso = derive2 { name="rcongresso"; version="0.4.6"; sha256="1xd07vlbcp3msmwvg2nk7acdx513v2wfbq64na0045rsv2v96m44"; depends=[dplyr httr jsonlite magrittr stringr tibble tidyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; };
-  rcqp = derive2 { name="rcqp"; version="0.5"; sha256="0iww9pbfxlvr68csig9nfi48nrqn2j6viqwwwggk789bk6ffz00a"; depends=[plyr]; };
   rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
   rcrossref = derive2 { name="rcrossref"; version="0.8.0"; sha256="01k3jpd6awan8r4kc5wjw0did30i2bafzjr8mwaaqv87gni2yiyf"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; };
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
-  rcss = derive2 { name="rcss"; version="1.2"; sha256="08hiprjcjvc138laqrvlvrmn664b63x829ammzgrwjqcsj4kpmds"; depends=[Rcpp RcppArmadillo rflann]; };
-  rcube = derive2 { name="rcube"; version="0.1"; sha256="15dyxwsj7f2annf3a2wi158m9s38jfl31lhwfi9shlzi5xadcwjk"; depends=[]; };
+  rcube = derive2 { name="rcube"; version="0.2"; sha256="1vfh0bg0awynbv0kafsn7sqj7sc2rjaap9rmy717qv9p0n6gkypr"; depends=[magrittr]; };
   rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; };
   rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; };
   rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
-  rdatacite = derive2 { name="rdatacite"; version="0.3.0"; sha256="10ivlng40f213iag30ygfihxx0415z2jdz3kx329wd4xjcj7fy02"; depends=[crul jsonlite oai solrium]; };
+  rdatacite = derive2 { name="rdatacite"; version="0.4.0"; sha256="14p8albilnzf882m499zfps77jrx0zav9wpz3m047xgs2msnwxqw"; depends=[crul jsonlite oai solrium]; };
   rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
   rdataretriever = derive2 { name="rdataretriever"; version="1.0.0"; sha256="1a1dbzs1jravbhidv9wcs52qbd6zf7wf26hixpqjwiq8gsq9l5gh"; depends=[]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
-  rddapp = derive2 { name="rddapp"; version="1.0.0"; sha256="0js2y34k971ydv4nx2g4lr3mnpr3pagdiwqfi9l5431fxxr0pf0n"; depends=[AER Formula lmtest sandwich shiny]; };
+  rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; };
   rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; };
   rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
+  rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; };
   rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
   rdflib = derive2 { name="rdflib"; version="0.1.0"; sha256="1xq378nfvbk8b2nbnr6yswqr351pgli7jcmhcr1ipynkl93rl5qm"; depends=[jsonld readr redland stringi]; };
   rdfp = derive2 { name="rdfp"; version="0.1.2"; sha256="1kznr5p5mhplgpgmc0f4vrs1fwpivwjy52hwfc8k0q0vx53h3fs2"; depends=[curl dplyr httr lubridate plyr purrr readr XML xml2]; };
+  rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
-  rdist = derive2 { name="rdist"; version="0.0.2"; sha256="0rwv8brambwki3jzpq250lk0k7nmvlzm80szy4nkhdl2zxwriv0a"; depends=[Rcpp RcppArmadillo]; };
-  rdiversity = derive2 { name="rdiversity"; version="1.0"; sha256="0x6s9028v4xcc54yy4977yqw5mrsbqlrm5b9drj05c64mavhm4sq"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; };
+  rdist = derive2 { name="rdist"; version="0.0.3"; sha256="1jp3s4293h973dpz0waq9abpd8ibp4gxdyk3bwn7a32zfpk4kjza"; depends=[Rcpp RcppArmadillo]; };
+  rdiversity = derive2 { name="rdiversity"; version="1.2.1"; sha256="0j67b9mnq2xfbi2hrn1x9vgdv63779d0rcbzndljh37b1x5zlr22"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; };
   rdlocrand = derive2 { name="rdlocrand"; version="0.3"; sha256="1cv69iy5sx9kdplpk9hnriqzgrm5mjbmhax4cybszhsyaly6r78d"; depends=[AER sandwich]; };
+  rdmulti = derive2 { name="rdmulti"; version="0.1"; sha256="0a2nppb59054ns0ya3igva7xjaivnsj023fd30pzwca99zsmnx6s"; depends=[rdrobust]; };
   rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; };
-  rdomains = derive2 { name="rdomains"; version="0.1.7"; sha256="1w6jvwzd9lwha4qkf8rhd1g3cpr79fsl4rrmh5chdnbahqg60gh9"; depends=[aws_alexa curl glmnet httr Matrix rlang RSelenium urltools virustotal XML xml2]; };
   rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; };
   rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; };
   rdpower = derive2 { name="rdpower"; version="0.1"; sha256="1pi0g980zgy0h3kyiksnbpi59fksm17g9lxinqjf7xiam7pgw99n"; depends=[rdrobust]; };
   rdrobust = derive2 { name="rdrobust"; version="0.99.1"; sha256="18hq4nmyf8327qdbh7m8y0av6f21pcxaxfqs0qrc07yf6sdcj6ri"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; };
-  rdryad = derive2 { name="rdryad"; version="0.3.0"; sha256="18vjq5amaian174ywymsx1px7ckirk36386h66lsq0h87qwnrwj7"; depends=[crul curl oai solrium xml2]; };
-  rdwd = derive2 { name="rdwd"; version="0.10.1"; sha256="0w1wd1qxisdqd04ybcacbjjsjsvhjd152jcfjljzv2d20ha82kcn"; depends=[berryFunctions pbapply]; };
+  rdryad = derive2 { name="rdryad"; version="0.4.0"; sha256="19ca618hymvpk5byrrglc6iidsgm6wn43fypspssa7b3r1c4xhdc"; depends=[crul curl data_table oai solrium tibble xml2]; };
+  rdwd = derive2 { name="rdwd"; version="0.10.2"; sha256="18ghcg1arm5k2gan2h71bx0h27hsqr0mkajb5sha0ijyby3wa4h8"; depends=[berryFunctions pbapply]; };
   re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
-  reReg = derive2 { name="reReg"; version="1.1-2"; sha256="13xnxpsa5pk39sp6pq9qvj4m0pjhvidfbjsx1s9qdczrvm6zsl3c"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; };
+  reReg = derive2 { name="reReg"; version="1.1.4"; sha256="0333r1rv9nshxmg7x2s5pdf7mk7pmpxdzfk617pmjkvf7qbfqfpa"; depends=[BB dplyr ggplot2 MASS nleqslv plyr purrr SQUAREM survival tidyr]; };
   reactR = derive2 { name="reactR"; version="0.2.0"; sha256="17jdcby95fxfa3imalllnqsp16py5vqqj4y0za4wli91vd37555q"; depends=[htmltools]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
   readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; };
@@ -10223,21 +10375,21 @@ in with self; {
   readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; };
   readODS = derive2 { name="readODS"; version="1.6.4"; sha256="1kj648phxvpg480fdhr2sj4l8q306gjdl886zqnkwxif5mw1aq7g"; depends=[cellranger readr xml2]; };
   readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; };
-  readability = derive2 { name="readability"; version="0.1.1"; sha256="19csrvnl1gslzamn46w5r0q4x12g56zr11m4lwp6rzwd5wcnj9ra"; depends=[data_table ggplot2 syllable tidyr]; };
-  readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
+  readabs = derive2 { name="readabs"; version="0.2.1"; sha256="0zm8n036qrh61ywba411x36zlda6n8iq1vv66d4akv55xz91f3bx"; depends=[dplyr readr readxl rsdmx sjmisc stringr tidyr]; };
+  readbitmap = derive2 { name="readbitmap"; version="0.1.5"; sha256="14825906l326w59g6apy00j55jg3h5kx2r6s031f4gdkbrc7szbk"; depends=[bmp jpeg png tiff]; };
   readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
   readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; };
   readobj = derive2 { name="readobj"; version="0.3"; sha256="0hwxfk27azay8hjz702b10cg395is06wnypqdw4788gm25d0i041"; depends=[Rcpp]; };
   readr = derive2 { name="readr"; version="1.1.1"; sha256="1cvw5wdcqk88cp5fyv678mnmp66l3whcd2yh33p2qvx0168bja8s"; depends=[BH hms R6 Rcpp tibble]; };
-  readroper = derive2 { name="readroper"; version="0.9.0"; sha256="1ikw114gc71lg3snawz7bfpd2mk2m1181183sz0lsc5sgl67bb17"; depends=[readr]; };
-  readstata13 = derive2 { name="readstata13"; version="0.9.0"; sha256="06qx40v4n217wi379d08w7kc9wlbxlyz9jqcsc85099vgab7l993"; depends=[Rcpp]; };
-  readtext = derive2 { name="readtext"; version="0.50"; sha256="1il7zfm092vvns8manz8lkj34q1w4gw931agkpk83cvf1618l5nl"; depends=[antiword data_table httr jsonlite pdftools readODS readxl streamR stringi tibble XML]; };
-  readxl = derive2 { name="readxl"; version="1.0.0"; sha256="1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"; depends=[cellranger Rcpp tibble]; };
+  readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; };
+  readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; };
+  readtext = derive2 { name="readtext"; version="0.71"; sha256="1blcsk1d78q0s1bijsrzrfrvhgbsq3qi1r9w3i51h1r9g3v9p87f"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi tibble xml2]; };
+  readxl = derive2 { name="readxl"; version="1.1.0"; sha256="05ii8knrg4jji6h7bv6bfpn279b6x52yrskdx5rv7b0hcpy22gdn"; depends=[cellranger Rcpp tibble]; };
   realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.10.1"; sha256="1ccdcmbcnlm0i3r6h09v85wdq4c8gz9dvvbfd2a5zx3ikwfm4wri"; depends=[mvtnorm]; };
+  rebmix = derive2 { name="rebmix"; version="2.10.2"; sha256="1m6h85kxp7lirx0pqhlibkd6f2wvgyhbmndrw308imkmzyqhgjz3"; depends=[mvtnorm]; };
   rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
   rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; };
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
@@ -10245,45 +10397,45 @@ in with self; {
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
-  recipes = derive2 { name="recipes"; version="0.1.2"; sha256="1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyselect timeDate]; };
+  recipes = derive2 { name="recipes"; version="0.1.3"; sha256="1vqh3pxs4n1azhnd1lzg91vasya6g323kllhbrw177j7kdxqyimy"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix pls purrr RcppRoll rlang tibble tidyr tidyselect timeDate]; };
+  reclin = derive2 { name="reclin"; version="0.1.0"; sha256="1r88rk1yb19lhd1y69h016s26390cg5gnmxjjh143lynm3pbh0sv"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-  recmap = derive2 { name="recmap"; version="0.5.31"; sha256="1kgmqmpphz4p2zidl0l24nia49g8211dyk66wl09azay4vxm46nj"; depends=[GA Rcpp sp]; };
+  recmap = derive2 { name="recmap"; version="0.5.33"; sha256="0znmsd7s25i2ildb4ysan10ih8s37rb8f794b6kp6cvy3zm81cbp"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
   recombinator = derive2 { name="recombinator"; version="1.0.0"; sha256="0amcpicsk270l9h7qgv764wp09phsffdpi4adcxrsrwiwm274ibw"; depends=[crayon]; };
-  recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; };
+  recommenderlab = derive2 { name="recommenderlab"; version="0.2-3"; sha256="0lgfcwxy97cvi893k1dia3nng3yvclnmv95fszzmkcrf4qi9yy7q"; depends=[arules irlba Matrix proxy registry]; };
   recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
   reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; };
   recosystem = derive2 { name="recosystem"; version="0.4.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; };
   recurse = derive2 { name="recurse"; version="1.1.0"; sha256="1zgzzhbvdzqgmgzj43yvpyc7ahbkn96l5wyr1iqpnn3ha78fy0p3"; depends=[Rcpp]; };
-  red = derive2 { name="red"; version="1.3.3"; sha256="0f4lriwlsq65z0sqjv4csrkbcjjvpybqf68rgx92ypkdjf57ixrs"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
+  red = derive2 { name="red"; version="1.4.0"; sha256="1z8ja8qbwgpbmy4ira9q6x482nw5rm4bksm82y0vc4gwpdxls5z3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
   redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; };
   reda = derive2 { name="reda"; version="0.4.1"; sha256="0aq6c2h694kdmjis12g4nxq5hdlzsi42nbnpzq7wic305l5r7nxl"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; };
-  redcapAPI = derive2 { name="redcapAPI"; version="2.0"; sha256="1n4kwmd0kgmnx2zcgvrz2dlkxmv6wflyj4pll00qvpb1njgnq1xv"; depends=[checkmate chron DBI httr labelVector lubridate stringr tidyr]; };
+  redcapAPI = derive2 { name="redcapAPI"; version="2.1"; sha256="1xdhjr970cg7sr014rviznwg27d2rahc9nfj44b3fghv8jzfc272"; depends=[checkmate chron DBI httr labelVector lubridate stringr tidyr]; };
   reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; };
   redist = derive2 { name="redist"; version="1.3-1"; sha256="0rivfi3jpjvhd36rkhlazx4vr7wsig9lf3im1masjmzd4s00zrd8"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
   redland = derive2 { name="redland"; version="1.0.17-9"; sha256="01jx6r7zznb6cpi2bx36fpsgig3bkc1nv9afz5s2nfqisxiq48w5"; depends=[roxygen2]; };
-  redlistr = derive2 { name="redlistr"; version="1.0.0"; sha256="0v2j8fkq8p2g071fkimlhn0ydba1h70rs48p2sy2hsbicj9qsd4z"; depends=[plyr raster rgdal rgeos sp]; };
-  redux = derive2 { name="redux"; version="1.0.0"; sha256="0p2hn7pphsfl6lyh1l8a8pp4frgfrfv2fxgkisyam331i7ns3r4h"; depends=[R6]; };
-  ref = derive2 { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
+  redlistr = derive2 { name="redlistr"; version="1.0.1"; sha256="07zg0yzrcamaag5xcn33mh8i099r2gyz5p47f38lsg33j7am0m8n"; depends=[plyr raster rgeos sp]; };
+  redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; };
   refGenome = derive2 { name="refGenome"; version="1.7.3"; sha256="15p0ra2p1pwhy5ixbhsz1g79c5sc2aap4i4c8kil0m2syg9y45sn"; depends=[DBI doBy RSQLite]; };
   referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
   refimpact = derive2 { name="refimpact"; version="1.0.0"; sha256="0qifqhar2pv81npsxl2pj713vgldyap7y79fq20jpk7qigzf9573"; depends=[checkmate curl httr jsonlite tibble xml2]; };
-  refinr = derive2 { name="refinr"; version="0.2.0"; sha256="0dwmqq0wigbzk7vv0ddd066pmwf1sd7rid4nhmsxajv21aghqc3i"; depends=[Rcpp stringdist]; };
+  refinr = derive2 { name="refinr"; version="0.3.1"; sha256="0q76sr050pg3ahwzcxj08mjig0k2jq8yh7nv6d914pwg3dhq05sn"; depends=[Rcpp stringdist stringi]; };
   refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; };
   refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; };
-  refund = derive2 { name="refund"; version="0.1-16"; sha256="0npq12bf3qmcbgwdxilwvzvf5x2m3qrxljlsx1sz9xczms2dz7kg"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
+  refuge = derive2 { name="refuge"; version="0.1.1"; sha256="1l9zbhx93f3ib978hlfvkczpy7c88g7ymwiq8grkycfzz52bfz0b"; depends=[dplyr httr jsonlite tibble]; };
+  refund = derive2 { name="refund"; version="0.1-17"; sha256="1lz90y3zim0vl2gxiy4zw0qhkvg7i0p64jqabblnlx13f3lzn944"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
   refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; };
   refund_wave = derive2 { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
   regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; };
   regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; };
   regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; };
   regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; };
-  regexr = derive2 { name="regexr"; version="1.1.0"; sha256="1gjv4wl4gjsh5rr0kz057x9j4dhikrm3zzlmxlhd1f9srjdmcdzy"; depends=[]; };
   reghelper = derive2 { name="reghelper"; version="0.3.3"; sha256="0lsdsxi3nawqdzs7k1xma95mmywl86k517cihiv8q2s4maihsja3"; depends=[ggplot2 lme4 nlme]; };
   registry = derive2 { name="registry"; version="0.5"; sha256="1yqfl1g6vsl28zn8brzc39659k8lqsmfms7900j7p64ilydyb2sx"; depends=[]; };
   reglogit = derive2 { name="reglogit"; version="1.2-5"; sha256="123l9n3m2v16skhj0rf77swlhy0ii6ridz13pp68hrxb72sr243c"; depends=[boot Matrix mvtnorm]; };
-  regnet = derive2 { name="regnet"; version="0.2.0"; sha256="1c7l2wmb5143ly53griy87c40xr8shxfk54kvf36grjxs7grl7pd"; depends=[glmnet Rcpp RcppArmadillo]; };
+  regnet = derive2 { name="regnet"; version="0.3.0"; sha256="1jqy3zkxn3jms9fm950h1bvhvassbfa5yrl7222z3wa0w66kxpp0"; depends=[glmnet Rcpp RcppArmadillo]; };
   regplot = derive2 { name="regplot"; version="0.1"; sha256="1jw93pplg6qdrfv9jhnifkhclxzrhg84zs8gkfl0nb40jxb6pc34"; depends=[beanplot sm survival vioplot]; };
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
   regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; };
@@ -10305,8 +10457,7 @@ in with self; {
   relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; };
   relaimpo = derive2 { name="relaimpo"; version="2.2-3"; sha256="0pbffalyhmfigyynkl6il60dyyf2aw1i71sncwrqcp18qgx4bxq9"; depends=[boot corpcor MASS mitools survey]; };
   relatable = derive2 { name="relatable"; version="1.0.0"; sha256="0147gin6dn76gg7gassar64f0w2gny1sh0k60v7914qhb4sj4s7i"; depends=[compare]; };
-  relations = derive2 { name="relations"; version="0.6-7"; sha256="1c16sb4v5n44nichwizilqs491rddn8kpf8qrqw54khj5zzg6w52"; depends=[cluster sets slam]; };
-  relax = derive2 { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
+  relations = derive2 { name="relations"; version="0.6-8"; sha256="0zld95ak07g3gqgjq80p18sww2ib5xg45idrvhxjvn19wddy87vz"; depends=[cluster sets slam]; };
   relaxnet = derive2 { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
   relaxo = derive2 { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
   reldist = derive2 { name="reldist"; version="1.6-6"; sha256="09vips7spcz0fahrpy0bl15hk43zgnq74h189hmygyi41l95aywa"; depends=[Hmisc mgcv]; };
@@ -10323,28 +10474,29 @@ in with self; {
   remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; };
   remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; };
   remotes = derive2 { name="remotes"; version="1.1.1"; sha256="07sxlwd09jzlfn7xakw9hwkr9k970lw2mnl0l3rpb5w71968km98"; depends=[]; };
+  renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; };
   rentrez = derive2 { name="rentrez"; version="1.2.1"; sha256="115ffrmsg755ynfwywql7xkcnlvv8ch4nlr1ab11i5923fz6vkvl"; depends=[httr jsonlite XML]; };
   repeated = derive2 { name="repeated"; version="1.1.0"; sha256="0cdyzhhv89186q5nwablcjbqvm7ncq2w5d09iidbajrac9wd1y60"; depends=[rmutil]; };
   repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; };
   repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; };
   replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; };
-  replyr = derive2 { name="replyr"; version="0.9.4"; sha256="1f8y2ywv7wf15g76949934r2qq2bp75ayfvrcb654q9pf2h5w39v"; depends=[DBI dplyr wrapr]; };
+  replyr = derive2 { name="replyr"; version="0.9.6"; sha256="1ffx8ziiiqpixabypk4lwnzvnrrylfl40rrjq4c3ys83gnbjm5n2"; depends=[DBI dplyr rlang wrapr]; };
   repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; };
-  repo = derive2 { name="repo"; version="2.1.2"; sha256="14a7lw1rvn7n7caz3p3y69n9wqw48qsxsjs5kwvpbwsmap7bjj7l"; depends=[digest]; };
+  repo = derive2 { name="repo"; version="2.1.3"; sha256="1g72zvj2mg8cxfy1w3d46lkk4hayad64ns5w1y43731whzraxk95"; depends=[digest]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
   reportROC = derive2 { name="reportROC"; version="3.0"; sha256="0jq3y1mia7nsnab14axyrvafw2b64g2zq25n42zplvm4pyfh1czr"; depends=[pROC]; };
-  reportReg = derive2 { name="reportReg"; version="0.1.0"; sha256="1xnrc7c73d5gwz6381z2nikg7jy1sygm6iw6raah8yrdzv5d816d"; depends=[]; };
+  reportReg = derive2 { name="reportReg"; version="0.2.0"; sha256="063z2szsainld9yb0hmpw23ij4d52qs6zjvdfdzj9h48qd50h38d"; depends=[nlme]; };
   reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
   reportr = derive2 { name="reportr"; version="1.2.2"; sha256="1fl4hy4ck4aapy152vn9gjd7w5vgvh2gz2ky6p0wwahah7m9b255"; depends=[ore]; };
   reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
-  repr = derive2 { name="repr"; version="0.13"; sha256="0k5796r5z9yr8s1hlx30x4cy1ix4fc85m0lwqf9zdapcvw0iqgld"; depends=[base64enc htmltools]; };
+  repr = derive2 { name="repr"; version="0.15.0"; sha256="0myg8d9idpp0gbi7nmcrjq3fa0zy4v73hkg6g5zlpw5vhsmvi8h0"; depends=[base64enc htmltools]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; };
-  reprex = derive2 { name="reprex"; version="0.1.2"; sha256="105d9vsmqfilgpw8psfb2wyiz1hvcycvh4cqhb3ab37lm3rcavvs"; depends=[callr knitr rmarkdown whisker]; };
+  reprex = derive2 { name="reprex"; version="0.2.0"; sha256="1l44pxjiz3g0jkk3v6rg5jps3llihfiah0qyv40s0bxvxa6gm8v9"; depends=[callr clipr rlang rmarkdown whisker withr]; };
   reproducer = derive2 { name="reproducer"; version="0.1.9"; sha256="092gz58sanpawgg0jk1634x9ki0jw460csbb6cywp0ndghswfgwh"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; };
-  reproducible = derive2 { name="reproducible"; version="0.1.4"; sha256="1z14hpinlykj1y1xf2qhfdabyfvfywrkzbyfjv3vhw8lvvkwajlw"; depends=[archivist crayon data_table devtools digest fastdigest git2r magrittr memoise raster Rcpp RCurl sp versions]; };
+  reproducible = derive2 { name="reproducible"; version="0.2.0"; sha256="0qaf9sx270hv73vggkschfwqvg39bmjvnz8wywvia722l3bjkh34"; depends=[archivist crayon data_table devtools digest dplyr fastdigest fasterize gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl rgdal rgeos sf sp versions]; };
   repurrrsive = derive2 { name="repurrrsive"; version="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; };
   reqres = derive2 { name="reqres"; version="0.2.1"; sha256="056cjdx0nmf32vma2jkpbaznbaf76kc4jn0w6nv7blq33qlvx37z"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
@@ -10366,43 +10518,42 @@ in with self; {
   restriktor = derive2 { name="restriktor"; version="0.1-80.711"; sha256="10kbfr7gzah119xm4cnx7br9i9fcga38kymjajw7m2571f4jsji9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
   resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; };
   rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; };
-  reticulate = derive2 { name="reticulate"; version="1.6"; sha256="036jiwxfvxkkijpilpbzlndm4bg4nd8gx8gxx4dl4zj263gd398m"; depends=[jsonlite Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.8"; sha256="0zwb4ikf021nw7axdn7qlr6bq4xkph3anfy314idkspy1iil4nmr"; depends=[jsonlite Matrix Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
   reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
   revdbayes = derive2 { name="revdbayes"; version="1.3.2"; sha256="09xxy3yk2fwd0113dgsz0kd2k1k1ghjv9ay2n03b5cnxqaksa99s"; depends=[bayesplot Rcpp RcppArmadillo rust zoo]; };
-  revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; };
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
   revengc = derive2 { name="revengc"; version="1.0.0"; sha256="0ccbw61xqjf9y15ghhzx57q3l48xpw9pq2nb11nrqapp5w3f9vzy"; depends=[stringr]; };
   revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; };
   revtools = derive2 { name="revtools"; version="0.2.2"; sha256="0sn7k5vcp09vp6j1bf879jrig382ayhfnwp569z9dxgdh7s18v6n"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; };
-  rexpokit = derive2 { name="rexpokit"; version="0.26.2"; sha256="0jydx3rlsbdn74gx2is1x6gsb4b64wqbc5jw2sb4xflvvhxfci67"; depends=[Rcpp]; };
+  rexpokit = derive2 { name="rexpokit"; version="0.26.3"; sha256="0af9h7p4gx627iin3l8hbwhkf7yfdrr900a1rq8ib9p4ip7inxmd"; depends=[Rcpp]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; };
   rfUtilities = derive2 { name="rfUtilities"; version="2.1-3"; sha256="0vnhvdkqqqn894abznw97j07gwdvvmvk8vsf4aaxx9yzk44cnk5g"; depends=[cluster randomForest]; };
+  rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; };
   rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
   rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
-  rflann = derive2 { name="rflann"; version="1.3"; sha256="1y8m52vlrcl69srssd23zgg90yfhh9rryd16hk1dnqg713qhksgm"; depends=[Rcpp RcppArmadillo]; };
   rfm = derive2 { name="rfm"; version="0.1.0"; sha256="0bd71qk6vrd0jnnwdwlh30mn8v8dwwgmffrd71kbq83gbfp8ry3l"; depends=[assertthat dplyr forcats ggplot2 lubridate magrittr purrr RColorBrewer rlang shiny tidyr]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
   rfoaas = derive2 { name="rfoaas"; version="1.1.1"; sha256="1rglqmbhnasc3ciypms3qqgfaj19202cnqdimsi69lvig2rnkca5"; depends=[httr]; };
   rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; };
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
-  rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
-  rgbif = derive2 { name="rgbif"; version="0.9.9"; sha256="11gji0b1gzh3zpmaff7ly9pvv6jdig5d1277hrss8x4zj7r34iap"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; };
+  rgam = derive2 { name="rgam"; version="0.6.6"; sha256="0klf2prw5zj76az66c5hzv23yya1b45l61xdy1zbnggvwh62fqik"; depends=[Rcpp RcppArmadillo]; };
+  rgbif = derive2 { name="rgbif"; version="1.0.0"; sha256="1bjapaxp84rm8p7qp3w814b80h2s2m9zpnah85xyg27ba26jixnz"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.2-18"; sha256="0vyvbsz7260crfnqk61vcbk051d01lyl984yk140nwh9wj8svr1d"; depends=[sp]; };
-  rgdax = derive2 { name="rgdax"; version="0.5.0"; sha256="1s9vqjmnkd4jvq5v8w1wc44khgd1pjzr2hq356vm0jpcvgf0qscq"; depends=[digest httr jsonlite RCurl]; };
+  rgdal = derive2 { name="rgdal"; version="1.3-3"; sha256="06dvybwz6rgnqhkc05jgi1j9j0bc8hnwrsz5gs1p3xkbxk9fvr0z"; depends=[sp]; };
+  rgdax = derive2 { name="rgdax"; version="0.6.0"; sha256="0kls1v9i3fhiyfns41nqqyz4spf5449hc624vwdw86sgbc1w30w8"; depends=[digest httr jsonlite RCurl]; };
   rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; };
-  rgenoud = derive2 { name="rgenoud"; version="5.8-1.0"; sha256="12n34r0p00bmflxrmbj927jm0q19j5r9mjplz5mzb1v8praa7v4x"; depends=[]; };
+  rgenoud = derive2 { name="rgenoud"; version="5.8-2.0"; sha256="0ffjw8kqmi0zkbskyw3h38a8iapv7hdi9819x5w9a5gmdmm4yv0h"; depends=[]; };
   rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; };
-  rgeopat2 = derive2 { name="rgeopat2"; version="0.2.4"; sha256="1ngisbx9ws8zllkq2qa7zafl400wrvmj3rm812aja74d8rr2i7mw"; depends=[readr sf stringr]; };
-  rgeos = derive2 { name="rgeos"; version="0.3-26"; sha256="0czlwfqilzh1zj61axisg06d9dksdvvg5hgcs31ydaqkh45llllq"; depends=[sp]; };
+  rgeopat2 = derive2 { name="rgeopat2"; version="0.2.5"; sha256="1zdjnbdxj6yfmb5dl4ajlcklgh0iw17ji3arl0wf9j61pw45kk17"; depends=[readr sf stringr]; };
+  rgeos = derive2 { name="rgeos"; version="0.3-28"; sha256="1dfbphf5g4ggd109j7qh4cycxgslppnja8d4ibwajkfgd3f6iq0q"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; };
   rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
@@ -10429,6 +10580,7 @@ in with self; {
   riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; };
   rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; };
   riingo = derive2 { name="riingo"; version="0.1.0"; sha256="1lkg0xmy3mhx99ywbvkmnkj6i61r5x75g4fnnwj6vdyslvwf3s5x"; depends=[crayon glue httr jsonlite purrr rlang tibble]; };
+  rijkspalette = derive2 { name="rijkspalette"; version="1.0.0"; sha256="15yn4sp4p4gcm94clyrijp5mxiz2xcslsq2a8x5x2la1l91kf70i"; depends=[crayon curl imager jsonlite]; };
   rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; };
   rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
   ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; };
@@ -10442,8 +10594,8 @@ in with self; {
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
   riskyr = derive2 { name="riskyr"; version="0.1.0"; sha256="1s6yrij5d1vhvzc7nnajjnjmxnhrs0r1psppcvwb0qg3ff181y22"; depends=[diagram vcd]; };
   rite = derive2 { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; };
-  ritis = derive2 { name="ritis"; version="0.7.0"; sha256="0f2xhxz8aqq1bhz6pwcdlfpchlvrnpgyh926hzfyg0rhz11k4fmv"; depends=[crul data_table jsonlite solrium tibble]; };
-  riv = derive2 { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; };
+  ritis = derive2 { name="ritis"; version="0.7.2"; sha256="1bn7nfgg9f2y19fp747k96r9kmnrfsqib81a9rzbwv4b97ymg31s"; depends=[crul data_table jsonlite solrium tibble]; };
+  riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; };
   riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; };
   rivernet = derive2 { name="rivernet"; version="1.1"; sha256="1brdgm2fbdq4qw85va6isj7p9bva4sj3spgsx8nsqvc8vaa90y4p"; depends=[]; };
   riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; };
@@ -10453,7 +10605,8 @@ in with self; {
   rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; };
   rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; };
   rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
-  rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
+  rjmcmc = derive2 { name="rjmcmc"; version="0.4.1"; sha256="0ww94zdrxdyznpsfxy5fr65w1qjxxr5zignj4bw4291694vfazw1"; depends=[coda madness mvtnorm]; };
+  rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; };
   rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
   rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; };
   rkafka = derive2 { name="rkafka"; version="1.1"; sha256="0c0hszsmmd876jcfamjcfb7bxw7869zgy99j4i6ksb8za232nmmw"; depends=[rJava rkafkajars RUnit]; };
@@ -10461,25 +10614,25 @@ in with self; {
   rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
-  rlang = derive2 { name="rlang"; version="0.2.0"; sha256="0f87fhw5pj6s2zjdxnpnd7pwn78czdz71b0xhm5adqg1p38sfwj8"; depends=[]; };
-  rlas = derive2 { name="rlas"; version="1.2.1"; sha256="0mqs7vd4855hdjymvp6427vhs2ihaz37lx59984x39rc7sfw6nap"; depends=[data_table Rcpp uuid]; };
+  rlang = derive2 { name="rlang"; version="0.2.1"; sha256="0ghg66vyri8nck4p6kl1nh47qdppbmxvjiyms69nhvipphk4ifpj"; depends=[]; };
+  rlas = derive2 { name="rlas"; version="1.2.4"; sha256="12siq75a4dwyfypyrz8550wj6xjjwfs99kxaglx39c8wc0z64wmy"; depends=[data_table Rcpp uuid]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; };
-  rlfsm = derive2 { name="rlfsm"; version="0.1.0"; sha256="1ixffrn56s9hg56ygk8882kz4b77sfdd9xb5vnk8b10sl9yjh4r7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
+  rlfsm = derive2 { name="rlfsm"; version="0.2.0"; sha256="08fdllzk5q77fz6ii83vbmz8dnfwwr3ixs11ia2l1vrm1gdj9gf7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
   rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; };
   rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
   rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; };
-  rly = derive2 { name="rly"; version="1.5"; sha256="0rd4ksd6qv227zgdxmy9d77v1jyba0vk0svh5wc5b72z92j9cjzb"; depends=[futile_logger R6]; };
+  rly = derive2 { name="rly"; version="1.6.1"; sha256="13l1ya0f8mbpwainzs1rbl9zjhf3wxrcfkf0xnj9wybs34k9qzxj"; depends=[futile_logger R6]; };
   rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
   rmake = derive2 { name="rmake"; version="1.0.0"; sha256="1qvbyd68p37nsqrm77w18znsa6m629qzyd7sl8w98p654pqmjhdw"; depends=[assertthat pryr rmarkdown]; };
   rmapshaper = derive2 { name="rmapshaper"; version="0.4.0"; sha256="0a911f6q9czni6zpijp63rngnil7jkbcy9f7jz55jr225fgm6g6z"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
-  rmapzen = derive2 { name="rmapzen"; version="0.3.4"; sha256="1hpl2j347d5qahwzxlr66k2fl6fg09160jn6p3ycvhp0g7zaq5r4"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.9"; sha256="0wq6kbhrkv3fhcy4hg5yyv9gdvf8gr4nsjwdifs4ih8lnn0dmdyb"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr yaml]; };
+  rmapzen = derive2 { name="rmapzen"; version="0.3.5"; sha256="0n549y6j056cl7c7pdcn9pixhvs8vpwqg50m380pchbxhxnfjvbq"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="1.10"; sha256="0mh2f3k98w7pgz0ri34149s4kx5y0kfm27nwq64k0qwxd16hwd9r"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr tinytex yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.10"; sha256="0gyvb8vdv1n93xbz0xl5vhwhskas8cxj4zv8flz18jm6f0bgqlrr"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.11"; sha256="0pzkxhgn4qcynv0rqbisld7hkpmx8aarxwc165bpipw2z11krdqj"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
   rmda = derive2 { name="rmda"; version="1.5"; sha256="13119x23xi912s7wl2p2a24msbczgv75x37p2jsr5w0n4l2k01wi"; depends=[caret MASS pander reshape]; };
@@ -10489,16 +10642,15 @@ in with self; {
   rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; };
   rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
-  rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
   rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; };
-  rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; };
   rmpw = derive2 { name="rmpw"; version="0.0.3"; sha256="1iidiq0pz88wgh155hfy8mw0cwwwcl77zshcjrbw11zpx6p8qy94"; depends=[gtools MASS]; };
   rms = derive2 { name="rms"; version="5.1-2"; sha256="01wjxlqfz6l1bdsvxqq0lsbps0k86hx3ayb6fl2n2hxccvsfxkzi"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
   rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.2"; sha256="0by2d6l25lf5vidxbkcxghpxycffyldzzbxcw6h4rm86zmkkv1m0"; depends=[magrittr purrr readr tidyverse xts zoo]; };
   rmumps = derive2 { name="rmumps"; version="5.1.2-4"; sha256="1qdpvyxwb18dapa8xqj8kjjmrnrqixkn29qn6q4cnwdwi1zcbdx6"; depends=[Rcpp]; };
-  rmutil = derive2 { name="rmutil"; version="1.1.0"; sha256="0f30afqbzrsgbnfpniwhbw4b8hlzc5zyaixvn9giggzwczfnf29k"; depends=[]; };
+  rmutil = derive2 { name="rmutil"; version="1.1.1"; sha256="0yyzypkz6jjqvhafg6ipml8hrhr0w9l6j2vnmf0gdy90xj78mgag"; depends=[]; };
+  rmweather = derive2 { name="rmweather"; version="0.1.1"; sha256="0p9fdvkdyicbyngsg53vf56fbc3q7yxs2m7iisd1hpaz09gazqlm"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange testthat tibble viridis]; };
   rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
   rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
   rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; };
@@ -10507,21 +10659,22 @@ in with self; {
   rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; };
   rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
   rngWELL = derive2 { name="rngWELL"; version="0.10-5"; sha256="0b4ys525gksgqwqx9id4bdgyi9mwj6n3r87xdzf4fc9hp3cc16jb"; depends=[]; };
-  rngtools = derive2 { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
+  rngtools = derive2 { name="rngtools"; version="1.3.1"; sha256="097215qcfw6ybllpzmp1532r59h2srvch3aca4z4s6l2rf9w8gvn"; depends=[digest pkgmaker stringr]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
-  rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; };
+  rnn = derive2 { name="rnn"; version="0.8.1"; sha256="0g2c87x939x5gh1h6np0fbyrg5w2zk2ydw8r0yaq2zj3z5yc5mlc"; depends=[shiny sigmoid]; };
   rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
   rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
   rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; };
   rnrfa = derive2 { name="rnrfa"; version="1.4.0"; sha256="007j6a2hihw7h0vhv6aiz7iymzr3lkzmc1dy5f8b22z5n52k4pl3"; depends=[ggmap ggplot2 httr plyr rgdal rjson sp stringr xml2 xts]; };
-  roadoi = derive2 { name="roadoi"; version="0.4.1"; sha256="1g4x1gkcrq8pd5vdikhf16ghgd990hhb1m387r2smz21v993cfk8"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
-  roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; };
-  robCompositions = derive2 { name="robCompositions"; version="2.0.7"; sha256="1ym63s6rn02p42q4mwmxbnh713shs4sc2ayimi053yzix4cnwn7w"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM zCompositions]; };
+  roadoi = derive2 { name="roadoi"; version="0.5.1"; sha256="139i0nhvmkx66f1k3vg5b59m0b12zd6abq38ggx15vshzs5q1f5w"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
+  roahd = derive2 { name="roahd"; version="1.4"; sha256="1snbda40lxb0hyk87alljxclwv3lsjy8qm39ynq8299f1ra1l1lh"; depends=[dplyr magrittr robustbase scales]; };
+  robCompositions = derive2 { name="robCompositions"; version="2.0.8"; sha256="0i7pjp0ir0n7j5r75ha5avsrqniji1zg7jb93nj9ji3qy286yyxw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM zCompositions]; };
+  robcbi = derive2 { name="robcbi"; version="1.1-2"; sha256="1n8whpnpsm9imiz8l1jxq5x597ydzb2b54jkvrl05hmwh79p97in"; depends=[robeth]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
-  robeth = derive2 { name="robeth"; version="2.7-1"; sha256="06qkrjvg4yps4h6xdb81svx52vlw389z1j4brpv0w9h40ljpxbff"; depends=[]; };
+  robeth = derive2 { name="robeth"; version="2.7-2"; sha256="049j24hxg7jy80xz615lj7l2mqiybm9zkmwznqpbzrz10s38dj3y"; depends=[]; };
   robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
-  robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
-  robis = derive2 { name="robis"; version="1.0.0"; sha256="02spxy33vh675dvhx2v6f06hxzcwfrsmkzb6yk5h30xp21blqv4g"; depends=[dplyr httr jsonlite leaflet]; };
+  robfilter = derive2 { name="robfilter"; version="4.1.1"; sha256="1fxqva2khk16sj5ka5zdpaknh2w9n925ys0i4v7ahqvzhnxg6l3b"; depends=[lattice MASS robustbase]; };
+  robis = derive2 { name="robis"; version="1.0.1"; sha256="11j86nyslh52fxvl6m2vay638n5gqw4akd9d1mkqnpvrvxhm41l5"; depends=[dplyr httr jsonlite leaflet]; };
   robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; };
   robotstxt = derive2 { name="robotstxt"; version="0.6.0"; sha256="1xia7xivqnqj0xis6i4qzm3v414ga1m7lmv1piz1b431faq9s1ai"; depends=[future httr magrittr spiderbar stringr]; };
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
@@ -10533,10 +10686,10 @@ in with self; {
   robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
   robustX = derive2 { name="robustX"; version="1.2-2"; sha256="0pgfq78qd8s40ciqval01bwajy6zfdjms1lbh0b5g0rww6920s6f"; depends=[robustbase]; };
   robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; };
-  robustbase = derive2 { name="robustbase"; version="0.92-8"; sha256="080ynchq8pvhnmbivj4fp74n0x9lyr9923sg0s9gq5irgm68kgxw"; depends=[DEoptimR]; };
+  robustbase = derive2 { name="robustbase"; version="0.93-1"; sha256="10fsc50vqngi2a26fgi99bacq4rb05jg8kqw38r4n4khssw06rk4"; depends=[DEoptimR]; };
   robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
   robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
-  robustlmm = derive2 { name="robustlmm"; version="2.1-4"; sha256="0qli04ylw25vc35k1maaddkn7rh8y5p7ggla1qvi8b1sglg43xhh"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; };
+  robustlmm = derive2 { name="robustlmm"; version="2.2-1"; sha256="0xh77jrhjybrbcfzvfzywj8nanqyfgn93rhd1bixw4snz7l1n97x"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; };
   robustloggamma = derive2 { name="robustloggamma"; version="1.0-2"; sha256="1cifyasrik010zs8jsz0kzzmwm3qmc0y7h2dahg2ibpwxfcqfcpq"; depends=[numDeriv RobustAFT robustbase survival]; };
   robustrank = derive2 { name="robustrank"; version="2017.12-2"; sha256="0lcjn77lsdfbcby89hfcz2h049v2fndw7rankdcdgnl6lw2bdpvr"; depends=[kyotil]; };
   robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; };
@@ -10546,14 +10699,15 @@ in with self; {
   rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; };
   rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
   roccv = derive2 { name="roccv"; version="1.1"; sha256="13pwrc31w279l7j58wdz24p8j9jdh53rsavj1mymj92jpm52nfzl"; depends=[glmnet pROC]; };
-  rockchalk = derive2 { name="rockchalk"; version="1.8.110"; sha256="1991g4vslbanz6swvj76bwfc7xpnrcwqwr59xn8nzf7kkb721w6a"; depends=[car lme4 MASS]; };
+  rockchalk = derive2 { name="rockchalk"; version="1.8.111"; sha256="0x82mmsvy41cw1chbrxwjj35fwimb3iv9lrlhxsslgix62xlskvx"; depends=[car lme4 MASS]; };
   rococo = derive2 { name="rococo"; version="1.1.5"; sha256="062pj62haf0xw74p6c1dd20ipcxka8nn0mxsq490d22kqwm4vf5a"; depends=[Rcpp]; };
   rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
   rodeo = derive2 { name="rodeo"; version="0.7.4"; sha256="16yzj12m9wvcrqxc33rpbyzbq019swi5jxnbda9crfwjdvafaa0d"; depends=[deSolve R6]; };
   rodham = derive2 { name="rodham"; version="0.1.1"; sha256="15mrlx7azvwkwjgfplvs5fhk2nwlg9pay2l99q327p8hx87jr8ra"; depends=[jsonlite plyr splitstackshape stringr tibble]; };
   roll = derive2 { name="roll"; version="1.0.7"; sha256="059n1pl7692grzv4pmnj8s6cs2zi98lr1s5zi9pxg5vpw7r6h2v9"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  rollRegres = derive2 { name="rollRegres"; version="0.1.0"; sha256="09vb06j8yyxw7k7dmni8s90wnvdk5l5x09gr76cvp4rjkx8jjlpj"; depends=[checkmate Rcpp RcppArmadillo]; };
   rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; };
-  rollmatch = derive2 { name="rollmatch"; version="1.0.0"; sha256="1v9kdfvci26vdyis6b9qb43w8mixx94hybvfmx3f55nbwng4dy00"; depends=[dplyr magrittr]; };
+  rollmatch = derive2 { name="rollmatch"; version="1.0.1"; sha256="1bxd31s30jji97m93z4w4hdxdrfyp947dyzhjwmm13zc59mpfnvs"; depends=[dplyr magrittr]; };
   rollply = derive2 { name="rollply"; version="0.5.0"; sha256="01rh4x9352ixdhrqdysapqx5ynksknyf8n230b340pxwaz2d7xhc"; depends=[plyr Rcpp stringr]; };
   rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; };
   rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; };
@@ -10563,7 +10717,8 @@ in with self; {
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
   ropenaq = derive2 { name="ropenaq"; version="0.2.6"; sha256="065p4c8l4bqxy00clbjhad8hqw4gg2h2c00b06n2fa5n70z0akgq"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
-  ropercenter = derive2 { name="ropercenter"; version="0.1.0"; sha256="0rp2dwdkl3qlwm8di0q184ppr77zs6i7njyr305pnxmbad119w9d"; depends=[dplyr foreign haven httr rvest stringr xml2]; };
+  ropercenter = derive2 { name="ropercenter"; version="0.2.0"; sha256="1ghn666jhwmkxwrr8pc398nhzvg4y4097pa19m4b08d9mkg9iqlj"; depends=[dplyr foreign haven httr readr rvest stringr tibble tidyr xml2]; };
+  roprov = derive2 { name="roprov"; version="0.1.0"; sha256="0g9jg9j91v705kygs4yx1y6s0cx5krr6kbg3jlgcsda9ldjmj7fy"; depends=[CodeDepends fastdigest igraph]; };
   rorcid = derive2 { name="rorcid"; version="0.4.0"; sha256="1diz14b5jzs9i4khyykq58cbgz87qraivv9lhq5nrrrfi2gryl9r"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; };
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.9.0"; sha256="0pnrfc0dcbh5r3qwfwyb0q063bzwpw4ga60965y5qyxz64cyx74r"; depends=[httr jsonlite]; };
@@ -10578,9 +10733,9 @@ in with self; {
   rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; };
   roxygen2 = derive2 { name="roxygen2"; version="6.0.1"; sha256="0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj"; depends=[brew commonmark desc digest R6 Rcpp stringi stringr xml2]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
-  rpanel = derive2 { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
+  rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; };
   rpart = derive2 { name="rpart"; version="4.1-13"; sha256="0k29qx3k3pj5sgrpg0p47yd8i811rmdakaw57bigpq1449asc4cf"; depends=[]; };
-  rpart_plot = derive2 { name="rpart.plot"; version="2.1.2"; sha256="1hn8s0fawwsr6j4m7wf38q7a608bjf9v1w706p49a08189baqdxz"; depends=[rpart]; };
+  rpart_plot = derive2 { name="rpart.plot"; version="2.2.0"; sha256="1sh45ixd22nl7lxry82h74k4d5y2yvrs9g2ydqqv5jwkk7hmki11"; depends=[rpart]; };
   rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
   rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
@@ -10588,24 +10743,24 @@ in with self; {
   rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
   rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; };
   rpdo = derive2 { name="rpdo"; version="0.2.3"; sha256="150kd9pvfr7msrh55vsqcj8lv994izlvhxf4g5n1qbzdcaqsdjzp"; depends=[checkr]; };
-  rpf = derive2 { name="rpf"; version="0.56.1"; sha256="1332d5fzpsi988k1x57hyydjwrx3gxr3l7hgf946jrd8y1c2nj5d"; depends=[mvtnorm RcppEigen]; };
+  rpf = derive2 { name="rpf"; version="0.59"; sha256="06gibjngl27mmvmni6ncz5qa4nlbxlna57f13607a9r739146378"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; };
   rpgm = derive2 { name="rpgm"; version="1.1.2"; sha256="0pbja877gb3mn7m78lfdl217dm7qsrblq6gwrjh5wbv1nd532hvz"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; };
-  rphylotastic = derive2 { name="rphylotastic"; version="0.0.4"; sha256="1as3cndbrnby70qbi43q8v5gpyr8fpms30jwsarizwwbdrxbjgw9"; depends=[ape httr jsonlite phylobase rentrez]; };
   rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; };
   rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; };
   rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; };
   rplos = derive2 { name="rplos"; version="0.8.0"; sha256="0l38zllzklsy6q2l2r0v2x8wcsldnxjhilcsq5ykl1k35gbva19y"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; };
   rplotengine = derive2 { name="rplotengine"; version="1.0-6"; sha256="1x9lf5h6cmjyi5xyvmk2ii2dwkwmjqbg0m1fhfabay0flqc7qdm0"; depends=[xtable]; };
-  rpms = derive2 { name="rpms"; version="0.2.1"; sha256="14fljzxpxbsx5x06aq39rdq8h25n0z6bq7g7ncgjp1lgk9ml6gdq"; depends=[Rcpp RcppArmadillo]; };
+  rpms = derive2 { name="rpms"; version="0.3.0"; sha256="0kdxjn2aij83ax0g1ipdb7qrvpqn67vhs3z54ihj1kbx4i8pzs9g"; depends=[Rcpp RcppArmadillo]; };
   rpn = derive2 { name="rpn"; version="1.0"; sha256="0wk8y4yk6wqzbq5bqv6zncfp9az5vn8xgwh426pk3bxm3v4xi16i"; depends=[BBmisc checkmate]; };
   rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; };
   rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; };
   rpostgis = derive2 { name="rpostgis"; version="1.4.0"; sha256="0rgi7ax2n2fln12501zshwaz23nns9qk4vy1ylnaqb4bg0x30gn4"; depends=[DBI raster rgeos RPostgreSQL sp]; };
   rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; };
-  rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; };
-  rprev = derive2 { name="rprev"; version="0.2.4"; sha256="1krrplgi2qfcm5kdz2am8fq8kjx67gjwxyd4ylf406r18xbvjd1d"; depends=[doParallel dplyr foreach ggplot2 lazyeval magrittr rms survival tidyr]; };
+  rppo = derive2 { name="rppo"; version="1.0"; sha256="0agqys52l8bb3mc3bpawym12phl5r1ymalfvgrq5w6n78lpzcxls"; depends=[httr jsonlite plyr readr]; };
+  rpql = derive2 { name="rpql"; version="0.6"; sha256="0kbxhh0pacgh5d490665a5k00qh93rv5k7v3g73vrgn6lc085a54"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
+  rprev = derive2 { name="rprev"; version="1.0.0"; sha256="0v8ibflqbc45qss2jnnalqhq788cp6gpx1lylcwj2h9k4i8qgi4c"; depends=[data_table doParallel dplyr foreach ggplot2 lazyeval lubridate magrittr survival tidyr]; };
   rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
   rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; };
   rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; };
@@ -10615,44 +10770,46 @@ in with self; {
   rptR = derive2 { name="rptR"; version="0.9.21"; sha256="0wqh9d372s2222qm5w0wx77l2sj7zvdnl7zvxcn5wfs3cz84fj15"; depends=[lme4 pbapply]; };
   rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; };
   rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; };
-  rquery = derive2 { name="rquery"; version="0.4.2"; sha256="018m46iqrbs4h20clhqhxydd9y43swhdq1mmb00hvzlfbwbxi05r"; depends=[DBI wrapr]; };
+  rqdatatable = derive2 { name="rqdatatable"; version="0.1.1"; sha256="14m0sfl46kkzwv4pmgl8wc4sxb9b14lbx3m3c7r6d3iv6jjmaaj2"; depends=[data_table rquery wrapr]; };
+  rquery = derive2 { name="rquery"; version="0.5.0"; sha256="1ssf7mxj8dy78v9a9bmaxppp2cygpcqndir40vavl6fm9v34s0nq"; depends=[wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
-  rrcov = derive2 { name="rrcov"; version="1.4-3"; sha256="0kagqggi634mvrhd67ia7mpjrj5v6w2wq0z3kyppg5xkvzh335nq"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
+  rrcov = derive2 { name="rrcov"; version="1.4-4"; sha256="0wn5h8vi0zyk5ah898m37ysz4kiih6y792nb9zdvhvd8r07f0sc5"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
   rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; };
   rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; };
   rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; };
+  rrd = derive2 { name="rrd"; version="0.2.1"; sha256="1n4590h3xzja7j8fzay4b8rp98wnilg2znnkbw4ffk9fdac2wr5l"; depends=[assertthat tibble]; };
   rrecsys = derive2 { name="rrecsys"; version="0.9.7.3"; sha256="034p7ncnzlkniicl5nd58m9wjy7mc00f027zpg5das226svhfywf"; depends=[ggplot2 knitr MASS Rcpp registry]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
   rredlist = derive2 { name="rredlist"; version="0.4.0"; sha256="0j2hab26zs9dyg9fggza7yffbvwvnmrk5frbfs2ys8h3hg2x6ncy"; depends=[crul jsonlite]; };
   rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; };
   rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; };
-  rrepast = derive2 { name="rrepast"; version="0.6.0"; sha256="1d6nk6437c4bxbyvpzdlgd1kxh651979m0k7aadi9fl77i5k2x3w"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
-  rres = derive2 { name="rres"; version="1.0"; sha256="16blkbmma5wj5zigl9yr62kbffyk2amvq45gvgpdj726qdskymcx"; depends=[kernlab Rcpp]; };
+  rrepast = derive2 { name="rrepast"; version="0.7.0"; sha256="1s596sk993aam5rsb4as2y3n5wcgjlnb25b29l59z0xks1v04mnc"; depends=[digest doParallel foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
+  rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; };
   rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; };
   rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
   rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; };
   rrpack = derive2 { name="rrpack"; version="0.1-7"; sha256="0svrw2ik59hjyfb0kag4nv8ilcaz7irmkp7ndbxxn0jg7dacb411"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; };
   rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; };
-  rsMove = derive2 { name="rsMove"; version="0.2.3"; sha256="0s256ifiq76rakabw2jn5jslsdd0r55cy7hm55214pgjfq8fiqpi"; depends=[caret gdalUtils ggplot2 raster RCurl rgdal sp]; };
+  rsMove = derive2 { name="rsMove"; version="0.2.4"; sha256="01iag63vskm68zjgq5qmgiimhmxcmp0mq6qarzsr3jlgmxix6kqs"; depends=[caret gdalUtils ggplot2 igraph lattice lubridate pryr randomForest raster RCurl rgdal sp spatialEco]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
   rsample = derive2 { name="rsample"; version="0.0.2"; sha256="10lmpy4ca045j2fxbz5xzl1w9242dkp6sc8hhrk0fxs0dkfb7amf"; depends=[broom dplyr purrr recipes rlang tibble tidyr]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="2.5.3"; sha256="0a6l7inx6shyxma0a0kf2jh8402n7xavpday4k7lr316v62lyq29"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="3.0.2"; sha256="0gbi2q63pbl8izyq8wjrjn9d0746ylak8fp7zsjzw56gjpak79q3"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
   rsconnect = derive2 { name="rsconnect"; version="0.8.8"; sha256="019phwamg2irb0ak9y0sn25ihi0a9sfdpa02dz9x0bhpcg55x0li"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
-  rscopus = derive2 { name="rscopus"; version="0.5.3"; sha256="1d6265ffmhd6ajlp607y5jy77nqgcrdym6w1j8vnil0705z3swzb"; depends=[httr plyr tidyr]; };
+  rscopus = derive2 { name="rscopus"; version="0.5.11"; sha256="1h0lj68znfy1jc2b7qbxj0cq8y2blhwz2p82cfn321yhca0s818c"; depends=[dplyr httr plyr tidyr]; };
   rscorecard = derive2 { name="rscorecard"; version="0.7.1"; sha256="1j7v383gcb13bi6d1v59pkx6d9g4yichyyh5ads9w82qq6v31xnw"; depends=[dplyr httr jsonlite lazyeval magrittr]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-  rsdmx = derive2 { name="rsdmx"; version="0.5-11"; sha256="06sjkjl9y2fg2yz740a1z5zn4afnjfv1nsykszxsnwn7s23rxi31"; depends=[plyr RCurl XML]; };
+  rsdmx = derive2 { name="rsdmx"; version="0.5-12"; sha256="0qzbn3d6vkvn8qnjymmjbqgcffglnl5qm2zm4v6694xwcc1msvwx"; depends=[plyr RCurl XML]; };
   rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
   rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
   rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
-  rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; };
-  rsimsum = derive2 { name="rsimsum"; version="0.3.1"; sha256="0rg3flfh2wwa3xyjsb041k94jryx2yxf8kb0nnvy9wgybn3v1c01"; depends=[checkmate ggplot2]; };
+  rsimsum = derive2 { name="rsimsum"; version="0.3.3"; sha256="0h08klkdn84y32xlaafig1jj5ni79j4yx2pp3pg2qfmpimxcm44w"; depends=[checkmate ggplot2]; };
+  rsinaica = derive2 { name="rsinaica"; version="0.5.0"; sha256="12jzbay7vm1ziqdjx8i7wkb3f354q95qfayasr3prl16sz80kpp7"; depends=[dplyr httr jsonlite lubridate stringr]; };
   rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; };
   rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.9"; sha256="1rj2qdlv44hbv1ipv7hdpssn90ypp6bfc7nqdaf9dak0bd6khwni"; depends=[estimability]; };
@@ -10660,7 +10817,7 @@ in with self; {
   rsoi = derive2 { name="rsoi"; version="0.3.0"; sha256="0syl90akbbg50pyhsa4nyq2r4psi2n6qg48a4nxprgz412n8rjbv"; depends=[dplyr lubridate readr]; };
   rsolr = derive2 { name="rsolr"; version="0.0.8"; sha256="1swhg7hnkdphnw0d9jrzn18nk2v5a6ny7n652fh8d0k88a27xx4d"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
   rspa = derive2 { name="rspa"; version="0.2.1"; sha256="0m3h25jxfccdqy4gf3cls4wcdpw580yfmb3lvw4ndfva8lj2q6sy"; depends=[lintools validate]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.2.3"; sha256="1dskwni79hrskwmlvlbm4v9fy59bvzgcjqwsdqk31iz3xfaanj39"; depends=[h2o sparklyr]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.2.4"; sha256="0ykk8lvigi3hb5iz7rxsi3brf4ydg2kxmaks4vk0vrkanyifs7xp"; depends=[h2o sparklyr]; };
   rsq = derive2 { name="rsq"; version="1.0.1"; sha256="1c7604g48rcsbfk66xfwia1jaxlqsjiw19zx9pg51n8d6c0l17zb"; depends=[MASS]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
@@ -10669,77 +10826,82 @@ in with self; {
   rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; };
   rstantools = derive2 { name="rstantools"; version="1.5.0"; sha256="19rzcfiirw539hxs98j33gccwigdpwf3nj1w5jwwzank217wmgg4"; depends=[]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; };
-  rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
-  rstpm2 = derive2 { name="rstpm2"; version="1.4.1"; sha256="0pgy9a8llj0zzzc06afzd0w11mdbx3xvmjf0qpzvsid1zqdbcqxr"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
+  rstiefel = derive2 { name="rstiefel"; version="0.20"; sha256="1wrl7rc4nrnxjs26l9v36x3mpx33mjijk27nbzidwrhp9gppzz1i"; depends=[]; };
+  rstpm2 = derive2 { name="rstpm2"; version="1.4.2"; sha256="19cijqx1jblhgwzr0q1p7aaiajnrf5g9l4fw67p69nv4nljcypan"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
   rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; };
   rstudioapi = derive2 { name="rstudioapi"; version="0.7"; sha256="133s75q2hr6jg28m1wvs96qrbc9c4vw87migwhkjqb88xxvbqhd5"; depends=[]; };
   rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
-  rsunlight = derive2 { name="rsunlight"; version="0.4.2"; sha256="1m4ya960zjqxbjcjj42gjmdy40ac7m471fkfsd0r6w675qbiiw87"; depends=[httr jsonlite plyr stringr]; };
-  rsurface = derive2 { name="rsurface"; version="1.0.2"; sha256="0lmwk8gk9h9np5fp652zvlapfdwgifarmib23dnifn5d904ia2sl"; depends=[plotly rsm]; };
+  rsunlight = derive2 { name="rsunlight"; version="0.7.0"; sha256="0v2wrgq8fxvkf8sf4z4wi4bbvbskw5wzcplns9imwfmm3y2pabyi"; depends=[crul data_table jsonlite plyr stringr tibble]; };
+  rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; };
   rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; };
   rsvd = derive2 { name="rsvd"; version="0.9"; sha256="1d71y4r27gpwsaq195yys301va8wdc2bvwxjk6501f7ma2yhl7y9"; depends=[]; };
-  rsvg = derive2 { name="rsvg"; version="1.1"; sha256="17jfspbvlfp2cdw9s4m128rqw5kvb7i5h335569n3518spqmgi4f"; depends=[]; };
+  rsvg = derive2 { name="rsvg"; version="1.3"; sha256="11mccgf6hfskg45wqc114sx3qy2r494y6axdf73z6xwhs1wpm97g"; depends=[]; };
+  rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; };
   rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; };
   rtable = derive2 { name="rtable"; version="0.1.5"; sha256="1a9x0qcbp96wg86nbvx25yh5viwvf5sqb41z3cvr5i7br2ji8n5i"; depends=[knitr ReporteRs shiny tidyr xtable]; };
   rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
-  rtdists = derive2 { name="rtdists"; version="0.8-1"; sha256="0chhlnx3zppsxxwnq3h2aykdpm6zcg2nmrdgxfy14yw133fnbykf"; depends=[evd gsl msm Rcpp]; };
+  rtdists = derive2 { name="rtdists"; version="0.8-3"; sha256="1p8j50snlfc4rs7fvzd2ny1i47vy3d6xmik4rhyppvv4kr47nwhm"; depends=[evd gsl msm Rcpp]; };
   rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
   rtext = derive2 { name="rtext"; version="0.1.20"; sha256="0455rwfxmpgb4qb925ildqr4km4ndgqjxgvk90x2dhfivgmmn60k"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; };
-  rtf = derive2 { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; };
+  rtf = derive2 { name="rtf"; version="0.4-13"; sha256="1gwvw98lnym305z9awjaximrmkl4kkki59blbwqs2js42iqcx2m3"; depends=[R_methodsS3 R_oo]; };
   rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; };
   rticles = derive2 { name="rticles"; version="0.4.1"; sha256="1f2a60jmlsiga377ihhy8sm9amqn7fd91sd4vx682b97hfh3zn39"; depends=[knitr rmarkdown yaml]; };
   rtide = derive2 { name="rtide"; version="0.0.4"; sha256="0i3mf3818s62mmn315brv2axpwiiz646k5hv8z26z7s4ahxavrc0"; depends=[abind datacheckr lubridate magrittr plyr stringr tibble tidyr]; };
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
+  rtika = derive2 { name="rtika"; version="0.1.8"; sha256="1lkcrs3cdfcgy86vbvjfxqs2jxw4imz16s6c3pxhdl8r0byjdndk"; depends=[curl rappdirs sys]; };
   rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; };
   rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; };
   rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; };
   rtk = derive2 { name="rtk"; version="0.2.5.4"; sha256="1nh757l4ih5pmmh7b84ca1f5wpz9mcksdb0a4rvs2hhgap38ihg9"; depends=[Rcpp]; };
   rtkore = derive2 { name="rtkore"; version="1.5.1"; sha256="03vmgrsil5yrrs3ndgqvfcwv9plcawc8v2y2x9nwcashxg40djn6"; depends=[Rcpp]; };
   rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; };
+  rtrek = derive2 { name="rtrek"; version="0.1.0"; sha256="05dzqylvv8rgh0sxl2qa2zvxnmilwmxsa6f99mh6ygcf9pal8jzd"; depends=[dplyr jsonlite magrittr purrr]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
   rtrim = derive2 { name="rtrim"; version="2.0.4"; sha256="1xl3xai768idnfc30hp20cnpq3a07049p7vpkqpdrpla6a8zhvqk"; depends=[]; };
   rts = derive2 { name="rts"; version="1.0-45"; sha256="11gvgj5bqiacsf51sg4dj7jpsjgdj6j26vqc8by15325a4c804ml"; depends=[raster RCurl sp xts zoo]; };
   rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; };
-  rtweet = derive2 { name="rtweet"; version="0.6.0"; sha256="0bh483wfl4f8xscdyv3ys5hhdabc91dynlbqlxxv8mil7pgg3chg"; depends=[bit64 httr jsonlite magrittr openssl readr tibble]; };
+  rtsplot = derive2 { name="rtsplot"; version="0.1.0"; sha256="1iz7m1r46d1b84fbbkby42ry8plp226gh38krrdgzshfcf2a6856"; depends=[quantmod RColorBrewer TTR xts zoo]; };
+  rtweet = derive2 { name="rtweet"; version="0.6.7"; sha256="0blyggy559cginfavmwzli1ibjbh1lbipyyi4bs2h9mvx9iwkl2l"; depends=[httr jsonlite magrittr tibble]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
   rtypeform = derive2 { name="rtypeform"; version="0.3.3"; sha256="13nqlgi4wwby8ka014ggilnh2m4qr940zbsks27zfd7q56ng7sbq"; depends=[httr jsonlite purrr tibble]; };
   rubias = derive2 { name="rubias"; version="0.1.0"; sha256="0k8f1aaj3zpxqkhzjfl7iyyx7pjssp5lldajjsghw110j75qksh4"; depends=[dplyr ggplot2 gtools magrittr Rcpp readr rlang stringr tibble tidyr]; };
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
   rucrdtw = derive2 { name="rucrdtw"; version="0.1.3"; sha256="0wbh9zbgqf5bk1ix5qry18lhgdqk90pn5xnv401268gldjy4z777"; depends=[Rcpp]; };
   rugarch = derive2 { name="rugarch"; version="1.4-0"; sha256="0b0rq88v93945g7pr6xin7wfdm8zl2vw8hxwa2kfak4xnrrprsyy"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
-  ruler = derive2 { name="ruler"; version="0.1.2"; sha256="1d0vf505fyinq4k2lfcvsii9fxs2xygfj5hrcwd566arpd2wkg7m"; depends=[dplyr keyholder rlang tidyr]; };
+  ruler = derive2 { name="ruler"; version="0.1.3"; sha256="000hnnnz3zccpshpi725f67kbfr3hnpgr48zyz24pbynyz3d7vap"; depends=[dplyr keyholder rlang tidyr]; };
   runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
   runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; };
   rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
-  rusk = derive2 { name="rusk"; version="0.1"; sha256="05ci4f0k2b54sqf0h6j38h3kkq3r27klva0hfg968snr9bb6v0wv"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
-  rust = derive2 { name="rust"; version="1.3.4"; sha256="1jb970kskl2wdhqcjbxl8gh986abdy96jbipnsdi3656ic5dxivn"; depends=[Rcpp RcppArmadillo spatstat]; };
+  rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
+  rust = derive2 { name="rust"; version="1.3.5"; sha256="16jrf1nfn3wnkrbzp5bjkqi0q0vpy82ra6f0vs1pyk5hw5jhshg9"; depends=[Rcpp RcppArmadillo spatstat]; };
+  ruta = derive2 { name="ruta"; version="1.0.2"; sha256="18r6vcjlxarwdc2gi1d1r5lq763nnvsy7ccq77lbl3cswx5s7x1q"; depends=[keras purrr]; };
   ruv = derive2 { name="ruv"; version="0.9.7"; sha256="1ynxmax9sz74s8abmmizla6jas385mn5ij151mq35k0yv1xszzj5"; depends=[ggplot2 gridExtra scales]; };
-  rv = derive2 { name="rv"; version="2.3.2"; sha256="108s9q19h5ypxb9w4a8nk97js261izag1sf75g4xfqblwxxrbflc"; depends=[]; };
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
-  rvcheck = derive2 { name="rvcheck"; version="0.0.9"; sha256="14pa7fa7yyhmk0v5md7x5xr5jd4gjwjlvgbynnhq30fj56qffyvf"; depends=[]; };
+  rvalues = derive2 { name="rvalues"; version="0.6.3"; sha256="1bsdvwcijb75f27c8padjx8663as667axc4skwa6xgv5y423kbd0"; depends=[]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.1.0"; sha256="0b3vw1r4aglciwmjqm8dvlizydydwcgnpwkzib2g9k69a355iyi0"; depends=[]; };
   rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; };
   rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; };
-  rvg = derive2 { name="rvg"; version="0.1.8"; sha256="03hank94b5d1spig9jzrm5h2xbipi8skwqjg8sfwxwy5sjyrbaam"; depends=[gdtools officer Rcpp xml2]; };
+  rvg = derive2 { name="rvg"; version="0.1.9"; sha256="0r2amwygazq1sff8fl0k618fxs2d5pxp5ryz7kqyjkcnxfghgnxf"; depends=[gdtools officer Rcpp xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
-  rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.7.1.0"; sha256="1w3nwxpvmmkcvyymhz434xh6srjc87hj824bcjydmavx221ncf6p"; depends=[BH lattice Rcpp RcppEigen RcppThread]; };
+  rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.8.1.0"; sha256="0n92822pgspq17wy52zmvch2ag9fc577y64myzg5b7hz7fqd96mq"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread]; };
   rwalkr = derive2 { name="rwalkr"; version="0.3.3"; sha256="03kpv4hvlajm09cqrlihia62pcj1skakx28ci4mgbfgpjy6l4jsl"; depends=[dplyr httr tibble tidyr]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
-  rwc = derive2 { name="rwc"; version="1.1"; sha256="0gdpskj87wjnpas90i3iqn1qv6frrki2xqiyyakg3zpaviw1imag"; depends=[MASS Matrix mvtnorm raster]; };
+  rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
   rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
   rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
   rwty = derive2 { name="rwty"; version="1.0.1"; sha256="1w66jlcbn8javlr2l0qinah3cxxadpjzvbz088saysyg277ikfxm"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; };
-  rwunderground = derive2 { name="rwunderground"; version="0.1.7"; sha256="1mdqlijjximfxqd9bx4hnsayq9h3ss7fp3hr2vxx2qb60b0fjx67"; depends=[countrycode dplyr httr lubridate]; };
+  rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
   rxylib = derive2 { name="rxylib"; version="0.2.1"; sha256="0qfdd7z9as6igc82i8dbvjz03jk8scxz599jw8xm69y5qs5zf104"; depends=[BH Rcpp]; };
   ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
   rzmq = derive2 { name="rzmq"; version="0.9.3"; sha256="04rb54gr1wr0nczxnhk5jbk9ar65yn2vs8bsa41i1hfhzjhnsvxb"; depends=[]; };
-  s2 = derive2 { name="s2"; version="0.3-0"; sha256="16258mmp4rkfpqa6255s7fdd44why0vky2rxb52440fgpwic5zdq"; depends=[Rcpp]; };
-  s20x = derive2 { name="s20x"; version="3.1-26"; sha256="1p931r8y4c9fac8x29sxw33q1knfjf78saj348mxddaaqrf90v1n"; depends=[]; };
+  s2 = derive2 { name="s2"; version="0.4-0"; sha256="1mpivllq3r3kn7msb7qn9h8fr31jl5cvfg1pdq1wi69k4bznd8y0"; depends=[Rcpp]; };
+  s20x = derive2 { name="s20x"; version="3.1-27"; sha256="021f9l34svx42mnzi080rr44sxz9zjvcnxljakcag02r4hl52pcp"; depends=[]; };
   s2dverification = derive2 { name="s2dverification"; version="2.8.0"; sha256="13cjzxrjwahjhdw5q8lpbwgywgswqrcnj7rkff9kraan9lj83bkk"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
   s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; };
   sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; };
@@ -10747,31 +10909,32 @@ in with self; {
   sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; };
   sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; };
   sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
-  sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; };
+  sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; };
   sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; };
   sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; };
   sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
-  sValues = derive2 { name="sValues"; version="0.1.4"; sha256="0y2cv3wls2y3zpbm2d098xj5n098yjl32yi7mwha6mhfwfa4y99l"; depends=[caTools ggplot2 reshape2]; };
+  sValues = derive2 { name="sValues"; version="0.1.5"; sha256="0y234nci9pnc10xyiwxllvb5b48ajga2y0k5fv9izlwkbc5wpiaw"; depends=[caTools ggplot2 reshape2]; };
   saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; };
+  sabre = derive2 { name="sabre"; version="0.2.0"; sha256="1mcjchw1hw1ry5vkl50jrz4bm82b4fqzhgn2xp2kdzwsgvq61dbm"; depends=[dplyr entropy rlang sf tibble tidyr]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
   sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; };
-  sads = derive2 { name="sads"; version="0.4.1"; sha256="1ir5cfjw3416gg7bvfp2qrn9qy1xbklb9a57rp06ghjg7d4slwpr"; depends=[bbmle GUILDS MASS poilog VGAM]; };
-  sae = derive2 { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; };
+  sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; };
+  sae = derive2 { name="sae"; version="1.2"; sha256="1fai9lkyyssnkkdrjrrx7vzj88nglmd4bkzan3hdhrc49abclp59"; depends=[lme4 MASS]; };
   sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
   saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; };
   saeSim = derive2 { name="saeSim"; version="0.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
-  saemix = derive2 { name="saemix"; version="2.1"; sha256="1g52vkqg2dfld7miakkmp23yf4yzc7ka0hbg2fl6ya9cq9m7wyqq"; depends=[]; };
   saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
   safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
   safer = derive2 { name="safer"; version="0.2.0"; sha256="0659xn8jzd5md2mm71p4036ljrfvlhkfshsgidx7l2k9ig532059"; depends=[assertthat base64enc sodium]; };
-  safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
   salesforcer = derive2 { name="salesforcer"; version="0.1.2"; sha256="02a4xzwphy5zfkd0qza6cm2n7dpf71bmc6r78gj17w4amrp3k5y5"; depends=[dplyr httr jsonlite lubridate purrr readr XML xml2]; };
+  sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; };
   samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.2-0"; sha256="1s3p5fvvxkjkm6vjpxi3rw8ncbmyvqpfb0gghcvf2sspdyzam1s2"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
+  sampler = derive2 { name="sampler"; version="0.2.0"; sha256="00c5blf8gfsj8ksf3jwksg3pkh7m39mk23r8v9lkqcp1y91z5p0i"; depends=[dplyr reshape splitstackshape tidyr]; };
   samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
   samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.1.2.400"; sha256="16q8pird6ic7001i3gkwqb2rlak9l853bf2m1y9njmdprsjs82yl"; depends=[TeachingSampling timeDate]; };
   samplesizeCMH = derive2 { name="samplesizeCMH"; version="0.0.0"; sha256="0gdywqmylid4fkz5syzf1wgcan71whhm9gjylmsg4p05hlwvpv1d"; depends=[]; };
@@ -10793,18 +10956,19 @@ in with self; {
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
   sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; };
   satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; depends=[plyr raster Rcpp]; };
-  satscanMapper = derive2 { name="satscanMapper"; version="1.0.0"; sha256="0yjz00nnkyp6q96r3nnizvglblxqg9rprbrc7rh9bpvydps3xxiy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; };
+  satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; };
   saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
   saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
   saws = derive2 { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
-  sbart = derive2 { name="sbart"; version="0.1.0"; sha256="0d74dmsxphsi548k81yihf7icay7fy5v6qxv3champw3j1fwkh3g"; depends=[LaplacesDemon msm Rcpp]; };
+  sbart = derive2 { name="sbart"; version="0.1.1"; sha256="0552dbdj7rm1h7dbl34m4r4disra6x3p919d9c4719ks88i78255"; depends=[LaplacesDemon msm Rcpp]; };
   sbfc = derive2 { name="sbfc"; version="1.0.1"; sha256="1xz8h1m5d5ahrz4wsy55amd5mxh3acjs5qmcn7gl6yh3pn0c8phf"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; };
-  sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
+  sbgcop = derive2 { name="sbgcop"; version="0.980"; sha256="0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs"; depends=[]; };
   sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
   sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
-  sbpiper = derive2 { name="sbpiper"; version="1.6.0"; sha256="00i6wp893rsmm688si3yja7bphmz6ixidhchg2j2h50cfik9q18h"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; };
+  sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; };
   sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; };
   sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; };
+  scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; };
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
   scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; };
   scaleboot = derive2 { name="scaleboot"; version="0.3-4"; sha256="16shdj4b8pbdbphqzw7r5xzx6k2qfkr729inv21gkp9qcp4h0vrm"; depends=[mvtnorm pvclust]; };
@@ -10814,7 +10978,7 @@ in with self; {
   scam = derive2 { name="scam"; version="1.2-2"; sha256="04w0y2l4h3xddb6mzyhf0mcx6kbphrmjyfc59cqw9z88sssfrmm7"; depends=[Matrix mgcv]; };
   scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; };
   scanstatistics = derive2 { name="scanstatistics"; version="1.0.1"; sha256="147fhq34vqkq50bw0g3a112048s5jaxxcwm3iv5wykp8zl45msmz"; depends=[dplyr emdbook ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; };
-  scape = derive2 { name="scape"; version="2.3-1"; sha256="0maccnkhn7wf6brwnb5b7nh2yx3afx0h7kji2475mvg19909mddq"; depends=[coda Hmisc lattice]; };
+  scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; };
   scatterD3 = derive2 { name="scatterD3"; version="0.8.2"; sha256="1cfh060ffwxy33b1f7n8mba1sbbwgx28mqn08im16dqbphkcmx1z"; depends=[digest ellipse htmlwidgets]; };
@@ -10825,9 +10989,11 @@ in with self; {
   scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; };
   scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; };
   schoRsch = derive2 { name="schoRsch"; version="1.4"; sha256="19k34i74ira71v0r5gz9rfnbadnjzi0wpxcm4zqqn7y6jpmfbd11"; depends=[]; };
-  scholar = derive2 { name="scholar"; version="0.1.4"; sha256="088clkpllpjv9rjb45v46dga4ig11ifvfyclgfgcgqvxy5cn92jr"; depends=[dplyr httr R_cache rvest stringr xml2]; };
+  schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; };
+  scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; };
   schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
-  schumaker = derive2 { name="schumaker"; version="1.0"; sha256="0qsbpza1x6kjs4jizg9fvhg0q5s05b5s6jv7r4fjajq9552dc83c"; depends=[]; };
+  schumaker = derive2 { name="schumaker"; version="1.1"; sha256="09ggzhi60lzqwmc344h6f31zdz0b22mzvj0jpfpdp9lllqb25amf"; depends=[]; };
+  scico = derive2 { name="scico"; version="1.0.0"; sha256="1z1w4j84h5rxa7s9ccjw7ygad85sm6km2l09rba1gad8bp0pfxmf"; depends=[]; };
   scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; };
   scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; };
   scifigure = derive2 { name="scifigure"; version="0.1.1"; sha256="0wfvg0c9hbdc3ipsnq6nkf7k9hf8yl27aqg012nqk9ynlwp9qa56"; depends=[]; };
@@ -10835,54 +11001,56 @@ in with self; {
   sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; };
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
   scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
+  scopr = derive2 { name="scopr"; version="0.3.2"; sha256="0wssxfhkgpqzw5gbqbidawj7wizwcbra8inrxvnmsjxq0fhhzazy"; depends=[behavr data_table memoise readr RSQLite stringr]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
-  scorecard = derive2 { name="scorecard"; version="0.1.6"; sha256="1k5vcjd574i493wazckyg6a0b4pf9b833rqppq444lwvkag7qn2q"; depends=[data_table doParallel foreach ggplot2 gridExtra]; };
+  scorecard = derive2 { name="scorecard"; version="0.1.8"; sha256="04zjlpchdbbm40n12am5094ha36bdiycbq5vzbh0vc3kmc6xhjp1"; depends=[data_table doParallel foreach ggplot2 gridExtra]; };
+  scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.0.9"; sha256="1hnz9dgx5fxbhh54psalrr50n22vc250v2xxxl49j09q26xh37kl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; };
   scoringRules = derive2 { name="scoringRules"; version="0.9.4"; sha256="0m8050qqb3j0miwfbadp6lmd2q5vicsqn4waw4jszz52fhb8mv27"; depends=[MASS Rcpp RcppArmadillo]; };
   scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
   scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; };
-  scraEP = derive2 { name="scraEP"; version="1.0"; sha256="1pmab2nhymb7vjfg7vysqn2cs9apdkwxgi55qn8kjg2g5r0098p7"; depends=[RCurl XML]; };
+  scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; };
   scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
   scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
   scriptName = derive2 { name="scriptName"; version="1.0.0"; sha256="0jpr9x5hf45cik5zxqw0j3vkvbk04a7ck2crvb2472hrv7s9al55"; depends=[purrr rlang]; };
   scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; };
   scriptexec = derive2 { name="scriptexec"; version="0.2.1"; sha256="09gaccqadb51ia66xk9vi3p9472s82bg6v8i6ba390g04yipbipi"; depends=[]; };
-  scrm = derive2 { name="scrm"; version="1.7.2-1"; sha256="123rxx1a13fbv975hp9f9rjcigp8vfai7679wbn9dlyvph5nivaz"; depends=[Rcpp]; };
+  scrm = derive2 { name="scrm"; version="1.7.2-4"; sha256="1fj0204hc0yvahg3plz3ia9kwa93mimk721mf2dljwdnj46lb067"; depends=[Rcpp]; };
   scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; };
   scs = derive2 { name="scs"; version="1.1-1"; sha256="1qx8b73g5v7mjx85lx5bln6j6i9r7m238i7hm8adr2jrbl33532y"; depends=[Matrix]; };
   scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
-  sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; };
+  sdPrior = derive2 { name="sdPrior"; version="0.5"; sha256="1l086a4ghx36fi951z968mpqdjpd64ilqvim6hcm05pl8dj7xcva"; depends=[BayesX caTools doParallel GB2 MASS mgcv mvtnorm pscl rsvd]; };
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; };
-  sdcMicro = derive2 { name="sdcMicro"; version="5.2.0"; sha256="1kfws4y59x7blvv8ix1xvwi92ccfsjnjlifs89jj18wjlb2khjsw"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.22.8"; sha256="134a0g1v5w9airckn1bqp4k7hv2dcl5kmb1hx78nw5s8h92y3gkc"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
+  sdcMicro = derive2 { name="sdcMicro"; version="5.3.0"; sha256="0n2pbwm344iw3zm0nf6ybx51hf79jhjzd2780c57n71jl2ybxzpk"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.23"; sha256="00zh55zpi6y5mrhyzxj1r9f2r1axikgy0dimxv7978sasxsm3hnm"; depends=[data_table data_tree knitr lpSolveAPI Rcpp Rglpk rlang slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
-  sdef = derive2 { name="sdef"; version="1.6"; sha256="1y1l5fl7lh636kyvc2hwssdnifl055nrz3riplj4qqw88lkm1mk8"; depends=[]; };
+  sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; };
   sdm = derive2 { name="sdm"; version="1.0-46"; sha256="14z8336yxja1j7mx8xszqqi6s24nk6r5bycmw8h01wvq4rqgxi4g"; depends=[raster sp]; };
   sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.6"; sha256="1kbgv5x5ilzccafl20x86fi9f7jqxnccvb8k7dy8q41s9n36qwfs"; depends=[R_utils raster rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.3.8"; sha256="10c962wbzgl2zpz7yx5kpryldbbq76qrd5pnz4rlmbaa9kfg08s5"; depends=[]; };
-  sdols = derive2 { name="sdols"; version="1.4"; sha256="1wamzpw8q55a5zkvk21c3hilr97lxz1yq3b0dcfgcdvcqap2i14w"; depends=[commonsMath rscala]; };
+  sdols = derive2 { name="sdols"; version="1.6"; sha256="083yvlqgr5151dy0570jkhns12nyj2na2gk39vf8gv0gyw72c3yk"; depends=[commonsMath rscala]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; };
   sdpt3r = derive2 { name="sdpt3r"; version="0.1"; sha256="06mw1h6c8gkhi3vhal17h7px3bb277xz15k2ryqjwc7agzwhmv8c"; depends=[Matrix]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
   sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; };
   seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; };
-  seacarb = derive2 { name="seacarb"; version="3.2.6"; sha256="1036hrmgv7xn0khddbfdg0p9d4hmhhxxb3fd7fysjmzlk7k7naqb"; depends=[gsw oce]; };
+  seacarb = derive2 { name="seacarb"; version="3.2.8"; sha256="02l10jgjw79vf31c8qfzfpyrfhlc0j2dibs4pkk5y7visggzr47p"; depends=[gsw oce]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
-  sealr = derive2 { name="sealr"; version="0.1.0"; sha256="1ky0m120bf4mmb0c99ywrzr2jjx3cljscf9vnsnp54rkabh1q2mm"; depends=[clipr clisymbols digest dplyr glue magrittr purrr rlang rstudioapi styler tibble tidyr]; };
+  sealr = derive2 { name="sealr"; version="0.1.1"; sha256="1y31k4y3v1mvjagsbr4647hdn8rk4nfdyixidl3myq0qhnaf0x6w"; depends=[clipr clisymbols digest dplyr glue magrittr purrr rlang rstudioapi styler tibble tidyr]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
-  searcher = derive2 { name="searcher"; version="0.0.2"; sha256="0lj7zyqldr8m7ky20frzaxmf9by2h3p89ibwsa7dyrf378swkwwj"; depends=[]; };
-  seas = derive2 { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
-  season = derive2 { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[coda ggplot2 MASS mgcv survival]; };
+  searcher = derive2 { name="searcher"; version="0.0.3"; sha256="004k757hn5y80k7kim3049n3mjrsimqpzdz5fis2ggxbdwwf1bs1"; depends=[]; };
+  seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; };
+  season = derive2 { name="season"; version="0.3.6"; sha256="1q0xih4vj0pv1xcgdi2d6vl56gd1gmzfbyc0aklpjz9iaxmxgb8f"; depends=[coda ggplot2 MASS mgcv survival]; };
   seasonal = derive2 { name="seasonal"; version="1.6.1"; sha256="1nvavn84f2zb0f6n352br52wcrcmnxv6vprzcpymrnzik7pyp8y6"; depends=[x13binary]; };
   seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; };
   seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
-  secr = derive2 { name="secr"; version="3.1.5"; sha256="1sxapy8h1kx4fk405j6nanvdl5g9gz4arg0v15cmhb4plij3mg3c"; depends=[abind MASS mgcv nlme raster sp stringr]; };
+  secr = derive2 { name="secr"; version="3.1.6"; sha256="0mf0p7asx2shf630j5xd7ym21f76a0af536wzs9rdbhq0xychv6z"; depends=[abind MASS mgcv nlme raster sp stringr]; };
   secrdesign = derive2 { name="secrdesign"; version="2.5.4"; sha256="1kbqgdjpyns11ag16rgw9n6mvmjgdypk9lv3yzwf4kynds46wbbk"; depends=[abind secr]; };
   secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; };
   secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; };
@@ -10896,13 +11064,12 @@ in with self; {
   segclust2d = derive2 { name="segclust2d"; version="0.1.0"; sha256="0kymw36cvakx84c96npkbnsvv0a1s82773ib5c802ybvkb2r1k9p"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; };
-  segregation = derive2 { name="segregation"; version="0.0.1"; sha256="0avapyr8h0c4hl0xchazr5gig9857y25xx4js788liy679iczwf7"; depends=[data_table]; };
+  segregation = derive2 { name="segregation"; version="0.1.0"; sha256="17dhgk56j6zxqgfq08vig68lkhxhbgbbqhshqh5051m1k4ivjdyz"; depends=[data_table]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
   seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; };
   sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; };
   selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
   selectapref = derive2 { name="selectapref"; version="0.1.0"; sha256="09kqrr814261mvpzc9x7v0fcnd4wf8fcl52jsx6snf1qp336hw26"; depends=[]; };
-  selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
   selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; };
   selectr = derive2 { name="selectr"; version="0.4-1"; sha256="1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b"; depends=[R6 stringr]; };
@@ -10915,37 +11082,36 @@ in with self; {
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
   semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; };
   semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; };
-  semTools = derive2 { name="semTools"; version="0.4-14"; sha256="1j1chman14i908c009lf0jgdmrrb8avgp8nif1i9wlj6vgif890c"; depends=[lavaan]; };
+  semTools = derive2 { name="semTools"; version="0.5-0"; sha256="0akan511aj8qkn37aiw200nvyxwdqrz022ll16av2n7qsp9xdynh"; depends=[lavaan]; };
+  semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; };
   semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
-  semds = derive2 { name="semds"; version="0.9-2"; sha256="0ig8b7ii1c8av0il904b71lzr8lqdiibwf16yj5dp8n4xc80bryh"; depends=[minpack_lm pracma]; };
+  semds = derive2 { name="semds"; version="0.9-4"; sha256="14x6xqv15fgsxhsyxw77i3slpdaax8kcq9sx7ipwp1b83fmmqv1z"; depends=[minpack_lm pracma]; };
   semiArtificial = derive2 { name="semiArtificial"; version="2.2.5"; sha256="1m8kwjhqjpqjzz22caiwpb4nb70d8y0ssf9j4rfyyh530x2q2k1m"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; };
-  seminr = derive2 { name="seminr"; version="0.4.0"; sha256="1vgmakj94s0l400wmk31hq8xl75dnhpbmdn85px6lsm1jhp6l8i5"; depends=[]; };
-  semisupKernelPCA = derive2 { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
-  semsfa = derive2 { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[doParallel foreach iterators mgcv moments np]; };
+  seminr = derive2 { name="seminr"; version="0.5.0"; sha256="0f8k1v2g82axhaw5a370f95h9q07qar1by795wfc3yil7pn94xmy"; depends=[]; };
+  semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; };
   semtree = derive2 { name="semtree"; version="0.9.12"; sha256="07i82f3bnn9x7gy8gsjyd99mzcq9pk3xqb3479d338vpky2afv43"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets]; };
   semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; };
   sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
   sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
-  sensR = derive2 { name="sensR"; version="1.5-0"; sha256="01rs0kiv73rqrlgzwf7hnprb029i5sq1h1qjb9q3879jxj4823pf"; depends=[MASS multcomp numDeriv]; };
-  sensiPhy = derive2 { name="sensiPhy"; version="0.8.1"; sha256="0pqwxs36g31qvy8ygx5grsx782magwsmh3v2qkv3rn2ycwy3brgp"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
+  sensR = derive2 { name="sensR"; version="1.5-1"; sha256="0hqnk6gvlkl9harz7rh5ikbp0s0vjwi63gxixqjfhkyk02ilaa3z"; depends=[MASS multcomp numDeriv]; };
+  sensiPhy = derive2 { name="sensiPhy"; version="0.8.2"; sha256="19sbcl3873r2jayxpr83n8w36br12c6p31y830gzi7a4q0cxaxxq"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
   sensitivity = derive2 { name="sensitivity"; version="1.15.0"; sha256="02vqs1pqzivxpg2ql3wi0530cshdkz7hxvablpd1dzhvjnindknm"; depends=[boot]; };
   sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; };
   sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
   sensitivityfull = derive2 { name="sensitivityfull"; version="1.5.6"; sha256="0g2gc4rms6gd34d23kxj50pjh0yq1h6yiybj4dxwyf6i2652irhq"; depends=[]; };
   sensitivitymult = derive2 { name="sensitivitymult"; version="1.0.2"; sha256="19pyq6c7pvr3zkz3dz5p2hhfcvwm0im0bwaw4yhhgin4kqfnfjd5"; depends=[]; };
-  sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; };
+  sensitivitymv = derive2 { name="sensitivitymv"; version="1.4.3"; sha256="1ga8mf92niiv1z3g3kv5ha5xdd1089aaqp19dz68kv8a396vhy1j"; depends=[]; };
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
-  sensors4plumes = derive2 { name="sensors4plumes"; version="0.9"; sha256="1fyf020bl6p9wdvnsfkmdlllhdwj3l4h9h2paq9dwd7hsr7av48p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; };
+  sensors4plumes = derive2 { name="sensors4plumes"; version="0.9.3"; sha256="1r9sddnlxpjck7rhm2w7z8jak7wmrxg3d62dydc5dqcqhgp54r6p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; };
   sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; };
   senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; };
-  sentimentr = derive2 { name="sentimentr"; version="2.2.3"; sha256="0f9hwiyja9cgig0ja9miqzsfwpn25bfa8xrwfm34v1n2l3v2gbxv"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
-  sentometrics = derive2 { name="sentometrics"; version="0.3.5"; sha256="0628vnv3wga21z5dvhxs3alj194s43xgaasifpbfm2gmfzma6lb4"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll stringi zoo]; };
-  seoR = derive2 { name="seoR"; version="0.1.0"; sha256="0aa74a9vi176ap4ap44sjm8lm3025dss067sm5lgc4b73a6ph75p"; depends=[digest dplyr httr igraph jsonlite RCurl readr robotstxt rvest stringr XML xml2]; };
+  sentimentr = derive2 { name="sentimentr"; version="2.3.2"; sha256="14f5zac5ywz864fbcia05kdlxx4bgvasc1l1abcrk34i2jvh8zwl"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
+  sentometrics = derive2 { name="sentometrics"; version="0.4"; sha256="0mr064qb1wr0bpbrx1bl3imxy95ybxlx4bxpy25qcz07v5nynk5l"; depends=[abind caret data_table doParallel foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll stringi zoo]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
-  seplyr = derive2 { name="seplyr"; version="0.5.5"; sha256="1hb0df1mlqv8fivdnqg5lw7gj92hscrxw122isgixkqm74n0vc5y"; depends=[dplyr rlang wrapr]; };
+  seplyr = derive2 { name="seplyr"; version="0.5.8"; sha256="0ca9mg2fx3jdgybbiq2a22q5p6613awxwysrpgdbs5lrqdm1ywim"; depends=[dplyr rlang tidyr wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
-  seqHMM = derive2 { name="seqHMM"; version="1.0.8"; sha256="1zr70ym32isav13wsb7zv4gv3bn04qi0dn5k0fqjbdcw36m5hfi8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
+  seqHMM = derive2 { name="seqHMM"; version="1.0.8-1"; sha256="18rpmncm5xn34l336kzg0pby59pw16s5cdv3h946yhrcjigz0kkn"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
   seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; };
   seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; };
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
@@ -10959,9 +11125,10 @@ in with self; {
   sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; };
   serial = derive2 { name="serial"; version="1.3"; sha256="1ibwd8xmkd0pwdhivm6h3yd3rsi28mai5n7qcs1bq2mx8hb5lg7f"; depends=[]; };
   seriation = derive2 { name="seriation"; version="1.2-3"; sha256="1q6hw4hjw224b4y0dc0j630v2pgj6sn455nwkilb70w8k31hpk92"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
-  seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; };
-  serrsBayes = derive2 { name="serrsBayes"; version="0.3-12"; sha256="137pm5s7w6fxaalyc7hzvdkg7rayjhqw2dnb2q8q9ijp0v9wx7mr"; depends=[MASS Matrix Rcpp RcppEigen truncnorm]; };
-  servr = derive2 { name="servr"; version="0.9"; sha256="0bs0i5mjfzxfshqz8i30nhn7kvgwly4fqn5bfq6dqfdrn7biai2x"; depends=[httpuv jsonlite mime xfun]; };
+  serieslcb = derive2 { name="serieslcb"; version="0.1.0"; sha256="09mg8x738q7p16z95rrfj9fzmsrl34fvx9nsz1ndkp4h6cwf679l"; depends=[gplots shiny]; };
+  seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
+  serrsBayes = derive2 { name="serrsBayes"; version="0.3-13"; sha256="1s38mva66l684i0wrk65r3gdafjlih7bglsmi9fr44yk0wavygrm"; depends=[MASS Matrix Rcpp RcppEigen truncnorm]; };
+  servr = derive2 { name="servr"; version="0.10"; sha256="0yz3igqsiyqnjj1ngh199zicg3spx4kbmvl0wc8i8xahk6l9g06v"; depends=[httpuv jsonlite mime xfun]; };
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   sessioninfo = derive2 { name="sessioninfo"; version="1.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; };
@@ -10970,7 +11137,7 @@ in with self; {
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.6-1"; sha256="1hqsjbbasqb8vxswl7cwwjgvjiki71yb8fr301lzfxagkanys790"; depends=[classInt DBI magrittr Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.6-3"; sha256="0c6ayyclhlna2jnpwi6glafw7ip7ar0ycsmms79x451mdqb5xvja"; depends=[classInt DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
@@ -10982,53 +11149,57 @@ in with self; {
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
   sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; };
   sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; };
-  sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; };
+  sglasso = derive2 { name="sglasso"; version="1.2.3"; sha256="1xf4jni7gybk66wp542p92jxrp4lf63ypbwsnb3av5db04bis7ll"; depends=[igraph Matrix]; };
   sglg = derive2 { name="sglg"; version="0.1.3"; sha256="17w9mfb53ll8aqasl4ysnb0b7sk6cgp7s1cfvn07rg5win2swqrj"; depends=[Formula robustloggamma ssym survival]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
   sgmcmc = derive2 { name="sgmcmc"; version="0.2.2"; sha256="1ga3dynhldkl98fd7fzbbhb4bryf6nyijwvxsj8i1szy4jsv8q3q"; depends=[tensorflow]; };
   sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
-  shades = derive2 { name="shades"; version="1.1.0"; sha256="0ajdpwisfax96mc3w1akjlkk36b6gni1aprxqvqlwlw8bmgsmj4p"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.5.0"; sha256="0a5flgc3r5psbsig3dns4pr1fyvkhmb7gh17sb5r4vm8w202p98y"; depends=[plyr raster rgeos sp]; };
+  shades = derive2 { name="shades"; version="1.2.0"; sha256="06mz09rrrjp4dkzbw6nnv6n3k80ddwzaw4pkp4127d1f4cij9pnj"; depends=[]; };
+  shadow = derive2 { name="shadow"; version="0.5.3"; sha256="036jh63y3i42yfjm96yp0xp3p77v1mzj77q0vl9msjhd246l5gm8"; depends=[plyr raster rgeos sp]; };
   shadowtext = derive2 { name="shadowtext"; version="0.0.2"; sha256="17ccylxnl6837cf81fwkgywjmqizmcm6mhqak10sl5apnqm5n1nl"; depends=[ggplot2]; };
-  shallot = derive2 { name="shallot"; version="0.4.3"; sha256="1rxx15qma6sbi4h2iv90ym4r22lwh64z495psrxv624w1zjypbvf"; depends=[commonsMath rscala]; };
+  shallot = derive2 { name="shallot"; version="0.4.4"; sha256="0bjbw8l5lzz5d6nxgwjby40fxvxrfli0wkipdf84pg4nigy84w2w"; depends=[commonsMath rscala sdols]; };
   shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive2 { name="shapes"; version="1.2.3"; sha256="1fzwpqa0paql4n652diqsqylz5r5crblfip6g6c0vszrvy7avi4q"; depends=[MASS rgl scatterplot3d]; };
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
-  sharpr2 = derive2 { name="sharpr2"; version="1.0.0.0"; sha256="018xzpl9h07cddpmr2bxm9iz50ky0ja12kybjil7ipjfn0kxavyr"; depends=[mvtnorm]; };
+  sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
   shazam = derive2 { name="shazam"; version="0.1.9"; sha256="1dm553l1qwqajy5p13x3ms6x45ax33zh7b79iw6xx1chbrpalhmk"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
   shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; };
   shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; };
-  shiny = derive2 { name="shiny"; version="1.0.5"; sha256="0hps6nlyffh685smsm9sd0rdmip0y8v7hgv6a4hqlq7kf8zmzqi0"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
-  shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.2"; sha256="0zvd37z4d2vx2h2ypmbzbaxa617dpwdzhp3rwd6yak0avfv5h7a0"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
-  shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; };
+  shiny = derive2 { name="shiny"; version="1.1.0"; sha256="12aw4kmf0j993fj4lpyqlyqzzn0bnniwd55w22p9pa0b3g6n9dbh"; depends=[crayon digest htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; };
+  shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
+  shinyAce = derive2 { name="shinyAce"; version="0.3.1"; sha256="1hqgszbiv99dibhwr21v21ll4s2hjn3ccqdicsm0z3gk77bh8iyb"; depends=[jsonlite shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
   shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.4"; sha256="14lvr99nfldlr101ysmpwz0zw0bjvr6b7lfm0msx57ymh6gjzg3n"; depends=[digest shiny]; };
-  shinyFiles = derive2 { name="shinyFiles"; version="0.6.2"; sha256="1lphzqbzg482lv0xiamfv28n5nyjppss9zzcpx1cd5fsz0xg1282"; depends=[htmltools RJSONIO shiny]; };
+  shinyFiles = derive2 { name="shinyFiles"; version="0.7.0"; sha256="1bs1dj84scg4gkrdlw1jvmnwckcjcdpzc8drwmr8h6cxk3yklijc"; depends=[htmltools jsonlite shiny]; };
   shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; };
   shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; };
-  shinyLP = derive2 { name="shinyLP"; version="1.1.1"; sha256="099ca86wvjfi3ld6fnvxk65rnxr5yji28il2f9xhacmhksn3db3l"; depends=[shiny]; };
+  shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
-  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.2"; sha256="0y23p9wirrp3d9zb8cfdizsg8ijgm2sxhvhfl06yq8i1wnr8yif5"; depends=[htmltools jsonlite shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.3"; sha256="070yy6vq9w97bz17nxbc2z65v05k50hr24dxfcld994bw0910ldx"; depends=[htmltools jsonlite shiny]; };
   shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; };
   shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; };
+  shinyanimate = derive2 { name="shinyanimate"; version="0.1.0"; sha256="0vbzfcw4d0fvmpdn2pjbsl3najikhm6p60w5vxc0d3x7d8sfq57z"; depends=[shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; };
   shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.7.0"; sha256="10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"; depends=[htmltools shiny]; };
-  shinyjqui = derive2 { name="shinyjqui"; version="0.2.0"; sha256="07ijd5psywlkfrz54d4q68bwij1as4ai0360fya8ikngkwg393mj"; depends=[htmlwidgets jsonlite shiny]; };
+  shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.5.0"; sha256="0wj388lys7jlh45il6vvln0bpjg1rr91xyypzz55hp46r8z31vl2"; depends=[htmltools shiny shinydashboard]; };
+  shinyhelper = derive2 { name="shinyhelper"; version="0.3.0"; sha256="1ypd9wc0h9yfh4awjmjn952g2cfsgcyrm25zk575b17jrkjl5skj"; depends=[markdown shiny]; };
+  shinyjqui = derive2 { name="shinyjqui"; version="0.3.0"; sha256="0x7pyb897apmdfpys2kc7bkaa8i4a9rlmdlmlps1n8cxj8kx3dal"; depends=[htmltools htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; };
-  shinymaterial = derive2 { name="shinymaterial"; version="0.5.2"; sha256="1xdvk8icnzc156bdn6782qgj1dgzc8v22b8qhfnxabxxgpap5nm9"; depends=[shiny]; };
-  shinystan = derive2 { name="shinystan"; version="2.4.0"; sha256="18bdh2h6grlwfx6p00214p7cgzg7zfhbvnkd1dmxihp9wf4l80af"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
+  shinymaterial = derive2 { name="shinymaterial"; version="0.5.3"; sha256="0lddw626mlb6vv474vv22pbjlwl1hgnjs8py3a30d84m94wg7p3z"; depends=[jsonlite shiny]; };
+  shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
+  shinytest = derive2 { name="shinytest"; version="1.3.0"; sha256="0xgsbw72jpyjw0shg6vb8cxxw3948xhbl2sjx0d376fy2jb1rh43"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch shiny testthat webdriver withr]; };
   shinythemes = derive2 { name="shinythemes"; version="1.1.1"; sha256="0i220y051dq763idh1j5zhpb5cpv3jr11jd9akmry9aadyys5pz6"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
@@ -11047,40 +11218,41 @@ in with self; {
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
   sidier = derive2 { name="sidier"; version="4.0.2"; sha256="1zzlgd20aw2asbsb3g9m5gvlmmgkai3bqrxyn48mphc2ncl4y7w0"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
   sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
-  sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
+  sievetest = derive2 { name="sievetest"; version="1.2.3"; sha256="17qrm7axvlr2yzp8brbibp26f8qdpqm85hc2kjzxm5zqwfvd6dfs"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
-  sigQC = derive2 { name="sigQC"; version="0.1.14"; sha256="17vgfpkbn8g3bgfxmy5wvpjkzizpzqjw5xijmzpi627ba9g8lrwh"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; };
+  sigQC = derive2 { name="sigQC"; version="0.1.20"; sha256="1s0z5pd8183q1v5pn07zwxckafhq0rhh7fzzny7xpjs79r50l9ii"; depends=[biclust circlize class cluster ComplexHeatmap fmsb gplots gridGraphics GSVA KernSmooth lattice MASS mclust moments nnet RankProd]; };
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
-  sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
-  sigmaNet = derive2 { name="sigmaNet"; version="1.0.3"; sha256="0b9p5kgcbpzb83s0vgmfwmh15lvsfz5q0yk5wl16rxyiqqg2nxag"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; };
-  sigmoid = derive2 { name="sigmoid"; version="0.2.1"; sha256="1myphx64irwllf3p9aifmg37mg4jg58ik7f42zilg5qsjfhj37zf"; depends=[]; };
+  sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; };
+  sigmoid = derive2 { name="sigmoid"; version="0.3.0"; sha256="1sa6nmip3fizdk3r47pvx0h3qldn267arpmid0wa1pb7k5j2g682"; depends=[]; };
   signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
   signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="0.2.4"; sha256="11dxv99yibp6cj3jg8qmy8r4csr2lyww6zrdy4a2zgmrzl02fhlc"; depends=[pwr]; };
+  sigr = derive2 { name="sigr"; version="0.2.7"; sha256="0fdqlwblinb2dqlmcr7p679ppjh73aykgsmjffyaz0liiyk0zsc7"; depends=[wrapr]; };
   siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; };
   sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
+  simIReff = derive2 { name="simIReff"; version="1.0"; sha256="0yi43splda8chnh4bq5x6chbrl5c0y9sv1k2m31763da0czayall"; depends=[bde extraDistr ks MASS np rvinecopulib truncnorm]; };
   simLife = derive2 { name="simLife"; version="0.3"; sha256="0bqhixr4zg7mwgxdsjk0h5a82dyfkhiv9xafw43w2bpnmyxywdia"; depends=[splancs unfoldr]; };
   simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; };
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
   simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
   simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
-  simPop = derive2 { name="simPop"; version="1.1.0"; sha256="0zaf12lzca73nn0jy1gikzzwrsg046sgsfn9ck65jzdwh9xj9020"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
+  simPop = derive2 { name="simPop"; version="1.1.1"; sha256="10dsr1rbglv5kwm5q05dxv4396wxwzhlf0851ynndlcbyxl8rvc0"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
   simTool = derive2 { name="simTool"; version="1.1.0"; sha256="121nv0s14jzxgcmj2fsj1k0msziknwbix2a49f7igic2l8yv869p"; depends=[dplyr plyr purrr reshape tibble tidyr]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
   simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; };
   simcausal = derive2 { name="simcausal"; version="0.5.4"; sha256="19mqabxqz2mvfhslbln5vsnlrnmgcfmgp7ypf5k2yd03755b0k4b"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
   simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; };
-  simecol = derive2 { name="simecol"; version="0.8-10"; sha256="027x19w4l85129cb71c5cp9y8msg3nkq5cy4cfrlw2dl5zky4j5j"; depends=[deSolve minqa]; };
+  simdistr = derive2 { name="simdistr"; version="1.0.0"; sha256="0r7qfrq4vcjqrzajc6xmn0rrkinqwbr8cqghgp4iklbhsjbk2xfl"; depends=[]; };
+  simecol = derive2 { name="simecol"; version="0.8-12"; sha256="06zw9xhj8jwhmqwxxbj8hgz9cxrw1b4syy6z79aawv9cg1bnwfhf"; depends=[deSolve minqa]; };
   simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; };
   simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
-  simglm = derive2 { name="simglm"; version="0.6.0"; sha256="1kmi5lpx8m14iz0i9z8811cp6fq2x700qsxn6rxrkxbq88a5mdss"; depends=[dplyr Matrix purrr tibble tidyr]; };
-  simmer = derive2 { name="simmer"; version="3.7.0"; sha256="1jirp7bl5a0mfc0hg495mxfz5cjdigg2dzwj8rbc9qkgibfvfnih"; depends=[BH codetools magrittr R6 Rcpp]; };
+  simglm = derive2 { name="simglm"; version="0.7.0"; sha256="1p29v8y3ahdkid35ky9sbj5227cvj0nn0ljzjpliyqwbkmxpncmj"; depends=[broom dplyr Matrix purrr rlang]; };
+  simmer = derive2 { name="simmer"; version="3.8.0"; sha256="0d1m93ffnajvkf3wiqvbim5l1i10k30pr702wyazrg6b0c2kybkf"; depends=[BH codetools magrittr R6 Rcpp]; };
   simmer_bricks = derive2 { name="simmer.bricks"; version="0.1.0"; sha256="1sb1ayh56sbgs4p0r3frjjfn4vcdr43xm85lvb9aqk3wmj2lddqy"; depends=[simmer]; };
   simmer_plot = derive2 { name="simmer.plot"; version="0.1.13"; sha256="0afp4il95dmdgw815rk0c3cyf56gli237v4i716l4agag5l1rp60"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
   simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; };
@@ -11092,15 +11264,16 @@ in with self; {
   simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; };
   simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; };
   simputation = derive2 { name="simputation"; version="0.2.2"; sha256="0bn5pq3gbsjc7sdivki98k9cb0sp5wkpm0bwi4mdnvpd7r2psb1n"; depends=[gower MASS rpart]; };
-  simr = derive2 { name="simr"; version="1.0.3"; sha256="0kp1x2bxr0ck49y9pn44jr7pp3ji1cqi48dr5z600mzacx6l95xp"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; };
+  simr = derive2 { name="simr"; version="1.0.4"; sha256="1mm0kfisa8yq81rd9l7vmxcklj4v1fy9a7dh0yzar5vn0wh18pr1"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; };
   simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
-  simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; };
-  simsem = derive2 { name="simsem"; version="0.5-13"; sha256="0v6gbfp4659gbpzc1vffg687c8bcd45ddb7jhd0bgx66m28853kk"; depends=[lavaan]; };
-  simstudy = derive2 { name="simstudy"; version="0.1.8"; sha256="0n8wq8xw4vlpcz6qlqkza9zwd3nkbmhs8nw2gzz64q9blzcp69mw"; depends=[data_table mvnfast Rcpp]; };
-  simsurv = derive2 { name="simsurv"; version="0.2.0"; sha256="16rg13chr78c8d8y1s29zkcz6s0v7zgv5jzq4309xbnw8w7h7y8m"; depends=[]; };
+  simsalapar = derive2 { name="simsalapar"; version="1.0-10"; sha256="1q7kh44xl7q48vpqbyrp85my6x97l4fqq36bry8vg3k5riihirzf"; depends=[colorspace gridBase sfsmisc]; };
+  simsem = derive2 { name="simsem"; version="0.5-14"; sha256="1sg1zmngpviqpbsy8kxnw4f4x93gy3gh02ykmcw8j9falfnd7g6i"; depends=[lavaan]; };
+  simstudy = derive2 { name="simstudy"; version="0.1.9"; sha256="0lix46xi02sfkd3nslqgcbnyfpgqhdz8kj5hh85b6ajly4hgw103"; depends=[data_table mvnfast Rcpp]; };
+  simsurv = derive2 { name="simsurv"; version="0.2.2"; sha256="1dfn156mm08l1cyp6wy69rd9a2lyy7qlbqa59jq35n9fhpjbrif0"; depends=[]; };
   simtimer = derive2 { name="simtimer"; version="3.0.0"; sha256="0hfp652s97dz07fs92gfsaiwd6pwg95qsvr6qjwj1k5d3h6hzf8y"; depends=[]; };
+  simukde = derive2 { name="simukde"; version="1.0.0"; sha256="1v4shnyba05mh0qaylivcjby6niz2yc4zb67qfbycifbj0cl14vh"; depends=[ks mvtnorm]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
-  simule = derive2 { name="simule"; version="1.2.0"; sha256="09lhd0q0xn15v0j172749rih3p2qgn3sbprhj2az9s4fm9752az3"; depends=[igraph lpSolve pcaPP]; };
+  simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; };
   sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; };
   sinew = derive2 { name="sinew"; version="0.3.5.1"; sha256="0fp5afjnkah3ig1c1fy23zlfxkfg590jai8iqf5s8wl8r4s0ywgm"; depends=[miniUI rstudioapi shiny sos stringi yaml]; };
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
@@ -11110,32 +11283,32 @@ in with self; {
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
-  sitar = derive2 { name="sitar"; version="1.0.10"; sha256="1qsk998fa5839f9yp08sxlj48mzdm46z07x1113q63483k5bnrrc"; depends=[nlme quantreg]; };
-  sitmo = derive2 { name="sitmo"; version="1.2.2"; sha256="0az4hpyyyx380slsk1kkcl8msi0c4lkwg8az2bmrhq3cik2ai8sn"; depends=[Rcpp]; };
+  sitar = derive2 { name="sitar"; version="1.1.0"; sha256="1a2x6igzq0i1vac54xyiq14vzx0m20431nv7aw0anv0lss7xy6r8"; depends=[dplyr nlme quantreg rlang tibble]; };
+  sitmo = derive2 { name="sitmo"; version="2.0.0"; sha256="11mzkdh01cfazxqxxlhm0ifbiggpw54k5n9qpz3vxbq10v9720h9"; depends=[Rcpp]; };
   sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
-  sitree = derive2 { name="sitree"; version="0.1-2"; sha256="0scfbj33mdqz10rgw6pznxca0hbmg64k53y30lwal957430yflz5"; depends=[data_table lattice latticeExtra]; };
-  sitreeE = derive2 { name="sitreeE"; version="0.0-1"; sha256="1gb0n5gis4ac0fdjcc496fwpvwmw5iwafpsjy3i1mpkjkxpn7za9"; depends=[sitree]; };
+  sitree = derive2 { name="sitree"; version="0.1-3"; sha256="1rs109sxvmsbx8w75iifbc14z685k9brk7fgfy0mjgkcxszafjwk"; depends=[data_table lattice latticeExtra]; };
+  sitreeE = derive2 { name="sitreeE"; version="0.0-2"; sha256="0w4gbdjphanfy614jv4zp70kl901zz5hblk35lyv7rjxifq5bpx0"; depends=[sitree]; };
   sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; };
   sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; };
   sjPlot = derive2 { name="sjPlot"; version="2.4.1"; sha256="0aazxrqsbp5jsd5yfm6hrx17rmlqbh5vs314xms7g620aj383zrh"; depends=[arm broom dplyr effects forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjlabelled = derive2 { name="sjlabelled"; version="1.0.8"; sha256="1hhcv5d5jbrd9wv9hdvck40wdpr4nr6hr972ng5w2wbh7bikvgqg"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.7.1"; sha256="0vj0b3vn3mkqw23x2rnrn468db44x6wvphbqlap5n7c7dzg8hg22"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; };
-  sjstats = derive2 { name="sjstats"; version="0.14.2-3"; sha256="0wqnyf1wpbq0av3027x455jcha7w8kg9lb62rjm5fkz52ff93hpx"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.0.11"; sha256="1bkjv36v7vwvwfal9qwfyvirnv72r080cq333q161bnq6vcp648y"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble tidyselect]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.7.3"; sha256="1d588cpgnyhxyclchiv5fx0vi155mkh7ac252swg5fp4752skff7"; depends=[broom crayon dplyr haven magrittr pillar purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; };
+  sjstats = derive2 { name="sjstats"; version="0.15.0"; sha256="1gy37k3ziyxlf336b9s5j2shp9qapwnr8ya8sfjyrs56naai411b"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; };
   skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
   skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
-  skimr = derive2 { name="skimr"; version="1.0.2"; sha256="1grm4z4avl6qp9ssk3cwg20wgqzk9w61p2hjwhld6p78r971k07a"; depends=[dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; };
+  skimr = derive2 { name="skimr"; version="1.0.3"; sha256="1c6szryq4w6gipmz7s5nn5936dbwly013czlcl6fky2yrhhjf25v"; depends=[cli dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; };
+  sklarsomega = derive2 { name="sklarsomega"; version="1.0"; sha256="0zyaycsbi4nnqx80lvipa43zphc032gw8bmxrx4blqb67xlfhp98"; depends=[hash LaplacesDemon Matrix numDeriv spam]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
   skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; };
-  skpr = derive2 { name="skpr"; version="0.47.5"; sha256="1c9ikn3lj3w2a4p1m8gdmhc1xzavf3y8zwra7lcb1snw9pznj7s8"; depends=[doParallel doRNG foreach iterators kableExtra knitr lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; };
-  skynet = derive2 { name="skynet"; version="1.0.1"; sha256="1jcb7m4warpg0c8x83dzm107qb5i0zakvjx4a1c6rr814c7xrlhl"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; };
+  skpr = derive2 { name="skpr"; version="0.49.1"; sha256="0qsqa9lbrch5vs0hfp6k8vcrh0xgcjm23lpi5prrdh3h93lqjhxf"; depends=[doParallel doRNG foreach iterators kableExtra knitr lme4 nlme Rcpp RcppEigen rintrojs shiny shinythemes survival]; };
+  skynet = derive2 { name="skynet"; version="1.2.2"; sha256="1k6909fm40g6ianzjzbrv93x0fx2l8lnwl38krb7r50g1yk7lnrd"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; };
   skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; };
-  sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
-  slam = derive2 { name="slam"; version="0.1-42"; sha256="1pvmfvqa2gcwmap41rp3rx9jrk16jvw80pq0hf5qgja4jlcb01kj"; depends=[]; };
+  slam = derive2 { name="slam"; version="0.1-43"; sha256="0hy4qzngcgafxxr6ld7n9a9wy979ji998gpcc32vidwyab66dj5h"; depends=[]; };
   sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; };
   sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
   slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; };
@@ -11144,33 +11317,34 @@ in with self; {
   slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
   slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; };
   slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; };
-  sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
-  smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; };
+  sm = derive2 { name="sm"; version="2.2-5.5"; sha256="1rw2mxygxsmk8mn4wag1ppjgzk0rlvh6zd8q02qrhjrn9jhi5qj3"; depends=[]; };
+  smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; };
   smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
-  smacof = derive2 { name="smacof"; version="1.10-5"; sha256="102b63b5zyjv0fsmp3in98ckacsgjvpzmv3fwbchdrvf1262aia2"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; };
-  smacpod = derive2 { name="smacpod"; version="2.0"; sha256="05bylhh98qlnq4gn0wwg3wb3pwa1q2kh06v2skj2fgbjgr03fhkn"; depends=[abind pbapply plotrix sp SpatialTools spatstat]; };
+  smacof = derive2 { name="smacof"; version="1.10-8"; sha256="1q3xpfpcgsm98gzavkpsmsidch7sdxwr6iyqpz7cm8qiki8jgjzb"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; };
+  smacpod = derive2 { name="smacpod"; version="2.0.4"; sha256="0dh8n3rxrffr09a8q7vdlin9hq5f2v0hjjjqsmzgwf7ln1b9wcr1"; depends=[abind pbapply plotrix sp spatstat]; };
   smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; };
   smam = derive2 { name="smam"; version="0.3-0"; sha256="1sdr0ki2y9smiwfglgh97kj6y0n1z3blyyxk823xp3467byk1rnb"; depends=[Matrix numDeriv Rcpp]; };
-  smapr = derive2 { name="smapr"; version="0.1.1"; sha256="0ci0j26nsgl4yi0b0bhxqgpn281ml5clhih2nl7hm5l8nybdyp3q"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
+  smapr = derive2 { name="smapr"; version="0.1.2"; sha256="0j4ddlj5km0hmz9q61l93rm6gc7x6iyfgq1fbkjajmij0099mscr"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
   smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; };
-  smartsizer = derive2 { name="smartsizer"; version="1.0.0"; sha256="0lp7qykb6y93aw5w7nbpb4d2vpz6by6zv8j7safhixx4wczlc39k"; depends=[MASS]; };
+  smartsizer = derive2 { name="smartsizer"; version="1.0.1"; sha256="0m474f6dz0izwdh2xvgx6shsbkpr969ckcld56d7c589kjhapbrl"; depends=[MASS]; };
   smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; };
   smbinning = derive2 { name="smbinning"; version="0.6"; sha256="13izdq2pl7hi8ppzmpmiiz4pmc43m63ixjrbj9lwa371vx60ndmh"; depends=[Formula gsubfn partykit sqldf]; };
   smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
   smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; };
   smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
   smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
-  smdata = derive2 { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; };
+  smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; };
   smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; };
   smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
   sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; depends=[lattice]; };
   smerc = derive2 { name="smerc"; version="0.4.5"; sha256="1455fjfihznzivz80jad7pyfjms8yyvmsz6wqdvqv3n6dsyr8fvb"; depends=[fields maps matrixStats smacpod sp SpatialTools spdep]; };
   smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
+  smicd = derive2 { name="smicd"; version="1.0.1"; sha256="05v1lwl2jacrzd4fcp7d386gd70q1kcrr96pnq39zdsniq2j7dn9"; depends=[formula_tools ineq laeken lme4 MuMIn mvtnorm spatstat truncnorm weights]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
   smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
-  smooth = derive2 { name="smooth"; version="2.4.1"; sha256="1iv34nzvz0y2cwlhq7ddm2ym0mdkp7jqxbfik2l64r4mfm8l0k8h"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
-  smoothAPC = derive2 { name="smoothAPC"; version="0.2"; sha256="06f0d4bjygpgcayzg9cxcb5plhsls0ljla2mrmjnjxpq8g3c3cl8"; depends=[colorspace lmtest quantreg rgl SparseM]; };
+  smooth = derive2 { name="smooth"; version="2.4.5"; sha256="0yp7ziikd1w0j091c49zqbfwypp49rfxpn410kbh09bay2fb58x1"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
+  smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothSurv = derive2 { name="smoothSurv"; version="2.0"; sha256="0ypgmqf7mj0x0ibid9qx6cbqn4cpig8333g095b64297bf0syvjc"; depends=[survival]; };
   smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
@@ -11179,11 +11353,11 @@ in with self; {
   smoothr = derive2 { name="smoothr"; version="0.1.0"; sha256="19ylhy7jz445yafdxlygs91vl4vrnnhggc2grwap0dcz0cazik1d"; depends=[sf units]; };
   smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
   smotefamily = derive2 { name="smotefamily"; version="1.2"; sha256="166gqwqljips2r0030m3q44zmxlnxcpb9hmwbg1bk3dqk9gfl8ra"; depends=[]; };
-  smovie = derive2 { name="smovie"; version="1.0.0"; sha256="07sf9nxanfkcp42bv4x12vrlsdr2nnyfgdm6bhcfpggavd4s8r9q"; depends=[revdbayes rpanel SuppDists]; };
+  smovie = derive2 { name="smovie"; version="1.0.1"; sha256="0nh228vp06w83wm826vw62gzy0zk66ng61safwvhl8lgaxkbwqmj"; depends=[revdbayes rpanel SuppDists]; };
   smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
-  sn = derive2 { name="sn"; version="1.5-1"; sha256="0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w"; depends=[mnormt numDeriv]; };
+  sn = derive2 { name="sn"; version="1.5-2"; sha256="16gwr68zzj5v83bqfmzxnzwig3dnjrkxdhs6clri1caqkvrq6aig"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
   snakecase = derive2 { name="snakecase"; version="0.9.1"; sha256="02462vd08asm4ah2brrc3z2s1lqcya80shrd6w743cylv3h3hpyv"; depends=[stringi stringr]; };
   snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; };
@@ -11208,7 +11382,7 @@ in with self; {
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
   social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
   socialmixr = derive2 { name="socialmixr"; version="0.1.2"; sha256="0cj8l1gl7c9hk3hpznfqhblmh79qvi9866713sry538f3kkv897c"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
-  sodavis = derive2 { name="sodavis"; version="1.0"; sha256="1mhmrg7c0chwjw117pzjya5y0ml8mm9ps5b64q5cjchlxr8900nx"; depends=[MASS mvtnorm nnet]; };
+  sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; };
   sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
   sofa = derive2 { name="sofa"; version="0.3.0"; sha256="10f01a23bq6a30f95cilfan588dg0bg36y7g14q46rmcz15cqbrx"; depends=[crul jsonlite mime R6]; };
   softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
@@ -11219,23 +11393,22 @@ in with self; {
   soilDB = derive2 { name="soilDB"; version="2.0-1"; sha256="0nzi0fss77x0bjdzslhy0flwvhap0i0cq3xw82x7sggnbmc3ya72"; depends=[aqp curl Hmisc plyr raster reshape2 sp xml2]; };
   soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; };
   soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; };
-  soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
-  soiltexture = derive2 { name="soiltexture"; version="1.4.5"; sha256="0a9n89ygfqpm6sir76ginri1l6gmw3gfd58szl4ikzaz8fk5hxqh"; depends=[MASS sp]; };
+  soiltexture = derive2 { name="soiltexture"; version="1.4.6"; sha256="1ak8vp6y2cb04118bw5inmwwgjvbxmzpbarr6ga7r1w5i16c7nk7"; depends=[MASS sp]; };
   soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; };
   sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; };
   solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
-  solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; };
+  solrad = derive2 { name="solrad"; version="0.99.0"; sha256="1r3bz2nvg660bfba9xbqlzrysvn0wpmn948qx3hfbqcv5ihcnly3"; depends=[]; };
   solrium = derive2 { name="solrium"; version="1.0.0"; sha256="1rlf60kynqb8pvzllfdkiabxgnqx60hwm8vy86y9f2bh7d7jsdhf"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
-  solvebio = derive2 { name="solvebio"; version="2.4.0"; sha256="0sikq63i6x6vq0h5d8w92yjf6mhnb8nidn18zv27lfmnl0mwwpnm"; depends=[dplyr httr jsonlite mime]; };
+  solvebio = derive2 { name="solvebio"; version="2.5.0"; sha256="1053pmmm1bl5kfrgmlbfnb6xywvv4nwrd6mwn9kyj2p63akvwq1s"; depends=[dplyr httr jsonlite mime]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
   som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="3.4"; sha256="02ghcs0w5pkmc20drynd44cli3s4vkxpksw3h9f828maw2n7q9jk"; depends=[data_table lattice MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="3.5"; sha256="1qsg822y3fsqs7knc8vwlhnnh51d8f8rn7yzvmxiqd8qnrkkmbix"; depends=[data_table lattice MASS Matrix]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
@@ -11247,7 +11420,6 @@ in with self; {
   sortinghat = derive2 { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; };
   sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
   sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; };
-  sos4R = derive2 { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; };
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
   sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; };
@@ -11255,37 +11427,40 @@ in with self; {
   soundgen = derive2 { name="soundgen"; version="1.2.0"; sha256="1k6my6lcwy36fa25glyd8vfr3b57fwx7nz4s24bkf40vp0vkpsc2"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; };
-  sourcetools = derive2 { name="sourcetools"; version="0.1.6"; sha256="0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"; depends=[]; };
-  sp = derive2 { name="sp"; version="1.2-7"; sha256="0q04yfgyjannsrzl0ppwcv0simrxrrbx2iz5mzaafc5x38zf0q3d"; depends=[lattice]; };
+  sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; };
+  sp = derive2 { name="sp"; version="1.3-1"; sha256="17xm1ig80p9wc860hm3bgishz6lj9fxgwqidj7rkbk4ap99qp62p"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
   spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; };
-  spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.2"; sha256="0m1432gkjkkqmzhksv19yca1wyvp5vjwcmpavhiik4ghfx72rgrr"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
-  spData = derive2 { name="spData"; version="0.2.8.3"; sha256="0w638fmzir2z7mn2ybfb88hlfnx1s36ysv7rmhfyf1s6wpyqcswl"; depends=[]; };
-  spGARCH = derive2 { name="spGARCH"; version="0.1.4"; sha256="1bvrhjvw1yyfajm6wyh38dvqkvrx9ymmk45pgbn4qwf47ckryhap"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; };
+  spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
+  spData = derive2 { name="spData"; version="0.2.9.0"; sha256="1yzgfbihpx9xj2vw6amm5sqib9d8xs4p964hlqbvypp4hfphnpwc"; depends=[]; };
+  spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; };
+  spGARCH = derive2 { name="spGARCH"; version="0.1.5"; sha256="14r8b2hj211r3bqk44l5y4zvlqbk6h8pa5i25rn0d9fqr37cks1f"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; };
   spMC = derive2 { name="spMC"; version="0.3.9"; sha256="10cvha5j2pi3b2qiq3jbrc10yi84a595zlg0wshx3wrzxb1rim85"; depends=[]; };
+  spMaps = derive2 { name="spMaps"; version="0.3"; sha256="0w4rrzbybaf9zgb09zg0zkf2hgvfrwx57yzbxm4px1ygdfxyi4cm"; depends=[raster rgeos sp]; };
   spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; };
   spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; };
   spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; depends=[geoR sp]; };
   spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
-  spTimer = derive2 { name="spTimer"; version="3.0-1"; sha256="1vl26d248642grca63kv1rsghqscchkhbybby0fgfg58v042qbs5"; depends=[coda sp spacetime]; };
+  spTimer = derive2 { name="spTimer"; version="3.1"; sha256="1b3d8z8bb8jagr4vcxwqfcq2y37hb975v75ggmpc02jvy228xs1z"; depends=[coda extraDistr sp spacetime]; };
   spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-  spaMM = derive2 { name="spaMM"; version="2.4.8"; sha256="15hwz4824m3p7vn6faiffx62zwz0ipqs5z8q6r208vy0jivawwsl"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; };
+  spaMM = derive2 { name="spaMM"; version="2.4.35"; sha256="1b013kyrhld2y4wr69v4bkii4qjp38hrp1srmmj5ldb68zw3vadz"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; };
   spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; };
   space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
-  spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; };
   spaceNet = derive2 { name="spaceNet"; version="1.0.1"; sha256="005jz7bm3c7zi3pgm8wyivc2kl058c0lwdjjzv0qb1vdsq9mpxx1"; depends=[MASS permute RcppTN Rfast sna vegan]; };
   spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
+  spacesRGB = derive2 { name="spacesRGB"; version="1.0-4"; sha256="0bifagywaksn27cdfsln52f5nwsaj347xilp812shmcma29b08ig"; depends=[]; };
   spacetime = derive2 { name="spacetime"; version="1.2-1"; sha256="1i6yrmyr9vc5lr99w7qhr0jqdx97ckjqay5g0lqdrk98sygpfl4g"; depends=[intervals lattice sp xts zoo]; };
   spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
   spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
   spacyr = derive2 { name="spacyr"; version="0.9.9"; sha256="1zdn57k5iacy73xmac32mslqzidpn3d38qyrnbzkzv2slysqwgkw"; depends=[data_table reticulate]; };
   spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; };
-  spam = derive2 { name="spam"; version="2.1-4"; sha256="0xdr6rmbsx6qq3n4225hr9sma56f33p4pbfirb4r1wxspy5d0zi9"; depends=[dotCall64]; };
-  spam64 = derive2 { name="spam64"; version="2.1-4"; sha256="186q2yl7kjmh13k51zysa6c86dcsydiaam51c2v9v8gk8pgagfgf"; depends=[]; };
+  spagmix = derive2 { name="spagmix"; version="0.2-0"; sha256="16yzkq1z5qj21milyw98a5bk7gvi6k3mbwgvnw7s8ckr40pbp48l"; depends=[abind MCMCpack mvtnorm sparr spatstat]; };
+  spam = derive2 { name="spam"; version="2.2-0"; sha256="02v78dmf263drmz3y099gbakbcvaxkb18900s7sw440cjfv691d1"; depends=[dotCall64]; };
+  spam64 = derive2 { name="spam64"; version="2.2-0"; sha256="1kyj93drzvd4ph6x7wr318xq3ldrrdxb17rwxws39wa4gj7jkmkg"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.3.2"; sha256="1dg4wnvxhybhagag9xx27af6760dlclaivx27mfxywfha312xfpn"; depends=[magrittr xml2]; };
-  spant = derive2 { name="spant"; version="0.9.0"; sha256="0cfvi5pxg1wg9kl9rxrarbb3jaxwjfwy34lmg1yy5nj8ld8lzlfc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd tkrplot]; };
+  spant = derive2 { name="spant"; version="0.10.0"; sha256="0kvxaaqij2wnjchp4zrqkwnsp6g767mx840xvyb8lq01a9k7jjyn"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
   sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
   spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
@@ -11294,7 +11469,7 @@ in with self; {
   sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
   sparkavro = derive2 { name="sparkavro"; version="0.1.0"; sha256="0jihqvjs7dgyxhyzhsbki7khy7fjniwf9xwlangzqfi4rcan8g7x"; depends=[DBI dplyr sparklyr]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="0.7.0"; sha256="0lyn5xlz7a826dmlihn6jp2kq72abr3jy0ylsa4lvk9sj3acy988"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; };
+  sparklyr = derive2 { name="sparklyr"; version="0.8.4"; sha256="1gmzg8464wqygx8r0rh1d67a2h9zpm98y6jwi3ay4adw7bnffhvx"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny tidyr withr xml2]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; };
   sparr = derive2 { name="sparr"; version="2.2-11"; sha256="01li60cybv9kg54zkc9rh4ra6danzbnap9rx59pgfj7zkhs2phmn"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
@@ -11302,11 +11477,12 @@ in with self; {
   sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; };
   sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.2"; sha256="12143qij3p8vry9i02i52nj00m1ckkwg2rq99dq00dq43axcpvgw"; depends=[data_table MASS Matrix mgcv refund]; };
   sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.3"; sha256="1a0pkbb7yk9pp57zyy96k7p5xy1s44jbfy0nz8zyw4h774369yfm"; depends=[Matrix Rcpp RcppEigen]; };
+  sparseIndexTracking = derive2 { name="sparseIndexTracking"; version="0.1.0"; sha256="1r636msdvmajxhc8chq40x01cg1ykdxl66qw83pg291x19bg1wvm"; depends=[]; };
   sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; };
   sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; };
   sparseMVN = derive2 { name="sparseMVN"; version="0.2.1.1"; sha256="0ikh1i4vid6r4sx9pdjqc5wbh4xdj966mr0b7jb1vjw18wrzad8q"; depends=[Matrix]; };
   sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
-  sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; };
+  sparseSVM = derive2 { name="sparseSVM"; version="1.1-6"; sha256="0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0"; depends=[]; };
   sparsebn = derive2 { name="sparsebn"; version="0.0.5"; sha256="19315nzj9pz98498amlhas6ii3vwvn3qxz5a6136nh2xfwfg2bhc"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
   sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.6"; sha256="02a75ldvxfn0awn2aaws3fgd4zzk1jjfry4nxjf3y1grdbbz396y"; depends=[Matrix nnet]; };
   sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; };
@@ -11318,13 +11494,13 @@ in with self; {
   sparsesvd = derive2 { name="sparsesvd"; version="0.1-4"; sha256="1yf373552wvdnd65r7hfcqa3v29dqn7jd4cn431mqd2acnqjrsam"; depends=[Matrix]; };
   sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
   sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; };
-  spartan = derive2 { name="spartan"; version="3.0.0"; sha256="1q78l04nbrllrsk14haln5s829rkkhkhmb34xzfgyd8glbi7z4ay"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
+  spartan = derive2 { name="spartan"; version="3.0.1"; sha256="15gn72cgbb3hf6grq2hhh2vxd3in0jp62k11qfap6fy9rm4cnqg6"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
   spass = derive2 { name="spass"; version="1.1"; sha256="1kr2ixyvsm82h2brdm51bzll69632mkj9f88a2ny0pcyqrbggg83"; depends=[geepack MASS multcomp mvtnorm Rcpp]; };
   spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; };
   spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; };
   spatial_gev_bma = derive2 { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; };
-  spatial_tools = derive2 { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[abind doParallel foreach iterators mmap raster rgdal]; };
+  spatial_tools = derive2 { name="spatial.tools"; version="1.6.0"; sha256="1jh9psc2im0mp52mmz596x5h64m6w1d8hibnm7x52di5j2jp29vz"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; };
   spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; };
   spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; };
   spatialEco = derive2 { name="spatialEco"; version="1.1-0"; sha256="1cvll6z775w8nvl5q5p62qgp3j2d0kcdb2avqwcqybk23jlxl7dr"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; };
@@ -11334,12 +11510,12 @@ in with self; {
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; };
-  spatialwarnings = derive2 { name="spatialwarnings"; version="1.0"; sha256="1j8zr9pv769ji9ynzrhah3nd56mjjap450c28g26ff00l3kr9l03"; depends=[ggplot2 moments plyr poweRlaw Rcpp RcppArmadillo reshape2 tidyr VGAM]; };
-  spatstat = derive2 { name="spatstat"; version="1.55-1"; sha256="01rzaaws3nkzqdpqvq54glxxl611gz8vi7l7jv988685y8r8q4wa"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
-  spatstat_data = derive2 { name="spatstat.data"; version="1.2-0"; sha256="0nzw5y1in36mib5g4v076b9jii71jjidxajn3n8v67lvl48dmwgm"; depends=[spatstat_utils]; };
+  spatialwarnings = derive2 { name="spatialwarnings"; version="1.2"; sha256="1kpyx1jl23ml4gpbwz5p4srmdq58634dxznw1g6f618wml13ab3s"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; };
+  spatstat = derive2 { name="spatstat"; version="1.56-0"; sha256="0gigb7vpgpwg4hrwsl9wncknrl2c7i4iv9aab2qskbc5z7xxjs4v"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
+  spatstat_data = derive2 { name="spatstat.data"; version="1.3-1"; sha256="13wb9c1r7g2lrrjv7a2qmkyz27yjmcasl9qrzgk09akqgikkbbf3"; depends=[spatstat_utils]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.5-7"; sha256="1sdcx4qxv0z5q97rljn34mssbs4w6qbqxhn71xmkns01xypl1wr2"; depends=[spatstat spatstat_utils tensor]; };
-  spatstat_utils = derive2 { name="spatstat.utils"; version="1.8-0"; sha256="053j67mrnjcw1mdbm3qjvf67hrfnhsma4770r7l67bs4xys2qhfg"; depends=[]; };
-  spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
+  spatstat_utils = derive2 { name="spatstat.utils"; version="1.8-2"; sha256="1wjvwhhyqh8f4cm3xw7vhrnj5qr9vlwkcxkj1l6s4sbjbcli2y2p"; depends=[]; };
+  spatsurv = derive2 { name="spatsurv"; version="1.2"; sha256="0acg6n5qs3z9c7y2n3amla61dm3z1p16njkx0h52dlgdbj5v1nhn"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
   spbabel = derive2 { name="spbabel"; version="0.4.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; };
   spc = derive2 { name="spc"; version="0.6.0"; sha256="118r2yjfmzm0bi3ccx9pzi56vw2kbjz0pbxrjqdks0075fk7ij0q"; depends=[]; };
   spc4sts = derive2 { name="spc4sts"; version="0.3.1"; sha256="1g7q3g486qns8qwpki2nbiy995v7fl1ibmk4645ws9yxgybw5mxj"; depends=[gridExtra rpart]; };
@@ -11351,33 +11527,35 @@ in with self; {
   spdep = derive2 { name="spdep"; version="0.7-7"; sha256="0wrlximy4w5y5aszy3pacmf3ag224chl12q4rj4r7ky6zw2sn1ns"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; };
   spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; };
   spdplyr = derive2 { name="spdplyr"; version="0.1.3"; sha256="1f34yzj9z4f1dj7pqaayk0mvabzwa6kc3kwi1pmpikl1afgsyv25"; depends=[dplyr lazyeval rlang sp spbabel tibble]; };
-  spduration = derive2 { name="spduration"; version="0.17.0"; sha256="1s41rs5nbdrknn6ag7zn8ds3203q2x5z5mb9vf80y6ba6w3ksr32"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
+  spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
   spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-  speaq = derive2 { name="speaq"; version="2.3.1"; sha256="18v39nm9h4388asl0vk2w874kpg5spp7fyhib04cyb91hhx910sr"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
+  speaq = derive2 { name="speaq"; version="2.3.3"; sha256="1zrm8xd2laix1rl4fgxscciia9sn932q44p0dsphpd1wr63sh6mv"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
+  spearmanCI = derive2 { name="spearmanCI"; version="1.0"; sha256="1xi51dphv91j5hgrd25sqs1li0g24cwpa1k162arw5b0qfl04f17"; depends=[emplik MASS]; };
   spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
-  speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; };
-  specificity = derive2 { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
   specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; };
+  specmine = derive2 { name="specmine"; version="2.0.3"; sha256="0lq9bv7xa8lfa4axr78ijyjlhdzimlini966729nknlq877mwdgz"; depends=[baseline caret compare devtools ellipse gdata genefilter GGally ggdendro ggplot2 hyperSpec igraph impute KEGGgraph KEGGREST MAIT MASS Metrics pcaPP pls qdap RColorBrewer readJDX reticulate rgl scatterplot3d speaq xcms]; };
   spectacles = derive2 { name="spectacles"; version="0.5-0"; sha256="0i1kzp0fpljcvkws15w3iwgpjig2llhlrfs5blk562kgb7vwshqm"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; };
   spectral = derive2 { name="spectral"; version="1.0.1"; sha256="0mawgxz1gbzgb3lxm6gfbv3wan0ykziprqym8ajvdjsdq4fwkk2m"; depends=[rasterImage Rcpp]; };
   spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
+  spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; };
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
-  spectrolab = derive2 { name="spectrolab"; version="0.0.4"; sha256="1vmrpszjwl9iq8z6p8rhh560l79iya6rah7jld8ykvm9irwdf15h"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; };
+  spectrolab = derive2 { name="spectrolab"; version="0.0.6"; sha256="0pzisyi64f9wm79qxw22rmgm6lsgn6jqavxh688yrm94nnn1qv5h"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
   spef = derive2 { name="spef"; version="1.0-7"; sha256="006qp0qsqrlbbbv4b86ikqz1ig0php0cahqz4c9n3js1kxwsdi7d"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
   speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
   spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
   spelling = derive2 { name="spelling"; version="1.1"; sha256="10zhzbpyjw5lkg4iyjwgs5xp2c8bgwyzjg146fcml6cjs6xhl8ni"; depends=[commonmark hunspell knitr xml2]; };
+  spemd = derive2 { name="spemd"; version="0.1-1"; sha256="1aw8dg2fm8qd95bgim2kjwp7ax4b2g78521llsxv7fhdj9hl7rgw"; depends=[MBA sp spdep]; };
   sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; };
   sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; };
   spew = derive2 { name="spew"; version="1.3.0"; sha256="09g8j5v5k455c3kqm1fn09ql3x34xy22igicakwl99s8gsln7v3p"; depends=[maptools plyr sp]; };
-  spex = derive2 { name="spex"; version="0.4.0"; sha256="0b2zcpbjr8lqfsmwvmy4lp88xz16v7fyqx1yv10yhcgxlgw0yw8p"; depends=[quadmesh raster sp]; };
+  spex = derive2 { name="spex"; version="0.5.0"; sha256="0xl6783jgrwqb5vg6x8r2ps7s278qc39nrjl1cj6ikf0x59ffm3r"; depends=[proj4 quadmesh raster sp]; };
   spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
   spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; };
   spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; };
-  spgs = derive2 { name="spgs"; version="1.0-1"; sha256="1jabgcc8bd6kikcd5rv9xczbg6r52mwyc68r8filn5i0gva4by57"; depends=[]; };
+  spgs = derive2 { name="spgs"; version="1.0-2"; sha256="0cfi5d0cpfj5sfni18xhira807z7sf88c6rpiyml6abrq7vbi5zv"; depends=[]; };
   spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; };
   sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
   sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; };
@@ -11392,25 +11570,26 @@ in with self; {
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
   splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
   splashr = derive2 { name="splashr"; version="0.4.1"; sha256="1gydnl6qdkqxvgzy3j6n8y4nan4wz6p7wybcgnm5p37n7q6m2rhk"; depends=[curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; };
-  splines2 = derive2 { name="splines2"; version="0.2.7"; sha256="1hh7zd2gqmfc5xx91kjwi465yvq6lwrhgjdim1b40g6canh0ixlb"; depends=[]; };
+  splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; };
   splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; };
   splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; };
   splithalf = derive2 { name="splithalf"; version="0.3.1"; sha256="01ip3brnlyxlxr1hmnmc2w6jg4vm5gjk8fwavclmv7m7hr2bb4xh"; depends=[dplyr tidyr]; };
   splitstackshape = derive2 { name="splitstackshape"; version="1.4.4"; sha256="0vhgb4pysp7hbph7kq8b38m4gqhal40j4p7gij2wrc2rajspzhkq"; depends=[data_table]; };
   splm = derive2 { name="splm"; version="1.4-10"; sha256="0zz28mfs84nqyvl1l0ba7yrhgcxxzw1v0542jc39h4pr537yz1nc"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
-  splot = derive2 { name="splot"; version="0.3.2"; sha256="1nix7pzqlla3iga99pw9jqcylg4j5xpfrf94y0abzpy3z4gq3kgc"; depends=[]; };
+  splot = derive2 { name="splot"; version="0.4.0"; sha256="1g6n10pjjfhxa8sycr1iamwfdhjhp6g2zn5dkynfhg9j7v0dxnyf"; depends=[]; };
   spls = derive2 { name="spls"; version="2.2-2"; sha256="11xp6wnxizc8g91ci9fd7lbjc8pin84c9ak8lr8yg2jyd2l351j9"; depends=[MASS nnet pls]; };
   splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; };
-  splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-137"; sha256="0bpzv6a05hnqnnz2znnkb3f34r56krhc595zjnn82azxj4a53njh"; depends=[]; };
-  splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-74"; sha256="0aikw6ckc0a7lrgjlcdmqspgrx0fc4iysd7jynd2lsf1hxy4pz35"; depends=[splusTimeDate]; };
+  splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-141"; sha256="1z29djg6az8dl47w0b9fpfwhng74xnbh5bq1asv55i8kdm1a4v1s"; depends=[]; };
+  splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-75"; sha256="14bg0yzwk3v0b1qrlfaxv48dpk380ha6wb2w4k02c9vmb51ysmw0"; depends=[splusTimeDate]; };
   spm = derive2 { name="spm"; version="1.1.0"; sha256="0xx1g6ir0sanj2p6xgsdghymx1iy2bzsany2j87q49y5hah7349j"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; };
   spm12r = derive2 { name="spm12r"; version="2.7.4"; sha256="0v0zmsbzk6446n1yipz3w99n0n4yya6idff3gfyj7fgq10pcalgz"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
-  spmoran = derive2 { name="spmoran"; version="0.1.3"; sha256="1bvq91k346w2cvb3yi10qgidabf3s8whlk6glqrlb1k6na7l8k3y"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; };
+  spmoran = derive2 { name="spmoran"; version="0.1.4"; sha256="0b58c2v57qj14icd577mpsgxwa84lyib4v9qxcbl26im4dhikmfm"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
   spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; };
-  spocc = derive2 { name="spocc"; version="0.7.0"; sha256="0ar107c7snbh1iaib3xddng88861h3gc56whicx5krl3zf2xgjqa"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
+  spocc = derive2 { name="spocc"; version="0.8.0"; sha256="00wm3fkwzcma847kfxliap66sr0i6vfr0kpkvcdjidgk3z51y3bw"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
   spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
+  spotGUI = derive2 { name="spotGUI"; version="0.2.0"; sha256="05x8i1295qjdzyr1ri5c85lgcmj3sahamdwgzknf87dsc9r4hjcz"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; };
   spotifyr = derive2 { name="spotifyr"; version="1.0.0"; sha256="1f7sv6qc8bim8vkcsma96zdzd1ci73dpag2dp27mqjcbh716xfy0"; depends=[dplyr httr lubridate purrr tidyr]; };
   spp = derive2 { name="spp"; version="1.15.4"; sha256="0gjg0g30y9w445mimrd29s44ryla1bmh1mdwj4hb85s1yi1l4h25"; depends=[BH caTools Rcpp Rsamtools]; };
   sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
@@ -11422,21 +11601,21 @@ in with self; {
   spsann = derive2 { name="spsann"; version="2.1-0"; sha256="0smxkcizs38m84d1d7852hsw699blv6x0n1ma9bi071r9lngljm5"; depends=[pedometrics Rcpp sp SpatialTools]; };
   spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; };
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
-  spsurvey = derive2 { name="spsurvey"; version="3.3"; sha256="1xpjimqkrwm77amqza4713psmg86bvz08gxdi35advq4w614f2w1"; depends=[deldir foreign Hmisc MASS rgeos sp]; };
-  spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
+  spsurvey = derive2 { name="spsurvey"; version="3.4"; sha256="0bi2d5jfqbnhhfhs79wid7ksg77vh8r5r8q2g4zbzpjgc9c67lj4"; depends=[deldir foreign Hmisc MASS rgeos sp]; };
+  spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; };
   sptemExp = derive2 { name="sptemExp"; version="0.1.1"; sha256="0a4y355j24sll8jmm17lh4j13k21b3nlalsxzpzx2gp5xw1x7jr6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
   sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; };
-  spuRs = derive2 { name="spuRs"; version="2.0.1"; sha256="1vjyhm4dvqm5d4kqjiwk7yy85455dgv4sy9kr5427zci3jlmxqij"; depends=[lattice MASS]; };
-  spup = derive2 { name="spup"; version="1.2-1"; sha256="05cl4kddg2f37238am92bbkyl5davd2a6jjb1akzn1v3ha6qbhpq"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
+  spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; };
+  spup = derive2 { name="spup"; version="1.3-1"; sha256="0xq9z9iy3bwqhzq783qydgmczxvh7knkk9vdvwnbpbk0rbjgq3kn"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
   sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; };
   sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
-  sqlscore = derive2 { name="sqlscore"; version="0.1.2"; sha256="0pl4nf59b8jy8rkqs2z684lxfqh01284h3cx97a1igpy4qqj712b"; depends=[dbplyr]; };
+  sqlscore = derive2 { name="sqlscore"; version="0.1.3"; sha256="0043ri91zzl08f47kjkvwqqnb8p7k2qlksg988x1dhna28n519va"; depends=[dbplyr]; };
   sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
   squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; };
   squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
   srp = derive2 { name="srp"; version="1.0.0"; sha256="10mpyy8q419dw0zd96l0z8lkxpcyn1l5fvnyvr3n0lyl6jmf91sy"; depends=[fda mgcv]; };
-  srvyr = derive2 { name="srvyr"; version="0.3.1"; sha256="1xad4n3bpldaaci83mvpfa8sq6bh0ll5k1fgrapwb8142hvk6m13"; depends=[dplyr magrittr rlang survey tibble]; };
+  srvyr = derive2 { name="srvyr"; version="0.3.3"; sha256="0xarb92xhsb3c6g45lqq9kgp5yy0y9psi7yrn7yvv1a130lwzs40"; depends=[dplyr magrittr rlang survey tibble]; };
   ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
   ssa = derive2 { name="ssa"; version="1.2.1"; sha256="10x58c57pa9x6svm4h4xrss72ikin9lpf3ihjwmnkgnaicvsd0bx"; depends=[iterators]; };
   ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
@@ -11445,6 +11624,8 @@ in with self; {
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
   ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
   ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
+  ssgraph = derive2 { name="ssgraph"; version="1.4"; sha256="1k1ignb6gsjwwsqlkxjlr3pm6avzf9z3aj069f6y0hglz3g74qv0"; depends=[BDgraph igraph Matrix]; };
+  ssh = derive2 { name="ssh"; version="0.2"; sha256="12v5yfkaqlbixifw6sfdbjw88fc604sryg4ygml7k383nr8rpklf"; depends=[getPass]; };
   ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
   ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
   ssizeRNA = derive2 { name="ssizeRNA"; version="1.2.9"; sha256="1916r0hmhpfa0p1s8myqk8g4i8fgjqkm4wvpb4nf3sl69kfdva95"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
@@ -11456,14 +11637,17 @@ in with self; {
   sspse = derive2 { name="sspse"; version="0.5-5"; sha256="07656miqrv9g5nn3ahyfj7wb010cwkr3qjhysbsih0p43dwczq0y"; depends=[coda]; };
   ssrm_logmer = derive2 { name="ssrm.logmer"; version="0.1"; sha256="1i9rrsixl3swd04w1gf9gf1r2wb9nkvwhc8ld4bx4zxzm1031f67"; depends=[sfsmisc statmod]; };
   sss = derive2 { name="sss"; version="0.1-0"; sha256="1qg56g60h8c52l8lpxihxsdgnqkxiag1mzh3p388r9hhff7g3g0k"; depends=[assertthat xml2]; };
+  sssc = derive2 { name="sssc"; version="1.0.0"; sha256="00m5zfd3jnbxa8x76v4pfyl4qdfq90n8rqx4hngany0ka1z5g7m6"; depends=[changepoint e1071 ggplot2 VGAM]; };
+  sstModel = derive2 { name="sstModel"; version="1.0.0"; sha256="04dvj6dbxidn1df2rslppl2pw2ql09rag39jrzdbnv6z20szbbd9"; depends=[data_table MASS openxlsx readxl shiny shinydashboard]; };
   ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
   ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; };
   st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
-  stR = derive2 { name="stR"; version="0.3"; sha256="0zad25s9wp4lapkww3rdbqsd4y7p8xhz9is7avq400srxakinx7n"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
-  staRdom = derive2 { name="staRdom"; version="1.0.3"; sha256="07ciabm0wakzdybhgdmiakdh7mygc38c8vqs9czgq65729928aqq"; depends=[doParallel dplyr drc eemR foreach GGally ggplot2 multiway plotly pracma readr stringr tibble tidyr zoo]; };
+  stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
+  stUPscales = derive2 { name="stUPscales"; version="1.0.3.1"; sha256="0qs8lj50jrkyh4dmiinpg6dxfs68x6zlp0knr2ckpgik3v51r52z"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; };
+  staRdom = derive2 { name="staRdom"; version="1.0.8"; sha256="15khv32jbhjq73kr60al39ppf4pps7n48220jhp7sc04fcbi8fwd"; depends=[data_table doParallel dplyr drc eemR foreach GGally ggplot2 matrixStats multiway plotly pracma readr stringr tibble tidyr zoo]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
   stability = derive2 { name="stability"; version="0.2.0"; sha256="154dp26aghznibnp9h7j86hi30caylvyxp87jkf2p7cb4l3qn5r4"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
-  stable = derive2 { name="stable"; version="1.1.2"; sha256="11irpn0qfblzskdr71991jlmdrbqqqpszppn5pii3lr5hflqqr1d"; depends=[rmutil]; };
+  stable = derive2 { name="stable"; version="1.1.3"; sha256="1fbyba91qi536mbb7hs6bvi1zgwdjvnv6ih7ykyyhkxk85cmfmq3"; depends=[rmutil stabledist]; };
   stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; };
   stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
   stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; };
@@ -11475,8 +11659,8 @@ in with self; {
   stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
   standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; };
   stapler = derive2 { name="stapler"; version="0.6.5"; sha256="0xhwlm3iyxxmaaf0smj8g5zdawb51d7dc636czbvk5g551g7wfdb"; depends=[matrixStats RNifti]; };
-  staplr = derive2 { name="staplr"; version="1.1.0"; sha256="08kk1zi89ggyli05y7lr1vhq4xszjp6z5jscaaknp38gav7jd5lc"; depends=[]; };
-  stargazer = derive2 { name="stargazer"; version="5.2.1"; sha256="1nfmb8qka6qxhjagk1a9am43dgnp39fy4cjbygivzp2hlzy22f46"; depends=[]; };
+  staplr = derive2 { name="staplr"; version="2.2.0"; sha256="0h75v8mxz1i9fi31pim7xpbsji8fjj3swp69m9yn75qv76bgjjxx"; depends=[assertthat stringr]; };
+  stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; };
   starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
   starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; };
   startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; };
@@ -11484,29 +11668,30 @@ in with self; {
   startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; };
   statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; };
   statar = derive2 { name="statar"; version="0.6.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; };
-  statcheck = derive2 { name="statcheck"; version="1.2.2"; sha256="0bcv8klp75q8hlmwhax9lxx9i0kbhsz8442acbhxh5fn2pn2x9jm"; depends=[ggplot2 plyr]; };
-  statcomp = derive2 { name="statcomp"; version="0.0.1.1000"; sha256="0ac4s8a955ka0rs2a3k93aq2cxzrc48ai0sl9kn4yaqcw1arv2ap"; depends=[zoo]; };
+  statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
-  states = derive2 { name="states"; version="0.2.0"; sha256="0gwisvzww7jl0n5ck8rnnw4ikr8gyq94m3362sdjmic9h7318f03"; depends=[dplyr lubridate]; };
+  states = derive2 { name="states"; version="0.2.1"; sha256="1f0cwv1jkl4nw0p31p147g71nira5f4hwq8lhjnmns28xq04by24"; depends=[dplyr lubridate]; };
   statesRcontiguous = derive2 { name="statesRcontiguous"; version="0.1.0"; sha256="0yzi6ycfj4cc4q0zzzckdz65wp9m4yx6fi7kp9nssj9pj6a8xlrp"; depends=[dplyr magrittr sf]; };
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
   statip = derive2 { name="statip"; version="0.1.5"; sha256="1gyn86kg96yrs9drc23xabf4s8ii32hgjla310sy6pd7c97bwqgf"; depends=[bazar dplyr]; };
   statmod = derive2 { name="statmod"; version="1.4.30"; sha256="07v4x8af60alcw6vbiwf5fp25bhra61kvxz9kqx64lszm0i1fb4x"; depends=[]; };
   statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
-  statnet_common = derive2 { name="statnet.common"; version="4.0.0"; sha256="0yw6l5b4qv0jqlg4zyczas7m12a5pyqghs6ydxy2f6v6vxkijvi0"; depends=[]; };
+  statnet_common = derive2 { name="statnet.common"; version="4.1.4"; sha256="14dydm4c4dzc4v6ldxpn04q551nczzfablwibrd8lzgja8x9ksic"; depends=[coda]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
-  statprograms = derive2 { name="statprograms"; version="0.1.0"; sha256="1jm8vnzccx34rhypkc5brx52k0f0g4z9cckzib43i5fcqd4skib6"; depends=[]; };
+  statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; };
   statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; };
   statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; };
+  statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; };
   stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; };
   stdReg = derive2 { name="stdReg"; version="3.0.0"; sha256="0mjn2zvpadxm3q5kw4v3jpfmx94chjxdf8n1m7c4dm7gfaj0q38x"; depends=[data_table drgee numDeriv survival]; };
   stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; };
   stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; };
   steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; };
+  steemr = derive2 { name="steemr"; version="0.0.4"; sha256="10x90l00mq1aq7xf69vl7lpax0gl9grq182ixp3iwn3pa1wifmpm"; depends=[lattice openair RCurl rlist tm VennDiagram wordcloud XML zoo]; };
   steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
   stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
   stellaRbase = derive2 { name="stellaRbase"; version="0.1.0"; sha256="1jwhh14wk57z8acg8vjd7m3nwq0vq4w0x9ml8zhk3gnl4czq8m04"; depends=[data_table httr RJSONIO]; };
-  stepPenal = derive2 { name="stepPenal"; version="0.1"; sha256="09viapb4846g91jzf9364rdyd865b19v83pwcdm3p3xsjry9ffxk"; depends=[caret dfoptim glmnet mvtnorm pROC]; };
+  stemmatology = derive2 { name="stemmatology"; version="0.3.1"; sha256="1ln5cvn4yldr8xdgadlfzkgxbv6im39mdsdz597zailqnfsr576g"; depends=[cluster igraph xml2]; };
   stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; };
   stepR = derive2 { name="stepR"; version="2.0-2"; sha256="0inxlgihyivfr0l4gk8zq0043l9s5w4r3x3hwjlzfwbqjkwy1rjs"; depends=[digest R_cache Rcpp]; };
   stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; };
@@ -11520,21 +11705,21 @@ in with self; {
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
   stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; };
   stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; };
-  stminsights = derive2 { name="stminsights"; version="0.1.2"; sha256="17vpkrhhv8k5wyyrnc2hza175p51yl2nghvv9y2ymq27x4r2xq5c"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
+  stminsights = derive2 { name="stminsights"; version="0.2.0"; sha256="0s4gnb3cb5vb4x4vmwa2dz7l7m8d0mqhrc8lmaa912s16y05y63z"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
   stoRy = derive2 { name="stoRy"; version="0.1.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree R6]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
   stochvol = derive2 { name="stochvol"; version="1.3.3"; sha256="0cg61djjfw4jmq71g8kddrihdy9n2vlpzlf7kl2f3p8njc1f8kk2"; depends=[coda Rcpp RcppArmadillo]; };
-  stocks = derive2 { name="stocks"; version="1.1.2"; sha256="1i77cg4vmmc362ixqqkz48wipsszmb1z8pjrh713d27726nhj3ig"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp zoo]; };
+  stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; };
+  stocks = derive2 { name="stocks"; version="1.1.3"; sha256="0zpmx32dxv672ifk1m725ww286g4r09dvxvnk146vpwlk4mk11d0"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp zoo]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
   stopwords = derive2 { name="stopwords"; version="0.9.0"; sha256="050v3hq1wd3w83zrp76nv6n67qsf5fss2cbihb6waijancm7zfzh"; depends=[ISOcodes]; };
   stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
-  storr = derive2 { name="storr"; version="1.1.3"; sha256="0rmljnlnbi5jdxbh5mzxgkq9aa3mm46kl04jlasyng8pv3prxj1v"; depends=[digest R6]; };
-  stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; };
-  stplanr = derive2 { name="stplanr"; version="0.2.3"; sha256="1h6vflcb9pmfl2h3rny3p79isrd5gkp0cblvwi2yfvxi2ll5axp9"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; };
-  stpm = derive2 { name="stpm"; version="1.6.8"; sha256="0gifkrpp8n4r31i4dfvjfq7w0l6jfid43i94ygqwwv0ca583aw4y"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
+  storr = derive2 { name="storr"; version="1.2.0"; sha256="0rsj84yfvy3y02cv0s25fq6ji4rfh7nnrpacbka0lhrxf698h5ga"; depends=[digest R6]; };
+  stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; };
+  stplanr = derive2 { name="stplanr"; version="0.2.5"; sha256="0r386bvsmglap6cxs6k3mn8bdahlbxb3qv2k4iqg2fr2r62dalf7"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; };
+  stpm = derive2 { name="stpm"; version="1.6.9"; sha256="1pj8lxych7fgrimi5c237f4vi6yc51ya3zwcq0qk3py96nixcpxn"; depends=[knitcitations nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
-  stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; };
   strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; };
   stranger = derive2 { name="stranger"; version="0.3.3"; sha256="0p0ssba5q192g7pviv1shmh1lpcdjmzdim3rp1qs3hrd1d3pn4vq"; depends=[assertthat data_table dplyr ggplot2 tidyr]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
@@ -11545,18 +11730,17 @@ in with self; {
   stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; };
   stratifyR = derive2 { name="stratifyR"; version="1.0-1"; sha256="0w135smkgryx29ppa7khpay8w04b3g2pxka0wsqlhksrp5pqa086"; depends=[actuar fitdistrplus mc2d triangle zipfR]; };
   stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; };
-  straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-  stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
+  stream = derive2 { name="stream"; version="1.3-0"; sha256="0wj6j070wmiw50vmjs075jm7k7aaryq4qm8dnj522vr7g0ryvkdh"; depends=[animation BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamMOA = derive2 { name="streamMOA"; version="1.1-4"; sha256="09vspcz806j2f397hr8h685vy4xbx419bbha91f44s3bhks1y7fr"; depends=[rJava stream]; };
-  streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
+  streamR = derive2 { name="streamR"; version="0.4.3"; sha256="174iliizvr050mm3z9gz44f264xp1kclbvq1amynqal2kv8k7yj1"; depends=[ndjson RCurl rjson]; };
   streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
   strider = derive2 { name="strider"; version="1.1"; sha256="00r6gbvwmla5h27iyi7rdfd0kr4alxz19fd7g2ba0in3779za3sw"; depends=[BH Rcpp]; };
   stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
-  stringdist = derive2 { name="stringdist"; version="0.9.4.7"; sha256="1qg80wmcrpkba9njvgjdg15bgw7ddks40kkfh5x61as9lhchy4i4"; depends=[]; };
+  stringdist = derive2 { name="stringdist"; version="0.9.5.1"; sha256="0gap1g9xwhp0zxqsznkc2carpvi80z03prr4q8m528684lznx2xa"; depends=[]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; };
-  stringi = derive2 { name="stringi"; version="1.1.7"; sha256="0nck1s2iglmkrn15ay2chrrwsy5lngcylz2sc87fxy5skxaahxdl"; depends=[]; };
-  stringr = derive2 { name="stringr"; version="1.3.0"; sha256="07dvfbkhv8gk6l32j43jvxpmqlhqp0mdby406h5a3bsc6k94ic13"; depends=[glue magrittr stringi]; };
+  stringi = derive2 { name="stringi"; version="1.2.3"; sha256="1sgg4krw03qkz1n4dwiya0djggk7giwd0w21qlp0pfjqi0rxq6qx"; depends=[]; };
+  stringr = derive2 { name="stringr"; version="1.3.1"; sha256="0hq3ybz7clnifi5wdm2s6p2i0kzljdkv26blg6yphng472h8x2vs"; depends=[glue magrittr stringi]; };
   strip = derive2 { name="strip"; version="0.1.1"; sha256="18pz6ix6d661fvg1k1yyyiiwa1gdixynmpxl725ffd9lpykmfqbw"; depends=[rlist]; };
   stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; };
   striprtf = derive2 { name="striprtf"; version="0.5.1"; sha256="1pv67grm8fb1plsfxrfrmv0yk6cjnf44ssawddlcxy9mvg3ka5mm"; depends=[magrittr Rcpp stringr]; };
@@ -11568,8 +11752,8 @@ in with self; {
   stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; };
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; };
-  styler = derive2 { name="styler"; version="1.0.1"; sha256="01iy3p0jn57c2glq2a5wh7ds3fyxlmcjpvxnmafvvvlhca73zw88"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; };
-  stylo = derive2 { name="stylo"; version="0.6.6"; sha256="01kkwzhpcf6nrvbj2dgyh2a10p48gxlgq78smv5x8cn8vcfl1ixa"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
+  styler = derive2 { name="styler"; version="1.0.2"; sha256="0rsbaszwr0089imcwracjss52ivjzlcba9j0sqvpza4qgd0yjmd4"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; };
+  stylo = derive2 { name="stylo"; version="0.6.7"; sha256="0l5msnv6sk90p3l7ma2q31yn93y1zj86y5hzzg2fws4r0pi09p19"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
   subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; };
   subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
@@ -11580,10 +11764,10 @@ in with self; {
   subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; };
   subplex = derive2 { name="subplex"; version="1.5-4"; sha256="10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"; depends=[]; };
   subprocess = derive2 { name="subprocess"; version="0.8.2"; sha256="1qyl8726vq94vqd6iyh9kca6wwxi3g7yv4b784wn2ifrm4waixxd"; depends=[]; };
-  subrank = derive2 { name="subrank"; version="0.9.9"; sha256="1z6sp9rfmpy28gpw13bh0c7y98lbbgv1cciavg3gix01whqa49n3"; depends=[]; };
+  subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; };
   subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; };
   subscore = derive2 { name="subscore"; version="2.0"; sha256="1vscmzw6ama2kc7ic6b2rfbbczcpyhp0m4dd5khg9vkyihww5b5h"; depends=[CTT irtoys]; };
-  subscreen = derive2 { name="subscreen"; version="0.2.2"; sha256="08s8ys0ban80xbyfzjimbgld4622c5bn0qwjmsa7g0dn5ss3ccq9"; depends=[data_table plyr]; };
+  subscreen = derive2 { name="subscreen"; version="1.0.0"; sha256="04xkmiwwf0jaf4ij6kwbivrpy94hk030zcsm8jgf7xq5pb7rf5kr"; depends=[data_table DT plyr shiny]; };
   subselect = derive2 { name="subselect"; version="0.14"; sha256="03sfnpj219a0ma92c2z953bh2y6s7w2c84lf2shnghmmxmg7jq9l"; depends=[corpcor ISwR MASS]; };
   subsemble = derive2 { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
   subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; };
@@ -11591,12 +11775,13 @@ in with self; {
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
   sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-11"; sha256="1hv9d99ir1xz6p0arxr77dv5qb45sr8jhapm6wf755l7pxlqqklq"; depends=[magrittr]; };
-  sugrrants = derive2 { name="sugrrants"; version="0.1.1"; sha256="08f5xdgimdvpivzrlwvdyrmy21nbh379pgfdrx4lxqcxd55y2hil"; depends=[dplyr ggplot2 lubridate purrr readr rlang tidyr timeDate]; };
+  sugrrants = derive2 { name="sugrrants"; version="0.1.2"; sha256="0l9v2wqb8wsp002gc802xcawwyv56rn765ipp6d1mzds3sp438h7"; depends=[dplyr ggplot2 lubridate purrr readr rlang tidyr timeDate tsibble]; };
   sumFREGAT = derive2 { name="sumFREGAT"; version="1.0.0"; sha256="13g3px3c3dxacrvgwrvqdp8lm7k185npr0dlq3siq9x9mgjr7hsj"; depends=[Matrix]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
-  summarytools = derive2 { name="summarytools"; version="0.8.3"; sha256="0b61131yns1ip4r5qgrfbwd6dqsgg349jfhlgfkvlszh5b9jqhnf"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; };
+  summarytools = derive2 { name="summarytools"; version="0.8.5"; sha256="0455csyz3hd9armpw18r1lgbzbyr6i43wyampp4n0s0lr95flp46"; depends=[htmltools lubridate matrixStats pander pryr rapportools RCurl]; };
   sunburstR = derive2 { name="sunburstR"; version="2.0.0"; sha256="1gkrgm90ps5i1k5cqdw6sbvd4jgbk4yq82gwd5m1z1jhv1shfsf4"; depends=[d3r dplyr htmltools htmlwidgets]; };
   suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; depends=[V8]; };
+  sundialr = derive2 { name="sundialr"; version="0.1.0"; sha256="0r6nijpj6vbz9ssrdhxn01frhahnqg4n1bsfg6d43c1smj563y6m"; depends=[Rcpp]; };
   supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; };
   supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
   supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
@@ -11604,11 +11789,12 @@ in with self; {
   superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; };
   superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; };
   superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; };
-  supernova = derive2 { name="supernova"; version="1.0"; sha256="18hyfq7gqx9n4s95yymkazyif9gzscrgfckis0s7hbban08iimpr"; depends=[]; };
+  supernova = derive2 { name="supernova"; version="1.1"; sha256="0n34fkscml6ldbcr6kk8c6n4f5z4j398qn1vsp06h3b0h6sl5rrb"; depends=[]; };
   superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
   supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; };
+  support = derive2 { name="support"; version="0.1.1"; sha256="0031dqkjwsi7s7bmvidjnivqxlh43q0ak2jnqnzm8h7sp0kfwjwf"; depends=[BH doParallel matrixStats MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; };
   support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; };
-  support_BWS2 = derive2 { name="support.BWS2"; version="0.1-1"; sha256="1jay1ak8242vn9a0ippfdd48vdxqqz9j8frbgf5ncffdmzzn1n21"; depends=[]; };
+  support_BWS2 = derive2 { name="support.BWS2"; version="0.1-2"; sha256="069n7kxl74v42rjxb153yk1p81izkbvi7k6r8zd5d78jx54w7igb"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
   sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; };
@@ -11618,17 +11804,19 @@ in with self; {
   survAUC = derive2 { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
   survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
   survAccuracyMeasures = derive2 { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[Rcpp RcppArmadillo survival]; };
+  survBootOutliers = derive2 { name="survBootOutliers"; version="1.0"; sha256="1gfh2n1kd1m4bpd1j7islm5ar1qmzycnmfpb8zl8ghv0z5rf5f09"; depends=[survival]; };
   survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
   survClip = derive2 { name="survClip"; version="0.2.3"; sha256="1s82z8cld6qlg6dv0l4j4vyg58ji9qp7xkg6sxd9s88fpcjdnz3g"; depends=[checkmate clipper corpcor elasticnet FactoMineR graph qpgraph rrcov survival]; };
   survHE = derive2 { name="survHE"; version="1.0.6"; sha256="128pjnm1m12qqhnz2izwmir64m99389qjr73vcqr19dgbkbgv28c"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
   survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
-  survMisc = derive2 { name="survMisc"; version="0.5.4"; sha256="1m24vnhxk410h117mz056j8xkhp1ivjn5wvpprc0rqnd374z6c84"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; };
+  survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; };
   survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; };
   survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; };
+  survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; };
   survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; };
-  surveillance = derive2 { name="surveillance"; version="1.16.0"; sha256="1nbskhbs8qfwnchig4rckbgy296ifl1hx0w3v71knj693x54r9cj"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
+  surveillance = derive2 { name="surveillance"; version="1.16.1"; sha256="0pr6fy0n684ncl9hf0bp6jfahmihziyyfj2zwnqigkc4bcl091h3"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
   survey = derive2 { name="survey"; version="3.33-2"; sha256="1c4q0005663b0y87ckmf1ra7gm2i5hnlw955pgb11bywh60hg9hl"; depends=[lattice Matrix survival]; };
   surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
@@ -11637,30 +11825,30 @@ in with self; {
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="2.9"; sha256="0ad4122m78hbzhkkaspzpr62bl59w1j8z0qa67slqljjldhq1akv"; depends=[data_table laeken]; };
   survidm = derive2 { name="survidm"; version="1.1.0"; sha256="1piwhb8zsqnw284xp0l3ajs8r9amyn8yfng19hkci574mkdgsw4f"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; };
-  survivALL = derive2 { name="survivALL"; version="0.9.2"; sha256="0mqmlmip6lr1d6i8yj4kc1zzj5jvvqrkipqxlprsrqbwni2ipp7l"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; };
-  survival = derive2 { name="survival"; version="2.42-3"; sha256="15pasbfzmg2r5bfpsadp9ia4cpybqz6n1kwm7ma02ykzf7bk4xx0"; depends=[Matrix]; };
+  survivALL = derive2 { name="survivALL"; version="0.9.3"; sha256="0lnvs7b097sl21gvnfafdprzvh197p1q4nzzagkdf4xm1xw8pj0h"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; };
+  survival = derive2 { name="survival"; version="2.42-4"; sha256="0gnv6r6qrapw867gb9napa8f00dm15aw97lgn6556mn9i9k6d0k7"; depends=[Matrix]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
   survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; };
   survminer = derive2 { name="survminer"; version="0.4.2"; sha256="15npx3q7xf7sl7pbb1476khgfpqrvidqcb101iim3iym125sl54r"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
-  survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; };
+  survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; };
   survtmle = derive2 { name="survtmle"; version="1.1.0"; sha256="0q1ym4a13xqy3lqjwg40wp28xlp1iqybwq7dd0gp6fnmx3n6373g"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; };
   survutils = derive2 { name="survutils"; version="1.0.1"; sha256="09844i5nfyn0fm5i8ca96xz8dza21shh2f89w41zh17xaxvidjsw"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; };
   sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; };
-  svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
+  svDialogs = derive2 { name="svDialogs"; version="1.0.0"; sha256="0xqppydfawnwk84kb5qiybwbcmv38vn4imgz01mz2pnq4xb80p97"; depends=[rstudioapi svGUI]; };
   svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
-  svGUI = derive2 { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; };
+  svGUI = derive2 { name="svGUI"; version="1.0.0"; sha256="1r7ab0p4yr8q03gj02hmj7k1ghksgkg4nx750c0ajfs2q9y1dxfc"; depends=[]; };
   svHttp = derive2 { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; };
-  svIDE = derive2 { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; };
+  svIDE = derive2 { name="svIDE"; version="0.9-54"; sha256="1a03xpjx22xhxfqkgcm1pmal0dlp544hvnckj0p6sy4y56hmsfik"; depends=[svMisc XML]; };
   svKomodo = derive2 { name="svKomodo"; version="0.9-63"; sha256="0x2774lhckhg8kw6plsn6dpks3b3fisb0psa03p7di7jx8vrkg5n"; depends=[svMisc]; };
-  svMisc = derive2 { name="svMisc"; version="1.0-2"; sha256="1a5wlz1csq6y2bqiznz14dlx5jc8z3x882yi2v82hinn647vn4m8"; depends=[]; };
+  svMisc = derive2 { name="svMisc"; version="1.1.0"; sha256="01r2a73wx2sh1njky961fxabx5wgddqqjqba6vjg0f3h8r3abmn2"; depends=[]; };
   svSocket = derive2 { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; };
   svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; };
-  svTools = derive2 { name="svTools"; version="0.9-4"; sha256="0szr5dcxjsh5p1nkszvmj0vmi9x70d656hfvhmqf0wyjwv63vp90"; depends=[codetools svMisc]; };
+  svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; };
   svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; };
-  svWidgets = derive2 { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; };
+  svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; };
   svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
-  svars = derive2 { name="svars"; version="1.1.2"; sha256="1d3dk4vn5l46xw5nh7k63v35phzvy9ixmbz0d2znl2nm05ih7gyy"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA tsDyn vars]; };
+  svars = derive2 { name="svars"; version="1.2.0"; sha256="06kg9z5clsgg65gjrcb456ppdwk8cja2cmzfwlwmnz5yf3m6lk8k"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA tsDyn vars zoo]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
   svd = derive2 { name="svd"; version="0.4.1"; sha256="00plnwrjnp3majssr3qbz2zp25z9cfivgpggyfvy4lnc4av5qn3g"; depends=[]; };
   svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; };
@@ -11671,30 +11859,31 @@ in with self; {
   svglite = derive2 { name="svglite"; version="1.2.1"; sha256="1bws3lc4hlhln11zd7lalhiyc43yk6c6vrzy41fkxk1dkjazfx51"; depends=[BH gdtools Rcpp]; };
   svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; };
   svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; };
-  svrpath = derive2 { name="svrpath"; version="0.1.1"; sha256="0j38m34ff5a8lqfsss8444fflprai3sgzi9kyrmingp07rx82ss5"; depends=[quadprog svmpath]; };
+  svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; };
+  svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; };
   svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; };
   svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
   swCRTdesign = derive2 { name="swCRTdesign"; version="2.2"; sha256="0kggniy5p900cj074swh7g47zf8bhwjmqph9b5frw86nycxwyn3v"; depends=[]; };
   swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; };
   swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; };
-  swamp = derive2 { name="swamp"; version="1.3.1"; sha256="1l4rk79hbggn31y5skslqsz9bv7lmya4q5ligki3x1677345hyhv"; depends=[amap gplots impute MASS]; };
+  swamp = derive2 { name="swamp"; version="1.4.1"; sha256="01w44d7rqh6q9wpapd3g7rzllhbm2brwilmna9vk2dwqx57jyim6"; depends=[amap gplots impute MASS]; };
   swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; };
   swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; };
   sweep = derive2 { name="sweep"; version="0.2.1"; sha256="0v6166p1h14klf1avqvry8jj3as498qnydksy0da8q1bp1sy007f"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
+  swgee = derive2 { name="swgee"; version="1.2"; sha256="1blfxhvcpfbc0k25xlkw8bxqdmgz3c9ksd9ww2p8k0dy5jd2z64r"; depends=[gee geepack mvtnorm]; };
   swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
+  swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.12.7"; sha256="1ymvghjvbrbsgn49mp8f9n4kv81626pa4pv05hrx813ly8h30mmq"; depends=[RCurl RJSONIO]; };
   swmmr = derive2 { name="swmmr"; version="0.8.1"; sha256="0zl00864x9q6a2aqdbqs3b5kw6z50wgr46c62kxk9xkns8317sa7"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; };
-  sybil = derive2 { name="sybil"; version="2.0.4"; sha256="0iyqr9iyb4bydmzjzrc721nzf5q36p2i3zciai9rzjlwx2mdw930"; depends=[lattice Matrix]; };
+  sybil = derive2 { name="sybil"; version="2.1.1"; sha256="1hgxlwpb5libvv126vh01ngxqs8hlvll8xjgxw5xxhfbgsadfp1m"; depends=[lattice Matrix]; };
   sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
-  sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
   sybilccFBA = derive2 { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
   sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; };
   sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; };
-  syllable = derive2 { name="syllable"; version="0.1.3"; sha256="1ymnczwx58h720hsm0s9zq3ddwg6gn6bgg0m8zw24i0nlivx0yjg"; depends=[data_table stringi textclean textshape]; };
   sylly = derive2 { name="sylly"; version="0.1-4"; sha256="14lw5sxrdvidk0465a7x0jz74cvqjbqv0wlqdy78qzbq4ilcmcaa"; depends=[]; };
   sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; };
   symDMatrix = derive2 { name="symDMatrix"; version="1.0.0"; sha256="0xss7f7hkrf2afchccfavymylfybnp9nxawqxd2vdjni95kbd595"; depends=[]; };
@@ -11704,11 +11893,11 @@ in with self; {
   synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; };
   synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; };
   synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
-  synchronicity = derive2 { name="synchronicity"; version="1.3.2"; sha256="1idrjzl7nkamf1ip55s6qcf64s63xs9j8z9jv3r89p6r5lw7k5mv"; depends=[BH bigmemory_sri Rcpp uuid]; };
-  synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
-  synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; };
-  synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; };
-  synthpop = derive2 { name="synthpop"; version="1.4-3"; sha256="1smibiid3hav7w9yky0n6ci160h69v16kkilmm00gady6w7j8drh"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
+  synchronicity = derive2 { name="synchronicity"; version="1.3.4"; sha256="1km5hx82gy71m5nc6pkcksv0dn32fylhg2axpdsnarrxva14mgdg"; depends=[BH bigmemory_sri Rcpp uuid]; };
+  synchrony = derive2 { name="synchrony"; version="0.3.7"; sha256="0lnin4aphy1lq20bn7nsdj0ymy2xdwjzdj2f89xq0qwkc7w7b5jb"; depends=[]; };
+  synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; };
+  synthACS = derive2 { name="synthACS"; version="1.4.2"; sha256="069cqmp9whal7z490jh6my8fqmmc4d2mm693xi4lsci2afc5plzc"; depends=[acs data_table Rcpp]; };
+  synthpop = derive2 { name="synthpop"; version="1.4-4"; sha256="1q3vmsagdaha97182cf3ak51rjx018h8c72zv9v6slf7h71a0d53"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
   sys = derive2 { name="sys"; version="1.5"; sha256="0yskm5mzps4435yvld9nfp6i5lqdy5ckpdwydvvbyjznz5yv01x2"; depends=[]; };
   sysfonts = derive2 { name="sysfonts"; version="0.7.2"; sha256="1jl66pyw9khi117523zanjjzdpnpgqdqx190w829xc4ljxzi8n55"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
@@ -11720,96 +11909,95 @@ in with self; {
   tab = derive2 { name="tab"; version="3.1.2"; sha256="1vc5swfy9p3bsv5bqqgk4w81apzk6d0m1xz0cbhii7rpn7x6zh1h"; depends=[gee survey survival xtable]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
   tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; };
+  table1 = derive2 { name="table1"; version="1.0"; sha256="06cidli3k8cxzvnj1n6vysamkd3qsim2i6ly9fl7rwiyj4g64rw8"; depends=[Formula]; };
   table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; };
   tableHTML = derive2 { name="tableHTML"; version="1.1.0"; sha256="0j2dk11h0dvibppyxjix4pxr6i9ji9ipzaizsr1fadrpk5xzawd5"; depends=[htmltools magrittr shiny]; };
-  tableMatrix = derive2 { name="tableMatrix"; version="0.8"; sha256="00l03blrrkwdrihqnwz8afx6s3d7a19laj44584546yd3prqx5dy"; depends=[data_table]; };
-  tableone = derive2 { name="tableone"; version="0.9.2"; sha256="12lyyhfirj768fws1j93qhc6n8b89hrlafixiilsg7fy14w89620"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; };
+  tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; };
+  tableone = derive2 { name="tableone"; version="0.9.3"; sha256="0wcp4ip9ww56sffnd9v0p73a50aakdnx0gs98qniy6g3z86s328j"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; };
   tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
-  tables = derive2 { name="tables"; version="0.8.3"; sha256="1n0kqsvwx2vg7nwyz7hi708xpf2jc9bz3y84aflnzcmbspj1wvf3"; depends=[Hmisc]; };
+  tables = derive2 { name="tables"; version="0.8.4"; sha256="1d4w3gjl5v8jnmdizg0rmnyxa9z3pxi3k226kc7nh7jfm8m9raif"; depends=[Hmisc knitr]; };
   tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; };
   tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
-  tabr = derive2 { name="tabr"; version="0.1.2"; sha256="1c9r6lx12xadv0c0068zxgx29nnf2hdbbrybm6bs27scizaxzhd2"; depends=[dplyr magrittr purrr tibble]; };
+  tabr = derive2 { name="tabr"; version="0.2.0"; sha256="1wmb1ywlsx2fqc9rg6hfi1anjiq4g552y65b0nflbv5yxsw96wsk"; depends=[dplyr magrittr purrr]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; };
-  tabularaster = derive2 { name="tabularaster"; version="0.4.0"; sha256="1hgbynjp19xwpin31j0647ldbzxam2kmkqnvj6v8kd4svps0kr3g"; depends=[dplyr raster sp spbabel spex tibble viridis]; };
-  tactile = derive2 { name="tactile"; version="0.1.0"; sha256="0ygray05jlxrg7mxg412s04jrxjyskxlrl0xgxir8s6mzjg79iqy"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
+  tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; };
+  tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; };
+  tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; };
+  tactile = derive2 { name="tactile"; version="0.2.0"; sha256="0jjfbsadxbf9s6vzi82rw5qa6hdc8iz4jci9xpbzwrjkb90dzd08"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
   tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.0"; sha256="0i69zyiqq8mc5wfc9r43dpcjhwmq4iwj605n4a6h4hma37jjnc2g"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
   tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
-  tailr = derive2 { name="tailr"; version="0.1.1"; sha256="07irl0fzg9skpv9kl211ar3yf68lcrpd2rcplkzbm242yb772z1v"; depends=[glue rlang]; };
-  tangram = derive2 { name="tangram"; version="0.3.2"; sha256="1dyfyl608k6a7vx9w0s2r6jr0y430qvkqkrrv24wav7snza4d5q2"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
+  tailr = derive2 { name="tailr"; version="0.1.2"; sha256="1z47akvm2y05ih8q5ci03jm29xzp4m52shvbm4d9h2bipnq5crys"; depends=[glue rlang]; };
+  tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
   tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; };
   tau = derive2 { name="tau"; version="0.0-20"; sha256="1inpqc2cz1vvjkmp8h3jpjvnvj0y5cwbbj92jlq0322w5w45vip9"; depends=[]; };
   tauturri = derive2 { name="tauturri"; version="0.1.1"; sha256="0v0p1avrx9vgnrli4zp6figm3s9265k9yny0acblbjlmz3z8smai"; depends=[httr magrittr plyr purrr tibble]; };
-  tawny = derive2 { name="tawny"; version="2.1.6"; sha256="0s6p0nnz1rpcnn2yfj1vvl54g57d8rv5s4y09azwz1z5ls7vnnlv"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
-  tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
-  taxa = derive2 { name="taxa"; version="0.2.0"; sha256="16jif3s5xf4cawwkhpmjrwb0c4ycmwicrshd5m0arlkcfmq85623"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; };
+  tawny = derive2 { name="tawny"; version="2.1.7"; sha256="1b2v0cgkmhzxy36dcdn6hnbqk6l5ac5c3myvwryf7wlp19xi786d"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
+  tawny_types = derive2 { name="tawny.types"; version="1.1.5"; sha256="1vg0hv91dif6cfqfzrf7m1qbk57fp8v97fp88whwmvs83yd521hq"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
+  taxa = derive2 { name="taxa"; version="0.2.1"; sha256="0jh3isjlh6bx9mdhavg1c43aayq1zl5jqx3x4690lwgvphnzl1dn"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; };
   taxize = derive2 { name="taxize"; version="0.9.3"; sha256="05llhgv6a440va80fs45r8q6865q45gi4z28b1ldcln0dmx77r7c"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; };
   taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; };
-  taxlist = derive2 { name="taxlist"; version="0.1.3"; sha256="0lsphap7brl67y458x29843wkxvvf2ppjn1crz4hby7wmn1psarx"; depends=[foreign taxize vegdata]; };
+  taxlist = derive2 { name="taxlist"; version="0.1.5"; sha256="17b7sdjjzragi8k08304idic0p8cj095h4p9vlpfidn8k6csrkv8"; depends=[foreign stringdist taxize vegdata]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; };
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
   tbl2xts = derive2 { name="tbl2xts"; version="0.1.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
   tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
-  tccox = derive2 { name="tccox"; version="0.1.0"; sha256="0b7f8kfsh97viplkjiiy8xm5b94ijnb0m748wqrnxgrvy8ikiy5k"; depends=[survival]; };
   tcgsaseq = derive2 { name="tcgsaseq"; version="1.6.6"; sha256="0sk8fydhfx1c3mrir3qx8bqcif220l6ggzmlw9yw8faha210ak2y"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
-  tclust = derive2 { name="tclust"; version="1.3-1"; sha256="1li62wynv81kb17fx7nk63a26qlb78l8fdf63in8yzcl7fkpji7y"; depends=[cluster mclust mvtnorm sn]; };
-  tcpl = derive2 { name="tcpl"; version="1.2.2"; sha256="1f32qq5816qkyx3n16vgf13g2piv2pqn2nki3c91vg51bwfap7z1"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; };
+  tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; };
+  tcpl = derive2 { name="tcpl"; version="1.4.3"; sha256="0b588in2xmdvybzfbbr0ik9mf0ls6k31nbrdpl7ijvxg2xfxfr1w"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; };
   tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; };
   tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; };
-  tdthap = derive2 { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
+  tdthap = derive2 { name="tdthap"; version="1.1-9"; sha256="0y01x0hcf0rw06cpn4pk17b0shf4v2c9was7vfs0zhsbq8qcwx7r"; depends=[]; };
   tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; };
-  teachingApps = derive2 { name="teachingApps"; version="1.0.2"; sha256="0rdgylcjwgbsasvd2mvi4qp74c3n4vg8yr59a82c2sidfkllci36"; depends=[actuar d3heatmap d3Network data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI needs networkD3 plotly radarchart Rcpp rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; };
+  teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; };
   teamcolors = derive2 { name="teamcolors"; version="0.0.1"; sha256="07mqsbhrsy23qc4j1w1wji36cbh6dijkp6p7g3598nlzhw7ln3aj"; depends=[]; };
   teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; };
   teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; };
   telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; };
   telegram_bot = derive2 { name="telegram.bot"; version="1.0.0"; sha256="10i126wa5dbpzxvr8f9zysfwg53051sk9cjdpdrjva1p3yvyn143"; depends=[httr R6 telegram]; };
-  tempR = derive2 { name="tempR"; version="0.9.9.12"; sha256="1ipr9yb26f1mmyivbapbb83n1fxa4gpxqgb99p5nx6mzw71vyp4j"; depends=[]; };
+  tempR = derive2 { name="tempR"; version="0.9.9.15"; sha256="00xxrwzbqcsvb50xcrr4aii4fjcfa8bc25jn0zvg4dxmww8w4s1r"; depends=[]; };
   tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; };
   tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; };
   temperatureresponse = derive2 { name="temperatureresponse"; version="0.1"; sha256="0q2x09cyy4zacbgmnwd43h1rwv2g3f2rk9cbg2phsvgxqx9vfm24"; depends=[AICcmodavg broom dplyr minpack_lm nlme numDeriv rootSolve tidyr]; };
-  templates = derive2 { name="templates"; version="0.2.0"; sha256="1lil7z975fk83m9pgacn0ikii4kslpp0pvpc8g7ra9yqj7qpyv3h"; depends=[dat magrittr modules stringr]; };
+  templates = derive2 { name="templates"; version="0.3.0"; sha256="0xnzj3cvhw1r7zfqaijbfdyclka61jwixcdh05a5z9qwgv0076sh"; depends=[dat magrittr stringr]; };
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
-  tensorBF = derive2 { name="tensorBF"; version="1.0.1"; sha256="1rnsff1ypwhn5z0xsxyk2z7jl6igscma1a0w613i81qf37iy81ba"; depends=[tensor]; };
   tensorBSS = derive2 { name="tensorBSS"; version="0.3.4"; sha256="0wh14qy7fa7klb7yy272d16cvgfgnrf25wba3bqbpral9pv5nkmv"; depends=[ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
-  tensorflow = derive2 { name="tensorflow"; version="1.5"; sha256="00g5fdr0ij2ximmqgd7a1hz66462lkjf4q6pn0knkhxcgp7jv8nn"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
+  tensorflow = derive2 { name="tensorflow"; version="1.8"; sha256="1ixli2m7lbkp5pv7a8waxvhi04l41dcrrplzgdyzqi3ifaarr2sk"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
   tensorr = derive2 { name="tensorr"; version="0.1.0"; sha256="00zqklz3hqjv20giwqnd1d62x5hdm620hfdkn1x75i87dv92qn8m"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
   tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; };
   tergm = derive2 { name="tergm"; version="3.4.1"; sha256="10sanqbnqdyqafjjcwm99zfnpgrv18z4y2rgaq5wqq7nni184hfm"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
-  termstrc = derive2 { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; };
-  ternvis = derive2 { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; };
-  tesseract = derive2 { name="tesseract"; version="2.0"; sha256="0dps8nji7rx5vfa9g2kmdh3vgm9f61dbainl4arrqngcr5fglpnf"; depends=[curl digest pdftools rappdirs Rcpp tibble]; };
+  tesseract = derive2 { name="tesseract"; version="2.1"; sha256="11v4z79sdrms5in5qvg5c6bvf2lynibwzpi7ficf7w240nq23d15"; depends=[curl digest pdftools rappdirs Rcpp tibble]; };
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
-  testit = derive2 { name="testit"; version="0.7"; sha256="07qsnhghdgyxdknzq7ngpkf3qw9939m3lvk9dv9nk2zypy4jhcq3"; depends=[]; };
+  testit = derive2 { name="testit"; version="0.8"; sha256="1xwpimphcv23ps824s6s77y9w8xww0imm22qmgs61bifjsfc3a88"; depends=[]; };
   testthat = derive2 { name="testthat"; version="2.0.0"; sha256="155l53kb69jga5d8c5nvdwqlvlgfmk4vzyyl4d0108j53jnlgh1v"; depends=[cli crayon digest magrittr praise R6 rlang withr]; };
   testthis = derive2 { name="testthis"; version="1.0.3"; sha256="1q42nhp4nsazn31lxymb3zfj928ygbiv6jy7f0j4m3p02w2hqz5n"; depends=[assertthat devtools magrittr rprojroot stringi testthat usethis]; };
   tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; };
-  texPreview = derive2 { name="texPreview"; version="1.1.0"; sha256="085aa9qgnmf3mqan2pff0gcdrz7kxd84r12lz780r1mr05ckk8zk"; depends=[magick rstudioapi svgPanZoom xml2]; };
+  texPreview = derive2 { name="texPreview"; version="1.1.4"; sha256="1xix13vh3haganyb67rrmrsy2nsk053wq83y9ky99wk5gmxpjmxf"; depends=[base64enc htmltools magick rstudioapi svgPanZoom xml2]; };
   texmex = derive2 { name="texmex"; version="2.4"; sha256="0s3x681f1qnbgmzi5iwqpmkfzpx9gsccd3q1vz1dppzq8fbid3c2"; depends=[ggplot2 mvtnorm]; };
   texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; };
   text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; };
-  textTinyR = derive2 { name="textTinyR"; version="1.1.0"; sha256="129ha0187vw4q5lw3xgch2k4fh9kfjrvvx2bb8bm3rd2skdhajj1"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
+  textTinyR = derive2 { name="textTinyR"; version="1.1.1"; sha256="0i35mfvrqz524089zysd1dyhfk6ndr1azxps01vls9rvgyw9452i"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
   textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; };
-  textclean = derive2 { name="textclean"; version="0.7.2"; sha256="13g8k7i7j33g4bzqps638k0j1gyms740wyz7d0205cqm70kzz8m3"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
+  textclean = derive2 { name="textclean"; version="0.9.2"; sha256="1xf5krbc8nr0yk63mcdlzbn3r58m4l4wgxhp54bahvn0ff8cwsjb"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
   texteffect = derive2 { name="texteffect"; version="0.1"; sha256="0fwcbz7bpynvcivac16z77j8d398bf7vl4l8sppi9yvg72l0k94w"; depends=[boot ggplot2 MASS]; };
   textfeatures = derive2 { name="textfeatures"; version="0.1.1"; sha256="0pcs3nax21npb5blbwrmzl7q85ya8n7vgjn83z2abjr80gj3f5lj"; depends=[dplyr rlang tibble]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
   textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; };
   textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; };
-  textmineR = derive2 { name="textmineR"; version="2.1.1"; sha256="15cs2x8cn1766inqck3bdfig0wngwny689bwmjrs5w66618007ji"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
+  textmineR = derive2 { name="textmineR"; version="2.1.2"; sha256="1lhk4ix8h138vrn2l1ivcwgv2d9i7xgccn7c6h6gxxc5dpzwdsyk"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
   textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; };
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
   textrank = derive2 { name="textrank"; version="0.2.0"; sha256="0s2mnid3dha3nyyc9abhb36vlij4bg0024i9ay4pvvy4l1x947gr"; depends=[data_table digest igraph]; };
   textreadr = derive2 { name="textreadr"; version="0.7.0"; sha256="081lqqclx2dlrv341178dagd5zajndf27lbrkrv78668cdfk58xr"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; };
   textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
-  textshape = derive2 { name="textshape"; version="1.5.0"; sha256="0hvp3mz7j2qkw38jg9cj92ikhyic1c9w8jk07z3vh3f5cm1klvbm"; depends=[data_table slam stringi]; };
+  textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; };
   textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; };
   textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
   tfdatasets = derive2 { name="tfdatasets"; version="1.5"; sha256="1ik6rzfnjmm54m7s2rvp1bq5jk0k2vl631bz3db3dk639jndiz6a"; depends=[magrittr reticulate rlang tensorflow tidyselect]; };
@@ -11829,7 +12017,7 @@ in with self; {
   theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; };
   thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; };
   thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; };
-  thinkr = derive2 { name="thinkr"; version="0.11"; sha256="1rr90q91nn406n2sbn3k9q5y1mjcb4i4ixsp05mh38r9qjkbirhk"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr ReporteRs stringi stringr tidyr XLConnect]; };
+  thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
   threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
@@ -11843,50 +12031,51 @@ in with self; {
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
   tidyLPA = derive2 { name="tidyLPA"; version="0.1.3"; sha256="1yk9abn21ycfdr1h43shjaymga5j9z862mp1zbwj2wbxxv6m5pp7"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; };
-  tidyRSS = derive2 { name="tidyRSS"; version="1.2.3"; sha256="1m21cwdbhial4h3084vqs0j6zwa267ia75gyjivprqjzcccjaqdp"; depends=[dplyr httr jsonlite lubridate magrittr purrr testthat tibble xml2]; };
+  tidyRSS = derive2 { name="tidyRSS"; version="1.2.4"; sha256="0dvpaawwm6jbwxiilxllzmifjwx9spbl57jmi8lkcq948abn84vg"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
   tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; };
   tidycensus = derive2 { name="tidycensus"; version="0.4.6"; sha256="1czfdwm5bn0xpqm43mvb5bd30m5kdxikaq21gxkj41r78z69qncl"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; };
   tidygraph = derive2 { name="tidygraph"; version="1.1.0"; sha256="1cqmii1pia5s8cj1hfm5jh4qgg9dn65dcb666bqfhq51nzgwy6b4"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; };
-  tidyhydat = derive2 { name="tidyhydat"; version="0.3.3"; sha256="01l4dwsrrmfavskbqxcq5v1ykggk363nn0m0nf6ks51xdr7lckf5"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr RSQLite tibble tidyr]; };
+  tidyhydat = derive2 { name="tidyhydat"; version="0.3.4"; sha256="03kjcvh6g6xwd72fm8yyflyy72zm6fd8d0rlb6wabzq7hbzhfpp0"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; };
   tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; };
-  tidyinftheo = derive2 { name="tidyinftheo"; version="0.2.1"; sha256="1lh1smhnfg5x35ans3rlj6nvrqwkaiac3ycy7r8wz5h9fhlri3pg"; depends=[dplyr ggplot2 infotheo magrittr purrr rlang tibble tidyselect tidyverse]; };
   tidyposterior = derive2 { name="tidyposterior"; version="0.0.1"; sha256="09q2j6kjwqphdzi60w26mlax9fnmndw7s3fsxfcj0pjjl8688w52"; depends=[broom dplyr ggplot2 purrr rlang rsample rstanarm tibble tidyr]; };
   tidypredict = derive2 { name="tidypredict"; version="0.2.0"; sha256="1hq9xzaa234679qvf02nc5w8l21yh1f3dhl76zxzqc7na7chn13k"; depends=[dplyr purrr rlang tibble tidyr]; };
-  tidyquant = derive2 { name="tidyquant"; version="0.5.4"; sha256="1ip3vivn6x0ip2y4izq4cz5lh31ygsymkvbb4jqvb8dj5wywr2hq"; depends=[alphavantager broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries timetk tseries TTR xml2 xts zoo]; };
-  tidyr = derive2 { name="tidyr"; version="0.8.0"; sha256="1qjpbj1a2vw6nw4hdb6fgassnrxrdpqwf9a8i6wqnv3wxvjb6zqb"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
+  tidyquant = derive2 { name="tidyquant"; version="0.5.5"; sha256="0kh3y291j5d6qbqr45jjzjpwa02r0ymb7gdr0zd9g3d4czllwv95"; depends=[dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang stringr tibble tidyr tidyverse timetk TTR xml2 xts]; };
+  tidyr = derive2 { name="tidyr"; version="0.8.1"; sha256="0485f19mkkglc4bv57y6bm6l9rfgd878hsz2xdg1nwgbqchjhgix"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
   tidyselect = derive2 { name="tidyselect"; version="0.2.4"; sha256="1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"; depends=[glue purrr Rcpp rlang]; };
-  tidystats = derive2 { name="tidystats"; version="0.1"; sha256="0dy4yqdc0y8pmix29100x80q828rapnq9y3qn2p6rs763c7canmr"; depends=[dplyr magrittr purrr readr tibble tidyr]; };
+  tidystats = derive2 { name="tidystats"; version="0.2"; sha256="15f12zizgql1y303pr4vhmvpmpxib0wpybd0b5gbx281iglpdsc0"; depends=[dplyr knitr magrittr purrr readr stringr tibble tidyr]; };
   tidystringdist = derive2 { name="tidystringdist"; version="0.1.2"; sha256="1jk5yqkjf33arbbfgfzk7ym943gy95n3yncybmvwbjsff07qpmaw"; depends=[attempt dplyr magrittr purrr rlang stringdist]; };
-  tidytext = derive2 { name="tidytext"; version="0.1.8"; sha256="10w3h71pqbfa0n5b0a63vajc7hbwjy8bazdwmi8260zz82fvhfvl"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
-  tidytree = derive2 { name="tidytree"; version="0.1.8"; sha256="0nhhr0qmigvvzchy4pgg7pm2cn50li4zg37b4bdlhkzfzhxz4y3m"; depends=[ape dplyr lazyeval magrittr tibble]; };
+  tidytext = derive2 { name="tidytext"; version="0.1.9"; sha256="1hkxg23cc44496w8nvrm1zsbk05fhk423k12ss6ay2da3n8khi0f"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
+  tidytree = derive2 { name="tidytree"; version="0.1.9"; sha256="0bxgmwamiclr4fnn5dk7hnkl7jf4p1fgwga2gfa3a6lwa79qgpwn"; depends=[ape dplyr lazyeval magrittr tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
-  tidyxl = derive2 { name="tidyxl"; version="1.0.1"; sha256="10ckabv7aa744wxs3d5y9cd3a4c0x89gg91l23w7ddvcgjziq7an"; depends=[piton Rcpp]; };
+  tidyxl = derive2 { name="tidyxl"; version="1.0.3"; sha256="02icd5xwyimdlzrn6ikj6rrs3kj3qw1ngap69cf89mvmlkp93y79"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
   tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
   tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; };
   tigger = derive2 { name="tigger"; version="0.2.11"; sha256="1kbqlfr3lsiiv0l7dzahna706zb4mx0gfx91220n2ckfc81pyrv5"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; };
-  tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
-  tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; };
+  tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; };
+  tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; };
   tigris = derive2 { name="tigris"; version="0.7"; sha256="0azfp8ahf63a10862669wsamf0270rcyrmknc331vjs52b3qlrvl"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
-  tikzDevice = derive2 { name="tikzDevice"; version="0.11"; sha256="09qbwf7k2512q7yimabfr97birvspkn13hyybqsgqm1iiaiwwps3"; depends=[filehash png]; };
+  tikzDevice = derive2 { name="tikzDevice"; version="0.12"; sha256="0srp7q91714sday4n2nbhnkwjy84q6kw7iihlskr7ckjdcqk7s3v"; depends=[filehash png]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
+  tiler = derive2 { name="tiler"; version="0.2.0"; sha256="0pdr34zlqvkkimp03nmj9p9ak39c2927ggyrhy7sc7h7k4x59dh8"; depends=[png raster rgdal sp]; };
   tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; };
   time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
   timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; };
   timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
   timeSeq = derive2 { name="timeSeq"; version="1.0.3"; sha256="1jdmcbghqmp9phfx7bii8nfqdc10f1nqmi1mk70n0fysm6cdvhn6"; depends=[gss lattice pheatmap reshape]; };
   timeSeries = derive2 { name="timeSeries"; version="3042.102"; sha256="185hmd70hida6i12mxbrccapkpwb6jhf6cmcfbz8bc3sv9h3q5gs"; depends=[timeDate]; };
-  timedelay = derive2 { name="timedelay"; version="1.0.7"; sha256="01rl3nwazxlypimaclyjr6ihwn75jfaffp43b94msvf25xd30aiy"; depends=[mnormt]; };
+  timechange = derive2 { name="timechange"; version="0.0.1"; sha256="054zh151am6asadj39nz3l4s37kip0bcjwg8mw59s78s5gyjbwds"; depends=[Rcpp]; };
+  timedelay = derive2 { name="timedelay"; version="1.0.8"; sha256="18f8x3lxhh954vn75gjg27iwyi81x7ajh1xh0bxafs7qivnimxvm"; depends=[MASS]; };
   timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
   timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR stringr]; };
   timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; };
-  timeordered = derive2 { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
+  timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; };
   timereg = derive2 { name="timereg"; version="1.9.2"; sha256="0ddckk8vrfkk4kwlrjms6niry6g6c8dz0yf96z2kq03jgs06kfdh"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeseriesdb = derive2 { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; };
-  timetk = derive2 { name="timetk"; version="0.1.0"; sha256="0z4zb00c4xbjn3ppz6ypcab2ahkr76mj6v68yfxkjb233cb18641"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
+  timetk = derive2 { name="timetk"; version="0.1.1"; sha256="0m8l9ivww5aykdfab6bk9khy7jqkd3yrzbz2r78xnsfzipa9bzmk"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
   timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; };
   timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
   timevis = derive2 { name="timevis"; version="0.4"; sha256="08caa5gilh1c0z41lm3ghf6cpnlsdjfm1v7ha73jxv1655kznmpx"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; };
@@ -11896,24 +12085,26 @@ in with self; {
   tint = derive2 { name="tint"; version="0.1.0"; sha256="1hczc2nrm8xgvw3igkfnlqyz73686l447kigsrd6m796v8ny1gbf"; depends=[htmltools knitr rmarkdown]; };
   tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; };
   tinytex = derive2 { name="tinytex"; version="0.5"; sha256="1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7"; depends=[]; };
+  tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.0"; sha256="045b0c0mn3qlasclpzc2k3x1xlmcdvg2ixc2n9m6gjmhp2fdm499"; depends=[rvest xml2]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
+  tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; };
   tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; };
   tis = derive2 { name="tis"; version="1.34"; sha256="01bpl8q2n49wpr2gghkcv1zf16b3375xa71mv0q7wwn0da3n7m0n"; depends=[]; };
   titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; };
   titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; };
   titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; };
   tkRplotR = derive2 { name="tkRplotR"; version="0.1.1"; sha256="0fr30c2xjgpjh0pkqv0m7g413wkzzffbak7ak26k7bsi2ls341qa"; depends=[]; };
-  tkrgl = derive2 { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; };
+  tkrgl = derive2 { name="tkrgl"; version="0.8"; sha256="1c5jiahqpf3nfybkzmks785dlkchjdisvknxkb0biv3xj9nzgz14"; depends=[rgl]; };
   tkrplot = derive2 { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
   tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
   tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
-  tm = derive2 { name="tm"; version="0.7-3"; sha256="048wrk1grd3r95a46aaxrwsgpj1l5afbzda8434b1zr1wr8y3hzk"; depends=[BH NLP Rcpp slam xml2]; };
+  tm = derive2 { name="tm"; version="0.7-4"; sha256="1vvc0arl1w5g8r8bp5w95w79d7hnyfvkhsw5nq2qxql1sjsq69ya"; depends=[BH NLP Rcpp slam xml2]; };
   tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
   tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
   tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
   tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.7"; sha256="1zcddarjd083p3sly49wvsnbn6bmpx5wd1bqm3acgydxk8y84nif"; depends=[NLP rvest tm xml2]; };
-  tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3.1"; sha256="15k4bzx1p271yzskkijlf2pm6m7pb5dqxmfab9rhwynllszv96if"; depends=[ISOcodes NLP tm XML]; };
+  tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.0"; sha256="0q4njhfpwqym9d8xfbb577vn6g9ks4nkpb4bh6j31nzg7yp96av7"; depends=[ISOcodes NLP tm xml2]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
   tmap = derive2 { name="tmap"; version="1.11-2"; sha256="1cinbsfhi8pngidxp3brmba1willknavlrpjzywm85wp7973y045"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
@@ -11926,7 +12117,6 @@ in with self; {
   tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; };
   tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; depends=[beeswarm plotwidgets tagcloud XML]; };
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
-  tmuxr = derive2 { name="tmuxr"; version="0.1.0"; sha256="0njd1wdk11bni0pinplyzywqlmswkq2xq7qid68v4s93q9069zn6"; depends=[magrittr purrr stringr]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; };
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
   tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
@@ -11956,40 +12146,41 @@ in with self; {
   tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; };
   tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; };
   track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; };
-  trackdem = derive2 { name="trackdem"; version="0.3.1"; sha256="10qq9217mpd4abhkwsh4yjzpi06qpqa5rnwhxls6yzmymf9apngl"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
+  trackdem = derive2 { name="trackdem"; version="0.4.1"; sha256="0r33ph7vk5i4nl3bw4642cpy743arly9xmn3n5jk2961q80m0kq5"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
   trackeR = derive2 { name="trackeR"; version="1.0.0"; sha256="0z200jlkgcdxwss0ckbh3vqcfw56fi7pivr9vzf4rkwyf2n6v25s"; depends=[fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; };
   trackr = derive2 { name="trackr"; version="0.7.5"; sha256="1achrnkqnpdjp2vr1s7xsl8fdfdyifgv5vr00b3xq9pkr4jggj6z"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools knitr lattice miniUI RJSONIO rmarkdown rsolr shiny]; };
   tractor_base = derive2 { name="tractor.base"; version="3.2.2"; sha256="1pbh9hand7h68vxap2qis3a7zs5qkrj2wxk8flqyvhx50p98wigv"; depends=[ore reportr shades]; };
+  trade = derive2 { name="trade"; version="0.5.3"; sha256="0v0yw261daag0hw3sc7dh2bpm8sd3r46xbcbcbxv7qb59rad756w"; depends=[antitrust]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
   trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; };
-  trajr = derive2 { name="trajr"; version="1.0.0"; sha256="1q17lgwgxn9j3ym1vikrnnyqf61ri3vl7jqq3f1fvy2280nac0s8"; depends=[plotrix signal]; };
-  tram = derive2 { name="tram"; version="0.2-0"; sha256="02jbgp011qbinyjwdmj0nc2mpphmqlhm0dvvs7x2lfngrw1fw163"; depends=[basefun Formula mlt multcomp sandwich survival variables]; };
-  tranSurv = derive2 { name="tranSurv"; version="1.1-5"; sha256="0vn3cywb331kxz6sxidprfh0lmgsmwlnzbv80bfrnahhmhmss8rl"; depends=[rootSolve SQUAREM survival]; };
+  trajr = derive2 { name="trajr"; version="1.1.0"; sha256="1wfncd3ays8wqz8hhwz46diyac49ivz31qm1rvy1gkbw71icmnd7"; depends=[plotrix signal]; };
+  tram = derive2 { name="tram"; version="0.2-2"; sha256="1lyk2srbj5axh2h8y54sxn5l36sa9q9nkkb7vvbhms5dinld1z6j"; depends=[basefun Formula mlt multcomp sandwich survival variables]; };
   transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
-  translateSPSS2R = derive2 { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; };
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
   transport = derive2 { name="transport"; version="0.9-4"; sha256="0ham0cla4qwfd6fqyckpdl2n2gm3qnl7ry1xi9kjvbajlcc0xwi2"; depends=[Rcpp]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
   treatSens = derive2 { name="treatSens"; version="2.1.3"; sha256="159dpd4wg0i4cidg40lad665sm3j4qch8d1y3k9chwggbhcad5jn"; depends=[BH dbarts lme4 mvtnorm nlme Rcpp RcppEigen]; };
   tree = derive2 { name="tree"; version="1.0-39"; sha256="0q2dnl1hvyaw76lkfq0i9d92z68r29ssb3a9j8jknnzx896x055x"; depends=[]; };
-  tree_bins = derive2 { name="tree.bins"; version="0.1.0"; sha256="0cqpvh9cbnsk4qv886n2sc1v1s51z4m6aj0ydqzijvy6ckigbiij"; depends=[data_table dplyr rpart rpart_utils]; };
-  treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; };
-  treeDA = derive2 { name="treeDA"; version="0.0.3"; sha256="1m9959jya872sdkmw8hcwnjqj7r5x4h0c29g4j2rnxklbspn27j9"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
+  tree_bins = derive2 { name="tree.bins"; version="0.1.1"; sha256="1flrkhdqimsn8dxn97xzl1fykx916i1dis1bfany44yk0cjmd85g"; depends=[data_table dplyr rpart rpart_utils]; };
+  treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; };
+  treeDA = derive2 { name="treeDA"; version="0.0.4"; sha256="0zhzb21lvxk278ysl275g39y2r8dlgqdix5rfg2pwv3nzj2531rc"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
   treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
   treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
   treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
+  treedater = derive2 { name="treedater"; version="0.2.0"; sha256="18y1nbpinpcnczyn0kwlcnhbmnxv7814ms6l5qfikdqrxd2gx3si"; depends=[ape limSolve]; };
   treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
   treeman = derive2 { name="treeman"; version="1.1.2"; sha256="0imwg4wi85gjhbhpym5gs0my8kacx28l74m5xbfwqdi4gxpz3kkc"; depends=[ape bigmemory plyr RJSONIO stringr]; };
   treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
-  treemapify = derive2 { name="treemapify"; version="2.4.0"; sha256="1cg8jwlls3r3kjlmmxcm9id2spsn5ggsjrw0826ih2khdlnjc0jy"; depends=[ggfittext ggplot2 plyr]; };
+  treemapify = derive2 { name="treemapify"; version="2.5.0"; sha256="0s8qrm2ifbpm31zwyc2f2f6jyc04r06vy6vgq3k99aq67mz6krdq"; depends=[ggfittext ggplot2]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
-  treeplyr = derive2 { name="treeplyr"; version="0.1.3"; sha256="00fkmmzivwy603grfbwdabsik1swkyba7sbwcjzxbgsmx3s472g6"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
-  treespace = derive2 { name="treespace"; version="1.1.2"; sha256="0am3ssdxf8v98hffncrg1zdpgcr79gvvr6z2mara04r0rxk86kaw"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp RLumShiny scatterD3 shiny shinyBS]; };
+  treeplyr = derive2 { name="treeplyr"; version="0.1.4"; sha256="140j1cd8a34fww8bi6b7mi3c7c1nik5sajk085nyfmjq7lxds0cy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
+  treespace = derive2 { name="treespace"; version="1.1.3"; sha256="0s3hmmjx2hf8l0piwz6mddd80hb5jsljnpzpakighqj9iiah5jjv"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; };
   treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; };
+  trekfont = derive2 { name="trekfont"; version="0.9.2"; sha256="1njmllp6i10rafjq5c9z1qp3bmy8zr3nxv9cjw75w5fnrh50rlzh"; depends=[]; };
   trelliscope = derive2 { name="trelliscope"; version="0.9.8"; sha256="1581ss5c3f7mnv6s3p9f8kfwnks0l80kxwpxv9mq61w3lf9fksm2"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; };
   trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; };
   trend = derive2 { name="trend"; version="1.1.0"; sha256="06yifqbsvxbmk5gld4z2nnyhf59v8ks5xjwacmb25mv9r6bn388b"; depends=[extraDistr]; };
@@ -11997,6 +12188,7 @@ in with self; {
   triangle = derive2 { name="triangle"; version="0.11"; sha256="0983bvywbyl0sms29j1hby2qy6p984vy4r0q1awh1f8gr01bbk5b"; depends=[]; };
   triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; };
   tribe = derive2 { name="tribe"; version="0.1.6"; sha256="0sx6hyfyg8x0vxq4l4gvv5kb8afrbjp3qk3s48l85vf5v1chwnhf"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; };
+  tricolore = derive2 { name="tricolore"; version="1.0.3"; sha256="0lycsb29havx911q0fv4r184nr81w1c7yvy4sn6jqg35g2p1qqdv"; depends=[assertthat dplyr ggplot2 ggtern shiny]; };
   triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; };
   trifield = derive2 { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
   trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
@@ -12008,9 +12200,10 @@ in with self; {
   tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; };
   triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; };
   tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; depends=[]; };
+  tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; };
   tropr = derive2 { name="tropr"; version="0.1.2"; sha256="1nm97sqmj4nfy7h8z58gmd9ipyrkw6skh2wx2g3ivm9pn3m50bwl"; depends=[digest httr magrittr rvest stringr xml2]; };
   trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
-  trtf = derive2 { name="trtf"; version="0.3-0"; sha256="1fca08lkwaa9m7ac69i3k3d8dxn8fp231yh68gz3ym8ja9vhzd7w"; depends=[Formula libcoin mlt partykit sandwich variables]; };
+  trtf = derive2 { name="trtf"; version="0.3-2"; sha256="16nsrg68vn9p4s5al7fg6fg02cr3ccswzmhig7k4irprsnhdy4fr"; depends=[Formula libcoin mlt partykit sandwich variables]; };
   trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
   truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; };
   truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; };
@@ -12019,12 +12212,14 @@ in with self; {
   truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
-  tsBSS = derive2 { name="tsBSS"; version="0.4"; sha256="0mli9y63bp7n21wzz5gga8i0c8f3db6cdcc5jp4zm529svilzkxm"; depends=[forecast ICtest JADE Rcpp RcppArmadillo]; };
-  tsDyn = derive2 { name="tsDyn"; version="0.9-46"; sha256="1cq36qxpimiwlzjnnjqj5rjb3l1h684day4kch99vza1v62h1lkv"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
+  tryCatchLog = derive2 { name="tryCatchLog"; version="1.0.2"; sha256="0452xcfv98d2nfdhi9l2033s381lsa1kjghmrk05d3kc88d22np7"; depends=[futile_logger]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.5.1"; sha256="0hysb132cjymlqg5bcsqdvii7kyx3rh07c4bsds636j1cypi86kd"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; };
+  tsDyn = derive2 { name="tsDyn"; version="0.9-48"; sha256="01yqfd156ffnxy9wyd3s9vkpkc9n0davs1cq606sbpvvkmphnws3"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   tsPI = derive2 { name="tsPI"; version="1.0.2"; sha256="0lw4s7gxn4xldsk5f3dz27bb9jywa14195703b5q1497h9j966gk"; depends=[KFAS]; };
   tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
   tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; };
+  tsbox = derive2 { name="tsbox"; version="0.0.3"; sha256="1dcfp0lg6fvhhkspgk9a41crnfq7gx50ll4a4a0qil795349srnj"; depends=[anytime data_table]; };
   tsbridge = derive2 { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
   tsbugs = derive2 { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
   tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
@@ -12033,21 +12228,21 @@ in with self; {
   tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
   tsensembler = derive2 { name="tsensembler"; version="0.0.4"; sha256="0n5mh951799yd00sbxz0ia2s086kc12rk9xmkdyjvqj8d83vh1ff"; depends=[Cubist earth forecast gbm glmnet kernlab nnet opera pls ranger RcppRoll softImpute xts zoo]; };
-  tseries = derive2 { name="tseries"; version="0.10-44"; sha256="0nz6v76hsxcprpgf84al5r0p08sr9qacqal4adndz9wmg604l4ag"; depends=[quadprog quantmod zoo]; };
+  tseries = derive2 { name="tseries"; version="0.10-45"; sha256="14s1glh5zzdvdl05a2z7ymhgf962svxf8xircghg5sc649lb33n0"; depends=[quadprog quantmod zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
   tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
   tsfknn = derive2 { name="tsfknn"; version="0.1.0"; sha256="0gzij2fbgwavpsqmr7cp012lhii23fav4nsrbc2w9qingglcnqd1"; depends=[ggplot2]; };
   tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
   tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.1.5"; sha256="054vdbgndi3zr1jizjyasp33l5ifbkfcj1gs8h4bk8vvkp96nqdv"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
+  tsibble = derive2 { name="tsibble"; version="0.3.0"; sha256="0rakw6fwkxlvdwzw5cj31a6dkq88jr2ffrkdwc41vasdxzf6xwrc"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; };
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
   tsoutliers = derive2 { name="tsoutliers"; version="0.6-6"; sha256="0q4lkqasnsps8lzpiyk074nfhv29sbma080729c8l3ba1sa9pmyn"; depends=[forecast KFKSDS stsm]; };
   tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
   tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; };
-  tstools = derive2 { name="tstools"; version="0.3.6"; sha256="0hk98czp6ban95jw7x9bv53n44z6wlkb9gc341x5pfjhslfqccal"; depends=[data_table jsonlite xts zoo]; };
+  tstools = derive2 { name="tstools"; version="0.3.6.1"; sha256="066bkm4hqkbhslk3f3vk9w4hzv3smg718vpav04byrvlcdiibv0c"; depends=[data_table jsonlite xts zoo]; };
   tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; };
   ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
@@ -12056,23 +12251,24 @@ in with self; {
   tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; };
   ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
   ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
-  tuber = derive2 { name="tuber"; version="0.9.5"; sha256="0519qsgs8cnhd5qx5amh8rz6qa7fhryf5i9wjr38zrlrzvksqblh"; depends=[dplyr httr plyr purrr]; };
+  tuber = derive2 { name="tuber"; version="0.9.7"; sha256="0ypfzxk0cyb81y61xxj4bhr5v9afnd7z9wi09xippjv8djbm78yb"; depends=[dplyr httr jsonlite plyr purrr]; };
   tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; };
-  tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.0"; sha256="0pxsnvzh5gy5dsdsqsmq8hkr597dnnv60b5dw7bqw493lavk2ccm"; depends=[]; };
+  tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; };
   tufte = derive2 { name="tufte"; version="0.3"; sha256="1fpv9ilf8ajynz38ny0abfnq20xzpgwbxaxj8ijwy8viki893bd0"; depends=[htmltools knitr rmarkdown xfun]; };
   tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
-  tukeytrend = derive2 { name="tukeytrend"; version="0.4"; sha256="14jyv8xb7ghbprn9gm5dlkry868i14ga63pfi78dhmq67i43s70x"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; };
+  tukeytrend = derive2 { name="tukeytrend"; version="0.6"; sha256="0lsxfpkim4fkrm2lrjhn3w55c0p694vbkal3mjqk6vnmnycg9d71"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; };
   tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
   tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; };
   tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; };
-  tuneRanger = derive2 { name="tuneRanger"; version="0.1"; sha256="1mjq64phnphx10mrllcdy1rgm44ar8zr3ba5c4f9fpz4a5kjm7i1"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; };
+  tuneRanger = derive2 { name="tuneRanger"; version="0.2"; sha256="0dk8nnh3sp0mlfr4vfc33r83a5kdgdi3sbqs0v4311i6dv72c1hn"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; };
   tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
-  turboEM = derive2 { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; };
+  turboEM = derive2 { name="turboEM"; version="2018.1"; sha256="1xjpm2dxn48nflqriplxxbrjxv0spix6v7cp76gyh4kj8ylnbna6"; depends=[doParallel foreach iterators numDeriv quantreg]; };
   turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; };
   turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
   tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; };
-  tvR = derive2 { name="tvR"; version="0.1.1"; sha256="1amcaala3lqzj4cv51hdqd7xydvx4fjs7hprc0n0b1b6xv7md1v3"; depends=[imager Matrix Rcpp RcppArmadillo Rdpack]; };
-  tvReg = derive2 { name="tvReg"; version="0.2.1"; sha256="10ad9475i6q1phrjc2hh1h9si14qv9z27yn0n31cnm9fqnprdqn8"; depends=[bvarsv MASS Matrix systemfit vars]; };
+  tuts = derive2 { name="tuts"; version="0.1.1"; sha256="0mwc6lsnhxww041wh3020wz7w812asp1d6djv4n9pl7jil0kvkry"; depends=[coda doParallel foreach lomb mcmcplots rjags truncnorm]; };
+  tvR = derive2 { name="tvR"; version="0.2.0"; sha256="06h90r0mlflsbbvg09s1ap8b16yfk285ma8rzzdi7cmkfdc5hlyx"; depends=[filling Matrix Rcpp RcppArmadillo Rdpack]; };
+  tvReg = derive2 { name="tvReg"; version="0.3.0"; sha256="16z032j5wxyvgc29m8sgh4wcvsdam6a0srjwym52885rdslbkmjy"; depends=[bvarsv MASS Matrix systemfit vars]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
   tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; };
   twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; };
@@ -12086,29 +12282,33 @@ in with self; {
   twoStageGwasPower = derive2 { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
+  txtq = derive2 { name="txtq"; version="0.0.4"; sha256="0ipfc68m7l72wdnd4lmy7jm2dxs4xayzrd0g58m44dbikgwnw20i"; depends=[base64url filelock fs R6]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
-  uGMAR = derive2 { name="uGMAR"; version="2.0.1"; sha256="038sy4blyz4dxqklk9g9r4glz0gvip84r6mb1ry4l7yh5nbii1dh"; depends=[Brobdingnag]; };
+  uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.1.2"; sha256="0nvpmlp8dd250xn3g936wm52s2m6hb82lpvgpdak44ydhhswds0m"; depends=[ChemmineR usethis]; };
+  uGMAR = derive2 { name="uGMAR"; version="2.0.2"; sha256="1rbhinq3s818c11kj5ybz1v3xmfpzz55i7mh20a0r3pq64jdh7kc"; depends=[Brobdingnag]; };
   uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
   uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; };
   uavRmp = derive2 { name="uavRmp"; version="0.5.3"; sha256="05annx1vzpssxf5ycrgk2dizgl83zbwvl2x3bj8r5d8w5lvlpwrb"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
+  ubci = derive2 { name="ubci"; version="0.0.2"; sha256="1k2fgzz286qyzqk216saz52s6044zhwgzgv6ra03513vgm9w45ld"; depends=[dplyr httr lubridate magrittr tibble tidyr]; };
   ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; };
   ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
   ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; };
   udapi = derive2 { name="udapi"; version="0.1.1"; sha256="0mhkf1s7pv8d5hbianzcpc3jxps2i6y955n6bplikcz1l1pnb9ib"; depends=[curl httr]; };
-  udpipe = derive2 { name="udpipe"; version="0.5"; sha256="0vbnfqbjpc27lazf96dwfp3rz0857hlbpld4hqhxkb2sqmrd17c1"; depends=[data_table Matrix Rcpp]; };
+  udpipe = derive2 { name="udpipe"; version="0.6"; sha256="0mzqyp3mhcchfknpspc79fmf5sf9n94dxpvssl393p2fd92gkajy"; depends=[data_table Matrix Rcpp]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.2.0"; sha256="1z1wx89b2d7z1a2zc4ai05v9slfpidja8f561jcsrcdi9hz2yp81"; depends=[rmarkdown]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
-  ukbtools = derive2 { name="ukbtools"; version="0.10.1"; sha256="1q1pp15lmia1cadiyqpbk532yy8r8hfskglybpkrxrjq2i1sdm4j"; depends=[dplyr ggplot2 magrittr plyr purrr readr scales stringr tibble tidyr XML]; };
-  ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; };
+  ukbtools = derive2 { name="ukbtools"; version="0.11.0"; sha256="0ww8knrivykk8zx0mqc0bg9f1m64psdpjcxvdn4alhs88ywc71cf"; depends=[data_table dplyr ggplot2 magrittr plyr purrr readr scales stringr tibble tidyr XML]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; };
+  umap = derive2 { name="umap"; version="0.1.0.3"; sha256="039pmpbh60m9p3i07mg4gv01p3x4ad0ngpcw76dgarr3yqkx4ic6"; depends=[Rcpp reticulate]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
-  umx = derive2 { name="umx"; version="2.4.0"; sha256="1i5sa6kwj57spjm1smz9835i92vs70hsq0yl7m1s0i0f3k18k3fx"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
+  umx = derive2 { name="umx"; version="2.8.0"; sha256="06r93dli8rxj0b7kz2s5395xnr8ka4bikdvfda882jjnv2rprdbb"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
+  uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; };
   uncmbb = derive2 { name="uncmbb"; version="0.2.0"; sha256="0cvbh7a81g52hd2qzp23jwwjd5406iszf4wilgrz8sjfrfgybgfm"; depends=[dplyr rlang]; };
-  understandBPMN = derive2 { name="understandBPMN"; version="1.0.0"; sha256="1rps8915r5chnagyqlr4m3jw9hfc3lgwkfnqpxfmxxl7k1dv3mnh"; depends=[dplyr purrr Rcpp tibble tidyr XML]; };
-  unfoldr = derive2 { name="unfoldr"; version="0.6.1"; sha256="1s1sy4x808w7nvc5kmskv7ksi2xcnfbb26qn0wkinbqma9aicqm2"; depends=[]; };
+  understandBPMN = derive2 { name="understandBPMN"; version="1.1.0"; sha256="11ijxr5nzg6ivx2c9shgba9nfjb8ixypbj8jvhl7zjkwjrpb6f1y"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr XML]; };
+  unfoldr = derive2 { name="unfoldr"; version="0.6.5"; sha256="18k1bq3vdsiyg55zvs0sx5wgmslxvj283g742rkh214mfy5d89l5"; depends=[]; };
   ungeneanno = derive2 { name="ungeneanno"; version="0.1.6"; sha256="0fm47vmzn4z73pn37p94r84lbkg5amk0sl78304ibwz0rhlda0y5"; depends=[httr XML]; };
   uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
   uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
@@ -12118,24 +12318,23 @@ in with self; {
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
   unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; };
   unitizer = derive2 { name="unitizer"; version="1.4.5"; sha256="1ml1x9jvwmh8mg2w2j2g8ffibw6a1ihj0aih11zzf4gjhs0w5p9d"; depends=[crayon diffobj]; };
-  units = derive2 { name="units"; version="0.5-1"; sha256="07hbhgk7vpfb94gyk028rrqy793aa8sgykkqm3k2fgb23nwcd6vl"; depends=[udunits2]; };
+  units = derive2 { name="units"; version="0.6-0"; sha256="06g4ihhxvcc9d28zd1nznd2h5fd8zamq7jcxw6qj0ghb8878mw2n"; depends=[Rcpp]; };
   unittest = derive2 { name="unittest"; version="1.3-0"; sha256="0haf3s3pc5bhsm6y5njghr9w8ifsjxczm5r7g0ynylwzvd019n8b"; depends=[]; };
   univOutl = derive2 { name="univOutl"; version="0.1-4"; sha256="041cc1jn95zababc4i84c378i204zkn865k2vd7mk1piwm3qkrj5"; depends=[Hmisc robustbase]; };
   unix = derive2 { name="unix"; version="1.3"; sha256="1l5w22j0h3qzya13wx7y8lx2baw496vcmn39l2y8r1v38as9dybc"; depends=[]; };
   unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; };
   unmarked = derive2 { name="unmarked"; version="0.12-2"; sha256="1ql8l7kc8py7zand164w3yszqbmwyxvrkjvr10l4hx2mkcnvxzx0"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; };
-  unpivotr = derive2 { name="unpivotr"; version="0.3.1"; sha256="184xpnvcc8k0nxqad3q9qsj47g7icw98sm9bnx8fz4ga4zppxn4p"; depends=[data_table dplyr dtplyr magrittr purrr rlang tibble tidyr xml2]; };
+  unpivotr = derive2 { name="unpivotr"; version="0.4.0"; sha256="0zixkrxizfa309bfscivdjkz0c62xxrrfnbp829pgj2pvyicki50"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr xml2]; };
   unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; };
   unrtf = derive2 { name="unrtf"; version="1.2"; sha256="11q2p6cnf1pqsh8sys45gb4xf713bh693lm59d8nw09kcbm23210"; depends=[sys]; };
-  unsystation = derive2 { name="unsystation"; version="0.1.1"; sha256="0w5llr2kyv7g5fx5yvlyqwj4da5k5fq1f2y70c9pjdzrny9lpz4q"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
+  unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-3"; sha256="1324gn42qxw4cf3jg9vd8nwxiw4w4fg6p2xhzmn636q5wlziln5c"; depends=[Brobdingnag partitions polynom]; };
   unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; };
-  upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
-  uptasticsearch = derive2 { name="uptasticsearch"; version="0.2.0"; sha256="09vc26vpghc5lwlchmn7h8khy7s0jhcb8lqd1asr5l178kfpv3w8"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; };
+  uptasticsearch = derive2 { name="uptasticsearch"; version="0.3.0"; sha256="09g50szxbgc7x2py647lzwmljspks7s6xbbjplbzbpkdc2z4pndh"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; };
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
-  upwaver = derive2 { name="upwaver"; version="1.0.1"; sha256="0pl5r1rh91s8i74zrsrblp6mjn371a2lp01f5d37d1vnjxc3dn9n"; depends=[assertthat httr rjson XLConnect]; };
+  upwaver = derive2 { name="upwaver"; version="1.1.0"; sha256="1hchdh6h021bxw9516500ki7nqk8bprxwrinibl9wzi70xrb9z4i"; depends=[assertthat httr rjson XLConnect]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
   urlshorteneR = derive2 { name="urlshorteneR"; version="0.9.2"; sha256="1y5n1rn2c7yj5ncxfnsrj9lvaam2j3vvx8ld1vqyjay1r8flzifd"; depends=[httr jsonlite stringr]; };
@@ -12143,34 +12342,34 @@ in with self; {
   uroot = derive2 { name="uroot"; version="2.0-9"; sha256="0nxc8d4v9v5z3wbnj325iq2yrh0mipqgg2rn8pp2jyyq9vb1cxlv"; depends=[]; };
   usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; };
   usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; };
-  useful = derive2 { name="useful"; version="1.2.3"; sha256="016fwnjrnq44m71jmiy8cpzncja77pii2ag2ir85jdk4fzgckn7l"; depends=[dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
-  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.0"; sha256="14wdy74mj9rzlpmrsy3b4fda5f2sx078w1k1lgahz0yra3bypl3k"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; };
+  useful = derive2 { name="useful"; version="1.2.5"; sha256="05198zzlvzmmsic3g6nlxlwivpaszkzx61ximw0v4i4sahblxmp7"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
+  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.1"; sha256="1lkxzd5j51q57m5fqv21y6m37fgjwzjh0hhf940czhlwkk1idyld"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; };
   usethis = derive2 { name="usethis"; version="1.3.0"; sha256="0r61pf8qisjvrshm6jpcb76ck1v79s7lg9zwdgad4fasyyrzrcx2"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; };
   usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; };
-  usmap = derive2 { name="usmap"; version="0.2.1"; sha256="0ilg8fzrxpljdly8xkniirqa3lw74kfark75pv071aa4l6xkiwlg"; depends=[]; };
+  usmap = derive2 { name="usmap"; version="0.3.0"; sha256="0zf3frhdg08fa5m25gln5b7xpbyjr0sbybyih0yd5hgvw0fnk4dm"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
-  utf8 = derive2 { name="utf8"; version="1.1.3"; sha256="03s4j6059q0nly68vpk6wy3p3f5ypakw93fj35kzd82b4z1r9cs3"; depends=[]; };
+  utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; };
   utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; };
   utility = derive2 { name="utility"; version="1.4.2"; sha256="0q08yc0sxbcjhsr0nkgc2pyxkd93zwlbf0jyq21cf535mj4036gq"; depends=[]; };
-  utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.5"; sha256="1kllm94c23pb176nazcfgsv38aawbzdwqdhyxx1c1n1jlsls2zk6"; depends=[data_table dplyr RCurl stringdist stringr]; };
+  utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; };
   utiml = derive2 { name="utiml"; version="0.1.4"; sha256="1z93a7ldgkab6hsa9a0hzyhxsbac45sgqn7fy2jh615d2kw7pqr1"; depends=[mldr]; };
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
-  uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.5"; sha256="0zsbznvhnxihpxbkw3z4mywc66qx9qfxa0bz6748h19c885hjw01"; depends=[Exact geepack plyr sandwich survival]; };
+  vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; };
   vagalumeR = derive2 { name="vagalumeR"; version="0.1.1"; sha256="1l1p63yhwqvkh8kgqii9n96vdm86jfc64nrinjp5l7jhx99sn013"; depends=[httr jsonlite plyr stringr]; };
   valaddin = derive2 { name="valaddin"; version="0.1.2"; sha256="0j1c3g9gn2j0manz3jjh58cnl7b1rfwm9494xqrfqpia8948p9vq"; depends=[lazyeval purrr]; };
   valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.2.4"; sha256="0dg6jkc3g42fj0dx1m868v7p7jmxfdgihal9jmzphysyl36z8fp7"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.2.5"; sha256="069r6a0l719napmrf37rwi2dvm4ql5ip3g7kba3s96b1qamh8afi"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; };
   validatetools = derive2 { name="validatetools"; version="0.4.3"; sha256="1v6mmk3iq5nzzjkkj1spiqfmqq2133xg2qyy3y8h4pwwfynp4v7c"; depends=[lpSolveAPI validate]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
-  valr = derive2 { name="valr"; version="0.4.0"; sha256="1km828lif5nh15fxc3kbk3xp14gmsd6f3n0g5ml9zbdimh9n990z"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; };
+  valr = derive2 { name="valr"; version="0.4.1"; sha256="0w9hgcyvmny2z1k2phnid60y8qvwbp47dy7q85ppd3j1cxyik5id"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; };
   valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; };
   vanddraabe = derive2 { name="vanddraabe"; version="1.0.0"; sha256="0hnfkwrrk50a5rica3lk2d52qi77xya3aspf13g0zygbyvv7ls72"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; };
   varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; };
@@ -12178,11 +12377,13 @@ in with self; {
   varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; };
   varbvs = derive2 { name="varbvs"; version="2.4-0"; sha256="0f6c9acrir8c8m8mg928azlp31yh49faz5s2g7cbgf5f1pxi07nl"; depends=[lattice latticeExtra Matrix Rcpp]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.9.11"; sha256="0ij45lq3dgvxm2nf6n8amd4si7giajnwlzq0lia568zfisdw4k0l"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
-  varhandle = derive2 { name="varhandle"; version="2.0.2"; sha256="1lbhwkkp9dyfhby6s4q3b6wy13wfqdjw3q21kq6k08rz7lsi0wny"; depends=[]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.10.0"; sha256="0v1l6rw8in0nr1a7g1mgfimjxjzjww174y8vxvmgirlifnnjxkc8"; depends=[data_table foreach laeken MASS plyr stringr surveyplanning]; };
+  varhandle = derive2 { name="varhandle"; version="2.0.3"; sha256="11yisjgqc8fq0sj1kzgp51i926cs4yqkpfmbis5ak786wqalc6na"; depends=[]; };
   variables = derive2 { name="variables"; version="1.0-0"; sha256="0i1nmrbps1snyzdwlki7sfxf2vpqghd9ap8pmy235d5r399jmpkb"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
   variosig = derive2 { name="variosig"; version="0.1"; sha256="191d4f52z686s8xbx7aw9c3qjp77iri43l52n8nxjgfjl877x5m4"; depends=[geoR gstat sp]; };
+  varjmcm = derive2 { name="varjmcm"; version="0.1.0"; sha256="02l0d896faakh9pdq2rzl2psmrj7l2pvacz7nk3r6552glsk7h18"; depends=[expm jmcm MASS Matrix]; };
+  varrank = derive2 { name="varrank"; version="0.1"; sha256="1ynpnzfvwbwfpcv7rqlkvxmmafnjgdssr5l42rr3bklm9j1z71vm"; depends=[FNN]; };
   vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
   vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
@@ -12190,148 +12391,158 @@ in with self; {
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; };
   vcfR = derive2 { name="vcfR"; version="1.8.0"; sha256="1684lamsivwaqzvmwzhrrziwczkaqn3mhbdr86zbjdhr1jcgkz2z"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; };
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
+  vcr = derive2 { name="vcr"; version="0.1.0"; sha256="1f0hjfip7k9gd7lbaqk97idan2qfns7yiw6rsxp8q7szmjyhb6ga"; depends=[base64enc crul lazyeval R6 urltools webmockr yaml]; };
   vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
   vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
-  vdiffr = derive2 { name="vdiffr"; version="0.2.2"; sha256="11annh6dl4xyky4c6jx0jhvwpfmqfha57666qzs225sj30xq84dc"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; };
+  vdiffr = derive2 { name="vdiffr"; version="0.2.3"; sha256="0rsznvbymlwdjl9qdll98x8cqkf8rdi20c5sw4w547sfxr664yl0"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; };
   vdmR = derive2 { name="vdmR"; version="0.2.5"; sha256="1v96khvg3k33kg3aavanl8g05n5mjkbqsbf8c4lya73f3rs4sfgb"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr Rdpack rgdal rgeos rjson Rook sp]; };
   vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
   veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; };
   vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; };
   vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; };
-  vegan = derive2 { name="vegan"; version="2.5-1"; sha256="0pynr02d1xngda6c3va8fc4nxpgfkawhzcnz1ws4dnarp9b1w90r"; depends=[cluster lattice MASS mgcv permute]; };
+  vegan = derive2 { name="vegan"; version="2.5-2"; sha256="13pyqvlpz64qibi8k5d109v7q09j06mbv6ndix3n4cn21mjx391c"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.1-1"; sha256="1jd9m2immkhgb1zr39gsgl746y7qpi5fhj8awmqq5lyr5j6jp6jh"; depends=[cluster rgl scatterplot3d vegan]; };
-  vegclust = derive2 { name="vegclust"; version="1.7.1"; sha256="1k1dcw424s19f8ngsksvdmsayahl1hkxd9v2irf8ljpp688l8idi"; depends=[Rcpp sp vegan]; };
+  vegclust = derive2 { name="vegclust"; version="1.7.4"; sha256="1fz3p5jpqy99r601dj9fahgv32vw0v54jlrq48wn81rzg2wwfmk7"; depends=[Kendall Rcpp sp vegan]; };
   vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
-  vegtable = derive2 { name="vegtable"; version="0.1.1"; sha256="0vpkfagkvwkij4kn4zxxiddbnw1qxv6dajjlis4byl766606xi1v"; depends=[foreign plotKML qdapRegex sp taxlist vegdata]; };
-  vein = derive2 { name="vein"; version="0.3.9"; sha256="1h5j7fa0c7q1p3fj3pr98f4y1dc4n2r6gm0a8rddv4m8nf2cjgq7"; depends=[data_table sf sp units]; };
+  vegtable = derive2 { name="vegtable"; version="0.1.3"; sha256="1pjbqhc09bmyjxx21z01dysbvwbx7v0mxm9xbcmfxdmr10adhian"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; };
+  vein = derive2 { name="vein"; version="0.3.35"; sha256="0jmsr7vw2p7r6z3s1kqkrnkd5f0w6mjzv2ln3s446c1z3bmvv5zv"; depends=[data_table eixport sf sp units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; };
   velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; };
   vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
-  venn = derive2 { name="venn"; version="1.5"; sha256="0mb8864kmn98184q007jnn7cydh02sx8bh1mhsskycmi70c8w8ai"; depends=[]; };
+  venn = derive2 { name="venn"; version="1.6"; sha256="0ipfysb9kjq07rvf6szy1cci4waw905bavk9bs60aii5858k9rcs"; depends=[]; };
   vennLasso = derive2 { name="vennLasso"; version="0.1.2"; sha256="1lma34msdl8ik0375bh4adbfgvcy0crv29gpsk7p6x75464jsp9y"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
   vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; depends=[Rcpp rgl stringr]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
   versions = derive2 { name="versions"; version="0.3"; sha256="0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd"; depends=[]; };
-  vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
+  vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; };
   vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
-  vetr = derive2 { name="vetr"; version="0.2.4"; sha256="16v31qkbn6nbng00465z6990n2hwzrv5i4m3ifv3ysfq28jnd28a"; depends=[]; };
+  vetr = derive2 { name="vetr"; version="0.2.5"; sha256="164zs1bxhkjzicip95lhyb2yi4hgg08zm6i18z6g4bjgn1ban1id"; depends=[]; };
   vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
+  vimp = derive2 { name="vimp"; version="1.0.0"; sha256="0q92zgs52nxrxswnvascbpfvg51hvy08cwjy2vjjvzjydicsfnxh"; depends=[SuperLearner]; };
+  vinereg = derive2 { name="vinereg"; version="0.3.0"; sha256="05vd9ilnx9cswsa21bnw6p5q44yyc7adm4xh966dnsdrsdj6dd7s"; depends=[cctools furrr future kde1d rvinecopulib]; };
   vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; };
   violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
   vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
+  vip = derive2 { name="vip"; version="0.1.0"; sha256="1blyyy17f4gxhbw7jwwf0xrq4ha142k356dfhasnvk4jqrpajcxc"; depends=[dplyr ggplot2 gridExtra magrittr pdp plyr tibble tidyr]; };
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
   viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.4-2"; sha256="19qw8vqf08x6fgm8w159qabpgr2wv2cxishpj6888ihcaa9ykp8f"; depends=[ade4 dismo raster rworldmap]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
-  visNetwork = derive2 { name="visNetwork"; version="2.0.3"; sha256="0bs6war8m6vnzyhmzfmry5sfc5v1crq8i8r8nn70shf19k7pabmw"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
-  visdat = derive2 { name="visdat"; version="0.1.0"; sha256="1r009jlg3wwg06j5066c09567q24986c74f0cd68kcbmihaxngbx"; depends=[dplyr ggplot2 magrittr purrr tidyr]; };
+  visNetwork = derive2 { name="visNetwork"; version="2.0.4"; sha256="05gdsma70zvkgly9qscbwy98x8zrqgsk93czb37jp0as365l00q5"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visdat = derive2 { name="visdat"; version="0.5.1"; sha256="1vnfwldzq5ddqk8prj4cg0dmkbjhpchdkb6v8kicd876dv8vxy2q"; depends=[dplyr ggplot2 magrittr plotly purrr readr rlang tibble tidyr]; };
   visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; };
   vistime = derive2 { name="vistime"; version="0.5.0"; sha256="1h7dm66m0qx3hmfx1hlv5na65swdhdykyg1fsqzgnjl6p98cg81j"; depends=[plotly RColorBrewer]; };
-  visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; };
+  visualFields = derive2 { name="visualFields"; version="0.5.4"; sha256="19fb1qq4kyhln21dmf7wm6kqf7g94ls7nsaspl2q9d3rlmcgz5h3"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
   visvow = derive2 { name="visvow"; version="0.1.0"; sha256="0nb849m6dqfanqlaqcargw0rlf4ch9v09zmf0zqmxkwcil0w0dka"; depends=[Cairo DT ggplot2 plot3D plyr pracma psych Rdpack readxl shiny shinyBS svglite WriteXLS]; };
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
-  vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; };
+  vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
   vlad = derive2 { name="vlad"; version="0.1.0"; sha256="0gdp9488ir6zsnwaf0zb1n4qivafccqky7i867vjc2zb9nnji6a9"; depends=[Rcpp RcppArmadillo]; };
   vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; };
   vmsbase = derive2 { name="vmsbase"; version="2.1.3"; sha256="1y4r1f6miwxx3q8pajyh202wvjz08w6291jvpv723qyxa6z1r69a"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
   vocaldia = derive2 { name="vocaldia"; version="0.8.2"; sha256="15314sq2gbi1z47ppvy8y3ljjk12jq4k5a1dfyi56h2lpzrc76ny"; depends=[]; };
-  vortexR = derive2 { name="vortexR"; version="1.1.4"; sha256="1zjrywjh8nrzaqmrl2yym481j0y40126xz8lh52vc8pk041p3xdb"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
+  vortexR = derive2 { name="vortexR"; version="1.1.5"; sha256="03bzjyscqf0npvdwm0741n1sg2kbpqlqkpxj843rmac6blkxy7cn"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; };
+  vosonSML = derive2 { name="vosonSML"; version="0.23.4"; sha256="0y2jyrkld02ksn2ipkkxzc724dhbqbja120gg7sm67v6x444pma7"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
   vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; };
   voteogram = derive2 { name="voteogram"; version="0.2.0"; sha256="0m4j7iz7mc6z536vk0kmqfd8ank87ingv5vnjl7mn62r53c5fbsf"; depends=[dplyr ggplot2 jsonlite scales]; };
-  votesys = derive2 { name="votesys"; version="0.1.0"; sha256="1y86411khvn8yz0q75ky9ic7n8a11jckmpamj56h9cl5yh1rbm9w"; depends=[data_table]; };
+  votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; };
   vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; };
   vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; };
   vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; };
-  voxel = derive2 { name="voxel"; version="1.3.2"; sha256="0sixcan3v5nczmrrxn56rw5dqjq8xx7z3cp18j23jq26mvq4nm34"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; };
+  voxel = derive2 { name="voxel"; version="1.3.5"; sha256="1xlym8xc22dq67h0lylrr16z7b4zdidpgrkvbs7n9fnkh6vijw2j"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti purrr]; };
   vpc = derive2 { name="vpc"; version="1.0.1"; sha256="0zxiakls7wi0278f6v74xdcaw500am8gfs8lp7cciaxnw2clvsbv"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; };
-  vqtl = derive2 { name="vqtl"; version="2.0.0"; sha256="193jd5wcz8s3n2571jn5f6vz7kgf6l8a6w9anzd53pgc2644w3f9"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools hglm iterators knitr lazyeval purrr qtl stringr testthat tidyr]; };
+  vqtl = derive2 { name="vqtl"; version="2.0.4"; sha256="1jp7h2afnfgn8i65qg64lwbjw56s37w8fgwfajcgxn2mwb5z0jcb"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools iterators knitr lazyeval purrr qtl stringr testthat tidyr]; };
   vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; };
   vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
   vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
   vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; };
+  vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; };
   vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; };
-  vtreat = derive2 { name="vtreat"; version="1.0.3"; sha256="04kicd7jxvcnvd0n9ssxv3jsi075wass30l3jg0ikdr3kc899vfs"; depends=[]; };
+  vtreat = derive2 { name="vtreat"; version="1.2.2"; sha256="06r8ib4l3cyxrx8ykkvjj7ycrjsrv5d5y0lm6zj12lc9l298zj49"; depends=[wrapr]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; };
   wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; };
   wCorr = derive2 { name="wCorr"; version="1.9.1"; sha256="1n4qd11bh0aq80fsw68vfky7nnvgkk6irsfjrknkf9bjvwvihlak"; depends=[minqa mnormt Rcpp RcppArmadillo]; };
+  wISAM = derive2 { name="wISAM"; version="0.2.8"; sha256="0c5ic98ihpzkycsj9wg0127civm4w1rmkkw6zsjp8sfn20cl8a8z"; depends=[MASS]; };
   wNNSel = derive2 { name="wNNSel"; version="0.1"; sha256="19j2yz6lvkxpmjr0vv6pjc7j1c02y0hb3gay5sy1y0xk706aggb5"; depends=[]; };
   wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; };
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
-  wTO = derive2 { name="wTO"; version="1.5"; sha256="0zz89r60fq47gdd08p29xxsx22097ynz1zrc4zmkv5z99wsmsssp"; depends=[data_table igraph magrittr plyr reshape2 som visNetwork]; };
+  wTO = derive2 { name="wTO"; version="1.6.1"; sha256="0iw5vg3qpjgyx6n2p10a2ma9dpcm1hchvrm2brh1a0j1xmjwpsrl"; depends=[data_table igraph magrittr plyr reshape2 shiny som visNetwork]; };
   waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; };
   waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
-  wakefield = derive2 { name="wakefield"; version="0.3.0"; sha256="1f74503ar4hw48j13npgzybvwc631xndldidqnyfk72wb11fzi4z"; depends=[chron dplyr ggplot2 stringi]; };
+  wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; };
+  walkalytics = derive2 { name="walkalytics"; version="0.1.0"; sha256="1kl6kwwnl67d45akna01xp389wjxsxlc84l0bcpadbipsqyb3kd1"; depends=[base64enc dplyr httr purrr sp stringr tibble]; };
   walker = derive2 { name="walker"; version="0.2.1"; sha256="1q99nny7mdh7wc3yj4dz0s2454aqyxjcsp5hpjrha14h4p3fcirf"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
   walkr = derive2 { name="walkr"; version="0.3.4"; sha256="01278hfa9mppwqmr54826gb65pswhqbh7ai8ij6m4ncc0fk6pvvd"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
-  wallace = derive2 { name="wallace"; version="1.0.4"; sha256="1adc070z94gwpfv4b1r0m2ylw9nzigzf412zlllbzlmn3pz42076"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos shiny shinyjs shinythemes spocc spThin]; };
+  wallace = derive2 { name="wallace"; version="1.0.5"; sha256="1c3ghc5prkw44sq93klj1cfgllsz3830y78i4b1y6r23bj2z9520"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML]; };
   wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; };
   walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; };
-  walrus = derive2 { name="walrus"; version="1.0.1"; sha256="032s2k122z5cqkcjvh9gva4vvmj5prn6z3rs8j5y16d98kgambpy"; depends=[ggplot2 jmvcore R6 WRS2]; };
+  walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; };
   wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.12"; sha256="1fb1pni00gphhwxzq75y5lbjqpyapc5vpqbbi2vq841dpn2jkcwm"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR NatureSounds pbapply pbmcapply pracma proxy RCurl rjson seewave signal Sim_DiffProc tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.14"; sha256="0wr0m950y404chh8gipx1v5mvldypm0iwyiqn4ypz5143fzlhwih"; depends=[bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
   washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; };
   wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
-  water = derive2 { name="water"; version="0.7"; sha256="1rdwmld4xxaxx003cjj67jylgg507r2jjqvncbp539q7c2z5b201"; depends=[raster rgdal sp]; };
+  water = derive2 { name="water"; version="0.8"; sha256="0qglf922dlgi41jzz3sivq7ckmzl8axqjfg4klcgnddycmm3ha5j"; depends=[raster rgdal sp]; };
   waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; };
   waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; };
   waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; };
   waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; };
-  waved = derive2 { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
+  waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; };
   wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; };
   wavelets = derive2 { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
-  wavemulcor = derive2 { name="wavemulcor"; version="2.1.0"; sha256="0z2vyb3rsxxh7k9fgaxi0xa6rwrw3pka1h4xkfrb9xydsacwbvx2"; depends=[waveslim]; };
+  wavemulcor = derive2 { name="wavemulcor"; version="2.2.1"; sha256="0150ybf8lwxc93zhcrsmh4gp6wbib3s14j95jlg6dlsckixyi3iw"; depends=[waveslim]; };
   waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; };
   waveslim = derive2 { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqhhk57m9vkbnfsznkvk8430cvbcsn7vridii"; depends=[]; };
   wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; };
   wbs = derive2 { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; };
   wbstats = derive2 { name="wbstats"; version="0.2"; sha256="0rfc9c6892jq7y17dwp6vsn62ggnac964xndmxq3mip6k2pk8yi0"; depends=[httr jsonlite tidyr]; };
   wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; };
-  wdman = derive2 { name="wdman"; version="0.2.2"; sha256="1a6zav82w0krk0ncm5b79ahy2hc0xakg9i1m2143ih5p6zvcm5m0"; depends=[assertthat binman semver subprocess yaml]; };
+  wdm = derive2 { name="wdm"; version="0.1.1"; sha256="0mr901l2378dyygdhc5agx93lm46a44fs3kr3ax2wnv1cdhmc379"; depends=[Rcpp]; };
+  weathercan = derive2 { name="weathercan"; version="0.2.7"; sha256="09465l1gy349vgnpasxazp3i5x82hld8k06ba6556k4r9jypx08v"; depends=[dplyr httr lubridate purrr stringi tidyr xml2]; };
   weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; };
   webTRISr = derive2 { name="webTRISr"; version="0.1.0"; sha256="19xal5zg9mg25vzvkz55zm6gkd8b0y3sw3zbbrxn73a1jg8x5v0l"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; };
   webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
   webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; };
   webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
-  webmockr = derive2 { name="webmockr"; version="0.2.0"; sha256="1zzfam380gy1d3k909ixbk61gmmv0w1x17qz8avrrnjlvqbp9gmn"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
+  webmockr = derive2 { name="webmockr"; version="0.2.6"; sha256="00akqj7lw3hvwxllnn48zpq5wk70bbr4ghzilh6064jwkk365c8v"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; };
+  webr = derive2 { name="webr"; version="0.1.0"; sha256="0fjbk933034cgmqd41cw7q5xcvrwgylcic6lxav9jv3b2sspzw06"; depends=[ggplot2 moonBook stringr]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
   websearchr = derive2 { name="websearchr"; version="0.0.2"; sha256="1yf8ch86khg5syppcxs94mxgc3i5623qyhzh174nssw1wzyqb9ba"; depends=[]; };
   webshot = derive2 { name="webshot"; version="0.5.0"; sha256="07r71zzmggp4jf92x4ws4wg6v1x98vaj01lsar85bnb30n5vx8gh"; depends=[jsonlite magrittr processx withr]; };
   webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; };
   webutils = derive2 { name="webutils"; version="0.6"; sha256="1basl7q2m8y9nw5ksi1kdz6an9pybvsmdd4snrm7a37041xymnps"; depends=[curl jsonlite]; };
-  webvis = derive2 { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
   wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; };
-  weco = derive2 { name="weco"; version="1.1"; sha256="1xnhbm499vypn8iwm33h1hv0wih1lj3bglm1rlgxaypbwj1acg53"; depends=[]; };
+  weco = derive2 { name="weco"; version="1.2"; sha256="1prk8hn782pd8g2rbbaj7y10vjimqs9n8i4rab6aw6fc3k759d6b"; depends=[]; };
+  weibullness = derive2 { name="weibullness"; version="1.18.6"; sha256="046fs6b5yb6ckddcb9vplc5478c7xprnafsj4rvzb1gmcpcrqqck"; depends=[]; };
   weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; };
   weightedScores = derive2 { name="weightedScores"; version="0.9.5.1"; sha256="118hzwaarcb8pk2zz83m6zzzndlpbbzb7gz87vc7zggpa998k1gr"; depends=[mvtnorm rootSolve]; };
   weightr = derive2 { name="weightr"; version="1.1.2"; sha256="13wy7ygx7khbmymg2r0rr6mrl4lbapf5bnnq1rq8izl38sjk7csx"; depends=[]; };
-  weights = derive2 { name="weights"; version="0.85"; sha256="0nsvgx2yn2ynrkqvvy3fxjsi6aw8w3zknm80fyjrih2zmxc7v61f"; depends=[gdata Hmisc mice]; };
+  weights = derive2 { name="weights"; version="0.90"; sha256="0wgh2nb2y0xr20y6ig9mric34zhwpndb71ddpbrf5sjqg3hijj96"; depends=[gdata Hmisc mice]; };
   weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; };
-  welchADF = derive2 { name="welchADF"; version="0.2"; sha256="1gyii50khjd1pamv3v19ajx6b2vw2aspbzmqiqrqmvcl46nha24y"; depends=[lme4]; };
+  welchADF = derive2 { name="welchADF"; version="0.3"; sha256="0k2di5fwh5jv87mw4bjnhbk2rmhf2v2f5ksjr5dgnyhnawwxqq97"; depends=[lme4]; };
   wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; };
-  wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
+  wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; };
+  wevid = derive2 { name="wevid"; version="0.4.2"; sha256="0d771r3xrd7nwnpwnhzqaqybimjg0gaikqqagbf483x423ijfdny"; depends=[ggplot2 pROC reshape2 zoo]; };
   wfe = derive2 { name="wfe"; version="1.6"; sha256="0y8f042hzlqwgsr63rl2apl7hkw9bs69a287dynvz9w078am61ch"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
   wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
   wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; };
-  wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
   wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
@@ -12344,7 +12555,7 @@ in with self; {
   widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; };
   widyr = derive2 { name="widyr"; version="0.1.1"; sha256="14r1qiq4i7lmn3i76aa0d9wcjw1jclm1jf371j25s92w8z36mdln"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-  wikilake = derive2 { name="wikilake"; version="0.3"; sha256="1y4vinm8gxyj6x36nb4xzhx1yf96x1nwlzzhvj4g36rbcix7dn6q"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
+  wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; };
   wikitaxa = derive2 { name="wikitaxa"; version="0.2.0"; sha256="06ccb1ix5lsz3jgr3aq2ywq9bdnz020sa5dzlq1ayw95gdqj6icl"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
   wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; };
@@ -12355,20 +12566,19 @@ in with self; {
   windfarmGA = derive2 { name="windfarmGA"; version="1.2.1"; sha256="1v4brwi92a2kchak43z0vxjq11373amh190fnmpmnpz58zbls448"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
-  wiqid = derive2 { name="wiqid"; version="0.1.3"; sha256="06six8w77lf9rc49hnr42xgn2jvhb84wvqgi08ns22yn4z2iz9pz"; depends=[coda HDInterval MASS truncnorm]; };
+  wiqid = derive2 { name="wiqid"; version="0.1.5"; sha256="02ssj0f12if3bic614bp9klzcag121rbqw4g0awvcpk9jql8k5dr"; depends=[coda HDInterval MASS truncnorm]; };
   withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; };
   wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; };
   wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; };
-  wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; };
   wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
   wmtsa = derive2 { name="wmtsa"; version="2.0-3"; sha256="1q436krz5p1f4a7a7sya6a9rh9x9mi8zzcgq66gbk9w9w4hcqcj6"; depends=[ifultools MASS splus2R]; };
   wmwpow = derive2 { name="wmwpow"; version="0.1.0"; sha256="0hvim7b9zn6h6w6m6hgil919nkzkn8676x8b2f3lbmm8m7dwm3lq"; depends=[lamW MASS smoothmest]; };
-  wnl = derive2 { name="wnl"; version="0.4.0"; sha256="02axa2xfbsvqiil240ywkj3r4yw5sqzk9mai1nccrvcx9fz8qlgc"; depends=[numDeriv]; };
+  wnl = derive2 { name="wnl"; version="0.4.1"; sha256="0gr0jf549nmavlzra6b1jg9306chl2l5qivizn5xkkcf8hmq5rm6"; depends=[numDeriv]; };
   wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
   woeBinning = derive2 { name="woeBinning"; version="0.1.5"; sha256="04pw32vng31v1n4r1g1fisvv8cacxmcx7m65vw4a2byamp2d25yq"; depends=[]; };
   woeR = derive2 { name="woeR"; version="0.1.3"; sha256="15bdhgjq39svzaqzmfykyaq4r543lq15jf0sz8m9bwjv2c6vlx5l"; depends=[dplyr]; };
-  womblR = derive2 { name="womblR"; version="1.0.2"; sha256="0cnggwi47pmyjqz78vcvdzv3kpss6v4h404w2d7dii0zfqjr7bpk"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
+  womblR = derive2 { name="womblR"; version="1.0.3"; sha256="0g8r98lfycvsaii3zczr55pah5ffqrpinbrax41yp62w6hzgkq9b"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
   wooldridge = derive2 { name="wooldridge"; version="1.3.0"; sha256="029vdiglwkr7ilr7jvzarvphcc71n1majn6bh427b4qq7n01a7wb"; depends=[]; };
   word_alignment = derive2 { name="word.alignment"; version="1.0.9"; sha256="02dy4a9agfb99rjbqxy35nf11bpxyjcq15bnyzjkbvcy0ppfgz0l"; depends=[data_table openxlsx quanteda]; };
   wordbankr = derive2 { name="wordbankr"; version="0.3.0"; sha256="0aa1gz3fg7h9wnk93ialwj0wjyk8wxani8galwkrms4fp7d5lmf4"; depends=[assertthat DBI dbplyr dplyr purrr rlang RMySQL robustbase stringr tidyr]; };
@@ -12377,10 +12587,11 @@ in with self; {
   wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
   wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; };
   wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
+  workflowr = derive2 { name="workflowr"; version="1.1.0"; sha256="0vpnrldn798g3hcf1i30l5306259idbn5h3s23hjx3vxqjznss7f"; depends=[callr getPass git2r glue knitr R_utils rmarkdown rprojroot rstudioapi stringr whisker yaml]; };
   worldmet = derive2 { name="worldmet"; version="0.8.4"; sha256="15crnmlcj1yi9rm35n8f34jprms24r2xwx550zz627bdvq4vmam4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; };
-  worms = derive2 { name="worms"; version="0.2.1"; sha256="0qxij56wvhlz9pgc1wp5nr3yi2r0h0r7xvlhhvsflch60gprpi1s"; depends=[httr plyr]; };
-  worrms = derive2 { name="worrms"; version="0.2.0"; sha256="1mqv2j9235pqdwqnw11b0zdv763wf9wqjqpf3p6fxpmki24j7xk6"; depends=[crul data_table jsonlite tibble]; };
-  wosr = derive2 { name="wosr"; version="0.1.0"; sha256="0j3srk8siiip192w6wdc2w9azbhpdxyrzgyinwmi1z58xqmi9c38"; depends=[httr jsonlite pbapply xml2]; };
+  worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; };
+  worrms = derive2 { name="worrms"; version="0.2.8"; sha256="1f25x46b7hzrjz6y8ps29cfl8qa17smxbnrghf3bwhr4qc0vf5k5"; depends=[crul data_table jsonlite tibble]; };
+  wosr = derive2 { name="wosr"; version="0.1.1"; sha256="1jmq4z5myjxww2lz20i70vyvsvjxm1n9ayvxggxvzl28kwhpi5ca"; depends=[httr jsonlite pbapply xml2]; };
   wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
   wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
   wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
@@ -12390,10 +12601,10 @@ in with self; {
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.4.0"; sha256="0kxnpvqnr9whc8f5dr0xwff23pky9hp7mvrprvqnkwk0k44zd6c5"; depends=[]; };
-  wrassp = derive2 { name="wrassp"; version="0.1.6"; sha256="1f6yyw6mmwc267cd9v17k6n4fhymi0y201bm6ii56rcw86n4ix77"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.5.0"; sha256="1r3h4h9vd0j4pbxh72557vqhdm1b79d35ialxr5919afx0nw1sg8"; depends=[]; };
+  wrassp = derive2 { name="wrassp"; version="0.1.7"; sha256="0wbgrpxp4ck8cpfnv6n5lf04ga12gn8cm3rm5jj32gcm4gvdvzjl"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
-  writexl = derive2 { name="writexl"; version="0.2"; sha256="0hclrbn21sc0ifd2c5xfww84jf47412wzs86a73swxxjzcbrkg5k"; depends=[]; };
+  writexl = derive2 { name="writexl"; version="1.0"; sha256="0r2v12dc4zqmr1agp6vbw0fc48i278018684x84psjjqfmnv14cf"; depends=[]; };
   wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
   wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
   wrswoR = derive2 { name="wrswoR"; version="1.1"; sha256="0jnb818xz841bx2i03k3hhy4hxcwpxblskg9nrc8kgbc22rxx4lz"; depends=[logging Rcpp]; };
@@ -12401,7 +12612,7 @@ in with self; {
   wru = derive2 { name="wru"; version="0.1-7"; sha256="1fvbl5i07f6kdwjhirjla4kc1rrmrm8blvn8aa79s87ljagg0ql9"; depends=[devtools]; };
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
   wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; };
-  wtest = derive2 { name="wtest"; version="2.0"; sha256="16fprxy8lxvipzynxbbs2ras8wflc4g4p1x1439ym1xkg2vwys9a"; depends=[]; };
+  wtest = derive2 { name="wtest"; version="3.1"; sha256="1rlas9jn57mcyjic9dhkqj355djldc95q07b076w847cd4pmzqvb"; depends=[]; };
   wtss = derive2 { name="wtss"; version="1.0.0"; sha256="041686mnhqcljxm3ska35mslpq30ah47anvnmrgnkx5y05pwa8pj"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; };
   wunderscraper = derive2 { name="wunderscraper"; version="0.1.0"; sha256="1h9nhxvs673n2ivw466qm77k20541cwgmmq35iv3dcb3hvw36p0r"; depends=[httr jsonlite sf tigris]; };
   wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
@@ -12420,22 +12631,24 @@ in with self; {
   xergm = derive2 { name="xergm"; version="1.8.2"; sha256="0rg8b0r27nzjnf0zkwfbkw96439h0b40k1l5lqi5igyr0bm7w0cc"; depends=[btergm GERGM rem tnam xergm_common]; };
   xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; };
   xesreadR = derive2 { name="xesreadR"; version="0.2.2"; sha256="1y7iilqdj9jv5snzylihs996hvpcj9s3yaiy7wr20m5yh1ngwkvj"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; };
-  xfun = derive2 { name="xfun"; version="0.1"; sha256="1sm51gmwgw876d6d1q8smxmfgfh6zsnykfx8qp8z6jmh0fvd89pj"; depends=[]; };
-  xgboost = derive2 { name="xgboost"; version="0.6.4.1"; sha256="0n47xvsrk8f8gy2x33rf93yfpkk4ir4z06f09qhlnrnpq1dvwfzf"; depends=[data_table magrittr Matrix stringi]; };
+  xfun = derive2 { name="xfun"; version="0.2"; sha256="0zl22fcw90kdvzkjyf6vbmdmn9rz3bl51522fasvmykypffyng4a"; depends=[]; };
+  xgboost = derive2 { name="xgboost"; version="0.71.2"; sha256="134q69xbi93ajjlwrp838jgypjdjipmbkzmr31mvc100i9nsr14x"; depends=[data_table magrittr Matrix stringi]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
   xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
   xkcd = derive2 { name="xkcd"; version="0.0.5"; sha256="1cq4n7w4adj24qq658z15jkqvrn4pd5abxpcsdkzb2cq98m69iis"; depends=[extrafont ggplot2 Hmisc]; };
   xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; };
   xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; };
-  xlsx = derive2 { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
+  xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
   xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; };
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
   xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; };
   xml2 = derive2 { name="xml2"; version="1.2.0"; sha256="154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha"; depends=[Rcpp]; };
   xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.1"; sha256="0q9d4l3p4ypc0qswnjwrd3as9bx9f1niixsc19y1msva51sg5h39"; depends=[]; };
+  xmlrpc2 = derive2 { name="xmlrpc2"; version="1.0"; sha256="1h99z0kmmp5rmyglqwpaan6hbb8kg8q4783kjsyww43fl0l3imd8"; depends=[base64enc curl xml2]; };
   xmrr = derive2 { name="xmrr"; version="1.0.1"; sha256="0h5861mym7k7xkby6zilcxq8i3yr06kcaam5pzi2y0q85iycb88f"; depends=[dplyr ggplot2 tidyr]; };
   xoi = derive2 { name="xoi"; version="0.67-4"; sha256="180zzc81d883qzl1xgj88d9aslqmsgdvv8w1mx2613h1rkirkpdp"; depends=[qtl]; };
+  xplain = derive2 { name="xplain"; version="0.2.1"; sha256="01hl9dxiqqxzdixqccga0sywlhv97pi1l51r9sr7v106s7q11jxn"; depends=[RCurl readr XML]; };
   xpose = derive2 { name="xpose"; version="0.4.2"; sha256="11k07z76fpp4fvp3kfx1jc7bx1mwc1xfwyp46xwfhgfbazbvyfd7"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; };
   xpose4 = derive2 { name="xpose4"; version="4.6.1"; sha256="1722ai8r94dmy4d2r728iir0hl2b2gmym8xjsqscfc6jw070734i"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; };
   xptr = derive2 { name="xptr"; version="1.1"; sha256="12yvgbwm311hap3kk24wdx5zz084h0lhkj9k10mjzqp4a6aayi88"; depends=[]; };
@@ -12445,21 +12658,21 @@ in with self; {
   xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; };
   xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; };
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
+  xtensor = derive2 { name="xtensor"; version="0.6.1-0"; sha256="0ajxzjj8nyn7a0z16agj499j6qwj0ykag152pvmqvdm000dx5n1l"; depends=[Rcpp]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
   xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; };
   xts = derive2 { name="xts"; version="0.10-2"; sha256="1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1"; depends=[zoo]; };
   xwf = derive2 { name="xwf"; version="0.2-1"; sha256="1g94wbsq8flnkxxfxx6yg87siiwpyrx219an9a2cf1blnwjv9b68"; depends=[mgcv]; };
-  xxIRT = derive2 { name="xxIRT"; version="2.0.3"; sha256="10n9rrhp0v71gmn0s2l2qi6sfplwj7anydw6rxqk409wg5is3x93"; depends=[dplyr ggplot2 lpSolveAPI magrittr reshape2]; };
-  xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; };
+  xxIRT = derive2 { name="xxIRT"; version="2.1.0"; sha256="17cyvbywfvbs93ky8qmzh6fp94dk24p3wpzb76lxb8nfsvakq5pf"; depends=[ggplot2 lpSolveAPI reshape2]; };
+  xyloplot = derive2 { name="xyloplot"; version="1.6"; sha256="0d1dv3syfjwcp9fil9bl1my19d0kdyz1qrp1yf7ykrk8aq91762v"; depends=[]; };
   xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; };
-  yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.2"; sha256="130zp8na3d50b49bcsqzsmjy2sif865h6vfpc5zmp1fhvkyykkfd"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; };
   yaImpute = derive2 { name="yaImpute"; version="1.0-29"; sha256="1zxl4l54y9f9lmi17hlhsbsc4f1qb0dnnl5dg9frhq6bhw2lqxqb"; depends=[]; };
   yacca = derive2 { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
-  yaml = derive2 { name="yaml"; version="2.1.18"; sha256="15m4q5krfqg0avvqg9i2g6ns4757lk6zbyrwbx5c5bgh51glvd8v"; depends=[]; };
+  yaml = derive2 { name="yaml"; version="2.1.19"; sha256="04bzrnfgbpk0rhkvzwp3k3ip7jpq26bjxz71bx5mwxmcjdb07nz5"; depends=[]; };
   yardstick = derive2 { name="yardstick"; version="0.0.1"; sha256="165czwi62nrhhci06fb0rfpk2gki94aiyl4wlflmgpzmspmgz7m8"; depends=[broom dplyr MLmetrics pROC rlang tibble tidyr tidyselect]; };
   yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
-  yasp = derive2 { name="yasp"; version="0.1.0"; sha256="082w1l0892v0vrvfmc1ssgy9ccj30hcrg7m56x61spgcmckfshy4"; depends=[]; };
+  yasp = derive2 { name="yasp"; version="0.2.0"; sha256="0fza8h9y1wmarsmjcvw4r970d6j4ii795pd2h4xh9nlsirv50adi"; depends=[]; };
   ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
   yearn = derive2 { name="yearn"; version="0.1.3"; sha256="03aqbf3q0nhg73pqpwlqdhpbmfa0rvv78b84b4mqir43601vjx65"; depends=[BiocInstaller devtools githubinstall]; };
   yesno = derive2 { name="yesno"; version="0.1.0"; sha256="0l3v51kghbq9s00s736s4jvl8a0yhbgb908mjvhw6k5nqb2cgh8a"; depends=[]; };
@@ -12467,7 +12680,7 @@ in with self; {
   yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
-  yuima = derive2 { name="yuima"; version="1.7.10"; sha256="0g1jh81s2i6ilpcbrjbz9wmk65m6xsdv8dif88x6v5k8660k2ksl"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
+  yuima = derive2 { name="yuima"; version="1.8.1"; sha256="1jzk3623c1cpw9j8d9b96x6n0jwz8h2izzhrdp01cwwskbnv3hq2"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
   yuimaGUI = derive2 { name="yuimaGUI"; version="1.2.0"; sha256="166hsq1nc0jzkqbz08y3dl0qdi58swascbkm1lc7zhsh6g93azjs"; depends=[DT ggplot2 plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
   zCompositions = derive2 { name="zCompositions"; version="1.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; };
@@ -12475,30 +12688,31 @@ in with self; {
   zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; };
   zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; };
   zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; };
+  zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; };
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; };
-  zetadiv = derive2 { name="zetadiv"; version="1.1.0"; sha256="0z90gpwyi2d0xnwy2vz7an5wv7jrwhl99kd2s76dlxylfjp7j2rn"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
+  zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
   zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };
   zipfextR = derive2 { name="zipfextR"; version="1.0.0"; sha256="007pw5z9rz8ng0llyd2088qxldc3sf0s35pcfqmm85qb94fdksdd"; depends=[tolerance VGAM]; };
-  ziphsmm = derive2 { name="ziphsmm"; version="2.0.4"; sha256="19ypfx05z7c0skv1nvjivxarblizqqwaqpqyvnhqrckfb7lkhdby"; depends=[pracma Rcpp RcppArmadillo]; };
+  ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; };
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
   zoib = derive2 { name="zoib"; version="1.5.1"; sha256="0lsyr8hfhk4dk129x2l1793v6nmf2k97wnsc44ir6ymip3i4zfld"; depends=[abind coda Formula matrixcalc rjags]; };
   zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; };
-  zoo = derive2 { name="zoo"; version="1.8-1"; sha256="16nc5jnpkf5j9vgq3pzssv7knj30mi055wj7q3sygz3l0d88hgfr"; depends=[lattice]; };
+  zoo = derive2 { name="zoo"; version="1.8-2"; sha256="1lpwigxmi5sc23xrha4gcsccsm4yfsg0sa97y6vac3pg1lliblvx"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
   zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; };
   zoocat = derive2 { name="zoocat"; version="0.2.0"; sha256="1xqi90jnpqjdf3zr4pldh1a2gjppjwjrgkq71rvdhmcrf5s8jav0"; depends=[plyr reshape2 scales zoo]; };
-  zooimage = derive2 { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
+  zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; };
   zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
   zoon = derive2 { name="zoon"; version="0.6.3"; sha256="11accyiv9n2zk7fq5bapbmv1ixadab19666i8w41bw642lafgivq"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap SDMTools sp testthat]; };
   zscorer = derive2 { name="zscorer"; version="0.1.0"; sha256="1199d72v9hm7k5jnll2ngn3jlfsiaxrrpbqzrkl0fghm6wnxcc6h"; depends=[]; };
   zstdr = derive2 { name="zstdr"; version="0.1.1"; sha256="1rigsdh0f68l6vvvxp277cp8hbxj10x4588s6az1njxfpxrc8ajj"; depends=[Rcpp]; };
-  ztable = derive2 { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
+  ztable = derive2 { name="ztable"; version="0.1.8"; sha256="1hk5k9614n52dpfrhdws06w4gvwhnz8q47x4cwxx88qmrzm8z2m3"; depends=[]; };
   ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; };
   zyp = derive2 { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 35822fa78bd41..68ab42a76dd7c 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -264,7 +264,7 @@ let
     graphscan = [ pkgs.gsl_1 ];
     gsl = [ pkgs.gsl_1 ];
     h5 = [ pkgs.hdf5-cpp pkgs.which ];
-    haven = [ pkgs.libiconv ];
+    haven = [ pkgs.libiconv pkgs.zlib.dev ];
     h5vc = [ pkgs.zlib.dev ];
     HiCseg = [ pkgs.gsl_1 ];
     imager = [ pkgs.x11 ];
@@ -296,7 +296,6 @@ let
     protolite = [ pkgs.protobuf ];
     qtbase = [ pkgs.qt4 ];
     qtpaint = [ pkgs.qt4 ];
-    R2GUESS = [ pkgs.gsl_1 ];
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
     RAppArmor = [ pkgs.libapparmor ];
     rapportools = [ pkgs.which ];
@@ -307,6 +306,7 @@ let
     RcppCNPy = [ pkgs.zlib.dev ];
     RcppGSL = [ pkgs.gsl_1 ];
     RcppZiggurat = [ pkgs.gsl_1 ];
+    reprex = [ pkgs.which ];
     rgdal = [ pkgs.proj pkgs.gdal ];
     rgeos = [ pkgs.geos ];
     rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
@@ -314,6 +314,7 @@ let
     Rglpk = [ pkgs.glpk ];
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
+    Rhdf5lib = [ pkgs.zlib ];
     Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
     Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf ];
     RJaCGH = [ pkgs.zlib.dev ];
@@ -397,6 +398,7 @@ let
     RPushbullet = [ pkgs.which ];
     qtpaint = [ pkgs.cmake ];
     qtbase = [ pkgs.cmake pkgs.perl ];
+    RcppEigen = [ pkgs.libiconv ];
     RCurl = [ pkgs.curl.dev ];
     R2SWF = [ pkgs.pkgconfig ];
     rggobi = [ pkgs.pkgconfig ];
@@ -438,6 +440,7 @@ let
     nlme = [ pkgs.libiconv ];
     Matrix = [ pkgs.libiconv ];
     mgcv = [ pkgs.libiconv ];
+    igraph = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [
@@ -476,7 +479,6 @@ let
     "cpa"
     "DALY"
     "dave"
-    "debug"
     "Deducer"
     "DeducerExtras"
     "DeducerPlugInExample"
@@ -495,7 +497,6 @@ let
     "EasyqpcR"
     "EcoVirtual"
     "ENiRG"
-    "eVenn"
     "exactLoglinTest"
     "fat2Lpoly"
     "fbati"
@@ -594,7 +595,6 @@ let
     "rareNMtests"
     "rAverage"
     "Rcmdr"
-    "RcmdrPlugin_BCA"
     "RcmdrPlugin_coin"
     "RcmdrPlugin_depthTools"
     "RcmdrPlugin_DoE"
@@ -628,7 +628,6 @@ let
     "RcmdrPlugin_temis"
     "RcmdrPlugin_UCA"
     "recluster"
-    "relax"
     "relimp"
     "RenextGUI"
     "reportRx"
@@ -747,6 +746,10 @@ let
       patches = [ ./patches/BayesXsrc.patch ];
     });
 
+    Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: {
+      patches = [ ./patches/Rhdf5lib.patch ];
+    });
+
     rJava = old.rJava.overrideDerivation (attrs: {
       preConfigure = ''
         export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
@@ -772,10 +775,6 @@ let
       '';
     });
 
-    Mposterior = old.Mposterior.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
-    });
-
     pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: {
       postPatch = lib.optionalString stdenv.isDarwin ''
         for file in R/*.{r,r.in}; do
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index 6614116a3bf6e..1586b5b16b3a1 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -3,7 +3,7 @@ library(data.table)
 library(parallel)
 cl <- makeCluster(10)
 
-biocVersion <- 3.6
+biocVersion <- 3.8
 snapshotDate <- Sys.Date()-1
 
 mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/bioc/src/contrib/")
diff --git a/pkgs/development/r-modules/patches/Rhdf5lib.patch b/pkgs/development/r-modules/patches/Rhdf5lib.patch
new file mode 100644
index 0000000000000..dcd9b61798bd1
--- /dev/null
+++ b/pkgs/development/r-modules/patches/Rhdf5lib.patch
@@ -0,0 +1,12 @@
+diff --git a/configure b/configure
+index e2d292e..b13c0db 100755
+--- a/configure
++++ b/configure
+@@ -2880,6 +2880,7 @@ $MAKE
+ echo "building the hdf5 library...";
+ cd ../;
+ ## we add the '-w' flag to suppress all the warnings hdf5 prints
++sed -i 's#/bin/mv#mv#' configure
+ ./configure --with-pic --enable-shared=no --enable-cxx \
+     --with-szlib \
+     CXX="${CXX}" CXFLAGS="${CXXFLAGS} -w" \
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 0c754fcfe3bc2..2f9a822383256 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.16.1";
-  source.sha256 = "42b8e0f57093e1d10c15542f956a871446b759e7969d99f91caf3b6731c156e8";
+  version = "1.16.2";
+  source.sha256 = "3bb53e03db0a8008161eb4c816ccd317120d3c415ba6fee6f90bbc7f7eec8690";
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 60697e72d724c..3c355d0857609 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -22,7 +22,7 @@
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
-, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf
+, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick
 }@args:
 
 let
@@ -96,6 +96,37 @@ in
     '';
   };
 
+  fog-dnsimple = attrs: {
+    postInstall = ''
+      cd $(cat $out/nix-support/gem-meta/install-path)
+      rm {$out/bin,bin,../../bin}/{setup,console}
+    '';
+  };
+
+  redis-rack = attrs: {
+    dontBuild = false;
+    preBuild = ''
+      exec 3>&1
+      output="$(gem build $gemspec | tee >(cat - >&3))"
+      exec 3>&-
+      sed -i 's!"rake".freeze!!' $gemspec
+    '';
+  };
+
+  ffi-rzmq-core = attrs: {
+    postInstall = ''
+      installPath=$(cat $out/nix-support/gem-meta/install-path)
+      sed -i $installPath/lib/ffi-rzmq-core/libzmq.rb -e 's@inside_gem =.*@inside_gem = "${zeromq}/lib"@'
+    '';
+  };
+
+  mini_magick = attrs: {
+    postInstall = ''
+      installPath=$(cat $out/nix-support/gem-meta/install-path)
+      echo -e "\nENV['PATH'] += ':${graphicsmagick}/bin'\n" >> $installPath/lib/mini_magick/configuration.rb
+    '';
+  };
+
   do_sqlite3 = attrs: {
     buildInputs = [ sqlite ];
   };
@@ -105,7 +136,7 @@ in
   };
 
   ffi = attrs: {
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libffi ];
   };
 
@@ -216,7 +247,7 @@ in
   };
 
   pango = attrs: {
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ];
   };
 
@@ -255,7 +286,7 @@ in
   };
 
   rmagick = attrs: {
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ imagemagick which ];
   };
 
@@ -323,6 +354,10 @@ in
     buildInputs = [ kerberos ];
   };
 
+  tiny_tds = attrs: {
+    nativeBuildInputs = [ pkgconfig openssl ];
+  };
+
   therubyracer = attrs: {
     buildFlags = [
       "--with-v8-dir=${v8}"
@@ -350,7 +385,7 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ xapian_1_2_22 zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index e87f65d02ad59..b8bf4315c0094 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -5,18 +5,20 @@ GEM
     coderay (1.1.2)
     eventmachine (1.2.7)
     htmlentities (4.3.4)
-    kramdown (1.16.2)
+    jaro_winkler (1.5.1)
+    kramdown (1.17.0)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     rainbow (3.0.0)
     reverse_markdown (1.1.0)
       nokogiri
-    rubocop (0.56.0)
+    rubocop (0.58.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -24,11 +26,11 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    solargraph (0.21.1)
+    solargraph (0.23.3)
       coderay (~> 1.1)
       eventmachine (~> 1.2, >= 1.2.5)
       htmlentities (~> 4.3, >= 4.3.4)
-      kramdown
+      kramdown (~> 1.16)
       parser (~> 2.4)
       reverse_markdown (~> 1.0, >= 1.0.5)
       rubocop (~> 0.52)
@@ -37,8 +39,8 @@ GEM
       yard (~> 0.9)
     thor (0.20.0)
     tilt (2.0.8)
-    unicode-display_width (1.3.2)
-    yard (0.9.12)
+    unicode-display_width (1.4.0)
+    yard (0.9.14)
 
 PLATFORMS
   ruby
@@ -47,4 +49,4 @@ DEPENDENCIES
   solargraph!
 
 BUNDLED WITH
-   1.14.6
+   1.16.2
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 0dbdd17d4d4dc..1205b730f212d 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -31,13 +31,21 @@
     };
     version = "4.3.4";
   };
+  jaro_winkler = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   kramdown = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
       type = "gem";
     };
-    version = "1.16.2";
+    version = "1.17.0";
   };
   mini_portile2 = {
     source = {
@@ -51,10 +59,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.4";
   };
   parallel = {
     source = {
@@ -76,10 +84,10 @@
   powerpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.1.2";
   };
   rainbow = {
     source = {
@@ -99,13 +107,13 @@
     version = "1.1.0";
   };
   rubocop = {
-    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04j2n2zilvfw46v94mpymwnfzni0jq05fz6gs3yi2na7l4c98zv8";
+      sha256 = "091simr4pvxnkm472ixk5lqbnhgznvmhjpjf98ppbx1r68a4mcp3";
       type = "gem";
     };
-    version = "0.56.0";
+    version = "0.58.0";
   };
   ruby-progressbar = {
     source = {
@@ -119,10 +127,10 @@
     dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18wkmbhymhwpdy4638bmdslniy2mjwldms5p61r6jnxzc7qnnalf";
+      sha256 = "1145g6x04fwmg8n51lsk7ybig31scndlj1i2i4lbrj9621bbqxfz";
       type = "gem";
     };
-    version = "0.21.1";
+    version = "0.23.3";
   };
   thor = {
     source = {
@@ -143,17 +151,17 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   yard = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11x58w0ccayvgy0lmhfyrzxd33ya1v41prh5zzhvaajhw8vr74lh";
+      sha256 = "08kww2m1izjq56q2va2my0x3f3f0xsg6f07b6sgb4nl0scr6y10q";
       type = "gem";
     };
-    version = "0.9.12";
+    version = "0.9.14";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index ce650adb7ef23..c30c3555100ae 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -3,12 +3,12 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "autoflake";
-  version = "1.1";
+  version = "1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a74d684a7a02654f74582addc24a3016c06809316cc140457a4fe93a1e6ed131";
+    sha256 = "c103e63466f11db3617167a2c68ff6a0cda35b940222920631c6eeec6b67e807";
   };
 
   propagatedBuildInputs = [ pyflakes ];
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index da60b77934b0a..34b9e53f6e478 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "8.10.1";
+  version = "8.11";
   name = "checkstyle-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "18i1a6v9dg08in68g584y7bhf76g59pp8lyixqc3v6wgj3ksv8q9";
+    url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
+    sha256 = "13x4m4rn7rix64baclcm2jqbizkj38njif2ba0ycmvyjm62smfwv";
   };
 
+  phases = [ "installPhase" ];
+
   installPhase = ''
     mkdir -p $out/checkstyle
-    cp -R * $out/checkstyle
+    cp $src $out/checkstyle/checkstyle-all.jar
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 6019235c47b93..5a095c8b6a0e4 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.83";
+  version = "1.84";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "14d4afjz0jshwpqryvwvzrs3rrqnd7cgg3x19awgy116591ibd83";
+    sha256 = "1rp8j0akxzcpvr2na5zchz8zxq5ldngiwj7f6sibjq5p3dcyn2w5";
   };
 
   buildInputs = [ pcre ];
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
index a7f29017fbe04..07bcd57a121aa 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -6,7 +6,7 @@ buildPerlPackage rec {
 
   src = fetchurl {
     sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m";
-    url = "http://www.gson.org/egypt/download/${name}.tar.gz";
+    url = "https://www.gson.org/egypt/download/${name}.tar.gz";
   };
 
   outputs = [ "out" ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 7ba4bbf25d120..70e476c4572dc 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices,
-  findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }:
+{ stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.72.0";
+  version = "0.76.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1lfnl1crwkygzbv3l85n30dqsfz627xrnmn4z3zxh7lazir5h8b8";
+    sha256 = "0r3yl4m7dhm1h4c431zp8hd2gg6k1d9bwd2371xav5q7hviwmjl6";
   };
 
   installPhase = ''
@@ -19,9 +18,10 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [
-    ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa
-  ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
+  buildInputs = [ libelf
+  ] ++ (with ocamlPackages; [
+    ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa
+  ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
     description = "A static type checker for JavaScript";
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index e738d30543ede..78dd577896225 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.4.0";
+  version = "6.5.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "17yjjmqcn1fy3bj73nh5i84yc7wappza612a0iwg0lqqn4yl7lyn";
+    sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index f2079b2b5a107..b174d6c069b71 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   name = "radare-1.5.2";
 
   src = fetchurl {
-    url = "http://radare.org/get/${name}.tar.gz";
+    url = "https://radare.org/get/${name}.tar.gz";
     sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
   };
 
diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix
index a2d135d448417..aec13296bdaac 100644
--- a/pkgs/development/tools/analysis/radare/ired.nix
+++ b/pkgs/development/tools/analysis/radare/ired.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ired-0.4";
 
   src = fetchurl {
-    url = "http://radare.org/get/${name}.tar.gz";
+    url = "https://radare.org/get/${name}.tar.gz";
     sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm";
   };
   
diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix
index d1ff712be2d3f..e35b000504199 100644
--- a/pkgs/development/tools/analysis/radare2-cutter/default.nix
+++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix
@@ -1,23 +1,46 @@
-{ stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }:
+{ stdenv, fetchFromGitHub
+# nativeBuildInputs
+, qmake, pkgconfig
+# Qt
+, qtbase, qtsvg, qtwebengine
+# buildInputs
+, radare2
+, python3 }:
 
 
 stdenv.mkDerivation rec {
   name = "radare2-cutter-${version}";
-  version = "1.3";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "radareorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr";
+    sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c";
   };
 
   postUnpack = "export sourceRoot=$sourceRoot/src";
 
-  patchFlags = [ "-p2" ];
+  # Remove this "very helpful" helper file intended for discovering r2,
+  # as it's a doozy of harddcoded paths and unexpected behavior.
+  # Happily Nix has everything all set so we don't need it,
+  # other than as basis for the qmakeFlags set below.
+  postPatch = ''
+    substituteInPlace Cutter.pro \
+      --replace "include(lib_radare2.pri)" ""
+  '';
 
   nativeBuildInputs = [ qmake pkgconfig ];
-  buildInputs = [ qtbase qtsvg radare2 ];
+  buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ];
+
+  qmakeFlags = [
+    "CONFIG+=link_pkgconfig"
+    "PKGCONFIG+=r_core"
+    # Leaving this enabled doesn't break build but generates errors
+    # at runtime (to console) about being unable to load needed bits.
+    # Disable until can be looked at.
+    "CUTTER_ENABLE_JUPYTER=false"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index bc5f41bf86ec3..0264305134cba 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -17,13 +17,13 @@ let
   inherit (stdenv.lib) optional;
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
-  version_commit = "18177";
-  gittap = "2.6.0";
-  gittip = "83ef480221ec29d82c16003c61d0dc86b8851d38";
-  version = "2.6.0";
-  sha256 = "18jhb9w8c1m09383d2xm2qp0rc240psjygbbs222hzpx32hald5s";
-  cs_tip = "37569a6874c8547b349a80823adda9284499fe80";
-  cs_sha256 = "0v31367g4jn4baswl62y0rvvm2nf57y91n3731xqblvi6qxj8qkv";
+  version_commit = "18681";
+  gittap = "2.7.0";
+  gittip = "6e08e452a7ec231a73997c44b4ff556c2998c7d9";
+  version = "2.7.0";
+  sha256 = "1a9z8w897256dhh3yhyfnshz3n2nrc4plc2i06cm5sznhl6x9xfx";
+  cs_tip = "ec8a5ce98fa0422a395489ed47da912b15d77441";
+  cs_sha256 = "080a64bqck28a2xfjwz29ddcr8p6hc6gi67mgry3pca289qrkk3q";
   #</generated>
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 01caa59fe4c3f..d0d20362236b1 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   preCheck = "export HOME=$TMPDIR";
 
   meta = {
-    homepage = http://rr-project.org/;
+    homepage = https://rr-project.org/;
     description = "Records nondeterministic executions and debugs them deterministically";
     longDescription = ''
       rr aspires to be your primary debugging tool, replacing -- well,
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index fba7d3d5cd410..638423ed5972d 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "snowman-${version}";
-  version = "2017-11-19";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "yegord";
     repo = "snowman";
-    rev = "d03c2d6ffbf262c0011584df59d6bd69c020e08e";
-    sha256 = "0bzqp3zc100dzvybf57bj4dvnybvds0lmn1w2xjb19wkzm9liskn";
+    rev = "v${version}";
+    sha256 = "1ry14n8jydg6rzl52gyn0qhmv6bvivk7iwssp89lq5qk8k183x3k";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
new file mode 100644
index 0000000000000..e33d6b26b12b1
--- /dev/null
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, python
+}:
+
+with python.pkgs;
+
+buildPythonApplication rec {
+  pname = "aws-sam-cli";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4740bfa23f39880d807aa75a2143259f7f15eec34c5fa5dde8fc04d8563ef521";
+  };
+
+  # Tests are not included in the PyPI package
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    aws-sam-translator
+    boto3
+    click
+    cookiecutter
+    docker
+    enum34
+    flask
+    pyyaml
+    six
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/awslabs/aws-sam-cli;
+    description = "CLI tool for local development and testing of Serverless applications";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ andreabedini ];
+  };
+}
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index f83353034a8f1..7b5391725423d 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "boomerang-${version}";
-  version = "0.4.0-alpha-2018-01-18";
+  version = "0.4.0-alpha-2018-07-03";
 
   src = fetchFromGitHub {
     owner = "ceeac";
     repo = "boomerang";
-    rev = "b4ff8d573407a8ed6365d4bfe53d2d47d983e393";
-    sha256 = "0x17vlm6y1paa49fi3pmzz7vzdqms19qkr274hkq32ql342b6i6x";
+    rev = "377ff2d7db93d892c925e2d3e61aef818371ce7d";
+    sha256 = "1ljbyj3b8xckr1wihyii3h576zgq0q88vli0ylpr3p4jxy5sm57j";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
new file mode 100644
index 0000000000000..76e2ad1e7cac7
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
@@ -0,0 +1,80 @@
+{ stdenv, buildBazelPackage, lib, fetchFromGitHub, git, jre, makeWrapper }:
+
+buildBazelPackage rec {
+  name = "bazel-deps-${version}";
+  version = "2018-05-31";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/johnynek/bazel-deps";
+    description = "Generate bazel dependencies for maven artifacts";
+    license = licenses.mit;
+    maintainers = [ maintainers.uri-canva ];
+    platforms = platforms.all;
+  };
+
+  src = fetchFromGitHub {
+    owner = "johnynek";
+    repo = "bazel-deps";
+    rev = "dd7d0086d3a61c1d5c3370a0300824d0c75946e4";
+    sha256 = "1h9ddgk6vn0bhnnkwwz4n1iqv2rcdj521dxhdwj5wwpndbciw855";
+  };
+
+  bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
+
+  buildInputs = [ git makeWrapper ];
+
+  fetchAttrs = {
+    preInstall = ''
+      # Remove all built in external workspaces, Bazel will recreate them when building
+      rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
+      # For each external workspace, remove all files that aren't referenced by Bazel
+      # Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD)
+      files_to_delete=()
+      for workspace in $(find $bazelOut/external -maxdepth 2 -name "WORKSPACE" -print0 | xargs -0L1 dirname); do
+        workspaceOut="$NIX_BUILD_TOP/workspaces/$(basename workspace)/output"
+        workspaceUserRoot="$NIX_BUILD_TOP/workspaces/$(basename workspace)/tmp"
+        rm -rf $workspace/.git
+        if ! targets_and_files=$(cd "$workspace" && bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" query '//...:*' 2> /dev/null | sort -u); then
+          continue
+        fi
+        if ! targets=$(cd "$workspace" && bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" query '//...:all' 2> /dev/null | sort -u); then
+          continue
+        fi
+        mapfile -t referenced_files < <(comm -23 <(printf '%s' "$targets_and_files") <(printf '%s' "$targets") | sed -e 's,^//:,,g' | sed -e 's,^//,,g' | sed -e 's,:,/,g')
+        referenced_files+=( "WORKSPACE" )
+        for referenced_file in "''${referenced_files[@]}"; do
+          # Some of the referenced files are symlinks to non-referenced files.
+          # The symlink targets have deterministic contents, but non-deterministic
+          # paths. Copy them to the referenced path, which is deterministic.
+          if target=$(readlink "$workspace/$referenced_file"); then
+            rm "$workspace/$referenced_file"
+            cp -a "$target" "$workspace/$referenced_file"
+          fi
+        done
+        mapfile -t workspace_files_to_delete < <(find "$workspace" -type f -or -type l | sort -u | comm -23 - <(printf "$workspace/%s\n" "''${referenced_files[@]}" | sort -u))
+        for workspace_file_to_delete in "''${workspace_files_to_delete[@]}"; do
+          files_to_delete+=("$workspace_file_to_delete")
+        done
+        # We're running bazel in many different workspaces in a loop. Letting the
+        # daemon shut down on its own would leave several daemons alive at the
+        # same time, using up a lot of memory. Shut them down explicitly instead.
+        bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" shutdown 2> /dev/null
+      done
+      for file_to_delete in "''${files_to_delete[@]}"; do
+        rm "$file_to_delete"
+      done
+      find . -type d -empty -delete
+    '';
+
+    sha256 = "0fh9jjwk3aq0kklhl9zyy8hj8gjm1y1fy4ygjinm0469w9jdgc3g";
+  };
+
+  buildAttrs = {
+    installPhase = ''
+      mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
+      cp gen_maven_deps.sh $out/bin
+      wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]}
+      cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
+    '';
+  };
+}
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index d5eaa24c16751..28214e94c7aa0 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,26 +1,28 @@
-{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python
+{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused
 # Always assume all markers valid (don't redownload dependencies).
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
+# Apple dependencies
+, libcxx, CoreFoundation, CoreServices, Foundation
 }:
 
 stdenv.mkDerivation rec {
 
-  version = "0.12.0";
+  version = "0.13.0";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
-    maintainers = [ maintainers.philandstuff ];
-    platforms = platforms.linux;
+    maintainers = [ maintainers.mboes ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 
   name = "bazel-${version}";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754";
+    sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2";
   };
 
   sourceRoot = ".";
@@ -29,17 +31,50 @@ stdenv.mkDerivation rec {
 
   # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
 
-  customBash = writeScriptBin "bash" ''
-    #!${stdenv.shell}
-    PATH="$PATH:${lib.makeBinPath [ coreutils ]}" exec ${bash}/bin/bash "$@"
+  customBash = writeCBin "bash" ''
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <string.h>
+    #include <unistd.h>
+
+    extern char **environ;
+
+    int main(int argc, char *argv[]) {
+      char *path = getenv("PATH");
+      char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}";
+      char *newPath;
+      if (path != NULL) {
+        int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
+        newPath = malloc(length * sizeof(char));
+        snprintf(newPath, length, "%s:%s", path, pathToAppend);
+      } else {
+        newPath = pathToAppend;
+      }
+      setenv("PATH", newPath, 1);
+      execve("${bash}/bin/bash", argv, environ);
+      return 0;
+    }
   '';
 
-  postPatch = ''
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+  '' + ''
     find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
       substituteInPlace "$path" \
         --replace /bin/bash ${customBash}/bin/bash \
         --replace /usr/bin/env ${coreutils}/bin/env
     done
+    # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
+    substituteInPlace scripts/bootstrap/compile.sh \
+        --replace /bin/sh ${customBash}/bin/bash
+    echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc
+    echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
+    echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
+    echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
+    sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+    sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+    sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+    sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
     patchShebangs .
   '';
 
@@ -54,7 +89,7 @@ stdenv.mkDerivation rec {
     makeWrapper
     which
     customBash
-  ];
+  ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ];
 
   # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
   # detector (see com.google.devtools.build.lib.skyframe.FileFunction).
@@ -79,11 +114,10 @@ stdenv.mkDerivation rec {
         examples/java-native/src/test/java/com/example/myproject:hello
   '';
 
-  # Bazel expects gcc and java to be in the path.
   installPhase = ''
     mkdir -p $out/bin
     mv output/bazel $out/bin
-    wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}"
+    wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
     mv output/bazel-complete.bash $out/share/bash-completion/completions/
     cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
@@ -92,7 +126,7 @@ stdenv.mkDerivation rec {
   # Save paths to hardcoded dependencies so Nix can detect them.
   postFixup = ''
     mkdir -p $out/nix-support
-    echo "${customBash} ${coreutils}" > $out/nix-support/depends
+    echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends
   '';
 
   dontStrip = true;
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
new file mode 100644
index 0000000000000..96e9d0f9a439f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, lib, fetchurl, coursier, jdk, jre, python, makeWrapper }:
+
+let
+  baseName = "bloop";
+  version = "1.0.0-M11";
+  deps = stdenv.mkDerivation {
+    name = "${baseName}-deps-${version}";
+    buildCommand = ''
+      export COURSIER_CACHE=$(pwd)
+      ${coursier}/bin/coursier fetch ch.epfl.scala:bloop-frontend_2.12:${version} \
+        -r "bintray:scalameta/maven" \
+        -r "bintray:scalacenter/releases" \
+        -r "https://oss.sonatype.org/content/repositories/staging" > deps
+      mkdir -p $out/share/java
+      cp $(< deps) $out/share/java/
+    '';
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash     = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
+  nailgunCommit = "60c2d130";
+
+  buildInputs = [ jdk makeWrapper deps ];
+
+  phases = [ "installPhase" ];
+
+  client = fetchurl {
+    url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py";
+    sha256 = "0qjw4nsyb4cxg96jj1yv5c0ivcxvmscxxqfzll5w9p1pjb30bq0n";
+  };
+
+  zshCompletion = fetchurl {
+    url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop";
+    sha256 = "1id6f1fgy2rk0q5aad6ffivhbxa94fallzsc04l9n0y1s2xdhqpm";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/zsh/site-functions
+
+    cp ${client} $out/bin/blp-client
+    cp ${zshCompletion} $out/share/zsh/site-functions/_bloop
+    chmod +x $out/bin/blp-client
+
+    makeWrapper ${jre}/bin/java $out/bin/blp-server \
+      --prefix PATH : ${lib.makeBinPath [ jdk ]} \
+      --add-flags "-cp $CLASSPATH bloop.Server"
+    makeWrapper $out/bin/blp-client $out/bin/bloop \
+      --prefix PATH : ${lib.makeBinPath [ python ]}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://scalacenter.github.io/bloop/;
+    license = licenses.asl20;
+    description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way.";
+    maintainers = with maintainers; [ tomahna ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index ed73d26768a4c..3729abfe247d6 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -14,11 +14,11 @@ let
   package = pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "1.1.1";
+    version = "1.2.0";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir";
+      sha256 = "02gwmls8kgm6scy36hdy0bg645zs1pxlrgwkcn79wrl7cfmabcbv";
     };
 
     buildInputs = with pythonPackages; [
diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix
index ef8a0cdc38ef7..11f5be4e98e9a 100644
--- a/pkgs/development/tools/build-managers/buildbot/pkg.nix
+++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "buildbot-pkg";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8";
+    sha256 = "70f429311c5812ffd334f023f4f50b904be5c672c8674ee6d28a11a7c096f18a";
   };
 
   propagatedBuildInputs = [ setuptools ];
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index c8a12c1926473..430cdee3ca8c5 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -11,7 +11,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb";
+      sha256 = "001kxjcyn5sxiq7m1izy4djj7alw6qpgaid4f518s9xgm4a8hwcb";
     };
 
     meta = with stdenv.lib; {
@@ -29,7 +29,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj";
+      sha256 = "11p9l9r9rh8cq0ihzjcdxfbi55n7inbsz45zqq67rkvqn5nhj5b6";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -49,7 +49,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l";
+      sha256 = "1yx63frfpbvwy4hfib1psyq5ad0wysyzfrla8d7lgbdaip021wzw";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -69,7 +69,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1";
+      sha256 = "06my75hli3w1skdkx1qz6zqw2wckanhrcvlqm4inylj9v9pcrgv6";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -89,7 +89,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2";
+      sha256 = "073gz44fa5k1p8k46k0ld9gg16j8zdj6sc297qfyqpiw28ybhc5s";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index b1cfb6aeaf2f0..968411ca9cc50 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm";
+    sha256 = "0lcaga16zf75aa6ckl9ahjbrs3n3bw7nj6m8g03n77873cgh94x4";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
diff --git a/pkgs/development/tools/build-managers/cask/default.nix b/pkgs/development/tools/build-managers/cask/default.nix
deleted file mode 100644
index 234dab99c03cd..0000000000000
--- a/pkgs/development/tools/build-managers/cask/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ emacsPackagesNg, writeScriptBin }:
-let
-
-  emacs = emacsPackagesNg.emacsWithPackages (epkgs: [ epkgs.cask-package-toolset ]);
-  cpt = emacsPackagesNg.cask-package-toolset;
-
-in writeScriptBin "cask" ''
-#!/bin/sh
-
-exec ${emacs}/bin/emacs --script ${cpt}/share/emacs/site-lisp/elpa/cask-package-toolset-${cpt.version}/cask-package-toolset.el -- "$@"
-''
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 051b8107703db..438aa81a9d0a3 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   # Don't search in non-Nix locations such as /usr, but do search in our libc.
   patches = [ ./search-path-3.9.patch ]
     # Don't depend on frameworks.
-    ++ optional useSharedLibraries ./application-services.patch  # TODO: remove conditional
+    ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch  # TODO: remove conditional
     ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   outputs = [ "out" ];
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 8e3993fadc14b..d37e25943b5f0 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -22,7 +22,7 @@ cmakeConfigurePhase() {
     if [ -z "$dontUseCmakeBuildDir" ]; then
         mkdir -p build
         cd build
-        cmakeDir=..
+        cmakeDir=${cmakeDir:-..}
     fi
 
     if [ -z "$dontAddPrefix" ]; then
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 849c722e55489..9ff32f1b34844 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -20,14 +20,19 @@ let newPython = python.override {
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.2.3";
+  version = "1.5.2";
   pname = "conan";
 
   src = newPython.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23";
+    sha256 = "0r5ymq27j60py1fb396zshq7z6adda34a857lwrj3k8hqhs0ihpp";
   };
 
+  postPatch = ''
+    # Remove pylint constraint
+    substituteInPlace conans/requirements.txt --replace ", <1.9.0" ""
+  '';
+
   checkInputs = with newPython.pkgs; [
     nose
     parameterized
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 7570c3be0679b..f810f97ef4979 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.8";
+    name = "gradle-4.8.1";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1fpihf35nd2wqh3ghkk9x0x2nr1s4vx3dgrfn2q4xagsm299dqpk";
+      sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg";
     };
   };
 
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 2f4daa2edc86a..c5ab3fafc5e67 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, makeWrapper, gcc, ncurses }:
+{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "9.02.07";
+  version = "9.02.08";
 
-  src = fetchFromGitHub {
-    sha256 = "1q3rwri5s1sqm4h75bahkjnlym4bk2ygg4fb75yrniwnj8rhdp12";
+  src = fetchFromGitLab {
+    sha256 = "1pr5lagmdls3clzwa2xwcfa3k5750rf7i0j3zld0xirb41zx07q2";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A program maintenance (make) utility using a C-like grammar";
-    homepage = https://fbb-git.github.io/icmake/;
+    homepage = https://fbb-git.gitlab.io/icmake/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 6022b645172c1..f14f6adf5fef9 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -4,7 +4,6 @@
 in python3Packages.buildPythonApplication rec {
   version = "0.46.1";
   pname = "meson";
-  name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index c59d2faaf26c7..b1df54f9bd5cb 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, asciidoc, re2c }:
+{ stdenv, fetchFromGitHub, python, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
   };
 
-  nativeBuildInputs = [ python asciidoc re2c ];
+  nativeBuildInputs = [ python asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
 
   buildPhase = ''
     python configure.py --bootstrap
-    asciidoc doc/manual.asciidoc
+    # "./ninja -vn manual" output copied here to support cross compilation.
+    asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
+    xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
   '';
 
   installPhase = ''
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index b99bc4f6b7584..38a197aa900b7 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 with pythonPackages;
 
 let
-  version = "1.6.0";
+  version = "1.7.0";
 in buildPythonApplication rec {
   inherit version;
   pname = "pantsbuild.pants";
@@ -12,7 +12,7 @@ in buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ahvcj33xribypgyh515mb3ack1djr0cq27nlyk0qhwgwv6acfnj";
+    sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37";
   };
 
   prePatch = ''
diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix
index 8063b6747666e..bd0562463fd78 100644
--- a/pkgs/development/tools/build-managers/redo/default.nix
+++ b/pkgs/development/tools/build-managers/redo/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "redo-1.2";
+  name = "redo-1.3";
   src = fetchurl {
     url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz";
-    sha256 = "0qr8plllxfn32r4rgnalzlhcs3b4l8a4ga8ig9v8i5iy1qnfhqnf";
+    sha256 = "1yx7nd59s01j096hr1zbnbx6mvd6ljzd4vgawh7p2l644jgwj70r";
   };
 
   nativeBuildInputs = [ perl /* for pod2man */ ];
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 76d0996256268..8db0cc0d54f32 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.scala-sbt.org/;
+    homepage = https://www.scala-sbt.org/;
     license = licenses.bsd3;
     description = "A build tool for Scala, Java and more";
     maintainers = with maintainers; [ nequissimus rickynils ];
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 36d9ddfb8ea12..9fb7c0e64b80b 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "shards-${version}";
-  version = "0.7.2";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
-    sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp";
+    sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm";
   };
 
   buildInputs = [ crystal libyaml which ];
 
-  buildFlags = [ "CRFLAGS=" "release" ];
+  buildFlags = [ "CRFLAGS=--release" ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index c778b67a95f5c..b820dc997e443 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,15 +1,15 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
-, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux
+, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
 , go-md2man }:
 
 let
-  version = "0.12";
+  version = "1.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "projectatomic";
     repo = "buildah";
-    sha256 = "0xyq7rv0lj6bxwh2rnf44w9gjcqbdkfcdff88023b9vlsc8h4k0m";
+    sha256 = "0pc7bzcaafrz56glygzhnbilgaz4ca2kmklw8njfgamffbw4d54p";
   };
   goPackagePath = "github.com/projectatomic/buildah";
 
@@ -22,8 +22,11 @@ in buildGoPackage rec {
   inherit goPackagePath;
   excludedPackages = [ "tests" ];
 
+  # Optimizations break compilation of libseccomp c bindings
+  hardeningDisable = [ "fortify" ];
+
   nativeBuildInputs = [ pkgconfig go-md2man.bin ];
-  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
+  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ];
 
   # Copied from the skopeo package, doesn’t seem to make a difference?
   # If something related to these libs failed, uncomment these lines.
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index c5bccf6ddae66..388f6b0db4397 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cdecl-2.5";
   src = fetchurl {
-    url = "http://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz";
+    url = "https://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz";
     sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly";
   };
 
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
new file mode 100644
index 0000000000000..4a4708df32ddb
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -0,0 +1,24 @@
+# with import <nixpkgs>{};
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "drone-cli-${version}";
+  version = "0.8.6";
+  revision = "v${version}";
+  goPackagePath = "github.com/drone/drone-cli";
+
+  goDeps= ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "drone";
+    repo = "drone-cli";
+    rev = revision;
+    sha256 = "1vvilpqyx9jl0lc9hr73qxngwhwbyk81fycal7ys1w59gv9hxrh9";
+  };
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ bricewge ];
+    license = licenses.asl20;
+    description = "Command line client for the Drone continuous integration server.";
+  };
+}
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/deps.nix b/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
new file mode 100644
index 0000000000000..d6486db13951f
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/drone-cli/deps.nix
@@ -0,0 +1,274 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/Microsoft/go-winio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/go-winio";
+      rev =  "7da180ee92d8bd8bb8c37fc560e673e6557c392f";
+      sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Sirupsen/logrus";
+      rev =  "d682213848ed68c0a260ca37d6dd5ace8423f5ba";
+      sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cncd/pipeline";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cncd/pipeline";
+      rev =  "3a09486affc9215ba52f55b1f6e10182458d1aba";
+      sha256 = "17v9bwmqhr9pqppsqpb2qg7klip5jmks5c5kq6lxw6iq75q3p5zm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev =  "7dba427612198a11b161a27f9d40bb2dca1ccd20";
+      sha256 = "0sv2044znv2cjcll0lc45wbjhsy0hpfkbczhl07m81i62r929l27";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev =  "f645ffca04abf2dd6c89ac9057a1eb7d2b0ac338";
+      sha256 = "0ic848invzfyzj9psbd8d3wvqddxbxbpj8vy2dbdqcwl26qabaqf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev =  "eb315e36415380e7c2fdee175262560ff42359da";
+      sha256 = "0jsci3f0dc3bd0bab7byq24qvwpd6dw34hnd2kmvvgrg31xzb73f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev =  "f2145db703495b2e525c59662db69a7344b00bb8";
+      sha256 = "0ql76imazd27h1dnnala49qsaw2dl6hspcwzh20bgm9ajcv0fwd0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/libcompose";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/libcompose";
+      rev =  "1c4bd4542afb20db0b51afd71d9ebceaf206e2dd";
+      sha256 = "1prm5w6d0zvc39jq7wxdgis3pzzra2wdqxqn68ip5dhf3m32c8vn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/drone/drone-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/drone-go";
+      rev =  "7f20e6c113d3ffa2af80401c4eba7d510c8fd875";
+      sha256 = "1qm5nmzqmvjl8c2nfhhbp5a4ij1zfw4dinx278ns9qb0w973614k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/drone/envsubst";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/envsubst";
+      rev =  "f4d1a8ef8670afc9eea1fb95ee09a979fd2763a3";
+      sha256 = "10rj5zskp6f0bw648c1fn76v18jlidjd7ri76kk3csz2bwjm3m9c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "507f6050b8568533fb3f5504de8e5205fa62a114";
+      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/flynn/go-shlex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/flynn/go-shlex";
+      rev =  "3f9db97f856818214da2e1057f8ad84803971cff";
+      sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "925541529c1fa6821df4e44ce2723319eb2be768";
+      sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/go-jsonnet";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/go-jsonnet.git";
+      rev =  "0274286eef945e5e24be6ebfc13a9deefdd312ee";
+      # sha256 = "105jqawa401z5kcsbpan3cg9lryxlnnrclg6s9xnzslwd9wxyfrl";
+      sha256 = "0crbsmwgy9iav7rnhkgkqv8cbyl6q60bjkbfcaqxb6m47q3d544a";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jackspirou/syscerts";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackspirou/syscerts";
+      rev =  "b68f5469dff16e102bd6a2d5b3e79341c938d736";
+      sha256 = "0mjz64qnysmy9lh0hrjvwir5ndlh5li13m6zvfrl0s5gi7m9v0kd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/joho/godotenv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/joho/godotenv";
+      rev =  "a79fa1e548e2c689c241d10173efd51e5d689d5b";
+      sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opencontainers/go-digest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/go-digest";
+      rev =  "279bed98673dd5bef374d3b6e4b09e2af76183bf";
+      sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/browser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/browser";
+      rev =  "c90ca0c84f15f81c982e32665bffd8d7aac8f097";
+      sha256 = "05xpqsns08blmwdh8aw5kpq2d9x4fl91535j6np1ylw1q2b67b8i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "650f4a345ab4e5b245a3034b110ebc7299e68186";
+      sha256 = "0r1ij3lq07d6kg3dlpj508vwkwmz0qpwcrbismisw6vkl7ls7w89";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "f5dfe339be1d06f81b22525fe34671ee7d2c8904";
+      sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "543e37812f10c46c622c9575afd7ad22f22a12ba";
+      sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev =  "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
+      sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "37707fdb30a5b38865cfb95e5aab41707daec7fd";
+      sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
+      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "d670f9405373e636a5a2765eea47fac0c9bc91a4";
+      sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
+    };
+  }
+]
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 7fc0ecd1b2b4c..33dc7c80c17a0 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.8.0";
+  version = "11.0.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1cdc0p3gq6q324p087qv335y224bv61fbr8xar4kza7lcqblb41d";
+    sha256 = "1wi2wza991hhys60c8f3rhad8dqargnb6i7xwfsxrjd26dsbif2b";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0xj0ym6mprrknxqrxqj3ydgabqgfdxrw3h1r0q8sggfxqrrs8y08";
+    sha256 = "1y67zxxad2jy1rvfhdlp194fi0qgwrnlcs24zh5lzwvsnwvc13bg";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0j8xkwfxvmg1bqrmalqvl6k45yn54m16r3af5ckgr717xylywqb6";
+    sha256 = "06p8fggnxn2afy0k4wjh44d1qby9n2j0mq6cl206cckzh2gfsknp";
   };
 
   patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 2c1b942169fed..7f66317167a5f 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -12,11 +12,11 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "liquibase";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
-    sha256 = "0my5rh553yfb8lz1lv5gmgvqbc5pl4xjii4z5wwbbpniyxwy64q4";
+    sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx";
   };
 
   buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 054eabdb5e439..1b4a4b7f50b2c 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -33,7 +33,7 @@ mkDerivation rec {
     description = "DB Browser for SQLite";
     homepage = http://sqlitebrowser.org/;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ ma27 ];
     platforms = platforms.linux; # can only test on linux
   };
 }
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix
index a0b0ee571d95d..dcaa43156699d 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/pkgs/development/tools/devtodo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1.20";
 
   src = fetchurl {
-    url = "http://swapoff.org/files/devtodo/${name}.tar.gz";
+    url = "https://swapoff.org/files/devtodo/${name}.tar.gz";
     sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p";
   };
 
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index 128eed603b039..925d0a786af01 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -4,13 +4,13 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "mkdocs";
-  version = "0.17.3";
+  version = "0.17.5";
 
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = "mkdocs";
     rev = version;
-    sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw";
+    sha256 = "1l1dahpwqikmww3yx2m6j2134npk8vcikg9klsmpqjpza8nigwzw";
   };
 
   postPatch = ''
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 9277ebe363fb2..253f5b374d3c3 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -3,15 +3,15 @@
 
 buildGoPackage rec {
   name = "easyjson-unstable-${version}";
-  version = "2018-03-23";
-  rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578";
+  version = "2018-06-06";
+  rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
 
   goPackagePath = "github.com/mailru/easyjson";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/mailru/easyjson";
-    sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0";
+    sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 0fae9fad5d140..d6cc527e6418a 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fac-${version}";
-  version = "1.1.0";
+  version = "2.0.0";
 
   goPackagePath = "github.com/mkchoi212/fac";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "mkchoi212";
     repo = "fac";
     rev = "v${version}";
-    sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx";
+    sha256 = "054bbiw0slz9szy3ap2sh5dy97w3g7ms27rd3ww3i1zdhvnggwpc";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix
index 65ec5ded5ad54..65335497e5fff 100644
--- a/pkgs/development/tools/fac/deps.nix
+++ b/pkgs/development/tools/fac/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/chroma";
-      rev =  "1b755a90bd109f170385cb3964f0abdfd3451145";
-      sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8";
+      rev =  "0c0b382eca61a71c1eb4cb4dea2bc78aa4939d96";
+      sha256 = "0chpzs542s366vv01bfhrajdrbhmrvc3gi8jhpw3xgz6wfkivcp4";
     };
   }
   {
@@ -46,21 +46,21 @@
     };
   }
   {
-    goPackagePath  = "github.com/mkchoi212/fac";
+    goPackagePath  = "github.com/nsf/termbox-go";
     fetch = {
       type = "git";
-      url = "https://github.com/mkchoi212/fac";
-      rev =  "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502";
-      sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz";
+      url = "https://github.com/nsf/termbox-go";
+      rev =  "5c94acc5e6eb520f1bcd183974e01171cc4c23b3";
+      sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw";
     };
   }
   {
-    goPackagePath  = "github.com/nsf/termbox-go";
+    goPackagePath  = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
-      url = "https://github.com/nsf/termbox-go";
-      rev =  "21a4d435a86280a2927985fd6296de56cbce453e";
-      sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
 ]
\ No newline at end of file
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 351ec2c77dbaf..5552bdcc5e6c2 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -19,6 +19,7 @@
 , bzip2
 , coreutils
 , cpio
+, curl
 , elfutils
 , flatpak
 , gitMinimal
@@ -35,7 +36,7 @@
 }:
 
 let
-  version = "0.10.10";
+  version = "0.99.1";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
@@ -43,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2";
+    sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5";
   };
 
   nativeBuildInputs = [
@@ -62,6 +63,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     acl
     bzip2
+    curl
     elfutils
     flatpak
     glib
diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix
index 9535ba86dd060..796c3dc79a09c 100644
--- a/pkgs/development/tools/flootty/default.nix
+++ b/pkgs/development/tools/flootty/default.nix
@@ -7,7 +7,6 @@ in
 buildPythonApplication rec {
   pname = "Flootty";
   version = "3.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 924dde91acc5c..70f6d8021ff8d 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "5.1.1";
+    version = "5.1.4";
   in
     stdenv.mkDerivation {
       name = "flyway-${version}";
       src = fetchurl {
-        url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-${version}.tar.gz";
-        sha256 = "0kdi7m5rwlik0d2rn9s3siqmc83xfkhhsdxw3g7r1mvk2ivscb7f";
+        url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.4/flyway-commandline-${version}.tar.gz";
+        sha256 = "1raz125k55v6xa8gp6ylcjxz77r5364xqp9di46rayx3z2282f7q";
       };
       buildInputs = [ makeWrapper ];
       dontBuild = true;
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 12152e9886697..f4f7af0e084a0 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gauge-${version}";
-  version = "0.9.7";
+  version = "1.0.0";
 
   goPackagePath = "github.com/getgauge/gauge";
   excludedPackages = ''\(build\|man\)'';
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "getgauge";
     repo = "gauge";
     rev = "v${version}";
-    sha256 = "09afsi97yxlqwmrxvihravqvz17m7y402gbw4hvdk0iixa6jpq6a";
+    sha256 = "1dnlqnpzqsikpxy2mndrmxpcsj4r1zcjmv8px1idzblp117vsnw1";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 88ea499d28cf3..d3ed7624b7a18 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "3.0.2";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4";
+    sha256 = "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 98df266703ac9..88c4fc14a6661 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -3,25 +3,15 @@
 , tasty-golden, transformers, fetchFromGitHub, fetchpatch
 }:
 
-let
-
-  newShellCheck = fetchpatch {
-    url = https://github.com/haskell-CI/haskell-ci/pull/159.patch;
-    sha256 = "17qn099lvfiii5z3hg24idmg4sk6ph7m2k940fsxzhqrad8fkjmw";
-  };
-
-in
-
 mkDerivation {
   pname = "haskell-ci";
   version = "0";
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424";
-    sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq";
+    rev = "f7ab8c794d7a957370d89f9b4e285a6d20bf8af8";
+    sha256 = "0w8qjdy8hzdrwmqnkf4y967r9xh0k21w3hxqlsjp66cay1vby2s8";
   };
-  patches = [ newShellCheck ];
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index c4f6e2565f677..daa3713a8d169 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,17 +2,17 @@
 
 buildGoPackage rec {
   name = "hcloud-${version}";
-  version = "1.4.0";
+  version = "1.5.0";
   goPackagePath = "github.com/hetznercloud/cli";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "1mysw091ddi3abijvciyy73ff31vqq7zb37w30sp3vhm5vq38nn2";
+    sha256 = "1pbfa977ihqn7j3ynyqghxjw0wmq0vgha4lsshdpf5xr2n3w0r8l";
   };
 
-  buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ];
+  buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
 
   meta = {
     description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 39677ba719e2a..9890107b2678c 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
-  version = "0.128";
+  version = "0.132";
 
   src = fetchurl {
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
-    sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix";
+    sha256 = "1fpmd5v3x91lw6jc7x997ic2kklj449fndyg14zvgxawhdkic2z1";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix
index 37b76c50e902f..f1c6e1f8ca6eb 100644
--- a/pkgs/development/tools/jira_cli/default.nix
+++ b/pkgs/development/tools/jira_cli/default.nix
@@ -25,7 +25,7 @@ in
 
     meta = with stdenv.lib; {
       description = "A command line interface to Jira";
-      homepage = http://github.com/alisaifee/jira-cli;
+      homepage = https://github.com/alisaifee/jira-cli;
       maintainers = with maintainers; [ nyarly ];
       license = licenses.mit;
     };
diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix
index 37c5dab8ce87d..8b5bea7ac6ce7 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/pkgs/development/tools/mdk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnu-mdk-1.2.9";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz;
+    url = https://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz;
     sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc";
   };
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index 48cf4b31a1762..cb00111b2b461 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
 
 stdenv.mkDerivation rec {
-  name = "babeltrace-1.5.5";
+  name = "babeltrace-1.5.6";
 
   src = fetchurl {
-    url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
-    sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0";
+    url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2";
+    sha256 = "1dxv2pwyqx2p7kzhcfansij40m9kanl85x2r68dmgp98g0hvq22k";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index de316d0e5e7fc..0b71c6719dc4a 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -103,6 +103,8 @@ stdenv.mkDerivation rec {
     then "-Wno-string-plus-int -Wno-deprecated-declarations"
     else "-static-libgcc";
 
+  hardeningDisable = [ "format" ];
+
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
   configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index a5ad3910f3f0e..32c888b7e62fa 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.0";
 
   src = fetchurl {
-    url = "http://cgdb.me/files/${name}.tar.gz";
+    url = "https://cgdb.me/files/${name}.tar.gz";
     sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
   };
 
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
new file mode 100644
index 0000000000000..2bd12b409f194
--- /dev/null
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, docker, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "circleci-cli";
+  version = "2018-05-12";
+
+  src = fetchFromGitHub {
+    owner = "circleci";
+    repo = "local-cli";
+    rev = "2c7c1a74e3c3ffb8eebc03fccd782b1bfe9e940a";
+    sha256 = "0fp0fz0xr7ynp32lqcmaigl9p45wk1hd2gv9i5q5bj9syj3g7qzm";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p "$out/bin/"
+    cp "$src/circleci.sh" "$out/bin/circleci"
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/circleci \
+      --prefix "PATH" : "${docker}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    # Box blurb edited from the AUR package circleci-cli
+    description = ''
+      Command to enable you to reproduce the CircleCI environment locally and
+      run jobs as if they were running on the hosted CirleCI application.
+    '';
+    maintainers = with maintainers; [ synthetica ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+    homepage = https://circleci.com/;
+  };
+}
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index cbf5883b29737..a3c5fd7f009c3 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "2.7.0";
 
   src = fetchurl {
-    url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz";
+    url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz";
     sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n";
   };
 
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index c4994ad24d794..a0040e4ed3e50 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.3.0";
 
   src = fetchurl {
-    url = "http://embed.cs.utah.edu/csmith/${name}.tar.gz";
+    url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz";
     sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj";
   };
 
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index 8c23659748437..82b224b37f42d 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -13,14 +13,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "dialog-${version}";
-  version = "1.3-20171209";
+  version = "1.3-20180621";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
       "https://invisible-mirror.net/archives/dialog/${name}.tgz"
     ];
-    sha256 = "1rk72as52f5br3wcr74d00wib41w65g8wvi36mfgybly251984r0";
+    sha256 = "0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
index 928f126029099..9b35d2960a4d3 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, python}:
 
 stdenv.mkDerivation {
-  name = "doclifter-2.17";
+  name = "doclifter-2.18";
   src = fetchurl {
-    url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz;
-    sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv";
+    url = http://www.catb.org/~esr/doclifter/doclifter-2.18.tar.gz;
+    sha256 = "0g39lbml7dclm2nb20j4ffzhq28226qiwxq1w37p7mpqijm7x3hw";
   };
   buildInputs = [ python ];
   
diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index a0d6e49c02580..2eda1f044ce84 100644
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   meta = with stdenv.lib; {
-    homepage = http://editorconfig.org/;
+    homepage = https://editorconfig.org/;
     description = "EditorConfig core library written in C";
     longDescription = ''
       EditorConfig makes it easy to maintain the correct coding style when
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 9f0ea147b5856..3b1c70b4ac332 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "eggdbus-0.6";
   
   src = fetchurl {
-    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://hal.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
   };
   
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index e89aba67999ed..04a300c56f448 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,11 +3,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.170";
+  version = "0.172";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
-    sha256 = "0rp0r54z44is49c594qy7hr211nhb00aa5y7z74vsybbaxslg10z";
+    sha256 = "090fmbnvd9jblkwhb2bm3hanim63rrvd5f30mfxq4jac6kk9k73p";
   };
 
   patches = ./debug-info-from-env.patch;
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index 8d2e678590056..f58d06599650c 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The ESP Package Manager generates distribution archives for a variety of platforms";
-    homepage = http://www.msweet.org/projects.php?Z2;
+    homepage = https://www.msweet.org/projects.php?Z2;
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 9c0c357e18676..4d8a9b05847a1 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.11.3";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1";
+    sha256 = "16f3g6s79gs1sp2ra3cka4c5mf5b557cx697bwcdfgj6r19ni5j7";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index de66bf5da14ef..12d3f97dfc41f 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -3,7 +3,6 @@ let
   deps = import ./requirements.nix { inherit pkgs; };
 in
 python27Packages.buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "gdbgui";
   version = "0.11.1.2";
 
diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix
index 73c9021c5e9f9..17aa3214ebcc0 100644
--- a/pkgs/development/tools/misc/gob2/default.nix
+++ b/pkgs/development/tools/misc/gob2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Preprocessor for making GObjects with inline C code";
-    homepage = http://www.jirka.org/gob.html;
+    homepage = https://www.jirka.org/gob.html;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/development/tools/misc/gtkperf/bench.patch
new file mode 100644
index 0000000000000..3d00a03e9a58c
--- /dev/null
+++ b/pkgs/development/tools/misc/gtkperf/bench.patch
@@ -0,0 +1,60 @@
+--- gtkperf/src/callbacks.c	2005-10-30 11:33:42.000000000 +0000
++++ gtkperf-patched/src/callbacks.c	2008-05-23 23:41:17.000000000 +0100
+@@ -219,6 +219,13 @@
+ }
+
+
++void
++on_cmdline_test(char *optarg)
++{
++	appdata->test_type = atoi(optarg);
++}
++
++
+ /* Initialize appdata */
+ void
+ setup_appdata(AppData * appdata_in)
+@@ -398,7 +405,7 @@
+ 	appdata->pixbuf_drawing = gdk_pixbuf_new_from_file (filename, NULL);
+
+ 	gtk_combo_box_set_active (GTK_COMBO_BOX (appdata->combobox_testtype),
+-				  0);
++				  appdata->test_type);
+
+ 	/* create end mark to info textview */
+ 	GtkTextIter iter;
+--- gtkperf/src/callbacks.h	2005-10-30 10:21:23.000000000 +0000
++++ gtkperf-patched/src/callbacks.h	2008-05-23 23:22:30.000000000 +0100
+@@ -13,6 +13,7 @@
+ void on_cmdline_run_all ();
+ void on_cmdline_help () ;
+ void on_cmdline_count (char *optarg) ;
++void on_cmdline_test (char *optarg) ;
+ void on_window_main_show (AppData * data);
+
+ gboolean
+--- gtkperf/src/main.c	2005-10-30 11:26:42.000000000 +0000
++++ gtkperf-patched/src/main.c	2008-05-23 23:44:02.000000000 +0100
+@@ -65,9 +65,10 @@
+ 			{"help", 0, 0, 0},
+ 			{"automatic", 0, 0, 0},
+ 			{"count", 1, 0, 0},
++			{"test", 1, 0, 0},
+ 			{0, 0, 0, 0}
+ 		};
+-		c = getopt_long (argc, argv, "hac:",
++		c = getopt_long (argc, argv, "hac:t:",
+ 			long_options, &option_index);
+ 		if (c == -1)
+ 			break;
+@@ -104,6 +105,10 @@
+ 				on_cmdline_count(optarg);
+ 				break;
+
++			case 't':
++				on_cmdline_test(optarg);
++				break;
++
+ 			default:
+ 			case 'h':
+ 				on_cmdline_help ();
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
new file mode 100644
index 0000000000000..5280b69cdcec4
--- /dev/null
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gtk2, pkgconfig, libintl }:
+
+stdenv.mkDerivation {
+  name = "gtkperf-0.40.0";
+  src = fetchurl {
+    url = "mirror://sourceforge//gtkperf/gtkperf_0.40.tar.gz";
+    sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 libintl ];
+
+  # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db
+  patches = [ ./bench.patch ];
+
+  meta = with stdenv.lib; {
+    description = "Application designed to test GTK+ performance";
+    homepage = http://gtkperf.sourceforge.net/;
+    license = with licenses; [ gpl2 ];
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 5176be1230186..08729f6b41b2d 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "intel-gpu-tools-1.22";
 
   src = fetchurl {
-    url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
+    url = "https://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
     sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix";
   };
 
diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix
index cb7d9af86e7d0..af660561ee178 100644
--- a/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/pkgs/development/tools/misc/jscoverage/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jscoverage-0.5.1";
 
   src = fetchurl {
-    url = "http://siliconforks.com/jscoverage/download/${name}.tar.bz2";
+    url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2";
     sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4";
   };
 
diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index 05229e4be7b2a..60f256c2ddafc 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -2,12 +2,11 @@
 
 python2.pkgs.buildPythonApplication rec {
   pname = "lit";
-  version = "0.5.1";
-  name = "${pname}-${version}";
+  version = "0.6.0";
 
   src = python2.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97";
+    sha256 = "1png3jgbhrw8a602gy6rnzvjcrj8w2p2kk6szdg9lz42zr090lgb";
   };
 
   # Non-standard test suite. Needs custom checkPhase.
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix
index ecee27c138583..ebba56d56d3bd 100644
--- a/pkgs/development/tools/misc/msitools/default.nix
+++ b/pkgs/development/tools/misc/msitools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "msitools-${version}";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
+    url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
     sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs";
   };
 
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 1982a25e3df00..39ec46ffbfddb 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "patchelf-0.9";
 
   src = fetchurl {
-    url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
+    url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
     sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
   };
 
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index ccd0b15a46d21..89b1ed6ee40cc 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
+    url = "https://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
     sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3";
   };
 
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index a059f5658b078..a5fd8f5cf64d2 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.22";
+  version = "4.23";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${name}.tar.xz";
-    sha256 = "17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306";
+    sha256 = "1bcsq2gbpcb81ayryvn56a6kjx42fc21la6qgds35n0xbybacq3q";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
 
   meta = with stdenv.lib; {
-    homepage = http://strace.io/;
+    homepage = https://strace.io/;
     description = "A system call tracer for Linux";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index dbd036d03fdf4..ee96b6198cc47 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -2,7 +2,7 @@
 , libaio }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-1.0.14";
+  name = "sysbench-1.0.15";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ vim mysql.connector-c libaio ];
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akopytov";
     repo = "sysbench";
-    rev = "1.0.14";
-    sha256 = "0mp1wqdm87zqyn55z23qf1izqz7ijgcbsysdwqndd98w6m5d86rp";
+    rev = "1.0.15";
+    sha256 = "0ddj4mxxqlnlp817ix2qad0v3p83azi9wyz4h7mffchgp3mndp9z";
   };
 
   meta = {
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index d1f6cc4ea29b1..0059c10afe0ce 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tokei-${version}";
-  version = "7.0.0";
+  version = "7.0.3";
 
   src = fetchFromGitHub {
     owner = "Aaronepower";
     repo = "tokei";
     rev = "v${version}";
-    sha256 = "1c8m2arhy58ky8pzj0dp3w9gpacia9jwmayi0il640l4fm8nr734";
+    sha256 = "1n2ddwmyd414p6a98khq8y0bmljwcclw30wy5zy5b6z1l40yxcza";
   };
 
-  cargoSha256 = "1cl4fjbvrw7zhpb8rxj566ddlxbj9vdsb1cp7mh6llmvaia2vgks";
+  cargoSha256 = "0ngqk8nnw00s25y91vgsl37j26xl2ws75l3lvklf9gbd4bi01crv";
 
   meta = with stdenv.lib; {
     description = "Count code, quickly";
diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index 011d0b3e80b97..0730ef1fb09c1 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -9,17 +9,15 @@
 
 let
   uhdVer = "v" + version;
-  ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz";
 
   # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
   # and xxx.yyy.zzz. Hrmpf... style keeps changing
-  version = "3.11.0.0";
+  version = "3.12.0.0";
 
-  # Firmware images are downloaded (pre-built) from:
-  # http://files.ettus.com/binaries/images/
+  # Firmware images are downloaded (pre-built) from the respective release on Github
   uhdImagesSrc = fetchurl {
-    url = "http://files.ettus.com/binaries/images/${ImgVer}";
-    sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z";
+    url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
+    sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p";
   };
 
 in stdenv.mkDerivation {
@@ -29,7 +27,7 @@ in stdenv.mkDerivation {
     owner = "EttusResearch";
     repo = "uhd";
     rev = "${uhdVer}";
-    sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q";
+    sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv";
   };
 
   enableParallelBuilding = true;
@@ -49,8 +47,10 @@ in stdenv.mkDerivation {
 
   postPhases = [ "installFirmware" ];
 
+  # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
   installFirmware = ''
-    tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out"
+    mkdir -p "$out/share/uhd/images"
+    tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 5f90525feca12..2eb9b453661b1 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "ycmd-${version}";
-  version = "2017-11-05";
+  version = "2018-06-14";
 
   src = fetchgit {
-    url = "git://github.com/Valloric/ycmd.git";
-    rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b";
-    sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi";
+    url = "https://github.com/Valloric/ycmd.git";
+    rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41";
+    sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
     ${python.interpreter} build.py --system-libclang --clang-completer --system-boost
   '';
 
-  patches = [ ./dont-symlink-clang.patch ];
-
   configurePhase = ":";
 
   # remove the tests
@@ -53,8 +51,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
 
-    cp -r third_party/JediHTTP $out/lib/ycmd/third_party
-    for p in waitress frozendict bottle python-future argparse requests; do
+    for p in jedi waitress frozendict bottle python-future requests; do
       cp -r third_party/$p $out/lib/ycmd/third_party
     done
 
diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
deleted file mode 100644
index 6199758de5204..0000000000000
--- a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
-index 133c987a..33625271 100644
---- a/cpp/ycm/CMakeLists.txt
-+++ b/cpp/ycm/CMakeLists.txt
-@@ -359,28 +359,6 @@ if( LIBCLANG_TARGET )
-       POST_BUILD
-       COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
-     )
--  else()
--    add_custom_command(
--      TARGET ${PROJECT_NAME}
--      POST_BUILD
--      COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
--    )
--
--    if( NOT APPLE )
--      # When loading our library, the dynamic linker may look for
--      # libclang.so.x instead of libclang.so.x.y. Create the corresponding
--      # symlink.
--      get_filename_component( LIBCLANG_NAME ${LIBCLANG_TARGET} NAME )
--      string( REGEX REPLACE "([^.]+).([0-9]+).([0-9]+)$" "\\1.\\2"
--              LIBCLANG_SONAME ${LIBCLANG_NAME} )
--      add_custom_command(
--        TARGET ${PROJECT_NAME}
--        POST_BUILD
--        COMMAND ${CMAKE_COMMAND} -E create_symlink
--        "${LIBCLANG_NAME}"
--        "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_SONAME}"
--      )
--    endif()
-   endif()
- endif()
- 
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 1f5ead84677b5..76130f255fde1 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, perl, icmake, utillinux }:
+{ stdenv, fetchFromGitLab, perl, icmake, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "4.02.00";
+  version = "4.02.01";
 
   nativeBuildInputs = [ icmake ];
 
   buildInputs = [ perl ];
 
-  src = fetchFromGitHub {
-    sha256 = "08i3q3h581kxr5v7wi114bng66pwwsjs5qj3ywnnrr7ra1h5rzwa";
+  src = fetchFromGitLab {
+    sha256 = "0m8idd8m3z27rix55avchm21sd2spcxgrdf63w65zpvnywq0ydax";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A package that implements a pre-document language and tools to process it";
-    homepage = https://fbb-git.github.io/yodl/;
+    homepage = https://fbb-git.gitlab.io/yodl/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 8e2953839b71c..f09dbfdb16538 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   version = "0.12.3";
 
   src = fetchurl {
-    url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
+    url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
     sha256 = if bits == "x64" then
       "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else
       "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c";
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 6a2995b2bbe06..fc1513ecf34bc 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
   version = "0.23.6";
 
   src = fetchurl {
-    url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
+    url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
     sha256 = if bits == "x64" then
       "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else
       "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg";
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An app runtime based on Chromium and node.js";
-    homepage = http://nwjs.io/;
+    homepage = https://nwjs.io/;
     platforms = ["i686-linux" "x86_64-linux"];
     maintainers = [ maintainers.offline ];
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index e778337ca5ca0..d7d086e74f975 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -1,30 +1,43 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }:
 let
   pname = "cppo";
-  version = "1.5.0";
   webpage = "http://mjambon.com/${pname}.html";
 in
 assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-stdenv.mkDerivation rec {
 
-  name = "${pname}-${version}";
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
+    version = "1.6.4";
+    sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh";
+    buildInputs = [ jbuilder ];
+    extra = {
+      inherit (jbuilder) installPhase;
+    };
+  } else {
+    version = "1.5.0";
+    sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
+    extra = {
+      createFindlibDestdir = true;
+      makeFlags = "PREFIX=$(out)";
+      preBuild = ''
+        mkdir $out/bin
+      '';
+    };
+  }
+; in
+
+stdenv.mkDerivation (rec {
+
+  name = "${pname}-${param.version}";
 
   src = fetchFromGitHub {
     owner = "mjambon";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
+    rev = "v${param.version}";
+    inherit (param) sha256;
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
-
-  createFindlibDestdir = true;
-
-  makeFlags = "PREFIX=$(out)";
-
-  preBuild = ''
-    mkdir $out/bin
-  '';
+  buildInputs = [ ocaml findlib ocamlbuild ] ++ (param.buildInputs or []);
 
   meta = with stdenv.lib; {
     description = "The C preprocessor for OCaml";
@@ -35,4 +48,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.vbgl ];
     license = licenses.bsd3;
   };
-}
+} // param.extra)
diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index abfcdb61c1e65..142a30eba8daf 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "jbuilder-${version}";
-  version = "1.0+beta20";
+  version = "1.0.0";
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "dune";
     rev = "${version}";
-    sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
+    sha256 = "08gb7l2rrfrsqvigna1cvvphww80zlvj7lqvaj4m4y9llanmnxcg";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   preFixup = "rm -rf $out/jbuilder";
 
   meta = {
-    homepage = https://github.com/janestreet/jbuilder;
+    inherit (src.meta) homepage;
     description = "Fast, portable and opinionated build system";
     maintainers = [ stdenv.lib.maintainers.vbgl ];
     license = stdenv.lib.licenses.asl20;
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index d09f06623a7e4..4ad1bfb3234d6 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 let
-  version = "3.0.5";
+  version = "3.1.0";
 in
 
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
-    sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy";
+    sha256 = "1vf0c2mmflp94r8hshb44lsvnfdy03ld6mld2n79cdxr3zl24ci2";
   };
 
   buildInputs = [ ocaml findlib yojson ]
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index 3cf70d66ddbdb..744a136c9ef2c 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -2,15 +2,16 @@
 , ocamlPackages
 , jbuilder }:
 
-stdenv.mkDerivation {
-  name = "ocaml-top-1.1.4";
+stdenv.mkDerivation rec {
+  version = "1.1.5";
+  name = "ocaml-top-${version}";
   src = fetchzip {
-    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz;
-    sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j";
+    url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz";
+    sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv";
   };
 
   buildInputs = [ ncurses jbuilder ]
-  ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
+  ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
 
   configurePhase = ''
     export TERM=xterm
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 8da0f781a8b24..0ed7312660a12 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
 let
   version = "1.99.19-beta";
 in
-buildOcaml {
+stdenv.mkDerivation rec {
 
-  name = "ocp-build";
-  inherit version;
+  name = "ocaml${ocaml.version}-ocp-build-${version}";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
@@ -14,7 +13,7 @@ buildOcaml {
     sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj";
   };
 
-  buildInputs = [ ocaml ];
+  buildInputs = [ ocaml findlib ];
   propagatedBuildInputs = [ ncurses ];
   preInstall = "mkdir -p $out/bin";
   preConfigure = ''
diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
deleted file mode 100644
index bdc75766bbf7e..0000000000000
--- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
-
-let inherit (stdenv.lib) getVersion versionAtLeast; in
-
-assert versionAtLeast (getVersion ocaml) "3.12.1";
-assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
-assert versionAtLeast "0.9.8" (getVersion cmdliner);
-
-stdenv.mkDerivation {
-
-  name = "ocp-indent-1.5.2";
-
-  src = fetchzip {
-    url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
-    sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
-  };
-
-  nativeBuildInputs = [ ocpBuild opam ];
-
-  buildInputs = [ ocaml findlib cmdliner ];
-
-  createFindlibDestdir = true;
-
-  preConfigure = "patchShebangs ./install.sh";
-
-  postInstall = ''
-    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://typerex.ocamlpro.com/ocp-indent.html;
-    description = "A customizable tool to indent OCaml code";
-    license = licenses.gpl3;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [ maintainers.jirkamarsik ];
-  };
-}
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index d11278f4d29c4..43898d250d919 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
 assert versionAtLeast (getVersion ocaml) "3.12.1";
 assert versionAtLeast (getVersion cmdliner) "1.0.0";
-assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
+assert versionAtLeast (getVersion ocp-build) "1.99.6-beta";
 
 stdenv.mkDerivation rec {
 
-  name = "ocp-indent-${version}";
+  name = "ocaml${ocaml.version}-ocp-indent-${version}";
   version = "1.6.1";
 
   src = fetchzip {
@@ -16,16 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
   };
 
-  nativeBuildInputs = [ ocpBuild opam ];
+  nativeBuildInputs = [ ocp-build ];
   buildInputs = [ ocaml findlib cmdliner ];
 
-  createFindlibDestdir = true;
-
-  preConfigure = "patchShebangs ./install.sh";
-
-  postInstall = ''
-    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
-  '';
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://typerex.ocamlpro.com/ocp-indent.html;
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 6b865e9709a6d..0a63ae8053423 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -1,39 +1,23 @@
-{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }:
 
-let inherit (stdenv.lib) getVersion versionAtLeast optional; in
+stdenv.mkDerivation rec {
 
-assert versionAtLeast (getVersion ocaml) "4";
-assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta";
-assert versionAtLeast (getVersion ocpIndent) "1.4.2";
-
-let
-  version = "1.1.5";
-in
-
-stdenv.mkDerivation {
-
-  name = "ocp-index-${version}";
+  version = "1.1.6";
+  name = "ocaml${ocaml.version}-ocp-index-${version}";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-index";
     rev = version;
-    sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd";
+    sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
   };
 
-  patches = [ (fetchpatch {
-    url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff;
-    sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z";
-  }) ];
-
-  buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
-  ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
-  propagatedBuildInputs = [ ocpIndent ];
+  buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
+  propagatedBuildInputs = [ ocp-indent ];
 
-  createFindlibDestdir = true;
+  buildPhase = "jbuilder build -p ocp-index";
 
-  preBuild = "export TERM=xterm";
-  postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}";
+  inherit (jbuilder) installPhase;
 
   meta = {
     homepage = http://typerex.ocamlpro.com/ocp-index.html;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 404bf08e74eeb..340c57f281766 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4
-, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper
+{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder
+, lambdaTerm, cppo, makeWrapper
 }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
@@ -7,30 +7,20 @@ then throw "utop is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  version = "1.19.3";
+  version = "2.1.0";
   name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x";
+    sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ];
 
-  propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
+  propagatedBuildInputs = [ lambdaTerm ];
 
-  createFindlibDestdir = true;
-
-  configureFlags = [ "--enable-camlp4" ]
-  ++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact";
-
-  buildPhase = ''
-    make
-    make doc
-    '';
-
-  dontStrip = true;
+  inherit (jbuilder) installPhase;
 
   postFixup =
    let
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index b7757b4747168..ae624c549eb12 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "packer-${version}";
-  version = "1.2.0";
+  version = "1.2.4";
 
   goPackagePath = "github.com/hashicorp/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "05qsyh6d4qsvabr543ggd4b09fipxzr270cawsx0glmkgw82nkzi";
+    sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix
index 017ef20e81c66..cafb076aa8116 100644
--- a/pkgs/development/tools/parsing/antlr/2.7.7.nix
+++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "antlr-2.7.7";
   src = fetchurl {
-    url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz";
+    url = "https://www.antlr2.org/download/antlr-2.7.7.tar.gz";
     sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5";
   };
   patches = [ ./2.7.7-fixes.patch ];
diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix
index e6765806e4f7e..c892b8fa8eab9 100644
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "antlr-${version}";
   version = "3.4";
   src = fetchurl {
-    url ="http://www.antlr3.org/download/antlr-${version}-complete.jar";
+    url ="https://www.antlr3.org/download/antlr-${version}-complete.jar";
     sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx";
   };
 
diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix
index 5e10003dd6f90..030a19e994050 100644
--- a/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/pkgs/development/tools/parsing/antlr/3.5.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "antlr-${version}";
   version = "3.5.2";
   src = fetchurl {
-    url ="http://www.antlr3.org/download/antlr-${version}-complete.jar";
+    url ="https://www.antlr3.org/download/antlr-${version}-complete.jar";
     sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6";
   };
 
diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
index f58d0f9904aa0..e097b5b3d5a57 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "antlr-${version}";
   version = "4.7.1";
   src = fetchurl {
-    url ="http://www.antlr.org/download/antlr-${version}-complete.jar";
+    url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
     sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
   };
 
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 17d1e47cb4ed1..fc0c6c9ed8a16 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "byacc-${version}";
-  version = "20180525";
+  version = "20180609";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
       "https://invisible-mirror.net/archives/byacc/${name}.tgz"
     ];
-    sha256 = "1ridghk1xprxfg2k8ls87wjc00i4a7f39x2fkswfqb2wwf5qv6qj";
+    sha256 = "173l9yai5yndbyn8nzdl6q11wv4x959bd0w392i82nfsqcz0pfsv";
   };
 
   doCheck = true;
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index cd1cb0efd123b..f418229f893bc 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -8,7 +8,7 @@ let
       name = "ragel-${version}";
 
       src = fetchurl {
-        url = "http://www.colm.net/files/ragel/${name}.tar.gz";
+        url = "https://www.colm.net/files/ragel/${name}.tar.gz";
         inherit sha256;
       };
 
diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index 153c0f76a4059..e58cc44884c8c 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -2,11 +2,11 @@
 with python3Packages; buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "pipenv";
-    version = "11.9.0";
+    version = "2018.5.18";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968";
+      sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84";
     };
 
     LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 98b38697992d6..2ff337ef20836 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "EZTrace-${version}";
 
   src = fetchurl {
-    url = "http://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz";
     sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr";
   };
 
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index f28fe187e6cf4..a01d7dd42906c 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , desktop-file-utils
 , fetchurl
+, fetchpatch
 , gettext
 , glib
 , gtk3
@@ -28,6 +29,15 @@ in stdenv.mkDerivation rec {
     sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3";
   };
 
+  patches = [
+    # fix includedir in pkgconfig
+    # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/2
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/sysprof/commit/d19a496bb55b8646e866df8bb07bc6ad3c55eaf2.patch;
+      sha256 = "15w6di9c4n1gsymkpk413f5f9gd3iq23wdkzs01y9xrxwqpm7hm4";
+    })
+  ];
+
   nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
   buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
 
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
new file mode 100644
index 0000000000000..7cbfc43850487
--- /dev/null
+++ b/pkgs/development/tools/pyre/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript }:
+let
+  # Manually set version - the setup script requires
+  # hg and git + keeping the .git directory around.
+  version = "0.0.8";
+  versionFile = writeScript "version.ml" ''
+    cat > "./version.ml" <<EOF
+    let build_info () =
+    "pyre-nixpkgs ${version}"
+    let version () =
+    "${version}"
+    EOF
+  '';
+in stdenv.mkDerivation {
+  name = "pyre-${version}";
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "pyre-check";
+    rev = "v${version}";
+    sha256 = "0c4km27xnzsqcqvjqxmqak37x473z6azlbldy7f05ghkms7mchrw";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = with ocamlPackages; [
+    ocaml
+    findlib
+    menhir
+    yojson
+    core
+    sedlex
+    ppx_deriving_yojson
+    ocamlbuild
+    ppxlib
+  ];
+
+  buildPhase = ''
+    # build requires HOME to be set
+    export HOME=.
+
+    # "external" because https://github.com/facebook/pyre-check/pull/8/files
+    sed "s/%VERSION%/external ${version}/" Makefile.template > Makefile
+
+    cp ${versionFile} ./scripts/generate-version-number.sh
+
+    mkdir $(pwd)/build
+    export OCAMLFIND_DESTDIR=$(pwd)/build
+    export OCAMLPATH=$OCAMLPATH:$(pwd)/build
+    make release
+  '';
+
+  checkPhase = ''
+    make test
+  '';
+
+  # Note that we're not installing the typeshed yet.
+  # Improvement for a future version.
+  installPhase = ''
+    mkdir -p $out/bin
+    cp _build/all/main.native $out/bin/pyre
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A performant type-checker for Python 3";
+    homepage = https://pyre-check.org;
+    license = licenses.mit;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ teh ];
+  };
+}
diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index 79cca444a1e94..6632d0626339a 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec {
     license = licenses.mit;
     homepage = https://github.com/dbohdan/remarshal;
     maintainers = with maintainers; [ offline ];
-    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index fb7a600707440..39e37b217cf32 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nexus-${version}";
-  version = "3.11.0-01";
+  version = "3.12.1-01";
 
   src = fetchurl {
-    url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz";
-    sha256 = "1h5nfzb1sqhzb5j7w2dpmdi7vnnc9g6zx43a44f3zjvlxh1s0vim";
+    url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
+    sha256 = "1vv50zv3cr42rq1g16gdl2d1hrxna2jjynlr7kivzlbyfq89ic3f";
   };
 
   sourceRoot = name;
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index d865a20fbb9f1..a2cd55f52b903 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,7 +6,7 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "1h7avlns00hd44ayi53lvdj2l85h9higky0jk7bad07hm39nagks";
+      sha256 = "07b39j1glr53yxbbkkkkx12h8r44fybqkn4fd7s2lr1ysyq5vn1a";
     };
 
     "x86_64-darwin" = {
@@ -28,10 +28,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.38";
+  version = "2.40";
 
   src = fetchurl {
-    url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
+    url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
     sha256 = spec.sha256;
   };
 
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 35e0d276101bd..cada8353866c7 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -7,14 +7,14 @@ spirv_sources = {
   tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8";
-    sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk";
+    rev = "f2c93c6e124836797311facb8449f9a0b76fefc2";
+    sha256 = "03w5xk2hjijj1rfbx5dw3lhy7vb9zrssfcwvp09q47f77vkgl105";
   };
   headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00";
-    sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm";
+    rev = "12f8de9f04327336b699b1b80aa390ae7f9ddbf4";
+    sha256 = "0fswk5ndvkmy64har3dmhpkv09zmvb0p4knbqc4fdl4qiggz0fvf";
   };
 };
 
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "spirv-tools-${version}";
-  version = "2018-02-05";
+  version = "2018-06-06";
 
   src = spirv_sources.tools;
   patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';
diff --git a/pkgs/development/tools/sqlint/Gemfile b/pkgs/development/tools/sqlint/Gemfile
new file mode 100644
index 0000000000000..7f045baeaa013
--- /dev/null
+++ b/pkgs/development/tools/sqlint/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'sqlint'
diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock
new file mode 100644
index 0000000000000..1fd44e97b9986
--- /dev/null
+++ b/pkgs/development/tools/sqlint/Gemfile.lock
@@ -0,0 +1,17 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (2.1.0)
+    pg_query (1.0.0)
+      json (>= 1.8, < 3)
+    sqlint (0.1.7)
+      pg_query (~> 0.13.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sqlint
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/development/tools/sqlint/default.nix
new file mode 100644
index 0000000000000..67fbd09f10271
--- /dev/null
+++ b/pkgs/development/tools/sqlint/default.nix
@@ -0,0 +1,34 @@
+{ lib, bundlerApp, fetchurl, ruby }:
+
+let
+  LIB_PG_QUERY_TAG = "10-1.0.1";
+  libpgQuerySrc = fetchurl {
+    name = "libpg_query.tar.gz";
+    url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/${LIB_PG_QUERY_TAG}";
+    sha256 = "0m5jv134hgw2vcfkqlnw80fr3wmrdvgrvk1ndcx9s44bzi5nsp47";
+  };
+in bundlerApp {
+  pname = "sqlint";
+  gemdir = ./.;
+  inherit ruby;
+
+  exes = [ "sqlint" ];
+
+  gemConfig = {
+    pg_query = attrs: {
+      dontBuild = false;
+      postPatch = ''
+        substituteInPlace ext/pg_query/extconf.rb \
+          --replace "#{workdir}/libpg_query.tar.gz" "${libpgQuerySrc}"
+      '';
+    };
+  };
+
+  meta = with lib; {
+    description = "Simple SQL linter";
+    homepage    = https://github.com/purcell/sqlint;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ ariutta ];
+    platforms   = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix
new file mode 100644
index 0000000000000..d2802a91703aa
--- /dev/null
+++ b/pkgs/development/tools/sqlint/gemset.nix
@@ -0,0 +1,28 @@
+{
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  pg_query = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zgwnrf5mkpkxfh49r2pvh2djivrbqd19350g8hxapmkya9w3qpi";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  sqlint = {
+    dependencies = ["pg_query"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wm81dgdmgc16b97bz73vm0wjd2m1ra1b40h0kwfd9wgrh9ig2al";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
+}
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix
index 3891617e1c790..8cde662b14c38 100644
--- a/pkgs/development/tools/tradcpp/default.nix
+++ b/pkgs/development/tools/tradcpp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "tradcpp-0.5.2";
 
   src = fetchurl {
-    url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz;
+    url = https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz;
     sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc";
   };
 
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 42ff463e1cc63..886706ed30bd9 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,9 +1,9 @@
 { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
 
 let
-  version = "2.1.1";
+  version = "2.1.2";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "0kgsb33f3wh6x4450x74wri6z78ky92sfrv7ba7h7zmxsadb6m4b";
+  sha256 = "0fb90v43d30whhyjlgb9mmy93ccbpr01pz97kp5hrg3wfd7703b1";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 2e2fc1ad92736..8f9087ee3b3ac 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "valadoc is a documentation generator for generating API documentation from Vala source code";
-    homepage = http://valadoc.org;
+    homepage = https://valadoc.org;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ sternenseemann ];
     platforms = with platforms; linux;
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index aafff7290c5c0..f6c160de65c34 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -6,11 +6,11 @@ with python3Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "vcstool";
-  version = "0.1.35";
+  version = "0.1.36";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c";
+    sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca";
   };
 
   propagatedBuildInputs = [ pyyaml ];
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 96307c8d134c2..0db25f88d7688 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -4,13 +4,13 @@ with python3Packages;
 
 buildPythonApplication rec {
   name = "vim-vint-${version}";
-  version = "0.3.18";
+  version = "0.3.19";
 
   src = fetchFromGitHub {
     owner = "kuniwak";
     repo = "vint";
     rev = "v${version}";
-    sha256 = "0qrlimg385sxq4y6vqbanby31inaa1q47w9qcw5knwffbz96whrs";
+    sha256 = "0fb0vkmn5fv4mwk6riw08hb3vsh1pivvrfwm90b95yhksq4pfi12";
   };
 
   # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails.
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
new file mode 100644
index 0000000000000..8951f16e43c44
--- /dev/null
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader,
+  glslang, pkgconfig, x11, libxcb, libXrandr, wayland }:
+
+stdenv.mkDerivation rec {
+  name = "vulkan-validation-layers-${version}";
+  version = "1.1.77.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-ValidationLayers";
+    rev = "sdk-${version}";
+    sha256 = "1c7m0x63fv8paph4rlha9bzv6sd0d7j277b31hh1sqkdcv2mzjhj";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ];
+  enableParallelBuilding = true;
+
+  cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
+
+  meta = with stdenv.lib; {
+    description = "LunarG Vulkan loader";
+    homepage    = "http://www.lunarg.com";
+    platforms   = platforms.linux;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.ralith ];
+  };
+}
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index b7b14128048be..3f7b21be005d5 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO, ninja }:
+{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng
+, CoreServices, CoreGraphics, ImageIO, ninja }:
 
 let
   googletest = fetchFromGitHub {
@@ -17,7 +18,8 @@ let
 in stdenv.mkDerivation rec {
   name    = "xcbuild-${version}";
 
-  # Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
+  # Once a version is released that includes
+  # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
   # we can stop doing this -pre thing.
   version = "0.1.2-pre";
 
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platforms.nix
index a36c4f4bf8064..bc60af9e1a5c2 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platforms.nix
@@ -1,11 +1,13 @@
-{ stdenv, sdk, writeText, platformName, xcbuild }:
+{ runCommand, lib, sdks, xcodePlatform, writeText }:
 
 let
 
+  inherit (lib.generators) toPlist;
+
   Info = {
-    CFBundleIdentifier = platformName;
+    CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}";
     Type = "Platform";
-    Name = "macosx";
+    Name = lib.toLower xcodePlatform;
   };
 
   Version = {
@@ -283,24 +285,18 @@ let
 
 in
 
-stdenv.mkDerivation {
-  name = "MacOSX.platform";
-  buildInputs = [ xcbuild ];
-  buildCommand = ''
-    mkdir -p $out/
-    cd $out/
+runCommand "Platforms" {} ''
+  platform=$out/${xcodePlatform}.platform
 
-    plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)}
-    plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)}
+  install -D ${writeText "Info.plist" (toPlist {} Info)} $platform/Info.plist
+  install -D ${writeText "version.plist" (toPlist {} Version)} $platform/version.plist
+  install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $platform/Developer/Library/Xcode/Specifications/Architectures.xcspec
+  install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $platform/Developer/Library/Xcode/Specifications/PackageTypes.xcspec
+  install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $platform/Developer/Library/Xcode/Specifications/ProductTypes.xcspec
 
-    mkdir -p $out/Developer/Library/Xcode/Specifications/
-    cd $out/Developer/Library/Xcode/Specifications/
-    plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)}
-    plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)}
-    plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)}
+  # per-platform bins go here
+  mkdir -p $platform/usr/bin
 
-    mkdir -p $out/Developer/SDKs/
-    cd $out/Developer/SDKs/
-    cp -r ${sdk} ${sdk.name}
-  '';
-}
+  mkdir -p $platform/Developer
+  ln -s ${sdks} $platform/Developer/SDKs
+''
diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix
deleted file mode 100644
index 87bbedd57880b..0000000000000
--- a/pkgs/development/tools/xcbuild/sdk.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, writeText, toolchainName, sdkName, xcbuild }:
-
-let
-  # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
-  version = "10.10";
-
-  SDKSettings = {
-    CanonicalName = sdkName;
-    DisplayName = sdkName;
-    Toolchains = [ toolchainName ];
-    Version = version;
-    MaximumDeploymentTarget = version;
-    isBaseSDK = "YES";
-  };
-
-  SystemVersion = {
-    ProductName = "Mac OS X";
-    ProductVersion = version;
-  };
-in
-
-stdenv.mkDerivation {
-  name = "MacOSX${version}.sdk";
-  inherit version;
-
-  buildInputs = [ xcbuild ];
-
-  buildCommand = ''
-    mkdir -p $out/
-    plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)}
-
-    mkdir -p $out/System/Library/CoreServices/
-    plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)}
-  '';
-}
diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix
new file mode 100644
index 0000000000000..b0af26e87c120
--- /dev/null
+++ b/pkgs/development/tools/xcbuild/sdks.nix
@@ -0,0 +1,28 @@
+{ runCommand, lib, toolchainName, sdkName, writeText, version, xcodePlatform }:
+
+let
+  inherit (lib.generators) toPlist;
+
+  SDKSettings = {
+    CanonicalName = sdkName;
+    DisplayName = sdkName;
+    Toolchains = [ toolchainName ];
+    Version = version;
+    MaximumDeploymentTarget = version;
+    isBaseSDK = "YES";
+  };
+
+  SystemVersion = {
+    ProductName = "Mac OS X";
+    ProductVersion = version;
+  };
+in
+
+runCommand "SDKs" {
+  inherit version;
+} ''
+  sdk=$out/${sdkName}.sdk
+  install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist
+  install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist
+  ln -s $sdk $out/${xcodePlatform}.sdk
+''
diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh
index 70100c196973e..9dc03a61f62ee 100644
--- a/pkgs/development/tools/xcbuild/setup-hook.sh
+++ b/pkgs/development/tools/xcbuild/setup-hook.sh
@@ -19,11 +19,9 @@ xcbuildInstallPhase () {
     runHook postInstall
 }
 
-if [ -z "$dontUseXcbuild" ]; then
-    buildPhase=xcbuildBuildPhase
-    if [ -z "$installPhase" ]; then
-        installPhase=xcbuildInstallPhase
-    fi
+buildPhase=xcbuildBuildPhase
+if [ -z "$installPhase" ]; then
+    installPhase=xcbuildInstallPhase
 fi
 
 # if [ -d "*.xcodeproj" ]; then
diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix
deleted file mode 100644
index 9e34360909f9b..0000000000000
--- a/pkgs/development/tools/xcbuild/toolchain.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{stdenv, writeText, toolchainName, xcbuild, fetchurl
-, llvm, cctools, gcc, bootstrap_cmds, binutils
-, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper
-, xib2nib}:
-
-let
-
-  ToolchainInfo = {
-    Identifier = toolchainName;
-  };
-
-  # We could pull this out of developer_cmds but it adds an annoying loop if we want to bootstrap and
-  # this is just a tiny script so I'm not going to bother
-  mkdep-darwin-src = fetchurl {
-    url        = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh";
-    sha256     = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541";
-    executable = true;
-  };
-in
-
-stdenv.mkDerivation {
-  name = "nixpkgs.xctoolchain";
-  buildInputs = [ xcbuild makeWrapper ];
-
-  ## cctools should build on Linux but it doesn't currently
-
-  buildCommand = ''
-    mkdir -p $out
-    plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)}
-
-    mkdir -p $out/usr/include
-    mkdir -p $out/usr/lib
-    mkdir -p $out/usr/libexec
-    mkdir -p $out/usr/share
-
-    mkdir -p $out/usr/bin
-    cd $out/usr/bin
-    ln -s ${stdenv.cc}/bin/cpp
-    ln -s ${stdenv.cc}/bin/c++
-    ln -s ${stdenv.cc}/bin/cc
-    ln -s c++ clang++
-    ln -s cc clang
-
-    ln -s ${llvm}/bin/llvm-cov
-    ln -s ${llvm}/bin/llvm-dsymutil
-    ln -s ${llvm}/bin/llvm-dwarfdump
-    ln -s ${llvm}/bin/llvm-nm
-    ln -s ${llvm}/bin/llvm-objdump
-    ln -s ${llvm}/bin/llvm-otool
-    ln -s ${llvm}/bin/llvm-profdata
-    ln -s ${llvm}/bin/llvm-size
-
-    ln -s ${yacc}/bin/yacc
-    ln -s ${yacc}/bin/bison
-    ln -s ${flex}/bin/flex
-    ln -s ${flex}/bin/flex++
-
-    ln -s flex lex
-
-    ln -s ${m4}/bin/m4
-    ln -s m4 gm4
-
-    ln -s ${unifdef}/bin/unifdef
-    ln -s ${unifdef}/bin/unifdefall
-
-    ln -s ${gperf}/bin/gperf
-    ln -s ${indent}/bin/indent
-    ln -s ${ctags}/bin/ctags
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    ln -s ${bootstrap_cmds}/bin/mig
-    ln -s ${binutils}/bin/lipo
-
-    ln -s ${cctools}/bin/ar
-    ln -s ${cctools}/bin/as
-    ln -s ${cctools}/bin/nm
-    ln -s ${cctools}/bin/nmedit
-    ln -s ${cctools}/bin/ld
-    ln -s ${cctools}/bin/libtool
-    ln -s ${cctools}/bin/strings
-    ln -s ${cctools}/bin/strip
-    ln -s ${cctools}/bin/install_name_tool
-    ln -s ${cctools}/bin/bitcode_strip
-    ln -s ${cctools}/bin/codesign_allocate
-    ln -s ${cctools}/bin/dsymutil
-    ln -s ${cctools}/bin/dyldinfo
-    ln -s ${cctools}/bin/otool
-    ln -s ${cctools}/bin/unwinddump
-    ln -s ${cctools}/bin/size
-    ln -s ${cctools}/bin/segedit
-    ln -s ${cctools}/bin/pagestuff
-    ln -s ${cctools}/bin/ranlib
-    ln -s ${cctools}/bin/redo_prebinding
-
-    ln -s ${xib2nib}/bin/ibtool
-  '' +
-    # No point including the entire gcc closure if we don't already have it
-    (if stdenv.cc.isClang then ''
-      ln -s ${stdenv.cc.cc.llvm}/bin/llvm-cov gcov
-      ln -s ${mkdep-darwin-src}               mkdep
-    '' else ''
-      ln -s ${gcc}/bin/gcov
-      ln -s ${gcc}/bin/mkdep
-    '');
-}
-
-# other commands in /bin/
-#   asa
-#   cmpdylib (in cctools)
-#   ctf_insert (in cctools)
-#   dwarfdump
-#   lorder
-#   rebase
-#   rpcgen (in developer_cmds)
-#   what
-
-
-# swift: see #11463
-#   swift
-#   swift-compress
-#   swift-demangle
-#   swift-stdlib-tool
-#   swift-update
-#   swiftc
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix
new file mode 100644
index 0000000000000..01a8fbdb0b065
--- /dev/null
+++ b/pkgs/development/tools/xcbuild/toolchains.nix
@@ -0,0 +1,71 @@
+{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv
+, buildPackages, lib, writeText }:
+
+let
+
+  inherit (lib) getBin optionalString;
+  inherit (lib.generators) toPlist;
+
+  ToolchainInfo = {
+    Identifier = toolchainName;
+  };
+
+  # We could pull this out of developer_cmds but it adds an annoying
+  # loop if we want to bootstrap and this is just a tiny script so I'm
+  # not going to bother.
+  mkdep-darwin-src = fetchurl {
+    url        = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh";
+    sha256     = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541";
+    executable = true;
+  };
+in
+
+runCommand "Toolchains" {
+  nativeBuildInputs = [ makeWrapper ];
+} (''
+  toolchain=$out/XcodeDefault.xctoolchain
+  mkdir -p $toolchain
+
+  install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $toolchain/ToolchainInfo.plist
+
+  mkdir -p $toolchain/usr/include
+  mkdir -p $toolchain/usr/lib
+  mkdir -p $toolchain/usr/libexec
+  mkdir -p $toolchain/usr/share
+  mkdir -p $toolchain/usr/bin
+
+  for bin in ${getBin stdenv.cc}/bin/*; do
+    ln -s $bin $toolchain/usr/bin
+  done
+
+  for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do
+    if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then
+      ln -s $bin $toolchain/usr/bin
+    fi
+  done
+
+  ln -s ${buildPackages.yacc}/bin/yacc $toolchain/usr/bin/yacc
+  ln -s ${buildPackages.yacc}/bin/bison $toolchain/usr/bin/bison
+  ln -s ${buildPackages.flex}/bin/flex $toolchain/usr/bin/flex
+  ln -s ${buildPackages.flex}/bin/flex++ $toolchain/usr/bin/flex++
+  ln -s $toolchain/bin/flex $toolchain/usr/bin/lex
+
+  ln -s ${buildPackages.m4}/bin/m4 $toolchain/usr/bin/m4
+  ln -s $toolchain/usr/bin/m4 $toolchain/usr/bin/gm4
+
+  ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/usr/bin/unifdef
+  ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/usr/bin/unifdefall
+
+  ln -s ${buildPackages.gperf}/bin/gperf $toolchain/usr/bin/gperf
+  ln -s ${buildPackages.indent}/bin/indent $toolchain/usr/bin/indent
+  ln -s ${buildPackages.ctags}/bin/ctags $toolchain/usr/bin/ctags
+'' + optionalString stdenv.isDarwin ''
+  for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do
+    if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then
+      ln -s $bin $toolchain/usr/bin
+    fi
+  done
+
+  ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/usr/bin
+  ln -s ${mkdep-darwin-src} $toolchain/usr/bin/mkdep
+'')
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index 06c48ec0a73f9..f8b1c1bf31e9d 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -1,81 +1,132 @@
-{ stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics
-, cctools, bootstrap_cmds, binutils}:
+{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
+, CoreServices, ImageIO, CoreGraphics
+, targetPlatform
+, xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX"
+, xcodeVer ? targetPlatform.xcodeVer or "9.4.1"
+, sdkVer ? targetPlatform.sdkVer or "10.10" }:
 
 let
 
+  inherit (lib) toLower;
+
   toolchainName = "com.apple.dt.toolchain.XcodeDefault";
-  platformName = "com.apple.platform.macosx";
-  sdkName = "macosx10.10";
+  sdkName = "${xcodePlatform}${sdkVer}";
+
+  # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
+  sdkBuildVersion = "17E189";
+  xcodeSelectVersion = "2349";
 
-  xcbuild = callPackage ./default.nix {
+  xcbuild = buildPackages.callPackage ./default.nix {
     inherit CoreServices ImageIO CoreGraphics;
   };
 
-  toolchain = callPackage ./toolchain.nix {
-    inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv;
+  toolchains = buildPackages.callPackage ./toolchains.nix {
+    inherit toolchainName;
   };
 
-  sdk = callPackage ./sdk.nix {
-    inherit toolchainName sdkName xcbuild;
+  sdks = buildPackages.callPackage ./sdks.nix {
+    inherit toolchainName sdkName xcodePlatform;
+    version = sdkVer;
   };
 
-  platform = callPackage ./platform.nix {
-    inherit sdk platformName xcbuild;
+  platforms = buildPackages.callPackage ./platforms.nix {
+    inherit sdks xcodePlatform;
   };
 
   xcconfig = writeText "nix.xcconfig" ''
     SDKROOT=${sdkName}
   '';
 
-in
-
-stdenv.mkDerivation {
-  name = "xcbuild-wrapper-${xcbuild.version}";
-
-  buildInputs = [ xcbuild makeWrapper ];
-
-  setupHook = ./setup-hook.sh;
-
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cd $out/bin/
-
-    for file in ${xcbuild}/bin/*; do
-      ln -s $file
-    done
-
-    mkdir $out/usr
-    ln -s $out/bin $out/usr/bin
-
-    mkdir -p $out/Library/Xcode/
-    ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
-
-    mkdir -p $out/Platforms/
-    ln -s ${platform} $out/Platforms/nixpkgs.platform
-
-    mkdir -p $out/Toolchains/
-    ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain
+  xcode-select = writeText "xcode-select" ''
+#!/usr/bin/env sh
+while [ $# -gt 0 ]; do
+   case "$1" in
+         -h | --help) ;; # noop
+         -s | --switch) shift;; # noop
+         -r | --reset) ;; # noop
+         -v | --version) echo xcode-select version ${xcodeSelectVersion} ;;
+         -p | --print-path) echo @DEVELOPER_DIR@ ;;
+         --install) ;; # noop
+    esac
+    shift
+done
+  '';
 
-    wrapProgram $out/bin/xcodebuild \
-      --add-flags "-xcconfig ${xcconfig}" \
-      --add-flags "DERIVED_DATA_DIR=." \
-      --set DEVELOPER_DIR "$out" \
-      --set SDKROOT ${sdkName}
-    wrapProgram $out/bin/xcrun \
-      --set DEVELOPER_DIR "$out" \
-      --set SDKROOT ${sdkName}
-    wrapProgram $out/bin/xcode-select \
-      --set DEVELOPER_DIR "$out" \
-      --set SDKROOT ${sdkName}
+  xcrun = writeText "xcrun" ''
+#!/usr/bin/env sh
+while [ $# -gt 0 ]; do
+   case "$1" in
+         --sdk | -sdk) shift ;;
+         --find | -find)
+           shift
+           command -v $1 ;;
+         --log | -log) ;; # noop
+         --verbose | -verbose) ;; # noop
+         --no-cache | -no-cache) ;; # noop
+         --kill-cache | -kill-cache) ;; # noop
+         --show-sdk-path | -show-sdk-path)
+           echo ${sdks}/${sdkName}.sdk ;;
+         --show-sdk-platform-path | -show-sdk-platform-path)
+           echo ${platforms}/${xcodePlatform}.platform ;;
+         --show-sdk-version | -show-sdk-version)
+           echo ${sdkVer} ;;
+         --show-sdk-build-version | -show-sdk-build-version)
+           echo ${sdkBuildVersion} ;;
+         *) break ;;
+    esac
+    shift
+done
+if ! [[ -z "$@" ]]; then
+   exec "$@"
+fi
   '';
 
+in
+
+runCommand "xcodebuild-${xcbuild.version}" {
+  nativeBuildInputs = [ makeWrapper ];
   inherit (xcbuild) meta;
 
-  passthru = {
-    raw = xcbuild;
-  };
+  # ensure that the toolchain goes in PATH
+  propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain/usr" ];
+
+  passthru = { inherit xcbuild; };
 
   preferLocalBuild = true;
-}
+} ''
+  mkdir -p $out/bin
+
+  mkdir -p $out/usr
+  ln -s $out/bin $out/usr/bin
+
+  mkdir -p $out/Library/Xcode
+  ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
+
+  ln -s ${platforms} $out/Platforms
+  ln -s ${toolchains} $out/Toolchains
+
+  makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \
+    --add-flags "-xcconfig ${xcconfig}" \
+    --add-flags "DERIVED_DATA_DIR=." \
+    --set DEVELOPER_DIR "$out" \
+    --set SDKROOT ${sdkName} \
+    --run '[ "$1" = "-version" ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0'
+
+  substitute ${xcode-select} $out/bin/xcode-select \
+    --subst-var-by DEVELOPER_DIR $out
+  chmod +x $out/bin/xcode-select
+
+  substitute ${xcrun} $out/bin/xcrun
+  chmod +x $out/bin/xcrun
+
+  for bin in PlistBuddy actool builtin-copy builtin-copyPlist \
+             builtin-copyStrings builtin-copyTiff \
+             builtin-embeddedBinaryValidationUtility \
+             builtin-infoPlistUtility builtin-lsRegisterURL \
+             builtin-productPackagingUtility builtin-validationUtility \
+             lsbom plutil; do
+    ln -s ${xcbuild}/bin/$bin $out/bin/$bin
+  done
+
+  fixupPhase
+''
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 535ab7b45fa31..635c9efa40e8b 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "00fxihv9ih40k6f21a7hb6vkx4h4m6ks0fbai5h9ssi0p4m5j3by";
+    sha256 = "145z9i935kab5pv3pldgs3b1i9ppplc928c71c2lbz8my1z6j77w";
   };
 
   buildInputs = [makeWrapper nodejs];
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 201e85985d825..52231d0a83186 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "yq";
-  version = "2.5.0";
+  version = "2.6.0";
 
   propagatedBuildInputs = [ pyyaml xmltodict jq ];
 
@@ -11,7 +11,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e9fd2aa32defcd051058e3b6f665873282aa4eed19e11b1db94fe70847535d4c";
+    sha256 = "0wyzg6lwxmzqsblljg9hddkadda7qdpw54sp0pmmbv89hhz7cky6";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 4e8cb2b8829c0..4159e3690490d 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "csslint-${version}";
 
   src = fetchurl {
-    url = "http://registry.npmjs.org/csslint/-/${name}.tgz";
+    url = "https://registry.npmjs.org/csslint/-/${name}.tgz";
     sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid";
   };
 
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index a0d8a0b84bac4..e5e6f639b95d6 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "grails-${version}";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "0796jbcblr3vxdf6sngzcfs1m24d1ra1n8jc7cnfrfxpf8r0z15m";
+    sha256 = "0q3rbz47lp2zh2794aycf85vnic77dg3sclrqbizfpdijma87iy7";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index 6d91007e4860d..597b9ab346083 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "kcgi";
-  version = "0.10.5";
+  version = "0.10.7";
   underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "kristapsdz";
     repo = pname;
     rev = "VERSION_${underscoreVersion}";
-    sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw";
+    sha256 = "1z8gfj1v69hhkiyybr41qw7yv3cdxahgk45nipxfb9nmn18p0k8n";
   };
   patchPhase = ''substituteInPlace configure \
     --replace /usr/local /
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index ec5a0e779c344..8997dbda72840 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.3.0";
-    sha256 = "0c8zcwi7r7nnmk29lprdmvil693x5svy3nzbaaqywmg6x2yyk46b";
+    version = "10.5.0";
+    sha256 = "1g1kdcrhahdsrkazfl9wj25abgjvkncgwwcm2ppgj3avfi1wam3v";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index d648cf957d188..8eb05d67f088c 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "6.14.2";
-    sha256 = "1lb2dpzamrag645l47gb33qqx8ppjimkb8gkczzwd5jymnr399dk";
+    version = "6.14.3";
+    sha256 = "1jbrfk875aimm65wni059rrydmhp4z0hrxskq3ci6jvykxr8gwg3";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
   }
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 5f81842ca2322..9410f017a9c35 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "8.11.2";
-    sha256 = "0ya9iz47d7ld4zb0aqym9cpxah0pzhsllhh7xmmmf28q7304d6ak";
+    version = "8.11.3";
+    sha256 = "1q3fc791ng1sgk0i5qnxpxri7235nkjm50zx1z34c759vhgpaz2p";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }
diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix
deleted file mode 100644
index f6f8aa8d1ab02..0000000000000
--- a/pkgs/development/web/nodejs/v9.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, callPackage, lib, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix {};
-in
-  buildNodejs {
-    inherit enableNpm;
-    version = "9.11.1";
-    sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13";
-    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-  }
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 4c8a6c6db97af..3322c58b40d0a 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -10,16 +10,16 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz";
-        sha512 = "37dc2svic03crmc9mvs4xc16rd28cbbf33js9ndp8278gb5xi40h1yzx467h3ca9mszjfwwr9vyfnvfbk07dj7gz039izrsq0085kln";
+        sha512 = "ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==";
       };
     };
-    "JSONStream-1.3.2" = {
+    "JSONStream-1.3.3" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz";
-        sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz";
+        sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==";
       };
     };
     "abbrev-1.1.1" = {
@@ -28,34 +28,34 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "acorn-4.0.13" = {
+    "acorn-5.7.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.13";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";
-        sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
+        sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
       };
     };
-    "acorn-5.5.3" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "5.5.3";
+    "acorn-dynamic-import-3.0.0" = {
+      name = "acorn-dynamic-import";
+      packageName = "acorn-dynamic-import";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz";
-        sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz";
+        sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==";
       };
     };
-    "acorn-node-1.3.0" = {
+    "acorn-node-1.5.2" = {
       name = "acorn-node";
       packageName = "acorn-node";
-      version = "1.3.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz";
-        sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr";
+        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz";
+        sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==";
       };
     };
     "adm-zip-0.2.1" = {
@@ -67,13 +67,13 @@ let
         sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
       };
     };
-    "ajv-4.11.8" = {
+    "ajv-5.5.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.8";
+      version = "5.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
+        sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
     "array-filter-0.0.1" = {
@@ -136,7 +136,7 @@ let
       version = "4.10.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
+        sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
     "assert-1.4.1" = {
@@ -157,15 +157,6 @@ let
         sha1 = "ee74009413002d84cec7219c6ac811812e723160";
       };
     };
-    "assert-plus-0.2.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
-      };
-    };
     "assert-plus-1.0.0" = {
       name = "assert-plus";
       packageName = "assert-plus";
@@ -175,15 +166,6 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "astw-2.2.0" = {
-      name = "astw";
-      packageName = "astw";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
-        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
-      };
-    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -211,22 +193,22 @@ let
         sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
       };
     };
-    "aws-sign2-0.6.0" = {
+    "aws-sign2-0.7.0" = {
       name = "aws-sign2";
       packageName = "aws-sign2";
-      version = "0.6.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
-        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.6.0" = {
+    "aws4-1.7.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
-        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -238,13 +220,13 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.2.3" = {
+    "base64-js-1.3.0" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.2.3";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";
-        sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
+        sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==";
       };
     };
     "bcrypt-pbkdf-1.0.1" = {
@@ -262,7 +244,7 @@ let
       version = "4.11.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
+        sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==";
       };
     };
     "boom-0.4.2" = {
@@ -274,22 +256,13 @@ let
         sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
       };
     };
-    "boom-2.10.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "2.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
-      };
-    };
     "brace-expansion-1.1.11" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
       version = "1.1.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
     "brorand-1.1.0" = {
@@ -301,22 +274,22 @@ let
         sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
-    "browser-pack-6.0.4" = {
+    "browser-pack-6.1.0" = {
       name = "browser-pack";
       packageName = "browser-pack";
-      version = "6.0.4";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz";
-        sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123";
+        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz";
+        sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
-    "browser-resolve-1.11.2" = {
+    "browser-resolve-1.11.3" = {
       name = "browser-resolve";
       packageName = "browser-resolve";
-      version = "1.11.2";
+      version = "1.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz";
-        sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
+        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
+        sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==";
       };
     };
     "browser-stdout-1.3.1" = {
@@ -325,34 +298,34 @@ let
       version = "1.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
+        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
       };
     };
-    "browserify-aes-1.1.1" = {
+    "browserify-aes-1.2.0" = {
       name = "browserify-aes";
       packageName = "browserify-aes";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz";
-        sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
+        sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
       };
     };
-    "browserify-cipher-1.0.0" = {
+    "browserify-cipher-1.0.1" = {
       name = "browserify-cipher";
       packageName = "browserify-cipher";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
-        sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
+        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
+        sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
       };
     };
-    "browserify-des-1.0.0" = {
+    "browserify-des-1.0.1" = {
       name = "browserify-des";
       packageName = "browserify-des";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz";
-        sha1 = "daa277717470922ed2fe18594118a175439721dd";
+        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz";
+        sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -379,7 +352,7 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
-        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
+        sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
     "buffer-5.1.0" = {
@@ -388,7 +361,16 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz";
-        sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2";
+        sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==";
+      };
+    };
+    "buffer-from-1.1.0" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz";
+        sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -433,7 +415,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
+        sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
       };
     };
     "cli-1.0.1" = {
@@ -454,15 +436,6 @@ let
         sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
       };
     };
-    "combine-source-map-0.7.2" = {
-      name = "combine-source-map";
-      packageName = "combine-source-map";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz";
-        sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e";
-      };
-    };
     "combine-source-map-0.8.0" = {
       name = "combine-source-map";
       packageName = "combine-source-map";
@@ -490,31 +463,13 @@ let
         sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
       };
     };
-    "commander-2.11.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
-      };
-    };
-    "commander-2.14.1" = {
+    "commander-2.15.1" = {
       name = "commander";
       packageName = "commander";
-      version = "2.14.1";
+      version = "2.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz";
-        sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r";
-      };
-    };
-    "commander-2.15.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz";
-        sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc";
+        url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
+        sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==";
       };
     };
     "concat-map-0.0.1" = {
@@ -526,22 +481,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "concat-stream-1.5.2" = {
+    "concat-stream-1.6.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.5.2";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
-      };
-    };
-    "concat-stream-1.6.1" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz";
-        sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
       };
     };
     "config-chain-1.1.11" = {
@@ -589,31 +535,31 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "create-ecdh-4.0.0" = {
+    "create-ecdh-4.0.3" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.0";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz";
-        sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
+        sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==";
       };
     };
-    "create-hash-1.1.3" = {
+    "create-hash-1.2.0" = {
       name = "create-hash";
       packageName = "create-hash";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz";
-        sha1 = "606042ac8b9262750f483caddab0f5819172d8fd";
+        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
+        sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
       };
     };
-    "create-hmac-1.1.6" = {
+    "create-hmac-1.1.7" = {
       name = "create-hmac";
       packageName = "create-hmac";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz";
-        sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
+        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
+        sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
     "cryptiles-0.2.2" = {
@@ -625,22 +571,13 @@ let
         sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
       };
     };
-    "cryptiles-2.0.5" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
-      };
-    };
     "crypto-browserify-3.12.0" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
       version = "3.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
-        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
+        sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
       };
     };
     "ctype-0.5.3" = {
@@ -676,7 +613,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
     "defined-1.0.0" = {
@@ -730,7 +667,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz";
-        sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac";
+        sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==";
       };
     };
     "diff-3.5.0" = {
@@ -739,16 +676,16 @@ let
       version = "3.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
-        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
+        sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
-    "diffie-hellman-5.0.2" = {
+    "diffie-hellman-5.0.3" = {
       name = "diffie-hellman";
       packageName = "diffie-hellman";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
-        sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
+        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+        sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
     "dom-serializer-0.1.0" = {
@@ -766,7 +703,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
-        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
+        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
     "domelementtype-1.1.3" = {
@@ -856,7 +793,7 @@ let
       version = "0.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
-        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -868,13 +805,13 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "events-2.0.0" = {
+    "events-2.1.0" = {
       name = "events";
       packageName = "events";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz";
-        sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg";
+        url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz";
+        sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -883,7 +820,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
-        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
+        sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
       };
     };
     "exit-0.1.2" = {
@@ -913,6 +850,24 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
+    "fast-deep-equal-1.1.0" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
+        sha1 = "c053477817c86b51daa853c81e059b733d023614";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
     "forever-agent-0.5.2" = {
       name = "forever-agent";
       packageName = "forever-agent";
@@ -940,13 +895,13 @@ let
         sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
       };
     };
-    "form-data-2.1.4" = {
+    "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.1.4";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
-        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz";
+        sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -964,7 +919,16 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+      };
+    };
+    "get-assigned-identifiers-1.2.0" = {
+      name = "get-assigned-identifiers";
+      packageName = "get-assigned-identifiers";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz";
+        sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==";
       };
     };
     "getpass-0.1.7" = {
@@ -982,7 +946,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -994,49 +958,40 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
-    "growl-1.10.3" = {
+    "growl-1.10.5" = {
       name = "growl";
       packageName = "growl";
-      version = "1.10.3";
+      version = "1.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz";
-        sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
+        url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz";
+        sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==";
       };
     };
-    "har-schema-1.0.5" = {
+    "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
-      version = "1.0.5";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
-        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-4.2.1" = {
+    "har-validator-5.0.3" = {
       name = "har-validator";
       packageName = "har-validator";
-      version = "4.2.1";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
-        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
+        sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
       };
     };
-    "has-1.0.1" = {
+    "has-1.0.3" = {
       name = "has";
       packageName = "has";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz";
-        sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28";
-      };
-    };
-    "has-flag-2.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "2.0.0";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
-        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
+        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
       };
     };
     "has-flag-3.0.0" = {
@@ -1048,15 +1003,6 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "hash-base-2.0.2" = {
-      name = "hash-base";
-      packageName = "hash-base";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz";
-        sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1";
-      };
-    };
     "hash-base-3.0.4" = {
       name = "hash-base";
       packageName = "hash-base";
@@ -1066,13 +1012,13 @@ let
         sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
       };
     };
-    "hash.js-1.1.3" = {
+    "hash.js-1.1.4" = {
       name = "hash.js";
       packageName = "hash.js";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
-        sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx";
+        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz";
+        sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==";
       };
     };
     "hawk-1.0.0" = {
@@ -1084,15 +1030,6 @@ let
         sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
       };
     };
-    "hawk-3.1.3" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
-      };
-    };
     "he-1.1.1" = {
       name = "he";
       packageName = "he";
@@ -1120,15 +1057,6 @@ let
         sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
       };
     };
-    "hoek-2.16.3" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "2.16.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
-      };
-    };
     "htmlescape-1.1.1" = {
       name = "htmlescape";
       packageName = "htmlescape";
@@ -1156,13 +1084,13 @@ let
         sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
       };
     };
-    "http-signature-1.1.1" = {
+    "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
     "https-browserify-1.0.0" = {
@@ -1174,13 +1102,13 @@ let
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     };
-    "ieee754-1.1.8" = {
+    "ieee754-1.1.12" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.8";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
-        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
+        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
       };
     };
     "image-size-0.5.5" = {
@@ -1192,15 +1120,6 @@ let
         sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c";
       };
     };
-    "indexof-0.0.1" = {
-      name = "indexof";
-      packageName = "indexof";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
-        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
-      };
-    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -1252,7 +1171,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
-        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
     "inline-source-map-0.6.2" = {
@@ -1264,13 +1183,13 @@ let
         sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
       };
     };
-    "insert-module-globals-7.0.2" = {
+    "insert-module-globals-7.2.0" = {
       name = "insert-module-globals";
       packageName = "insert-module-globals";
-      version = "7.0.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz";
-        sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7";
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz";
+        sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==";
       };
     };
     "interpret-1.1.0" = {
@@ -1288,7 +1207,7 @@ let
       version = "1.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
-        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -1318,6 +1237,15 @@ let
         sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
+    "isarray-2.0.4" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz";
+        sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==";
+      };
+    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -1345,6 +1273,15 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
+    "json-schema-traverse-0.3.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
+        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
+      };
+    };
     "json-stable-stringify-0.0.1" = {
       name = "json-stable-stringify";
       packageName = "json-stable-stringify";
@@ -1354,15 +1291,6 @@ let
         sha1 = "611c23e814db375527df851193db59dd2af27f45";
       };
     };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
-      };
-    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -1405,7 +1333,7 @@ let
       version = "1.1.27";
       src = fetchurl {
         url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz";
-        sha512 = "3x01f92pvzs341qv1cin9mb3yiimkzjpy0f4dms78ki26ba01kjqcjpcm85sw005lc8d5dkk9wsigwh7zawnh10vml03siifbbnk5cq";
+        sha512 = "mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==";
       };
     };
     "kew-0.1.7" = {
@@ -1417,22 +1345,13 @@ let
         sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
       };
     };
-    "labeled-stream-splicer-2.0.0" = {
+    "labeled-stream-splicer-2.0.1" = {
       name = "labeled-stream-splicer";
       packageName = "labeled-stream-splicer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz";
-        sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
-      };
-    };
-    "lexical-scope-1.2.0" = {
-      name = "lexical-scope";
-      packageName = "lexical-scope";
-      version = "1.2.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz";
-        sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
+        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz";
+        sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==";
       };
     };
     "lodash-3.7.0" = {
@@ -1462,13 +1381,13 @@ let
         sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
       };
     };
-    "lolex-2.3.2" = {
+    "lolex-2.7.0" = {
       name = "lolex";
       packageName = "lolex";
-      version = "2.3.2";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz";
-        sha512 = "2g7dp64fm1kp17mxgz5r8hlgd65k8wfxz8jwcgqskdxn7vsnm6vj1bylcqblyzl6879p3g7qcjqqwmw0nik6032fksb33q5v7d4v6h3";
+        url = "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz";
+        sha512 = "uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg==";
       };
     };
     "md5.js-1.3.4" = {
@@ -1486,7 +1405,7 @@ let
       version = "4.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
-        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
+        sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
       };
     };
     "mime-1.2.11" = {
@@ -1504,7 +1423,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
-        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
     "mime-db-1.33.0" = {
@@ -1513,7 +1432,7 @@ let
       version = "1.33.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
-        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+        sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
       };
     };
     "mime-types-2.1.18" = {
@@ -1522,16 +1441,16 @@ let
       version = "2.1.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
-        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+        sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
       };
     };
-    "minimalistic-assert-1.0.0" = {
+    "minimalistic-assert-1.0.1" = {
       name = "minimalistic-assert";
       packageName = "minimalistic-assert";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
-        sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -1549,7 +1468,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
     "minimist-0.0.8" = {
@@ -1597,13 +1516,13 @@ let
         sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
       };
     };
-    "module-deps-6.0.0" = {
+    "module-deps-6.1.0" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "6.0.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz";
-        sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz";
+        sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ==";
       };
     };
     "ms-2.0.0" = {
@@ -1624,13 +1543,13 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "nise-1.3.0" = {
+    "nise-1.4.2" = {
       name = "nise";
       packageName = "nise";
-      version = "1.3.0";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nise/-/nise-1.3.0.tgz";
-        sha512 = "20b9q52bz8ncm5jqjfhrhrcr2rb0y8jhb867ayrkdsf78y1c186qra112a6sj6lbnkab0dx0i1cnr2hz4l4dzzkn1l8khvc71vspqjk";
+        url = "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz";
+        sha512 = "BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw==";
       };
     };
     "node-uuid-1.4.8" = {
@@ -1720,7 +1639,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz";
-        sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm";
+        sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==";
       };
     };
     "parents-1.0.1" = {
@@ -1732,22 +1651,22 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.0" = {
+    "parse-asn1-5.1.1" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
-        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
+        sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
       };
     };
-    "path-browserify-0.0.0" = {
+    "path-browserify-0.0.1" = {
       name = "path-browserify";
       packageName = "path-browserify";
-      version = "0.0.0";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
-        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
+        sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==";
       };
     };
     "path-is-absolute-1.0.1" = {
@@ -1786,22 +1705,22 @@ let
         sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
       };
     };
-    "pbkdf2-3.0.14" = {
+    "pbkdf2-3.0.16" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.14";
+      version = "3.0.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz";
-        sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz";
+        sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==";
       };
     };
-    "performance-now-0.2.0" = {
+    "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
-      version = "0.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
-        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
     "phantomjs-1.9.7-15" = {
@@ -1822,22 +1741,13 @@ let
         sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
       };
     };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
     "process-nextick-args-2.0.0" = {
       name = "process-nextick-args";
       packageName = "process-nextick-args";
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
-        sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
       };
     };
     "progress-1.1.8" = {
@@ -1855,7 +1765,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
+        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
     "proto-list-1.2.4" = {
@@ -1876,13 +1786,22 @@ let
         sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
       };
     };
-    "public-encrypt-4.0.0" = {
+    "psl-1.1.28" = {
+      name = "psl";
+      packageName = "psl";
+      version = "1.1.28";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz";
+        sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw==";
+      };
+    };
+    "public-encrypt-4.0.2" = {
       name = "public-encrypt";
       packageName = "public-encrypt";
-      version = "4.0.0";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz";
-        sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
+        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
+        sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==";
       };
     };
     "punycode-1.3.2" = {
@@ -1912,13 +1831,13 @@ let
         sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
       };
     };
-    "qs-6.4.0" = {
+    "qs-6.5.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.4.0";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
     "querystring-0.2.0" = {
@@ -1945,7 +1864,7 @@ let
       version = "2.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
-        sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108";
+        sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==";
       };
     };
     "randomfill-1.0.4" = {
@@ -1954,7 +1873,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
-        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
+        sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
       };
     };
     "read-only-stream-2.0.0" = {
@@ -1975,22 +1894,13 @@ let
         sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
       };
     };
-    "readable-stream-2.0.6" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
-      };
-    };
-    "readable-stream-2.3.5" = {
+    "readable-stream-2.3.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.5";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz";
-        sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
     "rechoir-0.6.2" = {
@@ -2011,13 +1921,13 @@ let
         sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
       };
     };
-    "request-2.81.0" = {
+    "request-2.87.0" = {
       name = "request";
       packageName = "request";
-      version = "2.81.0";
+      version = "2.87.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+        url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
+        sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
       };
     };
     "request-progress-0.3.1" = {
@@ -2038,13 +1948,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.5.0" = {
+    "resolve-1.8.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.5.0";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz";
-        sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz";
+        sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==";
       };
     };
     "rimraf-2.2.8" = {
@@ -2056,22 +1966,31 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "ripemd160-2.0.1" = {
+    "ripemd160-2.0.2" = {
       name = "ripemd160";
       packageName = "ripemd160";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz";
-        sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
+        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
+        sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
       };
     };
-    "safe-buffer-5.1.1" = {
+    "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "samsam-1.3.0" = {
@@ -2080,7 +1999,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz";
-        sha512 = "1p5ac86nbwsyxsaqbfa288xk904a0lfc8fph9h2nflvgmz5ilwyprs12lb6as5n6k8q24y541sr4bvv7dy3pl1d2nnm6lpw7xh0hz6l";
+        sha512 = "1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==";
       };
     };
     "semver-1.1.4" = {
@@ -2092,13 +2011,13 @@ let
         sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
       };
     };
-    "sha.js-2.4.10" = {
+    "sha.js-2.4.11" = {
       name = "sha.js";
       packageName = "sha.js";
-      version = "2.4.10";
+      version = "2.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz";
-        sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y";
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
+        sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
     "shasum-1.0.2" = {
@@ -2134,7 +2053,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz";
-        sha512 = "16cp397231rnlk9vc4i8jggycqwxpgrn3pm9l2bf5y02ln4gawz41z2ycqnw9h1rkm7x8zf5qy5d7jv7ll0c634p62fpxfar96gmzb4";
+        sha512 = "ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==";
       };
     };
     "should-format-3.0.3" = {
@@ -2161,7 +2080,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz";
-        sha512 = "1y2b2dwphk185za2spffsr383na1pdjl2bf8lwv6yzaix1q9px92brp5i0m670kz5lb9kdlxkp61vq53v7mcxjadhgfjdz7h9v223i4";
+        sha512 = "JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==";
       };
     };
     "should-util-1.0.0" = {
@@ -2173,6 +2092,15 @@ let
         sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063";
       };
     };
+    "simple-concat-1.0.0" = {
+      name = "simple-concat";
+      packageName = "simple-concat";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz";
+        sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6";
+      };
+    };
     "sntp-0.2.4" = {
       name = "sntp";
       packageName = "sntp";
@@ -2182,15 +2110,6 @@ let
         sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
       };
     };
-    "sntp-1.0.9" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -2206,16 +2125,16 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
-        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
-    "sshpk-1.14.1" = {
+    "sshpk-1.14.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.1";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
-        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
       };
     };
     "stream-browserify-2.0.1" = {
@@ -2236,13 +2155,13 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "stream-http-2.8.0" = {
+    "stream-http-2.8.3" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.8.0";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz";
-        sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
+        sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
     "stream-splicer-2.0.0" = {
@@ -2263,22 +2182,13 @@ let
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
-    "string_decoder-1.0.3" = {
+    "string_decoder-1.1.1" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
-      };
-    };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
     "strip-json-comments-1.0.4" = {
@@ -2299,22 +2209,13 @@ let
         sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
       };
     };
-    "supports-color-4.4.0" = {
+    "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.4.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
-        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
-      };
-    };
-    "supports-color-5.3.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
-        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
+        sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==";
       };
     };
     "syntax-error-1.4.0" = {
@@ -2323,7 +2224,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
-        sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0";
+        sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
     "text-encoding-0.6.4" = {
@@ -2386,7 +2287,16 @@ let
       version = "2.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
-        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
+      };
+    };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
       };
     };
     "tty-browserify-0.0.1" = {
@@ -2395,7 +2305,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz";
-        sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b";
+        sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
       };
     };
     "tunnel-agent-0.4.3" = {
@@ -2431,7 +2341,7 @@ let
       version = "4.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz";
-        sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni";
+        sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
       };
     };
     "typedarray-0.0.6" = {
@@ -2443,13 +2353,22 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "umd-3.0.2" = {
+    "umd-3.0.3" = {
       name = "umd";
       packageName = "umd";
-      version = "3.0.2";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz";
+        sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
+      };
+    };
+    "undeclared-identifiers-1.1.2" = {
+      name = "undeclared-identifiers";
+      packageName = "undeclared-identifiers";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz";
-        sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6";
+        url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz";
+        sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==";
       };
     };
     "url-0.11.0" = {
@@ -2470,6 +2389,15 @@ let
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
+    "util-0.10.4" = {
+      name = "util";
+      packageName = "util";
+      version = "0.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
+        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+      };
+    };
     "util-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -2479,13 +2407,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.2.1" = {
+    "uuid-3.3.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.2.1";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
-        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz";
+        sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==";
       };
     };
     "verror-1.10.0" = {
@@ -2497,13 +2425,13 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vm-browserify-0.0.4" = {
+    "vm-browserify-1.1.0" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "0.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
-        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
+        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
       };
     };
     "which-1.0.9" = {
@@ -2539,15 +2467,15 @@ in
   marked = nodeEnv.buildNodePackage {
     name = "marked";
     packageName = "marked";
-    version = "0.3.17";
+    version = "0.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz";
-      sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq";
+      url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz";
+      sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "A markdown parser built for speed";
-      homepage = https://github.com/markedjs/marked;
+      homepage = https://marked.js.org/;
       license = "MIT";
     };
     production = true;
@@ -2556,152 +2484,142 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.1.1";
+    version = "16.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz";
-      sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz";
+      sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A==";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
-      sources."acorn-4.0.13"
-      sources."acorn-node-1.3.0"
+      sources."JSONStream-1.3.3"
+      sources."acorn-5.7.1"
+      sources."acorn-dynamic-import-3.0.0"
+      sources."acorn-node-1.5.2"
       sources."array-filter-0.0.1"
       sources."array-map-0.0.0"
       sources."array-reduce-0.0.0"
       sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
-      sources."astw-2.2.0"
+      (sources."assert-1.4.1" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+          sources."util-0.10.3"
+        ];
+      })
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
-      sources."browser-pack-6.0.4"
-      (sources."browser-resolve-1.11.2" // {
+      sources."browser-pack-6.1.0"
+      (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
         ];
       })
-      sources."browserify-aes-1.1.1"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-aes-1.2.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
       sources."buffer-5.1.0"
+      sources."buffer-from-1.1.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.1"
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.1"
+      sources."concat-stream-1.6.2"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
-      (sources."crypto-browserify-3.12.0" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."create-ecdh-4.0.3"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
+      sources."crypto-browserify-3.12.0"
       sources."date-now-0.1.4"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
-      sources."detective-5.1.0"
-      sources."diffie-hellman-5.0.2"
+      (sources."detective-5.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.4.0"
-      sources."events-2.0.0"
+      sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-assigned-identifiers-1.2.0"
       sources."glob-7.1.2"
-      sources."has-1.0.1"
+      sources."has-1.0.3"
       sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
+      sources."hash.js-1.1.4"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.8"
-      sources."indexof-0.0.1"
+      sources."ieee754-1.1.12"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      (sources."insert-module-globals-7.0.2" // {
-        dependencies = [
-          sources."combine-source-map-0.7.2"
-          sources."concat-stream-1.5.2"
-          sources."readable-stream-2.0.6"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."insert-module-globals-7.2.0"
       sources."is-buffer-1.1.6"
-      sources."isarray-1.0.0"
+      sources."isarray-2.0.4"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
-      (sources."labeled-stream-splicer-2.0.0" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      sources."lexical-scope-1.2.0"
+      sources."labeled-stream-splicer-2.0.1"
       sources."lodash.memoize-3.0.4"
       sources."md5.js-1.3.4"
       sources."miller-rabin-4.0.1"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      (sources."module-deps-6.0.0" // {
-        dependencies = [
-          sources."acorn-5.5.3"
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."module-deps-6.1.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
       sources."pako-1.0.6"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
-      sources."path-browserify-0.0.0"
+      sources."parse-asn1-5.1.1"
+      sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."process-0.11.10"
-      sources."process-nextick-args-1.0.7"
-      sources."public-encrypt-4.0.0"
+      sources."process-nextick-args-2.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.0.6"
       sources."randomfill-1.0.4"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.5" // {
+      (sources."readable-stream-2.3.6" // {
         dependencies = [
-          sources."process-nextick-args-2.0.0"
+          sources."isarray-1.0.0"
         ];
       })
-      sources."resolve-1.5.0"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
-      sources."sha.js-2.4.10"
+      sources."resolve-1.8.1"
+      sources."ripemd160-2.0.2"
+      sources."safe-buffer-5.1.2"
+      sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
+      sources."simple-concat-1.0.0"
       sources."source-map-0.5.7"
       sources."stream-browserify-2.0.1"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.0"
+      sources."stream-http-2.8.3"
       sources."stream-splicer-2.0.0"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-1.1.1"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -2714,19 +2632,16 @@ in
       sources."to-arraybuffer-1.0.1"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
-      sources."umd-3.0.2"
+      sources."umd-3.0.3"
+      sources."undeclared-identifiers-1.1.2"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-        ];
-      })
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
-      sources."vm-browserify-0.0.4"
+      sources."vm-browserify-1.1.0"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -2742,19 +2657,19 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.3.14";
+    version = "3.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz";
-      sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz";
+      sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw==";
     };
     dependencies = [
-      sources."commander-2.14.1"
+      sources."commander-2.15.1"
       sources."source-map-0.6.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript parser, mangler/compressor and beautifier toolkit";
-      homepage = http://lisperator.net/uglifyjs;
+      homepage = "https://github.com/mishoo/UglifyJS2#readme";
       license = "BSD-2-Clause";
     };
     production = true;
@@ -2763,79 +2678,67 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.0.1";
+    version = "3.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz";
-      sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59";
+      url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz";
+      sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ==";
     };
     dependencies = [
-      sources."ajv-4.11.8"
+      sources."ajv-5.5.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.3"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.6.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-2.10.1"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."errno-0.1.7"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      sources."form-data-2.3.2"
       sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-signature-1.1.1"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."http-signature-1.2.0"
       sources."image-size-0.5.5"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-stable-stringify-1.0.1"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
+      sources."performance-now-2.1.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.4.0"
-      sources."request-2.81.0"
-      sources."safe-buffer-5.1.1"
-      sources."sntp-1.0.9"
-      sources."source-map-0.5.7"
-      (sources."sshpk-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."stringstream-0.0.5"
+      sources."qs-6.5.2"
+      sources."request-2.87.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."source-map-0.6.1"
+      sources."sshpk-1.14.2"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.0"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -2850,24 +2753,24 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.4";
+    version = "5.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz";
-      sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz";
+      sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."browser-stdout-1.3.1"
-      sources."commander-2.11.0"
+      sources."commander-2.15.1"
       sources."concat-map-0.0.1"
       sources."debug-3.1.0"
       sources."diff-3.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.2"
-      sources."growl-1.10.3"
-      sources."has-flag-2.0.0"
+      sources."growl-1.10.5"
+      sources."has-flag-3.0.0"
       sources."he-1.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -2877,7 +2780,7 @@ in
       sources."ms-2.0.0"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."supports-color-4.4.0"
+      sources."supports-color-5.4.0"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -2906,7 +2809,7 @@ in
       sources."aws-sign2-0.5.0"
       sources."boom-0.4.2"
       sources."combined-stream-0.0.7"
-      sources."commander-2.15.0"
+      sources."commander-2.15.1"
       (sources."config-chain-1.1.11" // {
         dependencies = [
           sources."ini-1.3.5"
@@ -2937,6 +2840,7 @@ in
       sources."phantomjs-1.9.7-15"
       sources."progress-1.1.8"
       sources."proto-list-1.2.4"
+      sources."psl-1.1.28"
       sources."punycode-1.4.1"
       sources."qs-0.6.6"
       sources."request-2.36.0"
@@ -2945,7 +2849,7 @@ in
       sources."semver-1.1.4"
       sources."sntp-0.2.4"
       sources."throttleit-0.0.2"
-      sources."tough-cookie-2.3.4"
+      sources."tough-cookie-2.4.3"
       sources."tunnel-agent-0.4.3"
       sources."which-1.0.9"
     ];
@@ -2963,7 +2867,7 @@ in
     version = "13.2.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz";
-      sha512 = "21w1m96rk6ljlx72mlkyg4ix3bg2s4s461fpwi1i6shz7fvl6kfmyqgmij3374iq187a4qfhn7vsc0zs7qw1i61nqn3gy0f8g0cvvwp";
+      sha512 = "l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw==";
     };
     dependencies = [
       sources."should-equal-2.0.0"
@@ -2984,10 +2888,10 @@ in
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "4.4.4";
+    version = "6.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-4.4.4.tgz";
-      sha512 = "2wny4iakvr5mfcbgka4hb99893a7v00ygavndsavqpvijidhigwg9iqq9w225vgb741z0waxn4fdi2ndzp83dk2dja2fkj10kglb6q3";
+      url = "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz";
+      sha512 = "rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg==";
     };
     dependencies = [
       sources."@sinonjs/formatio-2.0.0"
@@ -2996,11 +2900,11 @@ in
       sources."isarray-0.0.1"
       sources."just-extend-1.1.27"
       sources."lodash.get-4.4.2"
-      sources."lolex-2.3.2"
-      sources."nise-1.3.0"
+      sources."lolex-2.7.0"
+      sources."nise-1.4.2"
       sources."path-to-regexp-1.7.0"
       sources."samsam-1.3.0"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."text-encoding-0.6.4"
       sources."type-detect-4.0.8"
     ];
@@ -3032,15 +2936,12 @@ in
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
         ];
       })
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      (sources."domutils-1.5.1" // {
-        dependencies = [
-          sources."entities-1.1.1"
-        ];
-      })
+      sources."domutils-1.5.1"
       sources."entities-1.0.0"
       sources."exit-0.1.2"
       sources."fs.realpath-1.0.0"
@@ -3071,10 +2972,10 @@ in
   shelljs = nodeEnv.buildNodePackage {
     name = "shelljs";
     packageName = "shelljs";
-    version = "0.8.1";
+    version = "0.8.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz";
-      sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz";
+      sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -3090,7 +2991,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."rechoir-0.6.2"
-      sources."resolve-1.5.0"
+      sources."resolve-1.8.1"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 186302f2715a3..846dabb21664e 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix
index 24f71a5c6a16e..a0bbd3b1c6717 100644
--- a/pkgs/games/airstrike/default.nix
+++ b/pkgs/games/airstrike/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "6a";
 
   src = fetchurl {
-    url = "http://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz";
+    url = "https://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz";
     sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi";
   };
 
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
index 1b23d1ccd6d20..628a521126f5c 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/pkgs/games/alienarena/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "alienarena-7.65";
 
   src = fetchurl {
-    url = "http://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz";
+    url = "https://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz";
     sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg";
   };
 
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index efc30c1bbf3c7..e9f239b4df326 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -28,7 +28,7 @@ let
     qt4 = pyqt4.qt;
 
 in buildPythonApplication rec {
-    version = "2.0.51";
+    version = "2.0.52";
     name = "anki-${version}";
 
     src = fetchurl {
@@ -37,7 +37,7 @@ in buildPythonApplication rec {
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "17prfkz9hbz1sdb62ddi6m4jwsb50n08myhai997x8d0r0xxilw0";
+      sha256 = "0yjyxgpk79rplz9z2r93kmlk09ari6xxfrz1cfm2yl9v8zfw1n6l";
     };
 
     propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
index 737f31d6e105b..91959a1c942b1 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/pkgs/games/astromenace/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Hardcore 3D space shooter with spaceship upgrade possibilities";
-    homepage = http://www.viewizard.com/;
+    homepage = https://www.viewizard.com/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix
index dbd2814a6fb61..1391ca70223a3 100644
--- a/pkgs/games/ball-and-paddle/default.nix
+++ b/pkgs/games/ball-and-paddle/default.nix
@@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
 
     platforms = stdenv.lib.platforms.unix;
+
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix
index 37176750763fd..56a926e63f6d0 100644
--- a/pkgs/games/chocolate-doom/default.nix
+++ b/pkgs/games/chocolate-doom/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index ee2e442daa288..d9a5df73f17cc 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,10 +1,41 @@
-{ pkgs, stdenv, stdenvNoCC, gccStdenv }:
+{ pkgs, stdenv, stdenvNoCC, buildEnv, gccStdenv, lib, recurseIntoAttrs }:
+
+# To whomever it may concern:
+#
+# This directory menaces with spikes of Nix code. It is terrifying.
+#
+# If this is your first time here, you should probably install the dwarf-fortress-full package,
+# for instance with `environment.systempackages = [ pkgs.dwarf-fortress.dwarf-fortress-full ];`.
+#
+# You can adjust its settings by using override, or compile your own package by
+# using the other packages here. Take a look at lazy-pack.nix to get an idea of
+# how.
+#
+# You will find the configuration files in ~/.local/share/df_linux/data/init. If
+# you un-symlink them and edit, then the scripts will avoid overwriting your
+# changes on later launches, but consider extending the wrapper with your
+# desired options instead.
+#
+# Although both dfhack and dwarf therapist are included in the lazy pack, you
+# can only use one at a time. DFHack does have therapist-like features, so this
+# may or may not be a problem.
 
 let
   callPackage = pkgs.newScope self;
 
+  df-games = lib.listToAttrs (map (dfVersion: {
+    name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}";
+    value = callPackage ./wrapper {
+      inherit (self) themes;
+      dwarf-fortress = callPackage ./game.nix { inherit dfVersion; };
+    };
+  }) (lib.attrNames self.df-hashes));
+
   self = rec {
-    dwarf-fortress-original = callPackage ./game.nix { };
+    df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
+    dwarf-fortress = df-games.dwarf-fortress_0_44_11;
+
+    dwarf-fortress-full = callPackage ./lazy-pack.nix { };
 
     dfhack = callPackage ./dfhack {
       inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
@@ -13,32 +44,30 @@ let
 
     soundSense = callPackage ./soundsense.nix { };
 
-    # unfuck is linux-only right now, we will just use it there
+    # unfuck is linux-only right now, we will only use it there.
     dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
-                                              else null;
+                            else null;
 
-    dwarf-fortress = callPackage ./wrapper {
-      themes = {
-        "phoebus" = phoebus-theme;
-        "cla" = cla-theme;
+    dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
+      inherit (dwarf-fortress) dwarf-fortress;
+      dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
+        texlive = pkgs.texlive.combine {
+          inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+        };
       };
     };
 
-    dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
-      texlive = pkgs.texlive.combine {
-        inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
-      };
-    };
-
-    dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
+    legends-browser = callPackage ./legends-browser {};
 
-    themes = callPackage ./themes {
+    twbt = callPackage ./twbt {};
+    themes = recurseIntoAttrs (callPackage ./themes {
       stdenv = stdenvNoCC;
-    };
+    });
 
+    # aliases
     phoebus-theme = themes.phoebus;
-
     cla-theme = themes.cla;
+    dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
   };
 
-in self
+in self // df-games
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a77f50a51711a..baad45298441f 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, hostPlatform, lib, fetchFromGitHub, cmake, writeScriptBin, callPackage
+{ stdenv, buildEnv, hostPlatform, lib, fetchurl, fetchFromGitHub, cmake, writeScriptBin, callPackage
 , perl, XMLLibXML, XMLLibXSLT, zlib
 , enableStoneSense ? false,  allegro5, libGLU_combined
+, enableTWBT ? true, twbt
+, SDL
 }:
 
 let
-  dfVersion = "0.44.10";
-  version = "${dfVersion}-r1";
+  dfVersion = "0.44.11";
+  version = "${dfVersion}-alpha1";
 
   # revision of library/xml submodule
-  xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
+  xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6";
 
   arch =
     if stdenv.system == "x86_64-linux" then "64"
@@ -32,44 +34,53 @@ let
     fi
   '';
 
-in stdenv.mkDerivation rec {
-  name = "dfhack-${version}";
+  dfhack = stdenv.mkDerivation rec {
+    name = "dfhack-base-${version}";
 
-  # Beware of submodules
-  src = fetchFromGitHub {
-    owner = "DFHack";
-    repo = "dfhack";
-    sha256 = "0srgymyd57hk9iffhi2i0ra5vzw2vzlpzn4042yb90vqpmvz2zrj";
-    rev = version;
-  };
+    # Beware of submodules
+    src = fetchFromGitHub {
+      owner = "DFHack";
+      repo = "dfhack";
+      sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm";
+      rev = version;
+      fetchSubmodules = true;
+    };
 
-  nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
-  # We don't use system libraries because dfhack needs old C++ ABI.
-  buildInputs = [ zlib ]
-             ++ lib.optionals enableStoneSense [ allegro5 libGLU_combined ];
+    patches = [ ./fix-stonesense.patch ];
+    nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
+    # We don't use system libraries because dfhack needs old C++ ABI.
+    buildInputs = [ zlib SDL ]
+               ++ lib.optionals enableStoneSense [ allegro5 libGLU_combined ];
 
-  preConfigure = ''
-    # Trick build system into believing we have .git
-    mkdir -p .git/modules/library/xml
-    touch .git/index .git/modules/library/xml/index
-  '';
+    preConfigure = ''
+      # Trick build system into believing we have .git
+      mkdir -p .git/modules/library/xml
+      touch .git/index .git/modules/library/xml/index
+    '';
 
-  preBuild = ''
-    export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
-  '';
+    preBuild = ''
+      export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
+    '';
 
-  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ]
-            ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ];
+    cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ]
+              ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ];
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
+  };
+in
+
+buildEnv {
+  name = "dfhack-${version}";
 
   passthru = { inherit version dfVersion; };
 
+  paths = [ dfhack ] ++ lib.optionals enableTWBT [ twbt.lib ];
+
   meta = with stdenv.lib; {
     description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
     homepage = https://github.com/DFHack/dfhack/;
     license = licenses.zlib;
     platforms = [ "x86_64-linux" "i686-linux" ];
-    maintainers = with maintainers; [ robbinch a1russell abbradar ];
+    maintainers = with maintainers; [ robbinch a1russell abbradar numinit ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
new file mode 100644
index 0000000000000..da860cd556247
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
@@ -0,0 +1,23 @@
+From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <hhochleitner@gmail.com>
+Date: Sun, 1 Oct 2017 18:01:43 +0200
+Subject: [PATCH] include <GL/glext.h>
+
+this fixes `GLhandleARB` not being defined
+---
+ plugins/stonesense/common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h
+index eb36691..ef45389 100644
+--- a/plugins/stonesense/common.h
++++ b/plugins/stonesense/common.h
+@@ -31,6 +31,8 @@ using namespace df::enums;
+ #include <allegro5/allegro_opengl.h>
+ #include <allegro5/utf8.h>
+ 
++#include <GL/glext.h>
++
+ // allegro leaks X headers, undef some of it here:
+ #undef TileShape
+ #undef None
\ No newline at end of file
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 2e54258c4be99..5e92bbb285b82 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase
+, qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "dwarf-therapist-original-${version}";
-  version = "40.0.0";
+  name = "dwarf-therapist-${version}";
+  version = "40.1.0";
 
   src = fetchFromGitHub {
     owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
     rev = "v${version}";
-    sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
+    sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3";
   };
 
   buildInputs = [ qtbase qtdeclarative ];
   nativeBuildInputs = [ texlive cmake ninja ];
 
+  installPhase = if stdenv.isDarwin then ''
+    mkdir -p $out/Applications
+    cp -r DwarfTherapist.app $out/Applications
+  '' else null;
+
   meta = with stdenv.lib; {
-    description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
-    maintainers = with maintainers; [ the-kenny abbradar bendlas ];
+    description = "Tool to manage dwarves in a running game of Dwarf Fortress";
+    maintainers = with maintainers; [ the-kenny abbradar bendlas numinit ];
     license = licenses.mit;
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = platforms.unix;
     homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist;
   };
 }
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index f9e3e468cdc00..54f0f0405ac5d 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,32 +1,32 @@
-{ stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
+{ stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
 
 let
-  df = dwarf-fortress-original;
-  dt = dwarf-therapist-original;
   platformSlug = if stdenv.targetPlatform.is32bit then
     "linux32" else "linux64";
-  inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini";
-  dfHashFile = "${df}/hash.md5";
+  inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
 
 in symlinkJoin {
-  name = "dwarf-therapist-${dt.version}";
+  name = "dwarf-therapist-${dwarf-therapist.version}";
 
-  paths = [ dt ];
+  paths = [ dwarf-therapist ];
 
   buildInputs = [ makeWrapper ];
 
+  passthru = { inherit dwarf-fortress dwarf-therapist; };
+
   postBuild = ''
     # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
     # therefore uses many relative paths.
     wrapProgram $out/bin/dwarftherapist \
       --run "cd $out/share/dwarftherapist"
+    ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist
 
     rm -rf $out/share/dwarftherapist/memory_layouts/linux
     mkdir -p $out/share/dwarftherapist/memory_layouts/linux
-    origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
-    patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)
+    origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
+    patchedmd5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8)
     substitute \
-      ${dt}/share/dwarftherapist/memory_layouts/${inifile} \
+      ${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile} \
       $out/share/dwarftherapist/memory_layouts/${inifile} \
       --replace "$origmd5" "$patchedmd5"
   '';
diff --git a/pkgs/games/dwarf-fortress/game.json b/pkgs/games/dwarf-fortress/game.json
new file mode 100644
index 0000000000000..05fb0cf50800d
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/game.json
@@ -0,0 +1,86 @@
+{
+  "0.43.05": {
+    "linux": "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45",
+    "linux32": "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03",
+    "osx": "1j2zdkjnmxy8yn599pm0qmbi4zjp1m8h4ggqjxhyzp135h0lqqf9",
+    "osx32": "09ym4mflp5z78pk5mvj7b44xihnsvrxmh0b5kix6h1m6z3cc90l4",
+    "win": "0m337wh4c47ij1f3zrimvy7baff7nzrmgjbmrwdy89d0z90xpnx8",
+    "win_s": "0bjk5m1qkn3ldhqiwbq24y2m9fz9r574d54ngdb8b4ri2xfl1fbp",
+    "win32": "162rl9ygpj66pis87bqc5bwc0mk75hxv6ianhn87pbl4rh7g8ax8",
+    "win32_s": "0gv1jyw5fdskjjs27pr41grbmkk7ipqn0ry615f5g79k3mhl200i",
+    "legacy": "09lvbmg1gq257qchlbmq7hxc5nl9r39jpf73zhmwb5xfbpprn0zs",
+    "legacy_s": "023a5b27fm65w7gmzjssyyci70fdjk2zbv965y4n0f23kc4rj9gl",
+    "legacy32": "1m75arxj1q82l2dkk8qcargm3xczxlqi8krwvg3iimddky34gipq",
+    "legacy32_s": "1hgzsk66isfr5vcraxwgl7cvycl14kwf8w9kzxr8jyp5z7k24q29"
+  },
+  "0.44.05": {
+    "linux": "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3",
+    "linux32": "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr",
+    "osx": "1ssc8vq3ad38x9c04j8gg96kxv0g2npi3jwcg40676byx5nrx7b6",
+    "osx32": "12i7x8idcbvp5h62jyc7b7j98jf4lrisnwglvnrms6jclj0b3g0q",
+    "win": "1kaifarjx0akg7s5a2ngfw0vm0vyr4jnax5rrbv96dliqn5knddz",
+    "win_s": "1a1xikrjdv4b0yfgnp5s8d6xn0njylynsqd8zixdc01vccl5kqm6",
+    "win32": "1j3cq0h7jdvxbsbpfxa7bli45smvy9m4fji0j6849kj7x0vcpwq4",
+    "win32_s": "10cw1n48ffkrv9ms07ka5b5370d9k2fm051cnnq03lkcvlwrq145",
+    "legacy": "0y7xpgmwn4nshhc7apyf8mj5ycl0q5vckdaviwzz6w1x31s3dp6n",
+    "legacy_s": "0j8rbw9ww1avmh8zhyzljjj6in87q4qffpffdl394fsi74n8px0d",
+    "legacy32": "0d3l4jvx53a01fjf1lf20ar9lfyykfhk05dlrfwz3w4k7vj4vvlf",
+    "legacy32_s": "1c5x9x44bblz7anhmk4y9a7p1b39b9k7gzvj4pi55jzfq0k60kl7"
+  },
+  "0.44.09": {
+    "linux": "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy",
+    "linux32": "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8",
+    "osx": "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs",
+    "osx32": "1iwlvmz1ir9k0kzn6726frmkznvsg9a99bbqnxvwcnq3nnnjxw3s",
+    "win": "08g5irgp59dfjgj3jxc8ixwzgnz2wghcl8cg1b1g4088dsf2x3x8",
+    "win_s": "1xyb4msn9wfrh7x136r8xn3sjz6z8c4zksbzifa0z0bpa3pdviap",
+    "win32": "0m8bs2mnyi1r4x84fwnfgd1ijdcf08xsq5zy84476svci932g5kz",
+    "win32_s": "0pl319qmyy96ibzlgj4wfj19dv1wzyg8ig6q11l4c7rivzc9286i",
+    "legacy": "0l8nrvppfzazhjsfkd5nd0bxnc6ljk8fs6yg8qh69g7q7zvzgnd3",
+    "legacy_s": "1c49z539a31czzq0rnhg6yrv1zbaja35sd0ssr4k7lsghjv84k1z",
+    "legacy32": "155xg6dpb8frlw7d9h7m1y0spw55wl4nkn7zrm70bpyp39pydlqp",
+    "legacy32_s": "05qkzjfx1ybrv96wya1dirdfxdkhj6a440sjpzwbqpkqgr8z57a3"
+  },
+  "0.44.10": {
+    "linux": "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2",
+    "linux32": "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n",
+    "osx": "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g",
+    "osx32": "0rsy1n19n12gh8rddgi3db32in488f2nizq8kw25hga03hsh4r6x",
+    "win": "04i0ka12hmn3chsyfmk2pbknr1pdf3p8yaz7kv82ri4g6dvsjfv6",
+    "win_s": "01m6nqcrz4rhdc8wb31azj3vmjid8bdpqaf9wkz4g4vvjyy7xiyz",
+    "win32": "1nymin8wbzbh8gm2702dy7h5spdijdxnysdz71ldyl0xx4vw68d9",
+    "win32_s": "1skz0jpfm6j9bins04kn96f3v3k0kvjqlh25x3129r3hh8xacnd3",
+    "legacy": "0s84vpfr2b5y1kda9allqjrpkaxw15mkblk9dq08syhsj19vspa7",
+    "legacy_s": "18b7ikp7xy2y071h3ydfh5mq9hw9y303rdqyikvra5ji3n5p96cm",
+    "legacy32": "1yh2fl3qwpy6wrxavhn75grbjygymnfh746hxbmc60la7y5flrpy",
+    "legacy32_s": "0j65w2hxgpccg9qsaz14r82qvnvfd0pbl2gyx9fv8d77kxhkc4pw"
+  },
+  "0.44.11": {
+    "linux": "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf",
+    "linux32": "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5",
+    "osx": "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx",
+    "osx32": "0w5avnj86wprk8q0rb5qm9kxbigzk6dk0akqbw4m76jgg2jdmir7",
+    "win": "1yxyv1sycn5jc3g1y02d82154xydg3kbghis7l3xi28n3bh8387b",
+    "win_s": "1xzwl6c362wqgps911y9q8vndp8zyd20fc2p7pkzzmw2hrgfqi6q",
+    "win32": "16x2rg3gm3lh2akg7n057kkxxigb2ljz0nk685lmn4j0adq8l31p",
+    "win32_s": "1a2y220111d94mzj5y3jwpy062k8fw25akyp7yn3fwa17vwvn8zq",
+    "legacy": "0gfjmsfqj21hs4d1hm7fvppbdjspc4r2qnnp6mwcbgh67i5p5rdb",
+    "legacy_s": "1wr4hpzmhgl8haric3jpfd3kwqv1fi4vkb1gvaax5f7kplvfqfac",
+    "legacy32": "1cpzckwvqkxqn0c498mmh4papsjdi3mcvcp2vzlvj46kvdl3n0f0",
+    "legacy32_s": "024vzwfcrx7ms4dip0ccwd0vizzck2pwz2ryyvlz4rpjzhswj5gi"
+  },
+  "0.44.12": {
+    "win32": "0bxrc7zj4vgcgdwc130g6f5jnp13vgx9a2kn2l1jcc958x8a367g",
+    "linux32": "0fmr8diskmbh12s0bpfn5gky9lmrc7xxj6va5adjm6ahxv9jwr06",
+    "osx": "1md6r1pimmlhcn5gjqzg0ygbdwc2v125sfjy0f6gbfbykwcm7391",
+    "osx32": "1dbg7pavxw20r8iqc566fn558avgj5glsycvi6ggbvsh0rpw6n5v",
+    "win": "0zb5ximqi5j7vyvgjzfz7ycadh5sgb7jlyaa68x0sjlbybdr1min",
+    "win_s": "1ncf5zr1fggr5knf30l0wh7spp376v1jcc6m9c86zim8azcfx0y7",
+    "linux": "0ydr5lnysy45nsznqp5r2pysdqn3f0xkrkh9v9l1md111mriabas",
+    "win32_s": "1mxbjkikf010skrpng51r86jmv4nal51j5n1y9kyhv344bq6chr9",
+    "legacy": "11a212ynhx18p3k8hvdjx199din14wggxiwz191b4309fznzpprz",
+    "legacy_s": "05madj529y18ndxrih96mivbzng1vz2zbzicrcnj58i2084zm23f",
+    "legacy32": "0rapcydiic2nq6idjf7fg53xsxk8dxzyi1vflpz554ghdrnsmwjv",
+    "legacy32_s": "16fgbd3lx4r270dxqj6gr1g1iqjj8cv389h2hw1l646xx28g8d2m"
+  }
+}
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 477ba33b77c6f..f57e9703fabfd 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -3,47 +3,55 @@
 
 # Our own "unfuck" libs for macOS
 , ncurses, fmodex, gcc
+
+, dfVersion, df-hashes
 }:
 
 with lib;
 
 let
-  baseVersion = "44";
-  patchVersion = "10";
-  dfVersion = "0.${baseVersion}.${patchVersion}";
-
   libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
 
   homepage = http://www.bay12games.com/dwarves/;
 
+  # Map Dwarf Fortress platform names to Nixpkgs platform names.
   # Other srcs are avilable like 32-bit mac & win, but I have only
   # included the ones most likely to be needed by Nixpkgs users.
-  srcs = {
-    "x86_64-linux" = fetchurl {
-      url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-      sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2";
-    };
-    "i686-linux" = fetchurl {
-      url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
-      sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n";
-    };
-    "x86_64-darwin" = fetchurl {
-      url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
-      sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
-    };
+  platforms = {
+    "x86_64-linux" = "linux";
+    "i686-linux" = "linux32";
+    "x86_64-darwin" = "osx";
+    "i686-darwin" = "osx32";
+    "x86_64-cygwin" = "win";
+    "i686-cygwin" = "win32";
   };
 
+  dfVersionTriple = splitString "." dfVersion;
+  baseVersion = elemAt dfVersionTriple 1;
+  patchVersion = elemAt dfVersionTriple 2;
+
+  game = if hasAttr dfVersion df-hashes
+         then getAttr dfVersion df-hashes
+         else throw "Unknown Dwarf Fortress version: ${dfVersion}";
+  dfPlatform = if hasAttr stdenv.system platforms
+               then getAttr stdenv.system platforms
+               else throw "Unsupported system: ${stdenv.system}";
+  sha256 = if hasAttr dfPlatform game
+           then getAttr dfPlatform game
+           else throw "Unsupported dfPlatform: ${dfPlatform}";
+
 in
 
 assert dwarf-fortress-unfuck != null ->
        dwarf-fortress-unfuck.dfVersion == dfVersion;
 
 stdenv.mkDerivation {
-  name = "dwarf-fortress-original-${dfVersion}";
+  name = "dwarf-fortress-${dfVersion}";
 
-  src = if builtins.hasAttr stdenv.system srcs
-        then builtins.getAttr stdenv.system srcs
-        else throw "Unsupported systems";
+  src = fetchurl {
+    url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2";
+    inherit sha256;
+  };
 
   installPhase = ''
     mkdir -p $out
@@ -81,13 +89,16 @@ stdenv.mkDerivation {
     md5sum $exe | awk '{ print $1 }' > $out/hash.md5
   '';
 
-  passthru = { inherit baseVersion patchVersion dfVersion; };
+  passthru = {
+    inherit baseVersion patchVersion dfVersion;
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "A single-player fantasy game with a randomly generated adventure world";
     inherit homepage;
     license = licenses.unfreeRedistributable;
-    platforms = attrNames srcs;
-    maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
+    platforms = attrNames platforms;
+    maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
new file mode 100644
index 0000000000000..3aa9e573f61df
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -0,0 +1,36 @@
+{ stdenvNoCC, lib, buildEnv, callPackage
+, dwarf-fortress, themes
+  # This package should, at any given time, provide an opinionated "optimal"
+  # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and
+  # should contain every utility available.
+, enableDFHack ? stdenvNoCC.isLinux
+, enableTWBT ? enableDFHack
+, enableSoundSense ? true
+, enableStoneSense ? false  # StoneSense is currently broken.
+, enableDwarfTherapist ? true, dwarf-therapist
+, enableLegendsBrowser ? true, legends-browser
+, theme ? themes.phoebus
+# General config options:
+, enableIntro ? true
+, enableTruetype ? true
+, enableFPS ? false
+}:
+
+buildEnv {
+  name = "dwarf-fortress-full";
+  paths = [
+    (dwarf-fortress.override {
+      inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme
+              enableIntro enableTruetype enableFPS;
+    })]
+    ++ lib.optional enableDwarfTherapist dwarf-therapist
+    ++ lib.optional enableLegendsBrowser legends-browser;
+
+  meta = with stdenvNoCC.lib; {
+    description = "An opinionated wrapper for Dwarf Fortress";
+    maintainers = with maintainers; [ Baughn ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    homepage = https://github.com/NixOS/nixpkgs/;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix
new file mode 100644
index 0000000000000..3bc4fa9c4bb58
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix
@@ -0,0 +1,36 @@
+{ stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }:
+
+let
+  name = "legends-browser-${version}";
+  version = "1.17.1";
+
+  jar = fetchurl {
+    url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar";
+    sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9";
+  };
+  
+  script = writeShellScriptBin "legends-browser" ''
+    set -eu
+    BASE="$HOME/.local/share/df_linux/legends-browser/"
+    mkdir -p "$BASE"
+    cd "$BASE"
+    if [[ ! -e legendsbrowser.properties ]]; then
+      echo 'Creating initial configuration for legends-browser'
+      echo "last=$(cd ..; pwd)" > legendsbrowser.properties
+    fi
+    ${jre}/bin/java -jar ${jar}
+  '';
+in
+
+buildEnv {
+  inherit name;
+  paths = [ script ];
+
+  meta = with stdenvNoCC.lib; {
+    description = "A multi-platform, open source, java-based legends viewer for dwarf fortress";
+    maintainers = with maintainers; [ Baughn ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    homepage = https://github.com/robertjanetzko/LegendsBrowser;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
index f09ac84354822..0a501bc3c052c 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-1_196";
-  dfVersion = "0.44.10";
+  dfVersion = "0.44.11";
   inherit soundPack;
   name = "soundsense-${version}";
   src = fetchzip {
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 90f46d052618a..5caaa9e05ca51 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -4,18 +4,12 @@ with builtins;
 
 listToAttrs (map (v: {
   inherit (v) name;
-  value = stdenv.mkDerivation {
+  value = fetchFromGitHub {
     name = "${v.name}-${v.version}";
-    src = fetchFromGitHub {
-      owner = "DFgraphics";
-      repo = v.name;
-      rev = v.version;
-      sha256 = v.sha256;
-    };
-    installPhase = ''
-      mkdir -p $out
-      cp -r data raw $out
-    '';
+    owner = "DFgraphics";
+    repo = v.name;
+    rev = v.version;
+    sha256 = v.sha256;
     meta = with lib; {
       platforms = platforms.all;
       maintainers = [ maintainers.matthewbauer ];
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
new file mode 100644
index 0000000000000..b56170e5229ab
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC, fetchurl, unzip }:
+
+
+stdenvNoCC.mkDerivation rec {
+  name = "twbt-${version}";
+  version = "6.49";
+  dfVersion = "0.44.11";
+
+  src = fetchurl {
+    url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
+    sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz";
+  };
+
+  sourceRoot = ".";
+
+  outputs = [ "lib" "art" "out" ];
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $lib/hack/{plugins,lua} $art/data/art
+    cp -a */twbt.plug.so $lib/hack/plugins/
+    cp -a *.lua $lib/hack/lua/
+    cp -a *.png $art/data/art/
+  '';
+
+  
+  meta = with stdenvNoCC.lib; {
+    description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface.";
+    maintainers = with maintainers; [ Baughn ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+    homepage = https://github.com/mifki/df-twbt;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index d816ba461b118..b9887fe4cfc09 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -3,7 +3,7 @@
 , ncurses, glib, gtk2, libsndfile, zlib
 }:
 
-let dfVersion = "0.44.10"; in
+let dfVersion = "0.44.11"; in
 
 stdenv.mkDerivation {
   name = "dwarf_fortress_unfuck-${dfVersion}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "svenstaro";
     repo = "dwarf_fortress_unfuck";
     rev = dfVersion;
-    sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
+    sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf";
   };
 
   cmakeFlags = [
@@ -20,12 +20,26 @@ stdenv.mkDerivation {
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
   ];
 
+  makeFlags = [
+    ''CFLAGS="-fkeep-inline-functions"''
+    ''CXXFLAGS="-fkeep-inline-functions"''
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libSM SDL SDL_image SDL_ttf glew openalSoft
     ncurses gtk2 libsndfile zlib libGL
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace \
+      'set(CMAKE_BUILD_TYPE Release)' \
+      'set(CMAKE_BUILD_TYPE Debug)'
+  '';
+
+  # Don't strip unused symbols; dfhack hooks into some of them.
+  dontStrip = true;
+
   installPhase = ''
     install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so
   '';
diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh
new file mode 100755
index 0000000000000..3db68122d358d
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p jq nix coreutils curl
+
+# systems to generate hashes for
+systems='linux linux32 osx osx32
+	 win win_s win32 win32_s
+         legacy legacy_s legacy32 legacy32_s'
+
+if [ $# -eq 0 ]; then
+    versions="$(curl http://www.bay12games.com/dwarves/ \
+		   | grep 'DOWNLOAD DWARF FORTRESS' \
+		   | sed 's/.*DOWNLOAD DWARF FORTRESS \([0-9.]*\) .*/\1/')"
+else
+    versions="$@"
+fi
+
+tmp1="$(mktemp)"
+tmp2="$(mktemp)"
+for version in $versions; do
+    for system in $systems; do
+	echo -n $version,$system,
+	ver=$(echo $version | sed -e s,^0\.,, | tr . _)
+	if [[ "$system" = *win* ]] || [[ "$system" = *legacy* ]]; then
+	    ext=zip
+	else
+	    ext=tar.bz2
+	fi
+	nix-prefetch-url \
+	    http://www.bay12games.com/dwarves/df_${ver}_${system}.${ext}
+    done
+done | jq --slurp --raw-input \
+	  'split("\n")  | .[:-1] | map(split(",")) |
+           map({ "version": .[0], "platform": .[1], "sha256": .[2] }) |
+	   group_by(.version) |
+	   map(map({"version": .version, (.platform): .sha256}) | add |
+	       {(.version): .} | map_values(del(.version))) | add' \
+	  > "$tmp1"
+
+# Append $tmp1 to game.json. There should be a better way to handle
+# this but all other attempts failed for me.
+jq -M --argfile a "$tmp1" '. + $a' < "$(dirname "$0")/game.json" > "$tmp2"
+cat "$tmp2" > "$(dirname "$0")/game.json"
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index e82cc2be680d5..5eebbf77d2baf 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
+{ stdenv, lib, buildEnv, dwarf-fortress, substituteAll
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk
 , enableStoneSense ? false
+, enableTWBT ? false, twbt
 , themes ? {}
 , theme ? null
+# General config options:
+, enableIntro ? true
+, enableTruetype ? true
+, enableFPS ? false
 }:
 
 let
   dfhack_ = dfhack.override {
     inherit enableStoneSense;
+    inherit enableTWBT;
   };
 
   ptheme =
@@ -16,45 +22,65 @@ let
     then builtins.getAttr theme themes
     else theme;
 
+  twbtOnlyWithDFHack = assert (enableDFHack || !enableTWBT); true;
+
+  unBool = b: if b then "YES" else "NO";
+
   # These are in inverse order for first packages to override the next ones.
-  pkgs = lib.optional (theme != null) ptheme
-         ++ lib.optional enableDFHack dfhack_
+  themePkg = lib.optional (theme != null) ptheme;
+  pkgs = lib.optional enableDFHack dfhack_
          ++ lib.optional enableSoundSense soundSense
-         ++ [ dwarf-fortress-original ];
+         ++ lib.optional enableTWBT twbt.art
+         ++ [ dwarf-fortress ];
 
   env = buildEnv {
-    name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
+    name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}";
 
-    paths = pkgs;
+    paths = themePkg ++ pkgs;
     pathsToLink = [ "/" "/hack" "/hack/scripts" ];
     ignoreCollisions = true;
 
-    postBuild = lib.optionalString enableDFHack ''
+    postBuild = ''
+      # De-symlink init.txt
+      cp $out/data/init/init.txt init.txt
+      rm $out/data/init/init.txt
+      mv init.txt $out/data/init/init.txt
+    '' + lib.optionalString enableDFHack ''
       rm $out/hack/symbols.xml
       substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
-        --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
-                  $(cat ${dwarf-fortress-original}/hash.md5)
+        --replace $(cat ${dwarf-fortress}/hash.md5.orig) \
+                  $(cat ${dwarf-fortress}/hash.md5)
+    '' + lib.optionalString enableTWBT ''
+      substituteInPlace $out/data/init/init.txt \
+        --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
+    '' + ''
+      substituteInPlace $out/data/init/init.txt \
+        --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
+        --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
+        --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
     '';
   };
 in
 
 stdenv.mkDerivation rec {
-  name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";
+  name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
 
-  compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs;
+  compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress.dfVersion); true) pkgs;
 
   dfInit = substituteAll {
     name = "dwarf-fortress-init";
     src = ./dwarf-fortress-init.in;
     inherit env;
     exe = if stdenv.isLinux then "libs/Dwarf_Fortress"
-                             else "dwarfort.exe";
+                            else "dwarfort.exe";
   };
 
   runDF = ./dwarf-fortress.in;
   runDFHack = ./dfhack.in;
   runSoundSense = ./soundSense.in;
 
+  passthru = { inherit dwarf-fortress; };
+
   buildCommand = ''
     mkdir -p $out/bin
 
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index b780d5327f2e1..9dde1da868dd7 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -37,6 +37,8 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  hardeningDisable = [ "format" ];
+
   buildPhase = ''
     runHook preBuild
 
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 28d273ad5cc42..2fe76649d5520 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     description = "A reimplementation of the Ultima VII game engine";
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out
   };
 }
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 2684a56a82862..ff39d1b996500 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, curl, expat
-, jansson, libpng, libjpeg, libGLU_combined, pcre
+, jansson, libpng, libjpeg, libGLU_combined, libXxf86vm, pcre
 , pkgconfig, SDL2, vimNox }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    expat curl jansson libpng libjpeg libGLU_combined pcre SDL2 vimNox
+    expat curl jansson libpng libjpeg libGLU_combined libXxf86vm pcre SDL2 vimNox
   ];
 
   installPhase = with stdenv.lib; let
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     mv ezquake-${sys}-${arch} $out/bin/ezquake
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://ezquake.github.io/;
     description = "A modern QuakeWorld client focused on competitive online play.";
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 2cc63e9ecdefe..d0ffa10baeca1 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -19,15 +19,15 @@ let
   binDists = {
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
-        stable        = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; };
-        experimental  = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; };
+        stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; fetcher = authenticatedFetch; };
+        experimental  = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; fetcher = authenticatedFetch; };
       };
       headless = {
-        stable        = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; };
-        experimental  = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; };
+        stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; };
+        experimental  = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; };
       };
       demo = {
-        stable        = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; };
+        stable        = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };
         experimental  = bdist { };
       };
     };
@@ -49,7 +49,7 @@ let
   actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform");
 
   bdistForArch = arch: { sha256 ? null
-                       , version ? "0.16.36"
+                       , version ? "0.16.51"
                        , fetcher ? fetchurl
                        , nameMut ? x: x
                        }:
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index ee93d162396d3..8003468f50fa0 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation {
 
     maintainers = with maintainers; [ pierron ];
     platforms = platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index c1bfda9e2f2f3..d5efe2b3ebd96 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -54,5 +54,6 @@ in stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
     platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index 89b9fca06eabf..e4f8c4fd8b3c0 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -2,12 +2,12 @@
   gst_all_1, ninja
 }:
 stdenv.mkDerivation rec {
-  version = "0.90";
+  version = "0.91";
   name = "gcompris-${version}";
 
   src = fetchurl {
     url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
-    sha256 = "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza";
+    sha256 = "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg";
   };
 
   cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0";
diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix
new file mode 100644
index 0000000000000..9759eb8956ab2
--- /dev/null
+++ b/pkgs/games/gshogi/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub
+, gtk3, gobjectIntrospection
+, wrapGAppsHook, python3Packages }:
+
+buildPythonApplication rec {
+  pname = "gshogi";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "johncheetham";
+    repo = "gshogi";
+    rev = "v${version}";
+    sha256 = "06vgndfgwyfi50wg3cw92zspc9z0k7xn2pp6qsjih0l5yih8iwqh";
+  };
+
+  doCheck = false;  # no tests available
+
+  buildInputs = [
+    gtk3
+    gobjectIntrospection
+  ];
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    pycairo
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A graphical implementation of the Shogi board game, also known as Japanese Chess";
+    homepage = http://johncheetham.com/projects/gshogi/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.ciil ];
+  };
+}
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 3964eefb9b332..df1dd47905e4e 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.3.2";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "0zlkja0jcqi3s4iw5h076iwqxa3haradqksjnx9jxcbkvaw75p3k";
+    sha256 = "1d12j6jl3bwarjwri0kjagxzi89s3413drinssgndlvmadd69sx4";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 2196fede32fc2..2852c6869af2b 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,4 +1,4 @@
-{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut
+{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut
 , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
 , zlib, libpng, libGLU_combined, physfs
 }:
@@ -10,17 +10,18 @@ let
         ]);
 in
 stdenv.mkDerivation rec {
-  version = "0.9.23";
+  version = "0.9.24.1";
   name = "hedgewars-${version}";
   src = fetchurl {
-    url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
-    sha256 = "12df5ar3zk186ah51c3myr4hlzyybcshmf1w1wf6vr9b0h44jbns";
+    url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
+    sha256 = "1f2vbndh9fnwklwjicrhy5zv2ciyhadfsny2cdqnc6lim90hldl1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc
-    qt4 ghc ffmpeg freeglut makeWrapper physfs
+    ghc ffmpeg freeglut makeWrapper physfs
+    qt5.qttools qt5.qtbase
   ];
 
   postPatch = ''
diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix
index 7dfb4cf9d3a9d..48379da3a0a4f 100644
--- a/pkgs/games/hexen/default.nix
+++ b/pkgs/games/hexen/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "hexen-0.2.3";
   src = fetchurl {
-    url = http://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz;
+    url = https://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz;
     sha256 = "c1433e930f2003c5f817f935406bb28ba15298a15b1c11f83f42df3e9f1f3bc4";
   };
 
diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
new file mode 100644
index 0000000000000..7f7ec00bdd64e
--- /dev/null
+++ b/pkgs/games/hyperrogue/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, autoreconfHook,
+  libpng, glew }:
+
+stdenv.mkDerivation rec {
+  name = "hyperrogue-${version}";
+  version = "10.4j";
+
+  src = fetchFromGitHub {
+    owner = "zenorogue";
+    repo = "hyperrogue";
+    rev = "v${version}";
+    sha256 = "0p0aplfr5hs5dmkgbd4rhvrdk33gss1wdb7knd2vf27n4c2avjcl";
+  };
+
+  CPPFLAGS = "-I${SDL.dev}/include/SDL";
+
+  buildInputs = [ autoreconfHook SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.roguetemple.com/z/hyper/;
+    description = "A roguelike game set in hyperbolic geometry";
+    maintainers = with maintainers; [ rardiol ];
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 50b9f03d4bc92..3281c3d28d12b 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchFromGitHub, libpng, cmake, SDL2, SDL2_mixer, pkgconfig, pcre}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng, pcre }:
 
 stdenv.mkDerivation rec {
 
   name = "ivan-${version}";
-  version = "052";
+  version = "053";
 
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
     rev = "v${version}";
-    sha256 = "1vvwb33jw4ppwsqlvaxq3b8npdzh9j9jfangyzszp5sfnnd7fj5b";
+    sha256 = "1r3fcccgpjmzzkg0lfmq76igjapr01kh97vz671z60jg7gyh301b";
   };
 
-  buildInputs = [SDL2 SDL2_mixer libpng pcre];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  nativeBuildInputs = [cmake pkgconfig];
+  buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ];
 
   hardeningDisable = ["all"];
-  
+
   # To store bone and high score files in ~/.ivan of the current user
   patches = [./homedir.patch];
 
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index 5ab9954739b2a..b5f858b99ad79 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.ciil ];
     platforms = platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix
index d6a2afb26cb89..fef6e11d9be9d 100644
--- a/pkgs/games/liberal-crime-squad/default.nix
+++ b/pkgs/games/liberal-crime-squad/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, ncurses, autoreconfHook, SDL2, SDL2_mixer }:
+{ fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }:
 
 stdenv.mkDerivation rec {
   version = "2016-07-06";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ncurses SDL2 SDL2_mixer ];
+  buildInputs = [ libiconv ncurses SDL2 SDL2_mixer ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A humorous politically themed ncurses game";
diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
deleted file mode 100644
index 5c91911acaf57..0000000000000
--- a/pkgs/games/micropolis/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }:
-
-stdenv.mkDerivation {
-  name = "micropolis-2010-12-18"; # version from the patch timestamp
-
-  src = fetchurl {
-    url = http://www.donhopkins.com/home/micropolis/micropolis-activity-source.tgz;
-    sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc";
-  };
-
-  patches =
-    [ (fetchurl {
-        url = http://rmdir.de/~michael/micropolis_git.patch;
-        sha256 = "10j0svcs576ip7v5mn99gvqx9ki8jfd5w5yvsxj57xh56dd0by2p";
-      })
-    ];
-
-  buildInputs = [ libX11 libXpm libXext xextproto byacc ];
-
-  preConfigure =
-    ''
-      cd src
-      sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm.dev}/include/X11@" tk/makefile
-      sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
-    '';
-
-  postInstall =
-    ''
-      mkdir -p $out/bin
-      mkdir -p $out/usr/share/games/micropolis
-      cd ..
-      for d in activity cities images manual res; do
-        cp -R $d $out/usr/share/games/micropolis
-      done
-      cp Micropolis $out/usr/share/games/micropolis
-      cat > $out/bin/micropolis << EOF
-      #!${stdenv.shell}
-      cd $out/usr/share/games/micropolis
-      ./Micropolis
-      EOF
-      chmod 755 $out/bin/micropolis
-    '';
-
-  meta = {
-    description = "GPL'ed version of S*m C*ty";
-    homepage = http://www.donhopkins.com/home/micropolis/;
-    license = "GPL";
-  };
-}
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 16e0c05e0e2cf..59e1144cf9670 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.12.2";
 
   src  = fetchurl {
-    url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
+    url    = "https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
     sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy";
   };
 
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index c6697f5806d45..6be5c9ee2474c 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -4,12 +4,14 @@ let
   libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
 in stdenv.mkDerivation rec {
   name = "multimc-${version}";
-  version = "0.6.2";
+  # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see
+  # https://github.com/NixOS/nixpkgs/issues/42387
+  version = "unstable-2018-06-04";
   src = fetchFromGitHub {
     owner = "MultiMC";
     repo = "MultiMC5";
-    rev = version;
-    sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c";
+    rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071";
+    sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ cmake file makeWrapper ];
@@ -22,6 +24,12 @@ in stdenv.mkDerivation rec {
     cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps
     cp ../application/package/linux/multimc.desktop $out/share/applications
     wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/
+
+    # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop,
+    # the desktop icon refers to `multimc`, but the executable actually gets
+    # installed as `MultiMC`. Create compatibility symlink to fix the desktop
+    # icon.
+    ln -sf $out/bin/MultiMC $out/bin/multimc
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index b67a79aa3fe77..eed38592236f7 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less }:
+{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less
+, x11Mode ? false, libXaw, libXext, mkfontdir
+}:
 
 let
   platform =
     if stdenv.hostPlatform.isUnix then "unix"
     else throw "Unknown platform for NetHack: ${stdenv.system}";
   unixHint =
-    /**/ if stdenv.hostPlatform.isLinux  then "linux"
+    if x11Mode then "linux-x11"
+    else if stdenv.hostPlatform.isLinux  then "linux"
     else if stdenv.hostPlatform.isDarwin then "macosx10.10"
     # We probably want something different for Darwin
     else "unix";
@@ -13,16 +16,16 @@ let
   binPath = lib.makeBinPath [ coreutils less ];
 
 in stdenv.mkDerivation {
-  name = "nethack-3.6.0";
+  name = "nethack${lib.optionalString x11Mode "-x11"}-3.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nethack/nethack-360-src.tgz";
-    sha256 = "12mi5kgqw3q029y57pkg3gnp930p7yvlqi118xxdif2qhj6nkphs";
+    url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz";
+    sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses ] ++ lib.optionals x11Mode [ libXaw libXext ];
 
-  nativeBuildInputs = [ flex bison ];
+  nativeBuildInputs = [ flex bison ] ++ lib.optionals x11Mode [ mkfontdir ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
@@ -86,13 +89,14 @@ in stdenv.mkDerivation {
     $out/games/nethack
     EOF
     chmod +x $out/bin/nethack
+    ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"}
   '';
 
   meta = with stdenv.lib; {
     description = "Rogue-like game";
     homepage = http://nethack.org/;
     license = "nethack";
-    platforms = platforms.unix;
+    platforms = if x11Mode then platforms.linux else platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix
index e4bcef29878cd..fa0411196318f 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/pkgs/games/openclonk/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   name = "openclonk-${version}";
 
   src = fetchurl {
-    url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
+    url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
     sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik";
   };
 
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 5a35b06a1e3da..9e67c7847f83f 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -1,17 +1,24 @@
 { stdenv, fetchurl, fetchFromGitHub,
-  SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng,
+  SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng,
   libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib
 }:
 
 let
   name = "openrct2-${version}";
-  version = "0.1.2";
+  version = "0.2.0";
 
   openrct2-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${version}";
-    sha256 = "1zqrdxr79c9yx4bdxz1r5866hhwq0lcs9qpv3vhisr56ar5n5wk3";
+    sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px";
+  };
+
+  objects-src = fetchFromGitHub {
+    owner = "OpenRCT2";
+    repo = "objects";
+    rev = "v1.0.2";
+    sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04";
   };
 
   title-sequences-src = fetchFromGitHub {
@@ -32,6 +39,7 @@ stdenv.mkDerivation rec {
     curl
     fontconfig
     freetype
+    icu
     jansson
     libiconv
     libpng
@@ -45,11 +53,15 @@ stdenv.mkDerivation rec {
   ];
 
   postUnpack = ''
-    cp -r ${title-sequences-src} $sourceRoot/title
+    cp -r ${objects-src}         $sourceRoot/data/object
+    cp -r ${title-sequences-src} $sourceRoot/data/title
   '';
 
   cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_TITLE_SEQUENCES=OFF"];
+    "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"
+    "-DDOWNLOAD_OBJECTS=OFF"
+    "-DDOWNLOAD_TITLE_SEQUENCES=OFF"
+  ];
 
   makeFlags = ["all" "g2"];
 
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 30470e98c58d0..a936ca134122a 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Open source clone of UFO: Enemy Unknown";
-    homepage = http://openxcom.org;
+    homepage = https://openxcom.org;
     repositories.git = https://github.com/SupSuper/OpenXcom.git;
     maintainers = [ stdenv.lib.maintainers.cpages ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index b1a39a609a1bf..377dc8652292b 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, fetchFromGitHub, zip, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "orthorobot";
-  version = "1.0";
+  version = "1.1.1";
 
   icon = fetchurl {
     url = "http://stabyourself.net/images/screenshots/orthorobot-5.png";
@@ -24,32 +24,26 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip";
-    sha256 = "023nc3zwjkbmy4c8w6mfg39mg69zpqqr2gzlmp4fpydrjas70kbl";
+  src = fetchFromGitHub {
+    owner = "Stabyourself";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p";
   };
 
-  nativeBuildInputs = [ makeWrapper unzip ];
-  buildInputs = [ lua love ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love zip ];
 
   phases = [ "unpackPhase" "installPhase" ];
 
-  unpackPhase = ''
-    unzip -j $src
-  '';  
-
   installPhase =
   ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/games/lovegames
-
-    cp -v ./*.love $out/share/games/lovegames/${pname}.love
-
+    mkdir -p $out/bin $out/share/games/lovegames $out/share/applications
+    zip -9 -r ${pname}.love ./*
+    mv ${pname}.love $out/share/games/lovegames/${pname}.love
     makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
-
-    chmod +x $out/bin/${pname}
-    mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications/
+    chmod +x $out/bin/${pname}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
index 2b4e69f0086cf..88ba8679e8a73 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/pkgs/games/quake3/content/demo.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation {
   name = "quake3-demodata-${version}";
 
   src = fetchurl {
-    url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
+    url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
     sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4";
   };
 
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
index 04da5811d99a3..f35aaaad35275 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation {
   name = "quake3-pointrelease-${version}";
 
   src = fetchurl {
-    url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
+    url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
     sha256 = "11piyksfqyxwl9mpgbc71w9sacsh4d3cdsgia0cy0dbbap2k4qf3";
   };
 
diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix
index db0b81f5567a1..4cbc5397bb3eb 100644
--- a/pkgs/games/racer/default.nix
+++ b/pkgs/games/racer/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     url = http://hippo.nipax.cz/src/racer-1.1.tar.gz;
     sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9";
   } else if stdenv.system == "x86_64-linux" then fetchurl {
-    url = http://hippo.nipax.cz/src/racer-1.1.64.tar.gz;
+    url = https://hippo.nipax.cz/src/racer-1.1.64.tar.gz;
     sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0";
   } else
     throw "System not supported";
diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix
index 40f0b17549412..bb93fafa3b509 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/games/rogue/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [
-      "http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz"
+      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz"
       "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz"
       "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz"
     ];
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix
index 5f1e1a17553ba..b8bf4efcf0aa7 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://download.scrolls.com/client/linux.tar.gz";
+    url = "https://download.scrolls.com/client/linux.tar.gz";
     sha256 = "ead1fd14988aa07041fedfa7f845c756cd5077a5a402d85bfb749cb669ececec";
   };
 
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index fcde5b5ea59f0..f4590081898ab 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
-    homepage = http://www.scummvm.org/;
+    homepage = https://www.scummvm.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.peterhoeg ];
     platforms = platforms.linux;
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 9ce5c7db83fbb..83a85415664d6 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://springrts.com/;
+    homepage = https://springrts.com/;
     description = "A powerful real-time strategy (RTS) game engine";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 36256d31fda70..2000398b537d4 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "springlobby-${version}";
-  version = "0.255";
+  version = "0.264";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw";
+    sha256 = "1i31anvvywhl2m8014m3vk74cj74l37j6a0idzfhd4ack8b9hg2x";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix
index 4260ded0d6ff8..283d8ad21d7ef 100644
--- a/pkgs/games/tennix/default.nix
+++ b/pkgs/games/tennix/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "tennix-1.1";
   src = fetchurl {
-    url = "http://icculus.org/tennix/downloads/${name}.tar.gz";
+    url = "https://icculus.org/tennix/downloads/${name}.tar.gz";
     sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm";
   };
 
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 65dc77fbf16f5..13d296e5961a0 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   urlVersion = lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
-    url = "http://terraria.org/server/terraria-server-${urlVersion}.zip";
+    url = "https://terraria.org/server/terraria-server-${urlVersion}.zip";
     sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3";
   };
 
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix
deleted file mode 100644
index 5ea84b9ef41f9..0000000000000
--- a/pkgs/games/unvanquished/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses
-, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore
-, makeWrapper }:
-stdenv.mkDerivation rec {
-  name = "unvanquished-${version}";
-  version = "0.13.1";
-  src = fetchurl {
-    url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz";
-    sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2";
-  };
-  buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl
-                  nettle openal speex libogg libvorbis libtheora xvidcore 
-                  makeWrapper ];
-  preConfigure = ''prefix="$prefix/opt"'';
-  postInstall = ''
-    # cp -r ../main "$prefix/Unvanquished/"
-    mkdir -p "$out/bin"
-    substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell}
-    cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3"
-    makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \
-                --run '[ -f ~/.Unvanquished/main/md5sums ] &&
-                       cd ~/.Unvanquished/main/ &&
-                       md5sum --quiet -c md5sums ||
-                       unvanquished-download-pk3' \
-                --run "cd '$prefix/Unvanquished'"
-    makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \
-                --run '[ -f ~/.Unvanquished/main/md5sums ] &&
-                       cd ~/.Unvanquished/main/ &&
-                       md5sum --quiet -c md5sums ||
-                       unvanquished-download-pk3' \
-                --run "cd '$prefix/Unvanquished'"
-  '';
-
-  meta = {
-    description = "FPS game set in a futuristic, sci-fi setting";
-    longDescription = ''
-      Unvanquished is a free, open-source first-person shooter
-      combining real-time strategy elements with a futuristic, sci-fi
-      setting. It is available for Windows, Linux, and macOS.
-
-      Features:
-
-      * Two teams
-        Play as either the technologically advanced humans or the highly
-        adaptable aliens, with a fresh gameplay experience on both
-        sides.
-
-      * Build a base
-        Construct and maintain your base with a variety of useful
-        structures, or group up with teammates to take on the other
-        team.
-
-      * Level up
-        Earn rewards for victories against the other team, whether it's
-        a deadly new weapon or access to a whole new alien form.
-
-      * Customize
-        Compatibility with Quake 3 file formats and modification tools
-        allows for extensive customization of the game and its
-        setting.
-    '';
-    homepage = http://unvanquished.net;
-    #license = "unknown";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
-    # This package can take a lot of disk space, so unavailable from channel
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 6ed276c0695b7..6165cacfdca52 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig
-, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi
+, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr
 , withVideos ? false
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw";
   };
 
-  buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ];
+  buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi libXrandr ];
   nativeBuildInputs = [ perl zip unzip pkgconfig ];
 
   postPatch = ''
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 12fb0bd60b0b3..45b4e5a5891ee 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.2";
+  version = "1.14.3";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1xhnhxjc8zjv89xmrbffa54fa4ybw6x0p34k14n9lrz1y18vaar8";
+    sha256 = "06648041nr77sgzr7jpmcn37cma3hp41qynp50xzddx28l17zwg9";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix
index 787aebef2d544..946bff79f9757 100644
--- a/pkgs/games/xbomb/default.nix
+++ b/pkgs/games/xbomb/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "xbomb-2.2b";
   src = fetchurl {
-    url    = "http://www.gedanken.org.uk/software/xbomb/download/${name}.tgz";
+    url    = "https://www.gedanken.org.uk/software/xbomb/download/${name}.tgz";
     sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m";
   };
 
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index ffb3a0227d9e9..ef8c5a09cae97 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.5.11";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
+    url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
     sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
   };
 
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 7fd5612bf8868..6d9ae55e639c5 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "xonotic-0.8.2";
 
   src = fetchurl {
-    url = "http://dl.xonotic.org/${name}.zip";
+    url = "https://dl.xonotic.org/${name}.zip";
     sha256 = "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2";
   };
 
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix
index 2f898a5aed397..47a321c99b4a5 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/pkgs/games/xsnow/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "xsnow-${version}";
 
   src = fetchurl {
-    url = "http://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz";
+    url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz";
     sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
   };
 
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 814241244e318..3e9add56903c3 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.3c";
 
   src = fetchurl {
-    url = "http://www.cs.cornell.edu/andru/release/${name}.tar.gz";
+    url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz";
     sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9";
   };
 
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix
index d6e79289525d7..449d7ae6e2d50 100644
--- a/pkgs/games/zoom/default.nix
+++ b/pkgs/games/zoom/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "zoom-1.1.5";
   
   src = fetchurl {
-    url = "http://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz";
+    url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz";
     sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
   };
   
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix
index 6ec938cfdefb9..52f3446e8c418 100644
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ b/pkgs/misc/base16-builder/node-packages-generated.nix
@@ -1,376 +1,367 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
-      };
-    };
-    "ejs-2.5.7" = {
-      name = "ejs";
-      packageName = "ejs";
-      version = "2.5.7";
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz";
-        sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
-    "fs-promise-0.3.1" = {
-      name = "fs-promise";
-      packageName = "fs-promise";
-      version = "0.3.1";
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz";
-        sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
-    "js-yaml-3.10.0" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.10.0";
+    "any-promise-0.1.0" = {
+      name = "any-promise";
+      packageName = "any-promise";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz";
-        sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv";
+        url = "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz";
+        sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27";
       };
     };
-    "limax-1.5.0" = {
-      name = "limax";
-      packageName = "limax";
-      version = "1.5.0";
+    "argparse-1.0.10" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/limax/-/limax-1.5.0.tgz";
-        sha1 = "bbe7f2d3231cef709ebef8c32e3c75bce8fa5734";
+        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
-    "meow-3.7.0" = {
-      name = "meow";
-      packageName = "meow";
-      version = "3.7.0";
+    "array-find-index-1.0.2" = {
+      name = "array-find-index";
+      packageName = "array-find-index";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz";
-        sha1 = "72cb668b425228290abbfa856892587308a801fb";
+        url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz";
+        sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "open-0.0.5" = {
-      name = "open";
-      packageName = "open";
-      version = "0.0.5";
+    "boxen-0.3.1" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz";
-        sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
+        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
       };
     };
-    "update-notifier-0.6.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.6.3";
+    "builtin-modules-1.1.1" = {
+      name = "builtin-modules";
+      packageName = "builtin-modules";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
-        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
+        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
+        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
       };
     };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
+    "bulk-replace-0.0.1" = {
+      name = "bulk-replace";
+      packageName = "bulk-replace";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+        url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz";
+        sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd";
       };
     };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
+    "camelcase-2.1.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz";
+        sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
       };
     };
-    "has-ansi-2.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "2.0.0";
+    "camelcase-keys-2.1.0" = {
+      name = "camelcase-keys";
+      packageName = "camelcase-keys";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
+        sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
       };
     };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
+    "capture-stack-trace-1.0.0" = {
+      name = "capture-stack-trace";
+      packageName = "capture-stack-trace";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
+        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
-    "any-promise-0.1.0" = {
-      name = "any-promise";
-      packageName = "any-promise";
-      version = "0.1.0";
+    "commander-1.1.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz";
-        sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27";
+        url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
+        sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
       };
     };
-    "argparse-1.0.9" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "1.0.9";
+    "configstore-2.1.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz";
-        sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86";
+        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
+        sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
       };
     };
-    "esprima-4.0.0" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "4.0.0";
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
-        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "sprintf-js-1.0.3" = {
-      name = "sprintf-js";
-      packageName = "sprintf-js";
-      version = "1.0.3";
+    "create-error-class-3.0.2" = {
+      name = "create-error-class";
+      packageName = "create-error-class";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
-        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
+        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
-    "hepburn-1.0.0" = {
-      name = "hepburn";
-      packageName = "hepburn";
-      version = "1.0.0";
+    "currently-unhandled-0.4.1" = {
+      name = "currently-unhandled";
+      packageName = "currently-unhandled";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz";
-        sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b";
+        url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz";
+        sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "pinyin-2.8.3" = {
-      name = "pinyin";
-      packageName = "pinyin";
-      version = "2.8.3";
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz";
-        sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b";
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
-    "speakingurl-13.0.0" = {
-      name = "speakingurl";
-      packageName = "speakingurl";
-      version = "13.0.0";
+    "deep-extend-0.6.0" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/speakingurl/-/speakingurl-13.0.0.tgz";
-        sha1 = "266c52d2b47585375af058e4783c8d1097a2d3db";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
-    "bulk-replace-0.0.1" = {
-      name = "bulk-replace";
-      packageName = "bulk-replace";
-      version = "0.0.1";
+    "dot-prop-3.0.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz";
-        sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd";
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
+        sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177";
       };
     };
-    "commander-1.1.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.1.1";
+    "duplexer2-0.1.4" = {
+      name = "duplexer2";
+      packageName = "duplexer2";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
-        sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
+        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz";
+        sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
       };
     };
-    "object-assign-4.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.1";
+    "ejs-2.6.1" = {
+      name = "ejs";
+      packageName = "ejs";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz";
+        sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==";
       };
     };
-    "nodejieba-2.2.5" = {
-      name = "nodejieba";
-      packageName = "nodejieba";
-      version = "2.2.5";
+    "error-ex-1.3.2" = {
+      name = "error-ex";
+      packageName = "error-ex";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.5.tgz";
-        sha1 = "821441a683fad25ebd2c8dde1401dd43dbeb027a";
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "keypress-0.1.0" = {
-      name = "keypress";
-      packageName = "keypress";
-      version = "0.1.0";
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
-        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
+    "esprima-4.0.0" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
+        sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==";
       };
     };
-    "camelcase-keys-2.1.0" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "2.1.0";
+    "filled-array-1.1.0" = {
+      name = "filled-array";
+      packageName = "filled-array";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
-        sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
+        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
+        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
       };
     };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
+    "find-up-1.1.2" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
+        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
       };
     };
-    "loud-rejection-1.6.0" = {
-      name = "loud-rejection";
-      packageName = "loud-rejection";
-      version = "1.6.0";
+    "fs-promise-0.3.1" = {
+      name = "fs-promise";
+      packageName = "fs-promise";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz";
-        sha1 = "5b46f80147edee578870f086d04821cf998e551f";
+        url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz";
+        sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a";
       };
     };
-    "map-obj-1.0.1" = {
-      name = "map-obj";
-      packageName = "map-obj";
-      version = "1.0.1";
+    "get-stdin-4.0.1" = {
+      name = "get-stdin";
+      packageName = "get-stdin";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
       };
     };
-    "minimist-1.2.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.0";
+    "got-5.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
+        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "normalize-package-data-2.4.0" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.4.0";
+    "graceful-fs-4.1.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
-    "read-pkg-up-1.0.1" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "1.0.1";
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
-        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
-    "redent-1.0.0" = {
-      name = "redent";
-      packageName = "redent";
+    "hepburn-1.0.0" = {
+      name = "hepburn";
+      packageName = "hepburn";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
-        sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
+        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz";
+        sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b";
       };
     };
-    "trim-newlines-1.0.0" = {
-      name = "trim-newlines";
-      packageName = "trim-newlines";
-      version = "1.0.0";
+    "hosted-git-info-2.6.1" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";
-        sha1 = "5887966bb582a4503a41eb524f7d35011815a613";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz";
+        sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==";
       };
     };
-    "camelcase-2.1.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "2.1.1";
+    "imurmurhash-0.1.4" = {
+      name = "imurmurhash";
+      packageName = "imurmurhash";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz";
-        sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
+        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
-    "currently-unhandled-0.4.1" = {
-      name = "currently-unhandled";
-      packageName = "currently-unhandled";
-      version = "0.4.1";
+    "indent-string-2.1.0" = {
+      name = "indent-string";
+      packageName = "indent-string";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz";
-        sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
+        url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz";
+        sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
       };
     };
-    "signal-exit-3.0.2" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.2";
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
-    "array-find-index-1.0.2" = {
-      name = "array-find-index";
-      packageName = "array-find-index";
-      version = "1.0.2";
+    "ini-1.3.5" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz";
-        sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
       };
     };
-    "hosted-git-info-2.5.0" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.5.0";
+    "is-arrayish-0.2.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -382,103 +373,121 @@ let
         sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
       };
     };
-    "semver-5.4.1" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.4.1";
+    "is-finite-1.0.2" = {
+      name = "is-finite";
+      packageName = "is-finite";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
       };
     };
-    "validate-npm-package-license-3.0.1" = {
-      name = "validate-npm-package-license";
-      packageName = "validate-npm-package-license";
-      version = "3.0.1";
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
-        sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
       };
     };
-    "builtin-modules-1.1.1" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "1.1.1";
+    "is-npm-1.0.0" = {
+      name = "is-npm";
+      packageName = "is-npm";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
-        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
+        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
       };
     };
-    "spdx-correct-1.0.2" = {
-      name = "spdx-correct";
-      packageName = "spdx-correct";
-      version = "1.0.2";
+    "is-obj-1.0.1" = {
+      name = "is-obj";
+      packageName = "is-obj";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
-        sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
+        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
       };
     };
-    "spdx-expression-parse-1.0.4" = {
-      name = "spdx-expression-parse";
-      packageName = "spdx-expression-parse";
-      version = "1.0.4";
+    "is-redirect-1.0.0" = {
+      name = "is-redirect";
+      packageName = "is-redirect";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
-        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
+        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
+        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
       };
     };
-    "spdx-license-ids-1.2.2" = {
-      name = "spdx-license-ids";
-      packageName = "spdx-license-ids";
-      version = "1.2.2";
+    "is-retry-allowed-1.1.0" = {
+      name = "is-retry-allowed";
+      packageName = "is-retry-allowed";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
-        sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
+        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "find-up-1.1.2" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "1.1.2";
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
-        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
-    "read-pkg-1.1.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "1.1.0";
+    "is-utf8-0.2.1" = {
+      name = "is-utf8";
+      packageName = "is-utf8";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
-        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
+        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
+        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
       };
     };
-    "path-exists-2.1.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "2.1.0";
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
-        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
-    "pinkie-promise-2.0.1" = {
-      name = "pinkie-promise";
-      packageName = "pinkie-promise";
-      version = "2.0.1";
+    "js-yaml-3.12.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
-        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
+        sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
       };
     };
-    "pinkie-2.0.4" = {
-      name = "pinkie";
-      packageName = "pinkie";
-      version = "2.0.4";
+    "keypress-0.1.0" = {
+      name = "keypress";
+      packageName = "keypress";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
-        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+        url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+      };
+    };
+    "latest-version-2.0.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
+        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+      };
+    };
+    "limax-1.6.0" = {
+      name = "limax";
+      packageName = "limax";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz";
+        sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33";
       };
     };
     "load-json-file-1.1.0" = {
@@ -490,112 +499,103 @@ let
         sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
       };
     };
-    "path-type-1.1.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
-        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
-      };
-    };
-    "graceful-fs-4.1.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.1.11";
+    "loud-rejection-1.6.0" = {
+      name = "loud-rejection";
+      packageName = "loud-rejection";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+        url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz";
+        sha1 = "5b46f80147edee578870f086d04821cf998e551f";
       };
     };
-    "parse-json-2.2.0" = {
-      name = "parse-json";
-      packageName = "parse-json";
-      version = "2.2.0";
+    "lowercase-keys-1.0.1" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
-        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
       };
     };
-    "pify-2.3.0" = {
-      name = "pify";
-      packageName = "pify";
-      version = "2.3.0";
+    "map-obj-1.0.1" = {
+      name = "map-obj";
+      packageName = "map-obj";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
-        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+        sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
       };
     };
-    "strip-bom-2.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "2.0.0";
+    "meow-3.7.0" = {
+      name = "meow";
+      packageName = "meow";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
-        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
+        url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz";
+        sha1 = "72cb668b425228290abbfa856892587308a801fb";
       };
     };
-    "error-ex-1.3.1" = {
-      name = "error-ex";
-      packageName = "error-ex";
-      version = "1.3.1";
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz";
-        sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc";
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "is-arrayish-0.2.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.2.1";
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
-        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "is-utf8-0.2.1" = {
-      name = "is-utf8";
-      packageName = "is-utf8";
-      version = "0.2.1";
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
-        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "indent-string-2.1.0" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "2.1.0";
+    "nan-2.10.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz";
-        sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
+        url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
+        sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==";
       };
     };
-    "strip-indent-1.0.1" = {
-      name = "strip-indent";
-      packageName = "strip-indent";
-      version = "1.0.1";
+    "node-status-codes-1.0.0" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz";
-        sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
+        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "repeating-2.0.1" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "2.0.1";
+    "nodejieba-2.2.6" = {
+      name = "nodejieba";
+      packageName = "nodejieba";
+      version = "2.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
-        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz";
+        sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3";
       };
     };
-    "is-finite-1.0.2" = {
-      name = "is-finite";
-      packageName = "is-finite";
-      version = "1.0.2";
+    "normalize-package-data-2.4.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -607,202 +607,256 @@ let
         sha1 = "097b602b53422a522c1afb8790318336941a011d";
       };
     };
-    "get-stdin-4.0.1" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "4.0.1";
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-        sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
-    "boxen-0.3.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.3.1";
+    "open-0.0.5" = {
+      name = "open";
+      packageName = "open";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
-        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
+        url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz";
+        sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
       };
     };
-    "configstore-2.1.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "2.1.0";
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
-        sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
+    "package-json-2.4.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
+        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+      };
+    };
+    "parse-json-2.2.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+      };
+    };
+    "path-exists-2.1.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
+        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
+    "path-type-1.1.0" = {
+      name = "path-type";
+      packageName = "path-type";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
+        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
+        sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
       };
     };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
+    "pify-2.3.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
       };
     };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
+    "pinyin-2.8.3" = {
+      name = "pinyin";
+      packageName = "pinyin";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz";
+        sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b";
       };
     };
-    "dot-prop-3.0.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "3.0.0";
+    "prepend-http-1.0.4" = {
+      name = "prepend-http";
+      packageName = "prepend-http";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
-        sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177";
+        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
       };
     };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
       };
     };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
+    "rc-1.2.8" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
-    "osenv-0.1.4" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.4";
+    "read-all-stream-3.1.0" = {
+      name = "read-all-stream";
+      packageName = "read-all-stream";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
-        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
+        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
+        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "uuid-2.0.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.3";
+    "read-pkg-1.1.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
-        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
+        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
       };
     };
-    "write-file-atomic-1.3.4" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.3.4";
+    "read-pkg-up-1.0.1" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz";
-        sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f";
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
+        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
       };
     };
-    "xdg-basedir-2.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "2.0.0";
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
-        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
-    "is-obj-1.0.1" = {
-      name = "is-obj";
-      packageName = "is-obj";
-      version = "1.0.1";
+    "redent-1.0.0" = {
+      name = "redent";
+      packageName = "redent";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
-        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+        url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
+        sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
       };
     };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
+    "registry-auth-token-3.3.2" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
+        sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
+    "registry-url-3.1.0" = {
+      name = "registry-url";
+      packageName = "registry-url";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
-    "imurmurhash-0.1.4" = {
-      name = "imurmurhash";
-      packageName = "imurmurhash";
-      version = "0.1.4";
+    "repeating-2.0.1" = {
+      name = "repeating";
+      packageName = "repeating";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
-        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
+        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "semver-5.5.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
+        sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
+      };
+    };
+    "semver-diff-2.1.0" = {
+      name = "semver-diff";
+      packageName = "semver-diff";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "slide-1.1.6" = {
@@ -814,121 +868,121 @@ let
         sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
       };
     };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
+    "spdx-correct-3.0.0" = {
+      name = "spdx-correct";
+      packageName = "spdx-correct";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
+        sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
       };
     };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
+    "spdx-exceptions-2.1.0" = {
+      name = "spdx-exceptions";
+      packageName = "spdx-exceptions";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
+        sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
       };
     };
-    "registry-auth-token-3.3.1" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.3.1";
+    "spdx-expression-parse-3.0.0" = {
+      name = "spdx-expression-parse";
+      packageName = "spdx-expression-parse";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz";
-        sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006";
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
       };
     };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
+    "spdx-license-ids-3.0.0" = {
+      name = "spdx-license-ids";
+      packageName = "spdx-license-ids";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
+        sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
       };
     };
-    "create-error-class-3.0.2" = {
-      name = "create-error-class";
-      packageName = "create-error-class";
-      version = "3.0.2";
+    "speakingurl-14.0.1" = {
+      name = "speakingurl";
+      packageName = "speakingurl";
+      version = "14.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
-        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
+        url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz";
+        sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==";
       };
     };
-    "duplexer2-0.1.4" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.1.4";
+    "sprintf-js-1.0.3" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz";
-        sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "is-redirect-1.0.0" = {
-      name = "is-redirect";
-      packageName = "is-redirect";
-      version = "1.0.0";
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
-        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
-    "is-retry-allowed-1.1.0" = {
-      name = "is-retry-allowed";
-      packageName = "is-retry-allowed";
-      version = "1.1.0";
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
-        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "lowercase-keys-1.0.0" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "1.0.0";
+    "strip-bom-2.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
-        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
+        sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
       };
     };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "1.0.0";
+    "strip-indent-1.0.1" = {
+      name = "strip-indent";
+      packageName = "strip-indent";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
+        url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz";
+        sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
       };
     };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "readable-stream-2.3.3" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.3.3";
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
     "timed-out-3.1.3" = {
@@ -940,6 +994,15 @@ let
         sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
       };
     };
+    "trim-newlines-1.0.0" = {
+      name = "trim-newlines";
+      packageName = "trim-newlines";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";
+        sha1 = "5887966bb582a4503a41eb524f7d35011815a613";
+      };
+    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -949,6 +1012,15 @@ let
         sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
       };
     };
+    "update-notifier-0.6.3" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
+        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
+      };
+    };
     "url-parse-lax-1.0.0" = {
       name = "url-parse-lax";
       packageName = "url-parse-lax";
@@ -958,69 +1030,6 @@ let
         sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
       };
     };
-    "capture-stack-trace-1.0.0" = {
-      name = "capture-stack-trace";
-      packageName = "capture-stack-trace";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
-        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-      };
-    };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
-    "safe-buffer-5.1.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
-      };
-    };
-    "string_decoder-1.0.3" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
-      };
-    };
     "util-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -1030,49 +1039,49 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "prepend-http-1.0.4" = {
-      name = "prepend-http";
-      packageName = "prepend-http";
-      version = "1.0.4";
+    "uuid-2.0.3" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
-        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
+        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
-    "rc-1.2.1" = {
-      name = "rc";
-      packageName = "rc";
-      version = "1.2.1";
+    "validate-npm-package-license-3.0.3" = {
+      name = "validate-npm-package-license";
+      packageName = "validate-npm-package-license";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz";
-        sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95";
+        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
+        sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
       };
     };
-    "deep-extend-0.4.2" = {
-      name = "deep-extend";
-      packageName = "deep-extend";
-      version = "0.4.2";
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
-        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
       };
     };
-    "ini-1.3.4" = {
-      name = "ini";
-      packageName = "ini";
+    "write-file-atomic-1.3.4" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
       version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-        sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz";
+        sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f";
       };
     };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
+    "xdg-basedir-2.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
+        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
       };
     };
   };
@@ -1087,344 +1096,129 @@ in
       sha1 = "320eafea9333a8ea2bc8e04bda8db2537c52d23f";
     };
     dependencies = [
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."ansi-styles-2.2.1"
-          sources."escape-string-regexp-1.0.5"
-          (sources."has-ansi-2.0.0" // {
-            dependencies = [
-              sources."ansi-regex-2.1.1"
-            ];
-          })
-          (sources."strip-ansi-3.0.1" // {
-            dependencies = [
-              sources."ansi-regex-2.1.1"
-            ];
-          })
-          sources."supports-color-2.0.0"
-        ];
-      })
-      sources."ejs-2.5.7"
-      (sources."fs-promise-0.3.1" // {
-        dependencies = [
-          sources."any-promise-0.1.0"
-        ];
-      })
-      (sources."js-yaml-3.10.0" // {
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."any-promise-0.1.0"
+      sources."argparse-1.0.10"
+      sources."array-find-index-1.0.2"
+      sources."boxen-0.3.1"
+      sources."builtin-modules-1.1.1"
+      sources."bulk-replace-0.0.1"
+      sources."camelcase-2.1.1"
+      sources."camelcase-keys-2.1.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."chalk-1.1.3"
+      sources."code-point-at-1.1.0"
+      sources."commander-1.1.1"
+      sources."configstore-2.1.0"
+      sources."core-util-is-1.0.2"
+      sources."create-error-class-3.0.2"
+      sources."currently-unhandled-0.4.1"
+      sources."decamelize-1.2.0"
+      sources."deep-extend-0.6.0"
+      sources."dot-prop-3.0.0"
+      sources."duplexer2-0.1.4"
+      sources."ejs-2.6.1"
+      sources."error-ex-1.3.2"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.0"
+      sources."filled-array-1.1.0"
+      sources."find-up-1.1.2"
+      sources."fs-promise-0.3.1"
+      sources."get-stdin-4.0.1"
+      sources."got-5.7.1"
+      sources."graceful-fs-4.1.11"
+      sources."has-ansi-2.0.0"
+      sources."hepburn-1.0.0"
+      sources."hosted-git-info-2.6.1"
+      sources."imurmurhash-0.1.4"
+      sources."indent-string-2.1.0"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."is-arrayish-0.2.1"
+      sources."is-builtin-module-1.0.0"
+      sources."is-finite-1.0.2"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-npm-1.0.0"
+      sources."is-obj-1.0.1"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."is-stream-1.1.0"
+      sources."is-utf8-0.2.1"
+      sources."isarray-1.0.0"
+      sources."js-yaml-3.12.0"
+      sources."keypress-0.1.0"
+      sources."latest-version-2.0.0"
+      sources."limax-1.6.0"
+      sources."load-json-file-1.1.0"
+      sources."loud-rejection-1.6.0"
+      sources."lowercase-keys-1.0.1"
+      sources."map-obj-1.0.1"
+      sources."meow-3.7.0"
+      sources."minimist-1.2.0"
+      (sources."mkdirp-0.5.1" // {
         dependencies = [
-          (sources."argparse-1.0.9" // {
-            dependencies = [
-              sources."sprintf-js-1.0.3"
-            ];
-          })
-          sources."esprima-4.0.0"
-        ];
-      })
-      (sources."limax-1.5.0" // {
-        dependencies = [
-          (sources."hepburn-1.0.0" // {
-            dependencies = [
-              sources."bulk-replace-0.0.1"
-            ];
-          })
-          (sources."pinyin-2.8.3" // {
-            dependencies = [
-              (sources."commander-1.1.1" // {
-                dependencies = [
-                  sources."keypress-0.1.0"
-                ];
-              })
-              sources."object-assign-4.1.1"
-              (sources."nodejieba-2.2.5" // {
-                dependencies = [
-                  sources."nan-2.3.5"
-                ];
-              })
-            ];
-          })
-          sources."speakingurl-13.0.0"
-        ];
-      })
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          (sources."camelcase-keys-2.1.0" // {
-            dependencies = [
-              sources."camelcase-2.1.1"
-            ];
-          })
-          sources."decamelize-1.2.0"
-          (sources."loud-rejection-1.6.0" // {
-            dependencies = [
-              (sources."currently-unhandled-0.4.1" // {
-                dependencies = [
-                  sources."array-find-index-1.0.2"
-                ];
-              })
-              sources."signal-exit-3.0.2"
-            ];
-          })
-          sources."map-obj-1.0.1"
-          sources."minimist-1.2.0"
-          (sources."normalize-package-data-2.4.0" // {
-            dependencies = [
-              sources."hosted-git-info-2.5.0"
-              (sources."is-builtin-module-1.0.0" // {
-                dependencies = [
-                  sources."builtin-modules-1.1.1"
-                ];
-              })
-              sources."semver-5.4.1"
-              (sources."validate-npm-package-license-3.0.1" // {
-                dependencies = [
-                  (sources."spdx-correct-1.0.2" // {
-                    dependencies = [
-                      sources."spdx-license-ids-1.2.2"
-                    ];
-                  })
-                  sources."spdx-expression-parse-1.0.4"
-                ];
-              })
-            ];
-          })
-          sources."object-assign-4.1.1"
-          (sources."read-pkg-up-1.0.1" // {
-            dependencies = [
-              (sources."find-up-1.1.2" // {
-                dependencies = [
-                  sources."path-exists-2.1.0"
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-              (sources."read-pkg-1.1.0" // {
-                dependencies = [
-                  (sources."load-json-file-1.1.0" // {
-                    dependencies = [
-                      sources."graceful-fs-4.1.11"
-                      (sources."parse-json-2.2.0" // {
-                        dependencies = [
-                          (sources."error-ex-1.3.1" // {
-                            dependencies = [
-                              sources."is-arrayish-0.2.1"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."pify-2.3.0"
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
-                        ];
-                      })
-                      (sources."strip-bom-2.0.0" // {
-                        dependencies = [
-                          sources."is-utf8-0.2.1"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."path-type-1.1.0" // {
-                    dependencies = [
-                      sources."graceful-fs-4.1.11"
-                      sources."pify-2.3.0"
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          (sources."redent-1.0.0" // {
-            dependencies = [
-              (sources."indent-string-2.1.0" // {
-                dependencies = [
-                  (sources."repeating-2.0.1" // {
-                    dependencies = [
-                      (sources."is-finite-1.0.2" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-              (sources."strip-indent-1.0.1" // {
-                dependencies = [
-                  sources."get-stdin-4.0.1"
-                ];
-              })
-            ];
-          })
-          sources."trim-newlines-1.0.0"
+          sources."minimist-0.0.8"
         ];
       })
+      sources."nan-2.10.0"
+      sources."node-status-codes-1.0.0"
+      sources."nodejieba-2.2.6"
+      sources."normalize-package-data-2.4.0"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
       sources."open-0.0.5"
-      (sources."update-notifier-0.6.3" // {
-        dependencies = [
-          (sources."boxen-0.3.1" // {
-            dependencies = [
-              sources."filled-array-1.1.0"
-              sources."object-assign-4.1.1"
-              (sources."repeating-2.0.1" // {
-                dependencies = [
-                  (sources."is-finite-1.0.2" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
-                ];
-              })
-              (sources."string-width-1.0.2" // {
-                dependencies = [
-                  sources."code-point-at-1.1.0"
-                  (sources."is-fullwidth-code-point-1.0.0" // {
-                    dependencies = [
-                      sources."number-is-nan-1.0.1"
-                    ];
-                  })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.1.1"
-                    ];
-                  })
-                ];
-              })
-              sources."widest-line-1.0.0"
-            ];
-          })
-          (sources."configstore-2.1.0" // {
-            dependencies = [
-              (sources."dot-prop-3.0.0" // {
-                dependencies = [
-                  sources."is-obj-1.0.1"
-                ];
-              })
-              sources."graceful-fs-4.1.11"
-              (sources."mkdirp-0.5.1" // {
-                dependencies = [
-                  sources."minimist-0.0.8"
-                ];
-              })
-              sources."object-assign-4.1.1"
-              sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.4" // {
-                dependencies = [
-                  sources."os-homedir-1.0.2"
-                ];
-              })
-              sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.3.4" // {
-                dependencies = [
-                  sources."imurmurhash-0.1.4"
-                  sources."slide-1.1.6"
-                ];
-              })
-              (sources."xdg-basedir-2.0.0" // {
-                dependencies = [
-                  sources."os-homedir-1.0.2"
-                ];
-              })
-            ];
-          })
-          sources."is-npm-1.0.0"
-          (sources."latest-version-2.0.0" // {
-            dependencies = [
-              (sources."package-json-2.4.0" // {
-                dependencies = [
-                  (sources."got-5.7.1" // {
-                    dependencies = [
-                      (sources."create-error-class-3.0.2" // {
-                        dependencies = [
-                          sources."capture-stack-trace-1.0.0"
-                        ];
-                      })
-                      sources."duplexer2-0.1.4"
-                      sources."is-redirect-1.0.0"
-                      sources."is-retry-allowed-1.1.0"
-                      sources."is-stream-1.1.0"
-                      sources."lowercase-keys-1.0.0"
-                      sources."node-status-codes-1.0.0"
-                      sources."object-assign-4.1.1"
-                      (sources."parse-json-2.2.0" // {
-                        dependencies = [
-                          (sources."error-ex-1.3.1" // {
-                            dependencies = [
-                              sources."is-arrayish-0.2.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."pinkie-promise-2.0.1" // {
-                        dependencies = [
-                          sources."pinkie-2.0.4"
-                        ];
-                      })
-                      sources."read-all-stream-3.1.0"
-                      (sources."readable-stream-2.3.3" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."safe-buffer-5.1.1"
-                          sources."string_decoder-1.0.3"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                      sources."timed-out-3.1.3"
-                      sources."unzip-response-1.0.2"
-                      (sources."url-parse-lax-1.0.0" // {
-                        dependencies = [
-                          sources."prepend-http-1.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."registry-auth-token-3.3.1" // {
-                    dependencies = [
-                      (sources."rc-1.2.1" // {
-                        dependencies = [
-                          sources."deep-extend-0.4.2"
-                          sources."ini-1.3.4"
-                          sources."minimist-1.2.0"
-                          sources."strip-json-comments-2.0.1"
-                        ];
-                      })
-                      sources."safe-buffer-5.1.1"
-                    ];
-                  })
-                  (sources."registry-url-3.1.0" // {
-                    dependencies = [
-                      (sources."rc-1.2.1" // {
-                        dependencies = [
-                          sources."deep-extend-0.4.2"
-                          sources."ini-1.3.4"
-                          sources."minimist-1.2.0"
-                          sources."strip-json-comments-2.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."semver-5.4.1"
-                ];
-              })
-            ];
-          })
-          (sources."semver-diff-2.1.0" // {
-            dependencies = [
-              sources."semver-5.4.1"
-            ];
-          })
-        ];
-      })
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."package-json-2.4.0"
+      sources."parse-json-2.2.0"
+      sources."path-exists-2.1.0"
+      sources."path-type-1.1.0"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pinyin-2.8.3"
+      sources."prepend-http-1.0.4"
+      sources."process-nextick-args-2.0.0"
+      sources."rc-1.2.8"
+      sources."read-all-stream-3.1.0"
+      sources."read-pkg-1.1.0"
+      sources."read-pkg-up-1.0.1"
+      sources."readable-stream-2.3.6"
+      sources."redent-1.0.0"
+      sources."registry-auth-token-3.3.2"
+      sources."registry-url-3.1.0"
+      sources."repeating-2.0.1"
+      sources."safe-buffer-5.1.2"
+      sources."semver-5.5.0"
+      sources."semver-diff-2.1.0"
+      sources."signal-exit-3.0.2"
+      sources."slide-1.1.6"
+      sources."spdx-correct-3.0.0"
+      sources."spdx-exceptions-2.1.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.0"
+      sources."speakingurl-14.0.1"
+      sources."sprintf-js-1.0.3"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-2.0.0"
+      sources."strip-indent-1.0.1"
+      sources."strip-json-comments-2.0.1"
+      sources."supports-color-2.0.0"
+      sources."timed-out-3.1.3"
+      sources."trim-newlines-1.0.0"
+      sources."unzip-response-1.0.2"
+      sources."update-notifier-0.6.3"
+      sources."url-parse-lax-1.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-2.0.3"
+      sources."validate-npm-package-license-3.0.3"
+      sources."widest-line-1.0.0"
+      sources."write-file-atomic-1.3.4"
+      sources."xdg-basedir-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -1433,5 +1227,6 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
 }
\ No newline at end of file
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index a112dcdec9756..8e6e01237eae6 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -1,16 +1,17 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
-  nodeEnv = import ./../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
+  nodeEnv = import ../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
new file mode 100644
index 0000000000000..69fa10d74fe6e
--- /dev/null
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "brightnessctl-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "Hummer12007";
+    repo = "brightnessctl";
+    rev = "${version}";
+    sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z";
+  };
+
+  makeFlags = "MODE=0755 PREFIX=/ DESTDIR=$(out)";
+
+  patchPhase = ''
+    substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/
+    substituteInPlace 90-brightnessctl.rules --replace %k '*'
+  '';
+
+  meta = {
+    homepage = "https://github.com/Hummer12007/brightnessctl";
+    maintainers = [ stdenv.lib.maintainers.Dje4321 ];
+    license = stdenv.lib.licenses.mit;
+    description = "This program allows you read and control device brightness";
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index 91f5af1062c15..f0be3cad723ca 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "cups-pk-helper-${version}";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
     sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm";
   };
 
diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
index db60ece128f53..4464b5ba11b31 100644
--- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
   name = "brgenml1cupswrapper-3.1.0-1";
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf101125/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101125/${name}.i386.deb";
     sha256 = "0kd2a2waqr10kfv1s8is3nd5dlphw4d1343srdsbrlbbndja3s6r";
   };
 
diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
index bd069b0d65a90..51ef47fe46936 100644
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   name = "brgenml1lpr-3.1.0-1";
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf101123/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101123/${name}.i386.deb";
     sha256 = "0zdvjnrjrz9sba0k525linxp55lr4cyivfhqbkq1c11br2nvy09f";
   };
 
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index b79ffa1c9a12b..1c0b8e13ab0b5 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, callPackage_i686 }:
+{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux }:
 
 let
 
-  i686_NIX_GCC = callPackage_i686 ({gcc}: gcc) {};
-  i686_libxml2 = callPackage_i686 ({libxml2}: libxml2) {};
-  i686_glibc = callPackage_i686 ({glibc}: glibc) {};
+  i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {};
+  i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {};
+  i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {};
 
   src_canon = fetchurl {
-    url = "http://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip";
+    url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip";
     sha256 = "1qpdmaaw42gm5fi21rp4lf05skffkq42ka5c8xkw8rckzb13sy9j";
   };
 
diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
index cda4ed6304d21..8357a452a2b17 100644
--- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     # The i386 part is a lie. There are x86, x86_64 and armv7l drivers.
     # Though this builds only supports x86_64 for now.
-    url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb";
     sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni";
   };
 
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index db787021ce03a..0711bad86a1ea 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchzip {
     # this site does not like curl -> override useragent
     curlOpts = "-A ''";
-    url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip";
+    url = "https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip";
     sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
index 5a828c265b55c..72a40f41f8852 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz";
+    url = "https://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz";
     sha256 = "b88f9b592723a00c024129560367f40a560ca3cba06fd99512ab368dd6855853";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index c80009bd84447..c5b63b07318d9 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb";
     sha256 = "7202dd895d38d50bb767080f2995ed350eed99bc2b7871452c3c915c8eefc30a";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
index fbb523409187b..4b31ccf387743 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz";
+    url = "https://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz";
     sha256 = "0y5iffybxjin8injrdmc9n9hl4s6b8n6ck76m1z78bzi88vwmhai";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 228f56d47ae06..40e65136f1b04 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   version = "3.0.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb";
     sha256 = "1ccvx393pqavsgzd8igrzlin5jrsf01d3acyvwqd1d0yz5jgqy6d";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
index 3b1d2e52881a3..1673c2d5c5c8c 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "mfcl2700dncupswrapper-${meta.version}";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb";
     sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index b0a0304693494..8e31cd2956a5b 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb";
     sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
index d45b53b5b80bf..2099291d434ba 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf101802/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb";
     sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
index 7791d71114b41..8dbc56fe846de 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.2.0-1";
 
   src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf101801/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb";
     sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af";
   };
 
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
new file mode 100644
index 0000000000000..0da85498723f2
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:
+
+stdenv.mkDerivation rec {
+  name = "mfcl2740dwcupswrapper-${version}";
+  version = "3.2.0-1";
+
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb";
+    sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb";
+  };
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = "dpkg-deb -x $src $out";
+
+  installPhase = ''
+    basedir=${mfcl2740dwlpr}/opt/brother/Printers/MFCL2740DW
+    dir=$out/opt/brother/Printers/MFCL2740DW
+
+    substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \
+      --replace /usr/bin/perl ${perl}/bin/perl \
+      --replace "basedir =~" "basedir = \"$basedir\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #"
+
+    substituteInPlace $dir/cupswrapper/paperconfigml1 \
+      --replace /usr/bin/perl ${perl}/bin/perl
+
+    wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
+
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model
+
+    ln $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW $out/lib/cups/filter
+    ln $dir/cupswrapper/brother-MFCL2740DW-cups-en.ppd $out/share/cups/model
+  '';
+
+  meta = {
+    description = "Brother MFC-L2740DW CUPS wrapper driver";
+    homepage = http://www.brother.com/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ stdenv.lib.maintainers.enzime ];
+  };
+}
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
new file mode 100644
index 0000000000000..6d3cf18e5296e
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
@@ -0,0 +1,43 @@
+{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
+
+stdenv.mkDerivation rec {
+  name = "mfcl2740dwlpr-${version}";
+  version = "3.2.0-1";
+
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb";
+    sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf";
+  };
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = "dpkg-deb -x $src $out";
+
+  installPhase = ''
+    dir=$out/opt/brother/Printers/MFCL2740DW
+
+    substituteInPlace $dir/lpd/filter_MFCL2740DW \
+      --replace /usr/bin/perl ${perl}/bin/perl \
+      --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #"
+
+    wrapProgram $dir/lpd/filter_MFCL2740DW \
+      --prefix PATH : ${stdenv.lib.makeBinPath [
+        coreutils ghostscript gnugrep gnused which
+      ]}
+
+    # need to use i686 glibc here, these are 32bit proprietary binaries
+    interpreter=${pkgsi686Linux.glibc}/lib/ld-linux.so.2
+    patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter
+    patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3
+    patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3
+  '';
+
+  meta = {
+    description = "Brother MFC-L2740DW lpr driver";
+    homepage = http://www.brother.com/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ stdenv.lib.maintainers.enzime ];
+  };
+}
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 2195cf7d2a399..d15680b636396 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   version = "1.20.3";
 
   src = fetchurl {
-    url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
+    url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
     sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv";
   };
 
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index 1c79be712b064..ca7ac4b415283 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -6,7 +6,7 @@ libxslt,
 libusb,
 sane-backends,
 rpm, cpio,
-eject,
+getopt,
 patchelf, gcc
 }:
 
@@ -25,6 +25,38 @@ in
 # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test...
 
 let plugins = {
+  x770 =   stdenv.mkDerivation rec {
+    name = "iscan-gt-x770-bundle";
+    version = "1.0.1";
+    pluginVersion = "2.1.2-1";
+
+    buildInputs = [ patchelf rpm ];
+    src = fetchurl {
+      url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
+      sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+      '';
+    preFixup = ''
+      lib=$out/lib/esci/libesint7C.so
+      rpath=${gcc.cc.lib}/lib/
+      patchelf --set-rpath $rpath $lib
+      '';
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
+        '';
+      hw = "Perfection V500 Photo";
+      };
+    meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; };
+    };
   f720 = stdenv.mkDerivation rec {
     name = "iscan-gt-f720-bundle";
     version = "1.0.1";
@@ -124,7 +156,7 @@ stdenv.mkDerivation rec {
     '';
   postFixup = ''
     # iscan-registry is a shell script requiring getopt
-    wrapProgram $out/bin/iscan-registry --prefix PATH : ${eject}/bin
+    wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin
     registry=$out/bin/iscan-registry;
     '' +
     stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: ''
diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/misc/drivers/epkowa/firmware_location.patch
index 7f67d9cf4579b..58ea849d8f9d9 100644
--- a/pkgs/misc/drivers/epkowa/firmware_location.patch
+++ b/pkgs/misc/drivers/epkowa/firmware_location.patch
@@ -8,11 +8,12 @@ set this environment variable. Instead, we patch iscan to set this variable
 before loading libesci-interpreter-gt-f720.so.
 --- backend/channel-usb.c.orig	2017-08-14 11:24:27.669582456 +0200
 +++ backend/channel-usb.c	2017-08-14 11:31:40.509010897 +0200
-@@ -169,6 +169,8 @@
+@@ -169,6 +169,9 @@
  {
    SANE_Status s;
  
 +  setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1);
++  setenv("ISCAN_FW_DIR", NIX_ESCI_PREFIX, 1);
 +
    s = sanei_usb_open (self->name, &self->fd);
  
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index d6ac4fd6a03c4..99286d5f2047f 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "foomatic-filters-4.0.17";
 
   src = fetchurl {
-    url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz";
+    url = "https://www.openprinting.org/download/foomatic/${name}.tar.gz";
     sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2";
   };
 
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix
index 021852f3505c8..3832c4de2dccd 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/misc/drivers/gutenprint/bin.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   name = "cups-gutenprint-binary-5.0.1";
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
-    url = http://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb;
+    url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb;
     sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc";
   } else throw "TODO"; # get from openprint.com -> drivers -> gutenprint
 
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 91be6cf743a44..4b88d4a96fa0d 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,26 +1,28 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
 , makeWrapper
-, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
-, net_snmp, openssl, polkit, nettools
+, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends
+, dbus, file, ghostscript, usbutils
+, net_snmp, openssl, perl, polkit, nettools
 , bash, coreutils, utillinux
 , withQt5 ? true
 , withPlugin ? false
+, withStaticPPDInstall ? false
 }:
 
 let
 
   name = "hplip-${version}";
-  version = "3.18.3";
+  version = "3.18.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y";
+    sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb";
   };
 
   plugin = fetchurl {
     url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw";
+    sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p";
   };
 
   hplipState = substituteAll {
@@ -55,8 +57,11 @@ pythonPackages.buildPythonApplication {
     libusb1
     sane-backends
     dbus
+    file
+    ghostscript
     net_snmp
     openssl
+    perl
     zlib
   ];
 
@@ -86,6 +91,11 @@ pythonPackages.buildPythonApplication {
       -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \
       -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \
       -e s,/var/lib/hp,$out/var/lib/hp,g \
+      -e s,/usr/bin/perl,${perl}/bin/perl,g \
+      -e s,/usr/bin/file,${file}/bin/file,g \
+      -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \
+      -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \
+      -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \
       {} +
   '';
 
@@ -98,6 +108,7 @@ pythonPackages.buildPythonApplication {
       --with-systraydir=$out/xdg/autostart
       --with-mimedir=$out/etc/cups
       --enable-policykit
+      ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
       --disable-qt4
       ${stdenv.lib.optionalString withQt5 "--enable-qt5"}
     "
@@ -111,10 +122,20 @@ pythonPackages.buildPythonApplication {
       hplip_confdir=$out/etc/hp
       hplip_statedir=$out/var/lib/hp
     "
+
+    # Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent
+    # generation of '*.ppd' files.
+    # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox.
+    # Could not find how to fix the problem in 'ppdc' so this is a workaround.
+    export CUPS_DATADIR="${cups}/share/cups"
   '';
 
   enableParallelBuilding = true;
 
+  #
+  # Running `hp-diagnose_plugin -g` can be used to diagnose
+  # issues with plugins.
+  #
   postInstall = stdenv.lib.optionalString withPlugin ''
     sh ${plugin} --noexec --keep
     cd plugin_tmp
@@ -130,17 +151,27 @@ pythonPackages.buildPythonApplication {
     mkdir -p $out/share/hplip/prnt/plugins
     for plugin in lj hbpl1; do
       cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins
+      chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so
       ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \
         $out/share/hplip/prnt/plugins/$plugin.so
     done
 
     mkdir -p $out/share/hplip/scan/plugins
-    for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do
+    for plugin in bb_soap bb_marvell bb_soapht bb_escl; do
       cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins
+      chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so
       ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \
         $out/share/hplip/scan/plugins/$plugin.so
     done
 
+    mkdir -p $out/share/hplip/fax/plugins
+    for plugin in fax_marvell; do
+      cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins
+      chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so
+      ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \
+        $out/share/hplip/fax/plugins/$plugin.so
+    done
+
     mkdir -p $out/var/lib/hp
     cp ${hplipState} $out/var/lib/hp/hplip.state
 
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index f6ddc61b5157b..f411045806265 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "postscript-lexmark-${version}";
 
   src = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
+    url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
     sha256 = "0wbhvypdr96a5ddg6kj41dn9sbl49n7pfi2vs762ij82hm2gvwcm";
   };
 
diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix
index f4b4db497e2d5..8575d654febf5 100644
--- a/pkgs/misc/emulators/bsod/default.nix
+++ b/pkgs/misc/emulators/bsod/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bsod-0.1";
 
   src = fetchurl {
-    url = http://www.vanheusden.com/bsod/bsod-0.1.tgz;
+    url = https://www.vanheusden.com/bsod/bsod-0.1.tgz;
     sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd";
   };
 
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index 453114e3b7a0f..1845757fb3082 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }:
+{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost, curl, gtest }:
 
 stdenv.mkDerivation rec { 
-  name = "citra-2018-02-23";
+  name = "citra-${version}";
+  version = "2018-06-09";
 
   # Submodules
   src = fetchgit {
     url = "https://github.com/citra-emu/citra";
-    rev = "e51a642a13b9c2eda43d875fe318f627e11d480f";
-    sha256 = "0cw9cqbljc87rjyr2alfryp04mxpvd5mdlyrmnp9yis3xr8g9sa1";
+    rev = "cf9bfe0690f1934847500cc5079b1aaf3299a507";
+    sha256 = "1ryc5d3fnhzlrzh1yljbq9x5n79dsb5hgqdba8z4x56iccx0kd0p";
   };
 
+  enableParallelBuilding = true;
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ SDL2 qtbase boost curl gtest ];
+  buildInputs = [ SDL2 qtbase qtmultimedia boost curl gtest ];
   cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ];
 
   preConfigure = ''
@@ -21,13 +23,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
-    homepage = https://citra-emu.org/;
-    description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    homepage = "https://citra-emu.org";
+    description = "An open-source emulator for the Nintendo 3DS";
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix
index 561f14b5554f3..358cc59d3db0f 100644
--- a/pkgs/misc/emulators/dlx/default.nix
+++ b/pkgs/misc/emulators/dlx/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "dlx-2012.07.08";
 
   src = fetchurl {
-    url = "http://www.davidviner.com/zip/dlx/dlx.zip";
+    url = "https://www.davidviner.com/zip/dlx/dlx.zip";
     sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn";
   };
 
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 5d4e22fefae3b..6959177b3c9df 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,69 +1,80 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib
-, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline
-, openal, libXdmcp, portaudio, libusb, libevdev
-, libpulseaudio ? null
-, curl
+{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5
+, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo
+, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline
+, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl
+, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
 
-, qt5
 # - Inputs used for Darwin
-, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL
-, wxGTK
-, libpng
-, hidapi
+, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
 
-# options
-, dolphin-wxgui ? true
-, dolphin-qtgui ? false
-}:
-# XOR: ensure only wx XOR qt are enabled
-assert dolphin-wxgui || dolphin-qtgui;
-assert !(dolphin-wxgui && dolphin-qtgui);
+let
+  desktopItem = makeDesktopItem {
+    name = "dolphin-emu-master";
+    exec = "dolphin-emu-master";
+    icon = "dolphin-emu";
+    comment = "A Wii/GameCube Emulator";
+    desktopName = "Dolphin Emulator (master)";
+    genericName = "Wii/GameCube Emulator";
+    categories = "Game;Emulator;";
+    startupNotify = "false";
+  };
+in stdenv.mkDerivation rec {
+  name = "dolphin-emu-${version}";
+  version = "2018-07-02";
 
-stdenv.mkDerivation rec {
-  name = "dolphin-emu-20180430";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "ad098283c023b0f5f0d314c646bc5d5756c35e3d";
-    sha256 = "17fv3vz0nc5jax1bbl4wny1kzsshbbhms82dxd8rzcwwvd2ad1g7";
+    rev = "87c5d00e2085090e51c1d44e4fd271437123c722";
+    sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk";
   };
 
-  cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
-    "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
-    "-DENABLE_LTO=True"
-  ] ++ stdenv.lib.optionals (!dolphin-qtgui)  [ "-DENABLE_QT2=False" ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
-
   enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake pkgconfig ]
+  ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [
+    curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
+    libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
+    portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml
+    qt5.qtbase
+  ] ++ stdenv.lib.optionals stdenv.isLinux [
+    bluez libudev libevdev alsaLib vulkan-loader
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    CoreBluetooth cf-private OpenGL ForceFeedback IOKit
+  ];
 
-  buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre
-                  gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal
-                  libXdmcp portaudio libusb libpulseaudio libpng hidapi
-                ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
-                  ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ]
-                  ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ];
+  cmakeFlags = [
+    "-DUSE_SHARED_ENET=ON"
+    "-DENABLE_LTO=ON"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "-DOSX_USE_DEFAULT_SEARCH_PATH=True"
+  ];
 
-  # - Change install path to Applications relative to $out
   # - Allow Dolphin to use nix-provided libraries instead of building them
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i -e 's,/Applications,Applications,g' Source/Core/DolphinWX/CMakeLists.txt
-    sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' CMakeLists.txt
+  preConfigure = ''
+    sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt
+    sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \
+      CMakeLists.txt
   '';
 
-  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-    mkdir -p "$out/Applications"
+  postInstall = ''
+    cp -r ${desktopItem}/share/applications $out/share
+    ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
+    wrapProgram $out/bin/dolphin-emu-nogui \
+      --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+    wrapProgram $out/bin/dolphin-emu \
+      --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
   '';
 
-  meta = {
-    homepage = http://dolphin-emu.org/;
+  meta = with stdenv.lib; {
+    homepage = "http://dolphin-emu.org";
     description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ MP2E ];
     branch = "master";
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index 2f11384d845a1..a0999e6caf520 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     version2 = concatStrings (splitString "." version);
     platform = "linux" + (optionalString stdenv.is64bit "_x64");
   in fetchurl {
-    url = "http://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
+    url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
     sha256 = if stdenv.is64bit
              then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0"
              else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl";
diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix
new file mode 100644
index 0000000000000..882bf13f4eaf8
--- /dev/null
+++ b/pkgs/misc/emulators/firebird-emu/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
+
+stdenv.mkDerivation rec {
+  name = "firebird-emu-${version}";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "nspire-emus";
+    repo = "firebird";
+    rev = "v${version}";
+    sha256 = "0pdca6bgnmzfgf5kp83as99y348gn4plzbxnqxjs61vp489baahq";
+    fetchSubmodules = true;
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs = [ qtbase qtdeclarative ];
+
+  makeFlags = [ "INSTALL_ROOT=$(out)" ];
+
+  # Attempts to install to /usr/bin and /usr/share/applications, which Nix does
+  # not use.
+  prePatch = ''
+    substituteInPlace firebird.pro \
+      --replace '/usr/' '/'
+  '';
+
+  meta = {
+    homepage = https://github.com/nspire-emus/firebird;
+    description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ pneumaticat ];
+    # Only tested on Linux, but likely possible to build on, e.g. macOS
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 6d462c0e37973..9856c93eda2dc 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       create customized Amigas.
     '';
     license = licenses.gpl2Plus;
-    homepage = http://fs-uae.net;
+    homepage = https://fs-uae.net;
     maintainers = with stdenv.lib; [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index 440eb681eb385..287df4db01be7 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "hatari-2.1.0";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2";
+    url = "https://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2";
     sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb";
   };
 
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 7b42e8d603391..fbe44c6540b37 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   sourceName = "higan_v${version}-source";
 
   src = fetchurl {
-    urls = [ "http://download.byuu.org/${sourceName}.7z" ];
+    urls = [ "https://download.byuu.org/${sourceName}.7z" ];
     sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35";
     curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
   };
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index c2103938acccb..9a99c6ddb6f93 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.8";
 
   src = fetchurl {
-    url = "http://www.seasip.info/Unix/LibDsk/${name}.tar.gz";
+    url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz";
     sha256 = "1fdypk6gjkb4i2ghnbn3va50y69pdym51jx3iz9jns4636z4sfqd";
   };
 
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 64e29f59a1869..7fb804d31e415 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -1,37 +1,52 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2
-, qtbase, qtmultimedia }:
+{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig
+, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit
+, qttools, minizip }:
 
-stdenv.mkDerivation rec {
+let
+  desktopItem = makeDesktopItem {
+    name = "mgba";
+    exec = "mgba-qt";
+    icon = "mgba";
+    comment = "A Game Boy Advance Emulator";
+    desktopName = "mgba";
+    genericName = "Game Boy Advance Emulator";
+    categories = "Game;Emulator;";
+    startupNotify = "false";
+  };
+in stdenv.mkDerivation rec {
   name = "mgba-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7";
+    sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ makeWrapper pkgconfig cmake ];
 
-  buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ];
+  buildInputs = [
+    libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip
+    qttools
+  ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/mgba-emu/mgba/commit/e31373560535203d826687044290a4994706c2dd.patch";
-      sha256 = "07582vj0fqgsgryx28pnshiwri9dn88l1rr4vkraib7bzx7cs4f9";
-    })
+  patches = [(fetchpatch {
+      url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch";
+      sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh";
+  })];
 
-    (fetchpatch {
-      url = "https://github.com/mgba-emu/mgba/commit/baabe0090bb1fd5997e531fd9568c2de09b5fc21.patch";
-      sha256 = "1kv9dxxna35s050q9af9nzskplz2x1aq8avg0ihbznhxjl8vmxz9";
-    })
-  ];
+  postInstall = ''
+    cp -r ${desktopItem}/share/applications $out/share
+    wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \
+      ${qtbase.bin}/${qtbase.qtPluginPrefix}
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://mgba.io;
     description = "A modern GBA emulator with a focus on accuracy";
+
     longDescription = ''
       mGBA is a new Game Boy Advance emulator written in C.
 
@@ -47,8 +62,9 @@ stdenv.mkDerivation rec {
       for tool-assist runners, and a modern feature set for emulators
       that older emulators may not support.
     '';
+
     license = licenses.mpl20;
     maintainers = with maintainers; [ MP2E AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 2e28fd297ec0c..95e94eeaff514 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       states and PS2 system memory. This allows you to play PS2 games on your
       PC, with many additional features and benefits.
     '';
-    homepage = http://pcsx2.net;
+    homepage = https://pcsx2.net;
     maintainers = with maintainers; [ hrdinka ];
 
     # PCSX2's source code is released under LGPLv3+. It However ships
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 140149bde495d..732a5971ed3c2 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -1,19 +1,31 @@
-{ stdenv, lib, fetchgit, cmake, pkgconfig
-, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev
-, pulseaudioSupport ? true, libpulseaudio
-, waylandSupport ? true, wayland
-, alsaSupport ? true, alsaLib
-}:
-
-stdenv.mkDerivation rec {
-  name = "rpcs3-${version}";
-  version = "2018-02-23";
-
-  src = fetchgit {
-    url = "https://github.com/RPCS3/rpcs3";
-    rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb";
-    sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x";
-  };
+{ stdenv, lib, fetchgit, cmake, pkgconfig, git                                                                      
+, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27                                              
+, pulseaudioSupport ? true, libpulseaudio                                                                           
+, waylandSupport ? true, wayland                                                                                    
+, alsaSupport ? true, alsaLib                                                                                       
+}:                                                                                                                  
+                                                                                                                    
+let                                                                                                                 
+  majorVersion = "0.0.5";                                                                                           
+  gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)                  
+in                                                                                                                  
+stdenv.mkDerivation rec {                                                                                           
+  name = "rpcs3-${version}";                                                                                        
+  version = "${majorVersion}-${gitVersion}";                                                                        
+                                                                                                                    
+  src = fetchgit {                                                                                                  
+    url = "https://github.com/RPCS3/rpcs3";                                                                         
+    rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8";                                                               
+    sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0";                                                
+  };                                                                                                                
+                                                                                                                    
+  preConfigure = ''                                                                                                 
+    cat > ./rpcs3/git-version.h <<EOF                                                                               
+    #define RPCS3_GIT_VERSION "${gitVersion}"                                                                       
+    #define RPCS3_GIT_BRANCH "HEAD"                                                                                 
+    #define RPCS3_GIT_VERSION_NO_UPDATE 1                                                                           
+    EOF
+  '';
 
   cmakeFlags = [
     "-DUSE_SYSTEM_LIBPNG=ON"
@@ -21,10 +33,10 @@ stdenv.mkDerivation rec {
     "-DUSE_NATIVE_INSTRUCTIONS=OFF"
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig git ];
 
   buildInputs = [
-    qtbase openal glew llvm_4 vulkan-loader libpng ffmpeg libevdev
+    qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27
   ] ++ lib.optional pulseaudioSupport libpulseaudio
     ++ lib.optional alsaSupport alsaLib
     ++ lib.optional waylandSupport wayland;
@@ -34,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "PS3 emulator/debugger";
     homepage = "https://rpcs3.net/";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar nocent ];
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index 6be60526eb66b..79832227a142f 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -1,35 +1,39 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig
-, SDL, zlib, gtk2, libxml2, libXv }:
+{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig
+, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
 
 stdenv.mkDerivation rec {
   name = "snes9x-gtk-${version}";
-  version = "1.54.1";
+  version = "1.56.2";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
     rev = version;
-    sha256 = "10fqm7lk36zj2gnx0ypps0nlws923f60b0zj4pmq9apawgx8k6rw";
+    sha256 = "0cbv95799gpagf6bxs1fmwmxvz5qs9g2rmmf5fsdd1cb4lryaijr";
   };
 
-  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ];
+  buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ];
 
-  preAutoreconf = "cd gtk; intltoolize";  
-    
-  buildInputs = [ SDL zlib gtk2 libxml2 libXv ];
-  installPhase = "install -Dt $out/bin snes9x-gtk";
+  preAutoreconf = ''
+    cd gtk
+    intltoolize
+  '';
 
   meta = with stdenv.lib; {
-    description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator";
+    homepage = "http://www.snes9x.com";
+    description = "Super Nintendo Entertainment System (SNES) emulator";
+
     longDescription = ''
       Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
       emulator. It basically allows you to play most games designed for the SNES
       and Super Famicom Nintendo game systems on your PC or Workstation; which
       includes some real gems that were only ever released in Japan.
     '';
+
     license = licenses.lgpl2;
     maintainers = with maintainers; [ qknight ];
-    homepage = http://www.snes9x.com/;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/misc/emulators/termtekst/default.nix
new file mode 100644
index 0000000000000..8186aba1ee565
--- /dev/null
+++ b/pkgs/misc/emulators/termtekst/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, python3Packages, ncurses }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "termtekst";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "zevv";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1gm7j5d49a60wm7px82b76f610i8pl8ccz4r6qsz90z4mp3lyw9b";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ ncurses requests ];
+
+  patchPhase = ''
+    substituteInPlace setup.py \
+      --replace "assert" "assert 1==1 #"
+    substituteInPlace src/tt \
+      --replace "locale.setlocale" "#locale.setlocale"
+    '';
+
+  meta = with lib; {
+    description = ''Console NOS Teletekst viewer in Python'';
+    longDescription = ''
+      Small Python app using curses to display Dutch NOS Teletekst on
+      the Linux console. The original Teletekst font includes 2x6
+      raster graphics glyphs which have no representation in unicode;
+      as a workaround the braille set is abused to approximate the
+      graphics.
+    '';
+    license = licenses.mit;
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index d2305aa37ba6b..156db148435e9 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,11 +1,11 @@
-{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
+{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
   wineRelease ? "stable",
   supportFlags
 }:
 
 let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
 in with src; {
-  wine32 = callPackage_i686 ./base.nix {
+  wine32 = pkgsi686Linux.callPackage ./base.nix {
     name = "wine-${version}";
     inherit src version supportFlags;
     pkgArches = [ pkgsi686Linux ];
@@ -33,4 +33,3 @@ in with src; {
     platforms = [ "x86_64-linux" ];
   };
 }
-
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index c55fbbb0b8a1e..bba06d6f6809f 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "3.0.1";
+    version = "3.0.2";
     url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
-    sha256 = "1wr63n70pli83p3rmclr2j4lxzs4ll1cwlpdlaajfrf6v9yhvl5s";
+    sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.9";
+    version = "3.11";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "0ddphvlp9lsjyqc6zckinc36bggpkg925v0x2vqr8nkdjs0w5bfc";
+    sha256 = "0zlhkz6aybkr9jg8za9x56fp92q10df0abadn9bsa8ryparr5d15";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "022hzh9i0pc063vcdy7ilb1lxlxpzgr4llcb52y2j3gz1psrcyqs";
+    sha256 = "0si6mvva4li6cix2p43dgpdg297642l0vipaam0ng4rmgpr92jrf";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index 813000492039a..fe9e8d3f4b007 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libtool }:
 
 stdenv.mkDerivation rec{
-  version="1.27";
+  version="1.28";
   name = "mxt-app-${version}";
 
   src = fetchFromGitHub {
     owner = "atmel-maxtouch";
     repo = "mxt-app";
     rev = "v${version}";
-    sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h";
+    sha256 = "1z2mir4ib9xzxmy0daazzvlga41n80zch1xyp1iz98rrdsnvd1la";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec{
     homepage = https://github.com/atmel-maxtouch/mxt-app;
     license = licenses.bsd2;
     maintainers = [ maintainers.colemickens ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 17cf99d8b00ce..6b28c39f76799 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
-    homepage = http://electricsheep.org/;
+    homepage = https://electricsheep.org/;
     maintainers = with maintainers; [ nand0p fpletz ];
     platforms = platforms.linux;
     license = licenses.gpl1;
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
index 02cdcf7b4d1c3..0c1446f0672fa 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "xautolock-2.2";
   src = fetchurl {
-    url = "http://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz";
+    url = "https://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz";
     sha256 = "11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2";
   };
   patches = [
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index ddb4235c5dbad..b9294e294e9d9 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
       configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults"
     '';
 
+  hardeningDisable = [ "format" ]; # no build output otherwise
+
   meta = with lib; {
     description = "Screen locker for the X Window System";
     homepage = http://sillycycle.com/xlockmore.html;
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index f1ab822c6f4a5..0425fb430c5b5 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchurl, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
+{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
 
 stdenv.mkDerivation rec {
-  version = "6.1.0";
+  version = "6.2.2";
   name = "seafile-shared-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6";
+  src = fetchFromGitHub {
+    owner = "haiwen";
+    repo = "seafile";
+    rev = "v${version}";
+    sha256 = "05swp7sjp7pzgp8hjjr2prg0wq213l04iyqdfwwasdczdx6j6g59";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
@@ -18,13 +20,6 @@ stdenv.mkDerivation rec {
     "--disable-console"
   ];
 
-  postInstall = ''
-    # Remove seafile binary
-    rm -rf "$out/bin/seafile"
-    # Remove cli client binary
-    rm -rf "$out/bin/seaf-cli"
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/haiwen/seafile;
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 372efec785d3d..5c2cab90df426 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.18";
+  version = "3.93.1.28";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw";
+    sha256 = "0r7fsyy074xd63p58fin3qsfq1535wafk0nag49551915hgdr18n";
   };
 
   preferLocalBuild = true;
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
index c01fb7f15dd95..99ca221f5ba2d 100644
--- a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
+++ b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gtk-engine-bluecurve-1.0";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2";
+    url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2";
     sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
   };
 
diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix
index 9870b3fefebb2..e6096ef829d01 100644
--- a/pkgs/misc/themes/jade1/default.nix
+++ b/pkgs/misc/themes/jade1/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "theme-jade1-${version}";
-  version = "3.2";
+  version = "3.3";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "theme-jade-1";
     rev = "v${version}";
-    sha256 = "0lf8cawn2s2x1b9af0cznhqzx3dsr8h18srcwjz7af3y5daxf311";
+    sha256 = "06w06dvzs1llmzpyz3c5yycsw3gslsgikalfcq5l92d72z4kzfw7";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9486a504ac39a..2a628e0cdf496 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,16 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+{ stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig
 , armTrustedFirmwareAllwinner
 , hostPlatform, buildPackages
 }:
 
 let
-  # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
-  sunxiPatch = fetchpatch {
-    name = "sunxi.patch";
-    url = "https://github.com/u-boot/u-boot/compare/v2018.05...dezgeg:2018-05-sunxi.patch";
-    sha256 = "1dfv4s1f71iv80vjxgyghv4pcwjv4mjphk75a8hfl3jdbpd66d36";
-  };
-
   buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
@@ -21,25 +14,17 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2018.05";
+    version = "2018.07";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad";
+      sha256 = "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z";
     };
 
     patches = [
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch1.patch;
-        sha256 = "0xvw16mp6mm36987rd5yb8bw0n5b3p1gq35wch2gbj15wx55450p";
-      })
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch2.patch;
-        sha256 = "0q1a5l5rfgddncxrjk59qr1f5587dwbvcf6z15bsfl2invs19m2b";
-      })
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
-        sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
+        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-07.patch;
+        sha256 = "096zqrlr8m9lxjma0iv7y6x78qswfs3q1w2irjkbmcvniz1azbs8";
       })
       (fetchpatch {
         url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
@@ -51,7 +36,7 @@ let
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc openssl python2 swig ];
+    nativeBuildInputs = [ bc bison dtc flex openssl python2 swig ];
     depsBuildBuild = [ buildPackages.stdenv.cc ];
 
     hardeningDisable = [ "all" ];
@@ -155,6 +140,12 @@ in rec {
     '';
   };
 
+  ubootNovena = buildUBoot rec {
+    defconfig = "novena_defconfig";
+    extraMeta.platforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot.bin" "SPL"];
+  };
+
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
@@ -174,7 +165,6 @@ in rec {
   };
 
   ubootPine64 = buildUBoot rec {
-    extraPatches = [sunxiPatch];
     defconfig = "pine64_plus_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
@@ -230,7 +220,6 @@ in rec {
   };
 
   ubootSopine = buildUBoot rec {
-    extraPatches = [sunxiPatch];
     defconfig = "sopine_baseboard_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index 125df39ae8a64..df13c15562ddd 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An operating function";
-    homepage = http://urbit.org;
+    homepage = https://urbit.org;
     license = licenses.mit;
     maintainers = with maintainers; [ mudri ];
     platforms = with platforms; linux;
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 163a1a9867600..68d0bb69b343b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,5 +1,5 @@
 # TODO check that no license information gets lost
-{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby
+{ fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
 , which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, rustracerd, fzf, skim
 , python3, boost, icu, ncurses
@@ -7,7 +7,7 @@
 , pythonPackages, python3Packages
 , substituteAll
 , languagetool
-, Cocoa ? null, git
+, Cocoa, CoreFoundation, CoreServices
 }:
 
 let
@@ -161,17 +161,6 @@ rec {
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
 
-  # do not auto-update this one, as the name clashes with vim-snippets
-  vim-docbk-snippets = buildVimPluginFrom2Nix {
-    name = "vim-docbk-snippets-2017-11-02";
-    src = fetchgit {
-      url = "https://github.com/jhradilek/vim-snippets";
-      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
-      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
-    };
-    dependencies = [];
-  };
-
   fzfWrapper = buildVimPluginFrom2Nix {
     name = fzf.name;
     src = fzf.src;
@@ -187,28 +176,57 @@ rec {
   LanguageClient-neovim = let
     LanguageClient-neovim-src = fetchgit {
       url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "fbc46862af7fa254f74f1108149fd0669c46f1ad";
-      sha256 = "1wrrmikriyw8an8hn7240igcaca9a0ykh1j0dfy45kslxkmqkk3r";
+      rev = "5015aa164dc9ad96a0f5fbadaf92a888d16bc0d9";
+      sha256 = "1b3916al2y4hxmmlhqxw4cdliyd42xahc7wmgm8yq1gbvzbhdafg";
     };
     LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
       name = "LanguageClient-neovim-bin";
       src = LanguageClient-neovim-src;
 
-      cargoSha256 = "0c2sklpvab63a1f1mhcq9abq5m2srkj52ypq7dq44g8ngn2a05ka";
+      cargoSha256 = "1vafyi650qdaq1f7fc8d4nzrv1i6iz28fs5z66hsnz4xkwb3qq9w";
+      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
+      # FIXME: Use impure version of CoreFoundation because of missing symbols.
+      #   Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable"
+      preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+        export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
+      '';
     };
   in buildVimPluginFrom2Nix {
-    name = "LanguageClient-neovim-2018-03-06";
+    name = "LanguageClient-neovim-2018-06-12";
     src = LanguageClient-neovim-src;
 
     dependencies = [];
     propogatedBuildInputs = [ LanguageClient-neovim-bin ];
 
     preFixup = ''
-      substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \
-        --replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']"
+      substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \
+        --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'"
     '';
   };
 
+  # do not auto-update this one, as the name clashes with vim-snippets
+  vim-docbk-snippets = buildVimPluginFrom2Nix {
+    name = "vim-docbk-snippets-2017-11-02";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-snippets";
+      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
+      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
+    };
+    dependencies = [];
+  };
+
+  # missing dependency, using additional-nix-code results in an invalid expression
+  vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimshell-vim-2018-06-02";
+    src = fetchgit {
+      url = "https://github.com/shougo/vimshell.vim";
+      rev = "03bf7673a5098918a533000d67dca97546695237";
+      sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi";
+    };
+    dependencies = [ "vimproc-vim" ];
+  };
+
   # --- generated packages bellow this line ---
 
   vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -223,11 +241,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2018-03-02";
+    name = "vim-autoformat-2018-05-28";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79";
-      sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf";
+      rev = "3c50ddb50635f7899b4339a64bc02333cdd24a4b";
+      sha256 = "1zw7b3zxgsmj149z238qx2palqysdywqgsxgj2z37kc8is8dpdpy";
     };
     dependencies = [];
 
@@ -260,11 +278,11 @@ rec {
   };
 
   julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "julia-vim-2018-03-27";
+    name = "julia-vim-2018-05-07";
     src = fetchgit {
       url = "https://github.com/JuliaEditorSupport/julia-vim";
-      rev = "4593c8b1ffe20022677e524487c8554d96cf8f84";
-      sha256 = "0yrdzkxyg6cg2i4bd6bqbq0w63hssh3nd0f0qnfl7v5pkq9yba4w";
+      rev = "3b8e8f9b03c4ffa415fb715406231efbbd1dfdd6";
+      sha256 = "1dnhawb73c89x58nl0iqhn1rvyw0wrhmvfkxdsh40rnpdbjkyrcn";
     };
     dependencies = [];
 
@@ -545,22 +563,22 @@ rec {
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-04-16";
+    name = "deoplete-nvim-2018-06-17";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "0d48792663437d81bdfa195c676d5c37ef10c89a";
-      sha256 = "1zqrxxi7ci1mp5ml7nayj3crzpqgdl09q20wilp68kf2mvll28xi";
+      rev = "62078d04aea43aceb7cbdcfc4b22cf8f7767f614";
+      sha256 = "1gc6hl3yi7h2mzw2sf1phnaphwmalyfqd6lfzmzq0lzf111mq9r3";
     };
     dependencies = [];
 
   };
 
   ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ultisnips-2018-04-16";
+    name = "ultisnips-2018-04-30";
     src = fetchgit {
       url = "https://github.com/SirVer/ultisnips";
-      rev = "905e5249246169b6db2bb060e0a2b06eac1890e6";
-      sha256 = "025b2f4gs04qb6wnxa0yclwm5jysdj6q10i2zkbiclvblfbxxv19";
+      rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba";
+      sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3";
     };
     dependencies = [];
 
@@ -578,11 +596,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-04-11";
+    name = "vim-gitgutter-2018-06-01";
     src = fetchgit {
       url = "https://github.com/airblade/vim-gitgutter";
-      rev = "5481318fc1b97e7c04eab5496ec45c63335d6bc1";
-      sha256 = "1jwqxkaqvkmdqi9k9nx25xz28av374a70izs0534hx12crgg8g3w";
+      rev = "a986ab054788776dca269d6c289b470255d54e8c";
+      sha256 = "0c0rjclqz8l1w1q6dfa2sxc67ns9vvg6q7yy2l0s5p7159d423iy";
     };
     dependencies = [];
 
@@ -622,11 +640,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2018-03-09";
+    name = "vim-closetag-2018-05-15";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "aa14c2c1e7da4112e46ef6b287cacdd7af96da6f";
-      sha256 = "058z8dzqki3idv7r5654xd91wplhhnsa2l533rszmkzji3hj2why";
+      rev = "17367f433e095a66a8a885ab628033ce2a635aa1";
+      sha256 = "11qkk1vsihw2sv1vdn94xjwm2p5hvisjv5h1arpdyxpnz45rs6vh";
     };
     dependencies = [];
 
@@ -698,6 +716,17 @@ rec {
 
   };
 
+  dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "dhall-vim-2018-06-04";
+    src = fetchgit {
+      url = "https://github.com/vmchale/dhall-vim";
+      rev = "290c2ec86b5c3d35dd3913cbb6ab9d2139074e38";
+      sha256 = "03jhcaz6r2lbd4drc8acc9kv2k0287nzvw7lyl36jjkk3qy4c499";
+    };
+    dependencies = [];
+
+  };
+
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "clighter8-2018-04-15";
     src = fetchgit {
@@ -713,11 +742,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-04-17";
+    name = "neomake-2018-06-02";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "df72c7a2f1bdcc08b5dbcd86f165fe7cd5eb6e1f";
-      sha256 = "1vlc0irqkl27dyh52wci36fcj80a67fcb9q9cpcbr94lwh4l7l26";
+      rev = "ed2d2069ef7d2e919fc73c993a2c99a05d12d79e";
+      sha256 = "1sf1ad8qzya8vkj8kdkkd204hs0fn7wh3ar9wv4nq1ks7v2y2855";
     };
     dependencies = [];
 
@@ -746,33 +775,33 @@ rec {
   };
 
   vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-toml-2018-03-06";
+    name = "vim-toml-2018-06-15";
     src = fetchgit {
       url = "https://github.com/cespare/vim-toml";
-      rev = "624f02475080ea26d9430b8d31d7c3199b0ec939";
-      sha256 = "0frjdv50rhd3awrddq25x4l22ca15i5587pgcmvwxz92y52484lx";
+      rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80";
+      sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n";
     };
     dependencies = [];
 
   };
 
   denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-extra-2018-03-18";
+    name = "denite-extra-2018-06-02";
     src = fetchgit {
       url = "https://github.com/chemzqm/denite-extra";
-      rev = "c48443ba1a27375b8a3c04b7b0a5b2c96c7ff62b";
-      sha256 = "142s6c4af7h0jrnyl0smflg2wmkwsvhvly04rci3p54x59w7xdc5";
+      rev = "54c2df37a2fa53e3caed4ad7391f85ff6dc7f0b1";
+      sha256 = "0rsgd302h3rml98a9ddkaglp157av6yhbfbmc5i781k5pz003vvg";
     };
     dependencies = [];
 
   };
 
   denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-git-2018-03-20";
+    name = "denite-git-2018-06-05";
     src = fetchgit {
       url = "https://github.com/chemzqm/denite-git";
-      rev = "d1feb1470f667a5086ae45136642cefa5fc74810";
-      sha256 = "001mwa6691a46lv9m9w8gb2syxgsny6ifv4l80f1chb7hjkblkhh";
+      rev = "dfc8c8977133b2e00efa2d5add7ff05c36b2c1a3";
+      sha256 = "1p4y22wwxvhxbgavandlld2rp2204g7vr162y0vsc0dm9lygvvm6";
     };
     dependencies = [];
 
@@ -812,11 +841,11 @@ rec {
   };
 
   csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "csv-vim-2018-04-15";
+    name = "csv-vim-2018-06-12";
     src = fetchgit {
       url = "https://github.com/chrisbra/csv.vim";
-      rev = "5ca39450e6d40265086d929ff82ca2c9566fdc68";
-      sha256 = "0i6j6c6027vpdcjq6znmkbdbbsdgwqb89jswkyhyx7ff3lwmzryq";
+      rev = "eddfe4d553d2d25ffcf294e225717ddf9ae4c357";
+      sha256 = "1074x0gycwaivadsa6g7mfhdf9rvyirhsfipby2pcvjrkbzvmz7j";
     };
     dependencies = [];
 
@@ -845,11 +874,11 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-07-07";
+    name = "vim-tmux-navigator-2018-05-17";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "d724094e7128acd7375cc758008f1e1688130877";
-      sha256 = "1n0n26lx056a0f8nmzbjpf8a48971g4d0fzv8xmq8yy505gbq9iw";
+      rev = "d030f75e2932605cfc1417ca2ebb3fd5192c2a8e";
+      sha256 = "1qfkzlg7g4ri54fhxnwwvh2xsm0hcnfxav7chdw10z3g984nzb1a";
     };
     dependencies = [];
 
@@ -867,11 +896,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2018-04-10";
+    name = "ctrlp-vim-2018-06-11";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "4b9e7cac612902a25498cca49f13475fe1a821a4";
-      sha256 = "1wa2kxiwipnxwd19gyv6grgqn0ms6zdxsj2xg80whkk3namlgg7m";
+      rev = "306bc60a1bed48cee895623d03c87d84d00764b6";
+      sha256 = "1ylzg9wjc1m4jgi6p3wk9nbip16cfhhgcbavly394j9w4zn3zdwy";
     };
     dependencies = [];
 
@@ -900,11 +929,11 @@ rec {
   };
 
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "agda-vim-2018-03-16";
+    name = "agda-vim-2018-05-23";
     src = fetchgit {
       url = "https://github.com/derekelkins/agda-vim";
-      rev = "911a9695f550b47e4dedbe8a3dd1b6a9a745fe52";
-      sha256 = "1bmi3d39hllrsnsy37dxhziffvs9qzns631gd9psk6xgcchkan7n";
+      rev = "24169e70c1dbd784349b1551b6a3753680d9bb87";
+      sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6";
     };
     dependencies = [];
 
@@ -922,11 +951,11 @@ rec {
   };
 
   vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-table-mode-2018-03-22";
+    name = "vim-table-mode-2018-05-16";
     src = fetchgit {
       url = "https://github.com/dhruvasagar/vim-table-mode";
-      rev = "e646bee5c45201b52f8f879eddf84b5c2e360e98";
-      sha256 = "1kaszrik5mqrvavl0lzfy9i0r3b2vf1jmjxp23azy0jfanflrxwa";
+      rev = "5483e163bd0a67e729e0e8436315f33f9e126baf";
+      sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw";
     };
     dependencies = [];
 
@@ -955,11 +984,11 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-04-13";
+    name = "vim-2018-05-31";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "7668d800a20c1f180bb49655d98378f2605ad616";
-      sha256 = "07xcqickvw22yx5b91blvb463jn5dpn3drzf8y0nmpz08kfs4qfc";
+      rev = "23e76f31abae2d3e090fcc25fbfcd8d8c9edd3bd";
+      sha256 = "0zj749kc65dgqhsan65wagqlq45hg68m7qs07h1r12csfrr3r8x7";
     };
     dependencies = [];
 
@@ -988,11 +1017,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2017-08-17";
+    name = "neco-ghc-2018-05-13";
     src = fetchgit {
       url = "https://github.com/eagletmt/neco-ghc";
-      rev = "faa033c05e6a6470d3d780e3931b4c9c72042009";
-      sha256 = "01l5n4x94sb6bhjhjx2sibs8gm3zla7hb6szdfgbdmdf7jlzazak";
+      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
+      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
     };
     dependencies = [];
 
@@ -1032,22 +1061,22 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2018-04-16";
+    name = "vim-elixir-2018-05-25";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "36e54e1cf965d92f251ead359207d4a7b04cfdf2";
-      sha256 = "0y296falc5l6k52vpw1f0bwzxgdbdjiljjg394s472228mnb2r3p";
+      rev = "b916c00a7cdb6099dbebb6096eab55794751e2b3";
+      sha256 = "1scg80j7kjjqfcswddwsig166zmipa9q6rm0kh8779i7qflgg4g0";
     };
     dependencies = [];
 
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2017-07-09";
+    name = "elm-vim-2018-06-16";
     src = fetchgit {
       url = "https://github.com/elmcast/elm-vim";
-      rev = "ae5315396cd0f3958750f10a5f3ad9d34d33f40d";
-      sha256 = "0a85l0mcxgha4s5c9lzdv9y2c1ff942y9a5sfjihz6sph21c77xp";
+      rev = "e7c2f9ce36e69608c2f289f75e22d068255eac1f";
+      sha256 = "022xan3ss4rrfhdsz9dd5n6avk4nf6lxqqbgpx9v4lrnqy01dhd8";
     };
     dependencies = [];
 
@@ -1087,11 +1116,11 @@ rec {
   };
 
   ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ensime-vim-2017-08-27";
+    name = "ensime-vim-2018-04-21";
     src = fetchgit {
       url = "https://github.com/ensime/ensime-vim";
-      rev = "d992b971a84afdfb2d99896d8aed537030e09a80";
-      sha256 = "1rhrq3zplvpyli1ymqjmhq91p61ixpjz1v5xf68nvq4ax50nl45z";
+      rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2";
+      sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320";
     };
     dependencies = ["vimproc" "vimshell" "self" "forms"];
     pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
@@ -1120,11 +1149,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-04-11";
+    name = "vim-go-2018-06-16";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "7491209072ed4aa746e6fe7894f976ecd251801e";
-      sha256 = "1a7fy8n9h383776jixlwxl8y3h8h5mixi0bcv4lv61x0g3xxh8gx";
+      rev = "155836d47052ea9c9bac81ba3e937f6f22c8e384";
+      sha256 = "1d16xninxwmqd6vgcjxzlqqynygb2h40lfmvwgp2cm60g2994fa3";
     };
     dependencies = [];
 
@@ -1208,11 +1237,11 @@ rec {
   };
 
   vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-codefmt-2017-03-04";
+    name = "vim-codefmt-2018-06-06";
     src = fetchgit {
       url = "https://github.com/google/vim-codefmt";
-      rev = "8bae55b45c3f030845ab636d6860cef4071915d1";
-      sha256 = "0wg0fplpwsgkbycjx1ryl29afbfzfsdv0j7xisjik26m9q8shn1k";
+      rev = "78f646545c4e1254fc413242e5c204a2dc79665d";
+      sha256 = "0ysnjsc7nybm374k039655y1wijkh8p2m0hsfxf9cxf79yjinyql";
     };
     dependencies = ["maktaba"];
 
@@ -1230,22 +1259,22 @@ rec {
   };
 
   vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-maktaba-2018-04-09";
+    name = "vim-maktaba-2018-05-06";
     src = fetchgit {
       url = "https://github.com/google/vim-maktaba";
-      rev = "77a4dcecd7d65ae2bf362bd7d9055d2806a8edf3";
-      sha256 = "0fvspd6q0dj9bqnv8xavfx7xwmg5g68r1kksfv54bbzckkhkw28w";
+      rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d";
+      sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3";
     };
     dependencies = [];
 
   };
 
   gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gitv-2017-11-26";
+    name = "gitv-2018-06-10";
     src = fetchgit {
       url = "https://github.com/gregsexton/gitv";
-      rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
-      sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
+      rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2";
+      sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn";
     };
     dependencies = ["fugitive"];
 
@@ -1263,11 +1292,11 @@ rec {
   };
 
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2017-12-18";
+    name = "vim-jsdoc-2018-05-05";
     src = fetchgit {
       url = "https://github.com/heavenshell/vim-jsdoc";
-      rev = "a164cb4c14b9063e82b6ccba96b4bc8b3a6d8f73";
-      sha256 = "0f4hj2vd4l4rprizkg64q6dmm86f5yc9gk554a6f4kpagw2w9y76";
+      rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503";
+      sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm";
     };
     dependencies = [];
 
@@ -1285,11 +1314,11 @@ rec {
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2018-04-16";
+    name = "vim-snippets-2018-06-11";
     src = fetchgit {
       url = "https://github.com/honza/vim-snippets";
-      rev = "d081fa5117acdd972bd0a3ec1c0424e79ef6121e";
-      sha256 = "0wrm5f15lf6hlyv9ca2a8jil14647acicsmaq34nr11gd375bvvc";
+      rev = "62f46770378ab899f40c334de264ccd64dc2db57";
+      sha256 = "1g55qhy81dh9x5rkzij3k7ain561gz1amyvg69cq44n6d7pz798h";
     };
     dependencies = [];
 
@@ -1340,11 +1369,11 @@ rec {
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2018-04-14";
+    name = "lightline-vim-2018-05-19";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "e54d2ae512c9c081bfff9303cb22ffa94ed48ba3";
-      sha256 = "042sfdwj46yv0bmf0cm5vm24j197isc3asdj4ymxzh5d6jy2i5qb";
+      rev = "555f202e33987863aaa31bf4df75ef989c3c49a7";
+      sha256 = "0997k1wzlclwf4y70mv5zncv6vp9xdwgp5q7nickw6j9qf86gb84";
     };
     dependencies = [];
 
@@ -1395,11 +1424,11 @@ rec {
   };
 
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-test-git-2018-04-16";
+    name = "vim-test-git-2018-05-30";
     src = fetchgit {
       url = "https://github.com/janko-m/vim-test.git";
-      rev = "61dbd5621bcf0fe74c1008083d7f103f041fc7c7";
-      sha256 = "0r5nxspznniviy0j89pmvksgvyzrzvx1qivabbcds7i62vqrxyw0";
+      rev = "062c489781c995f7e81103fec8a3c07bd2ff1f4b";
+      sha256 = "0q4rnaqf5c979h10pacxxn7h3zv4zs9lf7f3z90avnlarh1sjvvx";
     };
     dependencies = [];
 
@@ -1428,11 +1457,11 @@ rec {
   };
 
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2017-02-05";
+    name = "vim-buffergator-2018-05-02";
     src = fetchgit {
       url = "https://github.com/jeetsukumaran/vim-buffergator";
-      rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
-      sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
+      rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916";
+      sha256 = "1b6sw5858h3v7p46v1fiy06jnfwiwqsfqwhr46ia12d0rfdm538c";
     };
     dependencies = [];
 
@@ -1472,22 +1501,22 @@ rec {
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2017-07-04";
+    name = "vim-nerdtree-tabs-2018-05-05";
     src = fetchgit {
       url = "https://github.com/jistr/vim-nerdtree-tabs";
-      rev = "47bbe5afc26f701f08d31b2bbdb660f117367ded";
-      sha256 = "0a1gqdvmpa4gylnb7sxs6zr89i60fl16p477200x18hgh2zd2v02";
+      rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b";
+      sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa";
     };
     dependencies = [];
 
   };
 
   zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zenburn-2015-09-18";
+    name = "zenburn-2018-04-29";
     src = fetchgit {
       url = "https://github.com/jnurmine/zenburn";
-      rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179";
-      sha256 = "1las12jznf25dkxrjk3s9l70c6wnpjisngmvi83bhw5gvx4c7mq5";
+      rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd";
+      sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi";
     };
     dependencies = [];
 
@@ -1516,11 +1545,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-04-17";
+    name = "fzf-vim-2018-05-28";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "bbda33b402d92d43c75827bd54ee1932cf03a7b6";
-      sha256 = "02f16kdgs1ahsja84ls1zpjidcg1yx1bhpp39fd7zqqvzw16mf1q";
+      rev = "ce82e10630830bc37a50f706cc3b7216d24e5009";
+      sha256 = "081r1a4zqcr46rb4d39m8yj2dq1kiadh7n2iv7gxaqqldhx0p8pb";
     };
     dependencies = [];
 
@@ -1714,11 +1743,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-04-15";
+    name = "vimtex-2018-06-17";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "a7fc6f62e8234fc0696cfe4325153e922e2fddd5";
-      sha256 = "0bvv9k3zqdmvh80mwhrzxwjacrfq1x56ba7yqndggygfxb3l17mf";
+      rev = "13474370fa0cc5e547abd6f40a9b6fddf2712ae4";
+      sha256 = "1rwj8i5k8xaa466ld1p5nxsvfk3g20g42l2xqa60s6jmjicn7km5";
     };
     dependencies = [];
 
@@ -1736,11 +1765,11 @@ rec {
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2017-10-20";
+    name = "vim-easymotion-2018-06-05";
     src = fetchgit {
       url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "342549e7a1e5b07a030803e0e4b6f0415aa51275";
-      sha256 = "1glv4s95v8xxj47n0jzjxd0pxphnnpgzyd384d2bh0ql1xgf320v";
+      rev = "1a0244c90c3ff46219cf9597bb13662be4232407";
+      sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy";
     };
     dependencies = [];
 
@@ -1758,11 +1787,11 @@ rec {
   };
 
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow-2017-04-21";
+    name = "rainbow-2018-06-14";
     src = fetchgit {
       url = "https://github.com/luochen1990/rainbow";
-      rev = "1c45e0f81324641b23d4c21edda4eabeacba031b";
-      sha256 = "143bkawg4sy1vbizfwb6p9alizyr80sr6incxrz179l9dp9r8frf";
+      rev = "e7d115792f2a6bf6248d3f84a9025ae5e759868e";
+      sha256 = "0zd7dcbrn7djx3nqnf8kkz8wzxcjla2b3bzqg2j7v9bjb3x3vdfl";
     };
     dependencies = [];
 
@@ -1784,11 +1813,11 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2018-04-17";
+    name = "vim-highlightedyank-2018-06-01";
     src = fetchgit {
       url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "6387f7cc3b768300d1fcf82d367dbcb8d16b6230";
-      sha256 = "1ldyiy3qlxnxqkqa9yv39y5xkm7gma5gjy6nccqxxxjpjlyj39hb";
+      rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a";
+      sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk";
     };
     dependencies = [];
 
@@ -1894,33 +1923,33 @@ rec {
   };
 
   vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grepper-git-2018-04-13";
+    name = "vim-grepper-git-2018-04-24";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-grepper.git";
-      rev = "27e73cfa7970bf38fe9037c0053a2edbb622b000";
-      sha256 = "1hy9rjvfgry9426gflw4k5qmwzmijwg3gzmmzavf7m7sagl101kd";
+      rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4";
+      sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2018-04-17";
+    name = "vim-signify-2018-05-03";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-signify";
-      rev = "8351e5212f9415ccc1d9696518e1ec4337ad539f";
-      sha256 = "12gix280mmsgn1z1ihbvzh67xqribrc39h670fzyn6302dzb05p0";
+      rev = "a1551dbae3b76035360b2ea2b38555194505d925";
+      sha256 = "0wcfdcvbpl6hknsmzmpj86kbw1mfbfc55fza6kwad0lsw9ff5cix";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2018-04-10";
+    name = "vim-startify-2018-06-14";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "532f3db6be8c6e123abb3f6523c419b6b19436da";
-      sha256 = "19inxsafsivdwgdvw59x3dbx65xkb09q0k2p66q4n57fj60bajmb";
+      rev = "0b300f411f466f14f6832b3c97b7fb109f7b1ee3";
+      sha256 = "0qjd2bnag4rr29yjkrxrzpkvfkb0912g2virj5rr26bbf8ya6s5q";
     };
     dependencies = [];
 
@@ -1949,11 +1978,11 @@ rec {
   };
 
   vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-yapf-2017-03-21";
+    name = "vim-yapf-2018-06-05";
     src = fetchgit {
       url = "https://github.com/mindriot101/vim-yapf";
-      rev = "324380d77c9cf8e46e22b2e4391702273a53f563";
-      sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw";
+      rev = "cae79733a1a39732c5305d4a89cd093d17cb917d";
+      sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc";
     };
     dependencies = [];
     buildPhase = ''
@@ -1996,11 +2025,11 @@ rec {
   };
 
   vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-guides-2017-07-03";
+    name = "vim-indent-guides-2018-05-14";
     src = fetchgit {
       url = "https://github.com/nathanaelkane/vim-indent-guides";
-      rev = "b40687195c01caf40f62d20093296590b48e3a75";
-      sha256 = "17hc3bdb707lkg0kyac2czjjijdrzarnh6sr78s9rqpwrj3fj4i4";
+      rev = "54d889a63716ee2f1818aa2ec5082db47147147b";
+      sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2";
     };
     dependencies = [];
 
@@ -2018,22 +2047,22 @@ rec {
   };
 
   vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easygit-2018-04-02";
+    name = "vim-easygit-2018-05-15";
     src = fetchgit {
       url = "https://github.com/neoclide/vim-easygit";
-      rev = "db10f7bbe0106c7b74875d4530f0c20e6aceee51";
-      sha256 = "194mgkyqxn4s8mj8gwkjznixm7kbpzhawr6f0bphk6bc5llphnkr";
+      rev = "ada670f87f269e431b72cd7d63727683c46f3b4b";
+      sha256 = "0shj52jzkhq89kw9wg4p89f1aidn9c0h6ishq56pdzzmqnjgzkdr";
     };
     dependencies = [];
 
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2018-04-13";
+    name = "haskell-vim-2018-05-22";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "e027b314df128979dbd00dd94c9db080db156b5c";
-      sha256 = "13dx1ifwa444q8zkwda4qha74xjm4jfhhk9lbgbj9p1mj7gvbl7f";
+      rev = "b1ac46807835423c4a4dd063df6d5b613d89c731";
+      sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br";
     };
     dependencies = [];
 
@@ -2107,44 +2136,44 @@ rec {
   };
 
   vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-javascript-2018-04-06";
+    name = "vim-javascript-2018-06-12";
     src = fetchgit {
       url = "https://github.com/pangloss/vim-javascript";
-      rev = "c99c96bdf12b5a5749c9bbdb977b070e14c15eb3";
-      sha256 = "1lyiy7vfkliw91j6mvq77n4221fws6hkv0az362r32114d97309l";
+      rev = "935125e2c481a65d344b11ddfdb2e5f903e24e72";
+      sha256 = "1n4cij2in9i4f6mcj7wn9zn9i4xmxcrf6yn00bacx4f51l6qhhkr";
     };
     dependencies = [];
 
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2018-03-23";
+    name = "vim-markdown-2018-06-05";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "8ace66328c7a2f416671b863cd842712d36c53cc";
-      sha256 = "09pcxwwblq2bwdrq6qa42hw7sllgym42n7gb8igg6p9krkwvjx7s";
+      rev = "6d2cb3c06cd546fd4bee4136679db3a3d5de97fa";
+      sha256 = "17izjzgpwpl6i1vvz2hcd7ympgxyjmsb0k62rhvl15jmx06c3ysz";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2018-04-09";
+    name = "python-mode-2018-06-13";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "5308d0cc241080057a58c1772ebd254f2922998d";
-      sha256 = "1pkwhl9ab1fybc4sp5721xzlrzhzigf34w8zlmxby8v4nvmb8ggq";
+      rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6";
+      sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-10-15";
+    name = "vim-racer-2018-05-13";
     src = fetchgit {
       url = "https://github.com/racer-rust/vim-racer";
-      rev = "da725d38a6f0dd223771018c05e62a33c4a92f09";
-      sha256 = "16m9iw6x6wr26ilm72vwjsm9p346hbjd6md62mqk6ranln8rdirp";
+      rev = "cd663ddacc89fb3cbbb9649f7cd36528960b1fe9";
+      sha256 = "1k75ypgiy13l28mndi6p95lc818k04imlm7xk0y9sck8bsny1vhi";
     };
     dependencies = [];
 
@@ -2195,11 +2224,11 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2018-04-16";
+    name = "vim-grammarous-2018-05-19";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "fc7e73f2af96fb1745887dabde9bf8b945d0273d";
-      sha256 = "0zfnbdsva140hc50s4fr1as5c1mn3hfm43x53sk50fylb51r9hr7";
+      rev = "058db30bbd88e23fceb2f6364d9b22803d7c4c0d";
+      sha256 = "1l2vhfsb0lhr5j77r8lgqnqgs9h9kdhw9bla1lj27xi0njbl4kql";
     };
     dependencies = [];
     # use `:GrammarousCheck` to initialize checking
@@ -2248,11 +2277,11 @@ rec {
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-completion-manager-2017-12-28";
+    name = "nvim-completion-manager-2018-04-18";
     src = fetchgit {
       url = "https://github.com/roxma/nvim-completion-manager";
-      rev = "e724a442072261993ca503e969d2cb25722ab1d2";
-      sha256 = "00q52vl06hgcinclszm21a3rx7ivc147p52w1p29icksc26yxhjb";
+      rev = "3ef5ade36e7321aace4e9e22da216202bdcd65f1";
+      sha256 = "0vfcnvdcxhs3in4pwcqjb5h3ns7ik53n4xb1h9r94w1gfw00lh1l";
     };
     dependencies = [];
 
@@ -2270,22 +2299,22 @@ rec {
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2018-03-14";
+    name = "vim-devicons-2018-05-19";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "390b0142f1b6f02bdecc4867009e83c9ecc01db2";
-      sha256 = "1pzvhdcgyp85xx858a7i357d3xymrd0y2afwfpnsrhz35fsaw96z";
+      rev = "8ee4c8cdef4f6ea0f27b341ac077c303d0e57a90";
+      sha256 = "1mfkg9miqg42qmzamlkhjc3mlqcri69d1pj6cs4kz3bdl7326ww6";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2018-04-07";
+    name = "neoformat-2018-06-01";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "77c2c007508823f353f75a6b525d63ae21e55e82";
-      sha256 = "1xrvbkc8y40dgyiq5jnp0nhg19mh7m7v902hb9z3lkl6fsbcwbmb";
+      rev = "ebe9ed941aea254e5fc6c3e2a0219054ff873e4b";
+      sha256 = "0la3nvyi8kmp8pq6pkbhjc35wg6g28f903y7bz4igsajl37nijm1";
     };
     dependencies = [];
 
@@ -2303,22 +2332,22 @@ rec {
   };
 
   nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdtree-2018-04-10";
+    name = "nerdtree-2018-06-15";
     src = fetchgit {
       url = "https://github.com/scrooloose/nerdtree";
-      rev = "727770147a7589ab3a06722f4852c0237c8b3549";
-      sha256 = "105vgwy7qs6l92dm6kfby7lmxv35v2hbpjk9z5sr0qak5rad4m6c";
+      rev = "d6032c876c6d6932ab7f07e262a16c9a85a31d5b";
+      sha256 = "0s7z60rcdkziqqjc45adfqykpznv7aagfyfi5ybsxi5w4b8f2b9s";
     };
     dependencies = [];
 
   };
 
   syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "syntastic-2018-04-17";
+    name = "syntastic-2018-06-15";
     src = fetchgit {
       url = "https://github.com/scrooloose/syntastic";
-      rev = "d31e270cc8affc6338a9ed44e2efcaec0ca4cd34";
-      sha256 = "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57";
+      rev = "9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a";
+      sha256 = "1765ish9vdm7abm7c45z4h4v1xdhfis7igm5yc3m5h7im33gl7j2";
     };
     dependencies = [];
 
@@ -2336,11 +2365,11 @@ rec {
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2018-04-03";
+    name = "vim-polyglot-2018-06-05";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "cab6866e21341cab7419cdb4ae1fd18437d31bb0";
-      sha256 = "17mizznm80yj5vz6vajwix8m8xmsn552lph5vmic5dpg7bcny6m6";
+      rev = "33f610feb73ce782cf41a7d9a377541991c692b5";
+      sha256 = "0sqsarrvy8flxlp0nj5782gzqvk3v6c7r6234pbpjwqga967h0fd";
     };
     dependencies = [];
 
@@ -2358,11 +2387,11 @@ rec {
   };
 
   denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-04-14";
+    name = "denite-nvim-2018-06-11";
     src = fetchgit {
       url = "https://github.com/shougo/denite.nvim";
-      rev = "c0c75a752577399be53aa7a7e235e6ff5387494c";
-      sha256 = "1zbf2f0w02q8jwr824l6v0pxbc620rwfsah6mxyqbr5mxddcf1v6";
+      rev = "ef3ffe7ffff25b0260be1e336dcd55014a6787a7";
+      sha256 = "1zvin44fb9b11dciv1i14pwr3wc6yigsr4xmcg3gzaibr4mpng6b";
     };
     dependencies = [];
 
@@ -2413,11 +2442,11 @@ rec {
   };
 
   neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoinclude-vim-2018-02-12";
+    name = "neoinclude-vim-2018-05-22";
     src = fetchgit {
       url = "https://github.com/shougo/neoinclude.vim";
-      rev = "b63757822e0c31db04b32f0ca6bab01a560c2498";
-      sha256 = "1q2pbvl0xspjzwnisnrmv6w9wq289avzz2248hnm0v20rxvy5lwj";
+      rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a";
+      sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg";
     };
     dependencies = [];
 
@@ -2435,22 +2464,22 @@ rec {
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2018-04-15";
+    name = "neosnippet-snippets-2018-06-17";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "f453635c60998071299c3239c3d881f2be0c248e";
-      sha256 = "1df6mzk5yjhjlmzgz7lr9aa69a973mzfxmwldqnpi6yjfnmjn04c";
+      rev = "e5946e9ec4c68965dbabfaaf2584b1c057738afd";
+      sha256 = "114w2vm28075bz85867lz0rzam1m0wk7dkbkm1lm0jbknbpk606n";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2018-03-12";
+    name = "neosnippet-vim-2018-06-17";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "8cf286e3bf7a5fc859f4c5f1bef52c351f24fefa";
-      sha256 = "15mxckg5s9pjfm7xkhs4awx0vpmwdwwifqrvrh1r4mbia39pk6ry";
+      rev = "978ef36165e83ba1f8ee0a2047b6c923f7842d33";
+      sha256 = "083jfdwadjdv2pwbxmwz8m384m023zvzdszjnn6qkbgwimx5ga7m";
     };
     dependencies = [];
 
@@ -2479,11 +2508,11 @@ rec {
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2018-04-14";
+    name = "unite-vim-2018-06-17";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "7252fc334ed24722ad70867ba9e4aba125b611d7";
-      sha256 = "0r2na9i15qfmshzk0wr845nyn8h8mpbkz5xanjibsch2xz6fps76";
+      rev = "c175ba7df239a5971e4c189ecbc9486b160fbde2";
+      sha256 = "16j5vhmqs04y5rps5g86bgpf91w067gyw9rz47hf0y0a52niy436";
     };
     dependencies = [];
 
@@ -2508,16 +2537,6 @@ rec {
     '';
   };
 
-  vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2016-12-14";
-    src = fetchgit {
-      url = "https://github.com/shougo/vimshell.vim";
-      rev = "d0c5bef010237855b4de25863bc54895effe5d7a";
-      sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz";
-    };
-    dependencies = [ "vimproc-vim" ];
-  };
-
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "gundo-vim-2017-05-09";
     src = fetchgit {
@@ -2530,11 +2549,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2018-03-22";
+    name = "alchemist-vim-2018-04-23";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "fdc880663e0d76d29d6310553ae12d51565f692d";
-      sha256 = "03p5cw5j1j6v3x9gg61d95qzcijj1q0yqz5qdkjgll0fp507j8ak";
+      rev = "d15033ce1b94aa1e6ba11c1bf1249d9680b24a45";
+      sha256 = "0b0r236ah56zax7s095wq18j6bvfp267a3nfrndnszihwh7h2v1j";
     };
     dependencies = [];
 
@@ -2574,22 +2593,22 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2018-04-09";
+    name = "vim-multiple-cursors-2018-04-17";
     src = fetchgit {
       url = "https://github.com/terryma/vim-multiple-cursors";
-      rev = "8ae5dd3f4f344cc2abe79783a8b808e4093bf084";
-      sha256 = "0zj5dm86daqzl6f76prlfalpsb3vxxl7x1k6kza8hcbyicaxsi49";
+      rev = "b781b1461bd4b346958309e1733a9d6ad1a66b6c";
+      sha256 = "0hadbp2yj0kzcwj5rp18diq3b24xgxn46n7c29dgrjg91w4vagfd";
     };
     dependencies = [];
 
   };
 
   vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimpreviewpandoc-2018-04-02";
+    name = "vimpreviewpandoc-2018-05-12";
     src = fetchgit {
       url = "https://github.com/tex/vimpreviewpandoc";
-      rev = "83b0958b570dace55166f565e2d88c468d99d854";
-      sha256 = "1fa8624wxry53x62xjmglgm6kwppfcg50ifbzms555bfjsd4fxn8";
+      rev = "266d14d362f6c069863b2d63edb683e802e7e3ee";
+      sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly";
     };
     dependencies = [];
 
@@ -2618,11 +2637,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2018-04-16";
+    name = "vim-quickrun-2018-05-07";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "630ddff167e30c55d21985713ad6729adeb8e40b";
-      sha256 = "0r2gg3a8q5627n28xgyhmb6275xwvg76ghc1wdy38xdszvykh024";
+      rev = "4b493faaeb5322f11cadab52e39a53164baf9db7";
+      sha256 = "0081m3v8dg4ihxsd0rzhmrra3i6vrnpz0svgjmm689rk55dkrv5i";
     };
     dependencies = [];
 
@@ -2684,44 +2703,44 @@ rec {
   };
 
   vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-commentary-2018-04-06";
+    name = "vim-commentary-2018-05-30";
     src = fetchgit {
       url = "https://github.com/tpope/vim-commentary";
-      rev = "296d99b353261191adb7a356ee3fefbce8e6096b";
-      sha256 = "1n29rbgm2464byncmgxbvyizmag1gzswg00nfg2387nwprmpg7zj";
+      rev = "7f2127b1dfc57811112785985b46ff2289d72334";
+      sha256 = "0ck221cj0zwn19p0vlzv0vl26rjlsnfpllslrqjh5g57m5cxb8aq";
     };
     dependencies = [];
 
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-04-15";
+    name = "vim-dispatch-2018-06-02";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "f6b3e7799e6dce08869d7744aa7faa6528f065f5";
-      sha256 = "1zn6c54hlygkx348vd7kgkfpdj93vsijhc2ma42k6s7vhwqfyylg";
+      rev = "47729b7831421f20fa40a7d5b3e9b928faf18e75";
+      sha256 = "0wmvfqzw785c9bda0p4vlsavm0d59dmmnhs87jvqfijzyi2prj1l";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2018-03-16";
+    name = "vim-eunuch-2018-05-28";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "0971b4cb5c0865d3dd0316f725cd4236ff75b828";
-      sha256 = "1lw2ycgxypp0j8kyvlgn8hivqf1dj9rfrx8n7zgayy5w756g45cy";
+      rev = "e57666aa8d3a87b42c5ec429490bbf4a54f4c31d";
+      sha256 = "01sz7mhckhnwlp48rkl34cz4nkjwrkdc1rq4mbknd3yscg1w259d";
     };
     dependencies = [];
 
   };
 
   vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-fugitive-2018-04-15";
+    name = "vim-fugitive-2018-06-15";
     src = fetchgit {
       url = "https://github.com/tpope/vim-fugitive";
-      rev = "40d78f07dee2ffab68abb9d6d1a9e27843df0fe0";
-      sha256 = "16fh3n8sr57cfhfpilqhz9f3svhj4swa9yqjf4wicbw9zn40hrir";
+      rev = "d39d5ca4299569a5d1a37a511d1a5eccef71b037";
+      sha256 = "1657x01ihw96hnbnflyzxc88qpyj2lm6dnl84xs1ckzw3iqsw6ki";
     };
     dependencies = [];
 
@@ -2772,11 +2791,11 @@ rec {
   };
 
   vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sleuth-2018-03-30";
+    name = "vim-sleuth-2018-05-24";
     src = fetchgit {
       url = "https://github.com/tpope/vim-sleuth";
-      rev = "3b9df28c39f93c5ec8179d958900be1d0100b536";
-      sha256 = "10rba71hmmbgv5kfsl0lmj59z1nz7b2rr6p0dmww82zp6cyzy5j0";
+      rev = "478e495d40434fb42c655ea2881c8c6b114ecd49";
+      sha256 = "1dicdxxfd5sywk02hbpknbr100n96qggy3zy5v520dxdknq0sccz";
     };
     dependencies = [];
 
@@ -2794,22 +2813,22 @@ rec {
   };
 
   vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-surround-2016-06-01";
+    name = "vim-surround-2018-06-15";
     src = fetchgit {
       url = "https://github.com/tpope/vim-surround";
-      rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313";
-      sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46";
+      rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce";
+      sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql";
     };
     dependencies = [];
 
   };
 
   vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-vinegar-2018-04-03";
+    name = "vim-vinegar-2018-06-06";
     src = fetchgit {
       url = "https://github.com/tpope/vim-vinegar";
-      rev = "97f3fbc9596f3997ebf8e30bfdd00ebb34597722";
-      sha256 = "0y2nzvn4xxbgyjmm4mirwak4hnzka2g3w8xm64f1smh4cb3jn0yf";
+      rev = "bc2d57e2f57551171370b4458c6198041b11750c";
+      sha256 = "0f0pasz9r9qqdnlcc6zj94kh4dnslydb7zfdjhdj2salqm3hnpd7";
     };
     dependencies = [];
 
@@ -2838,22 +2857,22 @@ rec {
   };
 
   caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "caw-vim-2018-01-01";
+    name = "caw-vim-2018-06-16";
     src = fetchgit {
       url = "https://github.com/tyru/caw.vim";
-      rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42";
-      sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari";
+      rev = "e82ae00f3fc03289d4054b44f100025a1bc81939";
+      sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc";
     };
     dependencies = [];
 
   };
 
   open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "open-browser-vim-2018-03-11";
+    name = "open-browser-vim-2018-04-26";
     src = fetchgit {
       url = "https://github.com/tyru/open-browser.vim";
-      rev = "43b08d6642f26af5a875b0d0bdb3aa9a6d12e7eb";
-      sha256 = "162dv172n16jpjr812d561yyj9rz9xn4qrfx18wlpyixj3qf2bda";
+      rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246";
+      sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db";
     };
     dependencies = [];
 
@@ -2871,11 +2890,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-04-16";
+    name = "youcompleteme-2018-06-10";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "6975efddc1a90514db7c8ee882ccac91f70ff4cc";
-      sha256 = "1zmbb91fc0axavxln4milmn95d9szx8zwdiiwqjdyybkm29nxhc9";
+      rev = "e49f817bfe7a7400efcc0b6527188ff6395f996f";
+      sha256 = "19cnixx08aqirb9yw2k3glklmyna075x1d9szzpg8ml557v9qgnn";
     };
     dependencies = [];
     buildPhase = ''
@@ -2889,7 +2908,7 @@ rec {
 
     meta = {
       description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = http://github.com/Valloric/YouCompleteMe;
+      homepage = https://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
       platforms = stdenv.lib.platforms.unix;
@@ -2897,22 +2916,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-04-17";
+    name = "vim-airline-2018-06-13";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline";
-      rev = "3ad4a18d858bb80d45a1c054b845021abe5c8f0d";
-      sha256 = "1sgf9czgajba8nf7xbfa2dm26vw356ca55m1myaxlkqrlcckcvav";
+      rev = "45c9621157b5bc851804bfed57b8a504d55757b0";
+      sha256 = "0g4g5fa0qy6hagic590sksa8z6xlmigdan64bya06jr9m7fd8a1a";
     };
     dependencies = [];
 
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2018-03-24";
+    name = "vim-airline-themes-2018-06-14";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "b0fca80555b8249f3c62271b7635542a7de22363";
-      sha256 = "1ap7b7v1v3n4hpnj2w24w0dli2sliphvpyfhkdbhbq4c30znm1pk";
+      rev = "b35f952a6ae6768ae2c6a9f4febc7945cc311f74";
+      sha256 = "1j9y9irrzsq1bwp3b22ls016byi0yc9ymigzhw0n180rk6nb36c7";
     };
     dependencies = [];
 
@@ -2952,11 +2971,11 @@ rec {
   };
 
   vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ruby-2018-04-01";
+    name = "vim-ruby-2018-06-02";
     src = fetchgit {
       url = "https://github.com/vim-ruby/vim-ruby";
-      rev = "71f5df78a45c5458da793b2c897ff5dcdcd9a819";
-      sha256 = "1nblkhb1yp3q0rfq43l9968inn1z26vngf28n23y161ncfmq674y";
+      rev = "1e4c6fdf4450a01208911c079538e1a2ed128ec6";
+      sha256 = "0xnnk0sd3z8v5hvdxy7rljvzfvdl63dqvd3kiksw4kzj7j8gcbkg";
     };
     dependencies = [];
 
@@ -3150,44 +3169,44 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2018-04-17";
+    name = "vimwiki-2018-06-12";
     src = fetchgit {
       url = "https://github.com/vimwiki/vimwiki";
-      rev = "90dc1e58717bd25798bb16d3badab8908b619912";
-      sha256 = "01a2gy1r4k5gw7vrdn6p0vmybb2s0gf9q0w07qps5cnxapsggxk9";
+      rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90";
+      sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw";
     };
     dependencies = [];
 
   };
 
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-04-17";
+    name = "ale-2018-06-17";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "f9ba3d924fc445ceea6ab7a6700b95dd12d268ca";
-      sha256 = "12905gq95xif3963720yqywvzpvxz7j8qyk0i6pnmzjf92xnk8xm";
+      rev = "24fe1953110455f7f3305db2a8e5abc2aa6821af";
+      sha256 = "0m47h33w73k6p0p4i8rhqpnp8jn5siyjzwyhgv5nk3ydci5y1mmy";
     };
     dependencies = [];
 
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2018-04-05";
+    name = "vim-wakatime-2018-05-25";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "e0e7621f18a8763b851b0feb4a735633bf147cf7";
-      sha256 = "1xnrcxd7r08hqrv2fnv8x8p60nx2flh2pfcr4pkkscr0ilinakwz";
+      rev = "3d88d49551c15f6abd9fecd2480ef75f0d8cbe40";
+      sha256 = "1lm4j5c67q4al1ymqnr0zlbdgql0381rl65v78vyai8vzaj98m14";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "targets-vim-2018-02-28";
+    name = "targets-vim-2018-05-27";
     src = fetchgit {
       url = "https://github.com/wellle/targets.vim";
-      rev = "c1732189c9ec29cc3320094304019ffcafadafc4";
-      sha256 = "12ryicmb29qhmn216xdv9g8rl170mz5zrbfnmqja3wdlwkj3g83j";
+      rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75";
+      sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q";
     };
     dependencies = [];
 
@@ -3253,22 +3272,22 @@ rec {
   };
 
   nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nim-vim-2018-02-27";
+    name = "nim-vim-2018-05-20";
     src = fetchgit {
       url = "https://github.com/zah/nim.vim";
-      rev = "bdc19809d22190d9b8e85377252a24d930cd25f8";
-      sha256 = "08abwnzim767jvin6jsp2a580hpxzb2w5hbf8w5dhkvxv2pgk0vz";
+      rev = "704dd5d63cac54c22fe25c6efbcf18796df412e7";
+      sha256 = "0azk3m33c47ja24iirlrjqphmd8rzlivinqkx69izmd7l150ds2m";
     };
     dependencies = [];
 
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2018-02-04";
+    name = "deoplete-go-2018-05-20";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "513ae17f1bd33954da80059a21c128a315726a81";
-      sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y";
+      rev = "977fb75b38b82528d179f1029d1852900332dedc";
+      sha256 = "114ypdawgj5k2gx1ff48z7yzk14b7gc68s4ijnb1yww2qxa2g9wm";
     };
     dependencies = [];
     buildInputs = [ python3 ];
@@ -3281,22 +3300,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2018-04-07";
+    name = "deoplete-jedi-2018-05-13";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "eb777b50b7d218a23464c7d58c8573b5223d52f4";
-      sha256 = "1j2jfvgzj2y7pp8z441rs8ffbn1hmiwa7h556kf6mjlmyzs5cfma";
+      rev = "45f1ac2cf44e6a0c10298e07b4d308b84e94a80d";
+      sha256 = "03590rabdycbwjp0h36crb0jsavw5mln77hl107mb737rq2dgmah";
     };
     dependencies = [];
 
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2018-04-15";
+    name = "zig-vim-2018-06-10";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "eba14b79890b674432a78291ff0f16de4da2ed08";
-      sha256 = "1yj7gijwbsc1vrxlb158pf083ahrpgg5g7j3gjrkrazdcmmx5d2j";
+      rev = "e35f63823edcf1dd35fa3deb262e6eed0cac4f8c";
+      sha256 = "0vr6hh4vnpi6gbr3d54xip2n6s4j5xaiiqvzpa4pl6vfnqixazq5";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fcc4fcaa76f4c..0137c2e6b4712 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -201,7 +201,6 @@
 "github:shougo/tabpagebuffer.vim"
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
-"github:shougo/vimshell.vim"
 "github:SirVer/ultisnips"
 "github:sjl/gundo.vim"
 "github:slashmili/alchemist.vim"
@@ -261,6 +260,7 @@
 "github:vim-scripts/wombat256.vim"
 "github:vim-scripts/YankRing.vim"
 "github:vimwiki/vimwiki"
+"github:vmchale/dhall-vim"
 "github:w0rp/ale"
 "github:wakatime/vim-wakatime"
 "github:wellle/targets.vim"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim
deleted file mode 100644
index 5be2330507931..0000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim
+++ /dev/null
@@ -1 +0,0 @@
-    dependencies = [ "vimproc-vim" ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index d61fdff0f08d9..278343dab6e01 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -9,7 +9,7 @@
 
     meta = {
       description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = http://github.com/Valloric/YouCompleteMe;
+      homepage = https://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
       platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index c29611c0c662d..6cec206b73a40 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -67,8 +67,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.16.1";
-    sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3";
+    version = "0.17.6";
+    sha256 = "2625be8b922ffc199e1c776f784d39b6e004523212f7956c93ae40f9040ce6d5";
   };
 
   buildInputs = [
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 430ce192ed0da..41db2c1fcea32 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, vscode-utils
 
-, pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified. 
+, pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified.
                                   # Use version from `PATH` for default setting otherwise.
                                   # Defaults to `false` as we expect it to be project specific most of the time.
-, ctagsUseFixed ? true, ctags     # When `true`, the ctags default setting will be fixed to specified. 
+, ctagsUseFixed ? true, ctags     # When `true`, the ctags default setting will be fixed to specified.
                                   # Use version from `PATH` for default setting otherwise.
                                   # Defaults to `true` as usually not defined on a per projet basis.
 }:
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "0.8.0";
-    sha256 = "0i7s93l5g5lyi6vn77zh3ipj0p267y17fayv6vjrxc2igrs27ik6";
+    version = "2018.6.0";
+    sha256 = "a157399b45b40caa9e0b3432eaf3e7444ee4cb91497c139bcb740d42d61f9ae8";
   };
 
   postPatch = ''
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 950694d0bfe3d..e31d6fea378e9 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils
+{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, buildPackages
 , yacc, flex, libressl, bash, less, writeText }:
 
 let
@@ -178,7 +178,7 @@ let
 
     # temporarily use gnuinstall for bootstrapping
     # bsdinstall will be built later
-    makeFlags = [ "INSTALL=${coreutils}/bin/install" ];
+    makeFlags = [ "INSTALL=${buildPackages.coreutils}/bin/install" ];
     installFlags = [];
     RENAME = "-D";
 
@@ -600,4 +600,11 @@ in rec {
     makeFlags = [ "BINDIR=/share" ];
   };
 
+  locale = netBSDDerivation {
+    path = "usr.bin/locale";
+    version = "7.1.2";
+    sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p";
+    patches = [ ./locale.patch ];
+  };
+
 }
diff --git a/pkgs/os-specific/bsd/netbsd/locale.patch b/pkgs/os-specific/bsd/netbsd/locale.patch
new file mode 100644
index 0000000000000..1df9eb385625c
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/locale.patch
@@ -0,0 +1,85 @@
+--- a/locale.c	2018-06-11 14:39:06.449762000 -0400
++++ b/locale.c	2018-06-11 14:42:28.461122899 -0400
+@@ -56,14 +56,8 @@
+ #include <stringlist.h>
+ #include <unistd.h>
+ 
+-#include "citrus_namespace.h"
+-#include "citrus_region.h"
+-#include "citrus_lookup.h"
+-#include "setlocale_local.h"
+-
+ /* Local prototypes */
+ void	init_locales_list(void);
+-void	init_locales_list_alias(void);
+ void	list_charmaps(void);
+ void	list_locales(void);
+ const char *lookup_localecat(int);
+@@ -221,6 +215,8 @@
+ };
+ #define NKWINFO (sizeof(kwinfo)/sizeof(kwinfo[0]))
+ 
++const char *_PathLocale = NULL;
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -411,8 +407,7 @@
+ 	while ((dp = readdir(dirp)) != NULL) {
+ 		/* exclude "." and "..", _LOCALE_ALIAS_NAME */
+ 		if ((dp->d_name[0] != '.' || (dp->d_name[1] != '\0' &&
+-		    (dp->d_name[1] != '.' ||  dp->d_name[2] != '\0'))) &&
+-		    strcmp(_LOCALE_ALIAS_NAME, dp->d_name) != 0) {
++		    (dp->d_name[1] != '.' ||  dp->d_name[2] != '\0')))) {
+ 			s = strdup(dp->d_name);
+ 			if (s == NULL)
+ 				err(1, "could not allocate memory");
+@@ -431,48 +426,10 @@
+ 	if (sl_find(locales, "C") == NULL)
+ 		sl_add(locales, "C");
+ 
+-	init_locales_list_alias();
+-
+ 	/* make output nicer, sort the list */
+ 	qsort(locales->sl_str, locales->sl_cur, sizeof(char *), scmp);
+ }
+ 
+-void
+-init_locales_list_alias(void)
+-{
+-	char aliaspath[PATH_MAX];
+-	struct _lookup *hlookup;
+-	struct _region key, dat;
+-	size_t n;
+-	char *s, *t;
+-
+-	_DIAGASSERT(locales != NULL);
+-	_DIAGASSERT(_PathLocale != NULL);
+-
+-	(void)snprintf(aliaspath, sizeof(aliaspath),
+-		"%s/" _LOCALE_ALIAS_NAME, _PathLocale);
+-
+-	if (_lookup_seq_open(&hlookup, aliaspath,
+-	    _LOOKUP_CASE_SENSITIVE) == 0) {
+-		while (_lookup_seq_next(hlookup, &key, &dat) == 0) {
+-			n = _region_size((const struct _region *)&key);
+-			s = _region_head((const struct _region *)&key);
+-			for (t = s; n > 0 && *s!= '/'; --n, ++s);
+-			n = (size_t)(s - t);
+-			s = malloc(n + 1);
+-			if (s == NULL)
+-				err(1, "could not allocate memory");
+-			memcpy(s, t, n);
+-			s[n] = '\0';
+-			if (sl_find(locales, s) == NULL)
+-				sl_add(locales, s);
+-			else
+-				free(s);
+-		}
+-		_lookup_seq_close(hlookup);
+-	}
+-}
+-
+ /*
+  * Show current locale status, depending on environment variables
+  */
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 7f6f0cdd0c482..a62182f1d347b 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }:
+{ stdenv, fetchurl, xar, xz, cpio, pkgs, python, lib }:
 
 let
   # TODO: make this available to other packages and generalize the unpacking a bit
@@ -27,6 +27,7 @@ let
     buildInputs = [ xar xz cpio python ];
 
     phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+    outputs = [ "out" "dev" "man" ];
 
     unpackPhase = ''
       xar -x -f $src
@@ -87,13 +88,13 @@ let
         # ApplicationServices in the 10.9 SDK
         local isChild
 
-        if [ -d "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
+        if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
           isChild=1
-          cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" .
+          cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" .
         else
           isChild=0
           current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
-          cp -R "${sdk}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
+          cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
         fi
         ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name"
         ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources"
@@ -103,9 +104,9 @@ let
         fi
 
         if [ $isChild -eq 1 ]; then
-          pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null
+          pushd "${sdk.out}/Library/Frameworks/$path/Versions/$current" >/dev/null
         else
-          pushd "${sdk}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
+          pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
         fi
         local children=$(echo Frameworks/*.framework)
         if [ "$name" == "ApplicationServices" ]; then
@@ -159,8 +160,8 @@ in rec {
       installPhase = ''
         mkdir -p $out/include
         pushd $out/include >/dev/null
-        ln -s "${sdk}/include/xpc"
-        ln -s "${sdk}/include/launch.h"
+        ln -s "${lib.getDev sdk}/include/xpc"
+        ln -s "${lib.getDev sdk}/include/launch.h"
         popd >/dev/null
       '';
     };
@@ -178,7 +179,7 @@ in rec {
 
       installPhase = ''
         mkdir -p $out/include $out/lib
-        ln -s "${sdk}/include/Xplugin.h" $out/include/Xplugin.h
+        ln -s "${lib.getDev sdk}/include/Xplugin.h" $out/include/Xplugin.h
         ln -s "/usr/lib/libXplugin.1.dylib" $out/lib/libXplugin.dylib
       '';
     };
@@ -190,8 +191,8 @@ in rec {
       installPhase = ''
         mkdir -p $out/include
         pushd $out/include >/dev/null
-        ln -s "${sdk}/include/utmp.h"
-        ln -s "${sdk}/include/utmpx.h"
+        ln -s "${lib.getDev sdk}/include/utmp.h"
+        ln -s "${lib.getDev sdk}/include/utmpx.h"
         popd >/dev/null
       '';
     };
diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
index a866c9414d521..2d5520b9bf9c2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
@@ -1,7 +1,8 @@
-{ appleDerivation, xcbuild, IOKit }:
+{ appleDerivation, xcbuildHook, IOKit }:
 
 appleDerivation {
-  buildInputs = [ xcbuild IOKit ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ IOKit ];
   xcbuildFlags = "-target caffeinate";
   installPhase = ''
     install -D Products/Deployment/caffeinate $out/bin/caffeinate
diff --git a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
index 1cb85b1e98849..6e90033507806 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, appleDerivation, xcbuild, gnumake, Security
+{ stdenv, appleDerivation, xcbuildHook, gnumake, Security
 , libsecurity_utilities, libsecurity_cdsa_utilities }:
 
 appleDerivation {
-  buildInputs = [ xcbuild libsecurity_utilities libsecurity_cdsa_utilities ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities ];
 
   DSTROOT = "$out";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index dcfb4aefe1f5d..fda7cd85e4f7a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -2,7 +2,6 @@
 
 appleDerivation {
   # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
-  dontUseXcbuild = true;
 
   # pkill requires special private headers that are unavailable in
   # NixPkgs. These ones are needed:
@@ -49,7 +48,8 @@ appleDerivation {
     # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1
   '';
 
-  buildInputs = [ xcbuild ncurses libutil-new ];
+  nativeBuildInputs = [ xcbuild ];
+  buildInputs = [ ncurses libutil-new ];
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index b52ec3306dc42..596ca25d70a46 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, appleDerivation, fetchurl, xcbuild }:
+{ stdenv, appleDerivation, fetchurl, xcbuildHook }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   # These PBXcp calls should be patched in xcbuild to allow them to
   # automatically be prefixed.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index 1f35e3008b3b1..a572d46ceab56 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, appleDerivation, xcbuild }:
+{ stdenv, fetchurl, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   patchPhase = ''
     substituteInPlace rpcgen/rpc_main.c \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
index aba2472af6023..b947267ab14dc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, appleDerivation, xcbuild, lib, hostPlatform, Libc, xnu, libutil-new }:
+{ stdenv, appleDerivation, xcbuildHook
+, lib, hostPlatform, Libc, xnu, libutil-new }:
 
 appleDerivation {
-  buildInputs = [ xcbuild libutil-new ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ libutil-new ];
 
   NIX_CFLAGS_COMPILE = "-I.";
   NIX_LDFLAGS = "-lutil";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
index dd193f2c07dc6..f8636403ed540 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
@@ -1,7 +1,9 @@
-{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling, stdenv }:
+{ appleDerivation, xcbuildHook, CoreSymbolication
+, xnu, bison, flex, darling, stdenv }:
 
 appleDerivation {
-  buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ];
+  nativeBuildInputs = [ xcbuildHook flex bison ];
+  buildInputs = [ CoreSymbolication darling ];
   NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers";
   NIX_LDFLAGS = "-L./Products/Release";
   xcbuildFlags = "-target dtrace";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index 47a587966b44d..a19e0736336d7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }:
+{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil-new }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ zlib bzip2 lzma ncurses libutil-new ];
 
   # some commands not working:
   # mtree: _simple.h not found
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index bb9e4fa755dbe..369556fd5a1cf 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, appleDerivation, autoreconfHook, targetPlatform, enableStatic ? targetPlatform.isiOS }:
+{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform
+, enableStatic ? targetPlatform.isiOS
+, enableShared ? !targetPlatform.isiOS
+}:
 
 appleDerivation {
   postUnpack = "sourceRoot=$sourceRoot/libiconv";
 
-  preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isiOS ''
+  preConfigure = lib.optionalString stdenv.hostPlatform.isiOS ''
     sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
   '';
 
-  configureFlags = stdenv.lib.optionals enableStatic [ "--enable-static" "--disable-shared" ];
+  configureFlags = lib.optional enableStatic "--enable-static"
+                ++ lib.optional (!enableShared) "--disable-shared";
 
-  postInstall = stdenv.lib.optionalString (!enableStatic) ''
+  postInstall = lib.optionalString (!enableStatic) ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
     ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 
@@ -26,6 +30,6 @@ appleDerivation {
   ];
 
   meta = {
-    platforms = stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.darwin;
   };
 }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
index 1018100ba9c5a..639d377d1b647 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
@@ -13,7 +13,7 @@ appleDerivation {
       lib/RawSigner.h lib/MD2Object.h lib/HMACSHA1.h lib/bfContext.h lib/rc4Context.h; do
       substituteInPlace ''$file --replace \
         '"CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h"' \
-        '"${apple_sdk.sdk}/include/MacTypes.h"'
+        '"${stdenv.lib.getDev apple_sdk.sdk}/include/MacTypes.h"'
     done
 
     for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
index 2a05855bd5214..f5035a06f1e8e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
@@ -25,7 +25,7 @@ appleDerivation {
     mkdir -p include/securityd_client
     cp Security-*/libsecurityd/lib/*.h include/securityd_client
     mkdir -p include/xpc
-    cp ${apple_sdk.sdk}/include/xpc/*.h include/xpc
+    cp ${apple_sdk.sdk.out}/include/xpc/*.h include/xpc
 
     sed -i '1i #define bool int' lib/security_codesigning.d
     dtrace -h -C -s lib/security_codesigning.d -o codesigning_dtrace.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
index fb1ea2509d76f..435cd0f069f21 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, apple_sdk, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+{ appleDerivation, apple_sdk, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk, lib }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
@@ -7,7 +7,7 @@ appleDerivation {
   ];
   patchPhase = ''
     cp ${osx_private_sdk}/include/sandbox_private.h .
-    substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${apple_sdk.sdk}/include/sandbox.h"'
+    substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${lib.getDev apple_sdk.sdk}/include/sandbox.h"'
     substituteInPlace lib/AtomicFile.cpp --replace '<sandbox.h>' '"sandbox_private.h"'
   '';
 }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
index 93857ea792c25..6730e2424be45 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
@@ -15,13 +15,13 @@ name: version: sha256: args: let
         grep -Rl MacErrors.h . | while read file; do
           substituteInPlace "''$file" --replace \
             '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
-            '"${pkgs.darwin.apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+            '"${pkgs.darwin.apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
         done || true # grep returns 1 if it can't find the string
-        
+
         grep -Rl MacTypes.h . | while read file; do
           substituteInPlace "''$file" --replace \
             '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \
-            '"${pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"'
+            '"${stdenv.lib.getDev pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"'
         done || true # grep returns 1 if it can't find the string
       '';
       preBuild = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
index 06137879410d6..07a3186caeec9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -1,4 +1,4 @@
-{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp }:
+{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
@@ -19,7 +19,7 @@ appleDerivation {
     substituteInPlace lib/SecCertificate.cpp --replace '#include <Security/SecCertificatePriv.h>' ""
 
     cp ${osx_private_sdk}/include/xpc/private.h xpc
-    cp ${apple_sdk.sdk}/include/xpc/*.h xpc
+    cp ${lib.getDev apple_sdk.sdk}/include/xpc/*.h xpc
     cp ${osx_private_sdk}/include/sandbox_private.h lib/sandbox.h
 
     substituteInPlace lib/SecItemPriv.h \
@@ -29,7 +29,7 @@ appleDerivation {
 
     substituteInPlace lib/Keychains.cpp --replace \
       '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
-      '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+      '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
 
     substituteInPlace lib/CertificateValues.cpp --replace \
       '#include <Security/SecCertificatePriv.h>' ""
@@ -42,6 +42,6 @@ appleDerivation {
 
     substituteInPlace lib/KCEventNotifier.h --replace \
       'CoreFoundation/CFNotificationCenter.h' \
-      '${apple_sdk.sdk}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h'
+      '${apple_sdk.sdk.out}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h'
   '';
 }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
index 7facea2b89369..0115ce537e27a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
@@ -1,8 +1,8 @@
-{ stdenv, appleDerivation, xcbuild }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 # TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap
 appleDerivation {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   prePatch = ''
     substituteInPlace tzlink.c \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 23777c9415768..dccc83a70bffc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, appleDerivation, xcbuild, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
+{ stdenv, appleDerivation, xcbuildHook
+, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
 
   NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
index 1a0208ef3a082..d5bc3483c3894 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
@@ -1,9 +1,10 @@
-{ appleDerivation, xcbuild, Security
+{ appleDerivation, xcbuildHook, Security
 , libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities
 , xnu, osx_private_sdk, pcsclite}:
 
 appleDerivation {
-  buildInputs = [ xcbuild Security libsecurity_utilities
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ Security libsecurity_utilities
                   libsecurity_cdsa_utilities libsecurity_codesigning
                   pcsclite ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index 8ce916feb38ad..bec05ef857572 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, appleDerivation, xcbuild }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   patchPhase = ''
     # NOTE: these hashes must be recalculated for each version change
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
index 196276b0b2737..08df235ed8c2f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, bzip2, zlib, lzma }:
+{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }:
 
 appleDerivation {
-  buildInputs = [ xcbuild ncurses bzip2 zlib lzma ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ ncurses bzip2 zlib lzma ];
 
   # patches to use ncursees
   # disables md5
diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
index 4ddec2a30c906..3513cb2e172c9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
@@ -1,7 +1,8 @@
-{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new, lib}:
+{xcbuildHook, appleDerivation, apple_sdk, ncurses, libutil-new, lib}:
 
 appleDerivation {
-  buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ apple_sdk.frameworks.IOKit ncurses libutil-new ];
   NIX_LDFLAGS = "-lutil";
   installPhase = ''
     install -D Products/Release/libtop.a $out/lib/libtop.a
diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix
index b3790b8c87c3e..510c7154f2bc6 100644
--- a/pkgs/os-specific/darwin/insert_dylib/default.nix
+++ b/pkgs/os-specific/darwin/insert_dylib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, xcbuild }:
+{ stdenv, fetchFromGitHub, xcbuildHook }:
 
 stdenv.mkDerivation
   { name = "insert_dylib-2016.08.28";
@@ -8,7 +8,7 @@ stdenv.mkDerivation
         rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
         sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
       };
-    buildInputs = [ xcbuild ];
+    nativeBuildInputs = [ xcbuildHook ];
     installPhase =
       ''
         prog=$(find . -type f -name insert_dylib)
diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
new file mode 100644
index 0000000000000..3ff03aace4eeb
--- /dev/null
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, darwin, python }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.1";
+  name = "iproute2mac-${version}";
+
+  src = fetchFromGitHub {
+    owner = "brona";
+    repo = "iproute2mac";
+    rev = "v${version}";
+    sha256 = "1n6la7blbxza2m79cpnywsavhzsdv4gzdxrkly4dppyidjg6jy1h";
+  };
+
+  buildInputs = [ python ];
+
+  postPatch = ''
+    substituteInPlace src/ip.py \
+      --replace /usr/bin/python ${python}/bin/python \
+      --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
+      --replace /sbin/route ${darwin.network_cmds}/bin/route \
+      --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
+      --replace /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
+      --replace /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
+      --replace /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D -m 755 src/ip.py $out/bin/ip
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/brona/iproute2mac;
+    description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 2b8c7718aee8a..e6846aef75079 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
     substituteInPlace cmsutil.c --replace \
       '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
-      '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+      '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
     substituteInPlace createFVMaster.c --replace \
       '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
-      '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+      '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
   '';
 
   postUnpack = ''
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index 4104d0d455ad6..7f327fcf3d7a0 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, frameworks, perl } :
 stdenv.mkDerivation rec {
-  version = "0.9.0";
+  version = "0.9.1";
   name = "trash-${version}";
 
   src = fetchFromGitHub {
     owner = "ali-rantakari";
     repo = "trash";
-    rev = "f68ad25a02e24cc58eb8ef9a493d6dc0122bcd8f";
+    rev = "v${version}";
     sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41";
   };
 
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 46f6f03b90a74..910f1b91c215d 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile }:
+{ stdenv, requireFile, targetPlatform, lib }:
 
 let requireXcode = version: sha256:
   let
@@ -40,9 +40,11 @@ let requireXcode = version: sha256:
 
   in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; });
 
-in {
+in lib.makeExtensible (self: {
   xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n";
   xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2";
   xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic";
   xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c";
-}
+  xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01";
+  xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "8.2")}";
+})
diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index ebca738431c3c..d5ed21cd9e242 100644
--- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -25,9 +25,9 @@ rec {
   sdk = rec {
     name = "ios-sdk";
     type = "derivation";
-    outPath = xcode + "/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk";
+    outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk";
 
-    sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS";
+    platform = targetPlatform.xcodePlatform;
     version = targetPlatform.sdkVer;
   };
 
@@ -48,7 +48,10 @@ rec {
       mv cc-cflags.tmp $out/nix-support/cc-cflags
       echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
       echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags
-      echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") ''
+      echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") ''
+      echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
     '';
   }) // {
     inherit sdk;
@@ -60,7 +63,7 @@ rec {
     };
   } ''
     if ! [ -d ${sdk} ]; then
-        echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2
+        echo "You must have version ${sdk.version} of the ${sdk.platform} sdk installed at ${sdk}" >&2
         exit 1
     fi
     ln -s ${sdk}/usr $out
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 478040132b82f..5dc52c766f18f 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,7 +3,7 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba
 , gccCrossStageStatic, gcc
-, forceSystem, newScope, platform, config
+, pkgsi686Linux, newScope, platform, config
 , targetPlatform, buildPlatform
 , overrides ? {}
 , buildPackages, pkgs
@@ -90,7 +90,7 @@ let
     mig = callPackage ./mig {
       # Build natively, but force use of a 32-bit environment because we're
       # targeting `i586-pc-gnu'.
-      stdenv = (forceSystem "i686-linux" "i386").stdenv;
+      stdenv = pkgsi686Linux.stdenv;
     };
 
     # XXX: Use this one for its `.crossDrv'.  Using the one above from
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix
index 5871d1c6990a0..fb312b6bcb001 100644
--- a/pkgs/os-specific/linux/alsa-firmware/default.nix
+++ b/pkgs/os-specific/linux/alsa-firmware/default.nix
@@ -4,10 +4,7 @@ stdenv.mkDerivation rec {
   name = "alsa-firmware-1.0.29";
 
   src = fetchurl {
-    urls = [
-      "ftp://ftp.alsa-project.org/pub/firmware/${name}.tar.bz2"
-      "http://alsa.cybermirror.org/firmware/${name}.tar.bz2"
-    ];
+    url = "mirror://alsa/firmware/${name}.tar.bz2";
     sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw";
   };
 
@@ -28,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.alsa-project.org/main/index.php/Main_Page;
+    homepage = http://www.alsa-project.org/;
     description = "Soundcard firmwares from the alsa project";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index c2c612db54222..41b43afc242c3 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -4,10 +4,7 @@ stdenv.mkDerivation rec {
   name = "alsa-lib-1.1.6";
 
   src = fetchurl {
-    urls = [
-     "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
-     "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
-    ];
+    url = "mirror://alsa/lib/${name}.tar.bz2";
     sha256 = "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
index 5cd937a379280..a13e178e4183e 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -4,10 +4,7 @@ stdenv.mkDerivation rec {
   name = "alsa-oss-1.1.6";
 
   src = fetchurl {
-    urls = [
-      "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"
-      "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"
-    ];
+    url = "mirror://alsa/oss-lib/${name}.tar.bz2";
     sha256 = "1sj512wyci5qv8cisps96xngh7y9r5mv18ybqnazy18zwr1zgly3";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index f57f84b293b52..9012f32f31dff 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -4,10 +4,7 @@ stdenv.mkDerivation rec {
   name = "alsa-plugins-1.1.6";
 
   src = fetchurl {
-    urls = [
-      "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
-      "http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
-    ];
+    url = "mirror://alsa/plugins/${name}.tar.bz2";
     sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 67cae46164fc3..1ce94d14803c9 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -7,10 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.1.6";
 
   src = fetchurl {
-    urls = [
-      "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
-      "http://alsa.cybermirror.org/tools/${name}.tar.bz2"
-    ];
+    url = "mirror://alsa/tools/${name}.tar.bz2";
     sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n";
   };
 
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index b8498c096d334..376c42a8f9b8b 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -5,10 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1.6";
 
   src = fetchurl {
-    urls = [
-      "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
-      "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
-    ];
+    url = "mirror://alsa/utils/${name}.tar.bz2";
     sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m";
   };
 
@@ -27,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture utils";
-
     longDescription = ''
       The Advanced Linux Sound Architecture (ALSA) provides audio and
       MIDI functionality to the Linux-based operating system.
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index ea4f44f52bbb6..7b4ac9e1f3b87 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "atop-${version}";
 
   src = fetchurl {
-    url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
+    url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
     sha256 = "0r5j9q89wpylmg0px5xymxi3jpihw9wq8bh37g3ciymsw1fp5r3k";
   };
 
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 7e14983a6d2b4..b7928e38fc981 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "audit-2.8.3";
 
   src = fetchurl {
-    url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
+    url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz";
     sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl";
   };
 
diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 90489e12d6907..a3914067d7d81 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
-    url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
+    url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
     sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0";
   };
 
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index a1a2cff70a83a..61d0eb9bdb0c7 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
-    url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
+    url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
     sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7";
   };
 
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index a67133c323674..b095096caa767 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -3,11 +3,11 @@
   systemd, enableWiimote ? false, enableMidi ? false }:
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.49";
+  name = "bluez-5.50";
 
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
+    sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z";
   };
 
   pythonPath = with pythonPackages; [
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index e8972263f38df..1a8f7f7686264 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
   # still builds after the update.
   src = fetchurl {
-    url = "http://busybox.net/downloads/${name}.tar.bz2";
+    url = "https://busybox.net/downloads/${name}.tar.bz2";
     sha256 = "0smfn8hlds6nx8war62kyaykg3n7mxbjjfcpsgz84znwk4v4mhg3";
   };
 
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 1ef18f703d3ff..9b7f69d4ab899 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5";
 
   src = fetchurl {
-    url    = "http://www.trapkit.de/tools/checksec.sh";
+    url    = "https://www.trapkit.de/tools/checksec.sh";
     sha256 = "0iq9v568mk7g7ksa1939g5f5sx7ffq8s8n2ncvphvlckjgysgf3p";
   };
 
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 8f9983b5d6e3d..755e88b46cbc5 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.4.5";
 
   src = fetchurl {
-    url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
     sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
   };
 
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index dba495d0dee5c..ad9b27f83fa97 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.9";
 
   src = fetchurl {
-    url    = "http://download.openvz.org/criu/${name}.tar.bz2";
+    url    = "https://download.openvz.org/criu/${name}.tar.bz2";
     sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx";
   };
 
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index ef8c55853a394..e1da0a449c5b8 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,23 +1,35 @@
-{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt
-, enablePython ? false, python2 ? null
-}:
+{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
+, enablePython ? false, python2 ? null }:
 
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-1.7.5";
+  name = "cryptsetup-2.0.3";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
-    sha256 = "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b";
+    url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz";
+    sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d";
   };
 
-  configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]
-                ++ stdenv.lib.optional enablePython "--enable-python";
+  patches = [
+    # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated.
+    (fetchpatch {
+      url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch";
+      sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m";
+    })
+  ];
+
+  NIX_LDFLAGS = "-lgcc_s";
+
+  configureFlags = [
+    "--disable-kernel_crypto"
+    "--enable-cryptsetup-reencrypt"
+    "--with-crypto_backend=openssl"
+  ] ++ stdenv.lib.optional enablePython "--enable-python";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ devicemapper openssl libuuid popt ]
-             ++ stdenv.lib.optional enablePython python2;
+  buildInputs = [ devicemapper json_c openssl libuuid popt ]
+    ++ stdenv.lib.optional enablePython python2;
 
   meta = {
     homepage = https://gitlab.com/cryptsetup/cryptsetup/;
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index d39cadf41993d..e71d36c5e4855 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -1,17 +1,33 @@
-{ stdenv, fetchurl, devicemapper }:
+{ stdenv, fetchurl, fetchpatch, devicemapper }:
 
 stdenv.mkDerivation rec {
   name = "dmraid-1.0.0.rc16";
 
   src = fetchurl {
-    url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
+    url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
     sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq";
   };
 
-  patches = [ ./hardening-format.patch ];
+  patches = [ ./hardening-format.patch ]
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
+        sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w";
+        stripLen = 2;
+        extraPrefix = "1.0.0.rc16/";
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch";
+        sha256 = "0msnq39qnzg3b1pdksnz1dgqwa3ak03g41pqh0lw3h7w5rjc016k";
+        stripLen = 2;
+        extraPrefix = "1.0.0.rc16/";
+      })
+    ];
 
   postPatch = ''
     sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"
   '';
 
   preConfigure = "cd */";
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index b4c4af8c2e213..13614493f6106 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   version = "17.11.2";
 
   src = fetchurl {
-    url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
+    url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
     sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
   };
 
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index e2647112f1b2b..8d96a503c766a 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "eventstat-${version}";
-  version = "0.04.03";
+  version = "0.04.04";
   src = fetchzip {
     url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
-    sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr";
+    sha256 = "034xpdr3ip4w9k713wjc45x66k3nz6wg9wkzmchrjifxk4dldbd8";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
index 224239a4affd2..8aa78e65dec13 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "b43-fwcutter-019";
 
   src = fetchurl {
-    url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2";
+    url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2";
     sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
index e8ab77a509ff4..bf8bcf3872614 100644
--- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "intel2200BGFirmware-${version}";
 
   src = fetchurl {
-    url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
+    url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
     sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd";
   };
 
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
new file mode 100644
index 0000000000000..0918279cc9a9c
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "raspberrypi-wireless-firmware-${version}";
+  version = "2018-05-30";
+
+  srcs = [
+    (fetchurl {
+      url = "https://archive.raspberrypi.org/debian/pool/main/b/bluez-firmware/bluez-firmware_1.2-3+rpt5.debian.tar.xz";
+      sha256 = "06zpyrz6frkgjy26hr3998klnhjdqxwashgjgvj9rgbcqy70nkxg";
+    })
+    (fetchurl {
+      url = "https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-brcm80211_20161130-3+rpt3_all.deb";
+      sha256 = "10l74ac28baprnsiylf2vy4pkxgb3crixid90ngs6si9smm7rn6z";
+    })
+  ];
+
+  sourceRoot = ".";
+  dontBuild = true;
+  # Firmware blobs do not need fixing and should not be modified
+  dontFixup = true;
+
+  # Unpack the debian package
+  unpackCmd = ''
+    if ! [[ "$curSrc" =~ \.deb$ ]]; then return 1; fi
+    ar -xf "$curSrc"
+    tar -xf data.tar.xz
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/lib/firmware/brcm"
+
+    # Wifi firmware
+    for filename in lib/firmware/brcm/brcmfmac434??-sdio.*; do
+      cp "$filename" "$out/lib/firmware/brcm"
+    done
+
+    # Bluetooth firmware
+    cp broadcom/*.hcd "$out/lib/firmware/brcm"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W";
+    homepage = https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/;
+    license = licenses.unfreeRedistributableFirmware;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 344d224df9487..83ca21719faa8 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20180417";
+  version = "1.20180619";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "17mnnhni0wgdnc3mw60nfhcj9v6p5dwcqkwnbpvzczab3r2hziji";
+    sha256 = "1wppk6c5mbanx9h2wa3yz3rzh5am8bqvgw23gxqgwhbar8w99cfn";
   };
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index d49d01158229a..eb87d8aa72511 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "fnotifystat-${version}";
-  version = "0.02.00";
+  version = "0.02.01";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "0sfzmggfhhhp3vxn1s61b5bacr2hz6r7y699n3nysdciaa2scgdq";
+    sha256 = "18p6rqb3bhs2ih6mnp57j0cyawjm0iwky6y3ays54alkxqaz8gmx";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index bf7bc8a4546aa..bde2cbbafa65d 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "forkstat-${version}";
-  version = "0.02.02";
+  version = "0.02.03";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
-    sha256 = "02iqi4xjg2hl4paw88fz9jb88a9p4zprvq3g56cd7jwfx3vmw5a4";
+    sha256 = "1dl95ijs9bs9s9i629bi88qmvxjl25ym742gc063bysbp8drban1";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix
index fd37d35623e49..b7f47f12b15b2 100644
--- a/pkgs/os-specific/linux/fswebcam/default.nix
+++ b/pkgs/os-specific/linux/fswebcam/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "fswebcam-20140113";
 
   src = fetchurl {
-    url = "http://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz";
+    url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz";
     sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199";
   };
 
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 04a4a1a0e1f1d..d813258f95a9e 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -53,22 +53,18 @@ in stdenv.mkDerivation rec {
       # The configure phase will delete these files (temporary workaround for
       # ./fuse3-install_man.patch)
       install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
-      install -D -m444 doc/mount.fuse.8 $out/share/man/man8/mount.fuse.8
+      install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
     '' else ''
       sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
       ./makeconf.sh
     '');
 
   postFixup = "cd $out\n" + (if isFuse3 then ''
-    mv bin/mount.fuse3 bin/mount.fuse
-
     install -D -m444 etc/fuse.conf $common/etc/fuse.conf
     install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules
-    install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz
   '' else ''
     cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf
     cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules
-    cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz
   '');
 
   enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index f308930f0dc51..cdbcca55d2ff2 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.2.3";
-    sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d";
+    version = "3.2.4";
+    sha256Hash = "1ybgd4s7naiyvaris7j6fzp604cgi5mgrn715x8l4kn5k9d840im";
   };
 }
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index c02bfb1615c30..40d6967c66f4f 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "fwts-${version}";
-  version = "18.03.00";
+  version = "18.06.02";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
-    sha256 = "1f2gdnaygsj0spd6a559bzf3wii7l59k3sk49rjbbdb9g77nkhg2";
+    sha256 = "1j7yn3qyy9baylhjvr9j8hiyl1nc7la1j4fffvxk8qvxakwxbyl2";
     stripRoot = false;
   };
 
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 41bdd5d12ac31..4e04c16d70bda 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pam ];
 
   preConfigure = ''
-    sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c
+    sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index ebf7179d0814a..c1d324de7cffe 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
-  version = "0.312";
+  version = "0.313";
 
   src = fetchurl {
-    url = "https://github.com/vcrhonek/hwdata/archive/v0.312.tar.gz";
-    sha256 = "04dbxfn40b8vyw49qpkslv20akbqm5hwl3cndmqacp6cik1l0gai";
+    url = "https://github.com/vcrhonek/hwdata/archive/v0.313.tar.gz";
+    sha256 = "0x0qk2cim1mv8cl8h8rwqn8mbbs43j04rn06m81b531i182zii17";
   };
 
   preConfigure = "patchShebangs ./configure";
diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix
index b6c77a930807d..56e622df2ce81 100644
--- a/pkgs/os-specific/linux/ioport/default.nix
+++ b/pkgs/os-specific/linux/ioport/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ioport-1.2";
   src = fetchurl {
-    url = "http://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz";
+    url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz";
     sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z";
   };
   buildInputs = [ perl ];
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 8ccb0c203803e..3f5ed788bb233 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
-  version = "4.16.0";
+  version = "4.17.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "02pfalg319jpbjz273ph725br8dnkzpfvi98azi9yd6p1w128p0c";
+    sha256 = "0vmynikcamfhakvwyk5dsffy0ymgi5mdqiwybdvqfn1ijaq93abg";
   };
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 1668933db809b..0c088ac2a4bc6 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.6.2";
 
   src = fetchurl {
-    url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
+    url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
     sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m";
   };
 
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 792c7bcb0849a..de9787a0fa746 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.5";
-     sha256 = "0xw53bigh99nhacjb67qs1g145fwls7065l8vsrziwzpkyd5s6a8";
+     rev = "0.6";
+     sha256 = "0cs0a7rjg9gl9gn9sc3b1y8mv2zbjg7rb87mla6kcrknjci76pgm";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "0khc017s27n6y6c6wbqhmcghzggnagxbi8j36hl5g73y6s44vx42";
+    sha256 = "151bqc85vchl1arhl9pyvfashxq886cjrbi6js4csx4vzscbhzzm";
   };
 
   nativeBuildInputs = [
@@ -35,6 +35,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-dbus-datadir=$(out)/etc/"
+    "--localstatedir=/var"
     "--disable-systemd-service"
   ];
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a226061ecbfa5..548c66e87e63a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1,723 +1,682 @@
-/*
+# WARNING/NOTE: whenever you want to add an option here you need to either
+# * mark it as an optional one with `option`,
+# * or make sure it works for all the versions in nixpkgs,
+# * or check for which kernel versions it will work (using kernel
+#   changelog, google or whatever) and mark it with `whenOlder` or
+#   `whenAtLeast`.
+# Then do test your change by building all the kernels (or at least
+# their configs) in Nixpkgs or else you will guarantee lots and lots
+# of pain to users trying to switch to an older kernel because of some
+# hardware problems with a new one.
 
-  WARNING/NOTE: whenever you want to add an option here you need to
-  either
+# Configuration
+{ stdenv, version
 
-  * mark it as an optional one with `?` suffix,
-  * or make sure it works for all the versions in nixpkgs,
-  * or check for which kernel versions it will work (using kernel
-    changelog, google or whatever) and mark it with `versionOlder` or
-    `versionAtLeast`.
+# to let user override values, aka converting modules to included and vice-versa
+, mkValueOverride ? null
 
-  Then do test your change by building all the kernels (or at least
-  their configs) in Nixpkgs or else you will guarantee lots and lots
-  of pain to users trying to switch to an older kernel because of some
-  hardware problems with a new one.
+# new extraConfig as a flattened set
+, structuredExtraConfig ? {}
 
-*/
+# legacy extraConfig as string
+, extraConfig ? ""
 
-{ stdenv, version, extraConfig, features }:
+, features ? { grsecurity = false; xen_dom0 = false; }
+}:
+
+assert (mkValueOverride == null) || (builtins.isFunction mkValueOverride);
 
 with stdenv.lib;
 
-''
-  # Compress kernel modules for a sizable disk space savings.
-  ${optionalString (versionAtLeast version "3.18") ''
-    MODULE_COMPRESS y
-    MODULE_COMPRESS_XZ y
-  ''}
-
-  KERNEL_XZ y
-
-  # Debugging.
-  DEBUG_KERNEL y
-  DYNAMIC_DEBUG y
-  DEBUG_DEVRES n
-  DEBUG_STACK_USAGE n
-  DEBUG_STACKOVERFLOW n
-  SCHEDSTATS n
-  DETECT_HUNG_TASK y
-
-  ${if (features.debug or false) then ''
-    DEBUG_INFO y
-  '' else ''
-    DEBUG_INFO n
-  ''}
-
-  ${optionalString (versionOlder version "4.4") ''
-    CPU_NOTIFIER_ERROR_INJECT? n
-  ''}
-
-  ${optionalString (versionOlder version "4.11") ''
-    TIMER_STATS y
-    DEBUG_NX_TEST n
-  ''}
-
-  # Bump the maximum number of CPUs to support systems like EC2 x1.*
-  # instances and Xeon Phi.
-  ${optionalString (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") ''
-    NR_CPUS 384
-  ''}
-
-  # Unix domain sockets.
-  UNIX y
-
-  # Power management.
-  ${optionalString (versionOlder version "3.19") ''
-    PM_RUNTIME y
-  ''}
-  PM_ADVANCED_DEBUG y
-  ${optionalString (versionAtLeast version "3.11") ''
-    X86_INTEL_LPSS y
-  ''}
-  ${optionalString (versionAtLeast version "3.10") ''
-    X86_INTEL_PSTATE y
-  ''}
-  INTEL_IDLE y
-  CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
-  ${optionalString (versionOlder version "3.10") ''
-    USB_SUSPEND y
-  ''}
-  PM_WAKELOCKS y
-
-  # Support drivers that need external firmware.
-  STANDALONE n
-
-  # Make /proc/config.gz available.
-  IKCONFIG y
-  IKCONFIG_PROC y
-
-  # Optimize with -O2, not -Os.
-  CC_OPTIMIZE_FOR_SIZE n
-
-  # Enable the kernel's built-in memory tester.
-  MEMTEST y
-
-  # Include the CFQ I/O scheduler in the kernel, rather than as a
-  # module, so that the initrd gets a good I/O scheduler.
-  IOSCHED_CFQ y
-  BLK_CGROUP y # required by CFQ
-  IOSCHED_DEADLINE y
-  ${optionalString (versionAtLeast version "4.11") ''
-    MQ_IOSCHED_DEADLINE y
-  ''}
-  ${optionalString (versionAtLeast version "4.12") ''
-    BFQ_GROUP_IOSCHED y
-    MQ_IOSCHED_KYBER y
-    IOSCHED_BFQ m
-  ''}
-
-  # Enable NUMA.
-  NUMA? y
-
-  # Disable some expensive (?) features.
-  PM_TRACE_RTC n
-
-  # Enable initrd support.
-  BLK_DEV_RAM y
-  BLK_DEV_INITRD y
-
-  # Enable various subsystems.
-  ACCESSIBILITY y # Accessibility support
-  AUXDISPLAY y # Auxiliary Display support
-  HIPPI y
-  MTD_COMPLEX_MAPPINGS y # needed for many devices
-  SCSI_LOWLEVEL y # enable lots of SCSI devices
-  SCSI_LOWLEVEL_PCMCIA y
-  SCSI_SAS_ATA y  # added to enable detection of hard drive
-  SPI y # needed for many devices
-  SPI_MASTER y
-  WAN y
-  ${optionalString (versionOlder version "4.17") ''
-    DONGLE y # Serial dongle support
-  ''}
-
-  # Networking options.
-  NET y
-  IP_PNP n
-  ${optionalString (versionOlder version "3.13") ''
-    IPV6_PRIVACY y
-  ''}
-  NETFILTER y
-  NETFILTER_ADVANCED y
-  CGROUP_BPF? y # Required by systemd per-cgroup firewalling
-  CGROUP_NET_PRIO y # Required by systemd
-  IP_ROUTE_VERBOSE y
-  IP_MROUTE_MULTIPLE_TABLES y
-  IP_VS_PROTO_TCP y
-  IP_VS_PROTO_UDP y
-  IP_VS_PROTO_ESP y
-  IP_VS_PROTO_AH y
-  IP_DCCP_CCID3 n # experimental
-  IP_MULTICAST y
-  IPV6_ROUTER_PREF y
-  IPV6_ROUTE_INFO y
-  IPV6_OPTIMISTIC_DAD y
-  IPV6_MULTIPLE_TABLES y
-  IPV6_SUBTREES y
-  IPV6_MROUTE y
-  IPV6_MROUTE_MULTIPLE_TABLES y
-  IPV6_PIMSM_V2 y
-  ${optionalString (versionAtLeast version "4.7") ''
-    IPV6_FOU_TUNNEL m
-  ''}
-  CLS_U32_PERF y
-  CLS_U32_MARK y
-  ${optionalString (stdenv.system == "x86_64-linux") ''
-    BPF_JIT y
-  ''}
-  ${optionalString (versionAtLeast version "4.4") ''
-    NET_CLS_BPF m
-    NET_ACT_BPF m
-  ''}
-  L2TP_V3 y
-  L2TP_IP m
-  L2TP_ETH m
-  BRIDGE_VLAN_FILTERING y
-  BONDING m
-  NET_L3_MASTER_DEV? y
-  NET_FOU_IP_TUNNELS? y
-  IP_NF_TARGET_REDIRECT m
-
-  # Wireless networking.
-  CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
-  IPW2100_MONITOR? y # support promiscuous mode
-  IPW2200_MONITOR? y # support promiscuous mode
-  HOSTAP_FIRMWARE? y # Support downloading firmware images with Host AP driver
-  HOSTAP_FIRMWARE_NVRAM? y
-  ATH9K_PCI? y # Detect Atheros AR9xxx cards on PCI(e) bus
-  ATH9K_AHB? y # Ditto, AHB bus
-  B43_PHY_HT? y
-  BCMA_HOST_PCI? y
-
-  # Enable various FB devices.
-  FB y
-  FB_EFI y
-  FB_NVIDIA_I2C y # Enable DDC Support
-  FB_RIVA_I2C y
-  FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-  FB_ATY_GX y # Mach64 GX support
-  FB_SAVAGE_I2C y
-  FB_SAVAGE_ACCEL y
-  FB_SIS_300 y
-  FB_SIS_315 y
-  FB_3DFX_ACCEL y
-  FB_VESA y
-  FRAMEBUFFER_CONSOLE y
-  FRAMEBUFFER_CONSOLE_ROTATION y
-  ${optionalString (stdenv.system == "i686-linux") ''
-    FB_GEODE y
-  ''}
-
-  # Video configuration.
-  # Enable KMS for devices whose X.org driver supports it.
-  ${optionalString (versionOlder version "4.3") ''
-    DRM_I915_KMS y
-  ''}
-  # iGVT-g support
-  ${optionalString (versionAtLeast version "4.16") ''
-    DRM_I915_GVT y
-    DRM_I915_GVT_KVMGT m
-  ''}
-  # Allow specifying custom EDID on the kernel command line
-  DRM_LOAD_EDID_FIRMWARE y
-  VGA_SWITCHEROO y # Hybrid graphics support
-  DRM_GMA600 y
-  DRM_GMA3600 y
-  ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
-    DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
-  ''}
-  ${optionalString (versionAtLeast version "4.9") ''
-    DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
-    DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
-  ''}
-
-  # Sound.
-  SND_DYNAMIC_MINORS y
-  SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-  SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-  SND_HDA_RECONFIG y # Support reconfiguration of jack functions
-  SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
-  SND_USB_CAIAQ_INPUT y
-  ${optionalString (versionOlder version "4.12") ''
-    PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-  ''}
-
-  # USB serial devices.
-  USB_SERIAL_GENERIC y # USB Generic Serial Driver
-
-  # Include firmware for various USB serial devices.
-  # Only applicable for kernels below 4.16, after that no firmware is shipped in the kernel tree.
-  ${optionalString (versionOlder version "4.16") ''
-    USB_SERIAL_KEYSPAN_MPR y
-    USB_SERIAL_KEYSPAN_USA28 y
-    USB_SERIAL_KEYSPAN_USA28X y
-    USB_SERIAL_KEYSPAN_USA28XA y
-    USB_SERIAL_KEYSPAN_USA28XB y
-    USB_SERIAL_KEYSPAN_USA19 y
-    USB_SERIAL_KEYSPAN_USA18X y
-    USB_SERIAL_KEYSPAN_USA19W y
-    USB_SERIAL_KEYSPAN_USA19QW y
-    USB_SERIAL_KEYSPAN_USA19QI y
-    USB_SERIAL_KEYSPAN_USA49W y
-    USB_SERIAL_KEYSPAN_USA49WLC y
-  ''}
-
-  # Device mapper (RAID, LVM, etc.)
-  MD y
-
-  # Filesystem options - in particular, enable extended attributes and
-  # ACLs for all filesystems that support them.
-  FANOTIFY y
-  TMPFS y
-  TMPFS_POSIX_ACL y
-  ${optionalString (versionAtLeast version "4.9") ''
-    FS_ENCRYPTION? m
-  ''}
-  EXT2_FS_XATTR y
-  EXT2_FS_POSIX_ACL y
-  EXT2_FS_SECURITY y
-  ${optionalString (versionOlder version "4.0") ''
-    EXT2_FS_XIP y # Ext2 execute in place support
-  ''}
-  EXT3_FS_POSIX_ACL y
-  EXT3_FS_SECURITY y
-  EXT4_FS_POSIX_ACL y
-  EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
-  EXT4_FS_SECURITY y
-  REISERFS_FS_XATTR? y
-  REISERFS_FS_POSIX_ACL? y
-  REISERFS_FS_SECURITY? y
-  JFS_POSIX_ACL? y
-  JFS_SECURITY? y
-  XFS_QUOTA? y
-  XFS_POSIX_ACL? y
-  XFS_RT? y # XFS Realtime subvolume support
-  OCFS2_DEBUG_MASKLOG? n
-  BTRFS_FS_POSIX_ACL y
-  UBIFS_FS_ADVANCED_COMPR? y
-  F2FS_FS m
-  F2FS_FS_SECURITY? y
-  F2FS_FS_ENCRYPTION? y
-  UDF_FS m
-  ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
-    NFSD_PNFS y
-  ''}
-  NFSD_V2_ACL y
-  NFSD_V3 y
-  NFSD_V3_ACL y
-  NFSD_V4 y
-  ${optionalString (versionAtLeast version "3.11") ''
-    NFSD_V4_SECURITY_LABEL y
-  ''}
-  NFS_FSCACHE y
-  NFS_SWAP y
-  NFS_V3_ACL y
-  ${optionalString (versionAtLeast version "3.11") ''
-    NFS_V4_1 y  # NFSv4.1 client support
-    NFS_V4_2 y
-    NFS_V4_SECURITY_LABEL y
-  ''}
-  CIFS_XATTR y
-  CIFS_POSIX y
-  CIFS_FSCACHE y
-  CIFS_STATS y
-  CIFS_WEAK_PW_HASH y
-  CIFS_UPCALL y
-  CIFS_ACL y
-  CIFS_DFS_UPCALL y
-  ${optionalString (versionOlder version "4.13") ''
-    CIFS_SMB2 y
-  ''}
-  ${optionalString (versionAtLeast version "3.12") ''
-    CEPH_FSCACHE y
-  ''}
-  ${optionalString (versionAtLeast version "3.14") ''
-    CEPH_FS_POSIX_ACL y
-  ''}
-  ${optionalString (versionAtLeast version "3.13") ''
-    SQUASHFS_FILE_DIRECT y
-    SQUASHFS_DECOMP_MULTI_PERCPU y
-  ''}
-  SQUASHFS_XATTR y
-  SQUASHFS_ZLIB y
-  SQUASHFS_LZO y
-  SQUASHFS_XZ y
-  ${optionalString (versionAtLeast version "3.19") ''
-    SQUASHFS_LZ4 y
-  ''}
-
-  # Native Language Support modules, needed by some filesystems
-  NLS y
-  NLS_DEFAULT utf8
-  NLS_UTF8 m
-  NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option
-  NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
-
-  # Runtime security tests
-  ${optionalString (versionOlder version "4.11") ''
-    DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
-  ''}
-
-  # Security related features.
-  RANDOMIZE_BASE? y
-  STRICT_DEVMEM? y # Filter access to /dev/mem
-  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  SECURITY_YAMA? y # Prevent processes from ptracing non-children processes
-  DEVKMEM n # Disable /dev/kmem
-  ${optionalString (! stdenv.hostPlatform.isAarch32)
-    (if versionOlder version "3.14" then ''
-        CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
-      '' else ''
-        CC_STACKPROTECTOR_REGULAR? y
-      '')}
-  ${optionalString (versionAtLeast version "3.12") ''
-    USER_NS y # Support for user namespaces
-  ''}
-
-  # AppArmor support
-  SECURITY_APPARMOR y
-  DEFAULT_SECURITY_APPARMOR y
-
-  # Microcode loading support
-  MICROCODE y
-  MICROCODE_INTEL y
-  MICROCODE_AMD y
-  ${optionalString (versionAtLeast version "3.11" && versionOlder version "4.4") ''
-    MICROCODE_EARLY y
-    MICROCODE_INTEL_EARLY y
-    MICROCODE_AMD_EARLY y
-  ''}
-
-  ${optionalString (versionAtLeast version "4.10") ''
-    # Write Back Throttling
-    # https://lwn.net/Articles/682582/
-    # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
-    BLK_WBT y
-    BLK_WBT_SQ y
-    BLK_WBT_MQ y
-  ''}
-
-  # Misc. options.
-  8139TOO_8129 y
-  8139TOO_PIO n # PIO is slower
-  AIC79XX_DEBUG_ENABLE n
-  AIC7XXX_DEBUG_ENABLE n
-  AIC94XX_DEBUG n
-  ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") ''
-    AUDIT_LOGINUID_IMMUTABLE y
-  ''}
-  ${optionalString (versionOlder version "4.4") ''
-    B43_PCMCIA? y
-  ''}
-  BLK_DEV_INITRD y
-  BLK_DEV_INTEGRITY y
-  BSD_PROCESS_ACCT_V3 y
-  BT_HCIUART_BCSP? y
-  BT_HCIUART_H4? y # UART (H4) protocol support
-  BT_HCIUART_LL? y
-  BT_RFCOMM_TTY? y # RFCOMM TTY support
-  CLEANCACHE? y
-  CRASH_DUMP? n
-  DVB_DYNAMIC_MINORS? y # we use udev
-  EFI_STUB y # EFI bootloader in the bzImage itself
-  CGROUPS y # used by systemd
-  FHANDLE y # used by systemd
-  SECCOMP y # used by systemd >= 231
-  SECCOMP_FILTER y # ditto
-  POSIX_MQUEUE y
-  FRONTSWAP y
-  FUSION y # Fusion MPT device support
-  IDE n # deprecated IDE support
-  ${optionalString (versionAtLeast version "4.3") ''
-    IDLE_PAGE_TRACKING y
-  ''}
-  ${optionalString (versionOlder version "4.17") ''
-    IRDA_ULTRA y # Ultra (connectionless) protocol
-  ''}
-  JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
-  JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
-  JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support
-  JOYSTICK_XPAD_LEDS? y # LED Support for Xbox360 controller 'BigX' LED
-  KEXEC_FILE? y
-  KEXEC_JUMP? y
-  LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-  LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
-  LOGO n # not needed
-  MEDIA_ATTACH y
-  MEGARAID_NEWGEN y
-  ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") ''
-    MLX4_EN_VXLAN y
-  ''}
-  ${optionalString (versionOlder version "4.9") ''
-    MODVERSIONS y
-  ''}
-  MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-  MTRR_SANITIZER y
-  NET_FC y # Fibre Channel driver support
-  ${optionalString (versionAtLeast version "3.11") ''
-    PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
-  ''}
-  MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8.
-  PPP_MULTILINK y # PPP multilink support
-  PPP_FILTER y
-  REGULATOR y # Voltage and Current Regulator Support
-  RC_DEVICES? y # Enable IR devices
-  RT2800USB_RT55XX y
-  SCHED_AUTOGROUP y
-  CFS_BANDWIDTH y
-  SCSI_LOGGING y # SCSI logging facility
-  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
-  ''}
-  ${optionalString (versionOlder version "3.15") ''
-    USB_DEBUG? n
-  ''}
-  USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-  USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-  ${optionalString (versionAtLeast version "4.3") ''
-    USERFAULTFD y
-  ''}
-  X86_CHECK_BIOS_CORRUPTION y
-  X86_MCE y
-
-  ${optionalString (versionAtLeast version "3.12") ''
-    HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI
-    HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support
-  ''}
-
-
-  # Linux containers.
-  NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'
-  RT_GROUP_SCHED n
-  CGROUP_DEVICE? y
-  MEMCG y
-  MEMCG_SWAP y
-  ${optionalString (versionOlder version "4.7") "DEVPTS_MULTIPLE_INSTANCES y"}
-  BLK_DEV_THROTTLING y
-  CFQ_GROUP_IOSCHED y
-  ${optionalString (versionAtLeast version "4.3") ''
-    CGROUP_PIDS y
-  ''}
-
-  # Enable staging drivers.  These are somewhat experimental, but
-  # they generally don't hurt.
-  STAGING y
-
-  # PROC_EVENTS requires that the netlink connector is not built
-  # as a module.  This is required by libcgroup's cgrulesengd.
-  CONNECTOR y
-  PROC_EVENTS y
-
-  # Tracing.
-  FTRACE y
-  KPROBES y
-  FUNCTION_TRACER y
-  FTRACE_SYSCALLS y
-  SCHED_TRACER y
-  STACK_TRACER y
-
-  ${if versionOlder version "4.11" then ''
-    UPROBE_EVENT? y
-  '' else ''
-    UPROBE_EVENTS? y
-  ''}
-
-  ${optionalString (versionAtLeast version "4.4") ''
-    BPF_SYSCALL y
-    BPF_EVENTS y
-  ''}
-  FUNCTION_PROFILER y
-  RING_BUFFER_BENCHMARK n
-
-  # Devtmpfs support.
-  DEVTMPFS y
-
-  # Easier debugging of NFS issues.
-  SUNRPC_DEBUG y
-
-  # Virtualisation.
-  PARAVIRT? y
-  HYPERVISOR_GUEST y
-  PARAVIRT_SPINLOCKS? y
-  ${optionalString (versionOlder version "4.8") ''
-    KVM_APIC_ARCHITECTURE y
-  ''}
-  KVM_ASYNC_PF y
-  ${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) ''
-    KVM_COMPAT? y
-  ''}
-  ${optionalString (versionOlder version "4.12") ''
-    KVM_DEVICE_ASSIGNMENT? y
-  ''}
-  ${optionalString (versionAtLeast version "4.0") ''
-    KVM_GENERIC_DIRTYLOG_READ_PROTECT y
-  ''}
-  KVM_GUEST y
-  KVM_MMIO y
-  ${optionalString (versionAtLeast version "3.13") ''
-    KVM_VFIO y
-  ''}
-  ${optionalString (stdenv.isx86_64 || stdenv.isi686) ''
-    XEN? y
-    XEN_DOM0? y
-    ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
-      PCI_XEN? y
-      HVC_XEN? y
-      HVC_XEN_FRONTEND? y
-      XEN_SYS_HYPERVISOR? y
-      SWIOTLB_XEN? y
-      XEN_BACKEND? y
-      XEN_BALLOON? y
-      XEN_BALLOON_MEMORY_HOTPLUG? y
-      XEN_EFI? y
-      XEN_HAVE_PVMMU? y
-      XEN_MCE_LOG? y
-      XEN_PVH? y
-      XEN_PVHVM? y
-      XEN_SAVE_RESTORE? y
-      XEN_SCRUB_PAGES? y
-      XEN_SELFBALLOONING? y
-      XEN_STUB? y
-      XEN_TMEM? y
-    ''}
-  ''}
-  KSM y
-  ${optionalString (!stdenv.is64bit) ''
-    HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support.
-  ''}
-  ${optionalString (stdenv.is64bit) ''
-    VFIO_PCI_VGA y
-  ''}
-  VIRT_DRIVERS y
-
-  # Media support.
-  MEDIA_DIGITAL_TV_SUPPORT y
-  MEDIA_CAMERA_SUPPORT y
-  ${optionalString (versionOlder version "4.14") ''
-    MEDIA_RC_SUPPORT y
-  ''}
-  MEDIA_CONTROLLER y
-  MEDIA_USB_SUPPORT y
-  MEDIA_PCI_SUPPORT y
-  MEDIA_ANALOG_TV_SUPPORT y
-  VIDEO_STK1160_COMMON m
-  ${optionalString (versionOlder version "4.11") ''
-    VIDEO_STK1160_AC97 y
-  ''}
-
-  # Our initrd init uses shebang scripts, so can't be modular.
-  BINFMT_SCRIPT y
-
-  # For systemd-binfmt
-  BINFMT_MISC? y
-
-  # Enable the 9P cache to speed up NixOS VM tests.
-  9P_FSCACHE? y
-  9P_FS_POSIX_ACL? y
-
-  # Enable transparent support for huge pages.
-  TRANSPARENT_HUGEPAGE? y
-  TRANSPARENT_HUGEPAGE_ALWAYS? n
-  TRANSPARENT_HUGEPAGE_MADVISE? y
-
-  # zram support (e.g for in-memory compressed swap).
-  ZRAM m
-  ZSWAP? y
-  ZBUD? y
-  ${optionalString (versionOlder version "3.18") ''
-    ZSMALLOC y
-  ''}
-  ${optionalString (versionAtLeast version "3.18") ''
-    ZSMALLOC m
-  ''}
-
-  # Enable PCIe and USB for the brcmfmac driver
-  BRCMFMAC_USB? y
-  BRCMFMAC_PCIE? y
-
-  # Support x2APIC (which requires IRQ remapping).
-  ${optionalString (stdenv.system == "x86_64-linux") ''
-    X86_X2APIC y
-    IRQ_REMAP y
-  ''}
-  
-  # needed for iwd WPS support (wpa_supplicant replacement)
-  ${optionalString (versionAtLeast version "4.7") ''
-    KEY_DH_OPERATIONS y
-  ''}
-
-  # Disable the firmware helper fallback, udev doesn't implement it any more
-  FW_LOADER_USER_HELPER_FALLBACK? n
-
-  # Disable various self-test modules that have no use in a production system
-  # This menu disables all/most of them on >= 4.16
-  RUNTIME_TESTING_MENU? n
-  # For older kernels, painstakingly disable each symbol.
-  ${optionalString (versionOlder version "4.16") ''
-    ARM_KPROBES_TEST? n
-    ASYNC_RAID6_TEST? n
-    ATOMIC64_SELFTEST? n
-    BACKTRACE_SELF_TEST? n
-    INTERVAL_TREE_TEST? n
-    PERCPU_TEST? n
-    RBTREE_TEST? n
-    TEST_BITMAP? n
-    TEST_BPF? n
-    TEST_FIRMWARE? n
-    TEST_HASH? n
-    TEST_HEXDUMP? n
-    TEST_KMOD? n
-    TEST_KSTRTOX? n
-    TEST_LIST_SORT? n
-    TEST_LKM? n
-    TEST_PARMAN? n
-    TEST_PRINTF? n
-    TEST_RHASHTABLE? n
-    TEST_SORT? n
-    TEST_STATIC_KEYS? n
-    TEST_STRING_HELPERS? n
-    TEST_UDELAY? n
-    TEST_USER_COPY? n
-    TEST_UUID? n
-  ''}
-
-  CRC32_SELFTEST? n
-  CRYPTO_TEST? n
-  DRM_DEBUG_MM_SELFTEST? n
-  EFI_TEST? n
-  GLOB_SELFTEST? n
-  LNET_SELFTEST? n
-  LOCK_TORTURE_TEST? n
-  MTD_TESTS? n
-  NOTIFIER_ERROR_INJECTION? n
-  RCU_PERF_TEST? n
-  RCU_TORTURE_TEST? n
-  TEST_ASYNC_DRIVER_PROBE? n
-  WW_MUTEX_SELFTEST? n
-  XZ_DEC_TEST? n
-
-  ${optionalString (features.criu or false)  ''
-    EXPERT y
-    CHECKPOINT_RESTORE y
-  ''}
-
-  ${optionalString ((features.criu or false) && (features.criu_revert_expert or true))
-    # Revert some changes, introduced by EXPERT, when necessary for criu
-  ''
-    RFKILL_INPUT? y
-    HID_PICOLCD_FB? y
-    HID_PICOLCD_BACKLIGHT? y
-    HID_PICOLCD_LCD? y
-    HID_PICOLCD_LEDS? y
-    HID_PICOLCD_CIR? y
-    DEBUG_MEMORY_INIT? y
-  ''}
-
-  ${extraConfig}
-''
+with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; };
+
+let
+
+  # configuration items have to be part of a subattrs
+  flattenKConf =  nested: mapAttrs (_: head) (zipAttrs (attrValues nested));
+
+  options = {
+
+    debug = {
+      DEBUG_INFO                = if (features.debug or false) then yes else no;
+      DEBUG_KERNEL              = yes;
+      DEBUG_DEVRES              = no;
+      DYNAMIC_DEBUG             = yes;
+      TIMER_STATS               = whenOlder "4.11" yes;
+      DEBUG_NX_TEST             = whenOlder "4.11" no;
+      CPU_NOTIFIER_ERROR_INJECT = whenOlder "4.4" (option no);
+      DEBUG_STACK_USAGE         = no;
+      DEBUG_STACKOVERFLOW       = when (!features.grsecurity) no;
+      RCU_TORTURE_TEST          = no;
+      SCHEDSTATS                = no;
+      DETECT_HUNG_TASK          = yes;
+      CRASH_DUMP                = option no;
+      # Easier debugging of NFS issues.
+      SUNRPC_DEBUG              = yes;
+    };
+
+    power-management = {
+      PM_ADVANCED_DEBUG                = yes;
+      X86_INTEL_LPSS                   = yes;
+      X86_INTEL_PSTATE                 = yes;
+      INTEL_IDLE                       = yes;
+      CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes;
+      PM_WAKELOCKS                     = yes;
+    };
+
+    external-firmware = {
+      # Support drivers that need external firmware.
+      STANDALONE = no;
+    };
+
+    proc-config-gz = {
+      # Make /proc/config.gz available
+      IKCONFIG      = yes;
+      IKCONFIG_PROC = yes;
+    };
+
+    optimization = {
+      # Optimize with -O2, not -Os
+      CC_OPTIMIZE_FOR_SIZE = no;
+    };
+
+    memtest = {
+      MEMTEST = yes;
+    };
+
+    # Include the CFQ I/O scheduler in the kernel, rather than as a
+    # module, so that the initrd gets a good I/O scheduler.
+    scheduler = {
+      IOSCHED_CFQ = yes;
+      BLK_CGROUP  = yes; # required by CFQ"
+      IOSCHED_DEADLINE = yes;
+      MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes;
+      BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes;
+      MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes;
+      IOSCHED_BFQ = whenAtLeast "4.12" module;
+    };
+
+    # Enable NUMA.
+    numa = {
+      NUMA  = option yes;
+    };
+
+    networking = {
+      NET                = yes;
+      IP_PNP             = no;
+      NETFILTER          = yes;
+      NETFILTER_ADVANCED = yes;
+      IP_VS_PROTO_TCP    = yes;
+      IP_VS_PROTO_UDP    = yes;
+      IP_VS_PROTO_ESP    = yes;
+      IP_VS_PROTO_AH     = yes;
+      IP_DCCP_CCID3      = no; # experimental
+      CLS_U32_PERF       = yes;
+      CLS_U32_MARK       = yes;
+      BPF_JIT            = when (stdenv.system == "x86_64-linux") yes;
+      WAN                = yes;
+      # Required by systemd per-cgroup firewalling
+      CGROUP_BPF                  = option yes;
+      CGROUP_NET_PRIO             = yes; # Required by systemd
+      IP_ROUTE_VERBOSE            = yes;
+      IP_MROUTE_MULTIPLE_TABLES   = yes;
+      IP_MULTICAST                = yes;
+      IPV6_ROUTER_PREF            = yes;
+      IPV6_ROUTE_INFO             = yes;
+      IPV6_OPTIMISTIC_DAD         = yes;
+      IPV6_MULTIPLE_TABLES        = yes;
+      IPV6_SUBTREES               = yes;
+      IPV6_MROUTE                 = yes;
+      IPV6_MROUTE_MULTIPLE_TABLES = yes;
+      IPV6_PIMSM_V2               = yes;
+      IPV6_FOU_TUNNEL             = whenAtLeast "4.7" module;
+      NET_CLS_BPF                 = whenAtLeast "4.4" module;
+      NET_ACT_BPF                 = whenAtLeast "4.4" module;
+      L2TP_V3                     = yes;
+      L2TP_IP                     = module;
+      L2TP_ETH                    = module;
+      BRIDGE_VLAN_FILTERING       = yes;
+      BONDING                     = module;
+      NET_L3_MASTER_DEV           = option yes;
+      NET_FOU_IP_TUNNELS          = option yes;
+      IP_NF_TARGET_REDIRECT       = module;
+
+      PPP_MULTILINK = yes; # PPP multilink support
+      PPP_FILTER    = yes;
+
+      # needed for iwd WPS support (wpa_supplicant replacement)
+      KEY_DH_OPERATIONS = whenAtLeast "4.7" yes;
+    };
+
+    wireless = {
+      CFG80211_WEXT         = option yes; # Without it, ipw2200 drivers don't build
+      IPW2100_MONITOR       = option yes; # support promiscuous mode
+      IPW2200_MONITOR       = option yes; # support promiscuous mode
+      HOSTAP_FIRMWARE       = option yes; # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM = option yes;
+      ATH9K_PCI             = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus
+      ATH9K_AHB             = option yes; # Ditto, AHB bus
+      B43_PHY_HT            = option yes;
+      BCMA_HOST_PCI         = option yes;
+    };
+
+    fb = {
+      FB                  = yes;
+      FB_EFI              = yes;
+      FB_NVIDIA_I2C       = yes; # Enable DDC Support
+      FB_RIVA_I2C         = yes;
+      FB_ATY_CT           = yes; # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX           = yes; # Mach64 GX support
+      FB_SAVAGE_I2C       = yes;
+      FB_SAVAGE_ACCEL     = yes;
+      FB_SIS_300          = yes;
+      FB_SIS_315          = yes;
+      FB_3DFX_ACCEL       = yes;
+      FB_VESA             = yes;
+      FRAMEBUFFER_CONSOLE = yes;
+      FRAMEBUFFER_CONSOLE_ROTATION = yes;
+      FB_GEODE            = when (stdenv.system == "i686-linux") yes;
+    };
+
+    video = {
+      # Enable KMS for devices whose X.org driver supports it
+      DRM_I915_KMS           = whenOlder "4.3" yes;
+      # Allow specifying custom EDID on the kernel command line
+      DRM_LOAD_EDID_FIRMWARE = yes;
+      VGA_SWITCHEROO         = yes; # Hybrid graphics support
+      DRM_GMA600             = yes;
+      DRM_GMA3600            = yes;
+      # necessary for amdgpu polaris support
+      DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes;
+      # (experimental) amdgpu support for verde and newer chipsets
+      DRM_AMDGPU_SI = whenAtLeast "4.9" yes;
+      # (stable) amdgpu support for bonaire and newer chipsets
+      DRM_AMDGPU_CIK = whenAtLeast "4.9" yes;
+    } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
+      # Intel GVT-g graphics virtualization supports 64-bit only
+      DRM_I915_GVT = whenAtLeast "4.16" yes;
+      DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module;
+    };
+
+    sound = {
+      SND_DYNAMIC_MINORS  = yes;
+      SND_AC97_POWER_SAVE = yes; # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP  = yes; # Support digital beep via input layer
+      SND_HDA_RECONFIG    = yes; # Support reconfiguration of jack functions
+      # Support configuring jack functions via fw mechanism at boot
+      SND_HDA_PATCH_LOADER = yes;
+      SND_USB_CAIAQ_INPUT = yes;
+      # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+      PSS_MIXER           = whenOlder "4.12" yes;
+    };
+
+    usb-serial = {
+      USB_SERIAL_GENERIC          = yes; # USB Generic Serial Driver
+    } // optionalAttrs (versionOlder version "4.16") {
+      # Include firmware for various USB serial devices.
+      # Only applicable for kernels below 4.16, after that no firmware is shipped in the kernel tree.
+      USB_SERIAL_KEYSPAN_MPR      = yes;
+      USB_SERIAL_KEYSPAN_USA28    = yes;
+      USB_SERIAL_KEYSPAN_USA28X   = yes;
+      USB_SERIAL_KEYSPAN_USA28XA  = yes;
+      USB_SERIAL_KEYSPAN_USA28XB  = yes;
+      USB_SERIAL_KEYSPAN_USA19    = yes;
+      USB_SERIAL_KEYSPAN_USA18X   = yes;
+      USB_SERIAL_KEYSPAN_USA19W   = yes;
+      USB_SERIAL_KEYSPAN_USA19QW  = yes;
+      USB_SERIAL_KEYSPAN_USA19QI  = yes;
+      USB_SERIAL_KEYSPAN_USA49W   = yes;
+      USB_SERIAL_KEYSPAN_USA49WLC = yes;
+    };
+
+    usb = {
+      USB_DEBUG            = option (whenOlder "4.18" no);
+      USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators
+      USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling
+    };
+
+    # Filesystem options - in particular, enable extended attributes and
+    # ACLs for all filesystems that support them.
+    filesystem = {
+      FANOTIFY        = yes;
+      TMPFS           = yes;
+      TMPFS_POSIX_ACL = yes;
+      FS_ENCRYPTION   = option (whenAtLeast "4.9" module);
+
+      EXT2_FS_XATTR     = yes;
+      EXT2_FS_POSIX_ACL = yes;
+      EXT2_FS_SECURITY  = yes;
+      EXT2_FS_XIP       = whenOlder "4.0" yes; # Ext2 execute in place support
+
+      EXT3_FS_POSIX_ACL = yes;
+      EXT3_FS_SECURITY  = yes;
+
+      EXT4_FS_POSIX_ACL = yes;
+      EXT4_FS_SECURITY  = yes;
+      EXT4_ENCRYPTION   = option ((if (versionOlder version "4.8") then module else yes));
+
+      REISERFS_FS_XATTR     = option yes;
+      REISERFS_FS_POSIX_ACL = option yes;
+      REISERFS_FS_SECURITY  = option yes;
+
+      JFS_POSIX_ACL = option yes;
+      JFS_SECURITY  = option yes;
+
+      XFS_QUOTA     = option yes;
+      XFS_POSIX_ACL = option yes;
+      XFS_RT        = option yes; # XFS Realtime subvolume support
+
+      OCFS2_DEBUG_MASKLOG = option no;
+
+      BTRFS_FS_POSIX_ACL = yes;
+
+      UBIFS_FS_ADVANCED_COMPR = option yes;
+
+      F2FS_FS             = module;
+      F2FS_FS_SECURITY    = option yes;
+      F2FS_FS_ENCRYPTION  = option yes;
+      UDF_FS              = module;
+
+      NFSD_PNFS              = whenBetween "4.0" "4.6" yes;
+      NFSD_V2_ACL            = yes;
+      NFSD_V3                = yes;
+      NFSD_V3_ACL            = yes;
+      NFSD_V4                = yes;
+      NFSD_V4_SECURITY_LABEL = yes;
+
+      NFS_FSCACHE           = yes;
+      NFS_SWAP              = yes;
+      NFS_V3_ACL            = yes;
+      NFS_V4_1              = yes;  # NFSv4.1 client support
+      NFS_V4_2              = yes;
+      NFS_V4_SECURITY_LABEL = yes;
+
+      CIFS_XATTR        = yes;
+      CIFS_POSIX        = yes;
+      CIFS_FSCACHE      = yes;
+      CIFS_STATS        = yes;
+      CIFS_WEAK_PW_HASH = yes;
+      CIFS_UPCALL       = yes;
+      CIFS_ACL          = yes;
+      CIFS_DFS_UPCALL   = yes;
+      CIFS_SMB2         = whenOlder "4.13" yes;
+
+      CEPH_FSCACHE      = yes;
+      CEPH_FS_POSIX_ACL = yes;
+
+      SQUASHFS_FILE_DIRECT         = yes;
+      SQUASHFS_DECOMP_MULTI_PERCPU = yes;
+      SQUASHFS_XATTR               = yes;
+      SQUASHFS_ZLIB                = yes;
+      SQUASHFS_LZO                 = yes;
+      SQUASHFS_XZ                  = yes;
+      SQUASHFS_LZ4                 = yes;
+
+      # Native Language Support modules, needed by some filesystems
+      NLS              = yes;
+      NLS_DEFAULT      = "utf8";
+      NLS_UTF8         = module;
+      NLS_CODEPAGE_437 = module; # VFAT default for the codepage= mount option
+      NLS_ISO8859_1    = module; # VFAT default for the iocharset= mount option
+
+      DEVTMPFS = yes;
+    };
+
+    security = {
+      # Detect writes to read-only module pages
+      DEBUG_SET_MODULE_RONX            = option (whenOlder "4.11" yes);
+      RANDOMIZE_BASE                   = option yes;
+      STRICT_DEVMEM                    = option yes; # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE = "0"; # Disable SELinux by default
+      # Prevent processes from ptracing non-children processes
+      SECURITY_YAMA                    = option yes;
+      DEVKMEM                          = when (!features.grsecurity) no; # Disable /dev/kmem
+
+      USER_NS                          = yes; # Support for user namespaces
+
+      SECURITY_APPARMOR                = yes;
+      DEFAULT_SECURITY_APPARMOR        = yes;
+
+    } // optionalAttrs (!stdenv.hostPlatform.isAarch32) {
+
+      # Detect buffer overflows on the stack
+      CC_STACKPROTECTOR_REGULAR = option (whenOlder "4.18" yes);
+    };
+
+    microcode = {
+      MICROCODE       = yes;
+      MICROCODE_INTEL = yes;
+      MICROCODE_AMD   = yes;
+
+      MICROCODE_EARLY       = whenOlder "4.4" yes;
+      MICROCODE_INTEL_EARLY = whenOlder "4.4" yes;
+      MICROCODE_AMD_EARLY   = whenOlder "4.4" yes;
+    } // optionalAttrs (versionAtLeast version "4.10") {
+      # Write Back Throttling
+      # https://lwn.net/Articles/682582/
+      # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
+      BLK_WBT    = yes;
+      BLK_WBT_SQ = yes;
+      BLK_WBT_MQ = yes;
+    };
+
+    container = {
+      NAMESPACES     = option yes; #  Required by 'unshare' used by 'nixos-install'
+      RT_GROUP_SCHED = no;
+      CGROUP_DEVICE  = option yes;
+
+      MEMCG                    = yes;
+      MEMCG_SWAP               = yes;
+
+      DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes;
+      BLK_DEV_THROTTLING        = yes;
+      CFQ_GROUP_IOSCHED         = yes;
+      CGROUP_PIDS               = whenAtLeast "4.3" yes;
+    };
+
+    staging = {
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING = yes;
+    };
+
+    proc-events = {
+      # PROC_EVENTS requires that the netlink connector is not built
+      # as a module.  This is required by libcgroup's cgrulesengd.
+      CONNECTOR   = yes;
+      PROC_EVENTS = yes;
+    };
+
+    tracing = {
+      FTRACE                = yes;
+      KPROBES               = yes;
+      FUNCTION_TRACER       = yes;
+      FTRACE_SYSCALLS       = yes;
+      SCHED_TRACER          = yes;
+      STACK_TRACER          = yes;
+      UPROBE_EVENT          = option (whenOlder "4.11" yes);
+      UPROBE_EVENTS         = option (whenAtLeast "4.11" yes);
+      BPF_SYSCALL           = whenAtLeast "4.4" yes;
+      BPF_EVENTS            = whenAtLeast "4.4" yes;
+      FUNCTION_PROFILER     = yes;
+      RING_BUFFER_BENCHMARK = no;
+    };
+
+    virtualisation = {
+      PARAVIRT = option yes;
+
+      HYPERVISOR_GUEST = when (!features.grsecurity) yes;
+      PARAVIRT_SPINLOCKS  = option yes;
+
+      KVM_APIC_ARCHITECTURE             = whenOlder "4.8" yes;
+      KVM_ASYNC_PF                      = yes;
+      KVM_COMPAT                        = option (whenBetween "4.0" "4.12"  yes);
+      KVM_DEVICE_ASSIGNMENT             = option (whenBetween "3.10" "4.12" yes);
+      KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0"  yes;
+      KVM_GUEST                         = when (!features.grsecurity) yes;
+      KVM_MMIO                          = yes;
+      KVM_VFIO                          = yes;
+      KSM = yes;
+      VIRT_DRIVERS = yes;
+      # We nneed 64 GB (PAE) support for Xen guest support
+      HIGHMEM64G = option (when (!stdenv.is64bit) yes);
+
+      VFIO_PCI_VGA = when stdenv.is64bit yes;
+
+    } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
+      XEN = option yes;
+
+      # XXX: why isn't this in the xen-dom0 conditional section below?
+      XEN_DOM0 = option yes;
+
+    } // optionalAttrs features.xen_dom0 {
+      PCI_XEN                     = option yes;
+      HVC_XEN                     = option yes;
+      HVC_XEN_FRONTEND            = option yes;
+      XEN_SYS_HYPERVISOR          = option yes;
+      SWIOTLB_XEN                 = option yes;
+      XEN_BACKEND                 = option yes;
+      XEN_BALLOON                 = option yes;
+      XEN_BALLOON_MEMORY_HOTPLUG  = option yes;
+      XEN_EFI                     = option yes;
+      XEN_HAVE_PVMMU              = option yes;
+      XEN_MCE_LOG                 = option yes;
+      XEN_PVH                     = option yes;
+      XEN_PVHVM                   = option yes;
+      XEN_SAVE_RESTORE            = option yes;
+      XEN_SCRUB_PAGES             = option yes;
+      XEN_SELFBALLOONING          = option yes;
+      XEN_STUB                    = option yes;
+      XEN_TMEM                    = option yes;
+    });
+
+    media = {
+      MEDIA_DIGITAL_TV_SUPPORT = yes;
+      MEDIA_CAMERA_SUPPORT     = yes;
+      MEDIA_RC_SUPPORT         = whenOlder "4.14" yes;
+			MEDIA_CONTROLLER         = yes;
+      MEDIA_PCI_SUPPORT        = yes;
+      MEDIA_USB_SUPPORT        = yes;
+      MEDIA_ANALOG_TV_SUPPORT  = yes;
+      VIDEO_STK1160_COMMON     = module;
+      VIDEO_STK1160_AC97       = whenOlder "4.11" yes;
+    };
+
+    "9p" = {
+      # Enable the 9P cache to speed up NixOS VM tests.
+      "9P_FSCACHE"      = option yes;
+      "9P_FS_POSIX_ACL" = option yes;
+    };
+
+    huge-page = {
+      TRANSPARENT_HUGEPAGE         = option yes;
+      TRANSPARENT_HUGEPAGE_ALWAYS  = option no;
+      TRANSPARENT_HUGEPAGE_MADVISE = option yes;
+    };
+
+    zram = {
+      ZRAM     = module;
+      ZSWAP    = option yes;
+      ZBUD     = option yes;
+      ZSMALLOC = module;
+    };
+
+    brcmfmac = {
+      # Enable PCIe and USB for the brcmfmac driver
+      BRCMFMAC_USB  = option yes;
+      BRCMFMAC_PCIE = option yes;
+    };
+
+    # Support x2APIC (which requires IRQ remapping)
+    x2apic = optionalAttrs (stdenv.system == "x86_64-linux") {
+      X86_X2APIC = yes;
+      IRQ_REMAP  = yes;
+    };
+
+    # Disable various self-test modules that have no use in a production system
+    tests = {
+      # This menu disables all/most of them on >= 4.16
+      RUNTIME_TESTING_MENU = option no;
+    } // optionalAttrs (versionOlder version "4.16") {
+      # For older kernels, painstakingly disable each symbol.
+      ARM_KPROBES_TEST    = option no;
+      ASYNC_RAID6_TEST    = option no;
+      ATOMIC64_SELFTEST   = option no;
+      BACKTRACE_SELF_TEST = option no;
+      INTERVAL_TREE_TEST  = option no;
+      PERCPU_TEST         = option no;
+      RBTREE_TEST         = option no;
+      TEST_BITMAP         = option no;
+      TEST_BPF            = option no;
+      TEST_FIRMWARE       = option no;
+      TEST_HASH           = option no;
+      TEST_HEXDUMP        = option no;
+      TEST_KMOD           = option no;
+      TEST_KSTRTOX        = option no;
+      TEST_LIST_SORT      = option no;
+      TEST_LKM            = option no;
+      TEST_PARMAN         = option no;
+      TEST_PRINTF         = option no;
+      TEST_RHASHTABLE     = option no;
+      TEST_SORT           = option no;
+      TEST_STATIC_KEYS    = option no;
+      TEST_STRING_HELPERS = option no;
+      TEST_UDELAY         = option no;
+      TEST_USER_COPY      = option no;
+      TEST_UUID           = option no;
+    } // {
+      CRC32_SELFTEST           = option no;
+      CRYPTO_TEST              = option no;
+      EFI_TEST                 = option no;
+      GLOB_SELFTEST            = option no;
+      DRM_DEBUG_MM_SELFTEST    = option (whenOlder "4.18" no);
+      LNET_SELFTEST            = option (whenOlder "4.18" no);
+      LOCK_TORTURE_TEST        = option no;
+      MTD_TESTS                = option no;
+      NOTIFIER_ERROR_INJECTION = option no;
+      RCU_PERF_TEST            = option no;
+      RCU_TORTURE_TEST         = option no;
+      TEST_ASYNC_DRIVER_PROBE  = option no;
+      WW_MUTEX_SELFTEST        = option no;
+      XZ_DEC_TEST              = option no;
+    } // optionalAttrs (features.criu or false) ({
+      EXPERT              = yes;
+      CHECKPOINT_RESTORE  = yes;
+    } // optionalAttrs (features.criu_revert_expert or true) {
+      RFKILL_INPUT          = option yes;
+      HID_PICOLCD_FB        = option yes;
+      HID_PICOLCD_BACKLIGHT = option yes;
+      HID_PICOLCD_LCD       = option yes;
+      HID_PICOLCD_LEDS      = option yes;
+      HID_PICOLCD_CIR       = option yes;
+      DEBUG_MEMORY_INIT     = option yes;
+    });
+
+    misc = {
+      MODULE_COMPRESS    = yes;
+      MODULE_COMPRESS_XZ = yes;
+      KERNEL_XZ          = yes;
+
+      UNIX               = yes;  # Unix domain sockets.
+
+      MD                 = yes;     # Device mapper (RAID, LVM, etc.)
+
+      # Enable initrd support.
+      BLK_DEV_RAM       = yes;
+      BLK_DEV_INITRD    = yes;
+
+      PM_TRACE_RTC         = no; # Disable some expensive (?) features.
+      ACCESSIBILITY        = yes; # Accessibility support
+      AUXDISPLAY           = yes; # Auxiliary Display support
+      DONGLE               = whenOlder "4.17" yes; # Serial dongle support
+      HIPPI                = yes;
+      MTD_COMPLEX_MAPPINGS = yes; # needed for many devices
+
+      SCSI_LOWLEVEL        = yes; # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA = yes;
+      SCSI_SAS_ATA         = yes; # added to enable detection of hard drive
+
+      SPI        = yes; # needed for many devices
+      SPI_MASTER = yes;
+
+      "8139TOO_8129" = yes;
+      "8139TOO_PIO"  = no; # PIO is slower
+
+      AIC79XX_DEBUG_ENABLE = no;
+      AIC7XXX_DEBUG_ENABLE = no;
+      AIC94XX_DEBUG = no;
+      B43_PCMCIA = option (whenOlder "4.4" yes);
+
+      BLK_DEV_INTEGRITY       = yes;
+
+      BSD_PROCESS_ACCT_V3 = yes;
+
+      BT_HCIUART_BCSP = option yes;
+      BT_HCIUART_H4   = option yes; # UART (H4) protocol support
+      BT_HCIUART_LL   = option yes;
+      BT_RFCOMM_TTY   = option yes; # RFCOMM TTY support
+
+      CLEANCACHE = option yes;
+      CRASH_DUMP = option no;
+
+      DVB_DYNAMIC_MINORS = option yes; # we use udev
+
+      EFI_STUB            = yes; # EFI bootloader in the bzImage itself
+      CGROUPS             = yes; # used by systemd
+      FHANDLE             = yes; # used by systemd
+      SECCOMP             = yes; # used by systemd >= 231
+      SECCOMP_FILTER      = yes; # ditto
+      POSIX_MQUEUE        = yes;
+      FRONTSWAP           = yes;
+      FUSION              = yes; # Fusion MPT device support
+      IDE                 = no; # deprecated IDE support
+      IDLE_PAGE_TRACKING  = yes;
+      IRDA_ULTRA          = whenOlder "4.17" yes; # Ultra (connectionless) protocol
+
+      JOYSTICK_IFORCE_232 = option yes; # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB = option yes; # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF    = option yes; # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS  = option yes; # LED Support for Xbox360 controller 'BigX' LED
+
+      KEXEC_FILE      = option yes;
+      KEXEC_JUMP      = option yes;
+
+      # Windows Logical Disk Manager (Dynamic Disk) support
+      LDM_PARTITION         = yes;
+      LOGIRUMBLEPAD2_FF     = yes; # Logitech Rumblepad 2 force feedback
+      LOGO                  = no; # not needed
+      MEDIA_ATTACH          = yes;
+      MEGARAID_NEWGEN       = yes;
+
+      MLX4_EN_VXLAN = whenOlder "4.8" yes;
+
+      MODVERSIONS        = whenOlder "4.9" yes;
+      MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
+      MTRR_SANITIZER     = yes;
+      NET_FC             = yes; # Fibre Channel driver support
+      # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
+      PINCTRL_BAYTRAIL   = yes;
+      # 8 is default. Modern gpt tables on eMMC may go far beyond 8.
+      MMC_BLOCK_MINORS   = "32";
+
+      REGULATOR  = yes; # Voltage and Current Regulator Support
+      RC_DEVICES = option yes; # Enable IR devices
+
+      RT2800USB_RT53XX = yes;
+      RT2800USB_RT55XX = yes;
+
+      SCHED_AUTOGROUP  = yes;
+      CFS_BANDWIDTH    = yes;
+
+      SCSI_LOGGING = yes; # SCSI logging facility
+      SERIAL_8250  = yes; # 8250/16550 and compatible serial support
+
+      SLIP_COMPRESSED = yes; # CSLIP compressed headers
+      SLIP_SMART      = yes;
+
+      HWMON         = yes;
+      THERMAL_HWMON = yes; # Hardware monitoring support
+      UEVENT_HELPER = no;
+
+      USERFAULTFD   = yes;
+      X86_CHECK_BIOS_CORRUPTION = yes;
+      X86_MCE                   = yes;
+
+      # Our initrd init uses shebang scripts, so can't be modular.
+      BINFMT_SCRIPT = yes;
+      # For systemd-binfmt
+      BINFMT_MISC   = option yes;
+
+      # Disable the firmware helper fallback, udev doesn't implement it any more
+      FW_LOADER_USER_HELPER_FALLBACK = option no;
+
+      HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI
+      HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
+
+    } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
+      # Bump the maximum number of CPUs to support systems like EC2 x1.*
+      # instances and Xeon Phi.
+      NR_CPUS = "384";
+    };
+  };
+in (generateNixKConf ((flattenKConf options) // structuredExtraConfig) mkValueOverride) + extraConfig
diff --git a/pkgs/os-specific/linux/kernel/copperhead-4-14.patch b/pkgs/os-specific/linux/kernel/copperhead-4-14.patch
new file mode 100644
index 0000000000000..78112d164f069
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/copperhead-4-14.patch
@@ -0,0 +1,2864 @@
+diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
+index 0380a45ecf4b..39956a3ef645 100644
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -490,16 +490,6 @@
+			nosocket -- Disable socket memory accounting.
+			nokmem -- Disable kernel memory accounting.
+
+-	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
+-			Format: { "0" | "1" }
+-			See security/selinux/Kconfig help text.
+-			0 -- check protection applied by kernel (includes
+-				any implied execute protection).
+-			1 -- check protection requested by application.
+-			Default value is set via a kernel config option.
+-			Value can be changed at runtime via
+-				/selinux/checkreqprot.
+-
+	cio_ignore=	[S390]
+			See Documentation/s390/CommonIO for details.
+	clk_ignore_unused
+@@ -2899,6 +2889,11 @@
+			the specified number of seconds.  This is to be used if
+			your oopses keep scrolling off the screen.
+
++	extra_latent_entropy
++			Enable a very simple form of latent entropy extraction
++			from the first 4GB of memory as the bootmem allocator
++			passes the memory pages to the buddy allocator.
++
+	pcbit=		[HW,ISDN]
+
+	pcd.		[PARIDE]
+diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
+index 694968c7523c..002d86416ef8 100644
+--- a/Documentation/sysctl/kernel.txt
++++ b/Documentation/sysctl/kernel.txt
+@@ -91,6 +91,7 @@ show up in /proc/sys/kernel:
+ - sysctl_writes_strict
+ - tainted
+ - threads-max
++- tiocsti_restrict
+ - unknown_nmi_panic
+ - watchdog
+ - watchdog_thresh
+@@ -999,6 +1000,26 @@ available RAM pages threads-max is reduced accordingly.
+
+ ==============================================================
+
++tiocsti_restrict:
++
++This toggle indicates whether unprivileged users are prevented
++from using the TIOCSTI ioctl to inject commands into other processes
++which share a tty session.
++
++When tiocsti_restrict is set to (0) there are no restrictions(accept
++the default restriction of only being able to injection commands into
++one's own tty). When tiocsti_restrict is set to (1), users must
++have CAP_SYS_ADMIN to use the TIOCSTI ioctl.
++
++When user namespaces are in use, the check for the capability
++CAP_SYS_ADMIN is done against the user namespace that originally
++opened the tty.
++
++The kernel config option CONFIG_SECURITY_TIOCSTI_RESTRICT sets the
++default value of tiocsti_restrict.
++
++==============================================================
++
+ unknown_nmi_panic:
+
+ The value in this file affects behavior of handling NMI. When the
+diff --git a/Makefile b/Makefile
+index 787cf6605209..e4fda5330730 100644
+--- a/Makefile
++++ b/Makefile
+@@ -710,6 +710,9 @@ endif
+ KBUILD_CFLAGS += $(stackp-flag)
+
+ ifeq ($(cc-name),clang)
++ifdef CONFIG_LOCAL_INIT
++KBUILD_CFLAGS   += -fsanitize=local-init
++endif
+ KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
+ KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
+ KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
+diff --git a/arch/Kconfig b/arch/Kconfig
+index 400b9e1b2f27..4637096f7902 100644
+--- a/arch/Kconfig
++++ b/arch/Kconfig
+@@ -440,6 +440,11 @@ config GCC_PLUGIN_LATENT_ENTROPY
+	  is some slowdown of the boot process (about 0.5%) and fork and
+	  irq processing.
+
++	  When extra_latent_entropy is passed on the kernel command line,
++	  entropy will be extracted from up to the first 4GB of RAM while the
++	  runtime memory allocator is being initialized.  This costs even more
++	  slowdown of the boot process.
++
+	  Note that entropy extracted this way is not cryptographically
+	  secure!
+
+@@ -533,7 +538,7 @@ config CC_STACKPROTECTOR
+ choice
+	prompt "Stack Protector buffer overflow detection"
+	depends on HAVE_CC_STACKPROTECTOR
+-	default CC_STACKPROTECTOR_NONE
++	default CC_STACKPROTECTOR_STRONG
+	help
+	  This option turns on the "stack-protector" GCC feature. This
+	  feature puts, at the beginning of functions, a canary value on
+@@ -735,7 +740,7 @@ config ARCH_MMAP_RND_BITS
+	int "Number of bits to use for ASLR of mmap base address" if EXPERT
+	range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX
+	default ARCH_MMAP_RND_BITS_DEFAULT if ARCH_MMAP_RND_BITS_DEFAULT
+-	default ARCH_MMAP_RND_BITS_MIN
++	default ARCH_MMAP_RND_BITS_MAX
+	depends on HAVE_ARCH_MMAP_RND_BITS
+	help
+	  This value can be used to select the number of bits to use to
+@@ -769,7 +774,7 @@ config ARCH_MMAP_RND_COMPAT_BITS
+	int "Number of bits to use for ASLR of mmap base address for compatible applications" if EXPERT
+	range ARCH_MMAP_RND_COMPAT_BITS_MIN ARCH_MMAP_RND_COMPAT_BITS_MAX
+	default ARCH_MMAP_RND_COMPAT_BITS_DEFAULT if ARCH_MMAP_RND_COMPAT_BITS_DEFAULT
+-	default ARCH_MMAP_RND_COMPAT_BITS_MIN
++	default ARCH_MMAP_RND_COMPAT_BITS_MAX
+	depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
+	help
+	  This value can be used to select the number of bits to use to
+@@ -952,6 +957,7 @@ config ARCH_HAS_REFCOUNT
+
+ config REFCOUNT_FULL
+	bool "Perform full reference count validation at the expense of speed"
++	default y
+	help
+	  Enabling this switches the refcounting infrastructure from a fast
+	  unchecked atomic_t implementation to a fully state checked
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index 2d5f7aca156d..aa4839a74c6a 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -918,6 +918,7 @@ endif
+
+ config ARM64_SW_TTBR0_PAN
+	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
++	default y
+	help
+	  Enabling this option prevents the kernel from accessing
+	  user-space memory directly by pointing TTBR0_EL1 to a reserved
+@@ -1044,6 +1045,7 @@ config RANDOMIZE_BASE
+	bool "Randomize the address of the kernel image"
+	select ARM64_MODULE_PLTS if MODULES
+	select RELOCATABLE
++	default y
+	help
+	  Randomizes the virtual address at which the kernel image is
+	  loaded, as a security feature that deters exploit attempts
+diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
+index cc6bd559af85..01d5442d4722 100644
+--- a/arch/arm64/Kconfig.debug
++++ b/arch/arm64/Kconfig.debug
+@@ -45,6 +45,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET
+ config DEBUG_WX
+	bool "Warn on W+X mappings at boot"
+	select ARM64_PTDUMP_CORE
++	default y
+	---help---
+	  Generate a warning if any W+X mappings are found at boot.
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 34480e9af2e7..26304242250c 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -1,4 +1,3 @@
+-CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+ CONFIG_AUDIT=y
+ CONFIG_NO_HZ_IDLE=y
+diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
+index 33be513ef24c..6f0c0e3ef0dd 100644
+--- a/arch/arm64/include/asm/elf.h
++++ b/arch/arm64/include/asm/elf.h
+@@ -114,10 +114,10 @@
+
+ /*
+  * This is the base location for PIE (ET_DYN with INTERP) loads. On
+- * 64-bit, this is above 4GB to leave the entire 32-bit address
++ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
+  * space open for things that want to use the area for 32-bit pointers.
+  */
+-#define ELF_ET_DYN_BASE		(2 * TASK_SIZE_64 / 3)
++#define ELF_ET_DYN_BASE		0x100000000UL
+
+ #ifndef __ASSEMBLY__
+
+@@ -158,10 +158,10 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+ /* 1GB of VA */
+ #ifdef CONFIG_COMPAT
+ #define STACK_RND_MASK			(test_thread_flag(TIF_32BIT) ? \
+-						0x7ff >> (PAGE_SHIFT - 12) : \
+-						0x3ffff >> (PAGE_SHIFT - 12))
++						((1UL << mmap_rnd_compat_bits) - 1) >> (PAGE_SHIFT - 12) : \
++						((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
+ #else
+-#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))
++#define STACK_RND_MASK			(((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
+ #endif
+
+ #ifdef __AARCH64EB__
+diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
+index 9e773732520c..91359f45b5fc 100644
+--- a/arch/arm64/kernel/process.c
++++ b/arch/arm64/kernel/process.c
+@@ -419,9 +419,9 @@ unsigned long arch_align_stack(unsigned long sp)
+ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ {
+	if (is_compat_task())
+-		return randomize_page(mm->brk, SZ_32M);
++		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
+	else
+-		return randomize_page(mm->brk, SZ_1G);
++		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
+ }
+
+ /*
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 7483cd514c32..835a86c45fb0 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1153,8 +1153,7 @@ config VM86
+        default X86_LEGACY_VM86
+
+ config X86_16BIT
+-	bool "Enable support for 16-bit segments" if EXPERT
+-	default y
++	bool "Enable support for 16-bit segments"
+	depends on MODIFY_LDT_SYSCALL
+	---help---
+	  This option is required by programs like Wine to run 16-bit
+@@ -2228,7 +2227,7 @@ config COMPAT_VDSO
+ choice
+	prompt "vsyscall table for legacy applications"
+	depends on X86_64
+-	default LEGACY_VSYSCALL_EMULATE
++	default LEGACY_VSYSCALL_NONE
+	help
+	  Legacy user code that does not know how to find the vDSO expects
+	  to be able to issue three syscalls by calling fixed addresses in
+@@ -2318,8 +2317,7 @@ config CMDLINE_OVERRIDE
+	  be set to 'N' under normal conditions.
+
+ config MODIFY_LDT_SYSCALL
+-	bool "Enable the LDT (local descriptor table)" if EXPERT
+-	default y
++	bool "Enable the LDT (local descriptor table)"
+	---help---
+	  Linux can allow user programs to install a per-process x86
+	  Local Descriptor Table (LDT) using the modify_ldt(2) system
+diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
+index 6293a8768a91..add82e0f1df3 100644
+--- a/arch/x86/Kconfig.debug
++++ b/arch/x86/Kconfig.debug
+@@ -101,6 +101,7 @@ config EFI_PGT_DUMP
+ config DEBUG_WX
+	bool "Warn on W+X mappings at boot"
+	select X86_PTDUMP_CORE
++	default y
+	---help---
+	  Generate a warning if any W+X mappings are found at boot.
+
+diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
+index e32fc1f274d8..d08acc76502a 100644
+--- a/arch/x86/configs/x86_64_defconfig
++++ b/arch/x86/configs/x86_64_defconfig
+@@ -1,5 +1,4 @@
+ # CONFIG_LOCALVERSION_AUTO is not set
+-CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+ CONFIG_BSD_PROCESS_ACCT=y
+ CONFIG_TASKSTATS=y
+diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
+index 1911310959f8..bba8dbbc07a8 100644
+--- a/arch/x86/entry/vdso/vma.c
++++ b/arch/x86/entry/vdso/vma.c
+@@ -203,55 +203,9 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
+ }
+
+ #ifdef CONFIG_X86_64
+-/*
+- * Put the vdso above the (randomized) stack with another randomized
+- * offset.  This way there is no hole in the middle of address space.
+- * To save memory make sure it is still in the same PTE as the stack
+- * top.  This doesn't give that many random bits.
+- *
+- * Note that this algorithm is imperfect: the distribution of the vdso
+- * start address within a PMD is biased toward the end.
+- *
+- * Only used for the 64-bit and x32 vdsos.
+- */
+-static unsigned long vdso_addr(unsigned long start, unsigned len)
+-{
+-	unsigned long addr, end;
+-	unsigned offset;
+-
+-	/*
+-	 * Round up the start address.  It can start out unaligned as a result
+-	 * of stack start randomization.
+-	 */
+-	start = PAGE_ALIGN(start);
+-
+-	/* Round the lowest possible end address up to a PMD boundary. */
+-	end = (start + len + PMD_SIZE - 1) & PMD_MASK;
+-	if (end >= TASK_SIZE_MAX)
+-		end = TASK_SIZE_MAX;
+-	end -= len;
+-
+-	if (end > start) {
+-		offset = get_random_int() % (((end - start) >> PAGE_SHIFT) + 1);
+-		addr = start + (offset << PAGE_SHIFT);
+-	} else {
+-		addr = start;
+-	}
+-
+-	/*
+-	 * Forcibly align the final address in case we have a hardware
+-	 * issue that requires alignment for performance reasons.
+-	 */
+-	addr = align_vdso_addr(addr);
+-
+-	return addr;
+-}
+-
+ static int map_vdso_randomized(const struct vdso_image *image)
+ {
+-	unsigned long addr = vdso_addr(current->mm->start_stack, image->size-image->sym_vvar_start);
+-
+-	return map_vdso(image, addr);
++	return map_vdso(image, 0);
+ }
+ #endif
+
+diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
+index 3a091cea36c5..0931c05a3348 100644
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
+@@ -249,11 +249,11 @@ extern int force_personality32;
+
+ /*
+  * This is the base location for PIE (ET_DYN with INTERP) loads. On
+- * 64-bit, this is above 4GB to leave the entire 32-bit address
++ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
+  * space open for things that want to use the area for 32-bit pointers.
+  */
+ #define ELF_ET_DYN_BASE		(mmap_is_ia32() ? 0x000400000UL : \
+-						  (DEFAULT_MAP_WINDOW / 3 * 2))
++						  0x100000000UL)
+
+ /* This yields a mask that user programs can use to figure out what
+    instruction set this CPU supports.  This could be done in user space,
+@@ -312,8 +312,8 @@ extern unsigned long get_mmap_base(int is_legacy);
+
+ #ifdef CONFIG_X86_32
+
+-#define __STACK_RND_MASK(is32bit) (0x7ff)
+-#define STACK_RND_MASK (0x7ff)
++#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
++#define STACK_RND_MASK ((1UL << mmap_rnd_bits) - 1)
+
+ #define ARCH_DLINFO		ARCH_DLINFO_IA32
+
+@@ -322,7 +322,11 @@ extern unsigned long get_mmap_base(int is_legacy);
+ #else /* CONFIG_X86_32 */
+
+ /* 1GB for 64bit, 8MB for 32bit */
+-#define __STACK_RND_MASK(is32bit) ((is32bit) ? 0x7ff : 0x3fffff)
++#ifdef CONFIG_COMPAT
++#define __STACK_RND_MASK(is32bit) ((is32bit) ? (1UL << mmap_rnd_compat_bits) - 1 : (1UL << mmap_rnd_bits) - 1)
++#else
++#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
++#endif
+ #define STACK_RND_MASK __STACK_RND_MASK(mmap_is_ia32())
+
+ #define ARCH_DLINFO							\
+@@ -380,5 +384,4 @@ struct va_alignment {
+ } ____cacheline_aligned;
+
+ extern struct va_alignment va_align;
+-extern unsigned long align_vdso_addr(unsigned long);
+ #endif /* _ASM_X86_ELF_H */
+diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
+index 704f31315dde..bb82b6344a7b 100644
+--- a/arch/x86/include/asm/tlbflush.h
++++ b/arch/x86/include/asm/tlbflush.h
+@@ -253,6 +253,7 @@ static inline void cr4_set_bits(unsigned long mask)
+	unsigned long cr4;
+
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	if ((cr4 | mask) != cr4) {
+		cr4 |= mask;
+		this_cpu_write(cpu_tlbstate.cr4, cr4);
+@@ -266,6 +267,7 @@ static inline void cr4_clear_bits(unsigned long mask)
+	unsigned long cr4;
+
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	if ((cr4 & ~mask) != cr4) {
+		cr4 &= ~mask;
+		this_cpu_write(cpu_tlbstate.cr4, cr4);
+@@ -278,6 +280,7 @@ static inline void cr4_toggle_bits(unsigned long mask)
+	unsigned long cr4;
+
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	cr4 ^= mask;
+	this_cpu_write(cpu_tlbstate.cr4, cr4);
+	__write_cr4(cr4);
+@@ -386,6 +389,7 @@ static inline void __native_flush_tlb_global(void)
+	raw_local_irq_save(flags);
+
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	/* toggle PGE */
+	native_write_cr4(cr4 ^ X86_CR4_PGE);
+	/* write old PGE again and flush TLBs */
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index 48e98964ecad..a94dc690612f 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -1637,7 +1637,6 @@ void cpu_init(void)
+	wrmsrl(MSR_KERNEL_GS_BASE, 0);
+	barrier();
+
+-	x86_configure_nx();
+	x2apic_setup();
+
+	/*
+diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
+index 988a98f34c66..dc36d2d9078a 100644
+--- a/arch/x86/kernel/process.c
++++ b/arch/x86/kernel/process.c
+@@ -40,6 +40,8 @@
+ #include <asm/desc.h>
+ #include <asm/prctl.h>
+ #include <asm/spec-ctrl.h>
++#include <asm/elf.h>
++#include <linux/sizes.h>
+
+ /*
+  * per-CPU TSS segments. Threads are completely 'soft' on Linux,
+@@ -719,7 +721,10 @@ unsigned long arch_align_stack(unsigned long sp)
+
+ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ {
+-	return randomize_page(mm->brk, 0x02000000);
++	if (mmap_is_ia32())
++		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
++	else
++		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
+ }
+
+ /*
+diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
+index a63fe77b3217..e1085e76043e 100644
+--- a/arch/x86/kernel/sys_x86_64.c
++++ b/arch/x86/kernel/sys_x86_64.c
+@@ -54,13 +54,6 @@ static unsigned long get_align_bits(void)
+	return va_align.bits & get_align_mask();
+ }
+
+-unsigned long align_vdso_addr(unsigned long addr)
+-{
+-	unsigned long align_mask = get_align_mask();
+-	addr = (addr + align_mask) & ~align_mask;
+-	return addr | get_align_bits();
+-}
+-
+ static int __init control_va_addr_alignment(char *str)
+ {
+	/* guard against enabling this on other CPU families */
+@@ -122,10 +115,7 @@ static void find_start_end(unsigned long addr, unsigned long flags,
+	}
+
+	*begin	= get_mmap_base(1);
+-	if (in_compat_syscall())
+-		*end = task_size_32bit();
+-	else
+-		*end = task_size_64bit(addr > DEFAULT_MAP_WINDOW);
++	*end	= get_mmap_base(0);
+ }
+
+ unsigned long
+@@ -206,7 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+
+	info.flags = VM_UNMAPPED_AREA_TOPDOWN;
+	info.length = len;
+-	info.low_limit = PAGE_SIZE;
++	info.low_limit = get_mmap_base(1);
+	info.high_limit = get_mmap_base(0);
+
+	/*
+diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
+index 3141e67ec24c..e93173193f60 100644
+--- a/arch/x86/mm/init_32.c
++++ b/arch/x86/mm/init_32.c
+@@ -558,7 +558,7 @@ static void __init pagetable_init(void)
+	permanent_kmaps_init(pgd_base);
+ }
+
+-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
++pteval_t __supported_pte_mask __ro_after_init = ~(_PAGE_NX | _PAGE_GLOBAL);
+ EXPORT_SYMBOL_GPL(__supported_pte_mask);
+
+ /* user-defined highmem size */
+@@ -865,7 +865,7 @@ int arch_remove_memory(u64 start, u64 size)
+ #endif
+ #endif
+
+-int kernel_set_to_readonly __read_mostly;
++int kernel_set_to_readonly __ro_after_init;
+
+ void set_kernel_text_rw(void)
+ {
+@@ -917,12 +917,11 @@ void mark_rodata_ro(void)
+	unsigned long start = PFN_ALIGN(_text);
+	unsigned long size = PFN_ALIGN(_etext) - start;
+
++	kernel_set_to_readonly = 1;
+	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
+	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
+		size >> 10);
+
+-	kernel_set_to_readonly = 1;
+-
+ #ifdef CONFIG_CPA_DEBUG
+	printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n",
+		start, start+size);
+diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
+index 642357aff216..8bbf93ce3cd2 100644
+--- a/arch/x86/mm/init_64.c
++++ b/arch/x86/mm/init_64.c
+@@ -65,7 +65,7 @@
+  * around without checking the pgd every time.
+  */
+
+-pteval_t __supported_pte_mask __read_mostly = ~0;
++pteval_t __supported_pte_mask __ro_after_init = ~0;
+ EXPORT_SYMBOL_GPL(__supported_pte_mask);
+
+ int force_personality32;
+@@ -1185,7 +1185,7 @@ void __init mem_init(void)
+	mem_init_print_info(NULL);
+ }
+
+-int kernel_set_to_readonly;
++int kernel_set_to_readonly __ro_after_init;
+
+ void set_kernel_text_rw(void)
+ {
+@@ -1234,9 +1234,8 @@ void mark_rodata_ro(void)
+
+	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
+	       (end - start) >> 10);
+-	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
+-
+	kernel_set_to_readonly = 1;
++	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
+
+	/*
+	 * The rodata/data/bss/brk section (but not the kernel text!)
+diff --git a/block/blk-softirq.c b/block/blk-softirq.c
+index 01e2b353a2b9..9aeddca4a29f 100644
+--- a/block/blk-softirq.c
++++ b/block/blk-softirq.c
+@@ -20,7 +20,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
+  * Softirq action handler - move entries to local list and loop over them
+  * while passing them to the queue registered handler.
+  */
+-static __latent_entropy void blk_done_softirq(struct softirq_action *h)
++static __latent_entropy void blk_done_softirq(void)
+ {
+	struct list_head *cpu_list, local_list;
+
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
+index 473f150d6b22..65a65f9824ed 100644
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -5141,7 +5141,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+	struct ata_port *ap;
+	unsigned int tag;
+
+-	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+	ap = qc->ap;
+
+	qc->flags = 0;
+@@ -5158,7 +5158,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+	struct ata_port *ap;
+	struct ata_link *link;
+
+-	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
+	ap = qc->ap;
+	link = qc->dev->link;
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index c28dca0c613d..d4813f0d25ca 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -9,7 +9,6 @@ source "drivers/tty/Kconfig"
+
+ config DEVMEM
+	bool "/dev/mem virtual device support"
+-	default y
+	help
+	  Say Y here if you want to support the /dev/mem device.
+	  The /dev/mem device is used to access areas of physical
+@@ -568,7 +567,6 @@ config TELCLOCK
+ config DEVPORT
+	bool "/dev/port character device"
+	depends on ISA || PCI
+-	default y
+	help
+	  Say Y here if you want to support the /dev/port device. The /dev/port
+	  device is similar to /dev/mem, but for I/O ports.
+diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
+index e105532bfba8..e07d52bb9b62 100644
+--- a/drivers/media/dvb-frontends/cx24116.c
++++ b/drivers/media/dvb-frontends/cx24116.c
+@@ -1462,7 +1462,7 @@ static int cx24116_tune(struct dvb_frontend *fe, bool re_tune,
+	return cx24116_read_status(fe, status);
+ }
+
+-static int cx24116_get_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo cx24116_get_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
+index d37cb7762bd6..97e0feff0ede 100644
+--- a/drivers/media/dvb-frontends/cx24117.c
++++ b/drivers/media/dvb-frontends/cx24117.c
+@@ -1555,7 +1555,7 @@ static int cx24117_tune(struct dvb_frontend *fe, bool re_tune,
+	return cx24117_read_status(fe, status);
+ }
+
+-static int cx24117_get_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo cx24117_get_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c
+index 7f11dcc94d85..01da670760ba 100644
+--- a/drivers/media/dvb-frontends/cx24120.c
++++ b/drivers/media/dvb-frontends/cx24120.c
+@@ -1491,7 +1491,7 @@ static int cx24120_tune(struct dvb_frontend *fe, bool re_tune,
+	return cx24120_read_status(fe, status);
+ }
+
+-static int cx24120_get_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo cx24120_get_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
+index 1d59d1d3bd82..41cd0e9ea199 100644
+--- a/drivers/media/dvb-frontends/cx24123.c
++++ b/drivers/media/dvb-frontends/cx24123.c
+@@ -1005,7 +1005,7 @@ static int cx24123_tune(struct dvb_frontend *fe,
+	return retval;
+ }
+
+-static int cx24123_get_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo cx24123_get_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
+index f6ebbb47b9b2..3e0d8cbd76da 100644
+--- a/drivers/media/dvb-frontends/cxd2820r_core.c
++++ b/drivers/media/dvb-frontends/cxd2820r_core.c
+@@ -403,7 +403,7 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)
+	return DVBFE_ALGO_SEARCH_ERROR;
+ }
+
+-static int cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_CUSTOM;
+ }
+diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
+index e8ac8c3e2ec0..e0f4ba8302d1 100644
+--- a/drivers/media/dvb-frontends/mb86a20s.c
++++ b/drivers/media/dvb-frontends/mb86a20s.c
+@@ -2055,7 +2055,7 @@ static void mb86a20s_release(struct dvb_frontend *fe)
+	kfree(state);
+ }
+
+-static int mb86a20s_get_frontend_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo mb86a20s_get_frontend_algo(struct dvb_frontend *fe)
+ {
+         return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
+index 274544a3ae0e..9ef9b9bc1bd2 100644
+--- a/drivers/media/dvb-frontends/s921.c
++++ b/drivers/media/dvb-frontends/s921.c
+@@ -464,7 +464,7 @@ static int s921_tune(struct dvb_frontend *fe,
+	return rc;
+ }
+
+-static int s921_get_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo s921_get_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
+index 7166d2279465..fa682f9fdc4b 100644
+--- a/drivers/media/pci/bt8xx/dst.c
++++ b/drivers/media/pci/bt8xx/dst.c
+@@ -1657,7 +1657,7 @@ static int dst_tune_frontend(struct dvb_frontend* fe,
+	return 0;
+ }
+
+-static int dst_get_tuning_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo dst_get_tuning_algo(struct dvb_frontend *fe)
+ {
+	return dst_algo ? DVBFE_ALGO_HW : DVBFE_ALGO_SW;
+ }
+diff --git a/drivers/media/pci/pt1/va1j5jf8007s.c b/drivers/media/pci/pt1/va1j5jf8007s.c
+index f75f69556be7..d913a6050e8c 100644
+--- a/drivers/media/pci/pt1/va1j5jf8007s.c
++++ b/drivers/media/pci/pt1/va1j5jf8007s.c
+@@ -98,7 +98,7 @@ static int va1j5jf8007s_read_snr(struct dvb_frontend *fe, u16 *snr)
+	return 0;
+ }
+
+-static int va1j5jf8007s_get_frontend_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo va1j5jf8007s_get_frontend_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/media/pci/pt1/va1j5jf8007t.c b/drivers/media/pci/pt1/va1j5jf8007t.c
+index 63fda79a75c0..4115c3ccd4a8 100644
+--- a/drivers/media/pci/pt1/va1j5jf8007t.c
++++ b/drivers/media/pci/pt1/va1j5jf8007t.c
+@@ -88,7 +88,7 @@ static int va1j5jf8007t_read_snr(struct dvb_frontend *fe, u16 *snr)
+	return 0;
+ }
+
+-static int va1j5jf8007t_get_frontend_algo(struct dvb_frontend *fe)
++static enum dvbfe_algo va1j5jf8007t_get_frontend_algo(struct dvb_frontend *fe)
+ {
+	return DVBFE_ALGO_HW;
+ }
+diff --git a/drivers/misc/lkdtm_core.c b/drivers/misc/lkdtm_core.c
+index 981b3ef71e47..9883da1da383 100644
+--- a/drivers/misc/lkdtm_core.c
++++ b/drivers/misc/lkdtm_core.c
+@@ -78,7 +78,7 @@ static irqreturn_t jp_handle_irq_event(unsigned int irq,
+	return 0;
+ }
+
+-static void jp_tasklet_action(struct softirq_action *a)
++static void jp_tasklet_action(void)
+ {
+	lkdtm_handler();
+	jprobe_return();
+diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
+index b811442c5ce6..4f62a63cbcb1 100644
+--- a/drivers/tty/Kconfig
++++ b/drivers/tty/Kconfig
+@@ -122,7 +122,6 @@ config UNIX98_PTYS
+
+ config LEGACY_PTYS
+	bool "Legacy (BSD) PTY support"
+-	default y
+	---help---
+	  A pseudo terminal (PTY) is a software device consisting of two
+	  halves: a master and a slave. The slave device behaves identical to
+diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
+index 562d31073f9a..2184b9b5485f 100644
+--- a/drivers/tty/tty_io.c
++++ b/drivers/tty/tty_io.c
+@@ -171,6 +171,7 @@ static void free_tty_struct(struct tty_struct *tty)
+	put_device(tty->dev);
+	kfree(tty->write_buf);
+	tty->magic = 0xDEADDEAD;
++	put_user_ns(tty->owner_user_ns);
+	kfree(tty);
+ }
+
+@@ -2154,11 +2155,19 @@ static int tty_fasync(int fd, struct file *filp, int on)
+  *	FIXME: may race normal receive processing
+  */
+
++int tiocsti_restrict = IS_ENABLED(CONFIG_SECURITY_TIOCSTI_RESTRICT);
++
+ static int tiocsti(struct tty_struct *tty, char __user *p)
+ {
+	char ch, mbz = 0;
+	struct tty_ldisc *ld;
+
++	if (tiocsti_restrict &&
++		!ns_capable(tty->owner_user_ns, CAP_SYS_ADMIN)) {
++		dev_warn_ratelimited(tty->dev,
++			"Denied TIOCSTI ioctl for non-privileged process\n");
++		return -EPERM;
++	}
+	if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
+		return -EPERM;
+	if (get_user(ch, p))
+@@ -2841,6 +2850,7 @@ struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx)
+	tty->index = idx;
+	tty_line_name(driver, idx, tty->name);
+	tty->dev = tty_get_device(tty);
++	tty->owner_user_ns = get_user_ns(current_user_ns());
+
+	return tty;
+ }
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index 442be7f312f6..788557d5c454 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -38,6 +38,8 @@
+ #define USB_VENDOR_GENESYS_LOGIC		0x05e3
+ #define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND	0x01
+
++extern int deny_new_usb;
++
+ /* Protect struct usb_device->state and ->children members
+  * Note: Both are also protected by ->dev.sem, except that ->state can
+  * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
+@@ -4806,6 +4808,12 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
+			goto done;
+		return;
+	}
++
++	if (deny_new_usb) {
++		dev_err(&port_dev->dev, "denied insert of USB device on port %d\n", port1);
++		goto done;
++	}
++
+	if (hub_is_superspeed(hub->hdev))
+		unit_load = 150;
+	else
+diff --git a/fs/exec.c b/fs/exec.c
+index 0da4d748b4e6..69fcee853363 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -62,6 +62,7 @@
+ #include <linux/oom.h>
+ #include <linux/compat.h>
+ #include <linux/vmalloc.h>
++#include <linux/random.h>
+
+ #include <linux/uaccess.h>
+ #include <asm/mmu_context.h>
+@@ -321,6 +322,8 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+	arch_bprm_mm_init(mm, vma);
+	up_write(&mm->mmap_sem);
+	bprm->p = vma->vm_end - sizeof(void *);
++	if (randomize_va_space)
++		bprm->p ^= get_random_int() & ~PAGE_MASK;
+	return 0;
+ err:
+	up_write(&mm->mmap_sem);
+diff --git a/fs/namei.c b/fs/namei.c
+index 0b46b858cd42..3ae8e72341da 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -902,8 +902,8 @@ static inline void put_link(struct nameidata *nd)
+		path_put(&last->link);
+ }
+
+-int sysctl_protected_symlinks __read_mostly = 0;
+-int sysctl_protected_hardlinks __read_mostly = 0;
++int sysctl_protected_symlinks __read_mostly = 1;
++int sysctl_protected_hardlinks __read_mostly = 1;
+
+ /**
+  * may_follow_link - Check symlink following for unsafe situations
+diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
+index 5f93cfacb3d1..cea0d7d3b23e 100644
+--- a/fs/nfs/Kconfig
++++ b/fs/nfs/Kconfig
+@@ -195,4 +195,3 @@ config NFS_DEBUG
+	bool
+	depends on NFS_FS && SUNRPC_DEBUG
+	select CRC32
+-	default y
+diff --git a/fs/pipe.c b/fs/pipe.c
+index 8ef7d7bef775..b82f305ec13d 100644
+--- a/fs/pipe.c
++++ b/fs/pipe.c
+@@ -38,7 +38,7 @@ unsigned int pipe_max_size = 1048576;
+ /*
+  * Minimum pipe size, as required by POSIX
+  */
+-unsigned int pipe_min_size = PAGE_SIZE;
++unsigned int pipe_min_size __read_only = PAGE_SIZE;
+
+ /* Maximum allocatable pages per user. Hard limit is unset by default, soft
+  * matches default values.
+diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
+index 1ade1206bb89..60b0f76dec47 100644
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -39,7 +39,6 @@ config PROC_KCORE
+ config PROC_VMCORE
+	bool "/proc/vmcore support"
+	depends on PROC_FS && CRASH_DUMP
+-	default y
+         help
+         Exports the dump image of crashed kernel in ELF format.
+
+diff --git a/fs/stat.c b/fs/stat.c
+index 873785dae022..d3c2ada8b9c7 100644
+--- a/fs/stat.c
++++ b/fs/stat.c
+@@ -40,8 +40,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
+	stat->gid = inode->i_gid;
+	stat->rdev = inode->i_rdev;
+	stat->size = i_size_read(inode);
+-	stat->atime = inode->i_atime;
+-	stat->mtime = inode->i_mtime;
++	if (is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
++		stat->atime = inode->i_ctime;
++		stat->mtime = inode->i_ctime;
++	} else {
++		stat->atime = inode->i_atime;
++		stat->mtime = inode->i_mtime;
++	}
+	stat->ctime = inode->i_ctime;
+	stat->blksize = i_blocksize(inode);
+	stat->blocks = inode->i_blocks;
+@@ -75,9 +80,14 @@ int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
+	stat->result_mask |= STATX_BASIC_STATS;
+	request_mask &= STATX_ALL;
+	query_flags &= KSTAT_QUERY_FLAGS;
+-	if (inode->i_op->getattr)
+-		return inode->i_op->getattr(path, stat, request_mask,
+-					    query_flags);
++	if (inode->i_op->getattr) {
++		int retval = inode->i_op->getattr(path, stat, request_mask, query_flags);
++		if (!retval && is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
++			stat->atime = stat->ctime;
++			stat->mtime = stat->ctime;
++		}
++		return retval;
++	}
+
+	generic_fillattr(inode, stat);
+	return 0;
+diff --git a/include/linux/cache.h b/include/linux/cache.h
+index 750621e41d1c..e7157c18c62c 100644
+--- a/include/linux/cache.h
++++ b/include/linux/cache.h
+@@ -31,6 +31,8 @@
+ #define __ro_after_init __attribute__((__section__(".data..ro_after_init")))
+ #endif
+
++#define __read_only __ro_after_init
++
+ #ifndef ____cacheline_aligned
+ #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
+ #endif
+diff --git a/include/linux/capability.h b/include/linux/capability.h
+index f640dcbc880c..2b4f5d651f19 100644
+--- a/include/linux/capability.h
++++ b/include/linux/capability.h
+@@ -207,6 +207,7 @@ extern bool has_capability_noaudit(struct task_struct *t, int cap);
+ extern bool has_ns_capability_noaudit(struct task_struct *t,
+				      struct user_namespace *ns, int cap);
+ extern bool capable(int cap);
++extern bool capable_noaudit(int cap);
+ extern bool ns_capable(struct user_namespace *ns, int cap);
+ extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);
+ #else
+@@ -232,6 +233,10 @@ static inline bool capable(int cap)
+ {
+	return true;
+ }
++static inline bool capable_noaudit(int cap)
++{
++	return true;
++}
+ static inline bool ns_capable(struct user_namespace *ns, int cap)
+ {
+	return true;
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index cc613f20e5a6..7606596d6c2e 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -3392,4 +3392,15 @@ static inline bool dir_relax_shared(struct inode *inode)
+ extern bool path_noexec(const struct path *path);
+ extern void inode_nohighmem(struct inode *inode);
+
++extern int device_sidechannel_restrict;
++
++static inline bool is_sidechannel_device(const struct inode *inode)
++{
++	umode_t mode;
++	if (!device_sidechannel_restrict)
++		return false;
++	mode = inode->i_mode;
++	return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
++}
++
+ #endif /* _LINUX_FS_H */
+diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
+index bdaf22582f6e..326ff15d4637 100644
+--- a/include/linux/fsnotify.h
++++ b/include/linux/fsnotify.h
+@@ -181,6 +181,9 @@ static inline void fsnotify_access(struct file *file)
+	struct inode *inode = path->dentry->d_inode;
+	__u32 mask = FS_ACCESS;
+
++	if (is_sidechannel_device(inode))
++		return;
++
+	if (S_ISDIR(inode->i_mode))
+		mask |= FS_ISDIR;
+
+@@ -199,6 +202,9 @@ static inline void fsnotify_modify(struct file *file)
+	struct inode *inode = path->dentry->d_inode;
+	__u32 mask = FS_MODIFY;
+
++	if (is_sidechannel_device(inode))
++		return;
++
+	if (S_ISDIR(inode->i_mode))
+		mask |= FS_ISDIR;
+
+diff --git a/include/linux/gfp.h b/include/linux/gfp.h
+index b041f94678de..a5e0175c79e0 100644
+--- a/include/linux/gfp.h
++++ b/include/linux/gfp.h
+@@ -518,9 +518,9 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
+ extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);
+ extern unsigned long get_zeroed_page(gfp_t gfp_mask);
+
+-void *alloc_pages_exact(size_t size, gfp_t gfp_mask);
++void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
+ void free_pages_exact(void *virt, size_t size);
+-void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);
++void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
+
+ #define __get_free_page(gfp_mask) \
+		__get_free_pages((gfp_mask), 0)
+diff --git a/include/linux/highmem.h b/include/linux/highmem.h
+index 776f90f3a1cd..3f5c47000059 100644
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
+@@ -191,6 +191,13 @@ static inline void clear_highpage(struct page *page)
+	kunmap_atomic(kaddr);
+ }
+
++static inline void verify_zero_highpage(struct page *page)
++{
++	void *kaddr = kmap_atomic(page);
++	BUG_ON(memchr_inv(kaddr, 0, PAGE_SIZE));
++	kunmap_atomic(kaddr);
++}
++
+ static inline void zero_user_segments(struct page *page,
+	unsigned start1, unsigned end1,
+	unsigned start2, unsigned end2)
+diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
+index 69c238210325..ee487ea4f48f 100644
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -485,7 +485,7 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
+
+ struct softirq_action
+ {
+-	void	(*action)(struct softirq_action *);
++	void	(*action)(void);
+ };
+
+ asmlinkage void do_softirq(void);
+@@ -500,7 +500,7 @@ static inline void do_softirq_own_stack(void)
+ }
+ #endif
+
+-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
++extern void __init open_softirq(int nr, void (*action)(void));
+ extern void softirq_init(void);
+ extern void __raise_softirq_irqoff(unsigned int nr);
+
+diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
+index df32d2508290..c992d130b94d 100644
+--- a/include/linux/kobject_ns.h
++++ b/include/linux/kobject_ns.h
+@@ -46,7 +46,7 @@ struct kobj_ns_type_operations {
+	void (*drop_ns)(void *);
+ };
+
+-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
++int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
+ int kobj_ns_type_registered(enum kobj_ns_type type);
+ const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent);
+ const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj);
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index f23215854c80..98df98c44cc0 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -525,7 +525,7 @@ static inline int is_vmalloc_or_module_addr(const void *x)
+ }
+ #endif
+
+-extern void *kvmalloc_node(size_t size, gfp_t flags, int node);
++extern void *kvmalloc_node(size_t size, gfp_t flags, int node) __attribute__((alloc_size(1)));
+ static inline void *kvmalloc(size_t size, gfp_t flags)
+ {
+	return kvmalloc_node(size, flags, NUMA_NO_NODE);
+diff --git a/include/linux/percpu.h b/include/linux/percpu.h
+index 296bbe49d5d1..b26652c9a98d 100644
+--- a/include/linux/percpu.h
++++ b/include/linux/percpu.h
+@@ -129,7 +129,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
+				pcpu_fc_populate_pte_fn_t populate_pte_fn);
+ #endif
+
+-extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
++extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
+ extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
+ extern bool is_kernel_percpu_address(unsigned long addr);
+
+@@ -137,8 +137,8 @@ extern bool is_kernel_percpu_address(unsigned long addr);
+ extern void __init setup_per_cpu_areas(void);
+ #endif
+
+-extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp);
+-extern void __percpu *__alloc_percpu(size_t size, size_t align);
++extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) __attribute__((alloc_size(1)));
++extern void __percpu *__alloc_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
+ extern void free_percpu(void __percpu *__pdata);
+ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
+
+diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
+index 8e22f24ded6a..b7fecdfa6de5 100644
+--- a/include/linux/perf_event.h
++++ b/include/linux/perf_event.h
+@@ -1165,6 +1165,11 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
+ int perf_event_max_stack_handler(struct ctl_table *table, int write,
+				 void __user *buffer, size_t *lenp, loff_t *ppos);
+
++static inline bool perf_paranoid_any(void)
++{
++	return sysctl_perf_event_paranoid > 2;
++}
++
+ static inline bool perf_paranoid_tracepoint_raw(void)
+ {
+	return sysctl_perf_event_paranoid > -1;
+diff --git a/include/linux/slab.h b/include/linux/slab.h
+index ae5ed6492d54..fd0786124504 100644
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -146,8 +146,8 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *);
+ /*
+  * Common kmalloc functions provided by all allocators
+  */
+-void * __must_check __krealloc(const void *, size_t, gfp_t);
+-void * __must_check krealloc(const void *, size_t, gfp_t);
++void * __must_check __krealloc(const void *, size_t, gfp_t) __attribute__((alloc_size(2)));
++void * __must_check krealloc(const void *, size_t, gfp_t) __attribute((alloc_size(2)));
+ void kfree(const void *);
+ void kzfree(const void *);
+ size_t ksize(const void *);
+@@ -324,7 +324,7 @@ static __always_inline int kmalloc_index(size_t size)
+ }
+ #endif /* !CONFIG_SLOB */
+
+-void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc;
++void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags) __assume_slab_alignment __malloc;
+ void kmem_cache_free(struct kmem_cache *, void *);
+
+@@ -348,7 +348,7 @@ static __always_inline void kfree_bulk(size_t size, void **p)
+ }
+
+ #ifdef CONFIG_NUMA
+-void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc;
++void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
+ void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node) __assume_slab_alignment __malloc;
+ #else
+ static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
+@@ -473,7 +473,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
+  * for general use, and so are not documented here. For a full list of
+  * potential flags, always refer to linux/gfp.h.
+  */
+-static __always_inline void *kmalloc(size_t size, gfp_t flags)
++static __always_inline __attribute__((alloc_size(1))) void *kmalloc(size_t size, gfp_t flags)
+ {
+	if (__builtin_constant_p(size)) {
+		if (size > KMALLOC_MAX_CACHE_SIZE)
+@@ -513,7 +513,7 @@ static __always_inline int kmalloc_size(int n)
+	return 0;
+ }
+
+-static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
++static __always_inline __attribute__((alloc_size(1))) void *kmalloc_node(size_t size, gfp_t flags, int node)
+ {
+ #ifndef CONFIG_SLOB
+	if (__builtin_constant_p(size) &&
+diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
+index 39fa09bcde23..0b7a48cd883b 100644
+--- a/include/linux/slub_def.h
++++ b/include/linux/slub_def.h
+@@ -120,6 +120,11 @@ struct kmem_cache {
+	unsigned long random;
+ #endif
+
++#ifdef CONFIG_SLAB_CANARY
++	unsigned long random_active;
++	unsigned long random_inactive;
++#endif
++
+ #ifdef CONFIG_NUMA
+	/*
+	 * Defragmentation by allocating from a remote node.
+diff --git a/include/linux/string.h b/include/linux/string.h
+index cfd83eb2f926..b9ecb42c762d 100644
+--- a/include/linux/string.h
++++ b/include/linux/string.h
+@@ -234,10 +234,16 @@ void __read_overflow2(void) __compiletime_error("detected read beyond size of ob
+ void __read_overflow3(void) __compiletime_error("detected read beyond size of object passed as 3rd parameter");
+ void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter");
+
++#ifdef CONFIG_FORTIFY_SOURCE_STRICT_STRING
++#define __string_size(p) __builtin_object_size(p, 1)
++#else
++#define __string_size(p) __builtin_object_size(p, 0)
++#endif
++
+ #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
+ __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+	if (__builtin_constant_p(size) && p_size < size)
+		__write_overflow();
+	if (p_size < size)
+@@ -247,7 +253,7 @@ __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
+
+ __FORTIFY_INLINE char *strcat(char *p, const char *q)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+	if (p_size == (size_t)-1)
+		return __builtin_strcat(p, q);
+	if (strlcat(p, q, p_size) >= p_size)
+@@ -258,7 +264,7 @@ __FORTIFY_INLINE char *strcat(char *p, const char *q)
+ __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
+ {
+	__kernel_size_t ret;
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+
+	/* Work around gcc excess stack consumption issue */
+	if (p_size == (size_t)-1 ||
+@@ -273,7 +279,7 @@ __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
+ extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen);
+ __FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+	__kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size);
+	if (p_size <= ret && maxlen != ret)
+		fortify_panic(__func__);
+@@ -285,8 +291,8 @@ extern size_t __real_strlcpy(char *, const char *, size_t) __RENAME(strlcpy);
+ __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
+ {
+	size_t ret;
+-	size_t p_size = __builtin_object_size(p, 0);
+-	size_t q_size = __builtin_object_size(q, 0);
++	size_t p_size = __string_size(p);
++	size_t q_size = __string_size(q);
+	if (p_size == (size_t)-1 && q_size == (size_t)-1)
+		return __real_strlcpy(p, q, size);
+	ret = strlen(q);
+@@ -306,8 +312,8 @@ __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
+ __FORTIFY_INLINE char *strncat(char *p, const char *q, __kernel_size_t count)
+ {
+	size_t p_len, copy_len;
+-	size_t p_size = __builtin_object_size(p, 0);
+-	size_t q_size = __builtin_object_size(q, 0);
++	size_t p_size = __string_size(p);
++	size_t q_size = __string_size(q);
+	if (p_size == (size_t)-1 && q_size == (size_t)-1)
+		return __builtin_strncat(p, q, count);
+	p_len = strlen(p);
+@@ -420,8 +426,8 @@ __FORTIFY_INLINE void *kmemdup(const void *p, size_t size, gfp_t gfp)
+ /* defined after fortified strlen and memcpy to reuse them */
+ __FORTIFY_INLINE char *strcpy(char *p, const char *q)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
+-	size_t q_size = __builtin_object_size(q, 0);
++	size_t p_size = __string_size(p);
++	size_t q_size = __string_size(q);
+	if (p_size == (size_t)-1 && q_size == (size_t)-1)
+		return __builtin_strcpy(p, q);
+	memcpy(p, q, strlen(q) + 1);
+diff --git a/include/linux/tty.h b/include/linux/tty.h
+index 1dd587ba6d88..9a9a04fb641d 100644
+--- a/include/linux/tty.h
++++ b/include/linux/tty.h
+@@ -13,6 +13,7 @@
+ #include <uapi/linux/tty.h>
+ #include <linux/rwsem.h>
+ #include <linux/llist.h>
++#include <linux/user_namespace.h>
+
+
+ /*
+@@ -335,6 +336,7 @@ struct tty_struct {
+	/* If the tty has a pending do_SAK, queue it here - akpm */
+	struct work_struct SAK_work;
+	struct tty_port *port;
++	struct user_namespace *owner_user_ns;
+ } __randomize_layout;
+
+ /* Each of a tty's open files has private_data pointing to tty_file_private */
+@@ -344,6 +346,8 @@ struct tty_file_private {
+	struct list_head list;
+ };
+
++extern int tiocsti_restrict;
++
+ /* tty magic number */
+ #define TTY_MAGIC		0x5401
+
+diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
+index 1e5d8c392f15..66d0e49c9987 100644
+--- a/include/linux/vmalloc.h
++++ b/include/linux/vmalloc.h
+@@ -68,19 +68,19 @@ static inline void vmalloc_init(void)
+ }
+ #endif
+
+-extern void *vmalloc(unsigned long size);
+-extern void *vzalloc(unsigned long size);
+-extern void *vmalloc_user(unsigned long size);
+-extern void *vmalloc_node(unsigned long size, int node);
+-extern void *vzalloc_node(unsigned long size, int node);
+-extern void *vmalloc_exec(unsigned long size);
+-extern void *vmalloc_32(unsigned long size);
+-extern void *vmalloc_32_user(unsigned long size);
+-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
++extern void *vmalloc(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vzalloc(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_user(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
++extern void *vzalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
++extern void *vmalloc_exec(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_32(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_32_user(unsigned long size) __attribute__((alloc_size(1)));
++extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __attribute__((alloc_size(1)));
+ extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
+			unsigned long start, unsigned long end, gfp_t gfp_mask,
+			pgprot_t prot, unsigned long vm_flags, int node,
+-			const void *caller);
++			const void *caller) __attribute__((alloc_size(1)));
+ #ifndef CONFIG_MMU
+ extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags);
+ static inline void *__vmalloc_node_flags_caller(unsigned long size, int node,
+diff --git a/init/Kconfig b/init/Kconfig
+index 46075327c165..0c78750bc76d 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -309,6 +309,7 @@ config USELIB
+ config AUDIT
+	bool "Auditing support"
+	depends on NET
++	default y
+	help
+	  Enable auditing infrastructure that can be used with another
+	  kernel subsystem, such as SELinux (which requires this for
+@@ -1052,6 +1053,12 @@ config CC_OPTIMIZE_FOR_SIZE
+
+ endchoice
+
++config LOCAL_INIT
++	bool "Zero uninitialized locals"
++	help
++	  Zero-fill uninitialized local variables, other than variable-length
++	  arrays. Requires compiler support.
++
+ config SYSCTL
+	bool
+
+@@ -1361,8 +1368,7 @@ config SHMEM
+	  which may be appropriate on small systems without swap.
+
+ config AIO
+-	bool "Enable AIO support" if EXPERT
+-	default y
++	bool "Enable AIO support"
+	help
+	  This option enables POSIX asynchronous I/O which may by used
+	  by some high performance threaded applications. Disabling
+@@ -1491,7 +1497,7 @@ config VM_EVENT_COUNTERS
+
+ config SLUB_DEBUG
+	default y
+-	bool "Enable SLUB debugging support" if EXPERT
++	bool "Enable SLUB debugging support"
+	depends on SLUB && SYSFS
+	help
+	  SLUB has extensive debug support features. Disabling these can
+@@ -1515,7 +1521,6 @@ config SLUB_MEMCG_SYSFS_ON
+
+ config COMPAT_BRK
+	bool "Disable heap randomization"
+-	default y
+	help
+	  Randomizing heap placement makes heap exploits harder, but it
+	  also breaks ancient binaries (including anything libc5 based).
+@@ -1562,7 +1567,6 @@ endchoice
+
+ config SLAB_MERGE_DEFAULT
+	bool "Allow slab caches to be merged"
+-	default y
+	help
+	  For reduced kernel memory fragmentation, slab caches can be
+	  merged when they share the same size and other characteristics.
+@@ -1575,9 +1579,9 @@ config SLAB_MERGE_DEFAULT
+	  command line.
+
+ config SLAB_FREELIST_RANDOM
+-	default n
+	depends on SLAB || SLUB
+	bool "SLAB freelist randomization"
++	default y
+	help
+	  Randomizes the freelist order used on creating new pages. This
+	  security feature reduces the predictability of the kernel slab
+@@ -1586,12 +1590,56 @@ config SLAB_FREELIST_RANDOM
+ config SLAB_FREELIST_HARDENED
+	bool "Harden slab freelist metadata"
+	depends on SLUB
++	default y
+	help
+	  Many kernel heap attacks try to target slab cache metadata and
+	  other infrastructure. This options makes minor performance
+	  sacrifies to harden the kernel slab allocator against common
+	  freelist exploit methods.
+
++config SLAB_HARDENED
++	default y
++	depends on SLUB
++	bool "Hardened SLAB infrastructure"
++	help
++          Make minor performance sacrifices to harden the kernel slab
++          allocator.
++
++config SLAB_CANARY
++	depends on SLUB
++	depends on !SLAB_MERGE_DEFAULT
++	bool "SLAB canaries"
++	default y
++	help
++	  Place canaries at the end of kernel slab allocations, sacrificing
++	  some performance and memory usage for security.
++
++	  Canaries can detect some forms of heap corruption when allocations
++	  are freed and as part of the HARDENED_USERCOPY feature. It provides
++	  basic use-after-free detection for HARDENED_USERCOPY.
++
++	  Canaries absorb small overflows (rendering them harmless), mitigate
++	  non-NUL terminated C string overflows on 64-bit via a guaranteed zero
++	  byte and provide basic double-free detection.
++
++config SLAB_SANITIZE
++	bool "Sanitize SLAB allocations"
++	depends on SLUB
++	default y
++	help
++	  Zero fill slab allocations on free, reducing the lifetime of
++	  sensitive data and helping to mitigate use-after-free bugs.
++
++	  For slabs with debug poisoning enabling, this has no impact.
++
++config SLAB_SANITIZE_VERIFY
++	depends on SLAB_SANITIZE && PAGE_SANITIZE
++	default y
++	bool "Verify sanitized SLAB allocations"
++	help
++	  Verify that newly allocated slab allocations are zeroed to detect
++	  write-after-free bugs.
++
+ config SLUB_CPU_PARTIAL
+	default y
+	depends on SLUB && SMP
+diff --git a/kernel/audit.c b/kernel/audit.c
+index 5b34d3114af4..e57930192ce1 100644
+--- a/kernel/audit.c
++++ b/kernel/audit.c
+@@ -1573,6 +1573,9 @@ static int __init audit_enable(char *str)
+	audit_default = !!simple_strtol(str, NULL, 0);
+	if (!audit_default)
+		audit_initialized = AUDIT_DISABLED;
++        else
++		audit_initialized = AUDIT_UNINITIALIZED;
++
+	audit_enabled = audit_default;
+	audit_ever_enabled = !!audit_enabled;
+
+diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
+index d203a5d6b726..2a6c3e2c57a6 100644
+--- a/kernel/bpf/core.c
++++ b/kernel/bpf/core.c
+@@ -539,7 +539,7 @@ void __weak bpf_jit_free(struct bpf_prog *fp)
+	bpf_prog_unlock_free(fp);
+ }
+
+-int bpf_jit_harden __read_mostly;
++int bpf_jit_harden __read_mostly = 2;
+
+ static int bpf_jit_blind_insn(const struct bpf_insn *from,
+			      const struct bpf_insn *aux,
+diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
+index 4e933219fec6..0f37db32a2b1 100644
+--- a/kernel/bpf/syscall.c
++++ b/kernel/bpf/syscall.c
+@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(prog_idr_lock);
+ static DEFINE_IDR(map_idr);
+ static DEFINE_SPINLOCK(map_idr_lock);
+
+-int sysctl_unprivileged_bpf_disabled __read_mostly;
++int sysctl_unprivileged_bpf_disabled __read_mostly = 1;
+
+ static const struct bpf_map_ops * const bpf_map_types[] = {
+ #define BPF_PROG_TYPE(_id, _ops)
+diff --git a/kernel/capability.c b/kernel/capability.c
+index 1e1c0236f55b..452062fe45ce 100644
+--- a/kernel/capability.c
++++ b/kernel/capability.c
+@@ -431,6 +431,12 @@ bool capable(int cap)
+	return ns_capable(&init_user_ns, cap);
+ }
+ EXPORT_SYMBOL(capable);
++
++bool capable_noaudit(int cap)
++{
++	return ns_capable_noaudit(&init_user_ns, cap);
++}
++EXPORT_SYMBOL(capable_noaudit);
+ #endif /* CONFIG_MULTIUSER */
+
+ /**
+diff --git a/kernel/events/core.c b/kernel/events/core.c
+index cb8274d7824f..c1b3d232b0a4 100644
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -397,8 +397,13 @@ static cpumask_var_t perf_online_mask;
+  *   0 - disallow raw tracepoint access for unpriv
+  *   1 - disallow cpu events for unpriv
+  *   2 - disallow kernel profiling for unpriv
++ *   3 - disallow all unpriv perf event use
+  */
++#ifdef CONFIG_SECURITY_PERF_EVENTS_RESTRICT
++int sysctl_perf_event_paranoid __read_mostly = 3;
++#else
+ int sysctl_perf_event_paranoid __read_mostly = 2;
++#endif
+
+ /* Minimum for 512 kiB + 1 user control page */
+ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
+@@ -9941,6 +9946,9 @@ SYSCALL_DEFINE5(perf_event_open,
+	if (flags & ~PERF_FLAG_ALL)
+		return -EINVAL;
+
++	if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
++		return -EACCES;
++
+	err = perf_copy_attr(attr_uptr, &attr);
+	if (err)
+		return err;
+diff --git a/kernel/fork.c b/kernel/fork.c
+index 98c91bd341b4..dbb9540ee61c 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -102,6 +102,11 @@
+
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/task.h>
++#ifdef CONFIG_USER_NS
++extern int unprivileged_userns_clone;
++#else
++#define unprivileged_userns_clone 0
++#endif
+
+ /*
+  * Minimum number of threads to boot the kernel
+@@ -1554,6 +1559,10 @@ static __latent_entropy struct task_struct *copy_process(
+	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
+		return ERR_PTR(-EINVAL);
+
++	if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
++		if (!capable(CAP_SYS_ADMIN))
++			return ERR_PTR(-EPERM);
++
+	/*
+	 * Thread groups must share signals as well, and detached threads
+	 * can only be started up within the thread group.
+@@ -2347,6 +2356,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+	if (unshare_flags & CLONE_NEWNS)
+		unshare_flags |= CLONE_FS;
+
++	if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
++		err = -EPERM;
++		if (!capable(CAP_SYS_ADMIN))
++			goto bad_unshare_out;
++	}
++
+	err = check_unshare_flags(unshare_flags);
+	if (err)
+		goto bad_unshare_out;
+diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
+index 0972a8e09d08..00dde7aad47a 100644
+--- a/kernel/power/snapshot.c
++++ b/kernel/power/snapshot.c
+@@ -1136,7 +1136,7 @@ void free_basic_memory_bitmaps(void)
+
+ void clear_free_pages(void)
+ {
+-#ifdef CONFIG_PAGE_POISONING_ZERO
++#if defined(CONFIG_PAGE_POISONING_ZERO) || defined(CONFIG_PAGE_SANITIZE)
+	struct memory_bitmap *bm = free_pages_map;
+	unsigned long pfn;
+
+@@ -1153,7 +1153,7 @@ void clear_free_pages(void)
+	}
+	memory_bm_position_reset(bm);
+	pr_info("PM: free pages cleared after restore\n");
+-#endif /* PAGE_POISONING_ZERO */
++#endif /* PAGE_POISONING_ZERO || PAGE_SANITIZE */
+ }
+
+ /**
+diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
+index a64eee0db39e..4d7de378fe4c 100644
+--- a/kernel/rcu/tiny.c
++++ b/kernel/rcu/tiny.c
+@@ -164,7 +164,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+	}
+ }
+
+-static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
++static __latent_entropy void rcu_process_callbacks(void)
+ {
+	__rcu_process_callbacks(&rcu_sched_ctrlblk);
+	__rcu_process_callbacks(&rcu_bh_ctrlblk);
+diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
+index 3e3650e94ae6..7ecd7a5d04b3 100644
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -2918,7 +2918,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+ /*
+  * Do RCU core processing for the current CPU.
+  */
+-static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
++static __latent_entropy void rcu_process_callbacks(void)
+ {
+	struct rcu_state *rsp;
+
+diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
+index 5c09ddf8c832..f5db6ece105a 100644
+--- a/kernel/sched/fair.c
++++ b/kernel/sched/fair.c
+@@ -8986,7 +8986,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
+  * run_rebalance_domains is triggered when needed from the scheduler tick.
+  * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
+  */
+-static __latent_entropy void run_rebalance_domains(struct softirq_action *h)
++static __latent_entropy void run_rebalance_domains(void)
+ {
+	struct rq *this_rq = this_rq();
+	enum cpu_idle_type idle = this_rq->idle_balance ?
+diff --git a/kernel/softirq.c b/kernel/softirq.c
+index e89c3b0cff6d..0d3ebd520931 100644
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
+ EXPORT_SYMBOL(irq_stat);
+ #endif
+
+-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
++static struct softirq_action softirq_vec[NR_SOFTIRQS] __ro_after_init __aligned(PAGE_SIZE);
+
+ DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
+
+@@ -281,7 +281,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
+		kstat_incr_softirqs_this_cpu(vec_nr);
+
+		trace_softirq_entry(vec_nr);
+-		h->action(h);
++		h->action();
+		trace_softirq_exit(vec_nr);
+		if (unlikely(prev_count != preempt_count())) {
+			pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
+@@ -444,7 +444,7 @@ void __raise_softirq_irqoff(unsigned int nr)
+	or_softirq_pending(1UL << nr);
+ }
+
+-void open_softirq(int nr, void (*action)(struct softirq_action *))
++void __init open_softirq(int nr, void (*action)(void))
+ {
+	softirq_vec[nr].action = action;
+ }
+@@ -486,7 +486,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
+ }
+ EXPORT_SYMBOL(__tasklet_hi_schedule);
+
+-static __latent_entropy void tasklet_action(struct softirq_action *a)
++static __latent_entropy void tasklet_action(void)
+ {
+	struct tasklet_struct *list;
+
+@@ -522,7 +522,7 @@ static __latent_entropy void tasklet_action(struct softirq_action *a)
+	}
+ }
+
+-static __latent_entropy void tasklet_hi_action(struct softirq_action *a)
++static __latent_entropy void tasklet_hi_action(void)
+ {
+	struct tasklet_struct *list;
+
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index 069550540a39..822783a174aa 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -66,6 +66,7 @@
+ #include <linux/kexec.h>
+ #include <linux/bpf.h>
+ #include <linux/mount.h>
++#include <linux/tty.h>
+
+ #include <linux/uaccess.h>
+ #include <asm/processor.h>
+@@ -98,12 +99,19 @@
+ #if defined(CONFIG_SYSCTL)
+
+ /* External variables not in a header file. */
++#if IS_ENABLED(CONFIG_USB)
++int deny_new_usb __read_mostly = 0;
++EXPORT_SYMBOL(deny_new_usb);
++#endif
+ extern int suid_dumpable;
+ #ifdef CONFIG_COREDUMP
+ extern int core_uses_pid;
+ extern char core_pattern[];
+ extern unsigned int core_pipe_limit;
+ #endif
++#ifdef CONFIG_USER_NS
++extern int unprivileged_userns_clone;
++#endif
+ extern int pid_max;
+ extern int pid_max_min, pid_max_max;
+ extern int percpu_pagelist_fraction;
+@@ -115,40 +123,43 @@ extern int sysctl_nr_trim_pages;
+
+ /* Constants used for minimum and  maximum */
+ #ifdef CONFIG_LOCKUP_DETECTOR
+-static int sixty = 60;
++static int sixty __read_only = 60;
+ #endif
+
+-static int __maybe_unused neg_one = -1;
++static int __maybe_unused neg_one __read_only = -1;
+
+ static int zero;
+-static int __maybe_unused one = 1;
+-static int __maybe_unused two = 2;
+-static int __maybe_unused four = 4;
+-static unsigned long one_ul = 1;
+-static int one_hundred = 100;
+-static int one_thousand = 1000;
++static int __maybe_unused one __read_only = 1;
++static int __maybe_unused two __read_only = 2;
++static int __maybe_unused four __read_only = 4;
++static unsigned long one_ul __read_only = 1;
++static int one_hundred __read_only = 100;
++static int one_thousand __read_only = 1000;
+ #ifdef CONFIG_PRINTK
+-static int ten_thousand = 10000;
++static int ten_thousand __read_only = 10000;
+ #endif
+ #ifdef CONFIG_PERF_EVENTS
+-static int six_hundred_forty_kb = 640 * 1024;
++static int six_hundred_forty_kb __read_only = 640 * 1024;
+ #endif
+
+ /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
+-static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
++static unsigned long dirty_bytes_min __read_only = 2 * PAGE_SIZE;
+
+ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
+-static int maxolduid = 65535;
+-static int minolduid;
++static int maxolduid __read_only = 65535;
++static int minolduid __read_only;
+
+-static int ngroups_max = NGROUPS_MAX;
++static int ngroups_max __read_only = NGROUPS_MAX;
+ static const int cap_last_cap = CAP_LAST_CAP;
+
+ /*this is needed for proc_doulongvec_minmax of sysctl_hung_task_timeout_secs */
+ #ifdef CONFIG_DETECT_HUNG_TASK
+-static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
++static unsigned long hung_task_timeout_max __read_only = (LONG_MAX/HZ);
+ #endif
+
++int device_sidechannel_restrict __read_mostly = 1;
++EXPORT_SYMBOL(device_sidechannel_restrict);
++
+ #ifdef CONFIG_INOTIFY_USER
+ #include <linux/inotify.h>
+ #endif
+@@ -286,19 +297,19 @@ static struct ctl_table sysctl_base_table[] = {
+ };
+
+ #ifdef CONFIG_SCHED_DEBUG
+-static int min_sched_granularity_ns = 100000;		/* 100 usecs */
+-static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
+-static int min_wakeup_granularity_ns;			/* 0 usecs */
+-static int max_wakeup_granularity_ns = NSEC_PER_SEC;	/* 1 second */
++static int min_sched_granularity_ns __read_only = 100000;		/* 100 usecs */
++static int max_sched_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
++static int min_wakeup_granularity_ns __read_only;			/* 0 usecs */
++static int max_wakeup_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
+ #ifdef CONFIG_SMP
+-static int min_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE;
+-static int max_sched_tunable_scaling = SCHED_TUNABLESCALING_END-1;
++static int min_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_NONE;
++static int max_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_END-1;
+ #endif /* CONFIG_SMP */
+ #endif /* CONFIG_SCHED_DEBUG */
+
+ #ifdef CONFIG_COMPACTION
+-static int min_extfrag_threshold;
+-static int max_extfrag_threshold = 1000;
++static int min_extfrag_threshold __read_only;
++static int max_extfrag_threshold __read_only = 1000;
+ #endif
+
+ static struct ctl_table kern_table[] = {
+@@ -512,6 +523,15 @@ static struct ctl_table kern_table[] = {
+		.proc_handler	= proc_dointvec,
+	},
+ #endif
++#ifdef CONFIG_USER_NS
++	{
++		.procname	= "unprivileged_userns_clone",
++		.data		= &unprivileged_userns_clone,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec,
++	},
++#endif
+ #ifdef CONFIG_PROC_SYSCTL
+	{
+		.procname	= "tainted",
+@@ -853,6 +873,37 @@ static struct ctl_table kern_table[] = {
+		.extra1		= &zero,
+		.extra2		= &two,
+	},
++#endif
++#if defined CONFIG_TTY
++	{
++		.procname	= "tiocsti_restrict",
++		.data		= &tiocsti_restrict,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec_minmax_sysadmin,
++		.extra1		= &zero,
++		.extra2		= &one,
++	},
++#endif
++	{
++		.procname	= "device_sidechannel_restrict",
++		.data		= &device_sidechannel_restrict,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec_minmax_sysadmin,
++		.extra1		= &zero,
++		.extra2		= &one,
++	},
++#if IS_ENABLED(CONFIG_USB)
++	{
++		.procname	= "deny_new_usb",
++		.data		= &deny_new_usb,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec_minmax_sysadmin,
++		.extra1		= &zero,
++		.extra2		= &one,
++	},
+ #endif
+	{
+		.procname	= "ngroups_max",
+diff --git a/kernel/time/timer.c b/kernel/time/timer.c
+index 9fe525f410bf..6a85b0e1292e 100644
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1624,7 +1624,7 @@ static inline void __run_timers(struct timer_base *base)
+ /*
+  * This function runs timers and the timer-tq in bottom half context.
+  */
+-static __latent_entropy void run_timer_softirq(struct softirq_action *h)
++static __latent_entropy void run_timer_softirq(void)
+ {
+	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
+
+diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
+index c490f1e4313b..dd03bd39d7bf 100644
+--- a/kernel/user_namespace.c
++++ b/kernel/user_namespace.c
+@@ -24,6 +24,9 @@
+ #include <linux/projid.h>
+ #include <linux/fs_struct.h>
+
++/* sysctl */
++int unprivileged_userns_clone;
++
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ static DEFINE_MUTEX(userns_state_mutex);
+
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index 62d0e25c054c..3953072277eb 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -937,6 +937,7 @@ endmenu # "Debug lockups and hangs"
+
+ config PANIC_ON_OOPS
+	bool "Panic on Oops"
++	default y
+	help
+	  Say Y here to enable the kernel to panic when it oopses. This
+	  has the same effect as setting oops=panic on the kernel command
+@@ -946,7 +947,7 @@ config PANIC_ON_OOPS
+	  anything erroneous after an oops which could result in data
+	  corruption or other issues.
+
+-	  Say N if unsure.
++	  Say Y if unsure.
+
+ config PANIC_ON_OOPS_VALUE
+	int
+@@ -1319,6 +1320,7 @@ config DEBUG_BUGVERBOSE
+ config DEBUG_LIST
+	bool "Debug linked list manipulation"
+	depends on DEBUG_KERNEL || BUG_ON_DATA_CORRUPTION
++	default y
+	help
+	  Enable this to turn on extended checks in the linked-list
+	  walking routines.
+@@ -1932,6 +1934,7 @@ config MEMTEST
+ config BUG_ON_DATA_CORRUPTION
+	bool "Trigger a BUG when data corruption is detected"
+	select DEBUG_LIST
++	default y
+	help
+	  Select this option if the kernel should BUG when it encounters
+	  data corruption in kernel memory structures when they get checked
+@@ -1952,7 +1955,7 @@ config STRICT_DEVMEM
+	bool "Filter access to /dev/mem"
+	depends on MMU && DEVMEM
+	depends on ARCH_HAS_DEVMEM_IS_ALLOWED
+-	default y if TILE || PPC
++	default y
+	---help---
+	  If this option is disabled, you allow userspace (root) access to all
+	  of memory, including kernel and userspace memory. Accidental
+@@ -1971,6 +1974,7 @@ config STRICT_DEVMEM
+ config IO_STRICT_DEVMEM
+	bool "Filter I/O access to /dev/mem"
+	depends on STRICT_DEVMEM
++	default y
+	---help---
+	  If this option is disabled, you allow userspace (root) access to all
+	  io-memory regardless of whether a driver is actively using that
+diff --git a/lib/irq_poll.c b/lib/irq_poll.c
+index 86a709954f5a..6f15787fcb1b 100644
+--- a/lib/irq_poll.c
++++ b/lib/irq_poll.c
+@@ -75,7 +75,7 @@ void irq_poll_complete(struct irq_poll *iop)
+ }
+ EXPORT_SYMBOL(irq_poll_complete);
+
+-static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
++static void __latent_entropy irq_poll_softirq(void)
+ {
+	struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
+	int rearm = 0, budget = irq_poll_budget;
+diff --git a/lib/kobject.c b/lib/kobject.c
+index 34f847252c02..4fda329de614 100644
+--- a/lib/kobject.c
++++ b/lib/kobject.c
+@@ -956,9 +956,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
+
+
+ static DEFINE_SPINLOCK(kobj_ns_type_lock);
+-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
++static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __ro_after_init;
+
+-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
++int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
+ {
+	enum kobj_ns_type type = ops->type;
+	int error;
+diff --git a/lib/nlattr.c b/lib/nlattr.c
+index 3d8295c85505..3fa3b3409d69 100644
+--- a/lib/nlattr.c
++++ b/lib/nlattr.c
+@@ -341,6 +341,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
+ {
+	int minlen = min_t(int, count, nla_len(src));
+
++	BUG_ON(minlen < 0);
++
+	memcpy(dest, nla_data(src), minlen);
+	if (count > minlen)
+		memset(dest + minlen, 0, count - minlen);
+diff --git a/lib/vsprintf.c b/lib/vsprintf.c
+index 86c3385b9eb3..c482070e379b 100644
+--- a/lib/vsprintf.c
++++ b/lib/vsprintf.c
+@@ -1591,7 +1591,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
+	return widen_string(buf, buf - buf_start, end, spec);
+ }
+
+-int kptr_restrict __read_mostly;
++int kptr_restrict __read_mostly = 2;
+
+ /*
+  * Show a '%p' thing.  A kernel extension is that the '%p' is followed
+diff --git a/mm/Kconfig b/mm/Kconfig
+index 59efbd3337e0..c070e14ec83d 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -319,7 +319,8 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+         int "Low address space to protect from user allocation"
+	depends on MMU
+-        default 4096
++	default 32768 if ARM || (ARM64 && COMPAT)
++	default 65536
+         help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+diff --git a/mm/mmap.c b/mm/mmap.c
+index 11f96fad5271..632e7f9a710e 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -220,6 +220,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+
+	newbrk = PAGE_ALIGN(brk);
+	oldbrk = PAGE_ALIGN(mm->brk);
++	/* properly handle unaligned min_brk as an empty heap */
++	if (min_brk & ~PAGE_MASK) {
++		if (brk == min_brk)
++			newbrk -= PAGE_SIZE;
++		if (mm->brk == min_brk)
++			oldbrk -= PAGE_SIZE;
++	}
+	if (oldbrk == newbrk)
+		goto set_brk;
+
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 1d7693c35424..8963a3b4d37c 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -67,6 +67,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/lockdep.h>
+ #include <linux/nmi.h>
++#include <linux/random.h>
+
+ #include <asm/sections.h>
+ #include <asm/tlbflush.h>
+@@ -98,6 +99,15 @@ int _node_numa_mem_[MAX_NUMNODES];
+ DEFINE_MUTEX(pcpu_drain_mutex);
+ DEFINE_PER_CPU(struct work_struct, pcpu_drain);
+
++bool __meminitdata extra_latent_entropy;
++
++static int __init setup_extra_latent_entropy(char *str)
++{
++	extra_latent_entropy = true;
++	return 0;
++}
++early_param("extra_latent_entropy", setup_extra_latent_entropy);
++
+ #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
+ volatile unsigned long latent_entropy __latent_entropy;
+ EXPORT_SYMBOL(latent_entropy);
+@@ -1063,6 +1073,13 @@ static __always_inline bool free_pages_prepare(struct page *page,
+		debug_check_no_obj_freed(page_address(page),
+					   PAGE_SIZE << order);
+	}
++
++	if (IS_ENABLED(CONFIG_PAGE_SANITIZE)) {
++		int i;
++		for (i = 0; i < (1 << order); i++)
++			clear_highpage(page + i);
++	}
++
+	arch_free_page(page, order);
+	kernel_poison_pages(page, 1 << order, 0);
+	kernel_map_pages(page, 1 << order, 0);
+@@ -1278,6 +1295,21 @@ static void __init __free_pages_boot_core(struct page *page, unsigned int order)
+	__ClearPageReserved(p);
+	set_page_count(p, 0);
+
++	if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
++		unsigned long hash = 0;
++		size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
++		const unsigned long *data = lowmem_page_address(page);
++
++		for (index = 0; index < end; index++)
++			hash ^= hash + data[index];
++#ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
++		latent_entropy ^= hash;
++		add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
++#else
++		add_device_randomness((const void *)&hash, sizeof(hash));
++#endif
++	}
++
+	page_zone(page)->managed_pages += nr_pages;
+	set_page_refcounted(page);
+	__free_pages(page, order);
+@@ -1718,8 +1750,8 @@ static inline int check_new_page(struct page *page)
+
+ static inline bool free_pages_prezeroed(void)
+ {
+-	return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
+-		page_poisoning_enabled();
++	return IS_ENABLED(CONFIG_PAGE_SANITIZE) ||
++		(IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) && page_poisoning_enabled());
+ }
+
+ #ifdef CONFIG_DEBUG_VM
+@@ -1776,6 +1808,11 @@ static void prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags
+
+	post_alloc_hook(page, order, gfp_flags);
+
++	if (IS_ENABLED(CONFIG_PAGE_SANITIZE_VERIFY)) {
++		for (i = 0; i < (1 << order); i++)
++			verify_zero_highpage(page + i);
++	}
++
+	if (!free_pages_prezeroed() && (gfp_flags & __GFP_ZERO))
+		for (i = 0; i < (1 << order); i++)
+			clear_highpage(page + i);
+diff --git a/mm/slab.h b/mm/slab.h
+index 485d9fbb8802..436461588804 100644
+--- a/mm/slab.h
++++ b/mm/slab.h
+@@ -311,7 +311,11 @@ static inline bool is_root_cache(struct kmem_cache *s)
+ static inline bool slab_equal_or_root(struct kmem_cache *s,
+				      struct kmem_cache *p)
+ {
++#ifdef CONFIG_SLAB_HARDENED
++	return p == s;
++#else
+	return true;
++#endif
+ }
+
+ static inline const char *cache_name(struct kmem_cache *s)
+@@ -363,18 +367,26 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
+	 * to not do even the assignment. In that case, slab_equal_or_root
+	 * will also be a constant.
+	 */
+-	if (!memcg_kmem_enabled() &&
++	if (!IS_ENABLED(CONFIG_SLAB_HARDENED) &&
++	    !memcg_kmem_enabled() &&
+	    !unlikely(s->flags & SLAB_CONSISTENCY_CHECKS))
+		return s;
+
+	page = virt_to_head_page(x);
++#ifdef CONFIG_SLAB_HARDENED
++	BUG_ON(!PageSlab(page));
++#endif
+	cachep = page->slab_cache;
+	if (slab_equal_or_root(cachep, s))
+		return cachep;
+
+	pr_err("%s: Wrong slab cache. %s but object is from %s\n",
+	       __func__, s->name, cachep->name);
++#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
++	BUG_ON(1);
++#else
+	WARN_ON_ONCE(1);
++#endif
+	return s;
+ }
+
+@@ -399,7 +411,7 @@ static inline size_t slab_ksize(const struct kmem_cache *s)
+	 * back there or track user information then we can
+	 * only use the space before that information.
+	 */
+-	if (s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER))
++	if ((s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER)) || IS_ENABLED(CONFIG_SLAB_CANARY))
+		return s->inuse;
+	/*
+	 * Else we can use all the padding etc for the allocation
+diff --git a/mm/slab_common.c b/mm/slab_common.c
+index 65212caa1f2a..d8bf8a75f445 100644
+--- a/mm/slab_common.c
++++ b/mm/slab_common.c
+@@ -26,10 +26,10 @@
+
+ #include "slab.h"
+
+-enum slab_state slab_state;
++enum slab_state slab_state __ro_after_init;
+ LIST_HEAD(slab_caches);
+ DEFINE_MUTEX(slab_mutex);
+-struct kmem_cache *kmem_cache;
++struct kmem_cache *kmem_cache __ro_after_init;
+
+ static LIST_HEAD(slab_caches_to_rcu_destroy);
+ static void slab_caches_to_rcu_destroy_workfn(struct work_struct *work);
+@@ -49,7 +49,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
+ /*
+  * Merge control. If this is set then no merging of slab caches will occur.
+  */
+-static bool slab_nomerge = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
++static bool slab_nomerge __ro_after_init = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
+
+ static int __init setup_slab_nomerge(char *str)
+ {
+@@ -927,7 +927,7 @@ EXPORT_SYMBOL(kmalloc_dma_caches);
+  * of two cache sizes there. The size of larger slabs can be determined using
+  * fls.
+  */
+-static s8 size_index[24] = {
++static s8 size_index[24] __ro_after_init = {
+	3,	/* 8 */
+	4,	/* 16 */
+	5,	/* 24 */
+diff --git a/mm/slub.c b/mm/slub.c
+index 41c01690d116..591dd60d37f3 100644
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -125,6 +125,16 @@ static inline int kmem_cache_debug(struct kmem_cache *s)
+ #endif
+ }
+
++static inline bool has_sanitize(struct kmem_cache *s)
++{
++	return IS_ENABLED(CONFIG_SLAB_SANITIZE) && !(s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON));
++}
++
++static inline bool has_sanitize_verify(struct kmem_cache *s)
++{
++	return IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && has_sanitize(s);
++}
++
+ void *fixup_red_left(struct kmem_cache *s, void *p)
+ {
+	if (kmem_cache_debug(s) && s->flags & SLAB_RED_ZONE)
+@@ -297,6 +307,35 @@ static inline void set_freepointer(struct kmem_cache *s, void *object, void *fp)
+	*(void **)freeptr_addr = freelist_ptr(s, fp, freeptr_addr);
+ }
+
++#ifdef CONFIG_SLAB_CANARY
++static inline unsigned long *get_canary(struct kmem_cache *s, void *object)
++{
++	if (s->offset)
++		return object + s->offset + sizeof(void *);
++	return object + s->inuse;
++}
++
++static inline unsigned long get_canary_value(const void *canary, unsigned long value)
++{
++	return (value ^ (unsigned long)canary) & CANARY_MASK;
++}
++
++static inline void set_canary(struct kmem_cache *s, void *object, unsigned long value)
++{
++	unsigned long *canary = get_canary(s, object);
++	*canary = get_canary_value(canary, value);
++}
++
++static inline void check_canary(struct kmem_cache *s, void *object, unsigned long value)
++{
++	unsigned long *canary = get_canary(s, object);
++	BUG_ON(*canary != get_canary_value(canary, value));
++}
++#else
++#define set_canary(s, object, value)
++#define check_canary(s, object, value)
++#endif
++
+ /* Loop over all objects in a slab */
+ #define for_each_object(__p, __s, __addr, __objects) \
+	for (__p = fixup_red_left(__s, __addr); \
+@@ -484,13 +523,13 @@ static inline void *restore_red_left(struct kmem_cache *s, void *p)
+  * Debug settings:
+  */
+ #if defined(CONFIG_SLUB_DEBUG_ON)
+-static int slub_debug = DEBUG_DEFAULT_FLAGS;
++static int slub_debug __ro_after_init = DEBUG_DEFAULT_FLAGS;
+ #else
+-static int slub_debug;
++static int slub_debug __ro_after_init;
+ #endif
+
+-static char *slub_debug_slabs;
+-static int disable_higher_order_debug;
++static char *slub_debug_slabs __ro_after_init;
++static int disable_higher_order_debug __ro_after_init;
+
+ /*
+  * slub is about to manipulate internal object metadata.  This memory lies
+@@ -550,6 +589,9 @@ static struct track *get_track(struct kmem_cache *s, void *object,
+	else
+		p = object + s->inuse;
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		p = (void *)p + sizeof(void *);
++
+	return p + alloc;
+ }
+
+@@ -688,6 +730,9 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
+	else
+		off = s->inuse;
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		off += sizeof(void *);
++
+	if (s->flags & SLAB_STORE_USER)
+		off += 2 * sizeof(struct track);
+
+@@ -817,6 +862,9 @@ static int check_pad_bytes(struct kmem_cache *s, struct page *page, u8 *p)
+		/* Freepointer is placed after the object. */
+		off += sizeof(void *);
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		off += sizeof(void *);
++
+	if (s->flags & SLAB_STORE_USER)
+		/* We also have user information there */
+		off += 2 * sizeof(struct track);
+@@ -1416,8 +1464,9 @@ static void setup_object(struct kmem_cache *s, struct page *page,
+				void *object)
+ {
+	setup_object_debug(s, page, object);
++	set_canary(s, object, s->random_inactive);
+	kasan_init_slab_obj(s, object);
+-	if (unlikely(s->ctor)) {
++	if (unlikely(s->ctor) && !has_sanitize_verify(s)) {
+		kasan_unpoison_object_data(s, object);
+		s->ctor(object);
+		kasan_poison_object_data(s, object);
+@@ -2717,9 +2766,21 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,
+		stat(s, ALLOC_FASTPATH);
+	}
+
+-	if (unlikely(gfpflags & __GFP_ZERO) && object)
++	if (has_sanitize_verify(s) && object) {
++		size_t offset = s->offset ? 0 : sizeof(void *);
++		BUG_ON(memchr_inv(object + offset, 0, s->object_size - offset));
++		if (s->ctor)
++			s->ctor(object);
++		if (unlikely(gfpflags & __GFP_ZERO) && offset)
++			memset(object, 0, sizeof(void *));
++	} else if (unlikely(gfpflags & __GFP_ZERO) && object)
+		memset(object, 0, s->object_size);
+
++	if (object) {
++		check_canary(s, object, s->random_inactive);
++		set_canary(s, object, s->random_active);
++	}
++
+	slab_post_alloc_hook(s, gfpflags, 1, &object);
+
+	return object;
+@@ -2926,6 +2987,27 @@ static __always_inline void do_slab_free(struct kmem_cache *s,
+	void *tail_obj = tail ? : head;
+	struct kmem_cache_cpu *c;
+	unsigned long tid;
++	bool sanitize = has_sanitize(s);
++
++	if (IS_ENABLED(CONFIG_SLAB_CANARY) || sanitize) {
++		__maybe_unused int offset = s->offset ? 0 : sizeof(void *);
++		void *x = head;
++
++		while (1) {
++			check_canary(s, x, s->random_active);
++			set_canary(s, x, s->random_inactive);
++
++			if (sanitize) {
++				memset(x + offset, 0, s->object_size - offset);
++				if (!IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && s->ctor)
++					s->ctor(x);
++			}
++			if (x == tail_obj)
++				break;
++			x = get_freepointer(s, x);
++		}
++	}
++
+ redo:
+	/*
+	 * Determine the currently cpus per cpu slab.
+@@ -3104,7 +3186,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+			  void **p)
+ {
+	struct kmem_cache_cpu *c;
+-	int i;
++	int i, k;
+
+	/* memcg and kmem_cache debug support */
+	s = slab_pre_alloc_hook(s, flags);
+@@ -3141,13 +3223,29 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+	local_irq_enable();
+
+	/* Clear memory outside IRQ disabled fastpath loop */
+-	if (unlikely(flags & __GFP_ZERO)) {
++	if (has_sanitize_verify(s)) {
++		int j;
++
++		for (j = 0; j < i; j++) {
++			size_t offset = s->offset ? 0 : sizeof(void *);
++			BUG_ON(memchr_inv(p[j] + offset, 0, s->object_size - offset));
++			if (s->ctor)
++				s->ctor(p[j]);
++			if (unlikely(flags & __GFP_ZERO) && offset)
++				memset(p[j], 0, sizeof(void *));
++		}
++	} else if (unlikely(flags & __GFP_ZERO)) {
+		int j;
+
+		for (j = 0; j < i; j++)
+			memset(p[j], 0, s->object_size);
+	}
+
++	for (k = 0; k < i; k++) {
++		check_canary(s, p[k], s->random_inactive);
++		set_canary(s, p[k], s->random_active);
++	}
++
+	/* memcg and kmem_cache debug support */
+	slab_post_alloc_hook(s, flags, size, p);
+	return i;
+@@ -3179,9 +3277,9 @@ EXPORT_SYMBOL(kmem_cache_alloc_bulk);
+  * and increases the number of allocations possible without having to
+  * take the list_lock.
+  */
+-static int slub_min_order;
+-static int slub_max_order = PAGE_ALLOC_COSTLY_ORDER;
+-static int slub_min_objects;
++static int slub_min_order __ro_after_init;
++static int slub_max_order __ro_after_init = PAGE_ALLOC_COSTLY_ORDER;
++static int slub_min_objects __ro_after_init;
+
+ /*
+  * Calculate the order of allocation given an slab object size.
+@@ -3351,6 +3449,7 @@ static void early_kmem_cache_node_alloc(int node)
+	init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);
+	init_tracking(kmem_cache_node, n);
+ #endif
++	set_canary(kmem_cache_node, n, kmem_cache_node->random_active);
+	kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node),
+		      GFP_KERNEL);
+	init_kmem_cache_node(n);
+@@ -3507,6 +3606,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
+		size += sizeof(void *);
+	}
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		size += sizeof(void *);
++
+ #ifdef CONFIG_SLUB_DEBUG
+	if (flags & SLAB_STORE_USER)
+		/*
+@@ -3577,6 +3679,10 @@ static int kmem_cache_open(struct kmem_cache *s, unsigned long flags)
+ #ifdef CONFIG_SLAB_FREELIST_HARDENED
+	s->random = get_random_long();
+ #endif
++#ifdef CONFIG_SLAB_CANARY
++	s->random_active = get_random_long();
++	s->random_inactive = get_random_long();
++#endif
+
+	if (need_reserve_slab_rcu && (s->flags & SLAB_TYPESAFE_BY_RCU))
+		s->reserved = sizeof(struct rcu_head);
+@@ -3841,6 +3947,8 @@ const char *__check_heap_object(const void *ptr, unsigned long n,
+		offset -= s->red_left_pad;
+	}
+
++	check_canary(s, (void *)ptr - offset, s->random_active);
++
+	/* Allow address range falling entirely within object size. */
+	if (offset <= object_size && n <= object_size - offset)
+		return NULL;
+@@ -3859,7 +3967,11 @@ static size_t __ksize(const void *object)
+	page = virt_to_head_page(object);
+
+	if (unlikely(!PageSlab(page))) {
++#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
++		BUG_ON(!PageCompound(page));
++#else
+		WARN_ON(!PageCompound(page));
++#endif
+		return PAGE_SIZE << compound_order(page);
+	}
+
+@@ -4724,7 +4836,7 @@ enum slab_stat_type {
+ #define SO_TOTAL	(1 << SL_TOTAL)
+
+ #ifdef CONFIG_MEMCG
+-static bool memcg_sysfs_enabled = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
++static bool memcg_sysfs_enabled __ro_after_init = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
+
+ static int __init setup_slub_memcg_sysfs(char *str)
+ {
+diff --git a/mm/swap.c b/mm/swap.c
+index a77d68f2c1b6..d1f1d75f4d1f 100644
+--- a/mm/swap.c
++++ b/mm/swap.c
+@@ -92,6 +92,13 @@ static void __put_compound_page(struct page *page)
+	if (!PageHuge(page))
+		__page_cache_release(page);
+	dtor = get_compound_page_dtor(page);
++	if (!PageHuge(page))
++		BUG_ON(dtor != free_compound_page
++#ifdef CONFIG_TRANSPARENT_HUGEPAGE
++			&& dtor != free_transhuge_page
++#endif
++		);
++
+	(*dtor)(page);
+ }
+
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 6ca771f2f25b..6da2c9c3e6a5 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -4095,7 +4095,7 @@ int netif_rx_ni(struct sk_buff *skb)
+ }
+ EXPORT_SYMBOL(netif_rx_ni);
+
+-static __latent_entropy void net_tx_action(struct softirq_action *h)
++static __latent_entropy void net_tx_action(void)
+ {
+	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
+
+@@ -5609,7 +5609,7 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll)
+	return work;
+ }
+
+-static __latent_entropy void net_rx_action(struct softirq_action *h)
++static __latent_entropy void net_rx_action(void)
+ {
+	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
+	unsigned long time_limit = jiffies +
+diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
+index f48fe6fc7e8c..d78c52835c08 100644
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -261,6 +261,7 @@ config IP_PIMSM_V2
+
+ config SYN_COOKIES
+	bool "IP: TCP syncookie support"
++	default y
+	---help---
+	  Normal TCP/IP networking is open to an attack known as "SYN
+	  flooding". This denial-of-service attack prevents legitimate remote
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index 54deaa1066cf..211f97bd5ee3 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -37,6 +37,7 @@ static int vmlinux_section_warnings = 1;
+ static int warn_unresolved = 0;
+ /* How a symbol is exported */
+ static int sec_mismatch_count = 0;
++static int writable_fptr_count = 0;
+ static int sec_mismatch_verbose = 1;
+ static int sec_mismatch_fatal = 0;
+ /* ignore missing files */
+@@ -965,6 +966,7 @@ enum mismatch {
+	ANY_EXIT_TO_ANY_INIT,
+	EXPORT_TO_INIT_EXIT,
+	EXTABLE_TO_NON_TEXT,
++	DATA_TO_TEXT
+ };
+
+ /**
+@@ -1091,6 +1093,12 @@ static const struct sectioncheck sectioncheck[] = {
+	.good_tosec = {ALL_TEXT_SECTIONS , NULL},
+	.mismatch = EXTABLE_TO_NON_TEXT,
+	.handler = extable_mismatch_handler,
++},
++/* Do not reference code from writable data */
++{
++	.fromsec = { DATA_SECTIONS, NULL },
++	.bad_tosec = { ALL_TEXT_SECTIONS, NULL },
++	.mismatch = DATA_TO_TEXT
+ }
+ };
+
+@@ -1240,10 +1248,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+			continue;
+		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
+			continue;
+-		if (sym->st_value == addr)
+-			return sym;
+		/* Find a symbol nearby - addr are maybe negative */
+		d = sym->st_value - addr;
++		if (d == 0)
++			return sym;
+		if (d < 0)
+			d = addr - sym->st_value;
+		if (d < distance) {
+@@ -1402,7 +1410,11 @@ static void report_sec_mismatch(const char *modname,
+	char *prl_from;
+	char *prl_to;
+
+-	sec_mismatch_count++;
++	if (mismatch->mismatch == DATA_TO_TEXT)
++		writable_fptr_count++;
++	else
++		sec_mismatch_count++;
++
+	if (!sec_mismatch_verbose)
+		return;
+
+@@ -1526,6 +1538,14 @@ static void report_sec_mismatch(const char *modname,
+		fatal("There's a special handler for this mismatch type, "
+		      "we should never get here.");
+		break;
++	case DATA_TO_TEXT:
++#if 0
++		fprintf(stderr,
++		"The %s %s:%s references\n"
++		"the %s %s:%s%s\n",
++		from, fromsec, fromsym, to, tosec, tosym, to_p);
++#endif
++		break;
+	}
+	fprintf(stderr, "\n");
+ }
+@@ -2539,6 +2559,14 @@ int main(int argc, char **argv)
+		}
+	}
+	free(buf.p);
++	if (writable_fptr_count) {
++		if (!sec_mismatch_verbose) {
++			warn("modpost: Found %d writable function pointer(s).\n"
++			     "To see full details build your kernel with:\n"
++			     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
++			     writable_fptr_count);
++		}
++	}
+
+	return err;
+ }
+diff --git a/security/Kconfig b/security/Kconfig
+index 87f2a6f842fd..7bdbb7edf5bf 100644
+--- a/security/Kconfig
++++ b/security/Kconfig
+@@ -8,7 +8,7 @@ source security/keys/Kconfig
+
+ config SECURITY_DMESG_RESTRICT
+	bool "Restrict unprivileged access to the kernel syslog"
+-	default n
++	default y
+	help
+	  This enforces restrictions on unprivileged users reading the kernel
+	  syslog via dmesg(8).
+@@ -18,10 +18,34 @@ config SECURITY_DMESG_RESTRICT
+
+	  If you are unsure how to answer this question, answer N.
+
++config SECURITY_PERF_EVENTS_RESTRICT
++	bool "Restrict unprivileged use of performance events"
++	depends on PERF_EVENTS
++	default y
++	help
++	  If you say Y here, the kernel.perf_event_paranoid sysctl
++	  will be set to 3 by default, and no unprivileged use of the
++	  perf_event_open syscall will be permitted unless it is
++	  changed.
++
++config SECURITY_TIOCSTI_RESTRICT
++	bool "Restrict unprivileged use of tiocsti command injection"
++	default y
++	help
++	  This enforces restrictions on unprivileged users injecting commands
++	  into other processes which share a tty session using the TIOCSTI
++	  ioctl. This option makes TIOCSTI use require CAP_SYS_ADMIN.
++
++	  If this option is not selected, no restrictions will be enforced
++	  unless the tiocsti_restrict sysctl is explicitly set to (1).
++
++	  If you are unsure how to answer this question, answer N.
++
+ config SECURITY
+	bool "Enable different security models"
+	depends on SYSFS
+	depends on MULTIUSER
++	default y
+	help
+	  This allows you to choose different security modules to be
+	  configured into your kernel.
+@@ -48,6 +72,7 @@ config SECURITYFS
+ config SECURITY_NETWORK
+	bool "Socket and Networking Security Hooks"
+	depends on SECURITY
++	default y
+	help
+	  This enables the socket and networking security hooks.
+	  If enabled, a security module can use these hooks to
+@@ -155,6 +180,7 @@ config HARDENED_USERCOPY
+	depends on HAVE_HARDENED_USERCOPY_ALLOCATOR
+	select BUG
+	imply STRICT_DEVMEM
++	default y
+	help
+	  This option checks for obviously wrong memory regions when
+	  copying memory to/from the kernel (via copy_to_user() and
+@@ -178,10 +204,36 @@ config HARDENED_USERCOPY_PAGESPAN
+ config FORTIFY_SOURCE
+	bool "Harden common str/mem functions against buffer overflows"
+	depends on ARCH_HAS_FORTIFY_SOURCE
++	default y
+	help
+	  Detect overflows of buffers in common string and memory functions
+	  where the compiler can determine and validate the buffer sizes.
+
++config FORTIFY_SOURCE_STRICT_STRING
++	bool "Harden common functions against buffer overflows"
++	depends on FORTIFY_SOURCE
++	depends on EXPERT
++	help
++	  Perform stricter overflow checks catching overflows within objects
++	  for common C string functions rather than only between objects.
++
++	  This is not yet intended for production use, only bug finding.
++
++config PAGE_SANITIZE
++	bool "Sanitize pages"
++	default y
++	help
++	  Zero fill page allocations on free, reducing the lifetime of
++	  sensitive data and helping to mitigate use-after-free bugs.
++
++config PAGE_SANITIZE_VERIFY
++	bool "Verify sanitized pages"
++	depends on PAGE_SANITIZE
++	default y
++	help
++	  Verify that newly allocated pages are zeroed to detect
++	  write-after-free bugs.
++
+ config STATIC_USERMODEHELPER
+	bool "Force all usermode helper calls through a single binary"
+	help
+diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
+index 8af7a690eb40..6539694b0fd3 100644
+--- a/security/selinux/Kconfig
++++ b/security/selinux/Kconfig
+@@ -2,7 +2,7 @@ config SECURITY_SELINUX
+	bool "NSA SELinux Support"
+	depends on SECURITY_NETWORK && AUDIT && NET && INET
+	select NETWORK_SECMARK
+-	default n
++	default y
+	help
+	  This selects NSA Security-Enhanced Linux (SELinux).
+	  You will also need a policy configuration and a labeled filesystem.
+@@ -79,23 +79,3 @@ config SECURITY_SELINUX_AVC_STATS
+	  This option collects access vector cache statistics to
+	  /selinux/avc/cache_stats, which may be monitored via
+	  tools such as avcstat.
+-
+-config SECURITY_SELINUX_CHECKREQPROT_VALUE
+-	int "NSA SELinux checkreqprot default value"
+-	depends on SECURITY_SELINUX
+-	range 0 1
+-	default 0
+-	help
+-	  This option sets the default value for the 'checkreqprot' flag
+-	  that determines whether SELinux checks the protection requested
+-	  by the application or the protection that will be applied by the
+-	  kernel (including any implied execute for read-implies-exec) for
+-	  mmap and mprotect calls.  If this option is set to 0 (zero),
+-	  SELinux will default to checking the protection that will be applied
+-	  by the kernel.  If this option is set to 1 (one), SELinux will
+-	  default to checking the protection requested by the application.
+-	  The checkreqprot flag may be changed from the default via the
+-	  'checkreqprot=' boot parameter.  It may also be changed at runtime
+-	  via /selinux/checkreqprot if authorized by policy.
+-
+-	  If you are unsure how to answer this question, answer 0.
+diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
+index 1649cd18eb0b..067f35559aa7 100644
+--- a/security/selinux/include/objsec.h
++++ b/security/selinux/include/objsec.h
+@@ -150,6 +150,6 @@ struct pkey_security_struct {
+	u32	sid;	/* SID of pkey */
+ };
+
+-extern unsigned int selinux_checkreqprot;
++extern const unsigned int selinux_checkreqprot;
+
+ #endif /* _SELINUX_OBJSEC_H_ */
+diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
+index 00eed842c491..8f7b8d7e6f91 100644
+--- a/security/selinux/selinuxfs.c
++++ b/security/selinux/selinuxfs.c
+@@ -41,16 +41,7 @@
+ #include "objsec.h"
+ #include "conditional.h"
+
+-unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
+-
+-static int __init checkreqprot_setup(char *str)
+-{
+-	unsigned long checkreqprot;
+-	if (!kstrtoul(str, 0, &checkreqprot))
+-		selinux_checkreqprot = checkreqprot ? 1 : 0;
+-	return 1;
+-}
+-__setup("checkreqprot=", checkreqprot_setup);
++const unsigned int selinux_checkreqprot;
+
+ static DEFINE_MUTEX(sel_mutex);
+
+@@ -610,10 +601,9 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
+		return PTR_ERR(page);
+
+	length = -EINVAL;
+-	if (sscanf(page, "%u", &new_value) != 1)
++	if (sscanf(page, "%u", &new_value) != 1 || new_value)
+		goto out;
+
+-	selinux_checkreqprot = new_value ? 1 : 0;
+	length = count;
+ out:
+	kfree(page);
+diff --git a/security/yama/Kconfig b/security/yama/Kconfig
+index 96b27405558a..485c1b85c325 100644
+--- a/security/yama/Kconfig
++++ b/security/yama/Kconfig
+@@ -1,7 +1,7 @@
+ config SECURITY_YAMA
+	bool "Yama support"
+	depends on SECURITY
+-	default n
++	default y
+	help
+	  This selects Yama, which extends DAC support with additional
+	  system-wide security settings beyond regular Linux discretionary
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 249a1ea5cefa3..684955b9067de 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -15,9 +15,12 @@
 , # Allows overriding the default defconfig
   defconfig ? null
 
-, # Overrides to the kernel config.
+, # Legacy overrides to the intermediate kernel config, as string
   extraConfig ? ""
 
+, # kernel intermediate config overrides, as a set
+ structuredExtraConfig ? {}
+
 , # The version number used for the module directory
   modDirVersion ? version
 
@@ -42,6 +45,7 @@
 , preferBuiltin ? hostPlatform.platform.kernelPreferBuiltin or false
 , kernelArch ? hostPlatform.platform.kernelArch
 
+, mkValueOverride ? null
 , ...
 } @ args:
 
@@ -57,10 +61,13 @@ let
     efiBootStub = true;
     needsCifsUtils = true;
     netfilterRPFilter = true;
+    grsecurity = false;
+    xen_dom0 = false;
   } // features) kernelPatches;
 
-  config = import ./common-config.nix {
-    inherit stdenv version ;
+  intermediateNixConfig = import ./common-config.nix {
+    inherit stdenv version structuredExtraConfig mkValueOverride;
+
     # append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part
     extraConfig = extraConfig + lib.optionalString (hostPlatform.platform ? kernelExtraConfig) hostPlatform.platform.kernelExtraConfig;
 
@@ -79,7 +86,7 @@ let
 
     generateConfig = ./generate-config.pl;
 
-    kernelConfig = kernelConfigFun config;
+    kernelConfig = kernelConfigFun intermediateNixConfig;
     passAsFile = [ "kernelConfig" ];
 
     depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index a00ba9ab7b8e1..7e277617b61a3 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -28,7 +28,9 @@ ${optionalString (stdenv.platform.kernelArch == "x86_64") ''
   # Reduce attack surface by disabling various emulations
   IA32_EMULATION n
   X86_X32 n
-  MODIFY_LDT_SYSCALL? n
+  ${optionalString (versionOlder version "4.17") ''
+    MODIFY_LDT_SYSCALL? n
+  ''}
 
   VMAP_STACK y # Catch kernel stack overflows
 
@@ -55,6 +57,9 @@ ${optionalString (versionOlder version "4.11") ''
 # via the selinux=0 boot parameter.
 ${optionalString (versionAtLeast version "4.12") ''
   SECURITY_SELINUX_DISABLE n
+''}
+
+${optionalString ((versionAtLeast version "4.12") && (versionOlder version "4.17")) ''
   SECURITY_WRITABLE_HOOKS n
 ''}
 
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 786709d532830..3249d6e272d76 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -1,15 +1,18 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.48";
+  version = "4.14.55";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1f92pz92mf0x9jfv3qf4w40i78l053f2qh2n8p2sbrqzc67n1840";
+    sha256 = "1mq23s990bi8nmz9rgkiln6zfxzbhcjg0hh512flp36scgi32r47";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
deleted file mode 100644
index 0a06c4dd434eb..0000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
-  version = "4.16.14";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1h6zjnwpdyqk9fp72c35565lhw00kpjl55faakwx7xsxfpyvc25p";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index b360e98f0c093..133bcb4343c41 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.17";
+  version = "4.17.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04yd7hnsdyaq4xmrgg7509qjf09k1dy6k1p8qqfrdspajvc1valz";
+    sha256 = "15b3k79cjlgrc4q39p1laxz2p102d6a7bpfq0mh9724qs64xd795";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index ecef71fd604f6..2192cdeb9f8f2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.136";
+  version = "4.4.140";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0svb6qbhc376jk26r67qssh7lradx63s60qlm1q2kd4xjhxyj5a3";
+    sha256 = "1fy7hq438sqxcdgac5dw71qbb9g38z7bdqjyl79a1b0cvqy8yk0q";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index bcc4aad7fccba..c728137ccfb0b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.107";
+  version = "4.9.112";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1lya48grdgjjbzw8x5kvvblanfas23dcmchysnhwv5p0rq7g9rrw";
+    sha256 = "1pphyrqi20w8k9rg5mjkl0g3f2152c4gqzhgdi4hz8mad972kv30";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
new file mode 100644
index 0000000000000..6855c5c5f903c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
+
+buildLinux (args // rec {
+  version = "4.14.47-139";
+
+  # modDirVersion needs to be x.y.z.
+  modDirVersion = "4.14.47";
+
+  # branchVersion needs to be x.y. 
+  extraMeta.branch = "4.14";
+
+  src = fetchFromGitHub {
+    owner = "hardkernel";
+    repo = "linux";
+    rev = version;
+    sha256 = "0jjgrmvi1h8zs8snnvghnjd422yfmn7jv9y1n7xikmfv4nvwqrkv";
+  };
+
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix
new file mode 100644
index 0000000000000..2efe357cbd684
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix
@@ -0,0 +1,47 @@
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+
+buildLinux (rec {
+  mptcpVersion = "0.93";
+  modDirVersion = "4.9.60";
+  version = "${modDirVersion}-mptcp_v${mptcpVersion}";
+
+  extraMeta = {
+    branch = "4.4";
+    maintainers = with stdenv.lib.maintainers; [ teto layus ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "multipath-tcp";
+    repo = "mptcp";
+    rev = "v${mptcpVersion}";
+    sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys";
+  };
+
+  extraConfig = ''
+    IPV6 y
+    MPTCP y
+    IP_MULTIPLE_TABLES y
+
+    # Enable advanced path-managers...
+    MPTCP_PM_ADVANCED y
+    MPTCP_FULLMESH y
+    MPTCP_NDIFFPORTS y
+    # ... but use none by default.
+    # The default is safer if source policy routing is not setup.
+    DEFAULT_DUMMY y
+    DEFAULT_MPTCP_PM default
+
+    # MPTCP scheduler selection.
+    # Disabled as the only non-default is the useless round-robin.
+    MPTCP_SCHED_ADVANCED n
+    DEFAULT_MPTCP_SCHED default
+
+    # Smarter TCP congestion controllers
+    TCP_CONG_LIA m
+    TCP_CONG_OLIA m
+    TCP_CONG_WVEGAS m
+    TCP_CONG_BALIA m
+
+  '' + (args.extraConfig or "");
+} // args)
+
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index d486bd1d6d24a..a439fd0a6ec58 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 buildLinux (rec {
-  mptcpVersion = "0.93";
-  modDirVersion = "4.9.60";
+  mptcpVersion = "0.94";
+  modDirVersion = "4.14.24";
   version = "${modDirVersion}-mptcp_v${mptcpVersion}";
   # autoModules= true;
 
@@ -15,7 +15,7 @@ buildLinux (rec {
     owner = "multipath-tcp";
     repo = "mptcp";
     rev = "v${mptcpVersion}";
-    sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys";
+    sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv";
   };
 
   extraConfig = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d869ea090360c..e68a0ed26719f 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.14.34";
-  tag = "1.20180417";
+  modDirVersion = "4.14.50";
+  tag = "1.20180619";
 in
 stdenv.lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "1xgisvmcq50lpnd4rpqhaw52399n0rx2n8mp6k0bf8qm1g3vnza2";
+    sha256 = "0yccz8j3vrzv6h23b7yn7dx84kkzq3dmicm3shhz18nkpyyq71ch";
   };
 
   defconfig = {
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4794685a75557..cc82e146abd1b 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc7";
-  modDirVersion = "4.17.0-rc7";
-  extraMeta.branch = "4.17";
+  version = "4.18-rc4";
+  modDirVersion = "4.18.0-rc4";
+  extraMeta.branch = "4.18";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr";
+    sha256 = "1nhl82ygz7sm6njnb9qg9k4jp0gr1cv2wxpayrpc4ab21xb6b5mj";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9833bb57bafb8..fe46b9eab4034 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -24,7 +24,7 @@ in {
   modDirVersion ? version,
   # The kernel source (tarball, git checkout, etc.)
   src,
-  # Any patches
+  # a list of { name=..., patch=..., extraConfig=...} patches
   kernelPatches ? [],
   # The kernel .config file
   configfile,
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c22762bde7c79..e0826aaa9d48f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -28,6 +28,11 @@ rec {
     patch = ./tag-hardened.patch;
   };
 
+  copperhead_4_14 = rec {
+    name = "copperhead-4.14";
+    patch = ./copperhead-4-14.patch;
+  };
+
   copperhead_4_16 = rec {
     name = "copperhead-4.16";
     patch = ./copperhead-4-16.patch;
@@ -54,4 +59,24 @@ rec {
     };
   };
 
+  # https://github.com/NixOS/nixpkgs/issues/42755
+  xen-netfront_fix_mismatched_rtnl_unlock = rec {
+    name = "xen-netfront_fix_mismatched_rtnl_unlock";
+    patch = fetchpatch {
+      name = name + ".patch";
+      url = https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch;
+      sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8";
+    };
+  };
+
+  # https://github.com/NixOS/nixpkgs/issues/42755
+  xen-netfront_update_features_after_registering_netdev = rec {
+    name = "xen-netfront_update_features_after_registering_netdev";
+    patch = fetchpatch {
+      name = name + ".patch";
+      url = https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch;
+      sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
+    };
+  };
+
 }
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index c7915ace7ca34..201f170c25809 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.10";
 
   src = fetchurl {
-    url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
+    url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
     sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i";
   };
 
diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
index a7b6561239d00..07ab0427b226d 100644
--- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
+++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "22-1.1";
 
   src = fetchurl {
-    url = "http://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
+    url = "https://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
     sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh";
   };
 
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index d3d6cfd4c58b9..0fff816eac7be 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   name = "kmscon-8";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz";
     sha256 = "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a";
   };
 
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index c61fa683c7587..874faf7799b34 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsmbios-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "dell";
     repo = "libsmbios";
     rev = "v${version}";
-    sha256 = "158w5fz777is7nr5yhpr69b17nn6i1pavycxq1q9899frrpkzbsc";
+    sha256 = "0bck3byk62a69ngyj0zjpzf4wxwjmkhwhvsqb8z24dww9wz41l9k";
   };
 
   nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];
diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix
index c82c892c46272..14c152dc10e9c 100644
--- a/pkgs/os-specific/linux/libvolume_id/default.nix
+++ b/pkgs/os-specific/linux/libvolume_id/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libvolume_id-0.81.1";
    
   src = fetchurl {
-    url = http://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2;
+    url = https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2;
     sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5";
   };
 
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 4f35d54653834..25b868369ae1f 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     urls = [
       "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"
-      "http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
+      "https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
     ];
     sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0";
   };
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 18e90f85b4487..e5ee5e2029449 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "158";
+  version = "159";
 
   src = fetchFromGitHub {
     owner  = "andikleen";
     repo   = "mcelog";
     rev    = "v${version}";
-    sha256 = "0hiyj626fv4awzqgf4wnxjkr68cfcllqpibw0ncnpkvk9rn96rqp";
+    sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg";
   };
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 0e0178e8845bb..a1b207ffea099 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz";
+    url = "https://git.opensvc.com/";
     sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm";
   };
 
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 3d515f7b762fb..6bcd2ea692d3b 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   version = "1.1.19";
 
   src = fetchurl {
-    url    = "http://www.musl-libc.org/releases/musl-${version}.tar.gz";
+    url    = "https://www.musl-libc.org/releases/musl-${version}.tar.gz";
     sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv";
   };
 
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 63d389fdb1f85..468bfd135e776 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -2,12 +2,12 @@
 , flex, bison, libmnl, libnftnl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.5";
+  version = "0.9.0";
   name = "nftables-${version}";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
-    sha256 = "08z3xaxdryi0i9gcfifs77c96xs8ljynkr2hbfgf3w67l60az6wf";
+    url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2";
+    sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd";
   };
 
   configureFlags = [
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index cd7733f43a480..15c3e10e11994 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -17,7 +17,6 @@ buildPhase() {
         # Create the module.
         echo "Building linux driver against kernel: $kernel";
         cd kernel
-        kernelVersion=$(cd $kernel/lib/modules && ls)
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 11a97d420a83a..8eeaf502020dd 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -17,13 +17,11 @@ in
 rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "390.48";
-    sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai";
-    sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c";
-    settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl";
-    persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k";
-
-    patches = [ ./fix_missing_symbol.patch ];
+    version = "390.67";
+    sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg";
+    sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd";
+    settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7";
+    persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw";
   };
 
   beta = stable; # not enough interest to maintain beta ATM
diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
deleted file mode 100644
index ea783b4f011e7..0000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/
---- a/kernel/common/inc/nv-linux.h~     2018-01-25 06:09:41.000000000 +0100
-+++ b/kernel/common/inc/nv-linux.h      2018-03-05 13:58:17.746725638 +0100
-@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags(
- static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
- {
-     NvBool swiotlb_in_use = NV_FALSE;
-+#if 0
- #if defined(CONFIG_SWIOTLB)
-   #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
-     /*
-@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb
-     swiotlb_in_use = (swiotlb == 1);
-   #endif
- #endif
--
-+#endif
-     return swiotlb_in_use;
- }
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 13e5d1b76ea65..b5435f23e71b4 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -12,7 +12,7 @@
 , patches ? []
 }:
 
-{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
+{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch
 , kernel ? null, xorg, zlib, perl, 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
@@ -55,6 +55,7 @@ let
     outputDev = if libsOnly then null else "bin";
 
     kernel = if libsOnly then null else kernel.dev;
+    kernelVersion = if libsOnly then null else kernel.modDirVersion;
 
     hardeningDisable = [ "pic" "format" ];
 
@@ -69,7 +70,7 @@ let
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) {
+      settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index ff408b6a62485..bead5f84eac91 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open Data Plane optimized for DPDK";
-    homepage = http://www.opendataplane.org;
+    homepage = https://www.opendataplane.org;
     license = licenses.bsd3;
     platforms =  [ "x86_64-linux" ];
     maintainers = [ maintainers.abuibrahim ];
diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix
index 69c6dd1510cb4..a0464e1996a51 100644
--- a/pkgs/os-specific/linux/otpw/default.nix
+++ b/pkgs/os-specific/linux/otpw/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "otpw-1.3";
 
   src = fetchurl {
-    url = "http://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz";
+    url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz";
     sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk";
   };
 
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 99caa813b2ea5..9354811fd6f35 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.12";
+  version = "0.01.14";
 
   src = fetchFromGitHub {
-    sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa";
+    sha256 = "1gkyfn1jbrs6w83sxa33csj62a6pyqqsmn92932qf7ns6y00dyk4";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 76dbbf1e1be41..dd3957d361853 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pam-krb5-4.8";
 
   src = fetchurl {
-    url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz";
+    url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz";
     sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs";
   };
 
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index afb342768c337..270be695f03ad 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.9";
 
   src = fetchurl {
-    url = "http://pax.grsecurity.net/${name}.tar.gz";
+    url = "https://pax.grsecurity.net/${name}.tar.gz";
     sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
   };
 
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index 4d70533fac7ff..88592798a1f60 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.9.3";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz";
     sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz";
   };
 
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 1053e07559e89..326ba444957e3 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   name = "pm-utils-1.4.1";
 
   src = fetchurl {
-    url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f";
   };
 
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix
index a039984ff3386..3ee5e312d2337 100644
--- a/pkgs/os-specific/linux/pommed-light/default.nix
+++ b/pkgs/os-specific/linux/pommed-light/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pkgname = "pommed-light";
-  version = "1.50lw";
+  version = "1.51lw";
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/bytbox/${pkgname}/archive/v${version}.tar.gz";
 
-    sha256 = "1r2f28zqmyvzgymd0ng53hscbrq8vcqhxdnkq5dppjf9yrzn018b";
+    sha256 = "11wi17bh2br1hp8gmq40b1hm5drm6h969505f7432zam3cm8mc8q";
   };
 
   postPatch = ''
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       and the like.
     '';
     homepage = https://github.com/bytbox/pommed-light;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
     license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix
new file mode 100644
index 0000000000000..e4f7d4b3616eb
--- /dev/null
+++ b/pkgs/os-specific/linux/pps-tools/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  baseName = "pps-tools";
+  version = "1.0.2";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "redlab-i";
+    repo = "${baseName}";
+    rev = "v${version}";
+    sha256 = "1yh9g0l59dkq4ci0wbb03qin3c3cizfngmn9jy1vwm5zm6axlxhf";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $dev/include
+    mkdir -p $out/{usr/bin,usr/include/sys}
+    make install DESTDIR=$out
+    mv $out/usr/bin/* $out/bin
+    mv $out/usr/include/* $dev/include/
+    rm -rf $out/usr/
+  '';
+
+  meta = with stdenv.lib;{
+    description = "User-space tools for LinuxPPS";
+    homepage = http://linuxpps.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sorki ];
+  };
+}
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix
new file mode 100644
index 0000000000000..a334465fb71d5
--- /dev/null
+++ b/pkgs/os-specific/linux/pscircle/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "pscircle-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitLab {
+    owner = "mildlyparallel";
+    repo = "pscircle";
+    rev = "v${version}";
+    sha256 = "188d0db62215pycmx2qfmbbjpmih03vigsz2j448zhsbyxapavv3";
+  };
+
+  buildInputs = [
+      meson
+      pkgconfig
+      cairo
+      ninja
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://gitlab.com/mildlyparallel/pscircle;
+    description = "Visualize Linux processes in a form of a radial tree";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ldesgoui ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index 9aa9380687918..0cfc266d87155 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc
 , ethtool, nettools, libnl, libudev, python, perl
 } :
 
 let
-  version = "17.1";
+  version = "19";
 
 in stdenv.mkDerivation {
   name = "rdma-core-${version}";
@@ -12,10 +12,10 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "019h5q0szjccdgfk13qy0f2dxd0n1fr407b3qqq1vcmx41w9b6vz";
+    sha256 = "0c01f9yn9sk7wslyrclsi2jvrn4d36bdw4qjbl0vmcv4858wf4bb";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig pandoc ];
   buildInputs = [ libnl ethtool nettools libudev python perl ];
 
   cmakeFlags = [
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index db494ec2493fa..f24d8d1f875c1 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "s6-linux-utils-${version}";
 
   src = fetchurl {
-    url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
+    url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
     sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip";
   };
 
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
index a61a54afc38ea..a07eec431c338 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "smem-1.4";
 
   src = fetchurl {
-    url = "http://www.selenic.com/smem/download/${name}.tar.gz";
+    url = "https://www.selenic.com/smem/download/${name}.tar.gz";
     sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f";
   };
 
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index b4b8606197e81..c4d699c395e49 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "smemstat-${version}";
-  version = "0.01.18";
+  version = "0.02.00";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";
-    sha256 = "0g262gilj2jk365wj4yl93ifppgvc9rx7dmlw6ychbv72v2pbv6w";
+    sha256 = "16in8bzsrrcz7mc5qvyvjkxgpzz4bnq8zvkb7vsv6qfgyd3xr1dp";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 778f00d2a95d7..af3df245fe67c 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -25,7 +25,7 @@ let
 
       nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
 
-      hardeningDisable = [ "pic" ];
+      hardeningDisable = [ "fortify" "stackprotector" "pic" ];
 
       preConfigure = ''
         substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 3d89fdfdc281e..bbc4bc7da4640 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "sssd-${version}";
-  version = "1.16.1";
+  version = "1.16.2";
 
   src = fetchurl {
     url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
-    sha256 = "0vjh1c5960wh86zjsamdjhljls7bb5fz5jpcazgzrpmga5w6ggrd";
+    sha256 = "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy";
   };
 
   # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index db9f05f5f4d82..0da32371b351e 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "sysstat-11.7.3";
+  name = "sysstat-11.7.4";
 
   src = fetchurl {
     url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
-    sha256 = "1sk6rhdqr8xsm456fkhkcmbnqgkymqqs3jkapcf8mrnsx36gz94f";
+    sha256 = "144h5fb93s33w3pmgw7qadw1f7c4jq41m5lzcs49ihl44yi6aqm9";
   };
 
   buildInputs = [ gettext ];
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index 3189872ca3bca..9d919aaaa938a 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -4,16 +4,17 @@
 , fetchFromGitHub
 , pkgconfig
 , txt2tags
+, udev
 }:
 
 stdenv.mkDerivation rec {
   name = "thunderbolt-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thunderbolt-software-user-space";
-    rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23";
-    sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc";
+    rev = "v${version}";
+    sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
   };
 
   buildInputs = [
@@ -23,11 +24,15 @@ stdenv.mkDerivation rec {
     txt2tags
   ];
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE='Release'"
-    "-DUDEV_BIN_DIR=$out/bin"
-    "-DUDEV_RULES_DIR=$out/udev"
-  ];
+  # These can't go in the normal nix cmakeFlags because $out needs to be
+  # expanded by the shell, not by cmake or nix.  $ENV{out} doesn't work right
+  # either; it results in /build/source/build//nix/store/blahblahblahblah/bin/
+  # TODO: use ${placeholder "out"} when possible.
+  #       See https://github.com/NixOS/nixpkgs/pull/37693
+  preConfigure = ''
+    cmakeFlags+=" -DUDEV_BIN_DIR=$out/bin"
+    cmakeFlags+=" -DUDEV_RULES_DIR=$out/etc/udev/rules.d"
+  '';
 
   meta = {
     description = "Thunderbolt(TM) user-space components";
diff --git a/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch b/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch
new file mode 100644
index 0000000000000..48a520f6ec3a1
--- /dev/null
+++ b/pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch
@@ -0,0 +1,48 @@
+diff --git a/src/gstreamer-1.0/gsttcamsrc.cpp b/src/gstreamer-1.0/gsttcamsrc.cpp
+index d482e1e..e36afd8 100644
+--- a/src/gstreamer-1.0/gsttcamsrc.cpp
++++ b/src/gstreamer-1.0/gsttcamsrc.cpp
+@@ -1112,6 +1112,7 @@ bool gst_tcam_src_init_camera (GstTcamSrc* self)
+ 
+ static void gst_tcam_src_close_camera (GstTcamSrc* self)
+ {
++    GST_INFO("Closing device");
+     if (self->device != NULL)
+     {
+         self->device->dev->stop_stream();
+@@ -1156,7 +1157,7 @@ static gboolean gst_tcam_src_stop (GstBaseSrc* src)
+ 
+     self->device->dev->stop_stream();
+     gst_element_send_event(GST_ELEMENT(self), gst_event_new_eos());
+-    GST_DEBUG_OBJECT (self, "Stopped acquisition");
++    GST_DEBUG("Stopped acquisition");
+ 
+     return TRUE;
+ }
+@@ -1556,6 +1557,18 @@ static void gst_tcam_src_get_property (GObject* object,
+ }
+ 
+ 
++static gboolean gst_tcam_src_unlock (GstBaseSrc* src)
++{
++    GstTcamSrc* self = GST_TCAM_SRC(src);
++
++    self->is_running = FALSE;
++
++    self->cv.notify_all();
++
++    return TRUE;
++}
++
++
+ static void gst_tcam_src_class_init (GstTcamSrcClass* klass)
+ {
+     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+@@ -1616,6 +1629,7 @@ static void gst_tcam_src_class_init (GstTcamSrcClass* klass)
+     gstbasesrc_class->fixate = gst_tcam_src_fixate_caps;
+     gstbasesrc_class->start = gst_tcam_src_start;
+     gstbasesrc_class->stop = gst_tcam_src_stop;
++    gstbasesrc_class->unlock = gst_tcam_src_unlock;
+     gstbasesrc_class->negotiate = gst_tcam_src_negotiate;
+     gstbasesrc_class->get_times = gst_tcam_src_get_times;
+ 
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix
new file mode 100644
index 0000000000000..d4d6ae18ce627
--- /dev/null
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@@ -0,0 +1,98 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, pcre
+, tinyxml
+, libusb1
+, libzip
+, glib
+, gobjectIntrospection
+, gst_all_1
+, libwebcam
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tiscamera";
+  version = "0.9.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "TheImagingSource";
+    repo = pname;
+    rev = "v-${name}";
+    sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+  ];
+
+  buildInputs = [
+    pcre
+    tinyxml
+    libusb1
+    libzip
+    glib
+    gobjectIntrospection
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    libwebcam
+  ];
+
+
+  cmakeFlags = [
+    "-DBUILD_ARAVIS=OFF" # For GigE support. Won't need it as our camera is usb.
+    "-DBUILD_GST_1_0=ON"
+    "-DBUILD_TOOLS=ON"
+    "-DBUILD_V4L2=ON"
+    "-DBUILD_LIBUSB=ON"
+  ];
+
+
+  patches = [
+    ./allow-pipeline-stop-in-trigger-mode.patch # To be removed next release.
+  ];
+
+  postPatch = ''
+    substituteInPlace ./data/udev/80-theimagingsource-cameras.rules \
+      --replace "/usr/bin/uvcdynctrl" "${libwebcam}/bin/uvcdynctrl" \
+      --replace "/path/to/tiscamera/uvc-extensions" "$out/share/uvcdynctrl/data/199e"
+
+    substituteInPlace ./src/BackendLoader.cpp \
+      --replace '"libtcam-v4l2.so"' "\"$out/lib/tcam-0/libtcam-v4l2.so\"" \
+      --replace '"libtcam-aravis.so"' "\"$out/lib/tcam-0/libtcam-aravis.so\"" \
+      --replace '"libtcam-libusb.so"' "\"$out/lib/tcam-0/libtcam-libusb.so\""
+  '';
+
+  preConfigure = ''
+    cmakeFlagsArray=(
+      $cmakeFlagsArray
+      "-DCMAKE_INSTALL_PREFIX=$out"
+      "-DTCAM_INSTALL_UDEV=$out/lib/udev/rules.d"
+      "-DTCAM_INSTALL_UVCDYNCTRL=$out/share/uvcdynctrl/data/199e"
+      "-DTCAM_INSTALL_GST_1_0=$out/lib/gstreamer-1.0"
+      "-DTCAM_INSTALL_GIR=$out/share/gir-1.0"
+      "-DTCAM_INSTALL_TYPELIB=$out/lib/girepository-1.0"
+      "-DTCAM_INSTALL_SYSTEMD=$out/etc/systemd/system"
+    )
+  '';
+
+
+  # There are gobject introspection commands launched as part of the build. Those have a runtime
+  # dependency on `libtcam` (which itself is built as part of this build). In order to allow
+  # that, we set the dynamic linker's path to point on the build time location of the library.
+  preBuild = ''
+    export LD_LIBRARY_PATH=$PWD/src:$LD_LIBRARY_PATH
+  '';
+
+  meta = with lib; {
+    description = "The Linux sources and UVC firmwares for The Imaging Source cameras";
+    homepage = https://github.com/TheImagingSource/tiscamera;
+    license = with licenses; [ asl20 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jraygauthier ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index aeb9deac89d20..199523db42817 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "udisks-1.0.5";
 
   src = fetchurl {
-    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://hal.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
   };
 
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index a057cb3c101ea..9f65d0a0316cb 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -1,43 +1,61 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnused
-, expat, acl, systemd, glib, libatasmart, polkit
-, libxslt, docbook_xsl, utillinux, mdadm, libgudev
-, gobjectIntrospection
+{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, intltool, gnused
+, gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash
+, expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
+, gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43
+, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, udftools, ntfs3g
 }:
 
-stdenv.mkDerivation rec {
-  name = "udisks-2.1.8";
+let
+  version = "2.7.7";
+in stdenv.mkDerivation rec {
+  name = "udisks-${version}";
 
-  src = fetchurl {
-    url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
-    sha256 = "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs";
+  src = fetchFromGitHub {
+    owner = "storaged-project";
+    repo = "udisks";
+    rev = name;
+    sha256 = "13a7810izfhz729kwij584vsrzz9jdyfzvbl9magl0nfyj8zj8m8";
   };
 
-  outputs = [ "out" "man" "dev" ];
-
-  patches = [ ./force-path.patch ];
-
-  # FIXME remove /var/run/current-system/sw/* references
-  # FIXME add references to parted, cryptsetup, etc (see the sources)
-  postPatch =
-    ''
-      substituteInPlace src/main.c --replace \
-        "@path@" \
-        "${utillinux}/bin:${mdadm}/bin:/run/current-system/sw/bin"
-      substituteInPlace data/80-udisks2.rules \
-        --replace "/bin/sh" "${stdenv.shell}" \
-        --replace "/sbin/mdadm" "${mdadm}/bin/mdadm" \
-        --replace " sed " " ${gnused}/bin/sed "
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+  outputs = [ "out" "man" "dev" "devdoc" ];
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      bash = "${bash}/bin/bash";
+      blkid = "${utillinux}/bin/blkid";
+      false = "${coreutils}/bin/false";
+      mdadm = "${mdadm}/bin/mdadm";
+      sed = "${gnused}/bin/sed";
+      sh = "${bash}/bin/sh";
+      sleep = "${coreutils}/bin/sleep";
+      true = "${coreutils}/bin/true";
+    })
+    (substituteAll {
+      src = ./force-path.patch;
+      path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils libxfs ntfs3g parted utillinux ];
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig gnome3.gnome-common libtool intltool gobjectIntrospection
+    gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl
+  ];
+
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
       substituteInPlace udisks/udisksclient.c \
         --replace 'defined( __GNUC_PREREQ)' 1 \
         --replace '__GNUC_PREREQ(4,6)' 1
   '';
 
-  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+  buildInputs = [
+    expat libgudev libblockdev acl systemd glib libatasmart polkit
+  ];
 
-  buildInputs = [ libxslt docbook_xsl libgudev expat acl systemd glib libatasmart polkit ];
+  preConfigure = "./autogen.sh";
 
   configureFlags = [
+    "--enable-gtk-doc"
     "--localstatedir=/var"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-udevdir=$(out)/lib/udev"
@@ -50,9 +68,11 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = {
-    homepage = http://www.freedesktop.org/wiki/Software/udisks;
-    description = "A daemon and command-line utility for querying and manipulating storage devices";
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
+    homepage = https://www.freedesktop.org/wiki/Software/udisks/;
+    license = licenses.gpl2Plus; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
+    maintainers = with maintainers; [];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/os-specific/linux/udisks/fix-paths.patch
new file mode 100644
index 0000000000000..c2744c3b42e14
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/fix-paths.patch
@@ -0,0 +1,131 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SHELL = /bin/bash
++SHELL = @bash@
+ .SHELLFLAGS = -o pipefail -c
+ 
+ PYTHON ?= python3
+--- a/data/80-udisks2.rules
++++ b/data/80-udisks2.rules
+@@ -17,9 +17,9 @@
+ #
+ # TODO: file bug against mdadm(8) to have --export-prefix option that can be used with e.g. UDISKS_MD_MEMBER
+ #
+-SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="raid", ENV{ID_FS_TYPE}=="linux_raid_member", ENV{UDISKS_MD_MEMBER_LEVEL}=="", IMPORT{program}="/bin/sh -c '/sbin/mdadm --examine --export $tempnode | /bin/sed s/^MD_/UDISKS_MD_MEMBER_/g'"
++SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="raid", ENV{ID_FS_TYPE}=="linux_raid_member", ENV{UDISKS_MD_MEMBER_LEVEL}=="", IMPORT{program}="@sh@ -c '@mdadm@ --examine --export $tempnode | @sed@ s/^MD_/UDISKS_MD_MEMBER_/g'"
+ 
+-SUBSYSTEM=="block", KERNEL=="md*", ENV{DEVTYPE}!="partition", IMPORT{program}="/bin/sh -c '/sbin/mdadm --detail --export $tempnode | /bin/sed s/^MD_/UDISKS_MD_/g'"
++SUBSYSTEM=="block", KERNEL=="md*", ENV{DEVTYPE}!="partition", IMPORT{program}="@sh@ -c '@mdadm@ --detail --export $tempnode | @sed@ s/^MD_/UDISKS_MD_/g'"
+ 
+ LABEL="udisks_probe_end"
+ 
+--- a/modules/zram/udiskslinuxmanagerzram.c
++++ b/modules/zram/udiskslinuxmanagerzram.c
+@@ -250,7 +250,7 @@
+ 
+       g_snprintf (tmp, 255, "zram%" G_GUINT64_FORMAT, i);
+       filename = g_build_filename (PACKAGE_ZRAMCONF_DIR, tmp, NULL);
+-      contents = g_strdup_printf ("#!/bin/bash\n\n"
++      contents = g_strdup_printf ("#!@bash@\n\n"
+                                   "ZRAM_NUM_STR=%" G_GUINT64_FORMAT "\n"
+                                   "ZRAM_DEV_SIZE=%" G_GUINT64_FORMAT "\n"
+                                   "SWAP=n\n",
+--- a/src/tests/install-udisks/runtest.sh
++++ b/src/tests/install-udisks/runtest.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!@bash@
+ # vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ #
+--- a/src/tests/integration-test
++++ b/src/tests/integration-test
+@@ -414,7 +414,7 @@
+                 f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", '
+                         'ATTRS{model}=="scsi_debug*", '
+                         'ENV{ID_CDROM_MEDIA}=="?*", '
+-                        'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n')
++                        'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n')
+             # reload udev
+             subprocess.call('sync; pkill --signal HUP udevd || '
+                             'pkill --signal HUP systemd-udevd',
+@@ -1079,7 +1079,7 @@
+         self.assertFalse(os.access(f, os.X_OK))
+ 
+         f = os.path.join(mount_point, 'simple.exe')
+-        shutil.copy('/bin/bash', f)
++        shutil.copy('@bash@', f)
+         self.assertTrue(os.access(f, os.R_OK))
+         self.assertTrue(os.access(f, os.W_OK))
+         self.assertTrue(os.access(f, os.X_OK))
+@@ -1092,7 +1092,7 @@
+         self.assertFalse(os.access(f, os.X_OK))
+ 
+         f = os.path.join(mount_point, 'subdir', 'subdir.exe')
+-        shutil.copy('/bin/bash', f)
++        shutil.copy('@bash@', f)
+         self.assertTrue(os.access(f, os.R_OK))
+         self.assertTrue(os.access(f, os.W_OK))
+         self.assertTrue(os.access(f, os.X_OK))
+--- a/src/tests/storadectl/runtest.sh
++++ b/src/tests/storadectl/runtest.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!@bash@
+ # vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ #
+--- a/src/tests/test.c
++++ b/src/tests/test.c
+@@ -71,7 +71,7 @@
+ {
+   UDisksSpawnedJob *job;
+ 
+-  job = udisks_spawned_job_new ("/bin/true", NULL, getuid (), geteuid (), NULL, NULL);
++  job = udisks_spawned_job_new ("@true@", NULL, getuid (), geteuid (), NULL, NULL);
+   udisks_spawned_job_start (job);
+   _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_success), NULL);
+   g_object_unref (job);
+@@ -84,10 +84,10 @@
+ {
+   UDisksSpawnedJob *job;
+ 
+-  job = udisks_spawned_job_new ("/bin/false", NULL, getuid (), geteuid (), NULL, NULL);
++  job = udisks_spawned_job_new ("@false@", NULL, getuid (), geteuid (), NULL, NULL);
+   udisks_spawned_job_start (job);
+   _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
+-                             (gpointer) "Command-line `/bin/false' exited with non-zero exit status 1: ");
++                             (gpointer) "Command-line `@false@' exited with non-zero exit status 1: ");
+   g_object_unref (job);
+ }
+ 
+@@ -119,7 +119,7 @@
+ 
+   cancellable = g_cancellable_new ();
+   g_cancellable_cancel (cancellable);
+-  job = udisks_spawned_job_new ("/bin/true", NULL, getuid (), geteuid (), NULL, cancellable);
++  job = udisks_spawned_job_new ("@true@", NULL, getuid (), geteuid (), NULL, cancellable);
+   udisks_spawned_job_start (job);
+   _g_assert_signal_received (job, "completed", G_CALLBACK (on_completed_expect_failure),
+                              (gpointer) "Operation was cancelled (g-io-error-quark, 19)");
+@@ -145,7 +145,7 @@
+   GCancellable *cancellable;
+ 
+   cancellable = g_cancellable_new ();
+-  job = udisks_spawned_job_new ("/bin/sleep 0.5", NULL, getuid (), geteuid (), NULL, cancellable);
++  job = udisks_spawned_job_new ("@sleep@ 0.5", NULL, getuid (), geteuid (), NULL, cancellable);
+   udisks_spawned_job_start (job);
+   g_timeout_add (10, on_timeout, cancellable); /* 10 msec */
+   g_main_loop_run (loop);
+@@ -199,7 +199,7 @@
+ {
+   UDisksSpawnedJob *job;
+ 
+-  job = udisks_spawned_job_new ("/bin/sleep 1000", NULL, getuid (), geteuid (), NULL, NULL /* GCancellable */);
++  job = udisks_spawned_job_new ("@sleep@ 1000", NULL, getuid (), geteuid (), NULL, NULL /* GCancellable */);
+   udisks_spawned_job_start (job);
+   g_object_unref (job);
+ }
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index 2ca825a27d71e..3df0023bd678f 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -12,14 +12,14 @@ with stdenv.lib;
 assert libgcrypt != null -> libsodium == null;
 
 stdenv.mkDerivation rec {
-  version = "0.7.2";
+  version = "0.7.4";
   name = "usbguard-${version}";
 
   repo = "https://github.com/USBGuard/usbguard";
 
   src = fetchurl {
     url = "${repo}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6";
+    sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 9bdb16cd1f16f..fee9b0c09d56b 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.14.2";
 
   src = fetchurl {
-    url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
+    url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
     sha256 = "14h6d2p3n4jmxhd8i0p1m5dbwz5vnpb3z88xqd9ghg15n7265fg6";
   };
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index acb159a4acc98..42982d49ce873 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -24,11 +24,8 @@ stdenv.mkDerivation rec {
   buildPhase = "make module";
 
   meta = with stdenv.lib; {
-    homepage     = https://www.wireguard.com/;
-    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = "Kernel module for the WireGuard secure network tunnel";
-    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
+    inherit (wireguard-tools.meta) homepage license maintainers;
+    description = "Kernel module for the WireGuard secure network tunnel";
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index b28a5c6416d0c..6eac54ddf6510 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -6,6 +6,7 @@
 , zlib, libuuid, python, attr, openssl
 , libtirpc
 , nfs-utils
+, gawk, gnugrep, gnused, systemd
 
 # Kernel dependencies
 , kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null
@@ -60,7 +61,7 @@ let
       # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
       NIX_CFLAGS_LINK = "-lgcc_s";
 
-      hardeningDisable = [ "pic" ];
+      hardeningDisable = [ "fortify" "stackprotector" "pic" ];
 
       preConfigure = ''
         substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
@@ -76,12 +77,15 @@ let
         substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
         substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
         substituteInPlace ./etc/systemd/system/zfs-share.service.in \
-          --replace "@bindir@/rm " "${coreutils}/bin/rm "
+          --replace "/bin/rm " "${coreutils}/bin/rm "
 
         for f in ./udev/rules.d/*
         do
           substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
         done
+        substituteInPlace ./cmd/vdev_id/vdev_id \
+          --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
+          "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"
 
         ./autogen.sh
         configureFlagsArray+=("--libexecdir=$out/libexec")
@@ -153,7 +157,7 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "4.16";
+    incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
     version = "0.7.9";
@@ -172,7 +176,7 @@ in {
 
   zfsUnstable = common rec {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "4.16";
+    incompatibleKernelVersion = null;
 
     # this package should point to a version / git revision compatible with the latest kernel release
     version = "2018-05-22";
@@ -195,7 +199,7 @@ in {
   # also remove boot.zfs.enableLegacyCrypto
   zfsLegacyCrypto = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "4.16";
+    incompatibleKernelVersion = null;
 
     # this package should point to a version / git revision compatible with the latest kernel release
     version = "2018-02-01";
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index fd9c48f3469ee..31cff39cb3e69 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper, bash,
+{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused,
   majorVersion ? "1.0" }:
 
 let
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  buildInputs = [ jre makeWrapper bash ];
+  buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ];
 
   installPhase = ''
     mkdir -p $out
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
       wrapProgram $p \
         --set JAVA_HOME "${jre}" \
         --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \
-        --prefix PATH : "${bash}/bin"
+        --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin"
     done
     chmod +x $out/bin\/*
   '';
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 10ffa918e5bd3..b1d60d8c14567 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -2,7 +2,7 @@
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, newt,
   lua, speex,
-  srtp, wget, curl
+  srtp, wget, curl, iksemel
 }:
 
 let
@@ -10,7 +10,7 @@ let
     inherit version;
     name = "asterisk-${version}";
 
-    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl ];
+    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ];
 
     patches = [
       # We want the Makefile to install the default /var skeleton
@@ -26,7 +26,7 @@ let
     '';
 
     src = fetchurl {
-      url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
+      url = "https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index f4a6b47a45a4b..58a178a8b2eab 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,34 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools
-, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC
-, zookeeper_mt, zstd }:
+{ stdenv, fetchFromGitHub, cmake, libtool, boost, cctz, double-conversion, gperftools
+, icu, lz4, mysql, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zstd
+}:
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
 
-  version = "1.1.54310";
+  version = "1.1.54385";
 
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "ClickHouse";
     rev = "v${version}-stable";
-    sha256 = "167pihqak8ip7bmlyrbzl9x3mpn381j8v7pl7nhrl9bfnzgrq69v";
+    sha256 = "0s290xnx9dil2lbxdir5p5zmakvq5h523gdwax2cb37606wg8yj7";
   };
 
-  patches = [ ./termcap.patch ];
+  patches = [ ./find-mysql.patch ./termcap.patch ];
 
   nativeBuildInputs = [ cmake libtool ];
 
   buildInputs = [
-    boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco
-    re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd
+    boost cctz double-conversion gperftools icu lz4 mysql.connector-c openssl poco
+    re2 rdkafka readline sparsehash unixODBC zstd
   ];
 
   cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];
 
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-function" ];
-
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = https://clickhouse.yandex/;
     description = "Column-oriented database management system";
diff --git a/pkgs/servers/clickhouse/find-mysql.patch b/pkgs/servers/clickhouse/find-mysql.patch
new file mode 100644
index 0000000000000..3a5ec5181d1a8
--- /dev/null
+++ b/pkgs/servers/clickhouse/find-mysql.patch
@@ -0,0 +1,11 @@
+--- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake
++++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
+@@ -24,7 +24,7 @@ if (ENABLE_MYSQL)
+     if (USE_STATIC_LIBRARIES)
+         find_library (STATIC_MYSQLCLIENT_LIB mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})
+     else ()
+-        find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})
++        find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATH_SUFFIXES mysql PATHS ${MYSQL_LIB_PATHS})
+     endif ()
+ 
+     if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIBRARIES))
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 7a03bf75802be..64e4005f53f3a 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, curl
+{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
 , python, munge, perl, pam, openssl
 , ncurses, mysql, gtk2, lua, hwloc, numactl
 , readline, freeipmi, libssh2, xorg
@@ -8,11 +8,16 @@
 
 stdenv.mkDerivation rec {
   name = "slurm-${version}";
-  version = "17.11.5";
+  version = "17.11.7";
 
-  src = fetchurl {
-    url = "https://download.schedmd.com/slurm/${name}.tar.bz2";
-    sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r";
+  # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
+  # because the latter does not keep older releases.
+  src = fetchFromGitHub {
+    owner = "SchedMD";
+    repo = "slurm";
+    # The release tags use - instead of ., and have an extra -1 suffix.
+    rev = "${builtins.replaceStrings ["."] ["-"] name}-1";
+    sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 6868c0f81664c..bf9fd77df7c99 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   patchPhase = "patch -p0 < ${./buildfix.diff}";
   configureFlags = [
     "--enable-dictorg"
-    "--datadir=/run/current-system/share/dictd"
+    "--datadir=/run/current-systems/sw/share/dictd"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 2b1830ea67971..ff99f7a7cbf61 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
+{ stdenv, lib, fetchurl
+, perl
+, libcap, libtool, libxml2, openssl
 , enablePython ? false, python3 ? null
 , enableSeccomp ? false, libseccomp ? null, buildPackages
 }:
@@ -12,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
-    url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
     sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
   };
 
@@ -22,7 +24,8 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
 
   nativeBuildInputs = [ perl ];
-  buildInputs = [ openssl libtool libxml2 ]
+  buildInputs = [ libtool libxml2 openssl ]
+    ++ lib.optional stdenv.isLinux libcap
     ++ lib.optional enableSeccomp libseccomp
     ++ lib.optional enablePython python3;
 
@@ -43,6 +46,7 @@ stdenv.mkDerivation rec {
     "--without-idn"
     "--without-idnlib"
     "--without-lmdb"
+    "--without-libjson"
     "--without-pkcs11"
     "--without-purify"
     "--with-randomdev=/dev/random"
@@ -50,7 +54,8 @@ stdenv.mkDerivation rec {
     "--with-gost"
     "--without-eddsa"
     "--with-aes"
-  ] ++ lib.optional enableSeccomp "--enable-seccomp";
+  ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}"
+    ++ lib.optional enableSeccomp "--enable-seccomp";
 
   postInstall = ''
     moveToOutput bin/bind9-config $dev
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 6dcb8fbbd7723..bc01d9946c71a 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "miekg";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "11wvy3xp9in5ny6h7hp24dq6asc013vrwc6bqiky83dlzasjwkf6";
+    sha256 = "15q8l4apspaw1xbbb9j1d8s2cc5zrgycan6iq597ga9m0vyf7wiw";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index 772292b0a57e2..6757542050af2 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -2,11 +2,11 @@
 , boost, libsodium, libedit, re2
 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec {
   name = "dnsdist-${version}";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
-    sha256 = "025sgvpi3ps0n4mzfwkk6a5ang90a3c7s2fi9vni6jj0p16wsrxa";
+    sha256 = "1i3b1vpk9a8zbx9aby2s1ckkzhlvzgn11hcgj3b8x2j1b9771rqb";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 5fe7a8608c59a..ef99772a082dd 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.6.7";
+  version = "2.6.8";
 
   src = fetchurl {
-    url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243";
+    url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
+    sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15";
   };
 
   outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1a5577e816559..bfa610b57d8ab 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchurl {
-    url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b";
+    url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
+    sha256 = "8c88c73dd50dad6f371bfc170f49cd374022e59f8005ac1fa6cd99764f72b4d1";
   };
 
   outputs = [ "out" "dev" ];
@@ -62,7 +62,11 @@ unwrapped = stdenv.mkDerivation rec {
 };
 
 wrapped-full = with luajitPackages; let
-    luaPkgs =  [ luasec luasocket ]; # TODO: cqueues and others for http2 module
+    luaPkgs =  [
+      luasec luasocket # trust anchor bootstrap, prefill module
+      lfs # prefill module
+      # TODO: cqueues and others for http2 module
+    ];
   in runCommand unwrapped.name
   {
     nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index c1c0d4e425c21..2c82b0bf33a8c 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.21";
+  name = "nsd-4.1.22";
 
   src = fetchurl {
-    url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "1gfjdgb5nc0nrbpdm36ngxml302khl2lnwkykl3q45byl0sbjn3q";
+    url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
+    sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi";
   };
 
   prePatch = ''
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 20c9eecb0d5f9..6f8bffee24d01 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "4.1.3";
 
   src = fetchurl {
-    url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
+    url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
     sha256 = "1bh1qdgw415ax542123b6isri1jh4mbf2i9i1yffkfk0xmyv79cs";
   };
 
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     # cannot find postgresql libs on macos x
     license = licenses.gpl2;
-    maintainers = [ maintainers.mic92 ];
+    maintainers = with maintainers; [ mic92 disassembler ];
   };
 }
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 5ebb510be467b..ecefc1d8fabdc 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -1,17 +1,42 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv49
+, lib, fetchurl, fetchFromGitHub
+
 , which, findutils, m4, gawk
-, python, openjdk, mono58, libressl_2_6
-, boost16x
+, python, openjdk, mono58, libressl
 }:
 
 let
+  # hysterical raisins dictate a version of boost this old. however,
+  # we luckily do not need to build anything, we just need the header
+  # files.
+  boost152 = stdenv49.mkDerivation rec {
+    name = "boost-headers-1.52.0";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
+      sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
+    };
+
+    configurePhase = ":";
+    buildPhase = ":";
+    installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
+  };
+
   makeFdb =
     { version
     , branch
-    , rev, sha256
+    , sha256
+
+    # the revision can be inferred from the fdb tagging policy
+    , rev    ? "refs/tags/${version}"
 
-    # fdb 6.0+ support boost 1.6x+, so default to it
-    , boost ? boost16x
+    # in theory newer versions of fdb support newer compilers, but they
+    # don't :( maybe one day
+    , stdenv ? stdenv49
+
+    # in theory newer versions of fdb support newer boost versions, but they
+    # don't :( maybe one day
+    , boost ? boost152
     }: stdenv.mkDerivation rec {
         name = "foundationdb-${version}";
         inherit version;
@@ -23,14 +48,20 @@ let
         };
 
         nativeBuildInputs = [ gawk which m4 findutils mono58 ];
-        buildInputs = [ python openjdk libressl_2_6 boost ];
+        buildInputs = [ python openjdk libressl boost ];
 
         patches =
-          [ ./fix-scm-version.patch
-            ./ldflags.patch
-          ];
+          [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags
+            (if lib.versionAtLeast version "5.2"
+             then ./ldflags.patch
+             else ./ldflags-5.1.patch)
+          ] ++
+          # for 6.0+, we do NOT need to apply this version fix, since we can specify
+          # it ourselves. see configurePhase
+          (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch);
 
         postPatch = ''
+          # note: this does not do anything for 6.0+
           substituteInPlace ./build/scver.mk \
             --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \
             --subst-var-by NIXOS_FDB_SCBRANCH   "${branch}"
@@ -51,7 +82,13 @@ let
         enableParallelBuilding = true;
         makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
 
-        configurePhase = ":";
+        # on 6.0 and later, we can specify all this information manually
+        configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
+          export SOURCE_CONTROL=GIT
+          export SCBRANCH="${branch}"
+          export VERSION_ID="${rev}"
+        '';
+
         installPhase = ''
           mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
@@ -85,45 +122,24 @@ let
        };
     };
 
-  # hysterical raisins dictate a version of boost this old. however,
-  # we luckily do not need to build anything, we just need the header
-  # files.
-  boost152 = stdenv.mkDerivation rec {
-    name = "boost-headers-1.52.0";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
-      sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
-    };
-
-    configurePhase = ":";
-    buildPhase = ":";
-    installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
-  };
-
 in with builtins; {
 
-  foundationdb51 = makeFdb {
+  foundationdb51 = makeFdb rec {
     version = "5.1.7";
     branch  = "release-5.1";
-    rev     = "9ad8d02386d4a6a5efecf898df80f2747695c627";
     sha256  = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
-    boost   = boost152;
   };
 
   foundationdb52 = makeFdb rec {
-    version = "5.2.0pre1488_${substring 0 8 rev}";
-    branch  = "master";
-    rev     = "18f345487ed8d90a5c170d813349fa625cf05b4e";
-    sha256  = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc";
-    boost   = boost152;
+    version = "5.2.5";
+    branch  = "release-5.2";
+    sha256  = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7";
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.0pre1636_${substring 0 8 rev}";
+    version = "6.0.0pre2227_${substring 0 8 rev}";
     branch  = "master";
-    rev     = "1265a7b6d5e632dd562b3012e70f0727979806bd";
-    sha256  = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf";
+    rev     = "8caa6eaecf1eeec0298fc77db334761b0c1d1523";
+    sha256  = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll";
   };
-
 }
diff --git a/pkgs/servers/foundationdb/ldflags-5.1.patch b/pkgs/servers/foundationdb/ldflags-5.1.patch
new file mode 100644
index 0000000000000..4d523a7ecdd3d
--- /dev/null
+++ b/pkgs/servers/foundationdb/ldflags-5.1.patch
@@ -0,0 +1,90 @@
+diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
+index 0b6eac8..b1891ca 100644
+--- a/FDBLibTLS/local.mk
++++ b/FDBLibTLS/local.mk
+@@ -1,6 +1,5 @@
+ FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)
+-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
+-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
++FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
+ FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map
+ 
+ # The plugin isn't a typical library, so it feels more sensible to have a copy
+diff --git a/bindings/c/local.mk b/bindings/c/local.mk
+index 44f0c31..7aea5a4 100644
+--- a/bindings/c/local.mk
++++ b/bindings/c/local.mk
+@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
+ CLEAN_TARGETS += fdb_c_tests_clean
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
+-  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
++  fdb_c_LIBS += lib/libstdc++.a
++  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
+   fdb_c_tests_LIBS += -lpthread
+ endif
+ 
+diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
+index 2ef4fcb..6e59625 100644
+--- a/bindings/flow/tester/local.mk
++++ b/bindings/flow/tester/local.mk
+@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
+ 	@rm -rf bindings/flow/bin
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_flow_tester_LIBS += -ldl -lpthread -lrt
+-  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ else ifeq ($(PLATFORM),osx)
+   fdb_flow_tester_LDFLAGS += -lc++
+ endif
+diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
+index 033fe7d..865fc92 100644
+--- a/fdbbackup/local.mk
++++ b/fdbbackup/local.mk
+@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
+ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbbackup_LIBS += -ldl -lpthread -lrt
+-  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
+diff --git a/fdbcli/local.mk b/fdbcli/local.mk
+index 81a4a42..892c079 100644
+--- a/fdbcli/local.mk
++++ b/fdbcli/local.mk
+@@ -22,14 +22,13 @@
+ 
+ fdbcli_CFLAGS := $(fdbclient_CFLAGS)
+ fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
+-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl
++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
+ fdbcli_STATIC_LIBS :=
+ 
+ fdbcli_GENERATED_SOURCES += versions.h
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
+-  fdbcli_LIBS += -lpthread -lrt
++  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
+ else ifeq ($(PLATFORM),osx)
+   fdbcli_LDFLAGS += -lc++
+ endif
+diff --git a/fdbserver/local.mk b/fdbserver/local.mk
+index 78cad1b..36f2c0f 100644
+--- a/fdbserver/local.mk
++++ b/fdbserver/local.mk
+@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
+ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbserver_LIBS += -ldl -lpthread -lrt
+-  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags.patch
index 4d523a7ecdd3d..ee5911e495f8b 100644
--- a/pkgs/servers/foundationdb/ldflags.patch
+++ b/pkgs/servers/foundationdb/ldflags.patch
@@ -1,9 +1,9 @@
 diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
-index 0b6eac8..b1891ca 100644
+index 5e6b9cfb..73f4e5f3 100644
 --- a/FDBLibTLS/local.mk
 +++ b/FDBLibTLS/local.mk
 @@ -1,6 +1,5 @@
- FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)
+ FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc
 -FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
 -FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
 +FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
@@ -11,7 +11,7 @@ index 0b6eac8..b1891ca 100644
  
  # The plugin isn't a typical library, so it feels more sensible to have a copy
 diff --git a/bindings/c/local.mk b/bindings/c/local.mk
-index 44f0c31..7aea5a4 100644
+index 44f0c31b..7aea5a4f 100644
 --- a/bindings/c/local.mk
 +++ b/bindings/c/local.mk
 @@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
@@ -26,7 +26,7 @@ index 44f0c31..7aea5a4 100644
  endif
  
 diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
-index 2ef4fcb..6e59625 100644
+index 2ef4fcb7..6e59625c 100644
 --- a/bindings/flow/tester/local.mk
 +++ b/bindings/flow/tester/local.mk
 @@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
@@ -40,7 +40,7 @@ index 2ef4fcb..6e59625 100644
    fdb_flow_tester_LDFLAGS += -lc++
  endif
 diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
-index 033fe7d..865fc92 100644
+index 033fe7d4..865fc923 100644
 --- a/fdbbackup/local.mk
 +++ b/fdbbackup/local.mk
 @@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
@@ -54,7 +54,7 @@ index 033fe7d..865fc92 100644
    # GPerfTools profiler (uncomment to use)
    # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
 diff --git a/fdbcli/local.mk b/fdbcli/local.mk
-index 81a4a42..892c079 100644
+index 81a4a42e..892c079c 100644
 --- a/fdbcli/local.mk
 +++ b/fdbcli/local.mk
 @@ -22,14 +22,13 @@
@@ -75,7 +75,7 @@ index 81a4a42..892c079 100644
    fdbcli_LDFLAGS += -lc++
  endif
 diff --git a/fdbserver/local.mk b/fdbserver/local.mk
-index 78cad1b..36f2c0f 100644
+index 78cad1bf..36f2c0f7 100644
 --- a/fdbserver/local.mk
 +++ b/fdbserver/local.mk
 @@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
diff --git a/pkgs/servers/gpsd/0002-scons-envs-patch.patch b/pkgs/servers/gpsd/0002-scons-envs-patch.patch
new file mode 100644
index 0000000000000..fbb06db6aa393
--- /dev/null
+++ b/pkgs/servers/gpsd/0002-scons-envs-patch.patch
@@ -0,0 +1,11 @@
+--- b/SConstruct	2018-07-03 23:13:51.986746857 +0200
++++ a/SConstruct	2018-07-03 23:14:50.495252914 +0200
+@@ -221,7 +221,7 @@
+     'STAGING_PREFIX',  # Required by the OpenWRT and CeroWrt builds.
+     'WRITE_PAD',       # So we can test WRITE_PAD values on the fly.
+     )
+-envs = {}
++envs = os.environ
+ for var in import_env:
+     if var in os.environ:
+         envs[var] = os.environ[var]
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index b01e94187898b..6e270192063bd 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -2,6 +2,7 @@
 , ncurses, libX11, libXt, libXpm, libXaw, libXext
 , libusb1, docbook_xml_dtd_412, docbook_xsl, bc
 , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
+, pps-tools
 , python2Packages
 }:
 
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "gpsd-3.16";
 
   src = fetchurl {
-    url = "http://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz";
+    url = "https://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz";
     sha256 = "0a90ph4qrlz5kkcz2mwkfk3cmwy9fmglp94znz2y0gsd7bqrlmq3";
   };
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext
-    libxslt libusb1
+    libxslt libusb1 pps-tools
   ];
 
   pythonPath = [
@@ -37,6 +38,8 @@ stdenv.mkDerivation rec {
 
     # TODO: remove the patch with the next release
     ./0001-Use-pkgconfig-for-dbus-library.patch
+    # to be able to find pps-tools
+    ./0002-scons-envs-patch.patch
   ];
 
   # - leapfetch=no disables going online at build time to fetch leap-seconds
@@ -44,9 +47,15 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs .
     sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct
-    scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \
-        systemd=yes udevdir="$out/lib/udev" \
-        python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages"
+    scons \
+      -j $NIX_BUILD_CORES \
+      prefix="$out" \
+      leapfetch=no \
+      gpsd_user=${gpsdUser} \
+      gpsd_group=${gpsdGroup} \
+      systemd=yes \
+      udevdir="$out/lib/udev" \
+      python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages"
   '';
 
   checkPhase = ''
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index a5dbf74947e2e..fc9d4c0508edb 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.4.193";
 
   src = fetchzip {
-    url = "http://www.h2database.com/h2-2016-10-31.zip";
+    url = "https://www.h2database.com/h2-2016-10-31.zip";
     sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9";
   };
 
diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix
new file mode 100644
index 0000000000000..95ec267dba24d
--- /dev/null
+++ b/pkgs/servers/holochain-go/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "holochain-go${version}";
+  version = "0.1.0-alpha";
+  rev = "a17510b910a7a377441c152b8dccdbae1999f63f";
+
+  goPackagePath = "github.com/holochain/holochain-proto";
+
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "holochain";
+    repo = "holochain-proto";
+    sha256 = "19l29jnr63ximmyn4i4llv2mdwh306c2mpzmx2anj9z12wjpach0";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "core implementation of validating DHT dApps in go";
+    longDescription = "Holographic storage for distributed applications -- a validating monotonic DHT backed by authoritative hashchains for data provenance";
+    homepage = "https://holochain.org/";
+    downloadPage = "https://developer.holochain.org/";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ gavin ];
+
+  };
+}
diff --git a/pkgs/servers/holochain-go/deps.nix b/pkgs/servers/holochain-go/deps.nix
new file mode 100644
index 0000000000000..bad01c01a6bd9
--- /dev/null
+++ b/pkgs/servers/holochain-go/deps.nix
@@ -0,0 +1,1056 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+    };
+  }
+  {
+    goPackagePath = "github.com/agl/ed25519";
+    fetch = {
+      type = "git";
+      url = "https://github.com/agl/ed25519";
+      rev = "5312a61534124124185d41f09206b9fef1d88403";
+      sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
+    };
+  }
+  {
+    goPackagePath = "github.com/btcsuite/btcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/btcsuite/btcd";
+      rev = "675abc5df3c5531bc741b56a765e35623459da6d";
+      sha256 = "1sg7dmns8smsfcjpn9dnqapzf4b6r1vrp62j753izmbmc55rjm0f";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "e214231b295a8ea9479f11b70b35d5acf3556d9b";
+      sha256 = "0770h1mpig2j5sbiha3abnwaw8p6dg9i87r8pc7cf6m4kwml3sc9";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/spdystream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/spdystream";
+      rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db";
+      sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "507f6050b8568533fb3f5504de8e5205fa62a114";
+      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
+    };
+  }
+  {
+    goPackagePath = "github.com/fd/go-nat";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fd/go-nat";
+      rev = "dcaf50131e4810440bed2cbb6f7f32c4f4cc95dd";
+      sha256 = "094aqkjv9qfmy1k8xrg7cl4njbvamm51fdilay9c75wcax9p41jv";
+    };
+  }
+  {
+    goPackagePath = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6";
+      sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/blake2b";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/blake2b";
+      rev = "3c8c640cd7bea3ca78209d812b5854442ab92fed";
+      sha256 = "1hw0y15yf4fhjkfgh8jnk257chhmpzyppgnnck9aijhkvk41rply";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/goconvey";
+      rev = "83515ca83cca5aef8af8eab6eb7368f8e7500976";
+      sha256 = "1n9drlng7pbyqfxyfa14vik8vd3vj4m2b7v73410fxll36djj4s8";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/greenpack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/greenpack";
+      rev = "3f7f38f101dc36e64a4176ded8443684516d76c2";
+      sha256 = "0w468v8zpsmgml1bgr51rzfvcymlfpdzy091wid67i1z25gwyik0";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/liner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/liner";
+      rev = "72909af234e0e355af10d0ace679446a6c5d7ec3";
+      sha256 = "118dig6vg1pz5jq2w1kyq0102rvgq676z8zsdyi13ynw8phlpcnc";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/zebrapack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/zebrapack";
+      rev = "7858d9b3e1a2ca613b770bb4cdce84ad04cefbbb";
+      sha256 = "0wgk719q428q415628hw2glj9divw172iqnrn02hkgiwfnv005rp";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/tmframe";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/tmframe";
+      rev = "092b9413cc9ce8cb9fffadbfbf9038bb0bad5418";
+      sha256 = "19h9hq53g8wf12h15w07qlz7035x3k2z3zs6bj1dzm68xca26lcn";
+    };
+  }
+  {
+    goPackagePath = "github.com/glycerine/zygomys";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/zygomys";
+      rev = "22c88044c7c2a3f845b8bbd1df6d990e8ee4f29c";
+      sha256 = "1psbx4p022c19bq58bf9fs0mlm7mqavpbggsdkw7wqga0yn1vp18";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "1ef32a8b9fc3f8ec940126907cedb5998f6318e4";
+      sha256 = "0zk2n0n35ksskr5cd83k5k8wg21ckrcggjy88bym2s21ngj5w4fh";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e";
+      sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+    };
+  }
+  {
+    goPackagePath = "github.com/gxed/hashland";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gxed/hashland";
+      rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8";
+      sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386";
+    };
+  }
+  {
+    goPackagePath = "github.com/gxed/eventfd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gxed/eventfd";
+      rev = "80a92cca79a8041496ccc9dd773fcb52a57ec6f9";
+      sha256 = "1p15rsimkcp2flj6wb41flac72zhf97zd8jxrahsw05nyfbp58z5";
+    };
+  }
+  {
+    goPackagePath = "github.com/gxed/GoEndian";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gxed/GoEndian";
+      rev = "0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7";
+      sha256 = "0fn28h9gs1finrpfs388a3ycavlcf3qylsn803cflmrwaj5piqia";
+    };
+  }
+  {
+    goPackagePath = "github.com/huin/goupnp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/huin/goupnp";
+      rev = "1395d1447324cbea88d249fbfcfd70ea878fdfca";
+      sha256 = "03fp94757vzclkv5khmydhvcm2gjhxgd0mi8q7wqksy9l93ixgl4";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-ipfs-util";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-ipfs-util";
+      rev = "9ed527918c2f20abdf0adfab0553cd87db34f656";
+      sha256 = "03lq5378p31c6ghfa20vwa7b1vgd96ypc9dmwp1p62bddz6apci6";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-log";
+      rev = "0ef81702b797a2ecef05f45dcc82b15298f54355";
+      sha256 = "0q375wbh014hca8n6g3z2x875f5m9cads75chs0sqlhr5rfgncal";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-todocounter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-todocounter";
+      rev = "1e832b829506383050e6eebd12e05ea41a451532";
+      sha256 = "0cydbwivwp2k3x63rl6crhiw3svglc184saxyjrahvp7rv6cqdbq";
+    };
+  }
+  {
+    goPackagePath = "github.com/jackpal/gateway";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackpal/gateway";
+      rev = "cbcf4e3f3baee7952fc386c8b2534af4d267c875";
+      sha256 = "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1";
+    };
+  }
+  {
+    goPackagePath = "github.com/jackpal/go-nat-pmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackpal/go-nat-pmp";
+      rev = "28a68d0c24adce1da43f8df6a57340909ecd7fdd";
+      sha256 = "17l8vh4g1akhgm7hbw5n9k2hdphlsvm5vwdc8z3mzlxjmdww5z70";
+    };
+  }
+  {
+    goPackagePath = "github.com/jbenet/go-base58";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jbenet/go-base58";
+      rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d";
+      sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf";
+    };
+  }
+  {
+    goPackagePath = "github.com/jbenet/go-temp-err-catcher";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jbenet/go-temp-err-catcher";
+      rev = "aac704a3f4f27190b4ccc05f303a4931fd1241ff";
+      sha256 = "1fyqkcggnrzwxa8iii15g60w2jikdm26sr7l36km7y0nc2kvf7jc";
+    };
+  }
+  {
+    goPackagePath = "github.com/jbenet/goprocess";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jbenet/goprocess";
+      rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";
+      sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
+    };
+  }
+  {
+    goPackagePath = "github.com/jtolds/gls";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jtolds/gls";
+      rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064";
+      sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h";
+    };
+  }
+  {
+    goPackagePath = "github.com/lestrrat/go-jspointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lestrrat/go-jspointer";
+      rev = "d5f7c71bfd03c8e9489a636874cd106c22d3a47c";
+      sha256 = "10b94qdnvla9ax8b3djzwqz35gvqcvqrcafhqn0r4lay6y2i3241";
+    };
+  }
+  {
+    goPackagePath = "github.com/lestrrat/go-jsref";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lestrrat/go-jsref";
+      rev = "50df7b2d07d799426a9ac43fa24bdb4785f72a54";
+      sha256 = "16mz2mm1ggvdighglmf48qkir070gig64cf26vmiwfq3z5w47s7p";
+    };
+  }
+  {
+    goPackagePath = "github.com/lestrrat/go-jsschema";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lestrrat/go-jsschema";
+      rev = "a6a42341b50d8d7e2a733db922eefaa756321021";
+      sha256 = "0cyz9pzw53haabpxhxsqp1gb9z742gs6l6dp45skag6abdwgpi13";
+    };
+  }
+  {
+    goPackagePath = "github.com/lestrrat/go-jsval";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lestrrat/go-jsval";
+      rev = "cf70aae60f5b41a32922066c41287b0168e55904";
+      sha256 = "06ba6rh9f0nwqsam3bvmazcv6y8zma6njljbhjswjamylsfhclcs";
+    };
+  }
+  {
+    goPackagePath = "github.com/lestrrat/go-pdebug";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lestrrat/go-pdebug";
+      rev = "569c97477ae8837e053e5a50bc739e15172b8ebe";
+      sha256 = "0r56ppr6l6z3gcbxyyr3kiiw07a9gr3qxr26w8sbiq1np3zzpmzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/lestrrat/go-structinfo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lestrrat/go-structinfo";
+      rev = "8204d40bbcd79eb7603cd4c2c998e60eb2479ded";
+      sha256 = "0p52xp2x4zyv91k820pnarz8xidgil8191cwfr1rasp8z07a9d3j";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-addr-util";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-addr-util";
+      rev = "3bd34419494fb7f15182ddd19a5d92ac017a27c6";
+      sha256 = "11f0g9zd4barbdqplmflxbm3yp2plby5qbsk66zbad3xd28kllc0";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-flow-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-flow-metrics";
+      rev = "3b3bcfcf78f2dc0e85be13ef3c3adc64cc5a9347";
+      sha256 = "06kgn72bmvljigycgdbw2nywss3g3r0ysfcw4k48938akxydgc6d";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-circuit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-circuit";
+      rev = "772fa57b88017ff6bce887a8d1486b228cacf488";
+      sha256 = "03jl9b2g6z82pgkiqanvhlm3wyddp9x07b31h72r79g40lw6j7kz";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-conn";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-conn";
+      rev = "5c445d258745408186410e0ad5128224b00e47fe";
+      sha256 = "01a8hnkpxg73v48i2gbr3y8fs6881h5g965nak4bn05iy6jn1cr8";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-crypto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-crypto";
+      rev = "18915b5467c77ad8c07a35328c2cab468667a4e8";
+      sha256 = "00pgxh53g60ij18mb2l5g8id9c46sw4pfsaw3cprv5mqacc1dlfg";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-host";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-host";
+      rev = "acf01b322989cf731f66ce70b1ed7c41fe007798";
+      sha256 = "0gxqyw6azsp65yam6f667gdidwdfzlxri8xb7iwyqp58y9973i9c";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-interface-conn";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-interface-conn";
+      rev = "47718f905cc3ccd621b65fc106c521555c4040d3";
+      sha256 = "1ykd46mdqjy9yj2i4srx6m0f5jwaw2f5pm4pfdcrq4wh30r0xg3j";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-interface-connmgr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-interface-connmgr";
+      rev = "d00fbee4d35c7b5fdbd12499f673a236c6303865";
+      sha256 = "1ynmn8p0d145mbykr375lqzxl4h0gdcxdiz3bxfxnwxcl5x73pah";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-interface-pnet";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-interface-pnet";
+      rev = "c6acc383ec0b7b98112971df590d6702885ca821";
+      sha256 = "1micl8nvk29sac9zhvzxb0mgadp83kz725jbl4hs3a9a0ar9gxln";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-loggables";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-loggables";
+      rev = "3a7ad4dd32462b4d9c07a85021e0f5e1110debb2";
+      sha256 = "12h5lxxwnh5b8ch8q7fk6nky4fx5ajhf83bjxm0cdapv85y3cjz2";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-metrics";
+      rev = "2b4a2757a26649c9a603519647cc9d4478ade5c6";
+      sha256 = "1d2rfvkmaccajbljb7p1dwscf422la0qy1xl7h5d9ks4pk5pgcxr";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-nat";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-nat";
+      rev = "d090f00e553d1b6582e1ec829608a8a9bbf262e1";
+      sha256 = "1j6m3rs80zizgd6sy0rclfa95k7i9dxa6yfy6ca52lfqmwhh9ghk";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-net";
+      rev = "70a8d93f2d8c33b5c1a5f6cc4d2aea21663a264c";
+      sha256 = "04l67xnghr4bbgpdi5fw570zb6nl4k2nj0jpl6hmwbw0jhdd9hkn";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-peer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-peer";
+      rev = "aa0e03e559bde9d4749ad8e38595e15a6fe808fa";
+      sha256 = "1rmfsnwaij3klby30aqgvx85hk5swhp5dlxg1z255z6r4mmvvdwk";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-peerstore";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-peerstore";
+      rev = "7ac092e7f77f5bda1cb6e4ef95efbe911e97db41";
+      sha256 = "1kmj3dwnvkl08hb8j3zfispl2q582p5b5v76hk5yn46drs7da276";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-protocol";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-protocol";
+      rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b";
+      sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-secio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-secio";
+      rev = "146b7055645501f741c5644d4a3d207614f08899";
+      sha256 = "1df5f2r7wc34l6nycc1f4ni06cd2hhjncjyvzzw4vnmlqsncrx1w";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-swarm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-swarm";
+      rev = "48d6d0ff2d2a4724f6b47f1ed5ffc0ae63e30460";
+      sha256 = "1z595f71p1i89fhc5qc63mcgnfiy0p1gyda77p6jmzxyzgzwvlmz";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-transport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-transport";
+      rev = "49533464477a869fee537c8cc3fcee286aa8bdcd";
+      sha256 = "0dj0rzrykjmhnhpn8ac5696zvql8rq0amw87bj62qn4hpi7ri64h";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p";
+      rev = "3b8f2275a2b24de5777aaa4fc77f1af57c5c4387";
+      sha256 = "0jyk4zvhipknnwn1w3i11lsrzybh30p190xrkj7zgh5whz2rdqj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-maddr-filter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-maddr-filter";
+      rev = "3c9947befbb92277cc5f85057d387097debc4139";
+      sha256 = "022xmvv6djpycbcaw4hhxhbspl2g72yjla218j08xp8l0gp6w0hq";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-msgio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-msgio";
+      rev = "d82125c9907e1365775356505f14277d47dfd4d6";
+      sha256 = "0jawhcr6hm9apmdbl09s12mmqzwnphzn8k6wqwxfbmhs7gg2s1wq";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-peerstream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-peerstream";
+      rev = "2679b7430e519fc39f9cfbb0c7b7d016705b4ce1";
+      sha256 = "10rxbn21hp7c8x1hzc770hnh9zgcz13dn9mjd94fg2yxkf7fq6mn";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-reuseport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-reuseport";
+      rev = "15a1cd37f0502f3b2eccb6d71a7958edda314633";
+      sha256 = "1pcy6qpz804apsgxmh8irkj80viz5zrh2f3a0ipxkzq2nb6jx36k";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-sockaddr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-sockaddr";
+      rev = "f3e9f73a53d14d8257cb9da3d83dda07bbd8b2fe";
+      sha256 = "04saphhq5zbphzbd87lfpjkdf8k21x7q4hn8d03f8ykm19d51nlg";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-stream-muxer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-stream-muxer";
+      rev = "6ebe3f58af097068454b167a89442050b023b571";
+      sha256 = "1w1hypcg010npzlbabigrz65c4inj7w9js9ai4iw6z2d3s7ymc6v";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-tcp-transport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-tcp-transport";
+      rev = "2852032418949429c7d683502e7ea9bff2e951e7";
+      sha256 = "0j4cm890qbgj3ry757pcd21j4q2i3bkksc5z8y8hszyq8njc7ac5";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-ws-transport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-ws-transport";
+      rev = "2c20090616127904f706139653cd40ecac600227";
+      sha256 = "0yirawpv416fs9amzp0i6r2j0lmpw9bplqxiqixcvi7kkinb42hq";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
+      sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
+  {
+    goPackagePath = "github.com/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev = "01d59357d468872339068bcd5d55a00e2463051f";
+      sha256 = "0m595w0azrsvlfqqvrsrf0yd0myavn129rg1nsq1mnfy9c8768xa";
+    };
+  }
+  {
+    goPackagePath = "github.com/minio/blake2b-simd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/minio/blake2b-simd";
+      rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";
+      sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
+    };
+  }
+  {
+    goPackagePath = "github.com/minio/sha256-simd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/minio/sha256-simd";
+      rev = "ad98a36ba0da87206e3378c556abbfeaeaa98668";
+      sha256 = "0yfnqn3kqdnlfm54yvc4fr5vpdmwdi2kw571nlkbpmy8ldhsqqfi";
+    };
+  }
+  {
+    goPackagePath = "github.com/mr-tron/base58";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mr-tron/base58";
+      rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6";
+      sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr";
+      rev = "123a717755e0559ec8fda308019cd24e0a37bb07";
+      sha256 = "0lx2m83y0ffqn7ygqppa1ri1ykdrbvl1qzb4x2w8k97chxfjx4ip";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr-dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr-dns";
+      rev = "c3d4fcd3cbaf54a24b0b68f1461986ede1d59859";
+      sha256 = "13a8xbr5zb49aq570b51a5japb3rnsnwjncgqsd91bnqr8v68vdb";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr-net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr-net";
+      rev = "97d80565f68c5df715e6ba59c2f6a03d1fc33aaf";
+      sha256 = "0gsncnwn8b9i2hyh0kgiw51sz96wswww5m032dr87jld2zl7kdrb";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multihash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multihash";
+      rev = "265e72146e710ff649c6982e3699d01d4e9a18bb";
+      sha256 = "1yzjqwwwwd1yb22g2vf12y5w4gbgsa4g9arf66xk5m2r7r79h8hq";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multistream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multistream";
+      rev = "612ce31c03aebe1d5adbd3c850ee89e05a82b16d";
+      sha256 = "0yg7pkg8nvgz8ywcg55kqm1jk264qbdyilkjsnn32siyh5xwmcd1";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nats";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/go-nats";
+      rev = "247b2a84d8d0ff15cbc6faafc77ef15ea4317011";
+      sha256 = "0ig494i7j94wr0f8mpaai9hy5knbvqlhqj280m969m219h8di2qy";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/go-nats";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/go-nats";
+      rev = "247b2a84d8d0ff15cbc6faafc77ef15ea4317011";
+      sha256 = "0ig494i7j94wr0f8mpaai9hy5knbvqlhqj280m969m219h8di2qy";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nuid";
+      rev = "3e58d42c9cfe5cd9429f1a21ad8f35cd859ba829";
+      sha256 = "05xzdfcji3jv63c5sysmfypzg6xc2mm92gdcck7qvk10n60dndp4";
+    };
+  }
+  {
+    goPackagePath = "github.com/op/go-logging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/op/go-logging";
+      rev = "970db520ece77730c7e4724c61121037378659d9";
+      sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
+    };
+  }
+  {
+    goPackagePath = "github.com/opentracing/opentracing-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev = "6c572c00d1830223701e155de97408483dfcd14a";
+      sha256 = "1qw5s858zd2gsg1962jg3jpz38awpldv3vajlsj78qvzi0v0pmq4";
+    };
+  }
+  {
+    goPackagePath = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
+      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+    };
+  }
+  {
+    goPackagePath = "github.com/robertkrimen/otto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/robertkrimen/otto";
+      rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011";
+      sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e";
+      sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
+    };
+  }
+  {
+    goPackagePath = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev = "57f370e13068146efe1cb7129f79e5d51da8a242";
+      sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/go-goon";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/go-goon";
+      rev = "37c2f522c041b74919a9e5e3a6c5c47eb34730a5";
+      sha256 = "17ac6j6msdcxbmfhq6pxhw5z339b87bd6ciln9909drjv2szyxqv";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/go";
+      rev = "47fa5b7ceee66c60ac3a281416089035bf526a3c";
+      sha256 = "1wr4fgb8w1zi3z7b76wjr68h0152lrcamphyhpbljc0sx8ygv8xd";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/assertions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/assertions";
+      rev = "7678a5452ebea5b7090a6b163f844c133f523da2";
+      sha256 = "0df2z0f4l0yzbx38bphwyjsyxfgsza1yw4cq46zikbnknqjb8s1c";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/goconvey";
+      rev = "ef6db91d284a0e7badaa1f0c404c30aa7dee3aed";
+      sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7";
+    };
+  }
+  {
+    goPackagePath = "github.com/spaolacci/murmur3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spaolacci/murmur3";
+      rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc";
+      sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/btree";
+      rev = "9876f1454cf0993a53d74c27196993e345f50dd1";
+      sha256 = "0rys4pw7cf2yqr0qdls33ndbpas6d1qxi0wn8zacb315j1dd7cnp";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/buntdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/buntdb";
+      rev = "75d89283d5ba2a97e02ada50dc800fd65b601b7b";
+      sha256 = "11sgfwqfgn33fy62spqrqqx9lbp1cpb7f93wp2ngic5svpza0ykl";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/gjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/gjson";
+      rev = "3cd3a1192327ac5e24f7e87824be578b0b07c604";
+      sha256 = "1v9fmbz7j4ny5cnbmzs1nnv3nm34f129grfk8kxl0klydixg2jvx";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/grect";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/grect";
+      rev = "ba9a043346eba55344e40d66a5e74cfda3a9d293";
+      sha256 = "0iz948vwqk7n47pkrrmw20rd4f0m67qdhgs9xijc5swyrlj6yr61";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/match";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/match";
+      rev = "1731857f09b1f38450e2c12409748407822dc6be";
+      sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/rtree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/rtree";
+      rev = "6cd427091e0e662cb4f8e2c9eb1a41e1c46ff0d3";
+      sha256 = "0s3h3zjmz60d92gsb3vfqfbrgnjyai607adxg78674s1vdlm221l";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/tinyqueue";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/tinyqueue";
+      rev = "1e39f55115634cad2c504631c8bfcc292f2c9c55";
+      sha256 = "0yyl7qskmn9fb9h11z71ri30cml7d1k576wf1573wbqv59b81f2x";
+    };
+  }
+  {
+    goPackagePath = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev = "3b5c87ab5fb00c660bf85b888445d9a01db64db4";
+      sha256 = "0n30zjip3kips23w6wlp41nh4z2qc5cg8s1hf17kc3shnaj04n1n";
+    };
+  }
+  {
+    goPackagePath = "github.com/ugorji/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ugorji/go";
+      rev = "f3cacc17c85ecb7f1b6a9e373ee85d1480919868";
+      sha256 = "1g5jcxans5vjvg8k4wksilfx50izfhb9g0jdmcknlqbn17ww1fir";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff";
+      sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-logging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-logging";
+      rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390";
+      sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-notifier";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-notifier";
+      rev = "097c5d47330ff6a823f67e3515faa13566a62c6f";
+      sha256 = "081h4a33603n0mlh53by1mg21rr42xjvxk7r10x8l4v671bq0kha";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-smux-multistream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-smux-multistream";
+      rev = "afa6825376c14a0462fd420a7d4b4d157c937a42";
+      sha256 = "14vimxvlz48js4mkq5fp2ni8qbs0h2spv3qjgnqbg3jfbi8ynn5k";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-smux-spdystream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-smux-spdystream";
+      rev = "a6182ff2a058b177f3dc7513fe198e6002f7be78";
+      sha256 = "1x2p5h73q90rz221xvhm29sampqbimhrajb5bglj8lqkh502ip7g";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-smux-yamux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-smux-yamux";
+      rev = "49f324a2b63e778df703cf8e5a502bd56a683ef3";
+      sha256 = "15ndv8qr2n9k1icsxd7yismzdis0aasi28xcxqgw8nq2ldj9j9dz";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/mafmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/mafmt";
+      rev = "ab6a47300c1df531e468771e7d08fcd6d33f032e";
+      sha256 = "03is8fjnjpkp1pipgachf7cx76wa1wrlgijgw25qygkycyxins06";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/mdns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/mdns";
+      rev = "348bb87e5cd39b33dba9a33cb20802111e5ee029";
+      sha256 = "0z1qwras8yh3q05zvdifw1s3phbppbc0659qndamxsfq8jlds462";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/multiaddr-filter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/multiaddr-filter";
+      rev = "e903e4adabd70b78bc9293b6ee4f359afb3f9f59";
+      sha256 = "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/yamux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/yamux";
+      rev = "63d22127b261bf7014885d25fabe034bed14f04b";
+      sha256 = "0xifqmpcj1awjhqif2fc62vj7bds34q95lw1a3pi0sqmla6r8xhc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "8b1d31080a7692e075c4681cb2458454a1fe0706";
+      sha256 = "1l5n2vjyxrsmhqn5nas68mf58f2kcnb5zyqrcar608bxh9dlsnsl";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "640f4622ab692b87c2f3a94265e6f579fe38263d";
+      sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "78d5f264b493f125018180c204871ecf58a2dce1";
+      sha256 = "0x23n60wskys39dwybz5za77ldky9i518kp58ragpd5528kcc68s";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
+      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mgo.v2";
+      rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655";
+      sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/sourcemap.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/sourcemap.v1";
+      rev = "6e83acea0053641eff084973fee085f0c193c61a";
+      sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index e2acee87d1abb..9c645d59b2c75 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.69.1";
+  version = "0.73.1";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -91,11 +91,14 @@
     "binary_sensor.hikvision" = ps: with ps; [  ];
     "binary_sensor.hive" = ps: with ps; [  ];
     "binary_sensor.homematic" = ps: with ps; [ pyhomematic ];
+    "binary_sensor.homematicip_cloud" = ps: with ps; [  ];
+    "binary_sensor.hydrawise" = ps: with ps; [  ];
     "binary_sensor.ihc" = ps: with ps; [  ];
     "binary_sensor.insteon_plm" = ps: with ps; [  ];
     "binary_sensor.iss" = ps: with ps; [  ];
     "binary_sensor.isy994" = ps: with ps; [  ];
     "binary_sensor.knx" = ps: with ps; [  ];
+    "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "binary_sensor.linode" = ps: with ps; [ linode-api ];
     "binary_sensor.maxcube" = ps: with ps; [  ];
     "binary_sensor.modbus" = ps: with ps; [  ];
@@ -110,7 +113,9 @@
     "binary_sensor.pilight" = ps: with ps; [  ];
     "binary_sensor.ping" = ps: with ps; [  ];
     "binary_sensor.qwikswitch" = ps: with ps; [  ];
+    "binary_sensor.rachio" = ps: with ps; [  ];
     "binary_sensor.raincloud" = ps: with ps; [  ];
+    "binary_sensor.rainmachine" = ps: with ps; [  ];
     "binary_sensor.random" = ps: with ps; [  ];
     "binary_sensor.raspihats" = ps: with ps; [  ];
     "binary_sensor.rest" = ps: with ps; [  ];
@@ -130,6 +135,7 @@
     "binary_sensor.threshold" = ps: with ps; [  ];
     "binary_sensor.trend" = ps: with ps; [ numpy ];
     "binary_sensor.upcloud" = ps: with ps; [  ];
+    "binary_sensor.uptimerobot" = ps: with ps; [  ];
     "binary_sensor.velbus" = ps: with ps; [  ];
     "binary_sensor.vera" = ps: with ps; [  ];
     "binary_sensor.verisure" = ps: with ps; [  ];
@@ -137,6 +143,7 @@
     "binary_sensor.vultr" = ps: with ps; [ vultr ];
     "binary_sensor.wemo" = ps: with ps; [  ];
     "binary_sensor.wink" = ps: with ps; [  ];
+    "binary_sensor.wirelesstag" = ps: with ps; [  ];
     "binary_sensor.workday" = ps: with ps; [  ];
     "binary_sensor.xiaomi_aqara" = ps: with ps; [  ];
     "binary_sensor.zha" = ps: with ps; [  ];
@@ -146,7 +153,7 @@
     "bloomsky" = ps: with ps; [  ];
     "bmw_connected_drive" = ps: with ps; [  ];
     "browser" = ps: with ps; [  ];
-    "calendar" = ps: with ps; [  ];
+    "calendar" = ps: with ps; [ aiohttp-cors ];
     "calendar.caldav" = ps: with ps; [  ];
     "calendar.demo" = ps: with ps; [  ];
     "calendar.google" = ps: with ps; [  ];
@@ -162,6 +169,7 @@
     "camera.canary" = ps: with ps; [ ha-ffmpeg ];
     "camera.demo" = ps: with ps; [  ];
     "camera.doorbird" = ps: with ps; [  ];
+    "camera.familyhub" = ps: with ps; [  ];
     "camera.ffmpeg" = ps: with ps; [ ha-ffmpeg ];
     "camera.foscam" = ps: with ps; [  ];
     "camera.generic" = ps: with ps; [  ];
@@ -181,9 +189,11 @@
     "camera.uvc" = ps: with ps; [  ];
     "camera.verisure" = ps: with ps; [  ];
     "camera.xeoma" = ps: with ps; [  ];
+    "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ];
     "camera.yi" = ps: with ps; [ ha-ffmpeg ];
     "camera.zoneminder" = ps: with ps; [  ];
     "canary" = ps: with ps; [  ];
+    "cast" = ps: with ps; [ PyChromecast ];
     "climate" = ps: with ps; [  ];
     "climate.daikin" = ps: with ps; [  ];
     "climate.demo" = ps: with ps; [  ];
@@ -196,7 +206,9 @@
     "climate.generic_thermostat" = ps: with ps; [  ];
     "climate.heatmiser" = ps: with ps; [  ];
     "climate.hive" = ps: with ps; [  ];
+    "climate.homekit_controller" = ps: with ps; [  ];
     "climate.homematic" = ps: with ps; [ pyhomematic ];
+    "climate.homematicip_cloud" = ps: with ps; [  ];
     "climate.honeywell" = ps: with ps; [  ];
     "climate.knx" = ps: with ps; [  ];
     "climate.maxcube" = ps: with ps; [  ];
@@ -218,6 +230,7 @@
     "climate.venstar" = ps: with ps; [  ];
     "climate.vera" = ps: with ps; [  ];
     "climate.wink" = ps: with ps; [  ];
+    "climate.zhong_hong" = ps: with ps; [  ];
     "climate.zwave" = ps: with ps; [  ];
     "cloud" = ps: with ps; [ aiohttp-cors warrant ];
     "cloud.auth_api" = ps: with ps; [  ];
@@ -231,7 +244,7 @@
     "config.config_entries" = ps: with ps; [ voluptuous-serialize ];
     "config.core" = ps: with ps; [  ];
     "config.customize" = ps: with ps; [  ];
-    "config.entity_registry" = ps: with ps; [  ];
+    "config.entity_registry" = ps: with ps; [ aiohttp-cors ];
     "config.group" = ps: with ps; [  ];
     "config.hassbian" = ps: with ps; [  ];
     "config.script" = ps: with ps; [  ];
@@ -258,6 +271,7 @@
     "cover.rflink" = ps: with ps; [  ];
     "cover.rfxtrx" = ps: with ps; [  ];
     "cover.rpi_gpio" = ps: with ps; [  ];
+    "cover.ryobi_gdo" = ps: with ps; [  ];
     "cover.scsgate" = ps: with ps; [  ];
     "cover.tahoma" = ps: with ps; [  ];
     "cover.tellduslive" = ps: with ps; [  ];
@@ -288,6 +302,7 @@
     "device_tracker.cisco_ios" = ps: with ps; [ pexpect ];
     "device_tracker.ddwrt" = ps: with ps; [  ];
     "device_tracker.demo" = ps: with ps; [  ];
+    "device_tracker.freebox" = ps: with ps; [  ];
     "device_tracker.fritz" = ps: with ps; [ fritzconnection ];
     "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.google_maps" = ps: with ps; [  ];
@@ -407,6 +422,7 @@
     "hue.config_flow" = ps: with ps; [  ];
     "hue.const" = ps: with ps; [  ];
     "hue.errors" = ps: with ps; [  ];
+    "hydrawise" = ps: with ps; [  ];
     "ifttt" = ps: with ps; [  ];
     "ihc" = ps: with ps; [  ];
     "ihc.const" = ps: with ps; [  ];
@@ -415,6 +431,7 @@
     "image_processing.demo" = ps: with ps; [  ];
     "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ];
     "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ];
+    "image_processing.facebox" = ps: with ps; [  ];
     "image_processing.microsoft_face_detect" = ps: with ps; [ aiohttp-cors ];
     "image_processing.microsoft_face_identify" = ps: with ps; [ aiohttp-cors ];
     "image_processing.openalpr_cloud" = ps: with ps; [  ];
@@ -440,6 +457,7 @@
     "keyboard_remote" = ps: with ps; [ evdev ];
     "kira" = ps: with ps; [  ];
     "knx" = ps: with ps; [  ];
+    "konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "lametric" = ps: with ps; [  ];
     "light" = ps: with ps; [  ];
     "light.abode" = ps: with ps; [  ];
@@ -459,6 +477,7 @@
     "light.hive" = ps: with ps; [  ];
     "light.homekit_controller" = ps: with ps; [  ];
     "light.homematic" = ps: with ps; [ pyhomematic ];
+    "light.homematicip_cloud" = ps: with ps; [  ];
     "light.hue" = ps: with ps; [ aiohue ];
     "light.hyperion" = ps: with ps; [  ];
     "light.iglo" = ps: with ps; [  ];
@@ -473,6 +492,7 @@
     "light.litejet" = ps: with ps; [  ];
     "light.lutron" = ps: with ps; [  ];
     "light.lutron_caseta" = ps: with ps; [  ];
+    "light.lw12wifi" = ps: with ps; [  ];
     "light.mochad" = ps: with ps; [  ];
     "light.mqtt" = ps: with ps; [ paho-mqtt ];
     "light.mqtt_json" = ps: with ps; [ paho-mqtt ];
@@ -518,6 +538,7 @@
     "lock.demo" = ps: with ps; [  ];
     "lock.homematic" = ps: with ps; [ pyhomematic ];
     "lock.isy994" = ps: with ps; [  ];
+    "lock.kiwi" = ps: with ps; [  ];
     "lock.lockitron" = ps: with ps; [  ];
     "lock.mqtt" = ps: with ps; [ paho-mqtt ];
     "lock.nello" = ps: with ps; [  ];
@@ -528,6 +549,7 @@
     "lock.verisure" = ps: with ps; [  ];
     "lock.volvooncall" = ps: with ps; [  ];
     "lock.wink" = ps: with ps; [  ];
+    "lock.xiaomi_aqara" = ps: with ps; [  ];
     "lock.zwave" = ps: with ps; [  ];
     "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ];
     "logentries" = ps: with ps; [  ];
@@ -559,11 +581,13 @@
     "media_player.directv" = ps: with ps; [  ];
     "media_player.dunehd" = ps: with ps; [  ];
     "media_player.emby" = ps: with ps; [  ];
+    "media_player.epson" = ps: with ps; [  ];
     "media_player.firetv" = ps: with ps; [  ];
     "media_player.frontier_silicon" = ps: with ps; [  ];
     "media_player.gpmdp" = ps: with ps; [ websocket_client ];
     "media_player.gstreamer" = ps: with ps; [  ];
     "media_player.hdmi_cec" = ps: with ps; [  ];
+    "media_player.horizon" = ps: with ps; [  ];
     "media_player.itunes" = ps: with ps; [  ];
     "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
     "media_player.lg_netcast" = ps: with ps; [  ];
@@ -587,9 +611,9 @@
     "media_player.samsungtv" = ps: with ps; [ wakeonlan ];
     "media_player.snapcast" = ps: with ps; [  ];
     "media_player.songpal" = ps: with ps; [  ];
-    "media_player.sonos" = ps: with ps; [  ];
+    "media_player.sonos" = ps: with ps; [ soco ];
     "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
-    "media_player.spotify" = ps: with ps; [ aiohttp-cors spotipy ];
+    "media_player.spotify" = ps: with ps; [ aiohttp-cors ];
     "media_player.squeezebox" = ps: with ps; [  ];
     "media_player.ue_smart_radio" = ps: with ps; [  ];
     "media_player.universal" = ps: with ps; [  ];
@@ -613,10 +637,17 @@
     "mychevy" = ps: with ps; [  ];
     "mycroft" = ps: with ps; [  ];
     "mysensors" = ps: with ps; [  ];
+    "mysensors.const" = ps: with ps; [  ];
+    "mysensors.device" = ps: with ps; [  ];
+    "mysensors.gateway" = ps: with ps; [  ];
     "namecheapdns" = ps: with ps; [  ];
     "neato" = ps: with ps; [  ];
     "nest" = ps: with ps; [  ];
+    "nest.config_flow" = ps: with ps; [  ];
+    "nest.const" = ps: with ps; [  ];
+    "nest.local_auth" = ps: with ps; [  ];
     "netatmo" = ps: with ps; [  ];
+    "netgear_lte" = ps: with ps; [  ];
     "no_ip" = ps: with ps; [  ];
     "notify" = ps: with ps; [  ];
     "notify.apns" = ps: with ps; [  ];
@@ -633,6 +664,7 @@
     "notify.ecobee" = ps: with ps; [  ];
     "notify.facebook" = ps: with ps; [  ];
     "notify.file" = ps: with ps; [  ];
+    "notify.flock" = ps: with ps; [  ];
     "notify.free_mobile" = ps: with ps; [  ];
     "notify.gntp" = ps: with ps; [  ];
     "notify.group" = ps: with ps; [  ];
@@ -652,8 +684,8 @@
     "notify.message_bird" = ps: with ps; [  ];
     "notify.mycroft" = ps: with ps; [  ];
     "notify.mysensors" = ps: with ps; [  ];
+    "notify.netgear_lte" = ps: with ps; [  ];
     "notify.nfandroidtv" = ps: with ps; [  ];
-    "notify.nma" = ps: with ps; [  ];
     "notify.prowl" = ps: with ps; [  ];
     "notify.pushbullet" = ps: with ps; [ pushbullet ];
     "notify.pushetta" = ps: with ps; [  ];
@@ -688,6 +720,7 @@
     "proximity" = ps: with ps; [  ];
     "python_script" = ps: with ps; [  ];
     "qwikswitch" = ps: with ps; [  ];
+    "rachio" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];
     "raincloud" = ps: with ps; [  ];
     "rainmachine" = ps: with ps; [  ];
@@ -712,6 +745,7 @@
     "rpi_gpio" = ps: with ps; [  ];
     "rpi_pfio" = ps: with ps; [  ];
     "rss_feed_template" = ps: with ps; [ aiohttp-cors ];
+    "sabnzbd" = ps: with ps; [  ];
     "satel_integra" = ps: with ps; [  ];
     "scene" = ps: with ps; [  ];
     "scene.deconz" = ps: with ps; [  ];
@@ -766,7 +800,7 @@
     "sensor.cups" = ps: with ps; [ pycups ];
     "sensor.currencylayer" = ps: with ps; [  ];
     "sensor.daikin" = ps: with ps; [  ];
-    "sensor.darksky" = ps: with ps; [  ];
+    "sensor.darksky" = ps: with ps; [ python-forecastio ];
     "sensor.deconz" = ps: with ps; [  ];
     "sensor.deluge" = ps: with ps; [ deluge-client ];
     "sensor.demo" = ps: with ps; [  ];
@@ -799,6 +833,7 @@
     "sensor.file" = ps: with ps; [  ];
     "sensor.filesize" = ps: with ps; [  ];
     "sensor.filter" = ps: with ps; [  ];
+    "sensor.fints" = ps: with ps; [  ];
     "sensor.fitbit" = ps: with ps; [ aiohttp-cors ];
     "sensor.fixer" = ps: with ps; [  ];
     "sensor.folder" = ps: with ps; [  ];
@@ -822,6 +857,7 @@
     "sensor.homematicip_cloud" = ps: with ps; [  ];
     "sensor.hp_ilo" = ps: with ps; [  ];
     "sensor.htu21d" = ps: with ps; [  ];
+    "sensor.hydrawise" = ps: with ps; [  ];
     "sensor.hydroquebec" = ps: with ps; [  ];
     "sensor.ihc" = ps: with ps; [  ];
     "sensor.imap" = ps: with ps; [ aioimaplib ];
@@ -830,6 +866,7 @@
     "sensor.insteon_plm" = ps: with ps; [  ];
     "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
     "sensor.iota" = ps: with ps; [  ];
+    "sensor.iperf3" = ps: with ps; [  ];
     "sensor.irish_rail_transport" = ps: with ps; [  ];
     "sensor.isy994" = ps: with ps; [  ];
     "sensor.juicenet" = ps: with ps; [  ];
@@ -865,7 +902,9 @@
     "sensor.nest" = ps: with ps; [  ];
     "sensor.netatmo" = ps: with ps; [  ];
     "sensor.netdata" = ps: with ps; [  ];
+    "sensor.netgear_lte" = ps: with ps; [  ];
     "sensor.neurio_energy" = ps: with ps; [  ];
+    "sensor.nsw_fuel_station" = ps: with ps; [  ];
     "sensor.nut" = ps: with ps; [  ];
     "sensor.nzbget" = ps: with ps; [  ];
     "sensor.octoprint" = ps: with ps; [  ];
@@ -891,6 +930,7 @@
     "sensor.radarr" = ps: with ps; [  ];
     "sensor.rainbird" = ps: with ps; [  ];
     "sensor.raincloud" = ps: with ps; [  ];
+    "sensor.rainmachine" = ps: with ps; [  ];
     "sensor.random" = ps: with ps; [  ];
     "sensor.rest" = ps: with ps; [  ];
     "sensor.rflink" = ps: with ps; [  ];
@@ -971,6 +1011,7 @@
     "sensor.waze_travel_time" = ps: with ps; [  ];
     "sensor.whois" = ps: with ps; [  ];
     "sensor.wink" = ps: with ps; [  ];
+    "sensor.wirelesstag" = ps: with ps; [  ];
     "sensor.worldclock" = ps: with ps; [  ];
     "sensor.worldtidesinfo" = ps: with ps; [  ];
     "sensor.worxlandroid" = ps: with ps; [  ];
@@ -996,6 +1037,8 @@
     "sleepiq" = ps: with ps; [  ];
     "smappee" = ps: with ps; [  ];
     "snips" = ps: with ps; [ paho-mqtt ];
+    "sonos" = ps: with ps; [ soco ];
+    "spaceapi" = ps: with ps; [ aiohttp-cors ];
     "spc" = ps: with ps; [ websockets ];
     "splunk" = ps: with ps; [  ];
     "statsd" = ps: with ps; [ statsd ];
@@ -1030,13 +1073,16 @@
     "switch.hive" = ps: with ps; [  ];
     "switch.homekit_controller" = ps: with ps; [  ];
     "switch.homematic" = ps: with ps; [ pyhomematic ];
+    "switch.homematicip_cloud" = ps: with ps; [  ];
     "switch.hook" = ps: with ps; [  ];
+    "switch.hydrawise" = ps: with ps; [  ];
     "switch.ihc" = ps: with ps; [  ];
     "switch.insteon_local" = ps: with ps; [  ];
     "switch.insteon_plm" = ps: with ps; [  ];
     "switch.isy994" = ps: with ps; [  ];
     "switch.kankun" = ps: with ps; [  ];
     "switch.knx" = ps: with ps; [  ];
+    "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "switch.linode" = ps: with ps; [ linode-api ];
     "switch.litejet" = ps: with ps; [  ];
     "switch.lutron_caseta" = ps: with ps; [  ];
@@ -1087,6 +1133,7 @@
     "switch.wake_on_lan" = ps: with ps; [ wakeonlan ];
     "switch.wemo" = ps: with ps; [  ];
     "switch.wink" = ps: with ps; [  ];
+    "switch.wirelesstag" = ps: with ps; [  ];
     "switch.xiaomi_aqara" = ps: with ps; [  ];
     "switch.xiaomi_miio" = ps: with ps; [ construct ];
     "switch.zha" = ps: with ps; [  ];
@@ -1138,12 +1185,14 @@
     "vultr" = ps: with ps; [ vultr ];
     "wake_on_lan" = ps: with ps; [ wakeonlan ];
     "waterfurnace" = ps: with ps; [  ];
+    "watson_iot" = ps: with ps; [  ];
     "weather" = ps: with ps; [  ];
     "weather.bom" = ps: with ps; [  ];
     "weather.buienradar" = ps: with ps; [  ];
-    "weather.darksky" = ps: with ps; [  ];
+    "weather.darksky" = ps: with ps; [ python-forecastio ];
     "weather.demo" = ps: with ps; [  ];
     "weather.ecobee" = ps: with ps; [  ];
+    "weather.ipma" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
     "weather.openweathermap" = ps: with ps; [ pyowm ];
     "weather.yweather" = ps: with ps; [ yahooweather ];
@@ -1152,6 +1201,7 @@
     "websocket_api" = ps: with ps; [ aiohttp-cors ];
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
+    "wirelesstag" = ps: with ps; [  ];
     "xiaomi_aqara" = ps: with ps; [  ];
     "zabbix" = ps: with ps; [  ];
     "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index fbc233398735f..3642fb6b16d6a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -6,19 +6,20 @@
 let
 
   py = python3.override {
+    # Override the version of some packages pinned in Home Assistant's setup.py
     packageOverrides = self: super: {
       aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "3.1.3";
+        version = "3.3.2";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad";
+          sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12";
         };
       });
-      pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
-        version = "3.4.2";
+      requests = super.requests.overridePythonAttrs (oldAttrs: rec {
+        version = "2.19.1";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5";
+          sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
         };
       });
       voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {
@@ -42,13 +43,6 @@ let
           sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d";
         };
       });
-      async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
-        version = "2.0.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0";
-        };
-      });
       # used by check_config script
       # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
       colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec {
@@ -74,7 +68,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.69.1";
+  hassVersion = "0.73.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -89,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4";
+    sha256 = "1hcxwsyj15qks2il06dbwk1ycwspz97pgrwydp00qgcraw0yafmp";
   };
 
   propagatedBuildInputs = [
@@ -108,8 +102,8 @@ in with py.pkgs; buildPythonApplication rec {
     py.test --ignore tests/components
     # Some basic components should be tested however
     py.test \
-      tests/components/{group,http} \
-      tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py
+      tests/components/{group,http,frontend} \
+      tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py
   '';
 
   makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 168a1ec3b9dd4..1bc4d9e1c6fd8 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -1,13 +1,20 @@
-{ stdenv, fetchPypi, buildPythonPackage, user-agents }:
+{ lib, fetchPypi, buildPythonPackage, user-agents }:
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180509.0";
+  version = "20180708.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11d9c4a07565358e6ee001f5c57c8393b4aaadac0d993a0a39a0387a33644fba";
+    sha256 = "e1b068a21b26ffdc50aad2baef65b94a2f43a4df7b0d5970374d4300e93745f8";
   };
 
   propagatedBuildInputs = [ user-agents ];
+
+  meta = with lib; {
+    description = "Polymer frontend for Home Assistant";
+    homepage = https://github.com/home-assistant/home-assistant-polymer;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
+  };
 }
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 5768e7badea08..58ae8f85b81ff 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "tomcat-connectors-1.2.41-dev-1613051";
 
   src = fetchurl {
-    url = "http://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz";
+    url = "https://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz";
     sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc";
   };
 
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index f94ff56373d46..80caa37799121 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "couchdb-${version}";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
-    sha256 = "1k3v9v05417087b6fcj5yv03wl6i61xqrrhp0prl9b3ir2mmbwnm";
+    sha256 = "1c1ghrmrcyjd3s3pzml6akxf8xxcqy4mfzn5xf8jg158dzarmk53";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 39722c6d831fe..e10799e27f8ac 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -3,16 +3,16 @@
 
 , cmake
 , ninja
-
-, libxslt
-, libxml2
-
-, enableSSL ? true
-, enableMonitor ? false
-, enableRproxy ? true
-, enableTomahawk ? false
-, enableXSLT ? true
-, enableToolkit ? true
+, mbedtls
+
+, enableCache     ? true     # Internal cache support.
+, enableIpV6      ? true
+, enableTls       ? true
+, enableMonitor   ? false    # Support for the Hiawatha Monitor.
+, enableRproxy    ? true     # Reverse proxy support.
+, enableTomahawk  ? false    # Tomahawk, the Hiawatha command shell.
+, enableXslt      ? true, libxml2 ? null, libxslt ? null
+, enableToolkit   ? true     # The URL Toolkit.
 }:
 
 stdenv.mkDerivation rec {
@@ -27,28 +27,29 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ninja ];
-  buildInputs = [ libxslt libxml2 ];
+  buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace SETUID ""
   '';
 
   cmakeFlags = [
-    (
-      # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks:
-      # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled."
-      if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" )
-    ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" )
-    ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" )
-    ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" )
-    ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" )
-    ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" )
+    "-DUSE_SYSTEM_MBEDTLS=on" # Policy to use Nix deps, and Nix uses up to date deps
+    ( if enableCache     then "-DENABLE_CACHE=on"       else "-DENABLE_CACHE=off"       )
+    ( if enableIpV6      then "-DENABLE_IPV6=on"        else "-DENABLE_IPV6=off"        )
+    ( if enableTls       then "-DENABLE_TLS=on"         else "-DENABLE_TLS=off"         )
+    ( if enableMonitor   then "-DENABLE_MONITOR=on"     else "-DENABLE_MONITOR=off"     )
+    ( if enableRproxy    then "-DENABLE_RPROXY=on"      else "-DENABLE_RPROXY=off"      )
+    ( if enableTomahawk  then "-DENABLE_TOMAHAWK=on"    else "-DENABLE_TOMAHAWK=off"    )
+    ( if enableXslt      then "-DENABLE_XSLT=on"        else "-DENABLE_XSLT=off"        )
+    ( if enableToolkit   then "-DENABLE_TOOLKIT=on"     else "-DENABLE_TOOLKIT=off"     )
   ];
 
   meta = with stdenv.lib; {
+    homepage = https://www.hiawatha-webserver.org;
     description = "An advanced and secure webserver";
     license = licenses.gpl2;
-    homepage = https://www.hiawatha-webserver.org;
+    platforms = platforms.unix;    # "Hiawatha runs perfectly on Linux, BSD and MacOS X"
     maintainers = [ maintainers.ndowens ];
   };
 
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 068053d71f09b..c5702132d2808 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "jboss-as-7.1.1.Final";
   src = fetchurl {
-    url = http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz;
+    url = https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz;
     sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
   };
 
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 1e99aab24c602..473f2986ff06f 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jetty-${version}";
   version = "9.4.8.v20171121";
   src = fetchurl {
-    url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
+    url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
     name = "jetty-distribution-${version}.tar.gz";
     sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh";
   };
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 31b3449d5f64d..4596dac09086f 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   name = "lighttpd-1.4.49";
 
   src = fetchurl {
-    url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
+    url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
     sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf";
   };
 
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix
index 02cf49854ac8c..b636f79e6c60d 100644
--- a/pkgs/servers/http/micro-httpd/default.nix
+++ b/pkgs/servers/http/micro-httpd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "micro-httpd-20140814";
 
   src = fetchurl {
-    url   = "http://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz";
+    url   = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz";
     sha256 = "0mlm24bi31s0s8w55i0sysv2nc1n2x4cfp6dm47slz49h2fz24rk";
   };
 
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index 99b13dab84d09..37a0a98d4e018 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "mini-httpd-1.7";
 
   src = fetchurl {
-    url = "http://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz";
+    url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz";
     sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49";
   };
 
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index fa3b57a0b22e8..a18ac202a4a20 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
-, libxml2, zlib, guile, texinfo, cppunit, psmisc }:
+, libxml2, zlib, guile, texinfo, cppunit, killall }:
 
 let version = "0.11"; in
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   # On GNU/Linux the `test_suite' process sometimes stays around, so
   # forcefully terminate it.
-  postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true";
+  postCheck = "${killall}/bin/killall test_suite || true";
 
   meta = {
     description = "GNU MyServer, a powerful and easy to configure web server";
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index ff0a4c65b4a60..4486959300397 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
 , gd, geoip
+, withDebug ? false
 , withStream ? true
 , withMail ? false
 , modules ? []
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
   name = "nginx-${version}";
 
   src = fetchurl {
-    url = "http://nginx.org/download/nginx-${version}.tar.gz";
+    url = "https://nginx.org/download/nginx-${version}.tar.gz";
     inherit sha256;
   };
 
@@ -44,6 +45,8 @@ stdenv.mkDerivation {
     "--with-pcre-jit"
     # Install destination problems
     # "--with-http_perl_module"
+  ] ++ optional withDebug [
+    "--with-debug"
   ] ++ optional withStream [
     "--with-stream"
     "--with-stream_geoip_module"
@@ -64,6 +67,8 @@ stdenv.mkDerivation {
 
   hardeningEnable = optional (!stdenv.isDarwin) "pie";
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     mv $out/sbin $out/bin
   '';
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index f482c92ed9f77..1919cfddf62d2 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -5,8 +5,8 @@
     src = let gitsrc = pkgs.fetchFromGitHub {
       owner = "eustas";
       repo = "ngx_brotli";
-      rev = "37ab9b2933a0b756ba3447000b7f31d432ed8228"; # v0.1.1
-      sha256 = "114ai8v9ns23qm12wp9dgdjvldqjnrmb3cmarkn0d3k6n3bm01bf";
+      rev = "v0.1.2";
+      sha256 = "19r9igxm4hrzrhxajlxw2ccq0057h8ipkfiif725x0xqbxjskl6c";
     }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
       cp -a ${gitsrc} $out
       substituteInPlace $out/config \
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 252e1a97dfdba..1155bac757035 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "1.13.6.2";
 
   src = fetchurl {
-    url = "http://openresty.org/download/openresty-${version}.tar.gz";
+    url = "https://openresty.org/download/openresty-${version}.tar.gz";
     sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll";
   };
 
diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix
index b2c80b3f88fc7..7d592d0256b7d 100644
--- a/pkgs/servers/http/redstore/default.nix
+++ b/pkgs/servers/http/redstore/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "redstore-0.5.4";
 
   src = fetchurl {
-    url = "http://www.aelius.com/njh/redstore/${name}.tar.gz";
+    url = "https://www.aelius.com/njh/redstore/${name}.tar.gz";
     sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq";
   };
 
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 8256bd9c734bf..6e012c98737e1 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.29";
 
   src = fetchurl {
-    url = "http://acme.com/software/thttpd/${name}.tar.gz";
+    url = "https://acme.com/software/thttpd/${name}.tar.gz";
     sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
   };
 
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index aae4589ebbe80..5f92fbf2c03f6 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yaws-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "http://yaws.hyber.org/download/${name}.tar.gz";
-    sha256 = "00bnvf26xlhm3v3c6jzk5kcdk8jkwr1gbd2f4h329lyrpjsx30my";
+    sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9";
   };
 
   # The tarball includes a symlink yaws -> yaws-1.95, which seems to be
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index bdd88db09844e..f3b67741c1918 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Next Generation IRC Daemon";
-    homepage    = http://ngircd.barton.de;
+    homepage    = https://ngircd.barton.de;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 5a87c423f4f7c..52c19d819d7e8 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.1014";
+  version = "0.8.1209";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0pvm9q8dpavkgsv180mw4y6555iixjv5s7mnmai9xzjspjpf264k";
+    sha256 = "0vql7h6diswvvh1a0rcisc541bk4ilp0ab1nn4z4dq16hcy0fv61";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index 5544014387059..a9f5ba6f7b2cf 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -49,7 +49,7 @@ let
     postInstall = "$out/bin/twistd --help > /dev/null";
 
     meta = with stdenv.lib; {
-      homepage = http://twistedmatrix.com/;
+      homepage = https://twistedmatrix.com/;
       description = "Twisted, an event-driven networking engine written in Python";
       longDescription = ''
         Twisted is an event-driven networking engine written in Python
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
new file mode 100644
index 0000000000000..105223f31a5bb
--- /dev/null
+++ b/pkgs/servers/livepeer/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, buildGoPackage
+, pkgconfig, ffmpeg
+}:
+
+buildGoPackage rec {
+  name = "livepeer-${version}";
+  version = "0.2.4";
+
+  goPackagePath = "github.com/livepeer/go-livepeer";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "livepeer";
+    repo = "go-livepeer";
+    rev = version;
+    sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia";
+  };
+
+  buildInputs = [ pkgconfig ffmpeg ];
+
+  # XXX This removes the -O2 flag, to avoid errors like:
+  #   cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant
+  # This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959
+  hardeningDisable = [ "fortify" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Official Go implementation of the Livepeer protocol";
+    homepage = http://livepeer.org;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ elitak ];
+  };
+}
diff --git a/pkgs/servers/livepeer/deps.nix b/pkgs/servers/livepeer/deps.nix
new file mode 100644
index 0000000000000..297d0724a496c
--- /dev/null
+++ b/pkgs/servers/livepeer/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/ericxtang/m3u8";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ericxtang/m3u8";
+      rev = "575aeb9f754a5dabcc03d4aa0ed05ecaee26499e";
+      sha256 = "08811y4kg6rgj40v80cwjcwhy094qrfigdwjsgr8d6bn64cf9fz2";
+    };
+  }
+]
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index c9065d041618f..e676246a08ec2 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.1";
+  name = "dovecot-2.3.2.1";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional withSQLite sqlite;
 
   src = fetchurl {
-    url = "http://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8";
+    url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
+    sha256 = "0d2ffbicgl3wswbnyjbw6qigz7r1aqzprpchbwp5cynw122i2raa";
   };
 
   preConfigure = ''
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index e98c58c891a1e..1b744181096c9 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchurl {
-    url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73";
+    url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
+    sha256 = "0d95q2yj2f750jwg599jlizlglldcz9hs52y4mhrflwfqlaqw3lm";
   };
 
   buildInputs = [ dovecot openssl ];
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 393ce2c5cda95..87d9e50429903 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "exim-4.91";
 
   src = fetchurl {
-    url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
+    url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
     sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc";
   };
 
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index f17f3ed2de7ec..ab632372b4644 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "nullmailer-${version}";
 
   src = fetchurl {
-    url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
+    url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
     sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild";
   };
 
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index e562fdc88a6c8..60c517230b4f1 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison
+{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison
 , libasr, libevent, zlib, openssl, db, pam
 
 # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it
@@ -23,7 +23,13 @@ else stdenv.mkDerivation rec {
     sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81";
   };
 
-  patches = [ ./proc_path.diff ];
+  patches = [
+    ./proc_path.diff
+    (fetchpatch {
+      url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff";
+      sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa";
+    })
+  ];
 
   postPatch = with builtins; with lib;
     optionalString unpriviledged_smtpctl_encrypt ''
diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix
index a9ec36f59ca9d..3d48e95278198 100644
--- a/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -6,7 +6,7 @@ buildPerlPackage rec {
   version = "1.1.3";
 
   src = fetchurl {
-    url = "http://jimsun.linxnet.com/downloads/${name}.tar.gz";
+    url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz";
     sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4";
   };
 
diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix
index 1836d0e5cf363..3e7163cb15415 100644
--- a/pkgs/servers/mail/postgrey/default.nix
+++ b/pkgs/servers/mail/postgrey/default.nix
@@ -12,7 +12,7 @@ let
     name = "postgrey-${version}";
 in runCommand name {
   src = fetchurl {
-    url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz";
+    url = "https://postgrey.schweikert.ch/pub/${name}.tar.gz";
     sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz";
   };
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 3e31327980683..4de63d694667b 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,29 +6,25 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.6.6";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "04jqrki7rlxywdig264kavy1h5882rspi2drkbdzrk35jjq8rh3h";
+    sha256 = "1gb4zg8i1nj337f65s434h299ad19c0d7jyawb2glvv3n4cshm97";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann];
+  buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann ];
 
-  postPatch = ''
-    substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local"
-    substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local.override" "/etc/rspamd/rspamd.conf.local.override"
-  '';
-
-  cmakeFlags = ''
-    -DDEBIAN_BUILD=ON
-    -DRUNDIR=/var/run/rspamd
-    -DDBDIR=/var/lib/rspamd
-    -DLOGDIR=/var/log/rspamd
-  '';
+  cmakeFlags = [
+    "-DDEBIAN_BUILD=ON"
+    "-DRUNDIR=/var/run/rspamd"
+    "-DDBDIR=/var/lib/rspamd"
+    "-DLOGDIR=/var/log/rspamd"
+    "-DLOCAL_CONFDIR=/etc/rspamd"
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/vstakhov/rspamd;
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 423fbf027fb5a..302aa8d55932f 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.30.0";
+  version = "0.31.2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "10ggv7669ngxs8py82k8z24874ga0ldcxvpp7xhjpbr1s0gw8zv8";
+    sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q";
   };
 
   patches = [
@@ -42,7 +42,7 @@ in pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     blist canonicaljson daemonize dateutil frozendict pillow pyasn1
     pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
-    signedjson systemd twisted ujson unpaddedbase64 pyyaml
+    signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
     matrix-angular-sdk bleach netaddr jinja2 psycopg2
     psutil msgpack-python lxml matrix-synapse-ldap3
     phonenumbers jsonschema affinity bcrypt
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 9943c0b9ab033..305ee174bf3c7 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "4.10.0";
+  version = "5.0.0";
 
   mattermost-server = buildGoPackage rec {
     name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "02isw8qapp35pgriy4w1ar1ppvgc5a10j550hjbc1mylnhzkg1jf";
+      sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -20,11 +20,6 @@ let
         -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
     '';
 
-    postInstall = ''
-      ln -s $bin/bin/mattermost-server $bin/bin/platform
-      ln -s $bin/bin/mattermost-server $bin/bin/mattermost-platform
-    '';
-
   };
 
   mattermost-webapp = stdenv.mkDerivation {
@@ -32,7 +27,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "0pfj2dxl4qrv4w6yj0385nw0fa4flcg95kkahs0arwhan5bgifl5";
+      sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b";
     };
 
     installPhase = ''
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index bfe21543555dc..67b2685262d8b 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -1,35 +1,40 @@
-{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate,
-  go-bindata, easyjson, nodePackages, cmake, emscripten }:
+{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript
+, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }:
 
 buildGoPackage rec {
   name = "meguca-unstable-${version}";
-  version = "2018-05-26";
-  rev = "9f3d902fb899dbc874c1a91298d86fda7da59b1e";
+  version = "2018-07-01";
+  rev = "80db8298b6546c93944251c17fe03371e521671f";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ];
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bakape/meguca";
-    sha256 = "0qblllf23pxcwi5fhaq8xc77iawll7v7xpk2mf9ngks3h8p7gddq";
+    sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml";
     fetchSubmodules = true;
   };
 
-  configurePhase = ''
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  buildInputs = [
+    ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson
+    emscripten
+  ];
+
+  buildPhase = ''
     export HOME=$PWD
-    export GOPATH=$GOPATH:$HOME/go
+    export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go
+    cd $HOME/go/src/github.com/bakape/meguca
     ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules
     sed -i "/npm install --progress false --depth 0/d" Makefile
     make generate_clean
     go generate meguca/...
-  '';
-
-  buildPhase = ''
-    go build -p $NIX_BUILD_CORES meguca
-    make -j $NIX_BUILD_CORES client wasm
+    go build -v -p $NIX_BUILD_CORES meguca
+    make -j $NIX_BUILD_CORES client
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    make -j $NIX_BUILD_CORES wasm
   '';
 
   installPhase = ''
@@ -40,7 +45,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bakape/meguca";
-    description = "Anonymous realtime imageboard focused on high performance, free speech and transparent moderation";
+    description = "High performance anonymous realtime imageboard";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ chiiruno ];
     platforms = platforms.all;
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
index 493297b9757fe..b2e31515ab480 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -1,12 +1,21 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
+    goPackagePath = "github.com/ErikDubbelboer/gspt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ErikDubbelboer/gspt";
+      rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63";
+      sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq";
+    };
+  }
+  {
     goPackagePath = "github.com/Masterminds/squirrel";
     fetch = {
       type = "git";
       url = "https://github.com/Masterminds/squirrel";
-      rev = "40ef4f86bf59a996c348a9f56ddb4c4d3d49a6df";
-      sha256 = "1zdv8hds2skqz9xrybf1pw5hfxzd27c35fsrfq11ryif1wxwbkyp";
+      rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a";
+      sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg";
     };
   }
   {
@@ -28,6 +37,15 @@
     };
   }
   {
+    goPackagePath = "github.com/badoux/goscraper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/badoux/goscraper";
+      rev = "0213ced7087832e81e8892e8d044150cfc153856";
+      sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w";
+    };
+  }
+  {
     goPackagePath = "github.com/bakape/mnemonics";
     fetch = {
       type = "git";
@@ -41,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bakape/thumbnailer";
-      rev = "5b92eb4c4500fd8e004e4cc9eeb2038961e2004f";
-      sha256 = "0z9myzp6rjyylh91ibd1nfpz7za1gxg4n3pnn7sw54i9zyws1l4x";
+      rev = "fa88f595f3882773bc425b382eee71e3e2fa1291";
+      sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf";
     };
   }
   {
@@ -95,8 +113,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-playground/log";
-      rev = "91a5908e654f9fc444a71ea3c51c72cb5c6c2442";
-      sha256 = "0p67j453pi7ffv3axl5g97qadx8lj22vsi5xrzqrr3v6mj8b0lbm";
+      rev = "736ecb55f80c7121af3754a7ea62e96733451fe1";
+      sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh";
     };
   }
   {
@@ -113,8 +131,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
-      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+      rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
+      sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
     };
   }
   {
@@ -158,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mailru/easyjson";
-      rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578";
-      sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0";
+      rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
+      sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
     };
   }
   {
@@ -185,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sevlyar/go-daemon";
-      rev = "45a2ba1b7c6710a044163fa109bf08d060bc3afa";
-      sha256 = "1fd8cwljgbxsm3w38pii0n02zg8s53x7j08w784csj3sfzq7rbv4";
+      rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f";
+      sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc";
     };
   }
   {
@@ -221,8 +239,17 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "a3beeb748656e13e54256fd2cde19e058f41f60f";
-      sha256 = "0h0a1v2g3hf0dlfjfiv76vfvvy7r9sdhjyqc2snvh9dczm2k5zki";
+      rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
+      sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9";
+      sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k";
     };
   }
   {
@@ -230,8 +257,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "c11f84a56e43e20a78cee75a7c034031ecf57d1f";
-      sha256 = "1fn1wwr94v6ca1zcbsrs5v79s95pajdjqzz9rm9lxkgcvv1rl189";
+      rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56";
+      sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0";
     };
   }
   {
@@ -239,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
-      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
+      rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127";
+      sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz";
     };
   }
   {
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 8a4159a552132..a9d8714476cb5 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.8";
+  version = "1.5.9";
   name = "memcached-${version}";
 
   src = fetchurl {
-    url = "http://memcached.org/files/${name}.tar.gz";
-    sha256 = "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k";
+    url = "https://memcached.org/files/${name}.tar.gz";
+    sha256 = "01hx4hs8lgmjzpqj1iv5fpdwv1ymrii6bp4nh1s0mjvipxymgwsa";
   };
 
   buildInputs = [cyrus_sasl libevent];
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index 466c3873c6004..63925d30c6449 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Server for synchronising Taskwarrior clients";
-    homepage = http://taskwarrior.org;
+    homepage = https://taskwarrior.org;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ makefu ];
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index ad840dfd607fe..646a7856788b0 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -2,15 +2,26 @@
 
 buildGoPackage rec {
   name = "consul-alerts-${version}";
-  version = "0.3.3";
+  version = "0.5.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/AcalephStorage/consul-alerts";
 
+  goDeps = ./deps.nix;
+
   src = fetchFromGitHub {
     inherit rev;
     owner = "AcalephStorage";
     repo = "consul-alerts";
-    sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq";
+    sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r";
+  };
+
+  meta = with stdenv.lib; {
+    description = "An extendable open source continuous integration server";
+    homepage = https://github.com/AcalephStorage/consul-alerts;
+    # As per README
+    platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ nh2 ];
   };
 }
diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/pkgs/servers/monitoring/consul-alerts/deps.nix
new file mode 100644
index 0000000000000..6494dc61a87c9
--- /dev/null
+++ b/pkgs/servers/monitoring/consul-alerts/deps.nix
@@ -0,0 +1,34 @@
+let
+  mkAwsPackage = name: {
+    goPackagePath = "github.com/aws/aws-sdk-go/${name}";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "v1.14.13";
+      sha256 = "0014b6kl3rbjhjbk7jz116wdgdls54b1bwz454pkn1snlvkj3qil";
+    };
+  };
+in
+[
+  (mkAwsPackage "")
+  (mkAwsPackage "aws/session")
+  (mkAwsPackage "aws/sns")
+  (mkAwsPackage "service/sns")
+  {
+    goPackagePath = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev = "v0.3.5";
+      sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb";
+    };
+  }{
+    goPackagePath = "github.com/mitchellh/hashstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/hashstructure";
+      rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; # has no releases as of writing
+      sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 646401ce02f91..217ac3f6d9146 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.1.3";
+  version = "5.2.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,15 +9,21 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g";
+    sha256 = "0gv7g6ddcmdkjd1xp9dg2kq7askzaw1vkmcii21glqb74k2jfg74";
   };
 
   srcStatic = fetchurl {
-    url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46";
+    url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
+    sha256 = "0j69a9cjvkknq19aa2l634b48zy1lwmv2p676hzc856zgq3h6m9m";
   };
 
+  postPatch = ''
+    substituteInPlace pkg/cmd/grafana-server/main.go \
+      --replace 'var version = "5.0.0"'  'var version = "${version}"'
+  '';
+
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
+
   postInstall = ''
     tar -xvf $srcStatic
     mkdir -p $bin/share/grafana
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 47bc6d58da90d..64fd55f9e5a5f 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-${version}";
-  version = "4.3.4";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
-    sha256 = "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9";
+    sha256 = "0j09jawjrbp5n7gwyb5mkq7l2dmg6fl03695salral66fs95s8nq";
   };
 
   patches = [ ./nagios.patch ];
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index e9a9fcff2b934..dc6faf151b778 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.3.0.132";
 
   src = fetchurl {
-    url = "http://download.newrelic.com/server_monitor/archive/${version}/newrelic-sysmond-${version}-linux.tar.gz";
+    url = "https://download.newrelic.com/server_monitor/archive/${version}/newrelic-sysmond-${version}-linux.tar.gz";
     sha256 = "0cdvffdsadfahfn1779zjfawz6l77awab3g9mw43vsba1568jh4f";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
new file mode 100644
index 0000000000000..ca1dc83e96add
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+let
+  version = "0.10";
+  jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
+  mavenUrl = "http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
+in stdenv.mkDerivation {
+  inherit version jarName;
+
+  name = "jmx-prometheus-httpserver-${version}";
+
+  src = fetchurl {
+    url = mavenUrl;
+    sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f";
+  };
+
+  buildInputs = [ jre makeWrapper ];
+
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p $out/libexec
+    mkdir -p $out/bin
+    cp $src $out/libexec/$jarName
+    makeWrapper "${jre}/bin/java" $out/bin/jmx_prometheus_httpserver --add-flags "-jar $out/libexec/$jarName"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/prometheus/jmx_exporter;
+    description = "A process for exposing JMX Beans via HTTP for Prometheus consumption";
+    license = licenses.asl20;
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 497f20ac55ed3..02a6197d38461 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
-  version = "0.15.2";
+  version = "0.16.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,10 +11,10 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv";
+    sha256 = "0rm6ahccgr1djpwvsa3p1kfal3mpy4a6g5w974pra84gk3krli5a";
   };
 
-  # FIXME: megacli test fails
+  # FIXME: tests fail due to read-only nix store
   doCheck = false;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index b7879cc763aa7..031ba423cc403 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.6.1";
+  version = "1.7.0";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "0zc3bgs1ad392lqv72rkppxmk33b404b8jfx3wbzll7fklwxa8g2";
+    sha256 = "1jinvncbn1srfmclhys6khvaczawy243vgmj2gsgm9szrnrf7klv";
   };
 
   buildFlagsArray = [ ''-ldflags=
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix
index fb98b8686cc26..57a5ffd21b00d 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix
@@ -1,6 +1,15 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
+    goPackagePath = "code.cloudfoundry.org/clock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cloudfoundry/clock";
+      rev = "e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71";
+      sha256 = "1mwckqpg9qi5macfbx7lpc5frbd0dz8bzq78dl570j9j2aqp9hkf";
+    };
+  }
+  {
     goPackagePath = "collectd.org";
     fetch = {
       type = "git";
@@ -10,6 +19,15 @@
     };
   }
   {
+    goPackagePath = "github.com/Microsoft/ApplicationInsights-Go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/ApplicationInsights-Go";
+      rev = "3612f58550c1de70f1a110c78c830e55f29aa65d";
+      sha256 = "11znwr0787171yv80r5jmdks6i0i3rwa03ir1kapm0ycwr8h4nvy";
+    };
+  }
+  {
     goPackagePath = "github.com/Shopify/sarama";
     fetch = {
       type = "git";
@@ -55,6 +73,15 @@
     };
   }
   {
+    goPackagePath = "github.com/armon/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/go-metrics";
+      rev = "783273d703149aaeb9897cf58613d5af48861c25";
+      sha256 = "1ci4kh35zdh5gyjhci5gi324iqcq04nb3qh89h9w6spwqb91w0ln";
+    };
+  }
+  {
     goPackagePath = "github.com/aws/aws-sdk-go";
     fetch = {
       type = "git";
@@ -136,6 +163,15 @@
     };
   }
   {
+    goPackagePath = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev = "749f6afb4572201e3c37325d0ffedb6f32be8950";
+      sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd";
+    };
+  }
+  {
     goPackagePath = "github.com/docker/docker";
     fetch = {
       type = "git";
@@ -154,6 +190,15 @@
     };
   }
   {
+    goPackagePath = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev = "47565b4f722fb6ceae66b95f853feed578a4a51c";
+      sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
+    };
+  }
+  {
     goPackagePath = "github.com/eapache/go-resiliency";
     fetch = {
       type = "git";
@@ -190,6 +235,15 @@
     };
   }
   {
+    goPackagePath = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev = "9144852efba7c4daf409943ee90767da62d55438";
+      sha256 = "08jvki9id1wdca0j6kqb4fmipwvgmakg9yfavnbpyn3vsbx9vpbp";
+    };
+  }
+  {
     goPackagePath = "github.com/go-redis/redis";
     fetch = {
       type = "git";
@@ -239,8 +293,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/mux";
-      rev = "392c28fe23e1c45ddba891b0320b3b5df220beea";
-      sha256 = "0dmihkq34ls23by08r8p92qpf77imibjd9m9qvw344j4r2z7bd4d";
+      rev = "53c1911da2b537f792e7cafcb446b05ffe33b996";
+      sha256 = "10cvljpjgvkq1zqj82hr46dnddfcpmm18wabbv4pkxjrmvb9xkf7";
     };
   }
   {
@@ -257,8 +311,62 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/consul";
-      rev = "63d2fc68239b996096a1c55a0d4b400ea4c2583f";
-      sha256 = "0vx7jpi2a9374mlhn37b33780n7g950zh482z2sd4lsf29n4c580";
+      rev = "5174058f0d2bda63fa5198ab96c33d9a909c58ed";
+      sha256 = "0xm3gl8i7pgsbsc2397bwh9hp2dwnk4cmw5y05acqn3zpyp84sbv";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
+      sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-immutable-radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-immutable-radix";
+      rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf";
+      sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-rootcerts";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-rootcerts";
+      rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
+      sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3";
+      sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/serf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/serf";
+      rev = "984a73625de3138f44deb38d00878fab39eb6447";
+      sha256 = "1sk9sw7q9knp7yi4r5kcr8cgyi9jzvgb0kzbwa38p8h3w394izkk";
+    };
+  }
+  {
+    goPackagePath = "github.com/influxdata/go-syslog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/go-syslog";
+      rev = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e";
+      sha256 = "0zw8wswr3afb48mi510mql58gz818dp0mzq3vllqqhrz3x8w580r";
     };
   }
   {
@@ -275,8 +383,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/influxdata/toml";
-      rev = "5d1d907f22ead1cd47adde17ceec5bda9cacaf8f";
-      sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4";
+      rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b";
+      sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3";
     };
   }
   {
@@ -298,6 +406,15 @@
     };
   }
   {
+    goPackagePath = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d";
+      sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z";
+    };
+  }
+  {
     goPackagePath = "github.com/kardianos/osext";
     fetch = {
       type = "git";
@@ -388,15 +505,6 @@
     };
   }
   {
-    goPackagePath = "github.com/nats-io/nats";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nats-io/nats";
-      rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898";
-      sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5";
-    };
-  }
-  {
     goPackagePath = "github.com/nats-io/nuid";
     fetch = {
       type = "git";
@@ -415,6 +523,15 @@
     };
   }
   {
+    goPackagePath = "github.com/opencontainers/go-digest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/go-digest";
+      rev = "c9281466c8b2f606084ac71339773efd177436e7";
+      sha256 = "1djdazssy27xn91pjhx3dgb0f11bnlzzbwkh7f8zwnpz011anasi";
+    };
+  }
+  {
     goPackagePath = "github.com/opencontainers/runc";
     fetch = {
       type = "git";
@@ -460,6 +577,15 @@
     };
   }
   {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
     goPackagePath = "github.com/prometheus/client_golang";
     fetch = {
       type = "git";
@@ -527,8 +653,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "a5c2888e464b14fa882c2a059e0f95716bd45cf1";
-      sha256 = "1czzl00lxcyhmf6x7wmw3dxmnyqij8lcahn5mv325csgyym4vm4w";
+      rev = "c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3";
+      sha256 = "0rzfwhvwh58w1isr6jxq222xih578dsscdsfbh6bg1bxgbkz0x1m";
     };
   }
   {
@@ -550,6 +676,15 @@
     };
   }
   {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "facf9a85c22f48d2f52f2380e4efce1768749a89";
+      sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
+    };
+  }
+  {
     goPackagePath = "github.com/stretchr/testify";
     fetch = {
       type = "git";
@@ -635,8 +770,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d";
-      sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s";
+      rev = "a337091b0525af65de94df2eb7e98bd9962dcbe2";
+      sha256 = "11a6a3ah1f3jj6530q4hjqf79bv9fy62s5wgxpp28g8b3vlxxsyp";
     };
   }
   {
@@ -658,6 +793,24 @@
     };
   }
   {
+    goPackagePath = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev = "11c7f9e547da6db876260ce49ea7536985904c9b";
+      sha256 = "1qdda2b31qhli71xc2rscm7hf219gr2mals3n24kgv9svmw1cxkq";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "de2209a968d48e8970546c8a710189f7461370f7";
+      sha256 = "0jby05p1qhm4gik0ya9n14vhf9x83mxysd917k53x59jrwrkh9gr";
+    };
+  }
+  {
     goPackagePath = "gopkg.in/asn1-ber.v1";
     fetch = {
       type = "git";
@@ -676,6 +829,15 @@
     };
   }
   {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify.v1";
+      rev = "a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb";
+      sha256 = "0912q06l6mrrrc7jj7hlrsbglklxyp67z1vnmvmcm04ck6hx8dlm";
+    };
+  }
+  {
     goPackagePath = "gopkg.in/gorethink/gorethink.v3";
     fetch = {
       type = "git";
@@ -712,6 +874,15 @@
     };
   }
   {
+    goPackagePath = "gopkg.in/tomb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/tomb.v1";
+      rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
+      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+    };
+  }
+  {
     goPackagePath = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index da2d1388c469a..d3816cf1ecdb2 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -65,7 +65,7 @@ in
     meta = {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = "GPL";
       maintainers = [ stdenv.lib.maintainers.eelco ];
       platforms = stdenv.lib.platforms.linux;
@@ -82,7 +82,7 @@ in
     meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = licenses.gpl2;
       maintainers = [ maintainers.eelco ];
       platforms = platforms.linux;
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 1cc604f6491b2..bc5556d4bc00c 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -77,7 +77,7 @@ in
     meta = {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = "GPL";
       maintainers = [ stdenv.lib.maintainers.eelco ];
       platforms = stdenv.lib.platforms.linux;
@@ -94,7 +94,7 @@ in
     meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = licenses.gpl2;
       maintainers = [ maintainers.eelco ];
       platforms = platforms.linux;
diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix
index 332e139f42836..69b3577720f5c 100644
--- a/pkgs/servers/monitoring/zabbix/3.4.nix
+++ b/pkgs/servers/monitoring/zabbix/3.4.nix
@@ -29,7 +29,7 @@ in
     meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
-      homepage = http://www.zabbix.com/;
+      homepage = https://www.zabbix.com/;
       license = licenses.gpl2;
       maintainers = [ maintainers.eelco ];
       platforms = platforms.linux;
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix
index 2925a8f2dc535..4c3479d8662ea 100644
--- a/pkgs/servers/monitoring/zipkin/default.nix
+++ b/pkgs/servers/monitoring/zipkin/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "Zipkin distributed tracing system";
-    homepage = "http://zipkin.io/";
+    homepage = https://zipkin.io/;
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = [ maintainers.hectorj ];
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 7513d3c71d2b7..0121d748129ba 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.2";
+  version = "13.0.4";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0zf4z4cn4wwsybxirvzyk7l6xjw9gkc60lzm8jqz9aak3a5gk5kk";
+    sha256 = "18d514145fcddc86f48d0a5fa4a0d4b07617135a1b23107137a6ea3ed519bd54";
   };
 
   installPhase = ''
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index bd291356b4365..d965485356c85 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena-fuseki";
-    version = "3.7.0";
+    version = "3.8.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    sha256 = "1824rvdrs9yhjinac2vkvkxvns8bfdvy91k5ghzzk0nrdcj31pmr";
+    sha256 = "0jca96996zl3f1qc15sfv45n09rnnv24qxv87y16dnwnyc1ism0a";
   };
   buildInputs = [
     makeWrapper
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 5d1723274cb42..347af1c4de9ff 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.9";
+  version = "3.3.11";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "1zr9byxlqd7s3rnmvdgv85mmk5xxjz0va1pj2gn6y28k569prcbs";
+    sha256 = "0x1sq2gvag7adba5nsx913dax2b2259h73623r0b7gn4v01ivq21";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 972bd53d95ee6..0c549e2b7e9ed 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -27,6 +27,5 @@ buildGoPackage rec {
     license = licenses.mit;
     homepage = https://influxdb.com/;
     maintainers = with maintainers; [ offline zimbatm ];
-    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 022a1a9ba10f0..fe4d285713f6e 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "1pccw3av72qqpyfsdyz72ab1lvc7fqraw14vi3hq67n96rsj017a";
+    sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 07489b6272880..bf1ccbd06d564 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.9";
+  version = "4.0.10";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "0465bv6yxnwmas3wzg07vmrprv2pxhnr56hn5pxrybwf66y76kyz";
+    sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx";
   };
 
   buildInputs = [ lua ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://redis.io;
+    homepage = https://redis.io;
     description = "An open source, advanced key-value store";
     license = stdenv.lib.licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
index 4d0bb6c687db2..9075756c16214 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional stdenv.isLinux [ pam ];
 
   src = fetchurl {
-    url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz";
+    url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz";
     sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5";
   };
 
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
index 8ea71d611ebb7..a064049072c96 100644
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional stdenv.isLinux [ pam ];
 
   src = fetchurl {
-    url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
+    url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
     sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja";
   };
 
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index 9998d34a2dae4..e4c9b90ab1455 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -7,7 +7,7 @@ let
 
   srcs = {
     riak = fetchurl {
-      url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz";
+      url = "https://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz";
       sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p";
     };
     solr = fetchurl {
diff --git a/pkgs/servers/openafs/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 3f92299c2a0a2..3f92299c2a0a2 100644
--- a/pkgs/servers/openafs/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
diff --git a/pkgs/servers/openafs/module.nix b/pkgs/servers/openafs/1.6/module.nix
index 8cd9287a7772d..8cd9287a7772d 100644
--- a/pkgs/servers/openafs/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
diff --git a/pkgs/servers/openafs/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix
index 9e9ff623e5cd7..9e9ff623e5cd7 100644
--- a/pkgs/servers/openafs/srcs.nix
+++ b/pkgs/servers/openafs/1.6/srcs.nix
diff --git a/pkgs/servers/openafs/tsmbac.patch b/pkgs/servers/openafs/1.6/tsmbac.patch
index 412765fe8a5b7..412765fe8a5b7 100644
--- a/pkgs/servers/openafs/tsmbac.patch
+++ b/pkgs/servers/openafs/1.6/tsmbac.patch
diff --git a/pkgs/servers/openafs/1.8/bosserver.patch b/pkgs/servers/openafs/1.8/bosserver.patch
new file mode 100644
index 0000000000000..094d9871f64f5
--- /dev/null
+++ b/pkgs/servers/openafs/1.8/bosserver.patch
@@ -0,0 +1,30 @@
+diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
+--- openafs-1.8.0/src/bozo/bosserver.c
++++ #<buffer bosserver.c>
+@@ -244,24 +244,6 @@
+ static int
+ CreateDirs(const char *coredir)
+ {
+-    if ((!strncmp
+-	 (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
+-	  strlen(AFSDIR_USR_DIRPATH)))
+-	||
+-	(!strncmp
+-	 (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
+-	  strlen(AFSDIR_USR_DIRPATH)))) {
+-	if (MakeDir(AFSDIR_USR_DIRPATH))
+-	    return errno;
+-    }
+-    if (!strncmp
+-	(AFSDIR_SERVER_AFS_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
+-	 strlen(AFSDIR_SERVER_AFS_DIRPATH))) {
+-	if (MakeDir(AFSDIR_SERVER_AFS_DIRPATH))
+-	    return errno;
+-    }
+-    if (MakeDir(AFSDIR_SERVER_BIN_DIRPATH))
+-	return errno;
+     if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
+ 	return errno;
+     if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
+
+Diff finished.  Fri Jun 29 15:45:46 2018
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
new file mode 100644
index 0000000000000..59c15839b3937
--- /dev/null
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -0,0 +1,97 @@
+{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc
+, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
+, libtool_2, removeReferencesTo
+, ncurses # Extra ncurses utilities. Only needed for debugging.
+, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
+}:
+
+with (import ./srcs.nix { inherit fetchurl; });
+
+stdenv.mkDerivation rec {
+  name = "openafs-${version}";
+  inherit version srcs;
+
+  nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
+    removeReferencesTo which yacc ];
+
+  buildInputs = [ kerberos ncurses ];
+
+  patches = [ ./bosserver.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
+
+  outputs = [ "out" "dev" "man" "doc" "server" ];
+
+  enableParallelBuilding = true;
+
+  setOutputFlags = false;
+
+  # Makefiles don't include install targets for all new shared libs, yet.
+  dontDisableStatic = true;
+
+  preConfigure = ''
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "$TMP"
+    done
+
+    for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
+      substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+        "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+    done
+
+    ./regen.sh
+
+    configureFlagsArray=(
+      "--with-gssapi"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+      "--disable-kernel-module"
+      "--disable-fuse-client"
+      "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
+      ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
+      ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
+      "--disable-linux-d_splice-alias-extra-iput"
+      "--libexecdir=$server/libexec"
+    )
+  '' + stdenv.lib.optionalString (tsmbac != null) ''
+    export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
+    export XBSA_XLIBS="-ldl"
+  '';
+
+  buildFlags = [ "all_nolibafs" ];
+
+  postBuild = ''
+    for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+      make -C "''${d}" index.html
+    done
+  '';
+
+  postInstall = ''
+    mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
+    cp -r doc/{pdf,protocol,txt} README LICENSE $doc/share/doc/openafs
+    for d in AdminGuide QuickStartUnix UserGuide ; do
+      cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
+    done
+
+    rm -r $out/lib/openafs
+  '';
+
+  # Avoid references to $TMPDIR by removing it and let patchelf cleanup the
+  # binaries.
+  preFixup = ''
+    rm -rf "$(pwd)" && mkdir "$(pwd)"
+
+    find $out -type f -exec remove-references-to -t $server '{}' '+'
+  '';
+
+  meta = with stdenv.lib; {
+    outputsToInstall = [ "out" "doc" "man" ];
+    description = "Open AFS client";
+    homepage = https://www.openafs.org;
+    license = licenses.ipl10;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.z77z maintainers.spacefrogg ];
+  };
+}
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
new file mode 100644
index 0000000000000..356d3cf37c3b5
--- /dev/null
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+, kernel, glibc, perl, libtool_2, kerberos }:
+
+with (import ./srcs.nix { inherit fetchurl; });
+
+let
+  modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
+  kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+
+in stdenv.mkDerivation rec {
+  name = "openafs-${version}-${kernel.version}";
+  inherit version src;
+
+  nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
+    ++ kernel.moduleBuildDependencies;
+
+  buildInputs = [ kerberos ];
+
+  hardeningDisable = [ "pic" ];
+
+  configureFlags = [
+    "--with-linux-kernel-build=${kernelBuildDir}"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-gssapi"
+    "--disable-linux-d_splice-alias-extra-iput"
+  ];
+
+  preConfigure = ''
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "${kernelBuildDir}"
+    done
+
+    ./regen.sh -q
+  '';
+
+  buildPhase = ''
+    make V=1 only_libafs
+  '';
+
+  installPhase = ''
+    mkdir -p ${modDestDir}
+    cp src/libafs/MODLOAD-*/libafs-${kernel.version}.* ${modDestDir}/libafs.ko
+    xz -f ${modDestDir}/libafs.ko
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open AFS client kernel module";
+    homepage = https://www.openafs.org;
+    license = licenses.ipl10;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.z77z maintainers.spacefrogg ];
+    broken = (versionOlder kernel.version "3.18") || stdenv.targetPlatform.isAarch64;
+  };
+
+}
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix
new file mode 100644
index 0000000000000..e515045289998
--- /dev/null
+++ b/pkgs/servers/openafs/1.8/srcs.nix
@@ -0,0 +1,14 @@
+{ fetchurl }:
+rec {
+  version = "1.8.0";
+  src = fetchurl {
+    url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
+    sha256 = "63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d";
+  };
+
+  srcs = [ src
+    (fetchurl {
+      url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
+      sha256 = "e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8";
+    })];
+}
diff --git a/pkgs/servers/openafs/1.8/tsmbac.patch b/pkgs/servers/openafs/1.8/tsmbac.patch
new file mode 100644
index 0000000000000..f68c777b6f09d
--- /dev/null
+++ b/pkgs/servers/openafs/1.8/tsmbac.patch
@@ -0,0 +1,62 @@
+diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c
+--- openafs-1.8.0/src/butc/afsxbsa.c	2018-04-06 03:21:12.000000000 +0200
++++ openafs-1.8.0.new/src/butc/afsxbsa.c	2018-06-12 16:26:26.272522305 +0200
+@@ -651,7 +651,7 @@
+ #if defined(AFS_AIX_ENV)
+         dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
+ #elif defined (AFS_AMD64_LINUX26_ENV)
+-	dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
++	dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
+ #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
+         dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
+ #else
+diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4
+--- openafs-1.8.0/src/cf/tivoli.m4	2018-04-06 03:21:12.000000000 +0200
++++ openafs-1.8.0.new/src/cf/tivoli.m4	2018-06-12 16:26:26.072522485 +0200
+@@ -1,45 +1,7 @@
+ AC_DEFUN([OPENAFS_TIVOLI_TESTS],[
+ dnl check for tivoli
+ AC_MSG_CHECKING(for tivoli tsm butc support)
+-XBSA_CFLAGS=""
+-if test "$enable_tivoli_tsm" = "yes"; then
+-        XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
+-        XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
+-        XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
+-        XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
+-        XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
+-        XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
+-
+-        if test -r "$XBSADIR3/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR4/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR5/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR6/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR1/xbsa.h"; then
+-                XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
+-                XBSA_XLIBS=""
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR2/xbsa.h"; then
+-                XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
+-                XBSA_XLIBS=""
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        else
+-                AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
+-        fi
+-else
+-        AC_MSG_RESULT([no])
+-fi
++AC_MSG_RESULT([yes])
+ AC_SUBST(XBSA_CFLAGS)
+ AC_SUBST(XBSA_XLIBS)
+ XLIBS="$XBSA_XLIBS $XLIBS"
diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 171fcc887d216..b0cfc32e9117c 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -1,11 +1,34 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchFromGitHub, python3 }:
 
 let
   version = "2.1.9";
   sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz";
+
+  python = python3.override {
+    packageOverrides = self: super: {
+
+      # Packages pinned in setup.py.
+      # Starting with next release, a vendored version of vobject will be used.
+      python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
+        version = "2.6.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
+        };
+      });
+      vobject = super.vobject.overridePythonAttrs (oldAttrs: rec {
+        version = "0.9.5";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243";
+        };
+      });
+
+    };
+  };
 in
 
-python3Packages.buildPythonApplication {
+python.pkgs.buildPythonApplication {
   name = "radicale-${version}";
   inherit version;
 
@@ -18,7 +41,7 @@ python3Packages.buildPythonApplication {
 
   doCheck = false;
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python.pkgs; [
     vobject
     passlib
     pytz
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 1b5a8c24424a1..b7fddeb854d18 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Usenet NZB downloader, par2 repairer and auto extracting server";
-    homepage = http://sabnzbd.org;
+    homepage = https://sabnzbd.org;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fridh ];
diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix
index 91b1c8f95c1ce..4d9fc46dcf7fe 100644
--- a/pkgs/servers/samba/3.x.nix
+++ b/pkgs/servers/samba/3.x.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
 
   meta = {
-    homepage = http://www.samba.org/;
+    homepage = https://www.samba.org/;
     description = "The standard Windows interoperability suite of programs for Linux and Unix";
     platforms = stdenv.lib.platforms.linux;
     knownVulnerabilities = [
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index ba7e9c923e3bb..0ff7f88911f26 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
+, fetchpatch
 , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
 , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
@@ -13,6 +14,8 @@
 , enableRegedit ? true
 , enableCephFS ? false
 , enableGlusterFS ? false
+, enableAcl ? (!stdenv.isDarwin)
+, enablePam ? (!stdenv.isDarwin)
 }:
 
 with lib;
@@ -32,14 +35,18 @@ stdenv.mkDerivation rec {
     [ ./4.x-no-persistent-install.patch
       ./patch-source3__libads__kerberos_keytab.c.patch
       ./4.x-no-persistent-install-dynconfig.patch
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/samba-team/samba/pull/107.patch";
+        sha256 = "0r6q34vjj0bdzmcbnrkad9rww58k4krbwicv4gs1g3dj49skpvd6";
+      })
     ];
 
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline talloc popt iniparser
-      libbsd libarchive zlib acl fam libiconv gettext libunwind krb5Full
+      libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
     ]
-    ++ optionals stdenv.isLinux [ libaio pam systemd ]
+    ++ optionals stdenv.isLinux [ libaio systemd ]
     ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
@@ -47,7 +54,9 @@ stdenv.mkDerivation rec {
     ++ optional enableDomainController gnutls
     ++ optional enableRegedit ncurses
     ++ optional (enableCephFS && stdenv.isLinux) libceph
-    ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs;
+    ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs
+    ++ optional enableAcl acl
+    ++ optional enablePam pam;
 
   postPatch = ''
     # Removes absolute paths in scripts
@@ -67,7 +76,9 @@ stdenv.mkDerivation rec {
       "--localstatedir=/var"
     ]
     ++ optional (!enableDomainController) "--without-ad-dc"
-    ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
+    ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]
+    ++ optional (!enableAcl) "--without-acl-support"
+    ++ optional (!enablePam) "--without-pam";
 
   # To build in parallel.
   buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES";
@@ -89,7 +100,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.samba.org/;
+    homepage = https://www.samba.org/;
     description = "The standard Windows interoperability suite of programs for Linux and Unix";
     license = licenses.gpl3;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index c80bbbcfde914..07ebf97ab2bf5 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
       --set JAVA_HOME "${jre_headless}" \
       --set ES_JVM_OPTIONS "$out/config/jvm.options"
 
-    wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
+    wrapProgram $out/bin/elasticsearch-plugin \
+      --prefix ES_CLASSPATH : "$out/lib/*" \
+      --set JAVA_HOME "${jre_headless}"
   '';
 
   meta = {
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
index 6898ffcf1d792..ccdca1e53afc6 100644
--- a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
+++ b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
@@ -32,3 +32,12 @@ diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
 -fi
 -
 -ES_CLASSPATH="$ES_HOME/lib/*"
+diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
+--- a/bin/elasticsearch-plugin	2018-04-13 01:21:55.000000000 +0900
++++ b/bin/elasticsearch-plugin	2018-06-28 19:08:54.700969245 +0900
+@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then
+   path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR")
+ fi
+ 
+-exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}"
++exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}"
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index a4b2418f58c96..d8c8682d504e2 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   version = "8.0.2";
 
   src = fetchurl {
-    url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
+    url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
     sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4";
   };
 
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index a952dbada66fa..0e31cd8fe08ed 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "freeswitch-1.6.20";
 
   src = fetchurl {
-    url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
+    url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
     sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah";
   };
   postPatch = ''
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 40472c59a873a..241ed17d2a115 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "smcroute-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
     rev = version;
-    sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r";
+    sha256 = "0wh7c15lglcgiap9pplqpd5abnxhfx3vh0nqjzvfnl82hwhnld1z";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index e7114b957dcb9..6e78a84b4c7da 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.5163";
+  version = "2.0.0.5228";
 
   src = fetchurl {
-    url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3";
+    url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
+    sha256 = "0nys6livqzdn19f9qazs6w9mz35d1wj2f2fgcrccshrbwafrxdw1";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index fea5583ea5917..d12621a4608a7 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -2,6 +2,7 @@
 , libiconv, openssl, pcre, boost, judy, bison, libxml2
 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
+, asio, buildEnv, check, scons
 }:
 
 with stdenv.lib;
@@ -12,13 +13,22 @@ mariadb = everything // {
   inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin
   server = everything; # a full single-output build, including everything in `client` again
   inherit connector-c; # libmysqlclient.so
+  inherit galera;
+};
+
+galeraLibs = buildEnv {
+  name = "galera-lib-inputs-united";
+  paths = [ openssl.out boost check ];
 };
 
 common = rec { # attributes common to both builds
   version = "10.2.15";
 
   src = fetchurl {
-    url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz";
+    urls = [
+      "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
+      "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
+    ];
     sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik";
     name   = "mariadb-${version}.tar.gz";
   };
@@ -150,6 +160,7 @@ everything = stdenv.mkDerivation (common // {
     "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1"
     "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1"
     "-DWITH_WSREP=ON"
+    "-DWITH_INNODB_DISALLOW_WRITES=ON"
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
     "-DWITHOUT_TOKUDB=1"
@@ -159,6 +170,8 @@ everything = stdenv.mkDerivation (common // {
     rm -r "$out"/data # Don't need testing data
     rm "$out"/share/man/man1/mysql-test-run.pl.1
     rm "$out"/bin/rcmysql
+  '' + optionalString (! stdenv.isDarwin) ''
+    sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
   '';
 
   CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"
@@ -167,11 +180,11 @@ everything = stdenv.mkDerivation (common // {
 
 connector-c = stdenv.mkDerivation rec {
   name = "mariadb-connector-c-${version}";
-  version = "2.3.5";
+  version = "2.3.6";
 
   src = fetchurl {
-    url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
-    sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg";
+    url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
+    sha256 = "15iy5iqp0njbwbn086x2dq8qnbkaci7ydvi84cf5z8fxvljis9vb";
     name   = "mariadb-connector-c-${version}-src.tar.gz";
   };
 
@@ -206,4 +219,52 @@ connector-c = stdenv.mkDerivation rec {
   };
 };
 
+galera = stdenv.mkDerivation rec {
+  name = "mariadb-galera-${version}";
+  version = "25.3.23";
+
+  src = fetchurl {
+    url = "https://mirrors.nxthost.com/mariadb/mariadb-10.2.14/galera-${version}/src/galera-${version}.tar.gz";
+    sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra";
+  };
+
+  buildInputs = [ asio boost check openssl scons ];
+
+  patchPhase = ''
+    substituteInPlace SConstruct \
+      --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
+  '';
+
+  preConfigure = ''
+    export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
+    export LIBPATH="${galeraLibs}/lib"
+  '';
+
+  buildPhase = ''
+     scons -j$NIX_BUILD_CORES ssl=1 system_asio=1 strict_build_flags=0
+  '';
+
+  installPhase = ''
+    # copied with modifications from scripts/packages/freebsd.sh
+    GALERA_LICENSE_DIR="$share/licenses/${name}"
+    install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
+    install -m 555 "garb/garbd"                       "$out/bin/garbd"
+    install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"
+    install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"
+    install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
+    install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"
+    install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
+    install -m 444 "www.evanjones.ca/LICENSE"         "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
+    install -m 444 "chromium/LICENSE"                 "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
+  '';
+
+  meta = {
+    description = "Galera 3 wsrep provider library";
+    homepage = http://galeracluster.com/;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ izorkin ];
+    platforms = platforms.all;
+  };
+};
 in mariadb
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 6067d49838659..c32dcf475c5ce 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "11.29.3";
+  version = "11.29.7";
 in stdenv.mkDerivation rec {
 
   name = "monetdb-${version}";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "18l4jkkryki5az5n7gnalfdxz6ibnkg3q2z4cwh1010b313wqi8s";
+    sha256 = "19f9zfg94k8hr9qc7jp1iwl8av08mibzgmid0gbqplyhf6x1j0r7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 4017f5946a483..146d9d23198bf 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
-, boost, cctools, CoreServices, developer_cmds }:
+{ stdenv, fetchurl, cmake, bison
+, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
+, cctools, CoreServices, developer_cmds }:
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -18,7 +19,9 @@ self = stdenv.mkDerivation rec {
     export PATH=$PATH:$TMPDIR
   '';
 
-  buildInputs = [ cmake bison ncurses openssl readline zlib boost ]
+  nativeBuildInputs = [ cmake bison ];
+
+  buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
      ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
 
   enableParallelBuilding = true;
@@ -30,7 +33,11 @@ self = stdenv.mkDerivation rec {
     "-DWITH_SSL=yes"
     "-DWITH_EMBEDDED_SERVER=yes"
     "-DWITH_UNIT_TESTS=no"
-    "-DWITH_ZLIB=yes"
+    "-DWITH_EDITLINE=system"
+    "-DWITH_LIBEVENT=system"
+    "-DWITH_LZ4=system"
+    "-DWITH_PROTOBUF=system"
+    "-DWITH_ZLIB=system"
     "-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
     "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
     "-DWITH_FEDERATED_STORAGE_ENGINE=yes"
diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index 6dcd19d8d680a..a27f0ef0824c2 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.6";
 
   src = fetchurl {
-    url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
+    url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz";
     sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
   };
 
diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix
index 1206e50926ed3..c6eb4013c5ce4 100644
--- a/pkgs/servers/sql/postgresql/pgtap/default.nix
+++ b/pkgs/servers/sql/postgresql/pgtap/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       It can also be used in the xUnit testing style.
     '';
     maintainers = with maintainers; [ willibutz ];
-    homepage = http://pgtap.org;
+    homepage = https://pgtap.org;
     inherit (postgresql.meta) platforms;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
index 111b1be80f81c..684817d309baa 100644
--- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix
+++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "psqlodbc-09.01.0200";
 
   src = fetchurl {
-    url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+    url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
     sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9";
   };
 
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index bbb9b6ca51913..eb513d3aca621 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.19c";
 
   src = fetchurl {
-    url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
+    url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
     sha256 = "1wvvqj9r293skgqi28q4ixz7zwf301h1bf514p41xbi7ifldy4dv";
   };
 
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index a3c505646214f..2db004d9000f7 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "trezord-go-${version}";
-  version = "2.0.12";
+  version = "2.0.14";
 
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
   hardeningDisable = [ "fortify" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "trezor";
     repo   = "trezord-go";
     rev    = "v${version}";
-    sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6";
+    sha256 = "1bnzib1cbs7cj6vdf015vr60vm5wgfgbqajcpqxcikfckwhjsykv";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index 6f584bfabd3d4..b3714c7a0c281 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Web-based news feed (RSS/Atom) aggregator";
     license = licenses.gpl2Plus;
-    homepage = http://tt-rss.org;
+    homepage = https://tt-rss.org;
     maintainers = with maintainers; [ globin zohl ];
     platforms = platforms.all;
   };
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 0ccf4c5bd0beb..87d0a0ee45539 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "0.5.0";
 
   src = fetchurl {
-    url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
+    url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
     sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5";
   };
 
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index bb3f79855330f..4045db5e5f22c 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -49,11 +49,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uwsgi-${version}";
-  version = "2.0.17";
+  version = "2.0.17.1";
 
   src = fetchurl {
-    url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix";
+    url = "https://projects.unbit.it/downloads/${name}.tar.gz";
+    sha256 = "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 85192b11c30f5..68660ce6b36c8 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -7,7 +7,7 @@ let
       name = "varnish-${version}";
 
       src = fetchurl {
-        url = "http://varnish-cache.org/_downloads/${name}.tgz";
+        url = "https://varnish-cache.org/_downloads/${name}.tgz";
         inherit sha256;
       };
 
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 27cf873e7908b..a4a26fd506bc2 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "1l656b194h7z3k52ywl7sfa2h6sxa5gf22wcfrp0pp07v9p6pc5f";
+    sha256 = "0ifrgaw30h4d6hwwzrz8i9k036dxzkxgh71y9s0ds10lhr8vidym";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 4ed9d96510c84..615efa3b36720 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -19,10 +19,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Web-based news feed (RSS/Atom) aggregator";
+    homepage = https://selfoss.aditu.de;
     license = licenses.gpl3;
-    homepage = http://http://selfoss.aditu.de/;
+    maintainers = with maintainers; [ jtojnar regnat ];
     platforms = platforms.all;
-    maintainers = [ maintainers.regnat ];
   };
 }
-
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 8f6722ed86ecc..cee098db6b277 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-${version}";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "0vi59988bjxb1cyifh0fynpxa7l6cl0v57hrxima5c9iid10pw54";
+    sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l";
   };
 
   outputs = [ "out" "doc" ];
diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
new file mode 100644
index 0000000000000..e20acdb04a9e9
--- /dev/null
+++ b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
@@ -0,0 +1,14 @@
+diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp
+index acd195d..8809e4f 100644
+--- a/src/virtlyst.cpp
++++ b/src/virtlyst.cpp
+@@ -340,7 +340,8 @@ bool Virtlyst::createDB()
+         qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text();
+         return false;
+     }
+-    const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex());
++    const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD",
++            QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()));
+     query.bindValue(QStringLiteral(":password"), QString::fromLatin1(
+                         CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16)));
+     if (!query.exec()) {
diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix
new file mode 100644
index 0000000000000..c6245f9b40d2e
--- /dev/null
+++ b/pkgs/servers/web-apps/virtlyst/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook
+, qtbase, libvirt, cutelyst, grantlee }:
+
+stdenv.mkDerivation rec {
+  name = "virtlyst-${version}";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "cutelyst";
+    repo = "Virtlyst";
+    rev = "v${version}";
+    sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ];
+  buildInputs = [ qtbase libvirt cutelyst grantlee ];
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp src/libVirtlyst.so $out/lib
+    cp -r ../root $out
+  '';
+
+  patches = [ ./add-admin-password-env.patch ];
+
+  meta = with lib; {
+    description = "Web interface to manage virtual machines with libvirt";
+    homepage = https://github.com/cutelyst/Virtlyst;
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e6f5e7ff58878..6d2a92dd78b14 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -171,7 +171,7 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -183,7 +183,7 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -195,7 +195,7 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -207,7 +207,7 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -219,7 +219,7 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -243,7 +243,7 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -255,7 +255,7 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -267,7 +267,7 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -279,7 +279,7 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -291,7 +291,7 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -303,7 +303,7 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -315,7 +315,7 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -327,7 +327,7 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -339,7 +339,7 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -351,7 +351,7 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -363,7 +363,7 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -375,7 +375,7 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -387,7 +387,7 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -399,7 +399,7 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -411,7 +411,7 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -423,7 +423,7 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -435,7 +435,7 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -447,7 +447,7 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -459,7 +459,7 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -471,7 +471,7 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -483,7 +483,7 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -495,7 +495,7 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -507,7 +507,7 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -519,7 +519,7 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
@@ -531,7 +531,7 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -543,7 +543,7 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -567,7 +567,7 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -591,7 +591,7 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
@@ -603,7 +603,7 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
@@ -1424,11 +1424,11 @@ let
   }) // {inherit libX11 libXau libXext libXmu xproto ;};
 
   xbacklight = (mkDerivation "xbacklight" {
-    name = "xbacklight-1.2.1";
+    name = "xbacklight-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2;
-      sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
+      url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2;
+      sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libxcb xcbutil ];
@@ -1475,7 +1475,7 @@ let
     name = "xcb-util-cursor-0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2;
+      url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2;
       sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -1676,11 +1676,11 @@ let
   }) // {inherit ;};
 
   xeyes = (mkDerivation "xeyes" {
-    name = "xeyes-1.1.1";
+    name = "xeyes-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2;
-      sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
+      url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2;
+      sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 libXext libXmu libXrender libXt ];
@@ -2468,11 +2468,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.23.1";
+    name = "xkeyboard-config-2.24";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.23.1.tar.bz2;
-      sha256 = "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2;
+      sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 6de53faf7710c..06f54fd520737 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,9 +1,8 @@
-
 { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
 
 with stdenv.lib;
 
-overrideDerivation xorgserver (oldAttrs: {
+xorgserver.overrideAttrs (oldAttrs: {
 
   name = "xwayland-${xorgserver.version}";
   propagatedBuildInputs = oldAttrs.propagatedBuildInputs
@@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: {
     rm -fr $out/share/X11/xkb/compiled
   '';
 
-}) // {
   meta = {
     description = "An X server for interfacing X11 apps with the Wayland protocol";
-    homepage = http://wayland.freedesktop.org/xserver.html;
+    homepage = https://wayland.freedesktop.org/xserver.html;
     license = licenses.mit;
     platforms = platforms.linux;
   };
-}
-
-
-
+})
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 40f630999450e..ed6fef05a263e 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   name = "prosody-${version}";
 
   src = fetchurl {
-    url = "http://prosody.im/downloads/source/${name}.tar.gz";
+    url = "https://prosody.im/downloads/source/${name}.tar.gz";
     sha256 = "13knr7izscw0zx648b9582dx11aap4cq9bzfiqh5ykd7wwsz1dbm";
   };
 
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index c382061f1ef67..6a657cc634f36 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
     cp -R conf docs lib ${name}.jar $out
     mkdir -p $out/bin
     cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
-    for i in $out/bin/{zkCli,zkCleanup}.sh; do
+    patchShebangs $out/bin
+    for i in $out/bin/{zkCli,zkCleanup,zkServer}.sh; do
       wrapProgram $i \
         --set JAVA_HOME "${jre}" \
         --prefix PATH : "${bash}/bin"
diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix
index 2d5128120295a..a79ec90213a0b 100644
--- a/pkgs/shells/bash/bash-4.4-patches.nix
+++ b/pkgs/shells/bash/bash-4.4-patches.nix
@@ -20,4 +20,8 @@ patch: [
 (patch "017" "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp")
 (patch "018" "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v")
 (patch "019" "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7")
+(patch "020" "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q")
+(patch "021" "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx")
+(patch "022" "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5")
+(patch "023" "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g")
 ]
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 5a00a1ee41951..086fca480bb3e 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -20,4 +20,8 @@ buildGoPackage rec {
     maintainers = with maintainers; [ vrthra ];
     platforms = with platforms; linux ++ darwin;
   };
+
+  passthru = {
+    shellPath = "/bin/elvish";
+  };
 }
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 7c2caa96d898b..a03aa338a83ce 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
+      "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
       "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
     ];
     sha256 = "0xzv5b83b8ccn3d4qvwz3gk83fi1d42kphax1527nni1472fp1nx";
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index 9374949161121..a053884bb8854 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, cacert,
-  makeWrapper, less, openssl }:
+{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
+  makeWrapper, less, openssl, pam, lttng-ust }:
 
 let platformString = if stdenv.isDarwin then "osx"
                      else if stdenv.isLinux then "linux"
@@ -10,6 +10,7 @@ let platformString = if stdenv.isDarwin then "osx"
     platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                      else if stdenv.isLinux then "LD_LIBRARY_PATH"
                      else throw "unsupported platform";
+    libraries = [ libunwind libuuid icu curl openssl lttng-ust ] ++ (if stdenv.isLinux then [ pam ] else []);
 in
 stdenv.mkDerivation rec {
   name = "powershell-${version}";
@@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  buildInputs = [ autoPatchelfHook makeWrapper ];
-  propagatedBuildInputs = [ libunwind libuuid icu curl cacert less openssl ];
+  buildInputs = [ less ] ++ libraries;
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
   # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in
   # https://github.com/PowerShell/PowerShell/pull/6144
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/powershell
     cp -r * $out/share/powershell
     rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY
-    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath [ libunwind libuuid icu openssl curl ]}" \
+    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
                                            --set PAGER ${less}/bin/less --set TERM xterm
   '';
 
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 0e4d23ffd5cfb..6522985ab8641 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.6";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "09w7656qhqv3al52cl5lgzawvkbkpwjfnxyg0vyx0gbjs1hwiqjj";
+    sha256= "1a74xpww7k432b2z44388rl31nqvckn2q3fswci04f48698hzs5l";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index b95ba35045d09..665f403047f39 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "antibody-${version}";
-  version = "3.4.6";
+  version = "3.5.1";
   rev = "v${version}";
   
   goPackagePath = "github.com/getantibody/antibody";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner  = "getantibody";
     repo   = "antibody";
-    sha256 = "0pvsngvlxv5iw7yj18snslag8c61ji4w3j3rw543ckl6k3f9zq6c";
+    sha256 = "0bqq59vnnm80jiqlhn7wfyzj96nkv8k9zp8i4sgcj8gvk1zq2lbc";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
index 6e97ff3190292..b824358fbbabc 100644
--- a/pkgs/shells/zsh/antibody/deps.nix
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -1,82 +1,109 @@
 [
   {
-    goPackagePath = "github.com/alecthomas/kingpin";
+    goPackagePath  = "github.com/alecthomas/kingpin";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/kingpin";
-      rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
+      rev =  "a39589180ebd6bbf43076e514b55f20a95d43086";
       sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
     };
   }
   {
-    goPackagePath = "github.com/alecthomas/template";
+    goPackagePath  = "github.com/alecthomas/template";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/template";
-      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      rev =  "a0175ee3bccc567396460bf5acd36800cb10c49c";
       sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
     };
   }
   {
-    goPackagePath = "github.com/alecthomas/units";
+    goPackagePath  = "github.com/alecthomas/units";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/units";
-      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      rev =  "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
       sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
     };
   }
   {
-    goPackagePath = "github.com/caarlos0/gohome";
+    goPackagePath  = "github.com/caarlos0/gohome";
     fetch = {
       type = "git";
       url = "https://github.com/caarlos0/gohome";
-      rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
+      rev =  "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
       sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
     };
   }
   {
-    goPackagePath = "github.com/getantibody/folder";
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getantibody/folder";
     fetch = {
       type = "git";
       url = "https://github.com/getantibody/folder";
-      rev = "e65aa38ebeb03e6d6e91b90a637f3b7c17e1b6d6";
-      sha256 = "0h8al3sl4gxg1p33s8jrz91i7vrqahk12p0b3srlhnz1sn4ahn8n";
+      rev =  "479aa91767d47bc27599e6ebc7fd07945dd38132";
+      sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "12b6f73e6084dad08a7c6e575284b177ecafbc71";
+      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
     };
   }
   {
-    goPackagePath = "golang.org/x/crypto";
+    goPackagePath  = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
       sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
       sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
     };
   }
   {
-    goPackagePath = "golang.org/x/sync";
+    goPackagePath  = "golang.org/x/sync";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      rev =  "1d60e4601c6fd243af51cc01ddf169918a5407ca";
       sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
+    goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      rev =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
       sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
     };
   }
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix
new file mode 100644
index 0000000000000..9a3f5ec3cc49f
--- /dev/null
+++ b/pkgs/shells/zsh/gradle-completion/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gradle-completion-${version}";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "gradle";
+    repo = "gradle-completion";
+    rev = "v${version}";
+    sha256 = "02vv360r78ckwc6r4xbhmy5dxz6l9ya4lq9c62zh12ciq94y9kgx";
+  };
+
+  # we just move two files into $out,
+  # this shouldn't bother Hydra.
+  preferLocalBuild = true;
+
+  dontBuild = true;
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle
+    install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gradle tab completion for bash and zsh";
+    homepage = https://github.com/gradle/gradle-completion;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1ff9455adeceb..a11a530bcdb10 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
     $ cp -v $(nix-env -q --out-path oh-my-zsh | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
   '';
-  homepage        = "http://ohmyz.sh/";
+  homepage        = https://ohmyz.sh/;
   license         = licenses.mit;
   platforms       = platforms.all;
   maintainers     = with maintainers; [ scolobb nequissimus ];
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index 453a577440711..390039944c09e 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -8,14 +8,14 @@
 #   '';
 
 stdenv.mkDerivation rec {
-  version = "2017-05-09";
+  version = "2018-04-30";
   name = "zsh-command-time-${version}";
 
   src = fetchFromGitHub {
     owner = "popstas";
     repo = "zsh-command-time";
-    rev = "2111361cbc88c542c834fbab7802ae5ae8339824";
-    sha256 = "0hr9c7196wy9cg7vkmknszr2h446yvg9pqrq0rf3213kz074dhpg";
+    rev = "afb4a4c9ae7ce64ca9d4f334a79a25e46daad0aa";
+    sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq";
   };
 
   installPhase = ''
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 41b5fd99504d7..ab42dd319a62e 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -41,10 +41,8 @@ in lib.init bootStages ++ [
       targetPlatform = crossSystem;
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit)
-             then buildPackages.androidenv.androidndkPkgs_10e.gcc
-           else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
-             then buildPackages.androidenv.androidndkPkgs.gcc
+           else if crossSystem.useAndroidPrebuilt
+             then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
     };
   })
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 951c96877f960..366be3915802d 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -159,26 +159,27 @@ in rec {
         dyld = bootstrapTools;
       };
 
-      libcxx = stdenv.mkDerivation {
-        name = "bootstrap-stage0-libcxx";
-        phases = [ "installPhase" "fixupPhase" ];
-        installPhase = ''
-          mkdir -p $out/lib $out/include
-          ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
-          ln -s ${bootstrapTools}/include/c++      $out/include/c++
-        '';
-        linkCxxAbi = false;
-        setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh;
-      };
+      llvmPackages_5 = {
+        libcxx = stdenv.mkDerivation {
+          name = "bootstrap-stage0-libcxx";
+          phases = [ "installPhase" "fixupPhase" ];
+          installPhase = ''
+            mkdir -p $out/lib $out/include
+            ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
+            ln -s ${bootstrapTools}/include/c++      $out/include/c++
+          '';
+          linkCxxAbi = false;
+          setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh;
+        };
 
-      libcxxabi = stdenv.mkDerivation {
-        name = "bootstrap-stage0-libcxxabi";
-        buildCommand = ''
-          mkdir -p $out/lib
-          ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
-        '';
+        libcxxabi = stdenv.mkDerivation {
+          name = "bootstrap-stage0-libcxxabi";
+          buildCommand = ''
+            mkdir -p $out/lib
+            ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
+          '';
+        };
       };
-
     };
 
     extraNativeBuildInputs = [];
@@ -236,8 +237,13 @@ in rec {
         patchutils m4 scons flex perl bison unifdef unzip openssl python
         gettext sharutils libarchive pkg-config groff bash subversion
         openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
-        findfreetype libssh curl cmake autoconf automake libtool cpio
-        libcxx libcxxabi;
+        findfreetype libssh curl cmake autoconf automake libtool cpio;
+
+      llvmPackages_5 = super.llvmPackages_5 // (let
+        libraries = super.llvmPackages_5.libraries.extend (_: _: {
+          inherit (llvmPackages_5) libcxx libcxxabi;
+        });
+      in { inherit libraries; } // libraries);
 
       darwin = super.darwin // {
         inherit (darwin)
@@ -272,14 +278,17 @@ in rec {
     persistent = self: super: with prevStage; {
       inherit
         gnumake gzip gnused bzip2 gawk ed xz patch bash
-        libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
+        ncurses libffi zlib gmp pcre gnugrep
         coreutils findutils diffutils patchutils;
 
-       llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
-       in super.llvmPackages // {
-         llvm = llvmOverride;
-         clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
-       };
+      llvmPackages_5 = super.llvmPackages_5 // (let
+        tools = super.llvmPackages_5.tools.extend (llvmSelf: _: {
+          inherit (llvmPackages_5) llvm clang-unwrapped;
+        });
+        libraries = super.llvmPackages_5.libraries.extend (llvmSelf: _: {
+          inherit (llvmPackages_5) libcxx libcxxabi compiler-rt;
+        });
+      in { inherit tools libraries; } // tools // libraries);
 
       darwin = super.darwin // {
         inherit (darwin) dyld Libsystem libiconv locale;
@@ -311,12 +320,25 @@ in rec {
     persistent = self: super: with prevStage; {
       inherit
         gnumake gzip gnused bzip2 gawk ed xz patch bash
-        libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
+        ncurses libffi zlib llvm gmp pcre gnugrep
         coreutils findutils diffutils patchutils;
 
-      llvmPackages = super.llvmPackages // {
-        inherit (llvmPackages) llvm clang-unwrapped;
-      };
+      llvmPackages_5 = super.llvmPackages_5 // (let
+        tools = super.llvmPackages_5.tools.extend (_: super: {
+          # Build man pages with final stdenv not before
+          llvm = lib.extendDerivation
+            true
+            { inherit (super.llvm) man; }
+            llvmPackages_5.llvm;
+          clang-unwrapped = lib.extendDerivation
+            true
+            { inherit (super.clang-unwrapped) man; }
+            llvmPackages_5.clang-unwrapped;
+        });
+        libraries = super.llvmPackages_5.libraries.extend (_: _: {
+          inherit (llvmPackages_5) compiler-rt libcxx libcxxabi;
+        });
+      in { inherit tools libraries; } // tools // libraries);
 
       darwin = super.darwin // {
         inherit (darwin) dyld ICU Libsystem libiconv;
@@ -348,19 +370,9 @@ in rec {
     initialPath = import ../common-path.nix { inherit pkgs; };
     shell       = "${pkgs.bash}/bin/bash";
 
-    cc = lib.callPackageWith {} ../../build-support/cc-wrapper {
-      inherit (pkgs) stdenvNoCC;
-      inherit shell;
-      nativeTools = false;
-      nativeLibc  = false;
-      buildPackages = {
-        inherit (prevStage) stdenv;
-      };
-      inherit (pkgs) coreutils gnugrep;
-      cc       = pkgs.llvmPackages.clang-unwrapped;
-      bintools = pkgs.darwin.binutils;
-      libc     = pkgs.darwin.Libsystem;
-      extraPackages = [ pkgs.libcxx ];
+    # Hack to avoid man pages in stdenv, building bootstrap python
+    cc = pkgs.llvmPackages.libcxxClang.override {
+      cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ];
     };
 
     extraNativeBuildInputs = [];
@@ -377,7 +389,8 @@ in rec {
 
     allowedRequisites = (with pkgs; [
       xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out
-      bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
+      bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib llvmPackages.compiler-rt llvmPackages.compiler-rt.dev
+      zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
       binutils.bintools darwin.binutils darwin.binutils.bintools
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index dce715a6a53ec..778f107f71e14 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -77,8 +77,13 @@ rec {
 
     , ... } @ attrs:
 
-    # TODO(@Ericson2314): Make this more modular, and not O(n^2).
     let
+      fixedOutputDrv = attrs ? outputHash;
+      noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated
+                                      ++ depsHostHost ++ depsHostHostPropagated
+                                      ++ buildInputs ++ propagatedBuildInputs
+                                      ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
+      runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps;
       supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
       defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags;
       enabledHardeningOptions =
@@ -168,7 +173,11 @@ rec {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
           name = assert validity.handled; name + lib.optionalString
-            (stdenv.hostPlatform != stdenv.buildPlatform)
+            # Fixed-output derivations like source tarballs shouldn't get a host
+            # suffix. But we have some weird ones with run-time deps that are
+            # just used for their side-affects. Those might as well since the
+            # hash can't be the same. See #32986.
+            (stdenv.hostPlatform != stdenv.buildPlatform && runtimeSensativeIfFixedOutput)
             ("-" + stdenv.hostPlatform.config);
 
           builder = attrs.realBuilder or stdenv.shell;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 6c217be4ea3c7..0dd65bd2478dc 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -14,7 +14,6 @@ in with (import ../../../lib).systems.examples; {
   armv7l     = make armv7l-hf-multiplatform;
   aarch64    = make aarch64-multiplatform;
   x86_64-musl  = make musl64;
-  i686-musl    = make musl32;
   armv6l-musl  = make muslpi;
   aarch64-musl = make aarch64-multiplatform-musl;
   riscv64 = make riscv64;
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 7061adb8e88a5..7bd82b4ab2a53 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -3,7 +3,9 @@ with stdenv.lib;
 let
   # Sanitizers are not supported on Darwin.
   # Sanitizer headers aren't available in older libc++ stdenvs due to a bug
-  sanitizersBroken = stdenv.isDarwin || stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0;
+  sanitizersWorking =
+       (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0")
+    || (stdenv.cc.isGNU && stdenv.isLinux);
 in stdenv.mkDerivation {
   name = "cc-wrapper-test";
 
@@ -43,7 +45,7 @@ in stdenv.mkDerivation {
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
 
-    ${optionalString (!sanitizersBroken) ''
+    ${optionalString sanitizersWorking ''
       printf "checking whether sanitizers are fully functional... ">&2
       $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
       ./sanitizers
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix
index 8bbe1b6a52b65..f33d03b6d15f1 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@@ -6,7 +6,7 @@ in buildPythonApplication rec {
   name = "arandr-0.1.9";
 
   src = fetchurl {
-    url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz";
+    url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz";
     sha256 = "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv";
   };
 
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 8ad1b6f6455ec..14fe769db6bed 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
   name = "bumblebee-${version}";
 
   src = fetchurl {
-    url = "http://bumblebee-project.org/${name}.tar.gz";
+    url = "https://bumblebee-project.org/${name}.tar.gz";
     sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h";
   };
 
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 23e528297eef3..1e7b4e58c171f 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Generate X11 mouse clicks from keyboard";
-    homepage = http://www.semicomplete.com/projects/keynav/;
+    homepage = https://www.semicomplete.com/projects/keynav/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
index a20b7d69f3dc8..21d7a50566db3 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "vdpauinfo-1.0";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
+    url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
     sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20";
   };
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libvdpau ];
 
   meta = with stdenv.lib; {
-    homepage = http://people.freedesktop.org/~aplattner/vdpau/;
+    homepage = https://people.freedesktop.org/~aplattner/vdpau/;
     description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system";
     license = licenses.mit; # expat version
     platforms = platforms.unix;
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index 31ad524cf8f3a..2703379a23b96 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "x2vnc-1.7.2";
 
   src = fetchurl {
-    url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
+    url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
     sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
   };
 
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 1c23593bd1419..e633ba4f794ae 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -4,7 +4,7 @@ let version = "1.8.6"; in
 stdenv.mkDerivation {
   name = "xbindkeys-${version}";
   src = fetchurl {
-    url = "http://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
+    url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
     sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
   };
 
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix
index e66b184c04cc6..f4112765e6757 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
 
   name = "xbrightness-0.3-mika-akk";
   src = fetchurl {
-    url = http://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz;
+    url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz;
     sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
   };
 
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 3e0680cac4493..c72fab015d9fe 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xdg-user-dirs-0.17";
 
   src = fetchurl {
-    url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
   };
 
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix
index f69d5d80649b6..59ddac0eca159 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/pkgs/tools/X11/xdotool/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   makeFlags = "PREFIX=$(out)";
 
   meta = {
-    homepage = http://www.semicomplete.com/projects/xdotool/;
+    homepage = https://www.semicomplete.com/projects/xdotool/;
     description = "Fake keyboard/mouse input, window management, and more";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index e22338dbc7187..2faa8ead07165 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";
-  version = "0.4.8";
+  version = "0.4.9";
 
   doCheck = false;
 
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     repo = "xidlehook";
     rev = version;
 
-    sha256 = "1125n5szgq7bziz3lkrhb2a2iac93ap63g2xr78ap7b9i3gxs3xh";
+    sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw";
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 279b2e8321a4d..7523bab2e8c36 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchurl {
-    url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry";
+    url = "https://xpra.org/src/${name}.tar.xz";
+    sha256 = "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 7e620e0c2c81c..a0c2ee8f995f0 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -10,7 +10,7 @@ buildPythonApplication rec {
   version = "2.2.5";
 
   src = fetchurl {
-    url = "http://xpra.org/src/${name}.tar.xz";
+    url = "https://xpra.org/src/${name}.tar.xz";
     sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
   };
 
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
new file mode 100644
index 0000000000000..176b9fa0068ae
--- /dev/null
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, libX11, libXcomposite, libXft, pam, apacheHttpd, imagemagick
+, pamtester, xscreensaver }:
+
+stdenv.mkDerivation rec {
+  name = "xsecurelock-git-2018-07-10";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "xsecurelock";
+    rev = "0fa0d7dd87a4cc4bdb402323f95c3fcacc6f5049";
+    sha256 = "071b3gslszql1mgabs53r82jgbk9mn263m5v6adskfxbkamks8g0";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [
+    libX11 libXcomposite libXft pam
+    apacheHttpd imagemagick pamtester
+  ];
+
+  configureFlags = [
+    "--with-pam-service-name=login"
+    "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
+  ];
+
+  meta = with lib; {
+    description = "X11 screen lock utility with security in mind";
+    homepage = https://github.com/google/xsecurelock;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix
new file mode 100644
index 0000000000000..7ece3acbd6794
--- /dev/null
+++ b/pkgs/tools/admin/adtool/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, openldap }:
+
+stdenv.mkDerivation rec {
+  name = "adtool-${version}";
+  version = "1.3.3";
+
+  src = fetchurl {
+    url = "https://gp2x.org/adtool/${name}.tar.gz";
+    sha256  = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n";
+  };
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+  ];
+
+  installFlags = [
+    "sysconfdir=$(out)/etc"
+  ];
+
+  buildInputs = [ openldap ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $out/share/doc/adtool
+    mv $out/etc/* $out/share/doc/adtool
+    rmdir $out/etc
+  '';
+
+  # It requires an LDAP server for tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Active Directory administration utility for Unix";
+    homepage = https://gp2x.org/adtool;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 11ab58bc62f85..363214129b284 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -21,7 +21,7 @@ let
     inherit version;
 
     src = fetchurl {
-      url = "http://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
+      url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 4e7e2d402e90d..331a4bffb814b 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.15.10";
+  version = "1.15.58";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0nwpanbfx5h0bad8wwvvbhpjf9r6n885bbv2w8mw7vijdgclkq8x";
+    sha256 = "19wnr498q2mwbp8l978ahy9y7p7icahx53898fki6sbhd9pn2miq";
   };
 
   # No tests included
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
new file mode 100644
index 0000000000000..e69de29bb2d1d
--- /dev/null
+++ b/pkgs/tools/admin/azure-cli/default.nix
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index a5e0186fa2dc3..a037a2e42aaa6 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bubblewrap-${version}";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l";
+    sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8";
   };
 
   nativeBuildInputs = [ libcap libxslt docbook_xsl ];
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index b109a835635bd..c3d6faeac5274 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -19,18 +19,18 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "0c4jj580f7z6phiw4zhd32dlf4inkrxy3cig6ng66fi4zi6vnpc9";
+      sha256 = "0fdcd5d63e231443b9e032de4e2c2be9e4f1c766a25054ad93410f5213e45645";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "0rblb0akwdzr5i8al0dcz482xmx1xdnjnzgqywjvwd8fzdyzq7bp";
+      sha256 = "d39293914b2e969bfe18dd19eb77ba96d283995f8cf1e5d7ba6ac712a3c9479a";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "190.0.1";
+  version = "206.0.0";
 
   src = fetchurl (sources name stdenv.system);
 
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index fe165b1e66e30..07311c2c64a27 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -1,15 +1,15 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "lego-unstable-${version}";
-  version = "2018-02-02";
-  rev = "06a8e7c475c03ef8d4773284ac63357d2810601b";
+  name = "lego-${version}";
+  version = "1.0.1";
+  rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "xenolf";
     repo = "lego";
-    sha256 = "11a9gcgi3317z4lb1apkf6dnbjhf7xni0670nric3fbf5diqfwh2";
+    sha256 = "1l9winhqwid8ac8il303qkhsn0v5h7zhlklviszfi1rjal38ipiz";
   };
 
   goPackagePath = "github.com/xenolf/lego";
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index cfbb90fdc3082..dfe4c099bebbd 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl
-, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables
+, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
+, squashfsTools, iproute, iptables, ebtables
 }:
 
 buildGoPackage rec {
@@ -26,7 +27,7 @@ buildGoPackage rec {
     rm $bin/bin/{deps,macaroon-identity}
 
     wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [
-      acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables
+      acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables
     ]}
   '';
 
diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index bd0f051bd8458..1a85bf21b2248 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -7,7 +7,6 @@ with python.pkgs;
 buildPythonApplication rec {
   pname = "mycli";
   version = "1.6.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index c39c378d22169..b29d80e159b0a 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2";
-    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
+    url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   buildInputs = [ libxcomp ];
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index eaae8f40bfab6..80df9148220c1 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -1,41 +1,31 @@
 {
-  stdenv, python2Packages, openssl,
+  stdenv, pythonPackages, openssl,
 
   # Many Salt modules require various Python modules to be installed,
   # passing them in this array enables Salt to find them.
   extraInputs ? []
 }:
 
-let
-  # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved
-  tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec {
-    version = "4.5.3";
-    name = "${oldAttrs.pname}-${version}";
-    src = oldAttrs.src.override {
-      inherit version;
-      sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
-    };
-  });
-in
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "salt";
-  version = "2018.3.0";
+  version = "2018.3.2";
 
-  src = python2Packages.fetchPypi {
+  src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950";
+    sha256 = "d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd";
   };
 
-  propagatedBuildInputs = with python2Packages; [
-    futures
+  propagatedBuildInputs = with pythonPackages; [
     jinja2
     markupsafe
-    msgpack-python
+    msgpack
     pycrypto
     pyyaml
     pyzmq
     requests
     tornado
+  ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
+    futures
   ] ++ extraInputs;
 
   patches = [ ./fix-libcrypto-loading.patch ];
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix
new file mode 100644
index 0000000000000..8d30307af2d3c
--- /dev/null
+++ b/pkgs/tools/admin/ssl-cert-check/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, makeWrapper
+, openssl
+, which
+, gnugrep
+, gnused
+, gawk
+, mktemp
+, coreutils
+, findutils
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ssl-cert-check";
+  name = "${pname}-${version}";
+  version = "3.31";
+
+  src = fetchFromGitHub {
+    owner = "Matty9191";
+    repo = pname;
+    rev = "698c1996d05152cfaf2a1a3df4cc70482411fac8";
+    sha256 = "0jvi9phs0ngfwrj9zixb03v9byavbwxx8xkp0h5m98qppn1kvl3n";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [
+    openssl
+    which
+    gnugrep
+    mktemp
+    gawk
+    gnused
+    coreutils
+    findutils
+  ];
+
+  prePatch = ''
+    substituteInPlace $pname --replace PATH= NOT_PATH=
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $pname $out/bin/$pname
+    wrapProgram $out/bin/$pname \
+      --set PATH "${stdenv.lib.makeBinPath buildInputs}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "a Bourne shell script that can be used to report on expiring SSL certificates";
+    homepage = https://github.com/Matty9191/ssl-cert-check;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ryantm ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index 2e9d8cafdc077..782e0f461ece2 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "cabextract-1.6";
 
   src = fetchurl {
-    url = "http://www.cabextract.org.uk/${name}.tar.gz";
+    url = "https://www.cabextract.org.uk/${name}.tar.gz";
     sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf";
   };
 
diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index 77536a7ad30eb..68f7f02e74134 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "cromfs-1.5.10.2";
 
   src = fetchurl {
-    url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
+    url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
     sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817";
   };
 
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index 546e9a7aad98d..14b128d15c7a3 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -3,11 +3,11 @@
 , withGog ? false, unar ? null }:
 
 stdenv.mkDerivation rec {
-  name = "innoextract-1.6";
+  name = "innoextract-1.7";
 
   src = fetchurl {
     url = "http://constexpr.org/innoextract/files/${name}.tar.gz";
-    sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6";
+    sha256 = "197hs9aj1ska6czrsq4caazsw9v0xbaa0lazbh380fmwy8rbgvy1";
   };
 
   buildInputs = [ python lzma boost ];
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 886ed81790914..6cabd8ff976bd 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch rec {
       name = "CVE-2016-9296.patch";
-      url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d";
+      url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/12-${name}";
       sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m";
     })
     (fetchpatch rec {
       name = "CVE-2017-17969.patch";
-      url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5";
-      sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7";
+      url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/13-${name}";
+      sha256 = "00pycdwx6gw7w591bg54ym6zhbxgn47p3zhms6mnmaycfzw09mkn";
     })
   ];
 
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix
index 715efe719922f..05d6a4718de97 100644
--- a/pkgs/tools/archivers/pxattr/default.nix
+++ b/pkgs/tools/archivers/pxattr/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pxattr-2.1.0";
 
   src = fetchurl {
-    url = "http://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz";
+    url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz";
     sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z";
   };
 
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index 2505c012b26b1..217a8ab35a9e0 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
-    url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
+    url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
   };
 
   preInstall = ''
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 6d979bbf33d8b..9e05043d4b022 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     urls = [
       ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz
-      http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
+      https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
     ];
     sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
   };
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index e9eec597384c1..1fd092577f74e 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.13.22";
+  version = "8.13.23";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0csfg7aj9zg369q3c3bg18f24lk1j0356a90zlbrz7y5p668g3pv";
+    sha256 = "00bc4vsdvnyznfwcrkij02n2736nsbjlrh0rng96zv00p4abv4ad";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index a0e7b1f906c92..2d54c182349ca 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.05.02";
+  version = "2018.06.23";
 
   src = fetchzip {
-    url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24";
+    url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
+    sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b53a9b7eb0f3f..b6ff7e5c9673a 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -17,6 +17,7 @@
 , enableLastfm         ? true
 , enableMpd            ? true
 , enableReplaygain     ? true, bs1770gain ? null
+, enableSonosUpdate    ? true
 , enableThumbnails     ? true
 , enableWeb            ? true
 
@@ -37,6 +38,7 @@ assert enableKeyfinder   -> keyfinder-cli != null;
 assert enableLastfm      -> pythonPackages.pylast         != null;
 assert enableMpd         -> pythonPackages.mpd2           != null;
 assert enableReplaygain  -> bs1770gain                    != null;
+assert enableSonosUpdate -> pythonPackages.soco           != null;
 assert enableThumbnails  -> pythonPackages.pyxdg          != null;
 assert enableWeb         -> pythonPackages.flask          != null;
 
@@ -59,6 +61,7 @@ let
     mpdstats = enableMpd;
     mpdupdate = enableMpd;
     replaygain = enableReplaygain;
+    sonosupdate = enableSonosUpdate;
     thumbnails = enableThumbnails;
     web = enableWeb;
   };
@@ -95,13 +98,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "0m8macydkn1fp4ymig0rg7bzw77rrm454q763gxdpq2kg08yl5py";
+    sha256 = "17gfz0g7pqm6wha8zf63zpw07zgi787w1bjwdcxdh1l3z4m7jc9l";
   };
 
   propagatedBuildInputs = [
@@ -129,6 +132,7 @@ in pythonPackages.buildPythonApplication rec {
     ++ optional enableKeyfinder     keyfinder-cli
     ++ optional enableLastfm        pythonPackages.pylast
     ++ optional enableMpd           pythonPackages.mpd2
+    ++ optional enableSonosUpdate   pythonPackages.soco
     ++ optional enableThumbnails    pythonPackages.pyxdg
     ++ optional enableWeb           pythonPackages.flask
     ++ optional enableAlternatives  plugins.alternatives
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 02235f727c5c1..8fe6feaee0a66 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,5 +1,7 @@
-{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
-, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}:
+{ stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
+, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
+, xlibsWrapper
+}:
 
 stdenv.mkDerivation rec {
   name = "pasystray-${version}";
@@ -13,9 +15,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake makeWrapper 
-                  gnome3.defaultIconTheme
-                  avahi gtk3 libnotify libpulseaudio xlibsWrapper ];
+  buildInputs = [
+    autoconf automake makeWrapper
+    gnome3.defaultIconTheme
+    avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
+  ];
 
   preConfigure = ''
     aclocal
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 6de4d3d859ed7..0d11ba394e6b6 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,18 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d";
+    sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930";
   };
 
-  postPatch = ''
-    # loosen constraint on msgpack version, only 0.5.0 had problems
-    sed -i "s/'msgpack-python.*'/'msgpack-python'/g" setup.py
-  '';
-
   nativeBuildInputs = with python3Packages; [
     # For building documentation:
     sphinx guzzle_sphinx_theme
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 958afa3f6a9c3..e9ae735478633 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.26.1";
 
   src = fetchurl {
-    url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
+    url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
     sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
   };
 
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index 91d12a568a49d..3ab1eba5b6f02 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "chunksync-${version}";
 
   src = fetchurl {
-    url = "http://chunksync.florz.de/chunksync_${version}.tar.gz";
+    url = "https://chunksync.florz.de/chunksync_${version}.tar.gz";
     sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00";
   };
 
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 315ef72728387..99c0bd4a34ca8 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,27 +3,37 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.5.14";
+  version = "2.5.15";
   name = "dar-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dar/${name}-bis.tar.gz";
-    sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5";
+    url = "mirror://sourceforge/dar/${name}.tar.gz";
+    sha256 = "1h700i2k524w5rf5gr9yxl50ca5jwzqlkifay4ffcbhbkqln1n2q";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
     ++ optionals stdenv.isLinux [ attr e2fsprogs ];
 
-  configureFlags = [ "--disable-dar-static" ];
+  configureFlags = [
+    "--disable-birthtime"
+    "--disable-upx"
+    "--disable-dar-static"
+    "--disable-build-html"
+    "--enable-threadar"
+  ];
+
+  postInstall = ''
+    rm -r "$out"/share/dar # Disable html help
+  '';
 
   enableParallelBuilding = true;
 
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = http://dar.linux.free.fr/;
+    homepage = http://dar.linux.free.fr;
     description = "Disk ARchiver, allows backing up files into indexed archives";
-    maintainers = [ maintainers.viric ];
+    maintainers = with maintainers; [ viric ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index d55783f7f2cea..d4b6b9a72eba3 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -2,16 +2,16 @@
 
 python2Packages.buildPythonApplication rec {
   name = "duplicity-${version}";
-  version = "0.7.12";
+  version = "0.7.17";
 
   src = fetchurl {
-    url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz";
-    sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi";
+    url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
+    sha256 = "0jmh3h09680xyf33hzxxxl74bwz66zqhzvjlj7j89r9rz3qwa91p";
   };
 
   buildInputs = [ librsync makeWrapper python2Packages.wrapPython ];
   propagatedBuildInputs = with python2Packages; [
-    boto cffi cryptography ecdsa enum idna pygobject3
+    boto cffi cryptography ecdsa enum idna pygobject3 fasteners
     ipaddress lockfile paramiko pyasn1 pycrypto six
   ];
   checkInputs = with python2Packages; [ lockfile mock pexpect ];
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index ecd6a3209f4f9..6d761354b6af6 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "httrack-${version}";
 
   src = fetchurl {
-    url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
+    url = "https://mirror.httrack.com/httrack-${version}.tar.gz";
     sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl";
   };
 
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index 758146fcc00ba..021f783e0fdd9 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       using existing libraries, e.g. e2fslibs is used to read and write the
       ext2 partition.
     '';
-    homepage = http://partclone.org;
+    homepage = https://partclone.org;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 9f9714e6d99a8..a7f90b3b30378 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y";
+    sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv";
   };
 
   buildPhase = ''
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 095bd5f7d9a57..617d86e7f1e3a 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.3";
 
   src = fetchurl {
-    url    = "http://www.daemonology.net/bsdiff/${name}.tar.gz";
+    url    = "https://www.daemonology.net/bsdiff/${name}.tar.gz";
     sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
   };
 
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 91f7637e1bcbe..c9ec557ab1f4b 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec {
   version = "7.1";
 
   src = fetchurl {
-    url = "http://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz";
+    url = "https://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz";
     sha256 = "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw";
   };
 
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 04c83fa03fcf9..7e29ee2b856a3 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
-  version = "131";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
-    sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
-    rev = "r${version}";
+    sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2";
+    rev = "v${version}";
     repo = "lz4";
-    owner = "Cyan4973";
+    owner = "lz4";
   };
 
   outputs = [ "out" "dev" ];
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
   doCheck = false; # tests take a very long time
   checkTarget = "test";
 
-  patches = [ ./install-on-freebsd.patch ] ;
-
   postInstall = "rm $out/lib/*.a";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch
deleted file mode 100644
index 12a2bf72f4edb..0000000000000
--- a/pkgs/tools/compression/lz4/install-on-freebsd.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d1b0d0c..f8d6a2d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -80,8 +80,6 @@ clean:
- 
- 
- #------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
- 
- install:
- 	@cd $(LZ4DIR); $(MAKE) -e install
-@@ -129,4 +127,3 @@ examples:
- prg-travis:
- 	@cd $(PRGDIR); $(MAKE) -e test-travis
- 
--endif
-diff --git a/lib/Makefile b/lib/Makefile
-index 02ddd3b..26ed18f 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -80,8 +80,6 @@ clean:
- 
- 
- #------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
- 
- liblz4.pc: liblz4.pc.in Makefile
- 	@echo creating pkgconfig
-@@ -114,4 +112,3 @@ uninstall:
- 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
- 	@echo lz4 libraries successfully uninstalled
- 
--endif
-diff --git a/programs/Makefile b/programs/Makefile
-index f422902..6943363 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -113,8 +113,6 @@ clean:
- 
- 
- #------------------------------------------------------------------------
--#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
- 
- install: lz4 lz4c
- 	@echo Installing binaries
-@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench
- test-mem32: lz4c32 datagen
- # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
- 
--endif
diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix
index 72be1d28d2488..00eb5f265aafe 100644
--- a/pkgs/tools/compression/lzop/default.nix
+++ b/pkgs/tools/compression/lzop/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "lzop-1.04";
   src = fetchurl {
-    url = "http://www.lzop.org/download/${name}.tar.gz";
+    url = "https://www.lzop.org/download/${name}.tar.gz";
     sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky";
   };
 
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 732aa691d4a94..a2668f73ceb26 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
-    url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
+    url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz";
     sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54";
   };
 
diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix
index ad1b80410419c..8773121e6461c 100644
--- a/pkgs/tools/compression/rzip/default.nix
+++ b/pkgs/tools/compression/rzip/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    homepage = http://rzip.samba.org/;
+    homepage = https://rzip.samba.org/;
     description = "Compression program";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 8fa2d181de5ea..edb771b5b3ec4 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchFromGitHub {
-    sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw";
+    sha256 = "0fpv8k16s14g0r552mhbh0mkr716cqy41d2znyrvks6qfphkgir4";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
index e720634ca44ab..18bde25267d38 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz";
+    url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz";
     sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4";
   };
 
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix
index e5b09cbbff304..47428e7f52e4b 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/pkgs/tools/filesystems/chunkfs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "chunkfs-${version}";
 
   src = fetchurl {
-    url = "http://chunkfs.florz.de/chunkfs_${version}.tar.gz";
+    url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz";
     sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1";
   };
 
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 53b17f45f9f4f..321259292ef4c 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "f2fs-tools-${version}";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0aj9dbhv7vv19pyb2rhcg99v5v0s66sb9yzrdmi46bmvzz124pal";
+    sha256 = "1254pd254l1hxkzkkzqmzc0j9vywj2wddg9apqaixjninj21jrbc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
index b39c51a0c8816..581970e34fa74 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "9";
 
   src = fetchurl {
-    url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz";
+    url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz";
     sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9";
   };
 
diff --git a/pkgs/tools/filesystems/gocrypfs/default.nix b/pkgs/tools/filesystems/gocrypfs/default.nix
deleted file mode 100644
index b9314015cf551..0000000000000
--- a/pkgs/tools/filesystems/gocrypfs/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file was generated by go2nix.
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgconfig, openssl }:
-
-with lib;
-
-let
-  goFuseVersion = substring 0 7 (head (filter (
-    d: d.goPackagePath == "github.com/hanwen/go-fuse"
-  ) (import ./deps.nix))).fetch.rev;
-in buildGoPackage rec {
-  name = "gocryptfs-${version}";
-  version = "1.1.1";
-  rev = "v${version}";
-
-  goPackagePath = "github.com/rfjakob/gocryptfs";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "rfjakob";
-    repo = "gocryptfs";
-    sha256 = "0p173x2s0km7a43h6ihir5p19fdlkkb9lc9120k9hccr33iws25z";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl];
-
-  goDeps = ./deps.nix;
-
-  postPatch = "rm -r tests";
-
-  buildFlagsArray = ''
-    -ldflags=
-      -X main.GitVersion=${rev}
-      -X main.GitVersionFuse=${goFuseVersion}
-  '';
-
-  meta = {
-    description = "Encrypted overlay filesystem written in Go";
-    license = licenses.mit;
-    homepage = https://nuetzlich.net/gocryptfs/;
-    maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/tools/filesystems/gocrypfs/deps.nix b/pkgs/tools/filesystems/gocrypfs/deps.nix
deleted file mode 100644
index 08a4afb52653b..0000000000000
--- a/pkgs/tools/filesystems/gocrypfs/deps.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was generated by go2nix.
-[
-  {
-    goPackagePath = "github.com/hanwen/go-fuse";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hanwen/go-fuse";
-      rev = "6c2b7d8f22c99776f8bfe17cd26d5f744a5b4cdc";
-      sha256 = "1mb73vyqfy92830qif83zdlng0zycmm5fgmm9bwihqh92y8inw3h";
-    };
-  }
-  {
-    goPackagePath = "github.com/jacobsa/crypto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jacobsa/crypto";
-      rev = "293ce0c192fb4f59cd879b46544922b9ed09a13a";
-      sha256 = "12nm5h5dqqk8yrzlkmcqm0aam8l6l1s6rah48mrmz1z5bgm9h5rs";
-    };
-  }
-  {
-    goPackagePath = "github.com/rfjakob/eme";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rfjakob/eme";
-      rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255";
-      sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91";
-      sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz";
-    };
-  }
-]
diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix
new file mode 100644
index 0000000000000..75f5e9ffe11fe
--- /dev/null
+++ b/pkgs/tools/filesystems/gocryptfs/default.nix
@@ -0,0 +1,50 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }:
+
+let
+  version = "v1.5";
+  goFuseVersion = with stdenv.lib; substring 0 7 (head (filter (
+    d: d.goPackagePath == "github.com/hanwen/go-fuse"
+  ) (import ./deps.nix))).fetch.rev;
+in
+buildGoPackage rec {
+  name = "gocryptfs-${version}";
+
+  goPackagePath = "github.com/rfjakob/gocryptfs";
+
+  nativeBuildInputs = [ pandoc pkgconfig ];
+  buildInputs = [ openssl ];
+
+  src = fetchFromGitHub {
+    owner = "rfjakob";
+    repo = "gocryptfs";
+    rev = version;
+    sha256 = "0s5smjc7n9088n8a2mv7cy3cx31ci13i1i8fhg1vslc17a15qs2d";
+  };
+
+  postPatch = "rm -r tests";
+
+  buildFlagsArray = ''
+    -ldflags=
+      -X main.GitVersion=${version}
+      -X main.GitVersionFuse=${goFuseVersion}
+  '';
+
+  goDeps = ./deps.nix;
+
+  postBuild = ''
+    pushd go/src/github.com/rfjakob/gocryptfs/Documentation/
+    mkdir -p $out/share/man/man1
+    pandoc MANPAGE.md -s -t man -o $out/share/man/man1/gocryptfs.1
+    pandoc MANPAGE-XRAY.md -s -t man -o $out/share/man/man1/gocryptfs-xray.1
+    popd
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Encrypted overlay filesystem written in Go";
+    license = licenses.mit;
+    homepage = https://nuetzlich.net/gocryptfs/;
+    maintainers = with maintainers; [ flokli offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix
new file mode 100644
index 0000000000000..cb5aec527f244
--- /dev/null
+++ b/pkgs/tools/filesystems/gocryptfs/deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/hanwen/go-fuse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hanwen/go-fuse";
+      rev = "291273cb8ce0f139636a6fd7414be3c7e2de6288";
+      sha256 = "1djfl6mni8k4wllhwcr6qwyg1nh6wykdalvdl6gpc1rwrjj9c6xi";
+    };
+  }
+  {
+    goPackagePath = "github.com/jacobsa/crypto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jacobsa/crypto";
+      rev = "c73681c634de898c869684602cf0c0d2ce938c4d";
+      sha256 = "02jbiy6szshbzcmp4j3gpc577hrhikxqvm4kzxixp27k9f2cx5si";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/xattr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/xattr";
+      rev = "d15dbc2bb0b5da267362b5e066e2c44c1fcff6c7";
+      sha256 = "1vab8mpk2x4vbhx0kd0i0kn6sf7z5ivilcmdklyizzcfcwghh17g";
+    };
+  }
+  {
+    goPackagePath = "github.com/rfjakob/eme";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rfjakob/eme";
+      rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770";
+      sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
+      sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "151529c776cdc58ddbe7963ba9af779f3577b419";
+      sha256 = "149yfzs4k8vxhjr8f832drndir2k5ha0ggs2dw2fd6xvxf698bcx";
+    };
+  }
+]
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
index ac1a7c1c14850..afe51caa87729 100644
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://www.adebenham.com/files/mtp/${name}.tar.gz";
+    url = "https://www.adebenham.com/files/mtp/${name}.tar.gz";
     sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
   };
 
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index 5bce330651922..6b56a8aadfa08 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, libuuid, libselinux }:
-let 
+let
   sourceInfo = rec {
     version = "2.2.7";
     url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  configureFlags = [ "--with-libmount" ];
+
   # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv
   # still doesn't use it
   #
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 1007d04036e24..16ecb1c9d153b 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "s3backer-${version}";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
-    sha256 = "0fhkha5kap8dji3iy48cbszhq83b2anssscgjj9d5dsl5dj57zak";
+    sha256 = "0pmszcnnlqyysljfyysd6jsvdz7fqgbk8z4vnkmda5dwwcm8b8fs";
     rev = version;
     repo = "s3backer";
     owner = "archiecobbs";
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 11d836e66bccc..4d71d501b3c16 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "s3fs-fuse-${version}";
-  version = "1.83";
+  version = "1.84";
 
   src = fetchFromGitHub {
     owner  = "s3fs-fuse";
     repo   = "s3fs-fuse";
     rev    = "v${version}";
-    sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx";
+    sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871";
   };
 
   buildInputs = [ curl openssl libxml2 fuse ];
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 6f2fb68775df9..e9325e9b18d58 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -5,14 +5,14 @@
 let
   inherit (stdenv.lib) optional;
 in stdenv.mkDerivation rec {
-  version = "3.3.2";
+  version = "3.4.0";
   name = "sshfs-fuse-${version}";
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "01nrdprkqynk20yw6zdn6w8xv4hdw47g5d0v5qvfw0wls2kmadyr";
+    sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl";
   };
 
   nativeBuildInputs = [ meson pkgconfig ninja docutils ];
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index cc2bbad1680a2..d38e26edec6e5 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   version = "4.14.0";
 
   src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
-    rev = "refs/tags/v${version}";
+    url = "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
+    rev = "v${version}";
     sha256 = "19mg3avm188xz215hqbbh7251q27qwm7g1xr8ffrjwvzmdq55rxj";
   };
 
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 2f7e80dd912c5..6acb034d75b67 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   version = "0.1.5.978";
 
   src = fetchurl {
-    url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
+    url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
     sha256 = p.sha256;
   };
 
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index 3283d6789f734..916b8509b0d02 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1.1";
 
   src = fetchurl {
-    url = "http://frippery.org/uml/${name}.tgz";
+    url = "https://frippery.org/uml/${name}.tgz";
     sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
   };
 
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
new file mode 100644
index 0000000000000..56091a89e48b4
--- /dev/null
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile,
+eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio,
+opencolorio, xercesc, ilmbase, osl, seexpr
+}:
+
+let boost_static = boost165.override { enableStatic = true; };
+in stdenv.mkDerivation rec {
+
+  name = "appleseed-${version}";
+  version = "1.9.0-beta";
+
+  src = fetchFromGitHub {
+    owner  = "appleseedhq";
+    repo   = "appleseed";
+    rev    = "1.9.0-beta";
+    sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr";
+  };
+  buildInputs = [
+    cmake pkgconfig boost_static guile eigen3_3 libpng python
+    libGLU qt4 openexr openimageio opencolorio xercesc
+    osl seexpr
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO";
+
+  cmakeFlags = [
+      "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON"
+      "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON"
+      "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON"
+      "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON"
+      "-DWITH_PYTHON2_BINDINGS=ON"
+      # TODO: Look further into this if someone needs Python 3.x:
+      # "-DWITH_PYTHON3_BINDINGS=ON"
+      "-DWITH_DISNEY_MATERIAL=ON"
+      "-DUSE_SSE=ON"
+      "-DUSE_SSE42=ON"
+  ];
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Open source, physically-based global illumination rendering engine";
+    homepage = https://appleseedhq.net/;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
+
+# TODO: Is the below problematic?
+
+# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message):
+#  Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when
+#  available.  Run "cmake --help-policy CMP0072" for policy details.  Use the
+#  cmake_policy command to set the policy and suppress this warning.
+#
+#  FindOpenGL found both a legacy GL library:
+#
+#    OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so
+#
+#  and GLVND libraries for OpenGL and GLX:
+#
+#    OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so
+#    OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so
+#
+#  OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for
+#  compatibility with CMake 3.10 and below the legacy GL library will be used.
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index d35eae872040a..7a06d9f346b84 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchzip {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
-    url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
+    url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
     sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx";
 
     # The argyllcms web server doesn't like curl ...
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 44ad267f9d4eb..dd81c3e4ecc02 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "dcraw-9.28.0";
 
   src = fetchurl {
-    url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
+    url = "https://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
     sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418";
   };
 
diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix
index 47312f0f99753..9ce95154cb0bb 100644
--- a/pkgs/tools/graphics/exiftags/default.nix
+++ b/pkgs/tools/graphics/exiftags/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "exiftags-1.01";
 
   src = fetchurl {
-    url = http://johnst.org/sw/exiftags/exiftags-1.01.tar.gz;
+    url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz;
     sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr";
   };
 
diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix
new file mode 100644
index 0000000000000..4e371ffd2b07b
--- /dev/null
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk
+, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
+}:
+
+let
+
+  fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
+
+in
+
+buildPerlPackage rec {
+  name = "feedgnuplot-${version}";
+  version = "1.49";
+
+  src = fetchFromGitHub {
+    owner = "dkogan";
+    repo = "feedgnuplot";
+    rev = "v${version}";
+    sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02";
+  };
+
+  nativeBuildInputs = [ makeWrapper gawk ];
+
+  buildInputs = [ gnuplot perl ]
+    ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]);
+
+  # Fontconfig error: Cannot load default config file
+  FONTCONFIG_FILE = fontsConf;
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5.
+  doCheck = false;
+
+  postInstall = ''
+    wrapProgram $out/bin/feedgnuplot \
+        --prefix "PATH" ":" "$PATH" \
+        --prefix "PERL5LIB" ":" "$PERL5LIB"
+    install -D -m 444 -t $out/share/bash-completion/completions \
+        completions/bash/feedgnuplot
+    install -D -m 444 -t $out/share/zsh/site-functions \
+        completions/zsh/_feedgnuplot
+  '';
+
+  meta = with stdenv.lib; {
+    description = "General purpose pipe-oriented plotting tool";
+    homepage = https://github.com/dkogan/feedgnuplot/;
+    license = with licenses; [ artistic1 gpl1Plus ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mnacamura ];
+  };
+}
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
index 424cf5c1bdc64..a7bb616d82b5b 100644
--- a/pkgs/tools/graphics/fgallery/default.nix
+++ b/pkgs/tools/graphics/fgallery/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "fgallery-1.8.2";
 
   src = fetchurl {
-    url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip";
+    url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip";
     sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";
   };
 
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 05ce6b6f7c9c7..76cb3ab199c27 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.91";
 
   src = fetchurl {
-    url = "http://www.lcdf.org/gifsicle/${name}.tar.gz";
+    url = "https://www.lcdf.org/gifsicle/${name}.tar.gz";
     sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha";
   };
 
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 008f9af36852c..6c62e0528386c 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
 
   src = fetchurl {
-    url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
+    url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
     sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
   };
 
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index be4cf0f493b60..93a6652eafbc5 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "logstalgia-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn";
+    sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
new file mode 100644
index 0000000000000..08d5ff8514075
--- /dev/null
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
+, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
+, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
+, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
+, bison, flex, libpthreadstubs, libX11
+, embree2, makeWrapper, gsettings_desktop_schemas, glib
+, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
+}:
+
+let boost_static = boost165.override {
+      python = python35;
+      enableStatic = true;
+    };
+
+in stdenv.mkDerivation rec {
+  name = "luxcorerender-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "LuxCoreRender";
+    repo = "LuxCore";
+    rev = "luxcorerender_v2.0";
+    sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38";
+  };
+
+  buildInputs =
+   [ embree2 pkgconfig cmake zlib boost_static libjpeg
+     libtiff libpng ilmbase freetype openexr openimageio
+     tbb qt5.full c-blosc libGLU pcre bison
+     flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
+     epoxy at-spi2-core dbus doxygen
+     # needed for GSETTINGS_SCHEMAS_PATH
+     gsettings_desktop_schemas glib gnome3.gtk
+     # needed for XDG_ICON_DIRS
+     gnome3.defaultIconTheme
+     makeWrapper
+     (stdenv.lib.getLib gnome3.dconf)
+   ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
+
+  cmakeFlags = [
+    "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
+    "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR"
+    "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
+    "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include"
+    "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so"
+    "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5"
+    "-DEMBREE_INCLUDE_PATH=${embree2}/include"
+    "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
+    "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
+  ] ++ stdenv.lib.optional withOpenCL
+       "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5"
+    NIX_LDFLAGS+=" -lpython3"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/lib
+    cp -va bin/* $out/bin
+    cp -va lib/* $out/lib
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/luxcoreui" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+      --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open source, physically based, unbiased rendering engine";
+    homepage = https://luxcorerender.org/;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
+
+
+# TODO (might not be necessary):
+#
+# luxcoreui still gives warnings like: "failed to commit changes to
+# dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The
+# name ca.desrt.dconf was not provided by any .service files"
+
+# CMake complains of the FindOpenGL/GLVND preference
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index cd0cff0f3899a..0cea8d4011c7d 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i";
+    sha256 = "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index fcd347182ec48..05aa7b866360c 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -5,12 +5,12 @@
 stdenv.mkDerivation rec {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
-  name = "netpbm-10.77.02";
+  name = "netpbm-10.82.01";
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = 2883;
-    sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f";
+    rev = 3264;
+    sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf";
   };
 
   postPatch = /* CVE-2005-2471, from Arch */ ''
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
index 19aa7f00f14a8..c5651d0418e49 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -1,57 +1,68 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "nifskope-1.1.3";
+  name = "nifskope-${version}";
+  version = "2.0.dev7";
 
-  src = fetchurl {
-    url = "https://github.com/niftools/nifskope/releases/download/${name}/${name}.tar.bz2";
-    sha256 = "0fcvrcjyvivww10sjhxamcip797b9ykbf5p3rm2k24xhkwdaqp72";
+  src = fetchFromGitHub {
+    owner = "niftools";
+    repo = "nifskope";
+    rev = "47b788d26ae0fa12e60e8e7a4f0fa945a510c7b2"; # `v${version}` doesn't work with submodules
+    sha256 = "1wqpn53rkq28ws3apqghkzyrib4wis91x171ns64g8kp4q6mfczi";
+    fetchSubmodules = true;
   };
 
-  patches = [ ./gcc-6.patch ];
+  patches = [
+    ./external-lib-paths.patch
+    (substituteAll {
+      src = ./qttools-bins.patch;
+      qttools = "${qttools.dev}/bin";
+    })
+  ];
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qtbase qttools libGLU.dev makeWrapper ];
+  nativeBuildInputs = [ qmake ];
 
-  nativeBuildInputs = [ qmake4Hook ];
+  preConfigure = ''
+    shopt -s globstar
+    for i in **/*.cpp; do
+      substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope
+    done
+  '';
 
-  preConfigure =
-    ''
-      for i in *.cpp gl/*.cpp widgets/*.cpp; do
-        substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope
-      done
-    '';
+  enableParallelBuilding = true;
 
-  qmakeFlags = [ "-after TARGET=nifskope" ];
+  # Inspired by install/linux-install/nifskope.spec.in.
+  installPhase = let
+    qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}";
+  in ''
+    runHook preInstall
 
-  enableParallelBuilding = true;
+    d=$out/share/nifskope
+    mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,lang}
+    cp release/NifSkope $out/bin/
+    cp ./res/nifskope.png $out/share/pixmaps/
+    cp release/{nif.xml,kfm.xml,style.qss} $d/
+    cp res/shaders/*.frag res/shaders/*.prog res/shaders/*.vert $d/shaders/
+    cp ./res/lang/*.ts ./res/lang/*.tm $d/lang/
+    cp ./install/linux-install/nifskope.desktop $out/share/applications
+
+    substituteInPlace $out/share/applications/nifskope.desktop \
+      --replace 'Exec=nifskope' "Exec=$out/bin/NifSkope" \
+      --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png"
+
+    find $out/share -type f -exec chmod -x {} \;
+
+    wrapProgram $out/bin/NifSkope --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-${qtVersion}/plugins"
+
+    runHook postInstall
+  '';
 
-  hardeningDisable = [ "format" ];
-
-  # Inspired by linux-install/nifskope.spec.in.
-  installPhase =
-    ''
-      d=$out/share/nifskope
-      mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,doc,lang}
-      cp release/nifskope $out/bin/
-      cp nifskope.png $out/share/pixmaps/
-      cp nif.xml kfm.xml style.qss $d/
-      cp shaders/*.frag shaders/*.prog shaders/*.vert $d/shaders/
-      cp doc/*.html doc/docsys.css doc/favicon.ico $d/doc/
-      cp lang/*.ts lang/*.tm $d/lang/
-
-      substituteInPlace nifskope.desktop \
-        --replace 'Exec=nifskope' "Exec=$out/bin/nifskope" \
-        --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png"
-      cp nifskope.desktop $out/share/applications/
-
-      find $out/share -type f -exec chmod -x {} \;
-    ''; # */
-
-  meta = {
-    homepage = https://github.com/niftools/nifskope/;
+  meta = with stdenv.lib; {
+    homepage = http://niftools.sourceforge.net/wiki/NifSkope;
     description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.bsd3;
+    maintainers = with maintainers; [ eelco ma27 ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/tools/graphics/nifskope/external-lib-paths.patch b/pkgs/tools/graphics/nifskope/external-lib-paths.patch
new file mode 100644
index 0000000000000..a7f329caf74f4
--- /dev/null
+++ b/pkgs/tools/graphics/nifskope/external-lib-paths.patch
@@ -0,0 +1,33 @@
+diff --git a/NifSkope.pro b/NifSkope.pro
+index 1c0bc5a..cc29fc5 100644
+--- a/NifSkope.pro
++++ b/NifSkope.pro
+@@ -330,14 +330,14 @@ nvtristrip {
+ }
+ 
+ qhull {
+-    !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/qhull/src
+-    !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/qhull/src
++    !*msvc*:QMAKE_CFLAGS += -isystem ./lib/qhull/src
++    !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/qhull/src
+     else:INCLUDEPATH += lib/qhull/src
+     HEADERS += $$files($$PWD/lib/qhull/src/libqhull/*.h, false)
+ }
+ 
+ gli {
+-    !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/gli/gli -isystem ../nifskope/lib/gli/external
++    !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/gli/gli -isystem ./lib/gli/external
+     else:INCLUDEPATH += lib/gli/gli lib/gli/external
+     HEADERS += $$files($$PWD/lib/gli/gli/*.hpp, true)
+     HEADERS += $$files($$PWD/lib/gli/gli/*.inl, true)
+@@ -346,8 +346,8 @@ gli {
+ }
+ 
+ zlib {
+-    !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib
+-    !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/zlib
++    !*msvc*:QMAKE_CFLAGS += -isystem ./lib/zlib
++    !*msvc*:QMAKE_CXXFLAGS += -isystem ./lib/zlib
+     else:INCLUDEPATH += lib/zlib
+     HEADERS += $$files($$PWD/lib/zlib/*.h, false)
+     SOURCES += $$files($$PWD/lib/zlib/*.c, false)
diff --git a/pkgs/tools/graphics/nifskope/gcc-6.patch b/pkgs/tools/graphics/nifskope/gcc-6.patch
deleted file mode 100644
index 2bb8af9cfe4c2..0000000000000
--- a/pkgs/tools/graphics/nifskope/gcc-6.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Based on https://github.com/niftools/nifskope/commit/7261b0a119a549b11006d8e41ba990d706171f1c
-
-diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp nifskope-1.1.3/gl/dds/ColorBlock.cpp
---- nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp	2012-11-17 23:40:31.000000000 +0100
-+++ nifskope-1.1.3/gl/dds/ColorBlock.cpp	2017-09-10 10:50:36.766909836 +0200
-@@ -78,8 +78,8 @@
- 

- void ColorBlock::init(const Image * img, uint x, uint y)

- {

--	const uint bw = min(img->width() - x, 4U);

--	const uint bh = min(img->height() - y, 4U);

-+	const uint bw = std::min(img->width() - x, 4U);

-+	const uint bh = std::min(img->height() - y, 4U);

- 

- 	static int remainder[] = {

- 		0, 0, 0, 0,

-diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/Common.h nifskope-1.1.3/gl/dds/Common.h
---- nifskope-1.1.3-orig/gl/dds/Common.h	2012-11-17 23:40:31.000000000 +0100
-+++ nifskope-1.1.3/gl/dds/Common.h	2017-09-10 10:48:08.462099032 +0200
-@@ -33,14 +33,10 @@
- #ifndef _DDS_COMMON_H

- #define _DDS_COMMON_H

- 

--#ifndef min

--#define min(a,b) ((a) <= (b) ? (a) : (b))

--#endif

--#ifndef max

--#define max(a,b) ((a) >= (b) ? (a) : (b))

--#endif

-+#include <algorithm>

-+

- #ifndef clamp

--#define clamp(x,a,b) min(max((x), (a)), (b))

-+#define clamp(x,a,b) std::min( std::max( (x), (a) ), (b) )

- #endif

- 

- template<typename T>

-diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp
---- nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp	2012-11-17 23:40:31.000000000 +0100
-+++ nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp	2017-09-10 10:48:45.912056969 +0200
-@@ -63,6 +63,7 @@
- #include "DirectDrawSurface.h"

- #include "BlockDXT.h"

- #include "PixelFormat.h"

-+#include "Common.h"

- 

- #include <stdio.h> // printf

- #include <math.h>  // sqrt

-@@ -685,8 +686,8 @@
- 	// Compute width and height.

- 	for (uint m = 0; m < mipmap; m++)

- 	{

--		w = max(1U, w / 2);

--		h = max(1U, h / 2);

-+		w = std::max(1U, w / 2);

-+		h = std::max(1U, h / 2);

- 	}

- 	

- 	img->allocate(w, h);

-@@ -787,9 +788,9 @@
- 			readBlock(&block);

- 			

- 			// Write color block.

--			for (uint y = 0; y < min(4U, h-4*by); y++)

-+			for (uint y = 0; y < std::min(4U, h-4*by); y++)

- 			{

--				for (uint x = 0; x < min(4U, w-4*bx); x++)

-+				for (uint x = 0; x < std::min(4U, w-4*bx); x++)

- 				{

- 					img->pixel(4*bx+x, 4*by+y) = block.color(x, y);

- 				}

-@@ -909,9 +910,9 @@
- 	

- 	for (uint m = 0; m < mipmap; m++)

- 	{

--		w = max(1U, w / 2);

--		h = max(1U, h / 2);

--		d = max(1U, d / 2);

-+		w = std::max(1U, w / 2);

-+		h = std::max(1U, h / 2);

-+		d = std::max(1U, d / 2);

- 	}

- 

- 	if (header.pf.flags & DDPF_FOURCC)

-diff -ru -x '*~' nifskope-1.1.3-orig/gl/gltexloaders.cpp nifskope-1.1.3/gl/gltexloaders.cpp
---- nifskope-1.1.3-orig/gl/gltexloaders.cpp	2012-11-17 23:40:31.000000000 +0100
-+++ nifskope-1.1.3/gl/gltexloaders.cpp	2017-09-10 10:51:23.586839810 +0200
-@@ -1736,8 +1736,8 @@
- 			

- 			// generate next offset, resize

- 			mipmapOffset += mipmapWidth * mipmapHeight * 4;

--			mipmapWidth = max( 1, mipmapWidth / 2 );

--			mipmapHeight = max( 1, mipmapHeight / 2 );

-+			mipmapWidth = std::max( 1, mipmapWidth / 2 );

-+			mipmapHeight = std::max( 1, mipmapHeight / 2 );

- 		}

- 		

- 		// set total pixel size

-@@ -1932,11 +1932,11 @@
- 			{

- 				if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT1 )

- 				{

--					mipmapOffset += max( 8, ( mipmapWidth * mipmapHeight / 2 ) );

-+					mipmapOffset += std::max( 8, ( mipmapWidth * mipmapHeight / 2 ) );

- 				}

- 				else if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT5 )

- 				{

--					mipmapOffset += max( 16, ( mipmapWidth * mipmapHeight ) );

-+					mipmapOffset += std::max( 16, ( mipmapWidth * mipmapHeight ) );

- 				}

- 			}

- 			else if ( ddsHeader.ddsPixelFormat.dwBPP == 24 )

-@@ -1947,8 +1947,8 @@
- 			{

- 				mipmapOffset += ( mipmapWidth * mipmapHeight * 4 );

- 			}

--			mipmapWidth = max( 1, mipmapWidth / 2 );

--			mipmapHeight = max( 1, mipmapHeight / 2 );

-+			mipmapWidth = std::max( 1, mipmapWidth / 2 );

-+			mipmapHeight = std::max( 1, mipmapHeight / 2 );

- 		}

- 		

- 		nif->set<quint32>( iData, "Num Pixels", mipmapOffset );

diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/pkgs/tools/graphics/nifskope/qttools-bins.patch
new file mode 100644
index 0000000000000..5d85f9ef4fdd3
--- /dev/null
+++ b/pkgs/tools/graphics/nifskope/qttools-bins.patch
@@ -0,0 +1,22 @@
+diff --git a/NifSkope_targets.pri b/NifSkope_targets.pri
+index 05324c2..d8389b1 100644
+--- a/NifSkope_targets.pri
++++ b/NifSkope_targets.pri
+@@ -11,7 +11,7 @@ else:EXE = ""
+ ## lupdate / lrelease
+ ###############################
+ 
+-QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate$${EXE}
++QMAKE_LUPDATE = @qttools@/lupdate$${EXE}
+ exists($$QMAKE_LUPDATE) {
+ 	# Make target for Updating .ts
+ 	updatets.target = updatets
+@@ -23,7 +23,7 @@ exists($$QMAKE_LUPDATE) {
+ 	message("lupdate could not be found, ignoring make target")
+ }
+ 
+-QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease$${EXE}
++QMAKE_LRELEASE = @qttools@/lrelease$${EXE}
+ exists($$QMAKE_LRELEASE) {
+ 	# Build Step for Releasing .ts->.qm
+ 	updateqm.input = TRANSLATIONS
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index b53a07bcfadfe..4e7d1e361f91c 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, libpng, zlib, lcms2 }:
+{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
 
 stdenv.mkDerivation rec {
   name = "pngquant-${version}";
-  version = "2.11.7";
+  version = "2.12.1";
 
-  src = fetchgit {
-    url = "https://www.github.com/pornel/pngquant.git";
-    rev = "refs/tags/${version}";
-    sha256 = "1qr5qr2wznzp0v9xwyz4r3982rcm9kys913w8gwmv7qd1akvx2qh";
+  src = fetchFromGitHub {
+    owner = "pornel";
+    repo = "pngquant";
+    rev = version;
+    sha256 = "0jdvry3kvmmxcgwf5a3zbfz0idl6yl3700ag7pf8sk4lg4qp0llp";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 623415a314b52..4f3e5271183d0 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd";
   };
 
+  #
+  # Turn on "-rdb" option (REALLYDELAYBIND) by default to ensure compatibility with gs-9.22
+  #
+  patches = [ ./pstoedit-gs-9.22-compat.patch  ];
+
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]
diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
new file mode 100644
index 0000000000000..64fe805d5015d
--- /dev/null
+++ b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pstoeditoptions.h b/src/pstoeditoptions.h
+index 7846883..0fb6a6f 100755
+--- a/src/pstoeditoptions.h
++++ b/src/pstoeditoptions.h
+@@ -453,7 +453,7 @@ private:
+ 		"Later versions of Ghostscript will probably support -dDELAYBIND again. "
+ 		"But also in that case the security risk remains. So be careful with what "
+ 		"files you process with pstoedit and Ghostscript.",
+-		false),	//
++		true),	//
+ #endif
+ 	pagetoextract		(true, "-page","page number",g_t,"extract a specific page: 0 means all pages",
+ 		"Select a single page from a multi-page PostScript or PDF file.",
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 5620f5058a5f9..8e186399d6380 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qrencode-4.0.1";
+  name = "qrencode-4.0.2";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "0j7cqhjc0l6i99lzph51gakmcmfs74x483plna93r4ngz328knph";
+    sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9";
   };
 
   buildInputs = [ libpng ];
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
new file mode 100644
index 0000000000000..5134399895014
--- /dev/null
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, qmake, qtbase }:
+
+stdenv.mkDerivation rec {
+  name = "rocket-${version}";
+  version = "2018-06-09";
+
+  src = fetchFromGitHub {
+    owner = "rocket";
+    repo = "rocket";
+    rev = "7bc1e9826cad5dbc63e56371c6aa1798b2a7b50b";
+    sha256 = "13bdg2dc6ypk17sz39spqdlb3wai2y085bdb36pls2as2nf22drp";
+  };
+
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtbase ];
+
+  configurePhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r editor/editor $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for synchronizing music and visuals in demoscene productions";
+    homepage = "https://github.com/rocket/rocket";
+    license = licenses.zlib;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.dezgeg ];
+  };
+}
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix
new file mode 100644
index 0000000000000..c1e6c2afecce6
--- /dev/null
+++ b/pkgs/tools/graphics/structure-synth/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+  name = "structure-synth-${version}";
+  version = "v1.5";
+
+  src = fetchurl {
+    url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip;
+    sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";
+  };
+
+  buildInputs = [ qt4 unzip libGLU makeWrapper ];
+  nativeBuildInputs = [ qmake4Hook ];
+
+  # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15:
+  patches = [ ./gcc47.patch ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    ${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin;
+    mkdir -p $out/share/Examples $out/share/Misc;
+    cp "Structure Synth Source Code" $out/bin/structure-synth;
+    cp -r Examples/* $out/share/Examples;
+    cp -r Misc/* $out/share/Misc;
+  '';
+
+  # Structure Synth expects to see 'Examples' and 'Misc' directory in
+  # either $HOME or $PWD - so help it along by moving $PWD to 'share',
+  # where we just copied those two directories:
+  preFixup = ''
+    wrapProgram "$out/bin/structure-synth" --run "cd $out/share"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Application for generating 3D structures by specifying a design grammar";
+    homepage = http://structuresynth.sourceforge.net;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/tools/graphics/structure-synth/gcc47.patch
new file mode 100644
index 0000000000000..8726e89c83088
--- /dev/null
+++ b/pkgs/tools/graphics/structure-synth/gcc47.patch
@@ -0,0 +1,50 @@
+diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp"
+*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp"	2010-11-13 22:32:44.000000000 -0500
+--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp"	2018-06-24 14:23:30.794296776 -0400
+***************
+*** 1,5 ****
+  #include <QThread>

+! 

+  

+  #include "RayTracer.h"

+  

+--- 1,5 ----
+  #include <QThread>

+! #include <GL/glu.h>

+  

+  #include "RayTracer.h"

+  

+diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp"
+*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp"	2010-09-08 21:25:30.000000000 -0400
+--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp"	2018-06-24 14:23:12.542868194 -0400
+***************
+*** 122,128 ****
+  						currentT = p;

+  

+  						// We do not intersect grid.

+! 						if (!found) return false;

+  				}

+  

+  				stepX = (dir.x() > 0) ? 1 : -1;

+--- 122,128 ----
+  						currentT = p;

+  

+  						// We do not intersect grid.

+! 						if (!found) return NULL;

+  				}

+  

+  				stepX = (dir.x() > 0) ? 1 : -1;

+Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig
+diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h"
+*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h"	2010-08-11 15:12:22.000000000 -0400
+--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h"	2018-06-24 14:23:30.793296807 -0400
+***************
+*** 2,7 ****
+--- 2,8 ----
+  

+  #include "SyntopiaCore/Math/Vector3.h"

+  #include "Object3D.h"

++ #include <GL/glu.h>

+  

+  namespace SyntopiaCore {

+  	namespace GLEngine {	

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index d1dfe7afbf84c..da63cb58a55fd 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vips-${version}";
-  version = "8.6.3";
+  version = "8.6.4";
 
   src = fetchurl {
     url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "14h9w61gaimldmqaym0zhf9fkxjj1pkd5lhglhs6pxphynwxnnpq";
+    sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6";
   };
 
   buildInputs =
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
new file mode 100644
index 0000000000000..778a123415400
--- /dev/null
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader,
+  glslang, pkgconfig, x11, libxcb, libXrandr, wayland }:
+
+stdenv.mkDerivation rec {
+  name = "vulkan-tools-${version}";
+  version = "1.1.77.0";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-Tools";
+    rev = "sdk-${version}";
+    sha256 = "1c827n0xz8d7ydqpjchd58as943acyi182a0p4aq3bdsaxlmmpkg";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ];
+  enableParallelBuilding = true;
+
+  cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];
+
+  meta = with stdenv.lib; {
+    description = "LunarG Vulkan loader";
+    homepage    = https://www.lunarg.com;
+    platforms   = platforms.linux;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.ralith ];
+  };
+}
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
new file mode 100644
index 0000000000000..a0de144d907e2
--- /dev/null
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib
+, libxml2, freetype, libjpeg, libtiff, swig, openexr
+, ilmbase, boost165
+, withPython ? true, python35
+}:
+
+stdenv.mkDerivation rec {
+
+    name = "yafaray-core-${version}";
+    version = "v3.3.0";
+
+    src = fetchFromGitHub {
+      owner  = "YafaRay";
+      repo   = "Core";
+      rev    = "${version}";
+      sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6";
+    };
+
+    preConfigure = ''
+      NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR"
+    '';
+
+    buildInputs = [
+      cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff
+      swig openexr ilmbase
+    ] ++ stdenv.lib.optional withPython python35;
+
+    meta = with stdenv.lib; {
+      description = "A free, open source raytracer";
+      homepage = http://www.yafaray.org;
+      maintainers = with maintainers; [ hodapp ];
+      license = licenses.lgpl21;
+      platforms = platforms.linux;
+    };
+  }
+
+# TODO: Add optional Ruby support
+# TODO: Add Qt support? (CMake looks for it, but what for?)
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index 7f09b488c2893..a3f12d648d557 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fcitx-anthy-${version}";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
-    sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8";
+    sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
index 361355d1d6887..e2d58c564989a 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fcitx-chewing-${version}";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz";
-    sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs";
+    sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
index ebb6627dccae0..f7bb7126bef08 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fcitx-cloudpinyin-${version}";
-  version = "0.3.4";
+  version = "0.3.6";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz";
-    sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1";
+    sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
index 41560227bca07..32c9ecff9bd81 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fcitx-hangul-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz";
-    sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp";
+    sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
index c0c921f7b18dc..292d2dbb57f52 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fcitx-m17n-${version}";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz";
-    sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4";
+    sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
index b5b394c5b6cb0..7943903d6f7c9 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-configtool-0.4.9";
+  name = "fcitx-configtool-0.4.10";
 
   meta = with stdenv.lib; {
     description = "GTK-based config tool for Fcitx";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz";
-    sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r";
+    url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz";
+    sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 1a3352676b15d..50ab7d85c5ac0 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }:
+{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules
+, fetchpatch
+}:
 
 stdenv.mkDerivation rec {
   name = "fcitx-qt5-${version}";
@@ -9,6 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c";
   };
 
+  patches = [
+    # Fix build with Qt 5.11
+    # https://github.com/fcitx/fcitx-qt5/issues/34
+    (fetchpatch {
+      url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff;
+      sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b";
+    })
+  ];
+
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
 
   buildInputs = [ fcitx qtbase ];
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix
new file mode 100644
index 0000000000000..719d86b3a389e
--- /dev/null
+++ b/pkgs/tools/inputmethods/triggerhappy/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "triggerhappy-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "https://github.com/wertarbyte/triggerhappy/archive/release/${version}.tar.gz";
+    sha256 = "af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c";
+  };
+
+  buildInputs = [ perl ];
+  installFlags = [ "DESTDIR=$(out)" ];  
+
+  postPatch = ''
+    substituteInPlace Makefile --replace "/usr/" "/"
+    substituteInPlace Makefile --replace "/sbin/" "/bin/"
+  '';
+
+  postInstall = ''
+    install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples"
+    install -D -m 644 -t "$out/usr/lib/systemd/system" "systemd/triggerhappy.service" "systemd/triggerhappy.socket"
+    install -D -m 644 -t "$out/usr/lib/udev/rules.d" "udev/triggerhappy-udev.rules"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A lightweight hotkey daemon";
+    longDescription = ''
+      Triggerhappy is a hotkey daemon developed with small and embedded systems in
+      mind, e.g. linux based routers. It attaches to the input device files and
+      interprets the event data received and executes scripts configured in its
+      configuration.
+    '';
+    homepage = https://github.com/wertarbyte/triggerhappy/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.taha ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 1bdbef2fde6cd..b8510b102cbb2 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -38,15 +38,15 @@ assert withFFI -> libffi != null;
 assert withMisc -> libeb != null;
 
 stdenv.mkDerivation rec {
-  version = "1.8.6-20180501-git";
+  version = "1.8.8";
   name = "uim-${version}";
 
   src = fetchFromGitHub {
     owner = "uim";
     repo = "uim";
-    rev = "c79432cb5aba3a67fb7e7557f4817c749865cc8a";
+    rev = "2c0958c9c505a87e70e344c2192e2e5123c71ea5";
     fetchSubmodules = true;
-    sha256 = "12rznfwq1mh750i18bl1743c51akyyvy6la5rgrxmrnp0mha9ba5";
+    sha256 = "1hkjxi5r49gcna37m3jvykny5hz9ram4y8a3q7lw4qzr52mz9pdp";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix
new file mode 100644
index 0000000000000..2f9615a1fdbbd
--- /dev/null
+++ b/pkgs/tools/misc/agedu/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchgit, autoreconfHook, halibut}:
+let
+  date = "20180522";
+  rev = "5b12791";
+in
+stdenv.mkDerivation {
+  name = "agedu-${date}.${rev}";
+  # upstream provides tarballs but it seems they disappear after the next version is released
+  src = fetchgit {
+    url = https://git.tartarus.org/simon/agedu.git;
+    inherit rev;
+    sha256 = "1zyxif0i3yil4xm8y9aqk6wsdwi7b3jg682lv6ds6a6bl047fz1q";
+  };
+
+  nativeBuildInputs = [autoreconfHook halibut];
+
+  meta = with stdenv.lib; {
+    description = "A Unix utility for tracking down wasted disk space";
+    longDescription = ''
+       Most Unix file systems, in their default mode, helpfully record when a
+       file was last accessed. So if you generated a large amount of data years
+       ago, forgot to clean it up, and have never used it since, then it ought
+       in principle to be possible to use those last-access time stamps to tell
+       the difference between that and a large amount of data you're still
+       using regularly.
+
+       agedu uses this information to tell you which files waste disk space when
+       you haven't used them since a long time.
+    '';
+    homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ symphorien ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix
index 693ca27a88d96..550ab4972d978 100644
--- a/pkgs/tools/misc/apparix/default.nix
+++ b/pkgs/tools/misc/apparix/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "apparix-11-062";
 
   src = fetchurl {
-    url = "http://micans.org/apparix/src/${name}.tar.gz";
+    url = "https://micans.org/apparix/src/${name}.tar.gz";
     sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235";
   };
 
diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix
index 54c78874dd2e8..7ceafe127932b 100644
--- a/pkgs/tools/misc/appdata-tools/default.nix
+++ b/pkgs/tools/misc/appdata-tools/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureScript = "./autogen.sh";
 
   meta = with stdenv.lib; {
-    homepage = http://people.freedesktop.org/~hughsient/appdata;
+    homepage = https://people.freedesktop.org/~hughsient/appdata;
     description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index 760757190c328..e1068c248b347 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -1,14 +1,31 @@
-{ stdenv, fetchurl, libpcap }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "arp-scan-1.9";
+  name = "arp-scan-${version}";
+  version = "1.9.5";
 
-  src = fetchurl {
-    url = "http://www.nta-monitor.com/files/arp-scan/${name}.tar.gz";
-    sha256 = "14nqjzbmnlx2nac7lwa93y5m5iqk3layakyxyvfmvs283k3qm46f";
+  src = fetchFromGitHub {
+    owner = "royhills";
+    repo = "arp-scan";
+    rev = "4de863c2627a05177eda7159692a588f9f520cd1";
+    sha256 = "15zpfdybk2kh98shqs8qqd0f9nyi2ch2wcyv729rfj7yp0hif5mb";
   };
 
-  buildInputs = [ libpcap ];
+  perlModules = with perlPackages; [
+    HTTPDate
+    HTTPMessage
+    LWPUserAgent
+    URI
+  ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libpcap makeWrapper ];
+
+  postInstall = ''
+    for name in get-{oui,iab}; do
+      wrapProgram "$out/bin/$name" --set PERL5LIB "${stdenv.lib.makePerlPath perlModules }"
+    done;
+  '';
 
   meta = with stdenv.lib; {
     description = "ARP scanning and fingerprinting tool";
@@ -19,6 +36,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor mikoim ];
   };
 }
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
index 0808704ecb783..c1cca25c576e3 100644
--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -1,10 +1,10 @@
-{ lib, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages, fetchFromGitHub, glibcLocales }:
 
 let
   pythonPackages = python3Packages;
 in pythonPackages.buildPythonApplication rec {
   name = "asciinema-${version}";
-  version = "2.0.0";
+  version = "2.0.1";
 
   buildInputs = with pythonPackages; [ nose ];
   propagatedBuildInputs = with pythonPackages; [ requests ];
@@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "asciinema";
     repo = "asciinema";
     rev = "v${version}";
-    sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk";
+    sha256 = "09m9agkslrbm36y8pjqhg5nmyz9hppjyhafhzpglnadhfgwqzznr";
   };
 
   patchPhase = ''
@@ -21,8 +21,10 @@ in pythonPackages.buildPythonApplication rec {
     rm tests/pty_recorder_test.py
   '';
 
+  checkInputs = [ glibcLocales ];
+
   checkPhase = ''
-    nosetests
+    LC_ALL=en_US.UTF-8 nosetests
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix
index e02359eda8039..c7829239c41f0 100644
--- a/pkgs/tools/misc/aws-mturk-clt/default.nix
+++ b/pkgs/tools/misc/aws-mturk-clt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "aws-mturk-clt-1.3.0";
 
   src = fetchurl {
-    url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
+    url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
     sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3";
   };
 
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index a8b6d5f3c2525..e8ea9117bc5a9 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "1.5.1";
 
   src = fetchurl {
-    url = "http://zsmith.co/archives/${name}.tar.gz";
+    url = "https://zsmith.co/archives/${name}.tar.gz";
     sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib";
   };
 
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index f69f654cda3d1..ae88b7e99c658 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -10,7 +10,6 @@ with python.pkgs;
 buildPythonPackage rec {
   pname = "bepasty";
   version = "0.4.0";
-  name = "${pname}-${version}";
 
   propagatedBuildInputs = [
     flask
@@ -39,4 +38,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.makefu ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 74894da541827..e34eea8b10ce9 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.98";
 
   src = fetchurl {
-    url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz;
+    url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz;
     sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9";
   };
 
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index 90a2211235d77..41a50eecd84b6 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bibutils-${version}";
-  version = "6.3";
+  version = "6.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
-    sha256 = "10r5v5xbhsxdh6vq6g2xp6lgmpjdzba83h4m4clfhrzqis8clwqy";
+    sha256 = "1zqwhjsngnflzdp2nd3762bvmkjq5mal417fly1n2xfgdqpg37ps";
   };
 
   configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix
index e87987aa0835e..4248dd6bd93c0 100644
--- a/pkgs/tools/misc/blink1-tool/default.nix
+++ b/pkgs/tools/misc/blink1-tool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "blink1-${version}";
-  version = "1.98";
+  version = "1.98a";
 
   src = fetchurl {
     url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz";
-    sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb";
+    sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 793e5c56e1f18..90fc68dcc5cc2 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -3,17 +3,17 @@
 let version = "0.8"; in
 
 stdenv.mkDerivation rec {
-	name = "buildtorrent-${version}";
+  name = "buildtorrent-${version}";
 
-	src = fetchurl {
-		url = "http://mathr.co.uk/blog/code/${name}.tar.gz";
-		sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
-	};
+  src = fetchurl {
+    url = "https://mathr.co.uk/blog/code/${name}.tar.gz";
+    sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
+  };
 
-	meta = {
-		description = "A simple commandline torrent creator";
-		homepage = http://mathr.co.uk/blog/torrent.html;
-		license = stdenv.lib.licenses.gpl3Plus;
-		platforms = stdenv.lib.platforms.all;
-	};
+  meta = {
+    description = "A simple commandline torrent creator";
+    homepage = http://mathr.co.uk/blog/torrent.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 5dba7744d7b3d..e154e217e9515 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "calamares";
-  version = "3.2.0";
+  version = "3.2.1";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1i5q3hffjqi1id9kv8sixhddxd90d5qqmbc7gf5vf9m3c54pln64";
+    sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 2f442a7a9c106..54a6fac17a3c8 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clex-${version}";
-  version = "4.6.patch6";
+  version = "4.6.patch9";
 
   src = fetchurl {
-    sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp";
+    sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc";
     url = "${meta.homepage}/download/${name}.tar.gz";
   };
 
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index 2181e1cb916fe..bffcc597ea0a9 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-${version}";
-  version = "1.5.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
     rev = "${version}";
-    sha256 = "0bj7fk19z3c29vxm3mcp3s7vggkigmz3hrn4pcsqgfh96i5i5203";
+    sha256 = "0v1412zdkps21i5bw1p7jdv5ydnbw9dcr02318qr5mvk8lwdmsgw";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix
index c26f835c0ee5d..38b4916e39425 100644
--- a/pkgs/tools/misc/colord-gtk/default.nix
+++ b/pkgs/tools/misc/colord-gtk/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "colord-gtk-0.1.26";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
     sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18";
   };
 
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 9b63301400973..4461834cb74de 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "colord-1.4.2";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
     sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c";
   };
 
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index 47a74e84b55a2..dc8f776cef66f 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }:
+{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }:
 
 stdenv.mkDerivation rec {
   version = "1.1a-3";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3";
   };
 
-  buildInputs = [ xcbuild Foundation AddressBook ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ Foundation AddressBook ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index 253e6a50b3617..52bcbde1cc1b5 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "convmv-2.05";
 
   src = fetchurl {
-    url = "http://www.j3e.de/linux/convmv/${name}.tar.gz";
+    url = "https://www.j3e.de/linux/convmv/${name}.tar.gz";
     sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk";
   };
 
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index b20e493a58559..3d6d2328da1e0 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "cutecom-${version}";
-  version = "0.40.0";
+  version = "0.45.0";
   src = fetchFromGitHub {
     owner = "neundorf";
     repo = "CuteCom";
     rev = "v${version}";
-    sha256 = "1bn6vndqlvn73riq6p0nanmcl35ja9gsil5hvfpf509r7i8gx4ds";
+    sha256 = "07h1r7bcz86fvcvxq6g5zyh7fsginx27jbp81a7hjhhhn6v0dsmh";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix
index bb1267d62f4ba..747d7b26669b8 100644
--- a/pkgs/tools/misc/dbacl/default.nix
+++ b/pkgs/tools/misc/dbacl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "dbacl-1.14";
   src = fetchurl {
-    url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
+    url = "https://www.lbreyer.com/gpl/${name}.tar.gz";
     sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7";
   };
 
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index e5af0c8d7263d..35c18954bf3fe 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "1lcn3jbhpcm6ixp24vsfnk1v0qi0fjkkf57f4grs1wg148s3jpvc";
+    sha256 = "0chs5bfw4yjnr7brhxxqydybcxdkjv4gnik2s0cvjzcj3bqnz73b";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index d12038a707d2b..054822e60699c 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.100";
+  version = "1.0.106";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "0jmwf26sq4bkdz6wi0dcjsrfkg8c8k3xdhi11xp6cdrw6qpw82ws";
+    sha256 = "0vn2camhwf6h2ja78km9ihi8df4pfzvm9hnppv6vq32lfwjd3z2g";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix
index e89222af74b47..a6280ff4008a6 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/pkgs/tools/misc/desktop-file-utils/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "desktop-file-utils-0.23";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz";
     sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc";
   };
 
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 1987c6aed0ada..f84b37d48cc50 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -8,12 +8,12 @@
 
 python3Packages.buildPythonApplication rec {
   name = "diffoscope-${version}";
-  version = "91";
+  version = "98";
 
   src = fetchgit {
     url    = "https://anonscm.debian.org/git/reproducible/diffoscope.git";
     rev    = "refs/tags/${version}";
-    sha256 = "16xqy71115cj4kws6bkcjm98nlaff3a32fz82rn2l1xk9w9n3dnz";
+    sha256 = "1xvalxz11jlyk9aczq5g367ldx0wfib4kpxs8f1rg7kh97r8z1rh";
   };
 
   patches = [
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
   pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
       acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils
       dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
-      libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz
+      libarchive libcaca pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
     ] ++ lib.optionals enableBloat [
       apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick
       llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 15d8647ff8237..e22bce7c69893 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "direnv-${version}";
-  version = "2.15.1";
+  version = "2.17.0";
   goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v";
+    sha256 = "1dmanqpifx27cz41yc3ijpij0wrbgw9qny2d4n6jppfwf2qzyq4s";
   };
 
   postConfigure = ''
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index 71b4ec338df3d..f4354ad2416c1 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ent-1.1";
 
   src = fetchurl {
-    url = "http://www.fourmilab.ch/random/random.zip";
+    url = "https://www.fourmilab.ch/random/random.zip";
     sha256 = "1v39jlj3lzr5f99avzs2j2z6anqqd64bzm1pdf6q84a5n8nxckn1";
   };
 
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index b8791f5f32a2c..9301ce12a055d 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a";
+    sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index 1d7c47c2c9aba..729b4cef03a4f 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,13 +2,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   name = "esptool-${version}";
-  version = "2.3.1";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc";
+    sha256 = "1djlmqdvcyqjqbj225xkn4ix9qr01b8pmsdija2h4nizx77xjyng";
   };
 
   checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ];
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 62c782b26fec2..0e0bc37ad5377 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.16";
+  version = "4.17";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py";
+    sha256 = "11f5503mgcwjn1q4dvhjiqwnw3zmp2gbhirjvgfr71y72ys1wsy4";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 1bdab1e841f82..21a126b04f3bc 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "flashrom-${version}";
 
   src = fetchurl {
-    url = "http://download.flashrom.org/releases/${name}.tar.bz2";
+    url = "https://download.flashrom.org/releases/${name}.tar.bz2";
     sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb";
   };
 
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 3903fde3302e5..77ec5bcb86bbf 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "1.1.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "1jhl50yj5h6wl3fx1hcqi4vb7633srmbbcpsgajprc5fxscjgapm";
+    sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index d9da04c1fa1bc..ba85c5376db1f 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.17.3";
+  version = "0.17.4";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "1wsyykvnss5r0sx344kjbprnb87849462p9rg9xj37cp7qzciwdn";
+    sha256 = "10k21v9x82imly36lgra8a7rlvz5a1jd49db16g9xc11wx7cdg8g";
   };
 
   outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index 613fdc0f45554..84d3239729f5b 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin" "$out/share/gams"
     cp -a * "$out/share/gams"
 
-    cp ${licenseFile} $out/share/gamslice.txt
+    cp ${licenseFile} $out/share/gams/gamslice.txt
   '' + stdenv.lib.optionalString (optgamsFile != null) ''
-    cp ${optgamsFile} $out/share/optgams.def
+    cp ${optgamsFile} $out/share/gams/optgams.def
     ln -s $out/share/gams/optgams.def $out/bin/optgams.def
   '';
 
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 9172c13636a65..d70af6b311ff1 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "4.1.1";
 
   src = fetchurl {
-    url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz";
+    url = "https://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz";
     sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6";
   };
 
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index eb029d32f73e6..be4de738c1c3f 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-    url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz";
+    url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix
index 32e796966c9fe..9f489fee7ec68 100644
--- a/pkgs/tools/misc/gnuvd/default.nix
+++ b/pkgs/tools/misc/gnuvd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gnuvd-1.0.12";
 
   src = fetchurl {
-    url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ;
+    url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ;
     sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz";
   };
 
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index e048a2800df50..12c199801c717 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "goaccess-${version}";
 
   src = fetchurl {
-    url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
+    url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
     sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb";
   };
 
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
index 76c60023c063c..6c5bac11e738b 100644
--- a/pkgs/tools/misc/gringo/default.nix
+++ b/pkgs/tools/misc/gringo/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ./gringo-4.5.4-to_string.patch
   ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace ./SConstruct \
       --replace \
         "env['CXX']            = 'g++'" \
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 405e19e75bf97..03af224b4c051 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.14";
 
   src = fetchurl {
-    url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz";
+    url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz";
     sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p";
   };
 
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 0b04ee1e28110..d9c255d2a7a89 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "hyperfine-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "hyperfine";
     rev    = "refs/tags/v${version}";
-    sha256 = "0prmnhyp20w71l3mjqgdr38q94cqr1xayzgj7ibbq2hdick4w5nn";
+    sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg";
   };
 
   cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s";
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
new file mode 100644
index 0000000000000..decc4afde0b97
--- /dev/null
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildGoPackage}:
+
+buildGoPackage rec {
+  name = "ical2org-${version}";
+  version="v.1.1.5";
+
+  goPackagePath = "github.com/rjhorniii/ical2org";
+
+  src = fetchFromGitHub {
+    owner = "rjhorniii";
+    repo = "ical2org";
+    rev = "${version}";
+    sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm";
+    fetchSubmodules = true;
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Convert an iCal file to org agenda format, optionally deduplicating entries.";
+    homepage = https://github.com/rjhorniii/ical2org;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ swflint ];
+    platforms = platforms.unix;
+  };
+  
+}
diff --git a/pkgs/tools/misc/ical2org/deps.nix b/pkgs/tools/misc/ical2org/deps.nix
new file mode 100644
index 0000000000000..b948fac3d116d
--- /dev/null
+++ b/pkgs/tools/misc/ical2org/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "github.com/rjhorniii/ics-golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rjhorniii/ics-golang";
+      rev = "da66d6f502fac65073773ea3779cae2959545cb2";
+      sha256 = "1mm5rssvyjk29n1gq4l5xw26gm8bhvbzrs5c059i41zh9af121px";
+    };
+  }
+]
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 4410d1e3cd4e3..acd58c9bcbd57 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jdupes-${version}";
-  version = "1.9";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "0z6hb4jva0pnk5fb1p59qwyglgrpxgpnz4djq3g00y5yxv3sj9z9";
+    sha256 = "0msp68h1gaipwpvdylpwd6w9al5gcmawj9cmvi7nw8ihh184g3m7";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isLinux "ENABLE_BTRFS=1";
 
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README
+
+  '';
+
   meta = with stdenv.lib; {
     description = "A powerful duplicate file finder and an enhanced fork of 'fdupes'";
     longDescription = ''
@@ -26,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/jbruchon/jdupes;
     license = licenses.mit;
+    maintainers = with maintainers; [ romildo ];
     platforms = platforms.all;
-    maintainers = [ maintainers.romildo ];
   };
 }
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
new file mode 100644
index 0000000000000..58c9ee770b7fc
--- /dev/null
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }:
+
+rustPlatform.buildRustPackage rec {
+  name        = "journaldriver-${version}";
+  version     = "1.0.0";
+  cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k";
+
+  src = fetchFromGitHub {
+    owner  = "aprilabank";
+    repo   = "journaldriver";
+    rev    = "v${version}";
+    sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc";
+  };
+
+  buildInputs       = [ openssl systemd ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with lib; {
+    description = "Log forwarder from journald to Stackdriver Logging";
+    homepage    = "https://github.com/aprilabank/journaldriver";
+    license     = licenses.gpl3;
+    maintainers = [ maintainers.tazjin ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 79f70da9e26c7..033e93609ab2d 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-${version}";
-  version = "4";
+  version = "6";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     rev = "r${version}";
-    sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31";
+    sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
@@ -38,7 +38,7 @@ buildGoPackage rec {
     '';
     homepage = https://godoc.org/github.com/gokcehan/lf;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index e22a31a8fe2f2..c372b0d669c53 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "21a4d435a86280a2927985fd6296de56cbce453e"; # master
-      sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
+      rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; # master
+      sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw";
     };
   }
   {
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 410ab4543123a..5941b8056b194 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,10 +1,5 @@
-{ stdenv
-, fetchFromGitHub
-, libtool
-, automake
-, autoconf
-, python2 # Needed for tests
-}:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
 stdenv.mkDerivation rec {
   name = "libcpuid-${version}";
   version = "0.4.0";
@@ -16,51 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7";
   };
 
-  patchPhase = ''
-    libtoolize
-    autoreconf --install
-  '';
-
-  configurePhase = ''
-    mkdir -p Install
-    ./configure --prefix=$(pwd)/Install
-    substituteInPlace Makefile --replace "/usr/local" "$out"
-  '';
-
-  buildPhase = ''
-    make all
-  '';
-
-  postInstall = ''
-    pushd Install
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/
-    popd
-
-    function fixRunPath {
-      p0=$(patchelf --print-rpath $1)
-      p1=$(echo $p0 | sed -re 's#.*Install/lib:##g')
-      patchelf --set-rpath $p1 $1
-    }
-
-    fixRunPath Install/bin/cpuid_tool
-
-    mkdir -p $out
-    sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc
-
-    cp -r Install/* $out
-    cp -r tests $out
-  '';
-
-  nativeBuildInputs = [
-    libtool
-    automake
-    autoconf
+  patches = [
+    # Work around https://github.com/anrieff/libcpuid/pull/102.
+    ./stdint.patch
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = with stdenv.lib; {
     homepage = http://libcpuid.sourceforge.net/;
-    description = "a small C library for x86 CPU detection and feature extraction";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ artuuge ];
+    description = "A small C library for x86 CPU detection and feature extraction";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ orivej artuuge ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/libcpuid/stdint.patch b/pkgs/tools/misc/libcpuid/stdint.patch
new file mode 100644
index 0000000000000..beb8890c5a280
--- /dev/null
+++ b/pkgs/tools/misc/libcpuid/stdint.patch
@@ -0,0 +1,5 @@
+--- a/libcpuid/libcpuid.h
++++ b/libcpuid/libcpuid.h
+@@ -88 +88 @@
+-#include "libcpuid_types.h"
++#include <stdint.h>
diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix
new file mode 100644
index 0000000000000..bb0f93ba3283b
--- /dev/null
+++ b/pkgs/tools/misc/lice/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+
+  version = "0.4";
+  name = "lice-${version}";
+
+  src = fetchFromGitHub {
+    owner = "licenses";
+    repo = "lice";
+    rev = version;
+    sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx";
+    fetchSubmodules = true;
+  };
+
+  meta = with stdenv.lib; {
+    description = "Print license based on selection and user options.";
+    homepage = https://github.com/licenses/lice;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ swflint ];
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index c019803f9035a..dc33d2ece5484 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "logstash-contrib-${version}";
 
   src = fetchzip {
-   url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
+   url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
    sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k";
   };
 
diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 810bc36fb7237..2e364e33fc68f 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "memtest86-4.3.6";
   
   src = fetchurl {
-    url = http://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz;
+    url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz;
     sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv";
   };
 
diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 52f685b22ca64..18e7281ce83a0 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
   version = "2017.6.6";
 
   src = fetchurl {
-    url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
+    url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
     sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z";
   };
 
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix
index 47eec54e127ea..6913f1c11fdf0 100644
--- a/pkgs/tools/misc/mpdscribble/default.nix
+++ b/pkgs/tools/misc/mpdscribble/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url =
-    "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2";
+    "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2";
     sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw";
   };
 
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
index 556d21ee2fc73..850ed32998b48 100644
--- a/pkgs/tools/misc/mprime/default.nix
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version = "29.4b7";
 
   src = fetchurl {
-    url = "http://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip";
+    url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip";
     sha256 = "0idaqm46m4yis7vl014scx57lpccvjbnyy79gmj8caxghyajws0m";
   };
 
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 82155eb51c7f6..39c9323151f35 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "multitail-${version}";
 
   src = fetchurl {
-    url = "http://www.vanheusden.com/multitail/${name}.tgz";
+    url = "https://www.vanheusden.com/multitail/${name}.tgz";
     sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg";
   };
 
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 330210269d571..b167d0f2c4751 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.13";
 
   src = fetchurl {
-    url = "http://dev.yorhel.nl/download/${name}.tar.gz";
+    url = "https://dev.yorhel.nl/download/${name}.tar.gz";
     sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl";
   };
 
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index af6c17433f11f..7dbfc90fa1257 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "4.0.2";
+  version = "5.0.0";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2";
+    sha256 = "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr";
   };
 
   dontBuild = true;
diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix
index 3464a92fa110a..10aa5d1ae99b5 100644
--- a/pkgs/tools/misc/osinfo-db-tools/default.nix
+++ b/pkgs/tools/misc/osinfo-db-tools/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-tools-1.1.0";
+  name = "osinfo-db-tools-1.2.0";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
-    sha256 = "0sslzrbhpb2js1vn48c11s5p0bic3yqzdnxm054dhc3wq0pwshd1";
+    sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index a437eba495749..98154d9d5628e 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,40 +1,56 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection
-, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
-, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3
+, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
+, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
 }:
 
 let
+  version = "2018.6";
+
   libglnx-src = fetchFromGitHub {
-    owner  = "GNOME";
-    repo   = "libglnx";
-    rev    = "0c82203cd459a35cc3f471e3205355e9fb79160f";
-    sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc";
+    owner = "GNOME";
+    repo = "libglnx";
+    rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3";
+    sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc";
   };
 
   bsdiff-src = fetchFromGitHub {
-    owner  = "mendsley";
-    repo   = "bsdiff";
-    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
+    owner = "mendsley";
+    repo = "bsdiff";
+    rev = "1edf9f656850c0c64dae260960fabd8249ea9c60";
     sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
   };
-
-  version = "2018.4";
 in stdenv.mkDerivation {
   name = "ostree-${version}";
 
+  outputs = [ "out" "dev" "man" "installedTests" ];
+
   src = fetchFromGitHub {
-    rev    = "v${version}";
-    owner  = "ostreedev";
-    repo   = "ostree";
-    sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr";
+    rev = "v${version}";
+    owner = "ostreedev";
+    repo = "ostree";
+    sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g";
   };
 
+  patches = [
+    # Tests access the helper using relative path
+    # https://github.com/ostreedev/ostree/issues/1593
+    (fetchpatch {
+      url = https://github.com/ostreedev/ostree/pull/1633.patch;
+      sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc
     libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ];
+  buildInputs = [
+    glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap
+    libarchive bzip2 xz
+    utillinuxMinimal # for libmount
+    (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests
+  ];
 
   prePatch = ''
     rmdir libglnx bsdiff
@@ -44,16 +60,24 @@ in stdenv.mkDerivation {
 
   preConfigure = ''
     env NOCONFIGURE=1 ./autogen.sh
-
-    configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system"
   '';
 
+  configureFlags = [
+    "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
+    "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators"
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=$(installedTests)/libexec/installed-tests/libostree"
+    "installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
+  ];
+
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
-    homepage    = https://ostree.readthedocs.io/en/latest/;
-    license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    homepage = https://ostree.readthedocs.io/en/latest/;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ copumpkin ];
   };
 }
-
diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix
index 49c57ab8dc906..260d96a981f30 100644
--- a/pkgs/tools/misc/papis/default.nix
+++ b/pkgs/tools/misc/papis/default.nix
@@ -1,21 +1,20 @@
 { buildPythonApplication, lib, fetchFromGitHub, bashInteractive
-, argcomplete, arxiv2bib, beautifulsoup4, bibtexparser
-, configparser, dmenu-python, habanero, papis-python-rofi
-, pylibgen, prompt_toolkit, pyparser, pytest, python_magic
-, pyyaml, requests, unidecode, urwid, vobject, tkinter
-, vim
+, python3, vim
 }:
 
-buildPythonApplication rec {
+let
+  python = python3;
+
+in python.pkgs.buildPythonApplication rec {
   pname = "papis";
-  version = "0.5.3";
+  version = "0.6";
 
   # Missing tests on Pypi
   src = fetchFromGitHub {
     owner = "papis";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1yc4ilb7bw099pi2vwawyf8mi0n1kp87wgwgwcwc841ibq62q8ic";
+    sha256 = "0zy8q154zhpqb75c775nwq3mdl1szhzhkfi0nvyjmzfgsv2g1wa2";
   };
 
   postPatch = ''
@@ -23,15 +22,15 @@ buildPythonApplication rec {
     patchShebangs tests
   '';
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python.pkgs; [
     argcomplete arxiv2bib beautifulsoup4 bibtexparser
     configparser dmenu-python habanero papis-python-rofi
     pylibgen prompt_toolkit pyparser python_magic pyyaml
-    requests unidecode urwid vobject tkinter
+    requests unidecode urwid vobject tkinter whoosh
     vim
   ];
 
-  checkInputs = [ pytest ];
+  checkInputs = with python.pkgs; [ pytest ];
 
   # Papis tries to create the config folder under $HOME during the tests
   checkPhase = ''
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 75be4efe7d1b8..b884a23ca7bc5 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20180522";
+  name = "parallel-20180622";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1khcz9pm7rjnq4gw8pn30k1d40x337a204dxj4y4qijpx8m7w0gb";
+    sha256 = "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
index 98907ad4b8295..ef848bb43f265 100644
--- a/pkgs/tools/misc/patdiff/default.nix
+++ b/pkgs/tools/misc/patdiff/default.nix
@@ -4,7 +4,7 @@ with ocamlPackages;
 
 janePackage {
   name = "patdiff";
-  hash = "04kl9h7j3pzpyic8p34b8i9vpf6qn7ixp077d8i44cpbymdqdn96";
+  hash = "02cdn5j5brbp4n2rpxprzxfakjbl7n2llixg7m632bih3ppmfcq1";
   buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
   meta = {
     description = "File Diff using the Patience Diff algorithm";
diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix
index c075312618b8d..d84f0f966e499 100644
--- a/pkgs/tools/misc/pdd/default.nix
+++ b/pkgs/tools/misc/pdd/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "pdd";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "pdd";
     rev = "v${version}";
-    sha256 = "09nyzzch4jlsjfx8axqyxh9d1sw8x4g3vg5fbxz7m16994fzz75i";
+    sha256 = "1r7861qg73jpchgmk8zcz0iki95ic1i3f77sd7j7vf5bvkikv739";
   };
 
   format = "other";
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 2eb6f1aa8e6d7..7db908773169f 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2017.18";
+  version = "1.2018.8";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "0ssfg6lpk41ydhxhi6y6c9ca3hpql6gg3bxjws8vrx9s3s6r5rb0";
+    sha256 = "02svd0cpaix2d523iy457h3qwlc9qpvvkls64bqa7yrqyk43xrii";
   };
 
   # It's only a .jar file and a shell wrapper
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index 0b48a5a66c6e5..b29d0eafcc9e7 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "progress-${version}";
-  version = "0.13.1";
+  version = "0.14";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "progress";
     rev = "v${version}";
-    sha256 = "13nhczzb0zqg5zfpf5vcfi6aahyb8lrr52pvpjgi1zfkh2m9vnig";
+    sha256 = "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index cd1e5457639b6..f453199835f56 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "pv-1.6.6";
 
   src = fetchurl {
-    url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
+    url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2";
     sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0";
   };
 
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index dfda07fda4e4b..8dcc9ef81ff6e 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -9,7 +9,7 @@ assert tkremind -> makeWrapper != null;
 stdenv.mkDerivation rec {
   name = "remind-3.1.15";
   src = fetchurl {
-    url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz;
+    url = https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz;
     sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla";
   };
 
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index 42a94207be79e..68d9df987d8c9 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "riemann-c-client-1.10.1";
+  name = "riemann-c-client-1.10.2";
 
   src = fetchFromGitHub {
     owner = "algernon";
     repo = "riemann-c-client";
     rev = "${name}";
-    sha256 = "1pzyngvj9aq1w2185qpg6rxrjn406pnpy40bnh4c21fn4ql5kk9p";
+    sha256 = "185wn6fqgrs16f9c0lkzw14477wmkgandz86h4miw7cgi7ki4l5i";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/tools/misc/riemann-tools/Gemfile
index 3d56cd85c617b..ac6abd42c895c 100644
--- a/pkgs/tools/misc/riemann-tools/Gemfile
+++ b/pkgs/tools/misc/riemann-tools/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem "riemann-tools", "0.2.6"
+gem "riemann-tools", "0.2.13"
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock
index 58c12fd515161..9fc17ccea56a8 100644
--- a/pkgs/tools/misc/riemann-tools/Gemfile.lock
+++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock
@@ -1,142 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.1)
-    beefcake (1.1.0)
-    builder (3.2.2)
-    excon (0.45.3)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.31.0)
-      fog-atmos
-      fog-aws (~> 0.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.30)
-      fog-ecloud
-      fog-google (>= 0.0.2)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.6.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.7.2)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.31.1)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.0.6)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.2.1)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.3)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.4)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.0.1)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (0.4.7)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
+    beefcake (1.0.0)
+    json (1.8.6)
     mtrc (0.0.4)
-    multi_json (1.11.1)
-    multipart-post (2.0.0)
-    munin-ruby (0.2.5)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    riemann-client (0.2.5)
-      beefcake (>= 0.3.5)
+    riemann-client (0.2.6)
+      beefcake (>= 0.3.5, <= 1.0.0)
       mtrc (>= 0.0.4)
       trollop (>= 1.16.2)
-    riemann-tools (0.2.6)
-      faraday (>= 0.8.5)
-      fog (>= 1.4.0)
-      munin-ruby (>= 0.2.1)
-      nokogiri (>= 1.5.6)
-      riemann-client (>= 0.2.2)
+    riemann-tools (0.2.13)
+      json (~> 1.8)
+      riemann-client (>= 0.2.6)
       trollop (>= 1.16.2)
-      yajl-ruby (>= 1.1.0)
     trollop (2.1.2)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  riemann-tools (= 0.2.6)
+  riemann-tools (= 0.2.13)
 
 BUNDLED WITH
-   1.10.2
+   1.14.6
diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix
index c518bc66984d8..a20046deafc8b 100644
--- a/pkgs/tools/misc/riemann-tools/default.nix
+++ b/pkgs/tools/misc/riemann-tools/default.nix
@@ -1,7 +1,7 @@
 { bundlerEnv }:
 
 bundlerEnv {
-  name = "riemann-tools-0.2.6";
+  name = "riemann-tools-0.2.13";
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix
index 07818fc76bcd0..a57139d2f7cab 100644
--- a/pkgs/tools/misc/riemann-tools/gemset.nix
+++ b/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -1,444 +1,52 @@
 {
-  "CFPropertyList" = {
-    version = "2.3.1";
+  beefcake = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10gid0a7pdllh3qmjiqkqxgfqvd7m1f2dmcm4gcd19s63pv620gv";
       type = "gem";
-      sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k";
     };
+    version = "1.0.0";
   };
-  "beefcake" = {
-    version = "1.1.0";
+  json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
       type = "gem";
-      sha256 = "009gzy9jp81lsnxnwisinhc58cd0qljdiipj2701lzzrha5d826z";
     };
+    version = "1.8.6";
   };
-  "builder" = {
-    version = "3.2.2";
+  mtrc = {
     source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "excon" = {
-    version = "0.45.3";
-    source = {
-      type = "gem";
-      sha256 = "183kfxfjjlc97w4rxkrxjw3kis4lxm65vppmvl4bkblvlw4nq94j";
-    };
-  };
-  "faraday" = {
-    version = "0.9.1";
-    source = {
-      type = "gem";
-      sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "fission" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
-    };
-    dependencies = [
-      "CFPropertyList"
-    ];
-  };
-  "fog" = {
-    version = "1.31.0";
-    source = {
-      type = "gem";
-      sha256 = "0xr8xyrrkljm2hxi420x4qr5v6wqcj8d63v0qy1g6rkb3b1yhl9i";
-    };
-    dependencies = [
-      "fog-atmos"
-      "fog-aws"
-      "fog-brightbox"
-      "fog-core"
-      "fog-ecloud"
-      "fog-google"
-      "fog-json"
-      "fog-local"
-      "fog-powerdns"
-      "fog-profitbricks"
-      "fog-radosgw"
-      "fog-riakcs"
-      "fog-sakuracloud"
-      "fog-serverlove"
-      "fog-softlayer"
-      "fog-storm_on_demand"
-      "fog-terremark"
-      "fog-vmfusion"
-      "fog-voxel"
-      "fog-xml"
-      "ipaddress"
-      "nokogiri"
-    ];
-  };
-  "fog-atmos" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-aws" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1m79s5ha6qq60pxqqxr9qs9fg8fwaz79sfxckidyhxdydcsjwx6z";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-      "ipaddress"
-    ];
-  };
-  "fog-brightbox" = {
-    version = "0.7.2";
-    source = {
-      type = "gem";
-      sha256 = "0636sqaf2w1rh4i2hxfgs24374l4ai8dgch8a7nycqhvjk2dm0aq";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "inflecto"
-    ];
-  };
-  "fog-core" = {
-    version = "1.31.1";
-    source = {
-      type = "gem";
-      sha256 = "1bcsy4cq7vyjmdf3h2v7q6hfj64v6phn0rfvwgj5wfza7yaxnhk7";
-    };
-    dependencies = [
-      "builder"
-      "excon"
-      "formatador"
-      "mime-types"
-      "net-scp"
-      "net-ssh"
-    ];
-  };
-  "fog-ecloud" = {
-    version = "0.3.0";
-    source = {
-      type = "gem";
-      sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-google" = {
-    version = "0.0.6";
-    source = {
-      type = "gem";
-      sha256 = "1g3ykk239nxpdsr5anhprkp8vzk106gi4q6aqjh4z8q4bii0dflm";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-json" = {
-    version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
-    };
-    dependencies = [
-      "fog-core"
-      "multi_json"
-    ];
-  };
-  "fog-local" = {
-    version = "0.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
-    };
-    dependencies = [
-      "fog-core"
-    ];
-  };
-  "fog-powerdns" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-profitbricks" = {
-    version = "0.0.3";
-    source = {
-      type = "gem";
-      sha256 = "01a3ylfkjkyagf4b4xg9x2v20pzapr3ivn9ydd92v402bjsm1nmr";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-      "nokogiri"
-    ];
-  };
-  "fog-radosgw" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1pxbvmr4dsqx4x2klwnciyhki4r5ryr9y0hi6xmm3n6fdv4ii7k3";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-riakcs" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-sakuracloud" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1s16b48kh7y03hjv74ccmlfwhqqq7j7m4k6cywrgbyip8n3258n8";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-serverlove" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-softlayer" = {
-    version = "0.4.7";
-    source = {
-      type = "gem";
-      sha256 = "0fgfbhqnyp8ywymvflflhvbns54d1432x57pgpnfy8k1cxvhv9b8";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-storm_on_demand" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-terremark" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-vmfusion" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
-    };
-    dependencies = [
-      "fission"
-      "fog-core"
-    ];
-  };
-  "fog-voxel" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-xml" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
-    };
-    dependencies = [
-      "fog-core"
-      "nokogiri"
-    ];
-  };
-  "formatador" = {
-    version = "0.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
-    };
-  };
-  "inflecto" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
-    };
-  };
-  "ipaddress" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir";
-    };
-  };
-  "mime-types" = {
-    version = "2.6.1";
-    source = {
-      type = "gem";
-      sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
-    };
-  };
-  "mini_portile" = {
-    version = "0.6.2";
-    source = {
-      type = "gem";
-      sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
-    };
-  };
-  "mtrc" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "0xj2pv4cpn0ad1xw38sinsxfzwhgqs6ff18hw0cwz5xmsf3zqmiz";
-    };
-  };
-  "multi_json" = {
-    version = "1.11.1";
-    source = {
-      type = "gem";
-      sha256 = "0lrmadw2scqwz7nw3j5pfdnmzqimlbaxlxi37xsydrpbbr78qf6g";
-    };
-  };
-  "multipart-post" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-    };
-  };
-  "munin-ruby" = {
-    version = "0.2.5";
-    source = {
-      type = "gem";
-      sha256 = "0378jyf0hdbfs2vvk7v8k7hqilzi1rfkpn271dyrqqal7g2lnjl2";
-    };
-  };
-  "net-scp" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh" = {
-    version = "2.9.2";
-    source = {
-      type = "gem";
-      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.6.2";
-    source = {
       type = "gem";
-      sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30";
     };
-    dependencies = [
-      "mini_portile"
-    ];
+    version = "0.0.4";
   };
-  "riemann-client" = {
-    version = "0.2.5";
+  riemann-client = {
+    dependencies = ["beefcake" "mtrc" "trollop"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02rp8x2y8h61x8mx9c8kwgm2yyvgg63g8km93zmwmkpp5fyi3fi8";
       type = "gem";
-      sha256 = "1myhyh31f290jm1wlhhjvf331n5l8qdm7axkxyacdgjsfg4szsjc";
     };
-    dependencies = [
-      "beefcake"
-      "mtrc"
-      "trollop"
-    ];
-  };
-  "riemann-tools" = {
     version = "0.2.6";
-    source = {
-      type = "gem";
-      sha256 = "0qjm7p55h70l5bs876hhvz3isr204663f97py9g0ajxz2z8jkzpi";
-    };
-    dependencies = [
-      "faraday"
-      "fog"
-      "munin-ruby"
-      "nokogiri"
-      "riemann-client"
-      "trollop"
-      "yajl-ruby"
-    ];
   };
-  "trollop" = {
-    version = "2.1.2";
+  riemann-tools = {
+    dependencies = ["json" "riemann-client" "trollop"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0brf44cq4xz0nqhs189zlg76527bfv3jr453yc00410qdzz8fpxa";
       type = "gem";
-      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
     };
+    version = "0.2.13";
   };
-  "yajl-ruby" = {
-    version = "1.2.1";
+  trollop = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
       type = "gem";
-      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
     };
+    version = "2.1.2";
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index e9ed5c0450af6..b5b5a2cfed8f7 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation  rec {
   version = "1.4.0";
 
   src = fetchurl {
-    url = "http://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2";
+    url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2";
     sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w";
   };
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation  rec {
 
   meta = with stdenv.lib; {
     description = "Open source firmware for mp3 players";
-    homepage = http://www.rockbox.org;
+    homepage = https://www.rockbox.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ goibhniu jgeerds ];
diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix
index ed97601e51917..650ac9f660aa8 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/pkgs/tools/misc/routino/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.2";
 
   src = fetchurl {
-    url = "http://routino.org/download/${name}.tgz";
+    url = "https://routino.org/download/${name}.tgz";
     sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972";
   };
 
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 8c2845dc8ebde..75b9dd15fb7f5 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -1,40 +1,57 @@
-{ stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig,
-  libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils,
-  gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }:
+{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig,
+  gobjectIntrospection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake,
+  libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit,
+  bubblewrap, pcre, check, python }:
 
 let
   libglnx-src = fetchFromGitHub {
-    owner  = "GNOME";
-    repo   = "libglnx";
-    rev    = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db";
-    sha256 = "1npb9zbyb4bl0nxqf0pcqankcwzs3k1x8i2wkdwhgak4qcvxvfqn";
+    owner = "GNOME";
+    repo = "libglnx";
+    rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97";
+    sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs";
   };
 
   libdnf-src = fetchFromGitHub {
-    owner  = "rpm-software-management";
-    repo   = "libhif";
-    rev    = "b69552b3b3a42fd41698a925d5f5f623667bac63";
-    sha256 = "0h6k09rb4imzbmsn7mspwl0js2awqdpb4ysdqq550vw2nr0dzszr";
+    owner = "rpm-software-management";
+    repo = "libdnf";
+    rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49";
+    sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci";
   };
 
-  version = "2016.10";
+  version = "2018.5";
 in stdenv.mkDerivation {
   name = "rpm-ostree-${version}";
 
+  outputs = [ "out" "dev" "man" "devdoc" ];
+
   src = fetchFromGitHub {
-    rev    = "v${version}";
-    owner  = "projectatomic";
-    repo   = "rpm-ostree";
-    sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb";
+    rev = "v${version}";
+    owner = "projectatomic";
+    repo = "rpm-ostree";
+    sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig which autoconf automake libtool cmake gperf
+    gobjectIntrospection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42
+  ];
   buildInputs = [
-    which autoconf automake libtool libcap ostree rpm glib libgsystem gperf
-    json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42
-    cmake pcre check python
-    # FIXME: get rid of this once libarchive properly propagates this
-    acl
+    libcap ostree rpm glib systemd polkit bubblewrap
+    json-glib libarchive libsolv librepo
+    pcre check python
+  ];
+
+  patches = [
+    # Use gdbus-codegen from PATH
+    (fetchpatch {
+      url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch;
+      sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp";
+    })
+  ];
+
+  configureFlags = [
+    "--enable-gtk-doc"
+    "--with-bubblewrap=${bubblewrap}/bin/bwrap"
   ];
 
   dontUseCmakeConfigure = true;
@@ -47,14 +64,11 @@ in stdenv.mkDerivation {
     # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module
     cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/
 
-    # See https://github.com/projectatomic/rpm-ostree/issues/480
-    substituteInPlace src/libpriv/rpmostree-unpacker.c --replace 'include <selinux/selinux.h>' ""
-
     # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey
     substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \'
 
     # Let's not hardcode the rpm-gpg path...
-    substituteInPlace libdnf/libdnf/dnf-keyring.c \
+    substituteInPlace libdnf/libdnf/dnf-keyring.cpp \
       --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"'
   '';
 
@@ -64,10 +78,10 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
-    homepage    = "https://rpm-ostree.readthedocs.io/en/latest/";
-    license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    homepage = https://rpm-ostree.readthedocs.io/en/latest/;
+    license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ copumpkin ];
+    platforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 671dba0d548bc..4d826c97d29c0 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "rrdtool-1.7.0";
 
   src = fetchurl {
-    url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
+    url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
     sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr";
   };
 
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index a9fefe446fe02..668a3fd5c9963 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.2.1.1";
 
   src = fetchurl {
-    url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
+    url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
     sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka";
   };
 
diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix
new file mode 100644
index 0000000000000..055fa9418a9ab
--- /dev/null
+++ b/pkgs/tools/misc/sixpair/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, libusb }:
+stdenv.mkDerivation {
+  name = "sixpair-2007-04-18";
+
+  src = fetchurl {
+    url = http://www.pabr.org/sixlinux/sixpair.c;
+    sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr";
+  };
+
+  # hcitool is depricated
+  patches = [ ./hcitool.patch ];
+
+  buildInputs = [ libusb ];
+
+  unpackPhase = ''
+    cp $src sixpair.c
+  '';
+
+  buildPhase = ''
+    cc -o sixpair sixpair.c -lusb
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp sixpair $out/bin/sixpair
+  '';
+
+  meta = {
+    description = "Pair with SIXAXIS controllers over USB";
+    longDescription = ''
+      This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master.
+    '';
+    homepage = http://www.pabr.org/sixlinux/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.tomsmeets ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/pkgs/tools/misc/sixpair/hcitool.patch
new file mode 100644
index 0000000000000..b66e791dd0e0b
--- /dev/null
+++ b/pkgs/tools/misc/sixpair/hcitool.patch
@@ -0,0 +1,19 @@
+diff --git a/sixpair.c b/sixpair.c
+index b009a6f..78b7ef0 100644
+--- a/sixpair.c
++++ b/sixpair.c
+@@ -76,11 +76,11 @@ void process_device(int argc, char **argv, struct usb_device *dev,
+       exit(1);
+     }
+   } else {
+-    FILE *f = popen("hcitool dev", "r");
++    FILE *f = popen("bluetoothctl list", "r");
+     if ( !f ||
+-	 fscanf(f, "%*s\n%*s %x:%x:%x:%x:%x:%x",
++	 fscanf(f, "%*s %x:%x:%x:%x:%x:%x",
+ 		&mac[0],&mac[1],&mac[2],&mac[3],&mac[4],&mac[5]) != 6 ) {
+-      printf("Unable to retrieve local bd_addr from `hcitool dev`.\n");
++      printf("Unable to retrieve local bd_addr from `bluetoothctl list`.\n");
+       printf("Please enable Bluetooth or specify an address manually.\n");
+       exit(1);
+     }
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 169389928d06f..31303dcdd4d7d 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "skim-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lotabout";
     repo = "skim";
     rev = "v${version}";
-    sha256 = "067ds1sdi9ya1yqz9saczj1vml8arwzd46w35gmvdxgmxx4wmihs";
+    sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00";
   };
 
   outputs = [ "out" "vim" ];
@@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec {
 
   patchPhase = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
+    # fix Cargo.lock version
+    sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index 77622ce8a1ead..30475047c4f7a 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.11";
+  version = "0.9.13";
   name = "smenu-${version}";
 
   src = fetchFromGitHub {
     owner  = "p-gen";
     repo   = "smenu";
     rev    = "v${version}";
-    sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d";
+    sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 90a17bdff704c..9d12fa254d473 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
 , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl
 , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
-, gobjectIntrospection, libgnome-keyring3
+, gobjectIntrospection, libsecret
 , cups-filters
 , pythonPackages
 , withGUI ? true
@@ -9,32 +9,36 @@
 
 stdenv.mkDerivation rec {
   name = "system-config-printer-${version}";
-  version = "1.5.9";
+  version = "1.5.11";
 
   src = fetchurl {
-    url = "https://github.com/zdohnal/system-config-printer/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "03bwlpsiqpxzcwd78a7rmwiww4jnqd7kl7il4kx78l1r57lasd2r";
+    url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz";
+    sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q";
   };
 
   patches = [ ./detect_serverbindir.patch ];
 
-  buildInputs =
-    [ intltool pkgconfig glib udev libusb1 cups xmlto
-      libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils
-      pythonPackages.python pythonPackages.wrapPython
-      libnotify gobjectIntrospection gdk_pixbuf pango atk
-      libgnome-keyring3
-    ];
+  buildInputs = [
+    glib udev libusb1 cups
+    pythonPackages.python
+    libnotify gobjectIntrospection gdk_pixbuf pango atk
+    libsecret
+  ];
 
-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [
+    intltool pkgconfig
+    xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils
+    pythonPackages.wrapPython
+    wrapGAppsHook
+  ];
 
   pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
 
-  configureFlags =
-    [ "--with-udev-rules"
-      "--with-udevdir=$(out)/etc/udev"
-      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    ];
+  configureFlags = [
+    "--with-udev-rules"
+    "--with-udevdir=$(out)/etc/udev"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
 
   stripDebugList = [ "bin" "lib" "etc/udev" ];
 
diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix
index a256b8e4fdb39..03926b955383d 100644
--- a/pkgs/tools/misc/t1utils/default.nix
+++ b/pkgs/tools/misc/t1utils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "t1utils-1.41";
 
   src = fetchurl {
-    url = "http://www.lcdf.org/type/${name}.tar.gz";
+    url = "https://www.lcdf.org/type/${name}.tar.gz";
     sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw";
   };
 
diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
new file mode 100644
index 0000000000000..65b1f71194ace
--- /dev/null
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -0,0 +1,27 @@
+{ lib, python3, fetchFromGitHub }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "termtosvg";
+  version = "0.3.0";
+
+  # tests are not available when fetching from pypi
+  src = fetchFromGitHub {
+    owner = "nbedos";
+    repo = pname;
+    rev = version;
+    sha256 = "09hw0467pyfj5gwn3768b3rvs5ch3wb1kaax7zsqjd7mw2qh0cjw";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [ svgwrite pyte ];
+
+  checkInputs = [ python3.pkgs.mock ];
+  preCheck = "export HOME=$(mktemp -d)";
+  postCheck = "unset HOME";
+
+  meta = with lib; {
+    homepage = https://github.com/nbedos/termtosvg;
+    description = "Record terminal sessions as SVG animations";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index 80cbf3661da82..14c152236d6be 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "testdisk-7.1";
 
   src = fetchurl {
-    url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2;
+    url = https://www.cgsecurity.org/testdisk-7.0.tar.bz2;
     sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0";
   };
 
diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix
index 475d444c60076..6e17ce26e0de4 100644
--- a/pkgs/tools/misc/tio/default.nix
+++ b/pkgs/tools/misc/tio/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tio-${version}";
-  version = "1.30";
+  version = "1.31";
 
   src = fetchzip {
     url = "https://github.com/tio/tio/archive/v${version}.tar.gz";
-    sha256 = "1cyjy1jg2s32h1jkb99qb79sxkxh92niiyig0vysr14m4xnw01mr";
+    sha256 = "1164ida1vxvm0z76nmkk2d5y9i3wj8rni9sl1mid6c09gi4k2slk";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 91eeb6b0a5118..39d3ea1c2086e 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Advanced Power Management for Linux";
-    homepage = http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html;
+    homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 938092c238725..1f50eef0ed000 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "tmuxinator";
-  version = "0.10.1";
-  source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi";
+  version = "0.11.3";
+  source.sha256 = "1l9pnfmfxjrszzqbw8w2r6akdi7g52q9iga01bxmy2nm27mbv2q1";
 
   erubis = buildRubyGem rec {
     inherit ruby;
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 77308ecf2ed85..113c7e127d4f9 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, coreutils
 , python3, python3Packages, substituteAll }:
 
-assert stdenv.isLinux;
-
 python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
   version = "0.17.1.14";
@@ -19,7 +17,8 @@ python3Packages.buildPythonApplication rec {
     (substituteAll {
       src = ./nix-paths.patch;
       df = "${coreutils}/bin/df";
-      libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
+      libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";
+             in "${stdenv.cc.libc}/lib/libc${ext}";
     })
 
     # Fix build on Python 3.6.
@@ -37,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     homepage = https://github.com/andreafrancia/trash-cli;
     description = "Command line tool for the desktop trash can";
     maintainers = [ maintainers.rycee ];
-    platforms = platforms.all;
+    platforms = platforms.unix;
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index 84546985f72e2..978a3d541ab09 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "unclutter-8";
   src = fetchurl {
-    url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz;
+    url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz;
     sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
   };
 
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index f66f6c3642e72..23e28c3c286ae 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "units-${version}";
-  version = "2.16";
+  version = "2.17";
 
   src = fetchurl {
     url = "mirror://gnu/units/${name}.tar.gz";
-    sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw";
+    sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz";
   };
 
   buildInputs = [ readline ];
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index fc8c40ea4e067..2a792669ba8be 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1.0";
 
   src = fetchurl {
-    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2";
     sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y";
   };
 
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix
index 1c108af27f884..90b721ad58ae2 100644
--- a/pkgs/tools/misc/vorbisgain/default.nix
+++ b/pkgs/tools/misc/vorbisgain/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "vorbisgain-0.37";
 
   src = fetchurl {
-    url = "http://sjeng.org/ftp/vorbis/${name}.tar.gz";
+    url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz";
     sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx";
   };
 
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 9899e38c854e5..6d71a4072397f 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -3,13 +3,13 @@
 with python3Packages;
 buildPythonApplication rec {
   name = "wakatime-${version}";
-  version = "10.1.0";
+  version = "10.2.1";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime";
     rev = version;
-    sha256 = "0mq1b5hwm03jz1mhlfiwi8k5r6556r1nfv9h7qs3y32zrj9mvifv";
+    sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx";
   };
 
   # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 197eea17d8868..9c6211b13dfea 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -3,14 +3,14 @@
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  version = "3.1.5";
+  version = "3.2.1";
   name = "woeusb-${version}";
 
   src = fetchFromGitHub {
     owner = "slacka";
     repo = "WoeUSB";
     rev = "v${version}";
-    sha256 = "0jbyrd49ikwkfpnka884y3p600bm3nfil2zinrgbac7vyhxxqjmw";
+    sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1";
   };
 
   buildInputs = [ wxGTK30 autoreconfHook makeWrapper ];
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 63b6cb66883bc..dd3cbb33c1b12 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.43";
 
   src = fetchurl {
-    url="http://www.jwz.org/xdaliclock/${name}.tar.gz";
+    url="https://www.jwz.org/xdaliclock/${name}.tar.gz";
     sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
   };
 
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index e6c67ddb9bb8f..80a728747fefb 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils
-, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su
+{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
+, fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
+, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
@@ -90,7 +91,9 @@ stdenv.mkDerivation {
       ln -s @out@/lib/xfstests/$f $f
     done
 
-    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
+    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils
+                                   libcap lvm2 perl procps killall quota
+                                   utillinux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index bfce454473ad2..e9cd23f5bbc47 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1077";
+  version = "0.4.1099";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qf4n1zgbr533a0qbxp8548f25jwqdwfl42gi5dyfhm4f1y1jk1a";
+    sha256 = "1z9zhxv2vgbb20hgjiksyqm2zglwq71azbp27na1779hbqc467ik";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index c7fbeddd13a49..c8c0ba706c36e 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -2,11 +2,11 @@
   yubikey-personalization, libu2f-host, libusb1 }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "yubikey-manager-0.4.0";
+  name = "yubikey-manager-0.7.0";
 
   srcs = fetchurl {
     url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz";
-    sha256 = "0dc0mqg8r6kjh0s2rmrggfxbx9imslajjrj80rffcvg64a2vgsgb";
+    sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr";
   };
 
   propagatedBuildInputs =
@@ -18,6 +18,7 @@ pythonPackages.buildPythonPackage rec {
       pyusb
       pyopenssl
       six
+      fido2
     ] ++ [
       libu2f-host
       libusb1
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index e3a5a58671c90..6d99a5c2d1a5b 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "aircrack-ng-1.2";
 
   src = fetchurl {
-    url = "http://download.aircrack-ng.org/${name}.tar.gz";
+    url = "https://download.aircrack-ng.org/${name}.tar.gz";
     sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr";
   };
 
diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix
index 657d9284f1b88..13edd48e37d2d 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/pkgs/tools/networking/airfield/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -49,13 +49,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.6.0" = {
+    "aws4-1.7.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
-        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
       };
     };
     "bcrypt-pbkdf-1.0.1" = {
@@ -67,24 +67,6 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "boom-4.3.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
-      };
-    };
     "buffer-crc32-0.1.1" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
@@ -184,15 +166,6 @@ let
         sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
       };
     };
-    "cryptiles-3.1.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
-        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -208,7 +181,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -337,24 +310,6 @@ let
         sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
       };
     };
-    "hawk-6.0.2" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
-        sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als";
-      };
-    };
-    "hoek-4.2.1" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz";
-        sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
-      };
-    };
     "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -427,13 +382,13 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "lodash-4.17.5" = {
+    "lodash-4.17.10" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.5";
+      version = "4.17.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz";
-        sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
       };
     };
     "methods-0.0.1" = {
@@ -460,7 +415,7 @@ let
       version = "1.33.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
-        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+        sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
       };
     };
     "mime-types-2.1.18" = {
@@ -469,7 +424,7 @@ let
       version = "2.1.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
-        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+        sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
       };
     };
     "mkdirp-0.3.3" = {
@@ -535,13 +490,13 @@ let
         sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
       };
     };
-    "qs-6.5.1" = {
+    "qs-6.5.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
       };
     };
     "range-parser-0.0.4" = {
@@ -559,7 +514,7 @@ let
       version = "2.8.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-        sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
+        sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
       };
     };
     "redis-commands-1.3.5" = {
@@ -568,7 +523,7 @@ let
       version = "1.3.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz";
-        sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by";
+        sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==";
       };
     };
     "redis-parser-2.6.0" = {
@@ -580,13 +535,22 @@ let
         sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
       };
     };
-    "safe-buffer-5.1.1" = {
+    "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.1";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "send-0.1.0" = {
@@ -598,31 +562,13 @@ let
         sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
       };
     };
-    "sntp-2.1.0" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
-        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
-      };
-    };
-    "sshpk-1.14.1" = {
+    "sshpk-1.14.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
-        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
-      };
-    };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
       };
     };
     "tough-cookie-2.3.4" = {
@@ -631,7 +577,7 @@ let
       version = "2.3.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
-        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -652,22 +598,22 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "underscore-1.8.3" = {
+    "underscore-1.9.1" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.8.3";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
+        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
       };
     };
-    "uuid-3.2.1" = {
+    "uuid-3.3.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.2.1";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
-        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz";
+        sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==";
       };
     };
     "verror-1.10.0" = {
@@ -726,7 +672,7 @@ in
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
     dependencies = [
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -757,7 +703,7 @@ in
     version = "2.8.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-      sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
+      sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
     };
     dependencies = [
       sources."double-ended-queue-2.1.0-0"
@@ -779,7 +725,7 @@ in
     version = "3.3.3";
     src = fetchurl {
       url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz";
-      sha512 = "355x879l7vfnzp6m199ghns4sgl5xpx0j6nr2bqimy3xj29i168bsaxi8gwky6cqy4apvb62sp8n67rssdzq667zngf7mm4dddsr5df";
+      sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg==";
     };
     dependencies = [
       sources."debug-3.1.0"
@@ -801,13 +747,13 @@ in
   async = nodeEnv.buildNodePackage {
     name = "async";
     packageName = "async";
-    version = "2.6.0";
+    version = "2.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz";
-      sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4";
+      url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+      sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
     };
     dependencies = [
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -821,10 +767,10 @@ in
   request = nodeEnv.buildNodePackage {
     name = "request";
     packageName = "request";
-    version = "2.85.0";
+    version = "2.87.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
-      sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
+      url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
+      sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
     };
     dependencies = [
       sources."ajv-5.5.2"
@@ -832,18 +778,12 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
+      sources."aws4-1.7.0"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
@@ -856,8 +796,6 @@ in
       sources."getpass-0.1.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
@@ -871,15 +809,14 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      sources."safe-buffer-5.1.1"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.14.1"
-      sources."stringstream-0.0.5"
+      sources."qs-6.5.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sshpk-1.14.2"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uuid-3.2.1"
+      sources."uuid-3.3.0"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 75bc6ec109ce4..8f3be4cc8c7f8 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index 128ebc155b563..a06b409ca49ba 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "bwm-ng-${version}";
 
   src = fetchurl {
-    url = "http://www.gropp.org/bwm-ng/${name}.tar.gz";
+    url = "https://www.gropp.org/bwm-ng/${name}.tar.gz";
     sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02";
   };
 
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 1299c5eea5f3c..2db26985dcf94 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr
-, libseccomp }:
+, libseccomp, pps-tools }:
 
 assert stdenv.isLinux -> libcap != null;
 
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   version = "3.3";
 
   src = fetchurl {
-    url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
+    url = "https://download.tuxfamily.org/chrony/${name}.tar.gz";
     sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd";
   };
 
   buildInputs = [ readline texinfo nss nspr ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
   nativeBuildInputs = [ pkgconfig ];
 
   hardeningEnable = [ "pie" ];
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index f7a0c00fb4810..3d63340adb0b9 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = https://bitbucket.org/gotoh/connect/wiki/Home;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 3d8cdd2653b78..ab293a869d053 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     configureFlags = [
         ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
         ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
-        "--with-random /dev/urandom"
+        "--with-random=/dev/urandom"
       ];
   };
 
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 1ebf57997d000..6c7f335891f5d 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "4.4.1";
 
   src = fetchurl {
-    url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
+    url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
     sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia";
   };
 
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
index 2599e822529fe..d557c0ab9adb5 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj";
-    url = "http://www.mavetju.org/download/dhcping-${version}.tar.gz";
+    url = "https://www.mavetju.org/download/dhcping-${version}.tar.gz";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
index 6120b821bf412..6120b821bf412 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
new file mode 100644
index 0000000000000..cdf9c778838f1
--- /dev/null
+++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "dnscrypt-proxy2-${version}";
+  version = "2.0.15";
+
+  goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
+
+  src = fetchFromGitHub {
+    owner = "jedisct1";
+    repo = "dnscrypt-proxy";
+    rev = "${version}";
+    sha256 = "0iwvndk1h550zmwhwablb0smv9n2l51hqbmzj354mcgi6frnx819";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A tool that provides secure DNS resolution";
+
+    license = licenses.isc;
+    homepage = https://dnscrypt.info/;
+    maintainers = with maintainers; [ waynr ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index 97aad141239e7..015046f2bdaab 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bind, libseccomp, zlib, openssl }:
+{ stdenv, fetchurl, bind, libseccomp, zlib, openssl, libcap }:
 
 stdenv.mkDerivation rec {
   name = "dnsperf-${version}";
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" "doc" ];
 
-  buildInputs = [ bind libseccomp zlib openssl ];
+  buildInputs = [ bind zlib openssl ]
+              ++ stdenv.lib.optional stdenv.isLinux [ libcap libcap.lib libseccomp ];
 
   postInstall = ''
     mkdir -p "$out/share/doc/"
@@ -29,4 +30,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.vcunat ];
   };
 }
-
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix
index 65e5c9cd126bd..5e2b27c6516c8 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/pkgs/tools/networking/dnstracer/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "dnstracer-${version}";
 
   src = fetchurl {
-    url = "http://www.mavetju.org/download/${name}.tar.gz";
+    url = "https://www.mavetju.org/download/${name}.tar.gz";
     sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f";
   };
 
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index b7ef3b8fa75b5..be2e43a8947a8 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "dropbear-2018.76";
 
   src = fetchurl {
-    url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
+    url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
     sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj";
   };
 
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index b76b32ec4c8aa..2b19c8e6a0575 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "fping-4.0";
 
   src = fetchurl {
-    url = "http://www.fping.org/dist/${name}.tar.gz";
+    url = "https://www.fping.org/dist/${name}.tar.gz";
     sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7";
   };
 
diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix
index 312906f951001..d8d4353f7820d 100644
--- a/pkgs/tools/networking/gftp/default.nix
+++ b/pkgs/tools/networking/gftp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gftp-2.0.19";
 
   src = fetchurl {
-    url = http://www.gftp.org/gftp-2.0.19.tar.bz2;
+    url = https://www.gftp.org/gftp-2.0.19.tar.bz2;
     sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
   };
 
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
new file mode 100644
index 0000000000000..8a2d32e543b0f
--- /dev/null
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -0,0 +1,50 @@
+{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
+let
+version = "2.2.1";
+apk = stdenv.mkDerivation {
+  name = "gnirehtet.apk-${version}";
+  src = fetchzip {
+    url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
+    sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan";
+  };
+  installPhase = ''
+    mkdir $out
+    mv gnirehtet.apk $out
+  '';
+};
+in
+rustPlatform.buildRustPackage rec {
+  name = "gnirehtet-${version}";
+
+  src = fetchFromGitHub {
+      owner = "Genymobile";
+      repo = "gnirehtet";
+      rev = "v${version}";
+      sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9";
+  };
+  sourceRoot = "source/relay-rust";
+  cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5";
+
+  patchFlags = [ "-p2" ];
+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      adb = "${androidenv.platformTools}/bin/adb";
+      inherit apk;
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Reverse tethering over adb for Android";
+    longDescription = ''
+      This project provides reverse tethering over adb for Android: it allows devices to use the internet connection of the computer they are plugged on. It does not require any root access (neither on the device nor on the computer).
+
+      This relies on adb, make sure you have the required permissions/udev rules.
+    '';
+    homepage = https://github.com/Genymobile/gnirehtet;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ symphorien ];
+    platforms = platforms.unix;
+  };
+}
+
diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch
new file mode 100644
index 0000000000000..72a8445d83b96
--- /dev/null
+++ b/pkgs/tools/networking/gnirehtet/paths.patch
@@ -0,0 +1,35 @@
+diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs
+index 4f1be53..96d2e78 100644
+--- a/relay-rust/src/main.rs
++++ b/relay-rust/src/main.rs
+@@ -299,7 +299,7 @@ impl Command for RelayCommand {
+ 
+ fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
+     info!(target: TAG, "Installing gnirehtet client...");
+-    exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"])
++    exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"])
+ }
+ 
+ fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
+@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>(
+     args: Vec<S>,
+ ) -> Result<(), CommandExecutionError> {
+     let adb_args = create_adb_args(serial, args);
+-    debug!(target: TAG, "Execute: adb {:?}", adb_args);
+-    match process::Command::new("adb").args(&adb_args[..]).status() {
++    debug!(target: TAG, "Execute: @adb@ {:?}", adb_args);
++    match process::Command::new("@adb@").args(&adb_args[..]).status() {
+         Ok(exit_status) => {
+             if exit_status.success() {
+                 Ok(())
+@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution
+         serial,
+         vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
+     );
+-    debug!(target: TAG, "Execute: adb {:?}", args);
+-    match process::Command::new("adb").args(&args[..]).output() {
++    debug!(target: TAG, "Execute: @adb@ {:?}", args);
++    match process::Command::new("@adb@").args(&args[..]).output() {
+         Ok(output) => {
+             if output.status.success() {
+                 // the "regex" crate makes the binary far bigger, so just parse the versionCode
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index 2317a4e2216c6..07676cb187126 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0";
 
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
+    url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
     sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf";
   };
 
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 82e105c3a3bea..6fd4ab3616300 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       the situation that your Internet access is firewalled, but pings are
       allowed.
     '';
-    homepage = http://code.gerade.org/hans/;
+    homepage = https://code.gerade.org/hans/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 7521a9a13bc27..dac3b616a9c8f 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -2,14 +2,14 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "http-prompt";
-  version = "0.11.1";
+  version = "0.11.2";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0gi76wcn6lxkd74ljpbyhr7ylhq6sm8z7h66dnfmpsw4nhw49178";
+    sha256 = "130w3wkb5jbiwm5w0b470nd50gf30vrknmf3knhlgdxdmfb30zjz";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index e2049967e8892..55abeb4f583d1 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec {
 in
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.34";
+  name = "i2p-0.9.35";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1b3qw096b9i55izvrh2793sbg0ikvihfi6k15sz2pzmjn30hy37l";
+    sha256 = "02p76vn1777lgv4zs27r6i9s4yk7b2x61b25i8dqmn6j60y3fa4g";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index dad00cfd9ee12..c7d7b5ec6dfd2 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.18.0";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h";
+    sha256 = "1676dqa4j7vd18fyxgl65yp3ip6aivchicy6qj8rwp3dilqkiv10";
   };
 
   buildInputs = with stdenv.lib; [ boost zlib openssl ]
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 69f27ff37c235..5aa0c01e84858 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "iodine-0.7.0";
 
   src = fetchurl {
-    url = "http://code.kryo.se/iodine/${name}.tar.gz";
+    url = "https://code.kryo.se/iodine/${name}.tar.gz";
     sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd";
   };
 
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
index 0506c8580296d..00a3f7f3b6b05 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l";
-    url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz";
+    url = "https://www.ip2location.com/downloads/ip2location-${version}.tar.gz";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index 33e9841eb058b..6d26cf591baed 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iperf-2.0.11";
+  name = "iperf-2.0.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/iperf2/files/${name}.tar.gz";
-    sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp";
+    sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index ece7ea3c95e2c..86ee7578bb67d 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "iperf-3.5";
+  name = "iperf-3.6";
 
   src = fetchurl {
-    url = "http://downloads.es.net/pub/iperf/${name}.tar.gz";
-    sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk";
+    url = "https://downloads.es.net/pub/iperf/${name}.tar.gz";
+    sha256 = "0vllfmyqiy6nxgbagsx1zrs4pmfawyalzm5l1xcwqq64dpj52pfy";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix
new file mode 100644
index 0000000000000..1444c398e20cf
--- /dev/null
+++ b/pkgs/tools/networking/kail/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "kail-${version}";
+  version = "0.6.0";
+
+  goPackagePath = "github.com/boz/kail";
+
+  src = fetchFromGitHub {
+    owner = "boz";
+    repo = "kail";
+    rev = "v${version}";
+    sha256 = "17ybcncdjssil4bn3n2jp1asfcpl8vj560afb2mry9032qrryvx9";
+  };
+
+  # regenerate deps.nix using following steps:
+  #
+  # go get -u github.com/boz/kail
+  # cd $GOPATH/src/github.com/boz/kail
+  # git checkout <version>
+  # dep init
+  # dep2nix
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Kubernetes log viewer";
+    homepage = https://github.com/boz/kail;
+    license = licenses.mit;
+    maintainers = with maintainers; [ offline ];
+  };
+}
diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix
new file mode 100644
index 0000000000000..b7b4bfb385609
--- /dev/null
+++ b/pkgs/tools/networking/kail/deps.nix
@@ -0,0 +1,489 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev =  "06f11fffc537c4aef126d9fd3a92e2d7968f118f";
+      sha256 = "1zhr1pyzk44zb95r2bcs4kkngvmzdr5bac55315nnzl3adx4y4dn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-autorest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-autorest";
+      rev =  "f6be1abbb5abd0517522f850dd785990d373da7e";
+      sha256 = "1dgmvvp2lk5z2mc9f6wg5jgi2szgljy02k69lqbym8zqlph3h01n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/purell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/purell";
+      rev =  "7cf257f0a33260797b0febf39f95fccd86aab2a3";
+      sha256 = "1j4dcv8ryqxwpmb6k12ilkgkjwa0viymygfa3ilvfw0149jh0syk";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/urlesc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/urlesc";
+      rev =  "de5bf2ad457846296e2031421a34e2568e304e35";
+      sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev =  "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev =  "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/boz/go-lifecycle";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boz/go-lifecycle";
+      rev =  "c39961a5a0ce6b046f15d62bcbed79701666a9e0";
+      sha256 = "12xzjzgi0pspb28xrcmp4v33jij2bbg609z1kpq1pql9mxs6h31k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/boz/go-logutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boz/go-logutil";
+      rev =  "9d21a9e4757dbc497f947fe5253f9570c34562fa";
+      sha256 = "0rhhyvvz1lvjalv3hx4yvyh90jqfia27nzx9m54m0i7d0znrwpbj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/boz/kcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boz/kcache";
+      rev =  "fb1338d323013e9456687dc080038aa0bb211783";
+      sha256 = "05y7j3sxpa9nhpq53af9ad42fvwx7l3cpjm69nminrlqjmjs63zd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "adab96458c51a58dc1783b3335dcce5461522e75";
+      sha256 = "1y743w875aqqwggrh4lwlmqyx7ls5m1bnw5y4vr3zps4ib3gb4n5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "a539ee1a749a2b895533f979515ac7e6e0f5b650";
+      sha256 = "1kxvm6zyawisl3w4pcycqjld4r0x6hqpfh9jwqsg5y9pi330n5z9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/emicklei/go-restful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful";
+      rev =  "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
+      sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
+    };
+  }
+  {
+    goPackagePath  = "github.com/emicklei/go-restful-swagger12";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful-swagger12";
+      rev =  "dcef7f55730566d41eae5db10e7d6981829720f6";
+      sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "67c513e5729f918f5e69786686770c27141a4490";
+      sha256 = "045i2y2h1a6ml7fm1b3if4692320kjgg3cpxn7chlmpq7z1bmrrn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/jsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonpointer";
+      rev =  "779f45308c19820f1a69e9a4cd965f496e0da10f";
+      sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/jsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonreference";
+      rev =  "36d33bfe519efae5632669801b180bf1a245da3b";
+      sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/spec";
+      rev =  "3faa0055dbbf2110abc1f3b4e3adbb22721e96e7";
+      sha256 = "1a3q073zaq5d10kzgba7a85l4g389r5qgbpwk4nkbawpdzm8svaz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/swag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/swag";
+      rev =  "f3f9494671f93fcff853e3c6e9e948b3eb71e590";
+      sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "1c2b16bc280d6635de6c52fc1471ab962dc36ec9";
+      sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev =  "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "1909bc2f63dc92bb931deace8b8312c4db72d12f";
+      sha256 = "0d4pknkgp5qlbfpw8xp81dqgrfm0na1pfi2ll559nwvjz5vc90g5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev =  "316fb6d3f031ae8f4d457c6c5186b9e3ded70435";
+      sha256 = "1fyj10cy2d37mpfk73hjfjwpsgpnmdzf2mrkkvzyx0d41sf46xfd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev =  "24818f796faf91cd76ec7bddd72458fbced7a6c1";
+      sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev =  "57b0290873708074edf87ad921eccec8bef5f8ec";
+      sha256 = "14raxxsx2bww4f0am0yygv64h950avkswm7bdvq6k4d4lry6dgg8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gophercloud/gophercloud";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gophercloud/gophercloud";
+      rev =  "b4c2377fa77951a0e08163f52dc9b3e206355194";
+      sha256 = "00j9ny59zlf3ajwydf2k41n3l92kl2hf0ljx9x73jcfkdkn2xv5k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gregjones/httpcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gregjones/httpcache";
+      rev =  "c1f8028e62adb3d518b823a2f8e6a95c38bdd3aa";
+      sha256 = "1v7fb4ix2xg0plx5p1f7xd1srvimyss7v7ppn3j7py9ycl560qhr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/howeyc/gopass";
+    fetch = {
+      type = "git";
+      url = "https://github.com/howeyc/gopass";
+      rev =  "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
+      sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "e3000cb3d28c72b837601cac94debd91032d19fe";
+      sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d";
+    };
+  }
+  {
+    goPackagePath  = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev =  "abe3c4016bd3f50fa9c5b0e909641e2b8370b0cf";
+      sha256 = "18v04mxgssjw2wivrbrfm8v7k617szjjdndgink00pla03pga0cc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/juju/ratelimit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/ratelimit";
+      rev =  "5b9ff866471762aa2ab2dced63c9fb6f53921342";
+      sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev =  "2f5df55504ebc322e4d52d34df6a1f5b503bf26d";
+      sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "6df6d4d004b64986bbb0d1b25945f42b44787e90";
+      sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "fc9e8d8ef48496124e79ae0df75490096eccf6fe";
+      sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
+    };
+  }
+  {
+    goPackagePath  = "github.com/petar/GoLLRB";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petar/GoLLRB";
+      rev =  "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+      sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterbourgon/diskv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterbourgon/diskv";
+      rev =  "5f041e8faa004a95c88a202771f4cc3e991971e6";
+      sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb";
+      sha256 = "07fd392kqyaj7fnl4sgzy7fcs0sw4jx3mx2khhgk64n9j9i37l59";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev =  "181d419aa9e2223811b824e8f0b4af96f9ba9302";
+      sha256 = "08ff47w4clnkym3l0v4hhhfq21zvvwzpljvs0qvki5k0azv7siyc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
+      sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f";
+      sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "b176d7def5d71bdd214203491f89843ed217f420";
+      sha256 = "1ayi4iagsxhf193rx93j6y2rb48730hgm2qbahiq9lawm5g3vc14";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "1c05540f6879653db88113bc4a2b70aec4bd491f";
+      sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "9a379c6b3e95a790ffc43293c2a78dee0d7b6e20";
+      sha256 = "156wff8s9g3sxni2z80wky4v688pvdgfzxbpfp5rmqjvgqnifxkf";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "2d3e384235de683634e9080b58f757466840aa48";
+      sha256 = "1w8zrcjv4sfi3skchdbvbixgwzp5n1g0vny8r20dlapnqbazah0x";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "b19bf474d317b857955b12035d2c5acb57ce8b01";
+      sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "d9a072cfa7b9736e44311ef77b3e09d804bfa599";
+      sha256 = "07x7s65q9pydpaniga6zf259kw7qs40q6554wb22inq423wcs0nb";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev =  "1087e65c9441605df944fb12c33f0fe7072d18ca";
+      sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-inf/inf";
+      rev =  "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
+      sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev =  "218912509d74a117d05a718bb926d0948e531c20";
+      sha256 = "076jca9c4rsg2kwjwv4kr6qgpbj4w1z0xprkxz5f5glxjnffdifk";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev =  "18a564baac720819100827c16fdebcadb05b2d0d";
+      sha256 = "0x6sxr79rmnjyk0m53n66xr58xb8mza716jdn9f0djjwd10d1p1i";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev =  "82aa063804cf055e16e8911250f888bc216e8b61";
+      sha256 = "1l8dakfsawgxhiaqq0k9360gl13vr44sbjdxf7sbg3pl2csmi6pf";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/kube-openapi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/kube-openapi";
+      rev =  "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8";
+      sha256 = "1hvrdbpf8w6jr533pa3cqws42plasl5vzcr8fj89gxdbhga6b10j";
+    };
+  }
+]
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 36eced8085697..86d162648238a 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     urls = [
       "https://lftp.tech/ftp/${name}.tar.xz"
       "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz"
-      "http://lftp.yar.ru/ftp/${name}.tar.xz"
+      "https://lftp.yar.ru/ftp/${name}.tar.xz"
       ];
     sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny";
   };
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index 0b585d10316cd..2e045ad8de915 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -9,14 +9,14 @@ let
     else throwSystem;
   throwSystem = throw "Unsupported system: ${stdenv.system}";
   sha256 =
-    if stdenv.system == "x86_64-linux" then "011xg1frhjavv6zj1y3da0yh7rl6v1ax6xy2g8fk3sry9bi2p4j3"
+    if stdenv.system == "x86_64-linux" then "11mxa4kls5xjj3462ycrfvfxb1xkk23p5m9iirvwsi0zdmhpnwm8"
     else if stdenv.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62"
     else throwSystem;
   libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
 
 in stdenv.mkDerivation rec {
   name = "logmein-hamachi-${version}";
-  version = "2.1.0.174";
+  version = "2.1.0.198";
 
   src = fetchurl {
     url = "https://www.vpn.net/installers/${name}-${arch}.tgz";
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
new file mode 100644
index 0000000000000..425e531419e46
--- /dev/null
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc
+, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
+, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
+, libaio, libedit, libtool, libui, libuuid, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "maxscale-${version}";
+  version = "2.1.17";
+
+  src = fetchFromGitHub {
+    owner = "mariadb-corporation";
+    repo = "MaxScale";
+    rev = "${name}";
+    sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c
+    ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl
+    libaio libedit libtool libui libuuid zlib
+  ];
+
+  patches = [ ./getopt.patch ];
+
+  preConfigure = ''
+    for i in `grep -l -R '#include <getopt.h>' .`; do
+      substituteInPlace $i --replace "#include <getopt.h>" "#include <${glibc.dev}/include/getopt.h>"
+    done
+ '';
+
+  cmakeFlags = [
+    "-DUSE_C99=YES"
+    "-DDEFAULT_ADMIN_USER=root"
+    "-DWITH_MAXSCALE_CNF=YES"
+    "-DSTATIC_EMBEDDED=YES"
+    "-DBUILD_RABBITMQ=YES"
+    "-DBUILD_BINLOG=YES"
+    "-DBUILD_CDC=NO"
+    "-DBUILD_MMMON=YES"
+    "-DBUILD_LUAFILTER=YES"
+    "-DLUA_LIBRARIES=${lua}/lib"
+    "-DLUA_INCLUDE_DIR=${lua}/include"
+    "-DGCOV=NO"
+    "-DWITH_SCRIPTS=OFF"
+    "-DBUILD_TESTS=NO"
+    "-DBUILD_TOOLS=NO"
+    "-DPROFILE=NO"
+    "-DWITH_TCMALLOC=YES"
+    "-DWITH_JEMALLOC=YES"
+    "-DINSTALL_EXPERIMENTAL=YES"
+    "-DTARGET_COMPONENT=all"
+  ];
+
+  CFLAGS = "-std=gnu99";
+
+  enableParallelBuilding = false;
+
+  dontStrip = true;
+
+  postInstall = ''
+    find $out/bin -type f -perm -0100 | while read f1; do
+      patchelf \
+        --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \
+        --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \
+        && patchelf --shrink-rpath $f1
+    done
+
+    find $out/lib/maxscale -type f -perm -0100 | while read f2; do
+      patchelf \
+        --set-rpath "$(patchelf --print-rpath $f2)":$out/lib/maxscale $f2
+    done
+
+    mv $out/share/maxscale/create_grants $out/bin
+    rm -rf $out/{etc,var}
+  '';
+
+  meta = with stdenv.lib; {
+     description = ''MaxScale database proxy extends MariaDB Server's high availability'';
+     homepage = https://mariadb.com/products/technology/maxscale;
+     license = licenses.bsl11;
+     platforms = platforms.linux;
+     maintainers = with maintainers; [ izorkin ];
+ };
+}
diff --git a/pkgs/tools/networking/maxscale/getopt.patch b/pkgs/tools/networking/maxscale/getopt.patch
new file mode 100644
index 0000000000000..db09a8e8f1ec5
--- /dev/null
+++ b/pkgs/tools/networking/maxscale/getopt.patch
@@ -0,0 +1,11 @@
+--- a/server/core/maxpasswd.c   2018-01-12 05:06:49.000000000 -0500
++++ b/server/core/maxpasswd.c   2018-01-12 06:50:18.518000000 -0500
+@@ -25,6 +25,7 @@
+
+ #include <maxscale/cdefs.h>
+
++#include <getopt.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 07112d1497af2..0c546ff910902 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.1";
+  name = "miniupnpd-2.1.20180706";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m";
+    sha256 = "01mhv3lgpj2shs3666zwlhvfiv1mpf4h9mv35g8gihyq8k82ybgw";
     name = "${name}.tar.gz";
   };
 
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix
index a1a2b79b86a48..babfcf1db2162 100644
--- a/pkgs/tools/networking/miredo/default.nix
+++ b/pkgs/tools/networking/miredo/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ judy ];
 
   src = fetchurl {
-    url = "http://www.remlab.net/files/miredo/miredo-${version}.tar.xz";
+    url = "https://www.remlab.net/files/miredo/miredo-${version}.tar.xz";
     sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps";
   };
 
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 5f7537eda18dd..d3b62d3259cca 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -18,6 +18,8 @@ buildPythonPackage rec {
     sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py
   '';
 
+  doCheck = (!stdenv.isDarwin);
+
   checkPhase = ''
     export HOME=$(mktemp -d)
     export LC_CTYPE=en_US.UTF-8
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index e9af9dc980e73..8612808687e80 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.7.990";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
   };
 
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index bbd003a6256cc..6b6d99e745e11 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.14";
+  name = "nbd-3.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad";
+    sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r";
   };
 
-  patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ];
-
   buildInputs =
     [ pkgconfig glib ]
     ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch
deleted file mode 100644
index ad0a7a6f66de9..0000000000000
--- a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in
---- nbd-3.14-orig/Makefile.in	2016-09-19 15:37:30.904176475 +0200
-+++ nbd-3.14-new/Makefile.in	2016-09-19 15:39:43.813543062 +0200
-@@ -403,7 +403,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = . man doc tests systemd gznbd
-+SUBDIRS = . man doc tests gznbd
- sbin_PROGRAMS = @NBD_CLIENT_NAME@
- noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la
- libcliserv_la_SOURCES = cliserv.h cliserv.c
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 56cdbd178250c..619cdac92668c 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ndisc6-1.0.3";
 
   src = fetchurl {
-    url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
+    url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
     sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g";
   };
 
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index d84f87ed1ba79..de53cfdd224cf 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     urls = [
       "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
       "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz"
-      "http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
+      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
     ];
     sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
   };
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index bd5190767d1f4..d10125e09a65c 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2"
+      "https://mamuti.net/files/netrw/netrw-${version}.tar.bz2"
       "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2"
     ];
     sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr";
diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch
deleted file mode 100644
index 4850d93716dea..0000000000000
--- a/pkgs/tools/networking/network-manager/PppdPath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c	2017-02-15 13:10:27.000000000 +0100
-+++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c	2017-04-03 11:45:39.891653216 +0200
-@@ -724,7 +724,7 @@
- 
- 	g_return_val_if_fail (setting != NULL, NULL);
- 
--	pppd_binary = nm_utils_find_helper ("pppd", NULL, err);
-+	pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err);
- 	if (!pppd_binary)
- 		return NULL;
- 
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index ecd10a1397662..98b9b0aef4d68 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
+{ stdenv, fetchurl, fetchpatch, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
 , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection
@@ -6,18 +6,25 @@
 
 let
   pname = "network-manager-applet";
-  version = "1.8.10";
+  version = "1.8.14";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a";
+    sha256 = "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch;
+      sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk";
+    })
+  ];
+
   mesonFlags = [
     "-Dselinux=false"
-    "-Dappindicator=true"
+    "-Dappindicator=yes"
     "-Dgcr=${if withGnome then "true" else "false"}"
   ];
 
@@ -34,7 +41,6 @@ in stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [
     hicolor-icon-theme
-    gnome3.gnome-keyring  # See https://github.com/NixOS/nixpkgs/issues/38967
   ];
 
   NIX_CFLAGS = [
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 9a129f522134a..85c285fd3ece1 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib, gnome3
-, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
+{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3
+, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
-, python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }:
+, python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }:
 
 let
-  pname   = "NetworkManager";
-  version = "1.10.6";
+  pname = "NetworkManager";
 in stdenv.mkDerivation rec {
-  name    = "network-manager-${version}";
+  name = "network-manager-${version}";
+  version = "1.12.0";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "15bzjkrfa7sw5p5hkdha4a67y1zfnzh1s6za11sh8s1yxmyvkziq";
   };
 
   outputs = [ "out" "dev" ];
@@ -25,11 +25,6 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
     substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
-    substituteInPlace src/devices/nm-device.c \
-       --replace /usr/bin/ping ${inetutils}/bin/ping \
-       --replace /usr/bin/ping6 ${inetutils}/bin/ping
-    substituteInPlace src/devices/nm-arping-manager.c \
-       --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);'
     substituteInPlace data/84-nm-drivers.rules \
       --replace /bin/sh ${stdenv.shell}
     substituteInPlace data/85-nm-unmanaged.rules \
@@ -38,10 +33,6 @@ in stdenv.mkDerivation rec {
       --replace /bin/sed ${gnused}/bin/sed
     substituteInPlace data/NetworkManager.service.in \
       --replace /bin/kill ${coreutils}/bin/kill
-    substituteInPlace clients/common/nm-vpn-helpers.c \
-      --subst-var-by openconnect ${openconnect}
-    substituteInPlace src/nm-core-utils.c \
-      --subst-var-by modprobeBinPath ${kmod}/bin/modprobe
     # to enable link-local connections
     configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
 
@@ -70,16 +61,32 @@ in stdenv.mkDerivation rec {
     "--with-modem-manager-1"
     "--with-nmtui"
     "--disable-gtk-doc"
+    "--with-libnm-glib" # legacy library, TODO: remove
+    "--disable-tests"
   ];
 
   patches = [
-    ./PppdPath.patch
-    ./openconnect_helper_path.patch
-    ./modprobe.patch
+    # https://bugzilla.gnome.org/show_bug.cgi?id=796752
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=372955;
+      sha256 = "17rl19lprnsz4wjmp54c1qw6a3pf8x97bhd69xavwy7cx6z84b3n";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=796751
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=372953;
+      sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a";
+    })
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit inetutils kmod openconnect;
+    })
+
   ];
 
-  buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl
-                  bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ];
+  buildInputs = [
+    systemd libuuid polkit ppp libndp curl
+    bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson
+  ];
 
   propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ];
 
@@ -114,10 +121,10 @@ in stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage    = https://wiki.gnome.org/Projects/NetworkManager;
+    homepage = https://wiki.gnome.org/Projects/NetworkManager;
     description = "Network configuration and management tool";
-    license     = licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch
index b735da28dca18..5deaa2026d0f6 100644
--- a/pkgs/tools/networking/network-manager/fix-paths.patch
+++ b/pkgs/tools/networking/network-manager/fix-paths.patch
@@ -1,34 +1,41 @@
---- a/properties/nm-openvpn-editor.c
-+++ b/properties/nm-openvpn-editor.c
-@@ -775,8 +775,7 @@
- nm_find_openvpn (void)
- {
- 	static const char *openvpn_binary_paths[] = {
--		"/usr/sbin/openvpn",
--		"/sbin/openvpn",
-+		"@openvpn@/bin/openvpn",
- 		NULL
- 	};
- 	const char  **openvpn_binary = openvpn_binary_paths;
---- a/src/nm-openvpn-service.c
-+++ b/src/nm-openvpn-service.c
-@@ -522,9 +522,7 @@
- openvpn_binary_find_exepath (void)
- {
- 	static const char *paths[] = {
--		"/usr/sbin/openvpn",
--		"/sbin/openvpn",
--		"/usr/local/sbin/openvpn",
-+		"@openvpn@/bin/openvpn",
- 	};
- 	int i;
+--- a/clients/common/nm-vpn-helpers.c
++++ b/clients/common/nm-vpn-helpers.c
+@@ -205,7 +205,7 @@
+ 	char *argv[4];
+ 	const char *path;
  
-@@ -2326,7 +2324,7 @@
- 	_LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
+-	path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error);
++	path = "@openconnect@/bin/openconnect";
+ 	if (!path)
+ 		return FALSE;
  
- 	if (   !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
--	    && (system ("/sbin/modprobe tun") == -1))
-+	    && (system ("@kmod@/bin/modprobe tun") == -1))
- 		return EXIT_FAILURE;
+--- a/src/devices/nm-device.c
++++ b/src/devices/nm-device.c
+@@ -11828,14 +11828,14 @@
+ 			gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
+ 			if (gw) {
+ 				nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
+-				ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
++				ping_binary = "@inetutils@/bin/ping";
+ 				log_domain = LOGD_IP4;
+ 			}
+ 		} else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) {
+ 			gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
+ 			if (gw) {
+ 				nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
+-				ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
++				ping_binary = "@inetutils@/bin/ping";
+ 				log_domain = LOGD_IP6;
+ 			}
+ 		}
+--- a/src/nm-core-utils.c
++++ b/src/nm-core-utils.c
+@@ -428,7 +428,7 @@
  
- 	plugin = nm_openvpn_plugin_new (bus_name);
+ 	/* construct the argument list */
+ 	argv = g_ptr_array_sized_new (4);
+-	g_ptr_array_add (argv, "/sbin/modprobe");
++	g_ptr_array_add (argv, "@kmod@/bin/modprobe");
+ 	g_ptr_array_add (argv, (char *) arg1);
+ 
+ 	va_start (ap, arg1);
diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch
deleted file mode 100644
index 487c70b0165c3..0000000000000
--- a/pkgs/tools/networking/network-manager/modprobe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/nm-core-utils.c	2017-02-15 13:10:27.000000000 +0100
-+++ b/src/nm-core-utils.c	2017-07-06 14:28:41.575815695 +0200
-@@ -419,7 +419,7 @@
- 
- 	/* construct the argument list */
- 	argv = g_ptr_array_sized_new (4);
--	g_ptr_array_add (argv, "/sbin/modprobe");
-+	g_ptr_array_add (argv, "@modprobeBinPath@");
- 	g_ptr_array_add (argv, (char *) arg1);
- 
- 	va_start (ap, arg1);
diff --git a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch
deleted file mode 100644
index 597fb753e2684..0000000000000
--- a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
-index 15611c45c..4a7444d3a 100644
---- a/clients/common/nm-vpn-helpers.c
-+++ b/clients/common/nm-vpn-helpers.c
-@@ -203,23 +203,8 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
- 	gboolean ret;
- 	char **strv = NULL, **iter;
- 	char *argv[4];
--	const char *path;
--	const char *const DEFAULT_PATHS[] = {
--		"/sbin/",
--		"/usr/sbin/",
--		"/usr/local/sbin/",
--		"/bin/",
--		"/usr/bin/",
--		"/usr/local/bin/",
--		NULL,
--	};
--
--	path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS,
--	                                      G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
--	if (!path)
--		return FALSE;
- 
--	argv[0] = (char *) path;
-+	argv[0] = "@openconnect@/bin/openconnect";
- 	argv[1] = "--authenticate";
- 	argv[2] = (char *) host;
- 	argv[3] = NULL;
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index b1ee3da1b0583..2eef7f31ab555 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname   = "NetworkManager-openvpn";
-  version = "1.8.2";
+  version = "1.8.4";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8";
+    sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr";
   };
 
   patches = [
diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
new file mode 100644
index 0000000000000..b735da28dca18
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
@@ -0,0 +1,34 @@
+--- a/properties/nm-openvpn-editor.c
++++ b/properties/nm-openvpn-editor.c
+@@ -775,8 +775,7 @@
+ nm_find_openvpn (void)
+ {
+ 	static const char *openvpn_binary_paths[] = {
+-		"/usr/sbin/openvpn",
+-		"/sbin/openvpn",
++		"@openvpn@/bin/openvpn",
+ 		NULL
+ 	};
+ 	const char  **openvpn_binary = openvpn_binary_paths;
+--- a/src/nm-openvpn-service.c
++++ b/src/nm-openvpn-service.c
+@@ -522,9 +522,7 @@
+ openvpn_binary_find_exepath (void)
+ {
+ 	static const char *paths[] = {
+-		"/usr/sbin/openvpn",
+-		"/sbin/openvpn",
+-		"/usr/local/sbin/openvpn",
++		"@openvpn@/bin/openvpn",
+ 	};
+ 	int i;
+ 
+@@ -2326,7 +2324,7 @@
+ 	_LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
+ 
+ 	if (   !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
+-	    && (system ("/sbin/modprobe tun") == -1))
++	    && (system ("@kmod@/bin/modprobe tun") == -1))
+ 		return EXIT_FAILURE;
+ 
+ 	plugin = nm_openvpn_plugin_new (bus_name);
diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix
index 3e4d2d6e9207a..c63d7ac057b1f 100644
--- a/pkgs/tools/networking/noip/default.nix
+++ b/pkgs/tools/networking/noip/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "noip-2.1.9-1";
 
   src = fetchurl {
-    url = http://www.noip.com/client/linux/noip-duc-linux.tar.gz;
+    url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz;
     sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593";
   };
 
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 1178f5f0107ed..467b17e468a25 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }:
+{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null, pps-tools }:
 
 assert stdenv.isLinux -> libcap != null;
 assert stdenv.isLinux -> libseccomp != null;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "ntp-4.2.8p11";
 
   src = fetchurl {
-    url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
+    url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
     sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi";
   };
 
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps"
     ++ stdenv.lib.optional withSeccomp "--enable-libseccomp";
 
-  buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp;
+  buildInputs = [ libcap openssl perl ]
+    ++ lib.optional withSeccomp libseccomp
+    ++ lib.optional stdenv.isLinux pps-tools;
 
   hardeningEnable = [ "pie" ];
 
diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch
index 28de2f01d0739..872bf8e7fcc27 100644
--- a/pkgs/tools/networking/ntp/seccomp.patch
+++ b/pkgs/tools/networking/ntp/seccomp.patch
@@ -34,11 +34,12 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
  	SCMP_SYS(madvise),
  	SCMP_SYS(mmap),
  	SCMP_SYS(mmap2),
-@@ -1211,6 +1216,7 @@
+@@ -1211,6 +1216,8 @@
  	SCMP_SYS(select),
  	SCMP_SYS(setitimer),
  	SCMP_SYS(setsid),
 +        SCMP_SYS(setsockopt),
++        SCMP_SYS(openat),
  	SCMP_SYS(sigprocmask),
  	SCMP_SYS(sigreturn),
  	SCMP_SYS(socketcall),
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix
index 4775d42d7a9ee..bc026d6835b8a 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/pkgs/tools/networking/nylon/default.nix
@@ -9,7 +9,7 @@ in
 stdenv.mkDerivation {
   name = "nylon-1.21";
   src = fetchurl {
-    url = http://monkey.org/~marius/nylon/nylon-1.21.tar.gz;
+    url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz;
     sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4";
   };
 
diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix
new file mode 100644
index 0000000000000..3476e56993bfc
--- /dev/null
+++ b/pkgs/tools/networking/nyx/default.nix
@@ -0,0 +1,25 @@
+{ lib, pythonPackages }:
+
+with pythonPackages;
+
+buildPythonApplication rec {
+  pname = "nyx";
+  version = "2.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pm7vfcqr02pzqz4b2f6sw5prxxmgqwr1912am42xmy2i53n7nrq";
+  };
+
+  propagatedBuildInputs = [ stem ];
+
+  # ./run_tests.py returns `TypeError: testFailure() takes exactly 1 argument`
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Command-line monitor for Tor";
+    homepage = https://nyx.torproject.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ offline ];
+  };
+}
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index ef65444ae3315..20a448b0ded6f 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "nzbget-${version}";
-  version = "19.1";
+  version = "20.0";
 
   src = fetchurl {
     url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
-    sha256 = "1rjwv555zc2hiagf00k8l1pzav91qglsnqbqkyy3pmn2d8sl5pq6";
+    sha256 = "0vyhmjg3ipjlv41il6kklys3m6rhqifdkv25a7ak772l6ba3dp04";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index c1d00dba2b469..c7d1531869864 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,7 +2,7 @@
   asciidoc, libxml2, libxslt, docbook_xml_xslt }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.2.0";
+  version = "7.2.1";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb";
+    sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index b265cdb4c326e..5512db9fe7603 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let repo = "openfortivpn";
-    version = "1.7.0";
+    version = "1.7.1";
 
 in stdenv.mkDerivation {
   name = "${repo}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "adrienverge";
     inherit repo;
     rev = "v${version}";
-    sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0";
+    sha256 = "01nsgmmh72qk0aq2zdjh8qqn256mmvz1w2gl0wi7g29d82y2hdfm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix
index 6e50b11568e6b..5258d53a18aeb 100644
--- a/pkgs/tools/networking/pirate-get/default.nix
+++ b/pkgs/tools/networking/pirate-get/default.nix
@@ -3,18 +3,17 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "pirate-get";
-  version = "0.2.12";
+  version = "0.3.1";
 
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q6hvavj0gswgw3x756h18nmmpnxlgg08qvxphpbzlwd43xrnza3";
+    sha256 = "9d7cc4b15dd8c6a82f9e03a666372e38613ccafdc846ad4c1226ba936beea68d";
   };
 
-  propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ];
+  propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ];
 
   meta = with stdenv.lib; {
     description = "A command line interface for The Pirate Bay";
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index 4651dab7e67ef..b2584a4f49747 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -5,7 +5,7 @@ in
 stdenv.mkDerivation rec {
   name = "rp-pppoe-" + version;
   src = fetchurl {
-    url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
+    url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
     sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80";
   };
 
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix
new file mode 100644
index 0000000000000..eb2fe70cf4bab
--- /dev/null
+++ b/pkgs/tools/networking/shadowfox/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "shadowfox-${version}";
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "SrKomodo";
+    repo = "shadowfox-updater";
+    rev = "v${version}";
+    sha256 = "07695hba72q722d18q75pwa45azg9jibj6vqnhwb7mnwz2i7hkkc";
+  };
+
+  goPackagePath = "github.com/SrKomodo/shadowfox-updater";
+  goDeps = ./deps.nix;
+
+  buildFlags = "--tags release";
+
+  meta = with stdenv.lib; {
+    description = ''
+      This project aims at creating a universal dark theme for Firefox while
+      adhering to the modern design principles set by Mozilla.
+    '';
+    homepage = "https://overdodactyl.github.io/ShadowFox/";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ infinisil ];
+  };
+}
diff --git a/pkgs/tools/networking/shadowfox/deps.nix b/pkgs/tools/networking/shadowfox/deps.nix
new file mode 100644
index 0000000000000..f3a824af686e2
--- /dev/null
+++ b/pkgs/tools/networking/shadowfox/deps.nix
@@ -0,0 +1,75 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/gdamore/encoding";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gdamore/encoding";
+      rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
+      sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
+    };
+  }
+  {
+    goPackagePath = "github.com/gdamore/tcell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gdamore/tcell";
+      rev = "b3cebc399d6f98536af845ed8a5144ab586f6759";
+      sha256 = "1kbf08msh4bjbdwnj1cjmddl5jfiarswfim3q085x77bcb43l0qa";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev = "cec2bdc49009247305a260b082a18e802d0fe292";
+      sha256 = "0d4ab6v83w5ya4rnnaymasmza4p2jl0lqf4xcgsmsk6lnnrwm5s8";
+    };
+  }
+  {
+    goPackagePath = "github.com/lucasb-eyer/go-colorful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lucasb-eyer/go-colorful";
+      rev = "d9cec903b20cbeda6062366e460c2c1bdc717e4d";
+      sha256 = "1j8nxi71v0qplfx6alfdx8rm2dxrcfk2k27gjrh2aksa322cmryb";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66";
+      sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+    };
+  }
+  {
+    goPackagePath = "github.com/rivo/tview";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rivo/tview";
+      rev = "306abd9cb98c97417ab6c58aa0400b2e5daac88b";
+      sha256 = "00q8hymxa36a178hbzylsw3ald6a7gyg8adnki3flyv1jg3dnahx";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "5cec4b58c438bd98288aeb248bab2c1840713d21";
+      sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds";
+    };
+  }
+]
diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix
new file mode 100644
index 0000000000000..ce2a8cf6a7f35
--- /dev/null
+++ b/pkgs/tools/networking/skydive/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl
+, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }:
+
+buildGoPackage rec {
+  name = "skydive-${version}";
+  version = "0.17.0";
+  goPackagePath = "github.com/skydive-project/skydive";
+
+  src = fetchFromGitHub {
+    owner = "skydive-project";
+    repo = "skydive";
+    rev = "v${version}";
+    sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv";
+  };
+
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace ".proto: builddep" ".proto: " \
+      --replace ".bindata: builddep" ".bindata: "
+  '';
+
+  buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ];
+  goDeps = ./deps.nix;
+
+  preBuild = ''
+    make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version}
+  '';
+
+  preInstall = ''
+    mkdir -p $out/share/skydive
+    cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/
+  '';
+
+  postInstall = ''
+    rm $bin/bin/snort
+  '';
+
+  meta = {
+    homepage = http://skydive.network;
+    description = "A real-time network analyzer";
+    license = lib.licenses.asl20;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ lib.maintainers.lewo ];
+  };
+}
diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix
new file mode 100644
index 0000000000000..c573a7231bb6f
--- /dev/null
+++ b/pkgs/tools/networking/skydive/deps.nix
@@ -0,0 +1,1335 @@
+# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
+[
+  {
+    goPackagePath = "github.com/Microsoft/go-winio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/go-winio";
+      rev = "fff283ad5116362ca252298cfc9b95828956d85d";
+      sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9";
+    };
+  }
+  {
+    goPackagePath = "github.com/PuerkitoBio/purell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/purell";
+      rev = "fd18e053af8a4ff11039269006e8037ff374ce0e";
+      sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115";
+    };
+  }
+  {
+    goPackagePath = "github.com/PuerkitoBio/urlesc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/urlesc";
+      rev = "de5bf2ad457846296e2031421a34e2568e304e35";
+      sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
+    };
+  }
+  {
+    goPackagePath = "github.com/Sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Sirupsen/logrus";
+      rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b";
+      sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq";
+    };
+  }
+  {
+    goPackagePath = "github.com/StackExchange/wmi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/StackExchange/wmi";
+      rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
+      sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
+    };
+  }
+  {
+    goPackagePath = "github.com/abbot/go-http-auth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/abbot/go-http-auth";
+      rev = "ca62df34b58d26b6a064246c21c0a18f97813173";
+      sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n";
+    };
+  }
+  {
+    goPackagePath = "github.com/araddon/gou";
+    fetch = {
+      type = "git";
+      url = "https://github.com/araddon/gou";
+      rev = "0c2ab7394d785afff14c983fedce4be70ccc431f";
+      sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d";
+    };
+  }
+  {
+    goPackagePath = "github.com/armon/consul-api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/consul-api";
+      rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c";
+      sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
+      sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
+    };
+  }
+  {
+    goPackagePath = "github.com/bitly/go-hostpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bitly/go-hostpool";
+      rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2";
+      sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
+    };
+  }
+  {
+    goPackagePath = "github.com/c-bata/go-prompt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/c-bata/go-prompt";
+      rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0";
+      sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj";
+    };
+  }
+  {
+    goPackagePath = "github.com/cenk/hub";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenk/hub";
+      rev = "11382a9960d39b0ecda16fd01c424c11ff765a34";
+      sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm";
+    };
+  }
+  {
+    goPackagePath = "github.com/cenk/rpc2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenk/rpc2";
+      rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2";
+      sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8";
+    };
+  }
+  {
+    goPackagePath = "github.com/cnf/structhash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cnf/structhash";
+      rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc";
+      sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/cmux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/cmux";
+      rev = "30d10be492927e2dcae0089c374c455d42414fcb";
+      sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/bbolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/bbolt";
+      rev = "32c383e75ce054674c53b5a07e55de85332aee14";
+      sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94";
+      sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6";
+      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31";
+      sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/pkg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/pkg";
+      rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a";
+      sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c";
+      sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev = "325b0804fef3a66309d962357aac3c2ce3f4d329";
+      sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88";
+      sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a";
+      sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev = "5d2041e26a699eaca682e2ea41c8f891e1060444";
+      sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i";
+    };
+  }
+  {
+    goPackagePath = "github.com/emicklei/go-restful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful";
+      rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
+      sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
+    };
+  }
+  {
+    goPackagePath = "github.com/emicklei/go-restful-swagger12";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful-swagger12";
+      rev = "7524189396c68dc4b04d53852f9edc00f816b123";
+      sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/structs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/structs";
+      rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63";
+      sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8";
+      sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm";
+    };
+  }
+  {
+    goPackagePath = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+    };
+  }
+  {
+    goPackagePath = "github.com/gima/govalid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gima/govalid";
+      rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6";
+      sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-ole/go-ole";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ole/go-ole";
+      rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506";
+      sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-openapi/jsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonpointer";
+      rev = "779f45308c19820f1a69e9a4cd965f496e0da10f";
+      sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-openapi/jsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonreference";
+      rev = "36d33bfe519efae5632669801b180bf1a245da3b";
+      sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-openapi/spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/spec";
+      rev = "7abd5745472fff5eb3685386d5fb8bf38683154d";
+      sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-openapi/swag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/swag";
+      rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590";
+      sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/httphead";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/httphead";
+      rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c";
+      sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/pool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/pool";
+      rev = "32dbaa12caca20fad12253c30591227e04f62cdd";
+      sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/ws";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/ws";
+      rev = "915eed3240022c5265584c55032ef1b8c8f84168";
+      sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "2adc21fd136931e0388e278825291678e1d98309";
+      sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "925541529c1fa6821df4e44ce2723319eb2be768";
+      sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev = "cc6329d4279e3f025a53a83c397d2339b5705c45";
+      sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1";
+      sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/gopacket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gopacket";
+      rev = "67a21c4470a0598531a769727aef40b870ffa128";
+      sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq";
+    };
+  }
+  {
+    goPackagePath = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev = "41d03372f44f2bc18a72c97615a669fb60e7452a";
+      sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql";
+    };
+  }
+  {
+    goPackagePath = "github.com/gophercloud/gophercloud";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gophercloud/gophercloud";
+      rev = "849a2e71dd64dbfa2bd4be110ace68881802414b";
+      sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
+      sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/handlers";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/handlers";
+      rev = "90663712d74cb411cbef281bc1e08c19d1a76145";
+      sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd";
+      sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "cdedf21e585dae942951e34d6defc3215b4280fa";
+      sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv";
+    };
+  }
+  {
+    goPackagePath = "github.com/gosuri/uitable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gosuri/uitable";
+      rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42";
+      sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil";
+    };
+  }
+  {
+    goPackagePath = "github.com/gregjones/httpcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gregjones/httpcache";
+      rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229";
+      sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+      rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0";
+      sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/grpc-gateway";
+      rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104";
+      sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
+      sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+    };
+  }
+  {
+    goPackagePath = "github.com/howeyc/gopass";
+    fetch = {
+      type = "git";
+      url = "https://github.com/howeyc/gopass";
+      rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
+      sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
+    };
+  }
+  {
+    goPackagePath = "github.com/hydrogen18/stoppableListener";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hydrogen18/stoppableListener";
+      rev = "dadc9ccc400c712e5a316107a5c462863919e579";
+      sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7";
+    };
+  }
+  {
+    goPackagePath = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev = "e3000cb3d28c72b837601cac94debd91032d19fe";
+      sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d";
+    };
+  }
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath = "github.com/intel-go/yanff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/intel-go/yanff";
+      rev = "35804adce65005f76409327527e4e256569cacc6";
+      sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh";
+    };
+  }
+  {
+    goPackagePath = "github.com/iovisor/gobpf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iovisor/gobpf";
+      rev = "dd767a9fd5f868874ed117811461410100cea403";
+      sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3";
+    };
+  }
+  {
+    goPackagePath = "github.com/jbowtie/gokogiri";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jbowtie/gokogiri";
+      rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c";
+      sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29";
+    };
+  }
+  {
+    goPackagePath = "github.com/jonboulle/clockwork";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jonboulle/clockwork";
+      rev = "ed104f61ea4877bea08af6f759805674861e968d";
+      sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2";
+    };
+  }
+  {
+    goPackagePath = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88";
+      sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/loggo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/loggo";
+      rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790";
+      sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/ratelimit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/ratelimit";
+      rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342";
+      sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/webbrowser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/webbrowser";
+      rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507";
+      sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "d1898390779332322e6b5ca5011da4bf249bb056";
+      sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa";
+    };
+  }
+  {
+    goPackagePath = "github.com/kardianos/osext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kardianos/osext";
+      rev = "c2c54e542fb797ad986b31721e1baedf214ca413";
+      sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/fs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/fs";
+      rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
+      sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b";
+      sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc";
+    };
+  }
+  {
+    goPackagePath = "github.com/lxc/lxd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lxc/lxd";
+      rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6";
+      sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19";
+      sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d";
+      sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattbaird/elastigo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/safchain/elastigo";
+      rev = "441c1531dca50a19990385930149f6785f78fe59";
+      sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "d6bea18f789704b5f83375793155289da36a3c7f";
+      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-tty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-tty";
+      rev = "931426f7535ac39720c8909d70ece5a41a2502a6";
+      sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453";
+      sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda";
+      sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/hashstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/hashstructure";
+      rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799";
+      sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "281073eb9eb092240d33ef253c404f1cca550309";
+      sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
+    };
+  }
+  {
+    goPackagePath = "github.com/nlewo/contrail-introspect-cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nlewo/contrail-introspect-cli";
+      rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6";
+      sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq";
+    };
+  }
+  {
+    goPackagePath = "github.com/nu7hatch/gouuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nu7hatch/gouuid";
+      rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
+      sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj";
+    };
+  }
+  {
+    goPackagePath = "github.com/op/go-logging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/op/go-logging";
+      rev = "970db520ece77730c7e4724c61121037378659d9";
+      sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
+    };
+  }
+  {
+    goPackagePath = "github.com/opencontainers/runc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/runc";
+      rev = "8fa5343b0058459296399a89bc532aa5508de28d";
+      sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943";
+      sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8";
+    };
+  }
+  {
+    goPackagePath = "github.com/petar/GoLLRB";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petar/GoLLRB";
+      rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+      sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+    };
+  }
+  {
+    goPackagePath = "github.com/peterbourgon/diskv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterbourgon/diskv";
+      rev = "2973218375c3d13162e1d3afe1708aaee318ef3f";
+      sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig";
+    };
+  }
+  {
+    goPackagePath = "github.com/peterh/liner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterh/liner";
+      rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073";
+      sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "ff09b135c25aae272398c51a07235b90a75aa4f0";
+      sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/sftp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/sftp";
+      rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5";
+      sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/term";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/term";
+      rev = "cda20d4ac917ad418d86e151eff439648b06185b";
+      sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmylund/go-cache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmylund/go-cache";
+      rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
+      sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568";
+      sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "23070236b1ebff452f494ae831569545c2b61d26";
+      sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8";
+      sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8";
+    };
+  }
+  {
+    goPackagePath = "github.com/robertkrimen/otto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/robertkrimen/otto";
+      rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011";
+      sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17";
+    };
+  }
+  {
+    goPackagePath = "github.com/rogpeppe/fastuuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rogpeppe/fastuuid";
+      rev = "6724a57986aff9bff1a1770e9347036def7c89f6";
+      sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz";
+    };
+  }
+  {
+    goPackagePath = "github.com/safchain/ethtool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/safchain/ethtool";
+      rev = "e01512671ed4c2248daf0c5e974ecf88a4947335";
+      sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc";
+    };
+  }
+  {
+    goPackagePath = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255";
+      sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk";
+    };
+  }
+  {
+    goPackagePath = "github.com/skydive-project/dede";
+    fetch = {
+      type = "git";
+      url = "https://github.com/skydive-project/dede";
+      rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80";
+      sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf";
+    };
+  }
+  {
+    goPackagePath = "github.com/socketplane/libovsdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/socketplane/libovsdb";
+      rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272";
+      sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "a80ea588265c05730645be8342eeafeaa72b2923";
+      sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "8965335b8c7107321228e3e3702cab9832751bac";
+      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744";
+      sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "d00654080cddbd2b082acaa74007cb94a2b40866";
+      sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f";
+      sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lebauce/viper";
+      rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3";
+      sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb";
+    };
+  }
+  {
+    goPackagePath = "github.com/tchap/zapext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tchap/zapext";
+      rev = "e61c0c8823393722ae09ce0faee42fa177088a4b";
+      sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr";
+    };
+  }
+  {
+    goPackagePath = "github.com/tebeka/selenium";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tebeka/selenium";
+      rev = "657e45ec600f26e76da253936c1f2adb6978ff72";
+      sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99";
+    };
+  }
+  {
+    goPackagePath = "github.com/ugorji/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ugorji/go";
+      rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74";
+      sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc";
+    };
+  }
+  {
+    goPackagePath = "github.com/vishvananda/netlink";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vishvananda/netlink";
+      rev = "016ba6f67a12c03708643150afcfb1509be7747a";
+      sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4";
+    };
+  }
+  {
+    goPackagePath = "github.com/vishvananda/netns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vishvananda/netns";
+      rev = "604eaf189ee867d8c147fafc28def2394e878d25";
+      sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7";
+    };
+  }
+  {
+    goPackagePath = "github.com/weaveworks/tcptracer-bpf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/weaveworks/tcptracer-bpf";
+      rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf";
+      sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonpointer";
+      rev = "6fe8760cad3569743d51ddbb243b26f8456742dc";
+      sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonreference";
+      rev = "e02fc20de94c78484cd5ffb007f8af96be030a45";
+      sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonschema";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonschema";
+      rev = "702b404897d4364af44dc8dcabc9815947942325";
+      sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr";
+    };
+  }
+  {
+    goPackagePath = "github.com/xiang90/probing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xiang90/probing";
+      rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2";
+      sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2";
+    };
+  }
+  {
+    goPackagePath = "github.com/xordataexchange/crypt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xordataexchange/crypt";
+      rev = "b2862e3d0a775f18c7cfe02273500ae307b61218";
+      sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "0506d69f5564c56e25797bf7183c28921d4c6360";
+      sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/multierr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/multierr";
+      rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
+      sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/zap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/zap";
+      rev = "35aad584952c3e7020db7b839f6b102de6271f89";
+      sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1f22c0103821b9390939b6776727195525381532";
+      sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "a6577fac2d73be281a500b310739095313165611";
+      sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "810d7000345868fc619eb81f46307107118f4ae1";
+      sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a";
+      sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7";
+      sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e";
+      sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/errgo.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/errgo.v1";
+      rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3";
+      sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/fsnotify/fsnotify.v1";
+      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/httprequest.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/httprequest.v1";
+      rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718";
+      sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/inf.v0";
+      rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/macaroon-bakery.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/macaroon-bakery.v2";
+      rev = "22c04a94d902625448265ef041bb53e715452a40";
+      sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/macaroon.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/macaroon.v2";
+      rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0";
+      sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/sourcemap.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/sourcemap.v1";
+      rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536";
+      sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/urfave/cli.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/urfave/cli.v2";
+      rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1";
+      sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/validator.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/validator.v2";
+      rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448";
+      sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "bef53efd0c76e49e6de55ead051f886bea7e9420";
+      sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si";
+    };
+  }
+  {
+    goPackagePath = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad";
+      sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl";
+    };
+  }
+  {
+    goPackagePath = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev = "019ae5ada31de202164b118aee88ee2d14075c31";
+      sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1";
+    };
+  }
+  {
+    goPackagePath = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev = "35ccd4336052e7d73018b1382413534936f34eee";
+      sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g";
+    };
+  }
+  {
+    goPackagePath = "k8s.io/kube-openapi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/kube-openapi";
+      rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1";
+      sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa";
+    };
+  }
+]
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix
index 2172efc63e35f..cca6d630fc133 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/pkgs/tools/networking/smokeping/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "smokeping-${version}";
   version = "2.6.11";
   src = fetchurl {
-    url = "http://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz";
+    url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz";
     sha256 = "1p9hpa2zs33p7hzrds80kwrm5255s0869v3s3qmsyx2sx63c7czj";
   };
   propagatedBuildInputs = [
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index ff0441c407876..623081fbb4ef2 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "sivel";
     repo = "speedtest-cli";
     rev = "v${version}";
-    sha256 = "0d3av50qm7bahsdg0k7hp04r9ripsafn95yqcgsy5h5y9yj4rsvf";
+    sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index b50d619b437d7..ad2d88e4a9827 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.0";
 
   src = fetchurl {
-    url    = "http://www.tarsnap.com/spiped/${name}.tgz";
+    url    = "https://www.tarsnap.com/spiped/${name}.tgz";
     sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj";
   };
 
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
new file mode 100644
index 0000000000000..675777e4faa67
--- /dev/null
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute
+, withGUI ? false, qt5 }:
+
+let inherit (stdenv.lib) optional optionalString;
+in
+
+stdenv.mkDerivation rec {
+  pname = "spoofer";
+  version = "1.3.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz";
+    sha256 = "05297dyyq8bdpbr3zz974l7vm766lq1bsxvzp5pa4jfpvnj7cl1g";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl protobuf libpcap traceroute ]
+                ++ optional withGUI qt5.qtbase ;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.caida.org/projects/spoofer;
+    description = "Assess and report on deployment of source address validation";
+    longDescription = ''
+      Spoofer is a new client-server system for Windows, MacOS, and
+      UNIX-like systems that periodically tests a network's ability to
+      both send and receive packets with forged source IP addresses
+      (spoofed packets). This can be used to produce reports and
+      visualizations to inform operators, response teams, and policy
+      analysts. The system measures different types of forged
+      addresses, including private and neighboring addresses.  The
+      test results allows to analyze characteristics of networks
+      deploying source address validation (e.g., network location,
+      business type).
+    '';
+    platforms = platforms.all;
+    license = licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ leenaars];
+  };
+}
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 9ceb08ad72e9a..74405a472f8a1 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version = "5.6.3";
 
   src = fetchurl {
-    url = "http://download.strongswan.org/${name}.tar.bz2";
+    url = "https://download.strongswan.org/${name}.tar.bz2";
     sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3";
   };
 
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index 1b121335ac7ac..be807e3077156 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "20170101.0";
 
   src = fetchurl {
-    url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
+    url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
     sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4";
   };
 
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index bbdaed4ccc042..54d54a76fcb37 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git
-, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }:
+, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools
+, openssh, which, coreutils, iptables, bash }:
 
 let
   sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
     src = fetchgit {
       url = "https://github.com/datawire/sshuttle.git";
-      rev = "8f881d131a0d5cb203c5a530d233996077f1da1e";
-      sha256 = "0c760xhblz5mpcn5ddqpvivvgn0ixqbhpjsy50dkhgn6lymrx9bx";
+      rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
+      sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";
       leaveDotGit = true;
     };
 
@@ -16,26 +17,43 @@ let
   });
 in stdenv.mkDerivation rec {
   pname = "telepresence";
-  version = "0.67";
+  version = "0.85";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "datawire";
     repo = "telepresence";
     rev = version;
-    sha256 = "1bpyzgvrf43yvhwp5bzkp2qf3z9dhjma165w8ssca9g00v4b5vg9";
+    sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj";
   };
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper python3 ];
 
   phases = ["unpackPhase" "installPhase"];
 
   installPhase = ''
     mkdir -p $out/libexec $out/bin
-    cp cli/telepresence $out/libexec/telepresence
 
-    makeWrapper $out/libexec/telepresence $out/bin/telepresence \
-      --prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]}
+    export PREFIX=$out
+    substituteInPlace ./install.sh \
+      --replace "#!/bin/bash" "#!${stdenv.shell}" \
+      --replace '"''${VENVDIR}/bin/pip" -q install "git+https://github.com/datawire/sshuttle.git@telepresence"' "" \
+      --replace '"''${VENVDIR}/bin/sshuttle-telepresence"' '"${sshuttle-telepresence}/bin/sshuttle-telepresence"'
+    ./install.sh
+
+    wrapProgram $out/bin/telepresence \
+      --prefix PATH : ${lib.makeBinPath [
+        python3
+        sshfs-fuse
+        torsocks
+        conntrack-tools
+        sshuttle-telepresence
+        openssh
+        which
+        coreutils
+        iptables
+        bash
+      ]}
   '';
 
   meta = {
diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index 4f6bec9c00845..bf039b653cc6b 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.33";
+  version = "1.0.34";
   name = "tinc-${version}";
 
   src = fetchurl {
-    url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz";
+    url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
+    sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0";
   };
 
   buildInputs = [ lzo openssl zlib ];
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 0f5fd2836921c..db4b6a2281d48 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
-  version = "1.1pre15";
+  version = "1.1pre16";
 
   src = fetchgit {
     rev = "refs/tags/release-${version}";
     url = "git://tinc-vpn.org/tinc";
-    sha256 = "1msym63jpipvzb5dn8yn8yycrii43ncfq6xddxh2ifrakr48l6y5";
+    sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c";
   };
 
   outputs = [ "out" "man" "info" ];
@@ -23,10 +23,6 @@ stdenv.mkDerivation rec {
     sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac
   '';
 
-  postInstall = ''
-    rm $out/bin/tinc-gui
-  '';
-
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix
index 52bb418fc0d08..f6c88bb66b7c8 100644
--- a/pkgs/tools/networking/trickle/default.nix
+++ b/pkgs/tools/networking/trickle/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "trickle-1.07";
 
   src = fetchurl {
-    url = "http://monkey.org/~marius/trickle/${name}.tar.gz";
+    url = "https://monkey.org/~marius/trickle/${name}.tar.gz";
     sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx";
   };
 
diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix
index fc46c6a15bc51..8a3b292ad81ff 100644
--- a/pkgs/tools/networking/ucspi-tcp/default.nix
+++ b/pkgs/tools/networking/ucspi-tcp/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ucspi-tcp-0.88";
 
   src = fetchurl {
-    url = "http://cr.yp.to/ucspi-tcp/${name}.tar.gz";
+    url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz";
     sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja";
   };
 
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index d7ef54a2497dc..a009e76d9e0af 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.7.1";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "https://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "13b210hd200xxvaffyzqb4g58knv1sfigph70ai74lrcb3pqbq2n";
+    sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     # get rid of runtime dependencies on $dev outputs
   + ''substituteInPlace "$lib/lib/libunbound.la" ''
     + stdenv.lib.concatMapStrings
-      (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ")
+      (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
       buildInputs;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index 911afdd18bb0f..67e6f2e9c43f8 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -5,11 +5,11 @@ let
 in stdenv.mkDerivation rec {
   pname = "pyunbound";
   name = "${pname}-${version}";
-  version = "1.6.0";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/unbound-${version}.tar.gz";
-    sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb";
+    sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1";
   };
 
   buildInputs = [ openssl expat libevent swig python ];
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 4a40c32004077..e644578b6642e 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.3.0";
+  version = "5.3.1";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "01pfl1ap62hc27574sx1a4yaaf7hr2zkksspn5z97sgacl6h1rnf";
+    sha256 = "1xqvcsh70590bwmy37kwlwyl0rvnlqx987km3mnij93q4kvabg5n";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 62ea3d64468a6..c6b8cb242fdce 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,22 +2,17 @@
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
-  version = "0.0.20180531";
+  version = "0.0.20180613";
 
   goPackagePath = "git.zx2c4.com/wireguard-go";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "1vs11kr5a2s99v0g7079nfrfvmjfh1p2lnkj2icjyn2cb0s1vqiy";
+    sha256 = "0pvg7s1kyn48az54lsnyn1ryhjk0flmpz5dx520rc94g6xn88fic";
   };
 
   goDeps = ./deps.nix;
 
-  postPatch = ''
-    # Replace local imports so that go tools do not trip on them
-    find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
-  '';
-
   meta = with stdenv.lib; {
     description = "Userspace Go implementation of WireGuard";
     homepage = https://git.zx2c4.com/wireguard-go/about/;
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 276d7066c5617..24a19b8de9db1 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180531";
+  version = "0.0.20180708";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0944zxmpx2cs71nxl7rcyhpqlwplkzd7jsf1n66vflngw2sjxm03";
+    sha256 = "04c3vynr7rfmnnw7gccbap9xcfi89ma09lq66c4bzjzxny1n2wdz";
   };
 
   sourceRoot = "source/src/tools";
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index f34b01fb484a2..d86b1613a9a34 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xl2tpd-${version}";
-  version = "1.3.10.1";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
     rev = "v${version}";
-    sha256 = "0rz31bcjl7na89abn9bj5p3dbgqd6q6xsympzki15axxhyy57qan";
+    sha256 = "0slza1v8qligy8c83j0x3jzb85m9ibjxyyvpwsykrkypav8a6ii1";
   };
 
   buildInputs = [ libpcap ];
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 43aa44809ed89..bc8b1a5e0cdf3 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.8";
+  version = "1.2.10";
   name = "zerotierone-${version}";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8";
+    sha256 = "0mqckh51xj79z468n2683liczqracip36jvhfyd0fr3pwrbyqy8w";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
new file mode 100644
index 0000000000000..f673ba5f2d6ba
--- /dev/null
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -0,0 +1,147 @@
+{ stdenv, writeScript, buildFHSUserEnv, coreutils
+, extraPkgs ? pkgs: [] }:
+
+buildFHSUserEnv {
+  name = "appimage-run";
+
+  # Most of the packages were taken from the Steam chroot
+  targetPkgs = pkgs: with pkgs; [
+    gtk3
+    bashInteractive
+    gnome3.zenity
+    python2
+    xorg.xrandr
+    which
+    perl
+    xdg_utils
+    iana-etc
+  ] ++ extraPkgs pkgs;
+
+  multiPkgs = pkgs: with pkgs; [
+    desktop-file-utils
+    xorg.libXcomposite
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.libXext
+    xorg.libX11
+    xorg.libXfixes
+    libGL
+
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-ugly
+    libdrm
+    xorg.xkeyboardconfig
+    xorg.libpciaccess
+
+    glib
+    gtk2
+    bzip2
+    zlib
+    gdk_pixbuf
+
+    xorg.libXinerama
+    xorg.libXdamage
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXxf86vm
+    xorg.libXi
+    xorg.libSM
+    xorg.libICE
+    gnome2.GConf
+    freetype
+    (curl.override { gnutlsSupport = true; sslSupport = false; })
+    nspr
+    nss
+    fontconfig
+    cairo
+    pango
+    expat
+    dbus
+    cups
+    libcap
+    SDL2
+    libusb1
+    libudev
+    dbus-glib
+    libav
+    atk
+    libudev0-shim
+    networkmanager098
+
+    xorg.libXt
+    xorg.libXmu
+    xorg.libxcb
+    libGLU
+    libuuid
+    libogg
+    libvorbis
+    SDL
+    SDL2_image
+    glew110
+    openssl
+    libidn
+    tbb
+    wayland
+    mesa_noglu
+    libxkbcommon
+
+    flac
+    freeglut
+    libjpeg
+    libpng12
+    libsamplerate
+    libmikmod
+    libtheora
+    libtiff
+    pixman
+    speex
+    SDL_image
+    SDL_ttf
+    SDL_mixer
+    SDL2_ttf
+    SDL2_mixer
+    gstreamer
+    gst-plugins-base
+    libappindicator-gtk2
+    libcaca
+    libcanberra
+    libgcrypt
+    libvpx
+    librsvg
+    xorg.libXft
+    libvdpau
+    alsaLib
+    strace
+  ];
+
+  runScript = writeScript "appimage-exec" ''
+    #!${stdenv.shell}
+    APPIMAGE="$(realpath "$1")"
+
+    if [ ! -x "$APPIMAGE" ]; then
+      echo "fatal: $APPIMAGE is not executable"
+      exit 1
+    fi
+
+    SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)"
+    SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/"
+    mkdir -p "$SQUASHFS_ROOT"
+
+    export APPDIR="$SQUASHFS_ROOT/squashfs-root"
+    if [ ! -x "$APPDIR" ]; then
+      cd "$SQUASHFS_ROOT"
+      "$APPIMAGE" --appimage-extract 2>/dev/null
+    fi
+
+    cd "$APPDIR"
+    export PATH="$PATH:$PWD/usr/bin"
+    export APPIMAGE_SILENT_INSTALL=1
+
+    if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
+      exec "$APPIMAGE_DEBUG_EXEC"
+    fi
+
+    exec ./AppRun
+  '';
+}
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index a9c1a1a33b3ca..5ac13fc42cfd7 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,17 +1,17 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
 rustPlatform.buildRustPackage rec {
   name = "cargo-tree-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "sfackler";
     repo = "cargo-tree";
     rev = "v${version}";
 
-    sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r";
+    sha256 = "16vsw392qs3ag2brvcan19km7ds0s9s7505p3hnfjvjrzgdliir3";
   };
 
-  cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x";
+  cargoSha256 = "0g6afhqqdf76axbcs5wj9gydsabd3d5ja8qd8z8y6wbp7n0y4h6a";
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
index c2fd1293b7910..f6314b655294b 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python2, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:
 
 stdenv.mkDerivation rec {
-  rev  = "0.10.0";
+  rev  = "0.11.0";
   name = "createrepo_c-${rev}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner  = "rpm-software-management";
     repo   = "createrepo_c";
-    sha256 = "1sqzdkj9vigkvxsjlih1i0gylv53na2yic5if9w1s2sgxhqqz5zv";
+    sha256 = "1w9yynj8mxhw714gvgr0fibfks584b4y0n4vjckcf7y97cpdhjkn";
   };
 
   patches = [
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 8eb266a9e654d..44b67ae4dccdf 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   name = "home-manager-${version}";
-  version = "2017-12-7";
+  version = "2018-06-14";
 
   src = fetchFromGitHub{
     owner = "rycee";
     repo = "home-manager";
-    rev = "0be32c9d42e3a8739263ae7886dc2448c833c19c";
-    sha256 = "06lmnzlf5fmiicbgai27ad9m3bj980xf8ifdpc5lzbsy77pfcfap";
+    rev = "5641ee3f942e700de35b28fc879b0d8a10a7a1fe";
+    sha256 = "0bqzwczbr5c2y3ms7m7ly0as9zsnqwljq61ci2y2gbqzw3md1x2j";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 212b61f62f06d..24672296506dd 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }:
 rustPlatform.buildRustPackage rec {
   name = "nix-du-${version}";
-  version = "0.1.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
     rev = "v${version}";
-    sha256 = "1y7ifr4c3v1494swh6akvna0d0rxjy9jw3mw2wdd6vj1xphvmimq";
+    sha256 = "1n1qgqjbwbb59xnzgz0dn8h8pckh6yq3crh0w6x2sngijwh678x8";
   };
-  cargoSha256 = "0qq7a6ncxnbjvnmly99awqrk9f3z9b55ifil7b0bn5yhk4h9sa6y";
+  cargoSha256 = "1qidbrkdpf4kliyvy2040qi3a67s8mr2r46rjcblr1v2gar0xgs0";
 
-  doCheck = true;
+  # switch to true when nix includes https://github.com/NixOS/nix/pull/2223 and 
+  # https://github.com/NixOS/nix/pull/2234
+  doCheck = false;
   checkInputs = [ graphviz ];
-  nativeBuildInputs = [] ++ stdenv.lib.optionals doCheck checkInputs;
 
   buildInputs = [
     boost
@@ -25,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     homepage = https://github.com/symphorien/nix-du;
     license = licenses.lgpl3;
     maintainers = [ maintainers.symphorien ];
-    platforms = platforms.all;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index 8934295370509..10afb1d909768 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.3.1";
+  version = "0.3.4";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.3.1";
-    sha256 = "1sldbrz33wz30d3vv3d2clyqyd6x1y6h6xjz1xv55fa97ig1h481";
+    rev = "version-0.3.4";
+    sha256 = "03wdxai3hpv2v9jp7r91x8y36ryz6v1cczmx3d26g1bf0ij5svb8";
   };
   buildInputs = [ python3 mypy makeWrapper ];
   checkPhase = ''
diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index 14b234c4dd5ab..c216195f54d7e 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -2,24 +2,27 @@
 , python3
 , fetchFromGitHub
 , nix
+, git
 , makeWrapper
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-review";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "138f9m2c8fwpvn3kv5q7845ffi1pjbqxcs44aych4832i0pn6jaf";
+    sha256 = "0dv6hzmfqyhfi6zzjm10nzzqiy2wyfhiksm1cd4fznq0psxaihfj";
   };
 
   buildInputs = [ makeWrapper ];
 
   preFixup = ''
-    wrapProgram $out/bin/nix-review --prefix PATH : ${nix}/bin
+    wrapProgram $out/bin/nix-review --prefix PATH : ${stdenv.lib.makeBinPath [
+      git nix
+    ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
index fe3cf33b46c81..e7eb497b4b9fb 100644
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
 python3Packages.buildPythonApplication rec {
-  version = "0.5.0";
+  version = "0.6.3";
   name = "nix-update-source-${version}";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-update-source";
-    rev = "version-0.5.0";
-    sha256 = "13icwk249frddsmn9albasikwp8asmgvp3jf9xj9adzh63wzh1i7";
+    rev = "version-0.6.3";
+    sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz";
   };
   propagatedBuildInputs = [ nix-prefetch-scripts ];
   passthru = {
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 75bc6ec109ce4..8f3be4cc8c7f8 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index b532039ede1cf..846e9bcfc12a3 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -58,13 +58,13 @@ let
         sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
-    "underscore-1.8.3" = {
+    "underscore-1.9.1" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.8.3";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
+        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
       };
     };
   };
@@ -81,7 +81,11 @@ in
     };
     dependencies = [
       sources."async-0.2.10"
-      sources."binary-search-tree-0.2.4"
+      (sources."binary-search-tree-0.2.4" // {
+        dependencies = [
+          sources."underscore-1.4.4"
+        ];
+      })
       sources."isnumber-1.0.0"
       sources."mkdirp-0.3.5"
       (sources."nedb-1.0.2" // {
@@ -89,7 +93,7 @@ in
           sources."underscore-1.4.4"
         ];
       })
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index 440f91a6d64c0..677dbda7b495a 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.3.6";
   name = "opkg-${version}";
   src = fetchurl {
-    url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
+    url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
     sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn";
   };
 
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 5eb20169412dc..456469f150f7b 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchFromGitHub, lib
-, intltool, glib, pkgconfig, polkit, python, sqlite, systemd
+, intltool, glib, pkgconfig, polkit, python, sqlite
 , gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive
 # TODO: set enableNixBackend to true, as soon as it builds
 , nix, enableNixBackend ? false, boost
 , enableCommandNotFound ? false
-, enableBashCompletion ? false, bash-completion ? null }:
+, enableBashCompletion ? false, bash-completion ? null
+, enableSystemd ? stdenv.isLinux, systemd }:
 
 stdenv.mkDerivation rec {
   name = "packagekit-${version}";
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs";
   };
 
-  buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]
+  buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ]
+                  ++ lib.optional enableSystemd systemd
                   ++ lib.optional enableBashCompletion bash-completion;
   propagatedBuildInputs = [ sqlite nix boost ];
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ];
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--enable-systemd"
+    (if enableSystemd then "--enable-systemd" else "--disable-systemd")
     "--disable-dummy"
     "--disable-cron"
     "--disable-introspection"
@@ -63,7 +65,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.packagekit.org/;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ matthewbauer ];
   };
 }
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
new file mode 100644
index 0000000000000..e04b41557482b
--- /dev/null
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, imagemagick, libqrencode
+, testQR ? false, zbar ? null
+}:
+
+assert testQR -> zbar != false;
+
+stdenv.mkDerivation rec {
+  name = "asc-key-to-qr-code-gif-${version}";
+  version = "20180613";
+
+  src = fetchFromGitHub {
+    owner = "yishilin14";
+    repo = "asc-key-to-qr-code-gif";
+    rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f";
+    sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r";
+  };
+
+  buildInputs = [ imagemagick libqrencode ] ++ stdenv.lib.optional testQR zbar;
+  dontBuild = true;
+  dontStrip = true;
+  dontPatchELF = true;
+
+  preInstall = ''
+    substituteInPlace asc-to-gif.sh \
+      --replace "convert" "${imagemagick}/bin/convert" \
+      --replace "qrencode" "${libqrencode}/bin/qrencode"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp * $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif;
+    description = "Convert ASCII-armored PGP keys to animated QR code";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ asymmetric ];
+  };
+}
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 53ce183d4afb7..9f334b4a9602f 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.4.2";
+  version = "4.4.3";
 
   src = fetchFromGitHub {
-    sha256 = "0jsa1jl51kz8i8dpi3664a7y3bhypr3ipk1srzxfkk6aph4a5cdf"; 
+    sha256 = "1h90iz4l85drchpkmhlsvg7f9abhw6890fdr9x5n5ir3kxikwcdm"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index 52bc59abb4cbe..287fc3e899c0b 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.8.0";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
+    url = "https://people.freedesktop.org/~hadess/${name}.tar.xz";
     sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k";
   };
 
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix
new file mode 100644
index 0000000000000..23aec604d2d11
--- /dev/null
+++ b/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, fetchurl, gnulib }:
+
+stdenv.mkDerivation rec {
+  name = "gnu-pw-mgr-${version}";
+  version = "2.3.2";
+  src = fetchurl {
+    url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
+    sha256 = "0x60g0syqpd107l8w4bl213imy2lspm4kz1j18yr1sh10rdxlgxd";
+  };
+
+  buildInputs = [ gnulib ];
+
+  meta = with lib; {
+    homepage = https://www.gnu.org/software/gnu-pw-mgr/;
+    description = "A password manager designed to make it easy to reconstruct difficult passwords";
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ qoelet ];
+  };
+}
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index 9a147caa7e218..b86bb1a221c6a 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, readline, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnupg-1.4.22";
+  name = "gnupg-1.4.23";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m";
+    sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9";
   };
 
   buildInputs = [ readline bzip2 ];
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 0f575d748b6cc..f28d57fa62bd5 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.7";
+  version = "2.2.8";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0vlpis0q7gvq9mhdc43hkyn3cdriz4mwgj20my3gyzpgwqg3cnyr";
+    sha256 = "1k8dnnfs9888yp713l7kg2jg110lw47s4krx0njna6fjrsw4qyvp";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index fe7d506026281..25102fd073033 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,18 +1,18 @@
 { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
-  version = "1.7.1";
+  version = "1.8.1";
   name = "gopass-${version}";
 
-  goPackagePath = "github.com/justwatchcom/gopass";
+  goPackagePath = "github.com/gopasspw/gopass";
 
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchFromGitHub {
-    owner = "justwatchcom";
+    owner = "gopasspw";
     repo = "gopass";
     rev = "v${version}";
-    sha256 = "01cif6a2xa3c8nki0pas9mywdxs8d9niv8z13mii5hcfqvm0s7aw";
+    sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w";
   };
 
   wrapperPath = with stdenv.lib; makeBinPath ([
@@ -26,6 +26,9 @@ buildGoPackage rec {
       $bin/share/bash-completion/completions \
       $bin/share/zsh/site-functions \
       $bin/share/fish/vendor_completions.d
+    # by default, gopass tries to write configuration to /homeless-shelter
+    # during startup, which lands in stdout
+    export GOPASS_CONFIG=/dev/null
     $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass
     $bin/bin/gopass completion zsh  > $bin/share/zsh/site-functions/_gopass
     $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish
@@ -38,7 +41,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description     = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go.";
-    homepage        = https://www.justwatch.com/gopass/;
+    homepage        = https://www.gopass.pw/;
     license         = licenses.mit;
     maintainers     = with maintainers; [ andir ];
     platforms       = platforms.unix;
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
index e9929cb2e6fc1..c095b77129ccd 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/pkgs/tools/security/gpgstats/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.5";
 
   src = fetchurl {
-    url = "http://www.vanheusden.com/gpgstats/${name}.tgz";
+    url = "https://www.vanheusden.com/gpgstats/${name}.tgz";
     sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy";
   };
 
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index 72cb19aa732b1..d9617e3eb2baf 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -1,52 +1,102 @@
-{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, glib, pango, fontconfig, zlib, xorg, upx, patchelf }:
+{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }:
 
 let
-  dynlibPath = stdenv.lib.makeLibraryPath
-    ([ gtk2 atk gdk_pixbuf glib pango fontconfig zlib stdenv.cc.cc.lib ]
-    ++ (with xorg; [
-      libX11
-      libXext
-      libXrender
-      libXrandr
-      libSM
-      libXfixes
-      libXdamage
-      libXcursor
-      libXinerama
-      libXi
-      libXcomposite
-      libXxf86vm
-    ]));
-in
-stdenv.mkDerivation rec {
-  name    = "jd-gui-${version}";
-  version = "0.3.5";
+  version = "1.4.0";
+  name = "jd-gui-${version}";
 
   src = fetchurl {
-    url    = "http://jd.benow.ca/jd-gui/downloads/${name}.linux.i686.tar.gz";
-    sha256 = "0jrvzs2s836yvqi41c7fq0gfiwf187qg765b9r1il2bjc0mb3dqv";
+    url    = "https://github.com/java-decompiler/jd-gui/archive/v${version}.tar.gz";
+    sha256 = "0anz7szlr5kgmsmkyv34jdynsnk8v6kvibcyz98jsd96fh725lax";
   };
 
-  nativeBuildInputs = [ upx patchelf ];
+  deps = stdenv.mkDerivation {
+    name = "${name}-deps";
+    inherit src;
+    nativeBuildInputs = [ gradle_2_5 perl ];
 
-  unpackPhase = "tar xf ${src}";
-  installPhase = ''
-    mkdir -p $out/bin
-    upx -d jd-gui -o $out/bin/jd-gui
+    buildPhase = ''
+      export GRADLE_USER_HOME=$(mktemp -d);
+      gradle --no-daemon build
+    '';
 
-    patchelf \
-      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
-      --set-rpath ${dynlibPath} \
-      $out/bin/jd-gui
+    # Mavenize dependency paths
+    # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
+    installPhase = ''
+      find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | sh
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "1apmqiphnav79m4rdii58h7f4qslpfig4qybyyl2fr7zk92gv3l9";
+  };
+
+  # Point to our local deps repo
+  gradleInit = writeText "init.gradle" ''
+    logger.lifecycle 'Replacing Maven repositories with ${deps}...'
+
+    gradle.projectsLoaded {
+      rootProject.allprojects {
+        buildscript {
+          repositories {
+            clear()
+            maven { url '${deps}' }
+          }
+        }
+        repositories {
+          clear()
+          maven { url '${deps}' }
+        }
+      }
+    }
+  '';
+
+  desktopItem = launcher: makeDesktopItem {
+    name = "jd-gui";
+    exec = "${launcher} %F";
+    icon = "jd-gui";
+    comment = "Java Decompiler JD-GUI";
+    desktopName = "JD-GUI";
+    genericName = "Java Decompiler";
+    mimeType = "application/x-java-archive;application/x-java";
+    categories = "Development;Debugger;";
+  };
+
+in stdenv.mkDerivation rec {
+  inherit name version src;
+
+  nativeBuildInputs = [ gradle_2_5 perl makeWrapper ];
+
+  buildPhase = ''
+    export GRADLE_USER_HOME=$(mktemp -d)
+    gradle --offline --no-daemon --info --init-script ${gradleInit} jar
+  '';
+
+  installPhase = let
+    jar = "$out/share/jd-gui/${name}.jar";
+  in ''
+    mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps}
+    cp build/libs/${name}.jar ${jar}
+    cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png
+
+    cat > $out/bin/jd-gui <<EOF
+    #!${stdenv.shell}
+    export JAVA_HOME=${jre}
+    ${jre}/bin/java -jar ${jar} $@
+    EOF
+    chmod +x $out/bin/jd-gui
+
+    ${(desktopItem "$out/bin/jd-gui").buildCommand}
   '';
 
   dontStrip = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Fast Java Decompiler with powerful GUI";
     homepage    = "http://jd.benow.ca/";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = [ "i686-linux" ];
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.gpl3;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
index 9e1f664f5d846..f019aa460aeaa 100644
--- a/pkgs/tools/security/kbfs/default.nix
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kbfs-${version}";
-  version = "1.0.44";
+  version = "2.1.1";
 
   goPackagePath = "github.com/keybase/kbfs";
   subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "kbfs";
     rev = "v${version}";
-    sha256 = "1vjgzif8ki9xrlcghpzkvqwfwvaq63llf52s03m3d2vkyigmgp78";
+    sha256 = "1s1bgi9hcilz2is8w2kkvzi928i7w6m5j2x8avkb8zl9s3mrqz3q";
   };
 
   buildFlags = [ "-tags production" ];
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 331375273edd1..1bccd4c9f957b 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "1.0.44";
+  version = "2.1.0";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "keybase";
     repo   = "client";
     rev    = "v${version}";
-    sha256 = "1np8fk15wwqkswzcyygga52r74dp101ny63i3m1wypgfky4hvsbb";
+    sha256 = "16izsx5944byc930i6pqsbyrp316yyy8z5xvmzj0g8rgawajdx5h";
   };
 
   buildFlags = [ "-tags production" ];
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 1d50f5498c83e..b53860e406d24 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
-, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3
 , libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }:
 
 let
@@ -16,7 +16,7 @@ let
     gdk_pixbuf
     glib
     gnome2.GConf
-    gtk2
+    gtk3
     libnotify
     nspr
     nss
@@ -38,10 +38,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "keybase-gui-${version}";
-  version = "1.0.44-20180223200436.9a9ccec79";
+  version = "2.3.0-20180627160031.8e0438e6fb";
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
-    sha256 = "0dmi0fw39924kpahlsk853hbmpy8a6nj78lrh1wharayjpvj6jv3";
+    sha256 = "0xaxxjdfdmgv0wfy75dspfa0a7cdwdpphyy6my9vw82v8jxl3ffx";
   };
   phases = ["unpackPhase" "installPhase" "fixupPhase"];
   unpackPhase = ''
diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix
index 5eb659f40c3ad..d858ed3fd6d37 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/pkgs/tools/security/libacr38u/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
       The package is based on the debian package libacr38u.
     '';
-    homepage = http://www.acs.com.hk;
+    homepage = https://www.acs.com.hk;
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ berce ];
     platforms = with platforms; unix;
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index f746e8c8ffd9b..3bf906fb4c125 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "libmodsecurity-${version}";
-  version = "3.0.0";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "SpiderLabs";
     repo = "ModSecurity";
     fetchSubmodules = true;
     rev = "v${version}";
-    sha256 = "1y9nxbf5vgip4zl948a27xpw4mpimqd7xmskfi40k6g0cmmsx1x1";
+    sha256 = "0jhyqsvcjxq9ybndcinc08awknrg3sbkaby5w3qw03aqbfjkpywc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 56a47ea387431..4b25e944510dd 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.4";
+  version = "2.6.6";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "1p449gsackcavw5h9yn0ckk1fkakx9d55izi22gh8wfvijdfhw10";
+    sha256 = "02d8nwy78gy07c32c7dk3sl93h1z0gav0h4j7xp85m6xj852lb5a";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix
index fb078674ea74b..84b738a21092a 100644
--- a/pkgs/tools/security/nasty/default.nix
+++ b/pkgs/tools/security/nasty/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6";
 
   src = fetchurl {
-    url = "http://www.vanheusden.com/nasty/${name}.tgz";
+    url = "https://www.vanheusden.com/nasty/${name}.tgz";
     sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn";
   };
 
diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
new file mode 100644
index 0000000000000..214ffccc7aea2
--- /dev/null
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "0.24";
+  name = "nwipe-${version}";
+  src = fetchFromGitHub {
+    owner = "martijnvanbrummelen";
+    repo = "nwipe";
+    rev = "v${version}";
+    sha256 = "0zminjngz98b4jl1ii6ssa7pkmf4xw6mmk8apxz3xr68cps12ls0";
+  };
+  nativeBuildInputs = [ automake autoconf pkgconfig ];
+  buildInputs = [ ncurses parted ];
+  preConfigure = "sh init.sh || :";
+  meta = with stdenv.lib; {
+    description = "Securely erase disks";
+    homepage = https://github.com/martijnvanbrummelen/nwipe;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.woffs ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 5ce0ce0dbc214..c7e9267dde71f 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -29,12 +29,12 @@ let
     };
 
   generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
-    version = "1.7.1";
+    version = "1.7.2";
     name    = "password-store-${version}";
 
     src = fetchurl {
-      url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-      sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn";
+      url    = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+      sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27";
     };
 
     patches = [ ./set-correct-program-name-for-sleep.patch
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix
index 60198675b29d7..6d35c4aa8375c 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pass-otp-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "tadfisher";
     repo = "pass-otp";
     rev = "v${version}";
-    sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb";
+    sha256 = "0m8x5dqwcr9jim530685nsq4zn941hhl7ridmmd63b204z141rwa";
   };
 
   buildInputs = [ oathToolkit ];
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 82b7110189c79..b74905b6e7e20 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "REINER SCT cyberJack USB chipcard reader user space driver";
-    homepage = http://www.reiner-sct.com/;
+    homepage = https://www.reiner-sct.com/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ aszlig ];
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 589316b1d1c52..bf5856aec3579 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.8.23";
 
   src = fetchurl {
-    # This URL changes in unpredictable ways, so it is not sensible
-    # to put a version variable in there.
-    url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2";
+    url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2";
     sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss";
   };
 
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Middleware to access a smart card using SCard API (PC/SC)";
-    homepage = http://pcsclite.alioth.debian.org/;
+    homepage = https://pcsclite.apdu.fr/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ viric wkennington ];
     platforms = with platforms; unix;
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
new file mode 100644
index 0000000000000..3606e7b23f4bb
--- /dev/null
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "pdfcrack-${version}";
+  version = "0.16";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz";
+    sha256 = "1vvkrg3niinz0j9wwm31laxgmd7wdz201kn82b3dbksc0w1v4rbq";
+  };
+
+  installPhase = ''
+    install -Dt $out/bin pdfcrack
+  '';
+
+  meta = with lib; {
+    homepage = http://pdfcrack.sourceforge.net/;
+    description = "Small command line driven tool for recovering passwords and content from PDF files";
+    license = with licenses; [ gpl2 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ qoelet ];
+  };
+}
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index e555889d1abb6..b198d7446a924 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }:
+{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83";
   };
 
-  buildInputs = [ xcbuild libiconv Cocoa ncurses ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ libiconv Cocoa ncurses ];
 
   installPhase = ''
     mkdir -p $out/Applications
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
new file mode 100644
index 0000000000000..bf5f9116f08cb
--- /dev/null
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "saml2aws-${version}";
+  version = "2.6.1";
+
+  goPackagePath = "github.com/versent/saml2aws";
+  goDeps = ./deps.nix;
+
+  buildFlagsArray = ''
+    -ldflags=-X main.Version=${version}
+  '';
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "Versent";
+    repo = "saml2aws";
+    sha256 = "0sg5qm1gyrisna247lmxfgpa22y6rnz9vd6yg92kxlcwr4ji8l1j";
+  };
+
+  meta = with stdenv.lib; {
+    description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP";
+    homepage    = https://github.com/Versent/saml2aws;
+    license     = licenses.mit;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pmyjavec ];
+  };
+}
diff --git a/pkgs/tools/security/saml2aws/deps.nix b/pkgs/tools/security/saml2aws/deps.nix
new file mode 100644
index 0000000000000..6069f0b184ad3
--- /dev/null
+++ b/pkgs/tools/security/saml2aws/deps.nix
@@ -0,0 +1,291 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/AlecAivazis/survey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/AlecAivazis/survey";
+      rev =  "e752db451e07e09c7d7dc8cada807a44bdb0fd47";
+      sha256 = "00fhmsaymrf86pg246cqxvfrivgfkyg3i0aixsp3sn15hg3i0vlq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-ntlmssp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-ntlmssp";
+      rev =  "4b934ac9dad38d389d34f0b98d98b2467c422012";
+      sha256 = "0pwrax8mih2jgsdifag0346vh0vivgyz45jc4kjy6dhp3qhsy34z";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/goquery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/goquery";
+      rev =  "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2";
+      sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/alecthomas/kingpin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev =  "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath  = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev =  "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev =  "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/andybalholm/cascadia";
+    fetch = {
+      type = "git";
+      url = "https://github.com/andybalholm/cascadia";
+      rev =  "901648c87902174f774fac311d7f176f8647bdaa";
+      sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev =  "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff";
+      sha256 = "0vfpygjhdikmsqn9dgmp965ji5q790gcz9mg49mcpipc9n2lzx0d";
+    };
+  }
+  {
+    goPackagePath  = "github.com/beevik/etree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beevik/etree";
+      rev =  "9d7e8feddccb4ed1b8afb54e368bd323d2ff652c";
+      sha256 = "0f3lj7azxd5qq29hqd32211ds7n56i3rgmfll6c1f4css1f3srxg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/briandowns/spinner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/briandowns/spinner";
+      rev =  "48dbb65d7bd5c74ab50d53d04c949f20e3d14944";
+      sha256 = "1178kn72agihs13ffgm2sz5ad61pqwdmkrh8rhggzbaagch9mc75";
+    };
+  }
+  {
+    goPackagePath  = "github.com/danieljoos/wincred";
+    fetch = {
+      type = "git";
+      url = "https://github.com/danieljoos/wincred";
+      rev =  "412b574fb496839b312a75fba146bd32a89001cf";
+      sha256 = "1bb1928nnikx5036aw4152p55g8xgwx42rv0n2i5zydh1031f50m";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev =  "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5";
+      sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev =  "0b12d6b5";
+      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mgutz/ansi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mgutz/ansi";
+      rev =  "9520e82c474b0a04dd04f8a40959027271bab992";
+      sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev =  "3864e76763d94a6df2f9960b16a20a33da9f9a66";
+      sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev =  "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
+      sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev =  "477a77ecc69700c7cdeb1fa9e129548e1c1c393c";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tidwall/gjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/gjson";
+      rev =  "afaeb9562041a8018c74e006551143666aed08bf";
+      sha256 = "1hysk947mrlpaqjq7mab0nnm190fwvfdifaa2cq3sbwfrzx6h1c8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tidwall/match";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/match";
+      rev =  "1731857f09b1f38450e2c12409748407822dc6be";
+      sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "a8fb68e7206f8c78be19b432c58eb52a6aa34462";
+      sha256 = "1svphap40hy5srcqnb0l207r6wfm9hf0f3fcaq124qp4m91s6vlf";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "db08ff08e8622530d9ed3a0e8ac279f6d4c02196";
+      sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "8014b7b116a67fea23fbb82cd834c9ad656ea44b";
+      sha256 = "1ld5nr0zqjgkny7d5biix9hbnxnlzxxa5nspnal2q2c7wnai8apa";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/AlecAivazis/survey.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/AlecAivazis/survey";
+      rev =  "e752db451e07e09c7d7dc8cada807a44bdb0fd47";
+      sha256 = "00fhmsaymrf86pg246cqxvfrivgfkyg3i0aixsp3sn15hg3i0vlq";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev =  "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5";
+      sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index a9902fe504226..d28260ffb8b94 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stoken";
-  version = "0.90";
+  version = "0.92";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af";
+    sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index 866e1f41028bd..688521e1401a4 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "http://www.ucolick.org/~will/RUE/super/${name}-tar.gz";
+    url = "https://www.ucolick.org/~will/RUE/super/${name}-tar.gz";
     sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy";
   };
 
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 795925a221c21..a5ae0c7676b5c 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.3.6";
+  name = "tor-0.3.3.8";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "1drk2h8zd05xrfpx7xn77pcxz0hs4nrq6figw56qk5gkvgv5kg4r";
+    sha256 = "19dkyspvzabssl695gc1sd9905jyhnrg2yq7l7pvy729lbzb9x9w";
   };
 
   outputs = [ "out" "geoip" ];
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 02c0b27a5648a..2c422d5160461 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,13 +9,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.9.5";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1ddki3bnp6yrajc0cxxjkbdlfp0xqx407nxvvv611lsnlbr2sz5g";
+    sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index b64124b3c54da..e3b7fb643a26a 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   name = "volatility-${version}";
 
   src = fetchurl {
-    url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
+    url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
     sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
   };
 
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.volatilityfoundation.org/;
+    homepage = https://www.volatilityfoundation.org/;
     description = "Advanced memory forensics framework";
     maintainers = with maintainers; [ bosu ];
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index edb7828f95b71..7e480a0a17d0e 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180508";
+  version = "20180629";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
+    sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 2e4133124c11b..3f618301a864b 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bfs-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx";
+    sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g";
   };
 
   # Disable fstype test, tries to read /etc/mtab
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index bb9fa2dd877c8..39f6f17debff0 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   name = "collectd-${version}";
 
   src = fetchurl {
-    url = "http://collectd.org/files/${name}.tar.bz2";
+    url = "https://collectd.org/files/${name}.tar.bz2";
     sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh";
   };
 
diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix
new file mode 100644
index 0000000000000..517cefb6a2b39
--- /dev/null
+++ b/pkgs/tools/system/ddrescueview/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }:
+
+stdenv.mkDerivation rec {
+  name = "ddrescueview-0.4alpha3";
+
+  src = fetchurl {
+    name = "${name}.tar.xz";
+    url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz";
+    sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j";
+  };
+
+  nativeBuildInputs = [ fpc lazarus ];
+
+  buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ];
+
+  sourceRoot = "source";
+
+  NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
+
+  buildPhase = ''
+    lazbuild --lazarusdir=${lazarus}/share/lazarus ddrescueview.lpi
+  '';
+
+  installPhase = ''
+    install -Dt $out/bin ddrescueview
+    cd ../resources/linux
+    install -Dt $out/share/applications ddrescueview.desktop
+    install -Dt $out/share/icons/hicolor/32x32/apps ddrescueview.xpm
+    install -Dt $out/share/man/man1 ddrescueview.1
+  '';
+
+  meta = with lib; {
+    description = "A tool to graphically examine ddrescue mapfiles";
+    homepage = https://sourceforge.net/projects/ddrescueview/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix
new file mode 100644
index 0000000000000..f8a6dac819760
--- /dev/null
+++ b/pkgs/tools/system/ddrutility/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ddrutility-${version}";
+  version = "2.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ddrutility/${name}.tar.gz";
+    sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac";
+  };
+
+  postPatch = ''
+    substituteInPlace makefile --replace /usr/local ""
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "A set of utilities for hard drive data rescue";
+    homepage = https://sourceforge.net/projects/ddrutility/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 80d6f6a42f813..4b6ead9667d0a 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "dfc-3.0.5";
 
   src = fetchurl {
-    url = "http://projects.gw-computing.net/attachments/download/467/${name}.tar.gz";
+    url = "https://projects.gw-computing.net/attachments/download/467/${name}.tar.gz";
     sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w";
   };
 
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 6c0bcb406218a..8f1367d3fdce0 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "35";
+  version = "36";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh";
+    sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 22c25bfd567a3..a88cca41fa638 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.11.1";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
-    sha256 = "10ai59vyx1ssb3jyfwnmi4y5kchlnbi7vn7wbax36pa90l1j7jqk";
+    sha256 = "0sxxd05r7ika2m4p76kld1xclyi8yf4b79gb86084m1rcv692ap1";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index 57e3e63ca896f..5a6b1c22288c8 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.3-4";
 
   src = fetchurl {
-    url = "http://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
+    url = "https://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
     sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2";
   };
 
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 974a95bc0fab4..68c6ef3c3ef5f 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.2.0";
 
   src = fetchurl {
-    url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
+    url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz";
     sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
   };
 
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 839be268b5b42..066848ea7be93 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.53";
+  version = "21.56";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady";
+    sha256 = "09zc8k1d9l673bb41vjpz3zrzaxaymqgk8m1v7pccvg70rq005kv";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
index 34a48bd305396..d7c1f89a78625 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/pkgs/tools/system/iops/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1";
 
   src = fetchurl {
-    url = "http://www.vanheusden.com/iops/${name}.tgz";
+    url = "https://www.vanheusden.com/iops/${name}.tgz";
     sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
   };
 
diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix
new file mode 100644
index 0000000000000..eb7f1e3bb59bc
--- /dev/null
+++ b/pkgs/tools/system/loadwatch/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, ... }:
+
+stdenv.mkDerivation {
+  name = "loadwatch-1.1-1-g6d2544c";
+  src = fetchgit {
+    url = "git://woffs.de/git/fd/loadwatch.git";
+    sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b";
+    rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e";
+  };
+  installPhase = ''
+    mkdir -p $out/bin
+    install loadwatch lw-ctl $out/bin
+  '';
+  meta = with stdenv.lib; {
+    description = "Run a program using only idle cycles";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ woffs ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index f6e09b6816f68..d57b651897530 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "B.${numVersion}";
 
   src = fetchurl {
-    url = "http://ezix.org/software/files/lshw-${version}.tar.gz";
+    url = "https://ezix.org/software/files/lshw-${version}.tar.gz";
     sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
   };
 
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index a0aaa846bc739..c2d31ccb0fbfb 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -12,15 +12,15 @@ let
   thirdparty = fetchFromGitHub {
     owner = "osquery";
     repo = "third-party";
-    rev = "4ef099c31a1165c5e7e3a699f9e4b3eb68c3c3d9";
-    sha256 = "1vm0prw4dix0m51vkw9z0vwfd8698gqjw499q8h604hs1rvn6132";
+    rev = "32e01462fbea75d3b1904693f937dfd62eaced15";
+    sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf";
   };
 
 in
 
 stdenv.mkDerivation rec {
   name = "osquery-${version}";
-  version = "3.2.2";
+  version = "3.2.8";
 
   # this is what `osquery --help` will show as the version.
   OSQUERY_BUILD_VERSION = version;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "facebook";
     repo = "osquery";
     rev = version;
-    sha256 = "0qwj4cy6m25sqwb0irqfqinipx50l4imnz1gqxx147vzfwb52jlq";
+    sha256 = "1py5jizl7z1f9xzpg7pylbdnawvvifiyv9gpjwiim8ilgkmpaiv4";
   };
 
   patches = [ ./misc.patch ];
diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch
index acdbf6346c83c..859e398616ab0 100644
--- a/pkgs/tools/system/osquery/misc.patch
+++ b/pkgs/tools/system/osquery/misc.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8eb5a16..319d81dc 100644
+index 71921740..156ea6dc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -447,12 +447,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD)
+@@ -456,12 +456,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD)
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin")
  endif()
  
@@ -15,7 +15,7 @@ index b8eb5a16..319d81dc 100644
  # Make sure deps were built before compiling (else show warning).
  execute_process(
    COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}"
-@@ -518,6 +512,8 @@ endif()
+@@ -528,6 +522,8 @@ endif()
  
  if(APPLE)
    LOG_PLATFORM("OS X")
@@ -24,7 +24,7 @@ index b8eb5a16..319d81dc 100644
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")
    LOG_PLATFORM("Debian")
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")
-@@ -567,7 +563,6 @@ if(POSIX AND DEPS)
+@@ -577,7 +573,6 @@ if(POSIX AND DEPS)
    endif()
  endif()
  
@@ -32,7 +32,7 @@ index b8eb5a16..319d81dc 100644
  include_directories("${CMAKE_SOURCE_DIR}/include")
  include_directories("${CMAKE_SOURCE_DIR}")
  
-@@ -655,18 +650,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "")
+@@ -668,18 +663,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "")
    add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
  endif()
  
@@ -52,7 +52,7 @@ index b8eb5a16..319d81dc 100644
    add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng")
  endif()
 diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
-index 1c8201ee..a89e6821 100644
+index c8cbac4e..a4382420 100644
 --- a/osquery/CMakeLists.txt
 +++ b/osquery/CMakeLists.txt
 @@ -35,8 +35,6 @@ if(CLANG AND POSIX)
@@ -64,7 +64,7 @@ index 1c8201ee..a89e6821 100644
      -Wno-unused-parameter
      -Wno-gnu-case-range
      -Weffc++
-@@ -61,14 +59,7 @@ endif()
+@@ -65,14 +63,7 @@ endif()
  
  # Construct a set of all object files, starting with third-party and all
  # of the osquery core objects (sources from ADD_CORE_LIBRARY macros).
@@ -80,7 +80,7 @@ index 1c8201ee..a89e6821 100644
  
  # Add subdirectories
  add_subdirectory(config)
-@@ -147,10 +138,11 @@ if(APPLE OR LINUX)
+@@ -153,10 +144,11 @@ if(APPLE OR LINUX)
    ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite")
  elseif(FREEBSD)
    ADD_OSQUERY_LINK_CORE("icuuc")
@@ -93,15 +93,20 @@ index 1c8201ee..a89e6821 100644
  if(POSIX)
    ADD_OSQUERY_LINK_CORE("boost_system")
    ADD_OSQUERY_LINK_CORE("boost_filesystem")
-@@ -168,6 +160,8 @@ endif()
+@@ -174,10 +166,10 @@ endif()
  ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")
  
  if(POSIX)
+-  # Hashing methods in core use libcrypto.
+-  ADD_OSQUERY_LINK_CORE("crypto")
+-
 +  ADD_OSQUERY_LINK_ADDITIONAL("benchmark")
 +  ADD_OSQUERY_LINK_ADDITIONAL("snappy")
    ADD_OSQUERY_LINK_ADDITIONAL("ssl")
-   ADD_OSQUERY_LINK_ADDITIONAL("crypto")
++  ADD_OSQUERY_LINK_ADDITIONAL("crypto")
    ADD_OSQUERY_LINK_ADDITIONAL("libpthread")
+   ADD_OSQUERY_LINK_ADDITIONAL("magic")
+ endif()
 diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt
 index 52f3bf80..066ed1c0 100644
 --- a/osquery/extensions/CMakeLists.txt
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index c4b5699ffc29c..0ee17ffcc38be 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.5.6"; # with database from 2017-07
+  name = "pciutils-3.6.0"; # with database from 2018-06-29
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "08dvsk1b5m1r7qqzsm849h4glq67mngf8zw7bg0102ff1jwywipk";
+    sha256 = "17g9rvjknj2yqwxldnz8m5kaabbdvkcjnfic4sbx88kh0s81197j";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
index 4525343dcc140..234aacbbfdee9 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/pkgs/tools/system/psensor/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "1.2.0";
 
   src = fetchurl {
-    url = "http://wpitchoune.net/psensor/files/psensor-${version}.tar.gz";
+    url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz";
     sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r";
   };
 
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index a6999942e0c6c..81e929382b2da 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "rsyslog-8.21.0";
 
   src = fetchurl {
-    url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
+    url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
     sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx";
   };
 
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = http://www.rsyslog.com/;
+    homepage = https://www.rsyslog.com/;
     description = "Enhanced syslog implementation";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index b5d4317eac2d4..935b49f95db38 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "s-tui";
-  version = "0.6.2";
+  version = "0.7.5";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0fijk26sm51bnxf7plzd1fn2k4f8mdqd7j9zqc3d8zri7228vik2";
+    sha256 = "01w5jh0p66jk4h3cmif4glq42zv44zhziczxjwazkd034rp8dnv9";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix
index 5a4734328ff98..1595e8347e154 100644
--- a/pkgs/tools/system/stress/default.nix
+++ b/pkgs/tools/system/stress/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "stress-1.0.4";
  
   src = fetchurl {
-    url = "http://people.seas.harvard.edu/~apw/stress/${name}.tar.gz";
+    url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz";
     sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5";
   };
 
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index b47f5c98c4d26..7abf9e85ab883 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.15.1";
+  version = "3.16.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1vzrg6s30wc2as2s42h7a1qvyxqx26nq895r9y75aasfcwlbvnm2";
+    sha256 = "0a9snxvs3fsv0gm5q9xkrcg0hwgs3c8q1rb434cnzn4qbqfnzvn7";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "man" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.balabit.com/network-security/syslog-ng/;
+    homepage = https://www.balabit.com/network-security/syslog-ng/;
     description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = licenses.gpl2;
     maintainers = with maintainers; [ rickynils  fpletz ];
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 1300a6a87655c..27458174dc2aa 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "thermald-${version}";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "0y0r8zcaxcnim3axc7kh5pm4py33pgv5mwh002cbrw6h90l2qzq1";
+    sha256 = "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 58e194d38b949..849baa7159ae0 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "uptimed-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
-    sha256 = "0h3192angfiv01bjk3f3nd2fmjic37cl72pvmr556n0wy3cfybas";
+    sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j";
     rev = "v${version}";
     repo = "uptimed";
     owner = "rpodgorny";
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index a8c27a42b1dd7..c30a7b14e891f 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1";
 
   src = fetchurl {
-    url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+    url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
     sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
   };
 
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index c46f962415513..46fdf29ad46c9 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "http://www.colordiff.org/${name}.tar.gz"
+      "https://www.colordiff.org/${name}.tar.gz"
       "http://www.colordiff.org/archive/${name}.tar.gz"
     ];
     sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9";
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index dea8e15b540a1..7404c887a46bb 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.04";
 
   src = fetchurl {
-    url = "http://www.jwz.org/dadadodo/${name}.tar.gz";
+    url = "https://www.jwz.org/dadadodo/${name}.tar.gz";
     sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
   };
 
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index f1899b42b866d..098eee7cf720a 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.19";
 
   src = fetchurl {
-    url = "http://dl.cihar.com/enca/${name}.tar.xz";
+    url = "https://dl.cihar.com/enca/${name}.tar.xz";
     sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s";
   };
 
diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix
new file mode 100644
index 0000000000000..2ca515358a67a
--- /dev/null
+++ b/pkgs/tools/text/esh/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused }:
+
+stdenv.mkDerivation rec {
+  name = "esh-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jirutka";
+    repo = "esh";
+    rev = "v${version}";
+    sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w";
+  };
+
+  nativeBuildInputs = [ asciidoctor ];
+
+  buildInputs = [ gawk gnused ];
+
+  makeFlags = [ "prefix=$(out)" "DESTDIR=" ];
+
+  postPatch = ''
+    patchShebangs .
+    substituteInPlace esh \
+        --replace '"/bin/sh"' '"${stdenv.shell}"' \
+        --replace '"awk"' '"${gawk}/bin/awk"' \
+        --replace 'sed' '${gnused}/bin/sed'
+    substituteInPlace tests/test-dump.exp \
+        --replace '#!/bin/sh' '#!${stdenv.shell}'
+  '';
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Simple templating engine based on shell";
+    homepage = https://github.com/jirutka/esh;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mnacamura ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 2ebab9d63904a..e54933453b3f2 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.25.0";
+  version = "2.27.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "1fval2jhrv3w762rmrbhbn8zj161aalvqy8n8q74yr8hzmpcvlwn";
+    sha256 = "02m1fr38hvxc1kby38xz9r75x5pcm8nly4d4ibnaf9i06xkg1pn0";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix
index b2219d1e66d68..dbec8d353d946 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/pkgs/tools/text/ispell/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
   postPatch = ''
     cat >> local.h <<EOF
-    #define USG
+    ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"}
     #define TERMLIB "-lncurses"
     #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}"
     #define MASTERHASH "americanmed.hash"
diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix
index b6b647b43982d..b0baeaab5f662 100644
--- a/pkgs/tools/text/kakasi/default.nix
+++ b/pkgs/tools/text/kakasi/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "kakasi-2.3.6";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin [ libiconv ];
+
   meta = with stdenv.lib; {
     description = "Kanji Kana Simple Inverter";
     longDescription = ''
@@ -12,7 +14,7 @@ stdenv.mkDerivation rec {
     '';
     homepage    = "http://kakasi.namazu.org/";
     license     = licenses.gpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 
   src = fetchurl {
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index e60ead5bc8f5b..42ba36adf3102 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "LanguageTool-${version}";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${name}.zip";
-    sha256 = "0qc4z5rl9239lqfi2jrggzmjkx4f33n0arlqm5xgfaqgi8wypz0l";
+    sha256 = "01iy3cq6rwkm8sflj2nwp4ib29hyykd23hfsnrmqxji9csj8pf71";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix
index 47e6766d21faa..6665b377ccf50 100644
--- a/pkgs/tools/text/mpage/default.nix
+++ b/pkgs/tools/text/mpage/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "mpage-2.5.6";
+  name = "mpage-2.5.7";
   src = fetchurl {
-    url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz";
-    sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg";
+    url = "http://www.mesa.nl/pub/mpage/${name}.tgz";
+    sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi";
   };
 
   patchPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "liberal";  # a non-copyleft license, see `Copyright' file
-    homepage = http://www.libGLU_combined.nl/pub/mpage/;
+    homepage = http://www.mesa.nl/pub/mpage/;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix
index 7b87fd1e492c0..b51f811644d10 100644
--- a/pkgs/tools/text/peco/default.nix
+++ b/pkgs/tools/text/peco/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "peco-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
 
   goPackagePath = "github.com/peco/peco";
   subPackages = [ "cmd/peco" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "peco";
     repo = "peco";
     rev = "v${version}";
-    sha256 = "0cgfwbnz4jp2nvmqf2i03xf69by8g0xgd3k5k9aj46y9hps1ka92";
+    sha256 = "1m3s1jrrhqccgg3frfnq6iprwwi97j13wksckpcyrg51z6y5q041";
   };
 
   goDeps = ./deps.nix;
@@ -23,5 +23,6 @@ buildGoPackage rec {
     # peco should work on Windows or other POSIX platforms, but the go package
     # declares only linux and darwin.
     platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix
index 2f09c4dfbe310..8f998e3a26d27 100644
--- a/pkgs/tools/text/qprint/default.nix
+++ b/pkgs/tools/text/qprint/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "qprint-1.1";
 
   src = fetchurl {
-    url = "http://www.fourmilab.ch/webtools/qprint/${name}.tar.gz";
+    url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz";
     sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz";
   };
 
diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix
index 8db3d4eea2b63..8aadbb0b80622 100644
--- a/pkgs/tools/text/rst2html5/default.nix
+++ b/pkgs/tools/text/rst2html5/default.nix
@@ -4,11 +4,11 @@ pythonPackages.buildPythonPackage rec {
 
   name = "${pname}-${version}";
   pname = "rst2html5";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6";
+    sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73";
   };
 
   propagatedBuildInputs = with pythonPackages;
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix
index 9eebb830db1c7..ccf17695f6cd0 100644
--- a/pkgs/tools/text/uni2ascii/default.nix
+++ b/pkgs/tools/text/uni2ascii/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "uni2ascii-4.18";
   src = fetchurl {
-    url = "http://billposer.org/Software/Downloads/${name}.tar.gz";
+    url = "https://billposer.org/Software/Downloads/${name}.tar.gz";
     sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y";
   };
 
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index f681ae62aeaa7..8851b8a2725c0 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "7.7";
 
   src = fetchurl {
-    url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
+    url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
     sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr";
   };
 
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index e125c8e7f2fe3..aa32d52dfc6d1 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.31";
+  name = "hevea-2.32";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "15xrnnqlacz8dpr09h7jgijm65wss99rmy9mb1zmapplmwhavmzv";
+    sha256 = "1s4yqphfcr1pf5mcj5c84mvmd107k525iiym5jdwsxz0ka0ccmfy";
   };
 
   buildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
new file mode 100644
index 0000000000000..355d7a055e8f5
--- /dev/null
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, pkgconfig, gettext
+, guile, guile-reader, guile-lib
+, ploticus, imagemagick
+, ghostscript, transfig
+, enableEmacs ? false, emacs ? null
+, enableLout ? true, lout ? null
+, enableTex ? true, tex ? null
+, makeWrapper }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "skribilo-${version}";
+  version = "0.9.4";
+
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz";
+    sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf";
+  };
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ]
+  ++ optional enableEmacs emacs
+  ++ optional enableLout lout
+  ++ optional enableTex tex;
+
+  propagatedBuildInputs = [ guile-reader guile-lib ];
+
+  postInstall = ''
+    wrapProgram $out/bin/skribilo \
+      --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \
+      --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
+  '';
+
+  meta = {
+    description = "The Ultimate Document Programming Framework";
+    longDescription = ''
+      Skribilo is a free document production tool that takes a
+      structured document representation as its input and renders that
+      document in a variety of output formats: HTML and Info for
+      on-line browsing, and Lout and LaTeX for high-quality hard
+      copies.
+
+      The input document can use Skribilo's markup language to provide
+      information about the document's structure, which is similar to
+      HTML or LaTeX and does not require expertise. Alternatively, it
+      can use a simpler, "markup-less" format that borrows from Emacs'
+      outline mode and from other conventions used in emails, Usenet
+      and text.
+    '';
+    homepage = https://www.nongnu.org/skribilo/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
+# TODO: Better Emacs and TeX integration
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index f3f0a60b48023..8ce2a6b0aa3c9 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tectonic-${version}";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "tectonic-typesetting";
     repo = "tectonic";
     rev = "v${version}";
-    sha256 = "007l0l9xnyayiqiap22zlsp8l9afdw803064cj8inr3q7ckzfcpb";
+    sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x";
   };
 
-  cargoSha256 = "0kjy9zrjlrlkr2il62nz35hm1nndyym9dbnas43hzz7y8hdf859k";
+  cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6";
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 6555c999d7f2f..32894748ac465 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -4,7 +4,7 @@
 , freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
 , xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
 , poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
-, xpdf, cairo, pixman, xorg, clisp
+, xpdf, cairo, pixman, xorg, clisp, biber
 , makeWrapper
 }:
 
@@ -261,6 +261,7 @@ dvipng = stdenv.mkDerivation {
 };
 
 
+inherit biber;
 bibtexu = bibtex8;
 bibtex8 = stdenv.mkDerivation {
   name = "texlive-bibtex-x.bin-${version}";
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 35fee64ba54f4..3bf7ee1fdfecd 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -30,7 +30,7 @@ let
     pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens";
     extraInputs =
       lib.optional (lib.any pkgNeedsPython splitBin.wrong) python
-      ++ lib.optional (lib.any pkgNeedsPython splitBin.wrong) ruby;
+      ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby;
   };
 
   mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: >
diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix
index d1f01ccd86770..7fe0396ae440e 100644
--- a/pkgs/tools/typesetting/xml2rfc/default.nix
+++ b/pkgs/tools/typesetting/xml2rfc/default.nix
@@ -4,14 +4,14 @@ with python.pkgs;
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "2.9.6";
+  version = "2.9.8";
 
   buildInputs = [ intervaltree lxml requests pyflakes ];
   propagatedBuildInputs = [ intervaltree lxml requests six ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wr161lx6f1b3fq14ddr3y4jl0myrcmqs1s3fzsighvlmqfdihj7";
+    sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
index 5e0c13f9d951d..893d4f2aec23e 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    homepage = http://www.timkay.com/aws/;
+    homepage = https://www.timkay.com/aws/;
     description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index 55a8352fe77ac..83a340348c8ed 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -1,10 +1,15 @@
 { stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub
-, makeWrapper, coreutils, gnupg, gnutar, squashfsTools}:
+, makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap
+}:
 
+let binPath = stdenv.lib.makeBinPath [
+  coreutils gnupg gnutar squashfsTools debootstrap
+];
+in
 buildGoPackage rec {
   name = "distrobuilder-${version}";
-  version = "2018_04_28";
-  rev = "406fd5fe7dec4a969ec08bdf799c8ae483d37489";
+  version = "2018_06_29";
+  rev = "e5acd73f81ad37151f3a2088fde650cea9b6a7e6";
 
   goPackagePath = "github.com/lxc/distrobuilder";
 
@@ -12,17 +17,14 @@ buildGoPackage rec {
     inherit rev;
     owner = "lxc";
     repo = "distrobuilder";
-    sha256 = "11bd600g36pf89vza9jl7fp7cjy5h67nfvhxlnwghb3z40pq9lnc";
+    sha256 = "19rc11s0paqga72jr8bziixihfv7dlkszmfk6xkg0349hzdg0gac";
   };
 
   goDeps = ./deps.nix;
 
   postInstall = ''
-    wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${stdenv.lib.makeBinPath [
-      coreutils gnupg gnutar squashfsTools
-    ]}
+    wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath}
   '';
-
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index edb3d6add1690..674673f260ce6 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip makeWrapper ];
 
   src = fetchurl {
-    url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip";
+    url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip";
     sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias";
   };
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f310fd156c338..b653dfc7db69e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1,4 +1,4 @@
-self:
+lib: self: super:
 
 with self;
 
@@ -19,7 +19,7 @@ let
 
   # Make sure that we are not shadowing something from
   # all-packages.nix.
-  checkInPkgs = n: alias: if builtins.hasAttr n self
+  checkInPkgs = n: alias: if builtins.hasAttr n super
                           then throw "Alias ${n} is still in all-packages.nix"
                           else alias;
 
@@ -32,7 +32,7 @@ in
 
   ### Deprecated aliases - for backward compatibility
 
-mapAliases (rec {
+mapAliases ({
   PPSSPP = ppsspp; # added 2017-10-01
   QmidiNet = qmidinet;  # added 2016-05-22
   accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
@@ -219,7 +219,6 @@ mapAliases (rec {
   pltScheme = racket; # just to be sure
   polarssl = mbedtls; # added 2018-04-25
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
-  postage = pgmanage; # added 2017-11-03
   procps = procps-ng; # added 2018-04-25
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
   pulseaudioLight = pulseaudio; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5dacded6fe6b..01de9af5347f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5,7 +5,7 @@
  * to merges. Please use the full-text search of your editor. ;)
  * Hint: ### starts category names.
  */
-{ lib, nixpkgsFun, noSysDirs, config}:
+{ lib, noSysDirs, config}:
 self: pkgs:
 
 with pkgs;
@@ -15,22 +15,6 @@ with pkgs;
   # Allow callPackage to fill in the pkgs argument
   inherit pkgs;
 
-
-  # Override system. This is useful to build i686 packages on x86_64-linux.
-  forceSystem = system: kernel: nixpkgsFun {
-    localSystem = {
-      inherit system;
-      platform = platform // { kernelArch = kernel; };
-    };
-  };
-
-  # Used by wine, firefox with debugging version of Flash, ...
-  pkgsi686Linux = forceSystem "i686-linux" "i386";
-
-  callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgsi686Linux.callPackage
-    else throw "callPackage_i686 not supported on system '${stdenv.system}'";
-
   # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
   # it uses GCC compiled with multilib support; on i686-linux, it's
   # just the plain stdenv.
@@ -150,10 +134,6 @@ with pkgs;
 
   ebook2cw = callPackage ../applications/misc/ebook2cw { };
 
-  vsenv = callPackage ../build-support/vsenv {
-    vs = vs90wrapper;
-  };
-
   fetchbower = callPackage ../build-support/fetchbower {
     inherit (nodePackages) bower2nix;
   };
@@ -344,6 +324,9 @@ with pkgs;
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
 
+  pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; }
+    ../build-support/setup-hooks/prune-libtool-files.sh;
+
   closureInfo = callPackage ../build-support/closure-info.nix { };
 
   setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
@@ -397,6 +380,8 @@ with pkgs;
 
   useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
 
+  ical2org = callPackage ../tools/misc/ical2org {};
+
   iconConvTools = callPackage ../build-support/icon-conv-tools {};
 
 
@@ -501,6 +486,8 @@ with pkgs;
     buildTools = androidenv.buildTools;
   };
 
+  appimage-run = callPackage ../tools/package-management/appimage-run {};
+
   apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { };
 
   apt-offline = callPackage ../tools/misc/apt-offline { };
@@ -568,6 +555,8 @@ with pkgs;
 
   aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { };
 
+  aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
+
   aws-vault = callPackage ../tools/admin/aws-vault { };
 
   iamy = callPackage ../tools/admin/iamy { };
@@ -626,7 +615,7 @@ with pkgs;
 
   dgsh = callPackage ../shells/dgsh { };
 
-  dkimpy = pythonPackages.dkimpy;
+  dkimpy = with pythonPackages; toPythonApplication dkimpy;
 
   ecdsautils = callPackage ../tools/security/ecdsautils { };
 
@@ -642,6 +631,8 @@ with pkgs;
 
   enpass = callPackage ../tools/security/enpass { };
 
+  esh = callPackage ../tools/text/esh { };
+
   ezstream = callPackage ../tools/audio/ezstream { };
 
   genymotion = callPackage ../development/mobile/genymotion { };
@@ -675,6 +666,8 @@ with pkgs;
 
   passExtensions = recurseIntoAttrs pass.extensions;
 
+  asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };
+
   gopass = callPackage ../tools/security/gopass { };
 
   browserpass = callPackage ../tools/security/browserpass { };
@@ -855,6 +848,8 @@ with pkgs;
 
   bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
 
+  charles = callPackage ../applications/networking/charles { };
+
   libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
 
   quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };
@@ -863,6 +858,8 @@ with pkgs;
 
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
+  bliss = callPackage ../applications/science/math/bliss { };
+
   blitz = callPackage ../development/libraries/blitz {
     boost = boost160;
   };
@@ -984,6 +981,10 @@ with pkgs;
   capstone = callPackage ../development/libraries/capstone { };
   unicorn-emu = callPackage ../development/libraries/unicorn-emu { };
 
+  casync = callPackage ../applications/networking/sync/casync {
+    sphinx = python3Packages.sphinx;
+  };
+
   cataract          = callPackage ../applications/misc/cataract { };
   cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
 
@@ -1334,12 +1335,16 @@ with pkgs;
 
   kisslicer = callPackage ../tools/misc/kisslicer { };
 
-  klaus = callPackage ../servers/web-apps/klaus { };
+  klaus = with pythonPackages; toPythonApplication klaus;
 
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
   languagetool = callPackage ../tools/text/languagetool {  };
 
+  lief = callPackage ../development/libraries/lief {};
+
+  loadwatch = callPackage ../tools/system/loadwatch { };
+
   loccount = callPackage ../development/tools/misc/loccount { };
 
   long-shebang = callPackage ../misc/long-shebang {};
@@ -1386,6 +1391,10 @@ with pkgs;
 
   nrsc5 = callPackage ../applications/misc/nrsc5 { };
 
+  nwipe = callPackage ../tools/security/nwipe { };
+
+  nyx = callPackage ../tools/networking/nyx { };
+
   onboard = callPackage ../applications/misc/onboard { };
 
   optar = callPackage ../tools/graphics/optar {};
@@ -1480,6 +1489,8 @@ with pkgs;
     utillinux = utillinuxMinimal;
   };
 
+  sqlint = callPackage ../development/tools/sqlint { };
+
   antibody = callPackage ../shells/zsh/antibody { };
 
   antigen = callPackage ../shells/zsh/antigen { };
@@ -1488,6 +1499,8 @@ with pkgs;
 
   appdata-tools = callPackage ../tools/misc/appdata-tools { };
 
+  appleseed = callPackage ../tools/graphics/appleseed { };
+
   arping = callPackage ../tools/networking/arping { };
 
   arpoison = callPackage ../tools/networking/arpoison { };
@@ -1669,14 +1682,17 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
+  circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
+
   citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
-  citrix_receiver_13_9_1 = citrix_receiver.override { version = "13.9.1"; };
-  citrix_receiver_13_9_0 = citrix_receiver.override { version = "13.9.0"; };
-  citrix_receiver_13_8_0 = citrix_receiver.override { version = "13.8.0"; };
-  citrix_receiver_13_7_0 = citrix_receiver.override { version = "13.7.0"; };
-  citrix_receiver_13_6_0 = citrix_receiver.override { version = "13.6.0"; };
-  citrix_receiver_13_5_0 = citrix_receiver.override { version = "13.5.0"; };
-  citrix_receiver_13_4_0 = citrix_receiver.override { version = "13.4.0"; };
+  citrix_receiver_13_10_0 = citrix_receiver.override { version = "13.10.0"; };
+  citrix_receiver_13_9_1  = citrix_receiver.override { version = "13.9.1";  };
+  citrix_receiver_13_9_0  = citrix_receiver.override { version = "13.9.0";  };
+  citrix_receiver_13_8_0  = citrix_receiver.override { version = "13.8.0";  };
+  citrix_receiver_13_7_0  = citrix_receiver.override { version = "13.7.0";  };
+  citrix_receiver_13_6_0  = citrix_receiver.override { version = "13.6.0";  };
+  citrix_receiver_13_5_0  = citrix_receiver.override { version = "13.5.0";  };
+  citrix_receiver_13_4_0  = citrix_receiver.override { version = "13.4.0";  };
 
   citra = libsForQt5.callPackage ../misc/emulators/citra { };
 
@@ -1934,7 +1950,7 @@ with pkgs;
 
   daq = callPackage ../applications/networking/ids/daq { };
 
-  dar = callPackage ../tools/archivers/dar { };
+  dar = callPackage ../tools/backup/dar { };
 
   darkhttpd = callPackage ../servers/http/darkhttpd { };
 
@@ -1982,6 +1998,10 @@ with pkgs;
 
   ddrescue = callPackage ../tools/system/ddrescue { };
 
+  ddrescueview = callPackage ../tools/system/ddrescueview { };
+
+  ddrutility = callPackage ../tools/system/ddrutility { };
+
   deluge = callPackage ../applications/networking/p2p/deluge {
     pythonPackages = python2Packages;
   };
@@ -1996,7 +2016,9 @@ with pkgs;
 
   djbdns = callPackage ../tools/networking/djbdns { };
 
-  dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
+  dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { };
+
+  dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { };
 
   dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
 
@@ -2074,7 +2096,6 @@ with pkgs;
   dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix {
     inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
     inherit (darwin) cf-private;
-    wxGTK = wxGTK31;
   };
 
   doomseeker = qt5.callPackage ../applications/misc/doomseeker { };
@@ -2095,6 +2116,8 @@ with pkgs;
 
   drone = callPackage ../development/tools/continuous-integration/drone { };
 
+  drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
+
   dropbear = callPackage ../tools/networking/dropbear { };
 
   dtach = callPackage ../tools/misc/dtach { };
@@ -2210,6 +2233,8 @@ with pkgs;
     callPackage ../servers/search/elasticsearch/plugins.nix { }
   );
 
+  embree2 = callPackage ../development/libraries/embree/2.x.nix { };
+
   emem = callPackage ../applications/misc/emem { };
 
   emv = callPackage ../tools/misc/emv { };
@@ -2374,9 +2399,11 @@ with pkgs;
 
   fio = callPackage ../tools/system/fio { };
 
+  firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { };
+
   flamerobin = callPackage ../applications/misc/flamerobin { };
 
-  flashtool = callPackage_i686 ../development/mobile/flashtool {
+  flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool {
     platformTools = androidenv.platformTools;
   };
 
@@ -2390,6 +2417,8 @@ with pkgs;
 
   flvstreamer = callPackage ../tools/networking/flvstreamer { };
 
+  hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { };
+
   libbsd = callPackage ../development/libraries/libbsd { };
 
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
@@ -2404,6 +2433,8 @@ with pkgs;
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
 
+  feedgnuplot = callPackage ../tools/graphics/feedgnuplot { };
+
   fim = callPackage ../tools/graphics/fim { };
 
   flac123 = callPackage ../applications/audio/flac123 { };
@@ -2486,14 +2517,16 @@ with pkgs;
 
   fuseiso = callPackage ../tools/filesystems/fuseiso { };
 
-  fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; };
+  fdbPackages = callPackage ../servers/foundationdb {
+    stdenv49 = overrideCC stdenv gcc49;
+  };
 
   inherit (fdbPackages)
     foundationdb51
     foundationdb52
     foundationdb60;
 
-  foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; };
+  foundationdb = foundationdb52;
 
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
@@ -2639,6 +2672,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  gnirehtet = callPackage ../tools/networking/gnirehtet { };
+
   gnome15 = callPackage ../applications/misc/gnome15 {
     inherit (gnome2) gnome_python gnome_python_desktop;
   };
@@ -2679,6 +2714,8 @@ with pkgs;
   # must have AquaTerm installed separately
   gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
 
+  gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
+
   gnused = callPackage ../tools/text/gnused { };
   # This is an easy work-around for [:space:] problems.
   gnused_422 = callPackage ../tools/text/gnused/422.nix { };
@@ -2689,7 +2726,7 @@ with pkgs;
 
   goaccess = callPackage ../tools/misc/goaccess { };
 
-  gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
+  gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
 
   godot = callPackage ../development/tools/godot {};
 
@@ -2778,13 +2815,13 @@ with pkgs;
 
   groonga = callPackage ../servers/search/groonga { };
 
-  grub = callPackage_i686 ../tools/misc/grub {
+  grub = pkgsi686Linux.callPackage ../tools/misc/grub {
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { };
+  trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
 
-  trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
+  trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
 
   grub2 = grub2_full;
 
@@ -2834,6 +2871,8 @@ with pkgs;
 
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 
+  gtkperf = callPackage ../development/tools/misc/gtkperf { };
+
   gtkvnc = callPackage ../tools/admin/gtk-vnc {};
 
   gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
@@ -2993,6 +3032,8 @@ with pkgs;
     inherit (llvmPackages_38) stdenv;
   });
 
+  holochain-go = callPackage ../servers/holochain-go { };
+
   homesick = callPackage ../tools/misc/homesick { };
 
   honcho = callPackage ../tools/system/honcho { };
@@ -3013,6 +3054,8 @@ with pkgs;
 
   http-prompt = callPackage ../tools/networking/http-prompt { };
 
+  http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
+
   httpie = callPackage ../tools/networking/httpie { };
 
   httping = callPackage ../tools/networking/httping {};
@@ -3191,7 +3234,7 @@ with pkgs;
 
   jd = callPackage ../development/tools/jd { };
 
-  jd-gui = callPackage_i686 ../tools/security/jd-gui { };
+  jd-gui = callPackage ../tools/security/jd-gui { };
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
 
@@ -3220,6 +3263,8 @@ with pkgs;
 
   journalbeat = callPackage ../tools/system/journalbeat { };
 
+  journaldriver = callPackage ../tools/misc/journaldriver { };
+
   jp = callPackage ../development/tools/jp { };
 
   jp2a = callPackage ../applications/misc/jp2a { };
@@ -3260,7 +3305,7 @@ with pkgs;
 
   kbdd = callPackage ../applications/window-managers/kbdd { };
 
-  kdbplus = callPackage_i686 ../applications/misc/kdbplus { };
+  kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { };
 
   kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { };
 
@@ -3302,6 +3347,8 @@ with pkgs;
 
   kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
 
+  krop = callPackage ../applications/graphics/krop { };
+
   elisa = libsForQt5.callPackage ../applications/audio/elisa { };
 
   kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
@@ -3377,7 +3424,7 @@ with pkgs;
 
   kippo = callPackage ../servers/kippo { };
 
-  kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
+  kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };
 
   mailcatcher = callPackage ../development/web/mailcatcher { };
 
@@ -3483,9 +3530,6 @@ with pkgs;
   nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
   nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
 
-  nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {};
-  nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; };
-
   nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
     openssl = openssl_1_1_0;
   };
@@ -3494,6 +3538,10 @@ with pkgs;
     openssl = openssl_1_1_0;
   };
 
+  nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix {
+    nodejs = pkgs.nodejs-10_x;
+  };
+
   nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix {
     nodejs = pkgs.nodejs-8_x;
   };
@@ -3671,6 +3719,8 @@ with pkgs;
 
   lzip = callPackage ../tools/compression/lzip { };
 
+  luxcorerender = callPackage ../tools/graphics/luxcorerender { };
+
   xz = callPackage ../tools/compression/xz { };
 
   lz4 = callPackage ../tools/compression/lz4 { };
@@ -3999,7 +4049,7 @@ with pkgs;
 
   networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { };
 
-  networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
+  networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { };
 
   networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };
 
@@ -4047,6 +4097,8 @@ with pkgs;
 
   pasystray = callPackage ../tools/audio/pasystray { };
 
+  phash = callPackage ../development/libraries/phash { };
+
   pnmixer = callPackage ../tools/audio/pnmixer { };
 
   pulsemixer = callPackage ../tools/audio/pulsemixer { };
@@ -4057,7 +4109,7 @@ with pkgs;
 
   niff = callPackage ../tools/package-management/niff { };
 
-  nifskope = callPackage ../tools/graphics/nifskope { };
+  nifskope = libsForQt59.callPackage ../tools/graphics/nifskope { };
 
   nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
 
@@ -4148,6 +4200,8 @@ with pkgs;
 
   odpdown = callPackage ../tools/typesetting/odpdown { };
 
+  odpic = callPackage ../development/libraries/odpic { };
+
   odt2txt = callPackage ../tools/text/odt2txt { };
 
   offlineimap = callPackage ../tools/networking/offlineimap { };
@@ -4230,6 +4284,8 @@ with pkgs;
 
   update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
 
+  opae = callPackage ../development/libraries/opae { };
+
   openvswitch = callPackage ../os-specific/linux/openvswitch { };
 
   optipng = callPackage ../tools/graphics/optipng {
@@ -4240,6 +4296,8 @@ with pkgs;
 
   os-prober = callPackage ../tools/misc/os-prober {};
 
+  osl = callPackage ../development/compilers/osl { };
+
   ossec = callPackage ../tools/security/ossec {};
 
   ostree = callPackage ../tools/misc/ostree { };
@@ -4356,6 +4414,8 @@ with pkgs;
 
   patchage = callPackage ../applications/audio/patchage { };
 
+  patchwork-classic = callPackage ../applications/networking/ssb/patchwork-classic { };
+
   pcapfix = callPackage ../tools/networking/pcapfix { };
 
   pbzip2 = callPackage ../tools/compression/pbzip2 { };
@@ -4384,6 +4444,8 @@ with pkgs;
 
   pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { };
 
+  pdfcrack = callPackage ../tools/security/pdfcrack { };
+
   pdf2svg = callPackage ../tools/graphics/pdf2svg { };
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };
@@ -4431,23 +4493,23 @@ with pkgs;
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
-  pinentry_ncurses = pinentry.override {
+  pinentry_ncurses = self.pinentry.override {
     gtk2 = null;
   };
 
-  pinentry_emacs = pinentry.override {
+  pinentry_emacs = self.pinentry.override {
     enableEmacs = true;
   };
 
-  pinentry_gnome = pinentry.override {
+  pinentry_gnome = self.pinentry.override {
     gcr = gnome3.gcr;
   };
 
-  pinentry_qt4 = pinentry.override {
+  pinentry_qt4 = self.pinentry.override {
     qt = qt4;
   };
 
-  pinentry_qt5 = pinentry.override {
+  pinentry_qt5 = self.pinentry.override {
     qt = qt5.qtbase;
   };
 
@@ -4564,6 +4626,8 @@ with pkgs;
 
   ps3netsrv = callPackage ../servers/ps3netsrv { };
 
+  pscircle = callPackage ../os-specific/linux/pscircle { };
+
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pssh = callPackage ../tools/networking/pssh { };
@@ -4604,6 +4668,8 @@ with pkgs;
 
   remarshal = callPackage ../development/tools/remarshal { };
 
+  rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
+
   rtaudio = callPackage ../development/libraries/audio/rtaudio { };
 
   rtmidi = callPackage ../development/libraries/audio/rtmidi { };
@@ -4872,6 +4938,8 @@ with pkgs;
 
   salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
 
+  saml2aws = callPackage ../tools/security/saml2aws {};
+
   samplicator = callPackage ../tools/networking/samplicator { };
 
   sasview = callPackage ../applications/science/misc/sasview {};
@@ -4920,6 +4988,8 @@ with pkgs;
 
   securefs = callPackage ../tools/filesystems/securefs { };
 
+  seexpr = callPackage ../development/compilers/seexpr { };
+
   setroot = callPackage  ../tools/X11/setroot { };
 
   setserial = callPackage ../tools/system/setserial { };
@@ -4983,7 +5053,11 @@ with pkgs;
 
   sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
 
-  sit = callPackage ../applications/version-management/sit { };
+  sit = callPackage ../applications/version-management/sit {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+  };
+
+  sixpair = callPackage ../tools/misc/sixpair {};
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
@@ -4993,6 +5067,10 @@ with pkgs;
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
+  skribilo = callPackage ../tools/typesetting/skribilo {
+    tex = texlive.combined.scheme-small;
+  };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   sleepyhead = callPackage ../applications/misc/sleepyhead {};
@@ -5023,12 +5101,16 @@ with pkgs;
 
   snabb = callPackage ../tools/networking/snabb { } ;
 
+  snapcast = callPackage ../applications/audio/snapcast { };
+
   sng = callPackage ../tools/graphics/sng {
     libpng = libpng12;
   };
 
   snort = callPackage ../applications/networking/ids/snort { };
 
+  soapui = callPackage ../applications/networking/soapui { };
+
   sshguard = callPackage ../tools/security/sshguard {};
 
   softhsm = callPackage ../tools/security/softhsm {
@@ -5092,6 +5174,8 @@ with pkgs;
 
   sstp = callPackage ../tools/networking/sstp {};
 
+  structure-synth = callPackage ../tools/graphics/structure-synth { };
+
   su-exec = callPackage ../tools/security/su-exec {};
 
   subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
@@ -5334,7 +5418,7 @@ with pkgs;
 
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
-  toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; };
+  toxvpn = callPackage ../tools/networking/toxvpn { };
 
   tpmmanager = callPackage ../applications/misc/tpmmanager { };
 
@@ -5368,6 +5452,8 @@ with pkgs;
 
   trickle = callPackage ../tools/networking/trickle {};
 
+  triggerhappy = callPackage ../tools/inputmethods/triggerhappy {};
+
   trousers = callPackage ../tools/security/trousers { };
 
   tryton = callPackage ../applications/office/tryton { };
@@ -5464,6 +5550,8 @@ with pkgs;
 
   vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
 
+  vampire = callPackage ../applications/science/logic/vampire {};
+
   volatility = callPackage ../tools/security/volatility { };
 
   vbetool = callPackage ../tools/system/vbetool { };
@@ -5510,6 +5598,8 @@ with pkgs;
 
   vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
 
+  volume_key = callPackage ../development/libraries/volume-key { };
+
   vorbisgain = callPackage ../tools/misc/vorbisgain { };
 
   vpnc = callPackage ../tools/networking/vpnc { };
@@ -5810,14 +5900,7 @@ with pkgs;
   xbursttools = callPackage ../tools/misc/xburst-tools {
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
-    gccCross =
-      let
-        pkgsCross = nixpkgsFun {
-          # Ben Nanonote system
-          crossSystem = lib.systems.examples.ben-nanonote;
-        };
-      in
-        pkgsCross.buildPackages.gccCrossStageStatic;
+    gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic;
   };
 
   xclip = callPackage ../tools/misc/xclip { };
@@ -5869,6 +5952,8 @@ with pkgs;
     libxml2 = libxml2Python;
   };
 
+  xsecurelock = callPackage ../tools/X11/xsecurelock { };
+
   xsel = callPackage ../tools/misc/xsel { };
 
   xsv = callPackage ../tools/text/xsv { };
@@ -5887,6 +5972,8 @@ with pkgs;
 
   xwinwrap = callPackage ../tools/X11/xwinwrap {};
 
+  yafaray-core = callPackage ../tools/graphics/yafaray-core { };
+
   yaft = callPackage ../applications/misc/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
@@ -5978,6 +6065,8 @@ with pkgs;
 
   bash-completion = callPackage ../shells/bash/bash-completion { };
 
+  gradle-completion = callPackage ../shells/zsh/gradle-completion { };
+
   nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { };
 
   dash = callPackage ../shells/dash { };
@@ -6113,7 +6202,7 @@ with pkgs;
 
   cmdstan = callPackage ../development/compilers/cmdstan { };
 
-  cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
+  cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
 
   compcert = callPackage ../development/compilers/compcert { };
 
@@ -6420,25 +6509,25 @@ with pkgs;
 
   gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { };
 
-  gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+  gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
     version = "4.7-2013q3-20130916";
     releaseType = "update";
     sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d";
     ncurses = pkgsi686Linux.ncurses5;
   };
-  gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+  gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
     version = "4.8-2014q1-20140314";
     releaseType = "update";
     sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
     ncurses = pkgsi686Linux.ncurses5;
   };
-  gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+  gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
     version = "4.9-2015q1-20150306";
     releaseType = "update";
     sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154";
     ncurses = pkgsi686Linux.ncurses5;
   };
-  gcc-arm-embedded-5 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded {
+  gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded {
     dirName = "5.0";
     subdirName = "5-2016-q2-update";
     version = "5.4-2016q2-20160622";
@@ -6457,8 +6546,8 @@ with pkgs;
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc822.override {
-    overrides = config.haskellPackageOverrides or (self: super: {});
+  haskellPackages = haskell.packages.ghc843.override {
+    overrides = config.haskellPackageOverrides or haskell.packageOverrides;
   };
 
   inherit (haskellPackages) ghc;
@@ -6502,6 +6591,10 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_06;
   };
 
+  pyre = callPackage ../development/tools/pyre {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_06;
+  };
+
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
   glslang = callPackage ../development/compilers/glslang { };
@@ -6782,8 +6875,8 @@ with pkgs;
     inherit (stdenvAdapters) overrideCC;
     buildLlvmTools = buildPackages.llvmPackages_5.tools;
     targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
-  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-    cmake = cmake.override {
+  } // stdenv.lib.optionalAttrs (stdenv.isDarwin && hostPlatform == buildPlatform) {
+    cmake = buildPackages.cmake.override {
       isBootstrap = true;
       majorVersion = "3.9"; # 3.10.2: 'ApplicationServices/ApplicationServices.h' file not found
     };
@@ -6804,7 +6897,7 @@ with pkgs;
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (
-    callPackage_i686 ../development/compilers/mentor {}
+    pkgsi686Linux.callPackage ../development/compilers/mentor {}
   );
 
   mercury = callPackage ../development/compilers/mercury { };
@@ -6991,7 +7084,7 @@ with pkgs;
   smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
   smlnj = if stdenv.isDarwin
             then callPackage ../development/compilers/smlnj { }
-            else callPackage_i686 ../development/compilers/smlnj { };
+            else pkgsi686Linux.callPackage ../development/compilers/smlnj { };
 
   solc = callPackage ../development/compilers/solc { };
 
@@ -7053,7 +7146,7 @@ with pkgs;
 
   valadoc = callPackage ../development/tools/valadoc { };
 
-  vs90wrapper = callPackage ../development/compilers/vs90wrapper { };
+  wcc = callPackage ../development/compilers/wcc { };
 
   wla-dx = callPackage ../development/compilers/wla-dx { };
 
@@ -7146,7 +7239,7 @@ with pkgs;
   beam = callPackage ./beam-packages.nix { };
 
   inherit (beam.interpreters)
-    erlang erlangR18 erlangR19 erlangR20
+    erlang erlangR18 erlangR19 erlangR20 erlangR21
     erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
     elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
     lfe lfe_1_2;
@@ -7169,7 +7262,7 @@ with pkgs;
 
   guile = guile_2_2;
 
-  inherit (callPackage ../applications/networking/cluster/hadoop { })
+  inherit (callPackages ../applications/networking/cluster/hadoop { })
     hadoop_2_7
     hadoop_2_8
     hadoop_2_9
@@ -7304,7 +7397,8 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526;
+  perl = perl524;
+  inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
@@ -7375,6 +7469,7 @@ with pkgs;
   python34Full = python34.override{x11Support=true;};
   python35Full = python35.override{x11Support=true;};
   python36Full = python36.override{x11Support=true;};
+  python37Full = python37.override{x11Support=true;};
 
   # pythonPackages further below, but assigned here because they need to be in sync
   pythonPackages = python.pkgs;
@@ -7397,6 +7492,10 @@ with pkgs;
     inherit (darwin) CF configd;
     self = python36;
   };
+  python37 = callPackage ../development/interpreters/python/cpython/3.7 {
+    inherit (darwin) CF configd;
+    self = python37;
+  };
 
   pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
     self = pypy27;
@@ -7409,6 +7508,7 @@ with pkgs;
   python34Packages = python34.pkgs;
   python35Packages = python35.pkgs;
   python36Packages = recurseIntoAttrs python36.pkgs;
+  python37Packages = python37.pkgs;
   pypyPackages = pypy.pkgs;
 
   # Should eventually be moved inside Python interpreters.
@@ -7495,17 +7595,22 @@ with pkgs;
 
   scheme48 = callPackage ../development/interpreters/scheme48 { };
 
-  self = callPackage_i686 ../development/interpreters/self { };
+  self = pkgsi686Linux.callPackage ../development/interpreters/self { };
 
   spark = spark_22;
   spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
-  spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
-  spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
-  spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix {
+  spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix {
     inherit (darwin) libobjc;
+    stdenv = gccStdenv;
   };
+  spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
+  spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
+    inherit (darwin) libobjc;
+  } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+      stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  }));
   spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
   spidermonkey = spidermonkey_31;
 
@@ -7548,6 +7653,8 @@ with pkgs;
     samples = true;
   };
 
+  amtk = callPackage ../development/libraries/amtk { };
+
   avrgcclibc = throw "avrgcclibs are now separate packages, install avrbinutils, avrgcc and avrlibc";
 
   avrbinutils = callPackage ../development/misc/avr/binutils {};
@@ -7586,6 +7693,8 @@ with pkgs;
 
   guile-opengl = callPackage ../development/guile-modules/guile-opengl { };
 
+  guile-reader = callPackage ../development/guile-modules/guile-reader { };
+
   guile-sdl = callPackage ../development/guile-modules/guile-sdl { };
 
   guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
@@ -7620,6 +7729,8 @@ with pkgs;
 
   alloy = callPackage ../development/tools/alloy { };
 
+  adtool = callPackage ../tools/admin/adtool { };
+
   augeas = callPackage ../tools/system/augeas { };
 
   inherit (callPackages ../tools/admin/ansible {})
@@ -7692,13 +7803,19 @@ with pkgs;
   bam = callPackage ../development/tools/build-managers/bam {};
 
   bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
-  bazel = callPackage ../development/tools/build-managers/bazel { };
+  bazel = callPackage ../development/tools/build-managers/bazel {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
+  };
 
   bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
   buildifier = bazel-buildtools;
   buildozer = bazel-buildtools;
   unused_deps = bazel-buildtools;
 
+  bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps {
+    buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; };
+  };
+
   buildBazelPackage = callPackage ../build-support/build-bazel-package { };
 
   bear = callPackage ../development/tools/build-managers/bear { };
@@ -7728,6 +7845,8 @@ with pkgs;
 
   bloaty = callPackage ../development/tools/bloaty { };
 
+  bloop = callPackage ../development/tools/build-managers/bloop { };
+
   bossa = callPackage ../development/tools/misc/bossa {
     wxGTK = wxGTK30;
   };
@@ -7983,8 +8102,6 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
-    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx
-      wtf8 dtoa;
   };
 
   foreman = callPackage ../tools/system/foreman { };
@@ -8027,6 +8144,8 @@ with pkgs;
 
   gnome-usage = callPackage ../applications/misc/gnome-usage {};
 
+  gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { };
+
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
   m4 = gnum4;
 
@@ -8412,6 +8531,10 @@ with pkgs;
     flex = flex_2_5_35;
   };
 
+  spoofer = callPackage ../tools/networking/spoofer { };
+
+  spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; };
+
   sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
 
   sselp = callPackage ../tools/X11/sselp{ };
@@ -8505,11 +8628,14 @@ with pkgs;
 
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
-  xcbuild  = callPackage ../development/tools/xcbuild/wrapper.nix {
+  xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
-    inherit (darwin) cctools bootstrap_cmds binutils;
-    stdenv = clangStdenv;
+    stdenv = buildPackages.clangStdenv;
   };
+  xcbuild = xcodebuild;
+  xcbuildHook = makeSetupHook {
+    deps = [ xcbuild ];
+  } ../development/tools/xcbuild/setup-hook.sh  ;
 
   xmlindent = callPackage ../development/web/xmlindent {};
 
@@ -8597,7 +8723,9 @@ with pkgs;
 
   assimp = callPackage ../development/libraries/assimp { };
 
-  asio = callPackage ../development/libraries/asio { };
+  asio = asio_1_12;
+  asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { };
+  asio_1_12 = callPackage ../development/libraries/asio/1.12.nix { };
 
   aspell = callPackage ../development/libraries/aspell { };
 
@@ -8657,7 +8785,7 @@ with pkgs;
 
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = assert hostPlatform.useAndroidPrebuilt;
-    androidenv.androidndkPkgs.libraries;
+    androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries;
 
   bobcat = callPackage ../development/libraries/bobcat { };
 
@@ -8674,7 +8802,8 @@ with pkgs;
   boost164 = callPackage ../development/libraries/boost/1.64.nix { };
   boost165 = callPackage ../development/libraries/boost/1.65.nix { };
   boost166 = callPackage ../development/libraries/boost/1.66.nix { };
-  boost16x = boost166;
+  boost167 = callPackage ../development/libraries/boost/1.67.nix { };
+  boost16x = boost167;
   boost = boost16x;
 
   boost_process = callPackage ../development/libraries/boost-process { };
@@ -8698,6 +8827,8 @@ with pkgs;
 
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
+  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+
   capnproto = callPackage ../development/libraries/capnproto { };
 
   ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
@@ -8718,6 +8849,8 @@ with pkgs;
 
   ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { };
 
+  cctz = callPackage ../development/libraries/cctz { };
+
   celt = callPackage ../development/libraries/celt {};
   celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
   celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {};
@@ -8818,6 +8951,8 @@ with pkgs;
 
   cutee = callPackage ../development/libraries/cutee { };
 
+  cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { };
+
   cxxtools = callPackage ../development/libraries/cxxtools { };
 
   cwiid = callPackage ../development/libraries/cwiid { };
@@ -8901,6 +9036,8 @@ with pkgs;
 
   eclib = callPackage ../development/libraries/eclib {};
 
+  editline = callPackage ../development/libraries/editline { };
+
   eigen = callPackage ../development/libraries/eigen {};
   eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {};
 
@@ -8961,12 +9098,15 @@ with pkgs;
 
   ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    stdenv = gccStdenv;
   };
   ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    stdenv = gccStdenv;
   };
   ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    stdenv = gccStdenv;
   };
   ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
@@ -8974,6 +9114,7 @@ with pkgs;
   };
   ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+    stdenv = gccStdenv;
   };
 
   # Aliases
@@ -9204,8 +9345,8 @@ with pkgs;
     else if name == "uclibc" then targetPackages.uclibcCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
-    else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries
-    else if name == "libSystem" then darwin.xcode
+    else if targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries
+    else if name == "libSystem" then targetPackages.darwin.xcode
     else throw "Unknown libc";
 
   libcCross = assert targetPlatform != buildPlatform; libcCrossChooser targetPlatform.libc;
@@ -9784,6 +9925,8 @@ with pkgs;
 
   libbdplus = callPackage ../development/libraries/libbdplus { };
 
+  libblockdev = callPackage ../development/libraries/libblockdev { };
+
   libblocksruntime = callPackage ../development/libraries/libblocksruntime { };
 
   libbluray = callPackage ../development/libraries/libbluray { };
@@ -9794,13 +9937,19 @@ with pkgs;
 
   libburn = callPackage ../development/libraries/libburn { };
 
+  libbytesize = callPackage ../development/libraries/libbytesize { };
+
   libcaca = callPackage ../development/libraries/libcaca {
     inherit (xorg) libX11 libXext;
   };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };
-  libcanberra-gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; };
-  libcanberra-gtk2 = pkgs.libcanberra-gtk3.override { gtk = pkgs.gtk2; };
+  libcanberra-gtk3 = pkgs.libcanberra.override {
+    gtk = gtk3;
+  };
+  libcanberra-gtk2 = pkgs.libcanberra-gtk3.override {
+    gtk = gtk2.override { gdktarget = "x11"; };
+  };
 
   libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
     then pkgs.libcanberra
@@ -9898,6 +10047,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
+  libde265 = callPackage ../development/libraries/libde265 {};
+
   libdevil = callPackage ../development/libraries/libdevil {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
@@ -9979,6 +10130,24 @@ with pkgs;
 
   libgadu = callPackage ../development/libraries/libgadu { };
 
+  gap-libgap-compatible = let
+    version = "4r8p6";
+    pkgVer = "2016_11_12-14_25";
+  in
+    (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: {
+      name = "libgap-${oldAttrs.pname}-${version}";
+      src = fetchurl {
+        url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2";
+        sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b";
+      };
+      patches = (oldAttrs.patches or []) ++ [
+        # don't install any packages by default (needed for interop with libgap, probably obsolete  with 4r10
+        (fetchpatch {
+          url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/nodefaultpackages.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+          sha256 = "1xwj766m3axrxbkyx13hy3q8s2wkqxy3m6mgpwq3c3n4vk3v416v";
+        })
+      ];
+  });
   libgap = callPackage ../development/libraries/libgap { };
 
   libgdata = gnome3.libgdata;
@@ -10040,6 +10209,8 @@ with pkgs;
 
   libf2c = callPackage ../development/libraries/libf2c {};
 
+  libfive = callPackage ../development/libraries/libfive {};
+
   libfixposix = callPackage ../development/libraries/libfixposix {};
 
   libffcall = callPackage ../development/libraries/libffcall { };
@@ -10080,8 +10251,6 @@ with pkgs;
 
   libgssglue = callPackage ../development/libraries/libgssglue { };
 
-  libgsystem = callPackage ../development/libraries/libgsystem { };
-
   libgudev = callPackage ../development/libraries/libgudev { };
 
   libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
@@ -10096,6 +10265,8 @@ with pkgs;
 
   libhdhomerun = callPackage ../development/libraries/libhdhomerun { };
 
+  libheif = callPackage ../development/libraries/libheif {};
+
   libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { };
 
   libHX = callPackage ../development/libraries/libHX { };
@@ -10346,6 +10517,8 @@ with pkgs;
 
   libmx = callPackage ../development/libraries/libmx { };
 
+  libndctl = callPackage ../development/libraries/libndctl { };
+
   libnet = callPackage ../development/libraries/libnet { };
 
   libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
@@ -11022,7 +11195,6 @@ with pkgs;
   openvdb = callPackage ../development/libraries/openvdb {};
 
   inherit (callPackages ../development/libraries/libressl { })
-    libressl_2_5
     libressl_2_6
     libressl_2_7;
 
@@ -11113,7 +11285,10 @@ with pkgs;
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
 
-  phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {};
+  # TODO(@Ma27) get rid of that as soon as QT4 can be dropped
+  phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {
+    withQt4 = true;
+  };
 
   inherit (callPackage ../development/libraries/physfs { })
     physfs_2
@@ -11276,10 +11451,10 @@ with pkgs;
 
   libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5;
 
-  qt510 = recurseIntoAttrs (makeOverridable
-    (import ../development/libraries/qt-5/5.10) {
+  qt511 = recurseIntoAttrs (makeOverridable
+    (import ../development/libraries/qt-5/5.11) {
       inherit newScope;
-      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -11289,10 +11464,10 @@ with pkgs;
       inherit (gnome3) gtk3 dconf;
     });
 
-  libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5);
+  libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);
 
-  qt5 = qt510;
-  libsForQt5 = libsForQt510;
+  qt5 = qt511;
+  libsForQt5 = libsForQt511;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
@@ -11603,6 +11778,8 @@ with pkgs;
 
   skalibs = callPackage ../development/libraries/skalibs { };
 
+  skydive = callPackage ../tools/networking/skydive { };
+
   slang = callPackage ../development/libraries/slang { };
 
   slibGuile = callPackage ../development/libraries/slib {
@@ -11792,6 +11969,8 @@ with pkgs;
 
   tectonic = callPackage ../tools/typesetting/tectonic { };
 
+  tepl = callPackage ../development/libraries/tepl { };
+
   telepathy-glib = callPackage ../development/libraries/telepathy/glib { };
 
   telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {};
@@ -11818,6 +11997,8 @@ with pkgs;
 
   tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { };
 
+  tiscamera = callPackage ../os-specific/linux/tiscamera { };
+
   tivodecode = callPackage ../applications/video/tivodecode { };
 
   tix = callPackage ../development/libraries/tix { };
@@ -11955,7 +12136,10 @@ with pkgs;
                                           CoreText IOSurface ImageIO OpenGL GLUT;
   };
 
+  vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
   vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
+  vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
+  vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
 
   vtkWithQt4 = vtk.override { qtLib = qt4; };
 
@@ -12603,6 +12787,8 @@ with pkgs;
 
   lighttpd = callPackage ../servers/http/lighttpd { };
 
+  livepeer = callPackage ../servers/livepeer { ffmpeg = ffmpeg_3; };
+
   lwan = callPackage ../servers/http/lwan { };
 
   labelImg = callPackage ../applications/science/machine-learning/labelimg { };
@@ -12613,6 +12799,8 @@ with pkgs;
   matterircd = callPackage ../servers/mattermost/matterircd.nix { };
   matterbridge = callPackage ../servers/matterbridge { };
 
+  mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
+
   mediatomb = callPackage ../servers/mediatomb { };
 
   meguca = callPackage ../servers/meguca { };
@@ -12690,7 +12878,8 @@ with pkgs;
 
   oauth2_proxy = callPackage ../servers/oauth2_proxy { };
 
-  openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; };
+  openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; };
+  openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
 
   openresty = callPackage ../servers/http/openresty { };
 
@@ -12760,6 +12949,8 @@ with pkgs;
 
   libpulseaudio = libpulseaudio-vanilla;
 
+  pulseeffects = callPackage ../applications/audio/pulseeffects { };
+
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
 
   pies = callPackage ../servers/pies { };
@@ -12767,6 +12958,7 @@ with pkgs;
   rpcbind = callPackage ../servers/rpcbind { };
 
   mariadb = callPackage ../servers/sql/mariadb {
+    asio = asio_1_10;
     inherit (darwin) cctools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -12912,6 +13104,7 @@ with pkgs;
   prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
   prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
   prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
+  prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix {  };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
 
@@ -13081,6 +13274,8 @@ with pkgs;
     unifiTesting;
   unifi = unifiStable;
 
+  virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
+
   virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
 
   virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { };
@@ -13487,26 +13682,31 @@ with pkgs;
       ];
   };
 
-  linux_copperhead_lts = callPackage ../os-specific/linux/kernel/linux-copperhead-lts.nix {
-    kernelPatches = with kernelPatches; [
-      bridge_stp_helper
-      modinst_arg_list_too_long
-      tag_hardened
-    ];
-  };
-
-  linux_copperhead_stable = (linux_4_16.override {
-    kernelPatches = linux_4_16.kernelPatches ++ [
-      kernelPatches.copperhead_4_16
+  linux_copperhead_lts = (linux_4_14.override {
+    kernelPatches = linux_4_14.kernelPatches ++ [
+      kernelPatches.copperhead_4_14
       kernelPatches.tag_hardened
      ];
-    modDirVersionArg = linux_4_16.modDirVersion + "-hardened";
+    modDirVersionArg = linux_4_14.modDirVersion + "-hardened";
   });
 
   # linux mptcp is based on the 4.4 kernel
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
+  linux_mptcp_93 = callPackage ../os-specific/linux/kernel/linux-mptcp-93.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
@@ -13524,6 +13724,11 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
         kernelPatches.modinst_arg_list_too_long
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13532,6 +13737,11 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13542,17 +13752,11 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-      ];
-  };
-
-  linux_4_16 = callPackage ../os-specific/linux/kernel/linux-4.16.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-        kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13564,6 +13768,11 @@ with pkgs;
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
         kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13599,6 +13808,13 @@ with pkgs;
       ];
   };
 
+  linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {
+    kernelPatches = [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.modinst_arg_list_too_long
+    ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -13681,7 +13897,8 @@ with pkgs;
 
     rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
 
-    openafs = callPackage ../servers/openafs/module.nix { };
+    openafs = callPackage ../servers/openafs/1.6/module.nix { };
+    openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
 
     facetimehd = callPackage ../os-specific/linux/facetimehd { };
 
@@ -13762,7 +13979,6 @@ with pkgs;
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
-  linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16);
   linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17);
   # Don't forget to update linuxPackages_latest!
 
@@ -13815,13 +14031,17 @@ with pkgs;
   linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 
   linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts);
-  linuxPackages_copperhead_stable = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable);
 
   # Samus kernels
   linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
   linuxPackages_samus_latest = linuxPackages_samus_4_12;
   linux_samus_latest = linuxPackages_samus_latest.kernel;
 
+  # Hardkernel (Odroid) kernels.
+  linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14);
+  linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14;
+  linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel;
+
   # A function to build a manually-configured kernel
   linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
 
@@ -14054,6 +14274,8 @@ with pkgs;
 
   powertop = callPackage ../os-specific/linux/powertop { };
 
+  pps-tools = callPackage ../os-specific/linux/pps-tools { };
+
   prayer = callPackage ../servers/prayer { };
 
   procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
@@ -14081,6 +14303,8 @@ with pkgs;
   radeontop = callPackage ../os-specific/linux/radeontop { };
 
   raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};
+  raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { };
+
   raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {};
 
   regionset = callPackage ../os-specific/linux/regionset { };
@@ -14192,6 +14416,7 @@ with pkgs;
     ubootClearfog
     ubootGuruplug
     ubootJetsonTK1
+    ubootNovena
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
@@ -14423,18 +14648,26 @@ with pkgs;
 
   camingo-code = callPackage ../data/fonts/camingo-code { };
 
+  combinatorial_designs = callPackage ../data/misc/combinatorial_designs { };
+
+  conway_polynomials = callPackage ../data/misc/conway_polynomials { };
+
   dosis = callPackage ../data/fonts/dosis { };
 
   dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
 
   eb-garamond = callPackage ../data/fonts/eb-garamond { };
 
+  elliptic_curves = callPackage ../data/misc/elliptic_curves { };
+
   faba-icon-theme = callPackage ../data/icons/faba-icon-theme { };
 
   faba-mono-icons = callPackage ../data/icons/faba-mono-icons { };
 
   fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { };
 
+  graphs = callPackage ../data/misc/graphs { };
+
   emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { };
 
   emojione = callPackage ../data/fonts/emojione {
@@ -14483,6 +14716,8 @@ with pkgs;
 
   helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };
 
+  hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { };
+
   hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };
 
   hanazono = callPackage ../data/fonts/hanazono { };
@@ -14639,8 +14874,14 @@ with pkgs;
   paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix {};
   paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix {};
 
+  pari-galdata = callPackage ../data/misc/pari-galdata {};
+
+  pari-seadata-small = callPackage ../data/misc/pari-seadata-small {};
+
   poly = callPackage ../data/fonts/poly { };
 
+  polytopes_db = callPackage ../data/misc/polytopes_db { };
+
   posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
 
   powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
@@ -14724,6 +14965,8 @@ with pkgs;
 
   source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
 
+  source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
+
   sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { };
   source-han-sans-japanese = sourceHanSansPackages.japanese;
   source-han-sans-korean = sourceHanSansPackages.korean;
@@ -14751,6 +14994,8 @@ with pkgs;
 
   terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
 
+  termtekst = callPackage ../misc/emulators/termtekst { };
+
   tex-gyre = callPackages ../data/fonts/tex-gyre { };
 
   tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
@@ -14835,7 +15080,7 @@ with pkgs;
       requests requests_toolbelt sqlalchemy fusepy;
   };
 
-  adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
+  adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
 
   masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
 
@@ -14849,6 +15094,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  agedu = callPackage ../tools/misc/agedu { };
+
   ahoviewer = callPackage ../applications/graphics/ahoviewer {
     useUnrar = config.ahoviewer.useUnrar or false;
   };
@@ -14869,7 +15116,8 @@ with pkgs;
 
   msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
 
-  amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { };
+  amarok = libsForQt5.callPackage ../applications/audio/amarok { };
+  amarok-kf5 = amarok; # for compatibility
 
   AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
 
@@ -14930,6 +15178,8 @@ with pkgs;
 
   audio-recorder = callPackage ../applications/audio/audio-recorder { };
 
+  autokey = callPackage ../applications/office/autokey { };
+
   autotrace = callPackage ../applications/graphics/autotrace {};
 
   avocode = callPackage ../applications/graphics/avocode {};
@@ -14939,7 +15189,10 @@ with pkgs;
   schismtracker = callPackage ../applications/audio/schismtracker { };
 
   altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } );
+
   bitcoin = altcoins.bitcoin;
+  clightning = altcoins.clightning;
+
   bitcoin-xt = altcoins.bitcoin-xt;
   cryptop = altcoins.cryptop;
 
@@ -15147,8 +15400,6 @@ with pkgs;
 
   cava = callPackage ../applications/audio/cava { };
 
-  cask = callPackage ../development/tools/build-managers/cask { };
-
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };
@@ -15429,6 +15680,8 @@ with pkgs;
     patches = config.dwm.patches or [];
   };
 
+  dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
+
   dynamips = callPackage ../applications/virtualization/dynamips { };
 
   evilwm = callPackage ../applications/window-managers/evilwm {
@@ -15658,7 +15911,7 @@ with pkgs;
 
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     inherit lib newScope stdenv;
-    inherit fetchFromGitHub fetchgit fetchhg fetchurl;
+    inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch;
     inherit emacs texinfo makeWrapper runCommand;
     inherit (xorg) lndir;
 
@@ -15714,9 +15967,7 @@ with pkgs;
 
   eterm = callPackage ../applications/misc/eterm { };
 
-  etherape = callPackage ../applications/networking/sniffers/etherape {
-    inherit (gnome2) libgnomecanvas libglade;
-  };
+  etherape = callPackage ../applications/networking/sniffers/etherape { };
 
   evilvte = callPackage ../applications/misc/evilvte {
     configH = config.evilvte.config or "";
@@ -15815,7 +16066,7 @@ with pkgs;
   gnss-sdr = callPackage ../applications/misc/gnss-sdr { };
 
   gnuradio = callPackage ../applications/misc/gnuradio {
-    inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
+    inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
     inherit (darwin.apple_sdk.frameworks) CoreAudio;
     fftw = fftwFloat;
     qwt = qwt6_qt4;
@@ -15908,6 +16159,7 @@ with pkgs;
 
   wireshark = callPackage ../applications/networking/sniffers/wireshark {
     withQt = true;
+    qt5 = qt59;
     withGtk = false;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
   };
@@ -16148,6 +16400,8 @@ with pkgs;
 
   linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
+  lollypop = callPackage ../applications/audio/lollypop { };
+
   m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
 
   manuskript = callPackage ../applications/editors/manuskript { };
@@ -16262,6 +16516,8 @@ with pkgs;
 
   gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { };
 
+  gspell = callPackage ../development/libraries/gspell { };
+
   gtk2fontsel = callPackage ../applications/misc/gtk2fontsel {
     inherit (gnome2) gtk;
   };
@@ -16297,6 +16553,7 @@ with pkgs;
   };
 
   hello = callPackage ../applications/misc/hello { };
+  hello-unfree = callPackage ../applications/misc/hello-unfree { };
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
@@ -16358,6 +16615,8 @@ with pkgs;
 
   spectrwm = callPackage ../applications/window-managers/spectrwm { };
 
+  super-productivity = callPackage ../applications/networking/super-productivity { };
+
   wlc = callPackage ../development/libraries/wlc { };
   wlroots = callPackage ../development/libraries/wlroots { };
   rootston = wlroots.bin;
@@ -16375,12 +16634,16 @@ with pkgs;
 
   i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };
 
+  i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
+
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
   i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
 
   i3cat = callPackage ../tools/misc/i3cat { };
 
+  i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
+
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
     cairo = cairo.override { xcbSupport = true; };
   };
@@ -16423,6 +16686,8 @@ with pkgs;
     inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
   };
 
+  iksemel = callPackage ../development/libraries/iksemel { };
+
   imagej = callPackage ../applications/graphics/imagej { };
 
   imagemagick_light = imagemagick.override {
@@ -16443,6 +16708,8 @@ with pkgs;
     libxml2 = null;
     openjpeg = null;
     libwebp = null;
+    libheif = null;
+    libde265 = null;
   };
 
   imagemagick = callPackage ../applications/graphics/ImageMagick {
@@ -16470,6 +16737,7 @@ with pkgs;
     libxml2 = null;
     openjpeg = null;
     libwebp = null;
+    libheif = null;
   });
 
   imagemagick7 = lowPrio (imagemagick7Big.override {
@@ -16480,10 +16748,12 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   });
 
+  inherit (nodePackages) imapnotify;
+
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 
-  inferno = callPackage_i686 ../applications/inferno { };
+  inferno = pkgsi686Linux.callPackage ../applications/inferno { };
 
   inginious = callPackage ../servers/inginious {};
 
@@ -16568,6 +16838,8 @@ with pkgs;
 
   k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
 
+  kail = callPackage ../tools/networking/kail {  };
+
   kanboard = callPackage ../applications/misc/kanboard { };
 
   kdeApplications =
@@ -16606,7 +16878,7 @@ with pkgs;
 
   keepnote = callPackage ../applications/office/keepnote { };
 
-  kega-fusion = callPackage_i686 ../misc/emulators/kega-fusion { };
+  kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };
 
   kermit = callPackage ../tools/misc/kermit { };
 
@@ -16710,7 +16982,7 @@ with pkgs;
 
   libreoffice = hiPrio libreoffice-still;
 
-  libreoffice-unwrapped =callPackage ../applications/office/libreoffice {
+  libreoffice-args = {
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome2) GConf ORBit2 gnome_vfs;
     inherit (gnome3) defaultIconTheme;
@@ -16733,14 +17005,24 @@ with pkgs;
     stdenv = overrideCC stdenv gcc5;
   };
 
-  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; });
+  libreoffice-unwrapped =callPackage ../applications/office/libreoffice
+  (libreoffice-args // {
+  });
+  libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix
+  (libreoffice-args // {
+      poppler = poppler_0_61;
+  });
+
+  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
+    libreoffice = libreoffice-unwrapped;
+  });
 
   libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
-    libreoffice = libreoffice-unwrapped.override {
-      poppler = poppler_0_61;
-    };
+    libreoffice = libreoffice-still-unwrapped;
   });
 
+  libvmi = callPackage ../development/libraries/libvmi { };
+
   liferea = callPackage ../applications/networking/newsreaders/liferea {
     inherit (gnome3) libpeas gsettings-desktop-schemas dconf;
   };
@@ -17184,7 +17466,9 @@ with pkgs;
     inherit (gnome3) libgee;
   };
 
-  synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { };
+  synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
     fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
@@ -17199,6 +17483,8 @@ with pkgs;
 
   sawfish = callPackage ../applications/window-managers/sawfish { };
 
+  sidplayfp = callPackage ../applications/audio/sidplayfp { };
+
   sxhkd = callPackage ../applications/window-managers/sxhkd { };
 
   sxhkd-unstable = callPackage ../applications/window-managers/sxhkd/unstable.nix { };
@@ -17217,6 +17503,10 @@ with pkgs;
 
   maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
 
+  maxscale = callPackage ../tools/networking/maxscale {
+    stdenv = overrideCC stdenv gcc6;
+  };
+
   pdfdiff = callPackage ../applications/misc/pdfdiff { };
 
   mupdf = callPackage ../applications/misc/mupdf { };
@@ -17340,6 +17630,8 @@ with pkgs;
 
   osmctools = callPackage ../applications/misc/osmctools { };
 
+  owamp = callPackage ../applications/networking/owamp { };
+
   vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
 
   vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
@@ -17387,7 +17679,7 @@ with pkgs;
     ffmpeg = ffmpeg_2;
   };
 
-  pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { };
+  pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { };
 
   pekwm = callPackage ../applications/window-managers/pekwm { };
 
@@ -17701,10 +17993,6 @@ with pkgs;
     fltk = fltk13;
   };
 
-  inherit (callPackage ../applications/virtualization/rancher-compose {})
-    rancher-compose
-    rancher-compose_0_10;
-
   renoise = callPackage ../applications/audio/renoise {};
 
   radiotray-ng = callPackage ../applications/audio/radiotray-ng {
@@ -17765,7 +18053,9 @@ with pkgs;
 
   rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
 
-  rstudio = libsForQt5.callPackage ../applications/editors/rstudio { };
+  rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
+    boost = boost166;
+  };
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
@@ -17855,6 +18145,8 @@ with pkgs;
 
   setbfree = callPackage ../applications/audio/setbfree { };
 
+  shadowfox = callPackage ../tools/networking/shadowfox { };
+
   shfmt = callPackage ../tools/text/shfmt { };
 
   shutter = callPackage ../applications/graphics/shutter { };
@@ -17963,6 +18255,8 @@ with pkgs;
     inherit (xfce) exo;
   };
 
+  lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };
+
   slic3r = callPackage ../applications/misc/slic3r { };
 
   slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { };
@@ -18145,7 +18439,7 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
-  teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   uaskjuggler = callPackage ../applications/misc/taskjuggler { };
@@ -18191,6 +18485,8 @@ with pkgs;
     vte = gnome3.vte-ng;
   };
 
+  termtosvg = callPackage ../tools/misc/termtosvg { };
+
   tesseract = callPackage ../applications/graphics/tesseract { };
   tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { });
 
@@ -18525,7 +18821,7 @@ with pkgs;
 
   vwm = callPackage ../applications/window-managers/vwm { };
 
-  vym = callPackage ../applications/misc/vym { };
+  vym = qt5.callPackage ../applications/misc/vym { };
 
   w3m = callPackage ../applications/networking/browsers/w3m {
     graphicsSupport = !stdenv.isDarwin;
@@ -18590,6 +18886,10 @@ with pkgs;
     freerdp = freerdp_legacy;
   };
 
+  whitebox-tools = callPackage ../applications/gis/whitebox-tools {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   windowlab = callPackage ../applications/window-managers/windowlab { };
 
   windowmaker = callPackage ../applications/window-managers/windowmaker { };
@@ -18602,6 +18902,8 @@ with pkgs;
     erlang = erlangR18;
   };
 
+  write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
+
   alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
 
   wllvm = callPackage  ../development/tools/wllvm { };
@@ -18912,6 +19214,8 @@ with pkgs;
 
   xsd = callPackage ../development/libraries/xsd { };
 
+  xscope = callPackage ../applications/misc/xscope { };
+
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome2) libglade;
   };
@@ -19012,7 +19316,7 @@ with pkgs;
 
   zim = callPackage ../applications/office/zim { };
 
-  zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { };
+  zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
 
   zotero = callPackage ../applications/office/zotero { };
 
@@ -19283,6 +19587,8 @@ with pkgs;
 
   gogui = callPackage ../games/gogui {};
 
+  gshogi = python3Packages.callPackage ../games/gshogi {};
+
   gtetrinet = callPackage ../games/gtetrinet {
     inherit (gnome2) GConf libgnome libgnomeui;
   };
@@ -19302,6 +19608,8 @@ with pkgs;
 
   holdingnuts = callPackage ../games/holdingnuts { };
 
+  hyperrogue = callPackage ../games/hyperrogue { };
+
   icbm3d = callPackage ../games/icbm3d { };
 
   ingen = callPackage ../applications/audio/ingen {
@@ -19346,8 +19654,6 @@ with pkgs;
 
   megaglest = callPackage ../games/megaglest {};
 
-  micropolis = callPackage ../games/micropolis { };
-
   minecraft = callPackage ../games/minecraft {
     useAlsa = config.minecraft.alsa or false;
   };
@@ -19378,6 +19684,8 @@ with pkgs;
 
   nethack = callPackage ../games/nethack { };
 
+  nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
+
   neverball = callPackage ../games/neverball { };
 
   nexuiz = callPackage ../games/nexuiz { };
@@ -19422,7 +19730,7 @@ with pkgs;
 
   openxcom = callPackage ../games/openxcom { };
 
-  orthorobot = callPackage ../games/orthorobot { love = love_0_7; };
+  orthorobot = callPackage ../games/orthorobot { };
 
   pacvim = callPackage ../games/pacvim { };
 
@@ -19562,6 +19870,8 @@ with pkgs;
 
   springLobby = callPackage ../games/spring/springlobby.nix { };
 
+  ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
+
   stardust = callPackage ../games/stardust {};
 
   stockfish = callPackage ../games/stockfish { };
@@ -19616,7 +19926,7 @@ with pkgs;
 
   terraria-server = callPackage ../games/terraria-server { };
 
-  tibia = callPackage_i686 ../games/tibia { };
+  tibia = pkgsi686Linux.callPackage ../games/tibia { };
 
   tintin = callPackage ../games/tintin { };
 
@@ -19656,8 +19966,6 @@ with pkgs;
 
   unnethack = callPackage ../games/unnethack { };
 
-  unvanquished = callPackage ../games/unvanquished { };
-
   uqm = callPackage ../games/uqm { };
 
   urbanterror = callPackage ../games/urbanterror { };
@@ -19687,7 +19995,7 @@ with pkgs;
 
   vectoroids = callPackage ../games/vectoroids { };
 
-  vessel = callPackage_i686 ../games/vessel { };
+  vessel = pkgsi686Linux.callPackage ../games/vessel { };
 
   vms-empire = callPackage ../games/vms-empire { };
 
@@ -19916,8 +20224,8 @@ with pkgs;
     bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth
     kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
     kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
-    kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop
-    plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
+    kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
+    plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
     plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
     systemsettings user-manager xdg-desktop-portal-kde;
 
@@ -20023,6 +20331,8 @@ with pkgs;
 
   minimap2 = callPackage ../applications/science/biology/minimap2 { };
 
+  mosdepth = callPackage ../applications/science/biology/mosdepth { };
+
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
   paml = callPackage ../applications/science/biology/paml { };
@@ -20052,6 +20362,8 @@ with pkgs;
 
   varscan = callPackage ../applications/science/biology/varscan { };
 
+  hmmer = callPackage ../applications/science/biology/hmmer { };
+
   bwa = callPackage ../applications/science/biology/bwa { };
 
   ### SCIENCE/MACHINE LEARNING
@@ -20148,7 +20460,10 @@ with pkgs;
 
   petsc = callPackage ../development/libraries/science/math/petsc { };
 
-  sage = callPackage ../applications/science/math/sage { };
+  sage = callPackage ../applications/science/math/sage {
+    nixpkgs = pkgs;
+  };
+  sageWithDoc = sage.override { withDoc = true; };
 
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
@@ -20329,6 +20644,8 @@ with pkgs;
   minisat = callPackage ../applications/science/logic/minisat {};
   minisatUnstable = callPackage ../applications/science/logic/minisat/unstable.nix {};
 
+  monosat = callPackage ../applications/science/logic/monosat {};
+
   opensmt = callPackage ../applications/science/logic/opensmt { };
 
   ott = callPackage ../applications/science/logic/ott { };
@@ -20437,6 +20754,7 @@ with pkgs;
 
   qucs = callPackage ../applications/science/electronics/qucs { };
 
+  xcircuit = callPackage ../applications/science/electronics/xcircuit { };
 
   xoscope = callPackage ../applications/science/electronics/xoscope { };
 
@@ -20559,6 +20877,8 @@ with pkgs;
 
   fityk = callPackage ../applications/science/misc/fityk { };
 
+  gildas = callPackage ../applications/science/astronomy/gildas { };
+
   gplates = callPackage ../applications/science/misc/gplates {
     boost = boost160;
     cgal = cgal.override { boost = boost160; };
@@ -20669,10 +20989,12 @@ with pkgs;
 
   bootil = callPackage ../development/libraries/bootil { };
 
-  brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {};
+  brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {};
 
   brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {};
 
+  brightnessctl = callPackage ../misc/brightnessctl { };
+
   calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {};
 
   click = callPackage ../applications/networking/cluster/click { };
@@ -20716,10 +21038,10 @@ with pkgs;
 
   cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
-  cups-brother-hl1110 = callPackage_i686 ../misc/cups/drivers/hl1110 { };
+  cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { };
 
   # this driver ships with pre-compiled 32-bit binary libraries
-  cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { };
+  cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
 
   cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 {
     libusb = libusb1;
@@ -20809,7 +21131,7 @@ with pkgs;
 
   gammu = callPackage ../applications/misc/gammu { };
 
-  gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
+  gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { };
 
   ghostscript = callPackage ../misc/ghostscript rec {
     cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
@@ -20821,6 +21143,8 @@ with pkgs;
     x11Support = true;
   });
 
+  glava = callPackage ../applications/misc/glava {};
+
   gnome-breeze = callPackage ../misc/themes/gnome-breeze { };
 
   gnuk = callPackage ../misc/gnuk {
@@ -20910,12 +21234,15 @@ with pkgs;
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
+  muse = callPackage ../applications/audio/muse { };
+
   mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
 
   inherit (callPackages ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";
       curl = curl_7_59;
+      boehmgc = boehmgc.override { enableLargeConfig = true; };
       })
     nix
     nix1
@@ -20928,6 +21255,52 @@ with pkgs;
 
   nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
 
+  /*
+   * Evaluate a NixOS configuration using this evaluation of Nixpkgs.
+   *
+   * With this function you can write, for example, a package that
+   * depends on a custom virtual machine image.
+   *
+   * Parameter: A module, path or list of those that represent the
+   *            configuration of the NixOS system to be constructed.
+   *
+   * Result:    An attribute set containing packages produced by this
+   *            evaluation of NixOS, such as toplevel, kernel and
+   *            initialRamdisk.
+   *            The result can be extended in the modules by defining
+   *            extra options in system.build.
+   *
+   * Unlike in plain NixOS, the nixpkgs.config, nixpkgs.overlays and
+   * nixpkgs.system options will be ignored by default. Instead,
+   * nixpkgs.pkgs will have the default value of pkgs as it was
+   * constructed right after invoking the nixpkgs function (e.g. the
+   * value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
+   * but not the value of (import <nixpkgs> {} // { extra = ...; }).
+   *
+   * If you do want to use the config.nixpkgs options, you are
+   * probably better off by calling nixos/lib/eval-config.nix
+   * directly, even though it is possible to set config.nixpkgs.pkgs.
+   *
+   * For more information about writing NixOS modules, see
+   * https://nixos.org/nixos/manual/index.html#sec-writing-modules
+   *
+   * Note that you will need to have called Nixpkgs with the system
+   * parameter set to the right value for your deployment target.
+   */
+  nixos = configuration:
+    (import (self.path + "/nixos/lib/eval-config.nix") {
+      inherit (pkgs) system;
+      modules = [(
+                  { lib, ... }: {
+                    config.nixpkgs.pkgs = lib.mkDefault pkgs;
+                  }
+                )] ++ (
+                  if builtins.isList configuration
+                  then configuration
+                  else [configuration]
+                );
+    }).config.system.build;
+
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
   nix-bundle = callPackage ../tools/package-management/nix-bundle { };
@@ -20994,6 +21367,8 @@ with pkgs;
 
   lkproof = callPackage ../tools/typesetting/tex/lkproof { };
 
+  lice = callPackage ../tools/misc/lice {};
+
   m33-linux = callPackage ../misc/drivers/m33-linux { };
 
   mnemonicode = callPackage ../misc/mnemonicode { };
@@ -21100,17 +21475,20 @@ with pkgs;
   hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { };
 
   mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { };
-  mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { };
+  mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { };
 
   mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { };
-  mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { };
+  mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { };
 
   mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { };
-  mfcl2700dnlpr = callPackage_i686 ../misc/cups/drivers/mfcl2700dnlpr { };
+  mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { };
 
   mfcl2720dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2720dwcupswrapper { };
   mfcl2720dwlpr = callPackage ../misc/cups/drivers/mfcl2720dwlpr { };
 
+  mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { };
+  mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { };
+
   samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
   samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
   samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
@@ -21234,6 +21612,8 @@ with pkgs;
 
   trufflehog = callPackage ../tools/security/trufflehog { };
 
+  tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { };
+
   tvheadend = callPackage ../servers/tvheadend { };
 
   ums = callPackage ../servers/ums { };
@@ -21250,6 +21630,8 @@ with pkgs;
 
   unicode-paracode = callPackage ../tools/misc/unicode { };
 
+  unixcw = callPackage ../applications/misc/unixcw { };
+
   valauncher = callPackage ../applications/misc/valauncher { };
 
   vault = callPackage ../tools/security/vault { };
@@ -21270,7 +21652,7 @@ with pkgs;
   vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { };
 
   vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices;
     llvmPackages = llvmPackages_39;
   });
 
@@ -21299,7 +21681,17 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { });
+  winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
+    callPackage = newScope self;
+
+    inherit wineBuild;
+
+    inherit (callPackage ./wine-packages.nix {})
+      minimal base full stable unstable staging;
+  });
+
+  winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
+  wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
 
   wine = winePackages.full;
 
@@ -21408,7 +21800,7 @@ with pkgs;
     callPackage ../applications/networking/znc/modules.nix { }
   );
 
-  zsnes = callPackage_i686 ../misc/emulators/zsnes { };
+  zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { };
 
   xcpc = callPackage ../misc/emulators/xcpc { };
 
@@ -21546,7 +21938,7 @@ with pkgs;
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
   inherit (unixtools) hexdump ps logger eject umount
                       mount wall hostname more sysctl getconf
-                      getent;
+                      getent locale killall;
 
   fts = if hostPlatform.isMusl then netbsd.fts else null;
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 765f69c1b14a4..8f8caf755edf6 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -41,6 +41,15 @@ rec {
       javacSupport = true; odbcSupport = true;
     };
     erlangR20_nox = erlangR20.override { wxSupport = false; };
+    erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
+      wxGTK = wxGTK30;
+    };
+    erlangR21_odbc = erlangR21.override { odbcSupport = true; };
+    erlangR21_javac = erlangR21.override { javacSupport = true; };
+    erlangR21_odbc_javac = erlangR21.override {
+      javacSupport = true; odbcSupport = true;
+    };
+    erlangR21_nox = erlangR21.override { wxSupport = false; };
 
     # Basho fork, using custom builder.
     erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
@@ -69,6 +78,7 @@ rec {
     erlangR18 = packagesWith interpreters.erlangR18;
     erlangR19 = packagesWith interpreters.erlangR19;
     erlangR20 = packagesWith interpreters.erlangR20;
+    erlangR21 = packagesWith interpreters.erlangR21;
 
   };
 }
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 2bc5671e98748..de9b6d38b74fb 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -74,7 +74,7 @@ in rec {
     version = "8.7.2";
   };
   coq_8_8 = callPackage ../applications/science/logic/coq {
-    version = "8.8.0";
+    version = "8.8.1";
   };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index a53b16919ee3f..047eab83bb42c 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -44,15 +44,17 @@ in
 
   insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
 
-  iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs {
+  iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix {
     buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
     targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
-    xcode = darwin.xcode_8_2;
+    xcode = darwin.xcode;
     inherit (pkgs.llvmPackages) clang-unwrapped;
   };
 
+  iproute2mac = callPackage ../os-specific/darwin/iproute2mac { };
+
   libobjc = apple-source-releases.objc4;
-  
+
   lsusb = callPackage ../os-specific/darwin/lsusb { };
 
   opencflite = callPackage ../os-specific/darwin/opencflite { };
@@ -69,7 +71,8 @@ in
 
   usr-include = callPackage ../os-specific/darwin/usr-include { };
 
-  inherit (callPackages ../os-specific/darwin/xcode { } ) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2;
+  inherit (callPackages ../os-specific/darwin/xcode { } )
+          xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode;
 
   CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f81a921938ccf..c4c264c811ad7 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -32,7 +32,7 @@
 #   `meta` with `platforms` and `homepage` set to something you are
 #   unlikely to want to override for most packages
 
-{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand
+{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand
 
 , emacs, texinfo, lndir, makeWrapper
 , trivialBuild
@@ -82,6 +82,20 @@ let
       rev = "v${version}";
       sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s";
     };
+    patches = [
+      (fetchpatch {
+        url = https://github.com/politza/pdf-tools/commit/6505a0e817495b85897c9380161034ae611ddd90.patch;
+        sha256 = "122ycbja8ckaysp58xqfcv11sgpbcp78pll5mywf9hgr0qap9jsy";
+      })
+      (fetchpatch {
+        url = https://github.com/politza/pdf-tools/commit/ded6341b0e3ad97e8b14f68c1796ba66dc155fd1.patch;
+        sha256 = "0hd2v4c6xq2jzg2m6s5kzs0fldgygf1pnfqd11v6x4w05zvxn6a2";
+      })
+      (fetchpatch {
+        url = https://github.com/politza/pdf-tools/commit/50a5297b82e26cfd52f6c00645ddc1057099d6a7.patch;
+        sha256 = "107rqzldg06h8k3pmdinkl78dr4xycm570sp2an4ihjmpmph0z39";
+      })
+    ];
     nativeBuildInputs = [ external.pkgconfig ];
     buildInputs = with external; [ autoconf automake libpng zlib poppler ];
     preBuild = "make server/epdfinfo";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7ec9da39a9c51..cca0b7ba34609 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -8,7 +8,6 @@ let
   integerSimpleExcludes = [
     "ghc7103Binary"
     "ghc821Binary"
-    "ghcCross"
     "ghcjs"
     "ghcjs710"
     "ghcjs80"
@@ -67,17 +66,17 @@ in rec {
       buildLlvmPackages = buildPackages.llvmPackages_39;
       llvmPackages = pkgs.llvmPackages_39;
     };
-    ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec {
+    ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec {
       bootPkgs = packages.ghc821Binary;
       inherit (bootPkgs) alex happy hscolour;
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
-    ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec {
-      bootPkgs = packages.ghc821Binary;
+    ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix rec {
+      bootPkgs = packages.ghc822;
       inherit (bootPkgs) alex happy hscolour;
-      buildLlvmPackages = buildPackages.llvmPackages_5;
-      llvmPackages = pkgs.llvmPackages_5;
+      buildLlvmPackages = buildPackages.llvmPackages_6;
+      llvmPackages = pkgs.llvmPackages_6;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc821Binary;
@@ -101,7 +100,7 @@ in rec {
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
     };
     ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
-      bootPkgs = packages.ghc842;
+      bootPkgs = packages.ghc843;
       inherit (bootPkgs) alex happy;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
@@ -152,16 +151,16 @@ in rec {
       ghc = bh.compiler.ghc822;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
     };
-    ghc842 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc842;
-      ghc = bh.compiler.ghc842;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
-    };
     ghc843 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc843;
       ghc = bh.compiler.ghc843;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
     };
+    ghc861 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc861;
+      ghc = bh.compiler.ghc861;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;
       ghc = bh.compiler.ghcHEAD;
@@ -201,6 +200,7 @@ in rec {
         (pkgs.lib.attrNames packages);
     in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
       ghc = bh.compiler.integer-simple."${name}";
+      buildHaskellPackages = bh.packages.integer-simple."${name}";
       overrides = _self : _super : {
         integer-simple = null;
         integer-gmp = null;
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index df462665dd160..dafa351c4e418 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -83,5 +83,6 @@ import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
   inherit config overlays crossSystem;
   # Fallback: Assume we are building packages on the current (build, in GNU
   # Autotools parlance) system.
-  localSystem = { system = builtins.currentSystem; } // localSystem;
+  localSystem = (if args ? localSystem then {}
+                 else { system = builtins.currentSystem; }) // localSystem;
 })
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 311bb1eb63f0f..017b9fca3f93f 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -634,6 +634,26 @@ let
     };
   };
 
+  lfs = buildLuaPackage rec {
+    name = "lfs-${version}";
+    version = "1.7.0.2";
+
+    src = fetchFromGitHub {
+      owner = "keplerproject";
+      repo = "luafilesystem";
+      rev = "v" + stdenv.lib.replaceStrings ["."] ["_"] version;
+      sha256 = "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Portable library for filesystem operations";
+      homepage = https://keplerproject.github.com/luafilesystem;
+      license = licenses.mit;
+      maintainers = with maintainers; [ vcunat ];
+      platforms = platforms.all;
+    };
+  };
+
   lpeg = buildLuaPackage rec {
     name = "lpeg-${version}";
     version = "0.12";
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index ccd7b89fc12d3..f7f128547bae7 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -42,7 +42,7 @@ releaseTools.sourceTarball rec {
 
     echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
 
-    # Make sure that Nixpkgs does not use <nixpkgs>
+    # Make sure that Nixpkgs does not use <nixpkgs>.
     badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true)
     if [[ -n $badFiles ]]; then
         echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
@@ -101,7 +101,7 @@ releaseTools.sourceTarball rec {
     stopNest
 
     header "checking find-tarballs.nix"
-    nix-instantiate --eval --strict --show-trace --json \
+    nix-instantiate --readonly-mode --eval --strict --show-trace --json \
        ./maintainers/scripts/find-tarballs.nix \
       --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json
     nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l)
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3bb84e7e3a0cf..a49d638dc47ee 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -56,6 +56,17 @@ let
 
     bap = callPackage ../development/ocaml-modules/bap {
       inherit (janeStreet_0_9_0) core_kernel ppx_jane parsexp;
+      ezjsonm = ezjsonm.override {
+        inherit (janeStreet_0_9_0) sexplib;
+        hex = hex.override {
+          cstruct = cstruct.override {
+            inherit (janeStreet_0_9_0) sexplib;
+          };
+        };
+      };
+      uri = uri.override {
+        inherit (janeStreet_0_9_0) ppx_sexp_conv sexplib;
+      };
     };
 
     batteries = callPackage ../development/ocaml-modules/batteries { };
@@ -139,8 +150,6 @@ let
 
     cil = callPackage ../development/ocaml-modules/cil { };
 
-    cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { };
-
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
     cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
@@ -233,9 +242,7 @@ let
 
     estring = callPackage ../development/ocaml-modules/estring { };
 
-    ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
-      lwt = ocaml_lwt;
-    };
+    ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };
 
     facile = callPackage ../development/ocaml-modules/facile { };
 
@@ -312,6 +319,8 @@ let
 
     inifiles = callPackage ../development/ocaml-modules/inifiles { };
 
+    iri = callPackage ../development/ocaml-modules/iri { };
+
     jingoo = callPackage ../development/ocaml-modules/jingoo {
       pcre = ocaml_pcre;
     };
@@ -383,6 +392,10 @@ let
 
     ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
 
+    lwt_log = callPackage ../development/ocaml-modules/lwt_log {
+      lwt = lwt3;
+    };
+
     lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
       lwt = lwt3;
     };
@@ -494,12 +507,11 @@ let
 
     ocf = callPackage ../development/ocaml-modules/ocf { };
 
-    ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
+    ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
 
-    ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
-    ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; };
+    ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { };
 
-    ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; };
+    ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
 
     ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { };
 
@@ -534,6 +546,10 @@ let
     piqi = callPackage ../development/ocaml-modules/piqi { };
     piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
 
+    ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
+
+    psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { };
+
     psq = callPackage ../development/ocaml-modules/psq { };
 
     ptime = callPackage ../development/ocaml-modules/ptime { };
@@ -736,7 +752,7 @@ let
     janeStreet = import ../development/ocaml-modules/janestreet {
       inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit;
       inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
-      inherit ppx_deriving re zarith;
+      inherit ppx_deriving re zarith ppxlib;
       inherit (pkgs) stdenv openssl;
     };
     
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 687237db61ade..c489ff2fb20df 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -299,10 +299,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Appcpanminus = buildPerlPackage rec {
-    name = "App-cpanminus-1.7043";
+    name = "App-cpanminus-1.7044";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
-      sha256 = "68a06f7da80882a95bc02c92c7ee305846fb6ab648cf83678ea945e44ad65c65";
+      sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3";
     };
     meta = {
       homepage = https://github.com/miyagawa/cpanminus;
@@ -312,13 +312,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Appperlbrew = buildPerlPackage rec {
-    name = "App-perlbrew-0.82";
+  Appperlbrew = buildPerlModule rec {
+    name = "App-perlbrew-0.83";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz";
-      sha256 = "0p6l5i85zp89f5sh0gyz7didla672zg169yprbqcf97icmr46g80";
+      sha256 = "0sdz0y90pk49cw4njfm1jq7zppha6kdx7i1d6nk41672nqrphdhb";
     };
-    buildInputs = [ pkgs.curl FileWhich IOAll PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec ];
+    buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ];
     propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ];
 
     preConfigure = ''
@@ -358,7 +358,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ];
     doCheck = false;  # Can't find home directory.
     meta = {
-      homepage = http://sqitch.org/;
+      homepage = https://sqitch.org/;
       description = "Sane database change management";
       license = stdenv.lib.licenses.mit;
     };
@@ -477,10 +477,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ArchiveTar = buildPerlPackage rec {
-    name = "Archive-Tar-2.26";
+    name = "Archive-Tar-2.28";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
-      sha256 = "01246ffbadb6e76a04a32bf689894cf56ef9d34d58101ff1c51af8f6f1ef5843";
+      sha256 = "2e9144f6c96f6d3d76cd14f4e871e8defc4542cdd39245a16fca29090648a70d";
     };
     meta = {
       description = "Manipulates TAR archives";
@@ -489,15 +489,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   ArchiveTarWrapper = buildPerlPackage rec {
-     name = "Archive-Tar-Wrapper-0.23";
+     name = "Archive-Tar-Wrapper-0.27";
      src = fetchurl {
-       url = mirror://cpan/authors/id/M/MS/MSCHILLI/Archive-Tar-Wrapper-0.23.tar.gz;
-       sha256 = "1ykl0r2dwa93l0nxrjgs8qqkwjxn44qbvxpmrwiy269na4x3j0jc";
+       url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.27.tar.gz;
+       sha256 = "0ll0p8yh54yb9y9ykaf60icj3frs0lndwz3k4k4ql9fywx40mcck";
      };
      propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ];
      meta = {
        description = "API wrapper around the 'tar' utility";
      };
+    buildInputs = [ TestSimple13 ];
   };
 
   ArchiveZip = buildPerlPackage {
@@ -507,26 +508,19 @@ let self = _self // overrides; _self = with self; {
       sha256 = "02y2ylq83hy9kgj57sc0239x65br9sm98c0chsm61s08yc2mpiza";
     };
     buildInputs = [ TestMockModule ];
-  };
-
-  ArchiveZip_1_53 = buildPerlPackage {
-    name = "Archive-Zip-1.60";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz;
-      sha256 = "eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b";
-    };
     meta = {
       description = "Provide an interface to ZIP archive files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    buildInputs = [ TestMockModule ];
   };
 
+  ArchiveZip_1_53 = ArchiveZip;
+
   AudioScan = buildPerlPackage rec {
-    name = "Audio-Scan-0.99";
+    name = "Audio-Scan-1.00";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
-      sha256 = "00092cjj89sp019b35fm3qiz4iczqznwa3yhx5jdkazlwjhlmmma";
+      sha256 = "00aj95mv5dsyi0cnmd8b6i6hvvw1xiczgkmc5mv775p385q3pcfm";
     };
     buildInputs = [ pkgs.zlib TestWarn ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include";
@@ -630,16 +624,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   autobox = buildPerlPackage rec {
-    name = "autobox-2.85";
+    name = "autobox-3.0.1";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz";
-      sha256 = "d0b8d0f27f3d1c1e8ef47f806fa06b9c229c3ca84057004fedc35dbbc0341140";
+      url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz;
+      sha256 = "c303b7fccfaa1ff4d4c429ab3f15e5ca2a77554ef8c9fc3b8c62ba859e874c98";
     };
     propagatedBuildInputs = [ ScopeGuard ];
     meta = {
       description = "Call methods on native types";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
+    buildInputs = [ IPCSystemSimple TestFatal ];
   };
 
   Autobox = self.autobox;
@@ -677,17 +672,7 @@ let self = _self // overrides; _self = with self; {
 
   autodie = null; # part of Perl
 
-  AutoLoader = buildPerlPackage {
-    name = "AutoLoader-5.74";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SM/SMUELLER/AutoLoader-5.74.tar.gz;
-      sha256 = "2fac75b05309f71a6871804cd25e1a3ba0a28f43f294fb54528077558da3aff4";
-    };
-    meta = {
-      description = "Load subroutines only on demand";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  AutoLoader = null; # part of Perl 5.22
 
   autovivification = buildPerlPackage rec {
     name = "autovivification-0.18";
@@ -722,7 +707,7 @@ let self = _self // overrides; _self = with self; {
       description = "Perl compiler";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    doCheck = false;
+    doCheck = false; /* test fails */
   };
 
   BFlags = buildPerlPackage rec {
@@ -742,10 +727,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   BHooksEndOfScope = buildPerlPackage rec {
-    name = "B-Hooks-EndOfScope-0.21";
+    name = "B-Hooks-EndOfScope-0.24";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "0b70vbpabsy9ia366k330cz1zbdyb1pwhb0l7j28pmpih045iwwh";
+      sha256 = "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3";
     };
     propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ];
     meta = {
@@ -771,10 +756,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   bignum = buildPerlPackage rec {
-    name = "bignum-0.49";
+    name = "bignum-0.50";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d";
+      sha256 = "82f88a0acbbfa9c4c69f620316b37da8f4b3d2895208e6aad6121a8f0203a94f";
     };
     meta = {
       description = "Transparent BigNumber support for Perl";
@@ -914,10 +899,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   BusinessISSN = buildPerlPackage {
-    name = "Business-ISSN-0.91";
+    name = "Business-ISSN-1.003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-0.91.tar.gz;
-      sha256 = "f15b192c0f547bb2967811072b3d343b94bc5ea58d02704c19122f7ae0a9d6b5";
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz;
+      sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1";
     };
     meta = {
       description = "Work with International Standard Serial Numbers";
@@ -936,10 +921,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CacheFastMmap = buildPerlPackage rec {
-    name = "Cache-FastMmap-1.46";
+    name = "Cache-FastMmap-1.47";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.46.tar.gz;
-      sha256 = "0061kwlbv398b2hb0kx1r6lmqf4kb6dnq9j4lsikczyk981sxs98";
+      url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.47.tar.gz;
+      sha256 = "0fdni3iyjfnx8ldgrz3h6z6yxbklrx76klcghg6xvmzd878yqlmi";
     };
   };
 
@@ -1057,10 +1042,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CaptureTiny = buildPerlPackage rec {
-    name = "Capture-Tiny-0.46";
+    name = "Capture-Tiny-0.48";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "05bhlx6d4nzamhkkh0pkckg7wlvaq6mazf7q1fbb5wpp1j1nlyjx";
+      sha256 = "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc";
     };
     meta = {
       homepage = https://metacpan.org/release/Capture-Tiny;
@@ -1142,6 +1127,7 @@ let self = _self // overrides; _self = with self; {
       description = "Sensible default end action";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
+    buildInputs = [ HTTPRequestAsCGI ];
   };
 
   CatalystActionREST = buildPerlPackage rec {
@@ -1158,14 +1144,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CatalystAuthenticationCredentialHTTP = buildPerlPackage {
-    name = "Catalyst-Authentication-Credential-HTTP-1.016";
+  CatalystAuthenticationCredentialHTTP = buildPerlModule {
+    name = "Catalyst-Authentication-Credential-HTTP-1.018";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Credential-HTTP-1.016.tar.gz;
-      sha256 = "0r4kah3qr9d7iq16i64qbj6hxjfwv5fjy3jzwgs2qmr4mjixsg51";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz;
+      sha256 = "0ad5clfiyllnf37an99n139cxhhxf5g5rh8cxashsjv4xrnq38bg";
     };
-    buildInputs = [ TestException TestMockObject ];
-    propagatedBuildInputs = [ CatalystPluginAuthentication DataUUID StringEscape ];
+    buildInputs = [ ModuleBuildTiny TestException TestMockObject TestNeeds ];
+    propagatedBuildInputs = [ CatalystPluginAuthentication ClassAccessor DataUUID StringEscape ];
     meta = {
       description = "HTTP Basic and Digest authentication";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -1213,17 +1199,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystControllerHTMLFormFu = buildPerlPackage rec {
-    name = "Catalyst-Controller-HTML-FormFu-2.02";
+    name = "Catalyst-Controller-HTML-FormFu-2.04";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.02.tar.gz;
-      sha256 = "5ddfd4983bfb0c722995c964b4d9264b3a26a89c820c921648631a7717be0551";
+      url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz;
+      sha256 = "f13fb9b3b3b00b35f06abc31614461c8d7346fbe07fb569c71e8d586e5eb5ddc";
     };
-    buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT TemplateToolkit TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ];
-    propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFu RegexpAssemble ];
+    buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT CodeTidyAllPluginPerlAlignMooseAttributes PodCoverageTrustPod PodTidy TemplateToolkit TestCPANMeta TestDifferences TestEOL TestKwalitee TestLongString TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage TestWWWMechanize TestWWWMechanizeCatalyst ];
+    propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFuMultiForm RegexpAssemble ];
     meta = {
       description = "Catalyst integration for HTML::FormFu";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
+    doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */
   };
 
   CatalystControllerPOD = buildPerlModule rec {
@@ -1233,7 +1220,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9";
     };
     buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ];
-    propagatedBuildInputs = [ CatalystPluginStaticSimple FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ];
+    propagatedBuildInputs = [ CatalystPluginStaticSimple ClassAccessor FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ];
     meta = {
       homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/;
       description = "Serves PODs right from your Catalyst application";
@@ -1323,13 +1310,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystRuntime = buildPerlPackage rec {
-    name = "Catalyst-Runtime-5.90117";
+    name = "Catalyst-Runtime-5.90118";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz";
-      sha256 = "fe12d82c4e0704d1f15946651554ca069abccb6afbe5d9de315e97d90c0c92a3";
+      url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90118.tar.gz;
+      sha256 = "a3e979fc822f500d065e39a03d1883179bfdae77a8372cce0070efd1bf1e9a33";
     };
     buildInputs = [ TestFatal TypeTiny ];
-    propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable DataDump HTTPBody HTTPRequestAsCGI ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ];
+    propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ];
     meta = {
       homepage = http://dev.catalyst.perl.org/;
       description = "The Catalyst Framework Runtime";
@@ -1397,7 +1384,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz;
       sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9";
     };
-    buildInputs = [ TestDeep TestException ];
+    buildInputs = [ ClassAccessor TestDeep TestException ];
     propagatedBuildInputs = [ CatalystRuntime ];
     meta = {
       description = "Flexible caching support for Catalyst";
@@ -1471,21 +1458,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CatalystPluginUnicodeEncoding = buildPerlPackage {
-    name = "Catalyst-Plugin-Unicode-Encoding-1.9";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Unicode-Encoding-1.9.tar.gz;
-      sha256 = "1glxkh79zz71bmgk44hnhsi37z2mgxcwf7bkmwlnwv3jh1iaz0ah";
-    };
-    buildInputs = [ HTTPMessage IOStringy ];
-    propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ];
-    meta = {
-      description = "Unicode aware Catalyst";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ];
-      platforms   = stdenv.lib.platforms.unix;
-    };
-  };
+  CatalystPluginUnicodeEncoding = CatalystRuntime;
 
   CatalystPluginHTMLWidget = buildPerlPackage rec {
     name = "Catalyst-Plugin-HTML-Widget-1.1";
@@ -1573,7 +1546,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
       sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f";
     };
-    propagatedBuildInputs = [ CacheCache CatalystPluginSession ];
+    propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ];
     meta = {
       description = "File storage backend for session data";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -1672,7 +1645,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
       sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh";
     };
-    propagatedBuildInputs = [ CatalystRuntime TemplateTimer ];
+    propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ];
     meta = {
       description = "Template View Class";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -1714,10 +1687,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystXScriptServerStarman = buildPerlPackage {
-    name = "CatalystX-Script-Server-Starman-0.02";
+    name = "CatalystX-Script-Server-Starman-0.03";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.02.tar.gz;
-      sha256 = "0h02mpkc4cmi3jpvcd7iw7xyzx55bqvvl1qkf967gqkvpklm0qx5";
+      url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz;
+      sha256 = "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6";
     };
     patches = [
       # See Nixpkgs issues #16074 and #17624
@@ -1986,10 +1959,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassC3 = buildPerlPackage rec {
-    name = "Class-C3-0.33";
+    name = "Class-C3-0.34";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "1c319k0j9knba2k0xjr8fml54kfvs71wcnc0hxp7s3lqc49mvzxf";
+      sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd";
     };
     propagatedBuildInputs = [ AlgorithmC3 ];
     meta = {
@@ -2220,10 +2193,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ClassLoad = buildPerlPackage rec {
-    name = "Class-Load-0.24";
+    name = "Class-Load-0.25";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36";
+      sha256 = "2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f";
     };
     buildInputs = [ TestFatal TestNeeds ];
     propagatedBuildInputs = [ DataOptList PackageStash ];
@@ -2338,12 +2311,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   CloneChoose = buildPerlPackage rec {
-     name = "Clone-Choose-0.008";
+     name = "Clone-Choose-0.010";
      src = fetchurl {
-       url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.008.tar.gz;
-       sha256 = "0grf0bg1ldzqakaq7aaigjngwd07zybrlmwjcnb0q986q0jcfank";
+       url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz;
+       sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn";
      };
-     buildInputs = [ Clone ClonePP ];
+     buildInputs = [ Clone ClonePP TestWithoutModule ];
      meta = {
        description = "Choose appropriate clone utility";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -2363,17 +2336,30 @@ let self = _self // overrides; _self = with self; {
   };
 
   CodeTidyAll = buildPerlPackage rec {
-     name = "Code-TidyAll-0.69";
+     name = "Code-TidyAll-0.70";
      src = fetchurl {
-       url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.69.tar.gz;
-       sha256 = "0pl5pnq9flcak1m9rvqxbygk9vp5ma7dymr90waaazpdqrx4zyhk";
+       url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.70.tar.gz;
+       sha256 = "16s847y7jhx07yn15p84lpr1jn8srqb8ma12g4ngwr46hhkrbz06";
      };
-     propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich FileZglob Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ];
+     propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ];
      buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ];
      meta = {
        description = "Engine for tidyall, your all-in-one code tidier and validator";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-       homepage = "http://metacpan.org/release/Code-TidyAll";
+       homepage = https://metacpan.org/release/Code-TidyAll;
+     };
+  };
+
+  CodeTidyAllPluginPerlAlignMooseAttributes = buildPerlPackage rec {
+     name = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz;
+       sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd";
+     };
+     propagatedBuildInputs = [ CodeTidyAll TextAligner ];
+     meta = {
+       description = "TidyAll plugin to sort and align Moose-style attributes";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
      };
   };
 
@@ -2403,14 +2389,13 @@ let self = _self // overrides; _self = with self; {
       description = "Interface to Bzip2 compression library";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    doCheck = false;
   };
 
   CompressRawBzip2 = buildPerlPackage rec {
-    name = "Compress-Raw-Bzip2-2.074";
+    name = "Compress-Raw-Bzip2-2.081";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "0b5jwqf15zr787acnx8sfyy2zavdd7gfkd98n1dgy8fs6r8yb8a4";
+      sha256 = "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6";
     };
 
     # Don't build a private copy of bzip2.
@@ -2454,10 +2439,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigAutoConf = buildPerlPackage rec {
-    name = "Config-AutoConf-0.315";
+    name = "Config-AutoConf-0.317";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.315.tar.gz;
-      sha256 = "0h39x9rzrhhilpg8yxlzpka269qrzsjg0iy0c1b9xflqlvhx2g2b";
+      url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.317.tar.gz;
+      sha256 = "1qcwib4yaml5z2283qy5khjcydyibklsnk8zrk9wzdzc5wnv5r01";
     };
     propagatedBuildInputs = [ CaptureTiny ];
     meta = {
@@ -2535,10 +2520,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigIniFiles = buildPerlModule rec {
-    name = "Config-IniFiles-2.95";
+    name = "Config-IniFiles-2.98";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "414a19f98cc745769ce762aefce01fa52d031bc244403cd32fd1f6257f2dedc2";
+      sha256 = "9d5fc5c2192058e58ad35150ddae3043a2679f2aa4e1fb7e18e36794622b1797";
     };
     propagatedBuildInputs = [ IOStringy ];
     meta = {
@@ -2563,10 +2548,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigMVP = buildPerlPackage {
-    name = "Config-MVP-2.200010";
+    name = "Config-MVP-2.200011";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz;
-      sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz;
+      sha256 = "23c95666fc43c4adaebcc093b1b56091efc2a6aa2d75366a216d18eda96ad716";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ];
@@ -2680,13 +2665,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  constant = buildPerlPackage rec {
-    name = "constant-1.33";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/constant-1.33.tar.gz;
-      sha256 = "015my616h5l2fswh52x4dp3n007gk5lax83ww9q6cmzb610mv5kr";
-    };
-  };
+  constant = null; # part of Perl 5.22
 
   constantboolean = buildPerlModule {
     name = "constant-boolean-0.02";
@@ -2887,10 +2866,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CPANPerlReleases = buildPerlPackage rec {
-    name = "CPAN-Perl-Releases-3.50";
+    name = "CPAN-Perl-Releases-3.62";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
-      sha256 = "1nr739rnrw58p9r9z26pr4sc4s5z7wbhgyva3r2b2spyaylp5qkz";
+      sha256 = "1w4xxb2fypsxrrmdhnznmskm0y9i10hkwgi60lwizlyhb9ck8bzb";
     };
     meta = {
       homepage = https://github.com/bingos/cpan-perl-releases;
@@ -2900,12 +2879,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   CPANPLUS = buildPerlPackage rec {
-    name = "CPANPLUS-0.9172";
+    name = "CPANPLUS-0.9176";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
-      sha256 = "1q4b0fkdn4sh8ym9dig21w96p7kzrhq66lqhn0dy1l3pgx413zlc";
+      sha256 = "09fypxwd13fraarq6qznmw04n1zh2f2ykdz037jmzm4m2ic8n8xc";
     };
-    propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants TermUI ];
+    propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ];
     meta = {
       homepage = https://github.com/jib/cpanplus-devel;
       description = "Ameliorated interface to the CPAN";
@@ -3015,12 +2994,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptRandomSource = buildPerlModule {
-    name = "Crypt-Random-Source-0.12";
+    name = "Crypt-Random-Source-0.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.12.tar.gz;
-      sha256 = "00mw5m52sbz9nqp3f6axyrgcrihqxn7k8gv0vi1kvm1j1nc9g29h";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz;
+      sha256 = "1rpdds3sy5l1fhngnkrsgwsmwd54wpicx3i9ds69blcskwkcwkpc";
     };
-    buildInputs = [ ModuleBuildTiny TestException TestSimple13 ];
+    buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ];
     propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ];
     meta = {
       homepage = http://search.cpan.org/dist/Crypt-Random-Source;
@@ -3107,25 +3086,40 @@ let self = _self // overrides; _self = with self; {
     NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
+  CryptOpenSSLGuess = buildPerlPackage rec {
+     name = "Crypt-OpenSSL-Guess-0.11";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz;
+       sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa";
+     };
+     meta = {
+       description = "Guess OpenSSL include path";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+       homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess";
+     };
+  };
+
   CryptOpenSSLRandom = buildPerlPackage rec {
-    name = "Crypt-OpenSSL-Random-0.11";
+    name = "Crypt-OpenSSL-Random-0.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
-      sha256 = "0yjcabkibrkafywvdkmd1xpi6br48skyk3l15ni176wvlg38335v";
+      sha256 = "1x6ffps8q7mnawmcfq740llzy7i10g3319vap0wiw4d33fm6z1zh";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
     NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
+    buildInputs = [ CryptOpenSSLGuess ];
   };
 
   CryptOpenSSLRSA = buildPerlPackage rec {
-    name = "Crypt-OpenSSL-RSA-0.28";
+    name = "Crypt-OpenSSL-RSA-0.30";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz";
-      sha256 = "5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be";
+      url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.30.tar.gz;
+      sha256 = "23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac";
     };
     propagatedBuildInputs = [ CryptOpenSSLRandom ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
     NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
+    buildInputs = [ CryptOpenSSLGuess ];
   };
 
   CryptSSLeay = buildPerlPackage rec {
@@ -3190,10 +3184,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.059";
+    name = "CryptX-0.061";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "3ef0d6493f332b6a2e1b0d20eda034d060d66f19f48d47244c788c26dca09d27";
+      sha256 = "26729d8d4f711fd83f9b728ad8227e8986343e23fa37cbe58564645ce5d3f8c2";
     };
     meta = {
       description = "Crypto toolkit";
@@ -3623,10 +3617,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateManip = buildPerlPackage rec {
-    name = "Date-Manip-6.70";
+    name = "Date-Manip-6.72";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz";
-      sha256 = "0r4k4ypb09xwhvq6das0vpx2c0xbhhhx83knq6jfpf8m55h8qi9r";
+      sha256 = "19jdm73kqbv1biw4v8bdzy5qr2xvqdrfz8lxgg59445ljjfxvx1q";
     };
     # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work
     patchPhase = ''
@@ -3651,10 +3645,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTime = buildPerlPackage rec {
-    name = "DateTime-1.48";
+    name = "DateTime-1.49";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "0glcsvgldrmbwbaps6hssjzipzghhx4jh3g4jdncjspdmdp481ah";
+      sha256 = "0hbw4zq1562slnz7g7hyhfhyq98dzkk3i5g21x3xra5cvfix93kh";
     };
     buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ];
@@ -3880,12 +3874,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeLocale = buildPerlPackage rec {
-    name = "DateTime-Locale-1.17";
+    name = "DateTime-Locale-1.22";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "0ca6598b3f89e92e3d1140e5685c69f6f795f6eed158fa482f33ce2122b35cc9";
+      sha256 = "757b3915c6b2aac89462c52fed36543f27dfb66abc98c895523d2ab95da65f94";
     };
-    buildInputs = [ CPANMetaCheck FileShareDirInstall TestFatal TestFileShareDir TestRequires TestWarnings ];
+    buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ];
     propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ];
     meta = {
       homepage = https://metacpan.org/release/DateTime-Locale;
@@ -3908,10 +3902,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeTimeZone = buildPerlPackage rec {
-    name = "DateTime-TimeZone-2.18";
+    name = "DateTime-TimeZone-2.19";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "b7f74295650bde3f378017113dcc504cefecc054cf6ef31133dc76940e15453a";
+      sha256 = "b9192efe202d71b4ff7840718807a244bfca3992afd7e7ca78da20849f5ea4f8";
     };
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ];
@@ -3991,10 +3985,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelChecklib = buildPerlPackage rec {
-    name = "Devel-CheckLib-1.11";
+    name = "Devel-CheckLib-1.13";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz";
-      sha256 = "1h9jna2d83kpckkm87xwqx84kwd83d2dsynky3hnvgl0gqc1qvdx";
+      sha256 = "1a19qkwxwz3wqb16cdabymfbf9kiydiifw90nd5srpq5hy8gvb94";
     };
     buildInputs = [ IOCaptureOutput MockConfig ];
   };
@@ -4023,10 +4017,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelPPPort = buildPerlPackage rec {
-    name = "Devel-PPPort-3.36";
+    name = "Devel-PPPort-3.42";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/W/WO/WOLFSAGE/${name}.tar.gz";
-      sha256 = "b70fb1b4e2d48983ad20052fd7ae6df4c10ceffdedbacb2d691ddc9c957afa52";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.42.tar.gz;
+      sha256 = "bac5d98b92fe2673a84ea45f1c9b615e3a46c3cc6db59c61a2fc95dd3cf9e14a";
     };
     meta = {
       description = "Perl/Pollution/Portability";
@@ -4034,18 +4028,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DevelSelfStubber = buildPerlPackage {
-    name = "Devel-SelfStubber-1.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Devel-SelfStubber-1.05.tar.gz;
-      sha256 = "b7bd750e41ec2dbca3f2f1d48e5e8ba594dcc8bc7a923a2565611ab8d0846bf8";
-    };
-    meta = {
-      homepage = http://search.cpan.org/dist/Devel-SelfStubber;
-      description = "Generate stubs for a SelfLoading module";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  DevelSelfStubber = null; # part of Perl 5.22
 
   DevelSizeMe = buildPerlPackage {
     name = "Devel-SizeMe-0.19";
@@ -4402,18 +4385,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   DevelHide = buildPerlPackage rec {
-    name = "Devel-Hide-0.0009";
+    name = "Devel-Hide-0.0010";
     src = fetchurl {
       url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz";
-      sha256 = "1phnzbw58v6551nhv6sg86m72nx9w5j4msh1hg4jvkakkq5w9pki";
+      sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm";
     };
   };
 
   DevelNYTProf = buildPerlPackage rec {
-    name = "Devel-NYTProf-6.05";
+    name = "Devel-NYTProf-6.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz";
-      sha256 = "b2a9f8b49afb9be8d087ddb50ef77a53f3796481b37eb5a965e1d4055445db1c";
+      sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55";
     };
     propagatedBuildInputs = [ FileWhich JSONMaybeXS ];
     meta = {
@@ -4490,17 +4473,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Digest = buildPerlPackage {
-    name = "Digest-1.17";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-1.17.tar.gz;
-      sha256 = "2f6a54459fc7f37c0669d548bb224b695eb8d2ddc089aa5547645ce1f5fd86f7";
-    };
-    meta = {
-      description = "Modules that calculate message digests";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  Digest = null; # part of Perl 5.22
 
   DigestCRC = buildPerlPackage rec {
     name = "Digest-CRC-0.22.2";
@@ -4526,19 +4499,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DigestHMAC_SHA1 = buildPerlPackage {
-    name = "Digest-HMAC_SHA1-1.03";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz;
-      sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv";
-    };
-    meta = {
-      description = "Keyed-Hashing for Message Authentication";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ];
-      platforms   = stdenv.lib.platforms.unix;
-    };
-  };
+  DigestHMAC_SHA1 = DigestHMAC;
 
   DigestJHash = buildPerlPackage rec {
     name = "Digest-JHash-0.10";
@@ -4629,13 +4590,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   DistZilla = buildPerlPackage {
-    name = "Dist-Zilla-6.011";
+    name = "Dist-Zilla-6.012";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.011.tar.gz;
-      sha256 = "0cai08gzrvf9mkqsj3b8vhcwxaxs30h4gx0wffq8c5dja9fhzjxs";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz;
+      sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37";
     };
     buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ];
-    propagatedBuildInputs = [ AppCmd ArchiveTarWrapper CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ];
+    propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ];
     meta = {
       homepage = http://dzil.org/;
       description = "Distribution builder; installer not included!";
@@ -4657,7 +4618,7 @@ let self = _self // overrides; _self = with self; {
       description = "Test your dist with every testing plugin conceivable";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    doCheck = false;
+    doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */
   };
 
   DistZillaPluginCheckChangeLog = buildPerlPackage {
@@ -4689,19 +4650,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestMojibake ];
   };
 
-  DistZillaPluginNoTabsTests = buildPerlPackage {
-    name = "Dist-Zilla-Plugin-NoTabsTests-0.01";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Dist-Zilla-Plugin-NoTabsTests-0.01.tar.gz;
-      sha256 = "fd4ed380de4fc2bad61db377cc50ab26b567e53b3a1efd0b8d8baab80256ef9e";
-    };
-    propagatedBuildInputs = [ DistZilla Moose TestNoTabs namespaceautoclean ];
-    meta = {
-      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests;
-      description = "Release tests making sure hard tabs aren't used";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  DistZillaPluginNoTabsTests = DistZillaPluginTestNoTabs;
 
   DistZillaPluginPodWeaver = buildPerlPackage {
     name = "Dist-Zilla-Plugin-PodWeaver-4.008";
@@ -5015,10 +4964,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EmailAddressXS = buildPerlPackage rec {
-     name = "Email-Address-XS-1.03";
+     name = "Email-Address-XS-1.04";
      src = fetchurl {
-       url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.03.tar.gz;
-       sha256 = "1knf1i9rr20bpzscbvaqsqjgw51pnnga4zlnkgsvw7jpqh4cyj6i";
+       url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz;
+       sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr";
      };
      meta = {
        description = "Parse and format RFC 2822 email addresses and groups";
@@ -5129,20 +5078,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  EmailMIMEModifier = buildPerlPackage rec {
-    doCheck = false; # tests are broken, it seems
-    name = "Email-MIME-Modifier-1.444";
-    src = fetchurl {
-      url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "4521cf361527cd9b5e8b0db3d2e6c9588c52de6a8997e1daf5c21ed1eb7a4ba2";
-    };
-    propagatedBuildInputs = [ EmailMIME EmailMIMEContentType ];
-    meta = {
-      homepage = "http://search.cpan.org/~rjbs/${name}";
-      description = "Modify Email::MIME Objects Easily";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  EmailMIMEModifier = EmailMIME;
 
   EmailSend = buildPerlPackage rec {
     name = "Email-Send-2.201";
@@ -5193,10 +5129,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   EmailSimple = buildPerlPackage rec {
-    name = "Email-Simple-2.214";
+    name = "Email-Simple-2.216";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "b2f02b37441ea60efbddebbd675017d26bb767e9a4de3e0fc30b5410a1416b92";
+      sha256 = "d85f63cd1088d11311103676a8cf498fff564a201b538de52cd753b5e5ca8bd4";
     };
     propagatedBuildInputs = [ EmailDateFormat ];
     meta = {
@@ -5231,10 +5167,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Encode = buildPerlPackage rec {
-    name = "Encode-2.97";
+    name = "Encode-2.98";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
-      sha256 = "044d2fc743bdf5ce4509a0e717a7adb31d488dafae63fde794f57a9f47b2ecb7";
+      sha256 = "303d396477c94c43c2f83da1a8025d68de76bd7e52c2cc35fbdf5c59b4c2cffa";
     };
     meta = {
       description = "Character encodings in Perl";
@@ -5310,6 +5246,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EncodeNewlines = buildPerlPackage rec {
+     name = "Encode-Newlines-0.05";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz;
+       sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl";
+     };
+     meta = {
+       description = "Normalize line ending sequences";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+       homepage = "https://github.com/neilb/Encode-Newlines";
+     };
+  };
+
   enum = buildPerlPackage rec {
     name = "enum-1.11";
     src = fetchurl {
@@ -5347,10 +5296,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Error = buildPerlModule rec {
-    name = "Error-0.17025";
+    name = "Error-0.17026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc";
+      sha256 = "1nam651w5ffsh64nnqjpzirm5g3ck92idzz1f0sf0fnp5jb0ln9p";
     };
   };
 
@@ -5473,18 +5422,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ExtUtilsCommand = buildPerlPackage {
-    name = "ExtUtils-Command-1.20";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Command-1.20.tar.gz;
-      sha256 = "740cccc93ba851aae803695b7a5b65ccbaa78bf4e96aa2e54f3f632c87a98c98";
-    };
-    meta = {
-      homepage = http://search.cpan.org/dist/ExtUtils-Command;
-      description = "Utilities to replace common UNIX commands in Makefiles etc";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  ExtUtilsCommand = ExtUtilsMakeMaker;
 
   Expect = buildPerlPackage {
     name = "Expect-1.35";
@@ -5499,17 +5437,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Exporter = buildPerlPackage {
-    name = "Exporter-5.72";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TODDR/Exporter-5.72.tar.gz;
-      sha256 = "cd13b7a0e91e8505a0ce4b25f40fab2c92bb28a99ef0d03da1001d95a32f0291";
-    };
-    meta = {
-      description = "Implements default import method for modules";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  Exporter = null; # part of Perl 5.22
 
   ExtUtilsCBuilder = buildPerlPackage rec {
     name = "ExtUtils-CBuilder-0.280230";
@@ -5545,10 +5473,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsConstant = buildPerlPackage {
-    name = "ExtUtils-Constant-0.24";
+    name = "ExtUtils-Constant-0.25";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.24.tar.gz;
-      sha256 = "aa9e8c0b564576195a7508374f4a80b97fe3cf4a4c13efe4c949ece3e76b217d";
+      url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz;
+      sha256 = "6933d0e963b62281ef7561068e6aecac8c4ac2b476b2bba09ab0b90fbac9d757";
     };
   };
 
@@ -5602,10 +5530,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsInstallPaths = buildPerlPackage {
-    name = "ExtUtils-InstallPaths-0.011";
+    name = "ExtUtils-InstallPaths-0.012";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz;
-      sha256 = "0z06y0fhx9hy9x01abb7s2xdbqrh9x4ps7avmlf4bwfwih2gl2bn";
+      url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz;
+      sha256 = "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4";
     };
     propagatedBuildInputs = [ ExtUtilsConfig ];
     meta = {
@@ -5654,10 +5582,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsManifest = buildPerlPackage rec {
-    name = "ExtUtils-Manifest-1.70";
+    name = "ExtUtils-Manifest-1.71";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz;
-      sha256 = "159bypwl8xpq1yi39prr49hl7x2xww5aj97nv169c8xja0h0dzzf";
+      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Manifest-1.71.tar.gz;
+      sha256 = "1qa7jwhy78byvfzpjnn5k2jm30sb5m1z6k2m79iy6gg2xj41nrq0";
     };
   };
 
@@ -5855,13 +5783,26 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileCopyRecursive = buildPerlPackage rec {
-    name = "File-Copy-Recursive-0.40";
+    name = "File-Copy-Recursive-0.44";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DM/DMUEY/${name}.tar.gz";
-      sha256 = "18amrqvdjlb4hc7mblbwb63q96ql1rnlb5saknsvrxqfjcxr5f78";
+      sha256 = "1r3frbl61kr7ig9bzd60fka772cd504v3kx9kgnwvcy1inss06df";
     };
-    propagatedBuildInputs = [ PathTiny ];
-    buildInputs = [ TestDeep TestException TestFile TestWarn ];
+    buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ];
+  };
+
+  FileCopyRecursiveReduced = buildPerlPackage rec {
+     name = "File-Copy-Recursive-Reduced-0.006";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz;
+       sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676";
+     };
+     buildInputs = [ CaptureTiny PathTiny ];
+     meta = {
+       description = "Recursive copying of files and directories within Perl 5 toolchain";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+       homepage = "http://thenceforward.net/perl/modules/File-Copy-Recursive-Reduced/";
+     };
   };
 
   FileDesktopEntry = buildPerlPackage rec {
@@ -5899,10 +5840,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileFindObjectRule = buildPerlModule rec {
-    name = "File-Find-Object-Rule-0.0306";
+    name = "File-Find-Object-Rule-0.0307";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "2ce55766b25fb8799d37b95bca61e8a71d8a437e28541e1cd06b7eb89f7739d1";
+      sha256 = "571d92c1bbd749b03a5e063b65cdef081b8063fe190fca7ed2e37af7ccb5a99a";
     };
     propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ];
     meta = {
@@ -5975,10 +5916,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileHomeDir = buildPerlPackage {
-    name = "File-HomeDir-1.002";
+    name = "File-HomeDir-1.004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz;
-      sha256 = "eb4c0c85775138460cd4013d8117232f08e88381c95c6a93b3d11e969185c274";
+      url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz;
+      sha256 = "45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad";
     };
     propagatedBuildInputs = [ FileWhich ];
     meta = {
@@ -6047,7 +5988,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1ipbh63bkh1r2gy5g7q4bzhki8j29mm1jkhbv60p9vwsdys5s91a";
     };
     doCheck = false; # Failed test 'desktop file is the right one'
-    buildInputs = [ FileBaseDir ];
+    buildInputs = [ FileBaseDir FileDesktopEntry ];
   };
 
   FileMMagic = buildPerlPackage rec {
@@ -6122,10 +6063,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Filepushd = buildPerlPackage {
-    name = "File-pushd-1.014";
+    name = "File-pushd-1.016";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz;
-      sha256 = "b5ab37ffe3acbec53efb7c77b4423a2c79afa30a48298e751b9ebee3fdc6340b";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz;
+      sha256 = "d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc";
     };
     meta = {
       homepage = https://metacpan.org/release/File-pushd;
@@ -6174,10 +6115,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileShareDir = buildPerlPackage {
-    name = "File-ShareDir-1.104";
+    name = "File-ShareDir-1.112";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz;
-      sha256 = "1bqwhk3qfg60bkpi5b83bh93sng8jx20i3ka5sixc0prrppjidh7";
+      url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.112.tar.gz;
+      sha256 = "196vf98l6pasrpdcpd840321fknknhyidhsm1y5ifx74lrk5ac7q";
     };
     propagatedBuildInputs = [ ClassInspector ];
     meta = {
@@ -6186,11 +6127,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  FileShareDirInstall = buildPerlModule {
-    name = "File-ShareDir-Install-0.11";
+  FileShareDirInstall = buildPerlPackage {
+    name = "File-ShareDir-Install-0.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz;
-      sha256 = "1j0cw1aq9fdv9kl1a6fnfa4zihsvmcqzy9sb0xk0i9pyx5r8ggrj";
+      url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz;
+      sha256 = "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5";
     };
     meta = {
       description = "Install shared files";
@@ -6198,7 +6139,6 @@ let self = _self // overrides; _self = with self; {
       maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
-    buildInputs = [ ModuleBuildTiny ];
   };
 
   FilesysNotifySimple = buildPerlPackage {
@@ -6296,7 +6236,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  FileUtil = buildPerlPackage rec {
+  FileUtil = buildPerlModule rec {
     name = "File-Util-4.161950";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TO/TOMMY/${name}.tar.gz";
@@ -6396,10 +6336,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ForksSuper = buildPerlPackage {
-    name = "Forks-Super-0.93";
+    name = "Forks-Super-0.94";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.93.tar.gz;
-      sha256 = "1blkhi3kpkqv6dlnbxz5r9j9lbr58vag3aa2c9yqpkqk59hivbgg";
+      url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.94.tar.gz;
+      sha256 = "145nj2wsymr5vr93ikrakjx3dd07q63fxb1bq7lkiranm9974v8s";
     };
     doCheck = false;
     meta = {
@@ -6435,10 +6375,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   GamesSolitaireVerify = buildPerlModule {
-    name = "Games-Solitaire-Verify-0.1701";
+    name = "Games-Solitaire-Verify-0.1800";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1701.tar.gz;
-      sha256 = "71383f9c44a344aa92eca6ad999103b05809f19b3e078cf01651f2298bc435c1";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1800.tar.gz;
+      sha256 = "935ba997c49437a095adb39fd18233d5e378941aa9974df46e56aa6234f1fced";
     };
     buildInputs = [ TestDifferences ];
     propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ];
@@ -6512,6 +6452,18 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # seems to access the network
   };
 
+  GetoptArgvFile = buildPerlPackage rec {
+    name = "Getopt-ArgvFile-1.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JS/JSTENZEL/${name}.tar.gz";
+      sha256 = "3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22";
+    };
+    meta = {
+      license = stdenv.lib.licenses.artistic1;
+      maintainers = [ maintainers.pSub ];
+    };
+  };
+
   GetoptLong = buildPerlPackage rec {
     name = "Getopt-Long-2.50";
     src = fetchurl {
@@ -6573,10 +6525,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.326";
+    name = "Glib-1.327";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "0prn9kkdpwjq9qmzqashbhk3pq4gvlrmvm3b10xf1dhc48406382";
+      sha256 = "0n7hjhbh5xhagvb0qjwzg21j22ks0csah0chgk98g4wnfllxjl0k";
     };
     buildInputs = [ pkgs.glib ];
     meta = {
@@ -6770,7 +6722,6 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/A/AG/AGROLMS/${name}.tar.gz";
       sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx";
     };
-    buildInputs = [ TestPod ];
     propagatedBuildInputs = [ pkgs.krb5Full.dev ];
     meta = {
       maintainers = [ maintainers.limeytexan ];
@@ -6917,11 +6868,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  HashMoreUtils = buildPerlModule rec {
-    name = "Hash-MoreUtils-0.05";
+  HashMoreUtils = buildPerlPackage rec {
+    name = "Hash-MoreUtils-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz";
-      sha256 = "5e9c8458457eb18315a5669e3bef68488cd5ed8c2220011ac7429ff983288ab1";
+      sha256 = "db9a8fb867d50753c380889a5e54075651b5e08c9b3b721cb7220c0883547de8";
     };
     meta = {
       description = "Provide the stuff missing in Hash::Util";
@@ -7081,19 +7032,33 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTMLFormFu = buildPerlPackage rec {
-    name = "HTML-FormFu-2.05";
+    name = "HTML-FormFu-2.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-2.05.tar.gz;
-      sha256 = "0xz41ap0vyw9yfjci84i5ixc6jshjrd2swhiv8dsy5xx9x71iw1q";
+      url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.06.tar.gz;
+      sha256 = "1g9zi7cg53527hlqb9h73i75vfzm52dwjrm8784vykn4kw4kklsv";
     };
-    buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle ];
-    propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten MooseXAliases NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ];
+    buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ];
+    propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ];
     meta = {
       description = "HTML Form Creation, Rendering and Validation Framework";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
+  HTMLFormFuMultiForm = buildPerlPackage rec {
+     name = "HTML-FormFu-MultiForm-1.03";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz;
+       sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n";
+     };
+     propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ];
+     meta = {
+       description = "Handle multi-page/stage forms with FormFu";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+       homepage = "https://github.com/FormFu/HTML-FormFu-MultiForm";
+     };
+  };
+
   HTMLFormHandler = buildPerlPackage {
     name = "HTML-FormHandler-0.40068";
     src = fetchurl {
@@ -7431,10 +7396,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTTPMessage = buildPerlPackage rec {
-    name = "HTTP-Message-6.16";
+    name = "HTTP-Message-6.18";
     src = fetchurl {
       url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz";
-      sha256 = "46790ae127946d5cfea5a1e05c1b9f4a045a7c5094fe81f086bbf3341290ebd0";
+      sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112";
     };
     buildInputs = [ TryTiny ];
     propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ];
@@ -7568,18 +7533,7 @@ let self = _self // overrides; _self = with self; {
      };
   };
 
-  I18NCollate = buildPerlPackage {
-    name = "I18N-Collate-1.02";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/I18N-Collate-1.02.tar.gz;
-      sha256 = "9174506bc903eda89690394e3f45558ab7e013114227896d8569d6164648fe37";
-    };
-    meta = {
-      homepage = http://search.cpan.org/dist/I18N-Collate;
-      description = "Compare 8-bit scalar data according to the current locale";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  I18NCollate = null; # part of Perl 5.22
 
   iCalParser = buildPerlPackage rec {
     name = "iCal-Parser-1.21";
@@ -7675,10 +7629,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IO = buildPerlPackage {
-    name = "IO-1.25";
+    name = "IO-1.39";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GB/GBARR/IO-1.25.tar.gz;
-      sha256 = "89790db8b9281235dc995c1a85d532042ff68a90e1504abd39d463f05623e7b5";
+      url = mirror://cpan/authors/id/T/TO/TODDR/IO-1.39.tar.gz;
+      sha256 = "4f0502e7f123ac824188eb8873038aaf2ddcc29f8babc1a0b2e1cd34b55a1fca";
     };
     doCheck = false;
     meta = {
@@ -7727,10 +7681,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOCompress = buildPerlPackage rec {
-    name = "IO-Compress-2.074";
+    name = "IO-Compress-2.081";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "b4bd68ce895a6578e5be96ade36449461becc328cc7ab900ae4e362380f097f2";
+      sha256 = "5211c775544dc8c511af08edfb1c0c22734daa2789149c2a88d68e17b43546d9";
     };
     propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ];
     meta = {
@@ -7839,13 +7793,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  IOSocketInet6 = buildPerlPackage rec {
+  IOSocketInet6 = buildPerlModule rec {
     name = "IO-Socket-INET6-2.72";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
       sha256 = "1fqypz6qa5rw2d5y2zq7f49frwra0aln13nhq5gi514j2zx21q45";
     };
-    propagatedBuildInputs = [Socket6];
+    propagatedBuildInputs = [ Socket6 ];
     doCheck = false;
   };
 
@@ -7960,10 +7914,10 @@ let self = _self // overrides; _self = with self; {
 
 
   IPCRun = buildPerlPackage {
-    name = "IPC-Run-0.98";
+    name = "IPC-Run-20180523.0";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.98.tar.gz;
-      sha256 = "018r6jb8h0danyd3g8k03ziaf4w2d31qi9x876gn21js8l232spl";
+      url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz;
+      sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q";
     };
     doCheck = false; /* attempts a network connection to localhost */
     meta = {
@@ -8018,11 +7972,11 @@ let self = _self // overrides; _self = with self; {
 
   ImageExifTool = buildPerlPackage rec {
     name = "Image-ExifTool-${version}";
-    version = "10.80";
+    version = "11.01";
 
     src = fetchurl {
       url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
-      sha256 = "14rwr5wk2snqv4yva6fax1gfsdv88941n237m0wyzn3n0xh9dy5w";
+      sha256 = "175w34n73mypdpbaqj2vgqsfp59yvfrn8k7zmx4cawnp895bypvh";
     };
 
     meta = with stdenv.lib; {
@@ -8089,11 +8043,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   InlineJava = buildPerlPackage rec {
-    name = "Inline-Java-0.53";
+    name = "Inline-Java-0.66";
 
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PA/PATL/${name}.tar.gz";
-      sha256 = "1d9hq09nv3l6m015ws08b3gbfp8daxryqr7p0yi0xhqr44j9qcj8";
+      url = mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz;
+      sha256 = "0j6r6gxdn3wzx36cgcx4znj4ihp5fjl4gzk1623vvwgnwrlf0hy7";
     };
 
     propagatedBuildInputs = [ Inline ];
@@ -8118,6 +8072,7 @@ let self = _self // overrides; _self = with self; {
 
       maintainers = [ ];
     };
+    buildInputs = [ ExtUtilsMakeMaker ];
   };
 
   IPCSignal = buildPerlPackage rec {
@@ -8159,6 +8114,10 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz;
       sha256 = "0nlgdzy40q26z8qhwngsd461glyai8dpwaccyhiljmrkaqwdjxz2";
     };
+    # Do not abort cross-compilation on failure to load native JSON module into host perl
+    preConfigure = ''
+      substituteInPlace Makefile.PL --replace "exit 0;" ""
+    '';
     meta = {
       description = "JSON (JavaScript Object Notation) encoder/decoder";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -8179,10 +8138,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   JSONMaybeXS = buildPerlPackage rec {
-    name = "JSON-MaybeXS-1.003010";
+    name = "JSON-MaybeXS-1.004000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.003010.tar.gz;
-      sha256 = "0hs504x5zsa2vl6r7b3rvbygsak1ly24m1lg636bqp3x7jirmb30";
+      url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz;
+      sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar";
     };
     meta = {
       description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>";
@@ -8221,7 +8180,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "77c182a98528f1714d82afc548d5b3b4dc93e67069128bb9b9413f24cf07248b";
     };
     buildInputs = [ TestMockGuard TestRequires ];
-    propagatedBuildInputs = [ JSON ];
+    propagatedBuildInputs = [ JSON ModuleRuntime ];
     meta = {
       homepage = https://github.com/xaicron/p5-JSON-WebToken;
       description = "JSON Web Token (JWT) implementation";
@@ -8264,17 +8223,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  lib_ = buildPerlPackage {
-    name = "lib-0.63";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SM/SMUELLER/lib-0.63.tar.gz;
-      sha256 = "72f63db9220098e834d7a38231626bd0c9b802c1ec54a628e2df35f3818e5a00";
-    };
-    meta = {
-      description = "Manipulate @INC at compile time";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  lib_ = null; # part of Perl 5.22
 
   libapreq2 = buildPerlPackage {
     name = "libapreq2-2.13";
@@ -8425,10 +8374,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LinguaENTagger = buildPerlPackage {
-    name = "Lingua-EN-Tagger-0.28";
+    name = "Lingua-EN-Tagger-0.29";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.28.tar.gz;
-      sha256 = "1rm223d871s150dgnhbar71w56bim950cp45f0904w6px5fifcqa";
+      url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.29.tar.gz;
+      sha256 = "0dssn101kmpkh2ik1430mj2ikk04849vbpgi60382kvh9xn795na";
     };
     propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ];
     meta = {
@@ -8660,10 +8609,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LocaleCodes = buildPerlPackage {
-    name = "Locale-Codes-3.56";
+    name = "Locale-Codes-3.57";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.56.tar.gz;
-      sha256 = "d82f3340ecb7f8700493df0273dede0c049fbc44c2fe1e811fc6c5a79b79ae79";
+      url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.57.tar.gz;
+      sha256 = "3547cffeb6098a706a5647f6079e06cbdb68a6b7f9c8d5b0032659df7bfd8812";
     };
     meta = {
       description = "A distribution of modules to handle locale codes";
@@ -8728,13 +8677,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LocaleMaketextSimple = buildPerlPackage {
-    name = "Locale-Maketext-Simple-0.21";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JE/JESSE/Locale-Maketext-Simple-0.21.tar.gz;
-      sha256 = "1ad9vh45j8c32nzkbjipinawyg1pnjckwlhsjqcqs47vyi8zy2dh";
-    };
-  };
+  LocaleMaketextSimple = null; # part of Perl 5.22
 
   LocaleMsgfmt = buildPerlPackage {
     name = "Locale-Msgfmt-0.15";
@@ -8778,10 +8721,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LocaleTextDomainOOUtil = buildPerlPackage rec {
-     name = "Locale-TextDomain-OO-Util-3.008";
+     name = "Locale-TextDomain-OO-Util-4.001";
      src = fetchurl {
-       url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-3.008.tar.gz;
-       sha256 = "1kj633apv20ah5nazjlig4w25l021lvmlb6a6fhwrixis08mdqxb";
+       url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.001.tar.gz;
+       sha256 = "1bzh9bnm9lnjc63nrlcc03gz660lvgmvy4yphrv2yyr5829bpr7z";
      };
      propagatedBuildInputs = [ namespaceautoclean ];
      buildInputs = [ TestDifferences TestException TestNoWarnings ];
@@ -9022,10 +8965,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LWP = buildPerlPackage rec {
-    name = "libwww-perl-6.33";
+    name = "libwww-perl-6.34";
     src = fetchurl {
-      url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.33.tar.gz;
-      sha256 = "97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99";
+      url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.34.tar.gz;
+      sha256 = "260363fd4204c0ddf7cd76f7b70e22beb3b5186e4c346f250a59288b52dc114c";
     };
     propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ];
     meta = with stdenv.lib; {
@@ -9222,10 +9165,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MailDKIM = buildPerlPackage rec {
-    name = "Mail-DKIM-0.52";
+    name = "Mail-DKIM-0.53";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.52.tar.gz;
-      sha256 = "1dbczg7vyvvm12d9gbiqd9a24qg4254cz7bh7yf3p27i58hhpbwy";
+      url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.53.tar.gz;
+      sha256 = "1aqmffkbsqcckllf6hxbdm1xcybw6674h18np2aaas8z42g0ji3w";
     };
     propagatedBuildInputs = [ CryptOpenSSLRSA MailTools NetDNSResolverMock YAMLLibYAML ];
     doCheck = false; # tries to access the domain name system
@@ -9351,10 +9294,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigInt = buildPerlPackage rec {
-    name = "Math-BigInt-1.999811";
+    name = "Math-BigInt-1.999813";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "d4bfa5ad0127b6360ad29971da6fa08bcfb56a471d55db3c7419d05f8a947b8d";
+      sha256 = "67a10a10a806bd7add463acc1557554381052426cbcb04b1ffbeccfb6775be3d";
     };
     meta = {
       description = "Arbitrary size integer/float math package";
@@ -9363,10 +9306,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigIntGMP = buildPerlPackage rec {
-    name = "Math-BigInt-GMP-1.6004";
+    name = "Math-BigInt-GMP-1.6005";
     src = fetchurl {
       url    = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "1wiklyxxpf02c01flymyjqh46lhi0qhkvf14icni8grjgpfjjqi3";
+      sha256 = "0a5qwsjrp46lkmaxpw408lv14ygivk9i3cbbcrjim1qwsk1jlmjc";
     };
     buildInputs = [ pkgs.gmp ];
     doCheck = false;
@@ -9376,10 +9319,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigIntLite = buildPerlPackage rec {
-     name = "Math-BigInt-Lite-0.17";
+     name = "Math-BigInt-Lite-0.18";
      src = fetchurl {
-       url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.17.tar.gz;
-       sha256 = "1pii36cykpja9al6bdnsxn2w0la674qagqcff6lhk9yx6xakycpk";
+       url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz;
+       sha256 = "1m97jkh26nrji6mjdwhwlq9bcdn8qlw3vimik8bs2hw80syi70j4";
      };
      propagatedBuildInputs = [ MathBigInt ];
      meta = {
@@ -9388,10 +9331,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigRat = buildPerlPackage rec {
-    name = "Math-BigRat-0.2613";
+    name = "Math-BigRat-0.2614";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "b893dfe2caf27b233a3678abc39176e706a9b518e8937bc496e46e125e960e22";
+      sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59";
     };
     propagatedBuildInputs = [ MathBigInt ];
     meta = {
@@ -9401,22 +9344,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathClipper = buildPerlModule rec {
-    name = "Math-Clipper-1.23";
+    name = "Math-Clipper-1.27";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-Clipper-1.23.tar.gz;
-      sha256 = "0i9wzvig7ayijc9nvh5x5rryk1jrcj1hcvfmlcj449rnnxx24dav";
+      url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.27.tar.gz;
+      sha256 = "0di8frcxa8laa5s0x4vkr2mp9abv2a099c3x4gsdpnbijj10j6dn";
     };
     nativeBuildInputs = [ pkgs.ld-is-cc-hook ];
     buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ];
   };
 
-  MathComplex = buildPerlPackage {
-    name = "Math-Complex-1.59";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz;
-      sha256 = "f35eb4987512c51d2c47294a008ede210d8dd759b90b887d04847c69b42dd6d1";
-    };
-  };
+  MathComplex = null; # part of Perl 5.22
 
   MathConvexHullMonotoneChain = buildPerlPackage rec {
     name = "Math-ConvexHull-MonotoneChain-0.01";
@@ -9566,7 +9503,7 @@ let self = _self // overrides; _self = with self; {
       url    = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/${name}.tar.gz";
       sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2";
     };
-    propagatedBuildInputs = [ ];
+    outputs = [ "out" "dev" ]; # no "devdoc"
 
     installTargets = "install";
 
@@ -9579,13 +9516,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MIMEBase64 = buildPerlPackage rec {
-    name = "MIME-Base64-3.15";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
-      sha256 = "1f8y78dskf91p4xym73n9lqbj15av5vxpsivm7nr7jx9lrk3b1kz";
-    };
-  };
+  MIMEBase64 = null; # part of Perl 5.22
 
   MIMECharset = buildPerlPackage {
     name = "MIME-Charset-1.012.2";
@@ -9640,10 +9571,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MIMETypes = buildPerlPackage rec {
-    name = "MIME-Types-2.13";
+    name = "MIME-Types-2.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz";
-      sha256 = "1y3vnxk4wv4a00lxcp39hw9650cdl455d3y7nv42rqmvaxikghwr";
+      sha256 = "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0";
     };
     meta = {
       description = "Definition of MIME types";
@@ -9785,12 +9716,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleBuildXSUtil = buildPerlModule rec {
-    name = "Module-Build-XSUtil-0.18";
+    name = "Module-Build-XSUtil-0.19";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz";
-      sha256 = "1vjl77iwbwr2xhdlyqva3hhma9r1fgr2rappwsimwqjmybdrfd6b";
+      sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh";
     };
-    buildInputs = [ CaptureTiny CwdGuard FileCopyRecursive ];
+    buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ];
     meta = {
       description = "A Module::Build class for building XS modules";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -9809,28 +9740,29 @@ let self = _self // overrides; _self = with self; {
      meta = {
        description = "Generate Kwalitee ratings for a distribution";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-       homepage = "http://cpants.cpanauthors.org";
+       homepage = https://cpants.cpanauthors.org;
      };
   };
 
   ModuleCPANfile = buildPerlPackage rec {
-     name = "Module-CPANfile-1.1002";
+     name = "Module-CPANfile-1.1004";
      src = fetchurl {
-       url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1002.tar.gz;
-       sha256 = "1z9wsps70h7ypaxmwq8l8wp0dg4kqrxmaqgzbh2fq8jw9idw55dz";
+       url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz;
+       sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8";
      };
      meta = {
        description = "Parse cpanfile";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
        homepage = "https://github.com/miyagawa/cpanfile";
      };
+    buildInputs = [ Filepushd ];
   };
 
   ModuleCoreList = buildPerlPackage {
-    name = "Module-CoreList-5.20180221";
+    name = "Module-CoreList-5.20180420";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180221.tar.gz;
-      sha256 = "12gad19gxvrv19938f6hs2i2fanq2s1dx3l1yy8nh0nvc2mwggzl";
+      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180420.tar.gz;
+      sha256 = "1bp22m50rjv8qjvygciy60j7kblksvhglsdgaabhmrqcmx5ysj5p";
     };
     meta = {
       homepage = http://dev.perl.org/;
@@ -10131,13 +10063,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-7.71";
+    name = "Mojolicious-7.84";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "25d8ab46fd7c340abcbbe740f690c197df6ff40a9c3dddf907629211bf3ad905";
+      sha256 = "7461a27e8e8665b436a60c708cf6ce4164b84dfb1b2435480a65597085d26ebc";
     };
     meta = {
-      homepage = http://mojolicious.org;
+      homepage = https://mojolicious.org/;
       description = "Real-time web framework";
       license = with stdenv.lib.licenses; [ artistic2 ];
     };
@@ -10201,10 +10133,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Moose = buildPerlPackage {
-    name = "Moose-2.2010";
+    name = "Moose-2.2011";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2010.tar.gz;
-      sha256 = "af0905b69f18c27de1177c9bc7778ee495d4ec91be1f223e8ca8333af4de08c5";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2011.tar.gz;
+      sha256 = "973d0a35d9f39bf93bbc5206c25f5ec3651f96356f082d31873c0ac9a5c1cd82";
     };
     buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ];
     propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ];
@@ -11037,10 +10969,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Mouse = buildPerlModule rec {
-    name = "Mouse-2.5.2";
+    name = "Mouse-2.5.4";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.2.tar.gz;
-      sha256 = "17nr2432cfw7q2qxiz8pv7lw91dszgvn4ln77gpv2m77kjh5ilbs";
+      url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.4.tar.gz;
+      sha256 = "041nm46bxxyi1fd8w69r45k434b6m43va2s06pr3bys6igxic79d";
     };
     buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ];
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector";
@@ -11184,7 +11116,6 @@ let self = _self // overrides; _self = with self; {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.rycee ];
     };
-    doCheck = false;
   };
 
   NetAmazonAWSSign = buildPerlPackage {
@@ -11232,7 +11163,7 @@ let self = _self // overrides; _self = with self; {
     patches =
       [ ../development/perl-modules/net-amazon-mechanicalturk.patch ];
     propagatedBuildInputs = [ DigestHMAC LWPProtocolHttps XMLParser ];
-    doCheck = false;
+    doCheck = false; /* wants network */
   };
 
   NetAmazonS3 = buildPerlPackage rec {
@@ -11283,10 +11214,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetCIDR = buildPerlPackage {
-    name = "Net-CIDR-0.18";
+    name = "Net-CIDR-0.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.18.tar.gz;
-      sha256 = "c3df7ea8d42b2d8ec328c187329c5f8c4db6a2470873f61e3d0dd91430ef1427";
+      url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.19.tar.gz;
+      sha256 = "855bf4662062de1a85aba3b0e4c82665d7107873a43836f3c03e7f260dd89f3e";
     };
     meta = {
       description = "Manipulate IPv4/IPv6 netblocks in CIDR notation";
@@ -11394,10 +11325,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetHTTP = buildPerlPackage rec {
-    name = "Net-HTTP-6.17";
+    name = "Net-HTTP-6.18";
     src = fetchurl {
       url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz";
-      sha256 = "1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611";
+      sha256 = "7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c";
     };
     propagatedBuildInputs = [ URI ];
     __darwinAllowLocalNetworking = true;
@@ -11406,7 +11337,7 @@ let self = _self // overrides; _self = with self; {
       description = "Low-level HTTP connection (client)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    doCheck = false;
+    doCheck = false; /* wants network */
   };
 
   NetIDNEncode = buildPerlModule {
@@ -11776,10 +11707,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetOpenSSH = buildPerlPackage rec {
-    name = "Net-OpenSSH-0.77";
+    name = "Net-OpenSSH-0.78";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz";
-      sha256 = "16e965c6ed3dfe0f1288a6ba932d0e8d5c7846ce86de05c0dbd64259df2a2477";
+      sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c";
     };
     meta = {
       description = "Perl SSH client package implemented on top of OpenSSH";
@@ -11964,7 +11895,7 @@ let self = _self // overrides; _self = with self; {
      meta = {
        description = "Build an optimized subroutine parameter validator once, use it forever";
        license = with stdenv.lib.licenses; [ artistic2 ];
-       homepage = "http://metacpan.org/release/Params-ValidationCompiler";
+       homepage = https://metacpan.org/release/Params-ValidationCompiler;
      };
   };
 
@@ -12021,19 +11952,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ParseCPANMeta = buildPerlPackage {
-    name = "Parse-CPAN-Meta-1.4414";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4414.tar.gz;
-      sha256 = "cd7608154dfb72c9e110f012befe6b75d78448cb3e761716b60aa7545e16ca1b";
-    };
-    propagatedBuildInputs = [ CPANMetaYAML JSONPP ];
-    meta = {
-      homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta;
-      description = "Parse META.yml and META.json CPAN metadata files";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  ParseCPANMeta = CPANMeta;
 
   ParseDebControl = buildPerlPackage rec {
     name = "Parse-DebControl-2.005";
@@ -12145,10 +12064,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   PathTools = buildPerlPackage {
-    name = "PathTools-3.47";
+    name = "PathTools-3.74";
+    preConfigure = ''
+      substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd'
+    '';
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SM/SMUELLER/PathTools-3.47.tar.gz;
-      sha256 = "caa8d4b45372b8cb0ef0f6f696efa3a60b0fd394b115cad39a7fbb8f6bd38026";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.74.tar.gz;
+      sha256 = "25724cc54c59a3bfabadec95e72db292c98676bf3632497384e8dc6277936e11";
     };
   };
 
@@ -12222,13 +12144,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlCritic = buildPerlModule rec {
-    name = "Perl-Critic-1.130";
+    name = "Perl-Critic-1.132";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6";
+      sha256 = "bcf36e32830373cf1ee35abbe2e20336fbbcad5041c14aad6822ac947be092b1";
     };
     buildInputs = [ TestDeep ];
-    propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress FileHomeDir ModulePluggable PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ];
+    propagatedBuildInputs = [ BKeywords ConfigTiny FileHomeDir ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ];
     meta = {
       homepage = http://perlcritic.com;
       description = "Critique Perl source code for best-practices";
@@ -12265,16 +12187,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PerlIOviaQuotedPrint = buildPerlPackage {
-    name = "PerlIO-via-QuotedPrint-0.08";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHAY/PerlIO-via-QuotedPrint-0.08.tar.gz;
-      sha256 = "9b999a54134816de5217f7a8cac69fa5d89ab32dc589fcd5c9e84902f608cb9c";
-    };
-    meta = {
-      description = "PerlIO Layer for quoted-printable encoding";
-    };
-  };
+  PerlIOviaQuotedPrint = null; # part of Perl 5.22
 
   PerlIOviasymlink = buildPerlPackage {
     name = "PerlIO-via-symlink-0.05";
@@ -12498,10 +12411,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PlackMiddlewareMethodOverride = buildPerlPackage rec {
-    name = "Plack-Middleware-MethodOverride-0.15";
+    name = "Plack-Middleware-MethodOverride-0.20";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
-      sha256 = "2b4a6e67006f97a2b4cf7980900f6a8ababb1cf97d6597319f9897ada3c555bc";
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz;
+      sha256 = "dbfb5a2efb48bfeb01cb3ae1e1c677e155dc7bfe210c7e7f221bae3cb6aab5f1";
     };
     propagatedBuildInputs = [ Plack ];
     meta = {
@@ -12666,11 +12579,24 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PPIxQuoteLike = buildPerlModule rec {
+    name = "PPIx-QuoteLike-0.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.005.tar.gz;
+      sha256 = "13jvbjiqpm52kknjryzk3v4rnq70rzmx7w1bny9v5m5j6g029a4s";
+    };
+    propagatedBuildInputs = [ PPI ];
+    meta = {
+      description = "Parse Perl string literals and string-literal-like things.";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   PPIxRegexp = buildPerlModule rec {
-    name = "PPIx-Regexp-0.056";
+    name = "PPIx-Regexp-0.060";
     src = fetchurl {
       url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz";
-      sha256 = "37992de526a368d120506e8c6c0498266e4de81942658cf0af1db89b12302f15";
+      sha256 = "885e172bbfde54c240bdfd6013fc6e1b76bdd19c211901d2128f3873938ff377";
     };
     propagatedBuildInputs = [ PPI ];
     meta = {
@@ -12917,13 +12843,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PodEscapes = let version = "1.07"; in buildPerlPackage {
-    name = "Pod-Escapes-${version}";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NE/NEILB/Pod-Escapes-${version}.tar.gz";
-      sha256 = "0213lmbbw3vy50ahlp2lqmmnkwhrizyl1y87i4jgnla9k0kwixyv";
-    };
-  };
+  PodEscapes = null; # part of Perl 5.22
 
   PodEventual = buildPerlPackage {
     name = "Pod-Eventual-0.094001";
@@ -13077,7 +12997,6 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz;
       sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr";
     };
-    propagatedBuildInputs = [ TextTabsWrap ];
   };
 
   PodSpell = buildPerlPackage rec {
@@ -13102,6 +13021,20 @@ let self = _self // overrides; _self = with self; {
      };
   };
 
+  PodTidy = buildPerlModule rec {
+     name = "Pod-Tidy-0.10";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz;
+       sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8";
+     };
+     propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ];
+     buildInputs = [ TestCmd ];
+     meta = {
+       description = "a reformatting Pod Processor";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+     };
+  };
+
   PodUsage = buildPerlPackage {
     name = "Pod-Usage-1.69";
     src = fetchurl {
@@ -13130,6 +13063,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodWrap = buildPerlModule rec {
+     name = "Pod-Wrap-0.01";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz;
+       sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh";
+     };
+     meta = {
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+     };
+  };
+
   ProbePerl = buildPerlPackage rec {
     name = "Probe-Perl-0.03";
     src = fetchurl {
@@ -13165,7 +13109,6 @@ let self = _self // overrides; _self = with self; {
       description = "Collaborative, content-based spam filtering network agent";
       license = stdenv.lib.licenses.mit;
     };
-    doCheck = false;
   };
 
 
@@ -13248,6 +13191,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/J/JD/JDUNCAN/${name}.tar.gz";
       sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp";
     };
+    meta.broken = true;
   };
 
   RegexpGrammars = buildPerlModule rec {
@@ -13383,35 +13327,30 @@ let self = _self // overrides; _self = with self; {
       maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
-    doCheck = false;
+    doCheck = false; /* creates files in HOME */
   };
 
   RTClientREST = buildPerlPackage {
-    name = "RT-Client-REST-0.51";
+    name = "RT-Client-REST-0.52";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.51.tar.gz;
-      sha256 = "6a9df61c7f209f634613a8824393932d2faf2497b1c580ed8e5dd7794a36ea7d";
+      url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.52.tar.gz;
+      sha256 = "d058b8aa0db21aa1734ac50ae557297f603c2be60fa95a1d85278dbd11e19500";
     };
-    buildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies LWP ParamsValidate TestException ];
+    buildInputs = [ CGI HTTPServerSimple TestException ];
     meta = {
       description = "Talk to RT installation using REST protocol";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
+    propagatedBuildInputs = [ DateTimeFormatDateParse Error LWP ParamsValidate ];
   };
 
-  Safe = buildPerlPackage {
-    name = "Safe-2.35";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RG/RGARCIA/Safe-2.35.tar.gz;
-      sha256 = "e5d09756580287d7dc183ddaf26e4b2467e6f75b52ad73decdbe62d0750979b1";
-    };
-  };
+  Safe = null; # part of Perl 5.22
 
   SafeIsa = buildPerlPackage {
-    name = "Safe-Isa-1.000008";
+    name = "Safe-Isa-1.000010";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000008.tar.gz;
-      sha256 = "08r74hwxq5b3bibnbwjr9anybg15l3zqdgcirpw1xm2qpvcxgdkx";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz;
+      sha256 = "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
@@ -13474,17 +13413,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SearchDict = buildPerlPackage {
-    name = "Search-Dict-1.07";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Search-Dict-1.07.tar.gz;
-      sha256 = "b128cdae4712fe53e83a219ca65478a84c1b128a2c6c86933e47923cf19c6554";
-    };
-    meta = {
-      description = "Look - search for key in dictionary file";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  SearchDict = null; # part of Perl 5.22
 
   SelfLoader = buildPerlPackage {
     name = "SelfLoader-1.24";
@@ -13714,7 +13643,7 @@ let self = _self // overrides; _self = with self; {
      meta = {
        description = "Type constraints and coercions for Perl";
        license = with stdenv.lib.licenses; [ artistic2 ];
-       homepage = "http://metacpan.org/release/Specio";
+       homepage = https://metacpan.org/release/Specio;
      };
   };
 
@@ -13729,7 +13658,7 @@ let self = _self // overrides; _self = with self; {
      meta = {
        description = "Path::Tiny types and coercions for Specio";
        license = with stdenv.lib.licenses; [ asl20 ];
-       homepage = "http://metacpan.org/release/Specio-Library-Path-Tiny";
+       homepage = https://metacpan.org/release/Specio-Library-Path-Tiny;
      };
   };
 
@@ -13896,10 +13825,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   StatisticsDescriptive = buildPerlModule {
-    name = "Statistics-Descriptive-3.0612";
+    name = "Statistics-Descriptive-3.0613";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz;
-      sha256 = "772413148e5e00efb32f277c4254aa78b9112490a896208dcd0025813afdbf7a";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0613.tar.gz;
+      sha256 = "ee053899c06bb042c7ff3a0d32feabe457ed0a2c893355633288436a49707ead";
     };
     meta = {
       #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement
@@ -13927,10 +13856,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Storable = buildPerlPackage {
-    name = "Storable-2.51";
+    name = "Storable-3.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AM/AMS/Storable-2.51.tar.gz;
-      sha256 = "a566b792112bbba21131ec1d7a2bf78170c648484895283ae53c7f0c3dc2f0be";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.11.tar.gz;
+      sha256 = "b2dac116d2f5adaf289e9a8a9bbac35cc2c24a9d2221fea9b6578a33b8ec7d28";
     };
     meta = {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -13944,17 +13873,17 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv";
     };
     meta = {
-      homepage = http://plackperl.org;
+      homepage = https://plackperl.org;
       description = "Temporary buffer to save bytes";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
   strictures = buildPerlPackage rec {
-    name = "strictures-2.000003";
+    name = "strictures-2.000005";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "08mgvf1d2651gsg3jgjfs13878ndqa4ji8vfsda9f7jjd84ymy17";
+      url = mirror://cpan/authors/id/E/ET/ETHER/strictures-2.000005.tar.gz;
+      sha256 = "16fxhsmn2v8a1fxd02243zl7vckmvwzwwys1pjp9rw68hagxn2wn";
     };
     meta = {
       homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git;
@@ -14160,6 +14089,7 @@ let self = _self // overrides; _self = with self; {
     };
 
     buildInputs = [ ArchiveZip_1_53 pkgs.file ];
+    meta.broken = true;
   };
 
 
@@ -14179,6 +14109,7 @@ let self = _self // overrides; _self = with self; {
       license = licenses.gpl3;
       platforms = platforms.all;
       maintainers = with maintainers; [ pSub ];
+      meta.broken = true;
     };
   };
 
@@ -14239,20 +14170,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SubExporterUtil = let version = "0.987"; in buildPerlPackage {
-    name = "Sub-Exporter-Util-${version}";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-${version}.tar.gz";
-      sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l";
-    };
-    propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ];
-    meta = {
-      inherit version;
-      homepage = https://github.com/rjbs/sub-exporter;
-      description = "A sophisticated exporter for custom-built routines";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  SubExporterUtil = SubExporter;
 
   SubIdentify = buildPerlPackage rec {
     name = "Sub-Identify-0.14";
@@ -14319,10 +14237,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SubQuote = buildPerlPackage rec {
-    name = "Sub-Quote-2.005000";
+    name = "Sub-Quote-2.005001";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "44b145111bee7b0001818e77f7ce587153232dbc97351f4c5ed34522372b64ff";
+      sha256 = "d6ab4f0775def015367a05e02024b403f991b2be11d774f3d235fe7e9bdbba07";
     };
     buildInputs = [ TestFatal ];
     meta = {
@@ -14430,6 +14348,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  SysMemInfo = buildPerlPackage rec {
+    name = "Sys-MemInfo-0.99";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SC/SCRESTO/${name}.tar.gz";
+      sha256 = "0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b";
+    };
+    meta = {
+      description = "Memory informations";
+      maintainers = [ maintainers.pSub ];
+      license = with stdenv.lib.licenses; [ gpl2Plus ];
+    };
+  };
+
   SysCPU = buildPerlPackage rec {
     name = "Sys-CPU-0.61";
     src = fetchurl {
@@ -14477,12 +14408,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   SysVirt = buildPerlModule rec {
-    version = "4.4.0";
+    version = "4.5.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
       rev = "v${version}";
-      sha256 = "1swlbis7mk1dk36badyibi3s467vhrjii0hhvhbsn2n0l6wa49x6";
+      sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
@@ -14517,7 +14448,7 @@ let self = _self // overrides; _self = with self; {
       description = "Everything you need to follow the Catalyst Tutorial";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    doCheck = false;
+    doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */
   };
 
   TaskFreecellSolverTesting = buildPerlModule rec {
@@ -14560,10 +14491,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TaskWeaken = buildPerlPackage {
-    name = "Task-Weaken-1.05";
+    name = "Task-Weaken-1.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.05.tar.gz;
-      sha256 = "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz;
+      sha256 = "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3";
     };
     meta = {
       description = "Ensure that a platform has weaken support";
@@ -14728,12 +14659,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   TermProgressBar = buildPerlPackage rec {
-    name = "Term-ProgressBar-2.21";
+    name = "Term-ProgressBar-2.22";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz";
-      sha256 = "66994f1a6ca94d8d92e3efac406142fb0d05033360c0acce2599862db9c30e44";
+      sha256 = "2642ecca5b0b038c14812bcad3a9611ff7911dc59c9104d220797f837a880c49";
     };
-    buildInputs = [ CaptureTiny TestException ];
+    buildInputs = [ CaptureTiny TestException TestWarnings ];
     propagatedBuildInputs = [ ClassMethodMaker TermReadKey ];
     meta = {
       description = "Provide a progress meter on a standard terminal";
@@ -14915,16 +14846,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Test = buildPerlPackage {
-    name = "Test-1.26";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JE/JESSE/Test-1.26.tar.gz;
-      sha256 = "f7701bd28e05e7f82fe9a181bbab38f53fa6aeae48d2a810da74d1b981d4f392";
-    };
-    meta = {
-      description = "Provides a simple framework for writing test scripts";
-    };
-  };
+  Test = null; # part of Perl 5.22
 
   Test2PluginNoWarnings = buildPerlPackage rec {
      name = "Test2-Plugin-NoWarnings-0.06";
@@ -14937,15 +14859,15 @@ let self = _self // overrides; _self = with self; {
      meta = {
        description = "Fail if tests warn";
        license = with stdenv.lib.licenses; [ artistic2 ];
-       homepage = "http://metacpan.org/release/Test2-Plugin-NoWarnings";
+       homepage = https://metacpan.org/release/Test2-Plugin-NoWarnings;
      };
   };
 
   Test2Suite = buildPerlPackage rec {
-    name = "Test2-Suite-0.000111";
+    name = "Test2-Suite-0.000114";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
-      sha256 = "4ca28df74c7c2f37fe63897c5041aee92fba4530544d0afc371e7d14a9b4d0ad";
+      sha256 = "439b37d63ffcee7876bc43b4830d4e40c454f02646faff0131e7d36d46fa8c45";
     };
     propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ];
     meta = {
@@ -15008,10 +14930,10 @@ let self = _self // overrides; _self = with self; {
 
 
   TestBase = buildPerlPackage rec {
-    name = "Test-Base-0.88";
+    name = "Test-Base-0.89";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj";
+      sha256 = "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517";
     };
     propagatedBuildInputs = [ Spiffy ];
     buildInputs = [ AlgorithmDiff TextDiff ];
@@ -15073,6 +14995,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestCmd = buildPerlPackage rec {
+     name = "Test-Cmd-1.09";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz;
+       sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg";
+     };
+       doCheck = false; /* test fails */
+     meta = {
+       description = "Perl module for portable testing of commands and scripts";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+       homepage = "https://github.com/neilb/Test-Cmd";
+     };
+  };
+
   TestCommand = buildPerlModule {
     name = "Test-Command-0.11";
     src = fetchurl {
@@ -15139,10 +15075,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestDeep = buildPerlPackage {
-    name = "Test-Deep-1.127";
+    name = "Test-Deep-1.128";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.127.tar.gz;
-      sha256 = "0s3jmyvkgk48piw46sxppx11nfsbzhmisb0y513iza8vqiczr35p";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz;
+      sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
@@ -15278,7 +15214,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad";
     };
     buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir ScopeGuard ];
+    propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir PathTiny ScopeGuard ];
     meta = {
       homepage = https://github.com/kentfredric/Test-File-ShareDir;
       description = "Create a Fake ShareDir for your modules for testing";
@@ -15454,16 +15390,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestMockModule = buildPerlModule {
-    name = "Test-MockModule-0.13";
+    name = "Test-MockModule-0.15";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz;
-      sha256 = "0lwh6fvnc16r6d74vvh5h4b5a1spcslpjb3mcqbv23k01lm78wvl";
+      url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz;
+      sha256 = "0nx3nz7yvgcw9vw646520hh1jb3kz6sspsfqa69v3vczdkfgx5qn";
     };
     propagatedBuildInputs = [ SUPER ];
     meta = {
       maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
+    buildInputs = [ TestWarnings ];
   };
 
   SUPER = buildPerlModule rec {
@@ -15497,10 +15434,10 @@ let self = _self // overrides; _self = with self; {
   TestMoose = Moose;
 
   TestMockTime = buildPerlPackage rec {
-    name = "Test-MockTime-0.16";
+    name = "Test-MockTime-0.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz";
-      sha256 = "1vxv7y7jn71m8v8ag0z0dd0zadhxp264dppb40islcjl4g7r6x08";
+      sha256 = "1y820qsq7yf7r6smy5c6f0mpf2cis2q24vwmpim1svv0n8cf2qrk";
     };
   };
 
@@ -15531,6 +15468,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestMoreUTF8 = buildPerlPackage rec {
+     name = "Test-More-UTF8-0.05";
+     src = fetchurl {
+       url = mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz;
+       sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr";
+     };
+     meta = {
+       description = "Enhancing Test::More for UTF8-based projects";
+       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+     };
+  };
+
   TestMore = TestSimple;
 
   TestMost = buildPerlPackage {
@@ -15560,10 +15509,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestNoTabs = buildPerlPackage {
-    name = "Test-NoTabs-2.00";
+    name = "Test-NoTabs-2.02";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.00.tar.gz;
-      sha256 = "127kpl1va267qar2ia4c22xb96jby2jqnda3sj5pjgmxg8si26cg";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz;
+      sha256 = "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv";
     };
     meta = {
       description = "Check the presence of tabs in your project";
@@ -15604,10 +15553,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestPAUSEPermissions = buildPerlPackage rec {
-     name = "Test-PAUSE-Permissions-0.06";
+     name = "Test-PAUSE-Permissions-0.07";
      src = fetchurl {
-       url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-PAUSE-Permissions-0.06.tar.gz;
-       sha256 = "1rspdxwfr1mxjrpcsd4asd5q1qpmiyw0sm7g008yy1gsz6i2yl88";
+       url = mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz;
+       sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m";
      };
      propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ];
      buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ];
@@ -15639,10 +15588,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestPod = buildPerlPackage rec {
-    name = "Test-Pod-1.51";
+    name = "Test-Pod-1.52";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "1yvy5mc4j3s2h4aizryvark2nm58g2c6zhw9mlx9wmsavz7d78f1";
+      sha256 = "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30";
     };
     meta = {
       homepage = http://search.cpan.org/dist/Test-Pod/;
@@ -15906,10 +15855,10 @@ let self = _self // overrides; _self = with self; {
   TestSimple = null;
 
   TestSimple13 = buildPerlPackage rec {
-    name = "Test-Simple-1.302135";
+    name = "Test-Simple-1.302136";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302135.tar.gz;
-      sha256 = "889b59d5fb5955b5d15dbef1020aa2e9a3ccafacc8717c16a939d7cfd619ab70";
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302136.tar.gz;
+      sha256 = "8d9a5c53b0309257af58b55177045f7d94e095e1c1416cb1e11aae4c1cdad446";
     };
     meta = {
       description = "Basic utilities for writing tests";
@@ -15967,6 +15916,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestTempDirTiny = buildPerlPackage rec {
+    name = "Test-TempDir-Tiny-0.017";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.017.tar.gz;
+      sha256 = "0y2km1lbvp4hhsah2yc8vacp705zi1ijflsf7lkvqh640q6p5m55";
+    };
+    meta = {
+      description = "Temporary directories that stick around when tests fail";
+      license = with stdenv.lib.licenses; [ asl20 ];
+      homepage = "https://github.com/dagolden/Test-TempDir-Tiny";
+    };
+  };
+
   TestTCP = buildPerlPackage rec {
     name = "Test-TCP-2.19";
     src = fetchurl {
@@ -15980,13 +15942,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestSharedFork ];
   };
 
-  TestTester = buildPerlPackage {
-    name = "Test-Tester-0.109";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.109.tar.gz;
-      sha256 = "0m9n28z09kq455r5nydj1bnr85lvmbfpcbjdkjfbpmfb5xgciiyk";
-    };
-  };
+  TestTester = TestSimple;
 
   TestTime = buildPerlPackage rec {
     name = "Test-Time-0.05";
@@ -16039,24 +15995,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Testuseok = buildPerlPackage {
-    name = "Test-use-ok-0.11";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.11.tar.gz;
-      sha256 = "8410438a2acf127bffcf1ab92205b747a615b487e80a48e8c3d0bb9fa0dbb2a8";
-    };
-    meta = {
-      homepage = https://github.com/audreyt/Test-use-ok/tree;
-      description = "Alternative to Test::More::use_ok";
-      license = "unrestricted";
-    };
-  };
+  Testuseok = TestSimple;
 
   TestWarn = buildPerlPackage {
-    name = "Test-Warn-0.32";
+    name = "Test-Warn-0.35";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz;
-      sha256 = "1lkkpx8gyfsxfkys1psp990xyy1zxf8rsqd44az57x4y3zkidi9g";
+      url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.35.tar.gz;
+      sha256 = "1ialnc0q5277p7v01mvk7nljw8qx5qr5wiqzhmvbz8y87jb11r14";
     };
     propagatedBuildInputs = [ SubUplevel ];
     meta = {
@@ -16096,10 +16041,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestWWWMechanize = buildPerlPackage {
-    name = "Test-WWW-Mechanize-1.48";
+    name = "Test-WWW-Mechanize-1.50";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.48.tar.gz;
-      sha256 = "1d11fx9155d5v17d5w7q3kj37b01l8yj2yb0g6b0z1vh938rrlcr";
+      url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.50.tar.gz;
+      sha256 = "097pl87vdbxbb56vawzvs6ikrlb8nz3dx223kjjbdn3jlli3jjhg";
     };
     buildInputs = [ TestLongString ];
     propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ];
@@ -16154,10 +16099,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestXPath = buildPerlModule {
-    name = "Test-XPath-0.16";
+    name = "Test-XPath-0.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz;
-      sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi";
+      url = mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz;
+      sha256 = "1wy0488yg15kahfafnlmlhppxik7d0z00wxwj9fszrsq2h6crz6y";
     };
     propagatedBuildInputs = [ XMLLibXML ];
     meta = {
@@ -16167,26 +16112,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestYAML = buildPerlPackage rec {
-    name = "Test-YAML-1.06";
+    name = "Test-YAML-1.07";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "0hxrfs7p9hqkhvv5nhk2hd3kh32smwng4nz47b8xf4iw2q1n2dr7";
+      url = mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz;
+      sha256 = "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z";
     };
     buildInputs = [ TestBase ];
   };
 
-  TextAbbrev = buildPerlPackage {
-    name = "Text-Abbrev-1.02";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Text-Abbrev-1.02.tar.gz;
-      sha256 = "9cfb8bea2d5806b72fa1a0e1a3367ce662262eaa2701c6a3143a2a8076917433";
-    };
-    meta = {
-      homepage = http://search.cpan.org/dist/Text-Abbrev;
-      description = "Abbrev - create an abbreviation table from a list";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  TextAbbrev = null; # part of Perl 5.22
 
   TextAligner = buildPerlModule rec {
     name = "Text-Aligner-0.13";
@@ -16331,13 +16265,12 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TextFormat = buildPerlPackage rec {
-    name = "Text-Format-0.60";
+  TextFormat = buildPerlModule rec {
+    name = "Text-Format-0.61";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "664f313570604624ff9e1fc9b26b6d04e06897b3e4eac83089fc0905a692a2b8";
+      sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b";
     };
-    buildInputs = [ ModuleBuild ];
     meta = {
       homepage = http://www.shlomifish.org/open-source/projects/Text-Format/;
       description = "Format text";
@@ -16385,10 +16318,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestManifest = buildPerlPackage {
-    name = "Test-Manifest-2.02";
+    name = "Test-Manifest-2.021";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz;
-      sha256 = "064783ceaf7dd569a5724d40900a3f9d92168ee4c613f7a3cb99a99aa8283396";
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz;
+      sha256 = "a47aaad71c580e16e6e63d8c037cdddcd919876754beb2c95d9a88682dd332d9";
     };
     meta = {
       description = "Interact with a t/test_manifest file";
@@ -16534,15 +16467,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextSimpleTable = buildPerlPackage {
-    name = "Text-SimpleTable-2.04";
+    name = "Text-SimpleTable-2.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.04.tar.gz;
-      sha256 = "14sjmdcy7s73sk740g3ccmzmwhwd52x5ay3bjmibjlql1cag70ld";
+      url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.05.tar.gz;
+      sha256 = "1akcv3iq4y6mjc88p0j9yvv6g0g5cnc9nvzxnmsswnx5si7v5am5";
     };
     meta = {
       description = "Simple eyecandy ASCII tables";
       license = stdenv.lib.licenses.artistic2;
     };
+    propagatedBuildInputs = [ UnicodeLineBreak ];
   };
 
   TextSoundex = buildPerlPackage {
@@ -16554,10 +16488,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextSprintfNamed = buildPerlModule rec {
-    name = "Text-Sprintf-Named-0.0402";
+    name = "Text-Sprintf-Named-0.0403";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "951317fce8fa5dd08190ba760182bc71f2b4346fa21df55c76155e6353e2864f";
+      sha256 = "8a2f6e52998d1d8adb6ce0f5be85265be2e51ce06cf8ae23b3a0f059ba21b888";
     };
     buildInputs = [ TestWarn ];
     meta = {
@@ -16581,16 +16515,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TextTabsWrap = buildPerlPackage {
-    name = "Text-Tabs+Wrap-2013.0523";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz;
-      sha256 = "b9cb056fffb737b9c12862099b952bf4ab4b1f599fd34935356ae57dab6f655f";
-    };
-    meta = {
-      description = "Expand tabs and do simple line wrapping";
-    };
-  };
+  TextTabsWrap = null; # part of Perl 5.22
 
   TextTabularDisplay = buildPerlPackage rec {
     name = "Text-TabularDisplay-1.38";
@@ -16601,16 +16526,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextTemplate = buildPerlPackage {
-    name = "Text-Template-1.52";
+    name = "Text-Template-1.53";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.52.tar.gz;
-      sha256 = "85da7a5e7eecf1871cda8bf3ce7b8ad0b5f75c6c5791f43a7d94373406859b6c";
+      url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz;
+      sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4";
     };
     meta = {
       description = "Unknown";
       license = "unknown";
     };
-    buildInputs = [ TestWarnings ];
+    buildInputs = [ TestMoreUTF8 TestWarnings ];
   };
 
   TestTrap = buildPerlModule rec {
@@ -16643,10 +16568,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestVersion = buildPerlPackage rec {
-    name = "Test-Version-2.07";
+    name = "Test-Version-2.09";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
-      sha256 = "eae8b758395d6b23d4ce3109b055663379b9970fb8f81e5803d145dbc5ccdbac";
+      sha256 = "9ce1dd2897a5f30e1b7f8966ec66f57d8d8f280f605f28c7ca221fa79aca38e0";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs = [ FileFindRulePerl ];
@@ -16894,6 +16819,7 @@ let self = _self // overrides; _self = with self; {
       description = "Ordered hashes for Perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
+    doCheck = false; /* test fails on some machines */
   };
 
   TieRefHash = buildPerlPackage {
@@ -16972,18 +16898,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   TimeHiRes = buildPerlPackage rec {
-    name = "Time-HiRes-1.9753";
+    name = "Time-HiRes-1.9758";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9753.tar.gz;
-      sha256 = "05a9xhn8y0f679kg8n0n3ng4mk6sd7isihqbbhfh29nxkkwxbgqg";
+      url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9758.tar.gz;
+      sha256 = "07jbydcdzpjm6i4nidci0rlklx4kla210fsl6zishw0yq5di9yjv";
     };
   };
 
   TimeLocal = buildPerlPackage {
-    name = "Time-Local-1.25";
+    name = "Time-Local-1.28";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.25.tar.gz;
-      sha256 = "1ae9c51d777ac44a3ebc154dc625ba24d7c0cde6a8b6dba87b46d0777889fef2";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.28.tar.gz;
+      sha256 = "9278b9e5cc99dcbb0fd27a43e914828b59685601edae082889b5ee7266afe10e";
     };
     meta = {
       description = "Efficiently compute time from local and GMT time";
@@ -17086,10 +17012,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TypeTiny = buildPerlPackage {
-    name = "Type-Tiny-1.002001";
+    name = "Type-Tiny-1.002002";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002001.tar.gz;
-      sha256 = "93c9eeaaf23016625126794af483bc626a149f7226f9a6ec1081ef896acc13dd";
+      url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002002.tar.gz;
+      sha256 = "a85b0c8f99b5c9b5558f0bcc8893b44299fcccf3c264ff924940d09d91d8882c";
     };
     propagatedBuildInputs = [ ExporterTiny ];
     meta = {
@@ -17396,10 +17322,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   version = buildPerlPackage rec {
-    name = "version-0.9918";
+    name = "version-0.9924";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz";
-      sha256 = "54175c7ead4e2259c2fb2b83440b821e4287842067227e48fb899b5cae52237b";
+      sha256 = "81e4485ff3faf9b7813584d57b557f4b34e73b6c2eb696394f6deefacf5ca65b";
     };
     meta = {
       description = "Structured version objects";
@@ -17427,12 +17353,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   VMEC2 = buildPerlModule rec {
-    name = "VM-EC2-1.25";
+    name = "VM-EC2-1.28";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "cc8002965e3a4919527a85a84100cfc3703165a449ade29e95f4e31889fbd9ad";
+      sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd";
     };
-    propagatedBuildInputs = [ AnyEventHTTP JSON StringApprox XMLSimple ];
+    propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ];
     meta = {
       description = "Perl interface to Amazon EC2, Virtual Private Cloud, Elastic Load Balancing, Autoscaling, and Relational Database services";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -18005,13 +17931,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   YAML = buildPerlPackage rec {
-    name = "YAML-1.24";
+    name = "YAML-1.26";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.24.tar.gz;
-      sha256 = "1dpzgnjbd8yvf94vf45cmyj5bc6vrm6bchhx9xqwxqd5f9d093dm";
+      url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.26.tar.gz;
+      sha256 = "1g3zjm145zsackgnzkkb1chd15xns84jccm6knpwbysa9karjbzs";
     };
 
-    buildInputs = [ TestBase TestYAML ];
+    buildInputs = [ TestBase TestDeep TestYAML ];
 
     meta = {
       homepage = https://github.com/ingydotnet/yaml-pm/tree;
@@ -18042,12 +17968,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   YAMLLibYAML = buildPerlPackage rec {
-    name = "YAML-LibYAML-0.69";
+    name = "YAML-LibYAML-0.70";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz";
-      sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33";
+      sha256 = "1lqgal20v79ij68jhrpg57vxsv4sdahgmqdv88vg0388y776n95j";
     };
-    doCheck = false;
   };
 
   WebServiceLinode = buildPerlModule rec {
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 0aa78e3178d98..7861b2a231d08 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -12,14 +12,14 @@ let
   apcu = if isPhp7 then apcu51 else apcu40;
 
   apcu40 = assert !isPhp7; buildPecl {
-    name = "apcu-4.0.7";
-    sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp";
+    name = "apcu-4.0.11";
+    sha256 = "002d1gklkf0z170wkbhmm2z1p9p5ghhq3q1r9k54fq1sq4p30ks5";
     buildInputs = [ pkgs.pcre ];
   };
 
   apcu51 = assert isPhp7; buildPecl {
-    name = "apcu-5.1.8";
-    sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce";
+    name = "apcu-5.1.11";
+    sha256 = "0nz9m3fbxgyc2ij63yqmxm06a1f51g8rkxk85f85ziqdin66q2f1";
     buildInputs = [ pkgs.pcre ];
     doCheck = true;
     checkTarget = "test";
@@ -107,8 +107,8 @@ let
   };
 
   imagick = buildPecl {
-    name = "imagick-3.4.3RC1";
-    sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh";
+    name = "imagick-3.4.3";
+    sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z";
     configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.pcre ];
@@ -328,11 +328,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.6.3";
+    version = "1.6.5";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "1dna9ng77nw002l7hq60b6vz0f1snmnsxj1l7cg4f877msxppjsj";
+      sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7";
     };
 
     unpackPhase = ":";
@@ -383,11 +383,11 @@ let
 
   php-cs-fixer = pkgs.stdenv.mkDerivation rec {
     name = "php-cs-fixer-${version}";
-    version = "2.12.0";
+    version = "2.12.1";
 
     src = pkgs.fetchurl {
       url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-      sha256 = "1vz3s0hbqp1rzgrqfnr0jj5qds1jnw7kyhpl4qjlpd4s40x0n4b1";
+      sha256 = "1ifwb30wddp5blqnrkdmf0x11dk7nbxj4z2v5403fn7wfhgvibd2";
     };
 
     phases = [ "installPhase" ];
@@ -494,4 +494,30 @@ let
       maintainers = with maintainers; [ cmcdragonkai etu ];
     };
   };
+
+  psysh = pkgs.stdenv.mkDerivation rec {
+    name = "psysh-${version}";
+    version = "0.9.6";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
+      sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6";
+    };
+
+    phases = [ "installPhase" ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+
+    installPhase = ''
+      mkdir -p $out/bin
+      tar -xzf $src -C $out/bin
+      wrapProgram $out/bin/psysh
+    '';
+
+    meta = with pkgs.lib; {
+      description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP.";
+      license = licenses.mit;
+      homepage = https://psysh.org/;
+      maintainers = with maintainers; [ caugner ];
+    };
+  };
 }; in self
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f62f1e7c17f1..5eb33fa96d960 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26,6 +26,7 @@ let
   isPy34 = python.pythonVersion == "3.4";
   isPy35 = python.pythonVersion == "3.5";
   isPy36 = python.pythonVersion == "3.6";
+  isPy37 = python.pythonVersion == "3.7";
   isPyPy = python.executable == "pypy";
   isPy3k = strings.substring 0 1 python.pythonVersion == "3";
 
@@ -132,7 +133,7 @@ let
 
 in {
 
-  inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication;
+  inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication;
   inherit fetchPypi callPackage;
   inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
   inherit toPythonModule toPythonApplication;
@@ -149,7 +150,6 @@ in {
   setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { });
 
   vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit {
-    pythonPackages = self;
     boost = pkgs.boost160;
   };
 
@@ -195,16 +195,22 @@ in {
     inherit (pkgs) augeas;
   };
 
+  authres = callPackage ../development/python-modules/authres { };
+
   autograd = callPackage ../development/python-modules/autograd { };
 
   automat = callPackage ../development/python-modules/automat { };
 
+  aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { };
+
   aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };
 
   # packages defined elsewhere
 
   amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
 
+  ansiconv = callPackage ../development/python-modules/ansiconv { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   bap = callPackage ../development/python-modules/bap {
@@ -229,12 +235,16 @@ in {
 
   cdecimal = callPackage ../development/python-modules/cdecimal { };
 
+  clustershell = callPackage ../development/python-modules/clustershell { };
+
   dendropy = callPackage ../development/python-modules/dendropy { };
 
   dbf = callPackage ../development/python-modules/dbf { };
 
   dbfread = callPackage ../development/python-modules/dbfread { };
 
+  deap = callPackage ../development/python-modules/deap { };
+
   dkimpy = callPackage ../development/python-modules/dkimpy { };
 
   diff_cover = callPackage ../development/python-modules/diff_cover { };
@@ -255,8 +265,12 @@ in {
 
   distorm3 = callPackage ../development/python-modules/distorm3 { };
 
+  dogtail = callPackage ../development/python-modules/dogtail { };
+
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  fido2 = callPackage ../development/python-modules/fido2 {  };
+
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };
@@ -285,7 +299,9 @@ in {
 
   logster = callPackage ../development/python-modules/logster { };
 
-  mail-parser = callPackage ../development/python-modules/mail-parser {  };
+  mail-parser = callPackage ../development/python-modules/mail-parser { };
+
+  monty = callPackage ../development/python-modules/monty { };
 
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
@@ -315,8 +331,12 @@ in {
 
   outcome = callPackage ../development/python-modules/outcome {};
 
+  pdf2image = callPackage ../development/python-modules/pdf2image { };
+
   pdfminer = callPackage ../development/python-modules/pdfminer_six { };
 
+  pdfx = callPackage ../development/python-modules/pdfx { };
+
   plantuml = callPackage ../tools/misc/plantuml { };
 
   Pmw = callPackage ../development/python-modules/Pmw { };
@@ -353,7 +373,7 @@ in {
 
   pydocstyle = callPackage ../development/python-modules/pydocstyle { };
 
-  pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {});
+  pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {}));
 
   py3exiv2 = callPackage ../development/python-modules/py3exiv2 { };
 
@@ -390,6 +410,8 @@ in {
     inherit (pkgs.llvmPackages) openmp;
   };
 
+  pynisher = callPackage ../development/python-modules/pynisher { };
+
   pyparser = callPackage ../development/python-modules/pyparser { };
 
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
@@ -418,9 +440,13 @@ in {
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 
-  python-openid = callPackage (if isPy3k
-    then ../development/python-modules/python3-openid
-    else ../development/python-modules/python-openid) { };
+  python-hosts = callPackage ../development/python-modules/python-hosts { };
+
+  python3-openid = callPackage ../development/python-modules/python3-openid { };
+
+  python-periphery = callPackage ../development/python-modules/python-periphery { };
+
+  python-prctl = callPackage ../development/python-modules/python-prctl { };
 
   python-sql = callPackage ../development/python-modules/python-sql { };
 
@@ -446,12 +472,18 @@ in {
 
   salmon-mail = callPackage ../development/python-modules/salmon-mail { };
 
+  seekpath = callPackage ../development/python-modules/seekpath { };
+
   serversyncstorage = callPackage ../development/python-modules/serversyncstorage {};
 
   simpleeval = callPackage ../development/python-modules/simpleeval { };
 
   sip = callPackage ../development/python-modules/sip { };
 
+  sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };
+
+  spglib = callPackage ../development/python-modules/spglib { };
+
   supervise_api = callPackage ../development/python-modules/supervise_api { };
 
   syncserver = callPackage ../development/python-modules/syncserver {};
@@ -1225,9 +1257,9 @@ in {
   cypari2 = callPackage ../development/python-modules/cypari2 { };
 
   dlib = buildPythonPackage rec {
-    inherit (pkgs.dlib) name src nativeBuildInputs meta;
+    inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs;
 
-    buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ];
+    patches = [ ../development/python-modules/dlib/build-cores.patch ];
 
     checkInputs = with self; [ pytest ];
   };
@@ -1552,6 +1584,8 @@ in {
 
   cherrypy = callPackage ../development/python-modules/cherrypy {};
 
+  cftime = callPackage ../development/python-modules/cftime {};
+
   cjson = callPackage ../development/python-modules/cjson { };
 
   cld2-cffi = callPackage ../development/python-modules/cld2-cffi {};
@@ -1911,9 +1945,9 @@ in {
     };
   };
 
-  pytest = self.pytest_35;
+  pytest = self.pytest_36;
 
-  pytest_35 = callPackage ../development/python-modules/pytest {
+  pytest_36 = callPackage ../development/python-modules/pytest {
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle
       doCheck = false;
@@ -1922,7 +1956,7 @@ in {
   };
 
   # Needed for celery
-  pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec {
+  pytest_32 = self.pytest_36.overrideAttrs( oldAttrs: rec {
     version = "3.2.5";
     src = oldAttrs.src.override {
       inherit version;
@@ -2015,7 +2049,7 @@ in {
     meta = {
       description = "Complete yet simple CSS parser for Python";
       license = licenses.bsd3;
-      homepage = http://pythonhosted.org/tinycss/;
+      homepage = https://pythonhosted.org/tinycss/;
     };
   };
 
@@ -2104,9 +2138,6 @@ in {
   # Alias that we should deprecate
   dateutil = self.python-dateutil;
 
-  # Buildbot 0.8.7p1 needs dateutil==1.5
-  dateutil_1_5 = callPackage ../development/python-modules/dateutil/1_5.nix { };
-
   decorator = callPackage ../development/python-modules/decorator { };
 
   deform = callPackage ../development/python-modules/deform { };
@@ -2272,7 +2303,7 @@ in {
     '';
 
     meta = {
-      homepage = "http://editorconfig.org";
+      homepage = https://editorconfig.org;
       description = "EditorConfig File Locator and Interpreter for Python";
       license = stdenv.lib.licenses.psfl;
     };
@@ -2386,22 +2417,7 @@ in {
     };
   };
 
-  events = buildPythonPackage rec {
-    name = "Events-${version}";
-    version = "0.2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/E/Events/${name}.tar.gz";
-      sha256 = "0rymyfvarjdi2fdhfz2iqmp4wgd2n2sm0p2mx44c3spm7ylnqzqa";
-    };
-
-    meta = {
-      homepage = "http://events.readthedocs.org";
-      description = "Bringing the elegance of C# EventHanlder to Python";
-      license = licenses.bsd3;
-    };
-  };
-
+  events = callPackage ../development/python-modules/events { };
 
   eyeD3 = buildPythonPackage rec {
     version = "0.7.8";
@@ -2593,6 +2609,8 @@ in {
     };
   };
 
+  python-forecastio = callPackage ../development/python-modules/python-forecastio { };
+
   fpdf = callPackage ../development/python-modules/fpdf { };
 
   fpylll = callPackage ../development/python-modules/fpylll { };
@@ -2662,7 +2680,7 @@ in {
     };
 
     meta = {
-      homepage = http://docs.python.org/3/library/functools.html;
+      homepage = https://docs.python.org/3/library/functools.html;
     };
   };
 
@@ -3731,6 +3749,8 @@ in {
   # These used to be here but were moved to all-packages, but I'll leave them around for a while.
   pants = pkgs.pants;
 
+  paperspace = callPackage ../development/python-modules/paperspace { };
+
   paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { };
 
   papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { };
@@ -3844,6 +3864,8 @@ in {
 
   phpserialize = callPackage ../development/python-modules/phpserialize { };
 
+  plaid-python = callPackage ../development/python-modules/plaid-python { };
+
   plaster = callPackage ../development/python-modules/plaster {};
 
   plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {};
@@ -5497,6 +5519,8 @@ in {
     };
   };
 
+  flask-caching = callPackage ../development/python-modules/flask-caching { };
+
   flask-common = callPackage ../development/python-modules/flask-common { };
 
   flask-compress = callPackage ../development/python-modules/flask-compress { };
@@ -6178,6 +6202,8 @@ in {
 
   googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { };
 
+  google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { };
+
   google_api_core = callPackage ../development/python-modules/google_api_core { };
 
   google_api_python_client = callPackage ../development/python-modules/google-api-python-client { };
@@ -6214,36 +6240,11 @@ in {
 
   google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { };
 
-  google_gax = callPackage ../development/python-modules/google_gax { };
-
   gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
 
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
-  greenlet = buildPythonPackage rec {
-    name = "greenlet-${version}";
-    version = "0.4.10";
-    disabled = isPyPy;  # builtin for pypy
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/greenlet/${name}.tar.gz";
-      sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62";
-    };
-
-    propagatedBuildInputs = with self; [ six ];
-
-    # see https://github.com/python-greenlet/greenlet/issues/85
-    preCheck = ''
-      rm tests/test_leaks.py
-    '';
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/greenlet;
-      description = "Module for lightweight in-process concurrent programming";
-      license     = licenses.lgpl2;
-      platforms   = platforms.all;
-    };
-  };
+  greenlet = callPackage ../development/python-modules/greenlet { };
 
   grib-api = disabledIf (!isPy27) (toPythonModule
     (pkgs.grib-api.override {
@@ -6253,6 +6254,8 @@ in {
 
   grpcio = callPackage ../development/python-modules/grpcio { };
 
+  grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
+
   gspread = buildPythonPackage rec {
     version = "0.2.3";
     name = "gspread-${version}";
@@ -6301,9 +6304,6 @@ in {
 
   guessit = callPackage ../development/python-modules/guessit { };
 
-  # used by flexget
-  guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { };
-
   rebulk = callPackage ../development/python-modules/rebulk { };
 
   gunicorn = callPackage ../development/python-modules/gunicorn { };
@@ -6909,41 +6909,17 @@ in {
 
   keyring = callPackage ../development/python-modules/keyring { };
 
-  keyutils = callPackage ../development/python-modules/keyutils { };
+  keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; };
 
   kiwisolver = callPackage ../development/python-modules/kiwisolver { };
 
+  klaus = callPackage ../development/python-modules/klaus {};
+
   klein = callPackage ../development/python-modules/klein { };
 
   koji = callPackage ../development/python-modules/koji { };
 
-  kombu = buildPythonPackage rec {
-    name = "kombu-${version}";
-    version = "4.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/kombu/${name}.tar.gz";
-      sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
-    };
-
-    # Backport fix for python-3.6 from master (see issue https://github.com/celery/kombu/issues/675)
-    # TODO remove at next update
-    patches = [ (pkgs.fetchpatch {
-      url = "https://github.com/celery/kombu/commit/dc3fceff59d79ceac3f8f11a5d697beabb4b7a7f.patch";
-      sha256 = "0s6gsihzjvmpffc7xrrcijw00r56yb74jg0sbjgng2v1324z1da9";
-      name = "don-t-modify-dict-size-while-iterating-over-it";
-    }) ];
-
-    buildInputs = with self; [ pytest case pytz ];
-
-    propagatedBuildInputs = with self; [ amqp ];
-
-    meta = {
-      description = "Messaging library for Python";
-      homepage    = "https://github.com/celery/kombu";
-      license     = licenses.bsd3;
-    };
-  };
+  kombu = callPackage ../development/python-modules/kombu { };
 
   konfig = callPackage ../development/python-modules/konfig { };
 
@@ -7776,7 +7752,7 @@ in {
 
     meta = {
       description = "EditorConfig File Locator and Interpreter for Python";
-      homepage = "http://editorconfig.org/";
+      homepage = https://editorconfig.org/;
       license = licenses.psfl;
     };
   };
@@ -8066,7 +8042,7 @@ in {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
+      url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
       sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6";
     };
 
@@ -8075,7 +8051,7 @@ in {
 
     meta = {
       description = "Utilities for use with console mail clients, like mutt";
-      homepage = http://www.blacktrash.org/hg/muttils;
+      homepage = https://www.blacktrash.org/hg/muttils;
       license = licenses.gpl2Plus;
     };
   });
@@ -8223,7 +8199,7 @@ in {
 
     meta = {
       description = "Tool to measure, monitor and analyze memory behavior";
-      homepage = http://pythonhosted.org/Pympler/;
+      homepage = https://pythonhosted.org/Pympler/;
       license = licenses.asl20;
     };
   };
@@ -8265,6 +8241,8 @@ in {
     };
   };
 
+  monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; });
+
   monotonic = buildPythonPackage rec {
     pname = "monotonic";
     version = "1.3";
@@ -8707,7 +8685,7 @@ in {
 
     meta = {
       description = "A Python wrapper around notmuch";
-      homepage = http://notmuchmail.org/;
+      homepage = https://notmuchmail.org/;
       maintainers = with maintainers; [ garbas ];
     };
   };
@@ -9151,7 +9129,7 @@ in {
    ];
 
    meta = with stdenv.lib; {
-     homepage = "http://github.com/bcwaldon/warlock";
+     homepage = https://github.com/bcwaldon/warlock;
    };
  };
 
@@ -9974,35 +9952,8 @@ in {
     inherit (pkgs.xorg) libX11;
   };
 
-  pkgconfig = buildPythonPackage rec {
-    name = "pkgconfig-${version}";
-    version = "1.1.0";
-
-    # pypy: SyntaxError: __future__ statements must appear at beginning of file
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pkgconfig/${name}.tar.gz";
-      sha256 = "709daaf077aa2b33bedac12706373412c3683576a43013bbaa529fc2769d80df";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    propagatedBuildInputs = with self; [pkgs.pkgconfig];
-
-    meta = {
-      description = "Interface Python with pkg-config";
-      homepage = https://github.com/matze/pkgconfig;
-      license = licenses.mit;
-    };
-
-    # nosetests needs to be run explicitly.
-    # Note that the distributed archive does not actually contain any tests.
-    # https://github.com/matze/pkgconfig/issues/9
-    checkPhase = ''
-      nosetests
-    '';
-
+  pkgconfig = callPackage ../development/python-modules/pkgconfig {
+    inherit (pkgs) pkgconfig;
   };
 
   plumbum = callPackage ../development/python-modules/plumbum { };
@@ -10124,15 +10075,6 @@ in {
 
   psutil = callPackage ../development/python-modules/psutil { };
 
-  psutil_1 = self.psutil.overrideAttrs (oldAttrs: rec {
-    name = "${oldAttrs.pname}-${version}";
-    version = "1.2.1";
-    src = oldAttrs.src.override {
-      inherit version;
-      sha256 = "0ibclqy6a4qmkjhlk3g8jhpvnk0v9aywknc61xm3hfi5r124m3jh";
-    };
-  });
-
   psycopg2 = buildPythonPackage rec {
     name = "psycopg2-2.7.1";
     disabled = isPyPy;
@@ -10837,13 +10779,20 @@ in {
   };
 
   PyICU = buildPythonPackage rec {
-    name = "PyICU-1.9.7";
+    name = "PyICU-2.0.3";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyICU/${name}.tar.gz";
-      sha256 = "0qavhngmn7c90fz25a8a2k50wd5gzp3vwwjq8v2pkf2hq4fcs9yv";
+      sha256 = "0pzss3l0b0vcsyr7wlqdd6pkcqldspajfgd9k2iijf6r152d2ln4";
     };
 
+    patches = [
+      (pkgs.fetchpatch {
+        url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch;
+        sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9";
+      })
+    ];
+
     buildInputs = [ pkgs.icu self.pytest ];
 
     propagatedBuildInputs = [ self.six ];
@@ -11273,7 +11222,7 @@ in {
   pyls-isort = callPackage ../development/python-modules/pyls-isort {};
 
   pyudev = callPackage ../development/python-modules/pyudev {
-    inherit (pkgs) fetchurl systemd;
+    inherit (pkgs) systemd;
   };
 
   pynmea2 = callPackage ../development/python-modules/pynmea2 {};
@@ -11615,7 +11564,7 @@ in {
     doCheck = false;
 
     meta = {
-      homepage = "http://github.com/mongodb/mongo-python-driver";
+      homepage = https://github.com/mongodb/mongo-python-driver;
       license = licenses.asl20;
       description = "Python driver for MongoDB ";
     };
@@ -12117,53 +12066,9 @@ in {
 
   rjsmin = callPackage ../development/python-modules/rjsmin { };
 
-  pysolr = buildPythonPackage rec {
-    name = "pysolr-${version}";
-    version = "3.3.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pysolr/pysolr-${version}.tar.gz";
-      sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6";
-    };
-
-    propagatedBuildInputs = with self; [
-      requests
-    ];
-    buildInputs = with self; [
-
-    ];
-
-    meta = with stdenv.lib; {
-      homepage = "http://github.com/toastdriven/pysolr/";
-    };
-  };
-
-
-  django-haystack = buildPythonPackage rec {
-    name = "django-haystack-${version}";
-    version = "2.4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-haystack/django-haystack-${version}.tar.gz";
-      sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f";
-    };
-
-    doCheck = false;  # no tests in source
+  pysolr = callPackage ../development/python-modules/pysolr { };
 
-    buildInputs = with self; [ coverage mock nose geopy ];
-    propagatedBuildInputs = with self; [
-      django dateutil_1_5 whoosh pysolr elasticsearch
-    ];
-
-    patchPhase = ''
-      sed -i 's/geopy==/geopy>=/' setup.py
-      sed -i 's/whoosh==/Whoosh>=/' setup.py
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = "http://haystacksearch.org/";
-    };
-  };
+  django-haystack = callPackage ../development/python-modules/django-haystack { };
 
   geoalchemy2 = buildPythonPackage rec {
     name = "GeoAlchemy2-${version}";
@@ -12386,7 +12291,7 @@ in {
     propagatedBuildInputs = with self; [ pyasn1 ];
 
     meta = {
-      homepage = "http://stuvel.eu/rsa";
+      homepage = https://stuvel.eu/rsa;
       license = licenses.asl20;
       description = "A pure-Python RSA implementation";
     };
@@ -12865,7 +12770,7 @@ in {
 
     meta = {
       description = "sqlite-backed dictionary";
-      homepage = "http://github.com/Yelp/sqlite3dbm";
+      homepage = https://github.com/Yelp/sqlite3dbm;
       license = licenses.asl20;
     };
   };
@@ -12921,6 +12826,8 @@ in {
 
   shapely = callPackage ../development/python-modules/shapely { };
 
+  soco = callPackage ../development/python-modules/soco { };
+
   sopel = buildPythonPackage rec {
     name = "sopel-6.3.1";
 
@@ -13594,7 +13501,7 @@ in {
     doCheck = false;
     meta = {
       description = "Sphinx spelling extension";
-      homepage = "http://bitbucket.org/dhellmann/sphinxcontrib-spelling";
+      homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling;
       maintainers = with maintainers; [ nand0p ];
       license = licenses.bsd2;
     };
@@ -13866,7 +13773,7 @@ in {
 
     meta = {
       description = "Utility belt for automated testing";
-      homepage = "http://falcao.it/sure/";
+      homepage = https://falcao.it/sure/;
       license = licenses.gpl3Plus;
     };
   };
@@ -13946,7 +13853,7 @@ in {
     propagatedBuildInputs = with self; [ six dateutil pytz ];
 
     meta = {
-      homepage =  http://github.com/ralphbean/taskw;
+      homepage =  https://github.com/ralphbean/taskw;
       description = "Python bindings for your taskwarrior database";
       license = licenses.gpl3Plus;
       platforms = platforms.all;
@@ -15026,6 +14933,8 @@ EOF
     };
   });
 
+  xml2rfc = callPackage ../development/python-modules/xml2rfc { };
+
   xmltodict = callPackage ../development/python-modules/xmltodict { };
 
   xarray = callPackage ../development/python-modules/xarray { };
@@ -15566,28 +15475,7 @@ EOF
 
   libarcus = callPackage ../development/python-modules/libarcus { };
 
-  pybrowserid = buildPythonPackage rec {
-    name = "PyBrowserID-${version}";
-    version = "0.9.2";
-    disabled = isPy3k; # Errors in the test suite.
-
-    src = pkgs.fetchgit {
-      url = https://github.com/mozilla/PyBrowserID.git;
-      rev = "refs/tags/${version}";
-      sha256 = "0zsljr45gm8a4c0lxh6mgfc60a5fijhs4pwijb9fdkq16zw0pmf0";
-    };
-
-    doCheck = false;  # some tests use networking
-
-    buildInputs = with self; [ mock unittest2 ];
-    propagatedBuildInputs = with self; [ requests ];
-
-    meta = {
-      description = "Python library for the BrowserID Protocol";
-      homepage    = "https://github.com/mozilla/PyBrowserID";
-      license     = licenses.mpl20;
-    };
-  };
+  pybrowserid = callPackage ../development/python-modules/pybrowserid { };
 
   pyzmq = callPackage ../development/python-modules/pyzmq { };
 
@@ -16210,7 +16098,7 @@ EOF
     '';
 
     meta = {
-      homepage = http://pythonhosted.org/Logbook/;
+      homepage = https://pythonhosted.org/Logbook/;
       description = "A logging replacement for Python";
       license = licenses.bsd3;
     };
@@ -17077,7 +16965,7 @@ EOF
 
     meta = {
       description = "Free console XMPP client";
-      homepage = http://poez.io;
+      homepage = https://poez.io;
       license = licenses.mit;
       maintainers = [ maintainers.lsix ];
     };
@@ -17150,7 +17038,7 @@ EOF
 
     meta = with stdenv.lib; {
       description = "Lightweight SOAP client (Jurko's fork)";
-      homepage = "http://bitbucket.org/jurko/suds";
+      homepage = https://bitbucket.org/jurko/suds;
     };
   };
 
@@ -17589,7 +17477,7 @@ EOF
     doCheck = false;
     meta = {
       description = "A client side encrypted pastebin";
-      homepage = "http://0bin.net/";
+      homepage = https://0bin.net/;
       license = licenses.wtfpl;
     };
   };
@@ -18175,6 +18063,15 @@ EOF
 
   spectral-cube = callPackage ../development/python-modules/spectral-cube { };
 
+  astunparse = callPackage ../development/python-modules/astunparse { };
+
+  gast = callPackage ../development/python-modules/gast { };
+
+  IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { };
+
+  qiskit = callPackage ../development/python-modules/qiskit { };
+
+  qasm2image = callPackage ../development/python-modules/qasm2image { };
 });
 
 in fix' (extends overrides packages)
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f78152a8931c4..81f0874ca12da 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -25,6 +25,8 @@ let
 
   systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems;
 
+  supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;
+
   jobs =
     { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
 
@@ -33,7 +35,7 @@ let
       manual = import ../../doc;
       lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
 
-      darwin-tested = pkgs.releaseTools.aggregate
+      darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate
         { name = "nixpkgs-darwin-${jobs.tarball.version}";
           meta.description = "Release-critical builds for the Nixpkgs darwin channel";
           constituents =
@@ -66,7 +68,7 @@ let
               jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
             ];
-        };
+        } else null;
 
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
@@ -77,65 +79,66 @@ let
               jobs.manual
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
-              jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.python.x86_64-linux
-              jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
-              jobs.python3.x86_64-darwin
               # Needed by travis-ci to test PRs
               jobs.nox.x86_64-linux
-              jobs.nox.x86_64-darwin
               # Needed for support
               jobs.nix-info.x86_64-linux
-              jobs.nix-info.x86_64-darwin
               jobs.nix-info-tested.x86_64-linux
-              jobs.nix-info-tested.x86_64-darwin
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
-              # Ensure that basic stuff works on darwin
-              jobs.git.x86_64-darwin
-              jobs.mariadb.x86_64-darwin
-              jobs.vim.x86_64-darwin
-              # Ensure that UI stuff works on darwin
-              jobs.inkscape.x86_64-darwin
-              jobs.qt5.qtmultimedia.x86_64-darwin
 
               jobs.tests.cc-wrapper.x86_64-linux
-              jobs.tests.cc-wrapper.x86_64-darwin
               jobs.tests.cc-wrapper-gcc7.x86_64-linux
-              jobs.tests.cc-wrapper-gcc7.x86_64-darwin
               jobs.tests.cc-wrapper-gcc8.x86_64-linux
 
               # broken see issue #40038
-              # jobs.tests.cc-wrapper-gcc8.x86_64-darwin
 
               jobs.tests.cc-wrapper-clang.x86_64-linux
-              jobs.tests.cc-wrapper-clang.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx.x86_64-darwin
               jobs.tests.cc-wrapper-clang-39.x86_64-linux
-              jobs.tests.cc-wrapper-clang-39.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-39.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
               jobs.tests.cc-wrapper-clang-4.x86_64-linux
-              jobs.tests.cc-wrapper-clang-4.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-4.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin
               jobs.tests.cc-wrapper-clang-5.x86_64-linux
-              jobs.tests.cc-wrapper-clang-5.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
               jobs.tests.cc-wrapper-clang-6.x86_64-linux
-              jobs.tests.cc-wrapper-clang-6.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-6.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
               jobs.tests.cc-multilib-gcc.x86_64-linux
               jobs.tests.cc-multilib-clang.x86_64-linux
               jobs.tests.stdenv-inputs.x86_64-linux
+            ]
+            ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
+            ++ lib.optionals supportDarwin [
+              jobs.stdenv.x86_64-darwin
+              jobs.python.x86_64-darwin
+              jobs.python3.x86_64-darwin
+              jobs.nox.x86_64-darwin
+              jobs.nix-info.x86_64-darwin
+              jobs.nix-info-tested.x86_64-darwin
+              jobs.git.x86_64-darwin
+              jobs.mariadb.x86_64-darwin
+              jobs.vim.x86_64-darwin
+              jobs.inkscape.x86_64-darwin
+              jobs.qt5.qtmultimedia.x86_64-darwin
+              jobs.tests.cc-wrapper.x86_64-darwin
+              jobs.tests.cc-wrapper-gcc7.x86_64-darwin
+              # jobs.tests.cc-wrapper-gcc8.x86_64-darwin
+              jobs.tests.cc-wrapper-clang.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-39.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-4.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-5.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-6.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
               jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
-            ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
+            ];
         };
 
       stdenvBootstrapTools = with lib;
@@ -148,7 +151,7 @@ let
               dist test;
           })
         # darwin is special in this
-        // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
+        // optionalAttrs supportDarwin {
           x86_64-darwin =
             let
               bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 1fde08d1d48b4..27e8136cd397f 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -31,17 +31,13 @@ let
     then defaultBuildHostScope
     else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope;
   defaultHostHostScope = {}; # unimplemented
-  # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing
-  # these attributes. We should have a more general solution for selecting
-  # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`.
-  pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs;
-  targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages;
-  defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg;
-  defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {};
+  defaultHostTargetScope = pkgs // pkgs.xorg;
+  defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {};
 
-  splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget:
-            pkgsHostHost: pkgsHostTarget:
-            pkgsTargetTarget: let
+  spliceReal = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+               , pkgsHostHost, pkgsHostTarget
+               , pkgsTargetTarget
+               }: let
     mash =
       # Other pkgs sets
       pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget
@@ -55,7 +51,7 @@ let
         valueBuildBuild = pkgsBuildBuild.${name} or {};
         valueBuildHost = pkgsBuildHost.${name} or {};
         valueBuildTarget = pkgsBuildTarget.${name} or {};
-        valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splicer.";
+        valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splice.";
         valueHostTarget = pkgsHostTarget.${name} or {};
         valueTargetTarget = pkgsTargetTarget.${name} or {};
         augmentedValue = defaultValue
@@ -82,38 +78,51 @@ let
       in
         # The derivation along with its outputs, which we recur
         # on to splice them together.
-        if lib.isDerivation defaultValue then augmentedValue // splicer
-          (tryGetOutputs valueBuildBuild) (tryGetOutputs valueBuildHost) (tryGetOutputs valueBuildTarget)
-          (tryGetOutputs valueHostHost) (getOutputs valueHostTarget)
-          (tryGetOutputs valueTargetTarget)
+        if lib.isDerivation defaultValue then augmentedValue // spliceReal {
+          pkgsBuildBuild = tryGetOutputs valueBuildBuild;
+          pkgsBuildHost = tryGetOutputs valueBuildHost;
+          pkgsBuildTarget = tryGetOutputs valueBuildTarget;
+          pkgsHostHost = tryGetOutputs valueHostHost;
+          pkgsHostTarget = getOutputs valueHostTarget;
+          pkgsTargetTarget = tryGetOutputs valueTargetTarget;
         # Just recur on plain attrsets
-        else if lib.isAttrs defaultValue then splicer
-          valueBuildBuild valueBuildHost valueBuildTarget
-          {} valueHostTarget
-          valueTargetTarget
+        } else if lib.isAttrs defaultValue then spliceReal {
+          pkgsBuildBuild = valueBuildBuild;
+          pkgsBuildHost = valueBuildHost;
+          pkgsBuildTarget = valueBuildTarget;
+          pkgsHostHost = {};
+          pkgsHostTarget = valueHostTarget;
+          pkgsTargetTarget = valueTargetTarget;
         # Don't be fancy about non-derivations. But we could have used used
         # `__functor__` for functions instead.
-        else defaultValue;
+        } else defaultValue;
     };
   in lib.listToAttrs (map merge (lib.attrNames mash));
 
-  splicedPackages =
-    if actuallySplice
-    then
-      splicer
-        defaultBuildBuildScope defaultBuildHostScope defaultBuildTargetScope
-        defaultHostHostScope defaultHostTargetScope
-        defaultTargetTargetScope
-      // {
-        # These should never be spliced under any circumstances
-        inherit (pkgs) pkgs buildPackages targetPackages
-          buildPlatform targetPlatform hostPlatform;
-      }
-    else pkgs // pkgs.xorg;
+  splicePackages = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+                   , pkgsHostHost, pkgsHostTarget
+                   , pkgsTargetTarget
+                   } @ args:
+    if actuallySplice then spliceReal args else pkgsHostTarget;
+
+  splicedPackages = splicePackages {
+    pkgsBuildBuild = defaultBuildBuildScope;
+    pkgsBuildHost = defaultBuildHostScope;
+    pkgsBuildTarget = defaultBuildTargetScope;
+    pkgsHostHost = defaultHostHostScope;
+    pkgsHostTarget = defaultHostTargetScope;
+    pkgsTargetTarget = defaultTargetTargetScope;
+  } // {
+    # These should never be spliced under any circumstances
+    inherit (pkgs) pkgs buildPackages targetPackages
+      buildPlatform targetPlatform hostPlatform;
+  };
 
 in
 
 {
+  inherit splicePackages;
+
   # We use `callPackage' to be able to omit function arguments that can be
   # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
   # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
@@ -122,4 +131,8 @@ in
   callPackages = lib.callPackagesWith splicedPackages;
 
   newScope = extra: lib.callPackageWith (splicedPackages // extra);
+
+  # Haskell package sets need this because they reimplement their own
+  # `newScope`.
+  __splicedPackages = splicedPackages // { recurseForDerivations = false; };
 }
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index e38f5442d3aa0..cc70950c497c7 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -93,12 +93,12 @@ let
 
   allPackages = self: super:
     let res = import ./all-packages.nix
-      { inherit lib nixpkgsFun noSysDirs config; }
+      { inherit lib noSysDirs config; }
       res self;
     in res;
 
   aliases = self: super: if config.skipAliases or false then {}
-                         else import ./aliases.nix super;
+                         else import ./aliases.nix lib self super;
 
   # stdenvOverrides is used to avoid having multiple of versions
   # of certain dependencies that were used in bootstrapping the
@@ -117,6 +117,49 @@ let
     lib.optionalAttrs allowCustomOverrides
       ((config.packageOverrides or (super: {})) super);
 
+  # Convenience attributes for instantitating package sets. Each of
+  # these will instantiate a new version of allPackages. Currently the
+  # following package sets are provided:
+  #
+  # - pkgsCross.<system> where system is a member of lib.systems.examples
+  # - pkgsMusl
+  # - pkgsi686Linux
+  otherPackageSets = self: super: {
+    # This maps each entry in lib.systems.examples to its own package
+    # set. Each of these will contain all packages cross compiled for
+    # that target system. For instance, pkgsCross.rasberryPi.hello,
+    # will refer to the "hello" package built for the ARM6-based
+    # Raspberry Pi.
+    pkgsCross = lib.mapAttrs (n: crossSystem:
+                              nixpkgsFun { inherit crossSystem; })
+                              lib.systems.examples;
+
+    # All packages built with the Musl libc. This will override the
+    # default GNU libc on Linux systems. Non-Linux systems are not
+    # supported.
+    pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
+      localSystem = {
+        parsed = stdenv.hostPlatform.parsed // {
+          abi = {
+            "gnu" = lib.systems.parse.abis.musl;
+            "gnueabi" = lib.systems.parse.abis.musleabi;
+            "gnueabihf" = lib.systems.parse.abis.musleabihf;
+          }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl;
+        };
+      };
+    } else throw "Musl libc only supports Linux systems.";
+
+    # All packages built for i686 Linux.
+    # Used by wine, firefox with debugging version of Flash, ...
+    pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
+      localSystem = {
+        parsed = stdenv.hostPlatform.parsed // {
+          cpu = lib.systems.parse.cpuTypes.i686;
+        };
+      };
+    };
+  };
+
   # The complete chain of package set builders, applied from top to bottom.
   # stdenvOverlays must be last as it brings package forward from the
   # previous bootstrapping phases which have already been overlayed.
@@ -127,6 +170,7 @@ let
     trivialBuilders
     splice
     allPackages
+    otherPackageSets
     aliases
     configOverrides
   ] ++ overlays ++ [
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 64979ba3234d8..a46d2897f4ed8 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -19,14 +19,12 @@ let
     in runCommand "${cmd}-${version}" {
       meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
     } ''
-      mkdir -p $out/bin
-
       if ! [ -x "${provider}" ]; then
         echo "Cannot find command ${cmd}"
         exit 1
       fi
 
-      ln -s "${provider}" "$out/bin/${cmd}"
+      install -D "${provider}" "$out/bin/${cmd}"
     '';
 
   # more is unavailable in darwin
@@ -83,6 +81,14 @@ let
       linux = pkgs.nettools;
       darwin = pkgs.darwin.network_cmds;
     };
+    killall = {
+      linux = pkgs.psmisc;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    locale = {
+      linux = pkgs.glibc;
+      darwin = pkgs.netbsd.locale;
+    };
     logger = {
       linux = pkgs.utillinux;
     };
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
index 109f013625553..8ff2d46c24e0d 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/pkgs/top-level/wine-packages.nix
@@ -1,9 +1,9 @@
-{ stdenv, config, callPackage }:
+{ stdenv, config, callPackage, wineBuild }:
 
 rec {
   minimal = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
-    wineBuild = config.wine.build or "wine32";
+    inherit wineBuild;
   };
 
   base = minimal.override {